Disabled completion

This commit is contained in:
Yevgen Muntyan 2006-12-22 23:04:14 -06:00
parent b28ef14e1e
commit a57ecf8049
8 changed files with 267 additions and 274 deletions

View File

@ -46,7 +46,6 @@ moo/mooedit/language-specs/Makefile
moo/mooedit/gtksourceview/Makefile moo/mooedit/gtksourceview/Makefile
moo/mooedit/plugins/Makefile moo/mooedit/plugins/Makefile
moo/mooedit/plugins/activestrings/Makefile moo/mooedit/plugins/activestrings/Makefile
moo/mooedit/plugins/completion/Makefile
moo/mooedit/plugins/fileselector/Makefile moo/mooedit/plugins/fileselector/Makefile
moo/mooapp/Makefile moo/mooapp/Makefile
moo/moopython/Makefile moo/moopython/Makefile

View File

@ -18,7 +18,6 @@ unix_sources = \
mooedit_include_headers = \ mooedit_include_headers = \
moocmdview.h \ moocmdview.h \
moocompletionsimple.h \
mooedit-bookmarks.h \ mooedit-bookmarks.h \
mooedit-enums.h \ mooedit-enums.h \
mooedit-script.h \ mooedit-script.h \
@ -35,9 +34,7 @@ mooedit_include_headers = \
mooplugin-macro.h \ mooplugin-macro.h \
mooplugin.h \ mooplugin.h \
mootextbuffer.h \ mootextbuffer.h \
mootextcompletion.h \
mootextiter.h \ mootextiter.h \
mootextpopup.h \
mootextsearch.h \ mootextsearch.h \
mootextstyle.h \ mootextstyle.h \
mootextstylescheme.h \ mootextstylescheme.h \
@ -94,7 +91,6 @@ mooedit_sources = \
moocommand-script.c \ moocommand-script.c \
moocommand.c \ moocommand.c \
moocommanddisplay.c \ moocommanddisplay.c \
moocompletionsimple.c \
mooedit-bookmarks.c \ mooedit-bookmarks.c \
mooedit-enums.c \ mooedit-enums.c \
mooedit-script.c \ mooedit-script.c \
@ -125,9 +121,7 @@ mooedit_sources = \
mootextbox.c \ mootextbox.c \
mootextbtree.c \ mootextbtree.c \
mootextbuffer.c \ mootextbuffer.c \
mootextcompletion.c \
mootextfind.c \ mootextfind.c \
mootextpopup.c \
mootextsearch.c \ mootextsearch.c \
mootextstylescheme.c \ mootextstylescheme.c \
mootextview.c \ mootextview.c \

View File

@ -912,8 +912,8 @@ moo_plugin_init_builtin (void)
#if GTK_CHECK_VERSION(2,6,0) #if GTK_CHECK_VERSION(2,6,0)
_moo_file_selector_plugin_init (); _moo_file_selector_plugin_init ();
#endif #endif
_moo_completion_plugin_init ();
#if 0 #if 0
_moo_completion_plugin_init ();
_moo_active_strings_plugin_init (); _moo_active_strings_plugin_init ();
#endif #endif
} }

View File

@ -1,9 +1,9 @@
DIST_SUBDIRS = activestrings completion fileselector DIST_SUBDIRS = activestrings fileselector
# subdirs = activestrings # subdirs = activestrings completion
# libs = activestrings/libastrings.la completion/libcompletion.la # libs = activestrings/libastrings.la completion/libcompletion.la
subdirs = completion subdirs =
libs = completion/libcompletion.la libs =
if GTK_2_6 if GTK_2_6
subdirs += fileselector subdirs += fileselector
libs += fileselector/libfileselector.la libs += fileselector/libfileselector.la

View File

