summaryrefslogtreecommitdiffstats
path: root/src/ui/dialog
diff options
context:
space:
mode:
Diffstat (limited to 'src/ui/dialog')
-rw-r--r--src/ui/dialog/extension-editor.cpp1
-rw-r--r--src/ui/dialog/glyphs.cpp22
-rw-r--r--src/ui/dialog/icon-preview.cpp12
-rw-r--r--src/ui/dialog/inkscape-preferences.cpp14
-rw-r--r--src/ui/dialog/new-from-template.cpp16
-rw-r--r--src/ui/dialog/template-widget.cpp8
6 files changed, 33 insertions, 40 deletions
diff --git a/src/ui/dialog/extension-editor.cpp b/src/ui/dialog/extension-editor.cpp
index 84840f22d..248f4f67f 100644
--- a/src/ui/dialog/extension-editor.cpp
+++ b/src/ui/dialog/extension-editor.cpp
@@ -19,7 +19,6 @@
#include <glibmm/i18n.h>
#include <gtkmm/frame.h>
-#include <gtkmm/alignment.h>
#include <gtkmm/notebook.h>
#include "verbs.h"
diff --git a/src/ui/dialog/glyphs.cpp b/src/ui/dialog/glyphs.cpp
index 9c1236ca9..f858a4d55 100644
--- a/src/ui/dialog/glyphs.cpp
+++ b/src/ui/dialog/glyphs.cpp
@@ -12,7 +12,6 @@
#include "glyphs.h"
#include <glibmm/i18n.h>
-#include <gtkmm/alignment.h>
#include <gtkmm/comboboxtext.h>
#include <gtkmm/grid.h>
#include <gtkmm/iconview.h>
@@ -356,7 +355,7 @@ GlyphsPanel::GlyphsPanel(gchar const *prefsPath) :
table->attach( *Gtk::manage(label), 0, row, 1, 1);
- scriptCombo = new Gtk::ComboBoxText();
+ scriptCombo = Gtk::manage(new Gtk::ComboBoxText());
for (std::map<GUnicodeScript, Glib::ustring>::iterator it = getScriptToName().begin(); it != getScriptToName().end(); ++it)
{
scriptCombo->append(it->second);
@@ -365,11 +364,11 @@ GlyphsPanel::GlyphsPanel(gchar const *prefsPath) :
scriptCombo->set_active_text(getScriptToName()[G_UNICODE_SCRIPT_INVALID_CODE]);
sigc::connection conn = scriptCombo->signal_changed().connect(sigc::mem_fun(*this, &GlyphsPanel::rebuild));
instanceConns.push_back(conn);
- Gtk::Alignment *align = Gtk::manage(new Gtk::Alignment(Gtk::ALIGN_START, Gtk::ALIGN_START, 0.0, 0.0));
- align->add(*Gtk::manage(scriptCombo));
- align->set_hexpand();
- table->attach( *align, 1, row, 1, 1);
+ scriptCombo->set_halign(Gtk::ALIGN_START);
+ scriptCombo->set_valign(Gtk::ALIGN_START);
+ scriptCombo->set_hexpand();
+ table->attach(*scriptCombo, 1, row, 1, 1);
}
row++;
@@ -380,7 +379,7 @@ GlyphsPanel::GlyphsPanel(gchar const *prefsPath) :
auto label = new Gtk::Label(_("Range: "));
table->attach( *Gtk::manage(label), 0, row, 1, 1);
- rangeCombo = new Gtk::ComboBoxText();
+ rangeCombo = Gtk::manage(new Gtk::ComboBoxText());
for ( std::vector<NamedRange>::iterator it = getRanges().begin(); it != getRanges().end(); ++it ) {
rangeCombo->append(it->second);
}
@@ -388,10 +387,11 @@ GlyphsPanel::GlyphsPanel(gchar const *prefsPath) :
rangeCombo->set_active_text(getRanges()[1].second);
sigc::connection conn = rangeCombo->signal_changed().connect(sigc::mem_fun(*this, &GlyphsPanel::rebuild));
instanceConns.push_back(conn);
- Gtk::Alignment *align = new Gtk::Alignment(Gtk::ALIGN_START, Gtk::ALIGN_START, 0.0, 0.0);
- align->add(*Gtk::manage(rangeCombo));
- align->set_hexpand();
- table->attach( *Gtk::manage(align), 1, row, 1, 1);
+
+ rangeCombo->set_halign(Gtk::ALIGN_START);
+ rangeCombo->set_valign(Gtk::ALIGN_START);
+ rangeCombo->set_hexpand();
+ table->attach(*rangeCombo, 1, row, 1, 1);
}
row++;
diff --git a/src/ui/dialog/icon-preview.cpp b/src/ui/dialog/icon-preview.cpp
index 7b1e531b4..991139aa8 100644
--- a/src/ui/dialog/icon-preview.cpp
+++ b/src/ui/dialog/icon-preview.cpp
@@ -24,7 +24,6 @@
#include <glibmm/timer.h>
#include <glibmm/main.h>
-#include <gtkmm/alignment.h>
#include <gtkmm/checkbutton.h>
#include <gtkmm/frame.h>
#include "ui/widget/frame.h"
@@ -197,12 +196,11 @@ IconPreviewPanel::IconPreviewPanel() :
buttons[i]->signal_clicked().connect( sigc::bind<int>( sigc::mem_fun(*this, &IconPreviewPanel::on_button_clicked), i) );
-
- Gtk::Alignment *align = Gtk::manage(new Gtk::Alignment(0.5, 0.5, 0, 0));
- align->add(*buttons[i]);
+ buttons[i]->set_halign(Gtk::ALIGN_CENTER);
+ buttons[i]->set_valign(Gtk::ALIGN_CENTER);
if ( !pack || ( (avail == 0) && (previous == 0) ) ) {
- verts->pack_end(*align, Gtk::PACK_SHRINK);
+ verts->pack_end(*(buttons[i]), Gtk::PACK_SHRINK);
previous = sizes[i];
avail = sizes[i];
} else {
@@ -219,12 +217,12 @@ IconPreviewPanel::IconPreviewPanel() :
avail = previous;
verts->pack_end(*horiz, Gtk::PACK_SHRINK);
}
- horiz->pack_start(*align, Gtk::PACK_EXPAND_WIDGET);
+ horiz->pack_start(*(buttons[i]), Gtk::PACK_EXPAND_WIDGET);
avail -= sizes[i];
avail -= pad; // a little extra for padding
} else {
horiz = 0;
- verts->pack_end(*align, Gtk::PACK_SHRINK);
+ verts->pack_end(*(buttons[i]), Gtk::PACK_SHRINK);
}
}
}
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index d946bac82..5ebad0746 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -22,7 +22,6 @@
#include <glibmm/miscutils.h>
#include <glibmm/markup.h>
#include <gtkmm/main.h>
-#include <gtkmm/alignment.h>
#include "preferences.h"
#include "verbs.h"
@@ -85,7 +84,7 @@ InkscapePreferences::InkscapePreferences()
delete sb;
//Main HBox
- Gtk::HBox* hbox_list_page = Gtk::manage(new Gtk::HBox());
+ auto hbox_list_page = Gtk::manage(new Gtk::Box());
hbox_list_page->set_border_width(12);
hbox_list_page->set_spacing(12);
_getContents()->add(*hbox_list_page);
@@ -107,7 +106,7 @@ InkscapePreferences::InkscapePreferences()
page_list_selection->set_mode(Gtk::SELECTION_BROWSE);
//Pages
- Gtk::VBox* vbox_page = Gtk::manage(new Gtk::VBox());
+ auto vbox_page = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
Gtk::Frame* title_frame = Gtk::manage(new Gtk::Frame());
Gtk::ScrolledWindow* pageScroller = Gtk::manage(new Gtk::ScrolledWindow());
@@ -266,12 +265,11 @@ void InkscapePreferences::AddNewObjectsStyle(DialogPage &p, Glib::ustring const
_("Apply the style you last set on an object"));
PrefRadioButton* own = Gtk::manage( new PrefRadioButton);
- Gtk::HBox* hb = Gtk::manage( new Gtk::HBox);
- Gtk::Alignment* align = Gtk::manage( new Gtk::Alignment);
+ auto hb = Gtk::manage( new Gtk::Box);
own->init ( _("This tool's own style:"), prefs_path + "/usecurrent", 0, false, current);
- align->set(0,0,0,0);
- align->add(*own);
- hb->add(*align);
+ own->set_halign(Gtk::ALIGN_START);
+ own->set_valign(Gtk::ALIGN_START);
+ hb->add(*own);
p.set_tip( *own, _("Each tool may store its own style to apply to the newly created objects. Use the button below to set it."));
p.add_line( true, "", *hb, "", "");
diff --git a/src/ui/dialog/new-from-template.cpp b/src/ui/dialog/new-from-template.cpp
index 2b33fd54d..ab46a55da 100644
--- a/src/ui/dialog/new-from-template.cpp
+++ b/src/ui/dialog/new-from-template.cpp
@@ -15,9 +15,6 @@
#include "new-from-template.h"
#include "file.h"
-#include <gtkmm/alignment.h>
-
-
namespace Inkscape {
namespace UI {
@@ -32,13 +29,16 @@ NewFromTemplate::NewFromTemplate()
get_content_area()->pack_start(*_main_widget);
- Gtk::Alignment *align;
- align = Gtk::manage(new Gtk::Alignment(Gtk::ALIGN_END, Gtk::ALIGN_CENTER, 0.0, 0.0));
+ _create_template_button.set_halign(Gtk::ALIGN_END);
+ _create_template_button.set_valign(Gtk::ALIGN_END);
- get_content_area()->pack_end(*align, Gtk::PACK_SHRINK);
+#if WITH_GTKMM_3_12
+ _create_template_button.set_margin_end(15);
+#else
+ _create_template_button.set_margin_right(15);
+#endif
- align->set_padding(0, 0, 0, 15);
- align->add(_create_template_button);
+ get_content_area()->pack_end(_create_template_button, Gtk::PACK_SHRINK);
_create_template_button.signal_clicked().connect(
sigc::mem_fun(*this, &NewFromTemplate::_createFromTemplate));
diff --git a/src/ui/dialog/template-widget.cpp b/src/ui/dialog/template-widget.cpp
index 3b7fbe88c..8aeaa4046 100644
--- a/src/ui/dialog/template-widget.cpp
+++ b/src/ui/dialog/template-widget.cpp
@@ -11,7 +11,6 @@
#include "template-widget.h"
#include <glibmm/miscutils.h>
-#include <gtkmm/alignment.h>
#include <gtkmm/messagedialog.h>
#include "desktop.h"
@@ -42,10 +41,9 @@ TemplateWidget::TemplateWidget()
_short_description_label.set_line_wrap(true);
- Gtk::Alignment *align;
- align = Gtk::manage(new Gtk::Alignment(Gtk::ALIGN_END, Gtk::ALIGN_CENTER, 0.0, 0.0));
- pack_end(*align, Gtk::PACK_SHRINK);
- align->add(_more_info_button);
+ _more_info_button.set_halign(Gtk::ALIGN_END);
+ _more_info_button.set_valign(Gtk::ALIGN_CENTER);
+ pack_end(_more_info_button, Gtk::PACK_SHRINK);
pack_end(_short_description_label, Gtk::PACK_SHRINK, 5);
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-26 19:05:26 +0000