[gtranslator] fix bgo #687432 - gtranslator can't load/save tab layout, cause gdl 3.6



commit 22da0a85fec480943411c25c0d361b3fa2252381
Author: SÃbastien Granjoux <seb sfo free fr>
Date:   Wed Nov 14 22:00:47 2012 +0100

    fix bgo #687432 - gtranslator can't load/save tab layout, cause gdl 3.6
    
    Do not save the layout after each change.
    Fix the default layout to remove GtrOpenTranPlugin and GtrCharmapPanel pane as
    GDL 3.6.0 does not hide them as it should.

 data/layout.xml |   16 +++++-----------
 src/gtr-tab.c   |   18 ------------------
 2 files changed, 5 insertions(+), 29 deletions(-)
---
diff --git a/data/layout.xml b/data/layout.xml
index f3e313e..117f471 100644
--- a/data/layout.xml
+++ b/data/layout.xml
@@ -4,19 +4,13 @@
   <layout name="__default__">
     <dock name="__dock_1" floating="no" width="-1" height="-1" floatx="0" floaty="0">
       <paned orientation="horizontal" locked="no" iconified="no" closed="no" position="1164">
-        <paned orientation="horizontal" locked="no" iconified="no" closed="no" position="244">
+        <paned orientation="vertical" locked="no" iconified="no" closed="no" position="416">
           <notebook orientation="vertical" locked="no" iconified="no" closed="no" page="0">
-            <item name="GtrOpenTranPlugin" orientation="vertical" locked="no" iconified="no" closed="no"/>
-            <item name="GtrCharmapPanel" orientation="vertical" locked="no" iconified="no" closed="no"/>
+            <item name="GtrMessageTable" orientation="vertical" locked="no"  iconified="no" closed="no"/>
+          </notebook>
+          <notebook orientation="vertical" locked="no" iconified="no" closed="no" page="0">
+            <item name="GtrTranslationFields" orientation="vertical" locked="no" iconified="no" closed="no"/>
           </notebook>
-          <paned orientation="vertical" locked="no" iconified="no" closed="no" position="416">
-            <notebook orientation="vertical" locked="no" iconified="no" closed="no" page="0">
-              <item name="GtrMessageTable" orientation="vertical" locked="no"  iconified="no" closed="no"/>
-            </notebook>
-            <notebook orientation="vertical" locked="no" iconified="no" closed="no" page="0">
-              <item name="GtrTranslationFields" orientation="vertical" locked="no" iconified="no" closed="no"/>
-            </notebook>
-          </paned>
         </paned>
         <paned orientation="vertical" locked="no" iconified="no" closed="no" position="387">
           <item name="GtrTranslationMemoryUI" orientation="vertical" locked="no" iconified="no" closed="no"/>
diff --git a/src/gtr-tab.c b/src/gtr-tab.c
index f22d546..4c7760a 100644
--- a/src/gtr-tab.c
+++ b/src/gtr-tab.c
@@ -671,13 +671,6 @@ save_layout (GtrTab *tab)
 }
 
 static void
-on_layout_changed (GdlDockMaster *master,
-                   GtrTab        *tab)
-{
-  save_layout (tab);
-}
-
-static void
 extension_added (PeasExtensionSet *extensions,
                  PeasPluginInfo   *info,
                  PeasExtension    *exten,
@@ -732,11 +725,6 @@ gtr_tab_init (GtrTab * tab)
   gtk_box_pack_start (GTK_BOX (hbox), dockbar, FALSE, FALSE, 0);
 
   priv->layout_manager = gdl_dock_layout_new (G_OBJECT (priv->dock));
-  g_signal_connect (gdl_dock_layout_get_master (priv->layout_manager),
-                    "layout-changed",
-                    G_CALLBACK (on_layout_changed),
-                    tab);
-
   g_settings_bind (priv->ui_settings,
                    GTR_SETTINGS_PANEL_SWITCHER_STYLE,
                    gdl_dock_layout_get_master (priv->layout_manager),
@@ -967,17 +955,11 @@ gtr_tab_realize (GtkWidget *widget)
                                   tab);
 
       /* Loading dock layout */
-      g_signal_handlers_block_by_func (gdl_dock_layout_get_master (tab->priv->layout_manager),
-                                       G_CALLBACK (on_layout_changed),
-                                       tab);
       filename = g_build_filename (gtr_dirs_get_user_config_dir (),
                                    "layout.xml", NULL);
 
       gtr_tab_layout_load (tab, filename, NULL);
       g_free (filename);
-      g_signal_handlers_unblock_by_func (gdl_dock_layout_get_master (tab->priv->layout_manager),
-                                         G_CALLBACK (on_layout_changed),
-                                         tab);
 
       tab->priv->tab_realized = TRUE;
     }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]