GNOME.org
 

[libgda] Correctly display each perspective's menu in GdaBrowser upon starting

commit 788092eb5a25add3ad595838f7a53b021a5edc86
Author: Vivien Malerba <malerba gnome-db org>
Date:   Wed Aug 4 18:33:05 2010 +0200

    Correctly display each perspective's menu in GdaBrowser upon starting

 tools/browser/browser-perspective.c                |   27 +++++++++++++++-
 tools/browser/browser-perspective.h                |    8 ++++-
 tools/browser/browser-window.c                     |   18 ++++++++--
 .../data-manager/data-manager-perspective.c        |   22 +++++++++++++
 tools/browser/doc/gda-browser-sections.txt         |    1 +
 tools/browser/doc/tmpl/browser-perspective.sgml    |   10 ++++++
 tools/browser/query-exec/query-exec-perspective.c  |   34 ++++++++++++++++---
 .../schema-browser/schema-browser-perspective.c    |   23 +++++++++++++-
 8 files changed, 130 insertions(+), 13 deletions(-)
---
diff --git a/tools/browser/browser-perspective.c b/tools/browser/browser-perspective.c
index 040ed0a..34d9363 100644
--- a/tools/browser/browser-perspective.c
+++ b/tools/browser/browser-perspective.c
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2009 The GNOME Foundation.
+ * Copyright (C) 2009 - 2010 The GNOME Foundation.
  *
  * AUTHORS:
  *      Vivien Malerba <malerba gnome-db org>
@@ -107,6 +107,31 @@ browser_perspective_get_actions_ui (BrowserPerspective *pers)
 }
 
 /**
+ * browser_perspective_get_current_customization
+ * @pers: an object implementing the #BrowserPerspective interface
+ * @out_agroup: (transfer full): a place to store the returned GtkActionGroup, not %NULL
+ * @out_ui: (transfer none): a place to store the returned UI string, not %NULL
+ * 
+ * Rem: * out_agroup is a new object and should be unref'ed when not needed anymore
+ */
+void
+browser_perspective_get_current_customization (BrowserPerspective *pers,
+					       GtkActionGroup **out_agroup,
+					       const gchar **out_ui)
+{
+	g_return_if_fail (IS_BROWSER_PERSPECTIVE (pers));
+	g_return_if_fail (out_agroup);
+	g_return_if_fail (out_ui);
+
+	*out_agroup = NULL;
+	*out_ui = NULL;
+	if (BROWSER_PERSPECTIVE_GET_CLASS (pers)->i_get_current_customization)
+		(BROWSER_PERSPECTIVE_GET_CLASS (pers)->i_get_current_customization) (pers,
+										     out_agroup,
+										     out_ui);
+}
+
+/**
  * browser_perspective_page_tab_label_change
  * @pers: an object implementing the #BrowserPerspective interface
  * @page: an object implementing the #BrowserPage interface
diff --git a/tools/browser/browser-perspective.h b/tools/browser/browser-perspective.h
index 824c757..e6e865b 100644
--- a/tools/browser/browser-perspective.h
+++ b/tools/browser/browser-perspective.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 The GNOME Foundation.
+ * Copyright (C) 2009 - 2010 The GNOME Foundation.
  *
  * AUTHORS:
  *      Vivien Malerba <malerba gnome-db org>
@@ -40,6 +40,9 @@ struct _BrowserPerspectiveIface {
 	/* virtual table */
 	GtkActionGroup      *(* i_get_actions_group) (BrowserPerspective *perspective);
 	const gchar         *(* i_get_actions_ui) (BrowserPerspective *perspective);
+	void                 (* i_get_current_customization) (BrowserPerspective *perspective,
+							      GtkActionGroup **out_agroup,
+							      const gchar **out_ui);
 	void                 (* i_page_tab_label_change) (BrowserPerspective *perspective, BrowserPage *page);
 };
 
@@ -47,6 +50,9 @@ GType           browser_perspective_get_type          (void) G_GNUC_CONST;
 
 GtkActionGroup *browser_perspective_get_actions_group (BrowserPerspective *perspective);
 const gchar    *browser_perspective_get_actions_ui    (BrowserPerspective *perspective);
+void            browser_perspective_get_current_customization (BrowserPerspective *perspective,
+							       GtkActionGroup **out_agroup,
+							       const gchar **out_ui);
 void            browser_perspective_page_tab_label_change (BrowserPerspective *perspective,
 							   BrowserPage *page);
 
diff --git a/tools/browser/browser-window.c b/tools/browser/browser-window.c
index 390061e..24584a8 100644
--- a/tools/browser/browser-window.c
+++ b/tools/browser/browser-window.c
@@ -453,6 +453,12 @@ browser_window_new (BrowserConnection *bcnc, BrowserPerspectiveFactory *factory)
 		bwin->priv->ui_manager_merge_id = gtk_ui_manager_add_ui_from_string (bwin->priv->ui_manager,
 										     ui_info, -1, NULL);
 	bwin->priv->current_perspective = pers;
+	browser_perspective_get_current_customization (BROWSER_PERSPECTIVE (pers->perspective_widget),
+						       &actions, &ui_info);
+	browser_window_customize_perspective_ui (bwin, BROWSER_PERSPECTIVE (pers->perspective_widget),
+						 actions, ui_info);
+	if (actions)
+		g_object_unref (actions);
 	
 	/* insert perspective into window */
         bwin->priv->perspectives_nb = (GtkNotebook*) gtk_notebook_new ();
@@ -585,10 +591,14 @@ perspective_toggle_cb (GtkRadioAction *action, GtkRadioAction *current, BrowserW
 
 	/* current perspective's customizations */
 	bwin->priv->current_perspective = pers;
-	if (pers->customized_ui)
-		pers->customized_merge_id = gtk_ui_manager_add_ui_from_string (bwin->priv->ui_manager,
-									       pers->customized_ui,
-									       -1, NULL);
+
+	GtkActionGroup *actions;
+	browser_perspective_get_current_customization (BROWSER_PERSPECTIVE (pers->perspective_widget),
+						       &actions, &ui_info);
+	browser_window_customize_perspective_ui (bwin, BROWSER_PERSPECTIVE (pers->perspective_widget),
+						 actions, ui_info);
+	if (actions)
+		g_object_unref (actions);
 }
 
 static void
diff --git a/tools/browser/data-manager/data-manager-perspective.c b/tools/browser/data-manager/data-manager-perspective.c
index 8226b91..027ab79 100644
--- a/tools/browser/data-manager/data-manager-perspective.c
+++ b/tools/browser/data-manager/data-manager-perspective.c
@@ -38,6 +38,10 @@ static void data_manager_perspective_grab_focus (GtkWidget *widget);
 static void                 data_manager_perspective_perspective_init (BrowserPerspectiveIface *iface);
 static GtkActionGroup      *data_manager_perspective_get_actions_group (BrowserPerspective *perspective);
 static const gchar         *data_manager_perspective_get_actions_ui (BrowserPerspective *perspective);
+static void                 data_manager_perspective_get_current_customization (BrowserPerspective *perspective,
+										GtkActionGroup **out_agroup,
+										const gchar **out_ui);
+
 /* get a pointer to the parents to be able to call their destructor */
 static GObjectClass  *parent_class = NULL;
 
@@ -107,6 +111,7 @@ data_manager_perspective_perspective_init (BrowserPerspectiveIface *iface)
 {
 	iface->i_get_actions_group = data_manager_perspective_get_actions_group;
 	iface->i_get_actions_ui = data_manager_perspective_get_actions_ui;
+	iface->i_get_current_customization = data_manager_perspective_get_current_customization;
 }
 
 
@@ -388,3 +393,20 @@ data_manager_perspective_new_tab (DataManagerPerspective *dmp, const gchar *xml_
 	data_console_execute (DATA_CONSOLE (page));
 	gtk_widget_grab_focus (page);
 }
