Change marker layout in stroke-widget so they are all on one line.

(bzr r12363)

4 files changed, 68 insertions, 45 deletions

diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp
index 3468d984d..52f4ea6e2 100644
--- a/src/ui/dialog/symbols.cpp
+++ b/src/ui/dialog/symbols.cpp
@@ -44,6 +44,7 @@
 
 #include "ui/cache/svg_preview_cache.h"
 #include "ui/clipboard.h"
+#include "ui/icon-names.h"
 
 #include "symbols.h"
 
@@ -55,6 +56,7 @@
 #include "sp-use.h"
 #include "sp-defs.h"
 #include "sp-symbol.h"
+#include "widgets/icon.h"
 
 #ifdef WITH_LIBVISIO
 #include <libvisio/libvisio.h>
@@ -182,6 +184,64 @@ SymbolsDialog::SymbolsDialog( gchar const* prefsPath ) :
 
   ++row;
 
+  /******************** Tools *******************************/
+  Gtk::Button* button;
+  Gtk::HBox* tools = new Gtk::HBox();
+
+  //tools->set_layout( Gtk::BUTTONBOX_END );
+#if WITH_GTKMM_3_0
+  scroller->set_hexpand();
+  table->attach(*Gtk::manage(tools),0,row,2,1);
+#else
+  table->attach(*Gtk::manage(tools),0,2,row,row+1,Gtk::EXPAND|Gtk::FILL,Gtk::FILL);
+#endif
+
+  button = Gtk::manage(new Gtk::Button());
+  button->add(*Gtk::manage(Glib::wrap(
+      sp_icon_new (Inkscape::ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_ICON("symbol-add")))) );
+  button->set_tooltip_text(_("Add Symbol from the current document."));
+  button->set_relief( Gtk::RELIEF_NONE );
+  tools->pack_start(* Gtk::manage(button), Gtk::PACK_SHRINK);
+
+  button = Gtk::manage(new Gtk::Button());
+  button->add(*Gtk::manage(Glib::wrap(
+      sp_icon_new (Inkscape::ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_ICON("symbol-remove")))) );
+  button->set_tooltip_text(_("Remove Symbol from the current document."));
+  button->set_relief( Gtk::RELIEF_NONE );
+  tools->pack_start(* Gtk::manage(button), Gtk::PACK_SHRINK);
+
+  Gtk::Label* spacer = Gtk::manage(new Gtk::Label(""));
+  tools->pack_start(* Gtk::manage(spacer)); //, Gtk::EXPAND|Gtk::FILL);
+
+  button = Gtk::manage(new Gtk::Button());
+  button->add(*Gtk::manage(Glib::wrap(
+      sp_icon_new (Inkscape::ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_ICON("zoom-in")))) );
+  button->set_tooltip_text(_("Make Icons bigger by zooming in."));
+  button->set_relief( Gtk::RELIEF_NONE );
+  tools->pack_start(* Gtk::manage(button), Gtk::PACK_SHRINK);
+
+  Gtk::ToggleButton* toggle = Gtk::manage(new Gtk::ToggleButton());
+  toggle->add(*Gtk::manage(Glib::wrap(
+      sp_icon_new (Inkscape::ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_ICON("zoom-fit-page")))) );
+  toggle->set_tooltip_text(_("Toggle 'fit' symbols in icon space."));
+  toggle->set_relief( Gtk::RELIEF_NONE );
+  tools->pack_start(* Gtk::manage(toggle), Gtk::PACK_SHRINK);
+
+  button = Gtk::manage(new Gtk::Button());
+  button->add(*Gtk::manage(Glib::wrap(
+      sp_icon_new (Inkscape::ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_ICON("zoom-out")))) );
+  button->set_tooltip_text(_("Make Icons smaller by zooming out."));
+  button->set_relief( Gtk::RELIEF_NONE );
+  tools->pack_start(* Gtk::manage(button), Gtk::PACK_SHRINK);
+
+
+
+
+
+
+
+  ++row;
+
   /******************** Preview Scale ***********************/
   Gtk::Label* labelScale = new Gtk::Label(_("Preview scale: "));
 
diff --git a/src/widgets/stroke-marker-selector.cpp b/src/widgets/stroke-marker-selector.cpp
index 62fa47603..5ac6d5f34 100644
--- a/src/widgets/stroke-marker-selector.cpp
+++ b/src/widgets/stroke-marker-selector.cpp
@@ -56,10 +56,6 @@ MarkerComboBox::MarkerComboBox(gchar const *id, int l) :
     marker_store = Gtk::ListStore::create(marker_columns);
     set_model(marker_store);
     pack_start(image_renderer, false);
-    pack_end(label_renderer, true);
-    label_renderer.set_padding(2, 0);
-    image_renderer.set_padding(2, 0);
-    set_cell_data_func(label_renderer, sigc::mem_fun(*this, &MarkerComboBox::prepareLabelRenderer));
     set_cell_data_func(image_renderer, sigc::mem_fun(*this, &MarkerComboBox::prepareImageRenderer));
     gtk_combo_box_set_row_separator_func(GTK_COMBO_BOX(gobj()), MarkerComboBox::separator_cb, NULL, NULL);
 
@@ -559,12 +555,6 @@ MarkerComboBox::create_marker_image(unsigned psize, gchar const *mname,
     return pb;
 }
 
