Plugins-Commits April 2010

plugins-commits@lists.geany.org

7 participants
98 discussions

SF.net SVN: geany-plugins:[1309] trunk/geany-plugins/treebrowser
by dimitrov-adrian＠users.sourceforge.net 25 Apr '10

25 Apr '10

Revision: 1309 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1309&view=rev Author: dimitrov-adrian Date: 2010-04-25 21:16:59 +0000 (Sun, 25 Apr 2010) Log Message: ----------- Treebrowser: Added option to change bars position (Top or Bottom) Modified Paths: -------------- trunk/geany-plugins/treebrowser/ChangeLog trunk/geany-plugins/treebrowser/src/treebrowser.c Modified: trunk/geany-plugins/treebrowser/ChangeLog =================================================================== --- trunk/geany-plugins/treebrowser/ChangeLog 2010-04-25 20:38:37 UTC (rev 1308) +++ trunk/geany-plugins/treebrowser/ChangeLog 2010-04-25 21:16:59 UTC (rev 1309) @@ -7,7 +7,7 @@ "CRITICAL : g_object_ref: assertion `object->ref_count > 0' failed" (FIXED) Double click on bookmarks, do nothing (FIXED) show/hide hidden files not working on Windows - (FIXED) "Go Up" not working if the current path ends with slash + (FIXED) "Go Up" not working if the current path ends with slash // thanks to <dmaphy> for report +---------------------------+ @@ -29,7 +29,7 @@ (DONE) Using font from geany settings for sidebar * Migrating to stash * Adding keybindings for renaming/deleting/refreshing - * Add option to change bars position + (DONE) Add option to change bars position // requested by <dmaphy> * Add option to autorename the newest created objects by the Treebrowser @@ -40,6 +40,11 @@ 25-04-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> * src/treebrowser.c + Added option to change bars position (Top or Bottom) + +25-04-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> + + * src/treebrowser.c Menu elements are inactive instands of hidden Added experimental bookmarks view Added option to show/hide tree lines Modified: trunk/geany-plugins/treebrowser/src/treebrowser.c =================================================================== --- trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-04-25 20:38:37 UTC (rev 1308) +++ trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-04-25 21:16:59 UTC (rev 1309) @@ -53,6 +53,7 @@ static gboolean CONFIG_SHOW_HIDDEN_FILES = FALSE; static gboolean CONFIG_HIDE_OBJECT_FILES = FALSE; static gboolean CONFIG_SHOW_BARS = TRUE; +static gboolean CONFIG_SHOW_BARS_AT_TOP = FALSE; static gboolean CONFIG_CHROOT_ON_DCLICK = FALSE; static gboolean CONFIG_FOLLOW_CURRENT_DOC = TRUE; static gboolean CONFIG_ON_EXPAND_REFRESH = TRUE; @@ -1258,11 +1259,6 @@ g_signal_connect(wid, "clicked", G_CALLBACK(treebrowser_track_current), NULL); gtk_container_add(GTK_CONTAINER(toolbar), wid); - wid = GTK_WIDGET(gtk_tool_button_new_from_stock(GTK_STOCK_ABOUT)); - ui_widget_set_tooltip_text(wid, _("Bookmarks")); - g_signal_connect(wid, "clicked", G_CALLBACK(treebrowser_load_bookmarks), NULL); - gtk_container_add(GTK_CONTAINER(toolbar), wid); - wid = GTK_WIDGET(gtk_tool_button_new_from_stock(GTK_STOCK_CLOSE)); ui_widget_set_tooltip_text(wid, _("Hide bars")); g_signal_connect(wid, "clicked", G_CALLBACK(on_button_hide_bars), NULL); @@ -1284,8 +1280,16 @@ ui_widget_set_tooltip_text(addressbar, _("Addressbar for example '/projects/my-project'")); - gtk_box_pack_start(GTK_BOX(sidebar_vbox), scrollwin, TRUE, TRUE, 1); - gtk_box_pack_start(GTK_BOX(sidebar_vbox), sidebar_vbox_bars, FALSE, TRUE, 1); + if (CONFIG_SHOW_BARS_AT_TOP) + { + gtk_box_pack_start(GTK_BOX(sidebar_vbox), sidebar_vbox_bars, FALSE, TRUE, 1); + gtk_box_pack_start(GTK_BOX(sidebar_vbox), scrollwin, TRUE, TRUE, 1); + } + else + { + gtk_box_pack_start(GTK_BOX(sidebar_vbox), scrollwin, TRUE, TRUE, 1); + gtk_box_pack_start(GTK_BOX(sidebar_vbox), sidebar_vbox_bars, FALSE, TRUE, 1); + } g_signal_connect(selection, "changed", G_CALLBACK(on_treeview_changed), NULL); g_signal_connect(treeview, "button-press-event", G_CALLBACK(on_treeview_mouseclick), selection); @@ -1317,6 +1321,7 @@ GtkWidget *SHOW_HIDDEN_FILES; GtkWidget *HIDE_OBJECT_FILES; GtkWidget *SHOW_BARS; + GtkWidget *SHOW_BARS_AT_TOP; GtkWidget *CHROOT_ON_DCLICK; GtkWidget *FOLLOW_CURRENT_DOC; GtkWidget *ON_EXPAND_REFRESH; @@ -1340,6 +1345,7 @@ CONFIG_SHOW_HIDDEN_FILES = utils_get_setting_boolean(config, "treebrowser", "show_hidden_files", CONFIG_SHOW_HIDDEN_FILES); CONFIG_HIDE_OBJECT_FILES = utils_get_setting_boolean(config, "treebrowser", "hide_object_files", CONFIG_HIDE_OBJECT_FILES); CONFIG_SHOW_BARS = utils_get_setting_boolean(config, "treebrowser", "show_bars", CONFIG_SHOW_BARS); + CONFIG_SHOW_BARS_AT_TOP = utils_get_setting_boolean(config, "treebrowser", "show_bars_at_top", CONFIG_SHOW_BARS_AT_TOP); CONFIG_CHROOT_ON_DCLICK = utils_get_setting_boolean(config, "treebrowser", "chroot_on_dclick", CONFIG_CHROOT_ON_DCLICK); CONFIG_FOLLOW_CURRENT_DOC = utils_get_setting_boolean(config, "treebrowser", "follow_current_doc", CONFIG_FOLLOW_CURRENT_DOC); CONFIG_ON_EXPAND_REFRESH = utils_get_setting_boolean(config, "treebrowser", "on_expand_refresh", CONFIG_ON_EXPAND_REFRESH); @@ -1369,6 +1375,7 @@ g_key_file_set_boolean(config, "treebrowser", "show_hidden_files", CONFIG_SHOW_HIDDEN_FILES); g_key_file_set_boolean(config, "treebrowser", "hide_object_files", CONFIG_HIDE_OBJECT_FILES); g_key_file_set_boolean(config, "treebrowser", "show_bars", CONFIG_SHOW_BARS); + g_key_file_set_boolean(config, "treebrowser", "show_bars_at_top", CONFIG_SHOW_BARS_AT_TOP); g_key_file_set_boolean(config, "treebrowser", "chroot_on_dclick", CONFIG_CHROOT_ON_DCLICK); g_key_file_set_boolean(config, "treebrowser", "follow_current_doc", CONFIG_FOLLOW_CURRENT_DOC); g_key_file_set_boolean(config, "treebrowser", "on_expand_refresh", CONFIG_ON_EXPAND_REFRESH); @@ -1396,6 +1403,7 @@ CONFIG_ONE_CLICK_CHDOC = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(configure_widgets.ONE_CLICK_CHDOC)); CONFIG_SHOW_HIDDEN_FILES = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(configure_widgets.SHOW_HIDDEN_FILES)); CONFIG_HIDE_OBJECT_FILES = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(configure_widgets.HIDE_OBJECT_FILES)); + CONFIG_SHOW_BARS_AT_TOP = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(configure_widgets.SHOW_BARS_AT_TOP)); CONFIG_CHROOT_ON_DCLICK = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(configure_widgets.CHROOT_ON_DCLICK)); CONFIG_FOLLOW_CURRENT_DOC = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(configure_widgets.FOLLOW_CURRENT_DOC)); CONFIG_ON_EXPAND_REFRESH = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(configure_widgets.ON_EXPAND_REFRESH)); @@ -1420,12 +1428,12 @@ GtkWidget* plugin_configure(GtkDialog *dialog) { - GtkWidget *label; - GtkWidget *vbox, *hbox; + GtkWidget *label; + GtkWidget *vbox, *hbox; vbox = gtk_vbox_new(FALSE, 0); + hbox = gtk_hbox_new(FALSE, 0); - hbox = gtk_hbox_new(FALSE, 0); label = gtk_label_new(_("External open command")); configure_widgets.OPEN_EXTERNAL_CMD = gtk_entry_new(); gtk_entry_set_text(GTK_ENTRY(configure_widgets.OPEN_EXTERNAL_CMD), CONFIG_OPEN_EXTERNAL_CMD); @@ -1449,6 +1457,16 @@ gtk_box_pack_start(GTK_BOX(hbox), configure_widgets.INITIAL_DIR_DEEP, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 6); + configure_widgets.SHOW_BARS = gtk_check_button_new_with_label(_("Show bars")); + gtk_button_set_focus_on_click(GTK_BUTTON(configure_widgets.SHOW_BARS), FALSE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(configure_widgets.SHOW_BARS), CONFIG_SHOW_BARS); + gtk_box_pack_start(GTK_BOX(vbox), configure_widgets.SHOW_BARS, FALSE, FALSE, 0); + + configure_widgets.SHOW_BARS_AT_TOP = gtk_check_button_new_with_label(_("Show bars at top (Require plugin restart)")); + gtk_button_set_focus_on_click(GTK_BUTTON(configure_widgets.SHOW_BARS_AT_TOP), FALSE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(configure_widgets.SHOW_BARS_AT_TOP), CONFIG_SHOW_BARS_AT_TOP); + gtk_box_pack_start(GTK_BOX(vbox), configure_widgets.SHOW_BARS_AT_TOP, FALSE, FALSE, 0); + configure_widgets.SHOW_HIDDEN_FILES = gtk_check_button_new_with_label(_("Show hidden files")); gtk_button_set_focus_on_click(GTK_BUTTON(configure_widgets.SHOW_HIDDEN_FILES), FALSE); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(configure_widgets.SHOW_HIDDEN_FILES), CONFIG_SHOW_HIDDEN_FILES); 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:[1308] trunk/geany-plugins/treebrowser
by dimitrov-adrian＠users.sourceforge.net 25 Apr '10

