GNOME.org
 

glom r1665 - in trunk: . glom/mode_data glom/utility_widgets

Author: jhs
Date: Fri Aug 22 11:54:24 2008
New Revision: 1665
URL: http://svn.gnome.org/viewvc/glom?rev=1665&view=rev

Log:
2008-08-22  Johannes Schmid  <johannes schmid openismus com>

	* glom/mode_data/box_data_details.h:
	* glom/utility_widgets/Makefile.am:
	* glom/utility_widgets/dragbar.cc (renamed):
	* glom/utility_widgets/dragbar.h (renamed):
	* glom/utility_widgets/dragbutton.cc (renamed):
	* glom/utility_widgets/dragbutton.h (renamed):
	* glom/utility_widgets/flowtable_dnd.cc:
	* glom/utility_widgets/layouttoolbar.cc:
	* glom/utility_widgets/layouttoolbar.h:
	* glom/utility_widgets/layouttoolbarbutton.cc:
	* glom/utility_widgets/layouttoolbarbutton.h:
	Changed names of DragBar to LayoutToolbar and DragButton to 
	LayouttoolbarButton

Added:
   trunk/glom/utility_widgets/layouttoolbar.cc
      - copied, changed from r1662, /trunk/glom/utility_widgets/dragbar.cc
   trunk/glom/utility_widgets/layouttoolbar.h
      - copied, changed from r1662, /trunk/glom/utility_widgets/dragbar.h
   trunk/glom/utility_widgets/layouttoolbarbutton.cc
      - copied, changed from r1662, /trunk/glom/utility_widgets/dragbutton.cc
   trunk/glom/utility_widgets/layouttoolbarbutton.h
      - copied, changed from r1663, /trunk/glom/utility_widgets/dragbutton.h
Removed:
   trunk/glom/utility_widgets/dragbar.cc
   trunk/glom/utility_widgets/dragbar.h
   trunk/glom/utility_widgets/dragbutton.cc
   trunk/glom/utility_widgets/dragbutton.h
Modified:
   trunk/ChangeLog
   trunk/glom/mode_data/box_data_details.h
   trunk/glom/utility_widgets/Makefile.am
   trunk/glom/utility_widgets/flowtable_dnd.cc

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	Fri Aug 22 11:54:24 2008
@@ -28,7 +28,7 @@
 #include "flowtablewithfields.h"
 #include "../utility_widgets/placeholder.h"
 #ifndef GLOM_ENABLE_CLIENT_ONLY
-#include "../utility_widgets/dragbar.h"
+#include "../utility_widgets/layouttoolbar.h"
 #endif
 
 namespace Glom
@@ -133,7 +133,7 @@
   Gtk::Button m_Button_New;
   Gtk::Button m_Button_Del;
 #ifndef GLOM_ENABLE_CLIENT_ONLY