@ -96,22 +96,22 @@
(gtype-id "MOO_TYPE_EDIT_ACTION") (gtype-id "MOO_TYPE_EDIT_ACTION")
) )
(define-object TextCompletion ; (define-object TextCompletion
(in-module "Moo") ; (in-module "Moo")
(parent "GObject") ; (parent "GObject")
(c-name "MooTextCompletion") ; (c-name "MooTextCompletion")
(gtype-id "MOO_TYPE_TEXT_COMPLETION") ; (gtype-id "MOO_TYPE_TEXT_COMPLETION")
) ; )
(define-object TextPopup ; (define-object TextPopup
(in-module "Moo") ; (in-module "Moo")
(parent "GObject") ; (parent "GObject")
(c-name "MooTextPopup") ; (c-name "MooTextPopup")
(gtype-id "MOO_TYPE_TEXT_POPUP") ; (gtype-id "MOO_TYPE_TEXT_POPUP")
(fields ; (fields
'("GtkTreeViewColumn*" "column") ; '("GtkTreeViewColumn*" "column")
) ; )
) ; )
;; (define-object TextStyleScheme ;; (define-object TextStyleScheme
;; (in-module "Moo") ;; (in-module "Moo")
@ -1495,249 +1495,249 @@
) )
;; From moo/mooedit/mootextcompletion.h ; ;; From moo/mooedit/mootextcompletion.h
;
(define-virtual try_complete ; (define-virtual try_complete
(of-object "MooTextCompletion") ; (of-object "MooTextCompletion")
(return-type "none") ; (return-type "none")
(parameters ; (parameters
'("gboolean" "automatic") ; '("gboolean" "automatic")
) ; )
) ; )
;
(define-virtual finish ; (define-virtual finish
(of-object "MooTextCompletion") ; (of-object "MooTextCompletion")
(return-type "none") ; (return-type "none")
) ; )
;
(define-virtual update ; (define-virtual update
(of-object "MooTextCompletion") ; (of-object "MooTextCompletion")
(return-type "none") ; (return-type "none")
) ; )
;
(define-virtual complete ; (define-virtual complete
(of-object "MooTextCompletion") ; (of-object "MooTextCompletion")
(return-type "none") ; (return-type "none")
(parameters ; (parameters
'("GtkTreeModel*" "model") ; '("GtkTreeModel*" "model")
'("GtkTreeIter*" "iter") ; '("GtkTreeIter*" "iter")
) ; )
) ; )
;
(define-virtual populate ; (define-virtual populate
(of-object "MooTextCompletion") ; (of-object "MooTextCompletion")
(return-type "none") ; (return-type "none")
(parameters ; (parameters
'("GtkTreeModel*" "model") ; '("GtkTreeModel*" "model")
'("GtkTextIter*" "cursor") ; '("GtkTextIter*" "cursor")
'("const-char*" "text") ; '("const-char*" "text")
) ; )
) ; )
;
(define-method try_complete ; (define-method try_complete
(of-object "MooTextCompletion") ; (of-object "MooTextCompletion")
(c-name "moo_text_completion_try_complete") ; (c-name "moo_text_completion_try_complete")
(return-type "none") ; (return-type "none")
(parameters ; (parameters
'("gboolean" "automatic") ; '("gboolean" "automatic")
) ; )
) ; )
;
(define-method hide ; (define-method hide
(of-object "MooTextCompletion") ; (of-object "MooTextCompletion")
(c-name "moo_text_completion_hide") ; (c-name "moo_text_completion_hide")
(return-type "none") ; (return-type "none")
) ; )
;
(define-method show ; (define-method show
(of-object "MooTextCompletion") ; (of-object "MooTextCompletion")
(c-name "moo_text_completion_show") ; (c-name "moo_text_completion_show")
(return-type "none") ; (return-type "none")
) ; )
;
(define-method set_doc ; (define-method set_doc
(of-object "MooTextCompletion") ; (of-object "MooTextCompletion")
(c-name "moo_text_completion_set_doc") ; (c-name "moo_text_completion_set_doc")
(return-type "none") ; (return-type "none")
(parameters ; (parameters
'("GtkTextView*" "doc") ; '("GtkTextView*" "doc")
) ; )
) ; )
;
(define-method get_doc ; (define-method get_doc
(of-object "MooTextCompletion") ; (of-object "MooTextCompletion")
(c-name "moo_text_completion_get_doc") ; (c-name "moo_text_completion_get_doc")
(return-type "GtkTextView*") ; (return-type "GtkTextView*")
) ; )
;
(define-method get_buffer ; (define-method get_buffer
(of-object "MooTextCompletion") ; (of-object "MooTextCompletion")
(c-name "moo_text_completion_get_buffer") ; (c-name "moo_text_completion_get_buffer")
(return-type "GtkTextBuffer*") ; (return-type "GtkTextBuffer*")
) ; )
;
(define-method set_region ; (define-method set_region
(of-object "MooTextCompletion") ; (of-object "MooTextCompletion")
(c-name "moo_text_completion_set_region") ; (c-name "moo_text_completion_set_region")
(return-type "none") ; (return-type "none")
(parameters ; (parameters
'("const-GtkTextIter*" "start") ; '("const-GtkTextIter*" "start")
'("const-GtkTextIter*" "end") ; '("const-GtkTextIter*" "end")
) ; )
) ; )
;
(define-method get_region ; (define-method get_region
(of-object "MooTextCompletion") ; (of-object "MooTextCompletion")
(c-name "moo_text_completion_get_region") ; (c-name "moo_text_completion_get_region")
(return-type "gboolean") ; (return-type "gboolean")
(parameters ; (parameters
'("GtkTextIter*" "start") ; '("GtkTextIter*" "start")
'("GtkTextIter*" "end") ; '("GtkTextIter*" "end")
) ; )
) ; )
;
(define-method set_model ; (define-method set_model
(of-object "MooTextCompletion") ; (of-object "MooTextCompletion")
(c-name "moo_text_completion_set_model") ; (c-name "moo_text_completion_set_model")
(return-type "none") ; (return-type "none")
(parameters ; (parameters
'("GtkTreeModel*" "model") ; '("GtkTreeModel*" "model")
) ; )
) ; )
;
(define-method get_model ; (define-method get_model
(of-object "MooTextCompletion") ; (of-object "MooTextCompletion")
(c-name "moo_text_completion_get_model") ; (c-name "moo_text_completion_get_model")
(return-type "GtkTreeModel*") ; (return-type "GtkTreeModel*")
) ; )
;
(define-method set_text_column ; (define-method set_text_column
(of-object "MooTextCompletion") ; (of-object "MooTextCompletion")
(c-name "moo_text_completion_set_text_column") ; (c-name "moo_text_completion_set_text_column")
(return-type "none") ; (return-type "none")
(parameters ; (parameters
'("int" "column") ; '("int" "column")
) ; )
) ; )
;
(define-method set_text_func ; (define-method set_text_func
(of-object "MooTextCompletion") ; (of-object "MooTextCompletion")
(c-name "moo_text_completion_set_text_func") ; (c-name "moo_text_completion_set_text_func")
(return-type "none") ; (return-type "none")
(parameters ; (parameters
'("MooTextCompletionTextFunc" "func") ; '("MooTextCompletionTextFunc" "func")
'("gpointer" "data") ; '("gpointer" "data")
'("GDestroyNotify" "notify") ; '("GDestroyNotify" "notify")
) ; )
) ; )
;
(define-method get_popup ; (define-method get_popup
(of-object "MooTextCompletion") ; (of-object "MooTextCompletion")
(c-name "moo_text_completion_get_popup") ; (c-name "moo_text_completion_get_popup")
(return-type "MooTextPopup*") ; (return-type "MooTextPopup*")
) ; )
;; From moo/mooedit/mootextpopup.h ; ;; From moo/mooedit/mootextpopup.h
;
(define-function moo_text_popup_new ; (define-function moo_text_popup_new
(c-name "moo_text_popup_new") ; (c-name "moo_text_popup_new")
(is-constructor-of "MooTextPopup") ; (is-constructor-of "MooTextPopup")
(return-type "MooTextPopup*") ; (return-type "MooTextPopup*")
(properties ; (properties
'("doc" (optional)) ; '("doc" (optional))
) ; )
) ; )
;
(define-method set_doc ; (define-method set_doc
(of-object "MooTextPopup") ; (of-object "MooTextPopup")
(c-name "moo_text_popup_set_doc") ; (c-name "moo_text_popup_set_doc")
(return-type "none") ; (return-type "none")
(parameters ; (parameters
'("GtkTextView*" "doc") ; '("GtkTextView*" "doc")
) ; )
) ; )
;
(define-method get_doc ; (define-method get_doc
(of-object "MooTextPopup") ; (of-object "MooTextPopup")
(c-name "moo_text_popup_get_doc") ; (c-name "moo_text_popup_get_doc")
(return-type "GtkTextView*") ; (return-type "GtkTextView*")
) ; )
;
(define-method set_model ; (define-method set_model
(of-object "MooTextPopup") ; (of-object "MooTextPopup")
(c-name "moo_text_popup_set_model") ; (c-name "moo_text_popup_set_model")
(return-type "none") ; (return-type "none")
(parameters ; (parameters
'("GtkTreeModel*" "model") ; '("GtkTreeModel*" "model")
) ; )
) ; )
;
(define-method get_model ; (define-method get_model
(of-object "MooTextPopup") ; (of-object "MooTextPopup")
(c-name "moo_text_popup_get_model") ; (c-name "moo_text_popup_get_model")
(return-type "GtkTreeModel*") ; (return-type "GtkTreeModel*")
) ; )
;
(define-method show ; (define-method show
(of-object "MooTextPopup") ; (of-object "MooTextPopup")
(c-name "moo_text_popup_show") ; (c-name "moo_text_popup_show")
(return-type "gboolean") ; (return-type "gboolean")
(parameters ; (parameters
'("const-GtkTextIter*" "where") ; '("const-GtkTextIter*" "where")
) ; )
) ; )
;
(define-method update ; (define-method update
(of-object "MooTextPopup") ; (of-object "MooTextPopup")
(c-name "moo_text_popup_update") ; (c-name "moo_text_popup_update")
(return-type "none") ; (return-type "none")
) ; )
;
(define-method activate ; (define-method activate
(of-object "MooTextPopup") ; (of-object "MooTextPopup")
(c-name "moo_text_popup_activate") ; (c-name "moo_text_popup_activate")
(return-type "none") ; (return-type "none")
) ; )
;
(define-method hide ; (define-method hide
(of-object "MooTextPopup") ; (of-object "MooTextPopup")
(c-name "moo_text_popup_hide") ; (c-name "moo_text_popup_hide")
(return-type "none") ; (return-type "none")
) ; )
;
(define-method get_position ; (define-method get_position
(of-object "MooTextPopup") ; (of-object "MooTextPopup")
(c-name "moo_text_popup_get_position") ; (c-name "moo_text_popup_get_position")
(return-type "gboolean") ; (return-type "gboolean")
(parameters ; (parameters
'("GtkTextIter*" "iter") ; '("GtkTextIter*" "iter")
) ; )
) ; )
;
(define-method set_position ; (define-method set_position
(of-object "MooTextPopup") ; (of-object "MooTextPopup")
(c-name "moo_text_popup_set_position") ; (c-name "moo_text_popup_set_position")
(return-type "void") ; (return-type "void")
(parameters ; (parameters
'("const-GtkTextIter*" "iter") ; '("const-GtkTextIter*" "iter")
) ; )
) ; )
;
(define-method get_selected ; (define-method get_selected
(of-object "MooTextPopup") ; (of-object "MooTextPopup")
(c-name "moo_text_popup_get_selected") ; (c-name "moo_text_popup_get_selected")
(return-type "gboolean") ; (return-type "gboolean")
(parameters ; (parameters
'("GtkTreeIter*" "iter") ; '("GtkTreeIter*" "iter")
) ; )
) ; )
;
(define-method select ; (define-method select
(of-object "MooTextPopup") ; (of-object "MooTextPopup")
(c-name "moo_text_popup_select") ; (c-name "moo_text_popup_select")
(return-type "void") ; (return-type "void")
(parameters ; (parameters
'("GtkTreeIter*" "iter") ; '("GtkTreeIter*" "iter")
) ; )
) ; )

