glom r1694 - in trunk: . glom glom/mode_data glom/mode_design/print_layouts

[murrayc svn gnome org]

Author: murrayc
Date: Tue Sep 30 11:24:43 2008
New Revision: 1694
URL: http://svn.gnome.org/viewvc/glom?rev=1694&view=rev

Log:
2008-09-30  Murray Cumming  <murrayc murrayc com>

* glom/glom_developer.glade:
* glom/mode_data/box_data_list_related.cc:
* glom/mode_data/dialog_layout_details.cc:
* glom/mode_data/dialog_layout_details.h:
* glom/mode_data/dialog_layout_export.cc:
* glom/mode_data/dialog_layout_export.h:
* glom/mode_data/dialog_layout_list.cc: Renamed some widgets to make the 
code just slightly less weird.

Modified:
   trunk/ChangeLog
   trunk/glom/glom_developer.glade
   trunk/glom/mode_data/box_data_list_related.cc
   trunk/glom/mode_data/dialog_layout_details.cc
   trunk/glom/mode_data/dialog_layout_details.h
   trunk/glom/mode_data/dialog_layout_export.cc
   trunk/glom/mode_data/dialog_layout_export.h
   trunk/glom/mode_data/dialog_layout_list.cc
   trunk/glom/mode_design/print_layouts/canvas_layout_item.cc

Modified: trunk/glom/glom_developer.glade
==============================================================================
--- trunk/glom/glom_developer.glade	(original)
+++ trunk/glom/glom_developer.glade	Tue Sep 30 11:24:43 2008
@@ -4648,7 +4648,7 @@
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkButton" id="button_down">
+                              <widget class="GtkButton" id="button_field_down">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="can_default">True</property>
@@ -5448,7 +5448,7 @@
                                   </widget>
                                 </child>
                                 <child>
-                                  <widget class="GtkButton" id="button_field_down">
+                                  <widget class="GtkButton" id="button_down">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="can_default">True</property>
@@ -8280,7 +8280,7 @@
                         <property name="visible">True</property>
                         <property name="spacing">6</property>
                         <child>
-                          <widget class="GtkButton" id="button_field_add">
+                          <widget class="GtkButton" id="button_add_field">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="can_default">True</property>
@@ -8380,7 +8380,7 @@
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkButton" id="button_field_add_group">
+                          <widget class="GtkButton" id="button_add_group">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="can_default">True</property>
@@ -8695,7 +8695,7 @@
                             <property name="spacing">6</property>
                             <property name="layout_style">GTK_BUTTONBOX_START</property>
                             <child>
-                              <widget class="GtkButton" id="button_field_up">
+                              <widget class="GtkButton" id="button_up">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="can_default">True</property>
@@ -8705,7 +8705,7 @@
                               </widget>
                             </child>
                             <child>
-                              <widget class="GtkButton" id="button_field_down">
+                              <widget class="GtkButton" id="button_down">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="can_default">True</property>

Modified: trunk/glom/mode_data/box_data_list_related.cc
==============================================================================
--- trunk/glom/mode_data/box_data_list_related.cc	(original)
+++ trunk/glom/mode_data/box_data_list_related.cc	Tue Sep 30 11:24:43 2008
@@ -177,7 +177,7 @@
   //Call base class:
   
   const Gnome::Gda::Value primary_key_value = m_AddDel.get_value_key(row); //The primary key is in the key.
-  std::cout << "on_adddel_user_requested_edit(): Requesting edit for primary_key=" << primary_key_value.to_string() << std::endl;
+  //std::cout << "on_adddel_user_requested_edit(): Requesting edit for primary_key=" << primary_key_value.to_string() << std::endl;
   signal_user_requested_details().emit(primary_key_value);
 }
 

Modified: trunk/glom/mode_data/dialog_layout_details.cc
==============================================================================
--- trunk/glom/mode_data/dialog_layout_details.cc	(original)
+++ trunk/glom/mode_data/dialog_layout_details.cc	Tue Sep 30 11:24:43 2008
@@ -41,10 +41,10 @@
   m_box_table_widgets(0),
   m_box_related_table_widgets(0),
   m_box_related_navigation(0),
-  m_button_field_up(0),
-  m_button_field_down(0),
-  m_button_field_add(0),
-  m_button_field_add_group(0),
+  m_button_up(0),
+  m_button_down(0),
+  m_button_add_field(0),
+  m_button_add_group(0),
   m_button_add_notebook(0),
   m_button_add_related(0),
   m_button_add_related_calendar(0),
