Plugins-Commits March 2011

plugins-commits@lists.geany.org

6 participants
67 discussions

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

07 Mar '11

Revision: 1959 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1959&view=rev Author: codebrainz Date: 2011-03-07 09:41:22 +0000 (Mon, 07 Mar 2011) Log Message: ----------- Write README file. Modified Paths: -------------- trunk/geany-plugins/devhelp/README Modified: trunk/geany-plugins/devhelp/README =================================================================== --- trunk/geany-plugins/devhelp/README 2011-03-07 05:13:45 UTC (rev 1958) +++ trunk/geany-plugins/devhelp/README 2011-03-07 09:41:22 UTC (rev 1959) @@ -1 +1,98 @@ +============== +Devhelp Plugin +============== +.. contents:: + +About +===== + +This plugin uses libdevhelp to integrate Devhelp UI components and +functionality directly into Geany's user interface. In case you didn't know, +Devhelp is an API documentation browser mainly aimed at GNOME-related libraries, +although there are Devhelp books for a wide range of library APIs. Check your +package manager and/or Google and you should have no trouble finding books that +can be viewed with Devhelp. + +Usage +===== + +User Interface Changes +---------------------- + +When you load the plugin, two things are added to Geany's UI. The first is a +new tab labeled 'Devhelp' in the Sidebar notebook. Inside this notebook page +are two sub-tabs; Contents and Search. Contents lets you browse all of the +books at once and see their table of contents in a tree view. Search, not +surprisingly lets you search all of the books for a search term. The second +UI element that gets added to Geany is the 'Documentation' tab. Depending on +your preference choice, this new tab is either found in the main area, where +it will be next to a new tab called 'Code' which now holds the existing +documents tabs. If you choose to, you can also have the 'Documentation' tab +appear in the bottom message area, allowing you to see the documentation and +your code at the same time. There is also a preference for whether you want +to move the main Sidebar tabs to the bottom position or leave them at your +previously selected location. + +Keybindings +----------- + +There are three keybindings that can be set using the Geany Preferences dialog. +The first keybinding is called 'Toggle Devhelp (Contents Tab)' and it will +activate the Devhelp tab in the Sidebar and it's Contents sub-tab. The second +keybinding is called 'Toggle Devhelp (Search Tab)' and does the same thing +but with the Search tab. The third keybinding is called 'Search for Current +Symbol/Tag' and when activate it will take the word/symbol where the cursor is +in the current document and search for it, activating both the Devhelp Sidebar +tab and the Documentation tab for you. + +Context Menu +------------ + +There's one more way to invoke a search for the current symbol. If you right +click on the current document, on a tag/symbol you want help on, the context +menu that appears will have an item called 'Search Devhelp for "foo"...", +which, when activated, will do the same thing as the 'Search for Current +Symbol/Tag' keybinding explained above. + +Downloads +========= + +The Devhelp plugin is part of the combined Geany Plugins release. For more +information and downloads, please visit: +http://plugins.geany.org/geany-plugins/ + +Development Code +================ + +Get the code from: + + svn checkout http://geany-plugins.svn.sourceforge.net/svnroot/geany-plugins/trunk/geany-… + + +Dependencies +============ + +The Devhelp plugin depends on 'libdevhelp-1.0' and 'webkit-1.0', on top of the +regular Geany depenedencies (ie glib-2.0, gtk+-2.0, etc). + +License +======= + +The Devhelp plugin is distributed under the terms of the GNU General Public +License as published by the Free Software Foundation, either version 3 of the +License, or (at your option) any later version. You should have received a copy +of the GNU General Public License along with the Devhelp plugin, in the COPYING +file. If not, see <http://www.gnu.org/licenses/>. + +Bug Reports and Feature Requests +================================ + +To report a bug or ask for a new feature, please use the Geany-Plugins tracker +on SourceForge: http://sourceforge.net/tracker/?group_id=222729 + +Contact +======= + +You can email me at <codebrainz(a)users.sourceforge.net>, or find me on the +#geany IRC channel on FreeNode, with the nickname 'codebrainz'. 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:[1958] trunk/geany-plugins/Makefile.am
by codebrainz＠users.sourceforge.net 07 Mar '11

07 Mar '11

Revision: 1958 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1958&view=rev Author: codebrainz Date: 2011-03-07 05:13:45 +0000 (Mon, 07 Mar 2011) Log Message: ----------- Add Devhelp plugin to Makefile.am so it gets built. Modified Paths: -------------- trunk/geany-plugins/Makefile.am Modified: trunk/geany-plugins/Makefile.am =================================================================== --- trunk/geany-plugins/Makefile.am 2011-03-07 05:13:27 UTC (rev 1957) +++ trunk/geany-plugins/Makefile.am 2011-03-07 05:13:45 UTC (rev 1958) @@ -2,6 +2,7 @@ addons \ codenav \ debugger \ + devhelp \ geanycfp \ geanydoc \ geanyextrasel \ 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:[1957] trunk/geany-plugins/devhelp/src
by codebrainz＠users.sourceforge.net 07 Mar '11

07 Mar '11

