diff options
Diffstat (limited to 'lumina-desktop')
| -rw-r--r-- | lumina-desktop/SettingsMenu.cpp | 2 | ||||
| -rw-r--r-- | lumina-desktop/lumina-desktop.pro | 8 | ||||
| -rw-r--r-- | lumina-desktop/panel-plugins/systemdashboard/SysMenuQuick.ui | 61 |
3 files changed, 56 insertions, 15 deletions
diff --git a/lumina-desktop/SettingsMenu.cpp b/lumina-desktop/SettingsMenu.cpp index 0e59d77b..d6b07ee4 100644 --- a/lumina-desktop/SettingsMenu.cpp +++ b/lumina-desktop/SettingsMenu.cpp @@ -18,7 +18,7 @@ SettingsMenu::~SettingsMenu(){ } void SettingsMenu::InitMenu(){ - this->setTitle( tr("Desktop Settings") ); + this->setTitle( tr("Settings") ); this->setIcon( LXDG::findIcon("configure","") ); connect(this, SIGNAL(triggered(QAction*)), this, SLOT(runApp(QAction*)) ); //Now setup the possible configuration options diff --git a/lumina-desktop/lumina-desktop.pro b/lumina-desktop/lumina-desktop.pro index 02581bdc..fdc12469 100644 --- a/lumina-desktop/lumina-desktop.pro +++ b/lumina-desktop/lumina-desktop.pro @@ -8,17 +8,13 @@ isEmpty(PREFIX) { } target.path = $$PREFIX/bin -LIBS += -L../libLumina -lLuminaUtils -lXdamage -lX11 -lxcb -lxcb-damage +LIBS += -L../libLumina -L$$PREFIX/lib -lLuminaUtils -lXdamage -lX11 -lxcb -lxcb-damage QMAKE_LIBDIR = ../libLumina DEPENDPATH += ../libLumina TEMPLATE = app -openbsd-g++4 { - LRELEASE = lrelease4 -} else { - LRELEASE = /usr/local/lib/qt5/bin/lrelease -} +LRELEASE = $$PREFIX/lib/qt5/bin/lrelease SOURCES += main.cpp \ WMProcess.cpp \ diff --git a/lumina-desktop/panel-plugins/systemdashboard/SysMenuQuick.ui b/lumina-desktop/panel-plugins/systemdashboard/SysMenuQuick.ui index 37cac2d4..8f58cae9 100644 --- a/lumina-desktop/panel-plugins/systemdashboard/SysMenuQuick.ui +++ b/lumina-desktop/panel-plugins/systemdashboard/SysMenuQuick.ui @@ -14,7 +14,7 @@ <string>Form</string> </property> <property name="styleSheet"> - <string notr="true">QGroupBox{ + <string notr="true">/*QGroupBox{ border-radius: 5px; border: 1px solid grey; margin-top: 1ex; @@ -25,14 +25,23 @@ subcontrol-position: top center; padding: 0 3px; background-color: rgba(255,255,255,255); border-radius: 5px; -font-weight: bold; -}</string> +font: bold; +}*/</string> </property> <layout class="QVBoxLayout" name="verticalLayout"> <property name="spacing"> <number>2</number> </property> - <property name="margin"> + <property name="leftMargin"> + <number>1</number> + </property> + <property name="topMargin"> + <number>1</number> + </property> + <property name="rightMargin"> + <number>1</number> + </property> + <property name="bottomMargin"> <number>1</number> </property> <item> @@ -47,7 +56,16 @@ font-weight: bold; <property name="spacing"> <number>2</number> </property> - <property name="margin"> + <property name="leftMargin"> + <number>2</number> + </property> + <property name="topMargin"> + <number>2</number> + </property> + <property name="rightMargin"> + <number>2</number> + </property> + <property name="bottomMargin"> <number>2</number> </property> <item> @@ -141,7 +159,16 @@ font-weight: bold; <property name="spacing"> <number>2</number> </property> - <property name="margin"> + <property name="leftMargin"> + <number>2</number> + </property> + <property name="topMargin"> + <number>2</number> + </property> + <property name="rightMargin"> + <number>2</number> + </property> + <property name="bottomMargin"> <number>2</number> </property> <item> @@ -204,7 +231,16 @@ font-weight: bold; <property name="spacing"> <number>2</number> </property> - <property name="margin"> + <property name="leftMargin"> + <number>2</number> + </property> + <property name="topMargin"> + <number>2</number> + </property> + <property name="rightMargin"> + <number>2</number> + </property> + <property name="bottomMargin"> <number>2</number> </property> <item> @@ -260,7 +296,16 @@ font-weight: bold; <property name="spacing"> <number>2</number> </property> - <property name="margin"> + <property name="leftMargin"> + <number>2</number> + </property> + <property name="topMargin"> + <number>2</number> + </property> + <property name="rightMargin"> + <number>2</number> + </property> + <property name="bottomMargin"> <number>2</number> </property> <item> |