25 Apr '10

Revision: 1308 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1308&view=rev Author: dimitrov-adrian Date: 2010-04-25 20:38:37 +0000 (Sun, 25 Apr 2010) Log Message: ----------- Treebrowser: (FIXED) "Go Up" not working if the current path ends with slash; (FIXED) Double click on bookmarks, do nothing Modified Paths: -------------- trunk/geany-plugins/treebrowser/ChangeLog trunk/geany-plugins/treebrowser/src/treebrowser.c Modified: trunk/geany-plugins/treebrowser/ChangeLog =================================================================== --- trunk/geany-plugins/treebrowser/ChangeLog 2010-04-25 18:58:14 UTC (rev 1307) +++ trunk/geany-plugins/treebrowser/ChangeLog 2010-04-25 20:38:37 UTC (rev 1308) @@ -3,9 +3,11 @@ | KNOWN BUGS | +---------------------------+ - * crytical warning when unloading the plugin + * CRYTICAL warning when unloading the plugin "CRITICAL : g_object_ref: assertion `object->ref_count > 0' failed" + (FIXED) Double click on bookmarks, do nothing (FIXED) show/hide hidden files not working on Windows + (FIXED) "Go Up" not working if the current path ends with slash +---------------------------+ @@ -27,7 +29,10 @@ (DONE) Using font from geany settings for sidebar * Migrating to stash * Adding keybindings for renaming/deleting/refreshing + * Add option to change bars position + * Add option to autorename the newest created objects by the Treebrowser + +-------------------------------+ | Development release ChangeLog | +-------------------------------+ @@ -43,6 +48,7 @@ Added tooltips with uri // thanks to native filebrowser Added option to open terminal Applied patch from Enrico to fix gtk+-2.8 compitable for tree lines + Fixed "Go Up" not working if the current path ends with slash 19-04-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> Modified: trunk/geany-plugins/treebrowser/src/treebrowser.c =================================================================== --- trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-04-25 18:58:14 UTC (rev 1307) +++ trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-04-25 20:38:37 UTC (rev 1308) @@ -181,7 +181,7 @@ GFileInfo *info; file = g_file_new_for_path(uri); - info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN, 0, NULL, &error); + info = g_file_query_info(file, G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN, 0, NULL, &error); if (error) { g_error_free(error); @@ -249,6 +249,9 @@ static void treebrowser_chroot(gchar *directory) { + if (g_str_has_suffix(directory, "/")) + g_strlcpy(directory, directory, strlen(directory)); + gtk_entry_set_text(GTK_ENTRY(addressbar), directory); if (! g_file_test(directory, G_FILE_TEST_IS_DIR)) @@ -412,6 +415,12 @@ TREEBROWSER_COLUMN_NAME, g_basename(path_full), TREEBROWSER_COLUMN_URI, path_full, -1); + gtk_tree_store_append(treestore, &iter, &iter); + gtk_tree_store_set(treestore, &iter, + TREEBROWSER_COLUMN_ICON, NULL, + TREEBROWSER_COLUMN_NAME, g_strdup_printf("(%s)", _("Empty")), + TREEBROWSER_COLUMN_URI, NULL, + -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:[1307] trunk/geany-plugins/treebrowser/src/ treebrowser.c
by dimitrov-adrian＠users.sourceforge.net 25 Apr '10

25 Apr '10

Revision: 1307 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1307&view=rev Author: dimitrov-adrian Date: 2010-04-25 18:58:14 +0000 (Sun, 25 Apr 2010) Log Message: ----------- Treebrowser: fixed crytical warning Modified Paths: -------------- trunk/geany-plugins/treebrowser/src/treebrowser.c Modified: trunk/geany-plugins/treebrowser/src/treebrowser.c =================================================================== --- trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-04-25 18:53:59 UTC (rev 1306) +++ trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-04-25 18:58:14 UTC (rev 1307) @@ -257,7 +257,7 @@ return; } - if (CONFIG_SHOW_BOOKMARKS) + if (CONFIG_SHOW_BOOKMARKS && gtk_tree_store_iter_is_valid(treestore, &bookmarks_iter)) bookmarks_expanded = gtk_tree_view_row_expanded(GTK_TREE_VIEW(treeview), gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), &bookmarks_iter)); gtk_tree_store_clear(treestore); 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:[1306] trunk/geany-plugins/treebrowser/src/ treebrowser.c
by dimitrov-adrian＠users.sourceforge.net 25 Apr '10

