From eb604bb8480dc3a99ed30f928b097ed9dcd08530 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Sun, 21 Jul 2013 21:02:34 +0200 Subject: [PATCH] Icons for c-menu for web browser. --- .../mimetypes/128/image-x-generic.png | Bin 0 -> 10501 bytes .../mimetypes/16/image-x-generic.png | Bin 0 -> 671 bytes .../mimetypes/22/image-x-generic.png | Bin 0 -> 995 bytes .../mimetypes/32/image-x-generic.png | Bin 0 -> 1468 bytes .../mimetypes/48/image-x-generic.png | Bin 0 -> 2556 bytes .../mimetypes/64/image-x-generic.png | Bin 0 -> 3823 bytes src/gui/basewebview.cpp | 63 ++++++++++++------ src/gui/basewebview.h | 10 +++ src/gui/formabout.cpp | 5 +- src/gui/webbrowser.cpp | 1 + 10 files changed, 56 insertions(+), 23 deletions(-) create mode 100644 resources/graphics/themes/mini-kfaenza/mimetypes/128/image-x-generic.png create mode 100644 resources/graphics/themes/mini-kfaenza/mimetypes/16/image-x-generic.png create mode 100644 resources/graphics/themes/mini-kfaenza/mimetypes/22/image-x-generic.png create mode 100644 resources/graphics/themes/mini-kfaenza/mimetypes/32/image-x-generic.png create mode 100644 resources/graphics/themes/mini-kfaenza/mimetypes/48/image-x-generic.png create mode 100644 resources/graphics/themes/mini-kfaenza/mimetypes/64/image-x-generic.png diff --git a/resources/graphics/themes/mini-kfaenza/mimetypes/128/image-x-generic.png b/resources/graphics/themes/mini-kfaenza/mimetypes/128/image-x-generic.png new file mode 100644 index 0000000000000000000000000000000000000000..cb656f46120b039d42bc41a2e48048e86a2d494e GIT binary patch literal 10501 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%0Dw4@`WcJC}bvwgI{>;5|_8eOhPz7 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 literal 0 HcmV?d00001 diff --git a/src/gui/basewebview.cpp b/src/gui/basewebview.cpp index 7517164de..c08220c9f 100644 --- a/src/gui/basewebview.cpp +++ b/src/gui/basewebview.cpp @@ -12,10 +12,12 @@ BaseWebView::BaseWebView(QWidget *parent) : QWebView(parent), m_page(new BaseWebPage(this)) { setPage(m_page); + initializeActions(); createConnections(); } BaseWebView::~BaseWebView() { + qDebug("Destroying BaseWebView."); } void BaseWebView::onLoadFinished(bool ok) { @@ -30,6 +32,38 @@ void BaseWebView::createConnections() { this, &BaseWebView::onLoadFinished); } +void BaseWebView::setupIcons() { + m_actionReload->setIcon(ThemeFactory::fromTheme("view-refresh")); + m_actionCopyLink->setIcon(ThemeFactory::fromTheme("edit-copy")); + m_actionCopyImage->setIcon(ThemeFactory::fromTheme("insert-image")); + m_actionCopyImageUrl->setIcon(ThemeFactory::fromTheme("edit-copy")); +} + +void BaseWebView::initializeActions() { + // Create needed actions. + m_actionReload = pageAction(QWebPage::Reload); + m_actionReload->setParent(this); + m_actionReload->setText(tr("Reload web page")); + m_actionReload->setToolTip(tr("Reload current web page")); + + m_actionCopyLink = pageAction(QWebPage::CopyLinkToClipboard); + m_actionCopyLink->setParent(this); + m_actionCopyLink->setText(tr("Copy link url")); + m_actionCopyLink->setToolTip(tr("Copy link url to clipboard")); + + + m_actionCopyImage = pageAction(QWebPage::CopyImageToClipboard); + m_actionCopyImage->setParent(this); + m_actionCopyImage->setText(tr("Copy image")); + m_actionCopyImage->setToolTip(tr("Copy image to clipboard")); + + + m_actionCopyImageUrl = pageAction(QWebPage::CopyImageUrlToClipboard); + m_actionCopyImageUrl->setParent(this); + m_actionCopyImageUrl->setText(tr("Copy image url")); + m_actionCopyImageUrl->setToolTip(tr("Copy image url to clipboard")); +} + void BaseWebView::displayErrorPage() { // TODO: Add better custom error page. setHtml("error", url()); @@ -40,41 +74,28 @@ void BaseWebView::contextMenuEvent(QContextMenuEvent *event) { QMenu image_submenu(tr("Image"), &context_menu); QWebHitTestResult hit_result = page()->mainFrame()->hitTestContent(event->pos()); - // Obtain needed actions. - QAction *action_reload = pageAction(QWebPage::Reload); - action_reload->setText(tr("Reload web page")); - action_reload->setToolTip(tr("Reload current web page")); - context_menu.addAction(action_reload); + image_submenu.setIcon(ThemeFactory::fromTheme("image-x-generic")); + + // Assemble the menu from actions. + context_menu.addAction(m_actionReload); if (hit_result.linkUrl().isValid()) { - QAction *action_copylink = pageAction(QWebPage::CopyLinkToClipboard); - action_copylink->setText(tr("Copy link url")); - action_copylink->setToolTip(tr("Copy link url to clipboard")); - action_copylink->setIcon(ThemeFactory::fromTheme("edit-copy")); - context_menu.addAction(action_copylink); + context_menu.addAction(m_actionCopyLink); } if (!hit_result.pixmap().isNull()) { + // Add 'Image' menu, because if user clicked image it needs to be visible. context_menu.addMenu(&image_submenu); - QAction *action_copyimage = pageAction(QWebPage::CopyImageToClipboard); - action_copyimage->setText(tr("Copy image")); - action_copyimage->setToolTip(tr("Copy image to clipboard")); - action_copyimage->setIcon(ThemeFactory::fromTheme("insert-image")); - image_submenu.addAction(action_copyimage); + image_submenu.addAction(m_actionCopyImage); } if (hit_result.imageUrl().isValid()) { - QAction *action_copyimageurl = pageAction(QWebPage::CopyImageUrlToClipboard); - action_copyimageurl->setText(tr("Copy image url")); - action_copyimageurl->setToolTip(tr("Copy image url to clipboard")); - action_copyimageurl->setIcon(ThemeFactory::fromTheme("edit-copy")); - image_submenu.addAction(action_copyimageurl); + image_submenu.addAction(m_actionCopyImageUrl); } // Display the menu. context_menu.exec(mapToGlobal(event->pos())); - context_menu.deleteLater(); } void BaseWebView::paintEvent(QPaintEvent *event) { diff --git a/src/gui/basewebview.h b/src/gui/basewebview.h index 28a20d2db..49060abe0 100644 --- a/src/gui/basewebview.h +++ b/src/gui/basewebview.h @@ -2,6 +2,7 @@ #define BASEWEBVIEW_H #include +#include class QPaintEvent; @@ -15,11 +16,15 @@ class BaseWebView : public QWebView { explicit BaseWebView(QWidget *parent = 0); virtual ~BaseWebView(); + void setupIcons(); + protected slots: // Executes if loading of any page is done. void onLoadFinished(bool ok); protected: + void initializeActions(); + // Creates necessary connections. void createConnections(); @@ -34,6 +39,11 @@ class BaseWebView : public QWebView { private: BaseWebPage *m_page; + + QAction *m_actionReload; + QAction *m_actionCopyLink; + QAction *m_actionCopyImage; + QAction *m_actionCopyImageUrl; }; #endif // BASEWEBVIEW_H diff --git a/src/gui/formabout.cpp b/src/gui/formabout.cpp index 48b1df420..b48da8a0a 100644 --- a/src/gui/formabout.cpp +++ b/src/gui/formabout.cpp @@ -67,15 +67,16 @@ FormAbout::FormAbout(QWidget *parent) : QDialog(parent), m_ui(new Ui::FormAbout) "
  • Martin Rotter (rotter.martinos@gmail.com) (author of RSS Guard)
  • " "
  • snakebite & tiheum (authors of KFaenza/Faenza icon theme)
  • " "
  • Digia Plc (author of QtSingleApplication component)
  • " + "
  • Artem Galichkin (doomer3d@gmail.com) (author of original QKeySequenceWidget component)
  • " "" "")); m_ui->m_txtInfo->setText(tr("RSS Guard is a (very) tiny feed reader." - "

    This software is distributed under the terms of GNU General Public License, version 3 or later." + "

    This software is distributed under the terms of GNU General Public License, version 3." "

    Contacts:" "" - "You can obtain source code for Qonverter from its website." + "You can obtain source code for RSS Guard from its website." "


    Copyright © 2011-%1 Martin Rotter").arg(QDateTime::currentDateTime().date().year())); } diff --git a/src/gui/webbrowser.cpp b/src/gui/webbrowser.cpp index 038172dd8..c2888cba9 100644 --- a/src/gui/webbrowser.cpp +++ b/src/gui/webbrowser.cpp @@ -110,6 +110,7 @@ void WebBrowser::setupIcons() { m_actionForward->setIcon(ThemeFactory::fromTheme("go-next")); m_actionReload->setIcon(ThemeFactory::fromTheme("view-refresh")); m_actionStop->setIcon(ThemeFactory::fromTheme("process-stop")); + m_webView->setupIcons(); } QList WebBrowser::runningWebBrowsers() {