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

re-added debug output; refs #130

Browse Source
This commit is contained in:
Marc Wäckerlin
2012-05-09 07:56:27 +00:00
parent 04bcf67e6c
commit 427db75c68
6 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main.cxx
View File

@@ -364,11 +364,15 @@ int main(int argv, char** argc) try {
" start in bookmark-edition mode\n" " start in bookmark-edition mode\n"
" <url> optional full URL\n" " <url> optional full URL\n"
"Environment:\n" "Environment:\n"
" LANGUAGE \"de\", \"en\", ... (actual: %5)\n" " LANGUAGE \"de\", \"en\", ... "
" PROXY_TYPE \"http\" or \"socks\" or \"\" (actual: %2)\n" "(actual: %5)\n"
" PROXY_TYPE \"http\" or \"socks\" or \"\" "
"(actual: %2)\n"
" PROXY_PORT proxy port number (actual: %3)\n" " PROXY_PORT proxy port number (actual: %3)\n"
" PROXY_HOST proxy host name (actual: %4)\n" " PROXY_HOST proxy host name (actual: %4)\n"
" SWISS_USERAGENT fake user agent (actual: %6)\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(QFileInfo(argc[0]).fileName())
.arg(env["PROXY_TYPE"]).arg(env["PROXY_PORT"]).arg(env["PROXY_HOST"]) .arg(env["PROXY_TYPE"]).arg(env["PROXY_PORT"]).arg(env["PROXY_HOST"])
.arg(env["LANGUAGE"]).arg(env["SWISS_USERAGENT"]) .arg(env["LANGUAGE"]).arg(env["SWISS_USERAGENT"])
@@ -435,10 +439,16 @@ int main(int argv, char** argc) try {
} }
QSslConfiguration::setDefaultConfiguration(sslConfig); QSslConfiguration::setDefaultConfiguration(sslConfig);
//............................................................................ //............................................................................
std::cerr<<"LIBRARY PATHES:\n"<<app.libraryPaths().join("\n").toStdString()
<<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;
app.addLibraryPath(path); app.addLibraryPath(path);
} }
} else {
std::cerr<<"**** Error: PLUGIN-PATH is not defined"<<std::endl;
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,

6
src/qbrowserlib/saveorrun.ui
View File

@@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>447</width> <width>610</width>
<height>154</height> <height>154</height>
</rect> </rect>
</property> </property>
@@ -61,7 +61,7 @@
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="2"> <item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="checkBox_2"> <widget class="QCheckBox" name="_rememberPath">
<property name="text"> <property name="text">
<string>remember save path</string> <string>remember save path</string>
</property> </property>
@@ -108,7 +108,7 @@
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="2"> <item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="checkBox"> <widget class="QCheckBox" name="_rememberTool">
<property name="text"> <property name="text">
<string>remember tool for this type</string> <string>remember tool for this type</string>
</property> </property>

2
src/swissbrowser_de.ts
View File

@@ -741,6 +741,8 @@ Environment:
PROXY_PORT proxy port number (actual: %3) PROXY_PORT proxy port number (actual: %3)
PROXY_HOST proxy host name (actual: %4) PROXY_HOST proxy host name (actual: %4)
SWISS_USERAGENT fake user agent (actual: %6) SWISS_USERAGENT fake user agent (actual: %6)
QT_PLUGIN_PATH path to plugins dir (actual: %7)
QTWEBKIT_PLUGIN_PATH path to netscape plugins (actual: %8)
</source> </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

2
src/swissbrowser_en.ts
View File

@@ -741,6 +741,8 @@ Environment:
PROXY_PORT proxy port number (actual: %3) PROXY_PORT proxy port number (actual: %3)
PROXY_HOST proxy host name (actual: %4) PROXY_HOST proxy host name (actual: %4)
SWISS_USERAGENT fake user agent (actual: %6) SWISS_USERAGENT fake user agent (actual: %6)
QT_PLUGIN_PATH path to plugins dir (actual: %7)
QTWEBKIT_PLUGIN_PATH path to netscape plugins (actual: %8)
</source> </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

2
src/swissbrowser_fr.ts
View File

@@ -741,6 +741,8 @@ Environment:
PROXY_PORT proxy port number (actual: %3) PROXY_PORT proxy port number (actual: %3)
PROXY_HOST proxy host name (actual: %4) PROXY_HOST proxy host name (actual: %4)
SWISS_USERAGENT fake user agent (actual: %6) SWISS_USERAGENT fake user agent (actual: %6)
QT_PLUGIN_PATH path to plugins dir (actual: %7)
QTWEBKIT_PLUGIN_PATH path to netscape plugins (actual: %8)
</source> </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

2
src/swissbrowser_it.ts
View File

@@ -741,6 +741,8 @@ Environment:
PROXY_PORT proxy port number (actual: %3) PROXY_PORT proxy port number (actual: %3)
PROXY_HOST proxy host name (actual: %4) PROXY_HOST proxy host name (actual: %4)
SWISS_USERAGENT fake user agent (actual: %6) SWISS_USERAGENT fake user agent (actual: %6)
QT_PLUGIN_PATH path to plugins dir (actual: %7)
QTWEBKIT_PLUGIN_PATH path to netscape plugins (actual: %8)
</source> </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>