Plugins-Commits October 2010

plugins-commits@lists.geany.org

8 participants
80 discussions

SF.net SVN: geany-plugins:[1656] trunk/geany-plugins/addons/README
by eht16＠users.sourceforge.net 16 Oct '10

16 Oct '10

Revision: 1656 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1656&view=rev Author: eht16 Date: 2010-10-16 15:08:43 +0000 (Sat, 16 Oct 2010) Log Message: ----------- Update download link (patch by Michael Spahn, thanks). Modified Paths: -------------- trunk/geany-plugins/addons/README Modified: trunk/geany-plugins/addons/README =================================================================== --- trunk/geany-plugins/addons/README 2010-10-16 14:53:15 UTC (rev 1655) +++ trunk/geany-plugins/addons/README 2010-10-16 15:08:43 UTC (rev 1656) @@ -62,9 +62,8 @@ The Addons plugin is part of the combined Geany Plugins release. For more information and downloads, please visit -http://plugins.geany.org/geany-plugins/ +http://plugins.geany.org/index.php?site=downloads&hash=md5 - Development Code ^^^^^^^^^^^^^^^^ 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:[1655] trunk/geany-plugins/treebrowser
by dimitrov-adrian＠users.sourceforge.net 16 Oct '10

16 Oct '10

Revision: 1655 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1655&view=rev Author: dimitrov-adrian Date: 2010-10-16 14:53:15 +0000 (Sat, 16 Oct 2010) Log Message: ----------- Treebrowser: Added new option to show mime-type icons (Idea from Colomban Wendling`s mail) 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-13 16:28:15 UTC (rev 1654) +++ trunk/geany-plugins/treebrowser/ChangeLog 2010-10-16 14:53:15 UTC (rev 1655) @@ -38,6 +38,13 @@ +-------------------------------+ +16-10-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> + + * src/treebrowser.c + Added new option to show mime-type icons (can be configured by the preferences) + (Idea from Colomban Wendling`s mail) + + 09-10-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-10-13 16:28:15 UTC (rev 1654) +++ trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-10-16 14:53:15 UTC (rev 1655) @@ -59,6 +59,7 @@ static gboolean CONFIG_ON_DELETE_CLOSE_FILE = TRUE; static gboolean CONFIG_SHOW_TREE_LINES = TRUE; static gboolean CONFIG_SHOW_BOOKMARKS = FALSE; +static gint CONFIG_SHOW_ICONS = 2; /* ------------------ * TREEVIEW STRUCT @@ -149,6 +150,45 @@ }; +static GdkPixbuf * +utils_pixbuf_from_path(gchar *path) +{ + GIcon *icon; + GdkPixbuf *ret = NULL; + GtkIconInfo *info; + gint width; + + icon = g_content_type_get_icon(g_content_type_guess(path, NULL, 0, NULL)); + + if (icon != NULL) + { + gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &width, NULL); + info = gtk_icon_theme_lookup_by_gicon (gtk_icon_theme_get_default(), icon, width, GTK_ICON_LOOKUP_USE_BUILTIN); + if (!info) + return NULL; + ret = gtk_icon_info_load_icon (info, NULL); + gtk_icon_info_free (info); + } + + return ret; +} + +static GdkPixbuf * +utils_pixbuf_from_stock(const gchar *stock_id) +{ + GtkIconSet *icon_set; + + icon_set = gtk_icon_factory_lookup_default(stock_id); + + if (icon_set) + return gtk_icon_set_render_icon(icon_set, gtk_widget_get_default_style(), + gtk_widget_get_default_direction(), + GTK_STATE_NORMAL, GTK_ICON_SIZE_MENU, NULL, NULL); + + return NULL; +} + + /* ------------------ * TREEBROWSER CORE FUNCTIONS * ------------------ */ @@ -311,8 +351,8 @@ gchar *utf8_name; GSList *list, *node; - gchar *fname; - gchar *uri; + gchar *fname; + gchar *uri; directory = g_strconcat(directory, G_DIR_SEPARATOR_S, NULL); @@ -356,7 +396,7 @@ } last_dir_iter = gtk_tree_iter_copy(&iter); gtk_tree_store_set(treestore, &iter, - TREEBROWSER_COLUMN_ICON, GTK_STOCK_DIRECTORY, + TREEBROWSER_COLUMN_ICON, CONFIG_SHOW_ICONS ? utils_pixbuf_from_stock(GTK_STOCK_DIRECTORY) : NULL, TREEBROWSER_COLUMN_NAME, fname, TREEBROWSER_COLUMN_URI, uri, -1); @@ -373,7 +413,11 @@ { gtk_tree_store_append(treestore, &iter, parent); gtk_tree_store_set(treestore, &iter, - TREEBROWSER_COLUMN_ICON, GTK_STOCK_FILE, + TREEBROWSER_COLUMN_ICON, CONFIG_SHOW_ICONS == 2 + ? utils_pixbuf_from_path(uri) + : CONFIG_SHOW_ICONS + ? utils_pixbuf_from_stock(GTK_STOCK_FILE) + : NULL, TREEBROWSER_COLUMN_NAME, fname, TREEBROWSER_COLUMN_URI, uri, -1); @@ -422,8 +466,9 @@ gchar *contents, *path_full; gchar **lines, **line; GtkTreeIter iter; - gchar *pos; - gchar *name; + gchar *pos; + gchar *name; + GdkPixbuf *icon = NULL; if (! CONFIG_SHOW_BOOKMARKS) return; @@ -440,7 +485,7 @@ { gtk_tree_store_prepend(treestore, &bookmarks_iter, NULL); gtk_tree_store_set(treestore, &bookmarks_iter, - TREEBROWSER_COLUMN_ICON, GTK_STOCK_ABOUT, + TREEBROWSER_COLUMN_ICON, CONFIG_SHOW_ICONS ? utils_pixbuf_from_stock(GTK_STOCK_DIRECTORY) : NULL, TREEBROWSER_COLUMN_NAME, _("Bookmarks"), TREEBROWSER_COLUMN_URI, NULL, -1); @@ -474,7 +519,7 @@ { gtk_tree_store_append(treestore, &iter, &bookmarks_iter); gtk_tree_store_set(treestore, &iter, - TREEBROWSER_COLUMN_ICON, GTK_STOCK_DIRECTORY, + TREEBROWSER_COLUMN_ICON, CONFIG_SHOW_ICONS ? utils_pixbuf_from_stock(GTK_STOCK_DIRECTORY) : NULL, TREEBROWSER_COLUMN_NAME, g_basename(path_full), TREEBROWSER_COLUMN_URI, path_full, -1); @@ -1169,8 +1214,8 @@ gtk_tree_view_expand_row(GTK_TREE_VIEW(treeview), path, FALSE); flag_on_expand_refresh = FALSE; } - gtk_tree_store_set(treestore, iter, TREEBROWSER_COLUMN_ICON, GTK_STOCK_OPEN, -1); - + if (CONFIG_SHOW_ICONS) + gtk_tree_store_set(treestore, iter, TREEBROWSER_COLUMN_ICON, utils_pixbuf_from_stock(GTK_STOCK_OPEN), -1); } static void @@ -1180,8 +1225,8 @@ gtk_tree_model_get(GTK_TREE_MODEL(treestore), iter, TREEBROWSER_COLUMN_URI, &uri, -1); if (uri == FALSE) return; - - gtk_tree_store_set(treestore, iter, TREEBROWSER_COLUMN_ICON, GTK_STOCK_DIRECTORY, -1); + if (CONFIG_SHOW_ICONS) + gtk_tree_store_set(treestore, iter, TREEBROWSER_COLUMN_ICON, utils_pixbuf_from_stock(GTK_STOCK_DIRECTORY), -1); } static void @@ -1267,7 +1312,7 @@ gtk_tree_view_append_column(GTK_TREE_VIEW(view), treeview_column_text); gtk_tree_view_column_pack_start(treeview_column_text, render_icon, FALSE); - gtk_tree_view_column_set_attributes(treeview_column_text, render_icon, "stock-id", TREEBROWSER_RENDER_ICON, NULL); + gtk_tree_view_column_set_attributes(treeview_column_text, render_icon, "pixbuf", TREEBROWSER_RENDER_ICON, NULL); gtk_tree_view_column_pack_start(treeview_column_text, render_text, TRUE); gtk_tree_view_column_add_attribute(treeview_column_text, render_text, "text", TREEBROWSER_RENDER_TEXT); @@ -1288,7 +1333,7 @@ gtk_tree_view_set_enable_tree_lines(GTK_TREE_VIEW(view), CONFIG_SHOW_TREE_LINES); #endif - treestore = gtk_tree_store_new(TREEBROWSER_COLUMNC, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT); + treestore = gtk_tree_store_new(TREEBROWSER_COLUMNC, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT); gtk_tree_view_set_model(GTK_TREE_VIEW(view), GTK_TREE_MODEL(treestore)); g_signal_connect(G_OBJECT(render_text), "edited", G_CALLBACK(on_treeview_renamed), view); @@ -1409,6 +1454,7 @@ GtkWidget *ON_DELETE_CLOSE_FILE; GtkWidget *SHOW_TREE_LINES; GtkWidget *SHOW_BOOKMARKS; + GtkWidget *SHOW_ICONS; } configure_widgets; @@ -1430,6 +1476,7 @@ 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); + CONFIG_SHOW_ICONS = utils_get_setting_integer(config, "treebrowser", "show_icons", CONFIG_SHOW_ICONS); g_key_file_free(config); } @@ -1456,6 +1503,7 @@ 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); + g_key_file_set_integer(config, "treebrowser", "show_icons", CONFIG_SHOW_ICONS); data = g_key_file_to_data(config, NULL, NULL); utils_write_file(CONFIG_FILE, data); @@ -1482,6 +1530,7 @@ 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)); + CONFIG_SHOW_ICONS = gtk_combo_box_get_active(GTK_COMBO_BOX(configure_widgets.SHOW_ICONS)); if (save_settings() == TRUE) { @@ -1528,8 +1577,21 @@ 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); + ui_widget_set_tooltip_text(configure_widgets.SHOW_BARS, + _("If position is changed, the option require plugin restart.")); gtk_combo_box_set_active(GTK_COMBO_BOX(configure_widgets.SHOW_BARS), CONFIG_SHOW_BARS); + hbox = gtk_hbox_new(FALSE, 0); + label = gtk_label_new(_("Show icons")); + configure_widgets.SHOW_ICONS = gtk_combo_box_new_text(); + gtk_combo_box_append_text( GTK_COMBO_BOX(configure_widgets.SHOW_ICONS), _("None")); + gtk_combo_box_append_text( GTK_COMBO_BOX(configure_widgets.SHOW_ICONS), _("Base")); + gtk_combo_box_append_text( GTK_COMBO_BOX(configure_widgets.SHOW_ICONS), _("Content-type")); + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 6); + gtk_box_pack_start(GTK_BOX(hbox), configure_widgets.SHOW_ICONS, 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_ICONS), CONFIG_SHOW_ICONS); + configure_widgets.SHOW_HIDDEN_FILES = gtk_check_button_new_with_label(_("Show hidden files")); gtk_button_set_focus_on_click(GTK_BUTTON(configure_widgets.SHOW_HIDDEN_FILES), FALSE); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(configure_widgets.SHOW_HIDDEN_FILES), CONFIG_SHOW_HIDDEN_FILES); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

