Plugins-Commits March 2011

plugins-commits@lists.geany.org

6 participants
67 discussions

SF.net SVN: geany-plugins:[1969] trunk/geany-plugins/devhelp/src/ devhelpplugin.c
by codebrainz＠users.sourceforge.net 09 Mar '11

09 Mar '11

Revision: 1969 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1969&view=rev Author: codebrainz Date: 2011-03-09 06:41:13 +0000 (Wed, 09 Mar 2011) Log Message: ----------- Add a TODO comment to remind fixing the back/forward buttons better. Modified Paths: -------------- trunk/geany-plugins/devhelp/src/devhelpplugin.c Modified: trunk/geany-plugins/devhelp/src/devhelpplugin.c =================================================================== --- trunk/geany-plugins/devhelp/src/devhelpplugin.c 2011-03-09 06:41:00 UTC (rev 1968) +++ trunk/geany-plugins/devhelp/src/devhelpplugin.c 2011-03-09 06:41:13 UTC (rev 1969) @@ -395,6 +395,8 @@ G_CALLBACK(on_zoom_out_button_clicked), dhplug); + /* TODO: find the right signal, this doesn't work on inter-document + * links since the page doesn't reload. */ g_signal_connect(WEBKIT_WEB_VIEW(dhplug->webview), "document-load-finished", G_CALLBACK(on_document_load_finished), 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:[1968] trunk/geany-plugins/devhelp/src
by codebrainz＠users.sourceforge.net 09 Mar '11

09 Mar '11

Revision: 1968 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1968&view=rev Author: codebrainz Date: 2011-03-09 06:41:00 +0000 (Wed, 09 Mar 2011) Log Message: ----------- Add toolbar separator and cleanup code a bit using cppcheck. Modified Paths: -------------- trunk/geany-plugins/devhelp/src/devhelpplugin.c trunk/geany-plugins/devhelp/src/devhelpplugin.h Modified: trunk/geany-plugins/devhelp/src/devhelpplugin.c =================================================================== --- trunk/geany-plugins/devhelp/src/devhelpplugin.c 2011-03-09 06:40:46 UTC (rev 1967) +++ trunk/geany-plugins/devhelp/src/devhelpplugin.c 2011-03-09 06:41:00 UTC (rev 1968) @@ -198,7 +198,24 @@ plug->zoom_level = webkit_web_view_get_zoom_level(view); } +static void on_document_load_finished(WebKitWebView *view, + WebKitWebFrame *frame, + gpointer user_data) +{ + DevhelpPlugin *plug = user_data; + + if (webkit_web_view_can_go_back(view)) + gtk_widget_set_sensitive(GTK_WIDGET(plug->btn_back), TRUE); + else + gtk_widget_set_sensitive(GTK_WIDGET(plug->btn_back), FALSE); + + if (webkit_web_view_can_go_forward(view)) + gtk_widget_set_sensitive(GTK_WIDGET(plug->btn_forward), TRUE); + else + gtk_widget_set_sensitive(GTK_WIDGET(plug->btn_forward), FALSE); +} + /** * devhelp_plugin_new: * @@ -211,11 +228,9 @@ DevhelpPlugin* devhelp_plugin_new(gboolean sb_tabs_bottom, gboolean show_in_msgwin, gchar *last_uri) { - gchar *homepage_uri; GtkWidget *book_tree_sw, *webview_sw, *contents_label; - GtkWidget *search_label, *dh_sidebar_label, *doc_label; - GtkWidget *vbox, *toolbar; - GtkToolItem *btn_back, *btn_forward, *tb_sep, *btn_zoom_in, *btn_zoom_out; + GtkWidget *search_label, *dh_sidebar_label, *doc_label, *vbox, *toolbar; + GtkToolItem *btn_zoom_in, *btn_zoom_out, *tb_sep; DevhelpPlugin *dhplug; @@ -313,14 +328,16 @@ /* put the webview and toolbar stuff into the main notebook */ vbox = gtk_vbox_new(FALSE, 0); toolbar = gtk_toolbar_new(); - btn_back = gtk_tool_button_new_from_stock(GTK_STOCK_GO_BACK); - btn_forward = gtk_tool_button_new_from_stock(GTK_STOCK_GO_FORWARD); + dhplug->btn_back = gtk_tool_button_new_from_stock(GTK_STOCK_GO_BACK); + dhplug->btn_forward = gtk_tool_button_new_from_stock(GTK_STOCK_GO_FORWARD); btn_zoom_in = gtk_tool_button_new_from_stock(GTK_STOCK_ZOOM_IN); btn_zoom_out = gtk_tool_button_new_from_stock(GTK_STOCK_ZOOM_OUT); - gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(btn_back), -1); - gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(btn_forward), -1); - gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(btn_zoom_in), -1); - gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(btn_zoom_out), -1); + tb_sep = gtk_separator_tool_item_new(); + gtk_toolbar_insert(GTK_TOOLBAR(toolbar), dhplug->btn_back, -1); + gtk_toolbar_insert(GTK_TOOLBAR(toolbar), dhplug->btn_forward, -1); + gtk_toolbar_insert(GTK_TOOLBAR(toolbar), tb_sep, -1); + gtk_toolbar_insert(GTK_TOOLBAR(toolbar), btn_zoom_in, -1); + gtk_toolbar_insert(GTK_TOOLBAR(toolbar), btn_zoom_out, -1); gtk_box_pack_start(GTK_BOX(vbox), toolbar, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), webview_sw, TRUE, TRUE, 0); gtk_notebook_append_page(GTK_NOTEBOOK(dhplug->main_notebook), vbox, doc_label); @@ -358,12 +375,12 @@ G_CALLBACK(on_link_clicked), dhplug); - g_signal_connect(btn_back, + g_signal_connect(dhplug->btn_back, "clicked", G_CALLBACK(on_back_button_clicked), dhplug); - g_signal_connect(btn_forward, + g_signal_connect(dhplug->btn_forward, "clicked", G_CALLBACK(on_forward_button_clicked), dhplug); @@ -377,6 +394,11 @@ "clicked", G_CALLBACK(on_zoom_out_button_clicked), dhplug); + + g_signal_connect(WEBKIT_WEB_VIEW(dhplug->webview), + "document-load-finished", + G_CALLBACK(on_document_load_finished), + dhplug); /* toggle state tracking */ dhplug->last_main_tab_id = gtk_notebook_get_current_page( Modified: trunk/geany-plugins/devhelp/src/devhelpplugin.h =================================================================== --- trunk/geany-plugins/devhelp/src/devhelpplugin.h 2011-03-09 06:40:46 UTC (rev 1967) +++ trunk/geany-plugins/devhelp/src/devhelpplugin.h 2011-03-09 06:41:00 UTC (rev 1968) @@ -81,6 +81,9 @@ gchar *last_uri; gfloat zoom_level; + GtkToolItem *btn_back; + GtkToolItem *btn_forward; + DevhelpPluginPrivate *priv; }; 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:[1967] trunk/geany-plugins/devhelp/src
by codebrainz＠users.sourceforge.net 09 Mar '11

09 Mar '11

Revision: 1967 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1967&view=rev Author: codebrainz Date: 2011-03-09 06:40:46 +0000 (Wed, 09 Mar 2011) Log Message: ----------- Add navigation toolbar for webview. Modified Paths: -------------- trunk/geany-plugins/devhelp/src/devhelpplugin.c trunk/geany-plugins/devhelp/src/devhelpplugin.h Modified: trunk/geany-plugins/devhelp/src/devhelpplugin.c =================================================================== --- trunk/geany-plugins/devhelp/src/devhelpplugin.c 2011-03-08 20:03:34 UTC (rev 1966) +++ trunk/geany-plugins/devhelp/src/devhelpplugin.c 2011-03-09 06:40:46 UTC (rev 1967) @@ -57,9 +57,7 @@ GObjectClass *g_object_class; g_object_class = G_OBJECT_CLASS(klass); - g_object_class->finalize = devhelp_plugin_finalize; - g_type_class_add_private((gpointer)klass, sizeof(DevhelpPluginPrivate)); } @@ -172,7 +170,35 @@ plug->webview_tab); } +static void on_back_button_clicked(GtkToolButton *btn, gpointer user_data) +{ + DevhelpPlugin *plug = user_data; + webkit_web_view_go_back(WEBKIT_WEB_VIEW(plug->webview)); +} +static void on_forward_button_clicked(GtkToolButton *btn, gpointer user_data) +{ + DevhelpPlugin *plug = user_data; + webkit_web_view_go_forward(WEBKIT_WEB_VIEW(plug->webview)); +} + +static void on_zoom_in_button_clicked(GtkToolButton *btn, gpointer user_data) +{ + DevhelpPlugin *plug = user_data; + WebKitWebView *view = WEBKIT_WEB_VIEW(plug->webview); + webkit_web_view_zoom_in(view); + plug->zoom_level = webkit_web_view_get_zoom_level(view); +} + +static void on_zoom_out_button_clicked(GtkToolButton *btn, gpointer user_data) +{ + DevhelpPlugin *plug = user_data; + WebKitWebView *view = WEBKIT_WEB_VIEW(plug->webview); + webkit_web_view_zoom_out(view); + plug->zoom_level = webkit_web_view_get_zoom_level(view); +} + + /** * devhelp_plugin_new: * @@ -188,6 +214,9 @@ gchar *homepage_uri; GtkWidget *book_tree_sw, *webview_sw, *contents_label; GtkWidget *search_label, *dh_sidebar_label, *doc_label; + GtkWidget *vbox, *toolbar; + GtkToolItem *btn_back, *btn_forward, *tb_sep, *btn_zoom_in, *btn_zoom_out; + DevhelpPlugin *dhplug; dhplug = g_object_new(DEVHELP_TYPE_PLUGIN, NULL); @@ -280,12 +309,24 @@ dhplug->sb_notebook_tab = gtk_notebook_page_num( GTK_NOTEBOOK(geany->main_widgets->sidebar_notebook), dhplug->sb_notebook); - - /* put the webview stuff into the main notebook */ - gtk_notebook_append_page(GTK_NOTEBOOK(dhplug->main_notebook), - webview_sw, doc_label); + + /* put the webview and toolbar stuff into the main notebook */ + vbox = gtk_vbox_new(FALSE, 0); + toolbar = gtk_toolbar_new(); + btn_back = gtk_tool_button_new_from_stock(GTK_STOCK_GO_BACK); + btn_forward = gtk_tool_button_new_from_stock(GTK_STOCK_GO_FORWARD); + btn_zoom_in = gtk_tool_button_new_from_stock(GTK_STOCK_ZOOM_IN); + btn_zoom_out = gtk_tool_button_new_from_stock(GTK_STOCK_ZOOM_OUT); + gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(btn_back), -1); + gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(btn_forward), -1); + gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(btn_zoom_in), -1); + gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(btn_zoom_out), -1); + gtk_box_pack_start(GTK_BOX(vbox), toolbar, FALSE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(vbox), webview_sw, TRUE, TRUE, 0); + gtk_notebook_append_page(GTK_NOTEBOOK(dhplug->main_notebook), vbox, doc_label); dhplug->webview_tab = gtk_notebook_page_num( - GTK_NOTEBOOK(dhplug->main_notebook), webview_sw); + GTK_NOTEBOOK(dhplug->main_notebook), vbox); + gtk_widget_show_all(vbox); /* add menu item to editor popup menu */ /* todo: make this an image menu item with devhelp icon */ @@ -297,29 +338,45 @@ gtk_widget_show(dhplug->editor_menu_item); /* connect signals */ - g_signal_connect( - geany->main_widgets->editor_menu, - "show", - G_CALLBACK(on_editor_menu_popup), - dhplug); + g_signal_connect(geany->main_widgets->editor_menu, + "show", + G_CALLBACK(on_editor_menu_popup), + dhplug); - g_signal_connect( - dhplug->editor_menu_item, - "activate", - G_CALLBACK(on_search_help_activate), - dhplug); + g_signal_connect(dhplug->editor_menu_item, + "activate", + G_CALLBACK(on_search_help_activate), + dhplug); - g_signal_connect( - dhplug->book_tree, - "link-selected", - G_CALLBACK(on_link_clicked), - dhplug); + g_signal_connect(dhplug->book_tree, + "link-selected", + G_CALLBACK(on_link_clicked), + dhplug); - g_signal_connect( - dhplug->search, - "link-selected", - G_CALLBACK(on_link_clicked), - dhplug); + g_signal_connect(dhplug->search, + "link-selected", + G_CALLBACK(on_link_clicked), + dhplug); + + g_signal_connect(btn_back, + "clicked", + G_CALLBACK(on_back_button_clicked), + dhplug); + + g_signal_connect(btn_forward, + "clicked", + G_CALLBACK(on_forward_button_clicked), + dhplug); + + g_signal_connect(btn_zoom_in, + "clicked", + G_CALLBACK(on_zoom_in_button_clicked), + dhplug); + + g_signal_connect(btn_zoom_out, + "clicked", + G_CALLBACK(on_zoom_out_button_clicked), + dhplug); /* toggle state tracking */ dhplug->last_main_tab_id = gtk_notebook_get_current_page( Modified: trunk/geany-plugins/devhelp/src/devhelpplugin.h =================================================================== --- trunk/geany-plugins/devhelp/src/devhelpplugin.h 2011-03-08 20:03:34 UTC (rev 1966) +++ trunk/geany-plugins/devhelp/src/devhelpplugin.h 2011-03-09 06:40:46 UTC (rev 1967) @@ -79,6 +79,7 @@ gboolean in_message_window; gchar *last_uri; + gfloat zoom_level; DevhelpPluginPrivate *priv; }; 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:[1966] trunk/geany-plugins/treebrowser
by dimitrov-adrian＠users.sourceforge.net 08 Mar '11