25 Apr '10

Revision: 1306 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1306&view=rev Author: dimitrov-adrian Date: 2010-04-25 18:53:59 +0000 (Sun, 25 Apr 2010) Log Message: ----------- Treebrowser: Bookmarks, small fixups // again :D Modified Paths: -------------- trunk/geany-plugins/treebrowser/src/treebrowser.c Modified: trunk/geany-plugins/treebrowser/src/treebrowser.c =================================================================== --- trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-04-25 18:43:01 UTC (rev 1305) +++ trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-04-25 18:53:59 UTC (rev 1306) @@ -370,19 +370,21 @@ } else { - gtk_tree_store_prepend(treestore, &iter, NULL); - gtk_tree_store_set(treestore, &iter, - TREEBROWSER_COLUMN_ICON, NULL, - TREEBROWSER_COLUMN_NAME, NULL, - TREEBROWSER_COLUMN_URI, FALSE, - TREEBROWSER_COLUMN_FLAG, TREEBROWSER_FLAGS_SEPARATOR, - -1); gtk_tree_store_prepend(treestore, &bookmarks_iter, NULL); gtk_tree_store_set(treestore, &bookmarks_iter, TREEBROWSER_COLUMN_ICON, GTK_STOCK_ABOUT, TREEBROWSER_COLUMN_NAME, _("Bookmarks"), TREEBROWSER_COLUMN_URI, FALSE, -1); + + gtk_tree_store_insert_after(treestore, &iter, NULL, &bookmarks_iter); + gtk_tree_store_set(treestore, &iter, + TREEBROWSER_COLUMN_ICON, NULL, + TREEBROWSER_COLUMN_NAME, NULL, + TREEBROWSER_COLUMN_URI, FALSE, + TREEBROWSER_COLUMN_FLAG, TREEBROWSER_FLAGS_SEPARATOR, + -1); + } lines = g_strsplit (contents, "\n", 0); for (line = lines; *line; ++line) @@ -415,12 +417,12 @@ } g_strfreev(lines); g_free(contents); + if (bookmarks_expanded) + gtk_tree_view_expand_row(GTK_TREE_VIEW(treeview), gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), &bookmarks_iter), FALSE); + CONFIG_SHOW_BOOKMARKS = TRUE; } else g_error_free(error); - - if (bookmarks_expanded) - gtk_tree_view_expand_row(GTK_TREE_VIEW(treeview), gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), &bookmarks_iter), FALSE); } static gboolean @@ -782,11 +784,8 @@ on_menu_show_bookmarks(GtkMenuItem *menuitem, gpointer *user_data) { CONFIG_SHOW_BOOKMARKS = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menuitem)); - if (CONFIG_SHOW_BOOKMARKS) - treebrowser_load_bookmarks(); - else - gtk_tree_store_iter_clear_nodes(&bookmarks_iter, TRUE); save_settings(); + treebrowser_chroot(addressbar_last_address); } static void 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:[1305] trunk/geany-plugins/treebrowser/src/ treebrowser.c
by dimitrov-adrian＠users.sourceforge.net 25 Apr '10

25 Apr '10

Revision: 1305 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1305&view=rev Author: dimitrov-adrian Date: 2010-04-25 18:43:01 +0000 (Sun, 25 Apr 2010) Log Message: ----------- Treebrowser: bookmarks expand state remember Modified Paths: -------------- trunk/geany-plugins/treebrowser/src/treebrowser.c Modified: trunk/geany-plugins/treebrowser/src/treebrowser.c =================================================================== --- trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-04-25 18:35:12 UTC (rev 1304) +++ trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-04-25 18:43:01 UTC (rev 1305) @@ -29,6 +29,8 @@ static gchar *addressbar_last_address = NULL; static GtkTreeIter bookmarks_iter; +static gboolean bookmarks_expanded = FALSE; + static GtkTreeViewColumn *treeview_column_icon, *treeview_column_text; static GtkCellRenderer *render_icon, *render_text; @@ -109,6 +111,7 @@ static void project_change_cb(G_GNUC_UNUSED GObject *obj, G_GNUC_UNUSED GKeyFile *config, G_GNUC_UNUSED gpointer data); static void treebrowser_browse(gchar *directory, gpointer parent, gint deep_limit); +static void treebrowser_load_bookmarks(void); static void gtk_tree_store_iter_clear_nodes(gpointer iter, gboolean delete_root); static void load_settings(void); static gboolean save_settings(void); @@ -254,9 +257,16 @@ return; } + if (CONFIG_SHOW_BOOKMARKS) + bookmarks_expanded = gtk_tree_view_row_expanded(GTK_TREE_VIEW(treeview), gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), &bookmarks_iter)); + gtk_tree_store_clear(treestore); addressbar_last_address = directory; + treebrowser_browse(directory, NULL, CONFIG_INITIAL_DIR_DEEP); + + if (CONFIG_SHOW_BOOKMARKS) + treebrowser_load_bookmarks(); } static void @@ -349,14 +359,13 @@ gchar *contents, *path_full; gchar **lines, **line; GtkTreeIter iter; - gboolean expanded = FALSE; bookmarks = g_build_filename (g_get_home_dir(), ".gtk-bookmarks", NULL); if (g_file_get_contents(bookmarks, &contents, NULL, &error)) { if (gtk_tree_store_iter_is_valid(treestore, &bookmarks_iter)) { - expanded = gtk_tree_view_row_expanded(GTK_TREE_VIEW(treeview), gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), &bookmarks_iter)); + bookmarks_expanded = gtk_tree_view_row_expanded(GTK_TREE_VIEW(treeview), gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), &bookmarks_iter)); gtk_tree_store_iter_clear_nodes(&bookmarks_iter, FALSE); } else @@ -410,7 +419,7 @@ else g_error_free(error); - if (expanded) + if (bookmarks_expanded) gtk_tree_view_expand_row(GTK_TREE_VIEW(treeview), gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), &bookmarks_iter), FALSE); } 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:[1304] trunk/geany-plugins/treebrowser
by dimitrov-adrian＠users.sourceforge.net 25 Apr '10

25 Apr '10

Revision: 1304 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1304&view=rev Author: dimitrov-adrian Date: 2010-04-25 18:35:12 +0000 (Sun, 25 Apr 2010) Log Message: ----------- Treebrowser: Added option to open terminal; Bookmarks fixups Modified Paths: -------------- trunk/geany-plugins/treebrowser/ChangeLog trunk/geany-plugins/treebrowser/src/treebrowser.c Modified: trunk/geany-plugins/treebrowser/ChangeLog =================================================================== --- trunk/geany-plugins/treebrowser/ChangeLog 2010-04-25 17:30:41 UTC (rev 1303) +++ trunk/geany-plugins/treebrowser/ChangeLog 2010-04-25 18:35:12 UTC (rev 1304) @@ -41,6 +41,7 @@ Added option to copy the uri into clipboard Added option to search into the view by the name // thanks to native filebrowser Added tooltips with uri // thanks to native filebrowser + Added option to open terminal Applied patch from Enrico to fix gtk+-2.8 compitable for tree lines Modified: trunk/geany-plugins/treebrowser/src/treebrowser.c =================================================================== --- trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-04-25 17:30:41 UTC (rev 1303) +++ trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-04-25 18:35:12 UTC (rev 1304) @@ -56,6 +56,7 @@ static gboolean CONFIG_ON_EXPAND_REFRESH = TRUE; static gboolean CONFIG_ON_DELETE_CLOSE_FILE = TRUE; static gboolean CONFIG_SHOW_TREE_LINES = TRUE; +static gboolean CONFIG_SHOW_BOOKMARKS = FALSE; /* ------------------ * TREEVIEW STRUCT @@ -63,14 +64,17 @@ enum { - TREEBROWSER_COLUMNC = 3, + TREEBROWSER_COLUMNC = 4, - TREEBROWSER_COLUMN_ICON = 0, - TREEBROWSER_COLUMN_NAME = 1, - TREEBROWSER_COLUMN_URI = 2, + TREEBROWSER_COLUMN_ICON = 0, + TREEBROWSER_COLUMN_NAME = 1, + TREEBROWSER_COLUMN_URI = 2, + TREEBROWSER_COLUMN_FLAG = 3, - TREEBROWSER_RENDER_ICON = 0, - TREEBROWSER_RENDER_TEXT = 1 + TREEBROWSER_RENDER_ICON = 0, + TREEBROWSER_RENDER_TEXT = 1, + + TREEBROWSER_FLAGS_SEPARATOR = -1 }; @@ -226,6 +230,19 @@ return g_get_current_dir(); } +static gchar * +get_terminal (void) +{ + gchar *terminal; + const gchar *term = g_getenv("TERM"); + + if (term != NULL) + terminal = g_strdup(term); + else + terminal = g_strdup("xterm"); + return terminal; +} + static void treebrowser_chroot(gchar *directory) { @@ -347,12 +364,13 @@ gtk_tree_store_prepend(treestore, &iter, NULL); gtk_tree_store_set(treestore, &iter, TREEBROWSER_COLUMN_ICON, NULL, - TREEBROWSER_COLUMN_NAME, "--------------------", + TREEBROWSER_COLUMN_NAME, NULL, TREEBROWSER_COLUMN_URI, FALSE, + TREEBROWSER_COLUMN_FLAG, TREEBROWSER_FLAGS_SEPARATOR, -1); gtk_tree_store_prepend(treestore, &bookmarks_iter, NULL); gtk_tree_store_set(treestore, &bookmarks_iter, - TREEBROWSER_COLUMN_ICON, GTK_STOCK_HOME, + TREEBROWSER_COLUMN_ICON, GTK_STOCK_ABOUT, TREEBROWSER_COLUMN_NAME, _("Bookmarks"), TREEBROWSER_COLUMN_URI, FALSE, -1); @@ -572,6 +590,20 @@ } static void +on_menu_open_terminal(GtkMenuItem *menuitem, gchar *uri) +{ + gchar *argv[2] = {NULL, NULL}; + argv[0] = get_terminal(); + + if (g_file_test(uri, G_FILE_TEST_EXISTS)) + uri = g_file_test(uri, G_FILE_TEST_IS_DIR) ? g_strdup(uri) : g_path_get_dirname(uri); + else + uri = addressbar_last_address; + + g_spawn_async(uri, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL); +} + +static void on_menu_set_as_root(GtkMenuItem *menuitem, gchar *uri) { if (g_file_test(uri, G_FILE_TEST_IS_DIR)) @@ -738,6 +770,17 @@ } static void +on_menu_show_bookmarks(GtkMenuItem *menuitem, gpointer *user_data) +{ + CONFIG_SHOW_BOOKMARKS = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menuitem)); + if (CONFIG_SHOW_BOOKMARKS) + treebrowser_load_bookmarks(); + else + gtk_tree_store_iter_clear_nodes(&bookmarks_iter, TRUE); + save_settings(); +} + +static void on_menu_show_hidden_files(GtkMenuItem *menuitem, gpointer *user_data) { CONFIG_SHOW_HIDDEN_FILES = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menuitem)); @@ -774,6 +817,10 @@ g_signal_connect(item, "activate", G_CALLBACK(on_menu_open_externally), uri); gtk_widget_set_sensitive(item, is_exists); + item = ui_image_menu_item_new("utilities-terminal", _("Open Terminal")); + gtk_container_add(GTK_CONTAINER(menu), item); + g_signal_connect(item, "activate", G_CALLBACK(on_menu_open_terminal), uri); + item = ui_image_menu_item_new(GTK_STOCK_GOTO_TOP, _("Set as root")); gtk_container_add(GTK_CONTAINER(menu), item); g_signal_connect(item, "activate", G_CALLBACK(on_menu_set_as_root), uri); @@ -835,6 +882,11 @@ item = gtk_separator_menu_item_new(); gtk_container_add(GTK_CONTAINER(menu), item); + item = gtk_check_menu_item_new_with_mnemonic(_("Show bookmarks")); + gtk_container_add(GTK_CONTAINER(menu), item); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), CONFIG_SHOW_BOOKMARKS); + g_signal_connect(item, "activate", G_CALLBACK(on_menu_show_bookmarks), NULL); + item = gtk_check_menu_item_new_with_mnemonic(_("Show hidden files")); gtk_container_add(GTK_CONTAINER(menu), item); gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), CONFIG_SHOW_HIDDEN_FILES); @@ -1089,6 +1141,14 @@ * TREEBROWSER INITIAL FUNCTIONS * ------------------ */ +static gboolean +treeview_separator_func(GtkTreeModel *model, GtkTreeIter *iter, gpointer data) +{ + guint flag; + gtk_tree_model_get(model, iter, TREEBROWSER_COLUMN_FLAG, &flag, -1); + return (flag == TREEBROWSER_FLAGS_SEPARATOR ? TRUE : FALSE); +} + static GtkWidget* create_view_and_model(void) { @@ -1113,6 +1173,8 @@ gtk_tree_view_set_enable_search(GTK_TREE_VIEW(view), TRUE); gtk_tree_view_set_search_column(GTK_TREE_VIEW(view), TREEBROWSER_COLUMN_NAME); + gtk_tree_view_set_row_separator_func(GTK_TREE_VIEW(view), treeview_separator_func, NULL, NULL); + ui_widget_modify_font_from_string(view, geany->interface_prefs->tagbar_font); if (gtk_check_version(2, 12, 0) == NULL) @@ -1124,7 +1186,7 @@ gtk_tree_view_set_enable_tree_lines(GTK_TREE_VIEW(view), CONFIG_SHOW_TREE_LINES); #endif - treestore = gtk_tree_store_new(TREEBROWSER_COLUMNC, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); + treestore = gtk_tree_store_new(TREEBROWSER_COLUMNC, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT); gtk_tree_view_set_model(GTK_TREE_VIEW(view), GTK_TREE_MODEL(treestore)); g_signal_connect(G_OBJECT(render_text), "edited", G_CALLBACK(on_treeview_renamed), view); @@ -1243,6 +1305,7 @@ GtkWidget *ON_EXPAND_REFRESH; GtkWidget *ON_DELETE_CLOSE_FILE; GtkWidget *SHOW_TREE_LINES; + GtkWidget *SHOW_BOOKMARKS; } configure_widgets; @@ -1265,6 +1328,7 @@ CONFIG_ON_EXPAND_REFRESH = utils_get_setting_boolean(config, "treebrowser", "on_expand_refresh", CONFIG_ON_EXPAND_REFRESH); CONFIG_ON_DELETE_CLOSE_FILE = utils_get_setting_boolean(config, "treebrowser", "on_delete_close_file", CONFIG_ON_DELETE_CLOSE_FILE); CONFIG_SHOW_TREE_LINES = utils_get_setting_boolean(config, "treebrowser", "show_tree_lines", CONFIG_SHOW_TREE_LINES); + CONFIG_SHOW_BOOKMARKS = utils_get_setting_boolean(config, "treebrowser", "show_bookmarks", CONFIG_SHOW_BOOKMARKS); g_key_file_free(config); @@ -1293,6 +1357,7 @@ g_key_file_set_boolean(config, "treebrowser", "on_expand_refresh", CONFIG_ON_EXPAND_REFRESH); g_key_file_set_boolean(config, "treebrowser", "on_delete_close_file", CONFIG_ON_DELETE_CLOSE_FILE); g_key_file_set_boolean(config, "treebrowser", "show_tree_lines", CONFIG_SHOW_TREE_LINES); + g_key_file_set_boolean(config, "treebrowser", "show_bookmarks", CONFIG_SHOW_BOOKMARKS); data = g_key_file_to_data(config, NULL, NULL); utils_write_file(CONFIG_FILE, data); @@ -1319,6 +1384,7 @@ CONFIG_ON_EXPAND_REFRESH = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(configure_widgets.ON_EXPAND_REFRESH)); CONFIG_ON_DELETE_CLOSE_FILE = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(configure_widgets.ON_DELETE_CLOSE_FILE)); CONFIG_SHOW_TREE_LINES = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(configure_widgets.SHOW_TREE_LINES)); + CONFIG_SHOW_BOOKMARKS = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(configure_widgets.SHOW_BOOKMARKS)); if (save_settings() == TRUE) { @@ -1326,6 +1392,8 @@ gtk_tree_view_set_enable_tree_lines(GTK_TREE_VIEW(treeview), CONFIG_SHOW_TREE_LINES); #endif treebrowser_chroot(addressbar_last_address); + if (CONFIG_SHOW_BOOKMARKS) + treebrowser_load_bookmarks(); } else dialogs_show_msgbox(GTK_MESSAGE_ERROR, @@ -1403,17 +1471,23 @@ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(configure_widgets.ON_EXPAND_REFRESH), CONFIG_ON_EXPAND_REFRESH); gtk_box_pack_start(GTK_BOX(vbox), configure_widgets.ON_EXPAND_REFRESH, FALSE, FALSE, 0); - configure_widgets.ON_DELETE_CLOSE_FILE = gtk_check_button_new_with_label(_("On delete file, close it if is opened.")); + configure_widgets.ON_DELETE_CLOSE_FILE = gtk_check_button_new_with_label(_("On delete file, close it if is opened")); gtk_button_set_focus_on_click(GTK_BUTTON(configure_widgets.ON_DELETE_CLOSE_FILE), FALSE); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(configure_widgets.ON_DELETE_CLOSE_FILE), CONFIG_ON_DELETE_CLOSE_FILE); gtk_box_pack_start(GTK_BOX(vbox), configure_widgets.ON_DELETE_CLOSE_FILE, FALSE, FALSE, 0); - configure_widgets.SHOW_TREE_LINES = gtk_check_button_new_with_label(_("Show tree lines.")); + configure_widgets.SHOW_TREE_LINES = gtk_check_button_new_with_label(_("Show tree lines")); gtk_button_set_focus_on_click(GTK_BUTTON(configure_widgets.SHOW_TREE_LINES), FALSE); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(configure_widgets.SHOW_TREE_LINES), CONFIG_SHOW_TREE_LINES); #if GTK_CHECK_VERSION(2, 10, 0) gtk_box_pack_start(GTK_BOX(vbox), configure_widgets.SHOW_TREE_LINES, FALSE, FALSE, 0); #endif + + configure_widgets.SHOW_BOOKMARKS = gtk_check_button_new_with_label(_("Show bookmarks")); + gtk_button_set_focus_on_click(GTK_BUTTON(configure_widgets.SHOW_BOOKMARKS), FALSE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(configure_widgets.SHOW_BOOKMARKS), CONFIG_SHOW_BOOKMARKS); + gtk_box_pack_start(GTK_BOX(vbox), configure_widgets.SHOW_BOOKMARKS, FALSE, FALSE, 0); + gtk_widget_show_all(vbox); g_signal_connect(dialog, "response", G_CALLBACK(on_configure_response), 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:[1303] trunk/geany-plugins/treebrowser/src/ treebrowser.c
by dimitrov-adrian＠users.sourceforge.net 25 Apr '10