13 Oct '10

Revision: 1654 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1654&view=rev Author: dimitrov-adrian Date: 2010-10-13 16:28:15 +0000 (Wed, 13 Oct 2010) Log Message: ----------- Treebrowser: Fixed wrong Show toolbars state when it turned off from the plugin configuration, Fixed possible segfault when deleting file which is in bookmarks tree, Fixed collapsing and preloading bookmarks list when renaming, and deleting objects 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-11 16:25:41 UTC (rev 1653) +++ trunk/geany-plugins/treebrowser/ChangeLog 2010-10-13 16:28:15 UTC (rev 1654) @@ -41,6 +41,15 @@ 09-10-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> * src/treebrowser.c + Fixed possible segfault when deleting file which is in bookmarks tree + Fixed wrong Show toolbars state when it turned off from the plugin configuration + Fixed collapsing and preloading bookmarks list when renaming, and deleting objects + * README + Try to add screenshot for the website + +09-10-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> + + * src/treebrowser.c Fixes possible segfaults with bookmarks in ubuntu 10.10 * README Update and fixes website compitables Modified: trunk/geany-plugins/treebrowser/README =================================================================== --- trunk/geany-plugins/treebrowser/README 2010-10-11 16:25:41 UTC (rev 1653) +++ trunk/geany-plugins/treebrowser/README 2010-10-13 16:28:15 UTC (rev 1654) @@ -12,7 +12,13 @@ Treebrowser is plugin that provide tree like file browser for geany`s sidebar. It is on beta state, then all reports are welcome. +.. image:: http://img177.imageshack.us/img177/6403/geanytreebrowser.png + :width: 240 + :alt: treebrowser plugin + :align: right + :target: http://img177.imageshack.us/img177/6403/geanytreebrowser.png + Features ======== Modified: trunk/geany-plugins/treebrowser/src/treebrowser.c =================================================================== --- trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-10-11 16:25:41 UTC (rev 1653) +++ trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-10-13 16:28:15 UTC (rev 1654) @@ -543,7 +543,9 @@ dir = g_dir_open (root, 0, NULL); if (!dir) - return; + if (delete_root) + g_remove(root); + else return; name = g_dir_read_name (dir); while (name != NULL) @@ -803,32 +805,31 @@ GtkTreeIter iter; GtkTreeModel *model; GtkTreePath *path_parent; - gchar *uri; + gchar *uri, *uri_parent; - if (gtk_tree_selection_get_selected(selection, &model, &iter)) - { + if (! gtk_tree_selection_get_selected(selection, &model, &iter)) + return; - gtk_tree_model_get(model, &iter, TREEBROWSER_COLUMN_URI, &uri, -1); + gtk_tree_model_get(model, &iter, TREEBROWSER_COLUMN_URI, &uri, -1); - 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)) - document_close(document_find_by_filename(uri)); + if (! dialogs_show_question(_("Do you really want to delete '%s' ?"), uri)) + return; - fs_remove(uri, TRUE); - path_parent = gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), &iter); + if (CONFIG_ON_DELETE_CLOSE_FILE && !g_file_test(uri, G_FILE_TEST_IS_DIR)) + document_close(document_find_by_filename(uri)); - 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); - treebrowser_load_bookmarks(); - } - else - treebrowser_browse(g_path_get_dirname(uri), NULL); - } + uri_parent = g_path_get_dirname(uri); + fs_remove(uri, TRUE); + path_parent = gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), &iter); + if (gtk_tree_path_up(path_parent)) + { + if (gtk_tree_model_get_iter(GTK_TREE_MODEL(treestore), &iter, path_parent)) + treebrowser_browse(uri_parent, &iter); + else + treebrowser_browse(uri_parent, NULL); } + else + treebrowser_browse(uri_parent, NULL); } static void @@ -1211,16 +1212,13 @@ TREEBROWSER_COLUMN_NAME, name_new, TREEBROWSER_COLUMN_URI, uri_new, -1); - path_parent = gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), &iter); - 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); else treebrowser_browse(g_path_get_dirname(uri_new), NULL); - treebrowser_load_bookmarks(); } else treebrowser_browse(g_path_get_dirname(uri_new), NULL); @@ -1493,6 +1491,7 @@ treebrowser_chroot(addressbar_last_address); if (CONFIG_SHOW_BOOKMARKS) treebrowser_load_bookmarks(); + showbars(CONFIG_SHOW_BARS); } else 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:[1653] trunk/geany-plugins/treebrowser
by dimitrov-adrian＠users.sourceforge.net 11 Oct '10

11 Oct '10

Revision: 1653 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1653&view=rev Author: dimitrov-adrian Date: 2010-10-11 16:25:41 +0000 (Mon, 11 Oct 2010) Log Message: ----------- Fixes possible segfaults with bookmarks in ubuntu 10.10, README and ChangeLog updates. 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-10 17:00:38 UTC (rev 1652) +++ trunk/geany-plugins/treebrowser/ChangeLog 2010-10-11 16:25:41 UTC (rev 1653) @@ -37,9 +37,17 @@ | Development release ChangeLog | +-------------------------------+ + 09-10-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> * src/treebrowser.c + Fixes possible segfaults with bookmarks in ubuntu 10.10 + * README + Update and fixes website compitables + +09-10-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> + + * src/treebrowser.c Fixed translatable info (thanks to Frank Lanitz <frank(at)frank(dot)uvena(dot)de> for patch) Fixed fixed bad code and compilation warning in unused vars Modified: trunk/geany-plugins/treebrowser/README =================================================================== --- trunk/geany-plugins/treebrowser/README 2010-10-10 17:00:38 UTC (rev 1652) +++ trunk/geany-plugins/treebrowser/README 2010-10-11 16:25:41 UTC (rev 1653) @@ -1,27 +1,27 @@ .. |(version)| replace:: 0.2 Treebrowser plugin -======= +================== .. contents:: + About ===== Treebrowser is plugin that provide tree like file browser for geany`s sidebar. It is on beta state, then all reports are welcome. + Features ======== * Project following - * Filesystem functionality (create, rename, delete files or directoreis) - * (EXPERIMENTAL) gtk bookmark showing - * Open path externaly (using predefined filebrowser ex.: nautilus, thunar, ...) - * Open path in terminal - * Copy file path to clipboard + * Basic filesystem functionality + * GTK bookmarks support * Filters in browser + Requirements ============ * GTK >= 2.8.0 @@ -38,11 +38,11 @@ License ======= -Treebrowser plugin is distrubuted under the same license as the geany. +Treebrowser plugin is distrubuted under the same license as and geany. Ideas, questions, patches and bug reports -======= +========================================= Report them at http://sourceforge.net/tracker/?group_id=222729. Modified: trunk/geany-plugins/treebrowser/src/treebrowser.c =================================================================== --- trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-10-10 17:00:38 UTC (rev 1652) +++ trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-10-11 16:25:41 UTC (rev 1653) @@ -442,14 +442,14 @@ gtk_tree_store_set(treestore, &bookmarks_iter, TREEBROWSER_COLUMN_ICON, GTK_STOCK_ABOUT, TREEBROWSER_COLUMN_NAME, _("Bookmarks"), - TREEBROWSER_COLUMN_URI, FALSE, + TREEBROWSER_COLUMN_URI, NULL, -1); gtk_tree_store_insert_after(treestore, &iter, NULL, &bookmarks_iter); gtk_tree_store_set(treestore, &iter, TREEBROWSER_COLUMN_ICON, NULL, TREEBROWSER_COLUMN_NAME, NULL, - TREEBROWSER_COLUMN_URI, FALSE, + TREEBROWSER_COLUMN_URI, NULL, TREEBROWSER_COLUMN_FLAG, TREEBROWSER_FLAGS_SEPARATOR, -1); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[1652] trunk/geanylatex/src
by frlan＠users.sourceforge.net 10 Oct '10

