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

List:       kde-commits
Subject:    [ark] /: Use again KWindowConfig::restoreWindowSize
From:       Elvis Angelaccio <elvis.angelaccio () kdemail ! net>
Date:       2016-02-27 15:34:24
Message-ID: E1aZgsy-0007LA-An () scm ! kde ! org
[Download RAW message or body]

Git commit 4301a1422df17e857e5b38e2b302e65493bb4363 by Elvis Angelaccio.
Committed on 27/02/2016 at 15:28.
Pushed by elvisangelaccio into branch 'master'.

Use again KWindowConfig::restoreWindowSize

It is not broken (not anymore, at least), so let's use it.

M  +1    -7    kerfuffle/createdialog.cpp
M  +1    -7    kerfuffle/extractiondialog.cpp
M  +1    -7    part/arkviewer.cpp

http://commits.kde.org/ark/4301a1422df17e857e5b38e2b302e65493bb4363

diff --git a/kerfuffle/createdialog.cpp b/kerfuffle/createdialog.cpp
index 823f0e0..b37073a 100644
--- a/kerfuffle/createdialog.cpp
+++ b/kerfuffle/createdialog.cpp
@@ -43,9 +43,7 @@
 #include <QLineEdit>
 #include <QMimeDatabase>
 #include <QPushButton>
-#include <QScreen>
 #include <QUrl>
-#include <QWindow>
 
 namespace Kerfuffle
 {
@@ -205,11 +203,7 @@ void CreateDialog::restoreWindowSize()
 {
     // Restore window size from config file, needs a windowHandle so must be called \
after show()  KConfigGroup group(KSharedConfig::openConfig(), "AddDialog");
-    //KWindowConfig::restoreWindowSize(windowHandle(), group);
-    //KWindowConfig::restoreWindowSize is broken atm., so we need this hack:
-    const QRect desk = windowHandle()->screen()->geometry();
-    this->resize(QSize(group.readEntry(QString::fromLatin1("Width \
                %1").arg(desk.width()), windowHandle()->size().width()),
-                     group.readEntry(QString::fromLatin1("Height \
%1").arg(desk.height()), windowHandle()->size().height()))); +    \
KWindowConfig::restoreWindowSize(windowHandle(), group);  }
 
 void CreateDialog::slotSaveWindowSize()
diff --git a/kerfuffle/extractiondialog.cpp b/kerfuffle/extractiondialog.cpp
index 284047a..bfd014d 100644
--- a/kerfuffle/extractiondialog.cpp
+++ b/kerfuffle/extractiondialog.cpp
@@ -36,8 +36,6 @@
 
 #include <QDir>
 #include <QPushButton>
-#include <QWindow>
-#include <QScreen>
 
 #include "ui_extractiondialog.h"
 
@@ -269,10 +267,6 @@ void ExtractionDialog::restoreWindowSize()
 {
   // Restore window size from config file, needs a windowHandle so must be called \
after show()  KConfigGroup group(KSharedConfig::openConfig(), "ExtractDialog");
-  //KWindowConfig::restoreWindowSize(windowHandle(), group);
-  //KWindowConfig::restoreWindowSize is broken atm., so we need this hack:
-  const QRect desk = windowHandle()->screen()->geometry();
-  this->resize(QSize(group.readEntry(QString::fromLatin1("Width \
                %1").arg(desk.width()), windowHandle()->size().width()),
-                     group.readEntry(QString::fromLatin1("Height \
%1").arg(desk.height()), windowHandle()->size().height()))); +  \
KWindowConfig::restoreWindowSize(windowHandle(), group);  }
 }
diff --git a/part/arkviewer.cpp b/part/arkviewer.cpp
index c05bc3e..f8971e9 100644
--- a/part/arkviewer.cpp
+++ b/part/arkviewer.cpp
@@ -39,8 +39,6 @@
 #include <QKeyEvent>
 #include <QPushButton>
 #include <QMimeDatabase>
-#include <QWindow>
-#include <QScreen>
 
 ArkViewer::ArkViewer(QWidget *parent, Qt::WindowFlags flags)
         : QDialog(parent, flags)
@@ -197,11 +195,7 @@ bool ArkViewer::viewInInternalViewer(const QString& fileName, \
const QMimeType &m  
     // Load viewer dialog window size from config file
     KConfigGroup group(KSharedConfig::openConfig(), "Viewer");
-    //KWindowConfig::restoreWindowSize is broken atm., so we need this hack:
-    //KWindowConfig::restoreWindowSize(this->windowHandle(), group);
-    const QRect desk = windowHandle()->screen()->geometry();
-    resize(group.readEntry(QString::fromLatin1("Width %1").arg(desk.width()), \
                windowHandle()->size().width()),
-           group.readEntry(QString::fromLatin1("Height %1").arg(desk.height()), \
windowHandle()->size().height())); +    \
KWindowConfig::restoreWindowSize(windowHandle(), group);  
     // Create a QFrame for the header
     QFrame *header = new QFrame();


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