-  DragBar m_Dragbar;
+  LayoutToolbar m_Dragbar;
 #endif
 
   /*

Modified: trunk/glom/utility_widgets/Makefile.am
==============================================================================
--- trunk/glom/utility_widgets/Makefile.am	(original)
+++ trunk/glom/utility_widgets/Makefile.am	Fri Aug 22 11:54:24 2008
@@ -42,8 +42,8 @@
 
 if !GLOM_ENABLE_CLIENT_ONLY
 libutility_widgets_a_SOURCES += filechooserdialog_saveextras.cc filechooserdialog_saveextras.h \
-                                dragbutton.cc dragbutton.h \
-                                dragbar.cc dragbar.h \
+                                layouttoolbarbutton.cc layouttoolbarbutton.h \
+                                layouttoolbar.cc layouttoolbar.h \
                                 sidebar.h sidebar.cc \
                                 flowtable_dnd.h  flowtable_dnd.cc \
                                 notebooklabelglom.h notebooklabelglom.cc

Modified: trunk/glom/utility_widgets/flowtable_dnd.cc
==============================================================================
--- trunk/glom/utility_widgets/flowtable_dnd.cc	(original)
+++ trunk/glom/utility_widgets/flowtable_dnd.cc	Fri Aug 22 11:54:24 2008
@@ -22,7 +22,7 @@
 #include "../mode_data/flowtablewithfields.h"
 #include "egg/toolpalette/eggtoolpalette.h"
 #include "placeholder-glom.h"
-#include "dragbutton.h"
+#include "layouttoolbarbutton.h"
 #include "entryglom.h"
 #include "labelglom.h"
 #include "buttonglom.h"

Copied: trunk/glom/utility_widgets/layouttoolbar.cc (from r1662, /trunk/glom/utility_widgets/dragbar.cc)
==============================================================================
--- /trunk/glom/utility_widgets/dragbar.cc	(original)
+++ trunk/glom/utility_widgets/layouttoolbar.cc	Fri Aug 22 11:54:24 2008
@@ -18,8 +18,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "dragbar.h"
-#include "dragbutton.h"
+#include "layouttoolbar.h"
+#include "layouttoolbarbutton.h"
 #include <gtkmm/stock.h>
 #include <glibmm/i18n.h>
 #include "config.h"
@@ -30,7 +30,7 @@
 namespace Glom
 {
 
-DragBar::DragBar()
+LayoutToolbar::LayoutToolbar()
 {
   // Looks ugly otherwise:
   set_size_request(100, 200);
@@ -50,19 +50,25 @@
     Gtk::manage (new Gtk::Image(GLOM_ICON_DIR "/glom-notebook.png"));
   
 	
-  DragButton* drag_group = Gtk::manage(new DragButton(*image_group, LayoutWidgetBase::TYPE_GROUP,
-                                       _("Group"), _("Drag to document to add a new group")));
-  DragButton* drag_notebook = Gtk::manage(new DragButton(*image_notebook, LayoutWidgetBase::TYPE_NOTEBOOK,
-                                          _("Notebook"), _("Drag to document to add a new notebook")));  
-
-  DragButton* drag_item = Gtk::manage(new DragButton(*image_item, LayoutWidgetBase::TYPE_FIELD,
-                                      _("Database field"), _("Drag to document to add a new database field")));
-  DragButton* drag_button = Gtk::manage(new DragButton(*image_button, LayoutWidgetBase::TYPE_BUTTON,
+  LayoutToolbarButton* drag_group = 
+    Gtk::manage(new LayoutToolbarButton(*image_group, LayoutWidgetBase::TYPE_GROUP,
+                                        _("Group"), _("Drag to document to add a new group")));
+  LayoutToolbarButton* drag_notebook = 
+    Gtk::manage(new LayoutToolbarButton(*image_notebook, LayoutWidgetBase::TYPE_NOTEBOOK,
+                                        _("Notebook"), _("Drag to document to add a new notebook")));  
+  
+  LayoutToolbarButton* drag_item = 
+    Gtk::manage(new LayoutToolbarButton(*image_item, LayoutWidgetBase::TYPE_FIELD,
+                                        _("Database field"), _("Drag to document to add a new database field")));
+  LayoutToolbarButton* drag_button = 
+    Gtk::manage(new LayoutToolbarButton(*image_button, LayoutWidgetBase::TYPE_BUTTON,
                                         _("Button"), _("Drag to document to cadd a new button")));
-  DragButton* drag_text = Gtk::manage(new DragButton(*image_text, LayoutWidgetBase::TYPE_TEXT,
-                                      _("Group"), _("Drag to document to add a new text box")));  
-  DragButton* drag_image = Gtk::manage(new DragButton(*image_image, LayoutWidgetBase::TYPE_IMAGE,
-                                       _("Image"), _("Drag to document to add a new image")));
+  LayoutToolbarButton* drag_text = 
+    Gtk::manage(new LayoutToolbarButton(*image_text, LayoutWidgetBase::TYPE_TEXT,
+                                        _("Group"), _("Drag to document to add a new text box")));  
+  LayoutToolbarButton* drag_image = 
+    Gtk::manage(new LayoutToolbarButton(*image_image, LayoutWidgetBase::TYPE_IMAGE,
+                                        _("Image"), _("Drag to document to add a new image")));
   
   //Note for translators: These are container layout items, containing child layout items, like container widgets in GTK+.
   GtkContainer* container_group = GTK_CONTAINER(egg_tool_item_group_new(_("Containers")));
@@ -84,7 +90,7 @@
   show_all_children();
 }
 
-DragBar::~DragBar()
+LayoutToolbar::~LayoutToolbar()
 {
   
 }

Copied: trunk/glom/utility_widgets/layouttoolbar.h (from r1662, /trunk/glom/utility_widgets/dragbar.h)
==============================================================================
--- /trunk/glom/utility_widgets/dragbar.h	(original)
+++ trunk/glom/utility_widgets/layouttoolbar.h	Fri Aug 22 11:54:24 2008
@@ -18,8 +18,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef GLOM_UTILITY_WIDGETS_DRAGBAR_H
-#define GLOM_UTILITY_WIDGETS_DRAGBAR_H
+#ifndef GLOM_UTILITY_WIDGETS_LAYOUTTOOLBAR_H
+#define GLOM_UTILITY_WIDGETS_LAYOUTTOOLBAR_H
 
 #include <gtkmm/window.h>
 #include <gtkmm/handlebox.h>
@@ -30,14 +30,14 @@
 namespace Glom
 {
 
-class DragBar : public SideBar
+class LayoutToolbar : public SideBar
 {
 public:
-  DragBar();
-   ~DragBar();
+  LayoutToolbar();
+   ~LayoutToolbar();
 
 };
 
 } //namespace Glom
 
-#endif // GLOM_UTILITY_WIDGETS_DRAGBAR_H
+#endif // GLOM_UTILITY_WIDGETS_LAYOUTTOOLBAR_H

Copied: trunk/glom/utility_widgets/layouttoolbarbutton.cc (from r1662, /trunk/glom/utility_widgets/dragbutton.cc)
==============================================================================
--- /trunk/glom/utility_widgets/dragbutton.cc	(original)
+++ trunk/glom/utility_widgets/layouttoolbarbutton.cc	Fri Aug 22 11:54:24 2008
@@ -18,13 +18,13 @@
  * Boston, MA 02111-1307, USA.
  */
  
