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

Formatting, new icons, minor tweaks

Browse Source
This commit is contained in:
Klaus Basan
2014-09-23 00:36:13 +02:00
parent be0d1e8153
commit ef5f5bde0f
23 changed files with 120 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/blackgui/models/columnformatters.cpp
View File

@@ -133,6 +133,12 @@ namespace BlackGui
return QVariant(cvo->toPixmap());
}
CDateTimeFormatter::CDateTimeFormatter(const QString formatString, int alignment, bool i18n) :
CDefaultFormatter(alignment, i18n, { Qt::DisplayRole }), m_formatString(formatString)
{
// void
}
QVariant CDateTimeFormatter::displayRole(const QVariant &dateTime) const
{
if (dateTime.isNull()) return "";

3
src/blackgui/models/columnformatters.h
View File

@@ -209,8 +209,7 @@ namespace BlackGui
{
public:
//! Constructor
CDateTimeFormatter(const QString formatString = formatYmd(), int alignment = alignDefault(), bool i18n = true) :
CDefaultFormatter(alignment, i18n, { Qt::DisplayRole }), m_formatString(formatString) {}
CDateTimeFormatter(const QString formatString = formatYmd(), int alignment = alignDefault(), bool i18n = true);
//! \copydoc CDefaultFormatter::displayRole
virtual QVariant displayRole(const QVariant &dateTime) const override;

3
src/blackgui/models/listmodelbase.cpp
View File

@@ -129,10 +129,9 @@ namespace BlackGui
{
// KWB remove: qDebug() will be removed soon
qDebug() << "update" << this->objectName() << "size" << container.size() << "thread:" << QThread::currentThreadId();
// Keep sorting out of begin/end reset model
QTime myTimer;
// Keep sorting out of begin/end reset model
ContainerType sortedContainer;
bool performSort = sort && container.size() > 1 && this->hasValidSortColumn();
if (performSort)

4
src/blackgui/models/listmodelbase.h
View File

@@ -54,7 +54,7 @@ namespace BlackGui
/*!
* Set column for sorting
* \param propertyIndex index of column to be sorted by
* \param propertyIndex index of column to be sorted
*/
virtual void setSortColumnByPropertyIndex(const BlackMisc::CPropertyIndex &propertyIndex)
{
@@ -85,6 +85,8 @@ namespace BlackGui
protected slots:
//! Helper method with template free signature
//! \param variant container is transferred in variant
//! \param sort
int updateContainer(const QVariant &variant, bool sort)
{
return this->performUpdateContainer(variant, sort);