diff options
| author | q5sys <jt@xsystems.com> | 2018-02-07 14:38:04 -0500 |
|---|---|---|
| committer | q5sys <jt@xsystems.com> | 2018-02-07 14:38:04 -0500 |
| commit | 75864f725800936e6cb2435e336177f60dd7f039 (patch) | |
| tree | e23a6a36f06a5bb6096bdbb99d557ee05ce5d9d8 /src-qt5/core/lumina-desktop-unified | |
| parent | add shell logout to Lumina (diff) | |
| parent | Some quick updates to lumina-terminal (diff) | |
| download | lumina-75864f725800936e6cb2435e336177f60dd7f039.tar.gz lumina-75864f725800936e6cb2435e336177f60dd7f039.tar.bz2 lumina-75864f725800936e6cb2435e336177f60dd7f039.zip | |
Merge branch 'master' of http://github.com/trueos/lumina
Diffstat (limited to 'src-qt5/core/lumina-desktop-unified')
3 files changed, 12 insertions, 5 deletions
diff --git a/src-qt5/core/lumina-desktop-unified/lumina-desktop-unified.desktop b/src-qt5/core/lumina-desktop-unified/lumina-desktop-unified.desktop new file mode 100644 index 00000000..9f082647 --- /dev/null +++ b/src-qt5/core/lumina-desktop-unified/lumina-desktop-unified.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Exec=start-lumina-desktop --unified +TryExec=lumina-desktop-unified +Icon=Lumina-DE +Type=Application +Name=Lumina 2 +Comment=Illuminating the desktop diff --git a/src-qt5/core/lumina-desktop-unified/lumina-desktop.pro b/src-qt5/core/lumina-desktop-unified/lumina-desktop.pro index 96d84a71..a929f844 100644 --- a/src-qt5/core/lumina-desktop-unified/lumina-desktop.pro +++ b/src-qt5/core/lumina-desktop-unified/lumina-desktop.pro @@ -46,7 +46,7 @@ FORMS += BootSplash.ui # Install all the various files for the desktop itself desktop.path = $${L_SESSDIR} -desktop.files = lumina-desktop.desktop +desktop.files = lumina-desktop-unified.desktop defaults.path = $${L_SHAREDIR}/lumina-desktop defaults.files = defaults/* diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/DesktopManager.cpp b/src-qt5/core/lumina-desktop-unified/src-desktop/DesktopManager.cpp index 35bd288d..73cd6645 100644 --- a/src-qt5/core/lumina-desktop-unified/src-desktop/DesktopManager.cpp +++ b/src-qt5/core/lumina-desktop-unified/src-desktop/DesktopManager.cpp @@ -142,19 +142,19 @@ void DesktopManager::syncWindowList(){ void DesktopManager::syncTrayWindowList(){ QList<NativeWindowObject*> allWins = Lumina::NWS->currentTrayWindows(); - qDebug() << "Synced Tray Window List:" << allWins.length(); + //qDebug() << "Synced Tray Window List:" << allWins.length(); RootDesktopObject::instance()->setTrayWindows(allWins); } // === PRIVATE SLOTS === void DesktopManager::updateSessionSettings(){ - qDebug() << "Update Session Settings..."; + //qDebug() << "Update Session Settings..."; RootDesktopObject::instance()->updateCurrentTimeFormat(DesktopSettings::instance()->value(DesktopSettings::Session, "datetime_format", "").toString()); } void DesktopManager::updateDesktopSettings(){ - qDebug() << "Update Desktop Settings..."; + //qDebug() << "Update Desktop Settings..."; QList<QScreen*> scrns = QGuiApplication::screens(); int wkspace = Lumina::NWS->currentWorkspace(); for(int i=0; i<scrns.length(); i++){ updateWallpaper(scrns[i]->name(), wkspace); } @@ -164,7 +164,7 @@ void DesktopManager::updateDesktopSettings(){ void DesktopManager::updatePanelSettings(){ QList<QScreen*> scrns = QGuiApplication::screens(); int primary = QApplication::desktop()->primaryScreen(); - qDebug() << "Panel Settings Changed:" << primary << scrns.length(); + //qDebug() << "Panel Settings Changed:" << primary << scrns.length(); QStringList total_ids; for(int i=0; i<scrns.length(); i++){ //qDebug() << " - Check Screen Name:" << scrns[i]->name(); |