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

re-added debug output; refs #130

Browse Source
master
Marc Wäckerlin 12 years ago
parent 04bcf67e6c
commit 427db75c68
6 changed files with 32 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      src/main.cxx
  2. 6
      src/qbrowserlib/saveorrun.ui
  3. 6
      src/swissbrowser_de.ts
  4. 6
      src/swissbrowser_en.ts
  5. 6
      src/swissbrowser_fr.ts
  6. 6
      src/swissbrowser_it.ts

16
src/main.cxx
Unescape View File

@ -364,11 +364,15 @@ int main(int argv, char** argc) try {
" 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"
" 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")
" 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"])
@ -435,10 +439,16 @@ int main(int argv, char** argc) try {
}
QSslConfiguration::setDefaultConfiguration(sslConfig);
//............................................................................
std::cerr<<"LIBRARY PATHES:\n"<<app.libraryPaths().join("\n").toStdString()
<<std::endl;
if (env.contains("QT_PLUGIN_PATH")) {
foreach (QString path, env["QT_PLUGIN_PATH"].split(":")) {
std::cerr<<"**** Setting: PLUGIN-PATH to "<<path.toStdString()<<std::endl;
app.addLibraryPath(path);
}
} else {
std::cerr<<"**** Error: PLUGIN-PATH is not defined"<<std::endl;
abort();
}
if (env.contains("QTWEBKIT_PLUGIN_PATH")) qt_drt_overwritePluginDirectories();
Browser browser(actlib, urls, settings.get(), mimetypes, silent,

6
src/qbrowserlib/saveorrun.ui
Unescape View File

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

6
src/swissbrowser_de.ts
Unescape View File

@ -736,11 +736,13 @@ Options:
start in bookmark-edition mode
&lt;url&gt; optional full URL
Environment:
LANGUAGE &quot;de&quot;, &quot;en&quot;, ... (actual: %5)
PROXY_TYPE &quot;http&quot; or &quot;socks&quot; or &quot;&quot; (actual: %2)
LANGUAGE &quot;de&quot;, &quot;en&quot;, ... (actual: %5)
PROXY_TYPE &quot;http&quot; or &quot;socks&quot; or &quot;&quot; (actual: %2)
PROXY_PORT proxy port number (actual: %3)
PROXY_HOST proxy host name (actual: %4)
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>
<translation type="unfinished"></translation>
</message>

6
src/swissbrowser_en.ts
Unescape View File

@ -736,11 +736,13 @@ Options:
start in bookmark-edition mode
&lt;url&gt; optional full URL
Environment:
LANGUAGE &quot;de&quot;, &quot;en&quot;, ... (actual: %5)
PROXY_TYPE &quot;http&quot; or &quot;socks&quot; or &quot;&quot; (actual: %2)
LANGUAGE &quot;de&quot;, &quot;en&quot;, ... (actual: %5)
PROXY_TYPE &quot;http&quot; or &quot;socks&quot; or &quot;&quot; (actual: %2)
PROXY_PORT proxy port number (actual: %3)
PROXY_HOST proxy host name (actual: %4)
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>
<translation type="unfinished"></translation>
</message>

6
src/swissbrowser_fr.ts
Unescape View File

@ -736,11 +736,13 @@ Options:
start in bookmark-edition mode
&lt;url&gt; optional full URL
Environment:
LANGUAGE &quot;de&quot;, &quot;en&quot;, ... (actual: %5)
PROXY_TYPE &quot;http&quot; or &quot;socks&quot; or &quot;&quot; (actual: %2)
LANGUAGE &quot;de&quot;, &quot;en&quot;, ... (actual: %5)
PROXY_TYPE &quot;http&quot; or &quot;socks&quot; or &quot;&quot; (actual: %2)
PROXY_PORT proxy port number (actual: %3)
PROXY_HOST proxy host name (actual: %4)
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>
<translation type="unfinished"></translation>
</message>

6
src/swissbrowser_it.ts
Unescape View File

@ -736,11 +736,13 @@ Options:
start in bookmark-edition mode
&lt;url&gt; optional full URL
Environment:
LANGUAGE &quot;de&quot;, &quot;en&quot;, ... (actual: %5)
PROXY_TYPE &quot;http&quot; or &quot;socks&quot; or &quot;&quot; (actual: %2)
LANGUAGE &quot;de&quot;, &quot;en&quot;, ... (actual: %5)
PROXY_TYPE &quot;http&quot; or &quot;socks&quot; or &quot;&quot; (actual: %2)
PROXY_PORT proxy port number (actual: %3)
PROXY_HOST proxy host name (actual: %4)
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>
<translation type="unfinished"></translation>
</message>

Write Preview
Loading…
Cancel
Save