glom r1826 - in trunk: . glom glom/mode_data glom/mode_find

[murrayc svn gnome org]

Author: murrayc
Date: Wed Dec 24 21:45:09 2008
New Revision: 1826
URL: http://svn.gnome.org/viewvc/glom?rev=1826&view=rev

Log:
2008-12-24  Murray Cumming  <murrayc murrayc com>

* glom/mode_data/box_data_details.h: show_tool_pallete(): Make this 
non-virtual because there are no overrides.
* glom/mode_find/box_data_details_find.cc: constructor, 
fill_from_database(): Hide the tool palette, because it is useless in 
Find mode.

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

Modified: trunk/glom/frame_glom.h
==============================================================================
--- trunk/glom/frame_glom.h	(original)
+++ trunk/glom/frame_glom.h	Wed Dec 24 21:45:09 2008
@@ -154,7 +154,7 @@
 #ifndef GLOM_ENABLE_CLIENT_ONLY
   ///Create the database for new documents, showing the Connection dialog
   bool create_database(const Glib::ustring& database_name, const Glib::ustring& title);
-  void show_layout_toolbar (bool show = true);
+  void show_layout_toolbar(bool show = true);
 #endif // !GLOM_ENABLE_CLIENT_ONLY
 
   void export_data_to_string(Glib::ustring& the_string, const FoundSet& found_set, const Document_Glom::type_list_layout_groups& sequence);

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	Wed Dec 24 21:45:09 2008
@@ -997,7 +997,7 @@
     dialog->set_document(m_layout_name, m_layout_platform, get_document(), m_table_name, m_FieldsShown); //TODO: Use m_TableFields?
 }
 
-void Box_Data_Details::show_layout_toolbar (bool show)
+void Box_Data_Details::show_layout_toolbar(bool show)
 {
   if(show)
     m_Dragbar.show();

Modified: trunk/glom/mode_data/box_data_details.h
==============================================================================
--- trunk/glom/mode_data/box_data_details.h	(original)
+++ trunk/glom/mode_data/box_data_details.h	Wed Dec 24 21:45:09 2008
@@ -64,8 +64,9 @@
   type_signal_requested_related_details signal_requested_related_details();
 
 #ifndef GLOM_ENABLE_CLIENT_ONLY
-  virtual void show_layout_toolbar (bool show = true);
+  void show_layout_toolbar(bool show = true);
 #endif
+
 protected:
 
 

Modified: trunk/glom/mode_find/box_data_details_find.cc
==============================================================================
--- trunk/glom/mode_find/box_data_details_find.cc	(original)
+++ trunk/glom/mode_find/box_data_details_find.cc	Wed Dec 24 21:45:09 2008
@@ -18,6 +18,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
+
 #include "box_data_details_find.h"
 #include <glibmm/i18n.h>
 
@@ -34,6 +36,11 @@
 
   g_object_set(m_Button_Find.gobj(), "can-default", TRUE, (gpointer)NULL); //TODO: Make this a real method in gtkmm?
 
+#ifndef GLOM_ENABLE_CLIENT_ONLY
+  //Hide this because it is useless for Find mode:
+  show_layout_toolbar(false);
+#endif
+
   show_all_children();
 }
 
@@ -60,6 +67,12 @@
 
   create_layout(); //TODO: Only do this when the layout has changed.
 
+#ifndef GLOM_ENABLE_CLIENT_ONLY
+  //Hide this because it is useless for Find mode:
+  //Actually we already hide this in the constructor, but somehow it is visible again by now.
+  show_layout_toolbar(false);
+#endif
+
   return result;
 }