08 Mar '11

Revision: 1966 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1966&view=rev Author: dimitrov-adrian Date: 2011-03-08 20:03:34 +0000 (Tue, 08 Mar 2011) Log Message: ----------- Added 'Find in Files' option to right click context (patch by oly, thanks) 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 2011-03-08 10:10:18 UTC (rev 1965) +++ trunk/geany-plugins/treebrowser/ChangeLog 2011-03-08 20:03:34 UTC (rev 1966) @@ -37,6 +37,12 @@ +-------------------------------+ +08-02-2011 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> + + * src/treebrowser.c + Added "Find in Files" option to right click context + (patch by oly, thanks) + 23-02-2011 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 2011-03-08 10:10:18 UTC (rev 1965) +++ trunk/geany-plugins/treebrowser/src/treebrowser.c 2011-03-08 20:03:34 UTC (rev 1966) @@ -975,6 +975,12 @@ } static void +on_menu_find_in_files(GtkMenuItem *menuitem, gchar *uri) +{ + search_show_find_in_files_dialog(uri); +} + +static void on_menu_create_new_object(GtkMenuItem *menuitem, gchar *type) { GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); @@ -1201,6 +1207,11 @@ gtk_container_add(GTK_CONTAINER(menu), item); g_signal_connect(item, "activate", G_CALLBACK(on_menu_refresh), NULL); + item = ui_image_menu_item_new(GTK_STOCK_FIND, _("Find in Files")); + gtk_container_add(GTK_CONTAINER(menu), item); + g_signal_connect(item, "activate", G_CALLBACK(on_menu_find_in_files), uri); + gtk_widget_set_sensitive(item, is_dir); + item = gtk_separator_menu_item_new(); gtk_container_add(GTK_CONTAINER(menu), item); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[1965] trunk/geany-plugins/devhelp
by codebrainz＠users.sourceforge.net 08 Mar '11

