From 9d232179848d6872aadc6ec229b7b50ebef32c45 Mon Sep 17 00:00:00 2001 From: John Smith Date: Mon, 21 May 2012 10:57:19 +0900 Subject: Fix for 1000023 : Fill & Stroke dialog redesign (bzr r11389) --- src/ui/dialog/fill-and-stroke.cpp | 2 +- src/ui/widget/filter-effect-chooser.cpp | 2 ++ src/ui/widget/filter-effect-chooser.h | 2 +- src/ui/widget/object-composite-settings.cpp | 2 ++ src/ui/widget/object-composite-settings.h | 1 + 5 files changed, 7 insertions(+), 2 deletions(-) (limited to 'src/ui') diff --git a/src/ui/dialog/fill-and-stroke.cpp b/src/ui/dialog/fill-and-stroke.cpp index daf0eedbf..625b503f3 100644 --- a/src/ui/dialog/fill-and-stroke.cpp +++ b/src/ui/dialog/fill-and-stroke.cpp @@ -51,7 +51,7 @@ FillAndStroke::FillAndStroke() desktopChangeConn() { Gtk::Box *contents = _getContents(); - contents->set_spacing(0); + contents->set_spacing(2); contents->pack_start(_notebook, true, true); diff --git a/src/ui/widget/filter-effect-chooser.cpp b/src/ui/widget/filter-effect-chooser.cpp index cb9d3e7e0..81fe78f2e 100644 --- a/src/ui/widget/filter-effect-chooser.cpp +++ b/src/ui/widget/filter-effect-chooser.cpp @@ -25,6 +25,7 @@ SimpleFilterModifier::SimpleFilterModifier(int flags) : _hb_blur(false, 0), _lb_blend(_("Blend mode:")), _lb_blur(_("_Blur:")), + _lb_blur_unit(_("%")), _blend(BlendModeConverter, SP_ATTR_INVALID, false), _blur(0, 0, 100, 1, 0.01, 1) { @@ -44,6 +45,7 @@ SimpleFilterModifier::SimpleFilterModifier(int flags) #endif _hb_blur.pack_start(_lb_blur, false, false, 0); _hb_blur.pack_start(_blur, true, true, 0); + _hb_blur.pack_start(_lb_blur_unit, false, false, 3); } show_all_children(); diff --git a/src/ui/widget/filter-effect-chooser.h b/src/ui/widget/filter-effect-chooser.h index 2d5f04007..6afb6c180 100644 --- a/src/ui/widget/filter-effect-chooser.h +++ b/src/ui/widget/filter-effect-chooser.h @@ -52,7 +52,7 @@ private: int _flags; Gtk::HBox _hb_blend; Gtk::HBox _hb_blur; - Gtk::Label _lb_blend, _lb_blur; + Gtk::Label _lb_blend, _lb_blur, _lb_blur_unit; ComboBoxEnum _blend; SpinSlider _blur; diff --git a/src/ui/widget/object-composite-settings.cpp b/src/ui/widget/object-composite-settings.cpp index eb4790990..9e4e32229 100644 --- a/src/ui/widget/object-composite-settings.cpp +++ b/src/ui/widget/object-composite-settings.cpp @@ -63,6 +63,7 @@ ObjectCompositeSettings::ObjectCompositeSettings(unsigned int verb_code, char co _opacity_tag(Glib::ustring(history_prefix) + ":opacity"), _opacity_vbox(false, 0), _opacity_label(_("Opacity:")), + _opacity_label_unit(_("%")), #if WITH_GTKMM_3_0 _opacity_adjustment(Gtk::Adjustment::create(100.0, 0.0, 100.0, 1.0, 1.0, 0.0)), #else @@ -96,6 +97,7 @@ ObjectCompositeSettings::ObjectCompositeSettings(unsigned int verb_code, char co _opacity_vbox.pack_start(_opacity_hbox, false, false, 0); _opacity_hbox.pack_start(_opacity_hscale, true, true, 0); _opacity_hbox.pack_start(_opacity_spin_button, false, false, 0); + _opacity_hbox.pack_start(_opacity_label_unit, false, false, 3); _opacity_hscale.set_draw_value(false); #if WITH_GTKMM_3_0 _opacity_adjustment->signal_value_changed().connect(sigc::mem_fun(*this, &ObjectCompositeSettings::_opacityValueChanged)); diff --git a/src/ui/widget/object-composite-settings.h b/src/ui/widget/object-composite-settings.h index 9f9b336eb..32da626d6 100644 --- a/src/ui/widget/object-composite-settings.h +++ b/src/ui/widget/object-composite-settings.h @@ -47,6 +47,7 @@ private: Gtk::VBox _opacity_vbox; Gtk::HBox _opacity_hbox; Gtk::Label _opacity_label; + Gtk::Label _opacity_label_unit; #if WITH_GTKMM_3_0 Glib::RefPtr _opacity_adjustment; #else -- cgit v1.2.3