Revision: 1957 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1957&view=rev Author: codebrainz Date: 2011-03-07 05:13:27 +0000 (Mon, 07 Mar 2011) Log Message: ----------- Convert DevhelpPlugin to a GObject. Modified Paths: -------------- trunk/geany-plugins/devhelp/src/Makefile.am trunk/geany-plugins/devhelp/src/plugin.c trunk/geany-plugins/devhelp/src/plugin.h Added Paths: ----------- trunk/geany-plugins/devhelp/src/devhelpplugin.c trunk/geany-plugins/devhelp/src/devhelpplugin.h Removed Paths: ------------- trunk/geany-plugins/devhelp/src/dh-plugin.c trunk/geany-plugins/devhelp/src/dh-plugin.h Modified: trunk/geany-plugins/devhelp/src/Makefile.am =================================================================== --- trunk/geany-plugins/devhelp/src/Makefile.am 2011-03-07 00:55:38 UTC (rev 1956) +++ trunk/geany-plugins/devhelp/src/Makefile.am 2011-03-07 05:13:27 UTC (rev 1957) @@ -11,7 +11,7 @@ devhelp_la_SOURCES = \ plugin.c \ - dh-plugin.c \ + devhelpplugin.c \ main-notebook.c devhelp_la_CFLAGS = \ $(AM_CFLAGS) \ Copied: trunk/geany-plugins/devhelp/src/devhelpplugin.c (from rev 1956, trunk/geany-plugins/devhelp/src/dh-plugin.c) =================================================================== --- trunk/geany-plugins/devhelp/src/devhelpplugin.c (rev 0) +++ trunk/geany-plugins/devhelp/src/devhelpplugin.c 2011-03-07 05:13:27 UTC (rev 1957) @@ -0,0 +1,438 @@ +// devhelpplugin.c +// +// Copyright 2011 Matthew Brush <mbrush@desktop> +// +// 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. +// +// + +#include <gtk/gtk.h> +#include <geanyplugin.h> + +#include <devhelp/dh-base.h> +#include <devhelp/dh-book-tree.h> +#include <devhelp/dh-search.h> +#include <devhelp/dh-link.h> + +#ifdef HAVE_BOOK_MANAGER /* for newer api */ +#include <devhelp/dh-book-manager.h> +#endif + +#include <webkit/webkitwebview.h> + +#include "plugin.h" +#include "devhelpplugin.h" +#include "main-notebook.h" + + +/* Devhelp base object */ +static DhBase *dhbase = NULL; + +struct _DevhelpPluginPrivate +{ + /* add your private declarations here */ + gint tmp; +}; + +static void devhelp_plugin_finalize (GObject *object); + +G_DEFINE_TYPE(DevhelpPlugin, devhelp_plugin, G_TYPE_OBJECT) + + +static void devhelp_plugin_class_init(DevhelpPluginClass *klass) +{ + 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)); +} + + +static void devhelp_plugin_finalize(GObject *object) +{ + DevhelpPlugin *self; + + g_return_if_fail(object != NULL); + g_return_if_fail(DEVHELP_IS_PLUGIN(object)); + + self = DEVHELP_PLUGIN(object); + + gtk_widget_destroy(self->sb_notebook); + + gtk_notebook_remove_page(GTK_NOTEBOOK(self->main_notebook), + self->webview_tab); + + if (!self->in_message_window) + main_notebook_destroy(); + + gtk_widget_destroy(self->editor_menu_sep); + gtk_widget_destroy(self->editor_menu_item); + + gtk_notebook_set_tab_pos(GTK_NOTEBOOK( + geany->main_widgets->sidebar_notebook), + self->orig_sb_tab_pos); + + G_OBJECT_CLASS(devhelp_plugin_parent_class)->finalize(object); +} + + +static void devhelp_plugin_init(DevhelpPlugin *self) +{ + self->priv = G_TYPE_INSTANCE_GET_PRIVATE(self, + DEVHELP_TYPE_PLUGIN, DevhelpPluginPrivate); + +} + +/* Called when the editor menu item is selected */ +static void on_search_help_activate(GtkMenuItem *menuitem, gpointer user_data) +{ + DevhelpPlugin *dhplug = user_data; + gchar *current_tag = devhelp_plugin_get_current_tag(); + + if (current_tag == NULL) + return; + + dh_search_set_search_string (DH_SEARCH(dhplug->search), current_tag, NULL); + + /* activate devhelp tabs with search tab active */ + devhelp_plugin_activate_tabs(dhplug, FALSE); + + g_free(current_tag); +} + +/* + * Called when the editor context menu is shown so that the devhelp + * search item can be disabled if there isn't a selected tag. + */ +static void on_editor_menu_popup(GtkWidget *widget, gpointer user_data) +{ + 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); + gtk_menu_item_set_label(GTK_MENU_ITEM(dhplug->editor_menu_item), + new_label); + g_free(new_label); + } + + g_free(curword); +} + +/** + * on_link_clicked: + * @param ignored Not used + * @param link The devhelp link object describing what was clicked. + * @param user_data The current DevhelpPlugin struct. + * + * Called when a link in either the contents or search areas on the sidebar + * have a link clicked on, meaning to load that file into the webview. + */ +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); + gtk_notebook_set_current_page(GTK_NOTEBOOK(plug->main_notebook), + plug->webview_tab); +} + + +/** + * devhelp_plugin_new: + * + * Creates a new DevhelpPlugin. The returned structure is allocated dyamically + * and must be freed with the devhelp_plugin_destroy() function. This function + * gets called from Geany's plugin_init() function. + * + * @return A newly allocated DevhelpPlugin struct or null on error. + */ +DevhelpPlugin *devhelp_plugin_new(gboolean sb_tabs_bottom, gboolean show_in_msgwin) +{ + gchar *homepage_uri; + GtkWidget *book_tree_sw, *webview_sw, *contents_label; + GtkWidget *search_label, *dh_sidebar_label, *doc_label; + DevhelpPlugin *dhplug; + + dhplug = g_object_new(DEVHELP_TYPE_PLUGIN, NULL); + + if (dhplug == NULL) { + g_printerr(_("Cannot create a new Devhelp plugin, out of memory.\n")); + return NULL; + } + +#ifdef HAVE_BOOK_MANAGER /* for newer api */ + DhBookManager *book_manager; +#else + GNode *books; + GList *keywords; +#endif + + if (dhbase == NULL) + dhbase = dh_base_new(); + +#ifdef HAVE_BOOK_MANAGER /* for newer api */ + book_manager = dh_base_get_book_manager(dhbase); + dhplug->book_tree = dh_book_tree_new(book_manager); + dhplug->search = dh_search_new(book_manager); +#else + books = dh_base_get_book_tree(dhbase); + keywords = dh_base_get_keywords(dhbase); + dhplug->book_tree = dh_book_tree_new(books); + dhplug->search = dh_search_new(keywords); +#endif + + dhplug->in_message_window = show_in_msgwin; + + /* create/grab notebooks */ + dhplug->sb_notebook = gtk_notebook_new(); + dhplug->doc_notebook = geany->main_widgets->notebook; + + if (dhplug->in_message_window) + dhplug->main_notebook = geany->main_widgets->message_window_notebook; + else + dhplug->main_notebook = main_notebook_get(); + + /* editor menu items */ + dhplug->editor_menu_sep = gtk_separator_menu_item_new(); + dhplug->editor_menu_item = gtk_menu_item_new_with_label( + _("Search Documentation for Tag")); + + /* tab labels */ + contents_label = gtk_label_new(_("Contents")); + search_label = gtk_label_new(_("Search")); + dh_sidebar_label = gtk_label_new(_("Devhelp")); + doc_label = gtk_label_new(_("Documentation")); + + dhplug->orig_sb_tab_pos = gtk_notebook_get_tab_pos(GTK_NOTEBOOK( + geany->main_widgets->sidebar_notebook)); + devhelp_plugin_sidebar_tabs_bottom(dhplug, sb_tabs_bottom); + + /* sidebar contents/book tree */ + book_tree_sw = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(book_tree_sw), + GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); + gtk_container_set_border_width(GTK_CONTAINER(book_tree_sw), 6); + gtk_container_add(GTK_CONTAINER(book_tree_sw), dhplug->book_tree); + gtk_widget_show(dhplug->book_tree); + + /* sidebar search */ + gtk_widget_show(dhplug->search); + + /* webview to display documentation */ + dhplug->webview = webkit_web_view_new(); + webview_sw = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(webview_sw), + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + /*gtk_container_set_border_width(GTK_CONTAINER(webview_sw), 6);*/ + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(webview_sw), + GTK_SHADOW_ETCHED_IN); + gtk_container_add(GTK_CONTAINER(webview_sw), dhplug->webview); + gtk_widget_show_all(webview_sw); + + /* setup the sidebar notebook */ + gtk_notebook_append_page(GTK_NOTEBOOK(dhplug->sb_notebook), + book_tree_sw, contents_label); + gtk_notebook_append_page(GTK_NOTEBOOK(dhplug->sb_notebook), + dhplug->search, search_label); + gtk_notebook_set_current_page(GTK_NOTEBOOK(dhplug->sb_notebook), 0); + + gtk_widget_show_all(dhplug->sb_notebook); + gtk_notebook_append_page( + GTK_NOTEBOOK(geany->main_widgets->sidebar_notebook), + dhplug->sb_notebook, dh_sidebar_label); + 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); + dhplug->webview_tab = gtk_notebook_page_num( + GTK_NOTEBOOK(dhplug->main_notebook), webview_sw); + + /* add menu item to editor popup menu */ + /* todo: make this an image menu item with devhelp icon */ + gtk_menu_shell_append(GTK_MENU_SHELL(geany->main_widgets->editor_menu), + dhplug->editor_menu_sep); + gtk_menu_shell_append(GTK_MENU_SHELL(geany->main_widgets->editor_menu), + dhplug->editor_menu_item); + gtk_widget_show(dhplug->editor_menu_sep); + 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( + 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->search, + "link-selected", + G_CALLBACK(on_link_clicked), + dhplug); + + /* toggle state tracking */ + dhplug->last_main_tab_id = gtk_notebook_get_current_page( + GTK_NOTEBOOK(dhplug->main_notebook)); + dhplug->last_sb_tab_id = gtk_notebook_get_current_page(GTK_NOTEBOOK( + 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); + } + + return dhplug; +} + +/** + * devhelp_plugin_clean_word: + * @param str String to clean + * + * Replaces non GEANY_WORDCHARS in str with spaces and then trims whitespace. + * This function does not allocate a new string, it modifies str in place + * and returns a pointer to str. + * TODO: make this only remove stuff from the start or end of string. + * + * @return Pointer to (cleaned) @str. + */ +gchar *devhelp_plugin_clean_word(gchar *str) +{ + return g_strstrip(g_strcanon(str, GEANY_WORDCHARS, ' ')); +} + +/** + * devhelp_plugin_get_current_tag: + * + * Gets either the current selection or the word at the current selection. + * + * @return Newly allocated string with current tag or NULL no tag. + */ +gchar *devhelp_plugin_get_current_tag(void) +{ + gint pos; + gchar *tag = NULL; + GeanyDocument *doc = document_get_current(); + + if (sci_has_selection(doc->editor->sci)) + return devhelp_plugin_clean_word(sci_get_selection_contents(doc->editor->sci)); + + pos = sci_get_current_position(doc->editor->sci); + tag = editor_get_word_at_pos(doc->editor, pos, GEANY_WORDCHARS); + + if (tag == NULL) + return NULL; + + if (tag[0] == '\0') { + g_free(tag); + return NULL; + } + + return devhelp_plugin_clean_word(tag); +} + + +/** + * devhelp_plugin_activate_tabs: + * @param dhplug The current DevhelpPlugin struct. + * @param contents If TRUE then select the devhelp Contents tab + * otherwise select the devhelp Search tab. + * + * Toggles devhelp related tabs to be current tabs or back to the + * previously selected tabs. + */ +void devhelp_plugin_activate_tabs(DevhelpPlugin *dhplug, gboolean contents) +{ + if (!dhplug->tabs_toggled) + { + /* toggle state tracking */ + dhplug->last_main_tab_id = gtk_notebook_get_current_page( + GTK_NOTEBOOK(dhplug->main_notebook)); + dhplug->last_sb_tab_id = gtk_notebook_get_current_page(GTK_NOTEBOOK( + geany->main_widgets->sidebar_notebook)); + dhplug->tabs_toggled = TRUE; + + gtk_notebook_set_current_page(GTK_NOTEBOOK( + geany->main_widgets->sidebar_notebook), + dhplug->sb_notebook_tab); + gtk_notebook_set_current_page( + GTK_NOTEBOOK(dhplug->main_notebook), dhplug->webview_tab); + if (contents) + gtk_notebook_set_current_page(GTK_NOTEBOOK(dhplug->sb_notebook), 0); + else + gtk_notebook_set_current_page(GTK_NOTEBOOK(dhplug->sb_notebook), 1); + } + else + { + gtk_notebook_set_current_page(GTK_NOTEBOOK(dhplug->main_notebook), + dhplug->last_main_tab_id); + gtk_notebook_set_current_page(GTK_NOTEBOOK( + geany->main_widgets->sidebar_notebook), + dhplug->last_sb_tab_id); + dhplug->tabs_toggled = FALSE; + } +} + +/** + * devhelp_plugin_sidebar_tabs_bottom: + * @param dhplug The current DevhelpPlugin struct. + * @param bottom Whether to move the sidebar tabs to the bottom or not. + * + * Changes the sidebar tab position from its default position to the bottom or + * vice versa. + */ +void devhelp_plugin_sidebar_tabs_bottom(DevhelpPlugin *dhplug, gboolean bottom) +{ + if (bottom) + gtk_notebook_set_tab_pos(GTK_NOTEBOOK(geany->main_widgets->sidebar_notebook), + GTK_POS_BOTTOM); + else + gtk_notebook_set_tab_pos(GTK_NOTEBOOK(geany->main_widgets->sidebar_notebook), + dhplug->orig_sb_tab_pos); +} + + + + + + Added: trunk/geany-plugins/devhelp/src/devhelpplugin.h =================================================================== --- trunk/geany-plugins/devhelp/src/devhelpplugin.h (rev 0) +++ trunk/geany-plugins/devhelp/src/devhelpplugin.h 2011-03-07 05:13:27 UTC (rev 1957) @@ -0,0 +1,98 @@ +// devhelpplugin.h +// +// Copyright 2011 Matthew Brush <mbrush@desktop> +// +// 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. +// +// + + +#ifndef __DEVHELPPLUGIN_H__ +#define __DEVHELPPLUGIN_H__ + +#include <gtk/gtk.h> + +G_BEGIN_DECLS + +#ifndef DHPLUG_DATA_DIR +#define DHPLUG_DATA_DIR "/usr/local/share/geany-devhelp" +#endif + +#define DHPLUG_WEBVIEW_HOME_FILE DHPLUG_DATA_DIR"/home.html" + +#define DEVHELP_TYPE_PLUGIN (devhelp_plugin_get_type()) +#define DEVHELP_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),\ + DEVHELP_TYPE_PLUGIN, DevhelpPlugin)) +#define DEVHELP_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),\ + DEVHELP_TYPE_PLUGIN, DevhelpPluginClass)) +#define DEVHELP_IS_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),\ + DEVHELP_TYPE_PLUGIN)) +#define DEVHELP_IS_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),\ + DEVHELP_TYPE_PLUGIN)) +#define DEVHELP_PLUGIN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj),\ + DEVHELP_TYPE_PLUGIN, DevhelpPluginClass)) + +typedef struct _DevhelpPlugin DevhelpPlugin; +typedef struct _DevhelpPluginClass DevhelpPluginClass; +typedef struct _DevhelpPluginPrivate DevhelpPluginPrivate; + +struct _DevhelpPlugin +{ + GObject parent; + + GtkWidget *book_tree; /// "Contents" in the sidebar + GtkWidget *search; /// "Search" in the sidebar + GtkWidget *sb_notebook; /// Notebook that holds contents/search + gint sb_notebook_tab; /// Index of tab where devhelp sidebar is + GtkWidget *webview; /// Webkit that shows documentation + gint webview_tab; /// Index of tab that contains the webview + GtkWidget *main_notebook; /// Notebook that holds Geany doc notebook and + /// and webkit view + GtkWidget *doc_notebook; /// Geany's document notebook + GtkWidget *editor_menu_item; /// Item in the editor's context menu + GtkWidget *editor_menu_sep; /// Separator item above menu item + gboolean *webview_active; /// Tracks whether webview stuff is shown + + gboolean last_main_tab_id; /// These track the last id of the tabs + gboolean last_sb_tab_id; /// before toggling + gboolean tabs_toggled; /// Tracks state of whether to toggle to + /// Devhelp or back to code + gboolean created_main_nb; /// Track whether we created the main notebook + + GtkPositionType orig_sb_tab_pos; + gboolean sidebar_tab_bottom; + gboolean in_message_window; + + DevhelpPluginPrivate *priv; +}; + +struct _DevhelpPluginClass +{ + GObjectClass parent_class; +}; + + +GType devhelp_plugin_get_type (void); +DevhelpPlugin* devhelp_plugin_new (gboolean sb_tabs_bottom, gboolean show_in_msgwin); + +gchar *devhelp_plugin_clean_word(gchar *str); +gchar *devhelp_plugin_get_current_tag(void); +void devhelp_plugin_activate_tabs(DevhelpPlugin *dhplug, gboolean contents); +void devhelp_plugin_sidebar_tabs_bottom(DevhelpPlugin *dhplug, gboolean bottom); + +G_END_DECLS + +#endif /* __DEVHELPPLUGIN_H__ */ Deleted: trunk/geany-plugins/devhelp/src/dh-plugin.c =================================================================== --- trunk/geany-plugins/devhelp/src/dh-plugin.c 2011-03-07 00:55:38 UTC (rev 1956) +++ trunk/geany-plugins/devhelp/src/dh-plugin.c 2011-03-07 05:13:27 UTC (rev 1957) @@ -1,389 +0,0 @@ -/* - * dhplug.c - Part of the Geany Devhelp Plugin - * - * Copyright 2010 Matthew Brush <mbrush(a)leftclick.ca> - * - * 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 3 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. - */ - -#include <gtk/gtk.h> -#include <geanyplugin.h> - -#include <devhelp/dh-base.h> -#include <devhelp/dh-book-tree.h> -#include <devhelp/dh-search.h> -#include <devhelp/dh-link.h> - -#ifdef HAVE_BOOK_MANAGER /* for newer api */ -#include <devhelp/dh-book-manager.h> -#endif - -#include <webkit/webkitwebview.h> - -#include "plugin.h" -#include "dh-plugin.h" -#include "main-notebook.h" - -/* Devhelp base object */ -static DhBase *dhbase = NULL; - -/** - * devhelp_clean_word: - * @param str String to clean - * - * Replaces non GEANY_WORDCHARS in str with spaces and then trims whitespace. - * This function does not allocate a new string, it modifies str in place - * and returns a pointer to str. - * TODO: make this only remove stuff from the start or end of string. - * - * @return Pointer to (cleaned) @str. - */ -gchar *devhelp_clean_word(gchar *str) -{ - return g_strstrip(g_strcanon(str, GEANY_WORDCHARS, ' ')); -} - -/** - * devhelp_get_current_tag: - * - * Gets either the current selection or the word at the current selection. - * - * @return Newly allocated string with current tag or NULL no tag. - */ -gchar *devhelp_get_current_tag(void) -{ - gint pos; - gchar *tag = NULL; - GeanyDocument *doc = document_get_current(); - - if (sci_has_selection(doc->editor->sci)) - return devhelp_clean_word(sci_get_selection_contents(doc->editor->sci)); - - pos = sci_get_current_position(doc->editor->sci); - tag = editor_get_word_at_pos(doc->editor, pos, GEANY_WORDCHARS); - - if (tag == NULL) - return NULL; - - if (tag[0] == '\0') { - g_free(tag); - return NULL; - } - - return devhelp_clean_word(tag); -} - -/** - * devhelp_activate_tabs: - * @param dhplug The current DevhelpPlugin struct. - * @param contents If TRUE then select the devhelp Contents tab - * otherwise select the devhelp Search tab. - * - * Toggles devhelp related tabs to be current tabs or back to the - * previously selected tabs. - */ -void devhelp_activate_tabs(DevhelpPlugin *dhplug, gboolean contents) -{ - if (!dhplug->tabs_toggled) - { - /* toggle state tracking */ - dhplug->last_main_tab_id = gtk_notebook_get_current_page( - GTK_NOTEBOOK(dhplug->main_notebook)); - dhplug->last_sb_tab_id = gtk_notebook_get_current_page(GTK_NOTEBOOK( - geany->main_widgets->sidebar_notebook)); - dhplug->tabs_toggled = TRUE; - - gtk_notebook_set_current_page(GTK_NOTEBOOK( - geany->main_widgets->sidebar_notebook), - dhplug->sb_notebook_tab); - gtk_notebook_set_current_page( - GTK_NOTEBOOK(dhplug->main_notebook), dhplug->webview_tab); - if (contents) - gtk_notebook_set_current_page(GTK_NOTEBOOK(dhplug->sb_notebook), 0); - else - gtk_notebook_set_current_page(GTK_NOTEBOOK(dhplug->sb_notebook), 1); - } - else - { - gtk_notebook_set_current_page(GTK_NOTEBOOK(dhplug->main_notebook), - dhplug->last_main_tab_id); - gtk_notebook_set_current_page(GTK_NOTEBOOK( - geany->main_widgets->sidebar_notebook), - dhplug->last_sb_tab_id); - dhplug->tabs_toggled = FALSE; - } -} - -void devhelp_plugin_sidebar_tabs_bottom(DevhelpPlugin *dhplug, gboolean bottom) -{ - if (bottom) - gtk_notebook_set_tab_pos(GTK_NOTEBOOK(geany->main_widgets->sidebar_notebook), - GTK_POS_BOTTOM); - else - gtk_notebook_set_tab_pos(GTK_NOTEBOOK(geany->main_widgets->sidebar_notebook), - dhplug->orig_sb_tab_pos); -} - -/* Called when the editor menu item is selected */ -static void on_search_help_activate(GtkMenuItem *menuitem, gpointer user_data) -{ - DevhelpPlugin *dhplug = user_data; - gchar *current_tag = devhelp_get_current_tag(); - - if (current_tag == NULL) - return; - - dh_search_set_search_string (DH_SEARCH(dhplug->search), current_tag, NULL); - - /* activate devhelp tabs with search tab active */ - devhelp_activate_tabs(dhplug, FALSE); - - g_free(current_tag); -} - -/* - * Called when the editor context menu is shown so that the devhelp - * search item can be disabled if there isn't a selected tag. - */ -static void on_editor_menu_popup(GtkWidget *widget, gpointer user_data) -{ - gchar *curword = NULL; - gchar *new_label = NULL; - DevhelpPlugin *dhplug = user_data; - - curword = devhelp_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); - gtk_menu_item_set_label(GTK_MENU_ITEM(dhplug->editor_menu_item), - new_label); - g_free(new_label); - } - - g_free(curword); -} - -/** - * on_link_clicked: - * @param ignored Not used - * @param link The devhelp link object describing what was clicked. - * @param user_data The current DevhelpPlugin struct. - * - * Called when a link in either the contents or search areas on the sidebar - * have a link clicked on, meaning to load that file into the webview. - */ -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); - gtk_notebook_set_current_page(GTK_NOTEBOOK(plug->main_notebook), - plug->webview_tab); -} - -/** - * devhelp_plugin_new: - * - * Creates a new DevhelpPlugin. The returned structure is allocated dyamically - * and must be freed with the devhelp_plugin_destroy() function. This function - * gets called from Geany's plugin_init() function. - * - * @return A newly allocated DevhelpPlugin struct or null on error. - */ -DevhelpPlugin *devhelp_plugin_new(gboolean sb_tabs_bottom, gboolean show_in_msgwin) -{ - gchar *homepage_uri; - GtkWidget *book_tree_sw, *webview_sw, *contents_label; - GtkWidget *search_label, *dh_sidebar_label, *doc_label; - -#ifdef HAVE_BOOK_MANAGER /* for newer api */ - DhBookManager *book_manager; -#else - GNode *books; - GList *keywords; -#endif - - DevhelpPlugin *dhplug = g_malloc0(sizeof(DevhelpPlugin)); - - if (dhplug == NULL) { - g_printerr(_("Cannot create a new Devhelp plugin, out of memory.\n")); - return NULL; - } - - if (dhbase == NULL) - dhbase = dh_base_new(); - -#ifdef HAVE_BOOK_MANAGER /* for newer api */ - book_manager = dh_base_get_book_manager(dhbase); - dhplug->book_tree = dh_book_tree_new(book_manager); - dhplug->search = dh_search_new(book_manager); -#else - books = dh_base_get_book_tree(dhbase); - keywords = dh_base_get_keywords(dhbase); - dhplug->book_tree = dh_book_tree_new(books); - dhplug->search = dh_search_new(keywords); -#endif - - dhplug->in_message_window = show_in_msgwin; - - /* create/grab notebooks */ - dhplug->sb_notebook = gtk_notebook_new(); - dhplug->doc_notebook = geany->main_widgets->notebook; - - if (dhplug->in_message_window) - dhplug->main_notebook = geany->main_widgets->message_window_notebook; - else - dhplug->main_notebook = main_notebook_get(); - - /* editor menu items */ - dhplug->editor_menu_sep = gtk_separator_menu_item_new(); - dhplug->editor_menu_item = gtk_menu_item_new_with_label( - _("Search Documentation for Tag")); - - /* tab labels */ - contents_label = gtk_label_new(_("Contents")); - search_label = gtk_label_new(_("Search")); - dh_sidebar_label = gtk_label_new(_("Devhelp")); - doc_label = gtk_label_new(_("Documentation")); - - dhplug->orig_sb_tab_pos = gtk_notebook_get_tab_pos(GTK_NOTEBOOK( - geany->main_widgets->sidebar_notebook)); - devhelp_plugin_sidebar_tabs_bottom(dhplug, sb_tabs_bottom); - - /* sidebar contents/book tree */ - book_tree_sw = gtk_scrolled_window_new(NULL, NULL); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(book_tree_sw), - GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - gtk_container_set_border_width(GTK_CONTAINER(book_tree_sw), 6); - gtk_container_add(GTK_CONTAINER(book_tree_sw), dhplug->book_tree); - gtk_widget_show(dhplug->book_tree); - - /* sidebar search */ - gtk_widget_show(dhplug->search); - - /* webview to display documentation */ - dhplug->webview = webkit_web_view_new(); - webview_sw = gtk_scrolled_window_new(NULL, NULL); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(webview_sw), - GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - /*gtk_container_set_border_width(GTK_CONTAINER(webview_sw), 6);*/ - gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(webview_sw), - GTK_SHADOW_ETCHED_IN); - gtk_container_add(GTK_CONTAINER(webview_sw), dhplug->webview); - gtk_widget_show_all(webview_sw); - - /* setup the sidebar notebook */ - gtk_notebook_append_page(GTK_NOTEBOOK(dhplug->sb_notebook), - book_tree_sw, contents_label); - gtk_notebook_append_page(GTK_NOTEBOOK(dhplug->sb_notebook), - dhplug->search, search_label); - gtk_notebook_set_current_page(GTK_NOTEBOOK(dhplug->sb_notebook), 0); - - gtk_widget_show_all(dhplug->sb_notebook); - gtk_notebook_append_page( - GTK_NOTEBOOK(geany->main_widgets->sidebar_notebook), - dhplug->sb_notebook, dh_sidebar_label); - 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); - dhplug->webview_tab = gtk_notebook_page_num( - GTK_NOTEBOOK(dhplug->main_notebook), webview_sw); - - /* add menu item to editor popup menu */ - /* todo: make this an image menu item with devhelp icon */ - gtk_menu_shell_append(GTK_MENU_SHELL(geany->main_widgets->editor_menu), - dhplug->editor_menu_sep); - gtk_menu_shell_append(GTK_MENU_SHELL(geany->main_widgets->editor_menu), - dhplug->editor_menu_item); - gtk_widget_show(dhplug->editor_menu_sep); - 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( - 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->search, - "link-selected", - G_CALLBACK(on_link_clicked), - dhplug); - - /* toggle state tracking */ - dhplug->last_main_tab_id = gtk_notebook_get_current_page( - GTK_NOTEBOOK(dhplug->main_notebook)); - dhplug->last_sb_tab_id = gtk_notebook_get_current_page(GTK_NOTEBOOK( - 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); - } - - return dhplug; -} - -/** - * devhelp_plugin_destroy: - * @param dhplug The DevhelpPlugin to destroy/free. - * - * Destroys the associated widgets and frees memory for a DevhelpPlugin. This - * should be called from Geany's plugin_cleanup() function. - */ -void devhelp_plugin_destroy(DevhelpPlugin *dhplug) -{ - gtk_widget_destroy(dhplug->sb_notebook); - - gtk_notebook_remove_page(GTK_NOTEBOOK(dhplug->main_notebook), - dhplug->webview_tab); - - if (!dhplug->in_message_window) - main_notebook_destroy(); - - gtk_widget_destroy(dhplug->editor_menu_sep); - gtk_widget_destroy(dhplug->editor_menu_item); - - gtk_notebook_set_tab_pos(GTK_NOTEBOOK( - geany->main_widgets->sidebar_notebook), - dhplug->orig_sb_tab_pos); - - g_free(dhplug); -} Deleted: trunk/geany-plugins/devhelp/src/dh-plugin.h =================================================================== --- trunk/geany-plugins/devhelp/src/dh-plugin.h 2011-03-07 00:55:38 UTC (rev 1956) +++ trunk/geany-plugins/devhelp/src/dh-plugin.h 2011-03-07 05:13:27 UTC (rev 1957) @@ -1,68 +0,0 @@ -/* - * dhplug.h - Part of the Geany Devhelp Plugin - * - * Copyright 2010 Matthew Brush <mbrush(a)leftclick.ca> - * - * 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 3 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. - */ - -#ifndef DH_PLUGIN_H -#define DH_PLUGIN_H - -#include <gtk/gtk.h> - -#ifndef DHPLUG_DATA_DIR -#define DHPLUG_DATA_DIR "/usr/local/share/geany-devhelp" -#endif - -#define DHPLUG_WEBVIEW_HOME_FILE DHPLUG_DATA_DIR"/home.html" - -/* main plugin struct */ -typedef struct -{ - GtkWidget *book_tree; /// "Contents" in the sidebar - GtkWidget *search; /// "Search" in the sidebar - GtkWidget *sb_notebook; /// Notebook that holds contents/search - gint sb_notebook_tab; /// Index of tab where devhelp sidebar is - GtkWidget *webview; /// Webkit that shows documentation - gint webview_tab; /// Index of tab that contains the webview - GtkWidget *main_notebook; /// Notebook that holds Geany doc notebook and - /// and webkit view - GtkWidget *doc_notebook; /// Geany's document notebook - GtkWidget *editor_menu_item; /// Item in the editor's context menu - GtkWidget *editor_menu_sep; /// Separator item above menu item - gboolean *webview_active; /// Tracks whether webview stuff is shown - - gboolean last_main_tab_id; /// These track the last id of the tabs - gboolean last_sb_tab_id; /// before toggling - gboolean tabs_toggled; /// Tracks state of whether to toggle to - /// Devhelp or back to code - gboolean created_main_nb; /// Track whether we created the main notebook - - GtkPositionType orig_sb_tab_pos; - gboolean sidebar_tab_bottom; - gboolean in_message_window; - -} DevhelpPlugin; - -gchar *devhelp_clean_word(gchar *str); -gchar *devhelp_get_current_tag(void); -void devhelp_activate_tabs(DevhelpPlugin *dhplug, gboolean contents); -DevhelpPlugin *devhelp_plugin_new(gboolean sb_tabs_bottom, gboolean show_in_msgwin); -void devhelp_plugin_destroy(DevhelpPlugin *dhplug); -void devhelp_plugin_sidebar_tabs_bottom(DevhelpPlugin *dhplug, gboolean bottom); - -#endif Modified: trunk/geany-plugins/devhelp/src/plugin.c =================================================================== --- trunk/geany-plugins/devhelp/src/plugin.c 2011-03-07 00:55:38 UTC (rev 1956) +++ trunk/geany-plugins/devhelp/src/plugin.c 2011-03-07 05:13:27 UTC (rev 1957) @@ -27,7 +27,7 @@ #include <devhelp/dh-search.h> #include "plugin.h" -#include "dh-plugin.h" +#include "devhelpplugin.h" PLUGIN_VERSION_CHECK(200) @@ -62,18 +62,18 @@ switch (key_id) { case KB_DEVHELP_TOGGLE_CONTENTS: - devhelp_activate_tabs(dev_help_plugin, TRUE); + devhelp_plugin_activate_tabs(dev_help_plugin, TRUE); break; case KB_DEVHELP_TOGGLE_SEARCH: - devhelp_activate_tabs(dev_help_plugin, FALSE); + devhelp_plugin_activate_tabs(dev_help_plugin, FALSE); break; case KB_DEVHELP_SEARCH_SYMBOL: { - gchar *current_tag = devhelp_get_current_tag(); + gchar *current_tag = devhelp_plugin_get_current_tag(); if (current_tag == NULL) return; dh_search_set_search_string( DH_SEARCH(dev_help_plugin->search), current_tag, NULL); - devhelp_activate_tabs(dev_help_plugin, FALSE); + devhelp_plugin_activate_tabs(dev_help_plugin, FALSE); g_free(current_tag); break; } @@ -100,7 +100,7 @@ { static gboolean message_shown = FALSE; if (response_id == GTK_RESPONSE_OK || response_id == GTK_RESPONSE_APPLY) { - store_preferences(); + plugin_store_preferences(); if (!message_shown) { dialogs_show_msgbox(GTK_MESSAGE_INFO, "Settings for whether to use " @@ -277,8 +277,8 @@ plugin_module_make_resident(geany_plugin); - config_init(); - load_preferences(); + plugin_config_init(); + plugin_load_preferences(); dev_help_plugin = devhelp_plugin_new(move_sidebar_tabs_bottom, show_in_msg_window); @@ -297,10 +297,9 @@ void plugin_cleanup(void) { - store_preferences(); + plugin_store_preferences(); - if (dev_help_plugin != NULL) - devhelp_plugin_destroy(dev_help_plugin); + g_object_unref(dev_help_plugin); g_free(default_config); g_free(user_config); Modified: trunk/geany-plugins/devhelp/src/plugin.h =================================================================== --- trunk/geany-plugins/devhelp/src/plugin.h 2011-03-07 00:55:38 UTC (rev 1956) +++ trunk/geany-plugins/devhelp/src/plugin.h 2011-03-07 05:13:27 UTC (rev 1957) @@ -24,7 +24,7 @@ #include <gtk/gtk.h> #include <geanyplugin.h> -#include "dh-plugin.h" +#include "devhelpplugin.h" extern GeanyPlugin *geany_plugin; extern GeanyData *geany_data; 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:[1956] trunk/geany-plugins/po
by frlan＠users.sourceforge.net 07 Mar '11

