flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 23:05:36 +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

3
src/blackgui/components/aircraftcomponent.cpp
View File

@@ -8,8 +8,9 @@
*/
#include "aircraftcomponent.h"
#include "dockwidgetinfoareacomponent.h"
#include "ui_aircraftcomponent.h"
#include "dockwidgetinfoareacomponent.h"
#include "../guiutility.h"
namespace BlackGui
{

5
src/blackgui/components/aircraftcomponent.h
View File

@@ -16,7 +16,6 @@
#include "blackgui/components/timerbasedcomponent.h"
#include "blackgui/components/dockwidgetinfoareacomponent.h"
#include "blackmisc/avaircraft.h"
#include <QTabWidget>
namespace Ui { class CAircraftComponent; }
@@ -49,7 +48,7 @@ namespace BlackGui
int countAirportsInRange() const;
public slots:
//! Update users
//! Update aircrafts
void update();
//! \copydoc CTimerBasedComponent::setUpdateIntervalSeconds
@@ -71,7 +70,7 @@ namespace BlackGui
private:
Ui::CAircraftComponent *ui;
CTimerBasedComponent *m_timerComponent;
CTimerBasedComponent *m_timerComponent;
};
}
}

11
src/blackgui/components/atcstationcomponent.cpp
View File

@@ -48,12 +48,12 @@ namespace BlackGui
Q_ASSERT(connected);
connected = this->connect(this->ui->pb_AtcStationsLoadMetar, SIGNAL(clicked()), this, SLOT(getMetar()));
Q_ASSERT(connected);
connect(this, &QTabWidget::currentChanged, this, &CAtcStationComponent::ps_atcStationsTabChanged);
connect(this, &QTabWidget::currentChanged, this, &CAtcStationComponent::ps_atcStationsTabChanged); // "local" tab changed (booked, online)
connect(this->ui->tvp_AtcStationsOnline, &QTableView::clicked, this, &CAtcStationComponent::ps_onlineAtcStationSelected);
connect(this->ui->tvp_AtcStationsOnline, &CAtcStationView::testRequestDummyAtcOnlineStations, this, &CAtcStationComponent::ps_testCreateDummyOnlineAtcStations);
connect(this->ui->tvp_AtcStationsOnline, &CAtcStationView::requestUpdate, this, &CAtcStationComponent::ps_requestOnlineStationsUpdate);
connect(this->ui->pb_AtcStationsAtisReload, &QPushButton::clicked, this, &CAtcStationComponent::ps_requestAtis);
connect(this->ui->tvp_AtcStationsBooked, &CAtcStationView::requestUpdate, this, &CAtcStationComponent::ps_reloadAtcStationsBooked);
connect(this->ui->pb_AtcStationsAtisReload, &QPushButton::clicked, this, &CAtcStationComponent::ps_requestAtis);
}
CAtcStationComponent::~CAtcStationComponent()
@@ -82,10 +82,7 @@ namespace BlackGui
this->connect(this->getIContextNetwork(), &IContextNetwork::changedAtcStationOnlineConnectionStatus, this, &CAtcStationComponent::changedAtcStationOnlineConnectionStatus);
this->connect(this->getIContextNetwork(), &IContextNetwork::connectionStatusChanged, this, &CAtcStationComponent::ps_connectionStatusChanged);
}
bool connected = connect(this->getParentInfoArea(), &CInfoArea::tabBarCurrentChanged, this, &CAtcStationComponent::ps_infoAreaTabBarChanged);
Q_ASSERT(connected);
connect(this->getParentInfoArea(), &CInfoArea::tabBarCurrentChanged, this, &CAtcStationComponent::ps_infoAreaTabBarChanged);
}
void CAtcStationComponent::update()
@@ -98,7 +95,7 @@ namespace BlackGui
bool hasData = this->countBookedStations() > 0 || this->countOnlineStations() > 0;
if (hasData && !this->isVisibleWidget())
{
// KWB remove: qDebug() will be removed soo
// KWB remove: qDebug() will be removed soon
qDebug() << this->objectName() << "Skipping update, not visible";
return;
}

