Changeset View
Changeset View
Standalone View
Standalone View
krusader/kractions.cpp
Show All 28 Lines | |||||
29 | #include <KXmlGui/KActionCollection> | 29 | #include <KXmlGui/KActionCollection> | ||
30 | #include <KWidgetsAddons/KToggleAction> | 30 | #include <KWidgetsAddons/KToggleAction> | ||
31 | #include <KWidgetsAddons/KToolBarPopupAction> | 31 | #include <KWidgetsAddons/KToolBarPopupAction> | ||
32 | #include <KXmlGui/KToggleToolBarAction> | 32 | #include <KXmlGui/KToggleToolBarAction> | ||
33 | #include <KXmlGui/KXMLGUIFactory> | 33 | #include <KXmlGui/KXMLGUIFactory> | ||
34 | 34 | | |||
35 | #include "defaults.h" | 35 | #include "defaults.h" | ||
36 | #include "krusader.h" | 36 | #include "krusader.h" | ||
37 | #include "icon.h" | ||||
37 | #include "krusaderview.h" | 38 | #include "krusaderview.h" | ||
38 | #include "krslots.h" | 39 | #include "krslots.h" | ||
39 | #include "krtrashhandler.h" | 40 | #include "krtrashhandler.h" | ||
40 | #include "Dialogs/popularurls.h" | 41 | #include "Dialogs/popularurls.h" | ||
41 | #include "GUI/krremoteencodingmenu.h" | 42 | #include "GUI/krremoteencodingmenu.h" | ||
42 | #include "JobMan/jobman.h" | 43 | #include "JobMan/jobman.h" | ||
43 | #include "MountMan/kmountman.h" | 44 | #include "MountMan/kmountman.h" | ||
44 | #include "Panel/PanelView/krviewfactory.h" | 45 | #include "Panel/PanelView/krviewfactory.h" | ||
▲ Show 20 Lines • Show All 68 Lines • ▼ Show 20 Line(s) | |||||
113 | 114 | | |||
114 | QAction *createAction(QString text, QString icon, QKeySequence shortcut, | 115 | QAction *createAction(QString text, QString icon, QKeySequence shortcut, | ||
115 | QObject *recv, const char *slot, QString name, Krusader *krusaderApp) | 116 | QObject *recv, const char *slot, QString name, Krusader *krusaderApp) | ||
116 | { | 117 | { | ||
117 | QAction *a; | 118 | QAction *a; | ||
118 | if (icon.isEmpty()) | 119 | if (icon.isEmpty()) | ||
119 | a = new QAction(text, krusaderApp); | 120 | a = new QAction(text, krusaderApp); | ||
120 | else | 121 | else | ||
121 | a = new QAction(QIcon::fromTheme(icon), text, krusaderApp); | 122 | a = new QAction(Icon(icon), text, krusaderApp); | ||
122 | krusaderApp->connect(a, SIGNAL(triggered(bool)), recv, slot); | 123 | krusaderApp->connect(a, SIGNAL(triggered(bool)), recv, slot); | ||
123 | krusaderApp->actionCollection()->addAction(name, a); | 124 | krusaderApp->actionCollection()->addAction(name, a); | ||
124 | krusaderApp->actionCollection()->setDefaultShortcut(a, shortcut); | 125 | krusaderApp->actionCollection()->setDefaultShortcut(a, shortcut); | ||
125 | return a; | 126 | return a; | ||
126 | } | 127 | } | ||
127 | 128 | | |||
128 | QAction *createAction(QString text, QString icon, QList<QKeySequence> shortcuts, | 129 | QAction *createAction(QString text, QString icon, QList<QKeySequence> shortcuts, | ||
129 | QObject *recv, const char *slot, QString name, Krusader *krusaderApp) | 130 | QObject *recv, const char *slot, QString name, Krusader *krusaderApp) | ||
130 | { | 131 | { | ||
131 | QAction *a; | 132 | QAction *a; | ||
132 | if (icon.isEmpty()) | 133 | if (icon.isEmpty()) | ||
133 | a = new QAction(text, krusaderApp); | 134 | a = new QAction(text, krusaderApp); | ||
134 | else | 135 | else | ||
135 | a = new QAction(QIcon::fromTheme(icon), text, krusaderApp); | 136 | a = new QAction(Icon(icon), text, krusaderApp); | ||
136 | krusaderApp->connect(a, SIGNAL(triggered(bool)), recv, slot); | 137 | krusaderApp->connect(a, SIGNAL(triggered(bool)), recv, slot); | ||
137 | krusaderApp->actionCollection()->addAction(name, a); | 138 | krusaderApp->actionCollection()->addAction(name, a); | ||
138 | krusaderApp->actionCollection()->setDefaultShortcuts(a, shortcuts); | 139 | krusaderApp->actionCollection()->setDefaultShortcuts(a, shortcuts); | ||
139 | return a; | 140 | return a; | ||
140 | } | 141 | } | ||
141 | 142 | | |||
142 | 143 | | |||
143 | KToggleAction *createToggleAction(QString text, QString icon, QKeySequence shortcut, | 144 | KToggleAction *createToggleAction(QString text, QString icon, QKeySequence shortcut, | ||
144 | QObject *recv, const char *slot, QString name, Krusader *krusaderApp) | 145 | QObject *recv, const char *slot, QString name, Krusader *krusaderApp) | ||
145 | { | 146 | { | ||
146 | KToggleAction *a; | 147 | KToggleAction *a; | ||
147 | if (icon == 0) | 148 | if (icon == 0) | ||
148 | a = new KToggleAction(text, krusaderApp); | 149 | a = new KToggleAction(text, krusaderApp); | ||
149 | else | 150 | else | ||
150 | a = new KToggleAction(QIcon::fromTheme(icon), text, krusaderApp); | 151 | a = new KToggleAction(Icon(icon), text, krusaderApp); | ||
151 | krusaderApp->connect(a, SIGNAL(triggered(bool)), recv, slot); | 152 | krusaderApp->connect(a, SIGNAL(triggered(bool)), recv, slot); | ||
152 | krusaderApp->actionCollection()->addAction(name, a); | 153 | krusaderApp->actionCollection()->addAction(name, a); | ||
153 | krusaderApp->actionCollection()->setDefaultShortcut(a, shortcut); | 154 | krusaderApp->actionCollection()->setDefaultShortcut(a, shortcut); | ||
154 | return a; | 155 | return a; | ||
155 | } | 156 | } | ||
156 | 157 | | |||
157 | 158 | | |||
158 | void KrActions::setupActions(Krusader *krusaderApp) | 159 | void KrActions::setupActions(Krusader *krusaderApp) | ||
▲ Show 20 Lines • Show All 166 Lines • Show Last 20 Lines |