Plugins-Commits March 2010

plugins-commits@lists.geany.org

7 participants
76 discussions

SF.net SVN: geany-plugins:[1201] trunk/geany-plugins/treebrowser
by dimitrov-adrian＠users.sourceforge.net 22 Mar '10

22 Mar '10

Revision: 1201 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1201&view=rev Author: dimitrov-adrian Date: 2010-03-22 20:55:02 +0000 (Mon, 22 Mar 2010) Log Message: ----------- Treebrowser, applied few patches from Enrico Troger (code improvement) 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-03-22 00:47:59 UTC (rev 1200) +++ trunk/geany-plugins/treebrowser/ChangeLog 2010-03-22 20:55:02 UTC (rev 1201) @@ -5,8 +5,11 @@ * src/treebrowser.c fixed some bugs fixed few old compiler warnings + applied few patches from Enrico Troger (code improvement) + 21-03-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> + * src/treebrowser.c fixed few compile warnings with glib and unused vars fixed expanding, now directory is open when it click filling for first time Modified: trunk/geany-plugins/treebrowser/src/treebrowser.c =================================================================== --- trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-03-22 00:47:59 UTC (rev 1200) +++ trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-03-22 20:55:02 UTC (rev 1201) @@ -7,7 +7,6 @@ #include <glib/gstdio.h> #include "geanyplugin.h" -#include "Scintilla.h" /* These items are set by Geany before plugin_init() is called. */ GeanyPlugin *geany_plugin; @@ -72,19 +71,15 @@ * ------------------ */ #define foreach_slist_free(node, list) for (node = list, list = NULL; g_slist_free_1(list), node != NULL; list = node, node = node->next) +static GList* +_gtk_cell_layout_get_cells(GtkTreeViewColumn *column) +{ #if GTK_CHECK_VERSION(2, 12, 0) - static GList* - _gtk_cell_layout_get_cells(GtkTreeViewColumn *column) - { - return gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(column)); - } + return gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(column)); #else - static GList* - _gtk_cell_layout_get_cells(GtkTreeViewColumn *column) - { - return gtk_tree_view_column_get_cell_renderers(column); - } + return gtk_tree_view_column_get_cell_renderers(column); #endif +} /* ------------------ @@ -168,7 +163,6 @@ GtkTreeIter iter, *last_dir_iter = NULL; gboolean is_dir; gchar *utf8_name; - GDir *dir; GSList *list, *node; if (deep_limit < 1) @@ -233,7 +227,7 @@ static gboolean treebrowser_search(gchar *uri, gpointer parent) { - GtkTreeIter iter, iter_parent; + GtkTreeIter iter; GtkTreePath *path; gchar *uri_current; @@ -259,6 +253,7 @@ } while(gtk_tree_model_iter_next(GTK_TREE_MODEL(treestore), &iter)); + return FALSE; } static void @@ -416,7 +411,7 @@ } static void -on_menu_set_as_root(GtkMenuItem *menuitem, gpointer *user_data) +on_menu_set_as_root(GtkMenuItem *menuitem, const gchar *type) { GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); @@ -454,10 +449,10 @@ } else return; - if (type == "directory") + if (utils_str_equal(type, "directory")) uri_new = g_strconcat(uri, G_DIR_SEPARATOR_S, _("NewDirectory"), NULL); else - if (type == "file") + if (utils_str_equal(type, "file")) uri_new = g_strconcat(uri, G_DIR_SEPARATOR_S, _("NewFile"), NULL); else return; @@ -465,7 +460,7 @@ while(g_file_test(uri_new, G_FILE_TEST_EXISTS)) uri_new = g_strconcat(uri_new, "_", NULL); - if (type == "directory") + if (utils_str_equal(type, "directory")) { if (g_mkdir(uri_new, 0755) == 0) treebrowser_browse(uri, &iter, CONFIG_INITIAL_DIR_DEEP); @@ -975,18 +970,17 @@ load_settings(void) { GKeyFile *config = g_key_file_new(); - GError *error = NULL; g_key_file_load_from_file(config, CONFIG_FILE, G_KEY_FILE_NONE, NULL); - CONFIG_OPEN_EXTERNAL_CMD = g_key_file_get_string(config, "treebrowser", "open_external_cmd", &error); - CONFIG_INITIAL_DIR_DEEP = g_key_file_get_integer(config, "treebrowser", "initial_dir_deep", &error); - CONFIG_REVERSE_FILTER = g_key_file_get_boolean(config, "treebrowser", "reverse_filter", &error); - CONFIG_ONE_CLICK_CHDOC = g_key_file_get_boolean(config, "treebrowser", "one_click_chdoc", &error); - CONFIG_SHOW_HIDDEN_FILES = g_key_file_get_boolean(config, "treebrowser", "show_hidden_files", &error); - CONFIG_SHOW_BARS = g_key_file_get_boolean(config, "treebrowser", "show_bars", &error); - CONFIG_CHROOT_ON_DCLICK = g_key_file_get_boolean(config, "treebrowser", "chroot_on_dclick", &error); - CONFIG_FOLLOW_CURRENT_DOC = g_key_file_get_boolean(config, "treebrowser", "follow_current_doc", &error); + CONFIG_OPEN_EXTERNAL_CMD = utils_get_setting_string(config, "treebrowser", "open_external_cmd", CONFIG_OPEN_EXTERNAL_CMD); + CONFIG_INITIAL_DIR_DEEP = utils_get_setting_integer(config, "treebrowser", "initial_dir_deep", CONFIG_INITIAL_DIR_DEEP); + CONFIG_REVERSE_FILTER = utils_get_setting_boolean(config, "treebrowser", "reverse_filter", CONFIG_REVERSE_FILTER); + CONFIG_ONE_CLICK_CHDOC = utils_get_setting_boolean(config, "treebrowser", "one_click_chdoc", CONFIG_ONE_CLICK_CHDOC); + CONFIG_SHOW_HIDDEN_FILES = utils_get_setting_boolean(config, "treebrowser", "show_hidden_files", CONFIG_SHOW_HIDDEN_FILES); + CONFIG_SHOW_BARS = utils_get_setting_boolean(config, "treebrowser", "show_bars", CONFIG_SHOW_BARS); + 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); g_key_file_free(config); } 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:[1200] trunk/geany-plugins/geanygdb
by kugel-＠users.sourceforge.net 22 Mar '10

