New logo

Thanks to Adrien Vigneron and Elio Qoshi
10 years ago · 8b2e6bf9b6
parent 999bfd3b9a
commit 8b2e6bf9b6
30 changed files with 18 additions and 21 deletions
--- a/5
+++ b/5
@ -12,7 +12,8 @@ Bryan M Dunsmore       <dunsmoreb@gmail.com>             (opening background tab
 Mariusz Fik            <fisiu@opensuse.org>              (fixed tab order in preferences dialog)
 Daniele Cocca          <jmc@chakra-project.org>          (close tabs with middle click, initial work on speed dial)
 Giuseppe Calà          <jiveaxe@gmail.com>               (fixed loading of bookmarklets)
-Jan Rajnoha            <honza.rajny@hotmail.com>         (QupZilla icon)
+Adrien Vigneron        <adrienvigneron@ml1.net>          (new QupZilla logo)
 Elio Qoshi             <ping@elioqoshi.me>               (new QupZilla logo)
 Translators:
@ -56,5 +57,5 @@ Special thanks:
 Jonathan Hooverman    <jonathan.hooverman@gmail.com>    (english language correction)
 Peter Vacula          <pvacula1989@gmail.com>           (for a big support in the beginnings)
-Sergio Cipolla        <secipolla@gmail.com>             (modifications to QupZilla icon)
+Sergio Cipolla        <secipolla@gmail.com>             (modifications to old QupZilla icon)
 Radomir Orkac                                           (qupzilla.com domain)
--- a/linux/hicolor/128x128/apps/qupzilla.png
+++ b/linux/hicolor/128x128/apps/qupzilla.png
--- a/linux/hicolor/16x16/apps/qupzilla.png
+++ b/linux/hicolor/16x16/apps/qupzilla.png
--- a/linux/hicolor/256x256/apps/qupzilla.png
+++ b/linux/hicolor/256x256/apps/qupzilla.png
--- a/linux/hicolor/32x32/apps/qupzilla.png
+++ b/linux/hicolor/32x32/apps/qupzilla.png
--- a/linux/hicolor/48x48/apps/qupzilla.png
+++ b/linux/hicolor/48x48/apps/qupzilla.png
--- a/linux/hicolor/64x64/apps/qupzilla.png
+++ b/linux/hicolor/64x64/apps/qupzilla.png
--- a/linux/pixmaps/qupzilla.png
+++ b/linux/pixmaps/qupzilla.png
--- 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%;}
 </style>
 </head>
 <body>
--- 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;}
--- 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;}
 </style>
 </head>
 <body onload="document.getElementById('inp').focus()">
--- a/src/lib/data/icons.qrc
+++ b/src/lib/data/icons.qrc
@ -1,7 +1,6 @@
 <RCC>
    <qresource prefix="/">
        <file>icons/qupzilla.png</file>
        <file>icons/qupzillaupdate.png</file>
        <file>icons/preferences/applications-internet.png</file>
        <file>icons/preferences/applications-system.png</file>
        <file>icons/preferences/applications-webbrowsers.png</file>
@ -64,5 +63,6 @@
        <file>icons/other/empty-page.png</file>
        <file>icons/menu/privatebrowsing.png</file>
        <file>icons/menu/settings.png</file>
        <file>icons/other/startpage.png</file>
    </qresource>
 </RCC>
