From 00904e48823b29873f52854d95b5c2f83b15108b Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Tue, 11 Jun 2013 11:49:46 -0400 Subject: Change marker layout in stroke-widget so they are all on one line. (bzr r12363) --- src/widgets/stroke-marker-selector.cpp | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'src/widgets/stroke-marker-selector.cpp') 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]; -- cgit v1.2.3 From 0dbd19748a058c88f9a693ed08ddabf223d0524d Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Tue, 11 Jun 2013 16:14:43 -0400 Subject: Fix new bug with No-Marker having no icon, use Stock GTK::Remove icon for No-Marker. (bzr r12364) --- src/widgets/stroke-marker-selector.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/widgets/stroke-marker-selector.cpp') diff --git a/src/widgets/stroke-marker-selector.cpp b/src/widgets/stroke-marker-selector.cpp index 5ac6d5f34..dd00ed703 100644 --- a/src/widgets/stroke-marker-selector.cpp +++ b/src/widgets/stroke-marker-selector.cpp @@ -38,6 +38,7 @@ #include "helper/stock-items.h" #include "gradient-vector.h" +#include #include #include "ui/widget/spinbutton.h" #include "stroke-style.h" @@ -151,7 +152,8 @@ MarkerComboBox::init_combo() Gtk::TreeModel::Row row = *(marker_store->append()); row[marker_columns.label] = _("No document selected"); row[marker_columns.marker] = g_strdup("None"); - row[marker_columns.image] = NULL; + Glib::RefPtr iconTheme = Gtk::IconTheme::get_default(); + row[marker_columns.image] = new Gtk::Image( iconTheme->load_icon("gtk-remove", 22) ); row[marker_columns.stock] = false; row[marker_columns.history] = false; row[marker_columns.separator] = false; @@ -386,7 +388,8 @@ void MarkerComboBox::add_markers (GSList *marker_list, SPDocument *source, gbool row[marker_columns.label] = _("None"); row[marker_columns.stock] = false; row[marker_columns.marker] = g_strdup("None"); - row[marker_columns.image] = NULL; + Glib::RefPtr iconTheme = Gtk::IconTheme::get_default(); + row[marker_columns.image] = new Gtk::Image( iconTheme->load_icon("gtk-remove", 22) ); row[marker_columns.history] = true; row[marker_columns.separator] = false; } -- cgit v1.2.3 From 2f7a1c5a360c192e60fa25adcb8b838fd33c4d40 Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Tue, 11 Jun 2013 18:55:31 -0400 Subject: Change back to using NULL and fix windows theme error by checking (bzr r12367) --- src/widgets/stroke-marker-selector.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/widgets/stroke-marker-selector.cpp') diff --git a/src/widgets/stroke-marker-selector.cpp b/src/widgets/stroke-marker-selector.cpp index dd00ed703..82cd81e9f 100644 --- a/src/widgets/stroke-marker-selector.cpp +++ b/src/widgets/stroke-marker-selector.cpp @@ -60,7 +60,12 @@ MarkerComboBox::MarkerComboBox(gchar const *id, int l) : 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); - empty_image = new Gtk::Image(); + Glib::RefPtr iconTheme = Gtk::IconTheme::get_default(); + if(iconTheme->has_icon("gtk-remove")) { + empty_image = new Gtk::Image( iconTheme->load_icon("gtk-remove", 22) ); + } else { + empty_image = new Gtk::Image(); + } sandbox = ink_markers_preview_doc (); desktop = inkscape_active_desktop(); @@ -152,8 +157,7 @@ MarkerComboBox::init_combo() Gtk::TreeModel::Row row = *(marker_store->append()); row[marker_columns.label] = _("No document selected"); row[marker_columns.marker] = g_strdup("None"); - Glib::RefPtr iconTheme = Gtk::IconTheme::get_default(); - row[marker_columns.image] = new Gtk::Image( iconTheme->load_icon("gtk-remove", 22) ); + row[marker_columns.image] = NULL; row[marker_columns.stock] = false; row[marker_columns.history] = false; row[marker_columns.separator] = false; @@ -388,8 +392,7 @@ void MarkerComboBox::add_markers (GSList *marker_list, SPDocument *source, gbool row[marker_columns.label] = _("None"); row[marker_columns.stock] = false; row[marker_columns.marker] = g_strdup("None"); - Glib::RefPtr iconTheme = Gtk::IconTheme::get_default(); - row[marker_columns.image] = new Gtk::Image( iconTheme->load_icon("gtk-remove", 22) ); + row[marker_columns.image] = NULL; row[marker_columns.history] = true; row[marker_columns.separator] = false; } -- cgit v1.2.3 From 295d11627ae7750369d72022e63c8d7ce761ef8a Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Tue, 11 Jun 2013 20:04:45 -0400 Subject: Use 'remove' instead of 'gtk-remove' for theme. Fixed bugs: - https://launchpad.net/bugs/1190072 (bzr r12369) --- src/widgets/stroke-marker-selector.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/widgets/stroke-marker-selector.cpp') diff --git a/src/widgets/stroke-marker-selector.cpp b/src/widgets/stroke-marker-selector.cpp index 82cd81e9f..8e252f5e1 100644 --- a/src/widgets/stroke-marker-selector.cpp +++ b/src/widgets/stroke-marker-selector.cpp @@ -61,8 +61,8 @@ MarkerComboBox::MarkerComboBox(gchar const *id, int l) : gtk_combo_box_set_row_separator_func(GTK_COMBO_BOX(gobj()), MarkerComboBox::separator_cb, NULL, NULL); Glib::RefPtr iconTheme = Gtk::IconTheme::get_default(); - if(iconTheme->has_icon("gtk-remove")) { - empty_image = new Gtk::Image( iconTheme->load_icon("gtk-remove", 22) ); + if(iconTheme->has_icon("remove")) { + empty_image = new Gtk::Image( iconTheme->load_icon("remove", 22) ); } else { empty_image = new Gtk::Image(); } -- cgit v1.2.3 From 384c21c3bccef3a2f8f50236f87b87df29aa9e95 Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Wed, 12 Jun 2013 11:14:48 -0400 Subject: Use fixed inkscape icon for 'no-marker' instead of gtk theme icon (bzr r12371) --- src/widgets/stroke-marker-selector.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/widgets/stroke-marker-selector.cpp') diff --git a/src/widgets/stroke-marker-selector.cpp b/src/widgets/stroke-marker-selector.cpp index 8e252f5e1..2d1c932d3 100644 --- a/src/widgets/stroke-marker-selector.cpp +++ b/src/widgets/stroke-marker-selector.cpp @@ -60,12 +60,8 @@ MarkerComboBox::MarkerComboBox(gchar const *id, int l) : 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); - Glib::RefPtr iconTheme = Gtk::IconTheme::get_default(); - if(iconTheme->has_icon("remove")) { - empty_image = new Gtk::Image( iconTheme->load_icon("remove", 22) ); - } else { - empty_image = new Gtk::Image(); - } + empty_image = new Gtk::Image( Glib::wrap( + sp_pixbuf_new( Inkscape::ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_ICON("no-marker") ) ) ); sandbox = ink_markers_preview_doc (); desktop = inkscape_active_desktop(); -- cgit v1.2.3