10 Oct '10

Revision: 1652 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1652&view=rev Author: frlan Date: 2010-10-10 17:00:38 +0000 (Sun, 10 Oct 2010) Log Message: ----------- GeanyLaTeX: Add LaTeX type of BibTeX entry direct to menu Modified Paths: -------------- trunk/geanylatex/src/bibtex.c trunk/geanylatex/src/bibtex.h trunk/geanylatex/src/bibtexlabels.c trunk/geanylatex/src/datatypes.h trunk/geanylatex/src/geanylatex.c Modified: trunk/geanylatex/src/bibtex.c =================================================================== --- trunk/geanylatex/src/bibtex.c 2010-10-10 17:00:17 UTC (rev 1651) +++ trunk/geanylatex/src/bibtex.c 2010-10-10 17:00:38 UTC (rev 1652) @@ -134,7 +134,7 @@ } /* Adding the doctype to entry */ output = g_string_new("@"); - g_string_append(output, glatex_label_types[doctype]); + g_string_append(output, glatex_bibtex_types[doctype].latex); g_string_append(output, "{"); g_string_append(output, eol); Modified: trunk/geanylatex/src/bibtex.h =================================================================== --- trunk/geanylatex/src/bibtex.h 2010-10-10 17:00:17 UTC (rev 1651) +++ trunk/geanylatex/src/bibtex.h 2010-10-10 17:00:38 UTC (rev 1652) @@ -74,13 +74,10 @@ GLATEX_BIBTEX_N_ENTRIES }; -extern gchar *glatex_label_types[]; - extern const gchar *glatex_label_tooltips[]; - extern const gchar *glatex_label_entry_keywords[]; - extern const gchar *glatex_label_entry[]; +extern BibTeXType glatex_bibtex_types[]; int glatex_push_bibtex_entry(int style, GeanyDocument *doc); Modified: trunk/geanylatex/src/bibtexlabels.c =================================================================== --- trunk/geanylatex/src/bibtexlabels.c 2010-10-10 17:00:17 UTC (rev 1651) +++ trunk/geanylatex/src/bibtexlabels.c 2010-10-10 17:00:38 UTC (rev 1652) @@ -21,22 +21,25 @@ #include "geanylatex.h" #include "bibtex.h" +#include "datatypes.h" -gchar *glatex_label_types[] = { - N_("Article"), - N_("Book"), - N_("Booklet"), - N_("Conference"), - N_("Inbook"), - N_("Incollection"), - N_("Inproceedings"), - N_("Manual"), - N_("Mastersthesis"), - N_("Misc"), - N_("PhdThesis"), - N_("Proceedings"), - N_("Techreport"), - N_("Unpublished")}; +BibTeXType glatex_bibtex_types[] = { + { "Article", N_("Article (@Article)")}, + { "Book", N_("Book (@Book)")}, + { "Booklet", N_("Booklet (@Booklet)")}, + { "Conference", N_("Conference (@Conference)")}, + { "Inbook", N_("Inbook (@Inbook)")}, + { "Incollection", N_("Incollection (@Incollection)")}, + { "Inproceedings", N_("Inproceedings (@Inproceedings)")}, + { "Manual", N_("Manual (@Manual)")}, + { "Mastersthesis", N_("Mastersthesis (@Mastersthesis)")}, + { "Misc", N_("Misc (@Misc)")}, + { "PhdThesis", N_("PhdThesis (@PhdThesis)")}, + { "Proceedings", N_("Proceedings (@Proceedings)")}, + { "Techreport", N_("Techreport (@Techreport)")}, + { "Unpublished", N_("Unpublished (@Unpublished)")}, + { NULL, NULL} +}; const gchar *glatex_label_entry[] = { Modified: trunk/geanylatex/src/datatypes.h =================================================================== --- trunk/geanylatex/src/datatypes.h 2010-10-10 17:00:17 UTC (rev 1651) +++ trunk/geanylatex/src/datatypes.h 2010-10-10 17:00:38 UTC (rev 1652) @@ -37,6 +37,7 @@ gboolean sorted; } CategoryName; + typedef struct { gchar *filepath; @@ -44,6 +45,7 @@ GString *template; } TemplateEntry; + typedef struct { GtkWidget *documentclass_combobox; @@ -61,4 +63,10 @@ gboolean draft_active; } LaTeXWizard; +typedef struct +{ + gchar *latex; + gchar *label; +} BibTeXType; + #endif Modified: trunk/geanylatex/src/geanylatex.c =================================================================== --- trunk/geanylatex/src/geanylatex.c 2010-10-10 17:00:17 UTC (rev 1651) +++ trunk/geanylatex/src/geanylatex.c 2010-10-10 17:00:38 UTC (rev 1652) @@ -746,7 +746,6 @@ } - /* Called when keys were pressed */ static void glatex_kblatex_toggle(G_GNUC_UNUSED guint key_id) { @@ -2108,7 +2107,7 @@ for (i = 0; i < GLATEX_BIBTEX_N_TYPES; i++) { tmp = NULL; - tmp = gtk_menu_item_new_with_mnemonic(_(glatex_label_types[i])); + tmp = gtk_menu_item_new_with_mnemonic(_(glatex_bibtex_types[i].label)); gtk_container_add(GTK_CONTAINER(menu_latex_bibtex_submenu), tmp); g_signal_connect(tmp, "activate", G_CALLBACK(glatex_insert_bibtex_entry), GINT_TO_POINTER(i)); @@ -2287,5 +2286,4 @@ g_free(glatex_ref_chapter_string); g_free(glatex_ref_page_string); g_free(glatex_ref_all_string); - } 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:[1651] trunk/geanylatex/src
by frlan＠users.sourceforge.net 10 Oct '10

