aboutsummaryrefslogtreecommitdiff
path: root/src-qt5/core-utils
diff options
context:
space:
mode:
authorKen Moore <ken@ixsystems.com>2017-09-18 08:58:59 -0400
committerKen Moore <ken@ixsystems.com>2017-09-18 08:58:59 -0400
commitbf9863518213fea4003e4d95743db6ffdf3ae29c (patch)
tree689897497eb81bd7c8bae9eab5712ccdf27ef308 /src-qt5/core-utils
parentCommit a "scrollbar-simple.qss" file, and some WIP on updating X cursors on t... (diff)
downloadlumina-bf9863518213fea4003e4d95743db6ffdf3ae29c.tar.gz
lumina-bf9863518213fea4003e4d95743db6ffdf3ae29c.tar.bz2
lumina-bf9863518213fea4003e4d95743db6ffdf3ae29c.zip
Deactivate the "themes" page within lumina-config.
Replace that button with one that launches the theme engine config tool.
Diffstat (limited to 'src-qt5/core-utils')
-rw-r--r--src-qt5/core-utils/lumina-config/pages/getPage.cpp6
-rw-r--r--src-qt5/core-utils/lumina-config/pages/page_main.cpp14
2 files changed, 10 insertions, 10 deletions
diff --git a/src-qt5/core-utils/lumina-config/pages/getPage.cpp b/src-qt5/core-utils/lumina-config/pages/getPage.cpp
index 79eb18f6..7274ae3f 100644
--- a/src-qt5/core-utils/lumina-config/pages/getPage.cpp
+++ b/src-qt5/core-utils/lumina-config/pages/getPage.cpp
@@ -9,7 +9,7 @@
//Add any sub-pages here
#include "page_main.h"
#include "page_wallpaper.h"
-#include "page_theme.h"
+//#include "page_theme.h"
#include "page_autostart.h"
#include "page_defaultapps.h"
#include "page_fluxbox_keys.h"
@@ -40,7 +40,7 @@ QList<PAGEINFO> Pages::KnownPages(){
QList<PAGEINFO> list;
//Reminder: <ID>, <name>, <title>, <icon>, <comment>, <category>, <server subsytem list>, <search tags>
list << Pages::PageInfo("wallpaper", QObject::tr("Wallpaper"), QObject::tr("Wallpaper Settings"), "preferences-desktop-wallpaper",QObject::tr("Change background image(s)"), "appearance", QStringList(), QStringList() << "background" << "wallpaper" << "color" << "image");
- list << Pages::PageInfo("theme", QObject::tr("Theme"), QObject::tr("Theme Settings"), "preferences-desktop-theme",QObject::tr("Change interface fonts and colors"), "appearance", QStringList(), QStringList() << "background" << "interface" << "color" << "theme" << "plugins");
+ list << Pages::PageInfo(LUtils::AppToAbsolute("lthemeengine.desktop"), QObject::tr("Theme"), QObject::tr("Theme Settings"), "preferences-desktop-theme",QObject::tr("Change interface fonts and colors"), "appearance", QStringList(), QStringList() << "background" << "interface" << "color" << "theme" << "plugins");
list << Pages::PageInfo("compton", QObject::tr("Window Effects"), QObject::tr("Window Effects"), "window-duplicate",QObject::tr("Adjust transparency levels and window effects"), "appearance", QStringList(), QStringList() << "background" << "interface" << "color" << "transparency" << "windows" << "compositing");
list << Pages::PageInfo("autostart", QObject::tr("Autostart"), QObject::tr("Startup Settings"), "preferences-system-session-services",QObject::tr("Automatically start applications or services"), "session", QStringList(), QStringList() << "apps" << "autostart" << "services" << "xdg" << "startup" << "session");
list << Pages::PageInfo("defaultapps", QObject::tr("Applications"), QObject::tr("Mimetype Settings"), "preferences-desktop-default-applications",QObject::tr("Change default applications"), "session", QStringList(), QStringList() << "apps" << "default" << "services" << "xdg" << "session");
@@ -61,7 +61,7 @@ PageWidget* Pages::GetNewPage(QString id, QWidget *parent){
//Find the page that matches this "id"
PageWidget* page = 0;
if(id=="wallpaper"){ page = new page_wallpaper(parent); }
- else if(id=="theme"){ page = new page_theme(parent); }
+ //else if(id=="theme"){ page = new page_theme(parent); }
else if(id=="autostart"){ page = new page_autostart(parent); }
else if(id=="defaultapps"){ page = new page_defaultapps(parent); }
else if(id=="fluxbox-keys"){ page = new page_fluxbox_keys(parent); }
diff --git a/src-qt5/core-utils/lumina-config/pages/page_main.cpp b/src-qt5/core-utils/lumina-config/pages/page_main.cpp
index 13a3cfbd..bb0de962 100644
--- a/src-qt5/core-utils/lumina-config/pages/page_main.cpp
+++ b/src-qt5/core-utils/lumina-config/pages/page_main.cpp
@@ -44,7 +44,7 @@ void page_main::setPreviousPage(QString id){
}
}
}
-
+
}
void page_main::UpdateItems(QString search){
@@ -87,15 +87,15 @@ void page_main::UpdateItems(QString search){
//qDebug() << "Item Found:" << INFO[i].id << INFO[i].title;
int col = 0;
QTreeWidgetItem *lastIt = 0;
- if(INFO[i].category=="interface" && interface->childCount()>0 ){
+ if(INFO[i].category=="interface" && interface->childCount()>0 ){
if( interface->child( interface->childCount()-1)->text(1).isEmpty() ){ lastIt = interface->child(interface->childCount()-1); }
}else if(INFO[i].category=="appearance" && appearance->childCount()>0 ){
if( appearance->child(appearance->childCount()-1)->text(1).isEmpty() ){ lastIt = appearance->child(appearance->childCount()-1); }
- }else if(INFO[i].category=="session" && session->childCount()>0 ){
+ }else if(INFO[i].category=="session" && session->childCount()>0 ){
if( session->child( session->childCount()-1)->text(1).isEmpty() ){ lastIt = session->child(session->childCount()-1); }
- }else if(INFO[i].category=="user" && user->childCount()>0 ){
+ }else if(INFO[i].category=="user" && user->childCount()>0 ){
if( user->child( user->childCount()-1)->text(1).isEmpty() ){ lastIt = user->child(user->childCount()-1); }
- }else if(INFO[i].category=="system" && system->childCount()>0 ){
+ }else if(INFO[i].category=="system" && system->childCount()>0 ){
if( system->child( system->childCount()-1)->text(1).isEmpty() ){ lastIt = system->child(system->childCount()-1); }
}
if(lastIt==0){ lastIt = new QTreeWidgetItem(); col = 0;}
@@ -125,7 +125,7 @@ void page_main::UpdateItems(QString search){
ui->treeWidget->resizeColumnToContents(1);
//Now make sure the width of the tree widget is greater/equal to the recommended size
- int wid = ui->treeWidget->indentation() + 10;
+ int wid = ui->treeWidget->indentation() + 10;
for(int i=0; i<ui->treeWidget->columnCount(); i++){
wid += ui->treeWidget->columnWidth(i);
}
@@ -194,7 +194,7 @@ void page_main::showFind(){
void page_main::itemTriggered(QTreeWidgetItem *it, int col){
if(it->childCount()>0){
- it->setExpanded( !it->isExpanded() );
+ it->setExpanded( !it->isExpanded() );
it->setSelected(false);
}else if(!it->whatsThis(col).isEmpty()){
QString id = it->whatsThis(col);
bgstack15