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

refs #22

Browse Source
This commit is contained in:
Marc Wäckerlin
2011-01-27 09:31:02 +00:00
parent 9ce6f20adc
commit 44da3c7ed4
6 changed files with 42 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
openssl-act-engine/configure.in
View File

@@ -62,15 +62,15 @@ AC_CHECK_PROG(have_dot, dot, yes, no)
case ${host} in case ${host} in
(*linux*) case "${host}" in (*linux*) case "${host}" in
(*i386*) LDFLAGS+="-L../../actlibrary/Ubuntu-9-i686/Release" (*i386*) LDFLAGS+=" -L../../actlibrary/Ubuntu-9-i686/Release"
;; ;;
(*i686|x86_64*) LDFLAGS+="-L../../actlibrary/OpenSUSE-11-x86_64/Release" (*i686|x86_64*) LDFLAGS+=" -L../../actlibrary/OpenSUSE-11-x86_64/Release"
;; ;;
(*) AC_MSG_ERROR([Unknown Linux Host: $host]) (*) AC_MSG_ERROR([Unknown Linux Host: $host])
;; ;;
esac esac
;; ;;
(*mingw*) LDFLAGS+="-L../../actlibrary/mingw32-i586/Release" (*mingw*) LDFLAGS+=" -L../../actlibrary/mingw32-i586/Release"
;; ;;
(*) AC_MSG_ERROR([Unknown Host: $host]) (*) AC_MSG_ERROR([Unknown Host: $host])
;; ;;

13
swisssurfer/src/browser.hxx
View File

@@ -429,8 +429,17 @@ class Browser: public QMainWindow, protected Ui::Browser {
void iconChanged() { void iconChanged() {
LOG; LOG;
QWebView* view(qobject_cast<QWebView*>(sender())); QWebView* view(qobject_cast<QWebView*>(sender()));
for (int i(0); i<_tabs->count(); ++i) int index = _tabs->indexOf(view);
if (_tabs->widget(i)==view) _tabs->setTabIcon(i, view->icon()); if (index<0) return;
QIcon icon(QWebSettings::iconForUrl(view->url()));
if (icon.isNull()) {
LOG<<"Icon for URL is Null"<<view->url();
QPixmap pixmap(QWebSettings::webGraphic
(QWebSettings::DefaultFrameIconGraphic));
if (!pixmap.isNull()) icon = pixmap;
} else icon = icon.pixmap(16, 16);
if (icon.isNull()) LOG<<"Icon is still null";
_tabs->setTabIcon(index, icon);
} }
void titleChanged(const QString& text) { void titleChanged(const QString& text) {

14
swisssurfer/src/swisssurfer_de.ts
View File

@@ -344,17 +344,17 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="444"/> <location filename="browser.hxx" line="453"/>
<source>Info: %1</source> <source>Info: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="457"/> <location filename="browser.hxx" line="466"/>
<source>done.</source> <source>done.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="710"/> <location filename="browser.hxx" line="719"/>
<source>%1</source> <source>%1</source>
<comment>statusbar for hovered link %1=url</comment> <comment>statusbar for hovered link %1=url</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@@ -381,22 +381,22 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="439"/> <location filename="browser.hxx" line="448"/>
<source>%1</source> <source>%1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="811"/> <location filename="browser.hxx" line="820"/>
<source>Save File As ...</source> <source>Save File As ...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="866"/> <location filename="browser.hxx" line="875"/>
<source>authentication required</source> <source>authentication required</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="881"/> <location filename="browser.hxx" line="890"/>
<source>ssl error</source> <source>ssl error</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

14
swisssurfer/src/swisssurfer_en.ts
View File

@@ -344,17 +344,17 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="444"/> <location filename="browser.hxx" line="453"/>
<source>Info: %1</source> <source>Info: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="457"/> <location filename="browser.hxx" line="466"/>
<source>done.</source> <source>done.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="710"/> <location filename="browser.hxx" line="719"/>
<source>%1</source> <source>%1</source>
<comment>statusbar for hovered link %1=url</comment> <comment>statusbar for hovered link %1=url</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@@ -381,22 +381,22 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="439"/> <location filename="browser.hxx" line="448"/>
<source>%1</source> <source>%1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="811"/> <location filename="browser.hxx" line="820"/>
<source>Save File As ...</source> <source>Save File As ...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="866"/> <location filename="browser.hxx" line="875"/>
<source>authentication required</source> <source>authentication required</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="881"/> <location filename="browser.hxx" line="890"/>
<source>ssl error</source> <source>ssl error</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

14
swisssurfer/src/swisssurfer_fr.ts
View File

@@ -344,17 +344,17 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="444"/> <location filename="browser.hxx" line="453"/>
<source>Info: %1</source> <source>Info: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="457"/> <location filename="browser.hxx" line="466"/>
<source>done.</source> <source>done.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="710"/> <location filename="browser.hxx" line="719"/>
<source>%1</source> <source>%1</source>
<comment>statusbar for hovered link %1=url</comment> <comment>statusbar for hovered link %1=url</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@@ -381,22 +381,22 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="439"/> <location filename="browser.hxx" line="448"/>
<source>%1</source> <source>%1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="811"/> <location filename="browser.hxx" line="820"/>
<source>Save File As ...</source> <source>Save File As ...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="866"/> <location filename="browser.hxx" line="875"/>
<source>authentication required</source> <source>authentication required</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="881"/> <location filename="browser.hxx" line="890"/>
<source>ssl error</source> <source>ssl error</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

14
swisssurfer/src/swisssurfer_it.ts
View File

@@ -344,17 +344,17 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="444"/> <location filename="browser.hxx" line="453"/>
<source>Info: %1</source> <source>Info: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="457"/> <location filename="browser.hxx" line="466"/>
<source>done.</source> <source>done.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="710"/> <location filename="browser.hxx" line="719"/>
<source>%1</source> <source>%1</source>
<comment>statusbar for hovered link %1=url</comment> <comment>statusbar for hovered link %1=url</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@@ -381,22 +381,22 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="439"/> <location filename="browser.hxx" line="448"/>
<source>%1</source> <source>%1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="811"/> <location filename="browser.hxx" line="820"/>
<source>Save File As ...</source> <source>Save File As ...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="866"/> <location filename="browser.hxx" line="875"/>
<source>authentication required</source> <source>authentication required</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="881"/> <location filename="browser.hxx" line="890"/>
<source>ssl error</source> <source>ssl error</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>