Changeset View
Changeset View
Standalone View
Standalone View
krusader/krusader.cpp
Show All 34 Lines | |||||
35 | #include <QDesktopWidget> | 35 | #include <QDesktopWidget> | ||
36 | // QtDBus | 36 | // QtDBus | ||
37 | #include <QDBusInterface> | 37 | #include <QDBusInterface> | ||
38 | 38 | | |||
39 | #include <KCoreAddons/KRandom> | 39 | #include <KCoreAddons/KRandom> | ||
40 | #include <KConfigCore/KSharedConfig> | 40 | #include <KConfigCore/KSharedConfig> | ||
41 | #include <KConfigGui/KWindowConfig> | 41 | #include <KConfigGui/KWindowConfig> | ||
42 | #include <KI18n/KLocalizedString> | 42 | #include <KI18n/KLocalizedString> | ||
43 | #include <KIconThemes/KIconLoader> | | |||
44 | #include <KXmlGui/KActionCollection> | 43 | #include <KXmlGui/KActionCollection> | ||
45 | #include <KXmlGui/KXMLGUIFactory> | 44 | #include <KXmlGui/KXMLGUIFactory> | ||
46 | #include <KXmlGui/KToolBar> | 45 | #include <KXmlGui/KToolBar> | ||
47 | #include <KWidgetsAddons/KAcceleratorManager> | 46 | #include <KWidgetsAddons/KAcceleratorManager> | ||
48 | #include <KWidgetsAddons/KCursor> | 47 | #include <KWidgetsAddons/KCursor> | ||
49 | #include <KWidgetsAddons/KMessageBox> | 48 | #include <KWidgetsAddons/KMessageBox> | ||
50 | #include <KWidgetsAddons/KToggleAction> | 49 | #include <KWidgetsAddons/KToggleAction> | ||
51 | #include <KWidgetsAddons/KToolBarPopupAction> | 50 | #include <KWidgetsAddons/KToolBarPopupAction> | ||
52 | #include <KWindowSystem/KStartupInfo> | 51 | #include <KWindowSystem/KStartupInfo> | ||
53 | #include <KWindowSystem/KWindowSystem> | 52 | #include <KWindowSystem/KWindowSystem> | ||
54 | 53 | | |||
55 | #include "defaults.h" | 54 | #include "defaults.h" | ||
56 | #include "kicons.h" | | |||
57 | #include "kractions.h" | 55 | #include "kractions.h" | ||
58 | #include "krglobal.h" | 56 | #include "krglobal.h" | ||
59 | #include "krservices.h" | 57 | #include "krservices.h" | ||
60 | #include "krslots.h" | 58 | #include "krslots.h" | ||
61 | #include "krtrashhandler.h" | 59 | #include "krtrashhandler.h" | ||
62 | #include "krusaderversion.h" | 60 | #include "krusaderversion.h" | ||
63 | #include "krusaderview.h" | 61 | #include "krusaderview.h" | ||
64 | #include "panelmanager.h" | 62 | #include "panelmanager.h" | ||
▲ Show 20 Lines • Show All 67 Lines • ▼ Show 20 Line(s) | 111 | { | |||
132 | case KConfigBase::ReadWrite : | 130 | case KConfigBase::ReadWrite : | ||
133 | message = ""; | 131 | message = ""; | ||
134 | break; | 132 | break; | ||
135 | } | 133 | } | ||
136 | if (!message.isEmpty()) { | 134 | if (!message.isEmpty()) { | ||
137 | KMessageBox::error(krApp, message); | 135 | KMessageBox::error(krApp, message); | ||
138 | } | 136 | } | ||
139 | 137 | | |||
140 | // create an icon loader | | |||
141 | krLoader = KIconLoader::global(); | | |||
142 | // iconLoader->addExtraDesktopThemes(); | | |||
143 | | ||||
144 | // create MountMan | 138 | // create MountMan | ||
145 | KrGlobal::mountMan = new KMountMan(this); | 139 | KrGlobal::mountMan = new KMountMan(this); | ||
146 | connect(KrGlobal::mountMan, SIGNAL(refreshPanel(QUrl)), SLOTS, SLOT(refresh(QUrl))); | 140 | connect(KrGlobal::mountMan, SIGNAL(refreshPanel(QUrl)), SLOTS, SLOT(refresh(QUrl))); | ||
147 | 141 | | |||
148 | // create popular URLs container | 142 | // create popular URLs container | ||
149 | _popularUrls = new PopularUrls(this); | 143 | _popularUrls = new PopularUrls(this); | ||
150 | 144 | | |||
151 | // create bookman | 145 | // create bookman | ||
▲ Show 20 Lines • Show All 149 Lines • ▼ Show 20 Line(s) | |||||
301 | } | 295 | } | ||
302 | 296 | | |||
303 | void Krusader::setTray(bool forceCreation) | 297 | void Krusader::setTray(bool forceCreation) | ||
304 | { | 298 | { | ||
305 | const bool trayIsNeeded = forceCreation || KConfigGroup(krConfig, "Look&Feel") | 299 | const bool trayIsNeeded = forceCreation || KConfigGroup(krConfig, "Look&Feel") | ||
306 | .readEntry("Minimize To Tray", _ShowTrayIcon); | 300 | .readEntry("Minimize To Tray", _ShowTrayIcon); | ||
307 | if (!sysTray && trayIsNeeded) { | 301 | if (!sysTray && trayIsNeeded) { | ||
308 | sysTray = new KStatusNotifierItem(this); | 302 | sysTray = new KStatusNotifierItem(this); | ||
309 | sysTray->setIconByName(privIcon()); | 303 | sysTray->setIconByName(appIconName()); | ||
310 | // we have our own "quit" method, re-connect | 304 | // we have our own "quit" method, re-connect | ||
311 | QAction *quitAction = sysTray->action(QStringLiteral("quit")); | 305 | QAction *quitAction = sysTray->action(QStringLiteral("quit")); | ||
312 | if (quitAction) { | 306 | if (quitAction) { | ||
313 | disconnect(quitAction, &QAction::triggered, nullptr, nullptr); | 307 | disconnect(quitAction, &QAction::triggered, nullptr, nullptr); | ||
314 | connect(quitAction, &QAction::triggered, this, &Krusader::quit); | 308 | connect(quitAction, &QAction::triggered, this, &Krusader::quit); | ||
315 | } | 309 | } | ||
316 | } else if (sysTray && !trayIsNeeded) { | 310 | } else if (sysTray && !trayIsNeeded) { | ||
317 | // user does not want tray anymore :( | 311 | // user does not want tray anymore :( | ||
▲ Show 20 Lines • Show All 235 Lines • ▼ Show 20 Line(s) | 546 | if (userActionMenu) { | |||
553 | userActionMenu->menu()->clear(); | 547 | userActionMenu->menu()->clear(); | ||
554 | 548 | | |||
555 | userActionMenu->addAction(KrActions::actManageUseractions); | 549 | userActionMenu->addAction(KrActions::actManageUseractions); | ||
556 | userActionMenu->addSeparator(); | 550 | userActionMenu->addSeparator(); | ||
557 | krUserAction->populateMenu(userActionMenu, NULL); | 551 | krUserAction->populateMenu(userActionMenu, NULL); | ||
558 | } | 552 | } | ||
559 | } | 553 | } | ||
560 | 554 | | |||
561 | const char* Krusader::privIcon() { | 555 | const char* Krusader::appIconName() { | ||
562 | if (geteuid()) | 556 | if (geteuid()) | ||
563 | return "krusader_user"; | 557 | return "krusader_user"; | ||
564 | else | 558 | else | ||
565 | return "krusader_root"; | 559 | return "krusader_root"; | ||
566 | } | 560 | } | ||
567 | 561 | | |||
568 | void Krusader::quit() | 562 | void Krusader::quit() | ||
569 | { | 563 | { | ||
▲ Show 20 Lines • Show All 76 Lines • Show Last 20 Lines |