07 Mar '11

Revision: 1956 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1956&view=rev Author: frlan Date: 2011-03-07 00:55:38 +0000 (Mon, 07 Mar 2011) Log Message: ----------- Add devhelp to POTFILES Modified Paths: -------------- trunk/geany-plugins/po/ChangeLog trunk/geany-plugins/po/POTFILES.in Modified: trunk/geany-plugins/po/ChangeLog =================================================================== --- trunk/geany-plugins/po/ChangeLog 2011-03-06 23:57:08 UTC (rev 1955) +++ trunk/geany-plugins/po/ChangeLog 2011-03-07 00:55:38 UTC (rev 1956) @@ -1,3 +1,8 @@ +2011-03-07 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * POTFILES.in: Add devhelp plugin to list of translatable files. + + 2011-03-05 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * POTFILES.in: Add geanyPG to list translatable files. Modified: trunk/geany-plugins/po/POTFILES.in =================================================================== --- trunk/geany-plugins/po/POTFILES.in 2011-03-06 23:57:08 UTC (rev 1955) +++ trunk/geany-plugins/po/POTFILES.in 2011-03-07 00:55:38 UTC (rev 1956) @@ -36,6 +36,11 @@ debugger/src/utils.c debugger/src/watch_model.c +# devhelp +devhelp/src/dh-plugin.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:[1955] trunk/geany-plugins/devhelp/data/Makefile. am
by hyperair＠users.sourceforge.net 07 Mar '11

07 Mar '11

Revision: 1955 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1955&view=rev Author: hyperair Date: 2011-03-06 23:57:08 +0000 (Sun, 06 Mar 2011) Log Message: ----------- Set plugin = devhelp in devhelp/data/Makefile.am This is required for plugindatadir to work properly. Modified Paths: -------------- trunk/geany-plugins/devhelp/data/Makefile.am Modified: trunk/geany-plugins/devhelp/data/Makefile.am =================================================================== --- trunk/geany-plugins/devhelp/data/Makefile.am 2011-03-06 23:56:38 UTC (rev 1954) +++ trunk/geany-plugins/devhelp/data/Makefile.am 2011-03-06 23:57:08 UTC (rev 1955) @@ -1,5 +1,6 @@ include $(top_srcdir)/build/vars.docs.mk +plugin = devhelp FILES = \ devhelp-plugin.svg \ devhelp-plugin-48.png \ 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:[1954] trunk/geany-plugins/debugger/Makefile.am
by hyperair＠users.sourceforge.net 07 Mar '11

07 Mar '11

Revision: 1954 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1954&view=rev Author: hyperair Date: 2011-03-06 23:56:38 +0000 (Sun, 06 Mar 2011) Log Message: ----------- Drop indent-all.sh from debugger EXTRA_DIST Seems like it was removed earlier Modified Paths: -------------- trunk/geany-plugins/debugger/Makefile.am Modified: trunk/geany-plugins/debugger/Makefile.am =================================================================== --- trunk/geany-plugins/debugger/Makefile.am 2011-03-06 23:56:11 UTC (rev 1953) +++ trunk/geany-plugins/debugger/Makefile.am 2011-03-06 23:56:38 UTC (rev 1954) @@ -7,6 +7,3 @@ SUBDIRS = src plugin = debugger - -EXTRA_DIST += \ - indent-all.sh 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:[1953] trunk/geany-plugins/devhelp/Makefile
by hyperair＠users.sourceforge.net 07 Mar '11

