Plugins-Commits October 2010

plugins-commits@lists.geany.org

8 participants
80 discussions

SF.net SVN: geany-plugins:[1626] trunk/geany-plugins/treebrowser
by dimitrov-adrian＠users.sourceforge.net 05 Oct '10

05 Oct '10

Revision: 1626 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1626&view=rev Author: dimitrov-adrian Date: 2010-10-05 19:19:20 +0000 (Tue, 05 Oct 2010) Log Message: ----------- Fixed wrong english message for not existing directory. 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-10-05 17:12:13 UTC (rev 1625) +++ trunk/geany-plugins/treebrowser/ChangeLog 2010-10-05 19:19:20 UTC (rev 1626) @@ -41,6 +41,8 @@ 05-10-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> * src/treebrowser.c + Fixed wrong english message for not existing directory + (thanks to Dimitar Zhekov (dimitar.zhekov(a)gmail.com)) Added option to autorename point the newest created objects by the Treebrowser Improved autorename focus while renamed is successful then close old and open new file; Modified: trunk/geany-plugins/treebrowser/src/treebrowser.c =================================================================== --- trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-10-05 17:12:13 UTC (rev 1625) +++ trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-10-05 19:19:20 UTC (rev 1626) @@ -261,7 +261,7 @@ if (! g_file_test(directory, G_FILE_TEST_IS_DIR)) { if (CONFIG_SHOW_BARS == 0) - dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("Directory '%s' not exists."), directory); + dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("%s: no such directory."), directory); return; } 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:[1625] trunk/geany-plugins/treebrowser
by dimitrov-adrian＠users.sourceforge.net 05 Oct '10

05 Oct '10

