aboutsummaryrefslogtreecommitdiff
path: root/lumina-desktop
diff options
context:
space:
mode:
Diffstat (limited to 'lumina-desktop')
-rw-r--r--lumina-desktop/SettingsMenu.cpp4
-rw-r--r--lumina-desktop/lumina-desktop.pro50
-rw-r--r--lumina-desktop/panel-plugins/userbutton/UserWidget.cpp6
-rw-r--r--lumina-desktop/panel-plugins/userbutton/UserWidget.h3
-rw-r--r--lumina-desktop/panel-plugins/userbutton/UserWidget.ui32
5 files changed, 25 insertions, 70 deletions
diff --git a/lumina-desktop/SettingsMenu.cpp b/lumina-desktop/SettingsMenu.cpp
index c3e4371f..540538b5 100644
--- a/lumina-desktop/SettingsMenu.cpp
+++ b/lumina-desktop/SettingsMenu.cpp
@@ -35,12 +35,12 @@ void SettingsMenu::UpdateMenu(){
act = new QAction( LXDG::findIcon("preferences-other",""), tr("Display"), this);
act->setWhatsThis("lumina-xconfig");
this->addAction(act);
- QString qtconfig = LOS::QtConfigShortcut();
+ /*QString qtconfig = LOS::QtConfigShortcut();
if(QFile::exists(qtconfig) && !qtconfig.isEmpty()){
act = new QAction( LXDG::findIcon("preferences-desktop-theme",""), tr("Window Theme"), this);
act->setWhatsThis(qtconfig);
this->addAction(act);
- }
+ }*/
QString CONTROLPANEL = LOS::ControlPanelShortcut();
if(QFile::exists(CONTROLPANEL) && !CONTROLPANEL.isEmpty()){
//Now load the info
diff --git a/lumina-desktop/lumina-desktop.pro b/lumina-desktop/lumina-desktop.pro
index 4315b2a5..113bd9cf 100644
--- a/lumina-desktop/lumina-desktop.pro
+++ b/lumina-desktop/lumina-desktop.pro
@@ -1,30 +1,18 @@
+include($${PWD}/../OS-detect.pri)
QT += core gui network
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets x11extras multimedia quickwidgets concurrent svg
TARGET = Lumina-DE
-isEmpty(PREFIX) {
- PREFIX = /usr/local
-}
-target.path = $$DESTDIR$$PREFIX/bin
+target.path = $$DESTDIR$${L_BINDIR}
-isEmpty(LIBPREFIX) {
- LIBPREFIX = $$PREFIX/lib
-}
-LIBS += -L../libLumina -L$$LIBPREFIX -lLuminaUtils -lxcb -lxcb-damage
-QMAKE_LIBDIR = ../libLumina
+LIBS += -lLuminaUtils -lxcb -lxcb-damage
DEPENDPATH += ../libLumina
TEMPLATE = app
-isEmpty(QT5LIBDIR) {
- QT5LIBDIR = $$PREFIX/lib/qt5
-}
-
-LRELEASE = $$QT5LIBDIR/bin/lrelease
-
SOURCES += main.cpp \
WMProcess.cpp \
@@ -68,45 +56,37 @@ include(desktop-plugins/desktop-plugins.pri)
RESOURCES+= Lumina-DE.qrc
-INCLUDEPATH += ../libLumina $$PREFIX/include
-
-desktop.files = Lumina-DE.desktop
-linux-* {
-desktop.path = /usr/share/xsessions
-} else {
-desktop.path = $$PREFIX/share/xsessions
-}
+desktop.path = $${L_SESSDIR}
icons.files = Lumina-DE.png \
Insight-FileManager.png
-
-icons.path = $$PREFIX/share/pixmaps
+icons.path = $${L_SHAREDIR}/pixmaps
fluxconf.files = fluxboxconf/fluxbox-init-rc \
fluxboxconf/fluxbox-keys
-fluxconf.path = $$PREFIX/share/Lumina-DE/
+fluxconf.path = $${L_SHAREDIR}/Lumina-DE/
wallpapers.files = wallpapers/Lumina_Wispy_gold.jpg \
wallpapers/Lumina_Wispy_green.jpg \
wallpapers/Lumina_Wispy_purple.jpg \
wallpapers/Lumina_Wispy_red.jpg
-wallpapers.path = $$PREFIX/share/wallpapers/Lumina-DE
+wallpapers.path = $${L_SHAREDIR}/wallpapers/Lumina-DE
defaults.files = defaults/luminaDesktop.conf \
audiofiles/Logout.ogg \
audiofiles/Login.ogg
-defaults.path = $$PREFIX/share/Lumina-DE/
+defaults.path = $${L_SHAREDIR}/Lumina-DE/
-conf.path = $$PREFIX/etc
+conf.path = $${L_ETCDIR}
#Now do any PC-BSD defaults (if set)
PCBSD{
- conf.extra = cp defaults/luminaDesktop.pcbsd.conf $(INSTALL_ROOT)$$PREFIX/etc/luminaDesktop.conf.dist
- defaults.extra = cp defaults/desktop-background.pcbsd.jpg $(INSTALL_ROOT)$$PREFIX/share/Lumina-DE/desktop-background.jpg
+ conf.extra = cp defaults/luminaDesktop.pcbsd.conf $(INSTALL_ROOT)$${L_ETCDIR}/luminaDesktop.conf.dist
+ defaults.extra = cp defaults/desktop-background.pcbsd.jpg $(INSTALL_ROOT)$${L_SHAREDIR}/Lumina-DE/desktop-background.jpg
}else{
- conf.extra = cp defaults/luminaDesktop.conf $(INSTALL_ROOT)$$PREFIX/etc/luminaDesktop.conf.dist
- defaults.extra = cp defaults/desktop-background.jpg $(INSTALL_ROOT)$$PREFIX/share/Lumina-DE/desktop-background.jpg
+ conf.extra = cp defaults/luminaDesktop.conf $(INSTALL_ROOT)$${L_ETCDIR}/luminaDesktop.conf.dist
+ defaults.extra = cp defaults/desktop-background.jpg $(INSTALL_ROOT)$${L_SHAREDIR}/Lumina-DE/desktop-background.jpg
}
TRANSLATIONS = i18n/lumina-desktop_af.ts \
@@ -172,8 +152,8 @@ TRANSLATIONS = i18n/lumina-desktop_af.ts \
i18n/lumina-desktop_zh_TW.ts \
i18n/lumina-desktop_zu.ts
-dotrans.path=$$PREFIX/share/Lumina-DE/i18n/
-dotrans.extra=cd i18n && $${LRELEASE} -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)$$PREFIX/share/Lumina-DE/i18n/
+dotrans.path=$${L_SHAREDIR}/Lumina-DE/i18n/
+dotrans.extra=cd i18n && $${LRELEASE} -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)$${L_SHAREDIR}/Lumina-DE/i18n/
INSTALLS += target desktop icons wallpapers defaults conf fluxconf dotrans
diff --git a/lumina-desktop/panel-plugins/userbutton/UserWidget.cpp b/lumina-desktop/panel-plugins/userbutton/UserWidget.cpp
index da115478..f1f9d03e 100644
--- a/lumina-desktop/panel-plugins/userbutton/UserWidget.cpp
+++ b/lumina-desktop/panel-plugins/userbutton/UserWidget.cpp
@@ -32,7 +32,7 @@ UserWidget::UserWidget(QWidget* parent) : QTabWidget(parent), ui(new Ui::UserWid
//Setup the special buttons
connect(ui->tool_app_store, SIGNAL(clicked()), this, SLOT(openStore()) );
connect(ui->tool_controlpanel, SIGNAL(clicked()), this, SLOT(openControlPanel()) );
- connect(ui->tool_qtconfig, SIGNAL(clicked()), this, SLOT(openQtConfig()) );
+ //connect(ui->tool_qtconfig, SIGNAL(clicked()), this, SLOT(openQtConfig()) );
lastUpdate = QDateTime(); //make sure it refreshes
@@ -152,13 +152,13 @@ void UserWidget::UpdateAll(){
}else{
ui->tool_controlpanel->setVisible(false); //not available
}
- QString QTCONFIG = LOS::QtConfigShortcut();
+ /*QString QTCONFIG = LOS::QtConfigShortcut();
if(QFile::exists(QTCONFIG) && !QTCONFIG.isEmpty()){
ui->tool_qtconfig->setVisible(true);
ui->tool_qtconfig->setIcon( LXDG::findIcon("preferences-desktop-theme","") );
}else{
ui->tool_qtconfig->setVisible(false);
- }
+ }*/
//Now update the menus
UpdateMenu();
}
diff --git a/lumina-desktop/panel-plugins/userbutton/UserWidget.h b/lumina-desktop/panel-plugins/userbutton/UserWidget.h
index f2e8f6d8..af9408dd 100644
--- a/lumina-desktop/panel-plugins/userbutton/UserWidget.h
+++ b/lumina-desktop/panel-plugins/userbutton/UserWidget.h
@@ -80,9 +80,6 @@ private slots:
void openDeskSettings(){
LaunchItem("lumina-config", false);
}
- void openQtConfig(){
- LaunchItem( LOS::QtConfigShortcut(), false);
- }
void openScreenSaverConfig(){
LaunchItem(SSAVER, false);
}
diff --git a/lumina-desktop/panel-plugins/userbutton/UserWidget.ui b/lumina-desktop/panel-plugins/userbutton/UserWidget.ui
index 53eb1f94..9ef5af7e 100644
--- a/lumina-desktop/panel-plugins/userbutton/UserWidget.ui
+++ b/lumina-desktop/panel-plugins/userbutton/UserWidget.ui
@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>292</width>
+ <width>294</width>
<height>289</height>
</rect>
</property>
@@ -276,8 +276,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>259</width>
- <height>247</height>
+ <width>98</width>
+ <height>28</height>
</rect>
</property>
</widget>
@@ -444,8 +444,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>259</width>
- <height>247</height>
+ <width>98</width>
+ <height>28</height>
</rect>
</property>
</widget>
@@ -528,28 +528,6 @@
</widget>
</item>
<item>
- <widget class="QToolButton" name="tool_qtconfig">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Application Appearance</string>
- </property>
- <property name="iconSize">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- <property name="toolButtonStyle">
- <enum>Qt::ToolButtonTextBesideIcon</enum>
- </property>
- </widget>
- </item>
- <item>
<widget class="QToolButton" name="tool_config_screensaver">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
bgstack15