callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added a toggle action to show/hide the index sidebar, bound to Ctrl-I.

Browse Source 
2008-06-13  Sven Neumann  <sven@gimp.org>

	* plug-ins/help-browser/dialog.c: added a toggle action to
	show/hide the index sidebar, bound to Ctrl-I.


svn path=/trunk/; revision=25940
This commit is contained in:
Sven Neumann
2008-06-12 22:25:13 +00:00
committed by Sven Neumann
parent 8947cb118f
commit f8a3b5fbd1
2 changed files with 63 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2008-06-13 Sven Neumann <sven@gimp.org>
* plug-ins/help-browser/dialog.c: added a toggle action to
show/hide the index sidebar, bound to Ctrl-I.
2008-06-12 Sven Neumann <sven@gimp.org> 2008-06-12 Sven Neumann <sven@gimp.org>
Added basic support for using the online user manual: Added basic support for using the online user manual:

59
plug-ins/help-browser/dialog.c
View File

@ -69,6 +69,7 @@ typedef struct
gint width; gint width;
gint height; gint height;
gint paned_position; gint paned_position;
gboolean show_index;
gdouble zoom; gdouble zoom;
} DialogData; } DialogData;
@ -92,6 +93,10 @@ static void stop_callback (GtkAction *action,
gpointer data); gpointer data);
static void home_callback (GtkAction *action, static void home_callback (GtkAction *action,
gpointer data); gpointer data);
static void copy_location_callback (GtkAction *action,
gpointer data);
static void show_index_callback (GtkAction *action,
gpointer data);
static void zoom_in_callback (GtkAction *action, static void zoom_in_callback (GtkAction *action,
gpointer data); gpointer data);
static void zoom_out_callback (GtkAction *action, static void zoom_out_callback (GtkAction *action,
@ -100,8 +105,6 @@ static void close_callback (GtkAction *action,
gpointer data); gpointer data);
static void website_callback (GtkAction *action, static void website_callback (GtkAction *action,
gpointer data); gpointer data);
static void copy_location_callback (GtkAction *action,
gpointer data);
static void update_actions (void); static void update_actions (void);
@ -138,6 +141,7 @@ static void select_index (const gchar *uri);
static GHashTable *uri_hash_table = NULL; static GHashTable *uri_hash_table = NULL;
static GtkWidget *view = NULL; static GtkWidget *view = NULL;
static GtkWidget *sidebar = NULL;
static GtkWidget *tree_view = NULL; static GtkWidget *tree_view = NULL;
static GtkUIManager *ui_manager = NULL; static GtkUIManager *ui_manager = NULL;
static GtkWidget *button_prev = NULL; static GtkWidget *button_prev = NULL;
@ -158,7 +162,7 @@ browser_dialog_open (void)
GtkWidget *button; GtkWidget *button;
GtkToolItem *item; GtkToolItem *item;
GtkAction *action; GtkAction *action;
DialogData data = { 720, 560, 240, 1.0 }; DialogData data = { 720, 560, 240, TRUE, 1.0 };
gimp_ui_init ("helpbrowser", TRUE); gimp_ui_init ("helpbrowser", TRUE);
@ -227,7 +231,11 @@ browser_dialog_open (void)
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_paned_add1 (GTK_PANED (paned), scrolled); gtk_paned_add1 (GTK_PANED (paned), scrolled);
gtk_paned_set_position (GTK_PANED (paned), data.paned_position); gtk_paned_set_position (GTK_PANED (paned), data.paned_position);
gtk_widget_show (scrolled);
sidebar = scrolled;
if (data.show_index)
gtk_widget_show (sidebar);
tree_view = gtk_tree_view_new (); tree_view = gtk_tree_view_new ();
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (tree_view), FALSE); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (tree_view), FALSE);
@ -565,13 +573,29 @@ ui_manager_new (GtkWidget *window)
} }
}; };
static const GtkToggleActionEntry toggle_actions[] =
{
{
"show-index", NULL,
N_("S_how Index"), "<control>I",
N_("Toggle the visibility of the sidebar"),
G_CALLBACK (show_index_callback), FALSE
}
};
GtkUIManager *ui_manager = gtk_ui_manager_new (); GtkUIManager *ui_manager = gtk_ui_manager_new ();
GtkActionGroup *group = gtk_action_group_new ("Actions"); GtkActionGroup *group = gtk_action_group_new ("Actions");
GtkAction *action; GtkAction *action;
GError *error = NULL; GError *error = NULL;
gtk_action_group_set_translation_domain (group, NULL); gtk_action_group_set_translation_domain (group, NULL);
gtk_action_group_add_actions (group, actions, G_N_ELEMENTS (actions), NULL); gtk_action_group_add_actions (group,
actions, G_N_ELEMENTS (actions),
NULL);
gtk_action_group_add_toggle_actions (group,
toggle_actions,
G_N_ELEMENTS (toggle_actions),
NULL);
action = gimp_throbber_action_new ("website", action = gimp_throbber_action_new ("website",
"docs.gimp.org", "docs.gimp.org",
@ -621,6 +645,7 @@ ui_manager_new (GtkWidget *window)
" <separator />" " <separator />"
" <menuitem action=\"home\" />" " <menuitem action=\"home\" />"
" <menuitem action=\"copy-location\" />" " <menuitem action=\"copy-location\" />"
" <menuitem action=\"show-index\" />"
#ifdef HAVE_WEBKIT_ZOOM_API #ifdef HAVE_WEBKIT_ZOOM_API
" <separator />" " <separator />"
" <menuitem action=\"zoom-in\" />" " <menuitem action=\"zoom-in\" />"
@ -693,9 +718,10 @@ static void
copy_location_callback (GtkAction *action, copy_location_callback (GtkAction *action,
gpointer data) gpointer data)
{ {
WebKitWebFrame *frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view)); WebKitWebFrame *frame;
const gchar *uri; const gchar *uri;
frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view));
uri = webkit_web_frame_get_uri (frame); uri = webkit_web_frame_get_uri (frame);
if (uri) if (uri)
@ -708,6 +734,20 @@ copy_location_callback (GtkAction *action,
} }
} }
static void
show_index_callback (GtkAction *action,
gpointer data)
{
if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)))
{
gtk_widget_show (sidebar);
}
else
{
gtk_widget_hide (sidebar);
}
}
static void static void
zoom_in_callback (GtkAction *action, zoom_in_callback (GtkAction *action,
gpointer data) gpointer data)
@ -839,6 +879,12 @@ update_actions (void)
frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view)); frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view));
gtk_action_set_sensitive (action, webkit_web_frame_get_uri (frame) != NULL); gtk_action_set_sensitive (action, webkit_web_frame_get_uri (frame) != NULL);
/* update the show-index action */
action = gtk_ui_manager_get_action (ui_manager,
"/ui/help-browser-popup/show-index");
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
GTK_WIDGET_VISIBLE (sidebar));
} }
static void static void
@ -881,6 +927,7 @@ dialog_unmap (GtkWidget *window,
gtk_window_get_size (GTK_WINDOW (window), &data.width, &data.height); gtk_window_get_size (GTK_WINDOW (window), &data.width, &data.height);
data.paned_position = gtk_paned_get_position (GTK_PANED (paned)); data.paned_position = gtk_paned_get_position (GTK_PANED (paned));
data.show_index = GTK_WIDGET_VISIBLE (sidebar);
#ifdef HAVE_WEBKIT_ZOOM_API #ifdef HAVE_WEBKIT_ZOOM_API
data.zoom = (view ? data.zoom = (view ?