-void MarkerComboBox::prepareLabelRenderer( Gtk::TreeModel::const_iterator const &row ) {
-    Glib::ustring name=(*row)[marker_columns.label];
-    label_renderer.property_markup() = name.c_str();
-    label_renderer.property_scale() = 0.8;
-}
-
 void MarkerComboBox::prepareImageRenderer( Gtk::TreeModel::const_iterator const &row ) {
 
     Gtk::Image *image = (*row)[marker_columns.image];
diff --git a/src/widgets/stroke-marker-selector.h b/src/widgets/stroke-marker-selector.h
index d9732038e..27ac76d6f 100644
--- a/src/widgets/stroke-marker-selector.h
+++ b/src/widgets/stroke-marker-selector.h
@@ -68,7 +68,6 @@ private:
     SPDocument *doc;
     SPDocument *sandbox;
     Gtk::Image  *empty_image;
-    Gtk::CellRendererText label_renderer;
     Gtk::CellRendererPixbuf image_renderer;
 
     class MarkerColumns : public Gtk::TreeModel::ColumnRecord {
@@ -99,7 +98,6 @@ private:
     /*
      * Callbacks for drawing the combo box
      */
-    void prepareLabelRenderer( Gtk::TreeModel::const_iterator const &row );
     void prepareImageRenderer( Gtk::TreeModel::const_iterator const &row );
     static gboolean separator_cb (GtkTreeModel *model, GtkTreeIter *iter, gpointer data);
 
diff --git a/src/widgets/stroke-style.cpp b/src/widgets/stroke-style.cpp
index c6934f0a6..0a5b3781b 100644
--- a/src/widgets/stroke-style.cpp
+++ b/src/widgets/stroke-style.cpp
@@ -342,62 +342,37 @@ StrokeStyle::StrokeStyle() :
     // TRANSLATORS: Path markers are an SVG feature that allows you to attach arbitrary shapes
     // (arrowheads, bullets, faces, whatever) to the start, end, or middle nodes of a path.
 
+    spw_label(table, _("Markers:"), 0, i, NULL);
+
+    hb = spw_hbox(table, 1, 1, i);
+    i++;
+
     startMarkerCombo = manage(new MarkerComboBox("marker-start", SP_MARKER_LOC_START));
-    spw_label(table, _("_Start Markers:"), 0, i, startMarkerCombo);
     startMarkerCombo->set_tooltip_text(_("Start Markers are drawn on the first node of a path or shape"));
     startMarkerConn = startMarkerCombo->signal_changed().connect(
             sigc::bind<MarkerComboBox *, StrokeStyle *, SPMarkerLoc>(
                 sigc::ptr_fun(&StrokeStyle::markerSelectCB), startMarkerCombo, this, SP_MARKER_LOC_START));
     startMarkerCombo->show();
 
-#if WITH_GTKMM_3_0
-    startMarkerCombo->set_hexpand();
-    startMarkerCombo->set_halign(Gtk::ALIGN_FILL);
-    startMarkerCombo->set_valign(Gtk::ALIGN_CENTER);
-    table->attach(*startMarkerCombo, 1, i, 3, 1);
-#else
-    table->attach(*startMarkerCombo, 1, 4, i, i+1, (Gtk::EXPAND | Gtk::FILL), static_cast<Gtk::AttachOptions>(0), 0, 0);
-#endif
-
-    i++;
+    hb->pack_start(*startMarkerCombo, true, true, 0);
 
     midMarkerCombo =  manage(new MarkerComboBox("marker-mid", SP_MARKER_LOC_MID));
-    spw_label(table, _("_Mid Markers:"), 0, i, midMarkerCombo);
     midMarkerCombo->set_tooltip_text(_("Mid Markers are drawn on every node of a path or shape except the first and last nodes"));
     midMarkerConn = midMarkerCombo->signal_changed().connect(
         sigc::bind<MarkerComboBox *, StrokeStyle *, SPMarkerLoc>(
             sigc::ptr_fun(&StrokeStyle::markerSelectCB), midMarkerCombo, this, SP_MARKER_LOC_MID));
     midMarkerCombo->show();
 
-#if WITH_GTKMM_3_0
-    midMarkerCombo->set_hexpand();
-    midMarkerCombo->set_halign(Gtk::ALIGN_FILL);
-    midMarkerCombo->set_valign(Gtk::ALIGN_CENTER);
-    table->attach(*midMarkerCombo, 1, i, 3, 1);
-#else
-    table->attach(*midMarkerCombo, 1, 4, i, i+1, (Gtk::EXPAND | Gtk::FILL), static_cast<Gtk::AttachOptions>(0), 0, 0);
-#endif
-
-    i++;
+    hb->pack_start(*midMarkerCombo, true, true, 0);
 
     endMarkerCombo = manage(new MarkerComboBox("marker-end", SP_MARKER_LOC_END));
-    spw_label(table, _("_End Markers:"), 0, i, endMarkerCombo);
     endMarkerCombo->set_tooltip_text(_("End Markers are drawn on the last node of a path or shape"));
     endMarkerConn = endMarkerCombo->signal_changed().connect(
         sigc::bind<MarkerComboBox *, StrokeStyle *, SPMarkerLoc>(
             sigc::ptr_fun(&StrokeStyle::markerSelectCB), endMarkerCombo, this, SP_MARKER_LOC_END));
     endMarkerCombo->show();
 
-#if WITH_GTKMM_3_0
-    endMarkerCombo->set_hexpand();
-    endMarkerCombo->set_halign(Gtk::ALIGN_FILL);
-    endMarkerCombo->set_valign(Gtk::ALIGN_CENTER);
-    table->attach(*endMarkerCombo, 1, i, 3, 1);
-#else
-    table->attach(*endMarkerCombo, 1, 4, i, i+1, (Gtk::EXPAND | Gtk::FILL), static_cast<Gtk::AttachOptions>(0), 0, 0);
-#endif
-
-    i++;
+    hb->pack_start(*endMarkerCombo, true, true, 0);
 
     setDesktop(desktop);
     updateLine();