flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-05 01:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Viewbase style, UI style

Browse Source
This commit is contained in:
Klaus Basan
2018-12-05 02:55:36 +01:00
parent 45e34001a8
commit 774458afc9
4 changed files with 15 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackgui/editors/coordinateform.ui
View File

@@ -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>

3
src/blackgui/views/atcstationview.h
View File

@@ -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

14
src/blackgui/views/viewbase.h
View File

@@ -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();

20
src/blackgui/views/viewbasenontemplate.cpp
View File

@@ -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;