glom r1556 - in trunk: . glom

[murrayc svn gnome org]

Author: murrayc
Date: Fri Apr 11 15:44:55 2008
New Revision: 1556
URL: http://svn.gnome.org/viewvc/glom?rev=1556&view=rev

Log:
2008-04-11  Murray Cumming  <murrayc murrayc com>

* glom/application.cc fill_menu_tables(), fill_menu_reports(),
fill_menu_print_layouts(): Remove the ActionGroups before recreating 
them to avoid warnings, and presumably to avoid the changes from 
being ignored. Maybe GTK+ svn trunk has become less tolerant.
* glom/glom_developer.glade: Restored some GtkSourceViews, and put one 
in a scrolled window as it was before.

Modified:
   trunk/ChangeLog
   trunk/glom/application.cc
   trunk/glom/glom_developer.glade

Modified: trunk/glom/application.cc
==============================================================================
--- trunk/glom/application.cc	(original)
+++ trunk/glom/application.cc	Fri Apr 11 15:44:55 2008
@@ -1577,6 +1577,12 @@
   if(m_menu_tables_ui_merge_id)
     m_refUIManager->remove_ui(m_menu_tables_ui_merge_id);
 
+  if(m_refNavTablesActionGroup)
+  {
+    m_refUIManager->remove_action_group(m_refNavTablesActionGroup);
+    m_refNavTablesActionGroup.clear();
+  }
+
   m_refNavTablesActionGroup = Gtk::ActionGroup::create("NavTablesActions");
 
   Glib::ustring ui_description =
@@ -1660,6 +1666,12 @@
   if(m_menu_reports_ui_merge_id)
     m_refUIManager->remove_ui(m_menu_reports_ui_merge_id);
 
+  if(m_refNavReportsActionGroup)
+  {
+    m_refUIManager->remove_action_group(m_refNavReportsActionGroup);
+    m_refNavReportsActionGroup.clear();
+  }
+
   m_refNavReportsActionGroup = Gtk::ActionGroup::create("NavReportsActions");
 
   Glib::ustring ui_description =
@@ -1752,6 +1764,12 @@
   if(!m_pFrame || !m_pFrame->get_viewing_details())
     return;
 
+  if(m_refNavPrintLayoutsActionGroup)
+  {
+    m_refUIManager->remove_action_group(m_refNavPrintLayoutsActionGroup);
+    m_refNavPrintLayoutsActionGroup.clear();
+  }
+
   m_refNavPrintLayoutsActionGroup = Gtk::ActionGroup::create("NavPrintLayoutsActions");
 
   Glib::ustring ui_description =

Modified: trunk/glom/glom_developer.glade
==============================================================================
--- trunk/glom/glom_developer.glade	(original)
+++ trunk/glom/glom_developer.glade	Fri Apr 11 15:44:55 2008
@@ -545,6 +545,26 @@
                                 <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
                                 <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
                                 <property name="shadow_type">GTK_SHADOW_IN</property>
+
+                                <child>
+				  <widget class="GtkSourceView" id="textview_calculate">
+				    <property name="visible">True</property>
+				    <property name="can_focus">True</property>
+				    <property name="editable">True</property>
+				    <property name="overwrite">False</property>
+				    <property name="accepts_tab">True</property>
+				    <property name="justification">GTK_JUSTIFY_LEFT</property>
+				    <property name="wrap_mode">GTK_WRAP_NONE</property>
+				    <property name="cursor_visible">True</property>
+				    <property name="pixels_above_lines">0</property>
+				    <property name="pixels_below_lines">0</property>
+				    <property name="pixels_inside_wrap">0</property>
+				    <property name="left_margin">0</property>
+				    <property name="right_margin">0</property>
+				    <property name="indent">0</property>
+				    <property name="text" translatable="yes"></property>
+				  </widget>
+			        </child>
                               </widget>
                             </child>
                             <child>
@@ -1188,17 +1208,35 @@
                     <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
                     <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
                     <property name="shadow_type">GTK_SHADOW_IN</property>
+
                     <child>
-                      <widget class="GtkViewport" id="viewport1">
-                        <property name="visible">True</property>
-                        <child>
-                          <widget class="GtkSourceView" id="textview_calculation">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
+		    <widget class="GtkViewport" id="viewport1">
+		      <property name="visible">True</property>
+		      <property name="shadow_type">GTK_SHADOW_IN</property>
+
+		      <child>
+			<widget class="GtkSourceView" id="textview_calculation">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="editable">True</property>
+			  <property name="overwrite">False</property>
+			  <property name="accepts_tab">True</property>
+			  <property name="justification">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap_mode">GTK_WRAP_NONE</property>
+			  <property name="cursor_visible">True</property>
+			  <property name="pixels_above_lines">0</property>
+			  <property name="pixels_below_lines">0</property>
+			  <property name="pixels_inside_wrap">0</property>
+			  <property name="left_margin">0</property>
+			  <property name="right_margin">0</property>
+			  <property name="indent">0</property>
+			  <property name="text" translatable="yes"></property>
+			</widget>
+		      </child>
+
+		    </widget>
+		  </child>
+
                   </widget>
                 </child>
               </widget>
@@ -7950,11 +7988,36 @@
                 <property name="visible">True</property>
                 <property name="left_padding">20</property>
                 <child>
-                  <widget class="GtkSourceView" id="textview_script">
+                  <widget class="GtkScrolledWindow" id="scrolledwindow2">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                    <property name="shadow_type">GTK_SHADOW_IN</property>
+                    
+                    <child>
+                      <widget class="GtkSourceView" id="textview_script">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="editable">True</property>
+                        <property name="overwrite">False</property>
+                        <property name="accepts_tab">True</property>
+                        <property name="justification">GTK_JUSTIFY_LEFT</property>
+                        <property name="wrap_mode">GTK_WRAP_NONE</property>
+                        <property name="cursor_visible">True</property>
+                        <property name="pixels_above_lines">0</property>
+                        <property name="pixels_below_lines">0</property>
+                        <property name="pixels_inside_wrap">0</property>
+                        <property name="left_margin">0</property>
+                        <property name="right_margin">0</property>
+                        <property name="indent">0</property>
+                        <property name="text" translatable="yes"></property>
+                      </widget>
+                    </child>
+
                   </widget>
                 </child>
+
               </widget>
               <packing>
                 <property name="position">2</property>