glom r1743 - in trunk: . glom/mode_data glom/utility_widgets/db_adddel

[murrayc svn gnome org]

Author: murrayc
Date: Mon Nov 24 10:18:20 2008
New Revision: 1743
URL: http://svn.gnome.org/viewvc/glom?rev=1743&view=rev

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

* glom/utility_widgets/db_adddel/db_adddel.cc:
* glom/utility_widgets/db_adddel/db_adddel.h: Removed 
the unused signal_user_requested_delete signal.
on_MenuPopup_activate_Delete() (also called when the button is pressed):
Actually call user_requested_delete(), so that the user can delete a 
list row. I forgot to do this when moving the other stuff down into 
DbAddDel.
Ubuntu bug https://bugs.launchpad.net/ubuntu/+source/glom/+bug/299853
(elmergato)

Modified:
   trunk/ChangeLog
   trunk/glom/mode_data/box_data_list.cc
   trunk/glom/utility_widgets/db_adddel/db_adddel.cc
   trunk/glom/utility_widgets/db_adddel/db_adddel.h

Modified: trunk/glom/mode_data/box_data_list.cc
==============================================================================
--- trunk/glom/mode_data/box_data_list.cc	(original)
+++ trunk/glom/mode_data/box_data_list.cc	Mon Nov 24 10:18:20 2008
@@ -45,6 +45,7 @@
   m_AddDel.set_rules_hint(); //Use alternating row colors when the theme does that.
 
   //Connect signals:
+  //The Add and Delete buttons are handled by the DbAddDel widget itself.
   m_AddDel.signal_user_requested_edit().connect(sigc::mem_fun(*this, &Box_Data_List::on_adddel_user_requested_edit));
   m_AddDel.signal_script_button_clicked().connect(sigc::mem_fun(*this, &Box_Data_List::on_adddel_script_button_clicked));
   

Modified: trunk/glom/utility_widgets/db_adddel/db_adddel.cc
==============================================================================
--- trunk/glom/utility_widgets/db_adddel/db_adddel.cc	(original)
+++ trunk/glom/utility_widgets/db_adddel/db_adddel.cc	Mon Nov 24 10:18:20 2008
@@ -207,7 +207,7 @@
     if(iter)
     {
       //TODO: We can't handle multiple-selections yet.
-      signal_user_requested_delete().emit(iter, iter);
+      user_requested_delete(iter, iter);
     }
   }
 }
@@ -1625,11 +1625,6 @@
 }
 #endif // !GLOM_ENABLE_CLIENT_ONLY
 
-DbAddDel::type_signal_user_requested_delete DbAddDel::signal_user_requested_delete()
-{
-  return m_signal_user_requested_delete;
-}
-
 DbAddDel::type_signal_user_requested_edit DbAddDel::signal_user_requested_edit()
 {
   return m_signal_user_requested_edit;

Modified: trunk/glom/utility_widgets/db_adddel/db_adddel.h
==============================================================================
--- trunk/glom/utility_widgets/db_adddel/db_adddel.h	(original)
+++ trunk/glom/utility_widgets/db_adddel/db_adddel.h	Mon Nov 24 10:18:20 2008
@@ -217,14 +217,6 @@
 
   //Signals:
 
-
-  /** 
-   * @param start_row
-   * @param end_row
-   */
-  typedef sigc::signal<void, const Gtk::TreeModel::iterator&, const Gtk::TreeModel::iterator&> type_signal_user_requested_delete;
-  type_signal_user_requested_delete signal_user_requested_delete();
-
 #ifndef GLOM_ENABLE_CLIENT_ONLY
   /** Emitted when the user wants to edit the layout of the items in this widget.
    */
@@ -408,7 +400,6 @@
   Gtk::TreeViewColumn* m_treeviewcolumn_button;
 
   //signals:
-  type_signal_user_requested_delete m_signal_user_requested_delete;
   type_signal_user_requested_edit m_signal_user_requested_edit;
 #ifndef GLOM_ENABLE_CLIENT_ONLY
   type_signal_user_requested_layout m_signal_user_requested_layout;