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

List:       kde-commits
Subject:    [kget/kf5_port] ui: Port RenameFile to QDialog
From:       Lukas Appelhans <l.appelhans () gmx ! de>
Date:       2014-10-26 13:46:09
Message-ID: E1XiO93-0004gR-Ii () scm ! kde ! org
[Download RAW message or body]

Git commit 972778db1520b182fdf93edf9eb5918be82f1217 by Lukas Appelhans.
Committed on 26/10/2014 at 00:09.
Pushed by lappelhans into branch 'kf5_port'.

Port RenameFile to QDialog

M  +13   -11   ui/renamefile.cpp
M  +2    -2    ui/renamefile.h
M  +11   -1    ui/renamefile.ui

http://commits.kde.org/kget/972778db1520b182fdf93edf9eb5918be82f1217

diff --git a/ui/renamefile.cpp b/ui/renamefile.cpp
index 44bf52f..d8f32ae 100644
--- a/ui/renamefile.cpp
+++ b/ui/renamefile.cpp
@@ -21,31 +21,33 @@
 #include "core/filemodel.h"
 
 #include <QFile>
+#include <QPushButton>
 
 #include <KLocale>
 
 RenameFile::RenameFile(FileModel *model, const QModelIndex &index, QWidget *parent, Qt::WFlags flags)
-  : KDialog(parent, flags),
+  : QDialog(parent, flags),
     m_model(model),
     m_index(index)
 {
-    setCaption(i18n("Rename File"));
-    showButtonSeparator(true);
-    QWidget *widget = new QWidget(this);
-    ui.setupUi(widget);
-    setMainWidget(widget);
-
+    setWindowTitle(i18n("Rename File"));
+    //showButtonSeparator(true);
+    ui.setupUi(this);
+    
     const QString originalName = m_model->data(m_index, Qt::DisplayRole).toString();
     m_dest = m_model->getUrl(m_index).adjusted(QUrl::RemoveFilename);
 
     ui.label->setText(i18n("Rename %1 to:", originalName));
     ui.name->setText(originalName);
 
-    setButtonText(KDialog::Ok, i18n("&Rename"));
-    enableButtonOk(false);
+    ui.buttonBox->button(QDialogButtonBox::Ok)->setText(i18n("&Rename"));
+    ui.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
+    //ui.buttonBox->button(QDialogButtonBox::Ok)->setShortcut(Qt::CTRL | Qt::Key_Return);
 
     connect(ui.name, &KLineEdit::textEdited, this, &RenameFile::updateButton);
-    connect(this, &RenameFile::okClicked, this, &RenameFile::rename);
+    connect(ui.buttonBox, &QDialogButtonBox::accepted, this, &RenameFile::accept);
+    connect(ui.buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
+    connect(this, &QDialog::accepted, this, &RenameFile::rename);
 }
 
 void RenameFile::updateButton()
@@ -55,7 +57,7 @@ void RenameFile::updateButton()
     dest.setPath(m_dest.toString() + newName);
 
     const bool enabled = !newName.isEmpty() && !QFile::exists(dest.toString());
-    enableButtonOk(enabled);
+    ui.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(enabled);
 }
 
 void RenameFile::rename()
diff --git a/ui/renamefile.h b/ui/renamefile.h
index 5c076a8..57db691 100644
--- a/ui/renamefile.h
+++ b/ui/renamefile.h
@@ -20,14 +20,14 @@
 #ifndef RENAMEFILE_H
 #define RENAMEFILE_H
 
-#include <KDialog>
+#include <QDialog>
 #include <QUrl>
 
 #include "ui_renamefile.h"
 
 class FileModel;
 
-class RenameFile : public KDialog
+class RenameFile : public QDialog
 {
     Q_OBJECT
 
diff --git a/ui/renamefile.ui b/ui/renamefile.ui
index 2daf393..bc7ad05 100644
--- a/ui/renamefile.ui
+++ b/ui/renamefile.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>400</width>
-    <height>69</height>
+    <height>103</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
@@ -24,6 +24,16 @@
    <item>
     <widget class="KLineEdit" name="name"/>
    </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+     <property name="centerButtons">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <customwidgets>

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