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

view base improvements

Browse Source 
* Use direct update function (not via CVariant anymore)
* refresh indicator
* new signal syntax
This commit is contained in:
Klaus Basan
2016-03-29 11:35:40 +02:00
parent b1c32dac10
commit 600cd52f30
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,6 +13,7 @@
#include "blackgui/models/allmodels.h" #include "blackgui/models/allmodels.h"
#include "blackgui/stylesheetutility.h" #include "blackgui/stylesheetutility.h"
#include "blackgui/guiutility.h" #include "blackgui/guiutility.h"
#include "blackgui/guiapplication.h"
#include "blackgui/shortcut.h" #include "blackgui/shortcut.h"
#include "blackcore/registermetadata.h" #include "blackcore/registermetadata.h"
#include <QHeaderView> #include <QHeaderView>
@@ -183,8 +184,8 @@ namespace BlackGui
// standard menus // standard menus
int items = menu.actions().size(); int items = menu.actions().size();
if (this->m_menus.testFlag(MenuRefresh)) { menu.addAction(BlackMisc::CIcons::refresh16(), "Update", this, SIGNAL(requestUpdate())); } if (this->m_menus.testFlag(MenuRefresh)) { menu.addAction(BlackMisc::CIcons::refresh16(), "Update", this, &CViewBaseNonTemplate::requestUpdate); }
if (this->m_menus.testFlag(MenuBackend)) { menu.addAction(BlackMisc::CIcons::refresh16(), "Reload from backend", this, SIGNAL(requestNewBackendData())); } if (this->m_menus.testFlag(MenuBackend)) { menu.addAction(BlackMisc::CIcons::refresh16(), "Reload from backend", this, &CViewBaseNonTemplate::requestNewBackendData); }
if (this->m_menus.testFlag(MenuClear)) { menu.addAction(BlackMisc::CIcons::delete16(), "Clear", this, &CViewBaseNonTemplate::ps_clear); } if (this->m_menus.testFlag(MenuClear)) { menu.addAction(BlackMisc::CIcons::delete16(), "Clear", this, &CViewBaseNonTemplate::ps_clear); }
if (this->m_menus.testFlag(MenuRemoveSelectedRows)) if (this->m_menus.testFlag(MenuRemoveSelectedRows))
{ {
@@ -448,7 +449,7 @@ namespace BlackGui
this->m_rowResizeMode = Content; this->m_rowResizeMode = Content;
} }
void CViewBaseNonTemplate::showLoadIndicator(int containerSizeDependent) void CViewBaseNonTemplate::showLoadIndicator(int containerSizeDependent, bool processEvents)
{ {
if (!m_enabledLoadIndicator) { return; } if (!m_enabledLoadIndicator) { return; }
if (this->m_showingLoadIndicator) { return; } if (this->m_showingLoadIndicator) { return; }
@@ -464,7 +465,6 @@ namespace BlackGui
} }
this->m_showingLoadIndicator = true; this->m_showingLoadIndicator = true;
emit loadIndicatorVisibilityChanged(this->m_showingLoadIndicator); emit loadIndicatorVisibilityChanged(this->m_showingLoadIndicator);
// this->setStyleSheet(styleSheet());
if (!this->m_loadIndicator) if (!this->m_loadIndicator)
{ {
@@ -472,6 +472,10 @@ namespace BlackGui
} }
this->centerLoadIndicator(); this->centerLoadIndicator();
this->m_loadIndicator->startAnimation(); this->m_loadIndicator->startAnimation();
if (processEvents)
{
sGui->processEventsToRefreshGui();
}
} }
void CViewBaseNonTemplate::centerLoadIndicator() void CViewBaseNonTemplate::centerLoadIndicator()
@@ -687,7 +691,7 @@ namespace BlackGui
}); });
worker->thenWithResult<ContainerType>(this, [this, resize](const ContainerType & sortedContainer) worker->thenWithResult<ContainerType>(this, [this, resize](const ContainerType & sortedContainer)
{ {
this->ps_updateContainer(CVariant::from(sortedContainer), false, resize); this->updateContainer(sortedContainer, false, resize);
}); });
worker->then(this, &CViewBase::asyncUpdateFinished); worker->then(this, &CViewBase::asyncUpdateFinished);
return worker; return worker;

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

@@ -253,7 +253,9 @@ namespace BlackGui
void rowsResizeModeToContent(); void rowsResizeModeToContent();
//! Show loading indicator //! Show loading indicator
void showLoadIndicator(int containerSizeDependent = -1); //! \param containerSizeDependent check against resize threshold if indicator makes sense
//! \param processEvents force event processing to display indicator by updating GUI
void showLoadIndicator(int containerSizeDependent = -1, bool processEvents = true);
//! Hide loading indicator //! Hide loading indicator
void hideLoadIndicator(); void hideLoadIndicator();