-#include "dragbutton.h"
+#include "layouttoolbarbutton.h"
 
 namespace Glom
 {
   
-DragButton::DragButton(Gtk::Image& image, LayoutWidgetBase::enumType type,
-                       const Glib::ustring& title, const Glib::ustring& tooltip)
+LayoutToolbarButton::LayoutToolbarButton(Gtk::Image& image, LayoutWidgetBase::enumType type,
+                                         const Glib::ustring& title, const Glib::ustring& tooltip)
 : Gtk::ToolButton(image)
 {
   m_type = type;
@@ -39,18 +39,18 @@
   set_label(title);
 }
 
-DragButton::~DragButton()
+LayoutToolbarButton::~LayoutToolbarButton()
 {
 
 }
 
-void DragButton::on_drag_data_get(const Glib::RefPtr<Gdk::DragContext>&, 
+void LayoutToolbarButton::on_drag_data_get(const Glib::RefPtr<Gdk::DragContext>&, 
                                   Gtk::SelectionData& selection_data, guint, guint)
 {
   selection_data.set(8, (guint8*)(&m_type), 4);
 }
 
-void DragButton::on_drag_begin(const Glib::RefPtr<Gdk::DragContext>& drag_context)
+void LayoutToolbarButton::on_drag_begin(const Glib::RefPtr<Gdk::DragContext>& drag_context)
 {
   drag_context->set_icon(dynamic_cast<Gtk::Image*>(get_icon_widget())->get_pixbuf(), 0, 0);
 }

Copied: trunk/glom/utility_widgets/layouttoolbarbutton.h (from r1663, /trunk/glom/utility_widgets/dragbutton.h)
==============================================================================
--- /trunk/glom/utility_widgets/dragbutton.h	(original)
+++ trunk/glom/utility_widgets/layouttoolbarbutton.h	Fri Aug 22 11:54:24 2008
@@ -19,8 +19,8 @@
  */
  
 
-#ifndef GLOM_UTILITY_WIDGETS_DRAGBUTTON_H
-#define GLOM_UTILITY_WIDGETS_DRAGBUTTON_H
+#ifndef GLOM_UTILITY_WIDGETS_LAYOUTTOOLBARBUTTON_H
+#define GLOM_UTILITY_WIDGETS_LAYOUTTOOLBARBUTTON_H
 
 #include <gtkmm/button.h>
 #include <gtkmm/image.h>
@@ -31,11 +31,11 @@
 namespace Glom
 {
 
-class DragButton : public Gtk::ToolButton
+class LayoutToolbarButton : public Gtk::ToolButton
 {
 public:
-  DragButton(Gtk::Image& image, LayoutWidgetBase::enumType type, const Glib::ustring& title, const Glib::ustring& tooltip);  
-  ~DragButton();
+  LayoutToolbarButton(Gtk::Image& image, LayoutWidgetBase::enumType type, const Glib::ustring& title, const Glib::ustring& tooltip);  
+  ~LayoutToolbarButton();
 
   
   //TODO: What is this for? murrayc.
@@ -54,4 +54,4 @@
 };
 
 }
-#endif //GLOM_UTILITY_WIDGETS_DRAGBUTTON_H
+#endif //GLOM_UTILITY_WIDGETS_LAYOUTTOOLBARBUTTON_H
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]