From 4907f040892b798ab973de542cf7465d48c6e5d8 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Wed, 23 Oct 2013 16:26:01 +0200 Subject: fix layout (again, sorry) Signed-off-by: Stanislaw Halik --- .../ftnoir_accela_filtercontrols.ui | 287 +++++++++------------ .../ftnoir_filter_accela_dialog.cpp | 4 +- 2 files changed, 125 insertions(+), 166 deletions(-) diff --git a/ftnoir_filter_accela/ftnoir_accela_filtercontrols.ui b/ftnoir_filter_accela/ftnoir_accela_filtercontrols.ui index 6cf3d20b..098213ef 100644 --- a/ftnoir_filter_accela/ftnoir_accela_filtercontrols.ui +++ b/ftnoir_filter_accela/ftnoir_accela_filtercontrols.ui @@ -9,8 +9,8 @@ 0 0 - 427 - 235 + 459 + 207 @@ -21,14 +21,14 @@ - 248 - 235 + 0 + 0 - 428 - 235 + 459 + 207 @@ -47,23 +47,14 @@ - - - QLayout::SetMaximumSize - - - -1 - - - 0 - + true - + 0 0 @@ -77,29 +68,32 @@ Basic settings - - - 10 + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + QFormLayout::ExpandingFieldsGrow - - 10 + + QFormLayout::DontWrapRows - - 10 + + Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing - - 2 + + Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing - 20 + 6 - 0 + 2 - + - + 0 0 @@ -112,50 +106,57 @@ - - + + - + 0 0 - - - 35 - 22 - + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - background:none; + + QAbstractSpinBox::CorrectToPreviousValue - - false + + 3 - 0 + 0.100000000000000 - 200 + 65535.000000000000000 - 45 + 1.000000000000000 - - + + - + 0 0 - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + Translation - - QAbstractSpinBox::CorrectToPreviousValue + + + + + + + 0 + 0 + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter 3 @@ -174,7 +175,7 @@ - + 0 0 @@ -200,141 +201,92 @@ background:none; - - + + - + 0 0 - - Translation + + + 96 + 22 + + + + background:none; + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + false + + + % + + + 0 + + + 200 + + + 1 + + + 45 - - + + - + 0 0 - - 3 + + + 8 + - - 0.100000000000000 + + QFrame::NoFrame - - 65535.000000000000000 + + <html><head/><body><p align="justify">Accela filter by Stanisław Halik<br/>With kind help from Donovan Baarda</p><p align="right">2012-2013</p></body></html> - - 1.000000000000000 + + Qt::RichText + + + false + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + + true + + + 0 + + + Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - -1 - - - QLayout::SetMaximumSize - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 0 - 32 - - - - OK - - - - - - - - 0 - 0 - - - - - 0 - 32 - - - - Cancel - - - - - - - - - - 0 - 0 - - - - - 8 - - - - QFrame::NoFrame - - - <html><head/><body><p align="justify">Accela filter by Stanisław Halik<br/>With kind help from Donovan Baarda</p><p align="right">2012-2013</p></body></html> - - - Qt::RichText - - - false - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - true - - - 0 - - - Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - + 0 0 @@ -356,7 +308,7 @@ background:none; 5 - 7 + 0 10 @@ -604,6 +556,13 @@ background:none; + + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + diff --git a/ftnoir_filter_accela/ftnoir_filter_accela_dialog.cpp b/ftnoir_filter_accela/ftnoir_filter_accela_dialog.cpp index 0c04a32a..b0999070 100644 --- a/ftnoir_filter_accela/ftnoir_filter_accela_dialog.cpp +++ b/ftnoir_filter_accela/ftnoir_filter_accela_dialog.cpp @@ -42,8 +42,8 @@ FilterControls::FilterControls() : // Load the settings from the current .INI-file loadSettings(); - connect(ui.btnOK, SIGNAL(clicked()), this, SLOT(doOK())); - connect(ui.btnCancel, SIGNAL(clicked()), this, SLOT(doCancel())); + connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(doOK())); + connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(doCancel())); connect(ui.rotation_alpha, SIGNAL(valueChanged(double)), this, SLOT(settingChanged(double))); connect(ui.translation_alpha, SIGNAL(valueChanged(double)), this, SLOT(settingChanged(double))); -- cgit v1.2.3