2
src/blackgui/dockwidget.cpp
View File

@@ -201,6 +201,6 @@ namespace BlackGui
void CDockWidget::onStyleSheetsChanged()
{
// void
// void, for further extensions
}
}

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

1
src/blackgui/updateworker.h
View File

@@ -32,6 +32,7 @@ namespace BlackGui
virtual ~IUpdateWorker() { terminateThread();}
signals:
//! Update is completed
void updateFinished();
public slots:

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

@@ -55,7 +55,7 @@ namespace BlackGui
QAction *actionInteractiveResize = new QAction(&menu);
actionInteractiveResize->setObjectName(this->objectName().append("ActionResizing"));
actionInteractiveResize->setIconText("Resize (auto)");
actionInteractiveResize->setIcon(CIcons::viewMulticolumn());
actionInteractiveResize->setIcon(CIcons::viewMultiColumn());
actionInteractiveResize->setCheckable(true);
actionInteractiveResize->setChecked(this->m_resizeMode == ResizingAuto);
actionInteractiveResize->setEnabled(enabled);

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

@@ -47,7 +47,7 @@ namespace BlackGui
//! Clear data
virtual void clear() = 0;
//! Current rows resize mode
//! Resize mode
ResizeMode getResizeMode() const { return m_resizeMode; }
//! Set resize mode
@@ -100,8 +100,8 @@ namespace BlackGui
//! \param resize
virtual int performUpdateContainer(const QVariant &variant, bool sort, bool resize) = 0;
//! Skip resizing
virtual bool skipResize() const = 0;
//! Skip resizing because of size?
virtual bool reachedResizeThreshold() const = 0;
//! Resize or skip resize?
virtual bool resize() const;

4
src/blackmisc/audioallclasses.h
View File

@@ -7,8 +7,8 @@
* contained in the LICENSE file.
*/
#ifndef BLACKMISC_VOICEALLCLASSES_H
#define BLACKMISC_VOICEALLCLASSES_H
#ifndef BLACKMISC_AUDIOALLCLASSES_H
#define BLACKMISC_AUDIOALLCLASSES_H
#include "blackmisc/audiodevice.h"
#include "blackmisc/audiodevicelist.h"

4
src/blackmisc/iconlist.cpp
View File

@@ -102,6 +102,8 @@ namespace BlackMisc
CIcon(CIcons::StandardIconRadar16, "radar"),
CIcon(CIcons::StandardIconRefresh16, "refresh"),
CIcon(CIcons::StandardIconResize16, "resize"),
CIcon(CIcons::StandardIconResizeHorizontal16, "resize (horizontal)"),
CIcon(CIcons::StandardIconResizeVertical16, "resize (vertical)"),
CIcon(CIcons::StandardIconStatusBar16, "status bar"),
CIcon(CIcons::StandardIconSwift24, "swift"),
CIcon(CIcons::StandardIconSwift48, "swift"),
@@ -117,6 +119,8 @@ namespace BlackMisc
CIcon(CIcons::StandardIconUnknown16, "unknwon"),
CIcon(CIcons::StandardIconUser16, "user"),
CIcon(CIcons::StandardIconUsers16, "users"),
CIcon(CIcons::StandardIconViewMulticolumn, "view multicolumn"),
CIcon(CIcons::StandardIconViewTile, "view tile"),
CIcon(CIcons::StandardIconVolumeHigh16, "volume hight"),
CIcon(CIcons::StandardIconVolumeLow16, "volume low"),
CIcon(CIcons::StandardIconVolumeMuted16, "muted"),

4
src/blackmisc/icons.cpp
View File