10 Oct '10

Revision: 1651 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1651&view=rev Author: frlan Date: 2010-10-10 17:00:17 +0000 (Sun, 10 Oct 2010) Log Message: ----------- GeanyLaTeX: Move a generic function to latexutils.[c|h] Modified Paths: -------------- trunk/geanylatex/src/geanylatex.c trunk/geanylatex/src/latexutils.c trunk/geanylatex/src/latexutils.h Modified: trunk/geanylatex/src/geanylatex.c =================================================================== --- trunk/geanylatex/src/geanylatex.c 2010-10-10 16:59:47 UTC (rev 1650) +++ trunk/geanylatex/src/geanylatex.c 2010-10-10 17:00:17 UTC (rev 1651) @@ -746,49 +746,7 @@ } -void glatex_replace_special_character() -{ - GeanyDocument *doc = NULL; - doc = document_get_current(); - if (doc != NULL && sci_has_selection(doc->editor->sci)) - { - guint selection_len; - gchar *selection = NULL; - GString *replacement = g_string_new(NULL); - guint i; - gchar *new = NULL; - const gchar *entity = NULL; - gchar buf[7]; - gint len; - - selection = sci_get_selection_contents(doc->editor->sci); - - selection_len = strlen(selection); - - for (i = 0; i < selection_len; i++) - { - len = g_unichar_to_utf8(g_utf8_get_char(selection + i), buf); - i = len - 1 + i; - buf[len] = '\0'; - entity = glatex_get_entity(buf); - - if (entity != NULL) - { - replacement = g_string_append(replacement, entity); - } - else - { - replacement = g_string_append(replacement, buf); - } - } - new = g_string_free(replacement, FALSE); - sci_replace_sel(doc->editor->sci, new); - g_free(selection); - g_free(new); - } -} - /* Called when keys were pressed */ static void glatex_kblatex_toggle(G_GNUC_UNUSED guint key_id) { Modified: trunk/geanylatex/src/latexutils.c =================================================================== --- trunk/geanylatex/src/latexutils.c 2010-10-10 16:59:47 UTC (rev 1650) +++ trunk/geanylatex/src/latexutils.c 2010-10-10 17:00:17 UTC (rev 1651) @@ -119,3 +119,46 @@ } } + +void glatex_replace_special_character() +{ + GeanyDocument *doc = NULL; + doc = document_get_current(); + + if (doc != NULL && sci_has_selection(doc->editor->sci)) + { + guint selection_len; + gchar *selection = NULL; + GString *replacement = g_string_new(NULL); + guint i; + gchar *new = NULL; + const gchar *entity = NULL; + gchar buf[7]; + gint len; + + selection = sci_get_selection_contents(doc->editor->sci); + + selection_len = strlen(selection); + + for (i = 0; i < selection_len; i++) + { + len = g_unichar_to_utf8(g_utf8_get_char(selection + i), buf); + i = len - 1 + i; + buf[len] = '\0'; + entity = glatex_get_entity(buf); + + if (entity != NULL) + { + replacement = g_string_append(replacement, entity); + } + else + { + replacement = g_string_append(replacement, buf); + } + } + new = g_string_free(replacement, FALSE); + sci_replace_sel(doc->editor->sci, new); + g_free(selection); + g_free(new); + } +} Modified: trunk/geanylatex/src/latexutils.h =================================================================== --- trunk/geanylatex/src/latexutils.h 2010-10-10 16:59:47 UTC (rev 1650) +++ trunk/geanylatex/src/latexutils.h 2010-10-10 17:00:17 UTC (rev 1651) @@ -27,5 +27,6 @@ void glatex_usepackage(const gchar *pkg, const gchar *options); void glatex_enter_key_pressed_in_entry(G_GNUC_UNUSED GtkWidget *widget, gpointer dialog); void glatex_insert_string(gchar *string, gboolean reset_position); +void glatex_replace_special_character(void); #endif 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:[1650] trunk/geanylatex/src/geanylatex.h
by frlan＠users.sourceforge.net 10 Oct '10

