diff --git a/README b/README index bc1387b..3336832 100644 --- a/README +++ b/README @@ -8,5 +8,4 @@ Start e.g. with: SWISSSIGNER='java -Xmx256M -Dorg.jpedal.jai=true -Dswing.aatext=true -Dch.abacus.swisssigner.incamail.certlogin=false -splash:swisssigner-splash.png -Dch.abacus.pkcs11.configuration=swisssigner-pkcs11.cfg -Duser.language=de -cp /home/marc/downloads/swisssigner/swisssigner.jar:/home/marc/downloads/swisssigner/bc.jar:bcmail.jar:/home/marc/downloads/swisssigner/bcpg.jar:/home/marc/downloads/swisssigner/bctsp.jar:/home/marc/downloads/swisssigner/exml.jar:/home/marc/downloads/swisssigner/itext.jar:/home/marc/downloads/swisssigner/jai_codec.jar:/home/marc/downloads/swisssigner/jai_core.jar:/home/marc/downloads/swisssigner/jai_imageio.jar:/home/marc/downloads/swisssigner/jdic.jar:/home/marc/downloads/swisssigner/jdic_native.jar:/home/marc/downloads/swisssigner/jdic_stub_unix.jar:/home/marc/downloads/swisssigner/jpedal.jar: ch.abacus.hotdog.SwissSigner locale=de document=%1 browser_bin=firefox keystores=pkcs11' -src/swisssurfer --mime application/pdf pdf "$SWISSSIGNER" --mime application/x-java-jnlp-file jnlp "javaws %1" http://swisssign.com/de/swisssign-support/ss-faq/7-server-certificates/34-how-to-apache-konfiguration-mit-ssl-zertifikaten -src/swisssurfer --mime application/pdf pdf "$SWISSSIGNER" --mime application/x-java-jnlp-file jnlp "javaws %1" http://swisssign.com/de/swisssign-support/ss-faq/7-server-certificates/34-how-to-apache-konfiguration-mit-ssl-zertifikaten +src/swissbrowser --mime application/pdf pdf "$SWISSSIGNER" --mime application/x-java-jnlp-file jnlp "javaws %1" http://swisssign.com/de/swisssign-support/ss-faq/7-server-certificates/34-how-to-apache-konfiguration-mit-ssl-zertifikaten diff --git a/configure.in b/configure.in index d7cea6a..7b42233 100644 --- a/configure.in +++ b/configure.in @@ -21,8 +21,7 @@ SRC_DIR=src TST_DIR=test DOC_DIR=doc -m4_define(x_packagename, swisssurfer) -m4_define(x_packagename, swisssurfer) +m4_define(x_packagename, swissbrowser) m4_define(x_major, 1) m4_define(x_minor, 2) diff --git a/debian/changelog.in b/debian/changelog.in index b41305b..5aef502 100644 --- a/debian/changelog.in +++ b/debian/changelog.in @@ -1,6 +1,5 @@ @PACKAGE@ (@VERSION@-1) unstable; urgency=low - * see https://dev.swisssign.com/projects/swisssurfer for changes - * see https://dev.swisssign.com/projects/swisssurfer for changes + * see https://dev.swisssign.com/projects/swissbrowser for changes -- Marc Wäckerlin (SwissSign AG) Wed, 07 Apr 2010 10:23:02 +0200 diff --git a/debian/control b/debian/control index 5b304f8..97e2972 100644 --- a/debian/control +++ b/debian/control @@ -1,34 +1,27 @@ -Source: swisssurfer -Source: swisssurfer +Source: swissbrowser Section: web Priority: extra Maintainer: Marc Wäckerlin (SwissSign AG) Build-Depends: debhelper (>= 7), autotools-dev, libpkcs11-helper1-dev Standards-Version: 3.8.1 -Homepage: https://dev.swisssign.com/projects/swisssurfer -Homepage: https://dev.swisssign.com/projects/swisssurfer +Homepage: https://dev.swisssign.com/projects/swissbrowser -Package: swisssurfer-dev -Package: swisssurfer-dev +Package: swissbrowser-dev Provides: swisssurfer-dev Conflicts: swisssurfer-dev Replaces: swisssurfer-dev Section: devel Architecture: any -Depends: swisssurfer (= ${binary:Version}) -Depends: swisssurfer (= ${binary:Version}) -Description: swisssurfer -Description: swisssurfer +Depends: swissbrowser (= ${binary:Version}) +Description: swissbrowser . -Package: swisssurfer -Package: swisssurfer +Package: swissbrowser Provides: swisssurfer Conflicts: swisssurfer Replaces: swisssurfer Section: web Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: swisssurfer -Description: swisssurfer +Description: swissbrowser . diff --git a/debian/copyright b/debian/copyright index 0f6876d..8d73ff9 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,8 +1,7 @@ This package was debianized by Marc Wäckerlin (SwissSign AG) on Wed, 07 Apr 2010 10:23:02 +0200. -It was downloaded from https://dev.swisssign.com/projects/swisssurfer -It was downloaded from https://dev.swisssign.com/projects/swisssurfer +It was downloaded from https://dev.swisssign.com/projects/swissbrowser Upstream Author(s): diff --git a/debian/menu b/debian/menu index b9ab4fc..dde0d9b 100644 --- a/debian/menu +++ b/debian/menu @@ -1,13 +1,8 @@ -?package(swisssurfer):\ -?package(swisssurfer):\ +?package(swissbrowser):\ needs="X11"\ hints="Lightweight,Fast,Small,Security,SSL,Cryptoki,Certificate"\ section="Applications/Network/Web Browsing"\ - title="SwissSurfer"\ - title="SwissSurfer"\ - longtitle="SwissSurfer Internet Browser"\ - longtitle="SwissSurfer Internet Browser"\ - command="/usr/bin/swisssurfer"\ - command="/usr/bin/swisssurfer"\ - icon="/usr/share/swisssurfer/swisssurfer.xpm" - icon="/usr/share/swisssurfer/swisssurfer.xpm" + title="SwissBrowser"\ + longtitle="SwissBrowser Internet Browser"\ + command="/usr/bin/swissbrowser"\ + icon="/usr/share/swissbrowser/swissbrowser.xpm" diff --git a/debian/swisssurfer-dev.dirs b/debian/swissbrowser-dev.dirs similarity index 100% rename from debian/swisssurfer-dev.dirs rename to debian/swissbrowser-dev.dirs diff --git a/debian/swisssurfer-dev.install b/debian/swissbrowser-dev.install similarity index 64% rename from debian/swisssurfer-dev.install rename to debian/swissbrowser-dev.install index 5c30e62..2473b5e 100644 --- a/debian/swisssurfer-dev.install +++ b/debian/swissbrowser-dev.install @@ -1,5 +1,4 @@ -usr/share/doc/swisssurfer/html -usr/share/doc/swisssurfer/html +usr/share/doc/swissbrowser/html usr/include/* #usr/lib/lib*.a usr/lib/lib*.so diff --git a/debian/swisssurfer.dirs b/debian/swissbrowser.dirs similarity index 100% rename from debian/swisssurfer.dirs rename to debian/swissbrowser.dirs diff --git a/debian/swisssurfer.doc-base.EX b/debian/swissbrowser.doc-base.EX similarity index 67% rename from debian/swisssurfer.doc-base.EX rename to debian/swissbrowser.doc-base.EX index 0d3840a..b2a28aa 100644 --- a/debian/swisssurfer.doc-base.EX +++ b/debian/swissbrowser.doc-base.EX @@ -1,10 +1,7 @@ -Document: swisssurfer -Document: swisssurfer -Title: Debian swisssurfer Manual -Title: Debian swisssurfer Manual +Document: swissbrowser +Title: Debian swissbrowser Manual Author: -Abstract: This manual describes what swisssurfer is -Abstract: This manual describes what swisssurfer is +Abstract: This manual describes what swissbrowser is and how it can be used to manage online manuals on Debian systems. Section: unknown diff --git a/debian/swissbrowser.install b/debian/swissbrowser.install new file mode 100644 index 0000000..0a3c163 --- /dev/null +++ b/debian/swissbrowser.install @@ -0,0 +1,11 @@ +usr/bin/swissbrowser +usr/share/applications/swissbrowser.desktop +usr/share/swissbrowser/swissbrowser.xpm +usr/share/swissbrowser/swissbrowser.png +usr/share/doc/swissbrowser/AUTHORS +usr/share/doc/swissbrowser/NEWS +usr/share/doc/swissbrowser/README +usr/share/doc/swissbrowser/COPYING +usr/share/doc/swissbrowser/INSTALL +usr/share/doc/swissbrowser/ChangeLog +usr/lib/lib*.so.* diff --git a/debian/swisssurfer.install b/debian/swisssurfer.install deleted file mode 100644 index 3225eef..0000000 --- a/debian/swisssurfer.install +++ /dev/null @@ -1,21 +0,0 @@ -usr/bin/swisssurfer -usr/bin/swisssurfer -usr/share/applications/swisssurfer.desktop -usr/share/applications/swisssurfer.desktop -usr/share/swisssurfer/swisssurfer.xpm -usr/share/swisssurfer/swisssurfer.xpm -usr/share/swisssurfer/swisssurfer.png -usr/share/swisssurfer/swisssurfer.png -usr/share/doc/swisssurfer/AUTHORS -usr/share/doc/swisssurfer/AUTHORS -usr/share/doc/swisssurfer/NEWS -usr/share/doc/swisssurfer/NEWS -usr/share/doc/swisssurfer/README -usr/share/doc/swisssurfer/README -usr/share/doc/swisssurfer/COPYING -usr/share/doc/swisssurfer/COPYING -usr/share/doc/swisssurfer/INSTALL -usr/share/doc/swisssurfer/INSTALL -usr/share/doc/swisssurfer/ChangeLog -usr/share/doc/swisssurfer/ChangeLog -usr/lib/lib*.so.* diff --git a/doc/screenshot.png b/doc/screenshot.png index a741554..1700c4a 100644 Binary files a/doc/screenshot.png and b/doc/screenshot.png differ diff --git a/src/Info.plist b/src/Info.plist index 999272b..54150d2 100644 --- a/src/Info.plist +++ b/src/Info.plist @@ -5,21 +5,17 @@ CFBundleDevelopmentRegion English CFBundleExecutable - swisssurfer - swisssurfer + swissbrowser CFBundleGetInfoString SwissSign, (c) 2011 CFBundleIconFile - swisssurfer.icns - swisssurfer.icns + swissbrowser.icns CFBundleIdentifier - com.swisssign.swisssurfer - com.swisssign.swisssurfer + com.swisssign.swissbrowser CFBundleInfoDictionaryVersion 6.0 CFBundleName - SwissSurfer - SwissSurfer + SwissBrowser CFBundlePackageType APPL CFBundleShortVersionString diff --git a/src/browser.hxx b/src/browser.hxx index 932f9e9..7b19fbb 100644 --- a/src/browser.hxx +++ b/src/browser.hxx @@ -1019,8 +1019,7 @@ class Browser: public QMainWindow, protected Ui::Browser { void resetWindowTitle() { if (qobject_cast(_tabs->currentWidget())) - setWindowTitle(trUtf8("[%1] - %2 - SwissSurfer (%3)", - setWindowTitle(trUtf8("[%1] - %2 - SwissSurfer (%3)", + setWindowTitle(trUtf8("[%1] - %2 - SwissBrowser (%3)", "main window title " "%1 = host name " "%2 = page title " @@ -1031,8 +1030,7 @@ class Browser: public QMainWindow, protected Ui::Browser { ->title())) .arg(_tabs->count())); else - setWindowTitle(trUtf8("SwissSurfer", "window title with no tab")); - setWindowTitle(trUtf8("SwissSurfer", "window title with no tab")); + setWindowTitle(trUtf8("SwissBrowser", "window title with no tab")); } void statusBarMessage(const QString& text) { diff --git a/src/browser.ui b/src/browser.ui index 51bfb59..96d3084 100644 --- a/src/browser.ui +++ b/src/browser.ui @@ -11,13 +11,11 @@ - SwissSurfer - SwissSurfer + SwissBrowser - :/icons/32x32/swisssurfer.png:/icons/32x32/swisssurfer.png - :/icons/32x32/swisssurfer.png:/icons/32x32/swisssurfer.png + :/icons/32x32/swissbrowser.png:/icons/32x32/swissbrowser.png diff --git a/src/main.cxx b/src/main.cxx index 6988656..a08a67b 100644 --- a/src/main.cxx +++ b/src/main.cxx @@ -29,8 +29,7 @@ #include -//! @defgroup browser The SwissSurfer Executable and Main Window -//! @defgroup browser The SwissSurfer Executable and Main Window +//! @defgroup browser The SwissBrowser Executable and Main Window //! @defgroup pkcs11 The PKCS#11 Client Authentication //! @defgroup qbrowserlib The Swiss Browser Library //! @defgroup designer Qt Designer Plugin for Browser Related Widgets @@ -116,18 +115,15 @@ int main(int argv, char** argc) try { QTextCodec::setCodecForLocale(utf8); QTextCodec::setCodecForTr(utf8); QApplication app(argv, argc); - app.setWindowIcon(QIcon(":/icons/32x32/swisssurfer.png")); - app.setWindowIcon(QIcon(":/icons/32x32/swisssurfer.png")); - app.setApplicationName(QObject::trUtf8("SwissSurfer", "application name")); - app.setApplicationName(QObject::trUtf8("SwissSurfer", "application name")); + app.setWindowIcon(QIcon(":/icons/32x32/swissbrowser.png")); + app.setApplicationName(QObject::trUtf8("SwissBrowser", "application name")); app.setApplicationVersion(VERSION); QTranslator qtTranslator; if (env().contains("LANGUAGE")) QLocale::setDefault(env()["LANGUAGE"]); qtTranslator.load(":/language/qt_" + QLocale().name()); app.installTranslator(&qtTranslator); QTranslator appTranslator; - appTranslator.load(":/language/swisssurfer_"+ QLocale().name()); - appTranslator.load(":/language/swisssurfer_"+ QLocale().name()); + appTranslator.load(":/language/swissbrowser_"+ QLocale().name()); app.installTranslator(&appTranslator); //---------------------------------------------------------------------------- TMP=QDir::toNativeSeparators(QDir::tempPath()); @@ -155,8 +151,7 @@ int main(int argv, char** argc) try { bool editbookmarks(false); QStringList args(app.arguments()); std::auto_ptr settings - (std::auto_ptr(new QSettings("SwissSign", "SwissSurfer"))); - (std::auto_ptr(new QSettings("SwissSign", "SwissSurfer"))); + (std::auto_ptr(new QSettings("SwissSign", "SwissBrowser"))); for (QStringList::iterator it(args.begin()); ++it!=args.end();) if (*it=="-h" || *it=="--help" || *it=="-help" || *it=="/?") { std::cout< -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Specifies whether SwissSurfer will try to pre-fetch DNS entries to speed up browsing.</span></p></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Specifies whether SwissBrowser will try to pre-fetch DNS entries to speed up browsing.</span></p></body></html> @@ -401,8 +400,7 @@ p, li { white-space: pre-wrap; } <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'DejaVu Serif'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Private browsing prevents SwissSurfer from recording visited pages in the history and storing web page icons.</span></p></body></html> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Private browsing prevents SwissSurfer from recording visited pages in the history and storing web page icons.</span></p></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Private browsing prevents SwissBrowser from recording visited pages in the history and storing web page icons.</span></p></body></html> diff --git a/src/qbrowserlib/qbrowserlib_en.ts b/src/qbrowserlib/qbrowserlib_en.ts index 4e4cb22..84fdf13 100644 --- a/src/qbrowserlib/qbrowserlib_en.ts +++ b/src/qbrowserlib/qbrowserlib_en.ts @@ -183,8 +183,7 @@ p, li { white-space: pre-wrap; } <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'DejaVu Serif'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Specifies whether SwissSurfer will try to pre-fetch DNS entries to speed up browsing.</span></p></body></html> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Specifies whether SwissSurfer will try to pre-fetch DNS entries to speed up browsing.</span></p></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Specifies whether SwissBrowser will try to pre-fetch DNS entries to speed up browsing.</span></p></body></html> @@ -401,8 +400,7 @@ p, li { white-space: pre-wrap; } <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'DejaVu Serif'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Private browsing prevents SwissSurfer from recording visited pages in the history and storing web page icons.</span></p></body></html> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Private browsing prevents SwissSurfer from recording visited pages in the history and storing web page icons.</span></p></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Private browsing prevents SwissBrowser from recording visited pages in the history and storing web page icons.</span></p></body></html> diff --git a/src/qbrowserlib/qbrowserlib_fr.ts b/src/qbrowserlib/qbrowserlib_fr.ts index e5a78b3..1112a0f 100644 --- a/src/qbrowserlib/qbrowserlib_fr.ts +++ b/src/qbrowserlib/qbrowserlib_fr.ts @@ -183,8 +183,7 @@ p, li { white-space: pre-wrap; } <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'DejaVu Serif'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Specifies whether SwissSurfer will try to pre-fetch DNS entries to speed up browsing.</span></p></body></html> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Specifies whether SwissSurfer will try to pre-fetch DNS entries to speed up browsing.</span></p></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Specifies whether SwissBrowser will try to pre-fetch DNS entries to speed up browsing.</span></p></body></html> @@ -401,8 +400,7 @@ p, li { white-space: pre-wrap; } <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'DejaVu Serif'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Private browsing prevents SwissSurfer from recording visited pages in the history and storing web page icons.</span></p></body></html> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Private browsing prevents SwissSurfer from recording visited pages in the history and storing web page icons.</span></p></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Private browsing prevents SwissBrowser from recording visited pages in the history and storing web page icons.</span></p></body></html> diff --git a/src/qbrowserlib/qbrowserlib_it.ts b/src/qbrowserlib/qbrowserlib_it.ts index 692e596..2e91351 100644 --- a/src/qbrowserlib/qbrowserlib_it.ts +++ b/src/qbrowserlib/qbrowserlib_it.ts @@ -183,8 +183,7 @@ p, li { white-space: pre-wrap; } <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'DejaVu Serif'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Specifies whether SwissSurfer will try to pre-fetch DNS entries to speed up browsing.</span></p></body></html> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Specifies whether SwissSurfer will try to pre-fetch DNS entries to speed up browsing.</span></p></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Specifies whether SwissBrowser will try to pre-fetch DNS entries to speed up browsing.</span></p></body></html> @@ -401,8 +400,7 @@ p, li { white-space: pre-wrap; } <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'DejaVu Serif'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Private browsing prevents SwissSurfer from recording visited pages in the history and storing web page icons.</span></p></body></html> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Private browsing prevents SwissSurfer from recording visited pages in the history and storing web page icons.</span></p></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Private browsing prevents SwissBrowser from recording visited pages in the history and storing web page icons.</span></p></body></html> diff --git a/src/qbrowserlib/settings.ui b/src/qbrowserlib/settings.ui index 2e4676a..a1091dd 100644 --- a/src/qbrowserlib/settings.ui +++ b/src/qbrowserlib/settings.ui @@ -53,8 +53,7 @@ p, li { white-space: pre-wrap; } <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'DejaVu Serif'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Specifies whether SwissSurfer will try to pre-fetch DNS entries to speed up browsing.</span></p></body></html> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Specifies whether SwissSurfer will try to pre-fetch DNS entries to speed up browsing.</span></p></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Specifies whether SwissBrowser will try to pre-fetch DNS entries to speed up browsing.</span></p></body></html> DNS prefetch enabled @@ -343,8 +342,7 @@ p, li { white-space: pre-wrap; } <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'DejaVu Serif'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Private browsing prevents SwissSurfer from recording visited pages in the history and storing web page icons.</span></p></body></html> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Private browsing prevents SwissSurfer from recording visited pages in the history and storing web page icons.</span></p></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Private browsing prevents SwissBrowser from recording visited pages in the history and storing web page icons.</span></p></body></html> private browsing diff --git a/src/qmake.pro.in b/src/qmake.pro.in index de08554..1ae867a 100644 --- a/src/qmake.pro.in +++ b/src/qmake.pro.in @@ -29,8 +29,7 @@ win32 { QMAKE_LIBS += /opt/local/i586-mingw32msvc/lib/winscard.a CONFIG += release } -ICON = swisssurfer.icns -ICON = swisssurfer.icns +ICON = swissbrowser.icns TRANSLATIONS = @PACKAGENAME@_en.ts \ @PACKAGENAME@_de.ts \ diff --git a/src/resources.qrc b/src/resources.qrc index 46eaed0..c4c17af 100644 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -1,8 +1,7 @@ resources/icons/32x32/butt32_49.png - resources/icons/32x32/swisssurfer.png - resources/icons/32x32/swisssurfer.png + resources/icons/32x32/swissbrowser.png resources/icons/32x32/butt32_01.png resources/icons/32x32/butt32_02.png resources/icons/32x32/butt32_03.png @@ -19,8 +18,7 @@ resources/icons/16x16/butt16_49.png - resources/icons/16x16/swisssurfer.png - resources/icons/16x16/swisssurfer.png + resources/icons/16x16/swissbrowser.png resources/icons/16x16/butt16_01.png resources/icons/16x16/butt16_02.png resources/icons/16x16/butt16_03.png diff --git a/src/resources/icons/128x128/SW_SwissSurfer_128x128x32.png b/src/resources/icons/128x128/SW_SwissBrowser_128x128x32.png similarity index 100% rename from src/resources/icons/128x128/SW_SwissSurfer_128x128x32.png rename to src/resources/icons/128x128/SW_SwissBrowser_128x128x32.png diff --git a/src/resources/icons/16x16/swisssurfer.png b/src/resources/icons/16x16/swissbrowser.png similarity index 100% rename from src/resources/icons/16x16/swisssurfer.png rename to src/resources/icons/16x16/swissbrowser.png diff --git a/src/resources/icons/256x256/SW_SwissSurfer_256x256x32.png b/src/resources/icons/256x256/SW_SwissBrowser_256x256x32.png similarity index 100% rename from src/resources/icons/256x256/SW_SwissSurfer_256x256x32.png rename to src/resources/icons/256x256/SW_SwissBrowser_256x256x32.png diff --git a/src/resources/icons/32x32/swisssurfer.png b/src/resources/icons/32x32/swissbrowser.png similarity index 100% rename from src/resources/icons/32x32/swisssurfer.png rename to src/resources/icons/32x32/swissbrowser.png diff --git a/src/resources/icons/48x48/SW_SwissSurfer_48x48x32.png b/src/resources/icons/48x48/SW_SwissBrowser_48x48x32.png similarity index 100% rename from src/resources/icons/48x48/SW_SwissSurfer_48x48x32.png rename to src/resources/icons/48x48/SW_SwissBrowser_48x48x32.png diff --git a/src/resources/icons/512x512/SW_SwissSurfer_512x512x32.png b/src/resources/icons/512x512/SW_SwissBrowser_512x512x32.png similarity index 100% rename from src/resources/icons/512x512/SW_SwissSurfer_512x512x32.png rename to src/resources/icons/512x512/SW_SwissBrowser_512x512x32.png diff --git a/src/resources/icons/about.png b/src/resources/icons/about.png index e022a5d..54046e8 100644 Binary files a/src/resources/icons/about.png and b/src/resources/icons/about.png differ diff --git a/src/resources/icons/addbookmark.png b/src/resources/icons/addbookmark.png index 2bf48ec..8070895 100644 Binary files a/src/resources/icons/addbookmark.png and b/src/resources/icons/addbookmark.png differ diff --git a/src/resources/icons/clearlocation.png b/src/resources/icons/clearlocation.png index 6832633..06c6474 100644 Binary files a/src/resources/icons/clearlocation.png and b/src/resources/icons/clearlocation.png differ diff --git a/src/resources/icons/close.png b/src/resources/icons/close.png index 486d9ad..c44e18a 100644 Binary files a/src/resources/icons/close.png and b/src/resources/icons/close.png differ diff --git a/src/resources/icons/error.png b/src/resources/icons/error.png index 6db4008..c2aca74 100644 Binary files a/src/resources/icons/error.png and b/src/resources/icons/error.png differ diff --git a/src/resources/icons/find.png b/src/resources/icons/find.png index 0a87f72..a274e67 100644 Binary files a/src/resources/icons/find.png and b/src/resources/icons/find.png differ diff --git a/src/resources/icons/newtab.png b/src/resources/icons/newtab.png index 9da11d1..d1825ba 100644 Binary files a/src/resources/icons/newtab.png and b/src/resources/icons/newtab.png differ diff --git a/src/resources/icons/newwindow.png b/src/resources/icons/newwindow.png index f74cee1..b9572bf 100644 Binary files a/src/resources/icons/newwindow.png and b/src/resources/icons/newwindow.png differ diff --git a/src/resources/icons/print.png b/src/resources/icons/print.png index cc19072..ce01371 100644 Binary files a/src/resources/icons/print.png and b/src/resources/icons/print.png differ diff --git a/src/resources/icons/printpreview.png b/src/resources/icons/printpreview.png index d4266f5..b39f0c0 100644 Binary files a/src/resources/icons/printpreview.png and b/src/resources/icons/printpreview.png differ diff --git a/src/resources/icons/settings.png b/src/resources/icons/settings.png index f3caa4c..b44476e 100644 Binary files a/src/resources/icons/settings.png and b/src/resources/icons/settings.png differ diff --git a/src/resources/icons/swisssurfer.ico b/src/resources/icons/swissbrowser.ico similarity index 100% rename from src/resources/icons/swisssurfer.ico rename to src/resources/icons/swissbrowser.ico diff --git a/src/resources/icons/swisssurfer.png b/src/resources/icons/swissbrowser.png similarity index 100% rename from src/resources/icons/swisssurfer.png rename to src/resources/icons/swissbrowser.png diff --git a/src/resources/icons/swisssurfer_32x32x32.png b/src/resources/icons/swissbrowser_32x32x32.png similarity index 100% rename from src/resources/icons/swisssurfer_32x32x32.png rename to src/resources/icons/swissbrowser_32x32x32.png diff --git a/src/resources/icons/usercert.png b/src/resources/icons/usercert.png index e2963cf..fbf0a5e 100644 Binary files a/src/resources/icons/usercert.png and b/src/resources/icons/usercert.png differ diff --git a/src/resources/swisssurfer.png b/src/resources/swissbrowser.png similarity index 100% rename from src/resources/swisssurfer.png rename to src/resources/swissbrowser.png diff --git a/src/swissbrowser.desktop b/src/swissbrowser.desktop new file mode 100644 index 0000000..fa92edf --- /dev/null +++ b/src/swissbrowser.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Type=Application +Name=swissbrowser +Name[de]=swissbrowser +Name[fr]=swissbrowser +Name[it]=swissbrowser +Name[en]=swissbrowser +GenericName=SwissBrowser +Comment=Browser with SuisseID login +Icon=/usr/share/swissbrowser/swissbrowser.png +Categories=Network;WebBrowser +Exec=/usr/bin/swissbrowser diff --git a/src/swisssurfer.icns b/src/swissbrowser.icns similarity index 100% rename from src/swisssurfer.icns rename to src/swissbrowser.icns diff --git a/src/swisssurfer_de.ts b/src/swissbrowser_de.ts similarity index 98% rename from src/swisssurfer_de.ts rename to src/swissbrowser_de.ts index 95c015b..12a33d3 100644 --- a/src/swisssurfer_de.ts +++ b/src/swissbrowser_de.ts @@ -405,8 +405,7 @@ This product includes cryptographic software written by Eric Young (eay@cryptsof - SwissSurfer - SwissSurfer + SwissBrowser @@ -456,15 +455,13 @@ This product includes cryptographic software written by Eric Young (eay@cryptsof - [%1] - %2 - SwissSurfer (%3) - [%1] - %2 - SwissSurfer (%3) + [%1] - %2 - SwissBrowser (%3) main window title %1 = host name %2 = page title %3 = number of open tabs - SwissSurfer - SwissSurfer + SwissBrowser window title with no tab @@ -765,8 +762,7 @@ This product includes cryptographic software written by Eric Young (eay@cryptsof - SwissSurfer - SwissSurfer + SwissBrowser application name diff --git a/src/swisssurfer_en.ts b/src/swissbrowser_en.ts similarity index 98% rename from src/swisssurfer_en.ts rename to src/swissbrowser_en.ts index f78dec5..a59c1b0 100644 --- a/src/swisssurfer_en.ts +++ b/src/swissbrowser_en.ts @@ -405,8 +405,7 @@ This product includes cryptographic software written by Eric Young (eay@cryptsof - SwissSurfer - SwissSurfer + SwissBrowser @@ -456,15 +455,13 @@ This product includes cryptographic software written by Eric Young (eay@cryptsof - [%1] - %2 - SwissSurfer (%3) - [%1] - %2 - SwissSurfer (%3) + [%1] - %2 - SwissBrowser (%3) main window title %1 = host name %2 = page title %3 = number of open tabs - SwissSurfer - SwissSurfer + SwissBrowser window title with no tab @@ -765,8 +762,7 @@ This product includes cryptographic software written by Eric Young (eay@cryptsof - SwissSurfer - SwissSurfer + SwissBrowser application name diff --git a/src/swisssurfer_fr.ts b/src/swissbrowser_fr.ts similarity index 98% rename from src/swisssurfer_fr.ts rename to src/swissbrowser_fr.ts index 3b3d0f2..0bc51d7 100644 --- a/src/swisssurfer_fr.ts +++ b/src/swissbrowser_fr.ts @@ -405,8 +405,7 @@ This product includes cryptographic software written by Eric Young (eay@cryptsof - SwissSurfer - SwissSurfer + SwissBrowser @@ -456,15 +455,13 @@ This product includes cryptographic software written by Eric Young (eay@cryptsof - [%1] - %2 - SwissSurfer (%3) - [%1] - %2 - SwissSurfer (%3) + [%1] - %2 - SwissBrowser (%3) main window title %1 = host name %2 = page title %3 = number of open tabs - SwissSurfer - SwissSurfer + SwissBrowser window title with no tab @@ -765,8 +762,7 @@ This product includes cryptographic software written by Eric Young (eay@cryptsof - SwissSurfer - SwissSurfer + SwissBrowser application name diff --git a/src/swisssurfer_it.ts b/src/swissbrowser_it.ts similarity index 98% rename from src/swisssurfer_it.ts rename to src/swissbrowser_it.ts index 1d44627..0b19ac3 100644 --- a/src/swisssurfer_it.ts +++ b/src/swissbrowser_it.ts @@ -405,8 +405,7 @@ This product includes cryptographic software written by Eric Young (eay@cryptsof - SwissSurfer - SwissSurfer + SwissBrowser @@ -456,15 +455,13 @@ This product includes cryptographic software written by Eric Young (eay@cryptsof - [%1] - %2 - SwissSurfer (%3) - [%1] - %2 - SwissSurfer (%3) + [%1] - %2 - SwissBrowser (%3) main window title %1 = host name %2 = page title %3 = number of open tabs - SwissSurfer - SwissSurfer + SwissBrowser window title with no tab @@ -765,8 +762,7 @@ This product includes cryptographic software written by Eric Young (eay@cryptsof - SwissSurfer - SwissSurfer + SwissBrowser application name diff --git a/src/swisssurfer.desktop b/src/swisssurfer.desktop deleted file mode 100644 index 1c4eb25..0000000 --- a/src/swisssurfer.desktop +++ /dev/null @@ -1,20 +0,0 @@ -[Desktop Entry] -Type=Application -Name=swisssurfer -Name=swisssurfer -Name[de]=swisssurfer -Name[de]=swisssurfer -Name[fr]=swisssurfer -Name[fr]=swisssurfer -Name[it]=swisssurfer -Name[it]=swisssurfer -Name[en]=swisssurfer -Name[en]=swisssurfer -GenericName=SwissSurfer -GenericName=SwissSurfer -Comment=Browser with SuisseID login -Icon=/usr/share/swisssurfer/swisssurfer.png -Icon=/usr/share/swisssurfer/swisssurfer.png -Categories=Network;WebBrowser -Exec=/usr/bin/swisssurfer -Exec=/usr/bin/swisssurfer diff --git a/swisssurfer.spec.in b/swissbrowser.spec.in similarity index 86% rename from swisssurfer.spec.in rename to swissbrowser.spec.in index 8b3b5f8..52e3bc5 100644 --- a/swisssurfer.spec.in +++ b/swissbrowser.spec.in @@ -38,8 +38,7 @@ DESTDIR=$RPM_BUILD_ROOT make install rm -rf $RPM_BUILD_ROOT/usr/share/doc/packages/@PACKAGENAME@/html rm $RPM_BUILD_ROOT/usr/share/doc/packages/@PACKAGENAME@/COPYING rm $RPM_BUILD_ROOT/usr/share/doc/packages/@PACKAGENAME@/INSTALL -rm $RPM_BUILD_ROOT/usr/share/doc/packages/swisssurfer/swisssurfer.spec -rm $RPM_BUILD_ROOT/usr/share/doc/packages/swisssurfer/swisssurfer.spec +rm $RPM_BUILD_ROOT/usr/share/doc/packages/swissbrowser/swissbrowser.spec %clean rm -rf $RPM_BUILD_ROOT @@ -48,10 +47,8 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) /usr/bin/@PACKAGENAME@ /usr/share/applications/@PACKAGENAME@.desktop -/usr/share/swisssurfer/swisssurfer.png -/usr/share/swisssurfer/swisssurfer.png -/usr/share/swisssurfer/swisssurfer.xpm -/usr/share/swisssurfer/swisssurfer.xpm +/usr/share/swissbrowser/swissbrowser.png +/usr/share/swissbrowser/swissbrowser.xpm /usr/%_lib/lib*.so.* %doc /usr/share/doc/packages/@PACKAGENAME@/AUTHORS