diff options
| author | Ken Moore <ken@ixsystems.com> | 2017-07-05 13:30:10 -0400 |
|---|---|---|
| committer | Ken Moore <ken@ixsystems.com> | 2017-07-05 13:30:10 -0400 |
| commit | 9c0db82810e95763a34e703a2209fdda7d1ab883 (patch) | |
| tree | 21c3d36c2e2815d447dc4fd840d4d44b5f986366 /src-qt5/core/lumina-desktop-unified/src-desktop | |
| parent | Add the ability to use a static "instance()" of the DesktopSettings class wit... (diff) | |
| download | lumina-9c0db82810e95763a34e703a2209fdda7d1ab883.tar.gz lumina-9c0db82810e95763a34e703a2209fdda7d1ab883.tar.bz2 lumina-9c0db82810e95763a34e703a2209fdda7d1ab883.zip | |
Move Lumina2 over to using the static instance of the DesktopSettings class rather than a global object (lets us use the DesktopSettings within the standalone classes in libLumina as well).
Diffstat (limited to 'src-qt5/core/lumina-desktop-unified/src-desktop')
| -rw-r--r-- | src-qt5/core/lumina-desktop-unified/src-desktop/ContextMenu.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/ContextMenu.cpp b/src-qt5/core/lumina-desktop-unified/src-desktop/ContextMenu.cpp index 0a78fb25..c3e9a1db 100644 --- a/src-qt5/core/lumina-desktop-unified/src-desktop/ContextMenu.cpp +++ b/src-qt5/core/lumina-desktop-unified/src-desktop/ContextMenu.cpp @@ -19,7 +19,7 @@ void DesktopContextMenu::UpdateMenu(){ this->addAction(wkspaceact); this->addSeparator(); //Now load the user's menu setup and fill the menu - QStringList items = Lumina::SETTINGS->value(DesktopSettings::ContextMenu, "itemlist", QStringList()<< "terminal" << "filemanager" << "line" << "settings" <<"lockdesktop").toStringList(); + QStringList items = DesktopSettings::instance()->value(DesktopSettings::ContextMenu, "itemlist", QStringList()<< "terminal" << "filemanager" << "line" << "settings" <<"lockdesktop").toStringList(); //usewinmenu=false; for(int i=0; i<items.length(); i++){ if(items[i]=="terminal"){ this->addAction(LXDG::findIcon("utilities-terminal",""), tr("Terminal"))->setWhatsThis("lumina-open -terminal"); } @@ -76,7 +76,7 @@ DesktopContextMenu::~DesktopContextMenu(){ } void DesktopContextMenu::start(){ - connect(Lumina::SETTINGS, SIGNAL(FileModified(DesktopSettings::File)), this, SLOT(SettingsChanged(DesktopSettings::File)) ); + connect(DesktopSettings::instance(), SIGNAL(FileModified(DesktopSettings::File)), this, SLOT(SettingsChanged(DesktopSettings::File)) ); connect(this, SIGNAL(LockSession()), Lumina::SS, SLOT(LockScreenNow()) ); //Still need to connect to some "workspaceChanged(int)" signal |