Plugins-Commits April 2011

plugins-commits@lists.geany.org

7 participants
50 discussions

SF.net SVN: geany-plugins:[2029] trunk/geany-plugins/geanycfp/src/geanycfp. c
by wfraser＠users.sourceforge.net 17 Apr '11

17 Apr '11

Revision: 2029 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2029&view=rev Author: wfraser Date: 2011-04-17 12:25:22 +0000 (Sun, 17 Apr 2011) Log Message: ----------- GTK version checking to stop problems with version 2.8 until 2.10 Modified Paths: -------------- trunk/geany-plugins/geanycfp/src/geanycfp.c Modified: trunk/geany-plugins/geanycfp/src/geanycfp.c =================================================================== --- trunk/geany-plugins/geanycfp/src/geanycfp.c 2011-04-14 11:57:41 UTC (rev 2028) +++ trunk/geany-plugins/geanycfp/src/geanycfp.c 2011-04-17 12:25:22 UTC (rev 2029) @@ -1098,7 +1098,7 @@ /* check to see if file has changed since geany last saved it */ fd=GetFileData(doc->file_name); - if(stat(doc->file_name,&sBuf)==0 && fd!=NULL && fd->LastChangedTime!=-1 && + if(stat(doc->file_name,&sBuf)==0 && fd!=NULL && fd->LastChangedTime!=-1 && fd->LastChangedTime!=sBuf.st_mtime) { /* notify user that file has been changed */ @@ -1334,12 +1334,12 @@ GtkWidget *dialog,*label,*scroll; /* create dialog box */ - dialog=gtk_dialog_new(); - gtk_window_set_title(GTK_WINDOW(dialog),_("ConTEXT feature parity help")); + dialog=gtk_dialog_new_with_buttons(_("ConTEXT feature parity help"), + GTK_WINDOW(geany->main_widgets->window), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_STOCK_OK,GTK_RESPONSE_ACCEPT, + NULL); - /* create buttons */ - gtk_dialog_add_button(GTK_DIALOG(dialog),_("Ok"),GTK_RESPONSE_OK); - /* create label */ label=gtk_label_new( _("This Plugin implements two useful features.\n\n" @@ -1531,7 +1531,7 @@ } /* now check to see if numbered bookmark key is atempted - * + * * control and number pressed */ if(mod==4) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[2028] trunk/geany-plugins/geanypg/src/encrypt_cb .c
by alvesh88＠users.sourceforge.net 14 Apr '11

14 Apr '11

Revision: 2028 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2028&view=rev Author: alvesh88 Date: 2011-04-14 11:57:41 +0000 (Thu, 14 Apr 2011) Log Message: ----------- Don't clear the document if encryption is cancelled. Modified Paths: -------------- trunk/geany-plugins/geanypg/src/encrypt_cb.c Modified: trunk/geany-plugins/geanypg/src/encrypt_cb.c =================================================================== --- trunk/geany-plugins/geanypg/src/encrypt_cb.c 2011-04-12 19:44:48 UTC (rev 2027) +++ trunk/geany-plugins/geanypg/src/encrypt_cb.c 2011-04-14 11:57:41 UTC (rev 2028) @@ -43,7 +43,7 @@ err = gpgme_op_encrypt(ed->ctx, recp, 0, plain, cipher); if (err != GPG_ERR_NO_ERROR && gpgme_err_code(err) != GPG_ERR_CANCELED) geanypg_show_err_msg(err); - else + else if(gpgme_err_code(err) != GPG_ERR_CANCELED) { rewind(tempfile); geanypg_write_file(tempfile); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[2027] trunk/geanylatex
by frlan＠users.sourceforge.net 12 Apr '11

12 Apr '11

Revision: 2027 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2027&view=rev Author: frlan Date: 2011-04-12 19:44:48 +0000 (Tue, 12 Apr 2011) Log Message: ----------- Don't add a {} after a command in case of [ has been typed before or [] is there. Closes #3285393. The last case could happen on usage of \item[] Modified Paths: -------------- trunk/geanylatex/ChangeLog trunk/geanylatex/src/geanylatex.c Modified: trunk/geanylatex/ChangeLog =================================================================== --- trunk/geanylatex/ChangeLog 2011-04-12 18:07:11 UTC (rev 2026) +++ trunk/geanylatex/ChangeLog 2011-04-12 19:44:48 UTC (rev 2027) @@ -1,3 +1,9 @@ +2011-04-12 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * Don't add a {} after a command in case of [ has been typed before or [] + is there. Closes #3285393. + + 2011-03-17 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * Try to fix some compiler warnings. Patch ported from Geany-Plugins. Modified: trunk/geanylatex/src/geanylatex.c =================================================================== --- trunk/geanylatex/src/geanylatex.c 2011-04-12 18:07:11 UTC (rev 2026) +++ trunk/geanylatex/src/geanylatex.c 2011-04-12 19:44:48 UTC (rev 2027) @@ -614,7 +614,7 @@ } /* Now we are handling the case, a new line has been inserted - * but no closing braces */ + * but no closing braces */ else if (glatex_autobraces_active == TRUE) { gint line; @@ -654,6 +654,8 @@ else if (buf[i] == ' ' || buf[i] == '}' || buf[i] == '{' || + buf[i] == '[' || + buf[i] == ']' || buf[i] == '"') { break; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[2026] trunk/geany-plugins/build/cflags.m4
by colombanw＠users.sourceforge.net 12 Apr '11

12 Apr '11

Revision: 2026 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2026&view=rev Author: colombanw Date: 2011-04-12 18:07:11 +0000 (Tue, 12 Apr 2011) Log Message: ----------- Stop using AS_VAR_APPEND() to restore compatibility with old M4SH versions Modified Paths: -------------- trunk/geany-plugins/build/cflags.m4 Modified: trunk/geany-plugins/build/cflags.m4 =================================================================== --- trunk/geany-plugins/build/cflags.m4 2011-04-12 18:01:44 UTC (rev 2025) +++ trunk/geany-plugins/build/cflags.m4 2011-04-12 18:07:11 UTC (rev 2026) @@ -16,7 +16,7 @@ ]) dnl GP_CHECK_CFLAGS -dnl Checks for default Geany-Plugis CFLAGS and defines GP_CFLAGS +dnl Checks for default Geany-Plugins CFLAGS and defines GP_CFLAGS AC_DEFUN([GP_CHECK_CFLAGS], [ AC_ARG_ENABLE([extra-c-warnings], @@ -38,7 +38,7 @@ -Wundef \ -Wwrite-strings do - _GP_CHECK_CFLAG_([$flag], [AS_VAR_APPEND([GP_CFLAGS], [" $flag"])]) + _GP_CHECK_CFLAG_([$flag], [GP_CFLAGS="${GP_CFLAGS} $flag"]) done ]) AC_SUBST([GP_CFLAGS]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[2025] trunk/geany-plugins/build/cflags.m4
by hyperair＠users.sourceforge.net 12 Apr '11

12 Apr '11

Revision: 2025 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2025&view=rev Author: hyperair Date: 2011-04-12 18:01:44 +0000 (Tue, 12 Apr 2011) Log Message: ----------- Use AC_LANG_{PUSH,POP} instead of AC_LANG Modified Paths: -------------- trunk/geany-plugins/build/cflags.m4 Modified: trunk/geany-plugins/build/cflags.m4 =================================================================== --- trunk/geany-plugins/build/cflags.m4 2011-04-12 18:01:14 UTC (rev 2024) +++ trunk/geany-plugins/build/cflags.m4 2011-04-12 18:01:44 UTC (rev 2025) @@ -4,13 +4,14 @@ [ gp_check_cflag_CFLAGS="$CFLAGS" CFLAGS="$1" - AC_LANG([C]) AC_MSG_CHECKING([whether the C compiler understands $CFLAGS]) + AC_LANG_PUSH(C) AC_COMPILE_IFELSE([AC_LANG_SOURCE([int main(void) {return 0;}])], [AC_MSG_RESULT([yes]) $2], [AC_MSG_RESULT([no]) $3]) + AC_LANG_POP(C) CFLAGS="$gp_check_cflag_CFLAGS" ]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[2024] trunk/geany-plugins/build/cflags.m4
by hyperair＠users.sourceforge.net 12 Apr '11

12 Apr '11

Revision: 2024 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2024&view=rev Author: hyperair Date: 2011-04-12 18:01:14 +0000 (Tue, 12 Apr 2011) Log Message: ----------- Use AC_LANG_SOURCE in body of AC_COMPILE_IFELSE Modified Paths: -------------- trunk/geany-plugins/build/cflags.m4 Modified: trunk/geany-plugins/build/cflags.m4 =================================================================== --- trunk/geany-plugins/build/cflags.m4 2011-04-12 17:50:46 UTC (rev 2023) +++ trunk/geany-plugins/build/cflags.m4 2011-04-12 18:01:14 UTC (rev 2024) @@ -6,7 +6,7 @@ CFLAGS="$1" AC_LANG([C]) AC_MSG_CHECKING([whether the C compiler understands $CFLAGS]) - AC_COMPILE_IFELSE([int main(void) {return 0;}], + AC_COMPILE_IFELSE([AC_LANG_SOURCE([int main(void) {return 0;}])], [AC_MSG_RESULT([yes]) $2], [AC_MSG_RESULT([no]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[2023] trunk/geany-plugins/build/cflags.m4
by hyperair＠users.sourceforge.net 12 Apr '11

12 Apr '11

Revision: 2023 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2023&view=rev Author: hyperair Date: 2011-04-12 17:50:46 +0000 (Tue, 12 Apr 2011) Log Message: ----------- Stick test program in cflags.m4 into one line It looks really messy and hard to read when it's put into multiple lines; moreover, it's pretty tiny Modified Paths: -------------- trunk/geany-plugins/build/cflags.m4 Modified: trunk/geany-plugins/build/cflags.m4 =================================================================== --- trunk/geany-plugins/build/cflags.m4 2011-04-12 17:46:15 UTC (rev 2022) +++ trunk/geany-plugins/build/cflags.m4 2011-04-12 17:50:46 UTC (rev 2023) @@ -6,11 +6,7 @@ CFLAGS="$1" AC_LANG([C]) AC_MSG_CHECKING([whether the C compiler understands $CFLAGS]) - AC_COMPILE_IFELSE([ -int main(void) { - return 0; -} -], + AC_COMPILE_IFELSE([int main(void) {return 0;}], [AC_MSG_RESULT([yes]) $2], [AC_MSG_RESULT([no]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[2022] trunk/geany-plugins/addons/src
by eht16＠users.sourceforge.net 12 Apr '11

12 Apr '11

Revision: 2022 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2022&view=rev Author: eht16 Date: 2011-04-12 17:46:15 +0000 (Tue, 12 Apr 2011) Log Message: ----------- update to API version 208: document_sort_by_display_name -> document_compare_by_display_name Modified Paths: -------------- trunk/geany-plugins/addons/src/addons.c trunk/geany-plugins/addons/src/ao_doclist.c Modified: trunk/geany-plugins/addons/src/addons.c =================================================================== --- trunk/geany-plugins/addons/src/addons.c 2011-04-10 17:08:29 UTC (rev 2021) +++ trunk/geany-plugins/addons/src/addons.c 2011-04-12 17:46:15 UTC (rev 2022) @@ -41,7 +41,7 @@ GeanyFunctions *geany_functions; -PLUGIN_VERSION_CHECK(207) +PLUGIN_VERSION_CHECK(208) PLUGIN_SET_TRANSLATABLE_INFO( LOCALEDIR, GETTEXT_PACKAGE, Modified: trunk/geany-plugins/addons/src/ao_doclist.c =================================================================== --- trunk/geany-plugins/addons/src/ao_doclist.c 2011-04-10 17:08:29 UTC (rev 2021) +++ trunk/geany-plugins/addons/src/ao_doclist.c 2011-04-12 17:46:15 UTC (rev 2022) @@ -176,7 +176,7 @@ static GtkWidget *menu = NULL; GtkWidget *menu_item; GeanyDocument *current_doc = document_get_current(); - GCompareFunc sort_func; + GCompareFunc compare_func; AoDocListPrivate *priv = AO_DOC_LIST_GET_PRIVATE(data); if (menu != NULL) @@ -185,12 +185,12 @@ menu = gtk_menu_new(); if (priv->sort_mode == DOCLIST_SORT_BY_NAME) - sort_func = document_sort_by_display_name; + compare_func = document_compare_by_display_name; else - sort_func = NULL; + compare_func = NULL; ui_menu_add_document_items_sorted(GTK_MENU(menu), current_doc, - G_CALLBACK(ao_doclist_menu_item_activate_cb), sort_func); + G_CALLBACK(ao_doclist_menu_item_activate_cb), compare_func); menu_item = gtk_separator_menu_item_new(); gtk_widget_show(menu_item); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[2021] trunk/geany-plugins/addons/src/addons.c
by eht16＠users.sourceforge.net 10 Apr '11

10 Apr '11

Revision: 2021 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2021&view=rev Author: eht16 Date: 2011-04-10 17:08:29 +0000 (Sun, 10 Apr 2011) Log Message: ----------- Include addons.h to fix a compiler warning about missing prototype for ao_image_menu_item_new() Modified Paths: -------------- trunk/geany-plugins/addons/src/addons.c Modified: trunk/geany-plugins/addons/src/addons.c =================================================================== --- trunk/geany-plugins/addons/src/addons.c 2011-04-10 17:05:45 UTC (rev 2020) +++ trunk/geany-plugins/addons/src/addons.c 2011-04-10 17:08:29 UTC (rev 2021) @@ -24,6 +24,7 @@ #include "geanyplugin.h" +#include "addons.h" #include "ao_blanklines.h" #include "ao_doclist.h" #include "ao_openuri.h" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[2020] trunk/geany-plugins/addons/src
by eht16＠users.sourceforge.net 10 Apr '11

10 Apr '11

Revision: 2020 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2020&view=rev Author: eht16 Date: 2011-04-10 17:05:45 +0000 (Sun, 10 Apr 2011) Log Message: ----------- Add preference for the DocList addon to define the order of the documents in the list (closes #3204573) Modified Paths: -------------- trunk/geany-plugins/addons/src/addons.c trunk/geany-plugins/addons/src/ao_doclist.c trunk/geany-plugins/addons/src/ao_doclist.h Modified: trunk/geany-plugins/addons/src/addons.c =================================================================== --- trunk/geany-plugins/addons/src/addons.c 2011-04-10 16:18:37 UTC (rev 2019) +++ trunk/geany-plugins/addons/src/addons.c 2011-04-10 17:05:45 UTC (rev 2020) @@ -40,7 +40,7 @@ GeanyFunctions *geany_functions; -PLUGIN_VERSION_CHECK(206) +PLUGIN_VERSION_CHECK(207) PLUGIN_SET_TRANSLATABLE_INFO( LOCALEDIR, GETTEXT_PACKAGE, @@ -61,12 +61,11 @@ }; - typedef struct { /* general settings */ gchar *config_file; - gboolean show_toolbar_doclist_item; + gboolean enable_doclist; gboolean enable_openuri; gboolean enable_tasks; gboolean enable_systray; @@ -78,6 +77,8 @@ gchar *tasks_token_list; gboolean tasks_scan_all_documents; + DocListSortMode doclist_sort_mode; + /* instances and variables of components */ AoDocList *doclist; AoOpenUri *openuri; @@ -243,8 +244,10 @@ "plugins", G_DIR_SEPARATOR_S, "addons", G_DIR_SEPARATOR_S, "addons.conf", NULL); g_key_file_load_from_file(config, ao_info->config_file, G_KEY_FILE_NONE, NULL); - ao_info->show_toolbar_doclist_item = utils_get_setting_boolean(config, + ao_info->enable_doclist = utils_get_setting_boolean(config, "addons", "show_toolbar_doclist_item", TRUE); + ao_info->doclist_sort_mode = utils_get_setting_integer(config, + "addons", "doclist_sort_mode", DOCLIST_SORT_BY_OCCURRENCE); ao_info->enable_openuri = utils_get_setting_boolean(config, "addons", "enable_openuri", FALSE); ao_info->enable_tasks = utils_get_setting_boolean(config, @@ -266,7 +269,7 @@ plugin_module_make_resident(geany_plugin); - ao_info->doclist = ao_doc_list_new(ao_info->show_toolbar_doclist_item); + ao_info->doclist = ao_doc_list_new(ao_info->enable_doclist, ao_info->doclist_sort_mode); ao_info->openuri = ao_open_uri_new(ao_info->enable_openuri); ao_info->systray = ao_systray_new(ao_info->enable_systray); ao_info->bookmarklist = ao_bookmark_list_new(ao_info->enable_bookmarklist); @@ -298,6 +301,15 @@ } +static void ao_configure_doclist_toggled_cb(GtkToggleButton *togglebutton, gpointer data) +{ + gboolean sens = gtk_toggle_button_get_active(togglebutton); + + gtk_widget_set_sensitive(g_object_get_data(G_OBJECT(data), "radio_doclist_name"), sens); + gtk_widget_set_sensitive(g_object_get_data(G_OBJECT(data), "radio_doclist_occurrence"), sens); +} + + static void ao_configure_response_cb(GtkDialog *dialog, gint response, gpointer user_data) { if (response == GTK_RESPONSE_OK || response == GTK_RESPONSE_APPLY) @@ -306,8 +318,14 @@ gchar *data; gchar *config_dir = g_path_get_dirname(ao_info->config_file); - ao_info->show_toolbar_doclist_item = (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( + ao_info->enable_doclist = (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( g_object_get_data(G_OBJECT(dialog), "check_doclist")))); + if (gtk_toggle_button_get_active( + GTK_TOGGLE_BUTTON(g_object_get_data(G_OBJECT(dialog), "radio_doclist_name")))) + ao_info->doclist_sort_mode = DOCLIST_SORT_BY_NAME; + else + ao_info->doclist_sort_mode = DOCLIST_SORT_BY_OCCURRENCE; + ao_info->enable_openuri = (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( g_object_get_data(G_OBJECT(dialog), "check_openuri")))); ao_info->enable_tasks = (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( @@ -330,7 +348,8 @@ g_key_file_load_from_file(config, ao_info->config_file, G_KEY_FILE_NONE, NULL); g_key_file_set_boolean(config, "addons", - "show_toolbar_doclist_item", ao_info->show_toolbar_doclist_item); + "show_toolbar_doclist_item", ao_info->enable_doclist); + g_key_file_set_integer(config, "addons", "doclist_sort_mode", ao_info->doclist_sort_mode); g_key_file_set_boolean(config, "addons", "enable_openuri", ao_info->enable_openuri); g_key_file_set_boolean(config, "addons", "enable_tasks", ao_info->enable_tasks); g_key_file_set_string(config, "addons", "tasks_token_list", ao_info->tasks_token_list); @@ -345,7 +364,8 @@ g_key_file_set_boolean(config, "addons", "enable_xmltagging", ao_info->enable_xmltagging); - g_object_set(ao_info->doclist, "enable-doclist", ao_info->show_toolbar_doclist_item, NULL); + g_object_set(ao_info->doclist, "enable-doclist", ao_info->enable_doclist, NULL); + g_object_set(ao_info->doclist, "sort-mode", ao_info->doclist_sort_mode, NULL); g_object_set(ao_info->openuri, "enable-openuri", ao_info->enable_openuri, NULL); g_object_set(ao_info->systray, "enable-systray", ao_info->enable_systray, NULL); g_object_set(ao_info->bookmarklist, "enable-bookmarklist", @@ -378,7 +398,9 @@ GtkWidget *plugin_configure(GtkDialog *dialog) { - GtkWidget *vbox, *check_doclist, *check_openuri, *check_tasks, *check_systray; + GtkWidget *vbox, *check_openuri, *check_tasks, *check_systray; + GtkWidget *check_doclist, *vbox_doclist, *frame_doclist; + GtkWidget *radio_doclist_name, *radio_doclist_occurrence; GtkWidget *check_bookmarklist, *check_markword, *frame_tasks, *vbox_tasks; GtkWidget *check_tasks_scan_mode, *entry_tasks_tokens, *label_tasks_tokens, *tokens_hbox; GtkWidget *check_blanklines, *check_xmltagging; @@ -387,10 +409,32 @@ check_doclist = gtk_check_button_new_with_label( _("Show toolbar item to show a list of currently open documents")); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_doclist), - ao_info->show_toolbar_doclist_item); - gtk_box_pack_start(GTK_BOX(vbox), check_doclist, FALSE, FALSE, 3); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_doclist), ao_info->enable_doclist); + g_signal_connect(check_doclist, "toggled", G_CALLBACK(ao_configure_doclist_toggled_cb), dialog); + radio_doclist_name = gtk_radio_button_new_with_mnemonic(NULL, _("Sort documents by _name")); + ui_widget_set_tooltip_text(radio_doclist_name, + _("Sort the documents in the list by their filename")); + + radio_doclist_occurrence = gtk_radio_button_new_with_mnemonic_from_widget( + GTK_RADIO_BUTTON(radio_doclist_name), _("Sort documents by _occurrence")); + ui_widget_set_tooltip_text(radio_doclist_name, + _("Sort the documents in the order of the document tabs")); + + if (ao_info->doclist_sort_mode == DOCLIST_SORT_BY_NAME) + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_doclist_name), TRUE); + else + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_doclist_occurrence), TRUE); + + vbox_doclist = gtk_vbox_new(FALSE, 0); + gtk_box_pack_start(GTK_BOX(vbox_doclist), radio_doclist_name, FALSE, FALSE, 3); + gtk_box_pack_start(GTK_BOX(vbox_doclist), radio_doclist_occurrence, TRUE, TRUE, 3); + + frame_doclist = gtk_frame_new(NULL); + gtk_frame_set_label_widget(GTK_FRAME(frame_doclist), check_doclist); + gtk_container_add(GTK_CONTAINER(frame_doclist), vbox_doclist); + gtk_box_pack_start(GTK_BOX(vbox), frame_doclist, FALSE, FALSE, 3); + check_openuri = gtk_check_button_new_with_label( /* TODO fix the string */ _("Show a 'Open URI' menu item in the editor menu")); @@ -465,6 +509,8 @@ gtk_box_pack_start(GTK_BOX(vbox), check_xmltagging, FALSE, FALSE, 3); g_object_set_data(G_OBJECT(dialog), "check_doclist", check_doclist); + g_object_set_data(G_OBJECT(dialog), "radio_doclist_name", radio_doclist_name); + g_object_set_data(G_OBJECT(dialog), "radio_doclist_occurrence", radio_doclist_occurrence); g_object_set_data(G_OBJECT(dialog), "check_openuri", check_openuri); g_object_set_data(G_OBJECT(dialog), "check_tasks", check_tasks); g_object_set_data(G_OBJECT(dialog), "entry_tasks_tokens", entry_tasks_tokens); @@ -477,6 +523,7 @@ g_signal_connect(dialog, "response", G_CALLBACK(ao_configure_response_cb), NULL); ao_configure_tasks_toggled_cb(GTK_TOGGLE_BUTTON(check_tasks), dialog); + ao_configure_doclist_toggled_cb(GTK_TOGGLE_BUTTON(check_doclist), dialog); gtk_widget_show_all(vbox); Modified: trunk/geany-plugins/addons/src/ao_doclist.c =================================================================== --- trunk/geany-plugins/addons/src/ao_doclist.c 2011-04-10 16:18:37 UTC (rev 2019) +++ trunk/geany-plugins/addons/src/ao_doclist.c 2011-04-10 17:05:45 UTC (rev 2020) @@ -48,13 +48,15 @@ struct _AoDocListPrivate { gboolean enable_doclist; + DocListSortMode sort_mode; GtkToolItem *toolbar_doclist_button; }; enum { PROP_0, - PROP_ENABLE_DOCLIST + PROP_ENABLE_DOCLIST, + PROP_SORT_MODE }; enum { @@ -87,6 +89,17 @@ "Whether to show a toolbar item to open a document list", TRUE, G_PARAM_WRITABLE)); + + g_object_class_install_property(g_object_class, + PROP_SORT_MODE, + g_param_spec_int( + "sort-mode", + "sort-mode", + "How to sort the documents in the list", + 0, + G_MAXINT, + DOCLIST_SORT_BY_OCCURRENCE, + G_PARAM_WRITABLE)); } @@ -163,15 +176,22 @@ static GtkWidget *menu = NULL; GtkWidget *menu_item; GeanyDocument *current_doc = document_get_current(); + GCompareFunc sort_func; + AoDocListPrivate *priv = AO_DOC_LIST_GET_PRIVATE(data); if (menu != NULL) gtk_widget_destroy(menu); menu = gtk_menu_new(); - ui_menu_add_document_items(GTK_MENU(menu), current_doc, - G_CALLBACK(ao_doclist_menu_item_activate_cb)); + if (priv->sort_mode == DOCLIST_SORT_BY_NAME) + sort_func = document_sort_by_display_name; + else + sort_func = NULL; + ui_menu_add_document_items_sorted(GTK_MENU(menu), current_doc, + G_CALLBACK(ao_doclist_menu_item_activate_cb), sort_func); + menu_item = gtk_separator_menu_item_new(); gtk_widget_show(menu_item); gtk_container_add(GTK_CONTAINER(menu), menu_item); @@ -217,7 +237,7 @@ ui_add_document_sensitive(GTK_WIDGET(priv->toolbar_doclist_button)); g_signal_connect(priv->toolbar_doclist_button, "clicked", - G_CALLBACK(ao_toolbar_item_doclist_clicked_cb), NULL); + G_CALLBACK(ao_toolbar_item_doclist_clicked_cb), self); } gtk_widget_show(GTK_WIDGET(priv->toolbar_doclist_button)); } @@ -235,6 +255,9 @@ priv->enable_doclist = g_value_get_boolean(value); ao_toolbar_update(AO_DOC_LIST(object)); break; + case PROP_SORT_MODE: + priv->sort_mode = g_value_get_int(value); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); break; @@ -250,9 +273,9 @@ } -AoDocList *ao_doc_list_new(gboolean enable) +AoDocList *ao_doc_list_new(gboolean enable, DocListSortMode sort_mode) { - return g_object_new(AO_DOC_LIST_TYPE, "enable-doclist", enable, NULL); + return g_object_new(AO_DOC_LIST_TYPE, "enable-doclist", enable, "sort-mode", sort_mode, NULL); } Modified: trunk/geany-plugins/addons/src/ao_doclist.h =================================================================== --- trunk/geany-plugins/addons/src/ao_doclist.h 2011-04-10 16:18:37 UTC (rev 2019) +++ trunk/geany-plugins/addons/src/ao_doclist.h 2011-04-10 17:05:45 UTC (rev 2020) @@ -40,9 +40,16 @@ typedef struct _AoDocList AoDocList; typedef struct _AoDocListClass AoDocListClass; +typedef enum +{ + DOCLIST_SORT_BY_NAME = 1, + DOCLIST_SORT_BY_OCCURRENCE = 2 +} DocListSortMode; + + GType ao_doc_list_get_type (void); -AoDocList* ao_doc_list_new (gboolean enable); +AoDocList* ao_doc_list_new (gboolean enable, DocListSortMode sort_mode); G_END_DECLS This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits April 2011