wilderjds
/
falkon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Oxygen] Tweaked last icon to be used from theme.

Browse Source
remotes/origin/falkon
nowrep 13 years ago
parent 7b736ed9df
commit 197240845d
6 changed files with 14 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      src/lib/app/qupzilla.cpp
  2. 2
      src/lib/bookmarks/bookmarksmanager.cpp
  3. 2
      src/lib/bookmarks/bookmarkstoolbar.cpp
  4. 2
      src/lib/bookmarks/bookmarkstree.cpp
  5. 7
      src/lib/tools/iconprovider.cpp
  6. 4
      src/lib/webview/webview.cpp

8
src/lib/app/qupzilla.cpp
Unescape View File

@ -535,7 +535,7 @@ void QupZilla::setupMenu()
m_menuHistory->addAction(qIconProvider->standardIcon(QStyle::SP_ArrowForward), tr("&Forward"),
MENU_RECEIVER, SLOT(goNext()))->setShortcut(actionShortcut(QKeySequence::Forward, Qt::ALT + Qt::Key_Right, QKeySequence::Back, Qt::ALT + Qt::Key_Left));
m_menuHistory->addAction(qIconProvider->fromTheme("go-home"), tr("&Home"), MENU_RECEIVER, SLOT(goHome()))->setShortcut(QKeySequence("Alt+Home"));
m_menuHistory->addAction(QIcon(":/icons/menu/history.png"), tr("Show &All History"), MENU_RECEIVER, SLOT(showHistoryManager()))->setShortcut(QKeySequence("Ctrl+Shift+H"));
m_menuHistory->addAction(QIcon::fromTheme("view-history", QIcon(":/icons/menu/history.png")), tr("Show &All History"), MENU_RECEIVER, SLOT(showHistoryManager()))->setShortcut(QKeySequence("Ctrl+Shift+H"));
m_menuHistory->addSeparator();
connect(m_menuHistory, SIGNAL(aboutToShow()), MENU_RECEIVER, SLOT(aboutToShowHistoryMenu()));
connect(m_menuHistory, SIGNAL(aboutToHide()), MENU_RECEIVER, SLOT(aboutToHideHistoryMenu()));
@ -557,9 +557,9 @@ void QupZilla::setupMenu()
* Bookmarks Menu *
******************/
m_menuBookmarks = new Menu(tr("&Bookmarks"));
m_menuBookmarks->addAction(tr("Bookmark &This Page"), MENU_RECEIVER, SLOT(bookmarkPage()))->setShortcut(QKeySequence("Ctrl+D"));
m_menuBookmarks->addAction(tr("Bookmark &All Tabs"), MENU_RECEIVER, SLOT(bookmarkAllTabs()));
m_menuBookmarks->addAction(qIconProvider->fromTheme("user-bookmarks"), tr("Organize &Bookmarks"), MENU_RECEIVER, SLOT(showBookmarksManager()))->setShortcut(QKeySequence("Ctrl+Shift+O"));
m_menuBookmarks->addAction(QIcon::fromTheme("bookmark-new"), tr("Bookmark &This Page"), MENU_RECEIVER, SLOT(bookmarkPage()))->setShortcut(QKeySequence("Ctrl+D"));
m_menuBookmarks->addAction(QIcon::fromTheme("bookmark-new-list"), tr("Bookmark &All Tabs"), MENU_RECEIVER, SLOT(bookmarkAllTabs()));
m_menuBookmarks->addAction(qIconProvider->fromTheme("bookmarks-organize"), tr("Organize &Bookmarks"), MENU_RECEIVER, SLOT(showBookmarksManager()))->setShortcut(QKeySequence("Ctrl+Shift+O"));
m_menuBookmarks->addSeparator();
connect(m_menuBookmarks, SIGNAL(aboutToShow()), MENU_RECEIVER, SLOT(aboutToShowBookmarksMenu()));

2
src/lib/bookmarks/bookmarksmanager.cpp
Unescape View File

