Plugins-Commits November 2009

plugins-commits@lists.geany.org

4 participants
27 discussions

SF.net SVN: geany-plugins:[1053] trunk/geany-plugins
by eht16＠users.sourceforge.net 04 Nov '09

04 Nov '09

Revision: 1053 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1053&view=rev Author: eht16 Date: 2009-11-04 19:01:51 +0000 (Wed, 04 Nov 2009) Log Message: ----------- Add 'Mark Word' addon. Modified Paths: -------------- trunk/geany-plugins/addons/ChangeLog trunk/geany-plugins/addons/README trunk/geany-plugins/addons/src/Makefile.am trunk/geany-plugins/addons/src/addons.c trunk/geany-plugins/po/POTFILES.in Added Paths: ----------- trunk/geany-plugins/addons/src/ao_markword.c trunk/geany-plugins/addons/src/ao_markword.h Modified: trunk/geany-plugins/addons/ChangeLog =================================================================== --- trunk/geany-plugins/addons/ChangeLog 2009-11-04 18:53:38 UTC (rev 1052) +++ trunk/geany-plugins/addons/ChangeLog 2009-11-04 19:01:51 UTC (rev 1053) @@ -2,6 +2,8 @@ * src/ao_bookmarklist.c: Prevent updating the bookmark list if it is disabled. + * src/Makefile.am, src/ao_markword.c, src/ao_markword.h, src/addons.c: + Add 'Mark Word' addon. 2009-11-01 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/geany-plugins/addons/README =================================================================== --- trunk/geany-plugins/addons/README 2009-11-04 18:53:38 UTC (rev 1052) +++ trunk/geany-plugins/addons/README 2009-11-04 19:01:51 UTC (rev 1053) @@ -32,7 +32,18 @@ a simple popup menu with some basic actions. It can also be used to quickly show and hide the Geany main window. +Bookmark List +^^^^^^^^^^^^^ +Add a list of defined bookmarks (line markers) to the sidebar. +This list contains all bookmarks defined in the current file +for faster overview and access. +Mark Word +^^^^^^^^^ +When double-clicking a word, all occurences of this word are searched +and then highlighted (similar to Geany's 'Mark All' Find option). + + Downloads --------- Modified: trunk/geany-plugins/addons/src/Makefile.am =================================================================== --- trunk/geany-plugins/addons/src/Makefile.am 2009-11-04 18:53:38 UTC (rev 1052) +++ trunk/geany-plugins/addons/src/Makefile.am 2009-11-04 19:01:51 UTC (rev 1053) @@ -9,12 +9,14 @@ ao_openuri.h \ ao_systray.h \ ao_bookmarklist.h \ + ao_markword.h \ tasks.h \ addons.c \ ao_doclist.c \ ao_openuri.c \ ao_systray.c \ ao_bookmarklist.c \ + ao_markword.c \ tasks.c addons_la_LIBADD = $(COMMONLIBS) Modified: trunk/geany-plugins/addons/src/addons.c =================================================================== --- trunk/geany-plugins/addons/src/addons.c 2009-11-04 18:53:38 UTC (rev 1052) +++ trunk/geany-plugins/addons/src/addons.c 2009-11-04 19:01:51 UTC (rev 1053) @@ -28,6 +28,7 @@ #include "ao_openuri.h" #include "ao_systray.h" #include "ao_bookmarklist.h" +#include "ao_markword.h" #include "tasks.h" @@ -60,12 +61,14 @@ gboolean enable_tasks; gboolean enable_systray; gboolean enable_bookmarklist; + gboolean enable_markword; /* instances and variables of components */ AoDocList *doclist; AoOpenUri *openuri; AoSystray *systray; AoBookmarkList *bookmarklist; + AoMarkWord *markword; } AddonsInfo; static AddonsInfo *ao_info = NULL; @@ -103,6 +106,7 @@ gboolean ret = FALSE; ao_bookmark_list_update_marker(ao_info->bookmarklist, editor, nt); + ao_mark_word_check(ao_info->markword, editor, nt); ret = tasks_on_editor_notify(object, editor, nt, data); @@ -160,6 +164,8 @@ "addons", "enable_systray", FALSE); ao_info->enable_bookmarklist = utils_get_setting_boolean(config, "addons", "enable_bookmarklist", FALSE); + ao_info->enable_markword = utils_get_setting_boolean(config, + "addons", "enable_markword", FALSE); main_locale_init(LOCALEDIR, GETTEXT_PACKAGE); plugin_module_make_resident(geany_plugin); @@ -168,6 +174,7 @@ 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); + ao_info->markword = ao_mark_word_new(ao_info->enable_markword); tasks_set_enable(ao_info->enable_tasks); @@ -196,6 +203,8 @@ g_object_get_data(G_OBJECT(dialog), "check_systray")))); ao_info->enable_bookmarklist = (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( g_object_get_data(G_OBJECT(dialog), "check_bookmarklist")))); + ao_info->enable_markword = (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( + g_object_get_data(G_OBJECT(dialog), "check_markword")))); g_key_file_load_from_file(config, ao_info->config_file, G_KEY_FILE_NONE, NULL); g_key_file_set_boolean(config, "addons", @@ -205,12 +214,14 @@ g_key_file_set_boolean(config, "addons", "enable_systray", ao_info->enable_systray); g_key_file_set_boolean(config, "addons", "enable_bookmarklist", ao_info->enable_bookmarklist); + g_key_file_set_boolean(config, "addons", "enable_markword", ao_info->enable_markword); g_object_set(ao_info->doclist, "enable-doclist", ao_info->show_toolbar_doclist_item, 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", ao_info->enable_bookmarklist, NULL); + g_object_set(ao_info->markword, "enable-markword", ao_info->enable_markword, NULL); tasks_set_enable(ao_info->enable_tasks); if (! g_file_test(config_dir, G_FILE_TEST_IS_DIR) && utils_mkdir(config_dir, TRUE) != 0) @@ -234,7 +245,7 @@ GtkWidget *plugin_configure(GtkDialog *dialog) { GtkWidget *vbox, *check_doclist, *check_openuri, *check_tasks, *check_systray; - GtkWidget *check_bookmarklist; + GtkWidget *check_bookmarklist, *check_markword; vbox = gtk_vbox_new(FALSE, 6); @@ -269,11 +280,18 @@ ao_info->enable_bookmarklist); gtk_box_pack_start(GTK_BOX(vbox), check_bookmarklist, FALSE, FALSE, 3); + check_markword = gtk_check_button_new_with_label( + _("Mark all occurrences of a word when double-clicking it")); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_markword), + ao_info->enable_markword); + gtk_box_pack_start(GTK_BOX(vbox), check_markword, FALSE, FALSE, 3); + g_object_set_data(G_OBJECT(dialog), "check_doclist", check_doclist); 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), "check_systray", check_systray); g_object_set_data(G_OBJECT(dialog), "check_bookmarklist", check_bookmarklist); + g_object_set_data(G_OBJECT(dialog), "check_markword", check_markword); g_signal_connect(dialog, "response", G_CALLBACK(ao_configure_response_cb), NULL); gtk_widget_show_all(vbox); @@ -292,6 +310,7 @@ g_object_unref(ao_info->openuri); g_object_unref(ao_info->systray); g_object_unref(ao_info->bookmarklist); + g_object_unref(ao_info->markword); tasks_set_enable(FALSE); Added: trunk/geany-plugins/addons/src/ao_markword.c =================================================================== --- trunk/geany-plugins/addons/src/ao_markword.c (rev 0) +++ trunk/geany-plugins/addons/src/ao_markword.c 2009-11-04 19:01:51 UTC (rev 1053) @@ -0,0 +1,135 @@ +/* + * ao_markword.c - this file is part of Addons, a Geany plugin + * + * Copyright 2009 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * $Id$ + */ + + +#include <gtk/gtk.h> +#include <glib-object.h> + +#include "geanyplugin.h" + +#include "addons.h" +#include "ao_markword.h" + + +typedef struct _AoMarkWordPrivate AoMarkWordPrivate; + +#define AO_MARKWORD_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj),\ + AO_MARKWORD_TYPE, AoMarkWordPrivate)) + +struct _AoMarkWord +{ + GObject parent; +}; + +struct _AoMarkWordClass +{ + GObjectClass parent_class; +}; + +struct _AoMarkWordPrivate +{ + gboolean enable_markword; +}; + +enum +{ + PROP_0, + PROP_ENABLE_MARKWORD +}; + + +static void ao_mark_word_finalize (GObject *object); + +G_DEFINE_TYPE(AoMarkWord, ao_mark_word, G_TYPE_OBJECT); + + +static void ao_mark_word_set_property(GObject *object, guint prop_id, + const GValue *value, GParamSpec *pspec) +{ + AoMarkWordPrivate *priv = AO_MARKWORD_GET_PRIVATE(object); + + switch (prop_id) + { + case PROP_ENABLE_MARKWORD: + priv->enable_markword = g_value_get_boolean(value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + break; + } +} + + +static void ao_mark_word_class_init(AoMarkWordClass *klass) +{ + GObjectClass *g_object_class; + + g_object_class = G_OBJECT_CLASS(klass); + g_object_class->finalize = ao_mark_word_finalize; + g_object_class->set_property = ao_mark_word_set_property; + g_type_class_add_private(klass, sizeof(AoMarkWordPrivate)); + + g_object_class_install_property(g_object_class, + PROP_ENABLE_MARKWORD, + g_param_spec_boolean( + "enable-markword", + "enable-markword", + "Whether to mark all occurrences of a word when double-clicking it", + TRUE, + G_PARAM_WRITABLE)); +} + + +static void ao_mark_word_finalize(GObject *object) +{ + g_return_if_fail(object != NULL); + g_return_if_fail(IS_AO_MARKWORD(object)); + + G_OBJECT_CLASS(ao_mark_word_parent_class)->finalize(object); +} + + +void ao_mark_word_check(AoMarkWord *bm, GeanyEditor *editor, SCNotification *nt) +{ + AoMarkWordPrivate *priv = AO_MARKWORD_GET_PRIVATE(bm); + + if (priv->enable_markword) + { + switch (nt->nmhdr.code) + { + case SCN_DOUBLECLICK: + keybindings_send_command(GEANY_KEY_GROUP_SEARCH, GEANY_KEYS_SEARCH_MARKALL); + break; + } + } +} + + +static void ao_mark_word_init(AoMarkWord *self) +{ +} + + +AoMarkWord *ao_mark_word_new(gboolean enable) +{ + return g_object_new(AO_MARKWORD_TYPE, "enable-markword", enable, NULL); +} Property changes on: trunk/geany-plugins/addons/src/ao_markword.c ___________________________________________________________________ Added: svn:mime-type + text/x-csrc Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/geany-plugins/addons/src/ao_markword.h =================================================================== --- trunk/geany-plugins/addons/src/ao_markword.h (rev 0) +++ trunk/geany-plugins/addons/src/ao_markword.h 2009-11-04 19:01:51 UTC (rev 1053) @@ -0,0 +1,49 @@ +/* + * ao_markword.h - this file is part of Addons, a Geany plugin + * + * Copyright 2009 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * $Id$ + */ + + +#ifndef __AO_MARKWORD_H__ +#define __AO_MARKWORD_H__ + +G_BEGIN_DECLS + +#define AO_MARKWORD_TYPE (ao_mark_word_get_type()) +#define AO_MARKWORD(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),\ + AO_MARKWORD_TYPE, AoMarkWord)) +#define AO_MARKWORD_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),\ + AO_MARKWORD_TYPE, AoMarkWordClass)) +#define IS_AO_MARKWORD(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),\ + AO_MARKWORD_TYPE)) +#define IS_AO_MARKWORD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),\ + AO_MARKWORD_TYPE)) + +typedef struct _AoMarkWord AoMarkWord; +typedef struct _AoMarkWordClass AoMarkWordClass; + +GType ao_mark_word_get_type (void); +AoMarkWord* ao_mark_word_new (gboolean enable); +void ao_mark_word_check (AoMarkWord *bm, GeanyEditor *editor, + SCNotification *nt); + +G_END_DECLS + +#endif /* __AO_MARKWORD_H__ */ Property changes on: trunk/geany-plugins/addons/src/ao_markword.h ___________________________________________________________________ Added: svn:mime-type + text/x-chdr Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/geany-plugins/po/POTFILES.in =================================================================== --- trunk/geany-plugins/po/POTFILES.in 2009-11-04 18:53:38 UTC (rev 1052) +++ trunk/geany-plugins/po/POTFILES.in 2009-11-04 19:01:51 UTC (rev 1053) @@ -7,6 +7,7 @@ addons/src/addons.c addons/src/ao_doclist.c addons/src/ao_bookmarklist.c +addons/src/ao_markword.c #codenav codenav/src/codenavigation.c 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:[1052] trunk/geany-plugins/addons
by eht16＠users.sourceforge.net 04 Nov '09

04 Nov '09

Revision: 1052 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1052&view=rev Author: eht16 Date: 2009-11-04 18:53:38 +0000 (Wed, 04 Nov 2009) Log Message: ----------- Prevent updating the bookmark list if it is disabled. Modified Paths: -------------- trunk/geany-plugins/addons/ChangeLog trunk/geany-plugins/addons/src/ao_bookmarklist.c Modified: trunk/geany-plugins/addons/ChangeLog =================================================================== --- trunk/geany-plugins/addons/ChangeLog 2009-11-01 17:44:03 UTC (rev 1051) +++ trunk/geany-plugins/addons/ChangeLog 2009-11-04 18:53:38 UTC (rev 1052) @@ -1,3 +1,9 @@ +2009-11-04 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/ao_bookmarklist.c: + Prevent updating the bookmark list if it is disabled. + + 2009-11-01 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/addons.c: Modified: trunk/geany-plugins/addons/src/ao_bookmarklist.c =================================================================== --- trunk/geany-plugins/addons/src/ao_bookmarklist.c 2009-11-01 17:44:03 UTC (rev 1051) +++ trunk/geany-plugins/addons/src/ao_bookmarklist.c 2009-11-04 18:53:38 UTC (rev 1052) @@ -414,7 +414,10 @@ void ao_bookmark_list_update_marker(AoBookmarkList *bm, GeanyEditor *editor, SCNotification *nt) { - if (nt->nmhdr.code == SCN_MODIFIED && nt->modificationType == SC_MOD_CHANGEMARKER) + AoBookmarkListPrivate *priv = AO_BOOKMARK_LIST_GET_PRIVATE(bm); + + if (priv->enable_bookmarklist && + nt->nmhdr.code == SCN_MODIFIED && nt->modificationType == SC_MOD_CHANGEMARKER) { if (sci_is_marker_set_at_line(editor->sci, nt->line, 1)) { 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:[1051] trunk/geany-plugins/addons
by eht16＠users.sourceforge.net 01 Nov '09

01 Nov '09

Revision: 1051 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1051&view=rev Author: eht16 Date: 2009-11-01 17:44:03 +0000 (Sun, 01 Nov 2009) Log Message: ----------- Initally fill the Bookmark list after the plugin has been enabled. Modified Paths: -------------- trunk/geany-plugins/addons/ChangeLog trunk/geany-plugins/addons/src/ao_bookmarklist.c Modified: trunk/geany-plugins/addons/ChangeLog =================================================================== --- trunk/geany-plugins/addons/ChangeLog 2009-11-01 17:40:09 UTC (rev 1050) +++ trunk/geany-plugins/addons/ChangeLog 2009-11-01 17:44:03 UTC (rev 1051) @@ -5,6 +5,7 @@ * src/ao_bookmarklist.c: Improve handling of the notebook page (closes #2889415). Add a popup menu to the Bookmark list to easily remove set bookmarks. + Initally fill the Bookmark list after the plugin has been enabled. 2009-10-26 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/geany-plugins/addons/src/ao_bookmarklist.c =================================================================== --- trunk/geany-plugins/addons/src/ao_bookmarklist.c 2009-11-01 17:40:09 UTC (rev 1050) +++ trunk/geany-plugins/addons/src/ao_bookmarklist.c 2009-11-01 17:44:03 UTC (rev 1051) @@ -317,6 +317,7 @@ GtkListStore *store; GtkWidget *scrollwin; GtkTreeSortable *sortable; + GeanyDocument *doc; AoBookmarkListPrivate *priv = AO_BOOKMARK_LIST_GET_PRIVATE(bm); tree = GTK_TREE_VIEW(gtk_tree_view_new()); @@ -372,6 +373,11 @@ priv->store = store; priv->tree = GTK_WIDGET(tree); priv->page = scrollwin; + + /* initial update */ + doc = document_get_current(); + if (doc != NULL) + ao_bookmark_list_update(bm, doc); } 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:[1050] trunk/geany-plugins/addons
by eht16＠users.sourceforge.net 01 Nov '09

01 Nov '09

Revision: 1050 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1050&view=rev Author: eht16 Date: 2009-11-01 17:40:09 +0000 (Sun, 01 Nov 2009) Log Message: ----------- Add a popup menu to the Bookmark list to easily remove set bookmarks. Modified Paths: -------------- trunk/geany-plugins/addons/ChangeLog trunk/geany-plugins/addons/src/ao_bookmarklist.c Modified: trunk/geany-plugins/addons/ChangeLog =================================================================== --- trunk/geany-plugins/addons/ChangeLog 2009-11-01 17:13:08 UTC (rev 1049) +++ trunk/geany-plugins/addons/ChangeLog 2009-11-01 17:40:09 UTC (rev 1050) @@ -4,6 +4,7 @@ Fix setting up keybindings. * src/ao_bookmarklist.c: Improve handling of the notebook page (closes #2889415). + Add a popup menu to the Bookmark list to easily remove set bookmarks. 2009-10-26 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/geany-plugins/addons/src/ao_bookmarklist.c =================================================================== --- trunk/geany-plugins/addons/src/ao_bookmarklist.c 2009-11-01 17:13:08 UTC (rev 1049) +++ trunk/geany-plugins/addons/src/ao_bookmarklist.c 2009-11-01 17:40:09 UTC (rev 1050) @@ -31,10 +31,6 @@ #include <gdk/gdkkeysyms.h> -/* - * TODO - * - context menu - */ typedef struct _AoBookmarkListPrivate AoBookmarkListPrivate; @@ -56,6 +52,8 @@ gboolean enable_bookmarklist; GtkWidget *page; + GtkWidget *popup_menu; + GtkListStore *store; GtkWidget *tree; @@ -221,6 +219,17 @@ { /* allow reclicking of a treeview item */ g_idle_add(ao_selection_changed_cb, widget); } + else if (event->button == 3) + { + AoBookmarkListPrivate *priv = AO_BOOKMARK_LIST_GET_PRIVATE(data); + GtkTreeSelection *treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(priv->tree)); + if (gtk_tree_selection_get_selected(treesel, NULL, NULL)) + { + gtk_menu_popup(GTK_MENU(priv->popup_menu), NULL, NULL, NULL, NULL, + event->button, event->time); + } + /* don't return TRUE here, unless the selection won't be changed */ + } return FALSE; } @@ -234,6 +243,17 @@ { g_idle_add(ao_selection_changed_cb, widget); } + + if ((event->keyval == GDK_F10 && event->state & GDK_SHIFT_MASK) || event->keyval == GDK_Menu) + { + GdkEventButton button_event; + + button_event.time = event->time; + button_event.button = 3; + + ao_button_press_cb(widget, &button_event, data); + return TRUE; + } return FALSE; } @@ -247,9 +267,48 @@ gtk_widget_destroy(priv->page); priv->page = NULL; } + if (priv->popup_menu) + { + gtk_widget_destroy(priv->popup_menu); + priv->popup_menu = NULL; + } } +static void popup_item_click_cb(GtkWidget *button, gpointer data) +{ + GtkTreeSelection *treesel; + GtkTreeModel *model; + GtkTreeIter iter; + AoBookmarkListPrivate *priv = AO_BOOKMARK_LIST_GET_PRIVATE(data); + + treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(priv->tree)); + + if (gtk_tree_selection_get_selected(treesel, &model, &iter)) + { + GeanyDocument *doc = document_get_current(); + gint line_nr; + gtk_tree_model_get(model, &iter, BMLIST_COL_LINE, &line_nr, -1); + sci_delete_marker_at_line(doc->editor->sci, line_nr - 1, 1); + } +} + + +static GtkWidget *create_popup_menu(AoBookmarkList *bm) +{ + GtkWidget *item, *menu; + + menu = gtk_menu_new(); + + item = ui_image_menu_item_new(GTK_STOCK_DELETE, _("_Remove Bookmark")); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + g_signal_connect(item, "activate", G_CALLBACK(popup_item_click_cb), bm); + + return menu; +} + + static void ao_bookmark_list_show(AoBookmarkList *bm) { GtkCellRenderer *text_renderer; @@ -293,8 +352,8 @@ g_object_set(tree, "has-tooltip", TRUE, "tooltip-column", BMLIST_COL_TOOLTIP, NULL); /* selection handling */ - g_signal_connect(tree, "button-press-event", G_CALLBACK(ao_button_press_cb), NULL); - g_signal_connect(tree, "key-press-event", G_CALLBACK(ao_key_press_cb), NULL); + g_signal_connect(tree, "button-press-event", G_CALLBACK(ao_button_press_cb), bm); + g_signal_connect(tree, "key-press-event", G_CALLBACK(ao_key_press_cb), bm); /* scrolled window */ scrollwin = gtk_scrolled_window_new(NULL, NULL); @@ -309,6 +368,7 @@ scrollwin, gtk_label_new(_("Bookmarks"))); + priv->popup_menu = create_popup_menu(bm); priv->store = store; priv->tree = GTK_WIDGET(tree); priv->page = scrollwin; 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:[1049] trunk/geany-plugins/addons/ChangeLog
by eht16＠users.sourceforge.net 01 Nov '09

01 Nov '09

Revision: 1049 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1049&view=rev Author: eht16 Date: 2009-11-01 17:13:08 +0000 (Sun, 01 Nov 2009) Log Message: ----------- Wrong filenames Modified Paths: -------------- trunk/geany-plugins/addons/ChangeLog Modified: trunk/geany-plugins/addons/ChangeLog =================================================================== --- trunk/geany-plugins/addons/ChangeLog 2009-11-01 17:11:23 UTC (rev 1048) +++ trunk/geany-plugins/addons/ChangeLog 2009-11-01 17:13:08 UTC (rev 1049) @@ -2,20 +2,20 @@ * src/addons.c: Fix setting up keybindings. - * src/bookmarklist.c: + * src/ao_bookmarklist.c: Improve handling of the notebook page (closes #2889415). 2009-10-26 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * src/addons.c, src/bookmarklist.c, src/bookmarklist.h: + * src/addons.c, src/ao_bookmarklist.c, src/ao_bookmarklist.h: Add an 'activate' keybinding. 2009-10-25 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * src/Makefile.am, src/addons.c, src/bookmarklist.c, - src/bookmarklist.h: + * src/Makefile.am, src/addons.c, src/ao_bookmarklist.c, + src/ao_bookmarklist.h: Add a simple bookmark list to the sidebar. 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:[1048] trunk/geany-plugins/addons
by eht16＠users.sourceforge.net 01 Nov '09

01 Nov '09

Revision: 1048 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1048&view=rev Author: eht16 Date: 2009-11-01 17:11:23 +0000 (Sun, 01 Nov 2009) Log Message: ----------- Improve handling of the notebook page (closes #2889415). Modified Paths: -------------- trunk/geany-plugins/addons/ChangeLog trunk/geany-plugins/addons/src/ao_bookmarklist.c Modified: trunk/geany-plugins/addons/ChangeLog =================================================================== --- trunk/geany-plugins/addons/ChangeLog 2009-11-01 16:56:22 UTC (rev 1047) +++ trunk/geany-plugins/addons/ChangeLog 2009-11-01 17:11:23 UTC (rev 1048) @@ -2,6 +2,8 @@ * src/addons.c: Fix setting up keybindings. + * src/bookmarklist.c: + Improve handling of the notebook page (closes #2889415). 2009-10-26 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/geany-plugins/addons/src/ao_bookmarklist.c =================================================================== --- trunk/geany-plugins/addons/src/ao_bookmarklist.c 2009-11-01 16:56:22 UTC (rev 1047) +++ trunk/geany-plugins/addons/src/ao_bookmarklist.c 2009-11-01 17:11:23 UTC (rev 1048) @@ -55,8 +55,7 @@ { gboolean enable_bookmarklist; - gint page_number; - + GtkWidget *page; GtkListStore *store; GtkWidget *tree; @@ -243,7 +242,11 @@ { AoBookmarkListPrivate *priv = AO_BOOKMARK_LIST_GET_PRIVATE(bm); - gtk_notebook_remove_page(GTK_NOTEBOOK(geany->main_widgets->sidebar_notebook), priv->page_number); + if (priv->page) + { + gtk_widget_destroy(priv->page); + priv->page = NULL; + } } @@ -301,13 +304,14 @@ gtk_container_add(GTK_CONTAINER(scrollwin), GTK_WIDGET(tree)); gtk_widget_show_all(scrollwin); - priv->page_number = gtk_notebook_append_page( + gtk_notebook_append_page( GTK_NOTEBOOK(geany->main_widgets->sidebar_notebook), scrollwin, gtk_label_new(_("Bookmarks"))); priv->store = store; priv->tree = GTK_WIDGET(tree); + priv->page = scrollwin; } @@ -317,8 +321,10 @@ if (priv->enable_bookmarklist) { - gtk_notebook_set_current_page( - GTK_NOTEBOOK(geany->main_widgets->sidebar_notebook), priv->page_number); + GtkNotebook *notebook = GTK_NOTEBOOK(geany->main_widgets->sidebar_notebook); + gint page_number = gtk_notebook_page_num(notebook, priv->page); + + gtk_notebook_set_current_page(notebook, page_number); gtk_widget_grab_focus(priv->tree); } } @@ -358,6 +364,9 @@ static void ao_bookmark_list_init(AoBookmarkList *self) { + AoBookmarkListPrivate *priv = AO_BOOKMARK_LIST_GET_PRIVATE(self); + + priv->page = NULL; } 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:[1047] trunk/geany-plugins/addons
by eht16＠users.sourceforge.net 01 Nov '09

01 Nov '09

Revision: 1047 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1047&view=rev Author: eht16 Date: 2009-11-01 16:56:22 +0000 (Sun, 01 Nov 2009) Log Message: ----------- Fix setting up keybindings. Modified Paths: -------------- trunk/geany-plugins/addons/ChangeLog trunk/geany-plugins/addons/src/addons.c Modified: trunk/geany-plugins/addons/ChangeLog =================================================================== --- trunk/geany-plugins/addons/ChangeLog 2009-10-30 12:34:41 UTC (rev 1046) +++ trunk/geany-plugins/addons/ChangeLog 2009-11-01 16:56:22 UTC (rev 1047) @@ -1,3 +1,9 @@ +2009-11-01 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/addons.c: + Fix setting up keybindings. + + 2009-10-26 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/addons.c, src/bookmarklist.c, src/bookmarklist.h: Modified: trunk/geany-plugins/addons/src/addons.c =================================================================== --- trunk/geany-plugins/addons/src/addons.c 2009-10-30 12:34:41 UTC (rev 1046) +++ trunk/geany-plugins/addons/src/addons.c 2009-11-01 16:56:22 UTC (rev 1047) @@ -49,7 +49,6 @@ KB_COUNT }; -PLUGIN_KEY_GROUP(addons, KB_COUNT) typedef struct @@ -143,6 +142,7 @@ void plugin_init(GeanyData *data) { GKeyFile *config = g_key_file_new(); + GeanyKeyGroup *key_group; ao_info = g_new0(AddonsInfo, 1); @@ -172,7 +172,8 @@ tasks_set_enable(ao_info->enable_tasks); /* setup keybindings */ - keybindings_set_item(plugin_key_group, KB_FOCUS_BOOKMARK_LIST, kb_bmlist_activate, + key_group = plugin_set_key_group(geany_plugin, "addons", KB_COUNT, NULL); + keybindings_set_item(key_group, KB_FOCUS_BOOKMARK_LIST, kb_bmlist_activate, 0, 0, "focus_bookmark_list", _("Focus Bookmark List"), NULL); } 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 November 2009