Imported Upstream version 2.9.1

1 files changed, 24 insertions, 24 deletions

diff --git a/src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp b/src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp
index f0547b8..42febaa 100644
--- a/src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp
+++ b/src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp
@@ -18,34 +18,39 @@
 
 static BtModuleManagerDialog *m_staticModuleManagerDialog = 0;
 
-BtModuleManagerDialog* BtModuleManagerDialog::getInstance(QWidget* parent) {
-    if (!m_staticModuleManagerDialog) {
-        m_staticModuleManagerDialog = new BtModuleManagerDialog(parent);
-    };
+BtModuleManagerDialog* BtModuleManagerDialog::getInstance(QWidget *parent,
+                                                          Qt::WindowFlags flags)
+{
+    if (m_staticModuleManagerDialog) {
+        m_staticModuleManagerDialog->setParent(parent, flags);
+    } else {
+        m_staticModuleManagerDialog = new BtModuleManagerDialog(parent, flags);
+    }
     Q_ASSERT(m_staticModuleManagerDialog);
     return m_staticModuleManagerDialog;
 }
 
-BtModuleManagerDialog::BtModuleManagerDialog(QWidget* parent)
-        : BtConfigDialog(parent) {
+BtModuleManagerDialog::BtModuleManagerDialog(QWidget *parent,
+                                             Qt::WindowFlags flags)
+    : BtConfigDialog(parent,
+                     flags | Qt::CustomizeWindowHint | Qt::WindowTitleHint
+                           | Qt::WindowCloseButtonHint | Qt::WindowMaximizeButtonHint)
+{
     setAttribute(Qt::WA_DeleteOnClose);
-    setWindowTitle(tr("Bookshelf Manager"));
 
-    // Install page
-    BtInstallPage* installPage = new BtInstallPage();
-    addPage(installPage);
+    addPage(new BtInstallPage());
+    addPage(new BtRemovePage());
+    addPage(new BtIndexPage());
 
-    //Uninstall page
-    BtRemovePage* removePage = new BtRemovePage();
-    addPage(removePage);
+    retranslateUi();
 
-    //Index page
-    BtIndexPage* indexPage = new BtIndexPage();
-    addPage(indexPage);
+    loadDialogSettings();
+    setCurrentPage(0);
 
-    slotChangePage(0);
+}
 
-    loadDialogSettings();
+void BtModuleManagerDialog::retranslateUi() {
+    setWindowTitle(tr("Bookshelf Manager"));
 }
 
 BtModuleManagerDialog::~BtModuleManagerDialog() {
@@ -53,17 +58,12 @@ BtModuleManagerDialog::~BtModuleManagerDialog() {
     m_staticModuleManagerDialog = 0;
 }
 
-// The QWidget close() sends close event, so does closing by the window X button.
-void BtModuleManagerDialog::closeEvent(QCloseEvent*) {
-    qDebug() << "BtModuleManagerDialog::closeEvent";
-}
-
 void BtModuleManagerDialog::loadDialogSettings() {
     resize(CBTConfig::get(CBTConfig::bookshelfWidth), CBTConfig::get(CBTConfig::bookshelfHeight));
     move(CBTConfig::get(CBTConfig::bookshelfPosX), CBTConfig::get(CBTConfig::bookshelfPosY));
 }
 
-void BtModuleManagerDialog::saveDialogSettings() {
+void BtModuleManagerDialog::saveDialogSettings() const {
     CBTConfig::set(CBTConfig::bookshelfWidth, size().width());
     CBTConfig::set(CBTConfig::bookshelfHeight, size().height());
     CBTConfig::set(CBTConfig::bookshelfPosX, x());