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

List:       kde-commits
Subject:    [kmuddy] kmuddy/dialogs: more porting
From:       Tomas Mecir <null () kde ! org>
Date:       2018-03-31 19:47:15
Message-ID: E1f2MT5-0001ET-WE () code ! kde ! org
[Download RAW message or body]

Git commit 267c9d39f2dd3b80cef6032d10a54de5abdb4eeb by Tomas Mecir.
Committed on 31/03/2018 at 19:46.
Pushed by mecir into branch 'master'.

more porting

M  +1    -1    kmuddy/dialogs/dlgmxpconsole.cpp
M  +0    -4    kmuddy/dialogs/dlgoutputwindow.cpp
M  +12   -12   kmuddy/dialogs/dlgwindows.cpp

https://commits.kde.org/kmuddy/267c9d39f2dd3b80cef6032d10a54de5abdb4eeb

diff --git a/kmuddy/dialogs/dlgmxpconsole.cpp b/kmuddy/dialogs/dlgmxpconsole.cpp
index 1ae00f8..9e163e5 100644
--- a/kmuddy/dialogs/dlgmxpconsole.cpp
+++ b/kmuddy/dialogs/dlgmxpconsole.cpp
@@ -60,7 +60,7 @@ void dlgMXPConsole::addLine (const QString &line)
   sb->setValue (sb->maximum ());
 }
 
-QSize dlgObjects::sizeHint() const
+QSize dlgMXPConsole::sizeHint() const
 {
   return QSize (300, 200);
 }
diff --git a/kmuddy/dialogs/dlgoutputwindow.cpp b/kmuddy/dialogs/dlgoutputwindow.cpp
index ffde130..a4f9c3f 100644
--- a/kmuddy/dialogs/dlgoutputwindow.cpp
+++ b/kmuddy/dialogs/dlgoutputwindow.cpp
@@ -42,15 +42,11 @@ dlgOutputWindow::dlgOutputWindow (QWidget *parent) : \
QDialog(parent)  setFocusPolicy (Qt::StrongFocus);
 
   owindow = new cConsole(this);
-  //our window shall also have a status bar
-  owindow->setVScrollBarMode (Q3ScrollView::AlwaysOn);
 
   //no session information yet, will set it when it's available
   sess = 0;
   owindow->setSession (0);
 
-  KDialog::resizeLayout (this, 0, 5);
-  
   KWindowSystem::setType(this->winId(), NET::Utility);
 
   layout->setMargin (0);
diff --git a/kmuddy/dialogs/dlgwindows.cpp b/kmuddy/dialogs/dlgwindows.cpp
index a9dc7a2..fdb9c68 100644
--- a/kmuddy/dialogs/dlgwindows.cpp
+++ b/kmuddy/dialogs/dlgwindows.cpp
@@ -28,7 +28,8 @@ along with this program.  If not, see \
<http://www.gnu.org/licenses/>.  #include <klocale.h>
 #include <kpushbutton.h>
 
-#include <qlabel.h>
+#include <QDialogButtonBox>
+#include <QLabel>
 #include <QGridLayout>
 #include <QListWidget>
 #include <QVBoxLayout>
@@ -50,23 +51,16 @@ void dlgWindows::createDialog()
 {
   //initial dialog size
   setWindowTitle (i18n("Output Windows"));
-  setButtons (KDialog::Ok);
   
   //create main dialog's widget
-  QWidget *page = new QWidget (this);
-  QGridLayout *layout = new QGridLayout (page);
-
-  setMainWidget (page);
-
-  //change button text
-  setButtonText (KDialog::Ok, i18n ("Done"));
+  QGridLayout *layout = new QGridLayout (this);
 
   //create widgets
-  QLabel *label = new QLabel (i18n ("&List of output windows"), page);
-  box = new QListWidget (page);
+  QLabel *label = new QLabel (i18n ("&List of output windows"), this);
+  box = new QListWidget (this);
   label->setBuddy (box);
   
-  QFrame *buttons = new QFrame (page);
+  QFrame *buttons = new QFrame (this);
   QVBoxLayout *buttonslayout = new QVBoxLayout (buttons);
   
   btshow = new KPushButton (i18n("&Show"), buttons);
@@ -80,6 +74,12 @@ void dlgWindows::createDialog()
   buttonslayout->addWidget (btdelete);
   buttonslayout->addStretch (10);
 
+  QDialogButtonBox *dlgbuttons = new QDialogButtonBox (QDialogButtonBox::Ok | \
QDialogButtonBox::Cancel, this); +  QPushButton *button = dlgbuttons->button \
(QDialogButtonBox::Ok); +  button->setText (i18n ("&Dont"));
+  connect (dlgbuttons, &QDialogButtonBox::accepted, this, &QDialog::accept);
+  connect (dlgbuttons, &QDialogButtonBox::rejected, this, &QDialog::reject);
+
   layout->setColumnStretch (0, 10);
   layout->setRowStretch (1, 10);
   layout->setSpacing (5);


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