option is noe --login to enable immediate login, otherwise logs in at first https-access; also works without cryptoki-library; closes #34

This commit is contained in:
Marc Wäckerlin
2011-05-03 10:21:12 +00:00
parent 108f66b43e
commit 0870f9e4e4
9 changed files with 245 additions and 210 deletions

View File

@@ -232,82 +232,82 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="434"/>
<location filename="browser.hxx" line="435"/>
<source>Reading: %1</source>
<oldsource>Reading: %1%</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="449"/>
<location filename="browser.hxx" line="450"/>
<source>Zoom: %1%</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="436"/>
<location filename="browser.hxx" line="437"/>
<source>Illegal URL: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="500"/>
<location filename="browser.hxx" line="501"/>
<source>Print Document</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="521"/>
<location filename="browser.hxx" line="522"/>
<source>%1 - %2</source>
<oldsource>Back to %1 - %2</oldsource>
<comment>statusbar actionBack_hovered %1=url %2=title</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="659"/>
<location filename="browser.hxx" line="660"/>
<source>Info: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="672"/>
<location filename="browser.hxx" line="673"/>
<source>done.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="672"/>
<location filename="browser.hxx" line="673"/>
<source>page load error.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="925"/>
<location filename="browser.hxx" line="926"/>
<source>%1</source>
<comment>statusbar for hovered link %1=url</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="425"/>
<location filename="browser.hxx" line="426"/>
<source>Forbidden: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="426"/>
<location filename="browser.hxx" line="427"/>
<source>Access Denied</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="427"/>
<location filename="browser.hxx" line="428"/>
<source>&lt;p&gt;Access denied due to security considerations.&lt;/p&gt;&lt;p&gt;You are not allowed to connect to %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="540"/>
<location filename="browser.hxx" line="541"/>
<source>%1 - %2</source>
<comment>statusbar actionForward_hovered %1=url %2=title</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="604"/>
<location filename="browser.hxx" line="605"/>
<source>About</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="605"/>
<location filename="browser.hxx" line="606"/>
<source>SwissSurfer %1 (%2)
%3
@@ -321,22 +321,22 @@ Compiled: qt-%5</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="654"/>
<location filename="browser.hxx" line="655"/>
<source>%1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="1035"/>
<location filename="browser.hxx" line="1036"/>
<source>Save File As ...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="1090"/>
<location filename="browser.hxx" line="1091"/>
<source>authentication required</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="1102"/>
<location filename="browser.hxx" line="1103"/>
<source>ssl error</source>
<translation type="unfinished"></translation>
</message>
@@ -541,12 +541,12 @@ p, li { white-space: pre-wrap; }
<context>
<name>QMessageBox</name>
<message>
<location filename="smartcardauth.hxx" line="230"/>
<location filename="smartcardauth.hxx" line="221"/>
<source>Wrong PIN</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="smartcardauth.hxx" line="231"/>
<location filename="smartcardauth.hxx" line="222"/>
<source>Authentication failed, please try again.</source>
<translation type="unfinished"></translation>
</message>
@@ -556,6 +556,28 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="main.cxx" line="249"/>
<source>Usage: %1 [OPTIONS...] [&lt;url&gt; ...]
Options:
-h, --help show this help text
-k, --kiosk no url bar
if you sepcify -k and -s, -k must be first
-n, --no-settings don&apos;t load or store any settings
--login ask for smartcard password at startup
-l, --lib &lt;file&gt; path to file libengine_act.so
-s, --settings &lt;file&gt;
load settings from &lt;file&gt;
if you sepcify -k and -s, -k must be first
-c, --cert &lt;file&gt; load local client certificate from &lt;file&gt;
-y, --key &lt;file&gt; load local certificate key from &lt;file&gt;
-m, --mime &lt;mime&gt; &lt;ext&gt; &lt;tool&gt;
start &lt;tool&gt; for mimetype &lt;mime&gt;
&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)
PROXY_PORT proxy port number (actual: %3)
PROXY_HOST proxy host name (actual: %4)
</source>
<oldsource>Usage: %1 [OPTIONS...] [&lt;url&gt; ...]
Options:
-h, --help show this help text
-k, --kiosk no url bar
@@ -576,7 +598,7 @@ Environment:
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)
</source>
</oldsource>
<translation type="unfinished"></translation>
</message>
<message>