@@ -95,6 +95,8 @@ namespace BlackMisc
case StandardIconRadar16: return radar16();
case StandardIconRefresh16: return refresh16();
case StandardIconResize16: return resize16();
case StandardIconResizeHorizontal16: return resizeHorizontal16();
case StandardIconResizeVertical16: return resizeVertical16();
case StandardIconStatusBar16: return statusBar16();
case StandardIconSwift24: return swift24();
case StandardIconSwift48: return swift48();
@@ -110,6 +112,8 @@ namespace BlackMisc
case StandardIconUnknown16: return unknown16();
case StandardIconUser16: return user16();
case StandardIconUsers16: return users16();
case StandardIconViewMulticolumn: return viewMultiColumn();
case StandardIconViewTile: return viewTile();
case StandardIconVolumeHigh16: return volumeHigh16();
case StandardIconVolumeLow16: return volumeLow16();
case StandardIconVolumeMuted16: return volumeMuted16();

34
src/blackmisc/icons.h
View File

@@ -95,6 +95,8 @@ namespace BlackMisc
StandardIconRadar16,
StandardIconRefresh16,
StandardIconResize16,
StandardIconResizeHorizontal16,
StandardIconResizeVertical16,
StandardIconStatusBar16,
StandardIconSwift24,
StandardIconSwift48,
@@ -110,6 +112,8 @@ namespace BlackMisc
StandardIconUnknown16,
StandardIconUser16,
StandardIconUsers16,
StandardIconViewMulticolumn,
StandardIconViewTile,
StandardIconVolumeHigh16,
StandardIconVolumeLow16,
StandardIconVolumeMuted16,
@@ -157,7 +161,21 @@ namespace BlackMisc
return pm;
}
//! Resize
//! Resize horizontally
static const QPixmap &resizeHorizontal16()
{
static const QPixmap pm(":/diagona/icons/diagona/icons/arrow-resize.png");
return pm;
}
//! Resize vertically
static const QPixmap &resizeVertical16()
{
static const QPixmap pm(":/diagona/icons/diagona/icons/arrow-resize-090.png");
return pm;
}
//! Refresh
static const QPixmap &refresh16()
{
static const QPixmap pm(":/pastel/icons/pastel/16/arrow-refresh.png");
@@ -199,6 +217,20 @@ namespace BlackMisc
return pm;
}
//! View multicolumn
static const QPixmap &viewMultiColumn()
{
static const QPixmap pm(":/pastel/icons/pastel/16/application-view-multicolumns.png");
return pm;
}
//! View tile
static const QPixmap &viewTile()
{
static const QPixmap pm(":/pastel/icons/pastel/16/application-view-tile.png");
return pm;
}
//! Tick
static const QPixmap &tick16()
{

19
src/blackmisc/namevariantpair.h
View File

@@ -24,6 +24,16 @@ namespace BlackMisc
class CNameVariantPair : public BlackMisc::CValueObject
{
public:
//! Properties by index
enum ColumnIndex
{
IndexName = BlackMisc::CPropertyIndex::GlobalIndexCNameVariantPair,
IndexVariant,
IndexIcon,
IndexPixmap
};
//! Default constructor.
CNameVariantPair() {}
@@ -69,15 +79,6 @@ namespace BlackMisc
//! Members
static const QStringList &jsonMembers();
//! Properties by index
enum ColumnIndex
{
IndexName = BlackMisc::CPropertyIndex::GlobalIndexCNameVariantPair,
IndexVariant,
IndexIcon,
IndexPixmap
};
//! \copydoc CValueObject::propertyByIndex()
virtual QVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override;

12
src/blackmisc/nwserverlist.cpp
View File

@@ -1,7 +1,11 @@
/* Copyright (C) 2013 VATSIM Community / authors
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* Copyright (C) 2013
* swift Project Community / Contributors
*
* This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
* directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
* including this file, may be copied, modified, propagated, or distributed except according to the terms
* contained in the LICENSE file.
*/
#include "nwserverlist.h"

19
src/blackmisc/nwserverlist.h
View File

@@ -1,11 +1,13 @@
/* Copyright (C) 2013 VATSIM Community / authors
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* Copyright (C) 2013
* swift Project Community / Contributors
*
* This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
* directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
* including this file, may be copied, modified, propagated, or distributed except according to the terms
* contained in the LICENSE file.
*/
/*!
\file
*/
//! \file
#ifndef BLACKMISC_SERVERLIST_H
#define BLACKMISC_SERVERLIST_H
@@ -13,9 +15,6 @@
#include "nwserver.h"
#include "collection.h"
#include "sequence.h"
#include <QObject>
#include <QString>
#include <QList>
namespace BlackMisc
{

1
src/blackmisc/sequence.h
View File

@@ -355,6 +355,7 @@ namespace BlackMisc
* \param key1 A pointer to a member function of T.
* \param value1 Will be compared to the return value of key1.
* \param newValues Values from this map will be put into each matching element.
* \param skipEqualValues Equal values will not be updated
* \return The number of elements modified.
*/
template <class K1, class V1>

6
src/blackmisc/valueobject.cpp
View File

@@ -105,7 +105,7 @@ namespace BlackMisc
/*
* Variant equal property index?
*/
bool CValueObject::equalPropertyByIndex(const QVariant &compareValue, const CPropertyIndex &index) const
bool CValueObject::equalsPropertyByIndex(const QVariant &compareValue, const CPropertyIndex &index) const
{
const QVariant myValue = this->propertyByIndex(index);
return BlackMisc::equalQVariants(myValue, compareValue);
@@ -149,7 +149,7 @@ namespace BlackMisc
}
/*
* Variant map
* apply, return changed indexes
*/
CPropertyIndexList CValueObject::apply(const BlackMisc::CPropertyIndexVariantMap &indexMap, bool skipEqualValues)
{
@@ -163,7 +163,7 @@ namespace BlackMisc
const CPropertyIndex index = it.key();
if (skipEqualValues)
{
bool equal = this->equalPropertyByIndex(value, index);
bool equal = this->equalsPropertyByIndex(value, index);
if (equal) { continue; }
}
this->setPropertyByIndex(value, index);

4
src/blackmisc/valueobject.h
View File

@@ -211,11 +211,9 @@ namespace BlackMisc
virtual QPixmap toPixmap() const;
//! Set property by index
//! \remarks Intentionally not abstract, avoiding all classes need to implement this method
virtual void setPropertyByIndex(const QVariant &variant, const CPropertyIndex &index);
//! Property by index
//! \remarks Intentionally not abstract, avoiding all classes need to implement this method
virtual QVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
//! Property by index as String
@@ -223,7 +221,7 @@ namespace BlackMisc
virtual QString propertyByIndexAsString(const CPropertyIndex &index, bool i18n = false) const;
//! Is given variant equal to value of property index?
virtual bool equalPropertyByIndex(const QVariant &compareValue, const CPropertyIndex &index) const;
virtual bool equalsPropertyByIndex(const QVariant &compareValue, const CPropertyIndex &index) const;
//! The stored object as CValueObject
static const CValueObject *fromQVariant(const QVariant &variant);

11
src/blacksim/simulatorinfo.cpp
View File

@@ -1,3 +1,14 @@
/* Copyright (C) 2013
* swift Project Community / Contributors
*
* This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
* directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
* including this file, may be copied, modified, propagated, or distributed except according to the terms
* contained in the LICENSE file.
*/
//! \file
#include "simulatorinfo.h"
#include "blackmisc/blackmiscfreefunctions.h"

9
src/blacksim/simulatorinfo.h
View File

@@ -1,3 +1,12 @@
/* Copyright (C) 2013
* swift Project Community / Contributors
*
* This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
* directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
* including this file, may be copied, modified, propagated, or distributed except according to the terms
* contained in the LICENSE file.
*/
#ifndef BLACKSIM_SIMULATORINFO_H
#define BLACKSIM_SIMULATORINFO_H