07 Mar '11

Revision: 1953 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1953&view=rev Author: hyperair Date: 2011-03-06 23:56:11 +0000 (Sun, 06 Mar 2011) Log Message: ----------- Drop devhelp Makefile Removed Paths: ------------- trunk/geany-plugins/devhelp/Makefile Deleted: trunk/geany-plugins/devhelp/Makefile =================================================================== --- trunk/geany-plugins/devhelp/Makefile 2011-03-06 23:55:43 UTC (rev 1952) +++ trunk/geany-plugins/devhelp/Makefile 2011-03-06 23:56:11 UTC (rev 1953) @@ -1,714 +0,0 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. -# Makefile. Generated from Makefile.in by configure. - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - - -pkgdatadir = $(datadir)/geany-devhelp -pkgincludedir = $(includedir)/geany-devhelp -pkglibdir = $(libdir)/geany-devhelp -pkglibexecdir = $(libexecdir)/geany-devhelp -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = x86_64-unknown-linux-gnu -host_triplet = x86_64-unknown-linux-gnu -subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \ - ChangeLog INSTALL NEWS config.guess config.sub depcomp \ - install-sh ltmain.sh missing -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno config.status.lineno -mkinstalldirs = $(install_sh) -d -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -am__v_at_0 = @ -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir dist dist-all distcheck -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -distdir = $(PACKAGE)-$(VERSION) -top_distdir = $(distdir) -am__remove_distdir = \ - { test ! -d "$(distdir)" \ - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr "$(distdir)"; }; } -am__relativize = \ - dir0=`pwd`; \ - sed_first='s,^$[^/]*$/.*$$,\1,'; \ - sed_rest='s,^[^/]*/*,,'; \ - sed_last='s,^.*/$[^/]*$$$,\1,'; \ - sed_butlast='s,/*[^/]*$$,,'; \ - while test -n "$$dir1"; do \ - first=`echo "$$dir1" | sed -e "$$sed_first"`; \ - if test "$$first" != "."; then \ - if test "$$first" = ".."; then \ - dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ - dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ - else \ - first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ - if test "$$first2" = "$$first"; then \ - dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ - else \ - dir2="../$$dir2"; \ - fi; \ - dir0="$$dir0"/"$$first"; \ - fi; \ - fi; \ - dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ - done; \ - reldir="$$dir2" -DIST_ARCHIVES = $(distdir).tar.gz -GZIP_ENV = --best -distuninstallcheck_listfiles = find . -type f -print -distcleancheck_listfiles = find . -type f -print -ACLOCAL = ${SHELL} /home/mbrush/Projects/geany-devhelp/missing --run aclocal-1.11 -AMTAR = ${SHELL} /home/mbrush/Projects/geany-devhelp/missing --run tar -AM_DEFAULT_VERBOSITY = 0 -AR = ar -AUTOCONF = ${SHELL} /home/mbrush/Projects/geany-devhelp/missing --run autoconf -AUTOHEADER = ${SHELL} /home/mbrush/Projects/geany-devhelp/missing --run autoheader -AUTOMAKE = ${SHELL} /home/mbrush/Projects/geany-devhelp/missing --run automake-1.11 -AWK = mawk -CC = gcc -CCDEPMODE = depmode=gcc3 -CFLAGS = -g -O2 -CPP = gcc -E -CPPFLAGS = -CYGPATH_W = echo -DEFS = -DPACKAGE_NAME=\"geany-devhelp\" -DPACKAGE_TARNAME=\"geany-devhelp\" -DPACKAGE_VERSION=\"0.1\" -DPACKAGE_STRING=\"geany-devhelp\ 0.1\" -DPACKAGE_BUGREPORT=\"mbrush(a)leftclick.ca\" -DPACKAGE_URL=\"\" -DPACKAGE=\"geany-devhelp\" -DVERSION=\"0.1\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DEPDIR = .deps -DEVHELP_CFLAGS = -pthread -I/usr/include/devhelp-1.0 -I/usr/include/libwnck-1.0 -I/usr/include/gtk-2.0 -I/usr/include/webkit-1.0 -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/startup-notification-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -DEVHELP_LIBS = -pthread -ldevhelp-1 -lwebkit-1.0 -lgtk-x11-2.0 -lsoup-2.4 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lm -lcairo -lpng12 -lpango-1.0 -lfreetype -lfontconfig -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -DSYMUTIL = -DUMPBIN = -ECHO_C = -ECHO_N = -n -ECHO_T = -EGREP = /bin/grep -E -EXEEXT = -FGREP = /bin/grep -F -GEANY_CFLAGS = -DGTK -pthread -I/usr/include/geany -I/usr/include/geany/tagmanager -I/usr/include/geany/scintilla -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -GEANY_LIBS = -pthread -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lm -lcairo -lpng12 -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -GREP = /bin/grep -GTK_CFLAGS = -pthread -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -GTK_LIBS = -pthread -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lm -lcairo -lpng12 -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -INSTALL = /usr/bin/install -c -INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_PROGRAM = ${INSTALL} -INSTALL_SCRIPT = ${INSTALL} -INSTALL_STRIP_PROGRAM = $(install_sh) -c -s -LD = /usr/bin/ld -m elf_x86_64 -LDFLAGS = -LIBOBJS = -LIBS = -LIBTOOL = $(SHELL) $(top_builddir)/libtool -LIPO = -LN_S = ln -s -LTLIBOBJS = -MAKEINFO = ${SHELL} /home/mbrush/Projects/geany-devhelp/missing --run makeinfo -MKDIR_P = /bin/mkdir -p -NM = /usr/bin/nm -B -NMEDIT = -OBJDUMP = objdump -OBJEXT = o -OTOOL = -OTOOL64 = -PACKAGE = geany-devhelp -PACKAGE_BUGREPORT = mbrush(a)leftclick.ca -PACKAGE_NAME = geany-devhelp -PACKAGE_STRING = geany-devhelp 0.1 -PACKAGE_TARNAME = geany-devhelp -PACKAGE_URL = -PACKAGE_VERSION = 0.1 -PATH_SEPARATOR = : -PKG_CONFIG = /usr/bin/pkg-config -PKG_CONFIG_LIBDIR = -PKG_CONFIG_PATH = -RANLIB = ranlib -SED = /bin/sed -SET_MAKE = -SHELL = /bin/bash -STRIP = strip -VERSION = 0.1 -abs_builddir = /home/mbrush/Projects/geany-devhelp -abs_srcdir = /home/mbrush/Projects/geany-devhelp -abs_top_builddir = /home/mbrush/Projects/geany-devhelp -abs_top_srcdir = /home/mbrush/Projects/geany-devhelp -ac_ct_CC = gcc -ac_ct_DUMPBIN = -am__include = include -am__leading_dot = . -am__quote = -am__tar = ${AMTAR} chof - "$$tardir" -am__untar = ${AMTAR} xf - -bindir = ${exec_prefix}/bin -build = x86_64-unknown-linux-gnu -build_alias = -build_cpu = x86_64 -build_os = linux-gnu -build_vendor = unknown -builddir = . -datadir = ${datarootdir} -datarootdir = ${prefix}/share -docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} -dvidir = ${docdir} -exec_prefix = ${prefix} -host = x86_64-unknown-linux-gnu -host_alias = -host_cpu = x86_64 -host_os = linux-gnu -host_vendor = unknown -htmldir = ${docdir} -includedir = ${prefix}/include -infodir = ${datarootdir}/info -install_sh = ${SHELL} /home/mbrush/Projects/geany-devhelp/install-sh -libdir = ${exec_prefix}/lib -libexecdir = ${exec_prefix}/libexec -localedir = ${datarootdir}/locale -localstatedir = ${prefix}/var -lt_ECHO = echo -mandir = ${datarootdir}/man -mkdir_p = /bin/mkdir -p -oldincludedir = /usr/include -pdfdir = ${docdir} -prefix = /usr -program_transform_name = s,x,x, -psdir = ${docdir} -sbindir = ${exec_prefix}/sbin -sharedstatedir = ${prefix}/com -srcdir = . -sysconfdir = ${prefix}/etc -target_alias = -top_build_prefix = -top_builddir = . -top_srcdir = . -ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = src data -all: all-recursive - -.SUFFIXES: -am--refresh: - @: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \ - $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - echo ' $(SHELL) ./config.status'; \ - $(SHELL) ./config.status;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck - -$(top_srcdir)/configure: $(am__configure_deps) - $(am__cd) $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -$(am__aclocal_m4_deps): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool config.lt - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - $(am__remove_distdir) - test -d "$(distdir)" || mkdir "$(distdir)" - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ - dir1=$$subdir; dir2="$(top_distdir)"; \ - $(am__relativize); \ - new_top_distdir=$$reldir; \ - echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ - echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ - ($(am__cd) $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$new_top_distdir" \ - distdir="$$new_distdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - am__skip_mode_fix=: \ - distdir) \ - || exit 1; \ - fi; \ - done - -test -n "$(am__skip_mode_fix)" \ - || find "$(distdir)" -type d ! -perm -755 \ - -exec chmod u+rwx,go+rx {} \; -o \ - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r "$(distdir)" -dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) - -dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) - -dist-xz: distdir - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz - $(am__remove_distdir) - -dist-tarZ: distdir - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) - -dist-shar: distdir - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) - -dist-zip: distdir - -rm -f $(distdir).zip - zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) - -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) - -# This target untars the dist file and tries a VPATH configuration. Then -# it guarantees that the distribution is self-contained by making another -# tarfile. -distcheck: dist - case '$(DIST_ARCHIVES)' in \ - *.tar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ - bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ - *.tar.xz*) \ - xz -dc $(distdir).tar.xz | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst - chmod a-w $(distdir) - test -d $(distdir)/_build || exit 0; \ - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && am__cwd=`pwd` \ - && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ - $(DISTCHECK_CONFIGURE_FLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ - distuninstallcheck \ - && chmod -R a-w "$$dc_install_base" \ - && ({ \ - (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ - distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ - } || { rm -rf "$$dc_destdir"; exit 1; }) \ - && rm -rf "$$dc_destdir" \ - && $(MAKE) $(AM_MAKEFLAGS) dist \ - && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ - && cd "$$am__cwd" \ - || exit 1 - $(am__remove_distdir) - @(echo "$(distdir) archives ready for distribution: "; \ - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' -distuninstallcheck: - @$(am__cd) '$(distuninstallcheck_dir)' \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ - || { echo "ERROR: files left after uninstall:" ; \ - if test -n "$(DESTDIR)"; then \ - echo " (check DESTDIR support)"; \ - fi ; \ - $(distuninstallcheck_listfiles) ; \ - exit 1; } >&2 -distcleancheck: distclean - @if test '$(srcdir)' = . ; then \ - echo "ERROR: distcleancheck can only run from a VPATH build" ; \ - exit 1 ; \ - fi - @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left in build directory after distclean:" ; \ - $(distcleancheck_listfiles) ; \ - exit 1; } >&2 -check-am: all-am -check: check-recursive -all-am: Makefile -installdirs: installdirs-recursive -installdirs-am: -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool \ - distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -html-am: - -info: info-recursive - -info-am: - -install-data-am: - -install-dvi: install-dvi-recursive - -install-dvi-am: - -install-exec-am: - -install-html: install-html-recursive - -install-html-am: - -install-info: install-info-recursive - -install-info-am: - -install-man: - -install-pdf: install-pdf-recursive - -install-pdf-am: - -install-ps: install-ps-recursive - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf $(top_srcdir)/autom4te.cache - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: - -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ - distcheck distclean distclean-generic distclean-libtool \ - distclean-tags distcleancheck distdir distuninstallcheck dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: 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:[1952] trunk/geany-plugins
by hyperair＠users.sourceforge.net 07 Mar '11

