GNOME.org
 

[glom] Renamed Dialog_Glom to Window_BoxHolder.

commit 5f0fc9e352bb4d1f84e27118a68420f8ac9f18a1
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Sep 23 01:46:10 2009 +0200

    Renamed Dialog_Glom to Window_BoxHolder.
    
    * glom/dialog_glom.[h|cc]: Renamed to window_boxholder.[h|cc] to make
    its purpose clearer.
    * glom/frame_glom.[h|cc]:
    * glom/mode_data/notebook_data.[h|cc]:
    * Makefile_glom.am: Adapted.

 ChangeLog                                    |   10 ++++++++++
 Makefile_glom.am                             |    8 ++++----
 glom/box_withbuttons.h                       |    2 +-
 glom/frame_glom.cc                           |    6 +++---
 glom/frame_glom.h                            |    8 ++++----
 glom/mode_data/notebook_data.cc              |    2 +-
 glom/mode_data/notebook_data.h               |    4 ++--
 glom/{dialog_glom.cc => window_boxholder.cc} |   21 ++++++++++-----------
 glom/{dialog_glom.h => window_boxholder.h}   |   21 +++++++++++++--------
 9 files changed, 48 insertions(+), 34 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index aa511f0..e296180 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-09-23  Murray Cumming  <murrayc murrayc com>
+
+	Renamed Dialog_Glom to Window_BoxHolder.
+
+	* glom/dialog_glom.[h|cc]: Renamed to window_boxholder.[h|cc] to make 
+	its purpose clearer.
+	* glom/frame_glom.[h|cc]:
+	* glom/mode_data/notebook_data.[h|cc]:
+	* Makefile_glom.am: Adapted.
+
 2009-09-22  Murray Cumming  <murrayc murrayc com>
 
 	Dialog_Glom: Make this a little less stupid, so we can ifdef for Maemo.
diff --git a/Makefile_glom.am b/Makefile_glom.am
index d55eb2d..114036e 100644
--- a/Makefile_glom.am
+++ b/Makefile_glom.am
@@ -34,8 +34,6 @@ glom_glom_SOURCES =							\
 	glom/dialog_connection.h					\
 	glom/dialog_existing_or_new.cc					\
 	glom/dialog_existing_or_new.h					\
-	glom/dialog_glom.cc						\
-	glom/dialog_glom.h						\
 	glom/dialog_import_csv.cc					\
 	glom/dialog_import_csv.h					\
 	glom/dialog_import_csv_progress.cc				\
@@ -68,6 +66,10 @@ glom_glom_SOURCES =							\
 	glom/xsl_utils.h						\
 	glom/printoperation_printlayout.cc				\
 	glom/printoperation_printlayout.h				\
+	glom/report_builder.cc						\
+	glom/report_builder.h						\
+	glom/window_boxholder.cc					\
+	glom/window_boxholder.h						\
 	glom/bakery/app.cc						\
 	glom/bakery/app.h						\
 	glom/bakery/app_withdoc.cc					\
@@ -108,8 +110,6 @@ glom_glom_SOURCES =							\
 	glom/print_layout/canvas_print_layout.h				\
 	glom/python_embed/glom_python.cc				\
 	glom/python_embed/glom_python.h					\
-	glom/report_builder.cc						\
-	glom/report_builder.h						\
 	glom/utility_widgets/alignment_justified.cc			\
 	glom/utility_widgets/alignment_justified.h			\
 	glom/utility_widgets/buttonglom.cc				\
diff --git a/glom/box_withbuttons.h b/glom/box_withbuttons.h
index aacbb6e..f15af87 100644
--- a/glom/box_withbuttons.h
+++ b/glom/box_withbuttons.h
@@ -35,7 +35,7 @@ namespace Glom
 
 /** A Gtk::VBox base widget class, 
  * with some extra signals to allow derived classes to be used generically in 
- * Dialog_Glom, allowing the dialog to respond to buttons in the box.
+ * Window_BoxHolder, allowing the dialog to respond to buttons in the box.
  */
 class Box_WithButtons :
   public Gtk::VBox