@@ -148,11 +148,11 @@
     m_model_items->signal_row_changed().connect( sigc::mem_fun(*this, &Dialog_Layout_Details::on_treemodel_row_changed) );
   }
 
-  refGlade->get_widget("button_field_up", m_button_field_up);
-  m_button_field_up->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Layout_Details::on_button_field_up) );
+  refGlade->get_widget("button_up", m_button_up);
+  m_button_up->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Layout_Details::on_button_up) );
 
-  refGlade->get_widget("button_field_down", m_button_field_down);
-  m_button_field_down->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Layout_Details::on_button_field_down) );
+  refGlade->get_widget("button_down", m_button_down);
+  m_button_down->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Layout_Details::on_button_down) );
 
   refGlade->get_widget("button_field_delete", m_button_field_delete);
   m_button_field_delete->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Layout_Details::on_button_field_delete) );
@@ -160,11 +160,11 @@
   refGlade->get_widget("button_formatting", m_button_field_formatting);
   m_button_field_formatting->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Layout_Details::on_button_field_formatting) );
 
-  refGlade->get_widget("button_field_add", m_button_field_add);
-  m_button_field_add->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Layout_Details::on_button_field_add) );
+  refGlade->get_widget("button_add_field", m_button_add_field);
+  m_button_add_field->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Layout_Details::on_button_field_add) );
 
-  refGlade->get_widget("button_field_add_group", m_button_field_add_group);
-  m_button_field_add_group->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Layout_Details::on_button_field_add_group) );
+  refGlade->get_widget("button_add_group", m_button_add_group);
+  m_button_add_group->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Layout_Details::on_button_add_group) );
 
   refGlade->get_widget("button_add_notebook", m_button_add_notebook);
   m_button_add_notebook->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Layout_Details::on_button_add_notebook) );
@@ -389,7 +389,7 @@
           enable_up = false;  //It can't go any higher.
       }
 
-      m_button_field_up->set_sensitive(enable_up);
+      m_button_up->set_sensitive(enable_up);
 
 
       //Disable Down if It can't go any lower.
@@ -410,7 +410,7 @@
           enable_down = false;
       }
 
-      m_button_field_down->set_sensitive(enable_down);
+      m_button_down->set_sensitive(enable_down);
 
       m_button_field_delete->set_sensitive(true);
 
@@ -423,8 +423,8 @@
     else
     {
       //Disable all buttons that act on a selection:
-      m_button_field_down->set_sensitive(false);
-      m_button_field_up->set_sensitive(false);
+      m_button_down->set_sensitive(false);
+      m_button_up->set_sensitive(false);
       m_button_field_delete->set_sensitive(false);
       m_button_field_formatting->set_sensitive(false);
     }
@@ -449,7 +449,7 @@
   }
 }
 
-void Dialog_Layout_Details::on_button_field_up()
+void Dialog_Layout_Details::on_button_up()
 {
   Glib::RefPtr<Gtk::TreeView::Selection> refSelection = m_treeview_fields->get_selection();
   if(refSelection)
@@ -480,7 +480,7 @@
   enable_buttons();
 }
 
-void Dialog_Layout_Details::on_button_field_down()
+void Dialog_Layout_Details::on_button_down()
 {
   Glib::RefPtr<Gtk::TreeView::Selection> refSelection = m_treeview_fields->get_selection();
   if(refSelection)
@@ -880,7 +880,7 @@
   return parent;
 }
 
