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

List:       kde-commits
Subject:    [juk/frameworks] /: Port remainer of file renamer code away from KDialog.
From:       Michael Pyne <null () kde ! org>
Date:       2017-09-30 21:33:48
Message-ID: E1dyPOO-0007iK-6z () code ! kde ! org
[Download RAW message or body]

Git commit fac3391a6a26bcdfb2f2dfc850d204901debc282 by Michael Pyne.
Committed on 30/09/2017 at 19:25.
Pushed by mpyne into branch 'frameworks'.

Port remainer of file renamer code away from KDialog.

M  +2    -0    filerenamer.cpp
M  +4    -0    filerenamer.h
M  +7    -0    filerenamerbase.ui
M  +12   -11   filerenamerconfigdlg.cpp
M  +8    -8    filerenamerconfigdlg.h

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

diff --git a/filerenamer.cpp b/filerenamer.cpp
index db7ba6a..c3e592d 100644
--- a/filerenamer.cpp
+++ b/filerenamer.cpp
@@ -277,6 +277,8 @@ FileRenamerWidget::FileRenamerWidget(QWidget *parent) :
     connect(m_exampleDialog, SIGNAL(dataChanged()), SLOT(dataSelected()));
     connect(m_exampleDialog, SIGNAL(fileChanged(QString)),
             this,            SLOT(fileSelected(QString)));
+    connect(m_ui->dlgButtonBox, SIGNAL(accepted()), SIGNAL(accepted()));
+    connect(m_ui->dlgButtonBox, SIGNAL(rejected()), SIGNAL(rejected()));
 
     exampleTextChanged();
 }
diff --git a/filerenamer.h b/filerenamer.h
index c18eb5a..36d2342 100644
--- a/filerenamer.h
+++ b/filerenamer.h
@@ -159,6 +159,10 @@ public:
      */
     void saveConfig();
 
+signals:
+    void accepted(); // for the QDialogButtonBox
+    void rejected();
+
 protected slots:
     /**
      * This function should be called whenever the example text may need to be
diff --git a/filerenamerbase.ui b/filerenamerbase.ui
index cd80e8c..2cfadbf 100644
--- a/filerenamerbase.ui
+++ b/filerenamerbase.ui
@@ -247,6 +247,13 @@
      </layout>
     </widget>
    </item>
+   <item>
+    <widget class="QDialogButtonBox" name="dlgButtonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <customwidgets>
diff --git a/filerenamerconfigdlg.cpp b/filerenamerconfigdlg.cpp
index 88b6c08..7bf2b5b 100644
--- a/filerenamerconfigdlg.cpp
+++ b/filerenamerconfigdlg.cpp
@@ -20,27 +20,28 @@
 
 #include <klocale.h>
 
-FileRenamerConfigDlg::FileRenamerConfigDlg(QWidget *parent) :
-    KDialog(parent),
-    m_renamerWidget(new FileRenamerWidget(this))
+FileRenamerConfigDlg::FileRenamerConfigDlg(QWidget *parent)
+  : QDialog(parent)
+  , m_renamerWidget(new FileRenamerWidget(this))
 {
-    setObjectName( QLatin1String("file renamer dialog" ));
+    setObjectName(QLatin1String("file renamer dialog"));
     setModal(true);
-    setCaption(i18n("File Renamer Options"));
-    setButtons(Ok | Cancel);
+    setWindowTitle(i18n("File Renamer Options"));
 
+    // TODO: HiDPI?  Is this even still needed today?
     m_renamerWidget->setMinimumSize(400, 300);
 
-    setMainWidget(m_renamerWidget);
+    connect(m_renamerWidget, &FileRenamerWidget::accepted, this, &QDialog::accept);
+    connect(m_renamerWidget, &FileRenamerWidget::rejected, this, &QDialog::reject);
+
+    auto vboxLayout = new QVBoxLayout(this);
+    vboxLayout->addWidget(m_renamerWidget);
 }
 
 void FileRenamerConfigDlg::accept()
 {
-    // Make sure the config gets saved.
-
     m_renamerWidget->saveConfig();
-
-    KDialog::accept();
+    QDialog::accept();
 }
 
 // vim: set et sw=4 tw=0 sta:
diff --git a/filerenamerconfigdlg.h b/filerenamerconfigdlg.h
index eb551de..85bd078 100644
--- a/filerenamerconfigdlg.h
+++ b/filerenamerconfigdlg.h
@@ -15,26 +15,26 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef FILERENAMERCONFIGDLG_H
-#define FILERENAMERCONFIGDLG_H
+#ifndef JUK_FILERENAMERCONFIGDLG_H
+#define JUK_FILERENAMERCONFIGDLG_H
 
-#include <kdialog.h>
+#include <QDialog>
 
 class FileRenamerWidget;
 
-class FileRenamerConfigDlg : public KDialog
+class FileRenamerConfigDlg : public QDialog
 {
     Q_OBJECT
-    public:
+public:
     FileRenamerConfigDlg(QWidget *parent);
 
-    protected slots:
+protected slots:
     virtual void accept();
 
-    private:
+private:
     FileRenamerWidget *m_renamerWidget;
 };
 
-#endif // FILERENAMERCONFIGDLG_H
+#endif // JUK_FILERENAMERCONFIGDLG_H
 
 // vim: set et sw=4 tw=0 sta:

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