10 Oct '10

Revision: 1650 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1650&view=rev Author: frlan Date: 2010-10-10 16:59:47 +0000 (Sun, 10 Oct 2010) Log Message: ----------- GeanyLaTeX: Remove not needed include Modified Paths: -------------- trunk/geanylatex/src/geanylatex.h Modified: trunk/geanylatex/src/geanylatex.h =================================================================== --- trunk/geanylatex/src/geanylatex.h 2010-10-10 16:56:41 UTC (rev 1649) +++ trunk/geanylatex/src/geanylatex.h 2010-10-10 16:59:47 UTC (rev 1650) @@ -39,11 +39,9 @@ #include "latexstructure.h" #include "latexkeybindings.h" -#ifdef HAVE_LOCALE_H -# include <locale.h> -#endif #include <string.h> + typedef void (*MenuCallback) (G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata); 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:[1649] trunk/geany-plugins/geanyvc/src
by frlan＠users.sourceforge.net 10 Oct '10

10 Oct '10

Revision: 1649 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1649&view=rev Author: frlan Date: 2010-10-10 16:56:41 +0000 (Sun, 10 Oct 2010) Log Message: ----------- GeanyVC: Fix some compiler warnings about no previous prototypes Modified Paths: -------------- trunk/geany-plugins/geanyvc/src/externdiff.c trunk/geany-plugins/geanyvc/src/geanyvc.h trunk/geany-plugins/geanyvc/src/utils.c Added Paths: ----------- trunk/geany-plugins/geanyvc/src/utils.h Modified: trunk/geany-plugins/geanyvc/src/externdiff.c =================================================================== --- trunk/geany-plugins/geanyvc/src/externdiff.c 2010-10-10 09:30:22 UTC (rev 1648) +++ trunk/geany-plugins/geanyvc/src/externdiff.c 2010-10-10 16:56:41 UTC (rev 1649) @@ -25,6 +25,9 @@ extern GeanyFunctions *geany_functions; +const gchar *get_external_diff_viewer(void); + + enum { EXTERNAL_DIFF_MELD, Modified: trunk/geany-plugins/geanyvc/src/geanyvc.h =================================================================== --- trunk/geany-plugins/geanyvc/src/geanyvc.h 2010-10-10 09:30:22 UTC (rev 1648) +++ trunk/geany-plugins/geanyvc/src/geanyvc.h 2010-10-10 16:56:41 UTC (rev 1649) @@ -1,5 +1,5 @@ /* - * Copyright 2007-2009 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + * Copyright 2007-2010 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * Copyright 2007-2009 Enrico Tröger <enrico.troeger(a)uvena.de> * Copyright 2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * Copyright 2007-2009 Yura Siamashka <yurand2(a)gmail.com> Modified: trunk/geany-plugins/geanyvc/src/utils.c =================================================================== --- trunk/geany-plugins/geanyvc/src/utils.c 2010-10-10 09:30:22 UTC (rev 1648) +++ trunk/geany-plugins/geanyvc/src/utils.c 2010-10-10 16:56:41 UTC (rev 1649) @@ -20,6 +20,7 @@ #include <glib.h> #include "geanyplugin.h" +#include "utils.h" extern GeanyData *geany_data; extern GeanyFunctions *geany_functions; Added: trunk/geany-plugins/geanyvc/src/utils.h =================================================================== --- trunk/geany-plugins/geanyvc/src/utils.h (rev 0) +++ trunk/geany-plugins/geanyvc/src/utils.h 2010-10-10 16:56:41 UTC (rev 1649) @@ -0,0 +1,27 @@ +/* + * + * Copyright 2008 Yura Siamashka <yurand2(a)gmail.com> + * Copyright 2010 Frank Lanitz <frank(a)frank.uvena.de> + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef __GEANYVC_UTILS__ +#define __GEANYVC_UTILS__ + +gchar *normpath(const gchar * filename); +gchar *get_full_path(const gchar * location, const gchar * path); +gchar *get_relative_path(const gchar * location, const gchar * path); + +#endif 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:[1648] www/staging/content/start.html
by dmaphy＠users.sourceforge.net 10 Oct '10

10 Oct '10

Revision: 1648 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1648&view=rev Author: dmaphy Date: 2010-10-10 09:30:22 +0000 (Sun, 10 Oct 2010) Log Message: ----------- website: small validation fix Modified Paths: -------------- www/staging/content/start.html Modified: www/staging/content/start.html =================================================================== --- www/staging/content/start.html 2010-10-09 16:21:00 UTC (rev 1647) +++ www/staging/content/start.html 2010-10-10 09:30:22 UTC (rev 1648) @@ -50,11 +50,11 @@ <li>you didn't knew of this site yet</li> <li>the maintainers of this site didn't know of your plugin yet</li> <li>your plugin is part of the Geany Plugins project, but</li> - <ul> + <li><ul> <li>you don't have a README file written in reStructuredText</li> <li>or your README file is empty</li> <li>or a README file doesn't even exist</li> - </ul> + </ul></li> </ul> <p> For any of these reasons, you will find more detailed hints on the 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:[1647] trunk/geany-plugins/geanygendoc/src/ ggd-widget-doctype-selector.c
by colombanw＠users.sourceforge.net 09 Oct '10

09 Oct '10

Revision: 1647 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1647&view=rev Author: colombanw Date: 2010-10-09 16:21:00 +0000 (Sat, 09 Oct 2010) Log Message: ----------- GeanyGenDoc: Fix build with GTK+ 2.16 Modified Paths: -------------- trunk/geany-plugins/geanygendoc/src/ggd-widget-doctype-selector.c Modified: trunk/geany-plugins/geanygendoc/src/ggd-widget-doctype-selector.c =================================================================== --- trunk/geany-plugins/geanygendoc/src/ggd-widget-doctype-selector.c 2010-10-09 16:20:39 UTC (rev 1646) +++ trunk/geany-plugins/geanygendoc/src/ggd-widget-doctype-selector.c 2010-10-09 16:21:00 UTC (rev 1647) @@ -25,6 +25,11 @@ #include "ggd-plugin.h" +#if ! GTK_CHECK_VERSION (2, 20, 0) && ! defined(gtk_widget_get_realized) +# define gtk_widget_get_realized(w) (GTK_WIDGET_REALIZED (w)) +#endif + + static void ggd_doctype_selector_finalize (GObject *object); static void ggd_doctype_selector_constructed (GObject *object); static void doctype_column_edited_handler (GtkCellRendererText *renderer, 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