Thematic changes

src/lib/app/qupzilla.cpp

@@ -396,7 +396,7 @@ void QupZilla::setupMenu()
     m_actionAbout->setMenuRole(QAction::AboutRole);
     connect(m_actionAbout, SIGNAL(triggered()), MENU_RECEIVER, SLOT(aboutQupZilla()));
 
-    m_actionPreferences = new QAction(QIcon::fromTheme("preferences-desktop", QIcon(":/icons/faenza/settings.png")), tr("Pr&eferences"), 0);
+    m_actionPreferences = new QAction(QIcon::fromTheme("preferences-desktop", QIcon(":/icons/theme/settings.png")), tr("Pr&eferences"), 0);
     m_actionPreferences->setMenuRole(QAction::PreferencesRole);
     m_actionPreferences->setShortcut(QKeySequence(QKeySequence::Preferences));
     connect(m_actionPreferences, SIGNAL(triggered()), MENU_RECEIVER, SLOT(showPreferences()));
@@ -412,7 +412,7 @@ void QupZilla::setupMenu()
      * File Menu *
      *************/
     m_menuFile = new QMenu(tr("&File"));
-    m_menuFile->addAction(QIcon::fromTheme("tab-new", QIcon(":/icons/menu/new-tab.png")), tr("New Tab"), MENU_RECEIVER, SLOT(addTab()))->setShortcut(QKeySequence("Ctrl+T"));
+    m_menuFile->addAction(QIcon::fromTheme("tab-new", QIcon(":/icons/menu/tab-new.png")), tr("New Tab"), MENU_RECEIVER, SLOT(addTab()))->setShortcut(QKeySequence("Ctrl+T"));
     m_menuFile->addAction(QIcon::fromTheme("window-new"), tr("&New Window"), MENU_RECEIVER, SLOT(newWindow()))->setShortcut(QKeySequence("Ctrl+N"));
     m_menuFile->addAction(QIcon::fromTheme("document-open-remote"), tr("Open Location"), MENU_RECEIVER, SLOT(openLocation()))->setShortcut(QKeySequence("Ctrl+L"));
     m_menuFile->addAction(QIcon::fromTheme("document-open"), tr("Open &File..."), MENU_RECEIVER, SLOT(openFile()))->setShortcut(QKeySequence("Ctrl+O"));

src/lib/bookmarks/bookmarksmanager.cpp

@@ -350,7 +350,7 @@ void BookmarksManager::contextMenuRequested(const QPoint &position)
 
     QMenu moveMenu;
     moveMenu.setTitle(tr("Move bookmark to &folder"));
-    moveMenu.addAction(QIcon(":icons/other/unsortedbookmarks.png"), _bookmarksUnsorted, this, SLOT(moveBookmark()))->setData("unsorted");
+    moveMenu.addAction(QIcon(":icons/theme/unsortedbookmarks.png"), _bookmarksUnsorted, this, SLOT(moveBookmark()))->setData("unsorted");
     moveMenu.addAction(style()->standardIcon(QStyle::SP_DirOpenIcon), _bookmarksMenu, this, SLOT(moveBookmark()))->setData("bookmarksMenu");
     moveMenu.addAction(style()->standardIcon(QStyle::SP_DirOpenIcon), _bookmarksToolbar, this, SLOT(moveBookmark()))->setData("bookmarksToolbar");
     QSqlQuery query;

src/lib/bookmarks/bookmarkstree.cpp

@@ -74,7 +74,7 @@ void BookmarksTree::refreshTree()
         QTreeWidgetItem* newItem = new QTreeWidgetItem(rootItem);
         newItem->setText(0, _bookmarksUnsorted);
         newItem->setData(0, Qt::UserRole, "unsorted");
-        newItem->setIcon(0, QIcon(":/icons/other/unsortedbookmarks.png"));
+        newItem->setIcon(0, QIcon(":/icons/theme/unsortedbookmarks.png"));
         addTopLevelItem(newItem);
     }
 

src/lib/bookmarks/bookmarkswidget.cpp

@@ -54,9 +54,10 @@ BookmarksWidget::BookmarksWidget(WebView* view, QWidget* parent)
     // it dynamically changes and so, it's not good choice for this widget.
     setLayoutDirection(QApplication::layoutDirection());
 
-    connect(ui->speeddialButton, SIGNAL(clicked(QPoint)), this, SLOT(toggleSpeedDial()));
+    connect(ui->speeddialButton, SIGNAL(clicked()), this, SLOT(toggleSpeedDial()));
 
     const SpeedDial::Page page = m_speedDial->pageForUrl(m_url);
+    ui->speeddialButton->setFlat(page.url.isEmpty() ? true : false);
     ui->speeddialButton->setText(page.url.isEmpty() ?
                                  tr("Add to Speed Dial") :
                                  tr("Remove from Speed Dial"));
@@ -77,7 +78,6 @@ void BookmarksWidget::loadBookmark()
 
     if (m_bookmarkId > 0) {
         BookmarksModel::Bookmark bookmark = m_bookmarksModel->getBookmark(m_bookmarkId);
-        ui->name->setText(bookmark.title);
 
         int index = ui->folder->findData(bookmark.folder);
         // QComboBox::findData() returns index related to the item's parent
@@ -93,16 +93,13 @@ void BookmarksWidget::loadBookmark()
             ui->folder->setCurrentIndex(index);
         }
 
