glom r1419 - in trunk: . glom glom/mode_data

[jhs svn gnome org]

Author: jhs
Date: Tue Feb 19 09:12:33 2008
New Revision: 1419
URL: http://svn.gnome.org/viewvc/glom?rev=1419&view=rev

Log:
2008-02-19  Johannes Schmid <johannes schmid openismus com>

	* glom/application.cc:
	* glom/application.h:
	* glom/frame_glom.cc:
	* glom/frame_glom.h:
	Show drag toolbar when in developer mode
	
	* glom/mode_data/box_data_details.cc:
	Recreate layout when switching to developer mode

Modified:
   trunk/ChangeLog
   trunk/glom/application.cc
   trunk/glom/application.h
   trunk/glom/frame_glom.cc
   trunk/glom/frame_glom.h
   trunk/glom/mode_data/box_data_details.cc

Modified: trunk/glom/application.cc
==============================================================================
--- trunk/glom/application.cc	(original)
+++ trunk/glom/application.cc	Tue Feb 19 09:12:33 2008
@@ -102,6 +102,7 @@
   m_pFrame(0),
 #ifndef GLOM_ENABLE_CLIENT_ONLY
   m_window_translations(0),
+	m_pDrag_Bar(0),
 #endif // !GLOM_ENABLE_CLIENT_ONLY
   m_menu_tables_ui_merge_id(0),
   m_menu_reports_ui_merge_id(0),
@@ -1109,11 +1110,25 @@
   {
     if(!m_action_menu_userlevel_developer->get_active())
       m_action_menu_userlevel_developer->set_active();
+    // Show the drag layout toolbar
+    if (!m_pDrag_Bar)
+    {
+      m_pDrag_Bar = new DragBar();
+      App_Glom::get_application ()->add_sidebar (*m_pDrag_Bar);
+      m_pDrag_Bar->show();
+    }
   }
   else if(userlevel ==  AppState::USERLEVEL_OPERATOR)
   {
     if(!m_action_menu_userlevel_operator->get_active())
       m_action_menu_userlevel_operator->set_active();
+    // Remove the drag layout toolbar
+    if (m_pDrag_Bar)
+    {
+      App_Glom::get_application ()->remove_sidebar (*m_pDrag_Bar);
+      delete m_pDrag_Bar;
+      m_pDrag_Bar = 0;
+    }
   }
 }
 #endif // !GLOM_ENABLE_CLIENT_ONLY

Modified: trunk/glom/application.h
==============================================================================
--- trunk/glom/application.h	(original)
+++ trunk/glom/application.h	Tue Feb 19 09:12:33 2008
@@ -182,6 +182,9 @@
   //so we can use them again when connecting directly to the database:
   Glib::ustring m_temp_username, m_temp_password;
 
+  // Drag bar (to be replaced by the fancy selector widget from mathias)
+  DragBar* m_pDrag_Bar;
+	
   bool m_show_sql_debug;
 };
 

Modified: trunk/glom/frame_glom.cc
==============================================================================
--- trunk/glom/frame_glom.cc	(original)
+++ trunk/glom/frame_glom.cc	Tue Feb 19 09:12:33 2008
@@ -89,7 +89,6 @@
   m_pDialog_Relationships(0),
   m_dialog_addrelatedtable(0),
   m_dialog_relationships_overview(0),
-  m_pDrag_Bar(0),
 #endif // !GLOM_ENABLE_CLIENT_ONLY
   m_pDialogConnection(0)
 {
@@ -479,13 +478,6 @@
         test = (response == Gtk::RESPONSE_OK);
       }
       
-      if (test)
-      {
-        // Show the drag layout toolbar
-        m_pDrag_Bar = new DragBar();
-				App_Glom::get_application ()->add_sidebar (*m_pDrag_Bar);
-				m_pDrag_Bar->show();
-      }
       if(!test)
       {
         //Abort the change of user level:
@@ -509,13 +501,6 @@
       //Avoid double signals:
       //if(document->get_userlevel() != AppState::USERLEVEL_OPERATOR)
         document->set_userlevel(AppState::USERLEVEL_OPERATOR);
-      
-      if (m_pDrag_Bar)
-      {
-				App_Glom::get_application ()->remove_sidebar (*m_pDrag_Bar);
-        delete m_pDrag_Bar;
-        m_pDrag_Bar = 0;
-      }
     }
   }
 }

Modified: trunk/glom/frame_glom.h
==============================================================================
--- trunk/glom/frame_glom.h	(original)
+++ trunk/glom/frame_glom.h	Tue Feb 19 09:12:33 2008
@@ -239,7 +239,6 @@
   Dialog_AddRelatedTable* m_dialog_addrelatedtable;
   Dialog_RelationshipsOverview* m_dialog_relationships_overview;
   
-  DragBar* m_pDrag_Bar;
 #endif // !GLOM_ENABLE_CLIENT_ONLY
 
   Dialog_Connection* m_pDialogConnection;

Modified: trunk/glom/mode_data/box_data_details.cc
==============================================================================
--- trunk/glom/mode_data/box_data_details.cc	(original)
+++ trunk/glom/mode_data/box_data_details.cc	Tue Feb 19 09:12:33 2008
@@ -821,6 +821,8 @@
 #ifndef GLOM_ENABLE_CLIENT_ONLY
   m_design_mode = ( user_level == AppState::USERLEVEL_DEVELOPER );    
   m_FlowTable.set_design_mode(m_design_mode);
+	// Recreate layout to correctly set the size of empty flowtables
+	create_layout();
 #endif
 }