summaryrefslogtreecommitdiffstats
path: root/src/ui/dialog
diff options
context:
space:
mode:
Diffstat (limited to 'src/ui/dialog')
-rw-r--r--src/ui/dialog/filter-effects-dialog.cpp8
-rw-r--r--src/ui/dialog/livepatheffect-add.cpp15
-rw-r--r--src/ui/dialog/symbols.cpp37
3 files changed, 32 insertions, 28 deletions
diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
index 48398e716..4521cada7 100644
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -983,8 +983,9 @@ private:
Gtk::HBox *hb = Gtk::manage(new Gtk::HBox);
hb->set_spacing(12);
- if(label != "") {
- Gtk::Label *lbl = Gtk::manage(new Gtk::Label(label, 0.0, 0.5));
+ if (label != "") {
+ Gtk::Label *lbl = Gtk::manage(new Gtk::Label(label));
+ lbl->set_xalign(0.0);
hb->pack_start(*lbl, Gtk::PACK_SHRINK);
_size_group->add_widget(*lbl);
}
@@ -1156,10 +1157,11 @@ public:
: AttrWidget(SP_ATTR_INVALID),
_dialog(d),
_settings(d, _box, sigc::mem_fun(_dialog, &FilterEffectsDialog::set_child_attr_direct), LIGHT_ENDSOURCE),
- _light_label(_("Light Source:"), 0.0, 0.5),
+ _light_label(_("Light Source:")),
_light_source(LightSourceConverter),
_locked(false)
{
+ _light_label.set_xalign(0.0);
_settings._size_group->add_widget(_light_label);
_light_box.pack_start(_light_label, Gtk::PACK_SHRINK);
_light_box.pack_start(_light_source, Gtk::PACK_EXPAND_WIDGET);
diff --git a/src/ui/dialog/livepatheffect-add.cpp b/src/ui/dialog/livepatheffect-add.cpp
index a31f71a8c..39b6f7d52 100644
--- a/src/ui/dialog/livepatheffect-add.cpp
+++ b/src/ui/dialog/livepatheffect-add.cpp
@@ -141,7 +141,7 @@ LivePathEffectAdd::LivePathEffectAdd()
LPEExperimentalToggle->set_active(active);
Gtk::Image *LPEIcon;
builder_effect->get_widget("LPEIcon", LPEIcon);
- LPEIcon->set_from_icon_name(converter.get_icon(data->id), Gtk::BuiltinIconSize(Gtk::ICON_SIZE_DIALOG));
+ LPEIcon->set_from_icon_name(converter.get_icon(data->id), Gtk::IconSize(Gtk::ICON_SIZE_DIALOG));
Gtk::EventBox *LPESelectorEffectEventInfo;
builder_effect->get_widget("LPESelectorEffectEventInfo", LPESelectorEffectEventInfo);
LPESelectorEffectEventInfo->signal_enter_notify_event().connect(sigc::bind<Glib::RefPtr<Gtk::Builder>>(
@@ -150,7 +150,7 @@ LivePathEffectAdd::LivePathEffectAdd()
builder_effect->get_widget("LPESelectorEffectEventFav", LPESelectorEffectEventFav);
if (sp_has_fav(LPEName->get_text())) {
Gtk::Image *fav = dynamic_cast<Gtk::Image *>(LPESelectorEffectEventFav->get_child());
- fav->set_from_icon_name("draw-star", Gtk::IconSize(25));
+ fav->set_from_icon_name("draw-star", Gtk::IconSize(Gtk::ICON_SIZE_SMALL_TOOLBAR));
}
Gtk::EventBox *LPESelectorEffectEventFavTop;
builder_effect->get_widget("LPESelectorEffectEventFavTop", LPESelectorEffectEventFavTop);
@@ -271,7 +271,7 @@ bool LivePathEffectAdd::pop_description(GdkEventCrossing *evt, Glib::RefPtr<Gtk:
Gtk::Image *LPESelectorEffectInfoIcon;
_builder->get_widget("LPESelectorEffectInfoIcon", LPESelectorEffectInfoIcon);
- LPESelectorEffectInfoIcon->set_from_icon_name(LPEIcon->get_icon_name(), Gtk::IconSize(60));
+ LPESelectorEffectInfoIcon->set_from_icon_name(LPEIcon->get_icon_name(), Gtk::IconSize(Gtk::ICON_SIZE_DIALOG));
Gtk::Label *LPESelectorEffectInfoName;
_builder->get_widget("LPESelectorEffectInfoName", LPESelectorEffectInfoName);
@@ -306,7 +306,7 @@ bool LivePathEffectAdd::fav_toggler(GdkEventButton *evt, Glib::RefPtr<Gtk::Build
if (sp_has_fav(LPEName->get_text())) {
LPESelectorEffectEventFavTop->set_visible(false);
LPESelectorEffectEventFavTop->hide();
- LPESelectorEffectFav->set_from_icon_name("draw-star-outline", Gtk::IconSize(25));
+ LPESelectorEffectFav->set_from_icon_name("draw-star-outline", Gtk::IconSize(Gtk::ICON_SIZE_SMALL_TOOLBAR));
sp_remove_fav(LPEName->get_text());
LPESelectorEffect->get_parent()->get_style_context()->remove_class("lpefav");
LPESelectorEffect->get_parent()->get_style_context()->add_class("lpenormal");
@@ -317,7 +317,7 @@ bool LivePathEffectAdd::fav_toggler(GdkEventButton *evt, Glib::RefPtr<Gtk::Build
} else {
LPESelectorEffectEventFavTop->set_visible(true);
LPESelectorEffectEventFavTop->show();
- LPESelectorEffectFav->set_from_icon_name("draw-star", Gtk::IconSize(25));
+ LPESelectorEffectFav->set_from_icon_name("draw-star", Gtk::IconSize(Gtk::ICON_SIZE_SMALL_TOOLBAR));
sp_add_fav(LPEName->get_text());
LPESelectorEffect->get_parent()->get_style_context()->add_class("lpefav");
LPESelectorEffect->get_parent()->get_style_context()->remove_class("lpenormal");
@@ -333,14 +333,15 @@ bool LivePathEffectAdd::show_fav_toggler(GdkEventButton *evt)
Gtk::Image *favimage = dynamic_cast<Gtk::Image *>(_LPESelectorEffectEventFavShow->get_child());
if (favimage) {
if (_showfavs) {
- favimage->set_from_icon_name("draw-star", Gtk::IconSize(favimage->get_pixel_size()));
+ favimage->set_from_icon_name("draw-star", Gtk::IconSize(Gtk::ICON_SIZE_SMALL_TOOLBAR));
} else {
- favimage->set_from_icon_name("draw-star-outline", Gtk::IconSize(favimage->get_pixel_size()));
+ favimage->set_from_icon_name("draw-star-outline", Gtk::IconSize(Gtk::ICON_SIZE_SMALL_TOOLBAR));
}
}
reload_effect_list();
return true;
}
+
bool LivePathEffectAdd::apply(GdkEventButton *evt, Glib::RefPtr<Gtk::Builder> builder_effect,
const LivePathEffect::EnumEffectData<LivePathEffect::EffectType> *to_add)
{
diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp
index 9eaec21dc..a269ae094 100644
--- a/src/ui/dialog/symbols.cpp
+++ b/src/ui/dialog/symbols.cpp
@@ -201,37 +201,38 @@ SymbolsDialog::SymbolsDialog( gchar const* prefsPath ) :
overlay->add(* scroller);
overlay->get_style_context()->add_class("brightstyle");
scroller->set_size_request(100, 250);
- table->attach(*Gtk::manage(overlay),0,row,2,1);
+ table->attach(*Gtk::manage(overlay), 0, row, 2, 1);
/*************************Overlays******************************/
overlay_opacity = new Gtk::Image();
- overlay_opacity->set_halign(Gtk::ALIGN_START );
- overlay_opacity->set_valign(Gtk::ALIGN_START );
- //No results
- iconsize = Gtk::IconSize().from_name(Glib::ustring("ICON_SIZE_DIALOG_EXTRA"));
- if (!iconsize) {
- iconsize = Gtk::IconSize().register_new(Glib::ustring("ICON_SIZE_DIALOG_EXTRA"), 110, 110);
- }
- overlay_icon = sp_get_icon_image("searching", iconsize);
+ overlay_opacity->set_halign(Gtk::ALIGN_START);
+ overlay_opacity->set_valign(Gtk::ALIGN_START);
+
+ // No results
+ overlay_icon = sp_get_icon_image("searching", Gtk::ICON_SIZE_DIALOG);
+ overlay_icon->set_pixel_size(110);
overlay_icon->get_style_context()->add_class("iconsymbolic");
- overlay_icon->set_halign(Gtk::ALIGN_CENTER );
- overlay_icon->set_valign(Gtk::ALIGN_START );
+ overlay_icon->set_halign(Gtk::ALIGN_CENTER);
+ overlay_icon->set_valign(Gtk::ALIGN_START);
overlay_icon->set_margin_top(45);
+
overlay_title = new Gtk::Label();
overlay_title->set_halign(Gtk::ALIGN_CENTER );
overlay_title->set_valign(Gtk::ALIGN_START );
overlay_title->set_justify(Gtk::JUSTIFY_CENTER);
overlay_title->set_margin_top(155);
+
overlay_desc = new Gtk::Label();
- overlay_desc->set_halign(Gtk::ALIGN_CENTER );
- overlay_desc->set_valign(Gtk::ALIGN_START );
+ overlay_desc->set_halign(Gtk::ALIGN_CENTER);
+ overlay_desc->set_valign(Gtk::ALIGN_START);
overlay_desc->set_margin_top(180);
overlay_desc->set_justify(Gtk::JUSTIFY_CENTER);
- overlay->add_overlay(* overlay_opacity);
- overlay->add_overlay(* overlay_icon);
- overlay->add_overlay(* overlay_title);
- overlay->add_overlay(* overlay_desc);
-
+
+ overlay->add_overlay(*overlay_opacity);
+ overlay->add_overlay(*overlay_icon);
+ overlay->add_overlay(*overlay_title);
+ overlay->add_overlay(*overlay_desc);
+
previous_height = 0;
++row;
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-02 14:20:07 +0000