+
+static void
+data_manager_perspective_get_current_customization (BrowserPerspective *perspective,
+						    GtkActionGroup **out_agroup,
+						    const gchar **out_ui)
+{
+	DataManagerPerspective *bpers;
+	GtkWidget *page_contents;
+
+	bpers = DATA_MANAGER_PERSPECTIVE (perspective);
+	page_contents = gtk_notebook_get_nth_page (GTK_NOTEBOOK (bpers->priv->notebook),
+						   gtk_notebook_get_current_page (GTK_NOTEBOOK (bpers->priv->notebook)));
+	if (IS_BROWSER_PAGE (page_contents)) {
+		*out_agroup = browser_page_get_actions_group (BROWSER_PAGE (page_contents));
+		*out_ui = browser_page_get_actions_ui (BROWSER_PAGE (page_contents));
+	}
+}
diff --git a/tools/browser/doc/gda-browser-sections.txt b/tools/browser/doc/gda-browser-sections.txt
index ae4dc7a..cd5c7e8 100644
--- a/tools/browser/doc/gda-browser-sections.txt
+++ b/tools/browser/doc/gda-browser-sections.txt
@@ -144,6 +144,7 @@ BrowserPerspective
 browser_perspective_get_type
 browser_perspective_get_actions_group
 browser_perspective_get_actions_ui
+browser_perspective_get_current_customization
 browser_perspective_page_tab_label_change
 </SECTION>
 
diff --git a/tools/browser/doc/tmpl/browser-perspective.sgml b/tools/browser/doc/tmpl/browser-perspective.sgml
index a765fd9..7538085 100644
--- a/tools/browser/doc/tmpl/browser-perspective.sgml
+++ b/tools/browser/doc/tmpl/browser-perspective.sgml
@@ -85,6 +85,16 @@ A "perspective" in a #BrowserWindow window
 @Returns: 
 
 
+<!-- ##### FUNCTION browser_perspective_get_current_customization ##### -->
+<para>
+
+</para>
+
+ perspective: 
+ out_agroup: 
+ out_ui: 
+
+
 <!-- ##### FUNCTION browser_perspective_page_tab_label_change ##### -->
 <para>
 
diff --git a/tools/browser/query-exec/query-exec-perspective.c b/tools/browser/query-exec/query-exec-perspective.c
index 71a38e7..c4f4f3f 100644
--- a/tools/browser/query-exec/query-exec-perspective.c
+++ b/tools/browser/query-exec/query-exec-perspective.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Vivien Malerba
+ * Copyright (C) 2009 - 2010 Vivien Malerba
  *
  * This Library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public License as
@@ -41,6 +41,9 @@ static void query_exec_perspective_grab_focus (GtkWidget *widget);
 static void                 query_exec_perspective_perspective_init (BrowserPerspectiveIface *iface);
 static GtkActionGroup      *query_exec_perspective_get_actions_group (BrowserPerspective *perspective);
 static const gchar         *query_exec_perspective_get_actions_ui (BrowserPerspective *perspective);
+static void                 query_exec_perspective_get_current_customization (BrowserPerspective *perspective,
+									      GtkActionGroup **out_agroup,
+									      const gchar **out_ui);
 static void                 query_exec_perspective_page_tab_label_change (BrowserPerspective *perspective, BrowserPage *page);
 
 /* get a pointer to the parents to be able to call their destructor */
@@ -114,10 +117,10 @@ query_exec_perspective_perspective_init (BrowserPerspectiveIface *iface)
 {
 	iface->i_get_actions_group = query_exec_perspective_get_actions_group;
 	iface->i_get_actions_ui = query_exec_perspective_get_actions_ui;
+	iface->i_get_current_customization = query_exec_perspective_get_current_customization;
 	iface->i_page_tab_label_change = query_exec_perspective_page_tab_label_change;
 }
 
-
 static void
 query_exec_perspective_init (QueryExecPerspective *perspective)
 {
@@ -166,10 +169,6 @@ query_exec_perspective_new (BrowserWindow *bwin)
 	gtk_paned_pack2 (GTK_PANED (paned), nb, TRUE, TRUE);
 	gtk_notebook_set_scrollable (GTK_NOTEBOOK (nb), TRUE);
 	gtk_notebook_popup_enable (GTK_NOTEBOOK (nb));
-	g_signal_connect (G_OBJECT (nb), "switch-page",
-			  G_CALLBACK (nb_switch_page_cb), perspective);
-	g_signal_connect (G_OBJECT (nb), "page-removed",
-			  G_CALLBACK (nb_page_removed_cb), perspective);
 
 	GtkWidget *page, *tlabel, *button;
 
@@ -193,6 +192,12 @@ query_exec_perspective_new (BrowserWindow *bwin)
 
 	gtk_widget_grab_focus (page);
 
+	/* signals to customize perspective */
+	g_signal_connect (G_OBJECT (nb), "switch-page",
+			  G_CALLBACK (nb_switch_page_cb), perspective);
+	g_signal_connect (G_OBJECT (nb), "page-removed",
+			  G_CALLBACK (nb_page_removed_cb), perspective);
+
 	return bpers;
 }
 
