diff options
| author | Ken Moore <moorekou@gmail.com> | 2016-04-26 15:15:33 -0400 |
|---|---|---|
| committer | Ken Moore <moorekou@gmail.com> | 2016-04-26 15:15:33 -0400 |
| commit | 8ba7ba687187bddbae2a4d25c8924bbb5fd8302a (patch) | |
| tree | 1d1b4009d177db11f32e16338a49266fd4c0e3a4 | |
| parent | Fix up the detection/closing of the lumina desktop session. Now the user can ... (diff) | |
| parent | Merge branch 'master' of https://github.com/pcbsd/lumina (diff) | |
| download | lumina-8ba7ba687187bddbae2a4d25c8924bbb5fd8302a.tar.gz lumina-8ba7ba687187bddbae2a4d25c8924bbb5fd8302a.tar.bz2 lumina-8ba7ba687187bddbae2a4d25c8924bbb5fd8302a.zip | |
Merge branch 'master' of github.com:pcbsd/lumina
| -rw-r--r-- | src-qt5/core-utils/lumina-config/mainUI.cpp | 8 | ||||
| -rw-r--r-- | src-qt5/core-utils/lumina-config/mainUI.ui | 35 |
2 files changed, 35 insertions, 8 deletions
diff --git a/src-qt5/core-utils/lumina-config/mainUI.cpp b/src-qt5/core-utils/lumina-config/mainUI.cpp index 9667b689..4bf067c5 100644 --- a/src-qt5/core-utils/lumina-config/mainUI.cpp +++ b/src-qt5/core-utils/lumina-config/mainUI.cpp @@ -35,7 +35,13 @@ MainUI::MainUI() : QMainWindow(), ui(new Ui::MainUI()){ ui->spin_screen->setValue(desktop->screenNumber(this->mapToGlobal(this->geometry().center()))+1); //have the current screen auto-selected //qDebug() << "Number of Screens:" << desktop->screenCount(); sysApps = LXDG::sortDesktopNames( LXDG::systemDesktopFiles() ); - + //Add a couple spacers to center the toolbar items + QWidget *tmp = new QWidget(this); + tmp->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); + ui->toolBar->insertWidget(ui->actionDesktop, tmp); + tmp = new QWidget(this); + tmp->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); + ui->toolBar->addWidget(tmp); //Now finish setting up the UI setupIcons(); setupMenus(); diff --git a/src-qt5/core-utils/lumina-config/mainUI.ui b/src-qt5/core-utils/lumina-config/mainUI.ui index 132643d7..9edff2e7 100644 --- a/src-qt5/core-utils/lumina-config/mainUI.ui +++ b/src-qt5/core-utils/lumina-config/mainUI.ui @@ -109,7 +109,7 @@ <enum>QFrame::StyledPanel</enum> </property> <property name="currentIndex"> - <number>3</number> + <number>4</number> </property> <widget class="QWidget" name="page_desktop"> <layout class="QVBoxLayout" name="verticalLayout_3"> @@ -823,7 +823,7 @@ <item> <widget class="QTabWidget" name="tabWidget_apps"> <property name="currentIndex"> - <number>2</number> + <number>0</number> </property> <widget class="QWidget" name="tab_auto"> <attribute name="title"> @@ -1163,7 +1163,7 @@ <string/> </property> <property name="currentIndex"> - <number>0</number> + <number>2</number> </property> <widget class="QWidget" name="tab"> <attribute name="title"> @@ -1568,8 +1568,8 @@ <rect> <x>0</x> <y>0</y> - <width>138</width> - <height>28</height> + <width>573</width> + <height>97</height> </rect> </property> <property name="sizePolicy"> @@ -1683,6 +1683,12 @@ </layout> </widget> <widget class="QToolBar" name="toolBar"> + <property name="minimumSize"> + <size> + <width>120</width> + <height>0</height> + </size> + </property> <property name="contextMenuPolicy"> <enum>Qt::CustomContextMenu</enum> </property> @@ -1717,6 +1723,9 @@ <property name="text"> <string>Appearance</string> </property> + <property name="iconText"> + <string> Appearance </string> + </property> <property name="toolTip"> <string>Desktop Appearance</string> </property> @@ -1726,7 +1735,10 @@ <bool>true</bool> </property> <property name="text"> - <string>Interface</string> + <string> Interface </string> + </property> + <property name="iconText"> + <string> Interface </string> </property> <property name="toolTip"> <string>Interface Configuration</string> @@ -1737,7 +1749,10 @@ <bool>true</bool> </property> <property name="text"> - <string>Session</string> + <string> Session </string> + </property> + <property name="iconText"> + <string> Session </string> </property> <property name="toolTip"> <string>Session Options</string> @@ -1750,6 +1765,9 @@ <property name="text"> <string>Applications</string> </property> + <property name="iconText"> + <string> Applications </string> + </property> <property name="toolTip"> <string>Application Management</string> </property> @@ -1761,6 +1779,9 @@ <property name="text"> <string>Shortcuts</string> </property> + <property name="iconText"> + <string> Shortcuts </string> + </property> <property name="toolTip"> <string>Keyboard Shortcuts</string> </property> |