mirror of
https://invent.kde.org/network/falkon.git
synced 2024-12-20 02:36:34 +01:00
[Preferences][Win] Changed labels on "Set as default" button.
Also renamed QtSingleApplication::removeLockedFile to removeLockFile
This commit is contained in:
nowrep
parent
43d514a647
commit
35ceee25ee
2
src/lib/3rdparty/qtsingleapplication.cpp
vendored
2
src/lib/3rdparty/qtsingleapplication.cpp
vendored
@ -277,7 +277,7 @@ QWidget* QtSingleApplication::activationWindow() const
|
||||
return actWin;
|
||||
}
|
||||
|
||||
void QtSingleApplication::removeLockedFile()
|
||||
void QtSingleApplication::removeLockFile()
|
||||
{
|
||||
peer->removeLockedFile();
|
||||
}
|
||||
|
||||
2
src/lib/3rdparty/qtsingleapplication.h
vendored
2
src/lib/3rdparty/qtsingleapplication.h
vendored
@ -84,7 +84,7 @@ public:
|
||||
void initialize(bool dummy = true)
|
||||
{ isRunning(); Q_UNUSED(dummy) }
|
||||
|
||||
void removeLockedFile();
|
||||
void removeLockFile();
|
||||
|
||||
public Q_SLOTS:
|
||||
bool sendMessage(const QString &message, int timeout = 5000);
|
||||
|
||||
@ -747,7 +747,7 @@ void MainApplication::quitApplication()
|
||||
//
|
||||
// * this can occur on Mac OS (see #157)
|
||||
|
||||
removeLockedFile();
|
||||
removeLockFile();
|
||||
quit();
|
||||
}
|
||||
|
||||
|
||||
@ -109,11 +109,11 @@ Preferences::Preferences(QupZilla* mainClass, QWidget* parent)
|
||||
#ifdef Q_OS_WIN
|
||||
ui->checkDefaultBrowser->setChecked(settings.value("Web-Browser-Settings/CheckDefaultBrowser", DEFAULT_CHECK_DEFAULTBROWSER).toBool());
|
||||
if (mApp->associationManager()->isDefaultForAllCapabilities()) {
|
||||
ui->checkNowDefaultBrowser->setText(tr("QupZilla is default"));
|
||||
ui->checkNowDefaultBrowser->setText(tr("Default"));
|
||||
ui->checkNowDefaultBrowser->setEnabled(false);
|
||||
}
|
||||
else {
|
||||
ui->checkNowDefaultBrowser->setText(tr("Make QupZilla default"));
|
||||
ui->checkNowDefaultBrowser->setText(tr("Set as default"));
|
||||
ui->checkNowDefaultBrowser->setEnabled(true);
|
||||
connect(ui->checkNowDefaultBrowser, SIGNAL(clicked()), this, SLOT(makeQupZillaDefault()));
|
||||
}
|
||||
@ -530,7 +530,7 @@ void Preferences::makeQupZillaDefault()
|
||||
#ifdef Q_OS_WIN
|
||||
disconnect(ui->checkNowDefaultBrowser, SIGNAL(clicked()), this, SLOT(makeQupZillaDefault()));
|
||||
mApp->associationManager()->registerAllAssociation();
|
||||
ui->checkNowDefaultBrowser->setText(tr("QupZilla is default"));
|
||||
ui->checkNowDefaultBrowser->setText(tr("Default"));
|
||||
ui->checkNowDefaultBrowser->setEnabled(false);
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -2202,22 +2202,22 @@
|
||||
<context>
|
||||
<name>MainApplication</name>
|
||||
<message>
|
||||
<location filename="../src/lib/app/mainapplication.cpp" line="958"/>
|
||||
<location filename="../src/lib/app/mainapplication.cpp" line="959"/>
|
||||
<source>QupZilla is not currently your default browser. Would you like to make it your default browser?</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/lib/app/mainapplication.cpp" line="959"/>
|
||||
<location filename="../src/lib/app/mainapplication.cpp" line="960"/>
|
||||
<source>Always perform this check when starting QupZilla.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/lib/app/mainapplication.cpp" line="961"/>
|
||||
<location filename="../src/lib/app/mainapplication.cpp" line="962"/>
|
||||
<source>Default Browser</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/lib/app/mainapplication.cpp" line="981"/>
|
||||
<location filename="../src/lib/app/mainapplication.cpp" line="982"/>
|
||||
<source>QupZilla is a new, fast and secure open-source WWW browser. QupZilla is licensed under GPL version 3 or (at your option) any later version. It is based on WebKit core and Qt Framework.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
@ -2578,67 +2578,67 @@
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/lib/preferences/preferences.ui" line="37"/>
|
||||
<location filename="../src/lib/preferences/preferences.ui" line="2653"/>
|
||||
<source>QupZilla</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/lib/preferences/preferences.ui" line="91"/>
|
||||
<location filename="../src/lib/preferences/preferences.ui" line="60"/>
|
||||
<source>General</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/lib/preferences/preferences.ui" line="96"/>
|
||||
<location filename="../src/lib/preferences/preferences.ui" line="65"/>
|
||||
<source>Appearance</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/lib/preferences/preferences.ui" line="101"/>
|
||||
<location filename="../src/lib/preferences/preferences.ui" line="70"/>
|
||||
<source>Tabs</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/lib/preferences/preferences.ui" line="106"/>
|
||||
<location filename="../src/lib/preferences/preferences.ui" line="75"/>
|
||||
<source>Browsing</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/lib/preferences/preferences.ui" line="111"/>
|
||||
<location filename="../src/lib/preferences/preferences.ui" line="80"/>
|
||||
<source>Fonts</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/lib/preferences/preferences.ui" line="116"/>
|
||||
<location filename="../src/lib/preferences/preferences.ui" line="85"/>
|
||||
<source>Keyboard Shortcuts</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/lib/preferences/preferences.ui" line="121"/>
|
||||
<location filename="../src/lib/preferences/preferences.ui" line="90"/>
|
||||
<source>Downloads</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/lib/preferences/preferences.ui" line="126"/>
|
||||
<location filename="../src/lib/preferences/preferences.ui" line="95"/>
|
||||
<source>Password Manager</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/lib/preferences/preferences.ui" line="131"/>
|
||||
<location filename="../src/lib/preferences/preferences.ui" line="100"/>
|
||||
<source>Privacy</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/lib/preferences/preferences.ui" line="136"/>
|
||||
<location filename="../src/lib/preferences/preferences.ui" line="105"/>
|
||||
<source>Notifications</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/lib/preferences/preferences.ui" line="141"/>
|
||||
<location filename="../src/lib/preferences/preferences.ui" line="110"/>
|
||||
<source>Extensions</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/lib/preferences/preferences.ui" line="146"/>
|
||||
<location filename="../src/lib/preferences/preferences.ui" line="115"/>
|
||||
<source>Other</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
@ -2650,7 +2650,7 @@
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/lib/preferences/preferences.ui" line="204"/>
|
||||
<location filename="../src/lib/preferences/preferences.cpp" line="796"/>
|
||||
<location filename="../src/lib/preferences/preferences.cpp" line="801"/>
|
||||
<source>Note: You cannot delete active profile.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
@ -3494,89 +3494,89 @@
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/lib/preferences/preferences.cpp" line="111"/>
|
||||
<location filename="../src/lib/preferences/preferences.cpp" line="528"/>
|
||||
<source>QupZilla is default</source>
|
||||
<location filename="../src/lib/preferences/preferences.cpp" line="112"/>
|
||||
<location filename="../src/lib/preferences/preferences.cpp" line="533"/>
|
||||
<source>Default</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/lib/preferences/preferences.cpp" line="115"/>
|
||||
<source>Make QupZilla default</source>
|
||||
<location filename="../src/lib/preferences/preferences.cpp" line="116"/>
|
||||
<source>Set as default</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/lib/preferences/preferences.cpp" line="512"/>
|
||||
<location filename="../src/lib/preferences/preferences.cpp" line="517"/>
|
||||
<source>OSD Notification</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/lib/preferences/preferences.cpp" line="513"/>
|
||||
<location filename="../src/lib/preferences/preferences.cpp" line="518"/>
|
||||
<source>Drag it on the screen to place it where you want.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/lib/preferences/preferences.cpp" line="554"/>
|
||||
<location filename="../src/lib/preferences/preferences.cpp" line="559"/>
|
||||
<source>Choose download location...</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/lib/preferences/preferences.cpp" line="568"/>
|
||||
<location filename="../src/lib/preferences/preferences.cpp" line="573"/>
|
||||
<source>Choose stylesheet location...</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/lib/preferences/preferences.cpp" line="579"/>
|
||||
<location filename="../src/lib/preferences/preferences.cpp" line="584"/>
|
||||
<source>Deleted</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/lib/preferences/preferences.cpp" line="585"/>
|
||||
<location filename="../src/lib/preferences/preferences.cpp" line="590"/>
|
||||
<source>Choose executable location...</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/lib/preferences/preferences.cpp" line="709"/>
|
||||
<location filename="../src/lib/preferences/preferences.cpp" line="714"/>
|
||||
<source>Choose cache path...</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/lib/preferences/preferences.cpp" line="750"/>
|
||||
<location filename="../src/lib/preferences/preferences.cpp" line="755"/>
|
||||
<source>New Profile</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/lib/preferences/preferences.cpp" line="750"/>
|
||||
<location filename="../src/lib/preferences/preferences.cpp" line="755"/>
|
||||
<source>Enter the new profile's name:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/lib/preferences/preferences.cpp" line="757"/>
|
||||
<location filename="../src/lib/preferences/preferences.cpp" line="761"/>
|
||||
<location filename="../src/lib/preferences/preferences.cpp" line="762"/>
|
||||
<location filename="../src/lib/preferences/preferences.cpp" line="766"/>
|
||||
<source>Error!</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/lib/preferences/preferences.cpp" line="757"/>
|
||||
<location filename="../src/lib/preferences/preferences.cpp" line="762"/>
|
||||
<source>This profile already exists!</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/lib/preferences/preferences.cpp" line="761"/>
|
||||
<location filename="../src/lib/preferences/preferences.cpp" line="766"/>
|
||||
<source>Cannot create profile directory!</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/lib/preferences/preferences.cpp" line="781"/>
|
||||
<location filename="../src/lib/preferences/preferences.cpp" line="786"/>
|
||||
<source>Confirmation</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/lib/preferences/preferences.cpp" line="782"/>
|
||||
<location filename="../src/lib/preferences/preferences.cpp" line="787"/>
|
||||
<source>Are you sure to permanently delete "%1" profile? This action cannot be undone!</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/lib/preferences/preferences.cpp" line="1064"/>
|
||||
<location filename="../src/lib/preferences/preferences.cpp" line="1069"/>
|
||||
<source>Select Color</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
@ -5911,6 +5911,16 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla
|
||||
<source>Choose file...</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/lib/webview/webpage.cpp" line="997"/>
|
||||
<source>Cannot read data from <b>%1</b>. Upload was cancelled!</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/lib/webview/webpage.cpp" line="998"/>
|
||||
<source>Cannot read file!</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>WebSearchBar</name>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user