From efd82f4391caf3a51394520e6d19d4215afe8d66 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Thu, 22 Jun 2017 01:24:57 +0200 Subject: [PATCH] Minor UI improvements --- src/blackgui/components/logincomponent.ui | 370 +++++++++--------- .../components/mainkeypadareacomponent.ui | 2 +- .../components/voiceroomscomponent.ui | 12 + src/swiftguistandard/swiftguistd.cpp | 2 +- 4 files changed, 204 insertions(+), 182 deletions(-) diff --git a/src/blackgui/components/logincomponent.ui b/src/blackgui/components/logincomponent.ui index 9ee2ee0b7..ddb0bfaa1 100644 --- a/src/blackgui/components/logincomponent.ui +++ b/src/blackgui/components/logincomponent.ui @@ -56,6 +56,22 @@ 6 + + + + + 0 + 30 + + + + + + + false + + + @@ -90,6 +106,9 @@ 4 + + + @@ -97,34 +116,6 @@ - - - - - - - - - - - Id: - - - - - - - - - - - - - - - - - @@ -132,28 +123,33 @@ - - - - 4 - - - e.g. "KLAX" + + + + - - - - - - - e.g. Joe Doe + + + + Id: - - + + + + + + + + + + + + + @@ -165,6 +161,26 @@ + + + + + + + 4 + + + e.g. "KLAX" + + + + + + + e.g. Joe Doe + + + @@ -172,6 +188,13 @@ + + + + Password + + + @@ -179,10 +202,13 @@ - - - - Password + + + + + 0 + 10 + @@ -271,22 +297,6 @@ - - - - - 0 - 30 - - - - - - - false - - - @@ -314,122 +324,6 @@ 3 - - - - ICAO code e.g. DLH, LHA, ... - - - Airline - - - - - - - e.g. DEMBZ - - - Qt::ImhUppercaseOnly - - - 10 - - - e.g. DEMBZ - - - - - - - Callsign - - - - - - - ICAO code e.g. B737, A320, F18 - - - Aircraft - - - - - - - - - - - - - - - - - - - - - Launch - - - Model - - - - - - - Aircraft type e.g. L2J, L1P, .... - - - Type - - - - - - - e.g. L2J - - - - - - - - - 3 - - - e.g. "L2J" - - - - - - - - - - - - - - - 0 - 0 - - - - - - - @@ -506,6 +400,122 @@ + + + + Callsign + + + + + + + ICAO code e.g. B737, A320, F18 + + + Aircraft + + + + + + + + + + + + + + Launch + + + Model + + + + + + + + + + + + + + ICAO code e.g. DLH, LHA, ... + + + Airline + + + + + + + e.g. DEMBZ + + + Qt::ImhUppercaseOnly + + + 10 + + + e.g. DEMBZ + + + + + + + + + + + + + + e.g. L2J + + + + + + + + + 3 + + + e.g. "L2J" + + + + + + + + 0 + 0 + + + + + + + + + + + Aircraft type e.g. L2J, L1P, .... + + + Type + + + diff --git a/src/blackgui/components/mainkeypadareacomponent.ui b/src/blackgui/components/mainkeypadareacomponent.ui index 5f08848e0..36cf86ab9 100644 --- a/src/blackgui/components/mainkeypadareacomponent.ui +++ b/src/blackgui/components/mainkeypadareacomponent.ui @@ -148,7 +148,7 @@ - Rendering + Models true diff --git a/src/blackgui/components/voiceroomscomponent.ui b/src/blackgui/components/voiceroomscomponent.ui index 761aed866..4f7c870a6 100644 --- a/src/blackgui/components/voiceroomscomponent.ui +++ b/src/blackgui/components/voiceroomscomponent.ui @@ -79,6 +79,9 @@ true + + voice room + @@ -89,6 +92,9 @@ 0 + + override voice room + Ovr. @@ -139,10 +145,16 @@ true + + voice room + + + override voice room + Ovr. diff --git a/src/swiftguistandard/swiftguistd.cpp b/src/swiftguistandard/swiftguistd.cpp index 148d903a8..b751d70ac 100644 --- a/src/swiftguistandard/swiftguistd.cpp +++ b/src/swiftguistandard/swiftguistd.cpp @@ -395,7 +395,7 @@ void SwiftGuiStd::ps_verifyDataAvailability() const CSimulatorInfo sims = sGui->getIContextSimulator()->simulatorsWithInitializedModelSet(); if (sims.isNoSimulator()) { - CLogMessage(this).error("No model set so far, you need at least one model set"); + CLogMessage(this).error("No model set so far, you need at least one model set. Hint: You can create a model set in the mapping tool, or copy an existing set in the launcher."); } }