diff --git a/AUTHORS b/AUTHORS index 397c4d560..f67ec1a64 100644 --- a/AUTHORS +++ b/AUTHORS @@ -12,7 +12,8 @@ Bryan M Dunsmore (opening background tab Mariusz Fik (fixed tab order in preferences dialog) Daniele Cocca (close tabs with middle click, initial work on speed dial) Giuseppe Calà (fixed loading of bookmarklets) -Jan Rajnoha (QupZilla icon) +Adrien Vigneron (new QupZilla logo) +Elio Qoshi (new QupZilla logo) Translators: @@ -56,5 +57,5 @@ Special thanks: Jonathan Hooverman (english language correction) Peter Vacula (for a big support in the beginnings) -Sergio Cipolla (modifications to QupZilla icon) +Sergio Cipolla (modifications to old QupZilla icon) Radomir Orkac (qupzilla.com domain) diff --git a/linux/hicolor/128x128/apps/qupzilla.png b/linux/hicolor/128x128/apps/qupzilla.png index 523bb3fa8..ba314bd26 100644 Binary files a/linux/hicolor/128x128/apps/qupzilla.png and b/linux/hicolor/128x128/apps/qupzilla.png differ diff --git a/linux/hicolor/16x16/apps/qupzilla.png b/linux/hicolor/16x16/apps/qupzilla.png index 25d905a0d..b5430935f 100644 Binary files a/linux/hicolor/16x16/apps/qupzilla.png and b/linux/hicolor/16x16/apps/qupzilla.png differ diff --git a/linux/hicolor/256x256/apps/qupzilla.png b/linux/hicolor/256x256/apps/qupzilla.png index 787155176..cf8722a95 100644 Binary files a/linux/hicolor/256x256/apps/qupzilla.png and b/linux/hicolor/256x256/apps/qupzilla.png differ diff --git a/linux/hicolor/32x32/apps/qupzilla.png b/linux/hicolor/32x32/apps/qupzilla.png index a79005b1d..1ed5e5378 100644 Binary files a/linux/hicolor/32x32/apps/qupzilla.png and b/linux/hicolor/32x32/apps/qupzilla.png differ diff --git a/linux/hicolor/48x48/apps/qupzilla.png b/linux/hicolor/48x48/apps/qupzilla.png index ba7fbfe78..9799062b4 100644 Binary files a/linux/hicolor/48x48/apps/qupzilla.png and b/linux/hicolor/48x48/apps/qupzilla.png differ diff --git a/linux/hicolor/64x64/apps/qupzilla.png b/linux/hicolor/64x64/apps/qupzilla.png index 182c8e336..0a9cf9e81 100644 Binary files a/linux/hicolor/64x64/apps/qupzilla.png and b/linux/hicolor/64x64/apps/qupzilla.png differ diff --git a/linux/pixmaps/qupzilla.png b/linux/pixmaps/qupzilla.png index ba7fbfe78..9799062b4 100644 Binary files a/linux/pixmaps/qupzilla.png and b/linux/pixmaps/qupzilla.png differ diff --git a/src/lib/data/html/about.html b/src/lib/data/html/about.html index 90e7d64e8..16787f930 100644 --- a/src/lib/data/html/about.html +++ b/src/lib/data/html/about.html @@ -12,7 +12,7 @@ dl {margin-top: 0px;} dt {display: block;float: %LEFT_STR%;min-width: 24%;margin: 0 0 0.3em 1%} dd {color: black;margin: 0 0 0.3em 28%;} p {margin-%LEFT_STR%: 1%;} -.about-img {float: %RIGHT_STR%;margin-top: 15px;margin-%RIGHT_STR%: -25px;} +.about-img {float: %RIGHT_STR%;} diff --git a/src/lib/data/html/config.html b/src/lib/data/html/config.html index e53f2a615..8b699f429 100644 --- a/src/lib/data/html/config.html +++ b/src/lib/data/html/config.html @@ -12,7 +12,7 @@ dl {margin-top: 0px;} dt {display: block;float: %LEFT_STR%;min-width: 24%;margin: 0 0 0.3em 1%} dd {color: black;margin: 0 0 0.3em 28%;} p {margin-%LEFT_STR%: 1%;} -.about-img {float: %RIGHT_STR%;margin-top: 15px;margin-%RIGHT_STR%: -25px;} +.about-img {float: %RIGHT_STR%;} table.tbl {width: 100%;margin: 15px 0;border-radius: 4px;padding: 0px;border: 2px solid #aaa;border-collapse: separate;} .tbl th{border-radius: 2px;border: 1px solid #aaa;padding: 1px 3px;background: #eee;font-style:italic;} .tbl th[colspan="2"] {text-align: center;background: #ddd;font-style:normal;} diff --git a/src/lib/data/html/start.html b/src/lib/data/html/start.html index 92f93d1ec..6ac1941f4 100644 --- a/src/lib/data/html/start.html +++ b/src/lib/data/html/start.html @@ -11,6 +11,7 @@ h1 {color: #1a4ba4;font-size: 160%;margin-top: 0px;} .submit {margin-top: 5px;} a {color: #1a4ba4;text-decoration: none;font-weight: bold;} .bottom {margin-top: 20px;margin-bottom: 3px;} +img {margin-bottom:15px;} diff --git a/src/lib/data/icons.qrc b/src/lib/data/icons.qrc index 0333f3404..95f6838c5 100644 --- a/src/lib/data/icons.qrc +++ b/src/lib/data/icons.qrc @@ -1,7 +1,6 @@ icons/qupzilla.png - icons/qupzillaupdate.png icons/preferences/applications-internet.png icons/preferences/applications-system.png icons/preferences/applications-webbrowsers.png @@ -64,5 +63,6 @@ icons/other/empty-page.png icons/menu/privatebrowsing.png icons/menu/settings.png + icons/other/startpage.png diff --git a/src/lib/data/icons/exeicons/page.ico b/src/lib/data/icons/exeicons/page.ico index 9968167c2..db35de3e1 100644 Binary files a/src/lib/data/icons/exeicons/page.ico and b/src/lib/data/icons/exeicons/page.ico differ diff --git a/src/lib/data/icons/exeicons/page16.png b/src/lib/data/icons/exeicons/page16.png index 83a4c71b0..ef1101163 100644 Binary files a/src/lib/data/icons/exeicons/page16.png and b/src/lib/data/icons/exeicons/page16.png differ diff --git a/src/lib/data/icons/exeicons/page32.png b/src/lib/data/icons/exeicons/page32.png index 9c8126cd0..8d1271599 100644 Binary files a/src/lib/data/icons/exeicons/page32.png and b/src/lib/data/icons/exeicons/page32.png differ diff --git a/src/lib/data/icons/exeicons/page48.png b/src/lib/data/icons/exeicons/page48.png index b05e9c97d..8d03f3615 100644 Binary files a/src/lib/data/icons/exeicons/page48.png and b/src/lib/data/icons/exeicons/page48.png differ diff --git a/src/lib/data/icons/exeicons/qupzilla-window.png b/src/lib/data/icons/exeicons/qupzilla-window.png index 2a580f5d5..cf8722a95 100644 Binary files a/src/lib/data/icons/exeicons/qupzilla-window.png and b/src/lib/data/icons/exeicons/qupzilla-window.png differ diff --git a/src/lib/data/icons/exeicons/qupzilla.ico b/src/lib/data/icons/exeicons/qupzilla.ico index 515e92567..d61d995e4 100644 Binary files a/src/lib/data/icons/exeicons/qupzilla.ico and b/src/lib/data/icons/exeicons/qupzilla.ico differ diff --git a/src/lib/data/icons/other/about.png b/src/lib/data/icons/other/about.png index a4128db10..726024f93 100644 Binary files a/src/lib/data/icons/other/about.png and b/src/lib/data/icons/other/about.png differ diff --git a/src/lib/data/icons/other/startpage.png b/src/lib/data/icons/other/startpage.png new file mode 100644 index 000000000..6b6af3a85 Binary files /dev/null and b/src/lib/data/icons/other/startpage.png differ diff --git a/src/lib/data/icons/qupzilla.png b/src/lib/data/icons/qupzilla.png index 430128f2b..8197cbcc6 100644 Binary files a/src/lib/data/icons/qupzilla.png and b/src/lib/data/icons/qupzilla.png differ diff --git a/src/lib/data/icons/qupzillaupdate.png b/src/lib/data/icons/qupzillaupdate.png deleted file mode 100644 index dab699cff..000000000 Binary files a/src/lib/data/icons/qupzillaupdate.png and /dev/null differ diff --git a/src/lib/data/qupzilla.png b/src/lib/data/qupzilla.png index 7fb55f61e..9799062b4 100644 Binary files a/src/lib/data/qupzilla.png and b/src/lib/data/qupzilla.png differ diff --git a/src/lib/network/schemehandlers/qupzillaschemehandler.cpp b/src/lib/network/schemehandlers/qupzillaschemehandler.cpp index a7dcc7b68..873025a4a 100644 --- a/src/lib/network/schemehandlers/qupzillaschemehandler.cpp +++ b/src/lib/network/schemehandlers/qupzillaschemehandler.cpp @@ -170,7 +170,7 @@ QString QupZillaSchemeReply::startPage() sPage.append(QzTools::readAllFileContents(":html/start.html")); sPage.replace(QLatin1String("%FAVICON%"), QLatin1String("qrc:icons/qupzilla.png")); sPage.replace(QLatin1String("%BOX-BORDER%"), QLatin1String("qrc:html/box-border.png")); - sPage.replace(QLatin1String("%ABOUT-IMG%"), QLatin1String("qrc:icons/other/about.png")); + sPage.replace(QLatin1String("%ABOUT-IMG%"), QLatin1String("qrc:icons/other/startpage.png")); sPage.replace(QLatin1String("%TITLE%"), tr("Start Page")); sPage.replace(QLatin1String("%BUTTON-LABEL%"), tr("Search on Web")); @@ -212,12 +212,13 @@ QString QupZillaSchemeReply::aboutPage() aPage.replace(QLatin1String("%CONTRIBUTORS%"), tr("Contributors")); aPage.replace(QLatin1String("%CONTRIBUTORS-TEXT%"), authorString("Mladen Pejaković", "pejakm@autistici.org") + "
" + - authorString("Alexander Samilov", "alexsamilovskih@gmail.com") + "
" + + authorString("Adrien Vigneron", "adrienvigneron@ml1.net") + "
" + + authorString("Elio Qoshi", "ping@elioqoshi.me") + "
" + authorString("Seyyed Razi Alavizadeh", "s.r.alavizadeh@gmail.com") + "
" + + authorString("Alexander Samilov", "alexsamilovskih@gmail.com") + "
" + authorString("Franz Fellner", "alpine.art.de@googlemail.com") + "
" + authorString("Bryan M Dunsmore", "dunsmoreb@gmail.com") + "
" + authorString("Mariusz Fik", "fisiu@opensuse.org") + "
" + - authorString("Jan Rajnoha", "honza.rajny@hotmail.com") + "
" + authorString("Daniele Cocca", "jmc@chakra-project.org") ); aPage.replace(QLatin1String("%TRANSLATORS%"), tr("Translators")); diff --git a/src/lib/other/aboutdialog.cpp b/src/lib/other/aboutdialog.cpp index c64a983b2..5c9c23191 100644 --- a/src/lib/other/aboutdialog.cpp +++ b/src/lib/other/aboutdialog.cpp @@ -65,7 +65,7 @@ void AboutDialog::showAbout() m_showingAuthors = false; ui->authorsButton->setText(tr("Authors and Contributors")); if (m_aboutHtml.isEmpty()) { - m_aboutHtml += "
"; + m_aboutHtml += "
"; m_aboutHtml += tr("

Application version %1
").arg( #ifdef GIT_REVISION QString("%1 (%2)").arg(Qz::VERSION, GIT_REVISION) @@ -91,12 +91,13 @@ void AboutDialog::showAuthors() m_authorsHtml += tr("

Main developer:
%1 <%2>

").arg(Qz::AUTHOR, "nowrep@gmail.com"); m_authorsHtml += tr("

Contributors:
%1

").arg( QString::fromUtf8("Mladen Pejaković
" - "Alexander Samilov
" "Seyyed Razi Alavizadeh
" + "Adrien Vigneron
" + "Elio Qoshi
" + "Alexander Samilov
" "Franz Fellner
" "Bryan M Dunsmore
" "Mariusz Fik
" - "Jan Rajnoha
" "Daniele Cocca") ); diff --git a/src/lib/other/aboutdialog.ui b/src/lib/other/aboutdialog.ui index c515b9589..bcdff4ef9 100644 --- a/src/lib/other/aboutdialog.ui +++ b/src/lib/other/aboutdialog.ui @@ -6,8 +6,8 @@ 0 0 - 381 - 416 + 446 + 382 @@ -32,13 +32,6 @@ Qt::ScrollBarAlwaysOff - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html> - true diff --git a/src/lib/other/updater.cpp b/src/lib/other/updater.cpp index 8dc199737..85eef5edd 100644 --- a/src/lib/other/updater.cpp +++ b/src/lib/other/updater.cpp @@ -148,7 +148,7 @@ void Updater::downCompleted() Version updated(html); if (current.isValid && updated.isValid && current < updated) { - mApp->desktopNotifications()->showNotification(QPixmap(":icons/qupzillaupdate.png"), tr("Update available"), tr("New version of QupZilla is ready to download.")); + mApp->desktopNotifications()->showNotification(QPixmap(":icons/qupzilla.png"), tr("Update available"), tr("New version of QupZilla is ready to download.")); } } diff --git a/windows/install.ico b/windows/install.ico index 0520a17e8..964b4183c 100644 Binary files a/windows/install.ico and b/windows/install.ico differ diff --git a/windows/uninstall.ico b/windows/uninstall.ico index f31b71786..d27591c86 100644 Binary files a/windows/uninstall.ico and b/windows/uninstall.ico differ diff --git a/windows/welcome.bmp b/windows/welcome.bmp index eb9f2c64d..67ce0b30e 100644 Binary files a/windows/welcome.bmp and b/windows/welcome.bmp differ