Plugins-Commits December 2014

plugins-commits@lists.geany.org

1 participants
26 discussions

[geany/geany-plugins] 09cef7: Fixed the wrong plugin name
by Dimitar Zhekov 31 Dec '14

31 Dec '14

Branch: refs/heads/master Author: Dimitar Zhekov <dimitar.zhekov(a)gmail.com> Committer: Dimitar Zhekov <dimitar.zhekov(a)gmail.com> Date: Wed, 31 Dec 2014 13:52:22 UTC Commit: 09cef70c550daf68175e5ac381fd0ad7d9172cc3 https://github.com/geany/geany-plugins/commit/09cef70c550daf68175e5ac381fd0… Log Message: ----------- Fixed the wrong plugin name Modified Paths: -------------- scope/README Modified: scope/README 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1,5 +1,5 @@ -Insert Numbers Plugin -===================== +Scope Plugin +============ About ----- -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 89aae7: projectorganizer: verify icon image availability in current theme
by Jiří Techet 29 Dec '14

29 Dec '14

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 29 Dec 2014 14:12:56 UTC Commit: 89aae7f6b7469fa9c39b72d22eb65417be96a23b https://github.com/geany/geany-plugins/commit/89aae7f6b7469fa9c39b72d22eb65… Log Message: ----------- projectorganizer: verify icon image availability in current theme GIcon doesn't try to load the icon bitmap, just represents the icon by MIME type. It may happen the MIME type is registered but the corresponding icon doesn't exist on the system (happens on OS X, Windows) in which canse the GIcon cannot be used. Modified Paths: -------------- projectorganizer/src/prjorg-sidebar.c Modified: projectorganizer/src/prjorg-sidebar.c 13 lines changed, 13 insertions(+), 0 deletions(-) =================================================================== @@ -922,6 +922,19 @@ static void create_branch(gint level, GSList *leaf_list, GtkTreeIter *parent, if (content_type) { icon = g_content_type_get_icon(content_type); + if (icon) + { + GtkIconInfo *icon_info; + + icon_info = gtk_icon_theme_lookup_by_gicon(gtk_icon_theme_get_default(), icon, 16, 0); + if (!icon_info) + { + g_object_unref(icon); + icon = NULL; + } + else + gtk_icon_info_free(icon_info); + } g_free(content_type); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 894b81: projectorganizer: use "folder" icon name instead of "gtk-directory"
by Jiří Techet 29 Dec '14

29 Dec '14

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 29 Dec 2014 14:07:25 UTC Commit: 894b81d5312b69a040773427b99b45db26d40f0c https://github.com/geany/geany-plugins/commit/894b81d5312b69a040773427b99b4… Log Message: ----------- projectorganizer: use "folder" icon name instead of "gtk-directory" This fixes missing folder icons in the sidebar on OS X (and hopefully Windows too). Modified Paths: -------------- projectorganizer/src/prjorg-sidebar.c Modified: projectorganizer/src/prjorg-sidebar.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -868,7 +868,7 @@ static void create_branch(gint level, GSList *leaf_list, GtkTreeIter *parent, GtkTreeIter iter; gchar **path_arr = dir_list->data; gchar *last_dir_name; - GIcon *icon_dir = g_icon_new_for_string("gtk-directory", NULL); + GIcon *icon_dir = g_icon_new_for_string("folder", NULL); last_dir_name = path_arr[level]; @@ -1042,7 +1042,7 @@ static void load_project(void) if (!prj_org || !geany_data->app->project) return; - icon_dir = g_icon_new_for_string("gtk-directory", NULL); + icon_dir = g_icon_new_for_string("folder", NULL); header_patterns = get_precompiled_patterns(prj_org->header_patterns); source_patterns = get_precompiled_patterns(prj_org->source_patterns); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] a35ac1: projectorganizer: Better color of external directories with dark themes
by Jiří Techet 19 Dec '14

19 Dec '14

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Fri, 19 Dec 2014 11:42:03 UTC Commit: a35ac165216176151228f9c76e247d69deefa42a https://github.com/geany/geany-plugins/commit/a35ac165216176151228f9c76e247… Log Message: ----------- projectorganizer: Better color of external directories with dark themes Wait with sidebar reload after sidebar is realized so we can get correct colors from the theme. Modified Paths: -------------- projectorganizer/src/prjorg-sidebar.c Modified: projectorganizer/src/prjorg-sidebar.c 62 lines changed, 40 insertions(+), 22 deletions(-) =================================================================== @@ -49,7 +49,9 @@ typedef enum MATCH_PATTERN } MatchType; -static GdkColor external_color; +static GdkColor s_external_color; +static GtkWidget *s_toolbar = NULL; +static gboolean s_pending_reload = FALSE; static GtkWidget *s_file_view_vbox = NULL; static GtkWidget *s_file_view = NULL; @@ -884,7 +886,7 @@ static void create_branch(gint level, GSList *leaf_list, GtkTreeIter *parent, FILEVIEW_COLUMN_ICON, icon_dir, FILEVIEW_COLUMN_NAME, last_dir_name, -1); if (!project) - gtk_tree_store_set(s_file_store, &iter, FILEVIEW_COLUMN_COLOR, &external_color, -1); + gtk_tree_store_set(s_file_store, &iter, FILEVIEW_COLUMN_COLOR, &s_external_color, -1); create_branch(level+1, tmp_list, &iter, header_patterns, source_patterns, project); @@ -901,7 +903,7 @@ static void create_branch(gint level, GSList *leaf_list, GtkTreeIter *parent, FILEVIEW_COLUMN_ICON, icon_dir, FILEVIEW_COLUMN_NAME, last_dir_name, -1); if (!project) - gtk_tree_store_set(s_file_store, &iter, FILEVIEW_COLUMN_COLOR, &external_color, -1); + gtk_tree_store_set(s_file_store, &iter, FILEVIEW_COLUMN_COLOR, &s_external_color, -1); create_branch(level+1, tmp_list, &iter, header_patterns, source_patterns, project); @@ -933,7 +935,7 @@ static void create_branch(gint level, GSList *leaf_list, GtkTreeIter *parent, FILEVIEW_COLUMN_ICON, icon, FILEVIEW_COLUMN_NAME, path_arr[level], -1); if (!project) - gtk_tree_store_set(s_file_store, &iter, FILEVIEW_COLUMN_COLOR, &external_color, -1); + gtk_tree_store_set(s_file_store, &iter, FILEVIEW_COLUMN_COLOR, &s_external_color, -1); } else if (patterns_match(source_patterns, path_arr[level])) { @@ -944,7 +946,7 @@ static void create_branch(gint level, GSList *leaf_list, GtkTreeIter *parent, FILEVIEW_COLUMN_ICON, icon, FILEVIEW_COLUMN_NAME, path_arr[level], -1); if (!project) - gtk_tree_store_set(s_file_store, &iter, FILEVIEW_COLUMN_COLOR, &external_color, -1); + gtk_tree_store_set(s_file_store, &iter, FILEVIEW_COLUMN_COLOR, &s_external_color, -1); } else { @@ -955,7 +957,7 @@ static void create_branch(gint level, GSList *leaf_list, GtkTreeIter *parent, FILEVIEW_COLUMN_ICON, icon, FILEVIEW_COLUMN_NAME, path_arr[level], -1); if (!project) - gtk_tree_store_set(s_file_store, &iter, FILEVIEW_COLUMN_COLOR, &external_color, -1); + gtk_tree_store_set(s_file_store, &iter, FILEVIEW_COLUMN_COLOR, &s_external_color, -1); } if (icon) @@ -1045,6 +1047,9 @@ static void load_project(void) header_patterns = get_precompiled_patterns(prj_org->header_patterns); source_patterns = get_precompiled_patterns(prj_org->source_patterns); + /* reload on every refresh to update the color e.g. when the theme changes */ + s_external_color = gtk_widget_get_style(s_toolbar)->bg[GTK_STATE_NORMAL]; + foreach_slist (elem, prj_org->roots) { PrjOrgRoot *root = elem->data; @@ -1060,7 +1065,7 @@ static void load_project(void) FILEVIEW_COLUMN_ICON, icon_dir, FILEVIEW_COLUMN_NAME, name, -1); if (!first) - gtk_tree_store_set(s_file_store, &iter, FILEVIEW_COLUMN_COLOR, &external_color, -1); + gtk_tree_store_set(s_file_store, &iter, FILEVIEW_COLUMN_COLOR, &s_external_color, -1); load_project_root(root, &iter, header_patterns, source_patterns, first); @@ -1175,7 +1180,14 @@ static gboolean follow_editor_on_idle(gpointer foo) void prjorg_sidebar_update(gboolean reload) { if (reload) - load_project(); + { + /* we get color information only after the sidebar is realized - + * postpone reload if this is not the case yet */ + if (gtk_widget_get_realized(s_toolbar)) + load_project(); + else + s_pending_reload = TRUE; + } if (s_follow_editor) /* perform on idle - avoids unnecessary jumps on project load */ plugin_idle_add(geany_plugin, (GSourceFunc)follow_editor_on_idle, NULL); @@ -1194,9 +1206,15 @@ void prjorg_sidebar_find_tag_in_active(void) } +static void sidebar_realized_cb (GtkWidget *widget) { + if (s_pending_reload) + prjorg_sidebar_update(TRUE); +} + + void prjorg_sidebar_init(void) { - GtkWidget *scrollwin, *toolbar, *item, *image; + GtkWidget *scrollwin, *item, *image; GtkCellRenderer *renderer; GtkTreeViewColumn *column; GtkTreeSelection *sel; @@ -1207,57 +1225,57 @@ void prjorg_sidebar_init(void) /**** toolbar ****/ - toolbar = gtk_toolbar_new(); - gtk_toolbar_set_icon_size(GTK_TOOLBAR(toolbar), GTK_ICON_SIZE_MENU); - gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS); + s_toolbar = gtk_toolbar_new(); + gtk_toolbar_set_icon_size(GTK_TOOLBAR(s_toolbar), GTK_ICON_SIZE_MENU); + gtk_toolbar_set_style(GTK_TOOLBAR(s_toolbar), GTK_TOOLBAR_ICONS); - external_color = gtk_widget_get_style(toolbar)->bg[GTK_STATE_NORMAL]; + g_signal_connect (s_toolbar, "realize", G_CALLBACK (sidebar_realized_cb), NULL); item = GTK_WIDGET(gtk_tool_button_new(NULL, NULL)); gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON(item), "prjorg-refresh"); ui_widget_set_tooltip_text(item, _("Reload all")); g_signal_connect(item, "clicked", G_CALLBACK(on_reload_project), NULL); - gtk_container_add(GTK_CONTAINER(toolbar), item); + gtk_container_add(GTK_CONTAINER(s_toolbar), item); item = GTK_WIDGET(gtk_separator_tool_item_new()); - gtk_container_add(GTK_CONTAINER(toolbar), item); + gtk_container_add(GTK_CONTAINER(s_toolbar), item); item = GTK_WIDGET(gtk_tool_button_new(NULL, NULL)); gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON(item), "prjorg-add-external"); ui_widget_set_tooltip_text(item, _("Add external directory")); g_signal_connect(item, "clicked", G_CALLBACK(on_add_external), NULL); - gtk_container_add(GTK_CONTAINER(toolbar), item); + gtk_container_add(GTK_CONTAINER(s_toolbar), item); s_project_toolbar.add = item; item = GTK_WIDGET(gtk_separator_tool_item_new()); - gtk_container_add(GTK_CONTAINER(toolbar), item); + gtk_container_add(GTK_CONTAINER(s_toolbar), item); item = GTK_WIDGET(gtk_tool_button_new(NULL, NULL)); gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON(item), "prjorg-expand"); ui_widget_set_tooltip_text(item, _("Expand all")); g_signal_connect(item, "clicked", G_CALLBACK(on_expand_all), NULL); - gtk_container_add(GTK_CONTAINER(toolbar), item); + gtk_container_add(GTK_CONTAINER(s_toolbar), item); s_project_toolbar.expand = item; item = GTK_WIDGET(gtk_tool_button_new(NULL, NULL)); gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON(item), "prjorg-collapse"); ui_widget_set_tooltip_text(item, _("Collapse to project root")); g_signal_connect(item, "clicked", G_CALLBACK(on_collapse_all), NULL); - gtk_container_add(GTK_CONTAINER(toolbar), item); + gtk_container_add(GTK_CONTAINER(s_toolbar), item); s_project_toolbar.collapse = item; item = GTK_WIDGET(gtk_separator_tool_item_new()); - gtk_container_add(GTK_CONTAINER(toolbar), item); + gtk_container_add(GTK_CONTAINER(s_toolbar), item); item = GTK_WIDGET(gtk_toggle_tool_button_new()); gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(item), TRUE); gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON(item), "prjorg-follow"); ui_widget_set_tooltip_text(item, _("Follow active editor")); g_signal_connect(item, "clicked", G_CALLBACK(on_follow_active), NULL); - gtk_container_add(GTK_CONTAINER(toolbar), item); + gtk_container_add(GTK_CONTAINER(s_toolbar), item); s_project_toolbar.follow = item; - gtk_box_pack_start(GTK_BOX(s_file_view_vbox), toolbar, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(s_file_view_vbox), s_toolbar, FALSE, FALSE, 0); /**** tree view ****/ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 38bb32: Merge pull request #179 from wip/webhelper
by Colomban Wendling 19 Dec '14

