[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: extragear/graphics/digikam
From: Andi Clemens <andi.clemens () gmx ! net>
Date: 2009-12-31 19:57:37
Message-ID: 1262289457.930213.20585.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1068308 by aclemens:
Add UI file for RangeModifier
M +1 -0 digikam/CMakeLists.txt
M +16 -40 utilities/advancedrename/parser/modifiers/rangemodifier.cpp
M +5 -6 utilities/advancedrename/parser/modifiers/rangemodifier.h
A utilities/advancedrename/parser/modifiers/rangemodifierdialogwidget.ui \
--- trunk/extragear/graphics/digikam/digikam/CMakeLists.txt #1068307:1068308
@@ -123,6 +123,7 @@
KDE4_ADD_UI_FILES(digikamcore_LIB_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/modifiers/fillmodifierdialogwidget.ui
${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/modifiers/replacemodifierdialogwidget.ui
+ ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/modifiers/rangemodifierdialogwidget.ui
${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/options/dateoptiondialogwidget.ui
${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/options/sequencenumberoptiondialogwidget.ui
${CMAKE_CURRENT_SOURCE_DIR}/../utilities/imageeditor/printiface/printoptionspage.ui
--- trunk/extragear/graphics/digikam/utilities/advancedrename/parser/modifiers/rangemodifier.cpp \
#1068307:1068308 @@ -35,59 +35,35 @@
#include <klocale.h>
#include <knuminput.h>
+// Local includes
+
+#include "ui_rangemodifierdialogwidget.h"
+
namespace Digikam
{
RangeDialog::RangeDialog(ParseObject* parent)
- : ParseObjectDialog(parent),
- startInput(0), stopInput(0), toTheEndCheckBox(0)
+ : ParseObjectDialog(parent), ui(new Ui::RangeModifierDialogWidget())
{
- const int minRange = 1;
- const int maxRange = 999999;
+ QWidget* mainWidget = new QWidget(this);
+ ui->setupUi(mainWidget);
+ setSettingsWidget(mainWidget);
+ ui->startInput->setFocus();
- startInput = new KIntNumInput(this);
- startInput->setMinimum(minRange);
- startInput->setMaximum(maxRange);
- startInput->setLabel(i18nc("Beginning of the text range", "From:"));
-
- stopInput = new KIntNumInput(this);
- stopInput->setMinimum(minRange);
- stopInput->setMaximum(maxRange);
- stopInput->setLabel(i18nc("end of the text range", "To:"));
-
- toTheEndCheckBox = new QCheckBox(i18nc("range is specified until the end of the \
string", "to the end"));
- toTheEndCheckBox->setChecked(true);
slotToTheEndChecked(true);
- // --------------------------------------------------------
-
- QWidget* mainWidget = new QWidget(this);
- QGridLayout* mainLayout = new QGridLayout(this);
- mainLayout->addWidget(startInput, 0, 0);
- mainLayout->addWidget(toTheEndCheckBox, 1, 0);
- mainLayout->addWidget(stopInput, 2, 0);
- mainLayout->setSpacing(KDialog::spacingHint());
- mainLayout->setMargin(KDialog::spacingHint());
- mainLayout->setRowStretch(3, 10);
- mainWidget->setLayout(mainLayout);
-
- setSettingsWidget(mainWidget);
-
- // --------------------------------------------------------
-
- startInput->setFocus();
-
- connect(toTheEndCheckBox, SIGNAL(toggled(bool)),
+ connect(ui->toTheEndCheckBox, SIGNAL(toggled(bool)),
this, SLOT(slotToTheEndChecked(bool)));
}
RangeDialog::~RangeDialog()
{
+ delete ui;
}
void RangeDialog::slotToTheEndChecked(bool checked)
{
- stopInput->setEnabled(!checked);
+ ui->stopInput->setEnabled(!checked);
}
// --------------------------------------------------------
@@ -112,17 +88,17 @@
QPointer<RangeDialog> dlg = new RangeDialog(this);
if (dlg->exec() == KDialog::Accepted)
{
- int start = dlg->startInput->value();
- int stop = dlg->stopInput->value();
+ int start = dlg->ui->startInput->value();
+ int stop = dlg->ui->stopInput->value();
- if (dlg->toTheEndCheckBox->isChecked())
+ if (dlg->ui->toTheEndCheckBox->isChecked())
{
result = QString("{%1-}").arg(QString::number(start));
}
else
{
result = QString("{%1-%2}").arg(QString::number(start))
- .arg(QString::number(stop));
+ .arg(QString::number(stop));
}
}
delete dlg;
--- trunk/extragear/graphics/digikam/utilities/advancedrename/parser/modifiers/rangemodifier.h \
#1068307:1068308 @@ -29,9 +29,10 @@
#include "modifier.h"
#include "parseobjectdialog.h"
-class KIntNumInput;
-class QCheckBox;
-class QGroupBox;
+namespace Ui
+{
+ class RangeModifierDialogWidget;
+}
namespace Digikam
{
@@ -45,9 +46,7 @@
RangeDialog(ParseObject* parent);
~RangeDialog();
- KIntNumInput* startInput;
- KIntNumInput* stopInput;
- QCheckBox* toTheEndCheckBox;
+ Ui::RangeModifierDialogWidget* const ui;
private Q_SLOTS:
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic