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

List:       kde-commits
Subject:    [juk/frameworks] /: Port from KVBox and KDialog in the file renamer U/I.
From:       Michael Pyne <null () kde ! org>
Date:       2017-09-30 21:33:47
Message-ID: E1dyPON-0007iK-Tr () code ! kde ! org
[Download RAW message or body]

Git commit c4c0da049940d37815745598ecbdcb1ee4c782f5 by Michael Pyne.
Committed on 30/09/2017 at 18:36.
Pushed by mpyne into branch 'frameworks'.

Port from KVBox and KDialog in the file renamer U/I.

M  +20   -12   filerenamer.cpp
M  +3    -3    filerenamer.h
M  +17   -13   filerenameroptions.cpp
M  +6    -6    filerenameroptions.h
M  +7    -0    filerenameroptionsbase.ui

https://commits.kde.org/juk/c4c0da049940d37815745598ecbdcb1ee4c782f5

diff --git a/filerenamer.cpp b/filerenamer.cpp
index d02ea5a..db7ba6a 100644
--- a/filerenamer.cpp
+++ b/filerenamer.cpp
@@ -31,12 +31,13 @@
 #include <klineedit.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kvbox.h>
 
 #include <QFile>
 #include <QTimer>
 #include <QCheckBox>
 #include <QDir>
+#include <QDialog>
+#include <QDialogButtonBox>
 #include <QUrl>
 #include <QLabel>
 #include <QSignalMapper>
@@ -55,30 +56,30 @@
 #include "coverinfo.h"
 #include "juk_debug.h"
 
-class ConfirmationDialog : public KDialog
+class ConfirmationDialog : public QDialog
 {
 public:
     ConfirmationDialog(const QMap<QString, QString> &files,
-                       QWidget *parent = 0, const char *name = 0)
-        : KDialog(parent)
+                       QWidget *parent = nullptr)
+        : QDialog(parent)
     {
-        setObjectName( QLatin1String( name ) );
         setModal(true);
-        setCaption(i18nc("warning about mass file rename", "Warning"));
-        setButtons(Ok | Cancel);
+        setWindowTitle(i18nc("warning about mass file rename", "Warning"));
 
-        KVBox *vbox = new KVBox(this);
-        setMainWidget(vbox);
-        KVBox *hbox = new KVBox(vbox);
+        auto vboxLayout = new QVBoxLayout(this);
+        auto hbox = new QWidget(this);
+        auto hboxVLayout = new QVBoxLayout(hbox);
+        vboxLayout->addWidget(hbox);
 
         QLabel *l = new QLabel(hbox);
         l->setPixmap(SmallIcon("dialog-warning", 32));
+        hboxVLayout->addWidget(l);
 
         l = new QLabel(i18n("You are about to rename the following files. "
                             "Are you sure you want to continue?"), hbox);
-        hbox->setStretchFactor(l, 1);
+        hboxVLayout->addWidget(l, 1);
 
-        QTreeWidget *lv = new QTreeWidget(vbox);
+        QTreeWidget *lv = new QTreeWidget(this);
 
         QStringList headers;
         headers << i18n("Original Name");
@@ -86,6 +87,12 @@ public:
 
         lv->setHeaderLabels(headers);
         lv->setRootIsDecorated(false);
+        vboxLayout->addWidget(lv);
+
+        auto buttonBox = new QDialogButtonBox(this);
+        vboxLayout->addWidget(buttonBox);
+        connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
+        connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
 
         int lvHeight = 0;
 
@@ -107,6 +114,7 @@ public:
 
         lvHeight += lv->horizontalScrollBar()->height() + lv->header()->height();
         lv->setMinimumHeight(qMin(lvHeight, 400));
+
         resize(qMin(width(), 500), qMin(minimumHeight(), 400));
 
         show();
diff --git a/filerenamer.h b/filerenamer.h
index bd032fb..c18eb5a 100644
--- a/filerenamer.h
+++ b/filerenamer.h
@@ -15,8 +15,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef FILERENAMER_H
-#define FILERENAMER_H
+#ifndef JUK_FILERENAMER_H
+#define JUK_FILERENAMER_H
 
 #include <QString>
 #include <QVector>
@@ -543,6 +543,6 @@ private:
     bool moveFile(const QString &src, const QString &dest);
 };
 
-#endif /* FILERENAMER_H */
+#endif /* JUK_FILERENAMER_H */
 
 // vim: set et sw=4 tw=0 sta:
diff --git a/filerenameroptions.cpp b/filerenameroptions.cpp
index d13c2bb..ec26655 100644
--- a/filerenameroptions.cpp
+++ b/filerenameroptions.cpp
@@ -22,10 +22,10 @@
 #include "juk_debug.h"
 
 FileRenamerTagOptions::FileRenamerTagOptions(QWidget *parent,
-                                             const TagRenamerOptions &options) :
-    QWidget(parent),
-    Ui::FileRenamerTagOptionsBase(),
-    m_options(options)
+                                             const TagRenamerOptions &options)
+  : QWidget(parent)
+  , Ui::FileRenamerTagOptionsBase()
+  , m_options(options)
 {
     setupUi(this);
 
@@ -96,7 +96,6 @@ void FileRenamerTagOptions::slotTrackWidthChanged()
 void FileRenamerTagOptions::slotEmptyActionChanged()
 {
     m_options.setEmptyText(m_emptyTagValue->text());
-
     m_options.setEmptyAction(TagRenamerOptions::IgnoreEmptyTag);
 
     if(m_useValueButton->isChecked())
@@ -107,21 +106,26 @@ void FileRenamerTagOptions::slotEmptyActionChanged()
 
 TagOptionsDialog::TagOptionsDialog(QWidget *parent,
                                    const TagRenamerOptions &options,
-                                   unsigned categoryNumber) :
-    KDialog(parent, 0),
-    m_options(options),
-    m_categoryNumber(categoryNumber)
+                                   unsigned categoryNumber)
+  : QDialog(parent)
+  , m_options(options)
+  , m_categoryNumber(categoryNumber)
 {
     setModal(true);
-    setCaption(i18n("File Renamer"));
-    setButtons(Ok|Cancel);
+    setWindowTitle(i18n("File Renamer"));
 
     loadConfig();
 
     m_widget = new FileRenamerTagOptions(this, m_options);
     m_widget->setMinimumSize(400, 200);
 
-    setMainWidget(m_widget);
+    connect(m_widget->dlgButtonBox, &QDialogButtonBox::accepted,
+            this,                   &QDialog::accept);
+    connect(m_widget->dlgButtonBox, &QDialogButtonBox::rejected,
+            this,                   &QDialog::reject);
+
+    auto boxLayout = new QVBoxLayout(this);
+    boxLayout->addWidget(m_widget);
 }
 
 void TagOptionsDialog::accept()
@@ -129,7 +133,7 @@ void TagOptionsDialog::accept()
     m_options = m_widget->options();
 
     saveConfig();
-    KDialog::accept();
+    QDialog::accept();
 }
 
 void TagOptionsDialog::loadConfig()
diff --git a/filerenameroptions.h b/filerenameroptions.h
index 290ce00..bd3caf2 100644
--- a/filerenameroptions.h
+++ b/filerenameroptions.h
@@ -14,10 +14,11 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef FILERENAMEROPTIONS_H
-#define FILERENAMEROPTIONS_H
+#ifndef JUK_FILERENAMEROPTIONS_H
+#define JUK_FILERENAMEROPTIONS_H
+
+#include <QDialog>
 
-#include <kdialog.h>
 #include "ui_filerenameroptionsbase.h"
 #include "tagrenameroptions.h"
 
@@ -31,7 +32,6 @@ class FileRenamerTagOptions : public QWidget, public Ui::FileRenamerTagOptionsBa
     Q_OBJECT
 public:
     FileRenamerTagOptions(QWidget *parent, const TagRenamerOptions &options);
-    virtual ~FileRenamerTagOptions() {}
 
     const TagRenamerOptions &options() const { return m_options; }
 
@@ -49,7 +49,7 @@ private:
  *
  * @author Michael Pyne <mpyne@kde.org>
  */
-class TagOptionsDialog : public KDialog
+class TagOptionsDialog : public QDialog
 {
     Q_OBJECT
 
@@ -75,6 +75,6 @@ private:
     unsigned m_categoryNumber;
 };
 
-#endif /* FILERENAMEROPTIONS_H */
+#endif /* JUK_FILERENAMEROPTIONS_H */
 
 // vim: set et sw=4 tw=0 sta:
diff --git a/filerenameroptionsbase.ui b/filerenameroptionsbase.ui
index 3510c9c..4968239 100644
--- a/filerenameroptionsbase.ui
+++ b/filerenameroptionsbase.ui
@@ -328,6 +328,13 @@
      </property>
     </spacer>
    </item>
+   <item>
+    <widget class="QDialogButtonBox" name="dlgButtonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>

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