diff options
| -rw-r--r-- | lumina-config/mainUI.cpp | 10 | ||||
| -rw-r--r-- | lumina-config/mainUI.ui | 592 |
2 files changed, 326 insertions, 276 deletions
diff --git a/lumina-config/mainUI.cpp b/lumina-config/mainUI.cpp index 8b5877f7..204a9feb 100644 --- a/lumina-config/mainUI.cpp +++ b/lumina-config/mainUI.cpp @@ -34,9 +34,13 @@ MainUI::MainUI() : QMainWindow(), ui(new Ui::MainUI()){ setupMenus(); setupConnections(); - //Start on the Desktop page + //Start on the Desktop page (and first tab for all tab widgets) ui->stackedWidget->setCurrentWidget(ui->page_desktop); ui->tabWidget_desktop->setCurrentWidget(ui->tab_wallpaper); + ui->tabWidget_session->setCurrentIndex(0); + ui->tabWidget_apps->setCurrentIndex(0); + ui->tabWidget_panels->setCurrentIndex(0); + slotChangePage(false); QTimer::singleShot(10, this, SLOT(loadCurrentSettings()) ); @@ -66,7 +70,7 @@ void MainUI::setupIcons(){ ui->actionPanels->setIcon( LXDG::findIcon("preferences-desktop-icons","") ); //ui->actionMenu->setIcon( LXDG::findIcon("preferences-desktop-icons","") ); ui->actionShortcuts->setIcon( LXDG::findIcon("configure-shortcuts","") ); - ui->actionDefaults->setIcon( LXDG::findIcon("preferences-desktop-filetype-association","") ); + ui->actionDefaults->setIcon( LXDG::findIcon("preferences-system-windows","") ); ui->actionSession->setIcon( LXDG::findIcon("preferences-system-session-services","") ); ui->push_save->setIcon( LXDG::findIcon("document-save","") ); @@ -116,6 +120,8 @@ void MainUI::setupIcons(){ ui->tool_defaults_clear->setIcon( LXDG::findIcon("edit-clear","") ); ui->tool_defaults_set->setIcon( LXDG::findIcon("system-run","") ); ui->tool_defaults_setbin->setIcon( LXDG::findIcon("application-x-executable","") ); + ui->tabWidget_apps->setTabIcon( ui->tabWidget_apps->indexOf(ui->tab_auto), LXDG::findIcon("system-run", "") ); + ui->tabWidget_apps->setTabIcon( ui->tabWidget_apps->indexOf(ui->tab_defaults), LXDG::findIcon("preferences-desktop-filetype-association", "") ); //Session Page ui->tool_session_rmapp->setIcon( LXDG::findIcon("list-remove","") ); diff --git a/lumina-config/mainUI.ui b/lumina-config/mainUI.ui index 99888a26..200a75ef 100644 --- a/lumina-config/mainUI.ui +++ b/lumina-config/mainUI.ui @@ -109,7 +109,7 @@ <enum>QFrame::StyledPanel</enum> </property> <property name="currentIndex"> - <number>1</number> + <number>3</number> </property> <widget class="QWidget" name="page_desktop"> <layout class="QVBoxLayout" name="verticalLayout_3"> @@ -520,6 +520,12 @@ <property name="wordWrap"> <bool>true</bool> </property> + <property name="margin"> + <number>0</number> + </property> + <property name="indent"> + <number>10</number> + </property> </widget> </item> </layout> @@ -596,8 +602,8 @@ <rect> <x>0</x> <y>0</y> - <width>255</width> - <height>160</height> + <width>233</width> + <height>150</height> </rect> </property> <attribute name="label"> @@ -695,8 +701,8 @@ <rect> <x>0</x> <y>0</y> - <width>274</width> - <height>160</height> + <width>197</width> + <height>117</height> </rect> </property> <attribute name="label"> @@ -793,8 +799,8 @@ <rect> <x>0</x> <y>0</y> - <width>254</width> - <height>160</height> + <width>233</width> + <height>150</height> </rect> </property> <attribute name="label"> @@ -892,8 +898,8 @@ <rect> <x>0</x> <y>0</y> - <width>274</width> - <height>160</height> + <width>197</width> + <height>117</height> </rect> </property> <attribute name="label"> @@ -1122,6 +1128,9 @@ <property name="alignment"> <set>Qt::AlignCenter</set> </property> + <property name="wordWrap"> + <bool>true</bool> + </property> </widget> </item> </layout> @@ -1129,222 +1138,316 @@ <widget class="QWidget" name="page_defaults"> <layout class="QVBoxLayout" name="verticalLayout_9"> <item> - <layout class="QGridLayout" name="gridLayout_2"> - <item row="0" column="0"> - <layout class="QFormLayout" name="formLayout_6"> - <property name="fieldGrowthPolicy"> - <enum>QFormLayout::ExpandingFieldsGrow</enum> - </property> - <item row="0" column="0"> - <widget class="QLabel" name="label_19"> - <property name="font"> - <font> - <weight>75</weight> - <bold>true</bold> - </font> - </property> - <property name="text"> - <string>Web Browser:</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QToolButton" name="tool_default_webbrowser"> - <property name="text"> - <string notr="true">...</string> - </property> - <property name="toolButtonStyle"> - <enum>Qt::ToolButtonTextBesideIcon</enum> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_20"> - <property name="font"> - <font> - <weight>75</weight> - <bold>true</bold> - </font> - </property> - <property name="text"> - <string>E-Mail Client:</string> - </property> - </widget> + <widget class="QTabWidget" name="tabWidget_apps"> + <property name="currentIndex"> + <number>0</number> + </property> + <widget class="QWidget" name="tab_auto"> + <attribute name="title"> + <string>Auto-Started</string> + </attribute> + <layout class="QVBoxLayout" name="verticalLayout_19"> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_17"> + <item> + <widget class="QToolButton" name="tool_session_rmapp"> + <property name="text"> + <string notr="true">rem</string> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer_14"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QToolButton" name="tool_session_addapp"> + <property name="text"> + <string>Application</string> + </property> + <property name="toolButtonStyle"> + <enum>Qt::ToolButtonTextBesideIcon</enum> + </property> + </widget> + </item> + <item> + <widget class="QToolButton" name="tool_session_addbin"> + <property name="text"> + <string>Binary</string> + </property> + <property name="toolButtonStyle"> + <enum>Qt::ToolButtonTextBesideIcon</enum> + </property> + </widget> + </item> + <item> + <widget class="QToolButton" name="tool_session_addfile"> + <property name="text"> + <string>File</string> + </property> + <property name="toolButtonStyle"> + <enum>Qt::ToolButtonTextBesideIcon</enum> + </property> + </widget> + </item> + </layout> </item> - <item row="1" column="1"> - <widget class="QToolButton" name="tool_default_email"> - <property name="text"> - <string notr="true">...</string> - </property> - <property name="toolButtonStyle"> - <enum>Qt::ToolButtonTextBesideIcon</enum> + <item> + <widget class="QListWidget" name="list_session_start"> + <property name="sortingEnabled"> + <bool>true</bool> </property> </widget> </item> </layout> - </item> - <item row="0" column="1"> - <layout class="QFormLayout" name="formLayout_7"> - <item row="0" column="0"> - <widget class="QLabel" name="label_21"> - <property name="font"> - <font> - <weight>75</weight> - <bold>true</bold> - </font> - </property> - <property name="text"> - <string>File Manager:</string> - </property> - </widget> + </widget> + <widget class="QWidget" name="tab_defaults"> + <attribute name="title"> + <string>File Defaults</string> + </attribute> + <layout class="QVBoxLayout" name="verticalLayout_6"> + <property name="leftMargin"> + <number>3</number> + </property> + <property name="topMargin"> + <number>3</number> + </property> + <property name="rightMargin"> + <number>3</number> + </property> + <property name="bottomMargin"> + <number>3</number> + </property> + <item> + <layout class="QGridLayout" name="gridLayout_2"> + <item row="0" column="0"> + <layout class="QFormLayout" name="formLayout_6"> + <property name="fieldGrowthPolicy"> + <enum>QFormLayout::ExpandingFieldsGrow</enum> + </property> + <item row="0" column="0"> + <widget class="QLabel" name="label_19"> + <property name="font"> + <font> + <weight>75</weight> + <bold>true</bold> + </font> + </property> + <property name="text"> + <string>Web Browser:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QToolButton" name="tool_default_webbrowser"> + <property name="text"> + <string notr="true">...</string> + </property> + <property name="toolButtonStyle"> + <enum>Qt::ToolButtonTextBesideIcon</enum> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_20"> + <property name="font"> + <font> + <weight>75</weight> + <bold>true</bold> + </font> + </property> + <property name="text"> + <string>E-Mail Client:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QToolButton" name="tool_default_email"> + <property name="text"> + <string notr="true">...</string> + </property> + <property name="toolButtonStyle"> + <enum>Qt::ToolButtonTextBesideIcon</enum> + </property> + </widget> + </item> + </layout> + </item> + <item row="0" column="1"> + <layout class="QFormLayout" name="formLayout_7"> + <item row="0" column="0"> + <widget class="QLabel" name="label_21"> + <property name="font"> + <font> + <weight>75</weight> + <bold>true</bold> + </font> + </property> + <property name="text"> + <string>File Manager:</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_22"> + <property name="font"> + <font> + <weight>75</weight> + <bold>true</bold> + </font> + </property> + <property name="text"> + <string>Virtual Terminal:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QToolButton" name="tool_default_filemanager"> + <property name="text"> + <string>...</string> + </property> + <property name="toolButtonStyle"> + <enum>Qt::ToolButtonTextBesideIcon</enum> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QToolButton" name="tool_default_terminal"> + <property name="text"> + <string>...</string> + </property> + <property name="toolButtonStyle"> + <enum>Qt::ToolButtonTextBesideIcon</enum> + </property> + </widget> + </item> + </layout> + </item> + </layout> </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_22"> + <item> + <widget class="QGroupBox" name="group_default_filetypes"> <property name="font"> <font> - <weight>75</weight> - <bold>true</bold> + <italic>false</italic> </font> </property> - <property name="text"> - <string>Virtual Terminal:</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QToolButton" name="tool_default_filemanager"> - <property name="text"> - <string>...</string> - </property> - <property name="toolButtonStyle"> - <enum>Qt::ToolButtonTextBesideIcon</enum> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QToolButton" name="tool_default_terminal"> - <property name="text"> - <string>...</string> - </property> - <property name="toolButtonStyle"> - <enum>Qt::ToolButtonTextBesideIcon</enum> + <property name="title"> + <string>Specific File Types</string> </property> + <layout class="QVBoxLayout" name="verticalLayout_15"> + <property name="leftMargin"> + <number>2</number> + </property> + <property name="rightMargin"> + <number>2</number> + </property> + <item> + <widget class="QTreeWidget" name="tree_defaults"> + <property name="iconSize"> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + <property name="indentation"> + <number>20</number> + </property> + <property name="sortingEnabled"> + <bool>true</bool> + </property> + <property name="animated"> + <bool>true</bool> + </property> + <property name="allColumnsShowFocus"> + <bool>true</bool> + </property> + <attribute name="headerDefaultSectionSize"> + <number>200</number> + </attribute> + <attribute name="headerMinimumSectionSize"> + <number>150</number> + </attribute> + <column> + <property name="text"> + <string>Type/Group</string> + </property> + </column> + <column> + <property name="text"> + <string>Default Application</string> + </property> + </column> + <column> + <property name="text"> + <string>Description</string> + </property> + </column> + </widget> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_16"> + <item> + <widget class="QToolButton" name="tool_defaults_clear"> + <property name="text"> + <string>Clear</string> + </property> + <property name="toolButtonStyle"> + <enum>Qt::ToolButtonTextBesideIcon</enum> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer_13"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QToolButton" name="tool_defaults_set"> + <property name="text"> + <string>Set App</string> + </property> + <property name="toolButtonStyle"> + <enum>Qt::ToolButtonTextBesideIcon</enum> + </property> + </widget> + </item> + <item> + <widget class="QToolButton" name="tool_defaults_setbin"> + <property name="text"> + <string>Set Binary</string> + </property> + <property name="toolButtonStyle"> + <enum>Qt::ToolButtonTextBesideIcon</enum> + </property> + </widget> + </item> + </layout> + </item> + </layout> + <zorder>tree_defaults</zorder> + <zorder></zorder> </widget> </item> </layout> - </item> - </layout> - </item> - <item> - <widget class="QGroupBox" name="group_default_filetypes"> - <property name="font"> - <font> - <italic>false</italic> - </font> - </property> - <property name="title"> - <string>Specific File Types</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout_15"> - <property name="leftMargin"> - <number>2</number> - </property> - <property name="rightMargin"> - <number>2</number> - </property> - <item> - <widget class="QTreeWidget" name="tree_defaults"> - <property name="iconSize"> - <size> - <width>20</width> - <height>20</height> - </size> - </property> - <property name="indentation"> - <number>20</number> - </property> - <property name="sortingEnabled"> - <bool>true</bool> - </property> - <property name="animated"> - <bool>true</bool> - </property> - <property name="allColumnsShowFocus"> - <bool>true</bool> - </property> - <attribute name="headerDefaultSectionSize"> - <number>200</number> - </attribute> - <attribute name="headerMinimumSectionSize"> - <number>150</number> - </attribute> - <column> - <property name="text"> - <string>Group/Extension</string> - </property> - </column> - <column> - <property name="text"> - <string>Default Application</string> - </property> - </column> - <column> - <property name="text"> - <string>Description</string> - </property> - </column> - </widget> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_16"> - <item> - <widget class="QToolButton" name="tool_defaults_clear"> - <property name="text"> - <string>Clear</string> - </property> - <property name="toolButtonStyle"> - <enum>Qt::ToolButtonTextBesideIcon</enum> - </property> - </widget> - </item> - <item> - <spacer name="horizontalSpacer_13"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="QToolButton" name="tool_defaults_set"> - <property name="text"> - <string>Set App</string> - </property> - <property name="toolButtonStyle"> - <enum>Qt::ToolButtonTextBesideIcon</enum> - </property> - </widget> - </item> - <item> - <widget class="QToolButton" name="tool_defaults_setbin"> - <property name="text"> - <string>Set Binary</string> - </property> - <property name="toolButtonStyle"> - <enum>Qt::ToolButtonTextBesideIcon</enum> - </property> - </widget> - </item> - </layout> - </item> - </layout> - <zorder>tree_defaults</zorder> - <zorder></zorder> + </widget> </widget> </item> </layout> @@ -1352,7 +1455,7 @@ <widget class="QWidget" name="page_session"> <layout class="QVBoxLayout" name="verticalLayout_10"> <item> - <widget class="QTabWidget" name="tabWidget"> + <widget class="QTabWidget" name="tabWidget_session"> <property name="toolTip"> <string/> </property> @@ -1485,65 +1588,6 @@ </item> </layout> </widget> - <widget class="QWidget" name="tab_2"> - <attribute name="title"> - <string>Startup Routine</string> - </attribute> - <layout class="QVBoxLayout" name="verticalLayout_11"> - <item> - <widget class="QListWidget" name="list_session_start"> - <property name="sortingEnabled"> - <bool>true</bool> - </property> - </widget> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_17"> - <item> - <widget class="QToolButton" name="tool_session_rmapp"> - <property name="text"> - <string notr="true">rem</string> - </property> - </widget> - </item> - <item> - <spacer name="horizontalSpacer_14"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="QToolButton" name="tool_session_addapp"> - <property name="text"> - <string notr="true">add</string> - </property> - </widget> - </item> - <item> - <widget class="QToolButton" name="tool_session_addbin"> - <property name="text"> - <string>bin</string> - </property> - </widget> - </item> - <item> - <widget class="QToolButton" name="tool_session_addfile"> - <property name="text"> - <string>file</string> - </property> - </widget> - </item> - </layout> - </item> - </layout> - </widget> <widget class="QWidget" name="tab_fluxbox"> <attribute name="title"> <string>Window System</string> @@ -1770,8 +1814,8 @@ </attribute> <addaction name="actionDesktop"/> <addaction name="actionPanels"/> - <addaction name="actionShortcuts"/> <addaction name="actionDefaults"/> + <addaction name="actionShortcuts"/> <addaction name="actionSession"/> </widget> <action name="actionDesktop"> @@ -1812,10 +1856,10 @@ <bool>true</bool> </property> <property name="text"> - <string>Defaults</string> + <string>Applications</string> </property> <property name="toolTip"> - <string>Default Applications</string> + <string>Application Management</string> </property> </action> <action name="actionShortcuts"> |