web/surfer
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

save as dialog cleanups, #refs 145; rearrangements for debug; refs #153

Browse Source
This commit is contained in:
Marc Wäckerlin
2012-05-09 08:49:32 +00:00
parent 427db75c68
commit 40a926571c
13 changed files with 504 additions and 449 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/browser.hxx
+4 -3
View File
@@ -65,7 +65,8 @@ class Browser: public QMainWindow, protected Ui::Browser {
Browser(const QString& actlib, const QStringList& urls = QStringList(), Browser(const QString& actlib, const QStringList& urls = QStringList(),
QSettings* settings=0, QSettings* settings=0,
Settings::MimeTypes mimeTypes = Settings::MimeTypes(), qbrowserlib::Settings::MimeTypes mimeTypes =
qbrowserlib::Settings::MimeTypes(),
bool kiosk = false, bool login = true, bool quirks=true, bool kiosk = false, bool login = true, bool quirks=true,
QString bookmarkfile=QString()): QString bookmarkfile=QString()):
_url(0), _find(new ButtonLineEdit), _url(0), _find(new ButtonLineEdit),
@@ -583,7 +584,7 @@ class Browser: public QMainWindow, protected Ui::Browser {
void newSettings() { void newSettings() {
_searchEngines->clear(); _searchEngines->clear();
for (Settings::SearchEngines::const_iterator for (qbrowserlib::Settings::SearchEngines::const_iterator
it(_settings.searchEngines().begin()); it(_settings.searchEngines().begin());
it!=_settings.searchEngines().end(); it++) it!=_settings.searchEngines().end(); it++)
if (QFile(":/icons/"+it.key()).exists()) if (QFile(":/icons/"+it.key()).exists())
@@ -1499,7 +1500,7 @@ class Browser: public QMainWindow, protected Ui::Browser {
QPrinter _printer; QPrinter _printer;
SslClientAuthNetworkAccessManager _networkManager; SslClientAuthNetworkAccessManager _networkManager;
QSharedPointer<DownloadManager> _downloadManager; QSharedPointer<DownloadManager> _downloadManager;
Settings _settings; qbrowserlib::Settings _settings;
ErrorLog _errorLog; ErrorLog _errorLog;
LoginCertificate _logincertificate; LoginCertificate _logincertificate;
gui::Proxy _proxy; gui::Proxy _proxy;
src/main.cxx
+65 -57
View File
@@ -239,6 +239,60 @@ void notrace(QtMsgType, const char*) {
extern QWEBKIT_EXPORT void qt_drt_overwritePluginDirectories(); extern QWEBKIT_EXPORT void qt_drt_overwritePluginDirectories();
QMap<QString, QString>& env() {
static QStringList l(QProcess::systemEnvironment());
static QMap<QString, QString> env;
if (env.isEmpty())
for (QStringList::iterator it(l.begin()); it!=l.end(); ++it) {
QStringList v(it->split('='));
QString key(*v.begin());
QString value((v.pop_front(), v.join("=")));
env.insert(key, value);
}
return env;
}
QString helptext() {
return QObject::trUtf8
("Usage: %1 [OPTIONS...] [<url> ...]\n"
"Options:\n"
" -h, --help show this help text\n"
" -d, --debug enable verbose debug mode\n"
" -t --tmp path temporary folder for data caching\n"
" -k, --kiosk no url bar\n"
" if you sepcify -k and -s, -k must be first\n"
" -q, --quirks alternate user interface\n"
" -n, --no-settings don't load or store any settings\n"
" --login ask for smartcard password at startup\n"
" -l, --lib <file> path to file libengine_act.so\n"
" -s, --settings <file>\n"
" load settings from <file>\n"
" if you sepcify -k and -s, -k must be first\n"
" -c, --cert <file> load local client certificate from <file>\n"
" -y, --key <file> load local certificate key from <file>\n"
" -m, --mime <mime> <ext> <tool>\n"
" start <tool> for mimetype <mime>\n"
" -b, --bookmarks <file>\n"
" load and save bookmarks from and to <file>\n"
" -e, --edit-bookmarks\n"
" start in bookmark-edition mode\n"
" <url> optional full URL\n"
"Environment:\n"
" LANGUAGE \"de\", \"en\", ... "
"(actual: %5)\n"
" PROXY_TYPE \"http\" or \"socks\" or \"\" "
"(actual: %2)\n"
" PROXY_PORT proxy port number (actual: %3)\n"
" PROXY_HOST proxy host name (actual: %4)\n"
" SWISS_USERAGENT fake user agent (actual: %6)\n"
" QT_PLUGIN_PATH path to plugins dir (actual: %7)\n"
" QTWEBKIT_PLUGIN_PATH path to netscape plugins (actual: %8)\n")
.arg(QFileInfo(QCoreApplication::arguments().at(0)).fileName())
.arg(env()["PROXY_TYPE"]).arg(env()["PROXY_PORT"]).arg(env()["PROXY_HOST"])
.arg(env()["LANGUAGE"]).arg(env()["SWISS_USERAGENT"])
.arg(env()["QT_PLUGIN_PATH"]).arg(env()["QTWEBKIT_PLUGIN_PATH"]);
}
int main(int argv, char** argc) try { int main(int argv, char** argc) try {
// qInstallMsgHandler(notrace); // qInstallMsgHandler(notrace);
// std::cout.rdbuf((new std::stringstream)->rdbuf()); // std::cout.rdbuf((new std::stringstream)->rdbuf());
@@ -264,16 +318,6 @@ int main(int argv, char** argc) try {
// certs.push_back(QSslCertificate(SWISSSIGN_PLATINUM_CA_G2)); // certs.push_back(QSslCertificate(SWISSSIGN_PLATINUM_CA_G2));
// sslConfig.setCaCertificates(certs); // sslConfig.setCaCertificates(certs);
//............................................................................ //............................................................................
QStringList l(QProcess::systemEnvironment());
QMap<QString, QString> env;
for (QStringList::iterator it(l.begin()); it!=l.end(); ++it) {
QStringList v(it->split('='));
QString key(*v.begin());
QString value((v.pop_front(), v.join("=")));
env.insert(key, value);
qDebug()<<"env:"<<key<<"="<<value;
}
//............................................................................
QTextCodec* utf8(QTextCodec::codecForName("UTF-8")); QTextCodec* utf8(QTextCodec::codecForName("UTF-8"));
QTextCodec::setCodecForCStrings(utf8); QTextCodec::setCodecForCStrings(utf8);
QTextCodec::setCodecForLocale(utf8); QTextCodec::setCodecForLocale(utf8);
@@ -283,23 +327,23 @@ int main(int argv, char** argc) try {
app.setApplicationName(QObject::trUtf8("SwissBrowser", "application name")); app.setApplicationName(QObject::trUtf8("SwissBrowser", "application name"));
app.setApplicationVersion(VERSION); app.setApplicationVersion(VERSION);
QTranslator qtTranslator; QTranslator qtTranslator;
if (env.contains("LANGUAGE")) QLocale::setDefault(env["LANGUAGE"]); if (env().contains("LANGUAGE")) QLocale::setDefault(env()["LANGUAGE"]);
qtTranslator.load(":/language/qt_" + QLocale().name()); qtTranslator.load(":/language/qt_" + QLocale().name());
app.installTranslator(&qtTranslator); app.installTranslator(&qtTranslator);
QTranslator appTranslator; QTranslator appTranslator;
appTranslator.load(":/language/swissbrowser_"+ QLocale().name()); appTranslator.load(":/language/swissbrowser_"+ QLocale().name());
app.installTranslator(&appTranslator); app.installTranslator(&appTranslator);
//............................................................................ //............................................................................
if (env["PROXY_TYPE"]=="http") if (env()["PROXY_TYPE"]=="http")
QNetworkProxy::setApplicationProxy QNetworkProxy::setApplicationProxy
(QNetworkProxy (QNetworkProxy
(QNetworkProxy::HttpProxy, (QNetworkProxy::HttpProxy,
env["PROXY_HOST"], env["PROXY_PORT"].toInt())); env()["PROXY_HOST"], env()["PROXY_PORT"].toInt()));
if (env["PROXY_TYPE"]=="socks") if (env()["PROXY_TYPE"]=="socks")
QNetworkProxy::setApplicationProxy QNetworkProxy::setApplicationProxy
(QNetworkProxy (QNetworkProxy
(QNetworkProxy::Socks5Proxy, (QNetworkProxy::Socks5Proxy,
env["PROXY_HOST"], env["PROXY_PORT"].toInt())); env()["PROXY_HOST"], env()["PROXY_PORT"].toInt()));
else else
QNetworkProxyFactory::setUseSystemConfiguration(true); QNetworkProxyFactory::setUseSystemConfiguration(true);
qDebug()<<"***************************************************************"; qDebug()<<"***************************************************************";
@@ -332,7 +376,7 @@ int main(int argv, char** argc) try {
bool silent(false); bool silent(false);
bool quirks(false); bool quirks(false);
bool login(false); bool login(false);
Settings::MimeTypes mimetypes; qbrowserlib::Settings::MimeTypes mimetypes;
QString bookmarks; QString bookmarks;
bool editbookmarks(false); bool editbookmarks(false);
QStringList args(app.arguments()); QStringList args(app.arguments());
@@ -340,44 +384,7 @@ int main(int argv, char** argc) try {
(std::auto_ptr<QSettings>(new QSettings("SwissSign", "SwissBrowser"))); (std::auto_ptr<QSettings>(new QSettings("SwissSign", "SwissBrowser")));
for (QStringList::iterator it(args.begin()); ++it!=args.end();) for (QStringList::iterator it(args.begin()); ++it!=args.end();)
if (*it=="-h" || *it=="--help" || *it=="-help" || *it=="/?") { if (*it=="-h" || *it=="--help" || *it=="-help" || *it=="/?") {
std::cout<<QObject::trUtf8 std::cout<<helptext().toStdString()<<std::endl;
("Usage: %1 [OPTIONS...] [<url> ...]\n"
"Options:\n"
" -h, --help show this help text\n"
" -t --tmp path temporary folder for data caching\n"
" -k, --kiosk no url bar\n"
" if you sepcify -k and -s, -k must be first\n"
" -q, --quirks alternate user interface\n"
" -n, --no-settings don't load or store any settings\n"
" --login ask for smartcard password at startup\n"
" -l, --lib <file> path to file libengine_act.so\n"
" -s, --settings <file>\n"
" load settings from <file>\n"
" if you sepcify -k and -s, -k must be first\n"
" -c, --cert <file> load local client certificate from <file>\n"
" -y, --key <file> load local certificate key from <file>\n"
" -m, --mime <mime> <ext> <tool>\n"
" start <tool> for mimetype <mime>\n"
" -b, --bookmarks <file>\n"
" load and save bookmarks from and to <file>\n"
" -e, --edit-bookmarks\n"
" start in bookmark-edition mode\n"
" <url> optional full URL\n"
"Environment:\n"
" LANGUAGE \"de\", \"en\", ... "
"(actual: %5)\n"
" PROXY_TYPE \"http\" or \"socks\" or \"\" "
"(actual: %2)\n"
" PROXY_PORT proxy port number (actual: %3)\n"
" PROXY_HOST proxy host name (actual: %4)\n"
" SWISS_USERAGENT fake user agent (actual: %6)\n"
" QT_PLUGIN_PATH path to plugins dir (actual: %7)\n"
" QTWEBKIT_PLUGIN_PATH path to netscape plugins (actual: %8)\n")
.arg(QFileInfo(argc[0]).fileName())
.arg(env["PROXY_TYPE"]).arg(env["PROXY_PORT"]).arg(env["PROXY_HOST"])
.arg(env["LANGUAGE"]).arg(env["SWISS_USERAGENT"])
.toStdString()
<<std::endl;
return 0; return 0;
} else if ((*it=="-t" || *it=="--tmp") && ++it!=args.end()) { } else if ((*it=="-t" || *it=="--tmp") && ++it!=args.end()) {
TMP=*it; TMP=*it;
@@ -441,8 +448,8 @@ int main(int argv, char** argc) try {
//............................................................................ //............................................................................
std::cerr<<"LIBRARY PATHES:\n"<<app.libraryPaths().join("\n").toStdString() std::cerr<<"LIBRARY PATHES:\n"<<app.libraryPaths().join("\n").toStdString()
<<std::endl; <<std::endl;
if (env.contains("QT_PLUGIN_PATH")) { if (env().contains("QT_PLUGIN_PATH")) {
foreach (QString path, env["QT_PLUGIN_PATH"].split(":")) { foreach (QString path, env()["QT_PLUGIN_PATH"].split(":")) {
std::cerr<<"**** Setting: PLUGIN-PATH to "<<path.toStdString()<<std::endl; std::cerr<<"**** Setting: PLUGIN-PATH to "<<path.toStdString()<<std::endl;
app.addLibraryPath(path); app.addLibraryPath(path);
} }
@@ -450,7 +457,8 @@ int main(int argv, char** argc) try {
std::cerr<<"**** Error: PLUGIN-PATH is not defined"<<std::endl; std::cerr<<"**** Error: PLUGIN-PATH is not defined"<<std::endl;
abort(); abort();
} }
if (env.contains("QTWEBKIT_PLUGIN_PATH")) qt_drt_overwritePluginDirectories(); if (env().contains("QTWEBKIT_PLUGIN_PATH"))
qt_drt_overwritePluginDirectories();
Browser browser(actlib, urls, settings.get(), mimetypes, silent, Browser browser(actlib, urls, settings.get(), mimetypes, silent,
login, quirks, bookmarks); login, quirks, bookmarks);
if (editbookmarks) browser.on_actionEditBookmarks_triggered(); if (editbookmarks) browser.on_actionEditBookmarks_triggered();
src/qbrowserlib/qbrowserlib_de.ts
+21 -13
View File
@@ -16,7 +16,7 @@
</message> </message>
<message> <message>
<location filename="saveorrun.ui" line="52"/> <location filename="saveorrun.ui" line="52"/>
<location filename="saveorrun.ui" line="99"/> <location filename="saveorrun.ui" line="109"/>
<source>browse ...</source> <source>browse ...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@@ -36,13 +36,13 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="saveorrun.ui" line="106"/> <location filename="saveorrun.ui" line="83"/>
<source>Run</source> <source>remember tool for this type</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="saveorrun.ui" line="113"/> <location filename="saveorrun.ui" line="116"/>
<source>remember tool for this type</source> <source>Run</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@@ -523,12 +523,12 @@ p, li { white-space: pre-wrap; }
<context> <context>
<name>qbrowserlib::SaveOrRun</name> <name>qbrowserlib::SaveOrRun</name>
<message> <message>
<location filename="saveorrun.hxx" line="130"/> <location filename="saveorrun.hxx" line="132"/>
<source>File Exists</source> <source>File Exists</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="saveorrun.hxx" line="131"/> <location filename="saveorrun.hxx" line="133"/>
<source>File already exists: <source>File already exists:
%1 %1
@@ -537,12 +537,12 @@ Overwrite?</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="saveorrun.hxx" line="143"/> <location filename="saveorrun.hxx" line="145"/>
<source>No Program</source> <source>No Program</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="saveorrun.hxx" line="144"/> <location filename="saveorrun.hxx" line="146"/>
<source>Not an executable Program: <source>Not an executable Program:
%1 %1
@@ -551,26 +551,34 @@ Specify full path to executable program</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="saveorrun.hxx" line="156"/> <location filename="saveorrun.hxx" line="158"/>
<source>Save File As ...</source> <source>Save File As ...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="saveorrun.hxx" line="169"/> <location filename="saveorrun.hxx" line="171"/>
<source>Open File With ...</source> <source>Open File With ...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="saveorrun.hxx" line="181"/> <location filename="saveorrun.hxx" line="183"/>
<source>Dokumente</source> <source>Dokumente</source>
<comment>Documents folder in local language</comment> <comment>Documents folder in local language</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="saveorrun.hxx" line="183"/> <location filename="saveorrun.hxx" line="185"/>
<source>Arbeitsfläche</source> <source>Arbeitsfläche</source>
<comment>Desktop folder in local language</comment> <comment>Desktop folder in local language</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context>
<name>qbrowserlib::SaveOrRunDialog</name>
<message>
<location filename="saveorrun.hxx" line="237"/>
<source>Unknown File Type</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS> </TS>
src/qbrowserlib/qbrowserlib_en.ts
+21 -13
View File
@@ -16,7 +16,7 @@
</message> </message>
<message> <message>
<location filename="saveorrun.ui" line="52"/> <location filename="saveorrun.ui" line="52"/>
<location filename="saveorrun.ui" line="99"/> <location filename="saveorrun.ui" line="109"/>
<source>browse ...</source> <source>browse ...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@@ -36,13 +36,13 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="saveorrun.ui" line="106"/> <location filename="saveorrun.ui" line="83"/>
<source>Run</source> <source>remember tool for this type</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="saveorrun.ui" line="113"/> <location filename="saveorrun.ui" line="116"/>
<source>remember tool for this type</source> <source>Run</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@@ -523,12 +523,12 @@ p, li { white-space: pre-wrap; }
<context> <context>
<name>qbrowserlib::SaveOrRun</name> <name>qbrowserlib::SaveOrRun</name>
<message> <message>
<location filename="saveorrun.hxx" line="130"/> <location filename="saveorrun.hxx" line="132"/>
<source>File Exists</source> <source>File Exists</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="saveorrun.hxx" line="131"/> <location filename="saveorrun.hxx" line="133"/>
<source>File already exists: <source>File already exists:
%1 %1
@@ -537,12 +537,12 @@ Overwrite?</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="saveorrun.hxx" line="143"/> <location filename="saveorrun.hxx" line="145"/>
<source>No Program</source> <source>No Program</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="saveorrun.hxx" line="144"/> <location filename="saveorrun.hxx" line="146"/>
<source>Not an executable Program: <source>Not an executable Program:
%1 %1
@@ -551,26 +551,34 @@ Specify full path to executable program</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="saveorrun.hxx" line="156"/> <location filename="saveorrun.hxx" line="158"/>
<source>Save File As ...</source> <source>Save File As ...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="saveorrun.hxx" line="169"/> <location filename="saveorrun.hxx" line="171"/>
<source>Open File With ...</source> <source>Open File With ...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="saveorrun.hxx" line="181"/> <location filename="saveorrun.hxx" line="183"/>
<source>Dokumente</source> <source>Dokumente</source>
<comment>Documents folder in local language</comment> <comment>Documents folder in local language</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="saveorrun.hxx" line="183"/> <location filename="saveorrun.hxx" line="185"/>
<source>Arbeitsfläche</source> <source>Arbeitsfläche</source>
<comment>Desktop folder in local language</comment> <comment>Desktop folder in local language</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context>
<name>qbrowserlib::SaveOrRunDialog</name>
<message>
<location filename="saveorrun.hxx" line="237"/>
<source>Unknown File Type</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS> </TS>
src/qbrowserlib/qbrowserlib_fr.ts
+21 -13
View File
@@ -16,7 +16,7 @@
</message> </message>
<message> <message>
<location filename="saveorrun.ui" line="52"/> <location filename="saveorrun.ui" line="52"/>
<location filename="saveorrun.ui" line="99"/> <location filename="saveorrun.ui" line="109"/>
<source>browse ...</source> <source>browse ...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@@ -36,13 +36,13 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="saveorrun.ui" line="106"/> <location filename="saveorrun.ui" line="83"/>
<source>Run</source> <source>remember tool for this type</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="saveorrun.ui" line="113"/> <location filename="saveorrun.ui" line="116"/>
<source>remember tool for this type</source> <source>Run</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@@ -523,12 +523,12 @@ p, li { white-space: pre-wrap; }
<context> <context>
<name>qbrowserlib::SaveOrRun</name> <name>qbrowserlib::SaveOrRun</name>
<message> <message>
<location filename="saveorrun.hxx" line="130"/> <location filename="saveorrun.hxx" line="132"/>
<source>File Exists</source> <source>File Exists</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="saveorrun.hxx" line="131"/> <location filename="saveorrun.hxx" line="133"/>
<source>File already exists: <source>File already exists:
%1 %1
@@ -537,12 +537,12 @@ Overwrite?</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="saveorrun.hxx" line="143"/> <location filename="saveorrun.hxx" line="145"/>
<source>No Program</source> <source>No Program</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="saveorrun.hxx" line="144"/> <location filename="saveorrun.hxx" line="146"/>
<source>Not an executable Program: <source>Not an executable Program:
%1 %1
@@ -551,26 +551,34 @@ Specify full path to executable program</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="saveorrun.hxx" line="156"/> <location filename="saveorrun.hxx" line="158"/>
<source>Save File As ...</source> <source>Save File As ...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="saveorrun.hxx" line="169"/> <location filename="saveorrun.hxx" line="171"/>
<source>Open File With ...</source> <source>Open File With ...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="saveorrun.hxx" line="181"/> <location filename="saveorrun.hxx" line="183"/>
<source>Dokumente</source> <source>Dokumente</source>
<comment>Documents folder in local language</comment> <comment>Documents folder in local language</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="saveorrun.hxx" line="183"/> <location filename="saveorrun.hxx" line="185"/>
<source>Arbeitsfläche</source> <source>Arbeitsfläche</source>
<comment>Desktop folder in local language</comment> <comment>Desktop folder in local language</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context>
<name>qbrowserlib::SaveOrRunDialog</name>
<message>
<location filename="saveorrun.hxx" line="237"/>
<source>Unknown File Type</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS> </TS>
src/qbrowserlib/qbrowserlib_it.ts
+21 -13
View File
@@ -16,7 +16,7 @@
</message> </message>
<message> <message>
<location filename="saveorrun.ui" line="52"/> <location filename="saveorrun.ui" line="52"/>
<location filename="saveorrun.ui" line="99"/> <location filename="saveorrun.ui" line="109"/>
<source>browse ...</source> <source>browse ...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@@ -36,13 +36,13 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="saveorrun.ui" line="106"/> <location filename="saveorrun.ui" line="83"/>
<source>Run</source> <source>remember tool for this type</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="saveorrun.ui" line="113"/> <location filename="saveorrun.ui" line="116"/>
<source>remember tool for this type</source> <source>Run</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@@ -523,12 +523,12 @@ p, li { white-space: pre-wrap; }
<context> <context>
<name>qbrowserlib::SaveOrRun</name> <name>qbrowserlib::SaveOrRun</name>
<message> <message>
<location filename="saveorrun.hxx" line="130"/> <location filename="saveorrun.hxx" line="132"/>
<source>File Exists</source> <source>File Exists</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="saveorrun.hxx" line="131"/> <location filename="saveorrun.hxx" line="133"/>
<source>File already exists: <source>File already exists:
%1 %1
@@ -537,12 +537,12 @@ Overwrite?</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="saveorrun.hxx" line="143"/> <location filename="saveorrun.hxx" line="145"/>
<source>No Program</source> <source>No Program</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="saveorrun.hxx" line="144"/> <location filename="saveorrun.hxx" line="146"/>
<source>Not an executable Program: <source>Not an executable Program:
%1 %1
@@ -551,26 +551,34 @@ Specify full path to executable program</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="saveorrun.hxx" line="156"/> <location filename="saveorrun.hxx" line="158"/>
<source>Save File As ...</source> <source>Save File As ...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="saveorrun.hxx" line="169"/> <location filename="saveorrun.hxx" line="171"/>
<source>Open File With ...</source> <source>Open File With ...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="saveorrun.hxx" line="181"/> <location filename="saveorrun.hxx" line="183"/>
<source>Dokumente</source> <source>Dokumente</source>
<comment>Documents folder in local language</comment> <comment>Documents folder in local language</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="saveorrun.hxx" line="183"/> <location filename="saveorrun.hxx" line="185"/>
<source>Arbeitsfläche</source> <source>Arbeitsfläche</source>
<comment>Desktop folder in local language</comment> <comment>Desktop folder in local language</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context>
<name>qbrowserlib::SaveOrRunDialog</name>
<message>
<location filename="saveorrun.hxx" line="237"/>
<source>Unknown File Type</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS> </TS>
src/qbrowserlib/saveorrun.hxx
+3
View File
@@ -47,6 +47,8 @@ namespace qbrowserlib {
LOG; LOG;
setupUi(this); setupUi(this);
QString obj(remoteFilename()); QString obj(remoteFilename());
_rememberPath->setVisible(false);
_rememberTool->setVisible(false);
_program->setText(QCoreApplication::applicationDirPath() _program->setText(QCoreApplication::applicationDirPath()
+QDir::separator()); +QDir::separator());
_object->setText(obj); _object->setText(obj);
@@ -232,6 +234,7 @@ namespace qbrowserlib {
bool kiosk=false, QWidget* p=0): bool kiosk=false, QWidget* p=0):
QDialog(p), _sor(new SaveOrRun(reply, executor, type, src)) { QDialog(p), _sor(new SaveOrRun(reply, executor, type, src)) {
LOG; LOG;
setWindowTitle(tr("Unknown File Type"));
QVBoxLayout* l(new QVBoxLayout(this)); QVBoxLayout* l(new QVBoxLayout(this));
l->addWidget(_sor); l->addWidget(_sor);
l->addWidget(_buttons = new QDialogButtonBox(QDialogButtonBox::Cancel)); l->addWidget(_buttons = new QDialogButtonBox(QDialogButtonBox::Cancel));
src/qbrowserlib/saveorrun.ui
+18 -18
View File
@@ -77,6 +77,16 @@
<string>Open in External Application</string> <string>Open in External Application</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="_rememberTool">
<property name="text">
<string>remember tool for this type</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLineEdit" name="_program"> <widget class="QLineEdit" name="_program">
<property name="enabled"> <property name="enabled">
@@ -107,16 +117,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="_rememberTool">
<property name="text">
<string>remember tool for this type</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="tab_3"> <widget class="QWidget" name="tab_3">
@@ -279,12 +279,12 @@
<slot>click()</slot> <slot>click()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>371</x> <x>320</x>
<y>113</y> <y>78</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>94</x> <x>430</x>
<y>126</y> <y>108</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>
@@ -295,12 +295,12 @@
<slot>click()</slot> <slot>click()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>371</x> <x>320</x>
<y>207</y> <y>78</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>94</x> <x>430</x>
<y>220</y> <y>108</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>
src/qbrowserlib/settings.hxx
+7
View File
@@ -22,6 +22,8 @@
#define LOG qDebug()<<__PRETTY_FUNCTION__ #define LOG qDebug()<<__PRETTY_FUNCTION__
#endif #endif
namespace qbrowserlib {
class Settings: public QDialog, protected Ui::Settings { class Settings: public QDialog, protected Ui::Settings {
Q_OBJECT; Q_OBJECT;
@@ -104,6 +106,8 @@ class Settings: public QDialog, protected Ui::Settings {
on__buttons_rejected(); on__buttons_rejected();
} }
static bool DEBUG;
void setSettings(QSettings* settings) { void setSettings(QSettings* settings) {
_settings = settings; _settings = settings;
} }
@@ -368,4 +372,7 @@ class Settings: public QDialog, protected Ui::Settings {
SearchEngines _searchEngines; SearchEngines _searchEngines;
}; };
}
#endif #endif
src/swissbrowser_de.ts
+1
View File
@@ -716,6 +716,7 @@ Try: %1 --help</source>
<source>Usage: %1 [OPTIONS...] [&lt;url&gt; ...] <source>Usage: %1 [OPTIONS...] [&lt;url&gt; ...]
Options: Options:
-h, --help show this help text -h, --help show this help text
-d, --debug enable verbose debug mode
-t --tmp path temporary folder for data caching -t --tmp path temporary folder for data caching
-k, --kiosk no url bar -k, --kiosk no url bar
if you sepcify -k and -s, -k must be first if you sepcify -k and -s, -k must be first
src/swissbrowser_en.ts
+1
View File
@@ -716,6 +716,7 @@ Try: %1 --help</source>
<source>Usage: %1 [OPTIONS...] [&lt;url&gt; ...] <source>Usage: %1 [OPTIONS...] [&lt;url&gt; ...]
Options: Options:
-h, --help show this help text -h, --help show this help text
-d, --debug enable verbose debug mode
-t --tmp path temporary folder for data caching -t --tmp path temporary folder for data caching
-k, --kiosk no url bar -k, --kiosk no url bar
if you sepcify -k and -s, -k must be first if you sepcify -k and -s, -k must be first
src/swissbrowser_fr.ts
+1
View File
@@ -716,6 +716,7 @@ Try: %1 --help</source>
<source>Usage: %1 [OPTIONS...] [&lt;url&gt; ...] <source>Usage: %1 [OPTIONS...] [&lt;url&gt; ...]
Options: Options:
-h, --help show this help text -h, --help show this help text
-d, --debug enable verbose debug mode
-t --tmp path temporary folder for data caching -t --tmp path temporary folder for data caching
-k, --kiosk no url bar -k, --kiosk no url bar
if you sepcify -k and -s, -k must be first if you sepcify -k and -s, -k must be first
src/swissbrowser_it.ts
+1
View File
@@ -716,6 +716,7 @@ Try: %1 --help</source>
<source>Usage: %1 [OPTIONS...] [&lt;url&gt; ...] <source>Usage: %1 [OPTIONS...] [&lt;url&gt; ...]
Options: Options:
-h, --help show this help text -h, --help show this help text
-d, --debug enable verbose debug mode
-t --tmp path temporary folder for data caching -t --tmp path temporary folder for data caching
-k, --kiosk no url bar -k, --kiosk no url bar
if you sepcify -k and -s, -k must be first if you sepcify -k and -s, -k must be first