--- a/src/lib/data/icons/exeicons/page.ico
+++ b/src/lib/data/icons/exeicons/page.ico
--- a/src/lib/data/icons/exeicons/page16.png
+++ b/src/lib/data/icons/exeicons/page16.png
--- a/src/lib/data/icons/exeicons/page32.png
+++ b/src/lib/data/icons/exeicons/page32.png
--- a/src/lib/data/icons/exeicons/page48.png
+++ b/src/lib/data/icons/exeicons/page48.png
--- a/src/lib/data/icons/exeicons/qupzilla-window.png
+++ b/src/lib/data/icons/exeicons/qupzilla-window.png
--- a/src/lib/data/icons/exeicons/qupzilla.ico
+++ b/src/lib/data/icons/exeicons/qupzilla.ico
--- a/src/lib/data/icons/other/about.png
+++ b/src/lib/data/icons/other/about.png
--- a/src/lib/data/icons/other/startpage.png
+++ b/src/lib/data/icons/other/startpage.png
--- a/src/lib/data/icons/qupzilla.png
+++ b/src/lib/data/icons/qupzilla.png
--- a/src/lib/data/icons/qupzillaupdate.png
+++ b/src/lib/data/icons/qupzillaupdate.png
--- a/src/lib/data/qupzilla.png
+++ b/src/lib/data/qupzilla.png
--- 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") + "<br/>" +
-                      authorString("Alexander Samilov", "alexsamilovskih@gmail.com") + "<br/>" +
+                      authorString("Adrien Vigneron", "adrienvigneron@ml1.net") + "<br/>" +
                      authorString("Elio Qoshi", "ping@elioqoshi.me") + "<br/>" +
                      authorString("Seyyed Razi Alavizadeh", "s.r.alavizadeh@gmail.com") + "<br/>" +
                      authorString("Alexander Samilov", "alexsamilovskih@gmail.com") + "<br/>" +
                      authorString("Franz Fellner", "alpine.art.de@googlemail.com") + "<br/>" +
                      authorString("Bryan M Dunsmore", "dunsmoreb@gmail.com") + "<br/>" +
                      authorString("Mariusz Fik", "fisiu@opensuse.org") + "<br/>" +
                      authorString("Jan Rajnoha", "honza.rajny@hotmail.com")  + "<br/>" +
                      authorString("Daniele Cocca", "jmc@chakra-project.org")
                     );
        aPage.replace(QLatin1String("%TRANSLATORS%"), tr("Translators"));
--- 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 += "<center><div style='margin:10px;'>";
+        m_aboutHtml += "<center><div style='margin:20px;'>";
        m_aboutHtml += tr("<p><b>Application version %1</b><br/>").arg(
 #ifdef GIT_REVISION
                           QString("%1 (%2)").arg(Qz::VERSION, GIT_REVISION)
@ -91,12 +91,13 @@ void AboutDialog::showAuthors()
        m_authorsHtml += tr("<p><b>Main developer:</b><br/>%1 &lt;%2&gt;</p>").arg(Qz::AUTHOR, "<a href=mailto:nowrep@gmail.com>nowrep@gmail.com</a>");
        m_authorsHtml += tr("<p><b>Contributors:</b><br/>%1</p>").arg(
                             QString::fromUtf8("Mladen Pejaković<br/>"
                                               "Alexander Samilov<br/>"
                                               "Seyyed Razi Alavizadeh<br/>"
                                               "Adrien Vigneron<br/>"
                                               "Elio Qoshi<br/>"
                                               "Alexander Samilov<br/>"
                                               "Franz Fellner<br/>"
                                               "Bryan M Dunsmore<br/>"
                                               "Mariusz Fik<br/>"
                                               "Jan Rajnoha<br/>"
                                               "Daniele Cocca")
                         );
--- a/src/lib/other/aboutdialog.ui
+++ b/src/lib/other/aboutdialog.ui
@ -6,8 +6,8 @@
   <rect>
    <x>0</x>
    <y>0</y>
-    <width>381</width>
+    <width>446</width>
-    <height>416</height>
+    <height>382</height>
   </rect>
  </property>
  <property name="windowTitle">
@ -32,13 +32,6 @@
     <property name="horizontalScrollBarPolicy">
      <enum>Qt::ScrollBarAlwaysOff</enum>
     </property>
     <property name="html">
      <string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     </property>
     <property name="openExternalLinks">
      <bool>true</bool>
     </property>
--- 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."));
        }
    }
--- a/windows/install.ico
+++ b/windows/install.ico
--- a/windows/uninstall.ico
+++ b/windows/uninstall.ico
--- a/windows/welcome.bmp
+++ b/windows/welcome.bmp