@@ -373,3 +378,20 @@ query_exec_perspective_page_tab_label_change (BrowserPerspective *perspective, B
 					     GTK_WIDGET (page), tab_label);
 	}
 }
+
+static void
+query_exec_perspective_get_current_customization (BrowserPerspective *perspective,
+						  GtkActionGroup **out_agroup,
+						  const gchar **out_ui)
+{
+	QueryExecPerspective *bpers;
+	GtkWidget *page_contents;
+
+	bpers = QUERY_EXEC_PERSPECTIVE (perspective);
+	page_contents = gtk_notebook_get_nth_page (GTK_NOTEBOOK (bpers->priv->notebook),
+						   gtk_notebook_get_current_page (GTK_NOTEBOOK (bpers->priv->notebook)));
+	if (IS_BROWSER_PAGE (page_contents)) {
+		*out_agroup = browser_page_get_actions_group (BROWSER_PAGE (page_contents));
+		*out_ui = browser_page_get_actions_ui (BROWSER_PAGE (page_contents));
+	}
+}
diff --git a/tools/browser/schema-browser/schema-browser-perspective.c b/tools/browser/schema-browser/schema-browser-perspective.c
index d2c59ba..c6104b8 100644
--- a/tools/browser/schema-browser/schema-browser-perspective.c
+++ b/tools/browser/schema-browser/schema-browser-perspective.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Vivien Malerba
+ * Copyright (C) 2009 - 2010 Vivien Malerba
  *
  * This Library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public License as
@@ -42,6 +42,9 @@ static void                 schema_browser_perspective_perspective_init (Browser
 static GtkActionGroup      *schema_browser_perspective_get_actions_group (BrowserPerspective *perspective);
 static const gchar         *schema_browser_perspective_get_actions_ui (BrowserPerspective *perspective);
 static void                 schema_browser_perspective_page_tab_label_change (BrowserPerspective *perspective, BrowserPage *page);
+static void                 schema_browser_perspective_get_current_customization (BrowserPerspective *perspective,
+										  GtkActionGroup **out_agroup,
+										  const gchar **out_ui);
 
 /* get a pointer to the parents to be able to call their destructor */
 static GObjectClass  *parent_class = NULL;
@@ -101,6 +104,7 @@ schema_browser_perspective_perspective_init (BrowserPerspectiveIface *iface)
 	iface->i_get_actions_group = schema_browser_perspective_get_actions_group;
 	iface->i_get_actions_ui = schema_browser_perspective_get_actions_ui;
 	iface->i_page_tab_label_change = schema_browser_perspective_page_tab_label_change;
+	iface->i_get_current_customization = schema_browser_perspective_get_current_customization;
 }
 
 
@@ -460,3 +464,20 @@ schema_browser_perspective_display_table_info (SchemaBrowserPerspective *bpers,
 						 TRUE);
 	}
 }
+
+static void
+schema_browser_perspective_get_current_customization (BrowserPerspective *perspective,
+						      GtkActionGroup **out_agroup,
+						      const gchar **out_ui)
+{
+	SchemaBrowserPerspective *bpers;
+	GtkWidget *page_contents;
+
+	bpers = SCHEMA_BROWSER_PERSPECTIVE (perspective);
+	page_contents = gtk_notebook_get_nth_page (GTK_NOTEBOOK (bpers->priv->notebook),
+						   gtk_notebook_get_current_page (GTK_NOTEBOOK (bpers->priv->notebook)));
+	if (IS_BROWSER_PAGE (page_contents)) {
+		*out_agroup = browser_page_get_actions_group (BROWSER_PAGE (page_contents));
+		*out_ui = browser_page_get_actions_ui (BROWSER_PAGE (page_contents));
+	}
+}
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]