Differential D10352 Diff 32037 krusader/MountMan/kmountman.cpp

Changeset View

Standalone View

View Options

krusader/MountMan/kmountman.cpp

Show All 36 Lines
37 37​
38#include <Solid/Block> 38​#include <Solid/Block>
39#include <Solid/OpticalDisc> 39​#include <Solid/OpticalDisc>
40#include <Solid/OpticalDrive> 40​#include <Solid/OpticalDrive>
41#include <Solid/StorageAccess> 41​#include <Solid/StorageAccess>
42#include <Solid/StorageVolume> 42​#include <Solid/StorageVolume>
43 43​
44#include "../krglobal.h" 44​#include "../krglobal.h"
45​#include "../icon.h"
45#include "../kractions.h" 46​#include "../kractions.h"
46#include "../defaults.h" 47​#include "../defaults.h"
47#include "../Dialogs/krdialogs.h" 48​#include "../Dialogs/krdialogs.h"
48#include "../krservices.h" 49​#include "../krservices.h"
49#include "kmountmangui.h" 50​#include "kmountmangui.h"
50#include "../FileSystem/krpermhandler.h" 51​#include "../FileSystem/krpermhandler.h"
51 52​
52#ifdef _OS_SOLARIS_ 53​#ifdef _OS_SOLARIS_
53#define FSTAB "/etc/filesystemtab" 54​#define FSTAB "/etc/filesystemtab"
54#else 55​#else
55#define FSTAB "/etc/fstab" 56​#define FSTAB "/etc/fstab"
56#endif 57​#endif
57 58​
58KMountMan::KMountMan(QWidget *parent) : QObject(), _operational(false), waiting(false), mountManGui(0), parentWindow(parent) 59​KMountMan::KMountMan(QWidget *parent) : QObject(), _operational(false), waiting(false), mountManGui(0), parentWindow(parent)
59{ 60​{
60 _action = new KToolBarPopupAction(QIcon::fromTheme("kr_mountman"), i18n("&MountMan..."), this); 61​ _action = new KToolBarPopupAction(Icon("kr_mountman"), i18n("&MountMan..."), this);
61 connect(_action, &QAction::triggered, this, &KMountMan::mainWindow); 62​ connect(_action, &QAction::triggered, this, &KMountMan::mainWindow);
62 connect(_action->menu(), &QMenu::aboutToShow, this, &KMountMan::quickList); 63​ connect(_action->menu(), &QMenu::aboutToShow, this, &KMountMan::quickList);
63 _manageAction = _action->menu()->addAction(i18n("Open &MountMan")); 64​ _manageAction = _action->menu()->addAction(i18n("Open &MountMan"));
64 connect(_manageAction, &QAction::triggered, this, &KMountMan::mainWindow); 65​ connect(_manageAction, &QAction::triggered, this, &KMountMan::mainWindow);
65 _action->menu()->addSeparator(); 66​ _action->menu()->addSeparator();
66 67​
67 // added as a precaution, although we use kde services now 68​ // added as a precaution, although we use kde services now
68 _operational = KrServices::cmdExist("mount"); 69​ _operational = KrServices::cmdExist("mount");
▲ Show 20 Lines • Show All 431 Lines • Show Last 20 Lines