07 Mar '11

Revision: 1952 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1952&view=rev Author: hyperair Date: 2011-03-06 23:55:43 +0000 (Sun, 06 Mar 2011) Log Message: ----------- Integrate devhelp into autotools buildsys Modified Paths: -------------- trunk/geany-plugins/configure.ac trunk/geany-plugins/devhelp/Makefile.am trunk/geany-plugins/devhelp/data/Makefile.am trunk/geany-plugins/devhelp/src/Makefile.am Added Paths: ----------- trunk/geany-plugins/build/devhelp.m4 Added: trunk/geany-plugins/build/devhelp.m4 =================================================================== --- trunk/geany-plugins/build/devhelp.m4 (rev 0) +++ trunk/geany-plugins/build/devhelp.m4 2011-03-06 23:55:43 UTC (rev 1952) @@ -0,0 +1,11 @@ +AC_DEFUN([GP_CHECK_DEVHELP], +[ + GP_ARG_DISABLE([devhelp], [auto]) + GP_CHECK_PLUGIN_DEPS([devhelp], [DEVHELP], [libdevhelp-1.0]) + GP_STATUS_PLUGIN_ADD([DevHelp], [$enable_devhelp]) + AC_CONFIG_FILES([ + devhelp/Makefile + devhelp/src/Makefile + devhelp/data/Makefile + ]) +]) Modified: trunk/geany-plugins/configure.ac =================================================================== --- trunk/geany-plugins/configure.ac 2011-03-06 17:53:10 UTC (rev 1951) +++ trunk/geany-plugins/configure.ac 2011-03-06 23:55:43 UTC (rev 1952) @@ -25,6 +25,7 @@ GP_CHECK_ADDONS GP_CHECK_CODENAV GP_CHECK_DEBUGGER +GP_CHECK_DEVHELP GP_CHECK_GEANYCFP GP_CHECK_GEANYDOC GP_CHECK_GEANYEXTRASEL Modified: trunk/geany-plugins/devhelp/Makefile.am =================================================================== --- trunk/geany-plugins/devhelp/Makefile.am 2011-03-06 17:53:10 UTC (rev 1951) +++ trunk/geany-plugins/devhelp/Makefile.am 2011-03-06 23:55:43 UTC (rev 1952) @@ -1,3 +1,8 @@ -ACLOCAL_AMFLAGS = -I m4 +if ENABLE_DEVHELP +include $(top_srcdir)/build/vars.auxfiles.mk +else +include $(top_srcdir)/build/vars.docs.mk +endif SUBDIRS = src data +plugin = devhelp Modified: trunk/geany-plugins/devhelp/data/Makefile.am =================================================================== --- trunk/geany-plugins/devhelp/data/Makefile.am 2011-03-06 17:53:10 UTC (rev 1951) +++ trunk/geany-plugins/devhelp/data/Makefile.am 2011-03-06 23:55:43 UTC (rev 1952) @@ -1,7 +1,16 @@ -ACLOCAL_AMFLAGS = -I m4 +include $(top_srcdir)/build/vars.docs.mk -dist_pkgdata_DATA = devhelp-plugin.svg \ - devhelp-plugin-48.png \ - geany-devhelp-plugin.png \ - home.html \ - devhelp.conf +FILES = \ + devhelp-plugin.svg \ + devhelp-plugin-48.png \ + geany-devhelp-plugin.png \ + home.html \ + devhelp.conf + +EXTRA_DIST = $(FILES) + +if ENABLE_DEVHELP +plugindata_DATA = $(FILES) +else +EXTRA_DATA = $(FILES) +endif Modified: trunk/geany-plugins/devhelp/src/Makefile.am =================================================================== --- trunk/geany-plugins/devhelp/src/Makefile.am 2011-03-06 17:53:10 UTC (rev 1951) +++ trunk/geany-plugins/devhelp/src/Makefile.am 2011-03-06 23:55:43 UTC (rev 1952) @@ -1,12 +1,20 @@ -ACLOCAL_AMFLAGS = -I m4 +include $(top_srcdir)/build/vars.build.mk +include $(top_srcdir)/build/vars.docs.mk -geanypluginsdir = $(libdir)/geany -geanyplugins_LTLIBRARIES = devhelp.la +plugin = devhelp -devhelp_la_LDFLAGS = -module -avoid-version -shared -devhelp_la_CPPFLAGS = @GTK_CFLAGS@ \ - @GEANY_CFLAGS@ \ - @DEVHELP_CFLAGS@ \ - -DDHPLUG_DATA_DIR=\"$(pkgdatadir)\" -devhelp_la_LIBADD = @GTK_LIBS@ @GEANY_LIBS@ @DEVHELP_LIBS@ -devhelp_la_SOURCES = plugin.c dh-plugin.c main-notebook.c +if ENABLE_DEVHELP +geanyplugins_LTLIBRARIES = devhelp.la +else +EXTRA_LTLIBRARIES = devhelp.la +endif + +devhelp_la_SOURCES = \ + plugin.c \ + dh-plugin.c \ + main-notebook.c +devhelp_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(DEVHELP_CFLAGS) \ + -DDHPLUG_DATA_DIR=\"$(plugindata)\" +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:[1951] trunk/geany-plugins/geanypg
by hyperair＠users.sourceforge.net 06 Mar '11

