refs #335, GUI finetuning

* combo boxes, size model changed - fixes the issue with the settings exceeding the boundaries
* main window can be minimized
* renaming the main page
* style sheet
This commit is contained in:
Klaus Basan
2014-10-18 15:46:47 +02:00
committed by Roland Winklmeier
parent 216b9f170d
commit 6f8d85e864
10 changed files with 149 additions and 22 deletions

View File

@@ -37,7 +37,9 @@ using namespace BlackMisc::Hardware;
* Constructor
*/
MainWindow::MainWindow(GuiModes::WindowMode windowMode, QWidget *parent) :
QMainWindow(parent, windowMode == GuiModes::WindowFrameless ? (Qt::Window | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint) : (Qt::Tool | Qt::WindowStaysOnTopHint)),
QMainWindow(parent, windowMode == GuiModes::WindowFrameless ?
(Qt::Window | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint) :
(Qt::Tool | Qt::WindowStaysOnTopHint | Qt::WindowMinimizeButtonHint | Qt::WindowCloseButtonHint)),
ui(new Ui::MainWindow),
m_windowMode(windowMode)
{
@@ -154,7 +156,7 @@ void MainWindow::ps_setMainPage(bool start)
}
else
{
this->ui->sw_MainMiddle->setCurrentIndex(MainPageFoo);
this->ui->sw_MainMiddle->setCurrentIndex(MainPageInfoArea);
if (sender == this->ui->pb_MainAircrafts)
{

View File

@@ -78,8 +78,8 @@ protected:
//! \remarks keep the values in sync with the real tab indexes
enum MainPageIndex
{
MainPageCockpit = 0,
MainPageFoo = 1
MainPageCockpit = 0,
MainPageInfoArea = 1
};
private:

View File

@@ -461,7 +461,7 @@
<enum>QFrame::NoFrame</enum>
</property>
<property name="currentIndex">
<number>1</number>
<number>0</number>
</property>
<widget class="QWidget" name="pg_Cockpit">
<layout class="QVBoxLayout" name="vl_CockpitPage">

View File

@@ -49,7 +49,7 @@ void MainWindow::ps_onMenuClicked()
}
else if (sender == this->ui->menu_FileFont)
{
this->ps_setMainPage(MainPageFoo);
this->ps_setMainPage(MainPageInfoArea);
this->ui->comp_MainInfoArea->selectSettingsTab(BlackGui::Components::CSettingsComponent::SettingTabGui);
}
else if (sender == this->ui->menu_FileClose)