diff --git a/src/blackgui/components/audiocomponent.ui b/src/blackgui/components/audiocomponent.ui
index 6c175dcd1..789fd0d3f 100644
--- a/src/blackgui/components/audiocomponent.ui
+++ b/src/blackgui/components/audiocomponent.ui
@@ -36,11 +36,17 @@
0
-
-
+
+
+
+ 0
+ 0
+
+
true
-
+
0
@@ -53,6 +59,9 @@
0
+
+ QLayout::SetMaximumSize
+
0
@@ -66,13 +75,85 @@
0
-
-
+
QFrame::StyledPanel
QFrame::Raised
+
+
+ 2
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ Sound:
+
+
+
+ -
+
+
+ Volume COM1:
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+ Volume COM2:
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+
+
+ -
+
+
+ QFrame::StyledPanel
+
+
+ QFrame::Raised
+
+
+
+
diff --git a/src/blackgui/components/audiosetup.ui b/src/blackgui/components/audiosetup.ui
index 62cc12991..3b57da89c 100644
--- a/src/blackgui/components/audiosetup.ui
+++ b/src/blackgui/components/audiosetup.ui
@@ -60,7 +60,17 @@
-
-
+
+
+
+ 0
+ 0
+
+
+
+ QComboBox::AdjustToMinimumContentsLength
+
+
-
@@ -70,7 +80,17 @@
-
-
+
+
+
+ 0
+ 0
+
+
+
+ QComboBox::AdjustToMinimumContentsLength
+
+
-
diff --git a/src/blackgui/components/cockpitcomcomponent.ui b/src/blackgui/components/cockpitcomcomponent.ui
index 80f1620f1..6da775a5b 100644
--- a/src/blackgui/components/cockpitcomcomponent.ui
+++ b/src/blackgui/components/cockpitcomcomponent.ui
@@ -540,7 +540,7 @@
- -
+
-
@@ -552,7 +552,7 @@
test SELCAL
- Test
+
diff --git a/src/blackgui/components/settingsfsxcomponent.ui b/src/blackgui/components/settingsfsxcomponent.ui
index 356c5c346..970265893 100644
--- a/src/blackgui/components/settingsfsxcomponent.ui
+++ b/src/blackgui/components/settingsfsxcomponent.ui
@@ -127,7 +127,7 @@
-
- "simconnect.cfg" exists?
+ "simconnect.cfg"?
@@ -174,6 +174,9 @@
-
+
+ "simconnect.cfg" exists?
+
<html><head/><body><p><span style=" font-size:10pt; font-weight:600;">FSX simconnect config files</span></p></body></html>
diff --git a/src/blackgui/components/settingssimulatorcomponent.ui b/src/blackgui/components/settingssimulatorcomponent.ui
index 8d6b3c951..b030e253e 100644
--- a/src/blackgui/components/settingssimulatorcomponent.ui
+++ b/src/blackgui/components/settingssimulatorcomponent.ui
@@ -63,13 +63,20 @@
-
-
+
+
+ QComboBox::AdjustToMinimumContentsLength
+
+
-
-
+
Time synchronization
+
+ Time synch.
+
-
diff --git a/src/blackgui/qss/mainwindow.qss b/src/blackgui/qss/mainwindow.qss
index 0cca2524d..c60157862 100644
--- a/src/blackgui/qss/mainwindow.qss
+++ b/src/blackgui/qss/mainwindow.qss
@@ -74,6 +74,7 @@ QAbstractScrollArea #pg_StatusPageConsole { background-color: black; }
border-radius:3px;
color: yellow;
padding: 3px;
+ margin-right: 5px;
}
#wi_MainKeypadArea QPushButton {
@@ -96,16 +97,21 @@ QAbstractScrollArea #pg_StatusPageConsole { background-color: black; }
border-radius:3px;
border-width: 0px;
border-color: blue;
- color: lightblue;
+ color: yellow;
padding: 1px;
margin: 2px;
}
/** fixes scroll area for audio setup and inner background **/
#sa_AudioSetup { background-color: black; }
-#saAudioSetupInner {
- background-image: url(:/textures/icons/textures/texture-inner.jpg);
- background-color: black;
+#sa_AudioComponentInner {
+ background-image: url(:/textures/icons/textures/texture-inner.jpg);
+ background-color: black;
+}
+
+/** volume buttons **/
+#wi_AudioSoundButtons QPushButton {
+ background-color: transparent;
}
/** COM panel **/
@@ -127,7 +133,7 @@ QAbstractScrollArea #pg_StatusPageConsole { background-color: black; }
QProgressBar {
border: 1px solid green;
border-radius: 5px;
- background-color: black;
+ background-color: black;
text-align: center;
padding: 0px;
height: 16px;
@@ -252,6 +258,13 @@ QDoubleSpinBox {
background: transparent;
}
+QSpinBox {
+ border: 1px solid green;
+ border-radius: 5px;
+ padding: 1px;
+ background: transparent;
+}
+
QMenuBar {
background-image: url(:/textures/icons/textures/texture-outer.jpg);
background-color: darkslategray;
@@ -343,7 +356,8 @@ QScrollBar::sub-line:vertical {
QHeaderView::section {
border: 1px solid black;
background-color: darkslategray;
- padding: 1px;
+ color: white; /** font **/
+ padding: 1px;
margin: 0px;
}
diff --git a/src/swiftgui_standard/mainwindow.cpp b/src/swiftgui_standard/mainwindow.cpp
index 84a2115ba..1cf023da4 100644
--- a/src/swiftgui_standard/mainwindow.cpp
+++ b/src/swiftgui_standard/mainwindow.cpp
@@ -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)
{
diff --git a/src/swiftgui_standard/mainwindow.h b/src/swiftgui_standard/mainwindow.h
index 8395fe79f..bbcacf365 100644
--- a/src/swiftgui_standard/mainwindow.h
+++ b/src/swiftgui_standard/mainwindow.h
@@ -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:
diff --git a/src/swiftgui_standard/mainwindow.ui b/src/swiftgui_standard/mainwindow.ui
index f751e894f..439ff841b 100644
--- a/src/swiftgui_standard/mainwindow.ui
+++ b/src/swiftgui_standard/mainwindow.ui
@@ -461,7 +461,7 @@
QFrame::NoFrame
- 1
+ 0
diff --git a/src/swiftgui_standard/mainwindow_menus.cpp b/src/swiftgui_standard/mainwindow_menus.cpp
index d87988560..a93678d50 100644
--- a/src/swiftgui_standard/mainwindow_menus.cpp
+++ b/src/swiftgui_standard/mainwindow_menus.cpp
@@ -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)