aboutsummaryrefslogtreecommitdiff
path: root/lumina-config
diff options
context:
space:
mode:
Diffstat (limited to 'lumina-config')
-rw-r--r--lumina-config/PanelWidget.cpp6
-rw-r--r--lumina-config/PanelWidget.ui59
-rw-r--r--lumina-config/mainUI.cpp5
-rw-r--r--lumina-config/mainUI.ui70
4 files changed, 98 insertions, 42 deletions
diff --git a/lumina-config/PanelWidget.cpp b/lumina-config/PanelWidget.cpp
index e8398bae..26c7d8e8 100644
--- a/lumina-config/PanelWidget.cpp
+++ b/lumina-config/PanelWidget.cpp
@@ -117,9 +117,9 @@ void PanelWidget::LoadIcons(){
ui->tool_upplugin->setIcon( LXDG::findIcon("go-up","") );
ui->tool_downplugin->setIcon( LXDG::findIcon("go-down","") );
ui->tool_selectcolor->setIcon( LXDG::findIcon("preferences-desktop-color","") );
- ui->toolBox->setItemIcon(0,LXDG::findIcon("transform-move",""));
- ui->toolBox->setItemIcon(1,LXDG::findIcon("preferences-desktop-display",""));
- ui->toolBox->setItemIcon(2,LXDG::findIcon("preferences-plugin",""));
+ ui->tabWidget->setTabIcon(0,LXDG::findIcon("transform-move",""));
+ ui->tabWidget->setTabIcon(1,LXDG::findIcon("preferences-desktop-display",""));
+ ui->tabWidget->setTabIcon(2,LXDG::findIcon("preferences-plugin",""));
}
void PanelWidget::reloadColorSample(){
diff --git a/lumina-config/PanelWidget.ui b/lumina-config/PanelWidget.ui
index b078a15e..462ca7c9 100644
--- a/lumina-config/PanelWidget.ui
+++ b/lumina-config/PanelWidget.ui
@@ -75,23 +75,21 @@
</layout>
</item>
<item>
- <widget class="QToolBox" name="toolBox">
- <property name="frameShape">
- <enum>QFrame::StyledPanel</enum>
- </property>
+ <widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>0</number>
</property>
- <widget class="QWidget" name="page">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>246</width>
- <height>125</height>
- </rect>
- </property>
- <attribute name="label">
+ <property name="iconSize">
+ <size>
+ <width>22</width>
+ <height>22</height>
+ </size>
+ </property>
+ <widget class="QWidget" name="tabWidgetPage1" native="true">
+ <attribute name="title">
+ <string notr="true"/>
+ </attribute>
+ <attribute name="toolTip">
<string>Location</string>
</attribute>
<layout class="QFormLayout" name="formLayout">
@@ -148,6 +146,9 @@
<property name="singleStep">
<number>5</number>
</property>
+ <property name="value">
+ <number>40</number>
+ </property>
</widget>
</item>
<item row="3" column="1">
@@ -195,16 +196,11 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="page_3">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>246</width>
- <height>125</height>
- </rect>
- </property>
- <attribute name="label">
+ <widget class="QWidget" name="tabWidgetPage2" native="true">
+ <attribute name="title">
+ <string notr="true"/>
+ </attribute>
+ <attribute name="toolTip">
<string>Appearance</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_2">
@@ -283,16 +279,11 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="page_2">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>260</width>
- <height>112</height>
- </rect>
- </property>
- <attribute name="label">
+ <widget class="QWidget" name="tabWidgetPage3" native="true">
+ <attribute name="title">
+ <string notr="true"/>
+ </attribute>
+ <attribute name="toolTip">
<string>Plugins</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_3">
diff --git a/lumina-config/mainUI.cpp b/lumina-config/mainUI.cpp
index e1618480..d7858200 100644
--- a/lumina-config/mainUI.cpp
+++ b/lumina-config/mainUI.cpp
@@ -829,7 +829,10 @@ void MainUI::loadPanels(){
for(int i=0; i<PANELS.length(); i++){ delete PANELS.takeAt(i); i--; }
//Now create new panels
int dnum = currentDesktop();
- if(ui->scroll_panels->widget()->layout()==0){ ui->scroll_panels->widget()->setLayout( new QHBoxLayout() ); }
+ if(ui->scroll_panels->widget()->layout()==0){
+ ui->scroll_panels->widget()->setLayout( new QHBoxLayout() );
+ ui->scroll_panels->widget()->layout()->setContentsMargins(0,0,0,0);
+ }
ui->scroll_panels->widget()->layout()->setAlignment(Qt::AlignLeft);
//Clear anything left over in the layout
for(int i=0; i<ui->scroll_panels->widget()->layout()->count(); i++){
diff --git a/lumina-config/mainUI.ui b/lumina-config/mainUI.ui
index d3c6bb72..e18bee97 100644
--- a/lumina-config/mainUI.ui
+++ b/lumina-config/mainUI.ui
@@ -113,6 +113,15 @@
</property>
<widget class="QWidget" name="page_desktop">
<layout class="QVBoxLayout" name="verticalLayout_3">
+ <property name="leftMargin">
+ <number>3</number>
+ </property>
+ <property name="topMargin">
+ <number>2</number>
+ </property>
+ <property name="bottomMargin">
+ <number>2</number>
+ </property>
<item>
<widget class="QTabWidget" name="tabWidget_desktop">
<property name="currentIndex">
@@ -438,10 +447,22 @@
</widget>
<widget class="QWidget" name="page_panels">
<layout class="QVBoxLayout" name="verticalLayout_17">
+ <property name="leftMargin">
+ <number>3</number>
+ </property>
+ <property name="topMargin">
+ <number>2</number>
+ </property>
+ <property name="rightMargin">
+ <number>3</number>
+ </property>
+ <property name="bottomMargin">
+ <number>2</number>
+ </property>
<item>
<widget class="QTabWidget" name="tabWidget_panels">
<property name="currentIndex">
- <number>0</number>
+ <number>1</number>
</property>
<widget class="QWidget" name="tab_desktopInterface">
<attribute name="title">
@@ -590,6 +611,21 @@
<string>Panels</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_panels" rowstretch="0" columnstretch="0,0">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <property name="horizontalSpacing">
+ <number>2</number>
+ </property>
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout_5">
<item>
@@ -630,8 +666,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>98</width>
- <height>28</height>
+ <width>527</width>
+ <height>320</height>
</rect>
</property>
</widget>
@@ -645,6 +681,15 @@
</widget>
<widget class="QWidget" name="page_shortcuts">
<layout class="QVBoxLayout" name="verticalLayout_8">
+ <property name="leftMargin">
+ <number>3</number>
+ </property>
+ <property name="topMargin">
+ <number>2</number>
+ </property>
+ <property name="bottomMargin">
+ <number>2</number>
+ </property>
<item>
<widget class="QTreeWidget" name="tree_shortcut">
<property name="indentation">
@@ -766,6 +811,15 @@
</widget>
<widget class="QWidget" name="page_defaults">
<layout class="QVBoxLayout" name="verticalLayout_9">
+ <property name="leftMargin">
+ <number>3</number>
+ </property>
+ <property name="topMargin">
+ <number>2</number>
+ </property>
+ <property name="bottomMargin">
+ <number>2</number>
+ </property>
<item>
<widget class="QTabWidget" name="tabWidget_apps">
<property name="currentIndex">
@@ -1064,7 +1118,6 @@
</layout>
</item>
</layout>
- <zorder>tree_defaults</zorder>
</widget>
</item>
</layout>
@@ -1075,6 +1128,15 @@
</widget>
<widget class="QWidget" name="page_session">
<layout class="QVBoxLayout" name="verticalLayout_10">
+ <property name="leftMargin">
+ <number>3</number>
+ </property>
+ <property name="topMargin">
+ <number>2</number>
+ </property>
+ <property name="bottomMargin">
+ <number>2</number>
+ </property>
<item>
<widget class="QTabWidget" name="tabWidget_session">
<property name="toolTip">
bgstack15