diff --git a/glom/frame_glom.cc b/glom/frame_glom.cc
index 95f2160..5981443 100644
--- a/glom/frame_glom.cc
+++ b/glom/frame_glom.cc
@@ -1310,7 +1310,7 @@ void Frame_Glom::do_menu_Navigate_Table(bool open_default)
   if(!m_pBox_Tables)
   {
     Utils::get_glade_widget_derived_with_warning("box_navigation_tables", m_pBox_Tables);
-    m_pDialog_Tables = new Dialog_Glom(m_pBox_Tables, _("Tables"));
+    m_pDialog_Tables = new Window_BoxHolder(m_pBox_Tables, _("Tables"));
     m_pDialog_Tables->signal_hide().connect(sigc::mem_fun(*this, &Frame_Glom::on_dialog_tables_hide));
 
     Gtk::Window* pWindow = get_app_window();
@@ -1801,7 +1801,7 @@ void Frame_Glom::on_menu_developer_reports()
   if(!m_pBox_Reports)
   {
     Utils::get_glade_developer_widget_derived_with_warning("box_reports", m_pBox_Reports);
-    m_pDialog_Reports = new Dialog_Glom(m_pBox_Reports);
+    m_pDialog_Reports = new Window_BoxHolder(m_pBox_Reports);
     m_pDialog_Reports->set_transient_for(*(get_app_window()));
 
     Utils::get_glade_developer_widget_derived_with_warning("window_report_layout", m_pDialogLayoutReport);
@@ -1833,7 +1833,7 @@ void Frame_Glom::on_menu_developer_print_layouts()
   if(!m_pBox_PrintLayouts)
   {
     Utils::get_glade_developer_widget_derived_with_warning("box_print_layouts", m_pBox_PrintLayouts);
-    m_pDialog_PrintLayouts = new Dialog_Glom(m_pBox_PrintLayouts);
+    m_pDialog_PrintLayouts = new Window_BoxHolder(m_pBox_PrintLayouts);
 
     m_pDialog_PrintLayouts->set_default_size(300, 400);
     m_pBox_PrintLayouts->show_all();
diff --git a/glom/frame_glom.h b/glom/frame_glom.h
index 2fbe2dd..fb31fc1 100644
--- a/glom/frame_glom.h
+++ b/glom/frame_glom.h
@@ -28,7 +28,7 @@
 #include <libglom/document/bakery/view/view_composite.h>
 #include <libglom/document/document.h>
 
-#include "dialog_glom.h"
+#include "window_boxholder.h"
 
 #ifndef GLOM_ENABLE_MAEMO
 #include "navigation/box_tables.h"
@@ -276,7 +276,7 @@ protected:
 #ifndef GLOM_ENABLE_MAEMO
   //Navigation:
   Box_Tables* m_pBox_Tables;
-  Dialog_Glom* m_pDialog_Tables;
+  Window_BoxHolder* m_pDialog_Tables;
 #endif //GLOM_ENABLE_MAEMO
 
   Notebook_Data m_Notebook_Data;
@@ -284,11 +284,11 @@ protected:
 
 #ifndef GLOM_ENABLE_CLIENT_ONLY
   //Developer:
-  Dialog_Glom* m_pDialog_Reports;
+  Window_BoxHolder* m_pDialog_Reports;
   Dialog_Layout_Report* m_pDialogLayoutReport;
   Box_Reports* m_pBox_Reports;
   
-  Dialog_Glom* m_pDialog_PrintLayouts;
+  Window_BoxHolder* m_pDialog_PrintLayouts;
   Window_PrintLayout_Edit* m_pDialogLayoutPrint;
   Box_Print_Layouts* m_pBox_PrintLayouts;
 
diff --git a/glom/mode_data/notebook_data.cc b/glom/mode_data/notebook_data.cc
index 283344e..8f9f42d 100644
--- a/glom/mode_data/notebook_data.cc
+++ b/glom/mode_data/notebook_data.cc
@@ -40,7 +40,7 @@ Notebook_Data::Notebook_Data()
   m_iPage_Details = 1;
   #else
   //On Maemo, we add the box to m_window_maemo_details instead:
-  m_window_maemo_details = new Dialog_Glom(&m_Box_Details, _("Details"));
+  m_window_maemo_details = new Window_BoxHolder(&m_Box_Details, _("Details"));
   
   Gtk::Window* pWindow = get_app_window();
   if(pWindow)
diff --git a/glom/mode_data/notebook_data.h b/glom/mode_data/notebook_data.h
index 4e5cd66..ed99258 100644
--- a/glom/mode_data/notebook_data.h
+++ b/glom/mode_data/notebook_data.h
@@ -26,7 +26,7 @@
 #include <glom/mode_data/box_data_details.h>
 
 #ifdef GLOM_ENABLE_MAEMO 
-#include <glom/dialog_glom.h>
+#include <glom/window_boxholder.h>
 #endif
 
 namespace Glom
@@ -93,7 +93,7 @@ protected:
   Box_Data_Details m_Box_Details;
   
   #ifdef GLOM_ENABLE_MAEMO //Details are in a separate window on Maemo.
-  Dialog_Glom* m_window_maemo_details;
+  Window_BoxHolder* m_window_maemo_details;
   #endif
   
   guint m_iPage_Details, m_iPage_List;
diff --git a/glom/dialog_glom.cc b/glom/window_boxholder.cc
similarity index 72%
rename from glom/dialog_glom.cc
rename to glom/window_boxholder.cc
index 69f9f8a..15a07ef 100644
--- a/glom/dialog_glom.cc
+++ b/glom/window_boxholder.cc
@@ -18,38 +18,37 @@
  * Boston, MA 02111-1307, USA.
  */
  
-#include <glom/dialog_glom.h>
+#include <glom/window_boxholder.h>
 #include <glom/utils_ui.h>
 
 namespace Glom
 {
 
-Dialog_Glom::Dialog_Glom(Box_WithButtons* pBox, const Glib::ustring& title)
+Window_BoxHolder::Window_BoxHolder(Box_WithButtons* pBox, const Glib::ustring& title)
 {
+  g_assert(pBox);
+
   if(!title.empty())
     set_title(title);
 
   set_border_width(Utils::DEFAULT_SPACING_SMALL);
 
-  m_pBox = pBox;
-  g_assert(m_pBox);
-
-  m_pBox->signal_cancelled.connect(sigc::mem_fun(*this, &Dialog_Glom::on_box_cancelled));
+  pBox->signal_cancelled.connect(sigc::mem_fun(*this, &Window_BoxHolder::on_box_cancelled));
 
-  add(*m_pBox);
-  m_pBox->show();
+  add(*pBox);
+  pBox->show();
 
   //Set the default button, if there is one:
-  Gtk::Widget* default_button = m_pBox->get_default_button();
+  Gtk::Widget* default_button = pBox->get_default_button();
   if(default_button)
     set_default(*default_button);
 }
 
-Dialog_Glom::~Dialog_Glom()
+Window_BoxHolder::~Window_BoxHolder()
 {
 }
 
-void Dialog_Glom::on_box_cancelled()
+void Window_BoxHolder::on_box_cancelled()
 {
   hide();
 }
diff --git a/glom/dialog_glom.h b/glom/window_boxholder.h
similarity index 76%
rename from glom/dialog_glom.h
rename to glom/window_boxholder.h
index 94f5c4e..ecdf791 100644
--- a/glom/dialog_glom.h
+++ b/glom/window_boxholder.h
@@ -18,32 +18,37 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef DIALOG_GLOM_H
-#define DIALOG_GLOM_H
+#ifndef GLOM_WINDOW_BOXHOLDER_H
+#define GLOM_WINDOW_BOXHOLDER_H
 
 #include <glom/box_withbuttons.h>
 #include <gtkmm/window.h>
 #include <gtkmm/button.h>
 
+#ifdef GLOM_ENABLE_MAEMO
+#include <hildonmm/window.h>
+#endif
+
 namespace Glom
 {
 
 /** A window that can hold a Box_WithButtons.
  */
-class Dialog_Glom :
+class Window_BoxHolder :
+#ifndef GLOM_ENABLE_MAEMO
   public Gtk::Window
+#else
+  public Hildon::Window
+#endif
 {
 public: 
-  Dialog_Glom(Box_WithButtons* pBox, const Glib::ustring& title = Glib::ustring());
-  virtual ~Dialog_Glom();
+  Window_BoxHolder(Box_WithButtons* pBox, const Glib::ustring& title = Glib::ustring());
+  virtual ~Window_BoxHolder();
 
 private:
 
   //Signal handlers:
   void on_box_cancelled();
-
-  //Member widgets:
-  Box_WithButtons* m_pBox;
 };
 
 } //namespace Glom
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]