Revision: 1625 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1625&view=rev Author: dimitrov-adrian Date: 2010-10-05 17:12:13 +0000 (Tue, 05 Oct 2010) Log Message: ----------- CRITICAL error fixed when loading the plugin 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-10-05 16:46:28 UTC (rev 1624) +++ trunk/geany-plugins/treebrowser/ChangeLog 2010-10-05 17:12:13 UTC (rev 1625) @@ -47,6 +47,7 @@ Improved dialog for nonexisting folder (now apear only when toolbars is hidden) Fixed some warnings when compiling + Fixed gtk_tree_store_iter_is_valid() warning when loading the plugin 03-10-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> Modified: trunk/geany-plugins/treebrowser/src/treebrowser.c =================================================================== --- trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-10-05 16:46:28 UTC (rev 1624) +++ trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-10-05 17:12:13 UTC (rev 1625) @@ -286,7 +286,7 @@ directory = g_strconcat(directory, G_DIR_SEPARATOR_S, NULL); - has_parent = gtk_tree_store_iter_is_valid(treestore, parent); + has_parent = parent ? gtk_tree_store_iter_is_valid(treestore, parent) : FALSE; if (has_parent) { if (parent == &bookmarks_iter) 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:[1624] trunk/geany-plugins/treebrowser/ChangeLog
by dimitrov-adrian＠users.sourceforge.net 05 Oct '10

05 Oct '10

Revision: 1624 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1624&view=rev Author: dimitrov-adrian Date: 2010-10-05 16:46:28 +0000 (Tue, 05 Oct 2010) Log Message: ----------- ChangeLog update Modified Paths: -------------- trunk/geany-plugins/treebrowser/ChangeLog Modified: trunk/geany-plugins/treebrowser/ChangeLog =================================================================== --- trunk/geany-plugins/treebrowser/ChangeLog 2010-10-05 16:45:11 UTC (rev 1623) +++ trunk/geany-plugins/treebrowser/ChangeLog 2010-10-05 16:46:28 UTC (rev 1624) @@ -38,7 +38,7 @@ | Development release ChangeLog | +-------------------------------+ -03-10-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> +05-10-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> * src/treebrowser.c Added option to autorename point the newest created objects by the Treebrowser 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:[1623] trunk/geany-plugins/treebrowser
by dimitrov-adrian＠users.sourceforge.net 05 Oct '10

05 Oct '10

Revision: 1623 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1623&view=rev Author: dimitrov-adrian Date: 2010-10-05 16:45:11 +0000 (Tue, 05 Oct 2010) Log Message: ----------- Add option to autorename point the newest created objects by the Treebrowser; Minnor fixes. 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-10-05 14:50:41 UTC (rev 1622) +++ trunk/geany-plugins/treebrowser/ChangeLog 2010-10-05 16:45:11 UTC (rev 1623) @@ -3,7 +3,7 @@ | KNOWN BUGS | +---------------------------+ - * http://sourceforge.net/tracker/?func=detail&aid=3034450&group_id=222729&ati… + (FIXED) http://sourceforge.net/tracker/?func=detail&aid=3034450&group_id=222729&ati… * CRYTICAL warning when unloading the plugin "CRITICAL : g_object_ref: assertion `object->ref_count > 0' failed" (FIXED) Double click on bookmarks, do nothing @@ -31,7 +31,7 @@ * Migrating to stash * Adding keybindings for renaming/deleting/refreshing (DONE) Add option to change bars position // requested by <dmaphy> - * Add option to autorename point the newest created objects by the Treebrowser + (DONE) Add option to autorename point the newest created objects by the Treebrowser +-------------------------------+ @@ -41,6 +41,11 @@ 03-10-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> * src/treebrowser.c + Added option to autorename point the newest created objects by the Treebrowser + Improved autorename focus while renamed is successful then close old and + open new file; + Improved dialog for nonexisting folder + (now apear only when toolbars is hidden) Fixed some warnings when compiling 03-10-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> Modified: trunk/geany-plugins/treebrowser/src/treebrowser.c =================================================================== --- trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-10-05 14:50:41 UTC (rev 1622) +++ trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-10-05 16:45:11 UTC (rev 1623) @@ -43,7 +43,6 @@ static gboolean flag_on_expand_refresh = FALSE; - /* ------------------ * CONFIG VARS * ------------------ */ @@ -261,7 +260,9 @@ if (! g_file_test(directory, G_FILE_TEST_IS_DIR)) { - dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("Directory '%s' not exists."), directory); + if (CONFIG_SHOW_BARS == 0) + dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("Directory '%s' not exists."), directory); + return; } @@ -478,19 +479,17 @@ gtk_tree_model_get(GTK_TREE_MODEL(treestore), &iter, TREEBROWSER_COLUMN_URI, &uri_current, -1); if (gtk_tree_model_iter_has_child(GTK_TREE_MODEL(treestore), &iter)) - { if (treebrowser_search(uri, &iter)) return TRUE; + + 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); + gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(treeview), path, TREEBROWSER_COLUMN_ICON, FALSE, 0, 0); + gtk_tree_view_set_cursor(GTK_TREE_VIEW(treeview), path, treeview_column_text, FALSE); + return TRUE; } - else - 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); - gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(treeview), path, TREEBROWSER_COLUMN_ICON, FALSE, 0, 0); - gtk_tree_view_set_cursor(GTK_TREE_VIEW(treeview), path, treeview_column_text, FALSE); - return TRUE; - } } while(gtk_tree_model_iter_next(GTK_TREE_MODEL(treestore), &iter)); @@ -599,7 +598,35 @@ return FALSE; } +static gboolean +treebrowser_iter_rename(gpointer iter) +{ + GtkTreeModel *model; + GtkTreeViewColumn *column; + GtkCellRenderer *renderer; + GtkTreePath *path; + GList *renderers; + if (gtk_tree_store_iter_is_valid(treestore, iter)) + { + 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(column); + renderer = g_list_nth_data(renderers, TREEBROWSER_RENDER_TEXT); + + g_object_set(G_OBJECT(renderer), "editable", TRUE, NULL); + gtk_tree_view_set_cursor_on_cell(GTK_TREE_VIEW(treeview), path, column, renderer, TRUE); + + gtk_tree_path_free(path); + g_list_free(renderers); + return TRUE; + } + } + return FALSE; +} + /* ------------------ * RIGHTCLICK MENU EVENTS * ------------------*/ @@ -710,13 +737,24 @@ { if (g_mkdir(uri_new, 0755) == 0) treebrowser_browse(uri, refresh_root ? NULL : &iter); + else + return; } else { if (g_creat(uri_new, 0755) != -1) treebrowser_browse(uri, refresh_root ? NULL : &iter); + else + return; } + if (treebrowser_search(uri_new, NULL)) + { + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); + if (gtk_tree_selection_get_selected(selection, &model, &iter)) + treebrowser_iter_rename(&iter); + } + } static void @@ -725,27 +763,9 @@ GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); GtkTreeIter iter; GtkTreeModel *model; - GtkTreeViewColumn *column; - GtkCellRenderer *renderer; - GtkTreePath *path; - GList *renderers; if (gtk_tree_selection_get_selected(selection, &model, &iter)) - { - 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(column); - renderer = g_list_nth_data(renderers, TREEBROWSER_RENDER_TEXT); - - g_object_set(G_OBJECT(renderer), "editable", TRUE, NULL); - gtk_tree_view_set_cursor_on_cell(GTK_TREE_VIEW(treeview), path, column, renderer, TRUE); - - gtk_tree_path_free(path); - g_list_free(renderers); - } - } + treebrowser_iter_rename(&iter); } static void @@ -765,7 +785,7 @@ if (dialogs_show_question(_("Do you really want to delete '%s' ?"), uri)) { - if (CONFIG_ON_DELETE_CLOSE_FILE && ! g_file_test(uri, G_FILE_TEST_IS_DIR)) + if (CONFIG_ON_DELETE_CLOSE_FILE && !g_file_test(uri, G_FILE_TEST_IS_DIR)) document_close(document_find_by_filename(uri)); fs_remove(uri, TRUE); @@ -1178,6 +1198,10 @@ } else treebrowser_browse(g_path_get_dirname(uri_new), NULL); + + if (!g_file_test(uri, G_FILE_TEST_IS_DIR)) + if (document_close(document_find_by_filename(uri))) + document_open_file(uri_new, FALSE, NULL, 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:[1622] trunk/geany-plugins/treebrowser
by dimitrov-adrian＠users.sourceforge.net 05 Oct '10

05 Oct '10

Revision: 1622 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1622&view=rev Author: dimitrov-adrian Date: 2010-10-05 14:50:41 +0000 (Tue, 05 Oct 2010) Log Message: ----------- Fixed some warnings when compiling. 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-10-03 18:29:28 UTC (rev 1621) +++ trunk/geany-plugins/treebrowser/ChangeLog 2010-10-05 14:50:41 UTC (rev 1622) @@ -41,6 +41,11 @@ 03-10-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> * src/treebrowser.c + Fixed some warnings when compiling + +03-10-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> + + * src/treebrowser.c Fixed bugs in Bookmarks (directory expander, renaming and deleting files/directories) Fixed bug with empty path to chroot Modified: trunk/geany-plugins/treebrowser/src/treebrowser.c =================================================================== --- trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-10-03 18:29:28 UTC (rev 1621) +++ trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-10-05 14:50:41 UTC (rev 1622) @@ -112,11 +112,11 @@ 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); -static void treebrowser_bookmarks_set_state(void); -static void treebrowser_load_bookmarks(void); +static void treebrowser_bookmarks_set_state(); +static void treebrowser_load_bookmarks(); static void gtk_tree_store_iter_clear_nodes(gpointer iter, gboolean delete_root); -static void load_settings(void); -static gboolean save_settings(void); +static void load_settings(); +static gboolean save_settings(); /* ------------------ @@ -178,7 +178,7 @@ #ifdef G_OS_WIN32 #ifdef HAVE_GIO_2_0 - GError *error = NULL; + GError *error; GFile *file; GFileInfo *info; @@ -215,7 +215,7 @@ } static gchar* -get_default_dir(void) +get_default_dir() { gchar *dir; GeanyProject *project = geany->app->project; @@ -236,7 +236,7 @@ } static gchar * -get_terminal(void) +get_terminal() { gchar *terminal; const gchar *term = g_getenv("TERM"); @@ -278,7 +278,7 @@ treebrowser_browse(gchar *directory, gpointer parent) { GtkTreeIter iter, iter_empty, *last_dir_iter = NULL; - gboolean is_dir, is_hidden, is_parent_bookmarks; + gboolean is_dir; gboolean expanded = FALSE, has_parent; gchar *utf8_name; GSList *list, *node; @@ -375,7 +375,7 @@ } static void -treebrowser_bookmarks_set_state(void) +treebrowser_bookmarks_set_state() { if (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)); @@ -384,7 +384,7 @@ } static void -treebrowser_load_bookmarks(void) +treebrowser_load_bookmarks() { gchar *bookmarks; GError *error = NULL; @@ -568,7 +568,7 @@ } static gboolean -treebrowser_track_current(void) +treebrowser_track_current() { GeanyDocument *doc = document_get_current(); @@ -930,7 +930,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 full path to clipboard"), name)); + item = ui_image_menu_item_new(GTK_STOCK_COPY, _("Copy full path to clipboard")); 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_exists); @@ -964,31 +964,31 @@ * ------------------ */ static void -on_button_go_up(void) +on_button_go_up() { treebrowser_chroot(g_path_get_dirname(addressbar_last_address)); } static void -on_button_refresh(void) +on_button_refresh() { treebrowser_chroot(addressbar_last_address); } static void -on_button_go_home(void) +on_button_go_home() { treebrowser_chroot(g_strdup(g_get_home_dir())); } static void -on_button_current_path(void) +on_button_current_path() { treebrowser_chroot(get_default_dir()); } static void -on_button_hide_bars(void) +on_button_hide_bars() { showbars(FALSE); } @@ -1184,7 +1184,7 @@ } static void -treebrowser_track_current_cb(void) +treebrowser_track_current_cb() { if (CONFIG_FOLLOW_CURRENT_DOC) treebrowser_track_current(); @@ -1200,11 +1200,11 @@ { guint flag; gtk_tree_model_get(model, iter, TREEBROWSER_COLUMN_FLAG, &flag, -1); - return (flag == TREEBROWSER_FLAGS_SEPARATOR ? TRUE : FALSE); + return (flag == TREEBROWSER_FLAGS_SEPARATOR); } static GtkWidget* -create_view_and_model(void) +create_view_and_model() { GtkWidget *view; @@ -1249,7 +1249,7 @@ } static void -create_sidebar(void) +create_sidebar() { GtkWidget *scrollwin; GtkWidget *toolbar; @@ -1365,7 +1365,7 @@ } configure_widgets; static void -load_settings(void) +load_settings() { GKeyFile *config = g_key_file_new(); @@ -1387,7 +1387,7 @@ } static gboolean -save_settings(void) +save_settings() { GKeyFile *config = g_key_file_new(); gchar *config_dir = g_path_get_dirname(CONFIG_FILE); @@ -1567,7 +1567,7 @@ } void -plugin_cleanup(void) +plugin_cleanup() { g_free(addressbar_last_address); g_free(CONFIG_FILE); 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:[1621] trunk/geany-plugins/treebrowser
by dimitrov-adrian＠users.sourceforge.net 03 Oct '10

03 Oct '10

Revision: 1621 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1621&view=rev Author: dimitrov-adrian Date: 2010-10-03 18:29:28 +0000 (Sun, 03 Oct 2010) Log Message: ----------- Some bugfixes and improvements, mostly in bookmarks support. 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-10-03 18:16:54 UTC (rev 1620) +++ trunk/geany-plugins/treebrowser/ChangeLog 2010-10-03 18:29:28 UTC (rev 1621) @@ -47,8 +47,7 @@ Fixed showing wrong tooltips in settings dialog Merged show_bars and show_bars_at_top in one combobox (I think that this is more suitable) - Changed Right click -> Show bars to Hide/Show toolbar - (Now this is temporary hidding/showing and it now saving in the settings) + Fixed bug in show/hide toolbar Removed option for change how deep directories will be scanned (I think that this is unusable and in some cases make geany to freezy) Removed option "ON_EXPAND_REFRESH" - This is unnessecary already Modified: trunk/geany-plugins/treebrowser/src/treebrowser.c =================================================================== --- trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-10-03 18:16:54 UTC (rev 1620) +++ trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-10-03 18:29:28 UTC (rev 1621) @@ -538,11 +538,17 @@ showbars(gboolean state) { if (state) + { gtk_widget_show(sidebar_vbox_bars); + if (!CONFIG_SHOW_BARS) + CONFIG_SHOW_BARS = 1; + } else + { gtk_widget_hide(sidebar_vbox_bars); + CONFIG_SHOW_BARS = 0; + } - CONFIG_SHOW_BARS = state ? (CONFIG_SHOW_BARS ? CONFIG_SHOW_BARS : 1) : 0; save_settings(); } @@ -1310,15 +1316,15 @@ ui_widget_set_tooltip_text(addressbar, _("Addressbar for example '/projects/my-project'")); - if (CONFIG_SHOW_BARS == 1) + if (CONFIG_SHOW_BARS == 2) { + 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); - gtk_box_pack_start(GTK_BOX(sidebar_vbox), scrollwin, TRUE, TRUE, 1); } else { + 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); - 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); 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:[1620] trunk/geany-plugins/treebrowser
by dimitrov-adrian＠users.sourceforge.net 03 Oct '10

