glom r1661 - in trunk: . glom/utility_widgets glom/utility_widgets/egg/toolpalette

[jhs svn gnome org]

Author: jhs
Date: Wed Aug 20 10:07:00 2008
New Revision: 1661
URL: http://svn.gnome.org/viewvc/glom?rev=1661&view=rev

Log:
2008-08-20  Johannes Schmid <jhs gnome org>

	* glom/utility_widgets/dragbar.cc:
	* glom/utility_widgets/dragbutton.cc:
	* glom/utility_widgets/dragbutton.h:
	Added labels to the toolitems
	
	* glom/utility_widgets/egg/toolpalette/eggtoolpalette.c
	(egg_tool_palette_set_style):
	Fixed a bug in eggtoolpalette (\"toolbar-style\" vs. \"style). Also
	fixed in libegg trunk.
	
	* glom/utility_widgets/sidebar.cc:
	Use GTK_TOOLBAR_BOTH_HORIZ as toolbar style. (Does only work with 
	gtk+ >= 2.14)

Modified:
   trunk/ChangeLog
   trunk/glom/utility_widgets/dragbar.cc
   trunk/glom/utility_widgets/dragbutton.cc
   trunk/glom/utility_widgets/dragbutton.h
   trunk/glom/utility_widgets/egg/toolpalette/eggtoolpalette.c
   trunk/glom/utility_widgets/sidebar.cc

Modified: trunk/glom/utility_widgets/dragbar.cc
==============================================================================
--- trunk/glom/utility_widgets/dragbar.cc	(original)
+++ trunk/glom/utility_widgets/dragbar.cc	Wed Aug 20 10:07:00 2008
@@ -51,18 +51,18 @@
   
 	
   DragButton* drag_group = Gtk::manage(new DragButton(*image_group, LayoutWidgetBase::TYPE_GROUP,
-                                       _("Drag to document to add a new group")));
+                                       _("Group"), _("Drag to document to add a new group")));
   DragButton* drag_notebook = Gtk::manage(new DragButton(*image_notebook, LayoutWidgetBase::TYPE_NOTEBOOK,
-                                          _("Drag to document to add a new notebook")));  
+                                          _("Notebook"), _("Drag to document to add a new notebook")));  
 
   DragButton* drag_item = Gtk::manage(new DragButton(*image_item, LayoutWidgetBase::TYPE_FIELD,
-                                      _("Drag to document to add a new database field")));
+                                      _("Database field"), _("Drag to document to add a new database field")));
   DragButton* drag_button = Gtk::manage(new DragButton(*image_button, LayoutWidgetBase::TYPE_BUTTON,
-                                        _("Drag to document to cadd a new button")));
+                                        _("Button"), _("Drag to document to cadd a new button")));
   DragButton* drag_text = Gtk::manage(new DragButton(*image_text, LayoutWidgetBase::TYPE_TEXT,
-                                      _("Drag to document to add a new text box")));  
+                                      _("Group"), _("Drag to document to add a new text box")));  
   DragButton* drag_image = Gtk::manage(new DragButton(*image_image, LayoutWidgetBase::TYPE_IMAGE,
-                                       _("Drag to document to add a new 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")));

Modified: trunk/glom/utility_widgets/dragbutton.cc
==============================================================================
--- trunk/glom/utility_widgets/dragbutton.cc	(original)
+++ trunk/glom/utility_widgets/dragbutton.cc	Wed Aug 20 10:07:00 2008
@@ -24,7 +24,7 @@
 {
   
 DragButton::DragButton(Gtk::Image& image, LayoutWidgetBase::enumType type,
-                       Glib::ustring tooltip):
+                       Glib::ustring title, Glib::ustring tooltip):
 	Gtk::ToolButton(image)
 {
   m_type = type;
@@ -34,6 +34,7 @@
   drag_source_set(targetentries, Gdk::MODIFIER_MASK, 
                   Gdk::ACTION_COPY | Gdk::ACTION_MOVE);
   set_tooltip_text (tooltip);
+  set_label (title);
 }
 
 DragButton::~DragButton()

Modified: trunk/glom/utility_widgets/dragbutton.h
==============================================================================
--- trunk/glom/utility_widgets/dragbutton.h	(original)
+++ trunk/glom/utility_widgets/dragbutton.h	Wed Aug 20 10:07:00 2008
@@ -29,12 +29,12 @@
 
 namespace Glom
 {
-  
+
 class DragButton : public Gtk::ToolButton
 {
   public:
     DragButton(Gtk::Image& image, LayoutWidgetBase::enumType type,
-							 Glib::ustring tooltip);  
+							 Glib::ustring title, Glib::ustring tooltip);  
     ~DragButton();
 
   

Modified: trunk/glom/utility_widgets/egg/toolpalette/eggtoolpalette.c
==============================================================================
--- trunk/glom/utility_widgets/egg/toolpalette/eggtoolpalette.c	(original)
+++ trunk/glom/utility_widgets/egg/toolpalette/eggtoolpalette.c	Wed Aug 20 10:07:00 2008
@@ -993,7 +993,7 @@
   g_return_if_fail (EGG_IS_TOOL_PALETTE (palette));
 
   if (style != palette->priv->style)
-    g_object_set (palette, "style", style, NULL);
+    g_object_set (palette, "toolbar-style", style, NULL);
 }
 
 /**

Modified: trunk/glom/utility_widgets/sidebar.cc
==============================================================================
--- trunk/glom/utility_widgets/sidebar.cc	(original)
+++ trunk/glom/utility_widgets/sidebar.cc	Wed Aug 20 10:07:00 2008
@@ -31,10 +31,12 @@
   set_snap_edge(Gtk::POS_TOP);
   
   palette = EGG_TOOL_PALETTE(egg_tool_palette_new());
+  egg_tool_palette_set_style (palette, GTK_TOOLBAR_BOTH_HORIZ);
   Gtk::Container* container = Glib::wrap(GTK_CONTAINER(palette));
   
   add(*container);
-  show_all_children();
+  show_all_children();;
+
 }
 
 SideBar::~SideBar()