diff --git a/plugins/tools/basictools/kis_tool_brush.cc b/plugins/tools/basictools/kis_tool_brush.cc
--- a/plugins/tools/basictools/kis_tool_brush.cc
+++ b/plugins/tools/basictools/kis_tool_brush.cc
@@ -422,7 +422,7 @@
assistantWidget->setToolTip(i18n("You need to add Ruler Assistants before this tool will work."));
connect(m_chkAssistant, SIGNAL(toggled(bool)), this, SLOT(setAssistant(bool)));
- assistantLayout->addWidget(m_chkAssistant, 1, 1, 1, 1, Qt::AlignLeft);
+ addOptionWidgetOption(assistantWidget, m_chkAssistant);
m_sliderMagnetism = new KisSliderSpinBox(optionsWidget);
m_sliderMagnetism->setToolTip(i18n("Assistant Magnetism"));
@@ -436,8 +436,8 @@
toggleaction->setShortcut(QKeySequence(Qt::ControlModifier + Qt::ShiftModifier + Qt::Key_L));
connect(toggleaction, SIGNAL(triggered(bool)), m_chkAssistant, SLOT(toggle()));
-
- addOptionWidgetOption(m_sliderMagnetism, assistantWidget);
+ QLabel* magnetismLabel = new QLabel(i18n("Magnetism:"));
+ addOptionWidgetOption(m_sliderMagnetism, magnetismLabel);
QLabel* snapSingleLabel = new QLabel(i18n("Snap Single:"));
@@ -452,11 +452,12 @@
m_sliderMagnetism->setVisible(false);
m_chkOnlyOneAssistant->setVisible(false);
snapSingleLabel->setVisible(false);
+ magnetismLabel->setVisible(false);
connect(m_chkAssistant, SIGNAL(toggled(bool)), m_sliderMagnetism, SLOT(setVisible(bool)));
connect(m_chkAssistant, SIGNAL(toggled(bool)), m_chkOnlyOneAssistant, SLOT(setVisible(bool)));
connect(m_chkAssistant, SIGNAL(toggled(bool)), snapSingleLabel, SLOT(setVisible(bool)));
-
+ connect(m_chkAssistant, SIGNAL(toggled(bool)), magnetismLabel, SLOT(setVisible(bool)));
KisConfig cfg;
diff --git a/plugins/tools/basictools/wdgmovetool.ui b/plugins/tools/basictools/wdgmovetool.ui
--- a/plugins/tools/basictools/wdgmovetool.ui
+++ b/plugins/tools/basictools/wdgmovetool.ui
@@ -6,13 +6,19 @@
0
0
- 271
- 394
+ 245
+ 517
-
- -
+
+
-
+
+
+ 221
+ 101
+
+
Selection Mode
@@ -56,82 +62,122 @@
- -
-
-
- -
+
-
+
+
+ 227
+ 91
+
+
- Shortcut Move Distance
+ Move Shortcut
-
-
-
+
-
+
+
+
+ 0
+ 0
+
+
- Number of pixels to move after move shortcut keypress.
+ When holding shift, move keyboard shortcuts scale up by this amount.
1.000000000000000
- 100000.000000000000000
+ 1000.000000000000000
- 1.000000000000000
+ 10.000000000000000
- -
+
-
+
+
+
+ 0
+ 0
+
+
+
+ Multiplier:
+
+
+
+ -
- -
-
+
-
+
+
+
+ 0
+ 0
+
+
- When holding shift, move keyboard shortcuts scale up by this amount.
+ Number of pixels to move after move shortcut keypress.
+
+
+ px
1.000000000000000
- 1000.000000000000000
+ 100000.000000000000000
- 10.000000000000000
+ 1.000000000000000
- -
-
+
-
+
+
+
+ 0
+ 0
+
+
+
+ Amount:
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
- Large Move Scale
+ Unit:
- -
-
-
- Show coordinates on canvas
-
-
- Show coordinates
-
-
-
- -
+
-
-
+
0
0
- 240
- 70
+ 100
+ 101
@@ -148,13 +194,13 @@
- 2
+ 5
5
- 0
+ 5
0
@@ -164,6 +210,18 @@
QFormLayout::AllNonFixedFieldsGrow
+
+ 5
+
+
+ 5
+
+
+ 5
+
+
+ 5
+
-
@@ -189,7 +247,7 @@
-
-
+
0
0
@@ -205,7 +263,7 @@
-
-
+
0
0
@@ -239,8 +297,31 @@
- -
-
+
-
+
+
+ Show coordinates on canvas
+
+
+ Show coordinates on canvas
+
+
+
+ -
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
diff --git a/plugins/tools/basictools/wdgmultihandtool.ui b/plugins/tools/basictools/wdgmultihandtool.ui
--- a/plugins/tools/basictools/wdgmultihandtool.ui
+++ b/plugins/tools/basictools/wdgmultihandtool.ui
@@ -6,8 +6,8 @@
0
0
- 212
- 293
+ 201
+ 272
@@ -22,6 +22,13 @@
-
+
+
+ Qt::Horizontal
+
+
+
+ -
4
@@ -50,7 +57,7 @@
-
-
+
-
@@ -63,7 +70,7 @@
-
-
+
-
diff --git a/plugins/tools/selectiontools/kis_tool_select_contiguous.cc b/plugins/tools/selectiontools/kis_tool_select_contiguous.cc
--- a/plugins/tools/selectiontools/kis_tool_select_contiguous.cc
+++ b/plugins/tools/selectiontools/kis_tool_select_contiguous.cc
@@ -29,7 +29,6 @@
#include
#include
#include
-#include
#include
#include
@@ -173,12 +172,12 @@
QVBoxLayout * l = dynamic_cast(selectionWidget->layout());
Q_ASSERT(l);
if (l) {
- QHBoxLayout * hbox = new QHBoxLayout();
- Q_CHECK_PTR(hbox);
- l->insertLayout(1, hbox);
+
+ QGridLayout * gridLayout = new QGridLayout();
+ l->insertLayout(1, gridLayout);
QLabel * lbl = new QLabel(i18n("Fuzziness: "), selectionWidget);
- hbox->addWidget(lbl);
+ gridLayout->addWidget(lbl, 0, 0, 1, 1);
KisSliderSpinBox *input = new KisSliderSpinBox(selectionWidget);
Q_CHECK_PTR(input);
@@ -186,34 +185,27 @@
input->setRange(1, 100);
input->setSingleStep(1);
input->setExponentRatio(2);
- hbox->addWidget(input);
-
- hbox = new QHBoxLayout();
- Q_CHECK_PTR(hbox);
- l->insertLayout(2, hbox);
+ gridLayout->addWidget(input, 0, 1, 1, 1);
lbl = new QLabel(i18n("Grow/shrink selection: "), selectionWidget);
- hbox->addWidget(lbl);
+ gridLayout->addWidget(lbl, 1, 0, 1, 1);
KisSliderSpinBox *sizemod = new KisSliderSpinBox(selectionWidget);
Q_CHECK_PTR(sizemod);
sizemod->setObjectName("sizemod"); //grow/shrink selection
sizemod->setRange(-40, 40);
sizemod->setSingleStep(1);
- hbox->addWidget(sizemod);
-
- hbox = new QHBoxLayout();
- Q_CHECK_PTR(hbox);
- l->insertLayout(3, hbox);
+ gridLayout->addWidget(sizemod, 1, 1, 1, 1);
- hbox->addWidget(new QLabel(i18n("Feathering radius: "), selectionWidget));
+ lbl = new QLabel(i18n("Feathering radius: "), selectionWidget);
+ gridLayout->addWidget(lbl, 2, 0, 1, 1);
KisSliderSpinBox *feather = new KisSliderSpinBox(selectionWidget);
Q_CHECK_PTR(feather);
feather->setObjectName("feathering");
feather->setRange(0, 40);
feather->setSingleStep(1);
- hbox->addWidget(feather);
+ gridLayout->addWidget(feather, 2, 1, 1, 1);
connect (input , SIGNAL(valueChanged(int)), this, SLOT(slotSetFuzziness(int) ));
connect (sizemod, SIGNAL(valueChanged(int)), this, SLOT(slotSetSizemod(int) ));
diff --git a/plugins/tools/tool_smart_patch/kis_tool_smart_patch_options_widget.ui b/plugins/tools/tool_smart_patch/kis_tool_smart_patch_options_widget.ui
--- a/plugins/tools/tool_smart_patch/kis_tool_smart_patch_options_widget.ui
+++ b/plugins/tools/tool_smart_patch/kis_tool_smart_patch_options_widget.ui
@@ -6,48 +6,61 @@
0
0
- 340
- 235
+ 250
+ 129
-
+
-
-
-
-
- 200
- 200
-
-
-
- Inpaint Tool
-
-
-
- true
-
-
-
- 20
- 40
- 281
- 81
-
-
-
-
- 200
- 80
-
-
+
+
-
+
+
-
+
+
-
+
+
+ low/fast
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ Qt::LeftToRight
+
+
+ high/slow
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+
+
+
+
+ -
-
-
- 10
- 16
- 260
- 21
-
+
+
+ 0
+ 0
+
25
@@ -68,78 +81,79 @@
25
-
-
-
- 190
- 40
- 71
- 20
-
-
-
- Qt::LeftToRight
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Accuracy:
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
- Accurate
+ Patch Radius:
+
+
+ patchRadiusLabel
+
+
+
+ -
+
+
+
+ 0
+ 0
+
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
-
- 20
- 40
- 41
- 17
-
+
+ px
-
- Fast
+
+ 2
+
+
+ 8
+
+
+ 4
-
-
-
-
- 20
- 153
- 181
- 27
-
-
-
- Patch Radius
-
-
- label
-
-
-
-
-
- 220
- 153
- 61
- 27
-
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- 2
-
-
- 8
-
-
- 4
-
-
-
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+