summaryrefslogtreecommitdiffstats
path: root/src/ui
diff options
context:
space:
mode:
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/dialog/filter-effects-dialog.cpp51
-rw-r--r--src/ui/dialog/filter-effects-dialog.h9
-rw-r--r--src/ui/dialog/objects.cpp4
-rw-r--r--src/ui/interface.cpp12
-rw-r--r--src/ui/interface.h1
-rw-r--r--src/ui/widget/addtoicon.cpp1
-rw-r--r--src/ui/widget/layer-selector.cpp3
7 files changed, 58 insertions, 23 deletions
diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
index 7e9d8481a..b70cfcdd4 100644
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -1364,6 +1364,7 @@ FilterEffectsDialog::FilterModifier::FilterModifier(FilterEffectsDialog& d)
_list.append_column("#", _columns.count);
_list.get_column(2)->set_sizing(Gtk::TREE_VIEW_COLUMN_AUTOSIZE);
_list.get_column(2)->set_expand(false);
+ _list.get_column(2)->set_reorderable(true);
sw->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
_list.get_column(1)->set_resizable(true);
@@ -1868,7 +1869,7 @@ void FilterEffectsDialog::PrimitiveList::update()
if(f) {
bool active_found = false;
- _dialog._primitive_box.set_sensitive(true);
+ _dialog._primitive_box->set_sensitive(true);
_dialog.update_filter_general_settings_view();
for(SPObject *prim_obj = f->children;
prim_obj && SP_IS_FILTER_PRIMITIVE(prim_obj);
@@ -1913,7 +1914,7 @@ void FilterEffectsDialog::PrimitiveList::update()
}
}
else {
- _dialog._primitive_box.set_sensitive(false);
+ _dialog._primitive_box->set_sensitive(false);
set_size_request(-1, -1);
}
}
@@ -2760,8 +2761,10 @@ FilterEffectsDialog::FilterEffectsDialog()
// Initialize widget hierarchy
#if WITH_GTKMM_3_0
Gtk::Paned* hpaned = Gtk::manage(new Gtk::Paned);
+ _primitive_box = Gtk::manage(new Gtk::Paned);
#else
Gtk::HPaned* hpaned = Gtk::manage(new Gtk::HPaned);
+ _primitive_box = Gtk::manage(new Gtk::VPaned);
#endif
Gtk::ScrolledWindow* sw_prims = Gtk::manage(new Gtk::ScrolledWindow);
@@ -2769,25 +2772,40 @@ FilterEffectsDialog::FilterEffectsDialog()
Gtk::HBox* infobox = Gtk::manage(new Gtk::HBox(/*homogeneous:*/false, /*spacing:*/4));
Gtk::HBox* hb_prims = Gtk::manage(new Gtk::HBox);
Gtk::VBox* vb_prims = Gtk::manage(new Gtk::VBox);
+ Gtk::VBox* vb_desc = Gtk::manage(new Gtk::VBox);
+
+ Gtk::VBox* prim_vbox_p = Gtk::manage(new Gtk::VBox);
+ Gtk::VBox* prim_vbox_i = Gtk::manage(new Gtk::VBox);
+ _primitive_box->pack1(*prim_vbox_p);
+ _primitive_box->pack2(*prim_vbox_i);
+
_getContents()->add(*hpaned);
hpaned->pack1(_filter_modifier);
- hpaned->pack2(_primitive_box);
- _primitive_box.pack_start(*sw_prims);
- _primitive_box.pack_start(*sw_infobox, false, false);
+ hpaned->pack2(*_primitive_box);
+ prim_vbox_p->pack_start(*sw_prims, true, true);
+ prim_vbox_i->pack_start(*vb_prims, true, true);
+
sw_prims->add(_primitive_list);
- sw_infobox->add(*vb_prims);
- infobox->pack_start(_infobox_icon, false, false);
- infobox->pack_start(_infobox_desc, false, false);
+ sw_infobox->add(*infobox);
+
+ _infobox_icon.set_alignment(0, 0);
+ _infobox_desc.set_alignment(0, 0);
+ _infobox_desc.set_justify(Gtk::JUSTIFY_LEFT);
_infobox_desc.set_line_wrap(true);
- _infobox_desc.set_size_request(250, -1);
-
- vb_prims->pack_start(*hb_prims);
- vb_prims->pack_start(*infobox);
+ _infobox_desc.set_size_request(200, -1);
+
+ infobox->pack_start(_infobox_icon, false, false);
+ vb_desc->pack_start(_infobox_desc, true, true);
+ infobox->pack_start(*vb_desc, true, true);
+
+ vb_prims->pack_start(*hb_prims, false, false);
+ vb_prims->pack_start(*sw_infobox, true, true);
hb_prims->pack_start(_add_primitive, false, false);
- hb_prims->pack_start(_add_primitive_type, false, false);
- _getContents()->pack_start(_settings_tabs, false, false);
+
+ hb_prims->pack_start(_add_primitive_type, true, true);
+ _getContents()->pack_start(_settings_tabs, true, true);
_settings_tabs.append_page(_settings_tab1, _("Effect parameters"));
_settings_tabs.append_page(_settings_tab2, _("Filter General Settings"));
@@ -2801,7 +2819,7 @@ FilterEffectsDialog::FilterEffectsDialog()
sw_prims->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
sw_prims->set_shadow_type(Gtk::SHADOW_IN);
- sw_infobox->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_NEVER);
+ sw_infobox->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
// al_settings->set_padding(0, 0, 12, 0);
// fr_settings->set_shadow_type(Gtk::SHADOW_NONE);
@@ -3026,7 +3044,8 @@ void FilterEffectsDialog::update_primitive_infobox()
g_assert(false);
break;
}
- _infobox_icon.set_pixel_size(96);
+ //_infobox_icon.set_pixel_size(96);
+ _infobox_icon.set_pixel_size(64);
}
void FilterEffectsDialog::duplicate_primitive()
diff --git a/src/ui/dialog/filter-effects-dialog.h b/src/ui/dialog/filter-effects-dialog.h
index 283abb5b0..90bde23cf 100644
--- a/src/ui/dialog/filter-effects-dialog.h
+++ b/src/ui/dialog/filter-effects-dialog.h
@@ -28,6 +28,8 @@
#include <gtkmm/notebook.h>
#include <gtkmm/sizegroup.h>
+#include <gtkmm/paned.h>
+
namespace Inkscape {
namespace UI {
namespace Dialog {
@@ -279,7 +281,12 @@ private:
Gtk::Image _infobox_icon;
// View/add primitives
- Gtk::VBox _primitive_box;
+#if WITH_GTKMM_3_0
+ Gtk::Paned* _primitive_box;
+#else
+ Gtk::VPaned* _primitive_box;
+#endif
+
UI::Widget::ComboBoxEnum<Inkscape::Filters::FilterPrimitiveType> _add_primitive_type;
Gtk::Button _add_primitive;
diff --git a/src/ui/dialog/objects.cpp b/src/ui/dialog/objects.cpp
index 891048beb..27694a9ac 100644
--- a/src/ui/dialog/objects.cpp
+++ b/src/ui/dialog/objects.cpp
@@ -1907,8 +1907,8 @@ ObjectsPanel::ObjectsPanel() :
_popupMenu.append(*Gtk::manage(new Gtk::SeparatorMenuItem()));
- _watchingNonTop.push_back( &_addPopupItem( targetDesktop, SP_VERB_SELECTION_RAISE, GTK_STOCK_GO_UP, _("Up"), (int)BUTTON_UP ) );
- _watchingNonBottom.push_back( &_addPopupItem( targetDesktop, SP_VERB_SELECTION_LOWER, GTK_STOCK_GO_DOWN, _("Down"), (int)BUTTON_DOWN ) );
+ _watchingNonTop.push_back( &_addPopupItem( targetDesktop, SP_VERB_SELECTION_RAISE, "gtk-go-up", _("Up"), (int)BUTTON_UP ) );
+ _watchingNonBottom.push_back( &_addPopupItem( targetDesktop, SP_VERB_SELECTION_LOWER, "gtk-go-down", _("Down"), (int)BUTTON_DOWN ) );
_popupMenu.append(*Gtk::manage(new Gtk::SeparatorMenuItem()));
diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp
index a16bbc472..3e2a2004c 100644
--- a/src/ui/interface.cpp
+++ b/src/ui/interface.cpp
@@ -1523,6 +1523,12 @@ ContextMenu::ContextMenu(SPDesktop *desktop, SPItem *item) :
MIParent.signal_activate().connect(sigc::mem_fun(*this, &ContextMenu::LeaveGroup));
MIParent.show();
append(MIParent);
+
+ /* Pop selection out of group */
+ Gtk::MenuItem* miu = Gtk::manage(new Gtk::MenuItem(_("_Pop selection out of group"), 1));
+ miu->signal_activate().connect(sigc::mem_fun(*this, &ContextMenu::ActivateUngroupPopSelection));
+ miu->show();
+ append(*miu);
}
}
}
@@ -1920,6 +1926,12 @@ void ContextMenu::ActivateUngroup(void)
sp_item_group_ungroup(static_cast<SPGroup*>(_item), children);
_desktop->selection->setList(children);
}
+
+void ContextMenu::ActivateUngroupPopSelection(void)
+{
+ sp_selection_ungroup_pop_selection(_desktop->selection, _desktop);
+}
+
void ContextMenu::MakeAnchorMenu(void)
{
diff --git a/src/ui/interface.h b/src/ui/interface.h
index 6fb74046f..52074f0f0 100644
--- a/src/ui/interface.h
+++ b/src/ui/interface.h
@@ -194,6 +194,7 @@ class ContextMenu : public Gtk::Menu
/**
* callback, is executed on clicking the anchor "Group" and "Ungroup" menu entry
*/
+ void ActivateUngroupPopSelection(void);
void ActivateUngroup(void);
void ActivateGroup(void);
diff --git a/src/ui/widget/addtoicon.cpp b/src/ui/widget/addtoicon.cpp
index 823e24a00..10294125d 100644
--- a/src/ui/widget/addtoicon.cpp
+++ b/src/ui/widget/addtoicon.cpp
@@ -48,7 +48,6 @@ AddToIcon::AddToIcon() :
//
// _property_pixbuf_add = Gtk::Widget::
- //property_stock_id() = GTK_STOCK_ADD;
set_pixbuf();
}
diff --git a/src/ui/widget/layer-selector.cpp b/src/ui/widget/layer-selector.cpp
index dc89d233f..2a1fa352b 100644
--- a/src/ui/widget/layer-selector.cpp
+++ b/src/ui/widget/layer-selector.cpp
@@ -32,7 +32,6 @@
#include "util/reverse-list.h"
#include "verbs.h"
#include "widgets/icon.h"
-#include "widgets/shrink-wrap-button.h"
#include "xml/node-event-vector.h"
#include "widgets/gradient-vector.h"
@@ -114,7 +113,6 @@ LayerSelector::LayerSelector(SPDesktop *desktop)
);
_visibility_toggle.set_relief(Gtk::RELIEF_NONE);
- shrink_wrap_button(_visibility_toggle);
_visibility_toggle.set_tooltip_text(_("Toggle current layer visibility"));
pack_start(_visibility_toggle, Gtk::PACK_EXPAND_PADDING);
@@ -135,7 +133,6 @@ LayerSelector::LayerSelector(SPDesktop *desktop)
);
_lock_toggle.set_relief(Gtk::RELIEF_NONE);
- shrink_wrap_button(_lock_toggle);
_lock_toggle.set_tooltip_text(_("Lock or unlock current layer"));
pack_start(_lock_toggle, Gtk::PACK_EXPAND_PADDING);
generated by cgit v1.2.3 (git 2.25.1) at 2026-07-23 07:25:24 +0000