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

List:       kde-commits
Subject:    [kget/kf5_port] ui: Port NewTransferDialog to QDialog
From:       Lukas Appelhans <l.appelhans () gmx ! de>
Date:       2014-10-29 11:41:22
Message-ID: E1XjRcw-0004q4-CL () scm ! kde ! org
[Download RAW message or body]

Git commit b0ed30269239074b4eceae52f0149865d7c6d44a by Lukas Appelhans.
Committed on 29/10/2014 at 10:47.
Pushed by lappelhans into branch 'kf5_port'.

Port NewTransferDialog to QDialog

M  +13   -14   ui/newtransferdialog.cpp
M  +1    -1    ui/newtransferdialog.h
M  +15   -6    ui/newtransferwidget.ui

http://commits.kde.org/kget/b0ed30269239074b4eceae52f0149865d7c6d44a

diff --git a/ui/newtransferdialog.cpp b/ui/newtransferdialog.cpp
index e3350cd..0875edb 100644
--- a/ui/newtransferdialog.cpp
+++ b/ui/newtransferdialog.cpp
@@ -42,21 +42,18 @@ Q_GLOBAL_STATIC(NewTransferDialogHandler, \
newTransferDialogHandler)  
 
 NewTransferDialog::NewTransferDialog(QWidget *parent)
-  : KDialog(parent),
+  : QDialog(parent),
     m_window(0),
     m_existingTransfer(0),
     m_multiple(false),
     m_overWriteSingle(false)
 {
     setModal(true);
-    setCaption(i18n("New Download"));
-    showButtonSeparator(true);
+    setWindowTitle(i18n("New Download"));
+    
+    ui.setupUi(this);
 
-    QWidget *widget = new QWidget(this);
-    ui.setupUi(widget);
-    setMainWidget(widget);
-
-    enableButtonOk(false);
+    ui.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
 
     //timer to avoid constant checking of the input
     m_timer = new QTimer(this);
@@ -84,6 +81,8 @@ NewTransferDialog::NewTransferDialog(QWidget *parent)
     connect(ui.urlRequester, SIGNAL(textChanged(QString)), this, \
                SLOT(inputTimer()));
     connect(ui.listWidget, SIGNAL(itemChanged(QListWidgetItem*)), this, \
SLOT(inputTimer()));  connect(this, SIGNAL(finished(int)), this, \
SLOT(slotFinished(int))); +    connect(ui.buttonBox, &QDialogButtonBox::accepted, \
this, &QDialog::accept); +    connect(ui.buttonBox, &QDialogButtonBox::rejected, \
this, &QDialog::reject);  }
 
 NewTransferDialog::~NewTransferDialog()
@@ -250,11 +249,11 @@ void NewTransferDialog::setDefaultDestination()
 
 void NewTransferDialog::prepareDialog()
 {
-    /*if (m_window) {
-        KWindowInfo info = KWindowSystem::windowInfo(m_window->winId(), \
NET::WMDesktop, NET::WMDesktop); +    if (m_window) {
+        KWindowInfo info = KWindowSystem::windowInfo(m_window->winId(), \
NET::WMDesktop);  KWindowSystem::setCurrentDesktop(info.desktop());
         KWindowSystem::forceActiveWindow(m_window->winId());
-    }*/
+    }
 
     qCDebug(KGET_DEBUG) << "Show the dialog!";
     show();
@@ -267,7 +266,7 @@ bool NewTransferDialog::isEmpty()
 
 void NewTransferDialog::inputTimer()
 {
-    enableButtonOk(false);
+    ui.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
     m_timer->start();
 }
 
@@ -377,9 +376,9 @@ void NewTransferDialog::checkInput()
 
     //activate the ok button
     if (m_multiple) {
-        enableButtonOk(folderValid && filesChecked);
+        ui.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(folderValid && \
filesChecked);  } else {
-        enableButtonOk((folderValid || destinationValid) && sourceValid);
+        ui.buttonBox->button(QDialogButtonBox::Ok)->setEnabled((folderValid || \
destinationValid) && sourceValid);  }
 
     qCDebug(KGET_DEBUG) << source << source.fileName() << dest << dest.fileName() << \
                "Folder valid:" << folderValid
diff --git a/ui/newtransferdialog.h b/ui/newtransferdialog.h
index d21bedb..53f3c91 100644
--- a/ui/newtransferdialog.h
+++ b/ui/newtransferdialog.h
@@ -32,7 +32,7 @@ class TransferHandler;
 * 
 * @note this class is private and should be used via NewTransferDialogHandler
 */
-class NewTransferDialog : public KDialog
+class NewTransferDialog : public QDialog
 {
     Q_OBJECT
 
diff --git a/ui/newtransferwidget.ui b/ui/newtransferwidget.ui
index ccc584b..6b03eed 100644
--- a/ui/newtransferwidget.ui
+++ b/ui/newtransferwidget.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>400</width>
-    <height>367</height>
+    <height>246</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
@@ -74,20 +74,28 @@
      </item>
     </layout>
    </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
-   <class>KUrlRequester</class>
-   <extends>QFrame</extends>
-   <header>kurlrequester.h</header>
-  </customwidget>
-  <customwidget>
    <class>KListWidget</class>
    <extends>QListWidget</extends>
    <header>klistwidget.h</header>
   </customwidget>
   <customwidget>
+   <class>KUrlRequester</class>
+   <extends>QFrame</extends>
+   <header>kurlrequester.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
    <class>KLineEdit</class>
    <extends>QLineEdit</extends>
    <header>klineedit.h</header>
@@ -96,6 +104,7 @@
    <class>KUrlComboRequester</class>
    <extends>KUrlRequester</extends>
    <header>kurlrequester.h</header>
+   <container>1</container>
   </customwidget>
   <customwidget>
    <class>KComboBox</class>


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