diff --git a/configure.ac b/configure.ac index 1c02b64a..25293955 100644 --- a/configure.ac +++ b/configure.ac @@ -46,7 +46,6 @@ moo/mooedit/language-specs/Makefile moo/mooedit/gtksourceview/Makefile moo/mooedit/plugins/Makefile moo/mooedit/plugins/activestrings/Makefile -moo/mooedit/plugins/completion/Makefile moo/mooedit/plugins/fileselector/Makefile moo/mooapp/Makefile moo/moopython/Makefile diff --git a/moo/mooedit/Makefile.am b/moo/mooedit/Makefile.am index 71938ba4..41a6fcc7 100644 --- a/moo/mooedit/Makefile.am +++ b/moo/mooedit/Makefile.am @@ -18,7 +18,6 @@ unix_sources = \ mooedit_include_headers = \ moocmdview.h \ - moocompletionsimple.h \ mooedit-bookmarks.h \ mooedit-enums.h \ mooedit-script.h \ @@ -35,9 +34,7 @@ mooedit_include_headers = \ mooplugin-macro.h \ mooplugin.h \ mootextbuffer.h \ - mootextcompletion.h \ mootextiter.h \ - mootextpopup.h \ mootextsearch.h \ mootextstyle.h \ mootextstylescheme.h \ @@ -94,7 +91,6 @@ mooedit_sources = \ moocommand-script.c \ moocommand.c \ moocommanddisplay.c \ - moocompletionsimple.c \ mooedit-bookmarks.c \ mooedit-enums.c \ mooedit-script.c \ @@ -125,9 +121,7 @@ mooedit_sources = \ mootextbox.c \ mootextbtree.c \ mootextbuffer.c \ - mootextcompletion.c \ mootextfind.c \ - mootextpopup.c \ mootextsearch.c \ mootextstylescheme.c \ mootextview.c \ diff --git a/moo/mooedit/mooplugin.c b/moo/mooedit/mooplugin.c index d4cc6527..cbfc64c9 100644 --- a/moo/mooedit/mooplugin.c +++ b/moo/mooedit/mooplugin.c @@ -912,8 +912,8 @@ moo_plugin_init_builtin (void) #if GTK_CHECK_VERSION(2,6,0) _moo_file_selector_plugin_init (); #endif - _moo_completion_plugin_init (); #if 0 + _moo_completion_plugin_init (); _moo_active_strings_plugin_init (); #endif } diff --git a/moo/mooedit/plugins/Makefile.am b/moo/mooedit/plugins/Makefile.am index d61bd0cf..10bc796f 100644 --- a/moo/mooedit/plugins/Makefile.am +++ b/moo/mooedit/plugins/Makefile.am @@ -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 -subdirs = completion -libs = completion/libcompletion.la +subdirs = +libs = if GTK_2_6 subdirs += fileselector libs += fileselector/libfileselector.la diff --git a/moo/moopython/pygtk/mooedit-pygtk.defs b/moo/moopython/pygtk/mooedit-pygtk.defs index d132bcce..9d492250 100644 --- a/moo/moopython/pygtk/mooedit-pygtk.defs +++ b/moo/moopython/pygtk/mooedit-pygtk.defs @@ -96,22 +96,22 @@ (gtype-id "MOO_TYPE_EDIT_ACTION") ) -(define-object TextCompletion - (in-module "Moo") - (parent "GObject") - (c-name "MooTextCompletion") - (gtype-id "MOO_TYPE_TEXT_COMPLETION") -) +; (define-object TextCompletion +; (in-module "Moo") +; (parent "GObject") +; (c-name "MooTextCompletion") +; (gtype-id "MOO_TYPE_TEXT_COMPLETION") +; ) -(define-object TextPopup - (in-module "Moo") - (parent "GObject") - (c-name "MooTextPopup") - (gtype-id "MOO_TYPE_TEXT_POPUP") - (fields - '("GtkTreeViewColumn*" "column") - ) -) +; (define-object TextPopup +; (in-module "Moo") +; (parent "GObject") +; (c-name "MooTextPopup") +; (gtype-id "MOO_TYPE_TEXT_POPUP") +; (fields +; '("GtkTreeViewColumn*" "column") +; ) +; ) ;; (define-object TextStyleScheme ;; (in-module "Moo") @@ -1495,249 +1495,249 @@ ) -;; From moo/mooedit/mootextcompletion.h - -(define-virtual try_complete - (of-object "MooTextCompletion") - (return-type "none") - (parameters - '("gboolean" "automatic") - ) -) - -(define-virtual finish - (of-object "MooTextCompletion") - (return-type "none") -) - -(define-virtual update - (of-object "MooTextCompletion") - (return-type "none") -) - -(define-virtual complete - (of-object "MooTextCompletion") - (return-type "none") - (parameters - '("GtkTreeModel*" "model") - '("GtkTreeIter*" "iter") - ) -) - -(define-virtual populate - (of-object "MooTextCompletion") - (return-type "none") - (parameters - '("GtkTreeModel*" "model") - '("GtkTextIter*" "cursor") - '("const-char*" "text") - ) -) - -(define-method try_complete - (of-object "MooTextCompletion") - (c-name "moo_text_completion_try_complete") - (return-type "none") - (parameters - '("gboolean" "automatic") - ) -) - -(define-method hide - (of-object "MooTextCompletion") - (c-name "moo_text_completion_hide") - (return-type "none") -) - -(define-method show - (of-object "MooTextCompletion") - (c-name "moo_text_completion_show") - (return-type "none") -) - -(define-method set_doc - (of-object "MooTextCompletion") - (c-name "moo_text_completion_set_doc") - (return-type "none") - (parameters - '("GtkTextView*" "doc") - ) -) - -(define-method get_doc - (of-object "MooTextCompletion") - (c-name "moo_text_completion_get_doc") - (return-type "GtkTextView*") -) - -(define-method get_buffer - (of-object "MooTextCompletion") - (c-name "moo_text_completion_get_buffer") - (return-type "GtkTextBuffer*") -) - -(define-method set_region - (of-object "MooTextCompletion") - (c-name "moo_text_completion_set_region") - (return-type "none") - (parameters - '("const-GtkTextIter*" "start") - '("const-GtkTextIter*" "end") - ) -) - -(define-method get_region - (of-object "MooTextCompletion") - (c-name "moo_text_completion_get_region") - (return-type "gboolean") - (parameters - '("GtkTextIter*" "start") - '("GtkTextIter*" "end") - ) -) - -(define-method set_model - (of-object "MooTextCompletion") - (c-name "moo_text_completion_set_model") - (return-type "none") - (parameters - '("GtkTreeModel*" "model") - ) -) - -(define-method get_model - (of-object "MooTextCompletion") - (c-name "moo_text_completion_get_model") - (return-type "GtkTreeModel*") -) - -(define-method set_text_column - (of-object "MooTextCompletion") - (c-name "moo_text_completion_set_text_column") - (return-type "none") - (parameters - '("int" "column") - ) -) - -(define-method set_text_func - (of-object "MooTextCompletion") - (c-name "moo_text_completion_set_text_func") - (return-type "none") - (parameters - '("MooTextCompletionTextFunc" "func") - '("gpointer" "data") - '("GDestroyNotify" "notify") - ) -) - -(define-method get_popup - (of-object "MooTextCompletion") - (c-name "moo_text_completion_get_popup") - (return-type "MooTextPopup*") -) +; ;; From moo/mooedit/mootextcompletion.h +; +; (define-virtual try_complete +; (of-object "MooTextCompletion") +; (return-type "none") +; (parameters +; '("gboolean" "automatic") +; ) +; ) +; +; (define-virtual finish +; (of-object "MooTextCompletion") +; (return-type "none") +; ) +; +; (define-virtual update +; (of-object "MooTextCompletion") +; (return-type "none") +; ) +; +; (define-virtual complete +; (of-object "MooTextCompletion") +; (return-type "none") +; (parameters +; '("GtkTreeModel*" "model") +; '("GtkTreeIter*" "iter") +; ) +; ) +; +; (define-virtual populate +; (of-object "MooTextCompletion") +; (return-type "none") +; (parameters +; '("GtkTreeModel*" "model") +; '("GtkTextIter*" "cursor") +; '("const-char*" "text") +; ) +; ) +; +; (define-method try_complete +; (of-object "MooTextCompletion") +; (c-name "moo_text_completion_try_complete") +; (return-type "none") +; (parameters +; '("gboolean" "automatic") +; ) +; ) +; +; (define-method hide +; (of-object "MooTextCompletion") +; (c-name "moo_text_completion_hide") +; (return-type "none") +; ) +; +; (define-method show +; (of-object "MooTextCompletion") +; (c-name "moo_text_completion_show") +; (return-type "none") +; ) +; +; (define-method set_doc +; (of-object "MooTextCompletion") +; (c-name "moo_text_completion_set_doc") +; (return-type "none") +; (parameters +; '("GtkTextView*" "doc") +; ) +; ) +; +; (define-method get_doc +; (of-object "MooTextCompletion") +; (c-name "moo_text_completion_get_doc") +; (return-type "GtkTextView*") +; ) +; +; (define-method get_buffer +; (of-object "MooTextCompletion") +; (c-name "moo_text_completion_get_buffer") +; (return-type "GtkTextBuffer*") +; ) +; +; (define-method set_region +; (of-object "MooTextCompletion") +; (c-name "moo_text_completion_set_region") +; (return-type "none") +; (parameters +; '("const-GtkTextIter*" "start") +; '("const-GtkTextIter*" "end") +; ) +; ) +; +; (define-method get_region +; (of-object "MooTextCompletion") +; (c-name "moo_text_completion_get_region") +; (return-type "gboolean") +; (parameters +; '("GtkTextIter*" "start") +; '("GtkTextIter*" "end") +; ) +; ) +; +; (define-method set_model +; (of-object "MooTextCompletion") +; (c-name "moo_text_completion_set_model") +; (return-type "none") +; (parameters +; '("GtkTreeModel*" "model") +; ) +; ) +; +; (define-method get_model +; (of-object "MooTextCompletion") +; (c-name "moo_text_completion_get_model") +; (return-type "GtkTreeModel*") +; ) +; +; (define-method set_text_column +; (of-object "MooTextCompletion") +; (c-name "moo_text_completion_set_text_column") +; (return-type "none") +; (parameters +; '("int" "column") +; ) +; ) +; +; (define-method set_text_func +; (of-object "MooTextCompletion") +; (c-name "moo_text_completion_set_text_func") +; (return-type "none") +; (parameters +; '("MooTextCompletionTextFunc" "func") +; '("gpointer" "data") +; '("GDestroyNotify" "notify") +; ) +; ) +; +; (define-method get_popup +; (of-object "MooTextCompletion") +; (c-name "moo_text_completion_get_popup") +; (return-type "MooTextPopup*") +; ) -;; From moo/mooedit/mootextpopup.h - -(define-function moo_text_popup_new - (c-name "moo_text_popup_new") - (is-constructor-of "MooTextPopup") - (return-type "MooTextPopup*") - (properties - '("doc" (optional)) - ) -) - -(define-method set_doc - (of-object "MooTextPopup") - (c-name "moo_text_popup_set_doc") - (return-type "none") - (parameters - '("GtkTextView*" "doc") - ) -) - -(define-method get_doc - (of-object "MooTextPopup") - (c-name "moo_text_popup_get_doc") - (return-type "GtkTextView*") -) - -(define-method set_model - (of-object "MooTextPopup") - (c-name "moo_text_popup_set_model") - (return-type "none") - (parameters - '("GtkTreeModel*" "model") - ) -) - -(define-method get_model - (of-object "MooTextPopup") - (c-name "moo_text_popup_get_model") - (return-type "GtkTreeModel*") -) - -(define-method show - (of-object "MooTextPopup") - (c-name "moo_text_popup_show") - (return-type "gboolean") - (parameters - '("const-GtkTextIter*" "where") - ) -) - -(define-method update - (of-object "MooTextPopup") - (c-name "moo_text_popup_update") - (return-type "none") -) - -(define-method activate - (of-object "MooTextPopup") - (c-name "moo_text_popup_activate") - (return-type "none") -) - -(define-method hide - (of-object "MooTextPopup") - (c-name "moo_text_popup_hide") - (return-type "none") -) - -(define-method get_position - (of-object "MooTextPopup") - (c-name "moo_text_popup_get_position") - (return-type "gboolean") - (parameters - '("GtkTextIter*" "iter") - ) -) - -(define-method set_position - (of-object "MooTextPopup") - (c-name "moo_text_popup_set_position") - (return-type "void") - (parameters - '("const-GtkTextIter*" "iter") - ) -) - -(define-method get_selected - (of-object "MooTextPopup") - (c-name "moo_text_popup_get_selected") - (return-type "gboolean") - (parameters - '("GtkTreeIter*" "iter") - ) -) - -(define-method select - (of-object "MooTextPopup") - (c-name "moo_text_popup_select") - (return-type "void") - (parameters - '("GtkTreeIter*" "iter") - ) -) +; ;; From moo/mooedit/mootextpopup.h +; +; (define-function moo_text_popup_new +; (c-name "moo_text_popup_new") +; (is-constructor-of "MooTextPopup") +; (return-type "MooTextPopup*") +; (properties +; '("doc" (optional)) +; ) +; ) +; +; (define-method set_doc +; (of-object "MooTextPopup") +; (c-name "moo_text_popup_set_doc") +; (return-type "none") +; (parameters +; '("GtkTextView*" "doc") +; ) +; ) +; +; (define-method get_doc +; (of-object "MooTextPopup") +; (c-name "moo_text_popup_get_doc") +; (return-type "GtkTextView*") +; ) +; +; (define-method set_model +; (of-object "MooTextPopup") +; (c-name "moo_text_popup_set_model") +; (return-type "none") +; (parameters +; '("GtkTreeModel*" "model") +; ) +; ) +; +; (define-method get_model +; (of-object "MooTextPopup") +; (c-name "moo_text_popup_get_model") +; (return-type "GtkTreeModel*") +; ) +; +; (define-method show +; (of-object "MooTextPopup") +; (c-name "moo_text_popup_show") +; (return-type "gboolean") +; (parameters +; '("const-GtkTextIter*" "where") +; ) +; ) +; +; (define-method update +; (of-object "MooTextPopup") +; (c-name "moo_text_popup_update") +; (return-type "none") +; ) +; +; (define-method activate +; (of-object "MooTextPopup") +; (c-name "moo_text_popup_activate") +; (return-type "none") +; ) +; +; (define-method hide +; (of-object "MooTextPopup") +; (c-name "moo_text_popup_hide") +; (return-type "none") +; ) +; +; (define-method get_position +; (of-object "MooTextPopup") +; (c-name "moo_text_popup_get_position") +; (return-type "gboolean") +; (parameters +; '("GtkTextIter*" "iter") +; ) +; ) +; +; (define-method set_position +; (of-object "MooTextPopup") +; (c-name "moo_text_popup_set_position") +; (return-type "void") +; (parameters +; '("const-GtkTextIter*" "iter") +; ) +; ) +; +; (define-method get_selected +; (of-object "MooTextPopup") +; (c-name "moo_text_popup_get_selected") +; (return-type "gboolean") +; (parameters +; '("GtkTreeIter*" "iter") +; ) +; ) +; +; (define-method select +; (of-object "MooTextPopup") +; (c-name "moo_text_popup_select") +; (return-type "void") +; (parameters +; '("GtkTreeIter*" "iter") +; ) +; ) diff --git a/moo/moopython/pygtk/mooedit-pygtk.override b/moo/moopython/pygtk/mooedit-pygtk.override index dd88d48a..e0d33499 100644 --- a/moo/moopython/pygtk/mooedit-pygtk.override +++ b/moo/moopython/pygtk/mooedit-pygtk.override @@ -15,7 +15,6 @@ headers #include "mooedit/moocommand.h" #include "mooedit/mooedit-enums.h" #include "mooedit/moooutputfilter.h" -#include "mooedit/mootextcompletion.h" #include "moopython/moopython-utils.h" #include "moopython/pygtk/moo-pygtk.h" diff --git a/po/POTFILES.in b/po/POTFILES.in index 7ec0882d..dcd7344e 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -28,8 +28,6 @@ moo/mooedit/moousertools-prefs.c moo/mooedit/plugins/moofind.c 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.glade moo/mooedit/plugins/fileselector/moofileselector-prefs.c diff --git a/po/POTFILES.skip b/po/POTFILES.skip index 72d313ca..c603eb52 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -65,3 +65,6 @@ moo/moopython/plugins/pyproject/projects/latex.py moo/mooterm/mootermparser-yacc.c moo/mooterm/glade/mootermprefs.glade + +moo/mooedit/plugins/completion/completion.glade +moo/mooedit/plugins/completion/completion-plugin.c