[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:17
Message-ID: 1262287277.013169.16482.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1068292 by aclemens:
Add UI file for ReplaceModifier
M +1 -0 digikam/CMakeLists.txt
M +10 -36 utilities/advancedrename/parser/modifiers/replacemodifier.cpp
M +6 -4 utilities/advancedrename/parser/modifiers/replacemodifier.h
A utilities/advancedrename/parser/modifiers/replacemodifierdialogwidget.ui \
--- trunk/extragear/graphics/digikam/digikam/CMakeLists.txt #1068291:1068292
@@ -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/modifiers/replacemodifierdialogwidget.ui
)
KDE4_ADD_KCFG_FILES(digikamcore_LIB_SRCS
--- trunk/extragear/graphics/digikam/utilities/advancedrename/parser/modifiers/replacemodifier.cpp \
#1068291:1068292 @@ -26,8 +26,6 @@
// Qt includes
#include <QCheckBox>
-#include <QGridLayout>
-#include <QLabel>
#include <QPointer>
// KDE includes
@@ -39,48 +37,24 @@
// Local includes
#include "parseobjectdialog.h"
+#include "ui_replacemodifierdialogwidget.h"
namespace Digikam
{
ReplaceDialog::ReplaceDialog(ParseObject* parent)
- : ParseObjectDialog(parent),
- source(0), destination(0), caseSensitive(0)
+ : ParseObjectDialog(parent), ui(new Ui::ReplaceModifierDialogWidget())
{
- QString replace = i18nc("Replace text", "Replace");
-
- QLabel* srcLabel = new QLabel(replace + ':');
- source = new KLineEdit(this);
-
- QLabel* dstLabel = new QLabel(i18nc("Replace text with", "With:"));
- destination = new KLineEdit(this);
-
- caseSensitive = new QCheckBox(i18n("Case sensitive"));
- caseSensitive->setChecked(false);
-
- isRegExp = new QCheckBox(i18n("Regular Expression"));
- isRegExp->setChecked(false);
-
- QWidget* mainWidget = new QWidget(this);
- QGridLayout* mainLayout = new QGridLayout(this);
- mainLayout->addWidget(caseSensitive, 0, 0, 1,-1);
- mainLayout->addWidget(isRegExp, 1, 0, 1,-1);
- mainLayout->addWidget(srcLabel, 2, 0, 1, 1);
- mainLayout->addWidget(source, 2, 1, 1, 1);
- mainLayout->addWidget(dstLabel, 3, 0, 1, 1);
- mainLayout->addWidget(destination, 3, 1, 1, 1);
- mainLayout->setSpacing(KDialog::spacingHint());
- mainLayout->setMargin(KDialog::spacingHint());
- mainLayout->setRowStretch(4, 10);
- mainWidget->setLayout(mainLayout);
-
+ QWidget* mainWidget = new QWidget(this);
+ ui->setupUi(mainWidget);
setSettingsWidget(mainWidget);
- source->setFocus();
+ ui->source->setFocus();
}
ReplaceDialog::~ReplaceDialog()
{
+ delete ui;
}
// --------------------------------------------------------
@@ -106,18 +80,18 @@
QPointer<ReplaceDialog> dlg = new ReplaceDialog(this);
if (dlg->exec() == KDialog::Accepted)
{
- QString oldStr = dlg->source->text();
- QString newStr = dlg->destination->text();
+ QString oldStr = dlg->ui->source->text();
+ QString newStr = dlg->ui->destination->text();
if (!oldStr.isEmpty())
{
QString options;
- if (dlg->isRegExp->isChecked())
+ if (dlg->ui->isRegExp->isChecked())
{
options.append('r');
}
- if (!dlg->caseSensitive->isChecked())
+ if (!dlg->ui->caseSensitive->isChecked())
{
options.append('i');
}
--- trunk/extragear/graphics/digikam/utilities/advancedrename/parser/modifiers/replacemodifier.h \
#1068291:1068292 @@ -32,6 +32,11 @@
class KLineEdit;
class QCheckBox;
+namespace Ui
+{
+ class ReplaceModifierDialogWidget;
+}
+
namespace Digikam
{
@@ -44,10 +49,7 @@
ReplaceDialog(ParseObject* parent);
~ReplaceDialog();
- KLineEdit* source;
- KLineEdit* destination;
- QCheckBox* caseSensitive;
- QCheckBox* isRegExp;
+ Ui::ReplaceModifierDialogWidget* const ui;
};
// --------------------------------------------------------
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic