From 5f502c9034fa2375a58b3b3a8e207224ebeaa73a Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Sat, 23 May 2015 08:23:15 -0400 Subject: Remove the extra bootsplash show between the apps/settings menu initialization. Something about the addition processEvents() call is screwing up the init procedures. --- lumina-desktop/LSession.cpp | 2 +- lumina-desktop/SettingsMenu.cpp | 2 +- lumina-desktop/desktop-plugins/LDPlugin.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'lumina-desktop') diff --git a/lumina-desktop/LSession.cpp b/lumina-desktop/LSession.cpp index fd2b16b3..d4f7c2f0 100644 --- a/lumina-desktop/LSession.cpp +++ b/lumina-desktop/LSession.cpp @@ -119,7 +119,7 @@ void LSession::setupSession(){ if(DEBUG){ qDebug() << " - Init AppMenu:" << timer->elapsed();} appmenu = new AppMenu(); if(DEBUG){ qDebug() << " - Init SettingsMenu:" << timer->elapsed();} - splash.showScreen("menus"); + //splash.showScreen("menus"); settingsmenu = new SettingsMenu(); if(DEBUG){ qDebug() << " - Init SystemWindow:" << timer->elapsed();} sysWindow = new SystemWindow(); diff --git a/lumina-desktop/SettingsMenu.cpp b/lumina-desktop/SettingsMenu.cpp index 95e6e44f..078739a6 100644 --- a/lumina-desktop/SettingsMenu.cpp +++ b/lumina-desktop/SettingsMenu.cpp @@ -10,7 +10,7 @@ #include SettingsMenu::SettingsMenu() : QMenu(){ - QTimer::singleShot(10, this, SLOT(InitMenu()) ); + QTimer::singleShot(100, this, SLOT(InitMenu()) ); } SettingsMenu::~SettingsMenu(){ diff --git a/lumina-desktop/desktop-plugins/LDPlugin.h b/lumina-desktop/desktop-plugins/LDPlugin.h index 82f8e22f..fc6ab604 100644 --- a/lumina-desktop/desktop-plugins/LDPlugin.h +++ b/lumina-desktop/desktop-plugins/LDPlugin.h @@ -40,7 +40,7 @@ public: if(opaque){ this->setObjectName("LuminaDesktopPluginVisible"); } else{ this->setObjectName("LuminaDesktopPlugin"); } //Use plugin-specific values for stylesheet control (applauncher, desktopview, etc...) - qDebug() << "set Objectname:" << id.section("---",0,0).section("::",0,0); + //qDebug() << "set Objectname:" << id.section("---",0,0).section("::",0,0); this->setObjectName(id.section("---",0,0).section("::",0,0)); } -- cgit