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

SVN commit 1068295 by aclemens:

Add UI file for FillModifier

 M  +1 -0      digikam/CMakeLists.txt  
 M  +15 -36    utilities/advancedrename/parser/modifiers/fillmodifier.cpp  
 M  +5 -6      utilities/advancedrename/parser/modifiers/fillmodifier.h  
 A             utilities/advancedrename/parser/modifiers/fillmodifierdialogwidget.ui  \



--- trunk/extragear/graphics/digikam/digikam/CMakeLists.txt #1068294:1068295
@@ -125,6 +125,7 @@
                   ${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
 +                  ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/modifiers/fillmodifierdialogwidget.ui
  )
 
 KDE4_ADD_KCFG_FILES(digikamcore_LIB_SRCS
--- trunk/extragear/graphics/digikam/utilities/advancedrename/parser/modifiers/fillmodifier.cpp \
#1068294:1068295 @@ -39,53 +39,32 @@
 #include <klocale.h>
 #include <knuminput.h>
 
+// Local includes
+
+#include "ui_fillmodifierdialogwidget.h"
+
 namespace Digikam
 {
 FillDialog::FillDialog(ParseObject* parent)
-          : ParseObjectDialog(parent),
-            charInput(0), digitsInput(0)
+          : ParseObjectDialog(parent), ui(new Ui::FillModifierDialogWidget())
 {
-    QLabel* digitsLabel = new QLabel(i18nc("Length of the string", "Length:"), \
                this);
-    digitsInput = new KIntNumInput(this);
-    digitsInput->setMinimum(1);
-    digitsInput->setMaximum(300);
-    digitsInput->setValue(1);
+    QWidget* mainWidget = new QWidget(this);
+    ui->setupUi(mainWidget);
 
-    QLabel* charLabel = new QLabel(i18nc("character to fill string with", \
"Character:"), this);  QRegExp validateReg("\\w{1}");
     QRegExpValidator* validator = new QRegExpValidator(validateReg, this);
-    charInput = new KLineEdit(this);
-    charInput->setValidator(validator);
+    ui->charInput->setValidator(validator);
 
-    QLabel* alignLabel = new QLabel(i18n("Alignment:"), this);
-    alignBox = new KComboBox(this);
-    alignBox->insertItem(Left,  "Left");
-    alignBox->insertItem(Right, "Right");
+    ui->alignBox->insertItem(Left,  "Left");
+    ui->alignBox->insertItem(Right, "Right");
 
-    // --------------------------------------------------------
-
-    QWidget*     mainWidget = new QWidget(this);
-    QGridLayout* mainLayout = new QGridLayout(this);
-    mainLayout->addWidget(digitsLabel, 0, 0, 1, 1);
-    mainLayout->addWidget(digitsInput, 0, 1, 1, 1);
-    mainLayout->addWidget(alignLabel,  1, 0, 1, 1);
-    mainLayout->addWidget(alignBox,    1, 1, 1, 1);
-    mainLayout->addWidget(charLabel,   2, 0, 1, 1);
-    mainLayout->addWidget(charInput,   2, 1, 1, 1);
-    mainLayout->setSpacing(KDialog::spacingHint());
-    mainLayout->setMargin(KDialog::spacingHint());
-    mainLayout->setRowStretch(3, 10);
-    mainWidget->setLayout(mainLayout);
-
     setSettingsWidget(mainWidget);
-
-    // --------------------------------------------------------
-
-    digitsInput->setFocus();
+    ui->digitsInput->setFocus();
 }
 
 FillDialog::~FillDialog()
 {
+    delete ui;
 }
 
 // --------------------------------------------------------
@@ -145,9 +124,9 @@
     QPointer<FillDialog> dlg = new FillDialog(this);
     if (dlg->exec() == KDialog::Accepted)
     {
-        alignStr = (dlg->alignBox->currentIndex() == FillDialog::Left) ? \
                QString('l') : QString('r');
-        length   = dlg->digitsInput->value();
-        charStr  = dlg->charInput->text();
+        alignStr = (dlg->ui->alignBox->currentIndex() == FillDialog::Left) ? \
QString('l') : QString('r'); +        length   = dlg->ui->digitsInput->value();
+        charStr  = dlg->ui->charInput->text();
     }
     delete dlg;
 
--- trunk/extragear/graphics/digikam/utilities/advancedrename/parser/modifiers/fillmodifier.h \
#1068294:1068295 @@ -29,9 +29,10 @@
 #include "modifier.h"
 #include "parseobjectdialog.h"
 
-class KIntNumInput;
-class KLineEdit;
-class KComboBox;
+namespace Ui
+{
+    class FillModifierDialogWidget;
+}
 
 namespace Digikam
 {
@@ -50,9 +51,7 @@
         Right
     };
 
-    KLineEdit*    charInput;
-    KIntNumInput* digitsInput;
-    KComboBox*    alignBox;
+    Ui::FillModifierDialogWidget* const ui;
 };
 
 // --------------------------------------------------------


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