25 Apr '10

Revision: 1303 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1303&view=rev Author: dimitrov-adrian Date: 2010-04-25 17:30:41 +0000 (Sun, 25 Apr 2010) Log Message: ----------- Treebrowser: bookmark view tweaks Modified Paths: -------------- trunk/geany-plugins/treebrowser/src/treebrowser.c Modified: trunk/geany-plugins/treebrowser/src/treebrowser.c =================================================================== --- trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-04-25 16:05:32 UTC (rev 1302) +++ trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-04-25 17:30:41 UTC (rev 1303) @@ -28,6 +28,7 @@ static GtkWidget *addressbar; static gchar *addressbar_last_address = NULL; +static GtkTreeIter bookmarks_iter; static GtkTreeViewColumn *treeview_column_icon, *treeview_column_text; static GtkCellRenderer *render_icon, *render_text; @@ -330,17 +331,32 @@ GError *error = NULL; gchar *contents, *path_full; gchar **lines, **line; - GtkTreeIter iter_bookmark, iter; + GtkTreeIter iter; + gboolean expanded = FALSE; bookmarks = g_build_filename (g_get_home_dir(), ".gtk-bookmarks", NULL); - if (g_file_get_contents (bookmarks, &contents, NULL, &error)) + if (g_file_get_contents(bookmarks, &contents, NULL, &error)) { - gtk_tree_store_prepend(treestore, &iter_bookmark, NULL); - gtk_tree_store_set(treestore, &iter_bookmark, - TREEBROWSER_COLUMN_ICON, GTK_STOCK_HOME, - TREEBROWSER_COLUMN_NAME, _("Bookmarks"), - TREEBROWSER_COLUMN_URI, NULL, - -1); + if (gtk_tree_store_iter_is_valid(treestore, &bookmarks_iter)) + { + expanded = gtk_tree_view_row_expanded(GTK_TREE_VIEW(treeview), gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), &bookmarks_iter)); + gtk_tree_store_iter_clear_nodes(&bookmarks_iter, FALSE); + } + else + { + gtk_tree_store_prepend(treestore, &iter, NULL); + gtk_tree_store_set(treestore, &iter, + TREEBROWSER_COLUMN_ICON, NULL, + TREEBROWSER_COLUMN_NAME, "--------------------", + TREEBROWSER_COLUMN_URI, FALSE, + -1); + gtk_tree_store_prepend(treestore, &bookmarks_iter, NULL); + gtk_tree_store_set(treestore, &bookmarks_iter, + TREEBROWSER_COLUMN_ICON, GTK_STOCK_HOME, + TREEBROWSER_COLUMN_NAME, _("Bookmarks"), + TREEBROWSER_COLUMN_URI, FALSE, + -1); + } lines = g_strsplit (contents, "\n", 0); for (line = lines; *line; ++line) { @@ -359,19 +375,25 @@ } if (path_full = g_filename_from_uri(*line, NULL, NULL)) { - gtk_tree_store_append(treestore, &iter, &iter_bookmark); - gtk_tree_store_set(treestore, &iter, - TREEBROWSER_COLUMN_ICON, GTK_STOCK_HOME, - TREEBROWSER_COLUMN_NAME, g_basename(path_full), - TREEBROWSER_COLUMN_URI, path_full, - -1); + if (g_file_test(path_full, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) + { + gtk_tree_store_append(treestore, &iter, &bookmarks_iter); + gtk_tree_store_set(treestore, &iter, + TREEBROWSER_COLUMN_ICON, GTK_STOCK_DIRECTORY, + TREEBROWSER_COLUMN_NAME, g_basename(path_full), + TREEBROWSER_COLUMN_URI, path_full, + -1); + } } } - g_strfreev (lines); - g_free (contents); + g_strfreev(lines); + g_free(contents); } else g_error_free(error); + + if (expanded) + gtk_tree_view_expand_row(GTK_TREE_VIEW(treeview), gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), &bookmarks_iter), FALSE); } static gboolean @@ -732,10 +754,10 @@ static GtkWidget* create_popup_menu(gchar *name, gchar *uri) { - GtkWidget *item, *menu; gboolean is_exists = g_file_test(uri, G_FILE_TEST_EXISTS); gboolean is_dir = is_exists ? g_file_test(uri, G_FILE_TEST_IS_DIR) : FALSE; gboolean is_document = document_find_by_filename(uri) != NULL ? TRUE : FALSE; + GtkWidget *item, *menu; menu = gtk_menu_new(); @@ -910,18 +932,17 @@ gchar *name = "", *uri = ""; if (gtk_tree_selection_get_selected(selection, &model, &iter)) - { gtk_tree_model_get(GTK_TREE_MODEL(treestore), &iter, TREEBROWSER_COLUMN_NAME, &name, TREEBROWSER_COLUMN_URI, &uri, -1); - } if (event->button == 3) { gtk_menu_popup(GTK_MENU(create_popup_menu(name, uri)), NULL, NULL, NULL, NULL, event->button, event->time); return TRUE; } + return FALSE; } @@ -937,6 +958,9 @@ gtk_tree_model_get(GTK_TREE_MODEL(treestore), &iter, TREEBROWSER_COLUMN_URI, &uri, -1); + if (uri == FALSE) + return; + if (g_file_test(uri, G_FILE_TEST_EXISTS)) { if (g_file_test(uri, G_FILE_TEST_IS_DIR)) @@ -960,10 +984,11 @@ gchar *uri; gtk_tree_model_get_iter(GTK_TREE_MODEL(treestore), &iter, path); - gtk_tree_model_get(GTK_TREE_MODEL(treestore), &iter, - TREEBROWSER_COLUMN_URI, &uri, - -1); + gtk_tree_model_get(GTK_TREE_MODEL(treestore), &iter, TREEBROWSER_COLUMN_URI, &uri, -1); + if (uri == FALSE) + return; + if (g_file_test (uri, G_FILE_TEST_IS_DIR)) if (CONFIG_CHROOT_ON_DCLICK) treebrowser_chroot(uri); @@ -981,12 +1006,13 @@ { gchar *uri; + gtk_tree_model_get(GTK_TREE_MODEL(treestore), iter, TREEBROWSER_COLUMN_URI, &uri, -1); + if (uri == FALSE) + return; + if (flag_on_expand_refresh == FALSE && CONFIG_ON_EXPAND_REFRESH == TRUE) { flag_on_expand_refresh = TRUE; - gtk_tree_model_get(GTK_TREE_MODEL(treestore), iter, - TREEBROWSER_COLUMN_URI, &uri, - -1); treebrowser_browse(uri, iter, CONFIG_INITIAL_DIR_DEEP); gtk_tree_view_expand_row(GTK_TREE_VIEW(treeview), path, FALSE); flag_on_expand_refresh = FALSE; @@ -998,6 +1024,11 @@ static void on_treeview_row_collapsed(GtkWidget *widget, GtkTreeIter *iter, GtkTreePath *path, gpointer user_data) { + gchar *uri; + gtk_tree_model_get(GTK_TREE_MODEL(treestore), iter, TREEBROWSER_COLUMN_URI, &uri, -1); + if (uri == FALSE) + return; + gtk_tree_store_set(treestore, iter, TREEBROWSER_COLUMN_ICON, GTK_STOCK_DIRECTORY, -1); } @@ -1148,7 +1179,7 @@ g_signal_connect(wid, "clicked", G_CALLBACK(treebrowser_track_current), NULL); gtk_container_add(GTK_CONTAINER(toolbar), wid); - wid = GTK_WIDGET(gtk_tool_button_new_from_stock(GTK_STOCK_HOME)); + wid = GTK_WIDGET(gtk_tool_button_new_from_stock(GTK_STOCK_ABOUT)); ui_widget_set_tooltip_text(wid, _("Bookmarks")); g_signal_connect(wid, "clicked", G_CALLBACK(treebrowser_load_bookmarks), NULL); gtk_container_add(GTK_CONTAINER(toolbar), wid); 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:[1302] trunk/geany-plugins/treebrowser
by dimitrov-adrian＠users.sourceforge.net 25 Apr '10

25 Apr '10

Revision: 1302 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1302&view=rev Author: dimitrov-adrian Date: 2010-04-25 16:05:32 +0000 (Sun, 25 Apr 2010) Log Message: ----------- Treebrowser: Applied patch from Enrico to fix gtk+-2.8 compitable for tree lines Modified Paths: -------------- trunk/geany-plugins/treebrowser/ChangeLog trunk/geany-plugins/treebrowser/src/treebrowser.c Modified: trunk/geany-plugins/treebrowser/ChangeLog =================================================================== --- trunk/geany-plugins/treebrowser/ChangeLog 2010-04-25 15:28:01 UTC (rev 1301) +++ trunk/geany-plugins/treebrowser/ChangeLog 2010-04-25 16:05:32 UTC (rev 1302) @@ -41,6 +41,7 @@ Added option to copy the uri into clipboard Added option to search into the view by the name // thanks to native filebrowser Added tooltips with uri // thanks to native filebrowser + Applied patch from Enrico to fix gtk+-2.8 compitable for tree lines 19-04-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> Modified: trunk/geany-plugins/treebrowser/src/treebrowser.c =================================================================== --- trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-04-25 15:28:01 UTC (rev 1301) +++ trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-04-25 16:05:32 UTC (rev 1302) @@ -335,15 +335,12 @@ bookmarks = g_build_filename (g_get_home_dir(), ".gtk-bookmarks", NULL); if (g_file_get_contents (bookmarks, &contents, NULL, &error)) { - - //gtk_tree_store_iter_clear_nodes(NULL, FALSE); - /*gtk_tree_store_prepend(treestore, &iter_bookmark, NULL); + gtk_tree_store_prepend(treestore, &iter_bookmark, NULL); gtk_tree_store_set(treestore, &iter_bookmark, TREEBROWSER_COLUMN_ICON, GTK_STOCK_HOME, TREEBROWSER_COLUMN_NAME, _("Bookmarks"), TREEBROWSER_COLUMN_URI, NULL, -1); - */ lines = g_strsplit (contents, "\n", 0); for (line = lines; *line; ++line) { @@ -360,9 +357,9 @@ else name = NULL; } - if (path_full = g_file_get_path(g_file_new_for_uri(*line))) + if (path_full = g_filename_from_uri(*line, NULL, NULL)) { - gtk_tree_store_append(treestore, &iter, NULL); + gtk_tree_store_append(treestore, &iter, &iter_bookmark); gtk_tree_store_set(treestore, &iter, TREEBROWSER_COLUMN_ICON, GTK_STOCK_HOME, TREEBROWSER_COLUMN_NAME, g_basename(path_full), @@ -1090,7 +1087,11 @@ if (gtk_check_version(2, 12, 0) == NULL) g_object_set(view, "has-tooltip", TRUE, "tooltip-column", TREEBROWSER_COLUMN_URI, NULL); + gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(view)), GTK_SELECTION_SINGLE); + +#if GTK_CHECK_VERSION(2, 10, 0) gtk_tree_view_set_enable_tree_lines(GTK_TREE_VIEW(view), CONFIG_SHOW_TREE_LINES); +#endif treestore = gtk_tree_store_new(TREEBROWSER_COLUMNC, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); @@ -1290,7 +1291,9 @@ if (save_settings() == TRUE) { +#if GTK_CHECK_VERSION(2, 10, 0) gtk_tree_view_set_enable_tree_lines(GTK_TREE_VIEW(treeview), CONFIG_SHOW_TREE_LINES); +#endif treebrowser_chroot(addressbar_last_address); } else @@ -1377,8 +1380,9 @@ configure_widgets.SHOW_TREE_LINES = gtk_check_button_new_with_label(_("Show tree lines.")); gtk_button_set_focus_on_click(GTK_BUTTON(configure_widgets.SHOW_TREE_LINES), FALSE); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(configure_widgets.SHOW_TREE_LINES), CONFIG_SHOW_TREE_LINES); +#if GTK_CHECK_VERSION(2, 10, 0) gtk_box_pack_start(GTK_BOX(vbox), configure_widgets.SHOW_TREE_LINES, FALSE, FALSE, 0); - +#endif gtk_widget_show_all(vbox); g_signal_connect(dialog, "response", G_CALLBACK(on_configure_response), 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:[1301] trunk/geany-plugins/treebrowser/src/ treebrowser.c
by dimitrov-adrian＠users.sourceforge.net 25 Apr '10

25 Apr '10

Revision: 1301 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1301&view=rev Author: dimitrov-adrian Date: 2010-04-25 15:28:01 +0000 (Sun, 25 Apr 2010) Log Message: ----------- Treebrowser: (Fixed) Copy full url became inactive if the document isn`t oppened Modified Paths: -------------- trunk/geany-plugins/treebrowser/src/treebrowser.c Modified: trunk/geany-plugins/treebrowser/src/treebrowser.c =================================================================== --- trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-04-25 15:00:33 UTC (rev 1300) +++ trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-04-25 15:28:01 UTC (rev 1301) @@ -328,14 +328,22 @@ { gchar *bookmarks; GError *error = NULL; - gchar *contents; + gchar *contents, *path_full; gchar **lines, **line; - GtkTreeIter iter; + GtkTreeIter iter_bookmark, iter; bookmarks = g_build_filename (g_get_home_dir(), ".gtk-bookmarks", NULL); if (g_file_get_contents (bookmarks, &contents, NULL, &error)) { - gtk_tree_store_iter_clear_nodes(NULL, FALSE); + + //gtk_tree_store_iter_clear_nodes(NULL, FALSE); + /*gtk_tree_store_prepend(treestore, &iter_bookmark, NULL); + gtk_tree_store_set(treestore, &iter_bookmark, + TREEBROWSER_COLUMN_ICON, GTK_STOCK_HOME, + TREEBROWSER_COLUMN_NAME, _("Bookmarks"), + TREEBROWSER_COLUMN_URI, NULL, + -1); + */ lines = g_strsplit (contents, "\n", 0); for (line = lines; *line; ++line) { @@ -351,12 +359,15 @@ } else name = NULL; + } + if (path_full = g_file_get_path(g_file_new_for_uri(*line))) + { gtk_tree_store_append(treestore, &iter, NULL); gtk_tree_store_set(treestore, &iter, - TREEBROWSER_COLUMN_ICON, GTK_STOCK_DIRECTORY, - TREEBROWSER_COLUMN_NAME, g_basename(*line), - TREEBROWSER_COLUMN_URI, g_path_get_dirname(*line), - -1); + TREEBROWSER_COLUMN_ICON, GTK_STOCK_HOME, + TREEBROWSER_COLUMN_NAME, g_basename(path_full), + TREEBROWSER_COLUMN_URI, path_full, + -1); } } g_strfreev (lines); @@ -800,7 +811,7 @@ item = ui_image_menu_item_new(GTK_STOCK_COPY, g_strdup_printf(_("Copy full path"), name)); gtk_container_add(GTK_CONTAINER(menu), item); g_signal_connect(item, "activate", G_CALLBACK(on_menu_copy_uri), uri); - gtk_widget_set_sensitive(item, is_document); + gtk_widget_set_sensitive(item, is_exists); item = gtk_separator_menu_item_new(); gtk_container_add(GTK_CONTAINER(menu), item); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[1300] trunk/geany-plugins/treebrowser
by dimitrov-adrian＠users.sourceforge.net 25 Apr '10

25 Apr '10

Revision: 1300 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1300&view=rev Author: dimitrov-adrian Date: 2010-04-25 15:00:33 +0000 (Sun, 25 Apr 2010) Log Message: ----------- Treebrowser: Added option to show/hide treelines; copy uri to clipboard; search in treeview by name; tooltips in the view; changed style of inactive menu elements from hidden to inactive and... and experimental bookmarks view Modified Paths: -------------- trunk/geany-plugins/treebrowser/ChangeLog trunk/geany-plugins/treebrowser/src/treebrowser.c Modified: trunk/geany-plugins/treebrowser/ChangeLog =================================================================== --- trunk/geany-plugins/treebrowser/ChangeLog 2010-04-25 13:12:47 UTC (rev 1299) +++ trunk/geany-plugins/treebrowser/ChangeLog 2010-04-25 15:00:33 UTC (rev 1300) @@ -35,8 +35,12 @@ 25-04-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> * src/treebrowser.c - Menu elements are inactive instant of hidden + Menu elements are inactive instands of hidden + Added experimental bookmarks view + Added option to show/hide tree lines Added option to copy the uri into clipboard + Added option to search into the view by the name // thanks to native filebrowser + Added tooltips with uri // thanks to native filebrowser 19-04-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> Modified: trunk/geany-plugins/treebrowser/src/treebrowser.c =================================================================== --- trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-04-25 13:12:47 UTC (rev 1299) +++ trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-04-25 15:00:33 UTC (rev 1300) @@ -54,8 +54,8 @@ static gboolean CONFIG_FOLLOW_CURRENT_DOC = TRUE; static gboolean CONFIG_ON_EXPAND_REFRESH = TRUE; static gboolean CONFIG_ON_DELETE_CLOSE_FILE = TRUE; +static gboolean CONFIG_SHOW_TREE_LINES = TRUE; - /* ------------------ * TREEVIEW STRUCT * ------------------ */ @@ -322,6 +322,50 @@ gtk_tree_view_expand_row(GTK_TREE_VIEW(treeview), gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), parent), FALSE); } + +static void +treebrowser_load_bookmarks(void) +{ + gchar *bookmarks; + GError *error = NULL; + gchar *contents; + gchar **lines, **line; + GtkTreeIter iter; + + bookmarks = g_build_filename (g_get_home_dir(), ".gtk-bookmarks", NULL); + if (g_file_get_contents (bookmarks, &contents, NULL, &error)) + { + gtk_tree_store_iter_clear_nodes(NULL, FALSE); + lines = g_strsplit (contents, "\n", 0); + for (line = lines; *line; ++line) + { + if (**line) + { + gchar *pos; + gchar *name; + pos = g_utf8_strchr (*line, -1, ' '); + if (pos != NULL) + { + *pos = '\0'; + name = pos + 1; + } + else + name = NULL; + gtk_tree_store_append(treestore, &iter, NULL); + gtk_tree_store_set(treestore, &iter, + TREEBROWSER_COLUMN_ICON, GTK_STOCK_DIRECTORY, + TREEBROWSER_COLUMN_NAME, g_basename(*line), + TREEBROWSER_COLUMN_URI, g_path_get_dirname(*line), + -1); + } + } + g_strfreev (lines); + g_free (contents); + } + else + g_error_free(error); +} + static gboolean treebrowser_search(gchar *uri, gpointer parent) { @@ -753,7 +797,7 @@ g_signal_connect(item, "activate", G_CALLBACK(on_menu_close), uri); gtk_widget_set_sensitive(item, is_document); - item = ui_image_menu_item_new(GTK_STOCK_COPY, g_strdup_printf(_("Copy URI"), name)); + item = ui_image_menu_item_new(GTK_STOCK_COPY, g_strdup_printf(_("Copy full path"), name)); gtk_container_add(GTK_CONTAINER(menu), item); g_signal_connect(item, "activate", G_CALLBACK(on_menu_copy_uri), uri); gtk_widget_set_sensitive(item, is_document); @@ -1019,9 +1063,6 @@ render_text = gtk_cell_renderer_text_new(); gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(view), FALSE); - - ui_widget_modify_font_from_string(view, geany->interface_prefs->tagbar_font); - gtk_tree_view_append_column(GTK_TREE_VIEW(view), treeview_column_text); gtk_tree_view_column_pack_start(treeview_column_text, render_icon, FALSE); @@ -1030,10 +1071,19 @@ gtk_tree_view_column_pack_start(treeview_column_text, render_text, TRUE); gtk_tree_view_column_add_attribute(treeview_column_text, render_text, "text", TREEBROWSER_RENDER_TEXT); + gtk_tree_view_set_enable_search(GTK_TREE_VIEW(view), TRUE); + gtk_tree_view_set_search_column(GTK_TREE_VIEW(view), TREEBROWSER_COLUMN_NAME); + + ui_widget_modify_font_from_string(view, geany->interface_prefs->tagbar_font); + + if (gtk_check_version(2, 12, 0) == NULL) + g_object_set(view, "has-tooltip", TRUE, "tooltip-column", TREEBROWSER_COLUMN_URI, NULL); + + gtk_tree_view_set_enable_tree_lines(GTK_TREE_VIEW(view), CONFIG_SHOW_TREE_LINES); + treestore = gtk_tree_store_new(TREEBROWSER_COLUMNC, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); gtk_tree_view_set_model(GTK_TREE_VIEW(view), GTK_TREE_MODEL(treestore)); - g_signal_connect(G_OBJECT(render_text), "edited", G_CALLBACK(on_treeview_renamed), view); return view; @@ -1086,6 +1136,11 @@ g_signal_connect(wid, "clicked", G_CALLBACK(treebrowser_track_current), NULL); gtk_container_add(GTK_CONTAINER(toolbar), wid); + wid = GTK_WIDGET(gtk_tool_button_new_from_stock(GTK_STOCK_HOME)); + ui_widget_set_tooltip_text(wid, _("Bookmarks")); + g_signal_connect(wid, "clicked", G_CALLBACK(treebrowser_load_bookmarks), NULL); + gtk_container_add(GTK_CONTAINER(toolbar), wid); + wid = GTK_WIDGET(gtk_tool_button_new_from_stock(GTK_STOCK_CLOSE)); ui_widget_set_tooltip_text(wid, _("Hide bars")); g_signal_connect(wid, "clicked", G_CALLBACK(on_button_hide_bars), NULL); @@ -1144,6 +1199,7 @@ GtkWidget *FOLLOW_CURRENT_DOC; GtkWidget *ON_EXPAND_REFRESH; GtkWidget *ON_DELETE_CLOSE_FILE; + GtkWidget *SHOW_TREE_LINES; } configure_widgets; @@ -1165,6 +1221,7 @@ CONFIG_FOLLOW_CURRENT_DOC = utils_get_setting_boolean(config, "treebrowser", "follow_current_doc", CONFIG_FOLLOW_CURRENT_DOC); CONFIG_ON_EXPAND_REFRESH = utils_get_setting_boolean(config, "treebrowser", "on_expand_refresh", CONFIG_ON_EXPAND_REFRESH); CONFIG_ON_DELETE_CLOSE_FILE = utils_get_setting_boolean(config, "treebrowser", "on_delete_close_file", CONFIG_ON_DELETE_CLOSE_FILE); + CONFIG_SHOW_TREE_LINES = utils_get_setting_boolean(config, "treebrowser", "show_tree_lines", CONFIG_SHOW_TREE_LINES); g_key_file_free(config); @@ -1192,6 +1249,7 @@ g_key_file_set_boolean(config, "treebrowser", "follow_current_doc", CONFIG_FOLLOW_CURRENT_DOC); g_key_file_set_boolean(config, "treebrowser", "on_expand_refresh", CONFIG_ON_EXPAND_REFRESH); g_key_file_set_boolean(config, "treebrowser", "on_delete_close_file", CONFIG_ON_DELETE_CLOSE_FILE); + g_key_file_set_boolean(config, "treebrowser", "show_tree_lines", CONFIG_SHOW_TREE_LINES); data = g_key_file_to_data(config, NULL, NULL); utils_write_file(CONFIG_FILE, data); @@ -1217,9 +1275,13 @@ CONFIG_FOLLOW_CURRENT_DOC = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(configure_widgets.FOLLOW_CURRENT_DOC)); CONFIG_ON_EXPAND_REFRESH = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(configure_widgets.ON_EXPAND_REFRESH)); CONFIG_ON_DELETE_CLOSE_FILE = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(configure_widgets.ON_DELETE_CLOSE_FILE)); + CONFIG_SHOW_TREE_LINES = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(configure_widgets.SHOW_TREE_LINES)); if (save_settings() == TRUE) + { + gtk_tree_view_set_enable_tree_lines(GTK_TREE_VIEW(treeview), CONFIG_SHOW_TREE_LINES); treebrowser_chroot(addressbar_last_address); + } else dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("Plugin configuration directory could not be created.")); @@ -1301,6 +1363,11 @@ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(configure_widgets.ON_DELETE_CLOSE_FILE), CONFIG_ON_DELETE_CLOSE_FILE); gtk_box_pack_start(GTK_BOX(vbox), configure_widgets.ON_DELETE_CLOSE_FILE, FALSE, FALSE, 0); + configure_widgets.SHOW_TREE_LINES = gtk_check_button_new_with_label(_("Show tree lines.")); + gtk_button_set_focus_on_click(GTK_BUTTON(configure_widgets.SHOW_TREE_LINES), FALSE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(configure_widgets.SHOW_TREE_LINES), CONFIG_SHOW_TREE_LINES); + gtk_box_pack_start(GTK_BOX(vbox), configure_widgets.SHOW_TREE_LINES, FALSE, FALSE, 0); + gtk_widget_show_all(vbox); g_signal_connect(dialog, "response", G_CALLBACK(on_configure_response), NULL); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits April 2010