@ -115,7 +115,7 @@ void BookmarksManager::addFolder(QWidget* parent, QString* folder, bool showInse
QBoxLayout* layout = new QBoxLayout(QBoxLayout::TopToBottom, &dialog);
QLabel* labelParent = new QLabel(tr("Choose parent folder for new folder: "), &dialog);
QComboBox* combo = new QComboBox(&dialog);
combo->addItem(qIconProvider->fromTheme("user-bookmarks"), tr("Bookmarks"), "NO_PARENT");
combo->addItem(qIconProvider->fromTheme("bookmarks-organize"), tr("Bookmarks"), "NO_PARENT");
combo->addItem(style()->standardIcon(QStyle::SP_DirOpenIcon), _bookmarksToolbar, "bookmarksToolbar");
combo->setCurrentIndex(0);
QLabel* labelFolder = new QLabel(tr("Choose name for new bookmark folder: "), &dialog);

2
src/lib/bookmarks/bookmarkstoolbar.cpp
Unescape View File

@ -76,7 +76,7 @@ void BookmarksToolbar::customContextMenuRequested(const QPoint &pos)
QMenu menu;
menu.addAction(tr("&Bookmark Current Page"), p_QupZilla, SLOT(bookmarkPage()));
menu.addAction(tr("Bookmark &All Tabs"), p_QupZilla, SLOT(bookmarkAllTabs()));
menu.addAction(qIconProvider->fromTheme("user-bookmarks"), tr("&Organize Bookmarks"), p_QupZilla, SLOT(showBookmarksManager()));
menu.addAction(qIconProvider->fromTheme("bookmarks-organize"), tr("&Organize Bookmarks"), p_QupZilla, SLOT(showBookmarksManager()));
menu.addSeparator();
QAction act(tr("Show Most &Visited"), this);
act.setCheckable(true);

2
src/lib/bookmarks/bookmarkstree.cpp
Unescape View File

@ -66,7 +66,7 @@ void BookmarksTree::refreshTree()
if (m_viewType == ExportFolderView) {
rootItem = new QTreeWidgetItem(this);
rootItem->setText(0, tr("Bookmarks"));
rootItem->setIcon(0, qIconProvider->fromTheme("user-bookmarks"));
rootItem->setIcon(0, qIconProvider->fromTheme("bookmarks-organize"));
addTopLevelItem(rootItem);
}

7
src/lib/tools/iconprovider.cpp
Unescape View File

@ -202,8 +202,11 @@ QIcon IconProvider::fromTheme(const QString &icon)
else if (icon == QLatin1String("text-plain")) {
return QIcon::fromTheme("text-plain", QIcon(":icons/locationbar/unknownpage.png"));
}
else if (icon == QLatin1String("user-bookmarks")) {
return QIcon::fromTheme("user-bookmarks", QIcon(":icons/faenza/user-bookmarks.png"));
else if (icon == QLatin1String("bookmarks-organize")) {
return QIcon::fromTheme("bookmarks-organize", QIcon(":icons/faenza/user-bookmarks.png"));
}
else if (icon == QLatin1String("bookmark-new")) {
return QIcon::fromTheme("bookmark-new", QIcon(":icons/faenza/user-bookmarks.png"));
}
else if (icon == QLatin1String("list-remove")) {
return QIcon::fromTheme("list-remove", QIcon(":icons/faenza/list-remove.png"));

4
src/lib/webview/webview.cpp
Unescape View File

@ -941,7 +941,7 @@ void WebView::createPageContextMenu(QMenu* menu, const QPoint &pos)
}
menu->addSeparator();
menu->addAction(qIconProvider->fromTheme("user-bookmarks"), tr("Book&mark page"), this, SLOT(bookmarkLink()));
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()));
@ -973,7 +973,7 @@ void WebView::createLinkContextMenu(QMenu* menu, const QWebHitTestResult &hitTes
menu->addAction(act);
menu->addAction(QIcon::fromTheme("window-new"), tr("Open link in new &window"), this, SLOT(openUrlInNewWindow()))->setData(hitTest.linkUrl());
menu->addSeparator();
menu->addAction(qIconProvider->fromTheme("user-bookmarks"), tr("B&ookmark link"), this, SLOT(bookmarkLink()))->setData(hitTest.linkUrl());
menu->addAction(qIconProvider->fromTheme("bookmark-new"), tr("B&ookmark link"), this, SLOT(bookmarkLink()))->setData(hitTest.linkUrl());
menu->addAction(QIcon::fromTheme("document-save"), tr("&Save link as..."), this, SLOT(downloadUrlToDisk()))->setData(hitTest.linkUrl());
menu->addAction(QIcon::fromTheme("mail-message-new"), tr("Send link..."), this, SLOT(sendLinkByMail()))->setData(hitTest.linkUrl());
menu->addAction(QIcon::fromTheme("edit-copy"), tr("&Copy link address"), this, SLOT(copyLinkToClipboard()))->setData(hitTest.linkUrl());

Write Preview
Loading…
Cancel
Save