22 Mar '10

Revision: 1200 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1200&view=rev Author: kugel- Date: 2010-03-22 00:47:59 +0000 (Mon, 22 Mar 2010) Log Message: ----------- Fix the general geany slowness that geanygdb causes once a binary is loaded. Modified Paths: -------------- trunk/geany-plugins/geanygdb/ChangeLog trunk/geany-plugins/geanygdb/src/gdb-io-run.c Modified: trunk/geany-plugins/geanygdb/ChangeLog =================================================================== --- trunk/geany-plugins/geanygdb/ChangeLog 2010-03-21 22:49:45 UTC (rev 1199) +++ trunk/geany-plugins/geanygdb/ChangeLog 2010-03-22 00:47:59 UTC (rev 1200) @@ -1,3 +1,7 @@ +2010-03-22 Thomas Martitz <thomas.martitz(a)student.htw-berlin.de> + + * src/gdb-io-run.c: Fix the general geany slowness that geanygdb causes once a binary is loaded. + 2010-03-15 Thomas Martitz <thomas.martitz(a)student.htw-berlin.de> * src/gdb-io-run.c, src/gdb-ui-break.c: Run gdb with LANG=C to avoid Modified: trunk/geany-plugins/geanygdb/src/gdb-io-run.c =================================================================== --- trunk/geany-plugins/geanygdb/src/gdb-io-run.c 2010-03-21 22:49:45 UTC (rev 1199) +++ trunk/geany-plugins/geanygdb/src/gdb-io-run.c 2010-03-22 00:47:59 UTC (rev 1200) @@ -470,9 +470,9 @@ } st = g_io_channel_flush(src, &err); gerror("Error pushing command", &err); + gdbio_wait(10); } do_loop(); - gdbio_wait(10); return TRUE; } 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:[1199] trunk/geany-plugins/treebrowser
by dimitrov-adrian＠users.sourceforge.net 21 Mar '10

21 Mar '10