06 Mar '11

Revision: 1951 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1951&view=rev Author: hyperair Date: 2011-03-06 17:53:10 +0000 (Sun, 06 Mar 2011) Log Message: ----------- Add ChangeLog, NEWS and README stubs for geanypg Added Paths: ----------- trunk/geany-plugins/geanypg/ChangeLog trunk/geany-plugins/geanypg/NEWS trunk/geany-plugins/geanypg/README Added: trunk/geany-plugins/geanypg/ChangeLog =================================================================== Added: trunk/geany-plugins/geanypg/NEWS =================================================================== Added: trunk/geany-plugins/geanypg/README =================================================================== 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:[1950] trunk/geany-plugins/build/geanypg.m4
by hyperair＠users.sourceforge.net 06 Mar '11

06 Mar '11

Revision: 1950 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1950&view=rev Author: hyperair Date: 2011-03-06 17:52:35 +0000 (Sun, 06 Mar 2011) Log Message: ----------- Add ENABLE_GEANYPG AM_CONDITIONAL This is necessary due to GPGME having its own macro rather than using pkg-config Modified Paths: -------------- trunk/geany-plugins/build/geanypg.m4 Modified: trunk/geany-plugins/build/geanypg.m4 =================================================================== --- trunk/geany-plugins/build/geanypg.m4 2011-03-06 17:52:07 UTC (rev 1949) +++ trunk/geany-plugins/build/geanypg.m4 2011-03-06 17:52:35 UTC (rev 1950) @@ -7,6 +7,8 @@ AM_PATH_GPGME fi + AM_CONDITIONAL(ENABLE_GEANYPG, test "$enable_geanypg" = "yes") + GP_STATUS_PLUGIN_ADD([GeanyPG], [$enable_geanypg]) AC_CONFIG_FILES([ geanypg/Makefile 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