08 Mar '11

Revision: 1965 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1965&view=rev Author: codebrainz Date: 2011-03-08 10:10:18 +0000 (Tue, 08 Mar 2011) Log Message: ----------- Store last URI loaded in WebKit to configuration file. Load the last page that was open in the WebKitWebView from the configuration file when the plugin/Geany starts and save it on unload/close. Modified Paths: -------------- trunk/geany-plugins/devhelp/data/devhelp.conf trunk/geany-plugins/devhelp/src/devhelpplugin.c trunk/geany-plugins/devhelp/src/devhelpplugin.h trunk/geany-plugins/devhelp/src/plugin.c Modified: trunk/geany-plugins/devhelp/data/devhelp.conf =================================================================== --- trunk/geany-plugins/devhelp/data/devhelp.conf 2011-03-08 09:12:58 UTC (rev 1964) +++ trunk/geany-plugins/devhelp/data/devhelp.conf 2011-03-08 10:10:18 UTC (rev 1965) @@ -1,3 +1,4 @@ [general] move_sidebar_tabs_bottom=true show_in_message_window=false +last_uri= Modified: trunk/geany-plugins/devhelp/src/devhelpplugin.c =================================================================== --- trunk/geany-plugins/devhelp/src/devhelpplugin.c 2011-03-08 09:12:58 UTC (rev 1964) +++ trunk/geany-plugins/devhelp/src/devhelpplugin.c 2011-03-08 10:10:18 UTC (rev 1965) @@ -163,10 +163,11 @@ */ static void on_link_clicked(GObject *ignored, DhLink *link, gpointer user_data) { - gchar *uri = dh_link_get_uri(link); DevhelpPlugin *plug = user_data; - webkit_web_view_open(WEBKIT_WEB_VIEW(plug->webview), uri); - g_free(uri); + if (plug->last_uri) + g_free(plug->last_uri); + plug->last_uri = dh_link_get_uri(link); + webkit_web_view_open(WEBKIT_WEB_VIEW(plug->webview), plug->last_uri); gtk_notebook_set_current_page(GTK_NOTEBOOK(plug->main_notebook), plug->webview_tab); } @@ -181,7 +182,8 @@ * * @return A newly allocated DevhelpPlugin struct or null on error. */ -DevhelpPlugin *devhelp_plugin_new(gboolean sb_tabs_bottom, gboolean show_in_msgwin) +DevhelpPlugin* +devhelp_plugin_new(gboolean sb_tabs_bottom, gboolean show_in_msgwin, gchar *last_uri) { gchar *homepage_uri; GtkWidget *book_tree_sw, *webview_sw, *contents_label; @@ -326,12 +328,14 @@ geany->main_widgets->sidebar_notebook)); dhplug->tabs_toggled = FALSE; - /* load the default homepage for the webview */ - homepage_uri = g_filename_to_uri(DHPLUG_WEBVIEW_HOME_FILE, NULL, NULL); - if (homepage_uri) { - webkit_web_view_load_uri(WEBKIT_WEB_VIEW(dhplug->webview), - homepage_uri); - g_free(homepage_uri); + dhplug->last_uri = last_uri; + if (dhplug->last_uri) + webkit_web_view_load_uri(WEBKIT_WEB_VIEW(dhplug->webview), dhplug->last_uri); + else { + dhplug->last_uri = g_filename_to_uri(DHPLUG_WEBVIEW_HOME_FILE, NULL, NULL); + if (dhplug->last_uri) + webkit_web_view_load_uri(WEBKIT_WEB_VIEW(dhplug->webview), + dhplug->last_uri); } return dhplug; Modified: trunk/geany-plugins/devhelp/src/devhelpplugin.h =================================================================== --- trunk/geany-plugins/devhelp/src/devhelpplugin.h 2011-03-08 09:12:58 UTC (rev 1964) +++ trunk/geany-plugins/devhelp/src/devhelpplugin.h 2011-03-08 10:10:18 UTC (rev 1965) @@ -78,6 +78,8 @@ gboolean sidebar_tab_bottom; gboolean in_message_window; + gchar *last_uri; + DevhelpPluginPrivate *priv; }; @@ -88,7 +90,8 @@ GType devhelp_plugin_get_type (void); -DevhelpPlugin* devhelp_plugin_new (gboolean sb_tabs_bottom, gboolean show_in_msgwin); +DevhelpPlugin* +devhelp_plugin_new (gboolean sb_tabs_bottom, gboolean show_in_msgwin, gchar *last_uri); gchar *devhelp_plugin_clean_word(gchar *str); gchar *devhelp_plugin_get_current_tag(void); Modified: trunk/geany-plugins/devhelp/src/plugin.c =================================================================== --- trunk/geany-plugins/devhelp/src/plugin.c 2011-03-08 09:12:58 UTC (rev 1964) +++ trunk/geany-plugins/devhelp/src/plugin.c 2011-03-08 10:10:18 UTC (rev 1965) @@ -46,6 +46,7 @@ static gchar *user_config = NULL; static gboolean move_sidebar_tabs_bottom; static gboolean show_in_msg_window; +static gchar *last_uri = NULL; /* keybindings */ enum @@ -155,6 +156,17 @@ rcode++; } + error = NULL; + last_uri = g_key_file_get_string(kf, "general", "last_uri", &error); + if (error) + { + g_warning("Unable to load 'last_uri' setting: %s", error->message); + g_error_free(error); + error = NULL; + last_uri = NULL; + rcode++; + } + g_key_file_free(kf); return rcode; @@ -174,6 +186,7 @@ move_sidebar_tabs_bottom); g_key_file_set_boolean(kf, "general", "show_in_message_window", show_in_msg_window); + g_key_file_set_string(kf, "general", "last_uri", dev_help_plugin->last_uri); config_text = g_key_file_to_data(kf, NULL, NULL); g_key_file_free(kf); @@ -281,7 +294,8 @@ plugin_load_preferences(); dev_help_plugin = devhelp_plugin_new(move_sidebar_tabs_bottom, - show_in_msg_window); + show_in_msg_window, + last_uri); /* setup keybindings */ key_group = plugin_set_key_group(geany_plugin, "devhelp", KB_COUNT, NULL); @@ -298,7 +312,10 @@ void plugin_cleanup(void) { plugin_store_preferences(); - + + if (dev_help_plugin->last_uri) + g_free(dev_help_plugin->last_uri); + g_object_unref(dev_help_plugin); g_free(default_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:[1964] trunk/geany-plugins/devhelp/src
by codebrainz＠users.sourceforge.net 08 Mar '11

08 Mar '11

Revision: 1964 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1964&view=rev Author: codebrainz Date: 2011-03-08 09:12:58 +0000 (Tue, 08 Mar 2011) Log Message: ----------- Fix bug in update_editor_menu callback. Callback for update_editor_menu signal was adding the entire selection of text into the GtkMenuItem label. Fix ellipsizes selections/tags which are longer than DHPLUG_MAX_LABEL_TAG for display in the editor context menu. Make context menu string translatable. Modified Paths: -------------- trunk/geany-plugins/devhelp/src/devhelpplugin.c trunk/geany-plugins/devhelp/src/devhelpplugin.h Modified: trunk/geany-plugins/devhelp/src/devhelpplugin.c =================================================================== --- trunk/geany-plugins/devhelp/src/devhelpplugin.c 2011-03-08 03:32:28 UTC (rev 1963) +++ trunk/geany-plugins/devhelp/src/devhelpplugin.c 2011-03-08 09:12:58 UTC (rev 1964) @@ -122,19 +122,31 @@ */ static void on_editor_menu_popup(GtkWidget *widget, gpointer user_data) { + gchar *label_tag = NULL; gchar *curword = NULL; gchar *new_label = NULL; DevhelpPlugin *dhplug = user_data; curword = devhelp_plugin_get_current_tag(); + if (curword == NULL) gtk_widget_set_sensitive(dhplug->editor_menu_item, FALSE); else { - gtk_widget_set_sensitive(dhplug->editor_menu_item, TRUE); - new_label = g_strdup_printf("Search Devhelp for '%s'", curword); + if (strlen(curword) > DHPLUG_MAX_LABEL_TAG) { + label_tag = g_strndup(curword, DHPLUG_MAX_LABEL_TAG-3); + new_label = g_strdup_printf(_("Search Devhelp for: %s..."), + g_strstrip(label_tag)); + } + else { + label_tag = g_strndup(curword, DHPLUG_MAX_LABEL_TAG); + new_label = g_strdup_printf(_("Search Devhelp for %s"), + g_strstrip(label_tag)); + } gtk_menu_item_set_label(GTK_MENU_ITEM(dhplug->editor_menu_item), new_label); g_free(new_label); + g_free(label_tag); + gtk_widget_set_sensitive(dhplug->editor_menu_item, TRUE); } g_free(curword); Modified: trunk/geany-plugins/devhelp/src/devhelpplugin.h =================================================================== --- trunk/geany-plugins/devhelp/src/devhelpplugin.h 2011-03-08 03:32:28 UTC (rev 1963) +++ trunk/geany-plugins/devhelp/src/devhelpplugin.h 2011-03-08 09:12:58 UTC (rev 1964) @@ -33,6 +33,8 @@ #define DHPLUG_WEBVIEW_HOME_FILE DHPLUG_DATA_DIR"/home.html" +#define DHPLUG_MAX_LABEL_TAG 30 + #define DEVHELP_TYPE_PLUGIN (devhelp_plugin_get_type()) #define DEVHELP_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),\ DEVHELP_TYPE_PLUGIN, DevhelpPlugin)) 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:[1963] trunk/geany-plugins/devhelp/src/Makefile. am
by codebrainz＠users.sourceforge.net 08 Mar '11

08 Mar '11

Revision: 1963 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1963&view=rev Author: codebrainz Date: 2011-03-08 03:32:28 +0000 (Tue, 08 Mar 2011) Log Message: ----------- Fix typo in Makefile.am Modified Paths: -------------- trunk/geany-plugins/devhelp/src/Makefile.am Modified: trunk/geany-plugins/devhelp/src/Makefile.am =================================================================== --- trunk/geany-plugins/devhelp/src/Makefile.am 2011-03-07 22:07:29 UTC (rev 1962) +++ trunk/geany-plugins/devhelp/src/Makefile.am 2011-03-08 03:32:28 UTC (rev 1963) @@ -16,5 +16,5 @@ devhelp_la_CFLAGS = \ $(AM_CFLAGS) \ $(DEVHELP_CFLAGS) \ - -DDHPLUG_DATA_DIR=\"$(plugindata)\" + -DDHPLUG_DATA_DIR=\"$(plugindatadir)\" devhelp_la_LIBADD = $(DEVHELP_LIBS) 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:[1962] trunk/geany-plugins/README
by frlan＠users.sourceforge.net 07 Mar '11

07 Mar '11

Revision: 1962 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1962&view=rev Author: frlan Date: 2011-03-07 22:07:29 +0000 (Mon, 07 Mar 2011) Log Message: ----------- Start to convert general README to a more ReST like version and start to add some more contant about waf. Modified Paths: -------------- trunk/geany-plugins/README Modified: trunk/geany-plugins/README =================================================================== --- trunk/geany-plugins/README 2011-03-07 21:52:55 UTC (rev 1961) +++ trunk/geany-plugins/README 2011-03-07 22:07:29 UTC (rev 1962) @@ -1,19 +1,32 @@ +=============== +Geany-Plugins +=============== + +Installation +------------ + +Building with autotools +^^^^^^^^^^^^^^^^^^^^^^^ + You can use Autotools to build the Geany plugins in this repository. Usage: -./configure [arguments] or alternatively ./autogen.sh [arguments] -make -sudo make install + ./configure [arguments] or alternatively ./autogen.sh [arguments] + make + sudo make install -This will configure, build and install most of the Geany plugins. There is some -auto-detection in place which automagically disables some of the plugins if -there are insufficient build dependencies. The following arguments can tweak the -behaviour of the configure script:- +This will configure, build and install most of the Geany plugins. +There is some auto-detection in place which automagically disables +some of the plugins if there are insufficient build dependencies. +The following arguments can tweak the behaviour of the configure +script:- -=== Options === +Options +======= A full listing of all supported options can be found in ./configure --help. -== Enable/Disable Features == +Enable/Disable Features +======================= The following options can be passed to ./configure in forms --enable-<option>=auto (default), --enable-<option>, --disable-<option>. In all cases, --enable-<option>=auto causes the feature to be enabled/disabled @@ -32,7 +45,8 @@ This will force all optional plugins to be enabled even if dependencies are missing. -== Other tweaks == +Other tweaks +============ The following options can be passed to ./configure in the form --with-<option>=<argument>. @@ -40,7 +54,20 @@ * geany-prefix -- Geany's prefix, used when compiling Geany. -== Compiling Individual Plugins == -The Geany Plugins project uses a recursive automake build system, which means -that after running ./configure, you may compile each individual plug-in by cd-ing -into the respective plug-in directory and compiling it. +Compiling Individual Plugins +============================ + +The Geany Plugins project uses a recursive automake build system, +which means that after running ./configure, you may compile each +individual plug-in by cd-ing into the respective plug-in directory +and compiling it. + +Building with waf +^^^^^^^^^^^^^^^^^ + +Geany-Plugins can also being build using Python based build system waf. +For doing this you have similar to building with autotools run three steps: + + ./waf configure + ./waf build + ./waf install 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:[1961] trunk/geany-plugins/po/POTFILES.in
by frlan＠users.sourceforge.net 07 Mar '11

07 Mar '11

Revision: 1961 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1961&view=rev Author: frlan Date: 2011-03-07 21:52:55 +0000 (Mon, 07 Mar 2011) Log Message: ----------- Update POTFILES.in for updated file list of devhelp plugin Modified Paths: -------------- trunk/geany-plugins/po/POTFILES.in Modified: trunk/geany-plugins/po/POTFILES.in =================================================================== --- trunk/geany-plugins/po/POTFILES.in 2011-03-07 21:48:26 UTC (rev 1960) +++ trunk/geany-plugins/po/POTFILES.in 2011-03-07 21:52:55 UTC (rev 1961) @@ -37,10 +37,11 @@ debugger/src/watch_model.c # devhelp -devhelp/src/dh-plugin.c +devhelp/src/devhelpplugin.c devhelp/src/main-notebook.c devhelp/src/plugin.c + # geanycfp geanycfp/src/geanycfp.c 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:[1960] trunk/geany-plugins/devhelp
by frlan＠users.sourceforge.net 07 Mar '11

07 Mar '11

Revision: 1960 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1960&view=rev Author: frlan Date: 2011-03-07 21:48:26 +0000 (Mon, 07 Mar 2011) Log Message: ----------- Adding waf build support for devhelp plugin Added Paths: ----------- trunk/geany-plugins/devhelp/wscript_build trunk/geany-plugins/devhelp/wscript_configure Added: trunk/geany-plugins/devhelp/wscript_build =================================================================== --- trunk/geany-plugins/devhelp/wscript_build (rev 0) +++ trunk/geany-plugins/devhelp/wscript_build 2011-03-07 21:48:26 UTC (rev 1960) @@ -0,0 +1,31 @@ +# -*- coding: utf-8 -*- +# +# WAF build script for geany-plugins - Debugger +# +# Copyright 2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> +# Copyright 2011 Frank Lanitz <frnk(at)frank(dot)uvena(dot)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, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id: wscript_build 1735 2010-11-09 17:03:40Z eht16 $ + +from build.wafutils import build_plugin + + +name = 'Devhelp' +includes = ['devhelp/src'] +libraries = ['DEVHELP'] + +build_plugin(bld, name, includes=includes, libraries=libraries) Added: trunk/geany-plugins/devhelp/wscript_configure =================================================================== --- trunk/geany-plugins/devhelp/wscript_configure (rev 0) +++ trunk/geany-plugins/devhelp/wscript_configure 2011-03-07 21:48:26 UTC (rev 1960) @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# +# WAF build script for geany-plugins - Debugger +# +# Copyright 2011 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> +# Copyright 2011 Frank Lanitz <frank(at)frank(dot)uvena(dot)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, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id: wscript_configure 1735 2010-11-09 17:03:40Z eht16 $ + +from build.wafutils import check_cfg_cached + + +check_cfg_cached(conf, + package='libdevhelp-1.0', + uselib_store='DEVHELP', + args='--cflags --libs') 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 2011