Revision: 1199 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1199&view=rev Author: dimitrov-adrian Date: 2010-03-21 22:49:45 +0000 (Sun, 21 Mar 2010) Log Message: ----------- Treebrowser, fixed few old compiler warnings 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-03-21 20:28:11 UTC (rev 1198) +++ trunk/geany-plugins/treebrowser/ChangeLog 2010-03-21 22:49:45 UTC (rev 1199) @@ -1,6 +1,11 @@ Development release ChangeLog ----------------------------- +22-03-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> + * src/treebrowser.c + fixed some bugs + fixed few old compiler warnings + 21-03-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> * src/treebrowser.c fixed few compile warnings with glib and unused vars Modified: trunk/geany-plugins/treebrowser/src/treebrowser.c =================================================================== --- trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-03-21 20:28:11 UTC (rev 1198) +++ trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-03-21 22:49:45 UTC (rev 1199) @@ -105,7 +105,7 @@ gint i; gboolean temporary_reverse = FALSE; - if (base_name == NULL || base_name == "") + if (! NZV(gtk_entry_get_text(GTK_ENTRY(filter)))) return TRUE; filters = g_strsplit(gtk_entry_get_text(GTK_ENTRY(filter)), ";", 0); @@ -976,7 +976,6 @@ { GKeyFile *config = g_key_file_new(); GError *error = NULL; - gboolean tmp; g_key_file_load_from_file(config, CONFIG_FILE, G_KEY_FILE_NONE, NULL); @@ -995,6 +994,10 @@ static void on_configure_response(GtkDialog *dialog, gint response, gpointer user_data) { + GKeyFile *config = g_key_file_new(); + gchar *config_dir = g_path_get_dirname(CONFIG_FILE); + gchar *data; + if (! (response == GTK_RESPONSE_OK || response == GTK_RESPONSE_APPLY)) return; @@ -1007,10 +1010,6 @@ 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)); - GKeyFile *config = g_key_file_new(); - gchar *config_dir = g_path_get_dirname(CONFIG_FILE); - gchar *data; - g_key_file_load_from_file(config, CONFIG_FILE, G_KEY_FILE_NONE, NULL); if (! g_file_test(config_dir, G_FILE_TEST_IS_DIR) && utils_mkdir(config_dir, TRUE) != 0) dialogs_show_msgbox(GTK_MESSAGE_ERROR, 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:[1198] trunk/geany-plugins/treebrowser
by dimitrov-adrian＠users.sourceforge.net 21 Mar '10

21 Mar '10

Revision: 1198 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1198&view=rev Author: dimitrov-adrian Date: 2010-03-21 20:28:11 +0000 (Sun, 21 Mar 2010) Log Message: ----------- Treebrowser, old compilers fix 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-03-21 17:40:24 UTC (rev 1197) +++ trunk/geany-plugins/treebrowser/ChangeLog 2010-03-21 20:28:11 UTC (rev 1198) @@ -13,6 +13,7 @@ added option to close bars in bars added options to expand/collapse all from menu fixed compile error with glib < 2.12.0 + added option to go current doc path in menu 20-03-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> Modified: trunk/geany-plugins/treebrowser/src/treebrowser.c =================================================================== --- trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-03-21 17:40:24 UTC (rev 1197) +++ trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-03-21 20:28:11 UTC (rev 1198) @@ -105,7 +105,7 @@ gint i; gboolean temporary_reverse = FALSE; - if (gtk_entry_get_text_length(GTK_ENTRY(filter)) < 1) + if (base_name == NULL || base_name == "") return TRUE; filters = g_strsplit(gtk_entry_get_text(GTK_ENTRY(filter)), ";", 0); @@ -368,6 +368,12 @@ } static void +on_menu_current_path(GtkMenuItem *menuitem, gpointer *user_data) +{ + treebrowser_chroot(get_default_dir()); +} + +static void on_menu_open_externally(GtkMenuItem *menuitem, gpointer *user_data) { @@ -581,6 +587,10 @@ gtk_container_add(GTK_CONTAINER(menu), item); g_signal_connect(item, "activate", G_CALLBACK(on_menu_go_up), NULL); + item = ui_image_menu_item_new(GTK_STOCK_GO_UP, _("Set path from document")); + gtk_container_add(GTK_CONTAINER(menu), item); + g_signal_connect(item, "activate", G_CALLBACK(on_menu_current_path), NULL); + item = ui_image_menu_item_new(GTK_STOCK_OPEN, _("Open externally")); gtk_container_add(GTK_CONTAINER(menu), item); g_signal_connect(item, "activate", G_CALLBACK(on_menu_open_externally), NULL); @@ -961,7 +971,6 @@ GtkWidget *FOLLOW_CURRENT_DOC; } configure_widgets; - static void load_settings(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:[1197] trunk/geany-plugins/treebrowser
by dimitrov-adrian＠users.sourceforge.net 21 Mar '10

21 Mar '10

Revision: 1197 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1197&view=rev Author: dimitrov-adrian Date: 2010-03-21 17:40:24 +0000 (Sun, 21 Mar 2010) Log Message: ----------- Treebrowser, some fixes and small improvements. 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-03-21 13:15:32 UTC (rev 1196) +++ trunk/geany-plugins/treebrowser/ChangeLog 2010-03-21 17:40:24 UTC (rev 1197) @@ -3,13 +3,16 @@ 21-03-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> * src/treebrowser.c - fix few compile warnings with glib and unused vars - now directory is open when it click filling for first time + fixed few compile warnings with glib and unused vars + fixed expanding, now directory is open when it click filling for first time fixed possible segfault on start added menu option to go up fixed duplicated vbox varname now is 'sidebar_vbox' added configuration dialog - improved externally open menu + fixed externally open menu + added option to close bars in bars + added options to expand/collapse all from menu + fixed compile error with glib < 2.12.0 20-03-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> Modified: trunk/geany-plugins/treebrowser/src/treebrowser.c =================================================================== --- trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-03-21 13:15:32 UTC (rev 1196) +++ trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-03-21 17:40:24 UTC (rev 1197) @@ -23,6 +23,8 @@ static GtkWidget *addressbar; static gchar *addressbar_last_address = NULL; +static GtkWidget *menu_showbars; + static GtkTreeViewColumn *treeview_column_icon, *treeview_column_text; static GtkCellRenderer *render_icon, *render_text; @@ -57,6 +59,7 @@ TREEBROWSER_RENDER_TEXT = 1 }; + /* ------------------ * PLUGIN INFO * ------------------ */ @@ -69,7 +72,21 @@ * ------------------ */ #define foreach_slist_free(node, list) for (node = list, list = NULL; g_slist_free_1(list), node != NULL; list = node, node = node->next) +#if GTK_CHECK_VERSION(2, 12, 0) + static GList* + _gtk_cell_layout_get_cells(GtkTreeViewColumn *column) + { + return gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(column)); + } +#else + static GList* + _gtk_cell_layout_get_cells(GtkTreeViewColumn *column) + { + return gtk_tree_view_column_get_cell_renderers(column); + } +#endif + /* ------------------ * PROTOTYPES * ------------------ */ @@ -149,7 +166,7 @@ treebrowser_browse(gchar *directory, gpointer parent, gint deep_limit) { GtkTreeIter iter, *last_dir_iter = NULL; - gboolean is_dir, expanded; + gboolean is_dir; gchar *utf8_name; GDir *dir; GSList *list, *node; @@ -161,14 +178,6 @@ directory = g_strconcat(directory, G_DIR_SEPARATOR_S, NULL); - if ((parent && gtk_tree_view_row_expanded(GTK_TREE_VIEW(treeview), gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), parent))) - || !gtk_tree_model_iter_has_child(GTK_TREE_MODEL(treestore), parent)) - { - expanded = TRUE; - } - else - expanded = FALSE; - gtk_tree_store_iter_clear_nodes(parent, FALSE); list = utils_get_file_list(directory, NULL, NULL); @@ -219,9 +228,6 @@ } } - if (expanded) - gtk_tree_view_expand_row(GTK_TREE_VIEW(treeview), gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), parent), FALSE); - } static gboolean @@ -300,6 +306,7 @@ if (state) gtk_widget_show(sidebar_vbox_bars); else gtk_widget_hide(sidebar_vbox_bars); CONFIG_SHOW_BARS = state; + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_showbars), CONFIG_SHOW_BARS); } static void @@ -480,8 +487,10 @@ path = gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), &iter); if (G_LIKELY(path != NULL)) { - column = gtk_tree_view_get_column(GTK_TREE_VIEW (treeview), 0); - renderers = gtk_cell_layout_get_cells(GTK_CELL_LAYOUT (column)); + column = gtk_tree_view_get_column(GTK_TREE_VIEW(treeview), 0); + + renderers = _gtk_cell_layout_get_cells(column); + renderer = g_list_nth_data(renderers, TREEBROWSER_RENDER_TEXT); g_object_set(G_OBJECT(renderer), "editable", TRUE, NULL); @@ -525,12 +534,21 @@ GtkTreeIter iter; GtkTreeModel *model; gchar *uri; + gboolean expanded = FALSE; if (gtk_tree_selection_get_selected(selection, &model, &iter)) { gtk_tree_model_get(model, &iter, TREEBROWSER_COLUMN_URI, &uri, -1); if (g_file_test(uri, G_FILE_TEST_IS_DIR)) + { + if (gtk_tree_view_row_expanded(GTK_TREE_VIEW(treeview), gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), &iter))) + expanded = TRUE; + treebrowser_browse(uri, &iter, CONFIG_INITIAL_DIR_DEEP); + + if (expanded) + gtk_tree_view_expand_row(GTK_TREE_VIEW(treeview), gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), &iter), FALSE); + } } } @@ -615,10 +633,10 @@ gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); - item = gtk_check_menu_item_new_with_mnemonic(_("Show bars")); - gtk_container_add(GTK_CONTAINER(menu), item); - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), CONFIG_SHOW_BARS); - g_signal_connect(item, "activate", G_CALLBACK(on_menu_show_bars), NULL); + menu_showbars = gtk_check_menu_item_new_with_mnemonic(_("Show bars")); + gtk_container_add(GTK_CONTAINER(menu), menu_showbars); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_showbars), CONFIG_SHOW_BARS); + g_signal_connect(menu_showbars, "activate", G_CALLBACK(on_menu_show_bars), NULL); gtk_widget_show_all(menu); @@ -655,6 +673,12 @@ } static void +on_button_hide_bars(void) +{ + showbars(FALSE); +} + +static void on_addressbar_activate(GtkEntry *entry, gpointer user_data) { gchar *directory = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1); @@ -691,6 +715,7 @@ GtkTreeIter iter; GtkTreeModel *model; gchar *uri; + gboolean expanded = FALSE; if (gtk_tree_selection_get_selected(GTK_TREE_SELECTION(widget), &model, &iter)) { @@ -700,7 +725,16 @@ if (g_file_test(uri, G_FILE_TEST_EXISTS)) { if (g_file_test(uri, G_FILE_TEST_IS_DIR)) + { + if (gtk_tree_view_row_expanded(GTK_TREE_VIEW(treeview), gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), &iter)) + || !gtk_tree_model_iter_has_child(GTK_TREE_MODEL(treestore), &iter)) + expanded = TRUE; + treebrowser_browse(uri, &iter, CONFIG_INITIAL_DIR_DEEP); + + if (expanded) + gtk_tree_view_expand_row(GTK_TREE_VIEW(treeview), gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), &iter), FALSE); + } else if (CONFIG_ONE_CLICK_CHDOC) document_open_file(uri, FALSE, NULL, NULL); @@ -756,7 +790,7 @@ GtkTreePath *path_parent; column = gtk_tree_view_get_column(GTK_TREE_VIEW(treeview), 0); - renderers = gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(column)); + renderers = _gtk_cell_layout_get_cells(column); renderer = g_list_nth_data(renderers, TREEBROWSER_RENDER_TEXT); g_object_set(G_OBJECT(renderer), "editable", FALSE, NULL); @@ -853,6 +887,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_CLOSE)); + ui_widget_set_tooltip_text(wid, _("Hide bars")); + g_signal_connect(wid, "clicked", G_CALLBACK(on_button_hide_bars), NULL); + gtk_container_add(GTK_CONTAINER(toolbar), wid); + gtk_container_add(GTK_CONTAINER(scrollwin), treeview); gtk_box_pack_start(GTK_BOX(sidebar_vbox_bars), filter, FALSE, TRUE, 1); gtk_box_pack_start(GTK_BOX(sidebar_vbox_bars), addressbar, FALSE, TRUE, 1); @@ -982,6 +1021,8 @@ data = g_key_file_to_data(config, NULL, NULL); utils_write_file(CONFIG_FILE, data); g_free(data); + + treebrowser_chroot(addressbar_last_address); } } 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:[1196] trunk/geany-plugins/treebrowser
by dimitrov-adrian＠users.sourceforge.net 21 Mar '10

