Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00
Code Releases Activity

Final updates for 0.9.7 release

Browse Source
This commit is contained in:
nowrep 2011-03-05 13:16:13 +01:00
parent 67155b16d1
commit 23e61ceccf
9 changed files with 19 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
bin/locale/sk_SK.qm
View File

Binary file not shown.

7
src/app/mainapplication.cpp
View File

@ -178,10 +178,6 @@ void MainApplication::loadSettings()
QupZilla* MainApplication::getWindow()
{
QupZilla *active = qobject_cast<QupZilla*>(QApplication::activeWindow());
if (active)
return active;
for(int i=0; i<m_mainWindows.count(); i++) {
if (!m_mainWindows.at(i))
continue;
@ -233,9 +229,9 @@ void MainApplication::addNewTab(QUrl url)
void MainApplication::makeNewWindow(bool tryRestore, const QUrl &startUrl)
{
QupZilla* newWindow = new QupZilla(tryRestore, startUrl);
newWindow->show();
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)

2
src/app/mainapplication.h
View File

@ -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();

10
src/app/qupzilla.cpp
View File

@ -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()

2
src/app/qupzilla.h
View File

@ -182,7 +182,7 @@ private slots:
void fullScreen(bool make);
void startPrivate(bool state);
void quitApp();
bool quitApp();
private:
void setupUi();

2
src/downloads/downloadmanager.cpp
View File

@ -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);

2
src/preferences/preferences.cpp
View File

@ -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

46
src/preferences/preferences.ui
View File

@ -1039,27 +1039,20 @@
</widget>
</item>
<item row="3" column="1" colspan="2">
<widget class="QCheckBox" name="closeDownDialogOnFinish">
<property name="text">
<string>Automatically close download dialog after finish</string>
</property>
</widget>
</item>
<item row="4" column="1" colspan="2">
<widget class="QRadioButton" name="askEverytime">
<property name="text">
<string>Ask everytime for download location</string>
</property>
</widget>
</item>
<item row="5" column="1" colspan="2">
<item row="4" column="1" colspan="2">
<widget class="QRadioButton" name="useDefined">
<property name="text">
<string>Use defined location: </string>
</property>
</widget>
</item>
<item row="6" column="1" colspan="3">
<item row="5" column="1" colspan="3">
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QLineEdit" name="downLoc"/>
@ -1073,7 +1066,7 @@
</item>
</layout>
</item>
<item row="7" column="2">
<item row="6" column="2">
<spacer name="verticalSpacer_10">
<property name="orientation">
<enum>Qt::Vertical</enum>
@ -1086,36 +1079,7 @@
</property>
</spacer>
</item>
<item row="3" column="0">
<spacer name="horizontalSpacer_13">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="3" column="3">
<spacer name="horizontalSpacer_17">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="5" column="3">
<item row="4" column="3">
<spacer name="horizontalSpacer_18">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@ -1128,7 +1092,7 @@
</property>
</spacer>
</item>
<item row="6" column="0">
<item row="5" column="0">
<spacer name="horizontalSpacer_19">
<property name="orientation">
<enum>Qt::Horizontal</enum>

8
translations/sk_SK.ts
View File

@ -1495,7 +1495,7 @@ neexistuje!</translation>
<message>
<location filename="../src/preferences/preferences.ui" line="1424"/>
<source>SSL Manager</source>
<translation type="unfinished"></translation>
<translation>Správca SSL</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1463"/>
@ -2052,12 +2052,12 @@ Prosím pridajte si nejaký kliknutím na RSS ikonku v navigačnom riadku.</tran
<message>
<location filename="../src/preferences/sslmanager.cpp" line="56"/>
<source>&lt;b&gt;Organization: &lt;/b&gt;</source>
<translation type="unfinished">&lt;b&gt;Organizácia: &lt;/b&gt;</translation>
<translation>&lt;b&gt;Organizácia: &lt;/b&gt;</translation>
</message>
<message>
<location filename="../src/preferences/sslmanager.cpp" line="57"/>
<source>&lt;b&gt;Domain Name: &lt;/b&gt;</source>
<translation type="unfinished">&lt;b&gt;Doména: &lt;/b&gt;</translation>
<translation>&lt;b&gt;Doména: &lt;/b&gt;</translation>
</message>
<message>
<location filename="../src/preferences/sslmanager.cpp" line="58"/>
@ -2077,7 +2077,7 @@ Prosím pridajte si nejaký kliknutím na RSS ikonku v navigačnom riadku.</tran
<message>
<location filename="../src/preferences/sslmanager.cpp" line="61"/>
<source>&lt;b&gt;Expiration Date: &lt;/b&gt;</source>
<translation type="unfinished">&lt;b&gt;Platnosť do: &lt;/b&gt;</translation>
<translation>&lt;b&gt;Platnosť do: &lt;/b&gt;</translation>
</message>
<message>
<location filename="../src/preferences/sslmanager.cpp" line="67"/>