summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/live_effects/parameter/colorpicker.cpp8
-rw-r--r--src/ui/dialog/document-properties.cpp14
-rw-r--r--src/ui/dialog/document-properties.h2
-rw-r--r--src/ui/widget/color-picker.h25
-rw-r--r--src/ui/widget/registered-widget.cpp9
-rw-r--r--src/ui/widget/registered-widget.h6
6 files changed, 38 insertions, 26 deletions
diff --git a/src/live_effects/parameter/colorpicker.cpp b/src/live_effects/parameter/colorpicker.cpp
index f6521d0c0..d4ebdaa1c 100644
--- a/src/live_effects/parameter/colorpicker.cpp
+++ b/src/live_effects/parameter/colorpicker.cpp
@@ -105,7 +105,7 @@ ColorPickerParam::param_newWidget()
hbox->set_border_width(5);
hbox->set_homogeneous(false);
hbox->set_spacing(2);
- Inkscape::UI::Widget::RegisteredColorPicker * colorpickerwdg = Gtk::manage(
+ Inkscape::UI::Widget::RegisteredColorPicker * colorpickerwdg =
new Inkscape::UI::Widget::RegisteredColorPicker( param_label,
param_label,
param_tooltip,
@@ -113,17 +113,13 @@ ColorPickerParam::param_newWidget()
param_key + "_opacity_LPE",
*param_wr,
param_effect->getRepr(),
- param_effect->getSPDoc() ) );
- Gtk::Label * label = new Gtk::Label (param_label, Gtk::ALIGN_END);
- label->set_use_underline (true);
- label->set_mnemonic_widget (*colorpickerwdg);
+ param_effect->getSPDoc() );
SPDocument *document = SP_ACTIVE_DOCUMENT;
bool saved = DocumentUndo::getUndoSensitive(document);
DocumentUndo::setUndoSensitive(document, false);
colorpickerwdg->setRgba32(value);
DocumentUndo::setUndoSensitive(document, saved);
colorpickerwdg->set_undo_parameters(SP_VERB_DIALOG_LIVE_PATH_EFFECT, _("Change color button parameter"));
- hbox->pack_start(*dynamic_cast<Gtk::Widget *> (label), true, true);
hbox->pack_start(*dynamic_cast<Gtk::Widget *> (colorpickerwdg), true, true);
return dynamic_cast<Gtk::Widget *> (hbox);
}
diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index aae9ce867..433638f30 100644
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -318,27 +318,23 @@ void DocumentProperties::build_page()
};
attach_all(_page_page->table(), widget_array, G_N_ELEMENTS(widget_array),0,1);
- _rcp_bg_col.pack_start(*_rcp_bg._label, false, false, 2);
- _rcp_bg_col.pack_start(_rcp_bg, false, false, 2);
Gtk::Widget *const widget_array_left[] =
{
label_bkg, 0,
0, &_rcb_checkerboard,
- 0, &_rcp_bg_col,
+ 0, &_rcp_bg,
label_dsp, 0,
0, &_rcb_antialias,
};
attach_all(_rcb_doc_props_left, widget_array_left, G_N_ELEMENTS(widget_array_left),0,1);
- _rcp_bord_col.pack_start(*_rcp_bord._label, false, false, 2);
- _rcp_bord_col.pack_start(_rcp_bord, false, false, 2);
Gtk::Widget *const widget_array_right[] =
{
label_bdr, 0,
0, &_rcb_canb,
0, &_rcb_bord,
0, &_rcb_shad,
- 0, &_rcp_bord_col,
+ 0, &_rcp_bord,
};
attach_all(_rcb_doc_props_right, widget_array_right, G_N_ELEMENTS(widget_array_right),0,1, true);
@@ -346,7 +342,7 @@ void DocumentProperties::build_page()
std::list<Gtk::Widget*> _slaveList;
_slaveList.push_back(&_rcb_bord);
_slaveList.push_back(&_rcb_shad);
- _slaveList.push_back(&_rcp_bord_col);
+ _slaveList.push_back(&_rcp_bord);
_rcb_canb.setSlaveWidgets(_slaveList);
attach_all(_page_page->table(), widget_array, G_N_ELEMENTS(widget_array),0,1);
@@ -363,8 +359,8 @@ void DocumentProperties::build_guides()
{
label_gui, 0,
0, &_rcb_sgui,
- _rcp_gui._label, &_rcp_gui,
- _rcp_hgui._label, &_rcp_hgui
+ 0, &_rcp_gui,
+ 0, &_rcp_hgui
};
attach_all(_page_guides->table(), widget_array, G_N_ELEMENTS(widget_array));
diff --git a/src/ui/dialog/document-properties.h b/src/ui/dialog/document-properties.h
index fe0e1864e..3b211599b 100644
--- a/src/ui/dialog/document-properties.h
+++ b/src/ui/dialog/document-properties.h
@@ -119,8 +119,6 @@ protected:
//---------------------------------------------------------------
Gtk::Grid _rcb_doc_props_left;
Gtk::Grid _rcb_doc_props_right;
- Gtk::Box _rcp_bg_col;
- Gtk::Box _rcp_bord_col;
UI::Widget::RegisteredCheckButton _rcb_antialias;
UI::Widget::RegisteredCheckButton _rcb_checkerboard;
UI::Widget::RegisteredCheckButton _rcb_canb;
diff --git a/src/ui/widget/color-picker.h b/src/ui/widget/color-picker.h
index e8a738b5b..7bb4947d5 100644
--- a/src/ui/widget/color-picker.h
+++ b/src/ui/widget/color-picker.h
@@ -13,6 +13,8 @@
#ifndef __COLOR_PICKER_H__
#define __COLOR_PICKER_H__
+#include "labelled.h"
+
#include <stddef.h>
#include <gtkmm/dialog.h>
@@ -70,6 +72,29 @@ protected:
Gtk::Widget *_color_selector;
};
+
+class LabelledColorPicker : public Labelled {
+public:
+
+ LabelledColorPicker (const Glib::ustring& label,
+ const Glib::ustring& title,
+ const Glib::ustring& tip,
+ const guint32 rgba,
+ bool undo) : Labelled(label, tip, new ColorPicker(title, tip, rgba, undo)) {}
+
+ ~LabelledColorPicker()
+ { static_cast<ColorPicker*>(_widget)->~ColorPicker(); }
+
+ void setRgba32 (guint32 rgba)
+ { static_cast<ColorPicker*>(_widget)->setRgba32 (rgba); }
+
+ void closeWindow()
+ { static_cast<ColorPicker*>(_widget)->closeWindow (); }
+
+ sigc::connection connectChanged (const sigc::slot<void,guint>& slot)
+ { return static_cast<ColorPicker*>(_widget)->connectChanged(slot); }
+};
+
}//namespace Widget
}//namespace UI
}//namespace Inkscape
diff --git a/src/ui/widget/registered-widget.cpp b/src/ui/widget/registered-widget.cpp
index 753b72c2e..d539cdcc5 100644
--- a/src/ui/widget/registered-widget.cpp
+++ b/src/ui/widget/registered-widget.cpp
@@ -365,13 +365,10 @@ RegisteredColorPicker::RegisteredColorPicker(const Glib::ustring& label,
Registry& wr,
Inkscape::XML::Node* repr_in,
SPDocument *doc_in)
- : RegisteredWidget<ColorPicker> (title, tip, 0, true)
+ : RegisteredWidget<LabelledColorPicker> (label, title, tip, 0, true)
{
init_parent("", wr, repr_in, doc_in);
- _label = new Gtk::Label (label, Gtk::ALIGN_END);
- _label->set_use_underline (true);
- _label->set_mnemonic_widget (*this);
_ckey = ckey;
_akey = akey;
_changed_connection = connectChanged (sigc::mem_fun (*this, &RegisteredColorPicker::on_changed));
@@ -385,13 +382,13 @@ RegisteredColorPicker::~RegisteredColorPicker()
void
RegisteredColorPicker::setRgba32 (guint32 rgba)
{
- ColorPicker::setRgba32 (rgba);
+ LabelledColorPicker::setRgba32 (rgba);
}
void
RegisteredColorPicker::closeWindow()
{
- ColorPicker::closeWindow();
+ LabelledColorPicker::closeWindow();
}
void
diff --git a/src/ui/widget/registered-widget.h b/src/ui/widget/registered-widget.h
index 6064e9461..02c1810cf 100644
--- a/src/ui/widget/registered-widget.h
+++ b/src/ui/widget/registered-widget.h
@@ -76,6 +76,8 @@ protected:
RegisteredWidget( A& a, B& b, C& c ): W( a, b, c ) { construct(); }
template< typename A, typename B, typename C, typename D >
RegisteredWidget( A& a, B& b, C c, D d ): W( a, b, c, d ) { construct(); }
+ template< typename A, typename B, typename C, typename D, typename E >
+ RegisteredWidget( A& a, B& b, C& c, D d, E e ): W( a, b, c, d, e ) { construct(); }
template< typename A, typename B, typename C, typename D, typename E , typename F>
RegisteredWidget( A& a, B& b, C c, D& d, E& e, F* f): W( a, b, c, d, e, f) { construct(); }
template< typename A, typename B, typename C, typename D, typename E , typename F, typename G>
@@ -266,7 +268,7 @@ protected:
void on_activate();
};
-class RegisteredColorPicker : public RegisteredWidget<ColorPicker> {
+class RegisteredColorPicker : public RegisteredWidget<LabelledColorPicker> {
public:
virtual ~RegisteredColorPicker();
@@ -282,8 +284,6 @@ public:
void setRgba32 (guint32);
void closeWindow();
- Gtk::Label *_label;
-
protected:
Glib::ustring _ckey, _akey;
void on_changed (guint32);
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-19 18:36:47 +0000