03 Oct '10

Revision: 1620 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1620&view=rev Author: dimitrov-adrian Date: 2010-10-03 18:16:54 +0000 (Sun, 03 Oct 2010) Log Message: ----------- Modified Paths: -------------- trunk/geany-plugins/treebrowser/ChangeLog trunk/geany-plugins/treebrowser/README trunk/geany-plugins/treebrowser/src/treebrowser.c Modified: trunk/geany-plugins/treebrowser/ChangeLog =================================================================== --- trunk/geany-plugins/treebrowser/ChangeLog 2010-10-02 17:12:34 UTC (rev 1619) +++ trunk/geany-plugins/treebrowser/ChangeLog 2010-10-03 18:16:54 UTC (rev 1620) @@ -38,6 +38,21 @@ | Development release ChangeLog | +-------------------------------+ +03-10-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> + + * src/treebrowser.c + Fixed bugs in Bookmarks + (directory expander, renaming and deleting files/directories) + Fixed bug with empty path to chroot + Fixed showing wrong tooltips in settings dialog + Merged show_bars and show_bars_at_top in one combobox + (I think that this is more suitable) + Changed Right click -> Show bars to Hide/Show toolbar + (Now this is temporary hidding/showing and it now saving in the settings) + Removed option for change how deep directories will be scanned + (I think that this is unusable and in some cases make geany to freezy) + Removed option "ON_EXPAND_REFRESH" - This is unnessecary already + 19-08-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> * src/treebrowser.c Modified: trunk/geany-plugins/treebrowser/README =================================================================== --- trunk/geany-plugins/treebrowser/README 2010-10-02 17:12:34 UTC (rev 1619) +++ trunk/geany-plugins/treebrowser/README 2010-10-03 18:16:54 UTC (rev 1620) @@ -1,6 +1,5 @@ .. |(version)| replace:: 0.2 -======= Treebrowser plugin ======= @@ -15,29 +14,38 @@ Features ======== - * Project folowing + * Project following * Filesystem functionality (create, rename, delete files or directoreis) - * EXPERIMENTAL gtk bookmark showing - * Open path externaly (using predefined filebrowser ex.: nautilus, thunar...) + * (EXPERIMENTAL) gtk bookmark showing + * Open path externaly (using predefined filebrowser ex.: nautilus, thunar, ...) * Open path in terminal - * Copy document`s path to clipboard + * Copy file path to clipboard * Filters in browser Requirements ============ + * GTK >= 2.8.0 + * Geany >= 0.17 Usage ===== -After compiling and/or installing geanyvc, start Geany and go to menu +After compiling and/or installing treebrowser, start Geany and go to menu Tools->Plugin Manager and set checkbox at treebrowser plugin + License ======= Treebrowser plugin is distrubuted under the same license as the geany. + +Ideas, questions, patches and bug reports +======= + +Report them at http://sourceforge.net/tracker/?group_id=222729. + -- 2010 Adrian Dimitrov dimitrov(dot)adrian(at)gmail(dot)com Modified: trunk/geany-plugins/treebrowser/src/treebrowser.c =================================================================== --- trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-10-02 17:12:34 UTC (rev 1619) +++ trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-10-03 18:16:54 UTC (rev 1620) @@ -50,16 +50,13 @@ 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; 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 gint CONFIG_SHOW_BARS = 1; static gboolean CONFIG_CHROOT_ON_DCLICK = FALSE; 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; static gboolean CONFIG_SHOW_BOOKMARKS = FALSE; @@ -114,8 +111,8 @@ * ------------------ */ 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_bookmarks_state(void); +static void treebrowser_browse(gchar *directory, gpointer parent); +static void treebrowser_bookmarks_set_state(void); static void treebrowser_load_bookmarks(void); static void gtk_tree_store_iter_clear_nodes(gpointer iter, gboolean delete_root); static void load_settings(void); @@ -239,7 +236,7 @@ } static gchar * -get_terminal (void) +get_terminal(void) { gchar *terminal; const gchar *term = g_getenv("TERM"); @@ -259,45 +256,50 @@ gtk_entry_set_text(GTK_ENTRY(addressbar), directory); + if (strlen(directory) == 0) + directory = "/"; + if (! g_file_test(directory, G_FILE_TEST_IS_DIR)) { dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("Directory '%s' not exists."), directory); return; } - 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)); + treebrowser_bookmarks_set_state(); gtk_tree_store_clear(treestore); addressbar_last_address = directory; - treebrowser_browse(directory, NULL, CONFIG_INITIAL_DIR_DEEP); - - if (CONFIG_SHOW_BOOKMARKS) - treebrowser_load_bookmarks(); + treebrowser_browse(directory, NULL); + treebrowser_load_bookmarks(); } static void -treebrowser_browse(gchar *directory, gpointer parent, gint deep_limit) +treebrowser_browse(gchar *directory, gpointer parent) { GtkTreeIter iter, iter_empty, *last_dir_iter = NULL; - gboolean is_dir, is_hidden; - gboolean expanded = FALSE; + gboolean is_dir, is_hidden, is_parent_bookmarks; + gboolean expanded = FALSE, has_parent; gchar *utf8_name; GSList *list, *node; - if (deep_limit < 1) - return; - - deep_limit--; - 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))) + has_parent = gtk_tree_store_iter_is_valid(treestore, parent); + if (has_parent) + { + if (parent == &bookmarks_iter) + treebrowser_load_bookmarks(); + } + else + parent = NULL; + + if (has_parent && gtk_tree_view_row_expanded(GTK_TREE_VIEW(treeview), gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), parent))) + { expanded = TRUE; + treebrowser_bookmarks_set_state(); + } - treebrowser_bookmarks_state(); - gtk_tree_store_iter_clear_nodes(parent, FALSE); list = utils_get_file_list(directory, NULL, NULL); @@ -327,17 +329,12 @@ TREEBROWSER_COLUMN_NAME, fname, TREEBROWSER_COLUMN_URI, uri, -1); - if (deep_limit > 0) - treebrowser_browse(uri, &iter, deep_limit); - else - { - gtk_tree_store_prepend(treestore, &iter_empty, &iter); - gtk_tree_store_set(treestore, &iter_empty, - TREEBROWSER_COLUMN_ICON, NULL, - TREEBROWSER_COLUMN_NAME, g_strdup_printf("(%s)", _("Empty")), - TREEBROWSER_COLUMN_URI, NULL, - -1); - } + gtk_tree_store_prepend(treestore, &iter_empty, &iter); + gtk_tree_store_set(treestore, &iter_empty, + TREEBROWSER_COLUMN_ICON, NULL, + TREEBROWSER_COLUMN_NAME, g_strdup_printf("(%s)", _("Empty")), + TREEBROWSER_COLUMN_URI, NULL, + -1); } else { @@ -355,17 +352,30 @@ g_free(fname); g_free(uri); } + } + else + { + gtk_tree_store_prepend(treestore, &iter_empty, parent); + gtk_tree_store_set(treestore, &iter_empty, + TREEBROWSER_COLUMN_ICON, NULL, + TREEBROWSER_COLUMN_NAME, g_strdup_printf("(%s)", _("Empty")), + TREEBROWSER_COLUMN_URI, NULL, + -1); + } - if (parent && expanded) - gtk_tree_view_expand_row(GTK_TREE_VIEW(treeview), gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), parent), FALSE); + if (has_parent) + { + if (expanded) + gtk_tree_view_expand_row(GTK_TREE_VIEW(treeview), gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), parent), FALSE); + } + else + treebrowser_load_bookmarks(); - treebrowser_load_bookmarks(); } - static void -treebrowser_bookmarks_state(void) +treebrowser_bookmarks_set_state(void) { if (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)); @@ -385,7 +395,7 @@ if (! CONFIG_SHOW_BOOKMARKS) return; - bookmarks = g_build_filename (g_get_home_dir(), ".gtk-bookmarks", NULL); + 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)) @@ -409,7 +419,6 @@ TREEBROWSER_COLUMN_URI, FALSE, TREEBROWSER_COLUMN_FLAG, TREEBROWSER_FLAGS_SEPARATOR, -1); - } lines = g_strsplit (contents, "\n", 0); for (line = lines; *line; ++line) @@ -450,7 +459,6 @@ 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); @@ -534,7 +542,7 @@ else gtk_widget_hide(sidebar_vbox_bars); - CONFIG_SHOW_BARS = state; + CONFIG_SHOW_BARS = state ? (CONFIG_SHOW_BARS ? CONFIG_SHOW_BARS : 1) : 0; save_settings(); } @@ -695,12 +703,12 @@ if (utils_str_equal(type, "directory")) { if (g_mkdir(uri_new, 0755) == 0) - treebrowser_browse(uri, refresh_root ? NULL : &iter, CONFIG_INITIAL_DIR_DEEP); + treebrowser_browse(uri, refresh_root ? NULL : &iter); } else { if (g_creat(uri_new, 0755) != -1) - treebrowser_browse(uri, refresh_root ? NULL : &iter, CONFIG_INITIAL_DIR_DEEP); + treebrowser_browse(uri, refresh_root ? NULL : &iter); } } @@ -746,6 +754,7 @@ if (gtk_tree_selection_get_selected(selection, &model, &iter)) { + gtk_tree_model_get(model, &iter, TREEBROWSER_COLUMN_URI, &uri, -1); if (dialogs_show_question(_("Do you really want to delete '%s' ?"), uri)) @@ -757,10 +766,14 @@ path_parent = gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), &iter); if (gtk_tree_path_up(path_parent) && - gtk_tree_model_get_iter(GTK_TREE_MODEL(treestore), &iter, path_parent)) - treebrowser_browse(g_path_get_dirname(uri), &iter, CONFIG_INITIAL_DIR_DEEP); + gtk_tree_model_get_iter(GTK_TREE_MODEL(treestore), &iter, path_parent) + ) + { + treebrowser_browse(g_path_get_dirname(uri), &iter); + treebrowser_load_bookmarks(); + } else - treebrowser_browse(g_path_get_dirname(uri), NULL, CONFIG_INITIAL_DIR_DEEP); + treebrowser_browse(g_path_get_dirname(uri), NULL); } } } @@ -777,12 +790,10 @@ { gtk_tree_model_get(model, &iter, TREEBROWSER_COLUMN_URI, &uri, -1); if (g_file_test(uri, G_FILE_TEST_IS_DIR)) - { - treebrowser_browse(uri, &iter, CONFIG_INITIAL_DIR_DEEP); - } + treebrowser_browse(uri, &iter); } else - treebrowser_browse(addressbar_last_address, NULL, CONFIG_INITIAL_DIR_DEEP); + treebrowser_browse(addressbar_last_address, NULL); } static void @@ -824,7 +835,7 @@ { CONFIG_SHOW_HIDDEN_FILES = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menuitem)); save_settings(); - treebrowser_browse(addressbar_last_address, NULL, CONFIG_INITIAL_DIR_DEEP); + treebrowser_browse(addressbar_last_address, NULL); } static void @@ -933,7 +944,7 @@ 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); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), CONFIG_SHOW_BARS ? TRUE : FALSE); g_signal_connect(item, "activate", G_CALLBACK(on_menu_show_bars), NULL); gtk_widget_show_all(menu); @@ -1055,10 +1066,7 @@ if (g_file_test(uri, G_FILE_TEST_EXISTS)) { if (g_file_test(uri, G_FILE_TEST_IS_DIR)) - { - if (! CONFIG_ON_EXPAND_REFRESH) - treebrowser_browse(uri, &iter, CONFIG_INITIAL_DIR_DEEP); - } + treebrowser_browse(uri, &iter); else if (CONFIG_ONE_CLICK_CHDOC) document_open_file(uri, FALSE, NULL, NULL); @@ -1101,10 +1109,10 @@ if (uri == FALSE) return; - if (flag_on_expand_refresh == FALSE && CONFIG_ON_EXPAND_REFRESH == TRUE) + if (flag_on_expand_refresh == FALSE) { flag_on_expand_refresh = TRUE; - treebrowser_browse(uri, iter, CONFIG_INITIAL_DIR_DEEP); + treebrowser_browse(uri, iter); gtk_tree_view_expand_row(GTK_TREE_VIEW(treeview), path, FALSE); flag_on_expand_refresh = FALSE; } @@ -1157,12 +1165,13 @@ if (gtk_tree_path_up(path_parent)) { if (gtk_tree_model_get_iter(GTK_TREE_MODEL(treestore), &iter_parent, path_parent)) - treebrowser_browse(g_path_get_dirname(uri_new), &iter_parent, CONFIG_INITIAL_DIR_DEEP); + treebrowser_browse(g_path_get_dirname(uri_new), &iter_parent); else - treebrowser_browse(g_path_get_dirname(uri_new), NULL, CONFIG_INITIAL_DIR_DEEP); + treebrowser_browse(g_path_get_dirname(uri_new), NULL); + treebrowser_load_bookmarks(); } else - treebrowser_browse(g_path_get_dirname(uri_new), NULL, CONFIG_INITIAL_DIR_DEEP); + treebrowser_browse(g_path_get_dirname(uri_new), NULL); } } } @@ -1301,7 +1310,7 @@ ui_widget_set_tooltip_text(addressbar, _("Addressbar for example '/projects/my-project'")); - if (CONFIG_SHOW_BARS_AT_TOP) + if (CONFIG_SHOW_BARS == 1) { 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); @@ -1336,16 +1345,13 @@ static struct { GtkWidget *OPEN_EXTERNAL_CMD; - GtkWidget *INITIAL_DIR_DEEP; GtkWidget *REVERSE_FILTER; GtkWidget *ONE_CLICK_CHDOC; 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; GtkWidget *ON_DELETE_CLOSE_FILE; GtkWidget *SHOW_TREE_LINES; GtkWidget *SHOW_BOOKMARKS; @@ -1360,22 +1366,18 @@ g_key_file_load_from_file(config, CONFIG_FILE, G_KEY_FILE_NONE, NULL); 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_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_SHOW_BARS = utils_get_setting_integer(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); - 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); - } static gboolean @@ -1390,16 +1392,13 @@ return FALSE; 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", "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_integer(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); - 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); @@ -1419,15 +1418,13 @@ return; 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_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_SHOW_BARS = gtk_combo_box_get_active(GTK_COMBO_BOX(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)); - 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)); @@ -1449,8 +1446,8 @@ 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); @@ -1463,43 +1460,33 @@ _("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); + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 6); 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(_("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); - ui_widget_set_tooltip_text(configure_widgets.INITIAL_DIR_DEEP, - _("How many folders will opened and store in tree")); - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX(hbox), configure_widgets.INITIAL_DIR_DEEP, FALSE, FALSE, 0); + hbox = gtk_hbox_new(FALSE, 0); + label = gtk_label_new(_("Toolbar")); + configure_widgets.SHOW_BARS = gtk_combo_box_new_text(); + gtk_combo_box_append_text( GTK_COMBO_BOX(configure_widgets.SHOW_BARS), _("Hidden")); + gtk_combo_box_append_text( GTK_COMBO_BOX(configure_widgets.SHOW_BARS), _("Top")); + gtk_combo_box_append_text( GTK_COMBO_BOX(configure_widgets.SHOW_BARS), _("Bottom")); + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 6); + gtk_box_pack_start(GTK_BOX(hbox), configure_widgets.SHOW_BARS, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 6); + gtk_combo_box_set_active(GTK_COMBO_BOX(configure_widgets.SHOW_BARS), CONFIG_SHOW_BARS); - 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); gtk_box_pack_start(GTK_BOX(vbox), configure_widgets.SHOW_HIDDEN_FILES, FALSE, FALSE, 0); - ui_widget_set_tooltip_text(configure_widgets.INITIAL_DIR_DEEP, + ui_widget_set_tooltip_text(configure_widgets.SHOW_HIDDEN_FILES, _("On Windows, this just hide files that are prefixed with '.' (dot)")); configure_widgets.HIDE_OBJECT_FILES = gtk_check_button_new_with_label(_("Hide object files")); gtk_button_set_focus_on_click(GTK_BUTTON(configure_widgets.HIDE_OBJECT_FILES), FALSE); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(configure_widgets.HIDE_OBJECT_FILES), CONFIG_HIDE_OBJECT_FILES); gtk_box_pack_start(GTK_BOX(vbox), configure_widgets.HIDE_OBJECT_FILES, FALSE, FALSE, 0); - ui_widget_set_tooltip_text(configure_widgets.INITIAL_DIR_DEEP, + ui_widget_set_tooltip_text(configure_widgets.HIDE_OBJECT_FILES, _("Don't show generated object files in the file browser, this includes *.o, *.obj. *.so, *.dll, *.a, *.lib")); configure_widgets.REVERSE_FILTER = gtk_check_button_new_with_label(_("Reverse filter")); @@ -1522,11 +1509,6 @@ 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); - configure_widgets.ON_EXPAND_REFRESH = gtk_check_button_new_with_label(_("On expand, refresh directory view")); - gtk_button_set_focus_on_click(GTK_BUTTON(configure_widgets.ON_EXPAND_REFRESH), FALSE); - 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")); 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); 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:[1619] trunk/geanylatex/wscript
by frlan＠users.sourceforge.net 02 Oct '10

02 Oct '10

Revision: 1619 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1619&view=rev Author: frlan Date: 2010-10-02 17:12:34 +0000 (Sat, 02 Oct 2010) Log Message: ----------- GeanyLaTeX: Fix translation for stand alone version Modified Paths: -------------- trunk/geanylatex/wscript Modified: trunk/geanylatex/wscript =================================================================== --- trunk/geanylatex/wscript 2010-10-02 10:11:19 UTC (rev 1618) +++ trunk/geanylatex/wscript 2010-10-02 17:12:34 UTC (rev 1619) @@ -315,7 +315,7 @@ features = 'intltool_po', podir = 'po', install_path = '${LOCALEDIR}', - appname = 'geanylatex' + appname = 'geanylatex-sa' ) def shutdown(): 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:[1618] trunk/geanylatex/wscript
by frlan＠users.sourceforge.net 02 Oct '10

02 Oct '10

Revision: 1618 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1618&view=rev Author: frlan Date: 2010-10-02 10:11:19 +0000 (Sat, 02 Oct 2010) Log Message: ----------- GeanyLaTeX: Set suffix for stand alone plugin to make it possible to run both, combined and standalone plugin Modified Paths: -------------- trunk/geanylatex/wscript Modified: trunk/geanylatex/wscript =================================================================== --- trunk/geanylatex/wscript 2010-10-02 10:11:03 UTC (rev 1617) +++ trunk/geanylatex/wscript 2010-10-02 10:11:19 UTC (rev 1618) @@ -45,7 +45,7 @@ from TaskGen import taskgen, feature -APPNAME = 'geanylatex' +APPNAME = 'geanylatex-sa' VERSION = '0.6dev' srcdir = '.' @@ -299,8 +299,8 @@ bld.new_task_gen( features = 'cc cshlib', - name = 'geanylatex', - target = 'geanylatex', + name = 'geanylatex-sa', + target = 'geanylatex-sa', source = geanylatex_sources, includes = '. src/', uselib = 'GTK GEANY', 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:[1617] trunk/geanylatex/wscript
by frlan＠users.sourceforge.net 02 Oct '10

02 Oct '10

Revision: 1617 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1617&view=rev Author: frlan Date: 2010-10-02 10:11:03 +0000 (Sat, 02 Oct 2010) Log Message: ----------- GeanyLaTeX: Increase dependecy for GeanyLaTeX to Geany 0.20 (svn) Modified Paths: -------------- trunk/geanylatex/wscript Modified: trunk/geanylatex/wscript =================================================================== --- trunk/geanylatex/wscript 2010-09-30 20:24:50 UTC (rev 1616) +++ trunk/geanylatex/wscript 2010-10-02 10:11:03 UTC (rev 1617) @@ -176,7 +176,7 @@ gtk_version = conf.check_cfg(modversion='gtk+-2.0', uselib_store='GTK') # Checking for a 'good' geany - conf.check_cfg(package='geany', atleast_version='0.18', mandatory=True, args='--cflags --libs') + conf.check_cfg(package='geany', atleast_version='0.20', mandatory=True, args='--cflags --libs') gtk_version = conf.check_cfg(modversion='gtk+-2.0') or 'Unknown' geany_version = conf.check_cfg(modversion='geany') or 'Unknown' 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 October 2010