From 23e61ceccfcbfca7e8cec1404227d8aed5058daa Mon Sep 17 00:00:00 2001 From: nowrep Date: Sat, 5 Mar 2011 13:16:13 +0100 Subject: [PATCH] Final updates for 0.9.7 release --- bin/locale/sk_SK.qm | Bin 48768 -> 49336 bytes src/app/mainapplication.cpp | 7 +---- src/app/mainapplication.h | 2 +- src/app/qupzilla.cpp | 10 ++++--- src/app/qupzilla.h | 2 +- src/downloads/downloadmanager.cpp | 2 +- src/preferences/preferences.cpp | 2 -- src/preferences/preferences.ui | 46 ++++-------------------------- translations/sk_SK.ts | 8 +++--- 9 files changed, 19 insertions(+), 60 deletions(-) diff --git a/bin/locale/sk_SK.qm b/bin/locale/sk_SK.qm index 8a8b29026016eaa12c59cae14b2e7a63f0d633d3..821c232eaa424732b2362bf4a00890a9caeecafb 100644 GIT binary patch delta 7816 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 Il?mbh1)r%jC;$Ke diff --git a/src/app/mainapplication.cpp b/src/app/mainapplication.cpp index 0aef8c387..4f68c655b 100644 --- a/src/app/mainapplication.cpp +++ b/src/app/mainapplication.cpp @@ -178,10 +178,6 @@ void MainApplication::loadSettings() QupZilla* MainApplication::getWindow() { - QupZilla *active = qobject_cast(QApplication::activeWindow()); - if (active) - return active; - for(int i=0; ishow(); connect(newWindow, SIGNAL(message(MainApplication::MessageType,bool)), this, SLOT(sendMessages(MainApplication::MessageType,bool))); m_mainWindows.append(newWindow); + newWindow->show(); } void MainApplication::connectDatabase() @@ -282,7 +278,6 @@ void MainApplication::quitApplication() return; } - delete m_updater; m_isClosing = true; if (m_mainWindows.count() > 0) diff --git a/src/app/mainapplication.h b/src/app/mainapplication.h index ff955bc5f..fc9fd8874 100644 --- a/src/app/mainapplication.h +++ b/src/app/mainapplication.h @@ -67,8 +67,8 @@ public: inline QString getActiveLanguage() { return m_activeLanguage; } inline bool isClosing() { return m_isClosing; } inline bool isExited() { return m_isExited; } - inline int windowCount() { return m_mainWindows.count(); } bool checkProfileDir(); + inline int windowCount() { return m_mainWindows.count(); } QupZilla* getWindow(); BookmarksManager* bookmarksManager(); diff --git a/src/app/qupzilla.cpp b/src/app/qupzilla.cpp index e77e30899..77a1112d0 100644 --- a/src/app/qupzilla.cpp +++ b/src/app/qupzilla.cpp @@ -655,7 +655,7 @@ void QupZilla::closeEvent(QCloseEvent* event) if (mApp->isClosing()) return; if (mApp->windowCount() == 1) { - quitApp(); + quitApp() ? event->accept() : event->ignore(); return; } @@ -664,20 +664,22 @@ void QupZilla::closeEvent(QCloseEvent* event) event->accept(); } -void QupZilla::quitApp() +bool QupZilla::quitApp() { QSettings settings(m_activeProfil+"settings.ini", QSettings::IniFormat); settings.beginGroup("Web-URL-Settings"); if (settings.value("afterLaunch",0).toInt()!=2 && m_tabWidget->count()>1) { QMessageBox::StandardButton button = QMessageBox::warning(this, tr("There are still open tabs"), - tr("There are still %1 open tabs and your session won't be stored. Are you sure to quit?").arg(m_tabWidget->count()), QMessageBox::Yes | QMessageBox::No); + tr("There are still %1 open tabs and your session won't be stored. Are you sure to quit?").arg(m_tabWidget->count()), QMessageBox::Yes | QMessageBox::No); if (button != QMessageBox::Yes) - return; + return false; } settings.endGroup(); + mApp->aboutToCloseWindow(this); mApp->quitApplication(); + return true; } QupZilla::~QupZilla() diff --git a/src/app/qupzilla.h b/src/app/qupzilla.h index 4edb24dfe..45d8cb0e0 100644 --- a/src/app/qupzilla.h +++ b/src/app/qupzilla.h @@ -182,7 +182,7 @@ private slots: void fullScreen(bool make); void startPrivate(bool state); - void quitApp(); + bool quitApp(); private: void setupUi(); diff --git a/src/downloads/downloadmanager.cpp b/src/downloads/downloadmanager.cpp index 821dec3e3..11171f266 100644 --- a/src/downloads/downloadmanager.cpp +++ b/src/downloads/downloadmanager.cpp @@ -241,7 +241,7 @@ bool DownloadManager::canClose() void DownloadManager::closeEvent(QCloseEvent *e) { - if (!mApp->getWindow()) { // No main windows -> we are going to quit + if (mApp->windowCount() == 0) { // No main windows -> we are going to quit if (!canClose()){ QMessageBox::StandardButton button = QMessageBox::warning(this, tr("Warning"), tr("Are you sure to quit? All uncompleted downloads will be cancelled!"), QMessageBox::Yes | QMessageBox::No); diff --git a/src/preferences/preferences.cpp b/src/preferences/preferences.cpp index f20eb54c5..f92b9b245 100644 --- a/src/preferences/preferences.cpp +++ b/src/preferences/preferences.cpp @@ -170,7 +170,6 @@ Preferences::Preferences(QupZilla* mainClass, QWidget *parent) : else ui->useDefined->setChecked(true); connect(ui->useDefined, SIGNAL(toggled(bool)), this, SLOT(downLocChanged(bool))); - ui->closeDownDialogOnFinish->setChecked( settings.value("autoCloseOnFinish",false).toBool() ); connect(ui->downButt, SIGNAL(clicked()), this, SLOT(chooseDownPath())); downLocChanged(ui->useDefined->isChecked()); settings.endGroup(); @@ -431,7 +430,6 @@ void Preferences::saveSettings() text+="/"; settings.setValue("defaultDownloadPath",text); } - settings.setValue("autoCloseOnFinish",ui->closeDownDialogOnFinish->isChecked()); settings.endGroup(); //BROWSING diff --git a/src/preferences/preferences.ui b/src/preferences/preferences.ui index 7e4b8e345..b00a46233 100644 --- a/src/preferences/preferences.ui +++ b/src/preferences/preferences.ui @@ -1039,27 +1039,20 @@ - - - Automatically close download dialog after finish - - - - Ask everytime for download location - + Use defined location: - + @@ -1073,7 +1066,7 @@ - + Qt::Vertical @@ -1086,36 +1079,7 @@ - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 20 - 20 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - + Qt::Horizontal @@ -1128,7 +1092,7 @@ - + Qt::Horizontal diff --git a/translations/sk_SK.ts b/translations/sk_SK.ts index 2fa5f3090..e56b1d47a 100644 --- a/translations/sk_SK.ts +++ b/translations/sk_SK.ts @@ -1495,7 +1495,7 @@ neexistuje! SSL Manager - + Správca SSL @@ -2052,12 +2052,12 @@ Prosím pridajte si nejaký kliknutím na RSS ikonku v navigačnom riadku. <b>Organization: </b> - <b>Organizácia: </b> + <b>Organizácia: </b> <b>Domain Name: </b> - <b>Doména: </b> + <b>Doména: </b> @@ -2077,7 +2077,7 @@ Prosím pridajte si nejaký kliknutím na RSS ikonku v navigačnom riadku. <b>Expiration Date: </b> - <b>Platnosť do: </b> + <b>Platnosť do: </b>