diff --git a/src/blackgui/components/dbloadoverviewcomponent.ui b/src/blackgui/components/dbloadoverviewcomponent.ui index 25c42fe6a..fa21f601f 100644 --- a/src/blackgui/components/dbloadoverviewcomponent.ui +++ b/src/blackgui/components/dbloadoverviewcomponent.ui @@ -6,8 +6,8 @@ 0 0 - 644 - 278 + 920 + 337 @@ -27,8 +27,15 @@ 2 - 3 + 4 + + + + Countries: + + + @@ -36,281 +43,6 @@ - - - - Shared URL will go here - - - - - - - - 100 - 0 - - - - true - - - file ts - - - - - - - true - - - count - - - - - - - - 100 - 0 - - - - true - - - cache ts - - - - - - - true - - - count - - - - - - - - 100 - 0 - - - - true - - - cache ts - - - - - - - - 48 - 16777215 - - - - refresh from shared files - - - ... - - - - :/pastel/icons/pastel/16/arrow-refresh.png:/pastel/icons/pastel/16/arrow-refresh.png - - - - - - - true - - - count - - - - - - - true - - - count - - - - - - - Checking DB URL - - - - - - - Models: - - - - - - - true - - - count - - - - - - - Liveries: - - - - - - - - 100 - 0 - - - - true - - - file ts - - - - - - - true - - - count - - - - - - - true - - - count - - - - - - - - 100 - 0 - - - - true - - - DB ts - - - - - - - - 60 - 0 - - - - Cache count - - - C#: - - - - - - - DB URL: - - - - - - - - 48 - 16777215 - - - - refresh from shared files - - - ... - - - - :/pastel/icons/pastel/16/arrow-refresh.png:/pastel/icons/pastel/16/arrow-refresh.png - - - - - - - true - - - count - - - - - - - Shared - - - Shr.: - - - - - - - Airports: - - - - - - - Cache ts: - - - @@ -318,8 +50,8 @@ - - + + 48 @@ -338,21 +70,11 @@ - - - - true - - - count - - - - - + + - 100 + 125 0 @@ -364,94 +86,6 @@ - - - - true - - - count - - - - - - - true - - - count - - - - - - - - 60 - 0 - - - - DB count - - - DB#: - - - - - - - - 48 - 16777215 - - - - refresh from shared files - - - ... - - - - :/pastel/icons/pastel/16/arrow-refresh.png:/pastel/icons/pastel/16/arrow-refresh.png - - - - - - - - 100 - 0 - - - - true - - - DB ts - - - - - - - - 100 - 0 - - - - true - - - DB ts - - - @@ -472,18 +106,77 @@ - - - - Categories: + + + + + 125 + 0 + + + + true + + + cache ts - - + + - 100 + 125 + 0 + + + + true + + + DB ts + + + + + + + true + + + count + + + + + + + true + + + count + + + + + + + DB: + + + + + + + Shared URL will go here + + + + + + + + 125 0 @@ -495,8 +188,119 @@ - - + + + + true + + + count + + + + + + + + 125 + 0 + + + + true + + + DB ts + + + + + + + true + + + count + + + + + + + + 125 + 0 + + + + true + + + DB ts + + + + + + + DB URL: + + + + + + + + 125 + 0 + + + + true + + + DB ts + + + + + + + + 48 + 16777215 + + + + refresh from database + + + + + + + :/pastel/icons/pastel/16/arrow-refresh.png:/pastel/icons/pastel/16/arrow-refresh.png + + + + + + + + 125 + 0 + + + + true + + + cache ts + + + + + 48 @@ -515,6 +319,65 @@ + + + + Shared ts: + + + + + + + true + + + count + + + + + + + true + + + count + + + + + + + + 125 + 0 + + + + true + + + file ts + + + + + + + + 125 + 0 + + + + true + + + DB ts + + + @@ -535,90 +398,8 @@ - - - - Aircraft: - - - - - - - - 60 - 0 - - - - shared count - - - S#: - - - - - - - - 100 - 0 - - - - true - - - file ts - - - - - - - DB: - - - - - - - true - - - count - - - - - - - - 100 - 0 - - - - true - - - DB ts - - - - - - - true - - - count - - - - - + + 48 @@ -626,10 +407,10 @@ - refresh from shared files + refresh from database - ... + @@ -637,21 +418,11 @@ - - - - true - - - count - - - - - + + - 100 + 125 0 @@ -659,41 +430,7 @@ true - DB ts - - - - - - - Shared ts: - - - - - - - true - - - count - - - - - - - true - - - count - - - - - - - Countries: + cache ts @@ -761,6 +498,317 @@ + + + + + 48 + 16777215 + + + + refresh from shared files + + + ... + + + + :/pastel/icons/pastel/16/arrow-refresh.png:/pastel/icons/pastel/16/arrow-refresh.png + + + + + + + + 125 + 0 + + + + true + + + DB ts + + + + + + + Checking DB URL + + + + + + + true + + + count + + + + + + + + 48 + 16777215 + + + + refresh from shared files + + + ... + + + + :/pastel/icons/pastel/16/arrow-refresh.png:/pastel/icons/pastel/16/arrow-refresh.png + + + + + + + true + + + count + + + + + + + true + + + count + + + + + + + Airports: + + + + + + + true + + + count + + + + + + + Shared + + + Shr.: + + + + + + + + 60 + 0 + + + + shared count + + + S#: + + + + + + + true + + + count + + + + + + + true + + + count + + + + + + + Categories: + + + + + + + + 48 + 16777215 + + + + refresh from shared files + + + ... + + + + :/pastel/icons/pastel/16/arrow-refresh.png:/pastel/icons/pastel/16/arrow-refresh.png + + + + + + + + 60 + 0 + + + + DB count + + + DB#: + + + + + + + + 48 + 16777215 + + + + refresh from database + + + + :/pastel/icons/pastel/16/arrow-refresh.png:/pastel/icons/pastel/16/arrow-refresh.png + + + + + + + true + + + count + + + + + + + true + + + count + + + + + + + + 125 + 0 + + + + true + + + DB ts + + + + + + + Cache ts: + + + + + + + + 125 + 0 + + + + true + + + file ts + + + + + + + + 48 + 16777215 + + + + refresh from shared files + + + ... + + + + :/pastel/icons/pastel/16/arrow-refresh.png:/pastel/icons/pastel/16/arrow-refresh.png + + + + + + + + 125 + 0 + + + + true + + + file ts + + + @@ -781,103 +829,17 @@ - - + + - DB ts: + Models: - - - - - 100 - 0 - - - - true - - - file ts - - - - - + + - Shared: - - - - - - - true - - - count - - - - - - - true - - - count - - - - - - - - 48 - 16777215 - - - - refresh from shared files - - - ... - - - - :/pastel/icons/pastel/16/arrow-refresh.png:/pastel/icons/pastel/16/arrow-refresh.png - - - - - - - - 48 - 16777215 - - - - refresh from database - - - ... - - - - :/pastel/icons/pastel/16/arrow-refresh.png:/pastel/icons/pastel/16/arrow-refresh.png - - - - - - - true - - - count + Aircraft: @@ -901,21 +863,27 @@ - - + + + + + 125 + 0 + + true - count + file ts - - + + - 100 + 125 0 @@ -927,6 +895,66 @@ + + + + true + + + count + + + + + + + + 48 + 16777215 + + + + refresh from shared files + + + ... + + + + :/pastel/icons/pastel/16/arrow-refresh.png:/pastel/icons/pastel/16/arrow-refresh.png + + + + + + + true + + + count + + + + + + + + 48 + 16777215 + + + + refresh from database + + + ... + + + + :/pastel/icons/pastel/16/arrow-refresh.png:/pastel/icons/pastel/16/arrow-refresh.png + + + @@ -937,23 +965,45 @@ - - - + + + + true + + + count + + + + + + - 48 - 16777215 + 60 + 0 - refresh from database + Cache count - + C#: - - - :/pastel/icons/pastel/16/arrow-refresh.png:/pastel/icons/pastel/16/arrow-refresh.png + + + + + + + 125 + 0 + + + + true + + + cache ts @@ -967,8 +1017,8 @@ - - + + true @@ -977,31 +1027,79 @@ - - - - - 48 - 16777215 - + + + + true - - refresh from database - - - - - - - :/pastel/icons/pastel/16/arrow-refresh.png:/pastel/icons/pastel/16/arrow-refresh.png + + count - - + + - 100 + 125 + 0 + + + + true + + + DB ts + + + + + + + true + + + count + + + + + + + + 125 + 0 + + + + true + + + file ts + + + + + + + + 125 + 0 + + + + true + + + file ts + + + + + + + + 125 0 @@ -1013,11 +1111,27 @@ - - + + - 100 + 125 + 0 + + + + true + + + cache ts + + + + + + + + 125 0 @@ -1039,22 +1153,6 @@ - - - - - 100 - 0 - - - - true - - - DB ts - - - @@ -1075,132 +1173,34 @@ - - - - - 100 - 0 - + + + + Shared: + + + + true - cache ts + count - - - - - 100 - 0 - - - - true - - - file ts + + + + Liveries: - - - - - 48 - 16777215 - - - - refresh from database - - - - :/pastel/icons/pastel/16/arrow-refresh.png:/pastel/icons/pastel/16/arrow-refresh.png - - - - - - - - 100 - 0 - - - - true - - - DB ts - - - - - - - - 100 - 0 - - - - true - - - cache ts - - - - - - - - 100 - 0 - - - - true - - - cache ts - - - - - - - - 100 - 0 - - - - true - - - DB ts - - - - - - - - 100 - 0 - - - - true - - - file ts + + + + DB ts: diff --git a/src/blackgui/components/scalescreenfactor.cpp b/src/blackgui/components/scalescreenfactor.cpp index 95e064b85..672a74578 100644 --- a/src/blackgui/components/scalescreenfactor.cpp +++ b/src/blackgui/components/scalescreenfactor.cpp @@ -29,19 +29,19 @@ namespace BlackGui connect(ui->le_Factor, &QLineEdit::editingFinished, this, &CScaleScreenFactor::onEditFinished); const QDesktopWidget *w = qApp->desktop(); - this->setToolTip( - QStringLiteral( - "Scaling only works on High DPI screens\n" - "Width/height: %1/%2 Ratio: %3\n" - "Logical DPI x/y: %4/%5\n" - "Physical DPI x/y: %6/%7\n" - "width/height MM: %8/%9" - ). - arg(w->width()).arg(w->height()).arg(QString::number(CGuiUtility::mainApplicationWidgetPixelRatio(), 'f', 2)). - arg(w->logicalDpiX()).arg(w->logicalDpiY()). - arg(w->physicalDpiX()).arg(w->physicalDpiY()). - arg(w->widthMM()).arg(w->heightMM()) - ); + const QString tt = QStringLiteral( + "Scaling only works on High DPI screens\n" + "Width/height: %1/%2 Ratio: %3\n" + "Logical DPI x/y: %4/%5\n" + "Physical DPI x/y: %6/%7\n" + "width/height MM: %8/%9" + ). + arg(w->width()).arg(w->height()).arg(QString::number(CGuiUtility::mainApplicationWidgetPixelRatio(), 'f', 2)). + arg(w->logicalDpiX()).arg(w->logicalDpiY()). + arg(w->physicalDpiX()).arg(w->physicalDpiY()). + arg(w->widthMM()).arg(w->heightMM()); + + this->setToolTip(tt); } CScaleScreenFactor::~CScaleScreenFactor() @@ -53,9 +53,10 @@ namespace BlackGui ui->hs_Factor->setMaximum(max); ui->le_Factor->setValidator(new QIntValidator(min, max, ui->le_Factor)); - ui->le_Factor->setToolTip(QStringLiteral("%1-%2").arg(min).arg(max)); - ui->le_Factor->setPlaceholderText(QStringLiteral("%1-%2").arg(min).arg(max)); - ui->hs_Factor->setToolTip(QStringLiteral("%1-%2").arg(min, max)); + const QString tt = QStringLiteral("%1-%2").arg(min).arg(max); + ui->le_Factor->setToolTip(tt); + ui->le_Factor->setPlaceholderText(tt); + ui->hs_Factor->setToolTip(tt); const int v = (min + max) / 2; ui->hs_Factor->setValue(v); diff --git a/src/blackgui/components/settingsguicomponent.ui b/src/blackgui/components/settingsguicomponent.ui index 85e040517..1a0f02dae 100644 --- a/src/blackgui/components/settingsguicomponent.ui +++ b/src/blackgui/components/settingsguicomponent.ui @@ -6,8 +6,8 @@ 0 0 - 220 - 225 + 298 + 269 @@ -105,6 +105,12 @@ 0 + + + 0 + 30 + + 0-100% @@ -179,7 +185,7 @@ 40 - 20 + 30 diff --git a/src/blackgui/guiapplication.cpp b/src/blackgui/guiapplication.cpp index 6dbb5a970..2ce0d3751 100644 --- a/src/blackgui/guiapplication.cpp +++ b/src/blackgui/guiapplication.cpp @@ -328,9 +328,11 @@ namespace BlackGui void CGuiApplication::highDpiScreenSupport(double scaleFactor) { + // https://lists.qt-project.org/pipermail/development/2019-September/037434.html if (scaleFactor < 0) { - qputenv("QT_AUTO_SCREEN_SCALE_FACTOR", "1"); + // qputenv("QT_AUTO_SCREEN_SCALE_FACTOR", "1"); // until 5.14 + qputenv("QT_ENABLE_HIGHDPI_SCALING", "1"); } else { diff --git a/src/blackgui/share/qss/stdwidget.qss b/src/blackgui/share/qss/stdwidget.qss index eae7dfca5..8fcf6cf47 100644 --- a/src/blackgui/share/qss/stdwidget.qss +++ b/src/blackgui/share/qss/stdwidget.qss @@ -374,7 +374,7 @@ QGroupBox::title { subcontrol-origin: margin; subcontrol-position: middle left; /* position at the top center */ padding: 0px 2em 0px 2em; - min-width: 15em; + min-width: 10em; background-color: darkblue; border: 1px solid green; border-radius: 5px; diff --git a/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.ui b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.ui index ced7b9216..06c18f1ce 100644 --- a/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.ui +++ b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.ui @@ -7,13 +7,13 @@ 0 0 700 - 625 + 710 650 - 625 + 630 @@ -600,8 +600,8 @@ 0 0 - 646 - 344 + 634 + 353 @@ -658,18 +658,18 @@ - - BlackGui::Components::CSettingsSwiftPlugin - QFrame -
blackgui/components/settingsswiftplugin.h
- 1 - BlackGui::Components::CLogComponent QFrame
blackgui/components/logcomponent.h
1 + + BlackGui::Components::CSettingsSwiftPlugin + QFrame +
blackgui/components/settingsswiftplugin.h
+ 1 + BlackGui::Editors::CSituationForm QFrame diff --git a/src/swiftcore/swiftcore.ui b/src/swiftcore/swiftcore.ui index e26a60e27..ad4798f77 100644 --- a/src/swiftcore/swiftcore.ui +++ b/src/swiftcore/swiftcore.ui @@ -6,13 +6,13 @@ 0 0 - 450 + 625 550 - 450 + 550 550 @@ -231,8 +231,8 @@ QTextEdit { 0 0 - 450 - 19 + 625 + 25 @@ -270,7 +270,7 @@ QTextEdit { - + :/pastel/icons/pastel/16/wrench-orange.png:/pastel/icons/pastel/16/wrench-orange.png @@ -288,18 +288,18 @@ QTextEdit { - - BlackGui::Components::CCommandInput - QLineEdit -
blackgui/components/commandinput.h
- 1 - BlackGui::Components::CDBusServerAddressSelector QFrame
blackgui/components/dbusserveraddressselector.h
1 + + BlackGui::Components::CCommandInput + QLineEdit +
blackgui/components/commandinput.h
+ 1 + BlackGui::Components::CInfoBarStatusComponent QWidget @@ -326,6 +326,8 @@ QTextEdit { pb_Restart pb_DisconnectNetwork - + + + diff --git a/src/swiftguistandard/swiftguistd.ui b/src/swiftguistandard/swiftguistd.ui index 0d7306b62..1957ec14c 100644 --- a/src/swiftguistandard/swiftguistd.ui +++ b/src/swiftguistandard/swiftguistd.ui @@ -6,14 +6,14 @@ 0 0 - 375 - 600 + 450 + 750 - 350 - 550 + 375 + 600 @@ -202,8 +202,8 @@ 0 0 - 375 - 19 + 450 + 25 @@ -506,7 +506,7 @@ - + :/diagona/icons/diagona/icons/paper-plane--plus.png:/diagona/icons/diagona/icons/paper-plane--plus.png @@ -574,7 +574,9 @@ 1 - + + + setMainPage() diff --git a/src/swiftlauncher/swiftlauncher.ui b/src/swiftlauncher/swiftlauncher.ui index 548570f1a..4d052ceca 100644 --- a/src/swiftlauncher/swiftlauncher.ui +++ b/src/swiftlauncher/swiftlauncher.ui @@ -6,14 +6,14 @@ 0 0 - 400 - 675 + 475 + 750 - 400 - 675 + 425 + 700 @@ -88,7 +88,7 @@ - 4 + 2 6 @@ -98,8 +98,8 @@ 0 0 - 392 - 334 + 467 + 356 @@ -109,7 +109,7 @@ - 0 + 1 @@ -153,8 +153,8 @@ 0 0 - 392 - 334 + 467 + 356 @@ -214,18 +214,10 @@ - - - 0 - 0 - 392 - 334 - - &Core mode - + 4 @@ -241,28 +233,48 @@ 4 - - + + - + standalone - - :/launcher/icons/swiftGUIandCore115x85.png + + true + + bg_CoreMode + + + + + GUI and core (distributed) + + + bg_CoreMode + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + - - - 200 - 0 - - Audio distributed - + @@ -280,6 +292,22 @@ + + + + Standalone audio + + + + + + disable audio (AFV) + + + + + + @@ -290,50 +318,18 @@ - - - - Qt::Vertical - - - - 20 - 40 - - - - - - + + - GUI and core (distributed) + + + + :/launcher/icons/swiftGUIandCore115x85.png - - bg_CoreMode - - - - - standalone - - - true - - - bg_CoreMode - - - - + - - - 200 - 0 - - DBus (core to GUI) @@ -362,7 +358,7 @@ - QFrame::StyledPanel + QFrame::Panel QFrame::Raised @@ -372,22 +368,6 @@ - - - - Audio - - - - - - disable audio (AFV) - - - - - - @@ -395,8 +375,8 @@ 0 0 - 392 - 334 + 467 + 356 @@ -477,8 +457,8 @@ 0 0 - 376 - 151 + 451 + 160 @@ -528,8 +508,8 @@ 0 0 - 392 - 334 + 467 + 356 @@ -623,13 +603,21 @@ 0 - 150 + 165 0 + + + 0 + 0 + 467 + 134 + + Start application @@ -658,7 +646,7 @@ swift GUI - + :/own/icons/own/swift3D/sw3DBlue-256.png:/own/icons/own/swift3D/sw3DBlue-256.png @@ -678,7 +666,7 @@ swift core - + :/own/icons/own/swift3D/sw3DOrange-256.png:/own/icons/own/swift3D/sw3DOrange-256.png @@ -698,7 +686,7 @@ mapping tool - + :/own/icons/own/swift3D/sw3DGreen-256.png:/own/icons/own/swift3D/sw3DGreen-256.png @@ -715,7 +703,7 @@ ... - + :/misc/icons/misc/toolWizard128.png:/misc/icons/misc/toolWizard128.png @@ -735,7 +723,7 @@ goto swift database - + :/own/icons/own/swift3D/sw3DGreen-256.png:/own/icons/own/swift3D/sw3DGreen-256.png @@ -837,7 +825,7 @@ back to main - + :/diagona/icons/diagona/icons/arrow-180.png:/diagona/icons/diagona/icons/arrow-180.png @@ -923,6 +911,7 @@ rb_WindowFrameless +