diff --git a/src/lib/app/qupzilla.cpp b/src/lib/app/qupzilla.cpp index 7c0a72f96..a3bb58f3b 100644 --- a/src/lib/app/qupzilla.cpp +++ b/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")); diff --git a/src/lib/bookmarks/bookmarksmanager.cpp b/src/lib/bookmarks/bookmarksmanager.cpp index a17e5bdc3..952e23488 100644 --- a/src/lib/bookmarks/bookmarksmanager.cpp +++ b/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; diff --git a/src/lib/bookmarks/bookmarkstree.cpp b/src/lib/bookmarks/bookmarkstree.cpp index 49d01c6e6..56cdc4c52 100644 --- a/src/lib/bookmarks/bookmarkstree.cpp +++ b/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); } diff --git a/src/lib/bookmarks/bookmarkswidget.cpp b/src/lib/bookmarks/bookmarkswidget.cpp index 93ce9228d..08a32782e 100644 --- a/src/lib/bookmarks/bookmarkswidget.cpp +++ b/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())); diff --git a/src/lib/bookmarks/bookmarkswidget.ui b/src/lib/bookmarks/bookmarkswidget.ui index cfcc1dce8..0f9976bb7 100644 --- a/src/lib/bookmarks/bookmarkswidget.ui +++ b/src/lib/bookmarks/bookmarkswidget.ui @@ -2,114 +2,55 @@ BookmarksWidget - - - 0 - 0 - 210 - 135 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - PointingHandCursor - - - Add to Speed Dial - - - true - - - - - - - - - - - - - 0 - 0 - + + + + Qt::NoFocus + + + Add to Speed Dial + + + + :/icons/theme/speeddial.png:/icons/theme/speeddial.png + + + true - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - Save - - - - - - + - Name: + Add to bookmarks + + + + :/icons/other/bigstar.png:/icons/other/bigstar.png + + + true - - - Folder: + + + + 0 + 0 + - - - ClickableLabel - QLabel -
clickablelabel.h
- - - + + + diff --git a/src/lib/bookmarksimport/bookmarksimportdialog.ui b/src/lib/bookmarksimport/bookmarksimportdialog.ui index cbc5f6c76..5014817ce 100644 --- a/src/lib/bookmarksimport/bookmarksimportdialog.ui +++ b/src/lib/bookmarksimport/bookmarksimportdialog.ui @@ -291,7 +291,7 @@ - :/icons/faenza/stop.png:/icons/faenza/stop.png + :/icons/theme/stop.png:/icons/theme/stop.png diff --git a/src/lib/data/html.qrc b/src/lib/data/html.qrc index f4392374a..aa277b860 100644 --- a/src/lib/data/html.qrc +++ b/src/lib/data/html.qrc @@ -1,7 +1,6 @@ html/errorPage.html - html/info.png html/adblock_big.png html/adblockPage.html html/about.html @@ -20,10 +19,9 @@ html/reload.png html/qupzilla.ico html/broken-page.png - html/setting.png + html/configure.png html/config.html html/restore.html html/dirlist.html - html/hdd-icon.png diff --git a/src/lib/data/html/configure.png b/src/lib/data/html/configure.png new file mode 100644 index 000000000..17ceb3274 Binary files /dev/null and b/src/lib/data/html/configure.png differ diff --git a/src/lib/data/html/copyright b/src/lib/data/html/copyright index 5368bfcce..25d7594d5 100644 --- a/src/lib/data/html/copyright +++ b/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 ----------------------------------------------------------------------------- diff --git a/src/lib/data/html/hdd-icon.png b/src/lib/data/html/hdd-icon.png deleted file mode 100644 index a162fc77e..000000000 Binary files a/src/lib/data/html/hdd-icon.png and /dev/null differ diff --git a/src/lib/data/html/info.png b/src/lib/data/html/info.png deleted file mode 100644 index 96b4d44ec..000000000 Binary files a/src/lib/data/html/info.png and /dev/null differ diff --git a/src/lib/data/html/plus.png b/src/lib/data/html/plus.png index 6dba738fb..2fc45b7d3 100644 Binary files a/src/lib/data/html/plus.png and b/src/lib/data/html/plus.png differ diff --git a/src/lib/data/html/setting.png b/src/lib/data/html/setting.png deleted file mode 100644 index 86153a7fb..000000000 Binary files a/src/lib/data/html/setting.png and /dev/null differ diff --git a/src/lib/data/html/speeddial.html b/src/lib/data/html/speeddial.html index a97af2d30..1f638cfed 100644 --- a/src/lib/data/html/speeddial.html +++ b/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 () {
- - + +