21 Mar '10

Revision: 1196 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1196&view=rev Author: dimitrov-adrian Date: 2010-03-21 13:15:32 +0000 (Sun, 21 Mar 2010) Log Message: ----------- Treebrowser, configuration dialog added. 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-03-21 11:12:31 UTC (rev 1195) +++ trunk/geany-plugins/treebrowser/ChangeLog 2010-03-21 13:15:32 UTC (rev 1196) @@ -6,6 +6,10 @@ fix few compile warnings with glib and unused vars now directory is open when it click filling for first time fixed possible segfault on start + added menu option to go up + fixed duplicated vbox varname now is 'sidebar_vbox' + added configuration dialog + improved externally open menu 20-03-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> @@ -76,7 +80,7 @@ TODO --------------------------- (DONE) codestyle improve to be same as other parts as geany`s - * configuration dialog + (DONE) configuration dialog * trackick path to current focused document * Windows compitable * Language files Modified: trunk/geany-plugins/treebrowser/src/treebrowser.c =================================================================== --- trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-03-21 11:12:31 UTC (rev 1195) +++ trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-03-21 13:15:32 UTC (rev 1196) @@ -17,8 +17,8 @@ static gint page_number = 0; static GtkTreeStore *treestore; static GtkWidget *treeview; -static GtkWidget *vbox; -static GtkWidget *vbox_bars; +static GtkWidget *sidebar_vbox; +static GtkWidget *sidebar_vbox_bars; static GtkWidget *filter; static GtkWidget *addressbar; static gchar *addressbar_last_address = NULL; @@ -30,6 +30,9 @@ /* ------------------ * CONFIG VARS * ------------------ */ + +static gchar *CONFIG_FILE = NULL; +static gchar *CONFIG_OPEN_EXTERNAL_CMD = "nautilus '%d'"; static gint CONFIG_INITIAL_DIR_DEEP = 1; static gboolean CONFIG_REVERSE_FILTER = FALSE; static gboolean CONFIG_ONE_CLICK_CHDOC = FALSE; @@ -90,7 +93,7 @@ filters = g_strsplit(gtk_entry_get_text(GTK_ENTRY(filter)), ";", 0); - if (g_strcmp0(filters[0], "!") == 0) + if (utils_str_equal(filters[0], "!") == TRUE) { temporary_reverse = TRUE; i = 1; @@ -239,7 +242,7 @@ return TRUE; } - if (g_strcmp0(uri,uri_current) == 0) + if (utils_str_equal(uri,uri_current) == TRUE) { path = gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), &iter); gtk_tree_view_expand_to_path(GTK_TREE_VIEW(treeview), path); @@ -294,8 +297,8 @@ static void showbars(gboolean state) { - if (state) gtk_widget_show(vbox_bars); - else gtk_widget_hide(vbox_bars); + if (state) gtk_widget_show(sidebar_vbox_bars); + else gtk_widget_hide(sidebar_vbox_bars); CONFIG_SHOW_BARS = state; } @@ -352,20 +355,51 @@ * ------------------*/ static void +on_menu_go_up(GtkMenuItem *menuitem, gpointer *user_data) +{ + treebrowser_chroot(g_path_get_dirname(addressbar_last_address)); +} + +static void on_menu_open_externally(GtkMenuItem *menuitem, gpointer *user_data) { - GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); + GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); GtkTreeIter iter; GtkTreeModel *model; gchar *uri; + gchar *cmd, *locale_cmd, *dir; + GString *cmd_str = g_string_new(CONFIG_OPEN_EXTERNAL_CMD); + GError *error = NULL; + if (gtk_tree_selection_get_selected(selection, &model, &iter)) { gtk_tree_model_get(model, &iter, TREEBROWSER_COLUMN_URI, &uri, -1); - if (g_file_test(uri, G_FILE_TEST_IS_DIR)) - utils_open_browser(uri); + + dir = g_file_test(uri, G_FILE_TEST_IS_DIR) ? g_strdup(uri) : g_path_get_dirname(uri); + + utils_string_replace_all(cmd_str, "%f", uri); + utils_string_replace_all(cmd_str, "%d", dir); + + cmd = g_string_free(cmd_str, FALSE); + locale_cmd = utils_get_locale_from_utf8(cmd); + if (! g_spawn_command_line_async(locale_cmd, &error)) + { + gchar *c = strchr(cmd, ' '); + if (c != NULL) + *c = '\0'; + ui_set_statusbar(TRUE, + _("Could not execute configured external command '%s' (%s)."), + cmd, error->message); + g_error_free(error); + } + g_free(locale_cmd); + g_free(cmd); + g_free(dir); + } + } static void @@ -501,6 +535,18 @@ } static void +on_menu_expand_all(GtkMenuItem *menuitem, gpointer *user_data) +{ + gtk_tree_view_expand_all(GTK_TREE_VIEW(treeview)); +} + +static void +on_menu_collapse_all(GtkMenuItem *menuitem, gpointer *user_data) +{ + gtk_tree_view_collapse_all(GTK_TREE_VIEW(treeview)); +} + +static void on_menu_show_bars(GtkMenuItem *menuitem, gpointer *user_data) { showbars(gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menuitem))); @@ -513,6 +559,10 @@ menu = gtk_menu_new(); + item = ui_image_menu_item_new(GTK_STOCK_GO_UP, _("Go up")); + gtk_container_add(GTK_CONTAINER(menu), item); + g_signal_connect(item, "activate", G_CALLBACK(on_menu_go_up), NULL); + item = ui_image_menu_item_new(GTK_STOCK_OPEN, _("Open externally")); gtk_container_add(GTK_CONTAINER(menu), item); g_signal_connect(item, "activate", G_CALLBACK(on_menu_open_externally), NULL); @@ -553,6 +603,18 @@ gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); + item = ui_image_menu_item_new(GTK_STOCK_GO_FORWARD, _("Expand all")); + gtk_container_add(GTK_CONTAINER(menu), item); + g_signal_connect(item, "activate", G_CALLBACK(on_menu_expand_all), NULL); + + item = ui_image_menu_item_new(GTK_STOCK_GO_BACK, _("Collapse all")); + gtk_container_add(GTK_CONTAINER(menu), item); + g_signal_connect(item, "activate", G_CALLBACK(on_menu_collapse_all), NULL); + + item = gtk_separator_menu_item_new(); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + item = gtk_check_menu_item_new_with_mnemonic(_("Show bars")); gtk_container_add(GTK_CONTAINER(menu), item); gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), CONFIG_SHOW_BARS); @@ -748,8 +810,8 @@ GtkWidget *wid; GtkTreeSelection *selection; - vbox = gtk_vbox_new(FALSE, 0); - vbox_bars = gtk_vbox_new(FALSE, 0); + sidebar_vbox = gtk_vbox_new(FALSE, 0); + sidebar_vbox_bars = gtk_vbox_new(FALSE, 0); selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); addressbar = gtk_entry_new(); @@ -758,7 +820,7 @@ scrollwin = gtk_scrolled_window_new(NULL, NULL); page_number = gtk_notebook_append_page(GTK_NOTEBOOK(geany->main_widgets->sidebar_notebook), - vbox, gtk_label_new(_("Tree Browser"))); + sidebar_vbox, gtk_label_new(_("Tree Browser"))); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollwin), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); @@ -792,12 +854,12 @@ gtk_container_add(GTK_CONTAINER(toolbar), wid); gtk_container_add(GTK_CONTAINER(scrollwin), treeview); - gtk_box_pack_start(GTK_BOX(vbox_bars), filter, FALSE, TRUE, 1); - gtk_box_pack_start(GTK_BOX(vbox_bars), addressbar, FALSE, TRUE, 1); - gtk_box_pack_start(GTK_BOX(vbox_bars), toolbar, FALSE, TRUE, 1); + gtk_box_pack_start(GTK_BOX(sidebar_vbox_bars), filter, FALSE, TRUE, 1); + gtk_box_pack_start(GTK_BOX(sidebar_vbox_bars), addressbar, FALSE, TRUE, 1); + gtk_box_pack_start(GTK_BOX(sidebar_vbox_bars), toolbar, FALSE, TRUE, 1); - gtk_box_pack_start(GTK_BOX(vbox), scrollwin, TRUE, TRUE, 1); - gtk_box_pack_start(GTK_BOX(vbox), vbox_bars, FALSE, TRUE, 1); + 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); @@ -807,7 +869,7 @@ g_signal_connect(addressbar, "activate", G_CALLBACK(on_addressbar_activate), NULL); g_signal_connect(filter, "activate", G_CALLBACK(on_filter_activate), NULL); - gtk_widget_show_all(vbox); + gtk_widget_show_all(sidebar_vbox); showbars(CONFIG_SHOW_BARS); } @@ -848,68 +910,136 @@ * CONFIG DIALOG * ------------------ */ +static struct +{ + GtkWidget *OPEN_EXTERNAL_CMD; + GtkWidget *INITIAL_DIR_DEEP; + GtkWidget *REVERSE_FILTER; + GtkWidget *ONE_CLICK_CHDOC; + GtkWidget *SHOW_HIDDEN_FILES; + GtkWidget *SHOW_BARS; + GtkWidget *CHROOT_ON_DCLICK; + GtkWidget *FOLLOW_CURRENT_DOC; +} configure_widgets; + + static void +load_settings(void) +{ + GKeyFile *config = g_key_file_new(); + GError *error = NULL; + gboolean tmp; + + g_key_file_load_from_file(config, CONFIG_FILE, G_KEY_FILE_NONE, NULL); + + CONFIG_OPEN_EXTERNAL_CMD = g_key_file_get_string(config, "treebrowser", "open_external_cmd", &error); + CONFIG_INITIAL_DIR_DEEP = g_key_file_get_integer(config, "treebrowser", "initial_dir_deep", &error); + CONFIG_REVERSE_FILTER = g_key_file_get_boolean(config, "treebrowser", "reverse_filter", &error); + CONFIG_ONE_CLICK_CHDOC = g_key_file_get_boolean(config, "treebrowser", "one_click_chdoc", &error); + CONFIG_SHOW_HIDDEN_FILES = g_key_file_get_boolean(config, "treebrowser", "show_hidden_files", &error); + CONFIG_SHOW_BARS = g_key_file_get_boolean(config, "treebrowser", "show_bars", &error); + CONFIG_CHROOT_ON_DCLICK = g_key_file_get_boolean(config, "treebrowser", "chroot_on_dclick", &error); + CONFIG_FOLLOW_CURRENT_DOC = g_key_file_get_boolean(config, "treebrowser", "follow_current_doc", &error); + + g_key_file_free(config); +} + +static void on_configure_response(GtkDialog *dialog, gint response, gpointer user_data) { if (! (response == GTK_RESPONSE_OK || response == GTK_RESPONSE_APPLY)) return; - /*dialogs_show_msgbox(GTK_MESSAGE_INFO, "OKAY"); - */ + CONFIG_OPEN_EXTERNAL_CMD = gtk_editable_get_chars(GTK_EDITABLE(configure_widgets.OPEN_EXTERNAL_CMD), 0, -1); + CONFIG_INITIAL_DIR_DEEP = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(configure_widgets.INITIAL_DIR_DEEP)); + CONFIG_REVERSE_FILTER = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(configure_widgets.REVERSE_FILTER)); + 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_SHOW_BARS = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(configure_widgets.SHOW_BARS)); + 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)); + GKeyFile *config = g_key_file_new(); + gchar *config_dir = g_path_get_dirname(CONFIG_FILE); + gchar *data; + + g_key_file_load_from_file(config, CONFIG_FILE, G_KEY_FILE_NONE, NULL); + if (! g_file_test(config_dir, G_FILE_TEST_IS_DIR) && utils_mkdir(config_dir, TRUE) != 0) + dialogs_show_msgbox(GTK_MESSAGE_ERROR, + _("Plugin configuration directory could not be created.")); + else + { + g_key_file_set_string(config, "treebrowser", "open_external_cmd", CONFIG_OPEN_EXTERNAL_CMD); + g_key_file_set_integer(config, "treebrowser", "initial_dir_deep", CONFIG_INITIAL_DIR_DEEP); + g_key_file_set_boolean(config, "treebrowser", "reverse_filter", CONFIG_REVERSE_FILTER); + g_key_file_set_boolean(config, "treebrowser", "one_click_chdoc", CONFIG_ONE_CLICK_CHDOC); + g_key_file_set_boolean(config, "treebrowser", "show_hidden_files", CONFIG_SHOW_HIDDEN_FILES); + g_key_file_set_boolean(config, "treebrowser", "show_bars", CONFIG_SHOW_BARS); + 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); + + /* write config to file */ + data = g_key_file_to_data(config, NULL, NULL); + utils_write_file(CONFIG_FILE, data); + g_free(data); + } + } GtkWidget* plugin_configure(GtkDialog *dialog) { - GtkWidget *label, *entry, *checkbox; + GtkWidget *label; GtkWidget *vbox, *hbox; - vbox = gtk_vbox_new(FALSE, 0); + vbox = gtk_vbox_new(FALSE, 0); - label = gtk_label_new(_("This is experimental and not working for now.")); - gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); - - hbox = gtk_hbox_new(FALSE, 0); - label = gtk_label_new(_("External open command: ")); + 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); gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + ui_widget_set_tooltip_text(configure_widgets.OPEN_EXTERNAL_CMD, + _("The command to execute when using \"Open with\". You can use %f and %d wildcards.\n" + "%f will be replaced with the filename including full path\n" + "%d will be replaced with the path name of the selected file without the filename")); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - entry = gtk_entry_new(); - gtk_box_pack_start(GTK_BOX(hbox), entry, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), configure_widgets.OPEN_EXTERNAL_CMD, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 6); - hbox = gtk_hbox_new(FALSE, 0); - label = gtk_label_new(_("Initial directory deep: ")); + hbox = gtk_hbox_new(FALSE, 0); + label = gtk_label_new(_("Default directory deep to fill: ")); + configure_widgets.INITIAL_DIR_DEEP = gtk_spin_button_new_with_range(1, 99, 1); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(configure_widgets.INITIAL_DIR_DEEP), CONFIG_INITIAL_DIR_DEEP); gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - entry = gtk_entry_new(); - gtk_box_pack_start(GTK_BOX(hbox), entry, FALSE, FALSE, 0); + 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); - checkbox = gtk_check_button_new_with_label(_("Show hidden files")); - gtk_button_set_focus_on_click(GTK_BUTTON(checkbox), FALSE); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox), CONFIG_SHOW_HIDDEN_FILES); - gtk_box_pack_start(GTK_BOX(vbox), checkbox, 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); + gtk_box_pack_start(GTK_BOX(vbox), configure_widgets.SHOW_HIDDEN_FILES, FALSE, FALSE, 0); - checkbox = gtk_check_button_new_with_label(_("Reverse filter")); - gtk_button_set_focus_on_click(GTK_BUTTON(checkbox), FALSE); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox), CONFIG_REVERSE_FILTER); - gtk_box_pack_start(GTK_BOX(vbox), checkbox, FALSE, FALSE, 0); + configure_widgets.REVERSE_FILTER = gtk_check_button_new_with_label(_("Reverse filter")); + gtk_button_set_focus_on_click(GTK_BUTTON(configure_widgets.REVERSE_FILTER), FALSE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(configure_widgets.REVERSE_FILTER), CONFIG_REVERSE_FILTER); + gtk_box_pack_start(GTK_BOX(vbox), configure_widgets.REVERSE_FILTER, FALSE, FALSE, 0); - checkbox = gtk_check_button_new_with_label(_("Follow path")); - gtk_button_set_focus_on_click(GTK_BUTTON(checkbox), FALSE); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox), CONFIG_FOLLOW_CURRENT_DOC); - gtk_box_pack_start(GTK_BOX(vbox), checkbox, FALSE, FALSE, 0); + configure_widgets.FOLLOW_CURRENT_DOC = gtk_check_button_new_with_label(_("Follow current document")); + gtk_button_set_focus_on_click(GTK_BUTTON(configure_widgets.FOLLOW_CURRENT_DOC), FALSE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(configure_widgets.FOLLOW_CURRENT_DOC), CONFIG_FOLLOW_CURRENT_DOC); + gtk_box_pack_start(GTK_BOX(vbox), configure_widgets.FOLLOW_CURRENT_DOC, FALSE, FALSE, 0); - checkbox = gtk_check_button_new_with_label(_("On click document change")); - gtk_button_set_focus_on_click(GTK_BUTTON(checkbox), FALSE); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox), CONFIG_ONE_CLICK_CHDOC); - gtk_box_pack_start(GTK_BOX(vbox), checkbox, FALSE, FALSE, 0); + configure_widgets.ONE_CLICK_CHDOC = gtk_check_button_new_with_label(_("On click document change")); + gtk_button_set_focus_on_click(GTK_BUTTON(configure_widgets.ONE_CLICK_CHDOC), FALSE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(configure_widgets.ONE_CLICK_CHDOC), CONFIG_ONE_CLICK_CHDOC); + gtk_box_pack_start(GTK_BOX(vbox), configure_widgets.ONE_CLICK_CHDOC, FALSE, FALSE, 0); - checkbox = gtk_check_button_new_with_label(_("Chroot on dclick")); - gtk_button_set_focus_on_click(GTK_BUTTON(checkbox), FALSE); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox), CONFIG_CHROOT_ON_DCLICK); - gtk_box_pack_start(GTK_BOX(vbox), checkbox, FALSE, FALSE, 0); + configure_widgets.CHROOT_ON_DCLICK = gtk_check_button_new_with_label(_("Chroot on dclick")); + gtk_button_set_focus_on_click(GTK_BUTTON(configure_widgets.CHROOT_ON_DCLICK), FALSE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(configure_widgets.CHROOT_ON_DCLICK), CONFIG_CHROOT_ON_DCLICK); + gtk_box_pack_start(GTK_BOX(vbox), configure_widgets.CHROOT_ON_DCLICK, FALSE, FALSE, 0); gtk_widget_show_all(vbox); @@ -926,6 +1056,11 @@ void plugin_init(GeanyData *data) { + CONFIG_FILE = g_strconcat(geany->app->configdir, G_DIR_SEPARATOR_S, "plugins", G_DIR_SEPARATOR_S, + "treebrowser", G_DIR_SEPARATOR_S, "treebrowser.conf", NULL); + + load_settings(); + treeview = create_view_and_model(); create_sidebar(); treebrowser_chroot(get_default_dir()); @@ -937,5 +1072,5 @@ void plugin_cleanup(void) { - gtk_widget_destroy(GTK_WIDGET(vbox)); + gtk_widget_destroy(GTK_WIDGET(sidebar_vbox)); } 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:[1195] trunk/geany-plugins/treebrowser
by dimitrov-adrian＠users.sourceforge.net 21 Mar '10

21 Mar '10

Revision: 1195 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1195&view=rev Author: dimitrov-adrian Date: 2010-03-21 11:12:31 +0000 (Sun, 21 Mar 2010) Log Message: ----------- Treebrowser, fixed possible segfault onstart. 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-03-21 08:26:45 UTC (rev 1194) +++ trunk/geany-plugins/treebrowser/ChangeLog 2010-03-21 11:12:31 UTC (rev 1195) @@ -5,6 +5,7 @@ * src/treebrowser.c fix few compile warnings with glib and unused vars now directory is open when it click filling for first time + fixed possible segfault on start 20-03-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> Modified: trunk/geany-plugins/treebrowser/src/treebrowser.c =================================================================== --- trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-03-21 08:26:45 UTC (rev 1194) +++ trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-03-21 11:12:31 UTC (rev 1195) @@ -36,7 +36,7 @@ static gboolean CONFIG_SHOW_HIDDEN_FILES = FALSE; static gboolean CONFIG_SHOW_BARS = TRUE; static gboolean CONFIG_CHROOT_ON_DCLICK = FALSE; -static gboolean CONFIG_FOLLOW_CURRENT_DOC = FALSE; +static gboolean CONFIG_FOLLOW_CURRENT_DOC = TRUE; /* ------------------ @@ -732,7 +732,7 @@ treebrowser_track_current_cb(void) { if (CONFIG_FOLLOW_CURRENT_DOC) - treebrowser_track_current_cb(); + treebrowser_track_current(); } 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:[1194] trunk/geany-plugins/treebrowser
by dimitrov-adrian＠users.sourceforge.net 21 Mar '10

21 Mar '10

Revision: 1194 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1194&view=rev Author: dimitrov-adrian Date: 2010-03-21 08:26:45 +0000 (Sun, 21 Mar 2010) Log Message: ----------- Fix few compile warnings with glib and unused vars, and directory opening 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-03-20 18:21:35 UTC (rev 1193) +++ trunk/geany-plugins/treebrowser/ChangeLog 2010-03-21 08:26:45 UTC (rev 1194) @@ -1,7 +1,12 @@ Development release ChangeLog ----------------------------- +21-03-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> + * src/treebrowser.c + fix few compile warnings with glib and unused vars + now directory is open when it click filling for first time + 20-03-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> * src/treebrowser.c Modified: trunk/geany-plugins/treebrowser/src/treebrowser.c =================================================================== --- trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-03-20 18:21:35 UTC (rev 1193) +++ trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-03-21 08:26:45 UTC (rev 1194) @@ -4,6 +4,8 @@ * Copyright 2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> */ +#include <glib/gstdio.h> + #include "geanyplugin.h" #include "Scintilla.h" @@ -144,12 +146,9 @@ treebrowser_browse(gchar *directory, gpointer parent, gint deep_limit) { GtkTreeIter iter, *last_dir_iter = NULL; - gchar *path, *path_new, *display_name; gboolean is_dir, expanded; + gchar *utf8_name; GDir *dir; - - const gchar *name, *basename; - gchar *utf8_dir, *utf8_name; GSList *list, *node; if (deep_limit < 1) @@ -159,8 +158,11 @@ directory = g_strconcat(directory, G_DIR_SEPARATOR_S, NULL); - if (parent && gtk_tree_view_row_expanded(GTK_TREE_VIEW(treeview), gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), parent))) + if ((parent && gtk_tree_view_row_expanded(GTK_TREE_VIEW(treeview), gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), parent))) + || !gtk_tree_model_iter_has_child(GTK_TREE_MODEL(treestore), parent)) + { expanded = TRUE; + } else expanded = FALSE; @@ -193,7 +195,8 @@ TREEBROWSER_COLUMN_NAME, fname, TREEBROWSER_COLUMN_URI, uri, -1); - treebrowser_browse(uri, &iter, deep_limit); + if (deep_limit > 0) + treebrowser_browse(uri, &iter, deep_limit); } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

Nightly build failed: Plugins GTK 2.8 build test
by noreply＠nightly.geany.org 21 Mar '10

21 Mar '10

Plugins GTK 2.8 build test failed at: plugins loading test See http://nightly.geany.org/misc/build_gtk28_plugins_stderr.log for details. Error messages: ../../gtk28_test_plugins/codenav/src/codenavigation.c: In function 'plugin_configure': ../../gtk28_test_plugins/codenav/src/codenavigation.c:90: warning: ISO C90 forbids mixed declarations and code ../../gtk28_test_plugins/codenav/src/codenavigation.c: In function 'plugin_cleanup': ../../gtk28_test_plugins/codenav/src/codenavigation.c:111: warning: unused variable 'edit_menu' ... ../../gtk28_test_plugins/treebrowser/src/treebrowser.c:447: warning: implicit declaration of function 'gtk_cell_layout_get_cells' ../../gtk28_test_plugins/treebrowser/src/treebrowser.c:447: warning: assignment makes pointer from integer without a cast ../../gtk28_test_plugins/treebrowser/src/treebrowser.c: In function 'on_treeview_renamed': ../../gtk28_test_plugins/treebrowser/src/treebrowser.c:694: warning: assignment makes pointer from integer without a cast ../../gtk28_test_plugins/treebrowser/src/treebrowser.c:705: warning: implicit declaration of function 'g_rename' ** (plugin_test:22196): WARNING **: Can't load plugin: /home/enrico/geany/_build_/plugins_gtk28/default/treebrowser.so: undefined symbol: g_strcmp0 http://nightly.geany.org/

1 0

SF.net SVN: geany-plugins:[1193] trunk/geanylatex/src/geanylatex.c
by frlan＠users.sourceforge.net 20 Mar '10

20 Mar '10

Revision: 1193 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1193&view=rev Author: frlan Date: 2010-03-20 18:21:35 +0000 (Sat, 20 Mar 2010) Log Message: ----------- GeanyLaTeX: Adding options for inserting usecpakge function to dialog Modified Paths: -------------- trunk/geanylatex/src/geanylatex.c Modified: trunk/geanylatex/src/geanylatex.c =================================================================== --- trunk/geanylatex/src/geanylatex.c 2010-03-20 18:20:45 UTC (rev 1192) +++ trunk/geanylatex/src/geanylatex.c 2010-03-20 18:21:35 UTC (rev 1193) @@ -1025,6 +1025,8 @@ GtkWidget *label = NULL; GtkWidget *textbox = NULL; GtkWidget *table = NULL; + GtkWidget *label_options = NULL; + GtkWidget *textbox_options = NULL; dialog = gtk_dialog_new_with_buttons(_("Add additional package"), GTK_WINDOW(geany->main_widgets->window), @@ -1042,20 +1044,28 @@ label = gtk_label_new(_("Package name:")); textbox = gtk_entry_new(); + label_options = gtk_label_new(_("Package options:")); + textbox_options = gtk_entry_new(); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_misc_set_alignment(GTK_MISC(label_options), 0, 0.5); gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1); gtk_table_attach_defaults(GTK_TABLE(table), textbox, 1, 2, 0, 1); + gtk_table_attach_defaults(GTK_TABLE(table), label_options, 0, 1, 1, 2); + gtk_table_attach_defaults(GTK_TABLE(table), textbox_options, 1, 2, 1, 2); + gtk_container_add(GTK_CONTAINER(vbox), table); gtk_widget_show_all(vbox); if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) { - const gchar *pkg; + const gchar *pkg = NULL; + const gchar *option = NULL; pkg = gtk_entry_get_text(GTK_ENTRY(textbox)); - glatex_usepackage(pkg, NULL); - + option = gtk_entry_get_text(GTK_ENTRY(textbox_options)); + glatex_usepackage(pkg, option); } gtk_widget_destroy(dialog); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits March 2010