[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kde-baseapps/frameworks] lib/konq/src: Port to QAction/QIcon
From: Montel Laurent <montel () kde ! org>
Date: 2014-10-21 5:48:17
Message-ID: E1XgSIr-00035H-C1 () scm ! kde ! org
[Download RAW message or body]
Git commit 76819c8683ea7c03ef52a26d710068441d89a48e by Montel Laurent.
Committed on 21/10/2014 at 05:48.
Pushed by mlaurent into branch 'frameworks'.
Port to QAction/QIcon
M +5 -5 lib/konq/src/konq_copytomenu.cpp
M +5 -5 lib/konq/src/konq_operations.cpp
M +20 -20 lib/konq/src/konq_popupmenu.cpp
M +1 -1 lib/konq/src/konq_popupmenu.h
http://commits.kde.org/kde-baseapps/76819c8683ea7c03ef52a26d710068441d89a48e
diff --git a/lib/konq/src/konq_copytomenu.cpp b/lib/konq/src/konq_copytomenu.cpp
index 6244dfb..2e01247 100644
--- a/lib/konq/src/konq_copytomenu.cpp
+++ b/lib/konq/src/konq_copytomenu.cpp
@@ -23,7 +23,7 @@
#include "konq_copytomenu_p.h"
#include <QAction>
#include <kdebug.h>
-#include <kicon.h>
+#include <QIcon>
#include <kglobal.h>
#include <kfiledialog.h>
#include <klocale.h>
@@ -115,14 +115,14 @@ void KonqCopyToMainMenu::slotAboutToShow()
// Home Folder
subMenu = new KonqCopyToDirectoryMenu(this, this, QDir::homePath());
subMenu->setTitle(i18nc("@title:menu", "Home Folder"));
- subMenu->setIcon(KIcon("go-home"));
+ subMenu->setIcon(QIcon::fromTheme("go-home"));
addMenu(subMenu);
// Root Folder
#ifndef Q_OS_WIN
subMenu = new KonqCopyToDirectoryMenu(this, this, QDir::rootPath());
subMenu->setTitle(i18nc("@title:menu", "Root Folder"));
- subMenu->setIcon(KIcon("folder-red"));
+ subMenu->setIcon(QIcon::fromTheme("folder-red"));
addMenu(subMenu);
#else
foreach ( const QFileInfo& info, QDir::drives() ) {
@@ -151,7 +151,7 @@ void KonqCopyToMainMenu::slotAboutToShow()
}
subMenu = new KonqCopyToDirectoryMenu(this, this, info.absoluteFilePath());
subMenu->setTitle(info.absoluteFilePath());
- subMenu->setIcon(KIcon(driveIcon));
+ subMenu->setIcon(QIcon::fromTheme(driveIcon));
addMenu(subMenu);
}
#endif
@@ -257,7 +257,7 @@ void KonqCopyToDirectoryMenu::slotAboutToShow()
// correctly and not misinterpreted as an indicator for a keyboard shortcut
subMenu->setTitle(menuTitle.replace('&', "&&"));
const QString iconName = dirMime->iconName();
- subMenu->setIcon(KIcon(iconName));
+ subMenu->setIcon(QIcon::fromTheme(iconName));
if (QFileInfo(subPath).isSymLink()) { // I hope this isn't too slow...
QFont font = subMenu->menuAction()->font();
font.setItalic(true);
diff --git a/lib/konq/src/konq_operations.cpp b/lib/konq/src/konq_operations.cpp
index 2de177c..0f2f918 100644
--- a/lib/konq/src/konq_operations.cpp
+++ b/lib/konq/src/konq_operations.cpp
@@ -49,7 +49,7 @@
#include <kuiserverjobtracker.h>
#include <kstandarddirs.h>
// For doDrop
-#include <kicon.h>
+#include <QIcon>
#include <kauthorized.h>
#include <kglobal.h>
#include <kglobalsettings.h>
@@ -396,17 +396,17 @@ void KonqOperations::doDropFileCopy()
QString seq = QKeySequence( Qt::ShiftModifier ).toString();
seq.chop(1); // chop superfluous '+'
QAction* popupMoveAction = new QAction(i18n( "&Move Here" ) + '\t' + seq, \
this);
- popupMoveAction->setIcon(KIcon("go-jump"));
+ popupMoveAction->setIcon(QIcon::fromTheme("go-jump"));
seq = QKeySequence( Qt::ControlModifier ).toString();
seq.chop(1);
QAction* popupCopyAction = new QAction(i18n( "&Copy Here" ) + '\t' + seq, \
this);
- popupCopyAction->setIcon(KIcon("edit-copy"));
+ popupCopyAction->setIcon(QIcon::fromTheme("edit-copy"));
seq = QKeySequence( Qt::ControlModifier + Qt::ShiftModifier ).toString();
seq.chop(1);
QAction* popupLinkAction = new QAction(i18n( "&Link Here" ) + '\t' + seq, \
this);
- popupLinkAction->setIcon(KIcon("edit-link"));
+ popupLinkAction->setIcon(QIcon::fromTheme("edit-link"));
QAction* popupCancelAction = new QAction(i18n( "C&ancel" ) + '\t' + \
QKeySequence( Qt::Key_Escape ).toString(), this);
- popupCancelAction->setIcon(KIcon("process-stop"));
+ popupCancelAction->setIcon(QIcon::fromTheme("process-stop"));
if (!mlst.isEmpty() && (sMoving || (sReading && sDeleting)) && !linkOnly )
{
diff --git a/lib/konq/src/konq_popupmenu.cpp b/lib/konq/src/konq_popupmenu.cpp
index ac11dff..5b06c6d 100644
--- a/lib/konq/src/konq_popupmenu.cpp
+++ b/lib/konq/src/konq_popupmenu.cpp
@@ -34,7 +34,7 @@
#include <kdebug.h>
#include <krun.h>
#include <kprotocolmanager.h>
-#include <kicon.h>
+#include <QIcon>
#include <knewfilemenu.h>
#include <kiconloader.h>
#include <kinputdialog.h>
@@ -126,7 +126,7 @@ public:
KBookmarkManager* m_bookmarkManager;
KActionCollection &m_actions;
KActionCollection m_ownActionCollection; // only used by plugins; KDE5: pass \
m_ownActions instead
- QList<KAction*> m_ownActions;
+ QList<QAction *> m_ownActions;
KParts::BrowserExtension::ActionGroupMap m_actionGroups;
};
@@ -235,9 +235,9 @@ void KonqPopupMenuPrivate::init(KonqPopupMenu::Flags kpf, \
KParts::BrowserExtensi
addGroup( "topactions" ); // used e.g. for ShowMenuBar. includes a separator at \
the end
- KAction * act;
+ QAction * act;
- KAction *actNewWindow = 0;
+ QAction *actNewWindow = 0;
#if 0 // TODO in the desktop code itself.
if (( flags & KParts::BrowserExtension::ShowProperties ) && isOnDesktop &&
@@ -253,9 +253,9 @@ void KonqPopupMenuPrivate::init(KonqPopupMenu::Flags kpf, \
KParts::BrowserExtensi if ( ((kpf & KonqPopupMenu::ShowNewWindow) != 0) && sReading \
) {
const QString openStr = i18n("&Open");
- actNewWindow = new KAction(m_parentWidget /*for status tips*/);
+ actNewWindow = new QAction(m_parentWidget /*for status tips*/);
m_ownActions.append(actNewWindow);
- actNewWindow->setIcon( KIcon("window-new") );
+ actNewWindow->setIcon( QIcon::fromTheme("window-new") );
actNewWindow->setText( openStr );
QObject::connect(actNewWindow, &QAction::triggered, [this]() {
slotPopupNewView();
@@ -276,9 +276,9 @@ void KonqPopupMenuPrivate::init(KonqPopupMenu::Flags kpf, \
KParts::BrowserExtensi }
else if (mkdirRequested)
{
- KAction *actNewDir = new KAction(m_parentWidget);
+ QAction *actNewDir = new QAction(m_parentWidget);
m_ownActions.append(actNewDir);
- actNewDir->setIcon( KIcon("folder-new") );
+ actNewDir->setIcon( QIcon::fromTheme("folder-new") );
actNewDir->setText( i18n( "Create &Folder..." ) );
QObject::connect(actNewDir, &QAction::triggered, [this]() {
slotPopupNewDir();
@@ -288,10 +288,10 @@ void KonqPopupMenuPrivate::init(KonqPopupMenu::Flags kpf, \
KParts::BrowserExtensi }
} else if ( isIntoTrash ) {
// Trashed item, offer restoring
- act = new KAction(m_parentWidget /*for status tips*/);
+ act = new QAction(m_parentWidget /*for status tips*/);
m_ownActions.append(act);
act->setText( i18n( "&Restore" ) );
- act->setHelpText(i18n("Restores this file or directory, back to the location \
where it was deleted from initially")); + //PORT QT5 \
act->setHelpText(i18n("Restores this file or directory, back to the location where it \
was deleted from initially")); QObject::connect(act, &QAction::triggered, [this]() {
slotPopupRestoreTrashedItems();
});
@@ -311,10 +311,10 @@ void KonqPopupMenuPrivate::init(KonqPopupMenu::Flags kpf, \
KParts::BrowserExtensi
if (!currentDir && isSymLink && !isSymLinkInSameDir) {
// #65151: offer to open the target's parent dir
- act = new KAction(m_parentWidget);
+ act = new QAction(m_parentWidget);
m_ownActions.append(act);
act->setText(isDirectory ? i18n("Show Original Directory") : i18n("Show \
Original File"));
- act->setHelpText(i18n("Opens a new file manager window showing the target of \
this link, in its parent directory.")); + //PORT TO QT5 \
act->setHelpText(i18n("Opens a new file manager window showing the target of this \
link, in its parent directory.")); QObject::connect(act, &QAction::triggered, \
[this]() { slotShowOriginalFile();
});
@@ -345,9 +345,9 @@ void KonqPopupMenuPrivate::init(KonqPopupMenu::Flags kpf, \
KParts::BrowserExtensi }
if ( isCurrentTrash )
{
- act = new KAction(m_parentWidget);
+ act = new QAction(m_parentWidget);
m_ownActions.append(act);
- act->setIcon( KIcon("trash-empty") );
+ act->setIcon( QIcon::fromTheme("trash-empty") );
act->setText( i18n( "&Empty Trash Bin" ) );
KConfig trashConfig( "trashrc", KConfig::SimpleConfig);
act->setEnabled( !trashConfig.group("Status").readEntry( "Empty", true ) );
@@ -358,9 +358,9 @@ void KonqPopupMenuPrivate::init(KonqPopupMenu::Flags kpf, \
KParts::BrowserExtensi }
if ( isCurrentTrash )
{
- act = new KAction(m_parentWidget);
+ act = new QAction(m_parentWidget);
m_ownActions.append(act);
- act->setIcon( KIcon("trash-empty") );
+ act->setIcon( QIcon::fromTheme("trash-empty") );
act->setText( i18n( "&Configure Trash Bin" ) );
QObject::connect(act, &QAction::triggered, [this]() {
slotConfigTrashBin();
@@ -398,10 +398,10 @@ void KonqPopupMenuPrivate::init(KonqPopupMenu::Flags kpf, \
KParts::BrowserExtensi else
caption = i18n("&Bookmark This File");
- act = new KAction(m_parentWidget);
+ act = new QAction(m_parentWidget);
m_ownActions.append(act);
act->setObjectName( QLatin1String("bookmark_add" )); // for unittest
- act->setIcon( KIcon("bookmark-new") );
+ act->setIcon( QIcon::fromTheme("bookmark-new") );
act->setText( caption );
QObject::connect(act, &QAction::triggered, [this]() {
slotPopupAddToBookmark();
@@ -458,7 +458,7 @@ void KonqPopupMenuPrivate::init(KonqPopupMenu::Flags kpf, \
KParts::BrowserExtensi }
if ( (m_itemFlags & KParts::BrowserExtension::ShowProperties) && \
KPropertiesDialog::canDisplay( lstItems ) ) {
- act = new KAction(m_parentWidget);
+ act = new QAction(m_parentWidget);
m_ownActions.append(act);
act->setObjectName( QLatin1String("properties" )); // for unittest
act->setText( i18n( "&Properties" ) );
@@ -475,7 +475,7 @@ void KonqPopupMenuPrivate::init(KonqPopupMenu::Flags kpf, \
KParts::BrowserExtensi if ( isDirectory && isLocal ) {
if ( KFileShare::authorization() == KFileShare::Authorized ) {
q->addSeparator();
- act = new KAction(m_parentWidget);
+ act = new QAction(m_parentWidget);
m_ownActions.append(act);
act->setText( i18n("Share") );
QObject::connect(act, &QAction::triggered, [this]() {
diff --git a/lib/konq/src/konq_popupmenu.h b/lib/konq/src/konq_popupmenu.h
index 857374f..bec37e6 100644
--- a/lib/konq/src/konq_popupmenu.h
+++ b/lib/konq/src/konq_popupmenu.h
@@ -26,7 +26,7 @@
#include <QMap>
#include <QMenu>
-#include <kaction.h>
+#include <QAction>
#include <kactioncollection.h>
#include <kfileitem.h>
#include <kparts/browserextension.h>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic