summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohn Smith <john.smith7545@yahoo.com>2012-08-19 06:12:29 +0000
committerJohn Smith <john.smith7545@yahoo.com>2012-08-19 06:12:29 +0000
commit1de8d294ce337bd3e05942f9e51da3aca12f96b7 (patch)
tree4bc047a00815a9370468c423380b52658cd3aae4 /src
parentFix for 189535 : align verbs and by keys (diff)
downloadinkscape-1de8d294ce337bd3e05942f9e51da3aca12f96b7.tar.gz
inkscape-1de8d294ce337bd3e05942f9e51da3aca12f96b7.zip
Fix for 1035733 : Align Distribute dialog - Right align buttons
(bzr r11612)
Diffstat (limited to 'src')
-rw-r--r--src/ui/dialog/align-and-distribute.cpp25
-rw-r--r--src/ui/dialog/align-and-distribute.h5
2 files changed, 21 insertions, 9 deletions
diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp
index ecac40de5..be75f27e0 100644
--- a/src/ui/dialog/align-and-distribute.cpp
+++ b/src/ui/dialog/align-and-distribute.cpp
@@ -1060,24 +1060,31 @@ AlignAndDistribute::AlignAndDistribute()
_combo.set_active(prefs->getInt("/dialogs/align/align-to", 6));
_combo.signal_changed().connect(sigc::mem_fun(*this, &AlignAndDistribute::on_ref_change));
- _anchorBox.pack_start(_anchorLabel);
- _anchorBox.pack_start(_combo);
+ _anchorBox.pack_end(_combo, false, false);
+ _anchorBox.pack_end(_anchorLabel, false, false);
_selgrpLabel.set_mnemonic_widget(_selgrp);
- _selgrpBox.pack_start(_selgrpLabel);
- _selgrpBox.pack_start(_selgrp);
+ _selgrpBox.pack_end(_selgrp, false, false);
+ _selgrpBox.pack_end(_selgrpLabel, false, false);
_selgrp.set_active(prefs->getBool("/dialogs/align/sel-as-groups"));
_selgrp.signal_toggled().connect(sigc::mem_fun(*this, &AlignAndDistribute::on_selgrp_toggled));
+ // Right align the buttons
+ _alignTableBox.pack_end(_alignTable, false, false);
+ _distributeTableBox.pack_end(_distributeTable, false, false);
+ _rearrangeTableBox.pack_end(_rearrangeTable, false, false);
+ _removeOverlapTableBox.pack_end(_removeOverlapTable, false, false);
+ _nodesTableBox.pack_end(_nodesTable, false, false);
+
_alignBox.pack_start(_anchorBox);
_alignBox.pack_start(_selgrpBox);
- _alignBox.pack_start(_alignTable);
+ _alignBox.pack_start(_alignTableBox);
_alignFrame.add(_alignBox);
- _distributeFrame.add(_distributeTable);
- _rearrangeFrame.add(_rearrangeTable);
- _removeOverlapFrame.add(_removeOverlapTable);
- _nodesFrame.add(_nodesTable);
+ _distributeFrame.add(_distributeTableBox);
+ _rearrangeFrame.add(_rearrangeTableBox);
+ _removeOverlapFrame.add(_removeOverlapTableBox);
+ _nodesFrame.add(_nodesTableBox);
Gtk::Box *contents = _getContents();
contents->set_spacing(4);
diff --git a/src/ui/dialog/align-and-distribute.h b/src/ui/dialog/align-and-distribute.h
index 1c4c8ab54..7e649834e 100644
--- a/src/ui/dialog/align-and-distribute.h
+++ b/src/ui/dialog/align-and-distribute.h
@@ -119,6 +119,11 @@ protected:
Gtk::HBox _anchorBox;
Gtk::HBox _selgrpBox;
Gtk::VBox _alignBox;
+ Gtk::HBox _alignTableBox;
+ Gtk::HBox _distributeTableBox;
+ Gtk::HBox _rearrangeTableBox;
+ Gtk::HBox _removeOverlapTableBox;
+ Gtk::HBox _nodesTableBox;
Gtk::Label _anchorLabel;
Gtk::Label _selgrpLabel;
Gtk::CheckButton _selgrp;