-void Dialog_Layout_Details::on_button_field_add_group()
+void Dialog_Layout_Details::on_button_add_group()
 {
   Gtk::TreeModel::iterator parent = get_selected_group_parent();
 

Modified: trunk/glom/mode_data/dialog_layout_details.h
==============================================================================
--- trunk/glom/mode_data/dialog_layout_details.h	(original)
+++ trunk/glom/mode_data/dialog_layout_details.h	Tue Sep 30 11:24:43 2008
@@ -58,11 +58,11 @@
   sharedptr<LayoutItem_Button> offer_button_script_edit(const sharedptr<const LayoutItem_Button>& button);
 
   //signal handlers:
-  void on_button_field_up();
-  void on_button_field_down();
+  void on_button_up();
+  void on_button_down();
   void on_button_field_delete();
   virtual void on_button_field_add(); //overridden in derived class. 
-  void on_button_field_add_group();
+  void on_button_add_group();
   void on_button_add_notebook();
   void on_button_add_related();
   void on_button_add_related_calendar();
@@ -95,10 +95,10 @@
   Gtk::Box* m_box_related_table_widgets;
   Gtk::Frame* m_box_related_navigation;
 
-  Gtk::Button* m_button_field_up;
-  Gtk::Button* m_button_field_down;
-  Gtk::Button* m_button_field_add;
-  Gtk::Button* m_button_field_add_group;
+  Gtk::Button* m_button_up;
+  Gtk::Button* m_button_down;
+  Gtk::Button* m_button_add_field;
+  Gtk::Button* m_button_add_group;
   Gtk::Button* m_button_add_notebook;
   Gtk::Button* m_button_add_related;
   Gtk::Button* m_button_add_related_calendar;

Modified: trunk/glom/mode_data/dialog_layout_export.cc
==============================================================================
--- trunk/glom/mode_data/dialog_layout_export.cc	(original)
+++ trunk/glom/mode_data/dialog_layout_export.cc	Tue Sep 30 11:24:43 2008
@@ -73,10 +73,10 @@
 
 
   refGlade->get_widget("button_field_up", m_button_field_up);
-  m_button_field_up->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Layout_Export::on_button_field_up) );
+  m_button_field_up->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Layout_Export::on_button_up) );
 
   refGlade->get_widget("button_field_down", m_button_field_down);
-  m_button_field_down->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Layout_Export::on_button_field_down) );
+  m_button_field_down->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Layout_Export::on_button_down) );
 
   refGlade->get_widget("button_field_delete", m_button_field_delete);
   m_button_field_delete->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Layout_Export::on_button_delete) );
@@ -209,12 +209,12 @@
 }
 
 
-void Dialog_Layout_Export::on_button_field_up()
+void Dialog_Layout_Export::on_button_up()
 {
   move_treeview_selection_up(m_treeview_fields, m_ColumnsFields.m_col_sequence);
 }
 
-void Dialog_Layout_Export::on_button_field_down()
+void Dialog_Layout_Export::on_button_down()
 {
   move_treeview_selection_down(m_treeview_fields, m_ColumnsFields.m_col_sequence);
 }

Modified: trunk/glom/mode_data/dialog_layout_export.h
==============================================================================
--- trunk/glom/mode_data/dialog_layout_export.h	(original)
+++ trunk/glom/mode_data/dialog_layout_export.h	Tue Sep 30 11:24:43 2008
@@ -48,8 +48,8 @@
   virtual void enable_buttons();
 
   //signal handlers:
-  virtual void on_button_field_up();
-  virtual void on_button_field_down();
+  virtual void on_button_up();
+  virtual void on_button_down();
   virtual void on_button_add_field();
   virtual void on_button_delete();
   virtual void on_button_edit_field();

Modified: trunk/glom/mode_data/dialog_layout_list.cc
==============================================================================
--- trunk/glom/mode_data/dialog_layout_list.cc	(original)
+++ trunk/glom/mode_data/dialog_layout_list.cc	Tue Sep 30 11:24:43 2008
@@ -37,6 +37,7 @@
   m_button_add_notebook->hide();
   m_button_add_related->hide();
   m_button_add_related_calendar->hide();
+  m_button_add_group->hide();
 
   //We don't want this part of the dialog:
   //(We share one glade definition for several dialogs.)

Modified: trunk/glom/mode_design/print_layouts/canvas_layout_item.cc
==============================================================================
--- trunk/glom/mode_design/print_layouts/canvas_layout_item.cc	(original)
+++ trunk/glom/mode_design/print_layouts/canvas_layout_item.cc	Tue Sep 30 11:24:43 2008
@@ -277,6 +277,7 @@
                   layout_item->get_display_width(width);
                   width = std::max(width, (guint)10);
                   cell->set_width_height(width, row_height);
+                  std::cout << "DEBUG: width=" << width << std::endl;
 
                   //TODO: Add/Remove rows when resizing, instead of resizing the rows:
                   Glib::RefPtr<Goocanvas::Item> cell_as_item = CanvasItemMovable::cast_to_item(cell);
@@ -285,7 +286,7 @@
                     canvas_item->attach(cell_as_item, 
                       col /* left_attach */, col+1 /* right_attach */, 
                       row /* top_attach */, row + 1 /* right_attach */, 
-                      Gtk::SHRINK, (Gtk::AttachOptions)Gtk::FILL | Gtk::EXPAND);
+                      Gtk::FILL, (Gtk::AttachOptions)Gtk::FILL | Gtk::EXPAND);
                   }
                 }