From 774458afc98ff88c0b6252d36595be737a6a64c7 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Wed, 5 Dec 2018 02:55:36 +0100
Subject: [PATCH] Viewbase style, UI style

---
 src/blackgui/editors/coordinateform.ui     |  4 ++--
 src/blackgui/views/atcstationview.h        |  3 +--
 src/blackgui/views/viewbase.h              | 14 +++++++-------
 src/blackgui/views/viewbasenontemplate.cpp | 20 +++++---------------
 4 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/src/blackgui/editors/coordinateform.ui b/src/blackgui/editors/coordinateform.ui
index 78bda8352..d8bad1478 100644
--- a/src/blackgui/editors/coordinateform.ui
+++ b/src/blackgui/editors/coordinateform.ui
@@ -279,7 +279,7 @@
       <item>
        <widget class="QPushButton" name="pb_OwnAircraft">
         <property name="text">
-         <string> own aircraft </string>
+         <string>own aircraft</string>
         </property>
        </widget>
       </item>
@@ -325,7 +325,7 @@
  <resources/>
  <connections/>
  <buttongroups>
-  <buttongroup name="bg_EW"/>
   <buttongroup name="bg_NS"/>
+  <buttongroup name="bg_EW"/>
  </buttongroups>
 </ui>
diff --git a/src/blackgui/views/atcstationview.h b/src/blackgui/views/atcstationview.h
index f69ec79da..638e3aba1 100644
--- a/src/blackgui/views/atcstationview.h
+++ b/src/blackgui/views/atcstationview.h
@@ -12,9 +12,9 @@
 #ifndef BLACKGUI_ATCSTATIONVIEW_H
 #define BLACKGUI_ATCSTATIONVIEW_H
 
-#include "blackgui/blackguiexport.h"
 #include "blackgui/views/viewcallsignobjects.h"
 #include "blackgui/models/atcstationlistmodel.h"
+#include "blackgui/blackguiexport.h"
 #include "blackmisc/aviation/atcstation.h"
 #include "blackmisc/aviation/atcstationlist.h"
 #include "blackmisc/aviation/comsystem.h"
@@ -24,7 +24,6 @@
 #include <QObject>
 
 class QAction;
-class QWidget;
 
 namespace BlackMisc { namespace Aviation { class CCallsign; } }
 namespace BlackGui
diff --git a/src/blackgui/views/viewbase.h b/src/blackgui/views/viewbase.h
index 950a0bb96..214fc9b73 100644
--- a/src/blackgui/views/viewbase.h
+++ b/src/blackgui/views/viewbase.h
@@ -494,6 +494,12 @@ namespace BlackGui
             virtual void paste() = 0;
             //! @}
 
+            //! Trigger reload from backend by signal requestUpdate();
+            void triggerReload();
+
+            //! Trigger reload from backend by signal requestNewBackendData()
+            void triggerReloadFromBackend();
+
             //! Init text edit dialog if required and return pointer to it
             Components::CTextEditDialog *textEditDialog();
 
@@ -552,12 +558,6 @@ namespace BlackGui
             //! Save JSON
             virtual BlackMisc::CStatusMessage ps_saveJson(bool selectedOnly = false, const QString &directory = {}) = 0;
 
-            //! Trigger reload from backend by signal requestUpdate();
-            void ps_triggerReload();
-
-            //! Trigger reload from backend by signal requestNewBackendData()
-            void ps_triggerReloadFromBackend();
-
             // ------------ slots of CViewDbObjects ----------------
             // need to be declared here and overridden, as this is the only part with valid Q_OBJECT
 
@@ -572,7 +572,7 @@ namespace BlackGui
             void toggleAutoDisplay();
 
             //! Custom menu was requested
-            void customMenuRequested(QPoint pos);
+            void customMenuRequested(const QPoint &pos);
 
             //! Indicator has been updated
             void updatedIndicator();
diff --git a/src/blackgui/views/viewbasenontemplate.cpp b/src/blackgui/views/viewbasenontemplate.cpp
index 8e2033384..a3f5a817b 100644
--- a/src/blackgui/views/viewbasenontemplate.cpp
+++ b/src/blackgui/views/viewbasenontemplate.cpp
@@ -218,13 +218,13 @@ namespace BlackGui
                 {
                     static const QMetaMethod requestSignal = QMetaMethod::fromSignal(&CViewBaseNonTemplate::requestUpdate);
                     if (!this->isSignalConnected(requestSignal)) break;
-                    ma.addAction(CIcons::refresh16(), "Update", CMenuAction::pathViewUpdates(), { this, &CViewBaseNonTemplate::ps_triggerReload }); break;
+                    ma.addAction(CIcons::refresh16(), "Update", CMenuAction::pathViewUpdates(), { this, &CViewBaseNonTemplate::triggerReload }); break;
                 }
             case MenuBackend:
                 {
                     static const QMetaMethod requestSignal = QMetaMethod::fromSignal(&CViewBaseNonTemplate::requestNewBackendData);
                     if (!this->isSignalConnected(requestSignal)) break;
-                    ma.addAction(CIcons::refresh16(), "Reload from backend", CMenuAction::pathViewUpdates(), { this, &CViewBaseNonTemplate::ps_triggerReloadFromBackend }); break;
+                    ma.addAction(CIcons::refresh16(), "Reload from backend", CMenuAction::pathViewUpdates(), { this, &CViewBaseNonTemplate::triggerReloadFromBackend }); break;
                 }
             case MenuDisplayAutomatically:
                 {
@@ -636,23 +636,13 @@ namespace BlackGui
             }
         }
 
-        void CViewBaseNonTemplate::displayJsonPopup()
-        {
-
-        }
-
-        void CViewBaseNonTemplate::displaySelectedJsonPopup()
-        {
-
-        }
-
-        void CViewBaseNonTemplate::ps_triggerReload()
+        void CViewBaseNonTemplate::triggerReload()
         {
             this->showLoadIndicatorWithTimeout(m_loadIndicatorTimeoutMsDefault);
             emit this->requestUpdate();
         }
 
-        void CViewBaseNonTemplate::ps_triggerReloadFromBackend()
+        void CViewBaseNonTemplate::triggerReloadFromBackend()
         {
             this->showLoadIndicatorWithTimeout(m_loadIndicatorTimeoutMsDefault);
             emit this->requestNewBackendData();
@@ -787,7 +777,7 @@ namespace BlackGui
             this->setVisible(true);
         }
 
-        void CViewBaseNonTemplate::customMenuRequested(QPoint pos)
+        void CViewBaseNonTemplate::customMenuRequested(const QPoint &pos)
         {
             QMenu menu;
             CMenuActions menuActions;