View File

@ -15,7 +15,6 @@ headers
#include "mooedit/moocommand.h" #include "mooedit/moocommand.h"
#include "mooedit/mooedit-enums.h" #include "mooedit/mooedit-enums.h"
#include "mooedit/moooutputfilter.h" #include "mooedit/moooutputfilter.h"
#include "mooedit/mootextcompletion.h"
#include "moopython/moopython-utils.h" #include "moopython/moopython-utils.h"
#include "moopython/pygtk/moo-pygtk.h" #include "moopython/pygtk/moo-pygtk.h"

View File

@ -28,8 +28,6 @@ moo/mooedit/moousertools-prefs.c
moo/mooedit/plugins/moofind.c moo/mooedit/plugins/moofind.c
moo/mooedit/plugins/moofind.glade moo/mooedit/plugins/moofind.glade
moo/mooedit/plugins/completion/completion.glade
moo/mooedit/plugins/completion/completion-plugin.c
moo/mooedit/plugins/fileselector/moofileselector.c moo/mooedit/plugins/fileselector/moofileselector.c
moo/mooedit/plugins/fileselector/moofileselector.glade moo/mooedit/plugins/fileselector/moofileselector.glade
moo/mooedit/plugins/fileselector/moofileselector-prefs.c moo/mooedit/plugins/fileselector/moofileselector-prefs.c

View File

@ -65,3 +65,6 @@ moo/moopython/plugins/pyproject/projects/latex.py
moo/mooterm/mootermparser-yacc.c moo/mooterm/mootermparser-yacc.c
moo/mooterm/glade/mootermprefs.glade moo/mooterm/glade/mootermprefs.glade
moo/mooedit/plugins/completion/completion.glade
moo/mooedit/plugins/completion/completion-plugin.c