[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:21:24
Message-ID: 1262287284.134756.16568.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1068293 by aclemens:

Add UI file for SequenceNumberOption

 M  +1 -0      digikam/CMakeLists.txt  
 M  +12 -39    utilities/advancedrename/parser/options/sequencenumberoption.cpp  
 M  +6 -3      utilities/advancedrename/parser/options/sequencenumberoption.h  
 A             utilities/advancedrename/parser/options/sequencenumberoptiondialogwidget.ui \



--- trunk/extragear/graphics/digikam/digikam/CMakeLists.txt #1068292:1068293
@@ -123,6 +123,7 @@
 KDE4_ADD_UI_FILES(digikamcore_LIB_SRCS
                   ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/imageeditor/printiface/printoptionspage.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/advancedrename/parser/modifiers/replacemodifierdialogwidget.ui
  )
 
--- trunk/extragear/graphics/digikam/utilities/advancedrename/parser/options/sequencenumberoption.cpp \
#1068292:1068293 @@ -36,51 +36,24 @@
 #include <klocale.h>
 #include <knuminput.h>
 
+// Local includes
+
+#include "ui_sequencenumberoptiondialogwidget.h"
+
 namespace Digikam
 {
 
 SequenceNumberDialog::SequenceNumberDialog(ParseObject* parent)
-                    : ParseObjectDialog(parent),
-                      digits(0), start(0), step(0)
+                    : ParseObjectDialog(parent), ui(new \
Ui::SequenceNumberOptionDialogWidget())  {
-    digits = new KIntNumInput(this);
-    start  = new KIntNumInput(this);
-    step   = new KIntNumInput(this);
-
-    QLabel* digitsLabel = new QLabel(i18nc("number of digits", "Digits:"));
-    QLabel* startLabel  = new QLabel(i18nc("start of sequence number range", \
                "Start:"));
-    QLabel* stepLabel   = new QLabel(i18nc("stepping used for sequence number \
                range", "Step:"));
-
-    digits->setRange(1, 999999, 1);
-    digits->setSliderEnabled(false);
-
-    start->setRange(1, 999999, 1);
-    start->setSliderEnabled(false);
-
-    step->setRange(1, 999999, 1);
-    step->setSliderEnabled(false);
-
-    QGroupBox* gbox         = new QGroupBox(i18n("Custom Range"));
-    QGridLayout* gboxLayout = new QGridLayout(this);
-    gboxLayout->addWidget(startLabel, 0, 0);
-    gboxLayout->addWidget(start,      0, 1);
-    gboxLayout->addWidget(stepLabel,  1, 0);
-    gboxLayout->addWidget(step,       1, 1);
-    gboxLayout->setRowStretch(2, 10);
-    gbox->setLayout(gboxLayout);
-
-    QWidget* w              = new QWidget(this);
-    QGridLayout* mainLayout = new QGridLayout(this);
-    mainLayout->addWidget(digitsLabel, 0, 0, 1, 1);
-    mainLayout->addWidget(digits,      0, 1, 1, 1);
-    mainLayout->addWidget(gbox,        1, 0, 1,-1);
-    w->setLayout(mainLayout);
-
-    setSettingsWidget(w);
+    QWidget* mainWidget = new QWidget(this);
+    ui->setupUi(mainWidget);
+    setSettingsWidget(mainWidget);
 }
 
 SequenceNumberDialog::~SequenceNumberDialog()
 {
+    delete ui;
 }
 
 // --------------------------------------------------------
@@ -106,9 +79,9 @@
     QString result;
     if (dlg->exec() == KDialog::Accepted)
     {
-        int digits = dlg->digits->value();
-        int start  = dlg->start->value();
-        int step   = dlg->step->value();
+        int digits = dlg->ui->digits->value();
+        int start  = dlg->ui->start->value();
+        int step   = dlg->ui->step->value();
 
         result = QString("%1").arg("#", digits, QChar('#'));
         if (start > 1)
--- trunk/extragear/graphics/digikam/utilities/advancedrename/parser/options/sequencenumberoption.h \
#1068292:1068293 @@ -31,6 +31,11 @@
 
 class KIntNumInput;
 
+namespace Ui
+{
+    class SequenceNumberOptionDialogWidget;
+}
+
 namespace Digikam
 {
 
@@ -43,9 +48,7 @@
     SequenceNumberDialog(ParseObject* parent);
     ~SequenceNumberDialog();
 
-    KIntNumInput* digits;
-    KIntNumInput* start;
-    KIntNumInput* step;
+    Ui::SequenceNumberOptionDialogWidget* const ui;
 };
 
 // --------------------------------------------------------


[prev in list] [next in list] [prev in thread] [next in thread]