-        ui->saveRemove->setText(tr("Remove"));
-        connect(ui->name, SIGNAL(textEdited(QString)), SLOT(bookmarkEdited()));
+        ui->saveRemove->setText("Remove from Bookmarks");
+        ui->saveRemove->setFlat(false);
         connect(ui->folder, SIGNAL(currentIndexChanged(int)), SLOT(bookmarkEdited()));
     }
     else {
-        ui->name->setText(m_view->title());
         ui->folder->setCurrentIndex(0);
     }
-
-    ui->name->setCursorPosition(0);
 }
 
 void BookmarksWidget::toggleSpeedDial()
@@ -110,7 +107,7 @@ void BookmarksWidget::toggleSpeedDial()
     const SpeedDial::Page page = m_speedDial->pageForUrl(m_url);
 
     if (page.url.isEmpty()) {
-        QString title = ui->name->text().isEmpty() ? m_view->title() : ui->name->text();
+        QString title = m_view->title();
         m_speedDial->addPage(m_url, title);
     }
     else {
@@ -127,19 +124,19 @@ void BookmarksWidget::bookmarkEdited()
     }
 
     m_edited = true;
-    ui->saveRemove->setText(tr("Save"));
+    ui->saveRemove->setFlat(true);
 }
 
 void BookmarksWidget::comboItemActive(int index)
 {
-    m_bookmarksTree->activeItemChange(index, ui->folder, ui->name->text(), m_view);
+    m_bookmarksTree->activeItemChange(index, ui->folder, m_view->title(), m_view);
 }
 
 void BookmarksWidget::on_saveRemove_clicked(bool)
 {
     if (m_bookmarkId > 0) {
         if (m_edited) {
-            m_bookmarksModel->editBookmark(m_bookmarkId, ui->name->text(), QUrl(), BookmarksModel::fromTranslatedFolder(ui->folder->currentText()));
+            m_bookmarksModel->editBookmark(m_bookmarkId, m_view->title(), QUrl(), BookmarksModel::fromTranslatedFolder(ui->folder->currentText()));
         }
         else {
             m_bookmarksModel->removeBookmark(m_url);
@@ -147,7 +144,7 @@ void BookmarksWidget::on_saveRemove_clicked(bool)
         }
     }
     else {
-        m_bookmarksModel->saveBookmark(m_url, ui->name->text(), m_view->icon(), BookmarksModel::fromTranslatedFolder(ui->folder->currentText()));
+        m_bookmarksModel->saveBookmark(m_url, m_view->title(), m_view->icon(), BookmarksModel::fromTranslatedFolder(ui->folder->currentText()));
     }
 
     QTimer::singleShot(HIDE_DELAY, this, SLOT(close()));

src/lib/bookmarks/bookmarkswidget.ui

@@ -2,52 +2,42 @@
 <ui version="4.0">
  <class>BookmarksWidget</class>
  <widget class="QWidget" name="BookmarksWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>210</width>
-    <height>135</height>
-   </rect>
-  </property>
   <property name="windowTitle">
    <string/>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0" colspan="2">
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <item>
-      <spacer name="horizontalSpacer_2">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="ClickableLabel" name="speeddialButton">
-       <property name="cursor">
-        <cursorShape>PointingHandCursor</cursorShape>
-       </property>
-       <property name="text">
-        <string>Add to Speed Dial</string>
-       </property>
-       <property name="html-link-look" stdset="0">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
+   <item row="0" column="0">
+    <widget class="QPushButton" name="speeddialButton">
+     <property name="focusPolicy">
+      <enum>Qt::NoFocus</enum>
+     </property>
+     <property name="text">
+      <string>Add to Speed Dial</string>
+     </property>
+     <property name="icon">
+      <iconset resource="../data/icons.qrc">
+       <normaloff>:/icons/theme/speeddial.png</normaloff>:/icons/theme/speeddial.png</iconset>
+     </property>
+     <property name="flat">
+      <bool>true</bool>
+     </property>
+    </widget>
    </item>
-   <item row="1" column="1">
-    <widget class="QLineEdit" name="name"/>
+   <item row="1" column="0">
+    <widget class="QPushButton" name="saveRemove">
+     <property name="text">
+      <string>Add to bookmarks</string>
+     </property>
+     <property name="icon">
+      <iconset resource="../data/icons.qrc">
+       <normaloff>:/icons/other/bigstar.png</normaloff>:/icons/other/bigstar.png</iconset>
+     </property>
+     <property name="flat">
+      <bool>true</bool>
+     </property>
+    </widget>
    </item>
-   <item row="2" column="1">
+   <item row="2" column="0">
     <widget class="QComboBox" name="folder">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -57,59 +47,10 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="0" colspan="2">
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="saveRemove">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string>Save</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>Name:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0">
-    <widget class="QLabel" name="label_2">
-     <property name="text">
-      <string>Folder:</string>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>ClickableLabel</class>
-   <extends>QLabel</extends>
-   <header>clickablelabel.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
+ <resources>
+  <include location="../data/icons.qrc"/>
+ </resources>
  <connections/>
 </ui>

src/lib/bookmarksimport/bookmarksimportdialog.ui

@@ -291,7 +291,7 @@
              </property>
              <property name="icon">
               <iconset resource="../data/icons.qrc">
-               <normaloff>:/icons/faenza/stop.png</normaloff>:/icons/faenza/stop.png</iconset>
+               <normaloff>:/icons/theme/stop.png</normaloff>:/icons/theme/stop.png</iconset>
              </property>
              <property name="iconSize">
               <size>

src/lib/data/html.qrc

@@ -1,7 +1,6 @@
 <RCC>
     <qresource prefix="/">
         <file>html/errorPage.html</file>
-        <file>html/info.png</file>
         <file>html/adblock_big.png</file>
         <file>html/adblockPage.html</file>
         <file>html/about.html</file>
@@ -20,10 +19,9 @@
         <file>html/reload.png</file>
         <file>html/qupzilla.ico</file>
         <file>html/broken-page.png</file>
-        <file>html/setting.png</file>
+        <file>html/configure.png</file>
         <file>html/config.html</file>
         <file>html/restore.html</file>
         <file>html/dirlist.html</file>
-        <file>html/hdd-icon.png</file>
     </qresource>
 </RCC>

src/lib/data/html/copyright

@@ -242,7 +242,11 @@
  QtWin class from
  http://labs.qt.nokia.com/2009/09/15/using-blur-behind-on-windows/
 -----------------------------------------------------------------------------
- In application are used also some icons from Faenza icon set, which are 
- licensed under the GNU/GPL license.
+ In application are used also some icons from Oxygen icon set, which are 
+ licensed under the GNU/LGPL license.
+ More info at http://www.oxygen-icons.org/
+-----------------------------------------------------------------------------
+ Speed Dial page some icons from Faenza icon set, which are licensed under
+ the GNU/GPL license.
  More info at http://tiheum.deviantart.com/art/Faenza-Icons-173323228
 -----------------------------------------------------------------------------

src/lib/data/html/speeddial.html

@@ -6,7 +6,7 @@
 html {background: #eeeeee url("%IMG_BACKGROUND%") no-repeat center center;background-size: %B_SIZE%;}
 body {font: 13px/22px "Helvetica Neue", Helvetica, Arial, sans-serif;color: #525c66;direction: %DIRECTION%;}
 body * {-webkit-user-select: none;font-size: 100%;line-height: 1.6;margin: 0px;}
-.add {position: absolute;%RIGHT_STR%:10px;top:10px;width: 24px;height: 24px;background: url(%IMG_PLUS%); cursor: pointer;}
+.add {position: absolute;%RIGHT_STR%:6px;top:10px;width: 32px;height: 32px;background: url(%IMG_PLUS%); cursor: pointer;}
 
 #quickdial {margin: auto;text-align: center;}
 #quickdial div.entry {position: relative; float: %LEFT_STR%; border-width: 10px;
@@ -32,7 +32,7 @@ span.reload:hover {border-color: grey; border-radius: 4px;}
 .formTable {width: 350px;margin-%LEFT_STR%: auto;margin-%RIGHT_STR%: auto;margin-top: 15px;}
 .formTable input[type="text"] {width: 100%;-webkit-user-select: auto;}
 
-.sett {position: absolute;%RIGHT_STR%:36px;top:10px;width: 24px;height: 24px;background: url(%IMG_SETTINGS%); cursor: pointer;}
+.sett {position: absolute;%RIGHT_STR%:40px;top:10px;width: 32px;height: 32px;background: url(%IMG_SETTINGS%); cursor: pointer;}
 #settingsBox {margin-%LEFT_STR%:auto;margin-%RIGHT_STR%: auto;margin-top: 100px;width: 350px;height: auto;padding:0 8px;-webkit-border-image: url(%BOX-BORDER%) 25;-webkit-box-shadow: 0px 5px 80px #505050;border-radius:10px;border-width: 20px;}
 #settingsBox .content {margin-%LEFT_STR%:auto;margin-%RIGHT_STR%:auto;padding-bottom:2px;border-bottom: 1px solid #888;}
 #settingsBox .thumbhold {margin-%LEFT_STR%:auto;margin-%RIGHT_STR%:auto;margin-bottom: 5px;padding: 1px;border-radius: 10px;text-align:center;width:180px;height:100px;background: #AAA;}
@@ -66,6 +66,19 @@ var DIAL_WIDTH = %SD-SIZE%;
 
 var editingId = -1;
 
+function addSpeedDial()
+{
+    onEditClick(addBox('', NEW_PAGE, ''));
+    alignPage();
+}
+
+function configureSpeedDial()
+{
+    $('#fadeOverlay2').css({'filter' : 'alpha(opacity=100)'}).fadeIn();
+    $('#fadeOverlay2').click(function() { $(this).fadeOut('slow'); });
+    $('#settingsBox').click(function(event) { event.stopPropagation(); });
+}
+
 function escapeTitle(title) {
     title = title.replace(/"/g, '"');
     title = title.replace(/'/g, ''');
@@ -400,8 +413,8 @@ $(document).ready(function () {
 
 <body>
 <div id="quickdial"></div>
-<a onClick="$('#fadeOverlay2').css({'filter' : 'alpha(opacity=100)'}).fadeIn();$('#fadeOverlay2').click(function() { $(this).fadeOut('slow'); });$('#settingsBox').click(function(event) { event.stopPropagation(); });" title="%SETTINGS-TITLE%" class="sett"></a>
-<a onClick="onEditClick(addBox('', NEW_PAGE, '')); alignPage();" title="%ADD-TITLE%" class="add"></a>
+<a onClick="configureSpeedDial()" title="%SETTINGS-TITLE%" class="sett"></a>
+<a onClick="addSpeedDial()" title="%ADD-TITLE%" class="add"></a>
 
 <script type="text/javascript">
 %INITIAL-SCRIPT%

src/lib/data/icons.qrc

@@ -6,32 +6,34 @@
         <file>icons/preferences/applications-system.png</file>
         <file>icons/preferences/applications-webbrowsers.png</file>
         <file>icons/preferences/preferences-desktop.png</file>
-        <file>icons/faenza/go-up.png</file>
-        <file>icons/faenza/back.png</file>
-        <file>icons/faenza/close.png</file>
-        <file>icons/faenza/forward.png</file>
-        <file>icons/faenza/home.png</file>
-        <file>icons/faenza/reload.png</file>
-        <file>icons/faenza/stop.png</file>
+        <file>icons/theme/go-up.png</file>
+        <file>icons/theme/back.png</file>
+        <file>icons/theme/close.png</file>
+        <file>icons/theme/forward.png</file>
+        <file>icons/theme/home.png</file>
+        <file>icons/theme/reload.png</file>
+        <file>icons/theme/stop.png</file>
         <file>icons/preferences/extension.png</file>
-        <file>icons/faenza/settings.png</file>
+        <file>icons/theme/settings.png</file>
         <file>qupzilla.png</file>
         <file>icons/locationbar/privatebrowsing.png</file>
         <file>icons/locationbar/unknownpage.png</file>
         <file>icons/menu/history.png</file>
         <file>icons/menu/history_entry.png</file>
-        <file>icons/menu/new-tab.png</file>
+        <file>icons/menu/tab-new.png</file>
         <file>icons/menu/qt.png</file>
         <file>icons/menu/rss.png</file>
         <file>icons/other/about.png</file>
         <file>icons/other/feed.png</file>
         <file>icons/other/progress.gif</file>
         <file>icons/other/bigstar.png</file>
-        <file>icons/other/unsortedbookmarks.png</file>
-        <file>icons/locationbar/accept.png</file>
-        <file>icons/locationbar/warning.png</file>
+        <file>icons/theme/unsortedbookmarks.png</file>
+        <file>icons/locationbar/safe.png</file>
+        <file>icons/locationbar/unsafe.png</file>
+        <file>icons/locationbar/visit1.png</file>
+        <file>icons/locationbar/visit2.png</file>
+        <file>icons/locationbar/visit3.png</file>
         <file>icons/other/keys.png</file>
-        <file>icons/other/bigrss.png</file>
         <file>icons/preferences/applications-fonts.png</file>
         <file>icons/preferences/applications-graphics.png</file>
         <file>icons/preferences/document-properties.png</file>
@@ -40,16 +42,16 @@
         <file>icons/other/bighistory.png</file>
         <file>icons/menu/dot.png</file>
         <file>icons/preferences/style-default.png</file>
-        <file>icons/faenza/user-bookmarks.png</file>
+        <file>icons/theme/user-bookmarks.png</file>
         <file>icons/other/adblock-disabled.png</file>
         <file>icons/menu/search-icon.png</file>
         <file>icons/menu/gear.png</file>
         <file>icons/browsers/firefox.png</file>
         <file>icons/browsers/chrome.png</file>
         <file>icons/browsers/opera.png</file>
-        <file>icons/faenza/go-next.png</file>
-        <file>icons/faenza/go-previous.png</file>
-        <file>icons/faenza/list-remove.png</file>
+        <file>icons/theme/go-next.png</file>
+        <file>icons/theme/go-previous.png</file>
+        <file>icons/theme/list-remove.png</file>
         <file>icons/preferences/application-x-theme.png</file>
         <file>icons/preferences/dialog-password.png</file>
         <file>icons/preferences/dialog-question.png</file>
@@ -75,7 +77,8 @@
         <file>icons/browsers/internet-explorer.png</file>
         <file>icons/sites/startpage.png</file>
         <file>icons/sites/w3.png</file>
-        <file>icons/faenza/expand.png</file>
-        <file>icons/faenza/collapse.png</file>
+        <file>icons/theme/expand.png</file>
+        <file>icons/theme/collapse.png</file>
+        <file>icons/theme/speeddial.png</file>
     </qresource>
 </RCC>

src/lib/network/schemehandlers/qupzillaschemehandler.cpp

@@ -286,7 +286,7 @@ QString QupZillaSchemeReply::speeddialPage()
         dPage.replace(QLatin1String("%JQUERY%"), QLatin1String("qrc:html/jquery.js"));
         dPage.replace(QLatin1String("%JQUERY-UI%"), QLatin1String("qrc:html/jquery-ui.js"));
         dPage.replace(QLatin1String("%LOADING-IMG%"), QLatin1String("qrc:html/loading.gif"));
-        dPage.replace(QLatin1String("%IMG_SETTINGS%"), QLatin1String("qrc:html/setting.png"));
+        dPage.replace(QLatin1String("%IMG_SETTINGS%"), QLatin1String("qrc:html/configure.png"));
 
         dPage.replace(QLatin1String("%SITE-TITLE%"), tr("Speed Dial"));
         dPage.replace(QLatin1String("%ADD-TITLE%"), tr("Add New Page"));

src/lib/other/browsinglibrary.cpp

@@ -49,7 +49,7 @@ BrowsingLibrary::BrowsingLibrary(QupZilla* mainClass, QWidget* parent)
 
     ui->tabs->AddTab(m_historyManager, QIcon(":/icons/other/bighistory.png"), tr("History"));
     ui->tabs->AddTab(m_bookmarksManager, QIcon(":/icons/other/bigstar.png"), tr("Bookmarks"));
-    ui->tabs->AddTab(m_rssManager, QIcon(":/icons/other/bigrss.png"), tr("RSS"));
+    ui->tabs->AddTab(m_rssManager, QIcon(":/icons/other/feed.png"), tr("RSS"));
 
     ui->tabs->SetMode(FancyTabWidget::Mode_LargeSidebar);
     ui->tabs->setFocus();

src/lib/rss/rsswidget.cpp

@@ -55,18 +55,17 @@ RSSWidget::RSSWidget(WebView* view, QWidget* parent)
         }
 
         QPushButton* button = new QPushButton(this);
-        button->setText(tr("Add"));
+        button->setIcon(QIcon(":icons/other/feed.png"));
+        button->setStyleSheet("text-align:left");
+        button->setText(title);
         button->setToolTip(url.toString());
         button->setProperty("rss-url", url);
         button->setProperty("rss-title", title);
-        QLabel* label = new QLabel(this);
-        label->setText(fontMetrics().elidedText(title, Qt::ElideRight, 300));
-        label->setToolTip(title);
+        button->setFlat(true); // setFlat( rss.exists ? true : false );
 
         int pos = i % cols > 0 ? (i % cols) * 2 : 0;
 
-        ui->gridLayout->addWidget(label, row, pos);
-        ui->gridLayout->addWidget(button, row, pos + 1);
+        ui->gridLayout->addWidget(button, row, pos);
         connect(button, SIGNAL(clicked()), this, SLOT(addRss()));
 
         if (i % cols == cols - 1) {

src/lib/rss/rsswidget.ui

@@ -28,23 +28,7 @@
         <property name="spacing">
          <number>0</number>
         </property>
-        <item>
-         <widget class="QLabel" name="label">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="pixmap">
-           <pixmap resource="../data/icons.qrc">:/icons/other/bigrss.png</pixmap>
-          </property>
-         </widget>
-        </item>
-        <item>
+        <item alignment="Qt::AlignHCenter">
          <widget class="QLabel" name="label_2">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">

src/lib/sidebar/bookmarkssidebar.cpp

@@ -46,8 +46,8 @@ BookmarksSideBar::BookmarksSideBar(QupZilla* mainClass, QWidget* parent)
     ui->bookmarksTree->setDragDropReceiver(true, m_bookmarksModel);
     ui->bookmarksTree->setMimeType(QLatin1String("application/qupzilla.treewidgetitem.bookmarks"));
 
-    ui->expandAll->setIcon(QIcon::fromTheme("view-sort-ascending", QIcon(":/icons/faenza/expand.png")));
-    ui->collapseAll->setIcon(QIcon::fromTheme("view-sort-descending", QIcon(":/icons/faenza/collapse.png")));
+    ui->expandAll->setIcon(QIcon::fromTheme("view-sort-ascending", QIcon(":/icons/theme/expand.png")));
+    ui->collapseAll->setIcon(QIcon::fromTheme("view-sort-descending", QIcon(":/icons/theme/collapse.png")));
 
     ui->bookmarksTree->setDefaultItemShowMode(TreeWidget::ItemsExpanded);
     connect(ui->bookmarksTree, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextMenuRequested(QPoint)));

src/lib/tools/iconprovider.cpp

@@ -160,33 +160,33 @@ QIcon IconProvider::standardIcon(QStyle::StandardPixmap icon)
 
 #ifndef QZ_WS_X11
     case QStyle::SP_DialogCloseButton:
-        return QIcon(":/icons/faenza/close.png");
+        return QIcon(":/icons/theme/close.png");
 
     case QStyle::SP_BrowserStop:
-        return QIcon(":/icons/faenza/stop.png");
+        return QIcon(":/icons/theme/stop.png");
 
     case QStyle::SP_BrowserReload:
-        return QIcon(":/icons/faenza/reload.png");
+        return QIcon(":/icons/theme/reload.png");
 
     case QStyle::SP_FileDialogToParent:
-        return QIcon(":/icons/faenza/go-up.png");
+        return QIcon(":/icons/theme/go-up.png");
 
     case QStyle::SP_ArrowForward:
         //RTL Support
         if (QApplication::layoutDirection() == Qt::RightToLeft) {
-            return QIcon(":/icons/faenza/back.png");
+            return QIcon(":/icons/theme/back.png");
         }
         else {
-            return QIcon(":/icons/faenza/forward.png");
+            return QIcon(":/icons/theme/forward.png");
         }
 
     case QStyle::SP_ArrowBack:
         //RTL Support
         if (QApplication::layoutDirection() == Qt::RightToLeft) {
-            return QIcon(":/icons/faenza/forward.png");
+            return QIcon(":/icons/theme/forward.png");
         }
         else {
-            return QIcon(":/icons/faenza/back.png");
+            return QIcon(":/icons/theme/back.png");
         }
 #endif
     default:
@@ -197,25 +197,25 @@ QIcon IconProvider::standardIcon(QStyle::StandardPixmap icon)
 QIcon IconProvider::fromTheme(const QString &icon)
 {
     if (icon == QLatin1String("go-home")) {
-        return QIcon::fromTheme("go-home", QIcon(":/icons/faenza/home.png"));
+        return QIcon::fromTheme("go-home", QIcon(":/icons/theme/home.png"));
     }
     else if (icon == QLatin1String("text-plain")) {
         return QIcon::fromTheme("text-plain", QIcon(":icons/locationbar/unknownpage.png"));
     }
     else if (icon == QLatin1String("bookmarks-organize")) {
-        return QIcon::fromTheme("bookmarks-organize", QIcon(":icons/faenza/user-bookmarks.png"));
+        return QIcon::fromTheme("bookmarks-organize", QIcon(":icons/theme/user-bookmarks.png"));
     }
     else if (icon == QLatin1String("bookmark-new")) {
-        return QIcon::fromTheme("bookmark-new", QIcon(":icons/faenza/user-bookmarks.png"));
+        return QIcon::fromTheme("bookmark-new", QIcon(":icons/theme/user-bookmarks.png"));
     }
     else if (icon == QLatin1String("list-remove")) {
-        return QIcon::fromTheme("list-remove", QIcon(":icons/faenza/list-remove.png"));
+        return QIcon::fromTheme("list-remove", QIcon(":icons/theme/list-remove.png"));
     }
     else if (icon == QLatin1String("go-next")) {
-        return QIcon::fromTheme("go-next", QIcon(":icons/faenza/go-next.png"));
+        return QIcon::fromTheme("go-next", QIcon(":icons/theme/go-next.png"));
     }
     else if (icon == QLatin1String("go-previous")) {
-        return QIcon::fromTheme("go-previous", QIcon(":icons/faenza/go-previous.png"));
+        return QIcon::fromTheme("go-previous", QIcon(":icons/theme/go-previous.png"));
     }
     else {
         return QIcon::fromTheme(icon);

src/lib/webview/siteinfowidget.cpp

@@ -42,11 +42,11 @@ SiteInfoWidget::SiteInfoWidget(QupZilla* mainClass, QWidget* parent)
 
     if (QzTools::isCertificateValid(webPage->sslCertificate())) {
         ui->secureLabel->setText(tr("Your connection to this site is <b>secured</b>."));
-        ui->secureIcon->setPixmap(QPixmap(":/icons/locationbar/accept.png"));
+        ui->secureIcon->setPixmap(QPixmap(":/icons/locationbar/safe.png"));
     }
     else {
         ui->secureLabel->setText(tr("Your connection to this site is <b>unsecured</b>."));
-        ui->secureIcon->setPixmap(QPixmap(":/icons/locationbar/warning.png"));
+        ui->secureIcon->setPixmap(QPixmap(":/icons/locationbar/unsafe.png"));
     }
 
     QString scheme = url.scheme();
@@ -61,14 +61,14 @@ SiteInfoWidget::SiteInfoWidget(QupZilla* mainClass, QWidget* parent)
         int count = query.value(0).toInt();
         if (count > 3) {
             ui->historyLabel->setText(tr("This is your <b>%1</b> visit of this site.").arg(QString::number(count) + "."));
-            ui->historyIcon->setPixmap(QPixmap(":/icons/locationbar/accept.png"));
+            ui->historyIcon->setPixmap(QPixmap(":/icons/locationbar/visit3.png"));
         }
         else if (count == 0) {
             ui->historyLabel->setText(tr("You have <b>never</b> visited this site before."));
-            ui->historyIcon->setPixmap(QPixmap(":/icons/locationbar/warning.png"));
+            ui->historyIcon->setPixmap(QPixmap(":/icons/locationbar/visit1.png"));
         }
         else {
-            ui->historyIcon->setPixmap(QPixmap(":/icons/locationbar/warning.png"));
+            ui->historyIcon->setPixmap(QPixmap(":/icons/locationbar/visit2.png"));
             QString text;
             if (count == 1) {
                 text = tr("first");

src/lib/webview/tabbar.cpp

@@ -149,7 +149,7 @@ void TabBar::contextMenuRequested(const QPoint &position)
     m_clickedTab = index;
 
     QMenu menu;
-    menu.addAction(QIcon::fromTheme("tab-new", QIcon(":/icons/menu/new-tab.png")), tr("&New tab"), p_QupZilla, SLOT(addTab()));
+    menu.addAction(QIcon::fromTheme("tab-new", QIcon(":/icons/menu/tab-new.png")), tr("&New tab"), p_QupZilla, SLOT(addTab()));
     menu.addSeparator();
     if (index != -1) {
         WebTab* webTab = qobject_cast<WebTab*>(m_tabWidget->widget(m_clickedTab));

src/lib/webview/webview.cpp

@@ -909,53 +909,62 @@ void WebView::createPageContextMenu(QMenu* menu, const QPoint &pos)
     action->setIcon(qIconProvider->standardIcon(QStyle::SP_ArrowForward));
     action->setEnabled(history()->canGoForward());
 
-    menu->addAction(m_actionReload);
-    menu->addAction(m_actionStop);
-    menu->addSeparator();
+    if (url() != QUrl("qupzilla:speeddial")){
 
-    if (frameAtPos && page()->mainFrame() != frameAtPos) {
-        m_clickedFrame = frameAtPos;
-        Menu* frameMenu = new Menu(tr("This frame"));
-        frameMenu->addAction(tr("Show &only this frame"), this, SLOT(loadClickedFrame()));
-        Action* act = new Action(QIcon::fromTheme("tab-new", QIcon(":/icons/menu/new-tab.png")), tr("Show this frame in new &tab"));
-        connect(act, SIGNAL(triggered()), this, SLOT(loadClickedFrameInNewTab()));
-        connect(act, SIGNAL(middleClicked()), this, SLOT(loadClickedFrameInBgTab()));
-        frameMenu->addAction(act);
-        frameMenu->addSeparator();
-        frameMenu->addAction(qIconProvider->standardIcon(QStyle::SP_BrowserReload), tr("&Reload"), this, SLOT(reloadClickedFrame()));
-        frameMenu->addAction(QIcon::fromTheme("document-print"), tr("Print frame"), this, SLOT(printClickedFrame()));
-        frameMenu->addSeparator();
-        frameMenu->addAction(QIcon::fromTheme("zoom-in"), tr("Zoom &in"), this, SLOT(clickedFrameZoomIn()));
-        frameMenu->addAction(QIcon::fromTheme("zoom-out"), tr("&Zoom out"), this, SLOT(clickedFrameZoomOut()));
-        frameMenu->addAction(QIcon::fromTheme("zoom-original"), tr("Reset"), this, SLOT(clickedFrameZoomReset()));
-        frameMenu->addSeparator();
-        frameMenu->addAction(QIcon::fromTheme("text-html"), tr("Show so&urce of frame"), this, SLOT(showClickedFrameSource()));
+        menu->addAction(m_actionReload);
+        menu->addAction(m_actionStop);
+        menu->addSeparator();
 
-        menu->addMenu(frameMenu);
+        if (frameAtPos && page()->mainFrame() != frameAtPos) {
+            m_clickedFrame = frameAtPos;
+            Menu* frameMenu = new Menu(tr("This frame"));
+            frameMenu->addAction(tr("Show &only this frame"), this, SLOT(loadClickedFrame()));
+            Action* act = new Action(QIcon::fromTheme("tab-new", QIcon(":/icons/menu/tab-new.png")), tr("Show this frame in new &tab"));
+            connect(act, SIGNAL(triggered()), this, SLOT(loadClickedFrameInNewTab()));
+            connect(act, SIGNAL(middleClicked()), this, SLOT(loadClickedFrameInBgTab()));
+            frameMenu->addAction(act);
+            frameMenu->addSeparator();
+            frameMenu->addAction(qIconProvider->standardIcon(QStyle::SP_BrowserReload), tr("&Reload"), this, SLOT(reloadClickedFrame()));
+            frameMenu->addAction(QIcon::fromTheme("document-print"), tr("Print frame"), this, SLOT(printClickedFrame()));
+            frameMenu->addSeparator();
+            frameMenu->addAction(QIcon::fromTheme("zoom-in"), tr("Zoom &in"), this, SLOT(clickedFrameZoomIn()));
+            frameMenu->addAction(QIcon::fromTheme("zoom-out"), tr("&Zoom out"), this, SLOT(clickedFrameZoomOut()));
+            frameMenu->addAction(QIcon::fromTheme("zoom-original"), tr("Reset"), this, SLOT(clickedFrameZoomReset()));
+            frameMenu->addSeparator();
+            frameMenu->addAction(QIcon::fromTheme("text-html"), tr("Show so&urce of frame"), this, SLOT(showClickedFrameSource()));
+
+            menu->addMenu(frameMenu);
+        }
+
+        menu->addSeparator();
+        menu->addAction(qIconProvider->fromTheme("bookmark-new"), tr("Book&mark page"), this, SLOT(bookmarkLink()));
+        menu->addAction(QIcon::fromTheme("document-save"), tr("&Save page as..."), this, SLOT(savePageAs()));
+        menu->addAction(QIcon::fromTheme("edit-copy"), tr("&Copy page link"), this, SLOT(copyLinkToClipboard()))->setData(url());
+        menu->addAction(QIcon::fromTheme("mail-message-new"), tr("Send page link..."), this, SLOT(sendPageByMail()));
+        menu->addAction(QIcon::fromTheme("document-print"), tr("&Print page"), this, SLOT(printPage()));
+        menu->addSeparator();
+        menu->addAction(QIcon::fromTheme("edit-select-all"), tr("Select &all"), this, SLOT(selectAll()));
+        menu->addSeparator();
+
+        if (url().scheme() == QLatin1String("http") || url().scheme() == QLatin1String("https")) {
+            const QUrl w3url = QUrl::fromEncoded("http://validator.w3.org/check?uri=" + QUrl::toPercentEncoding(url().toEncoded()));
+            menu->addAction(QIcon(":icons/sites/w3.png"), tr("Validate page"), this, SLOT(openUrlInSelectedTab()))->setData(w3url);
+
+            QByteArray langCode = mApp->currentLanguage().left(2).toUtf8();
+            const QUrl gturl = QUrl::fromEncoded("http://translate.google.com/translate?sl=auto&tl=" + langCode + "&u=" + QUrl::toPercentEncoding(url().toEncoded()));
+            menu->addAction(QIcon(":icons/sites/translate.png"), tr("Translate page"), this, SLOT(openUrlInSelectedTab()))->setData(gturl);
+        }
+
+        menu->addSeparator();
+        menu->addAction(QIcon::fromTheme("text-html"), tr("Show so&urce code"), this, SLOT(showSource()));
+        menu->addAction(QIcon::fromTheme("dialog-information"), tr("Show info ab&out site"), this, SLOT(showSiteInfo()));
     }
 
-    menu->addSeparator();
-    menu->addAction(qIconProvider->fromTheme("bookmark-new"), tr("Book&mark page"), this, SLOT(bookmarkLink()));
-    menu->addAction(QIcon::fromTheme("document-save"), tr("&Save page as..."), this, SLOT(savePageAs()));
-    menu->addAction(QIcon::fromTheme("edit-copy"), tr("&Copy page link"), this, SLOT(copyLinkToClipboard()))->setData(url());
-    menu->addAction(QIcon::fromTheme("mail-message-new"), tr("Send page link..."), this, SLOT(sendPageByMail()));
-    menu->addAction(QIcon::fromTheme("document-print"), tr("&Print page"), this, SLOT(printPage()));
-    menu->addSeparator();
-    menu->addAction(QIcon::fromTheme("edit-select-all"), tr("Select &all"), this, SLOT(selectAll()));
-    menu->addSeparator();
-
-    if (url().scheme() == QLatin1String("http") || url().scheme() == QLatin1String("https")) {
-        const QUrl w3url = QUrl::fromEncoded("http://validator.w3.org/check?uri=" + QUrl::toPercentEncoding(url().toEncoded()));
-        menu->addAction(QIcon(":icons/sites/w3.png"), tr("Validate page"), this, SLOT(openUrlInSelectedTab()))->setData(w3url);
-
-        QByteArray langCode = mApp->currentLanguage().left(2).toUtf8();
-        const QUrl gturl = QUrl::fromEncoded("http://translate.google.com/translate?sl=auto&tl=" + langCode + "&u=" + QUrl::toPercentEncoding(url().toEncoded()));
-        menu->addAction(QIcon(":icons/sites/translate.png"), tr("Translate page"), this, SLOT(openUrlInSelectedTab()))->setData(gturl);
+    else {
+        menu->addSeparator();
+        menu->addAction(tr("&Add new page"), this, SLOT(addSpeedDial()));
+        menu->addAction(tr("&Configure Speed Dial"), this, SLOT(configureSpeedDial()));
     }
-
-    menu->addSeparator();
-    menu->addAction(QIcon::fromTheme("text-html"), tr("Show so&urce code"), this, SLOT(showSource()));
-    menu->addAction(QIcon::fromTheme("dialog-information"), tr("Show info ab&out site"), this, SLOT(showSiteInfo()));
 }
 
 void WebView::createLinkContextMenu(QMenu* menu, const QWebHitTestResult &hitTest)
@@ -966,7 +975,7 @@ void WebView::createLinkContextMenu(QMenu* menu, const QWebHitTestResult &hitTes
     }
 
     menu->addSeparator();
-    Action* act = new Action(QIcon::fromTheme("tab-new", QIcon(":/icons/menu/new-tab.png")), tr("Open link in new &tab"));
+    Action* act = new Action(QIcon::fromTheme("tab-new", QIcon(":/icons/menu/tab-new.png")), tr("Open link in new &tab"));
     act->setData(hitTest.linkUrl());
     connect(act, SIGNAL(triggered()), this, SLOT(userDefinedOpenUrlInNewTab()));
     connect(act, SIGNAL(middleClicked()), this, SLOT(userDefinedOpenUrlInBgTab()));
@@ -1140,6 +1149,16 @@ void WebView::muteMedia()
     }
 }
 
+void WebView::addSpeedDial()
+{
+    page()->mainFrame()->evaluateJavaScript("addSpeedDial()");
+}
+
+void WebView::configureSpeedDial()
+{
+    page()->mainFrame()->evaluateJavaScript("configureSpeedDial()");
+}
+
 void WebView::wheelEvent(QWheelEvent* event)
 {
     if (mApp->plugins()->processWheelEvent(Qz::ON_WebView, this, event)) {

src/lib/webview/webview.h

@@ -160,6 +160,8 @@ private slots:
     void frameStateChanged();
     void emitChangedUrl();
     void checkRss();
+    void addSpeedDial();
+    void configureSpeedDial();
 
 private:
     QList<int> m_zoomLevels;