django plugin bugs fixed

This commit is contained in:
lxsameer 2011-05-24 20:48:35 +04:30
parent 46738f7be4
commit c96571d68a
1 changed files with 7 additions and 10 deletions

View File

@ -69,7 +69,7 @@ binding for Kuso IDE django plugin"
;; ---------------------------------------------------------------------- ;; ----------------------------------------------------------------------
;; Functions ;; Functions
;; ---------------------------------------------------------------------- ;; ----------------------------------------------------------------------
(defun init-keymap () (defun django/init-keymap ()
"Initialize the keymap for django plugin." "Initialize the keymap for django plugin."
(define-key django-map (kbd "<f6>") 'django-runserver) (define-key django-map (kbd "<f6>") 'django-runserver)
(define-key django-map (kbd "<f7>") 'django-syncdb) (define-key django-map (kbd "<f7>") 'django-syncdb)
@ -77,23 +77,20 @@ binding for Kuso IDE django plugin"
;; (define-key django-map (kbd "\C-x p f") 'django-buffer) ;; (define-key django-map (kbd "\C-x p f") 'django-buffer)
) )
(defun init-menus () (defun django/init-menus ()
"Initialize menu entry for django plugin." "Initialize menu entry for django plugin."
(define-key-after global-map [menu-bar django] (cons "Django" (make-sparse-keymap "django-map"))) (define-key-after global-map [menu-bar django] (cons "Django" (make-sparse-keymap "django-map")))
(define-key-after global-map [menu-bar django manage] (cons "Management" (make-sparse-keymap "django-manage-map"))) (define-key-after global-map [menu-bar django manage] (cons "Management" (make-sparse-keymap "django-manage-map")))
(define-key-after global-map [menu-bar django manage runserver] '("Development Server" . django-runserver)) (define-key-after global-map [menu-bar django manage runserver] '("Development Server" . django-runserver))
(define-key-after global-map [menu-bar django manage runserver-extra] '("Development Server Extended" . django-runserver-extra) 'runserver) (define-key-after global-map [menu-bar django manage runserver-extra] '("Development Server Extended" . django-runserver-extra) 'runserver)
(define-key-after global-map [menu-bar django manage syncdb] '("Syncdb" . django-syncdb) 'runserver-extra) (define-key-after global-map [menu-bar django manage syncdb] '("Syncdb" . django-syncdb) 'runserver-extra)
(define-key-after global-map [menu-bar django manage syncdb-extra] '("Syncdb with extra options" . django-syncdb-extra) 'syncdb) (define-key-after global-map [menu-bar django manage syncdb-extra] '("Syncdb with extra options" . django-syncdb-extra) 'syncdb)
(define-key-after global-map [menu-bar django manage custom-command] '("Custom Command" . django-command) 'syncdb-extra) (define-key-after global-map [menu-bar django manage custom-command] '("Custom Command" . django-command) 'syncdb-extra)
(define-key-after global-map [menu-bar django shell] '("Project shell" . django-shell) 'manage) (define-key-after global-map [menu-bar django shell] '("Project shell" . django-shell) 'manage)
(define-key-after global-map [menu-bar django sep2] '("--") 'runserver-extra) (define-key-after global-map [menu-bar django sep2] '("--") 'runserver-extra)
) )
(defun destruct-menus () (defun django/destruct-menus ()
"Remove menus from menubar" "Remove menus from menubar"
(global-unset-key [menu-bar django]) (global-unset-key [menu-bar django])
;; (global-unset-key [menu-bar edit sep2]) ;; (global-unset-key [menu-bar edit sep2])
@ -195,8 +192,8 @@ GNUEmacs."
(let () (let ()
;; before initiazing mode ;; before initiazing mode
(run-hooks 'django-preinit-hook) (run-hooks 'django-preinit-hook)
(init-keymap) (django/init-keymap)
(init-menus) (django/init-menus)
(setq django-cwd default-directory) (setq django-cwd default-directory)
;;(put 'django-region 'menu-enable nil) ;;(put 'django-region 'menu-enable nil)
;;(force-mode-line-update) ;;(force-mode-line-update)
@ -207,11 +204,11 @@ GNUEmacs."
(let () (let ()
;; before deactivating mode ;; before deactivating mode
(run-hooks 'django-prerm-hook) (run-hooks 'django-prerm-hook)
(destruct-menus) (django/destruct-menus)
(setq project-path "") (setq project-path "")
;; after deactivating mode ;; after deactivating mode
(run-hooks 'django-postrm-hook) (run-hooks 'django-postrm-hook)
) )
) )
) )
(provide 'django-mode) (provide 'django)