19 Dec '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 18 Dec 2014 22:19:09 UTC Commit: 38bb329fb3584e783564411e50e3a1e91e02b5f9 https://github.com/geany/geany-plugins/commit/38bb329fb3584e783564411e50e3a… Log Message: ----------- Merge pull request #179 from wip/webhelper webhelper: Add support for basic bookmarks Modified Paths: -------------- webhelper/README webhelper/src/gwh-browser.c webhelper/src/gwh-browser.h webhelper/src/gwh-keybindings.h webhelper/src/gwh-plugin.c webhelper/src/gwh-settings.c Modified: webhelper/README 13 lines changed, 12 insertions(+), 1 deletions(-) =================================================================== @@ -19,7 +19,8 @@ Prominent features * Possible automatic reloading of the web view upon document saving; * A web inspector/debugging tool for the web view's content (including a JavaScript console, a viewer and editor of processed HTML and CSS, a network - usage analysis tool and many more, thanks to WebKit). + usage analysis tool and many more, thanks to WebKit); +* Basic bookmarks for quicker access to frequently used URL. Requirements @@ -46,6 +47,16 @@ When loaded into Geany, this plugins adds a web view in the message window (the default), the sidebar or in a separate window. You can find most of the features from this view. +Bookmarks +--------- + +To add a bookmark, you can click on the website's icon next to its URL and +check the "Bookmark this website" item. You can alternatively use the +configurable keybinding to toggle the bookmark for the current URL. + +Bookmarks are displayed in the drop-down menu of the URL bar, sorted +alphabetically by domain. + License ======= Modified: webhelper/src/gwh-browser.c 294 lines changed, 288 insertions(+), 6 deletions(-) =================================================================== @@ -22,6 +22,8 @@ #include "config.h" #include <stdio.h> +#include <stdlib.h> +#include <string.h> #include <glib.h> #include <glib/gi18n-lib.h> #include <gtk/gtk.h> @@ -49,6 +51,28 @@ (GTK_WIDGET_MAPPED ((w))) # endif /* defined (gtk_widget_get_mapped) */ #endif /* GTK_CHECK_VERSION (2, 20, 0) */ +#if ! GTK_CHECK_VERSION (2, 24, 0) +# define GtkComboBoxText GtkComboBox +# define GTK_COMBO_BOX_TEXT GTK_COMBO_BOX +# define GTK_IS_COMBO_BOX_TEXT GTK_IS_COMBO_BOX +# define gtk_combo_box_text_new_with_entry gtk_combo_box_entry_new_text +# define gtk_combo_box_get_entry_text_column(c) \ + (gtk_combo_box_entry_get_text_column (GTK_COMBO_BOX_ENTRY (c))) +# define gtk_combo_box_text_append_text gtk_combo_box_append_text +#endif /* GTK_CHECK_VERSION (2, 24, 0) */ +#if ! GTK_CHECK_VERSION (3, 0, 0) +static void +combo_box_text_remove_all (GtkComboBoxText *combo_box) +{ + GtkListStore *store; + + g_return_if_fail (GTK_IS_COMBO_BOX_TEXT (combo_box)); + + store = GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (combo_box))); + gtk_list_store_clear (store); +} +# define gtk_combo_box_text_remove_all combo_box_text_remove_all +#endif /* GTK_CHECK_VERSION (3, 0, 0) */ #if GTK_CHECK_VERSION (3, 0, 0) /* alias GtkObject, we implement the :destroy signal */ # define GtkObject GtkWidget @@ -76,6 +100,7 @@ struct _GwhBrowserPrivate GtkWidget *inspector_web_view; GtkWidget *url_entry; + GtkWidget *url_combo; GtkToolItem *item_prev; GtkToolItem *item_next; GtkToolItem *item_cancel; @@ -174,6 +199,28 @@ on_settings_browser_last_uri_notify (GObject *object, } static void +on_settings_browser_bookmarks_notify (GObject *object, + GParamSpec *pspec, + GwhBrowser *self) +{ + gchar **bookmarks; + + g_return_if_fail (GWH_IS_BROWSER (self)); + + gtk_combo_box_text_remove_all (GTK_COMBO_BOX_TEXT (self->priv->url_combo)); + bookmarks = gwh_browser_get_bookmarks (self); + if (bookmarks) { + gchar **p; + + for (p = bookmarks; *p; p++) { + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (self->priv->url_combo), + *p); + } + g_strfreev (bookmarks); + } +} + +static void on_settings_browser_orientation_notify (GObject *object, GParamSpec *pspec, GwhBrowser *self) @@ -393,6 +440,72 @@ on_url_entry_activate (GtkEntry *entry, } static void +on_url_combo_active_notify (GtkComboBox *combo, + GParamSpec *pspec, + GwhBrowser *self) +{ + if (gtk_combo_box_get_active (combo) != -1) { + const gchar *uri = gtk_entry_get_text (GTK_ENTRY (self->priv->url_entry)); + + gwh_browser_set_uri (self, uri); + } +} + +static void +on_item_bookmark_toggled (GtkCheckMenuItem *item, + GwhBrowser *self) +{ + if (gtk_check_menu_item_get_active (item)) { + gwh_browser_add_bookmark (self, gwh_browser_get_uri (self)); + } else { + gwh_browser_remove_bookmark (self, gwh_browser_get_uri (self)); + } +} + +static void +on_url_entry_icon_press (GtkEntry *entry, + GtkEntryIconPosition icon_pos, + GdkEventButton *event, + GwhBrowser *self) +{ + if (icon_pos == GTK_ENTRY_ICON_PRIMARY) { + GtkWidget *menu = gtk_menu_new (); + GtkWidget *item; + const gchar *uri = gwh_browser_get_uri (self); + + item = gtk_check_menu_item_new_with_mnemonic (_("Bookmark this website")); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), + gwh_browser_has_bookmark (self, uri)); + g_signal_connect (item, "toggled", + G_CALLBACK (on_item_bookmark_toggled), self); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + gtk_widget_show (item); + + gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, + event->button, event->time); + } +} + +static gboolean +on_entry_completion_match_selected (GtkEntryCompletion *comp, + GtkTreeModel *model, + GtkTreeIter *iter, + GwhBrowser *self) +{ + gint column = gtk_entry_completion_get_text_column (comp); + gchar *row; + + gtk_tree_model_get (model, iter, column, &row, -1); + /* set the entry value too in the unlikely case the selected URI is the + * currently viewed one, in which case set_uri() won't change it */ + gtk_entry_set_text (GTK_ENTRY (self->priv->url_entry), row); + gwh_browser_set_uri (self, row); + g_free (row); + + return TRUE; +} + +static void update_history (GwhBrowser *self) { WebKitWebView *web_view = WEBKIT_WEB_VIEW (self->priv->web_view); @@ -671,6 +784,7 @@ gwh_browser_constructed (GObject *object) /* a bit ugly, fake notifications */ g_object_notify (G_OBJECT (self->priv->settings), "browser-last-uri"); + g_object_notify (G_OBJECT (self->priv->settings), "browser-bookmarks"); g_object_notify (G_OBJECT (self->priv->settings), "browser-orientation"); g_object_notify (G_OBJECT (self->priv->settings), "inspector-window-geometry"); } @@ -799,11 +913,35 @@ gwh_browser_class_init (GwhBrowserClass *klass) g_type_class_add_private (klass, sizeof (GwhBrowserPrivate)); } +/* a GtkEntryCompletionMatchFunc matching anywhere in the haystack */ +static gboolean +url_completion_match_func (GtkEntryCompletion *comp, + const gchar *key, + GtkTreeIter *iter, + gpointer dummy) +{ + GtkTreeModel *model = gtk_entry_completion_get_model (comp); + gint column = gtk_entry_completion_get_text_column (comp); + gchar *row = NULL; + gboolean match = FALSE; + + gtk_tree_model_get (model, iter, column, &row, -1); + if (row) { + SETPTR (row, g_utf8_normalize (row, -1, G_NORMALIZE_DEFAULT)); + SETPTR (row, g_utf8_casefold (row, -1)); + match = strstr (row, key) != NULL; + g_free (row); + } + + return match; +} + static GtkWidget * create_toolbar (GwhBrowser *self) { - GtkWidget *toolbar; - GtkToolItem *item; + GtkWidget *toolbar; + GtkToolItem *item; + GtkEntryCompletion *comp; toolbar = g_object_new (GTK_TYPE_TOOLBAR, "icon-size", GTK_ICON_SIZE_MENU, @@ -827,14 +965,26 @@ create_toolbar (GwhBrowser *self) gtk_toolbar_insert (GTK_TOOLBAR (toolbar), self->priv->item_reload, -1); gtk_widget_show (GTK_WIDGET (self->priv->item_reload)); - self->priv->url_entry = gtk_entry_new (); + self->priv->url_combo = gtk_combo_box_text_new_with_entry (); item = gtk_tool_item_new (); gtk_tool_item_set_is_important (item, TRUE); - gtk_container_add (GTK_CONTAINER (item), self->priv->url_entry); + gtk_container_add (GTK_CONTAINER (item), self->priv->url_combo); gtk_tool_item_set_expand (item, TRUE); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); gtk_widget_show_all (GTK_WIDGET (item)); + self->priv->url_entry = gtk_bin_get_child (GTK_BIN (self->priv->url_combo)); + set_location_icon (self, NULL); + gtk_entry_set_icon_tooltip_text (GTK_ENTRY (self->priv->url_entry), + GTK_ENTRY_ICON_PRIMARY, + _("Website information and settings")); + + comp = gtk_entry_completion_new (); + gtk_entry_completion_set_model (comp, gtk_combo_box_get_model (GTK_COMBO_BOX (self->priv->url_combo))); + gtk_entry_completion_set_text_column (comp, gtk_combo_box_get_entry_text_column (GTK_COMBO_BOX (self->priv->url_combo))); + gtk_entry_completion_set_match_func (comp, url_completion_match_func, NULL, NULL); + gtk_entry_set_completion (GTK_ENTRY (self->priv->url_entry), comp); + self->priv->item_inspector = gtk_toggle_tool_button_new_from_stock (GTK_STOCK_INFO); gtk_tool_button_set_label (GTK_TOOL_BUTTON (self->priv->item_inspector), _("Web inspector")); gtk_tool_item_set_tooltip_text (self->priv->item_inspector, _("Toggle web inspector")); @@ -845,8 +995,6 @@ create_toolbar (GwhBrowser *self) gtk_widget_set_sensitive (GTK_WIDGET (self->priv->item_next), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (self->priv->item_cancel), FALSE); - set_location_icon (self, NULL); - g_signal_connect_swapped (G_OBJECT (self->priv->item_prev), "clicked", G_CALLBACK (webkit_web_view_go_back), self->priv->web_view); @@ -863,6 +1011,12 @@ create_toolbar (GwhBrowser *self) G_CALLBACK (on_item_inspector_toggled), self); g_signal_connect (G_OBJECT (self->priv->url_entry), "activate", G_CALLBACK (on_url_entry_activate), self); + g_signal_connect (G_OBJECT (self->priv->url_entry), "icon-press", + G_CALLBACK (on_url_entry_icon_press), self); + g_signal_connect (G_OBJECT (self->priv->url_combo), "notify::active", + G_CALLBACK (on_url_combo_active_notify), self); + g_signal_connect (G_OBJECT (comp), "match-selected", + G_CALLBACK (on_entry_completion_match_selected), self); return toolbar; } @@ -1059,6 +1213,8 @@ gwh_browser_init (GwhBrowser *self) g_signal_connect (self->priv->settings, "notify::browser-last-uri", G_CALLBACK (on_settings_browser_last_uri_notify), self); + g_signal_connect (self->priv->settings, "notify::browser-bookmarks", + G_CALLBACK (on_settings_browser_bookmarks_notify), self); g_signal_connect (self->priv->settings, "notify::browser-orientation", G_CALLBACK (on_settings_browser_orientation_notify), self); g_signal_connect (self->priv->settings, "notify::inspector-detached", @@ -1161,3 +1317,129 @@ gwh_browser_toggle_inspector (GwhBrowser *self) inspector_set_visible (self, ! INSPECTOR_VISIBLE (self)); } + +gchar ** +gwh_browser_get_bookmarks (GwhBrowser *self) +{ + gchar **bookmarks = NULL; + + g_return_val_if_fail (GWH_IS_BROWSER (self), NULL); + + g_object_get (self->priv->settings, "browser-bookmarks", &bookmarks, NULL); + + return bookmarks; +} + +static void +gwh_browser_set_bookmarks (GwhBrowser *self, + gchar **bookmarks) +{ + g_object_set (self->priv->settings, "browser-bookmarks", bookmarks, NULL); +} + +static gint +strv_index (gchar **strv, + const gchar *str) +{ + g_return_val_if_fail (str != NULL, -1); + + if (strv) { + gint idx; + + for (idx = 0; *strv; strv++, idx++) { + if (strcmp (str, *strv) == 0) { + return idx; + } + } + } + + return -1; +} + +gboolean +gwh_browser_has_bookmark (GwhBrowser *self, + const gchar *uri) +{ + gchar **bookmarks = NULL; + gboolean exists = FALSE; + + g_return_val_if_fail (GWH_IS_BROWSER (self), FALSE); + g_return_val_if_fail (uri != NULL, FALSE); + + bookmarks = gwh_browser_get_bookmarks (self); + exists = strv_index (bookmarks, uri) >= 0; + g_strfreev (bookmarks); + + return exists; +} + +static const gchar * +uri_skip_scheme (const gchar *uri) +{ + if (g_ascii_isalpha (*uri)) { + do { + uri++; + } while (*uri == '+' || *uri == '-' || *uri == '.' || + g_ascii_isalnum (*uri)); + /* this is not strictly correct but good enough for what we do */ + while (*uri == ':' || *uri == '/') + uri++; + } + + return uri; +} + +static int +sort_uris (gconstpointer a, + gconstpointer b) +{ + const gchar *uri1 = uri_skip_scheme (*(const gchar *const *) a); + const gchar *uri2 = uri_skip_scheme (*(const gchar *const *) b); + + return g_ascii_strcasecmp (uri1, uri2); +} + +void +gwh_browser_add_bookmark (GwhBrowser *self, + const gchar *uri) +{ + gchar **bookmarks = NULL; + + g_return_if_fail (GWH_IS_BROWSER (self)); + g_return_if_fail (uri != NULL); + + bookmarks = gwh_browser_get_bookmarks (self); + if (strv_index (bookmarks, uri) < 0) { + gsize length = bookmarks ? g_strv_length (bookmarks) : 0; + + bookmarks = g_realloc (bookmarks, (length + 2) * sizeof *bookmarks); + bookmarks[length] = g_strdup (uri); + bookmarks[length + 1] = NULL; + /* it would be faster to insert directly at the right place but who cares */ + qsort (bookmarks, length + 1, sizeof *bookmarks, sort_uris); + gwh_browser_set_bookmarks (self, bookmarks); + } + g_strfreev (bookmarks); +} + +void +gwh_browser_remove_bookmark (GwhBrowser *self, + const gchar *uri) +{ + gchar **bookmarks = NULL; + gint idx; + + g_return_if_fail (GWH_IS_BROWSER (self)); + g_return_if_fail (uri != NULL); + + bookmarks = gwh_browser_get_bookmarks (self); + idx = strv_index (bookmarks, uri); + if (idx >= 0) { + gsize length = g_strv_length (bookmarks); + + memmove (&bookmarks[idx], &bookmarks[idx + 1], + (length - (gsize) idx) * sizeof *bookmarks); + gwh_browser_set_bookmarks (self, bookmarks); + } + g_strfreev (bookmarks); +} Modified: webhelper/src/gwh-browser.h 11 lines changed, 11 insertions(+), 0 deletions(-) =================================================================== @@ -83,6 +83,17 @@ G_GNUC_INTERNAL GtkWindow *gwh_browser_get_inspector_transient_for (GwhBrowser *self); G_GNUC_INTERNAL void gwh_browser_toggle_inspector (GwhBrowser *self); +G_GNUC_INTERNAL +gchar **gwh_browser_get_bookmarks (GwhBrowser *self); +G_GNUC_INTERNAL +gboolean gwh_browser_has_bookmark (GwhBrowser *self, + const gchar *uri); +G_GNUC_INTERNAL +void gwh_browser_add_bookmark (GwhBrowser *self, + const gchar *uri); +G_GNUC_INTERNAL +void gwh_browser_remove_bookmark (GwhBrowser *self, + const gchar *uri); G_END_DECLS Modified: webhelper/src/gwh-keybindings.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -32,6 +32,7 @@ G_BEGIN_DECLS enum { GWH_KB_TOGGLE_INSPECTOR, GWH_KB_SHOW_HIDE_SEPARATE_WINDOW, + GWH_KB_TOGGLE_BOOKMARK, GWH_KB_COUNT }; Modified: webhelper/src/gwh-plugin.c 21 lines changed, 21 insertions(+), 0 deletions(-) =================================================================== @@ -284,6 +284,18 @@ on_kb_show_hide_separate_window (guint key_id) } } +static void +on_kb_toggle_bookmark (guint key_id) +{ + const gchar *uri = gwh_browser_get_uri (GWH_BROWSER (G_browser)); + + if (gwh_browser_has_bookmark (GWH_BROWSER (G_browser), uri)) { + gwh_browser_remove_bookmark (GWH_BROWSER (G_browser), uri); + } else { + gwh_browser_add_bookmark (GWH_BROWSER (G_browser), uri); + } +} + static gchar * get_config_filename (void) @@ -312,6 +324,12 @@ load_config (void) _("Last URI visited by the browser"), "about:blank", G_PARAM_READWRITE)); + gwh_settings_install_property (G_settings, g_param_spec_boxed ( + "browser-bookmarks", + _("Bookmarks"), + _("List of bookmarks"), + G_TYPE_STRV, + G_PARAM_READWRITE)); gwh_settings_install_property (G_settings, g_param_spec_enum ( "browser-orientation", _("Browser orientation"), @@ -441,6 +459,9 @@ plugin_init (GeanyData *data) on_kb_show_hide_separate_window, 0, 0, "show_hide_separate_window", _("Show/Hide Web View's Window"), NULL); + keybindings_set_item (gwh_keybindings_get_group (), GWH_KB_TOGGLE_BOOKMARK, + on_kb_toggle_bookmark, 0, 0, "toggle_bookmark", + _("Toggle bookmark for the current website"), NULL); } void Modified: webhelper/src/gwh-settings.c 22 lines changed, 22 insertions(+), 0 deletions(-) =================================================================== @@ -291,6 +291,16 @@ key_file_set_value (GKeyFile *kf, g_key_file_set_string (kf, group, key, g_value_get_string (value)); break; + case G_TYPE_BOXED: + if (G_VALUE_HOLDS (value, G_TYPE_STRV)) { + gchar **val = g_value_get_boxed (value); + + g_key_file_set_string_list (kf, group, key, (const gchar *const *) val, + val ? g_strv_length (val) : 0); + break; + } + /* fallthrough */ + default: g_set_error (error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_INVALID_VALUE, "Unsupported setting type \"%s\" for setting \"%s::%s\"", @@ -411,6 +421,18 @@ key_file_get_value (GKeyFile *kf, break; } + case G_TYPE_BOXED: + if (G_VALUE_HOLDS (value, G_TYPE_STRV)) { + gchar **val; + + val = g_key_file_get_string_list (kf, group, key, NULL, &err); + if (! err) { + g_value_take_boxed (value, val); + } + break; + } + /* fallthrough */ + default: g_set_error (&err, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_INVALID_VALUE, "Unsupported setting type \"%s\" for setting \"%s::%s\"", -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] a649d2: projectorganizer: Rename variables/functions/types referring to the previous plugin name
by Jiří Techet 18 Dec '14

18 Dec '14

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 18 Dec 2014 16:26:11 UTC Commit: a649d2d92869d72c2f4ff447beb9b10ad74f8bf3 https://github.com/geany/geany-plugins/commit/a649d2d92869d72c2f4ff447beb9b… Log Message: ----------- projectorganizer: Rename variables/functions/types referring to the previous plugin name Modified Paths: -------------- projectorganizer/src/prjorg-main.c projectorganizer/src/prjorg-menu.c projectorganizer/src/prjorg-menu.h projectorganizer/src/prjorg-project.c projectorganizer/src/prjorg-project.h projectorganizer/src/prjorg-sidebar.c projectorganizer/src/prjorg-sidebar.h Modified: projectorganizer/src/prjorg-main.c 66 lines changed, 33 insertions(+), 33 deletions(-) =================================================================== @@ -48,17 +48,17 @@ static void on_doc_open(G_GNUC_UNUSED GObject * obj, G_GNUC_UNUSED GeanyDocument { g_return_if_fail(doc != NULL && doc->file_name != NULL); - if (gprj_project_is_in_project(doc->file_name)) - gprj_project_remove_single_tm_file(doc->file_name); + if (prjorg_project_is_in_project(doc->file_name)) + prjorg_project_remove_single_tm_file(doc->file_name); - gprj_sidebar_update(FALSE); + prjorg_sidebar_update(FALSE); } static void on_doc_activate(G_GNUC_UNUSED GObject * obj, G_GNUC_UNUSED GeanyDocument * doc, G_GNUC_UNUSED gpointer user_data) { - gprj_sidebar_update(FALSE); + prjorg_sidebar_update(FALSE); } @@ -72,10 +72,10 @@ static void on_doc_close(G_GNUC_UNUSED GObject * obj, GeanyDocument * doc, /* tags of open files managed by geany - when the file gets closed, * we should take care of it */ - if (gprj_project_is_in_project(doc->file_name)) - gprj_project_add_single_tm_file(doc->file_name); + if (prjorg_project_is_in_project(doc->file_name)) + prjorg_project_add_single_tm_file(doc->file_name); - gprj_sidebar_update(FALSE); + prjorg_sidebar_update(FALSE); } @@ -85,7 +85,7 @@ static void on_build_start(GObject *obj, gpointer user_data) foreach_document(i) { - if (gprj_project_is_in_project(documents[i]->file_name)) + if (prjorg_project_is_in_project(documents[i]->file_name)) document_save_file(documents[i], FALSE); } } @@ -94,18 +94,18 @@ static void on_build_start(GObject *obj, gpointer user_data) static void on_project_dialog_open(G_GNUC_UNUSED GObject * obj, GtkWidget * notebook, G_GNUC_UNUSED gpointer user_data) { - if (g_prj && page_index == -1) - page_index = gprj_project_add_properties_tab(notebook); + if (prj_org && page_index == -1) + page_index = prjorg_project_add_properties_tab(notebook); } static void on_project_dialog_confirmed(G_GNUC_UNUSED GObject * obj, GtkWidget * notebook, G_GNUC_UNUSED gpointer user_data) { - if (g_prj) + if (prj_org) { - gprj_project_read_properties_tab(); - gprj_sidebar_update(TRUE); + prjorg_project_read_properties_tab(); + prjorg_sidebar_update(TRUE); } } @@ -124,36 +124,36 @@ static void on_project_dialog_close(G_GNUC_UNUSED GObject * obj, GtkWidget * not static void on_project_open(G_GNUC_UNUSED GObject * obj, GKeyFile * config, G_GNUC_UNUSED gpointer user_data) { - gprj_project_open(config); - gprj_sidebar_update(TRUE); - gprj_sidebar_activate(TRUE); - gprj_menu_activate_menu_items(TRUE); + prjorg_project_open(config); + prjorg_sidebar_update(TRUE); + prjorg_sidebar_activate(TRUE); + prjorg_menu_activate_menu_items(TRUE); } static void on_project_close(G_GNUC_UNUSED GObject * obj, G_GNUC_UNUSED gpointer user_data) { - gprj_project_close(); - gprj_sidebar_update(TRUE); - gprj_sidebar_activate(FALSE); - gprj_menu_activate_menu_items(FALSE); + prjorg_project_close(); + prjorg_sidebar_update(TRUE); + prjorg_sidebar_activate(FALSE); + prjorg_menu_activate_menu_items(FALSE); } static void on_project_save(G_GNUC_UNUSED GObject * obj, GKeyFile * config, G_GNUC_UNUSED gpointer user_data) { - if (!g_prj) + if (!prj_org) { /* happens when the project is created */ - gprj_project_open(config); - gprj_sidebar_update(TRUE); - gprj_sidebar_activate(TRUE); - gprj_menu_activate_menu_items(TRUE); + prjorg_project_open(config); + prjorg_sidebar_update(TRUE); + prjorg_sidebar_activate(TRUE); + prjorg_menu_activate_menu_items(TRUE); } - gprj_project_save(config); + prjorg_project_save(config); } @@ -174,8 +174,8 @@ PluginCallback plugin_callbacks[] = { void plugin_init(G_GNUC_UNUSED GeanyData * data) { - gprj_menu_init(); - gprj_sidebar_init(); + prjorg_menu_init(); + prjorg_sidebar_init(); } @@ -183,12 +183,12 @@ void plugin_cleanup(void) { if (geany_data->app->project) { - gprj_project_close(); - gprj_sidebar_update(TRUE); + prjorg_project_close(); + prjorg_sidebar_update(TRUE); } - gprj_menu_cleanup(); - gprj_sidebar_cleanup(); + prjorg_menu_cleanup(); + prjorg_sidebar_cleanup(); } Modified: projectorganizer/src/prjorg-menu.c 30 lines changed, 15 insertions(+), 15 deletions(-) =================================================================== @@ -70,7 +70,7 @@ static gboolean try_swap_header_source(gchar *file_name, gboolean is_header, GSL base_name = g_path_get_basename(full_name); if (g_pattern_match_string(pattern, base_name) && - gprj_project_is_in_project(full_name)) + prjorg_project_is_in_project(full_name)) { if ((is_header && patterns_match(source_patterns, base_name)) || (!is_header && patterns_match(header_patterns, base_name))) @@ -97,11 +97,11 @@ static void on_swap_header_source(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_U gchar *doc_basename; doc = document_get_current(); - if (!g_prj || !geany_data->app->project || !doc || !doc->file_name) + if (!prj_org || !geany_data->app->project || !doc || !doc->file_name) return; - header_patterns = get_precompiled_patterns(g_prj->header_patterns); - source_patterns = get_precompiled_patterns(g_prj->source_patterns); + header_patterns = get_precompiled_patterns(prj_org->header_patterns); + source_patterns = get_precompiled_patterns(prj_org->source_patterns); doc_basename = g_path_get_basename(doc->file_name); @@ -123,7 +123,7 @@ static void on_swap_header_source(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_U gchar *filename; filename = document_index(i)->file_name; - if (gprj_project_is_in_project(filename)) + if (prjorg_project_is_in_project(filename)) list = g_slist_prepend(list, filename); } swapped = try_swap_header_source(doc->file_name, is_header, list, header_patterns, source_patterns); @@ -155,11 +155,11 @@ static void on_swap_header_source(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_U if (!swapped) { - foreach_slist(elem, g_prj->roots) + foreach_slist(elem, prj_org->roots) { GHashTableIter iter; gpointer key, value; - GPrjRoot *root = elem->data; + PrjOrgRoot *root = elem->data; list = NULL; g_hash_table_iter_init(&iter, root->file_table); @@ -192,14 +192,14 @@ static void on_find_in_project(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUS static void on_find_file(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer user_data) { if (geany_data->app->project) - gprj_sidebar_find_file_in_active(); + prjorg_sidebar_find_file_in_active(); } static void on_find_tag(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer user_data) { if (geany_data->app->project) - gprj_sidebar_find_tag_in_active(); + prjorg_sidebar_find_tag_in_active(); } @@ -291,9 +291,9 @@ static void on_open_selected_file(GtkMenuItem *menuitem, gpointer user_data) GSList *elem; gchar *found_path = NULL; - foreach_slist (elem, g_prj->roots) + foreach_slist (elem, prj_org->roots) { - GPrjRoot *root = elem->data; + PrjOrgRoot *root = elem->data; gpointer key, value; GHashTableIter iter; @@ -358,7 +358,7 @@ static void on_open_selected_file(GtkMenuItem *menuitem, gpointer user_data) } -void gprj_menu_init(void) +void prjorg_menu_init(void) { GtkWidget *image; GeanyKeyGroup *key_group = plugin_set_key_group(geany_plugin, "ProjectOrganizer", KB_COUNT, kb_callback); @@ -413,11 +413,11 @@ void gprj_menu_init(void) gtk_menu_shell_prepend(GTK_MENU_SHELL(geany->main_widgets->editor_menu), s_context_osf_item); g_signal_connect((gpointer) s_context_osf_item, "activate", G_CALLBACK(on_open_selected_file), NULL); - gprj_menu_activate_menu_items(FALSE); + prjorg_menu_activate_menu_items(FALSE); } -void gprj_menu_activate_menu_items(gboolean activate) +void prjorg_menu_activate_menu_items(gboolean activate) { gtk_widget_set_sensitive(s_context_osf_item, activate); gtk_widget_set_sensitive(s_shs_item, activate); @@ -427,7 +427,7 @@ void gprj_menu_activate_menu_items(gboolean activate) } -void gprj_menu_cleanup(void) +void prjorg_menu_cleanup(void) { gtk_widget_destroy(s_fif_item); gtk_widget_destroy(s_ff_item); Modified: projectorganizer/src/prjorg-menu.h 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -19,8 +19,8 @@ #ifndef __PRJORG_MENU_H__ #define __PRJORG_MENU_H__ -void gprj_menu_init(void); -void gprj_menu_activate_menu_items(gboolean activate); -void gprj_menu_cleanup(void); +void prjorg_menu_init(void); +void prjorg_menu_activate_menu_items(gboolean activate); +void prjorg_menu_cleanup(void); #endif Modified: projectorganizer/src/prjorg-project.c 184 lines changed, 92 insertions(+), 92 deletions(-) =================================================================== @@ -41,7 +41,7 @@ typedef struct GtkWidget *generate_tag_prefs; } PropertyDialogElements; -GPrj *g_prj = NULL; +PrjOrg *prj_org = NULL; static PropertyDialogElements *e; @@ -120,7 +120,7 @@ static GSList *get_file_list(const gchar * path, GSList *patterns, GSList *ignor } -static gint gprj_project_rescan_root(GPrjRoot *root) +static gint prjorg_project_rescan_root(PrjOrgRoot *root) { GPtrArray *source_files; GSList *pattern_list = NULL; @@ -145,8 +145,8 @@ static gint gprj_project_rescan_root(GPrjRoot *root) else pattern_list = get_precompiled_patterns(geany_data->app->project->file_patterns); - ignored_dirs_list = get_precompiled_patterns(g_prj->ignored_dirs_patterns); - ignored_file_list = get_precompiled_patterns(g_prj->ignored_file_patterns); + ignored_dirs_list = get_precompiled_patterns(prj_org->ignored_dirs_patterns); + ignored_file_list = get_precompiled_patterns(prj_org->ignored_file_patterns); lst = get_file_list(root->base_dir, pattern_list, ignored_dirs_list, ignored_file_list); @@ -238,7 +238,7 @@ static GeanyFiletype *filetypes_detect(const gchar *utf8_filename) } -static void regenerate_tags(GPrjRoot *root, gpointer user_data) +static void regenerate_tags(PrjOrgRoot *root, gpointer user_data) { GHashTableIter iter; gpointer key, value; @@ -267,22 +267,22 @@ static void regenerate_tags(GPrjRoot *root, gpointer user_data) } -void gprj_project_rescan(void) +void prjorg_project_rescan(void) { GSList *elem; gint filenum = 0; - if (!g_prj) + if (!prj_org) return; clear_idle_queue(&s_idle_add_funcs); clear_idle_queue(&s_idle_remove_funcs); - foreach_slist(elem, g_prj->roots) - filenum += gprj_project_rescan_root(elem->data); + foreach_slist(elem, prj_org->roots) + filenum += prjorg_project_rescan_root(elem->data); - if (g_prj->generate_tag_prefs == GPrjTagYes || (g_prj->generate_tag_prefs == GPrjTagAuto && filenum < 500)) - g_slist_foreach(g_prj->roots, (GFunc)regenerate_tags, NULL); + if (prj_org->generate_tag_prefs == PrjOrgTagYes || (prj_org->generate_tag_prefs == PrjOrgTagAuto && filenum < 500)) + g_slist_foreach(prj_org->roots, (GFunc)regenerate_tags, NULL); } @@ -291,53 +291,53 @@ static void update_project( gchar **header_patterns, gchar **ignored_dirs_patterns, gchar **ignored_file_patterns, - GPrjTagPrefs generate_tag_prefs) + PrjOrgTagPrefs generate_tag_prefs) { - if (g_prj->source_patterns) - g_strfreev(g_prj->source_patterns); - g_prj->source_patterns = g_strdupv(source_patterns); + if (prj_org->source_patterns) + g_strfreev(prj_org->source_patterns); + prj_org->source_patterns = g_strdupv(source_patterns); - if (g_prj->header_patterns) - g_strfreev(g_prj->header_patterns); - g_prj->header_patterns = g_strdupv(header_patterns); + if (prj_org->header_patterns) + g_strfreev(prj_org->header_patterns); + prj_org->header_patterns = g_strdupv(header_patterns); - if (g_prj->ignored_dirs_patterns) - g_strfreev(g_prj->ignored_dirs_patterns); - g_prj->ignored_dirs_patterns = g_strdupv(ignored_dirs_patterns); + if (prj_org->ignored_dirs_patterns) + g_strfreev(prj_org->ignored_dirs_patterns); + prj_org->ignored_dirs_patterns = g_strdupv(ignored_dirs_patterns); - if (g_prj->ignored_file_patterns) - g_strfreev(g_prj->ignored_file_patterns); - g_prj->ignored_file_patterns = g_strdupv(ignored_file_patterns); + if (prj_org->ignored_file_patterns) + g_strfreev(prj_org->ignored_file_patterns); + prj_org->ignored_file_patterns = g_strdupv(ignored_file_patterns); - g_prj->generate_tag_prefs = generate_tag_prefs; + prj_org->generate_tag_prefs = generate_tag_prefs; - gprj_project_rescan(); + prjorg_project_rescan(); } -void gprj_project_save(GKeyFile * key_file) +void prjorg_project_save(GKeyFile * key_file) { GPtrArray *array; GSList *elem, *lst; - if (!g_prj) + if (!prj_org) return; g_key_file_set_string_list(key_file, "prjorg", "source_patterns", - (const gchar**) g_prj->source_patterns, g_strv_length(g_prj->source_patterns)); + (const gchar**) prj_org->source_patterns, g_strv_length(prj_org->source_patterns)); g_key_file_set_string_list(key_file, "prjorg", "header_patterns", - (const gchar**) g_prj->header_patterns, g_strv_length(g_prj->header_patterns)); + (const gchar**) prj_org->header_patterns, g_strv_length(prj_org->header_patterns)); g_key_file_set_string_list(key_file, "prjorg", "ignored_dirs_patterns", - (const gchar**) g_prj->ignored_dirs_patterns, g_strv_length(g_prj->ignored_dirs_patterns)); + (const gchar**) prj_org->ignored_dirs_patterns, g_strv_length(prj_org->ignored_dirs_patterns)); g_key_file_set_string_list(key_file, "prjorg", "ignored_file_patterns", - (const gchar**) g_prj->ignored_file_patterns, g_strv_length(g_prj->ignored_file_patterns)); - g_key_file_set_integer(key_file, "prjorg", "generate_tag_prefs", g_prj->generate_tag_prefs); + (const gchar**) prj_org->ignored_file_patterns, g_strv_length(prj_org->ignored_file_patterns)); + g_key_file_set_integer(key_file, "prjorg", "generate_tag_prefs", prj_org->generate_tag_prefs); array = g_ptr_array_new(); - lst = g_prj->roots->next; + lst = prj_org->roots->next; foreach_slist (elem, lst) { - GPrjRoot *root = elem->data; + PrjOrgRoot *root = elem->data; g_ptr_array_add(array, root->base_dir); } g_key_file_set_string_list(key_file, "prjorg", "external_dirs", (const gchar * const *)array->pdata, array->len); @@ -345,16 +345,16 @@ void gprj_project_save(GKeyFile * key_file) } -static GPrjRoot *create_root(const gchar *base_dir) +static PrjOrgRoot *create_root(const gchar *base_dir) { - GPrjRoot *root = (GPrjRoot *) g_new0(GPrjRoot, 1); + PrjOrgRoot *root = (PrjOrgRoot *) g_new0(PrjOrgRoot, 1); root->base_dir = g_strdup(base_dir); root->file_table = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, (GFreeFunc)tm_source_file_free); return root; } -static void close_root(GPrjRoot *root, gpointer user_data) +static void close_root(PrjOrgRoot *root, gpointer user_data) { GPtrArray *source_files; @@ -369,62 +369,62 @@ static void close_root(GPrjRoot *root, gpointer user_data) } -static gint root_comparator(GPrjRoot *a, GPrjRoot *b) +static gint root_comparator(PrjOrgRoot *a, PrjOrgRoot *b) { return g_strcmp0(a->base_dir, b->base_dir); } -void gprj_project_add_external_dir(const gchar *dirname) +void prjorg_project_add_external_dir(const gchar *dirname) { - GPrjRoot *new_root = create_root(dirname); - if (g_slist_find_custom (g_prj->roots, new_root, (GCompareFunc)root_comparator) != NULL) + PrjOrgRoot *new_root = create_root(dirname); + if (g_slist_find_custom (prj_org->roots, new_root, (GCompareFunc)root_comparator) != NULL) { close_root(new_root, NULL); return; } - GSList *lst = g_prj->roots->next; + GSList *lst = prj_org->roots->next; lst = g_slist_prepend(lst, new_root); lst = g_slist_sort(lst, (GCompareFunc)root_comparator); - g_prj->roots->next = lst; + prj_org->roots->next = lst; - gprj_project_rescan(); + prjorg_project_rescan(); } -void gprj_project_remove_external_dir(const gchar *dirname) +void prjorg_project_remove_external_dir(const gchar *dirname) { - GPrjRoot *test_root = create_root(dirname); - GSList *found = g_slist_find_custom (g_prj->roots, test_root, (GCompareFunc)root_comparator); + PrjOrgRoot *test_root = create_root(dirname); + GSList *found = g_slist_find_custom (prj_org->roots, test_root, (GCompareFunc)root_comparator); if (found != NULL) { - GPrjRoot *found_root = found->data; + PrjOrgRoot *found_root = found->data; - g_prj->roots = g_slist_remove(g_prj->roots, found_root); + prj_org->roots = g_slist_remove(prj_org->roots, found_root); close_root(found_root, NULL); - gprj_project_rescan(); + prjorg_project_rescan(); } close_root(test_root, NULL); } -void gprj_project_open(GKeyFile * key_file) +void prjorg_project_open(GKeyFile * key_file) { gchar **source_patterns, **header_patterns, **ignored_dirs_patterns, **ignored_file_patterns, **external_dirs, **dir_ptr, *last_name; gint generate_tag_prefs; GSList *elem, *ext_list = NULL; - if (g_prj != NULL) - gprj_project_close(); + if (prj_org != NULL) + prjorg_project_close(); - g_prj = (GPrj *) g_new0(GPrj, 1); + prj_org = (PrjOrg *) g_new0(PrjOrg, 1); - g_prj->source_patterns = NULL; - g_prj->header_patterns = NULL; - g_prj->ignored_dirs_patterns = NULL; - g_prj->ignored_file_patterns = NULL; - g_prj->generate_tag_prefs = GPrjTagAuto; + prj_org->source_patterns = NULL; + prj_org->header_patterns = NULL; + prj_org->ignored_dirs_patterns = NULL; + prj_org->ignored_file_patterns = NULL; + prj_org->generate_tag_prefs = PrjOrgTagAuto; source_patterns = g_key_file_get_string_list(key_file, "prjorg", "source_patterns", NULL, NULL); if (!source_patterns) @@ -438,7 +438,7 @@ void gprj_project_open(GKeyFile * key_file) ignored_file_patterns = g_key_file_get_string_list(key_file, "prjorg", "ignored_file_patterns", NULL, NULL); if (!ignored_file_patterns) ignored_file_patterns = g_strsplit("*.o *.obj *.a *.lib *.so *.dll *.lo *.la *.class *.jar *.pyc *.mo *.gmo", " ", -1); - generate_tag_prefs = utils_get_setting_integer(key_file, "prjorg", "generate_tag_prefs", GPrjTagAuto); + generate_tag_prefs = utils_get_setting_integer(key_file, "prjorg", "generate_tag_prefs", PrjOrgTagAuto); external_dirs = g_key_file_get_string_list(key_file, "prjorg", "external_dirs", NULL, NULL); foreach_strv (dir_ptr, external_dirs) @@ -448,12 +448,12 @@ void gprj_project_open(GKeyFile * key_file) foreach_slist (elem, ext_list) { if (g_strcmp0(last_name, elem->data) != 0) - g_prj->roots = g_slist_append(g_prj->roots, create_root(elem->data)); + prj_org->roots = g_slist_append(prj_org->roots, create_root(elem->data)); last_name = elem->data; } g_slist_free(ext_list); /* the project directory is always first */ - g_prj->roots = g_slist_prepend(g_prj->roots, create_root(geany_data->app->project->base_path)); + prj_org->roots = g_slist_prepend(prj_org->roots, create_root(geany_data->app->project->base_path)); update_project( source_patterns, @@ -488,7 +488,7 @@ static gchar **split_patterns(const gchar *str) } -void gprj_project_read_properties_tab(void) +void prjorg_project_read_properties_tab(void) { gchar **source_patterns, **header_patterns, **ignored_dirs_patterns, **ignored_file_patterns; @@ -508,7 +508,7 @@ void gprj_project_read_properties_tab(void) } -gint gprj_project_add_properties_tab(GtkWidget *notebook) +gint prjorg_project_add_properties_tab(GtkWidget *notebook) { GtkWidget *vbox, *hbox, *hbox1; GtkWidget *table; @@ -532,7 +532,7 @@ gint gprj_project_add_properties_tab(GtkWidget *notebook) ui_widget_set_tooltip_text(e->source_patterns, _("Space separated list of patterns that are used to identify source files. " "Used for header/source swapping.")); - str = g_strjoinv(" ", g_prj->source_patterns); + str = g_strjoinv(" ", prj_org->source_patterns); gtk_entry_set_text(GTK_ENTRY(e->source_patterns), str); g_free(str); @@ -544,7 +544,7 @@ gint gprj_project_add_properties_tab(GtkWidget *notebook) ui_widget_set_tooltip_text(e->header_patterns, _("Space separated list of patterns that are used to identify headers. " "Used for header/source swapping.")); - str = g_strjoinv(" ", g_prj->header_patterns); + str = g_strjoinv(" ", prj_org->header_patterns); gtk_entry_set_text(GTK_ENTRY(e->header_patterns), str); g_free(str); @@ -556,7 +556,7 @@ gint gprj_project_add_properties_tab(GtkWidget *notebook) ui_widget_set_tooltip_text(e->ignored_file_patterns, _("Space separated list of patterns that are used to identify files " "that are not displayed in the project tree.")); - str = g_strjoinv(" ", g_prj->ignored_file_patterns); + str = g_strjoinv(" ", prj_org->ignored_file_patterns); gtk_entry_set_text(GTK_ENTRY(e->ignored_file_patterns), str); g_free(str); @@ -568,7 +568,7 @@ gint gprj_project_add_properties_tab(GtkWidget *notebook) ui_widget_set_tooltip_text(e->ignored_dirs_patterns, _("Space separated list of patterns that are used to identify directories " "that are not scanned for source files.")); - str = g_strjoinv(" ", g_prj->ignored_dirs_patterns); + str = g_strjoinv(" ", prj_org->ignored_dirs_patterns); gtk_entry_set_text(GTK_ENTRY(e->ignored_dirs_patterns), str); g_free(str); @@ -578,7 +578,7 @@ gint gprj_project_add_properties_tab(GtkWidget *notebook) gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(e->generate_tag_prefs), _("Auto (generate if less than 500 files)")); gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(e->generate_tag_prefs), _("Yes")); gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(e->generate_tag_prefs), _("No")); - gtk_combo_box_set_active(GTK_COMBO_BOX_TEXT(e->generate_tag_prefs), g_prj->generate_tag_prefs); + gtk_combo_box_set_active(GTK_COMBO_BOX_TEXT(e->generate_tag_prefs), prj_org->generate_tag_prefs); ui_table_add_row(GTK_TABLE(table), 4, label, e->generate_tag_prefs, NULL); ui_widget_set_tooltip_text(e->generate_tag_prefs, _("Generate tag list for all project files instead of only for the currently opened files. " @@ -605,37 +605,37 @@ gint gprj_project_add_properties_tab(GtkWidget *notebook) } -void gprj_project_close(void) +void prjorg_project_close(void) { - if (!g_prj) + if (!prj_org) return; /* can happen on plugin reload */ clear_idle_queue(&s_idle_add_funcs); clear_idle_queue(&s_idle_remove_funcs); - g_slist_foreach(g_prj->roots, (GFunc)close_root, NULL); - g_slist_free(g_prj->roots); + g_slist_foreach(prj_org->roots, (GFunc)close_root, NULL); + g_slist_free(prj_org->roots); - g_strfreev(g_prj->source_patterns); - g_strfreev(g_prj->header_patterns); - g_strfreev(g_prj->ignored_dirs_patterns); - g_strfreev(g_prj->ignored_file_patterns); + g_strfreev(prj_org->source_patterns); + g_strfreev(prj_org->header_patterns); + g_strfreev(prj_org->ignored_dirs_patterns); + g_strfreev(prj_org->ignored_file_patterns); - g_free(g_prj); - g_prj = NULL; + g_free(prj_org); + prj_org = NULL; } -gboolean gprj_project_is_in_project(const gchar * filename) +gboolean prjorg_project_is_in_project(const gchar * filename) { GSList *elem; - if (!filename || !g_prj || !geany_data->app->project || !g_prj->roots) + if (!filename || !prj_org || !geany_data->app->project || !prj_org->roots) return FALSE; - foreach_slist (elem, g_prj->roots) + foreach_slist (elem, prj_org->roots) { - GPrjRoot *root = elem->data; + PrjOrgRoot *root = elem->data; if (g_hash_table_lookup_extended (root->file_table, filename, NULL, NULL)) return TRUE; } @@ -648,7 +648,7 @@ static gboolean add_tm_idle(gpointer foo) { GSList *elem2; - if (!g_prj || !s_idle_add_funcs) + if (!prj_org || !s_idle_add_funcs) return FALSE; foreach_slist (elem2, s_idle_add_funcs) @@ -656,9 +656,9 @@ static gboolean add_tm_idle(gpointer foo) GSList *elem; gchar *fname = elem2->data; - foreach_slist (elem, g_prj->roots) + foreach_slist (elem, prj_org->roots) { - GPrjRoot *root = elem->data; + PrjOrgRoot *root = elem->data; TMSourceFile *sf = g_hash_table_lookup(root->file_table, fname); if (sf != NULL && !document_find_by_filename(fname)) @@ -682,7 +682,7 @@ static gboolean add_tm_idle(gpointer foo) * Additional problem: The tag removal in Geany happens after this function is called. * To be sure, perform on idle after this happens (even though from my knowledge of TM * this shouldn't probably matter). */ -void gprj_project_add_single_tm_file(gchar *filename) +void prjorg_project_add_single_tm_file(gchar *filename) { if (s_idle_add_funcs == NULL) plugin_idle_add(geany_plugin, (GSourceFunc)add_tm_idle, NULL); @@ -695,7 +695,7 @@ static gboolean remove_tm_idle(gpointer foo) { GSList *elem2; - if (!g_prj || !s_idle_remove_funcs) + if (!prj_org || !s_idle_remove_funcs) return FALSE; foreach_slist (elem2, s_idle_remove_funcs) @@ -703,9 +703,9 @@ static gboolean remove_tm_idle(gpointer foo) GSList *elem; gchar *fname = elem2->data; - foreach_slist (elem, g_prj->roots) + foreach_slist (elem, prj_org->roots) { - GPrjRoot *root = elem->data; + PrjOrgRoot *root = elem->data; TMSourceFile *sf = g_hash_table_lookup(root->file_table, fname); if (sf != NULL) @@ -731,7 +731,7 @@ static gboolean remove_tm_idle(gpointer foo) * when this function is called and if we remove the TmSourceFile now, line * number for the searched tag won't be found. For this reason delay the tag * TmSourceFile removal until idle */ -void gprj_project_remove_single_tm_file(gchar *filename) +void prjorg_project_remove_single_tm_file(gchar *filename) { if (s_idle_remove_funcs == NULL) plugin_idle_add(geany_plugin, (GSourceFunc)remove_tm_idle, NULL); Modified: projectorganizer/src/prjorg-project.h 40 lines changed, 20 insertions(+), 20 deletions(-) =================================================================== @@ -23,14 +23,14 @@ typedef struct { gchar *base_dir; GHashTable *file_table; /* contains all file names within base_dir, maps file_name->TMSourceFile */ -} GPrjRoot; +} PrjOrgRoot; typedef enum { - GPrjTagAuto, - GPrjTagYes, - GPrjTagNo, -} GPrjTagPrefs; + PrjOrgTagAuto, + PrjOrgTagYes, + PrjOrgTagNo, +} PrjOrgTagPrefs; typedef struct { @@ -38,29 +38,29 @@ typedef struct gchar **header_patterns; gchar **ignored_dirs_patterns; gchar **ignored_file_patterns; - GPrjTagPrefs generate_tag_prefs; + PrjOrgTagPrefs generate_tag_prefs; - GSList *roots; /* list of GPrjRoot; the project root is always the first followed by external dirs roots */ -} GPrj; + GSList *roots; /* list of PrjOrgRoot; the project root is always the first followed by external dirs roots */ +} PrjOrg; -extern GPrj *g_prj; +extern PrjOrg *prj_org; -void gprj_project_open(GKeyFile * key_file); +void prjorg_project_open(GKeyFile * key_file); -gint gprj_project_add_properties_tab(GtkWidget *notebook); +gint prjorg_project_add_properties_tab(GtkWidget *notebook); -void gprj_project_close(void); +void prjorg_project_close(void); -void gprj_project_save(GKeyFile * key_file); -void gprj_project_read_properties_tab(void); -void gprj_project_rescan(void); +void prjorg_project_save(GKeyFile * key_file); +void prjorg_project_read_properties_tab(void); +void prjorg_project_rescan(void); -void gprj_project_add_external_dir(const gchar *dirname); -void gprj_project_remove_external_dir(const gchar *dirname); +void prjorg_project_add_external_dir(const gchar *dirname); +void prjorg_project_remove_external_dir(const gchar *dirname); -void gprj_project_add_single_tm_file(gchar *filename); -void gprj_project_remove_single_tm_file(gchar *filename); +void prjorg_project_add_single_tm_file(gchar *filename); +void prjorg_project_remove_single_tm_file(gchar *filename); -gboolean gprj_project_is_in_project(const gchar * filename); +gboolean prjorg_project_is_in_project(const gchar * filename); #endif Modified: projectorganizer/src/prjorg-sidebar.c 46 lines changed, 23 insertions(+), 23 deletions(-) =================================================================== @@ -277,7 +277,7 @@ static void on_collapse_all(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED static void on_follow_active(GtkToggleToolButton *button, G_GNUC_UNUSED gpointer user_data) { s_follow_editor = gtk_toggle_tool_button_get_active(button); - gprj_sidebar_update(FALSE); + prjorg_sidebar_update(FALSE); } @@ -294,8 +294,8 @@ static void on_add_external(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED { gchar *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); - gprj_project_add_external_dir(filename); - gprj_sidebar_update(TRUE); + prjorg_project_add_external_dir(filename); + prjorg_sidebar_update(TRUE); project_write_config(); g_free (filename); @@ -320,8 +320,8 @@ static void on_remove_external_dir(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_U return; gtk_tree_model_get(model, &iter, FILEVIEW_COLUMN_NAME, &name, -1); - gprj_project_remove_external_dir(name); - gprj_sidebar_update(TRUE); + prjorg_project_remove_external_dir(name); + prjorg_sidebar_update(TRUE); project_write_config(); g_free(name); @@ -695,8 +695,8 @@ static void on_find_tag(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_UNUSED gpoin static void on_reload_project(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_UNUSED gpointer user_data) { - gprj_project_rescan(); - gprj_sidebar_update(TRUE); + prjorg_project_rescan(); + prjorg_sidebar_update(TRUE); } @@ -981,7 +981,7 @@ static void set_intro_message(const gchar *msg) } -static void load_project_root(GPrjRoot *root, GtkTreeIter *parent, GSList *header_patterns, GSList *source_patterns, gboolean project) +static void load_project_root(PrjOrgRoot *root, GtkTreeIter *parent, GSList *header_patterns, GSList *source_patterns, gboolean project) { GSList *lst = NULL; GSList *path_list = NULL; @@ -1037,17 +1037,17 @@ static void load_project(void) gtk_tree_store_clear(s_file_store); - if (!g_prj || !geany_data->app->project) + if (!prj_org || !geany_data->app->project) return; icon_dir = g_icon_new_for_string("gtk-directory", NULL); - header_patterns = get_precompiled_patterns(g_prj->header_patterns); - source_patterns = get_precompiled_patterns(g_prj->source_patterns); + header_patterns = get_precompiled_patterns(prj_org->header_patterns); + source_patterns = get_precompiled_patterns(prj_org->source_patterns); - foreach_slist (elem, g_prj->roots) + foreach_slist (elem, prj_org->roots) { - GPrjRoot *root = elem->data; + PrjOrgRoot *root = elem->data; gchar *name; if (first) @@ -1126,14 +1126,14 @@ static gboolean follow_editor_on_idle(gpointer foo) doc = document_get_current(); - if (!doc || !doc->file_name || !geany_data->app->project || !g_prj) + if (!doc || !doc->file_name || !geany_data->app->project || !prj_org) return FALSE; model = GTK_TREE_MODEL(s_file_store); gtk_tree_model_iter_children(model, &root_iter, NULL); - foreach_slist (elem, g_prj->roots) + foreach_slist (elem, prj_org->roots) { - GPrjRoot *root = elem->data; + PrjOrgRoot *root = elem->data; path = get_file_relative_path(root->base_dir, doc->file_name); if (path != NULL && !g_str_has_prefix(path, "..")) @@ -1172,7 +1172,7 @@ static gboolean follow_editor_on_idle(gpointer foo) } -void gprj_sidebar_update(gboolean reload) +void prjorg_sidebar_update(gboolean reload) { if (reload) load_project(); @@ -1182,19 +1182,19 @@ void gprj_sidebar_update(gboolean reload) } -void gprj_sidebar_find_file_in_active(void) +void prjorg_sidebar_find_file_in_active(void) { find_file(NULL); } -void gprj_sidebar_find_tag_in_active(void) +void prjorg_sidebar_find_tag_in_active(void) { find_tag(NULL); } -void gprj_sidebar_init(void) +void prjorg_sidebar_init(void) { GtkWidget *scrollwin, *toolbar, *item, *image; GtkCellRenderer *renderer; @@ -1299,7 +1299,7 @@ void gprj_sidebar_init(void) G_CALLBACK(on_key_press), NULL); set_intro_message(_("(Re)open project to start using the plugin")); - gprj_sidebar_activate(FALSE); + prjorg_sidebar_activate(FALSE); /**** popup menu ****/ @@ -1383,13 +1383,13 @@ void gprj_sidebar_init(void) } -void gprj_sidebar_activate(gboolean activate) +void prjorg_sidebar_activate(gboolean activate) { gtk_widget_set_sensitive(s_file_view_vbox, activate); } -void gprj_sidebar_cleanup(void) +void prjorg_sidebar_cleanup(void) { gtk_widget_destroy(s_file_view_vbox); } Modified: projectorganizer/src/prjorg-sidebar.h 12 lines changed, 6 insertions(+), 6 deletions(-) =================================================================== @@ -20,14 +20,14 @@ #define __PRJORG_SIDEBAR_H__ -void gprj_sidebar_init(void); -void gprj_sidebar_cleanup(void); -void gprj_sidebar_activate(gboolean activate); +void prjorg_sidebar_init(void); +void prjorg_sidebar_cleanup(void); +void prjorg_sidebar_activate(gboolean activate); -void gprj_sidebar_find_file_in_active(void); -void gprj_sidebar_find_tag_in_active(void); +void prjorg_sidebar_find_file_in_active(void); +void prjorg_sidebar_find_tag_in_active(void); -void gprj_sidebar_update(gboolean reload); +void prjorg_sidebar_update(gboolean reload); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 17e42d: projectorganizer: Use backslash dir separator under Windows
by Jiří Techet 18 Dec '14

18 Dec '14

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 18 Dec 2014 16:15:20 UTC Commit: 17e42d7dc3180753036db3eeea597e3cc7c7f385 https://github.com/geany/geany-plugins/commit/17e42d7dc3180753036db3eeea597… Log Message: ----------- projectorganizer: Use backslash dir separator under Windows Modified Paths: -------------- projectorganizer/src/prjorg-utils.c Modified: projectorganizer/src/prjorg-utils.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -59,7 +59,7 @@ static gchar *relpath(const gchar *origin_dir, const gchar *dest_dir) SETPTR(ret, g_build_filename(ret, destv[j], NULL)); if (strlen(ret) == 0) - SETPTR(ret, g_strdup("./")); + SETPTR(ret, g_strdup("."G_DIR_SEPARATOR_S)); g_free(origin); g_free(dest); @@ -82,7 +82,7 @@ gchar *get_file_relative_path(const gchar *origin_dir, const gchar *dest_file) dest_basename = g_path_get_basename(dest_file); - if (g_strcmp0(ret, "./") != 0) + if (g_strcmp0(ret, "."G_DIR_SEPARATOR_S) != 0) { SETPTR(ret, g_build_filename(ret, dest_basename, NULL)); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 8c7fed: projectorganizer: The ./ prefix in message window is unnecessary
by Jiří Techet 18 Dec '14

18 Dec '14

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 18 Dec 2014 16:14:32 UTC Commit: 8c7feda2c519388472d09c7d49637ff0d24f9ad8 https://github.com/geany/geany-plugins/commit/8c7feda2c519388472d09c7d49637… Log Message: ----------- projectorganizer: The ./ prefix in message window is unnecessary And looks ugly under Windows. Modified Paths: -------------- projectorganizer/src/prjorg-sidebar.c Modified: projectorganizer/src/prjorg-sidebar.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -372,7 +372,7 @@ static void find_file_recursive(GtkTreeIter *iter, gboolean case_sensitive, gboo path = build_path(iter); rel_path = get_file_relative_path(geany_data->app->project->base_path, path); - msgwin_msg_add(COLOR_BLACK, -1, NULL, "./%s", rel_path ? rel_path : path); + msgwin_msg_add(COLOR_BLACK, -1, NULL, "%s", rel_path ? rel_path : path); g_free(path); g_free(rel_path); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 524dbb: projectorganizer: Discourage people from using ProjectOrganizer and GeanyPrj at the same time
by Jiří Techet 18 Dec '14

18 Dec '14

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 18 Dec 2014 14:28:02 UTC Commit: 524dbb8ff64b8e3628f672f13eb2da06e2c67a61 https://github.com/geany/geany-plugins/commit/524dbb8ff64b8e3628f672f13eb2d… Log Message: ----------- projectorganizer: Discourage people from using ProjectOrganizer and GeanyPrj at the same time Modified Paths: -------------- projectorganizer/README Modified: projectorganizer/README 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -207,6 +207,9 @@ Known issues the plugin is loaded. * There might be some issues with UTF8 file names - the testing has been very limited. +* In general it is not a good idea to use both the Project Organizer and GeanyPrj + at the same time because both of the plugins access the tag manager in Geany + to keep all the project files indexed and might cause conflicts to each other. * Project Organizer hasn't been tested under Windows (by me) so there might be issues. Patches are welcome. -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 533a12: webhelper: Add bookmark completion to the URL entry
by Colomban Wendling 18 Dec '14

18 Dec '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 18 Dec 2014 14:21:23 UTC Commit: 533a12a9930764d36f12bf50376b9e69806f21cc https://github.com/geany/geany-plugins/commit/533a12a9930764d36f12bf50376b9… Log Message: ----------- webhelper: Add bookmark completion to the URL entry Modified Paths: -------------- webhelper/src/gwh-browser.c Modified: webhelper/src/gwh-browser.c 57 lines changed, 55 insertions(+), 2 deletions(-) =================================================================== @@ -56,6 +56,8 @@ # define GTK_COMBO_BOX_TEXT GTK_COMBO_BOX # define GTK_IS_COMBO_BOX_TEXT GTK_IS_COMBO_BOX # define gtk_combo_box_text_new_with_entry gtk_combo_box_entry_new_text +# define gtk_combo_box_get_entry_text_column(c) \ + (gtk_combo_box_entry_get_text_column (GTK_COMBO_BOX_ENTRY (c))) # define gtk_combo_box_text_append_text gtk_combo_box_append_text #endif /* GTK_CHECK_VERSION (2, 24, 0) */ #if ! GTK_CHECK_VERSION (3, 0, 0) @@ -484,6 +486,25 @@ on_url_entry_icon_press (GtkEntry *entry, } } +static gboolean +on_entry_completion_match_selected (GtkEntryCompletion *comp, + GtkTreeModel *model, + GtkTreeIter *iter, + GwhBrowser *self) +{ + gint column = gtk_entry_completion_get_text_column (comp); + gchar *row; + + gtk_tree_model_get (model, iter, column, &row, -1); + /* set the entry value too in the unlikely case the selected URI is the + * currently viewed one, in which case set_uri() won't change it */ + gtk_entry_set_text (GTK_ENTRY (self->priv->url_entry), row); + gwh_browser_set_uri (self, row); + g_free (row); + + return TRUE; +} + static void update_history (GwhBrowser *self) { @@ -892,11 +913,35 @@ gwh_browser_class_init (GwhBrowserClass *klass) g_type_class_add_private (klass, sizeof (GwhBrowserPrivate)); } +/* a GtkEntryCompletionMatchFunc matching anywhere in the haystack */ +static gboolean +url_completion_match_func (GtkEntryCompletion *comp, + const gchar *key, + GtkTreeIter *iter, + gpointer dummy) +{ + GtkTreeModel *model = gtk_entry_completion_get_model (comp); + gint column = gtk_entry_completion_get_text_column (comp); + gchar *row = NULL; + gboolean match = FALSE; + + gtk_tree_model_get (model, iter, column, &row, -1); + if (row) { + SETPTR (row, g_utf8_normalize (row, -1, G_NORMALIZE_DEFAULT)); + SETPTR (row, g_utf8_casefold (row, -1)); + match = strstr (row, key) != NULL; + g_free (row); + } + + return match; +} + static GtkWidget * create_toolbar (GwhBrowser *self) { - GtkWidget *toolbar; - GtkToolItem *item; + GtkWidget *toolbar; + GtkToolItem *item; + GtkEntryCompletion *comp; toolbar = g_object_new (GTK_TYPE_TOOLBAR, "icon-size", GTK_ICON_SIZE_MENU, @@ -934,6 +979,12 @@ create_toolbar (GwhBrowser *self) GTK_ENTRY_ICON_PRIMARY, _("Website information and settings")); + comp = gtk_entry_completion_new (); + gtk_entry_completion_set_model (comp, gtk_combo_box_get_model (GTK_COMBO_BOX (self->priv->url_combo))); + gtk_entry_completion_set_text_column (comp, gtk_combo_box_get_entry_text_column (GTK_COMBO_BOX (self->priv->url_combo))); + gtk_entry_completion_set_match_func (comp, url_completion_match_func, NULL, NULL); + gtk_entry_set_completion (GTK_ENTRY (self->priv->url_entry), comp); + self->priv->item_inspector = gtk_toggle_tool_button_new_from_stock (GTK_STOCK_INFO); gtk_tool_button_set_label (GTK_TOOL_BUTTON (self->priv->item_inspector), _("Web inspector")); gtk_tool_item_set_tooltip_text (self->priv->item_inspector, _("Toggle web inspector")); @@ -964,6 +1015,8 @@ create_toolbar (GwhBrowser *self) G_CALLBACK (on_url_entry_icon_press), self); g_signal_connect (G_OBJECT (self->priv->url_combo), "notify::active", G_CALLBACK (on_url_combo_active_notify), self); + g_signal_connect (G_OBJECT (comp), "match-selected", + G_CALLBACK (on_entry_completion_match_selected), self); return toolbar; } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits December 2014