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

refs #335, new icons, textures / placeholders

Browse Source
This commit is contained in:
Klaus Basan
2014-10-01 17:04:47 +02:00
parent 620e8a7752
commit 65c2ed9db4
11 changed files with 86 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackgui/models/clientlistmodel.cpp
View File

@@ -33,7 +33,7 @@ namespace BlackGui
this->m_columns.addColumn(CColumn::standardString("capabilities", CClient::IndexCapabilitiesString)); this->m_columns.addColumn(CColumn::standardString("capabilities", CClient::IndexCapabilitiesString));
this->m_columns.addColumn(CColumn::standardString("model", {CClient::IndexModel, CAircraftModel::IndexModelString})); this->m_columns.addColumn(CColumn::standardString("model", {CClient::IndexModel, CAircraftModel::IndexModelString}));
this->m_columns.addColumn(CColumn("q.?", "queried", {CClient::IndexModel, CAircraftModel::IndexIsQueriedModelString}, this->m_columns.addColumn(CColumn("q.?", "queried", {CClient::IndexModel, CAircraftModel::IndexIsQueriedModelString},
new CBoolIconFormatter(CIcons::StandardIconTick, CIcons::StandardIconCross, "queried", "not queried"))); new CBoolIconFormatter(CIcons::StandardIconTick16, CIcons::StandardIconCross16, "queried", "not queried")));
this->m_columns.addColumn(CColumn::standardString("server", CClient::IndexServer)); this->m_columns.addColumn(CColumn::standardString("server", CClient::IndexServer));
// force strings for translation in resource files // force strings for translation in resource files

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

@@ -273,7 +273,7 @@ namespace BlackGui
} }
CBoolIconFormatter::CBoolIconFormatter(int alignment) : CBoolIconFormatter::CBoolIconFormatter(int alignment) :
CBoolIconFormatter(CIcons::StandardIconTick, CIcons::StandardIconEmpty16, "on", "off", alignment) CBoolIconFormatter(CIcons::StandardIconTick16, CIcons::StandardIconEmpty16, "on", "off", alignment)
{ } { }
CBoolIconFormatter::CBoolIconFormatter(CIcons::IconIndex onIcon, CIcons::IconIndex offIcon, const QString &onName, const QString &offName, int alignment) : CBoolIconFormatter::CBoolIconFormatter(CIcons::IconIndex onIcon, CIcons::IconIndex offIcon, const QString &onName, const QString &offName, int alignment) :

24
src/blackmisc/blackmisc.qrc
View File

@@ -287,6 +287,23 @@
<file>icons/diagona/icons/binocular--arrow.png</file> <file>icons/diagona/icons/binocular--arrow.png</file>
<file>icons/diagona/icons/binocular--exclamation.png</file> <file>icons/diagona/icons/binocular--exclamation.png</file>
<file>icons/diagona/icons/binocular--minus.png</file> <file>icons/diagona/icons/binocular--minus.png</file>
<file>icons/diagona/icons/arrow-circle.png</file>
<file>icons/diagona/icons/arrow-circle-045-left.png</file>
<file>icons/diagona/icons/arrow-circle-135.png</file>
<file>icons/diagona/icons/arrow-circle-135-left.png</file>
<file>icons/diagona/icons/arrow-circle-225.png</file>
<file>icons/diagona/icons/arrow-circle-225-left.png</file>
<file>icons/diagona/icons/arrow-circle-315.png</file>
<file>icons/diagona/icons/arrow-circle-315-left.png</file>
<file>icons/diagona/icons/arrow-circle-double.png</file>
<file>icons/diagona/icons/arrow-circle-double-135.png</file>
<file>icons/diagona/icons/speaker.png</file>
<file>icons/diagona/icons/speaker--arrow.png</file>
<file>icons/diagona/icons/speaker--exclamation.png</file>
<file>icons/diagona/icons/speaker--minus.png</file>
<file>icons/diagona/icons/speaker-network.png</file>
<file>icons/diagona/icons/speaker--pencil.png</file>
<file>icons/diagona/icons/speaker--plus.png</file>
</qresource> </qresource>
<qresource prefix="/own"> <qresource prefix="/own">
<file>icons/own/app.jpg</file> <file>icons/own/app.jpg</file>
@@ -306,6 +323,9 @@
<file>icons/own/swift/swiftCartoonNova24.png</file> <file>icons/own/swift/swiftCartoonNova24.png</file>
<file>icons/own/swift/swiftCartoonNova48.png</file> <file>icons/own/swift/swiftCartoonNova48.png</file>
<file>icons/own/twr.jpg</file> <file>icons/own/twr.jpg</file>
<file>icons/own/transparent1px.png</file>
<file>icons/own/arrowWide300x10down.png</file>
<file>icons/own/arrowWide300x10up.png</file>
</qresource> </qresource>
<qresource prefix="/qled"> <qresource prefix="/qled">
<file>icons/qled/circle_black.svg</file> <file>icons/qled/circle_black.svg</file>
@@ -346,4 +366,8 @@
<file>icons/qled/triang_yellow.svg</file> <file>icons/qled/triang_yellow.svg</file>
<file>icons/qled/round_black.svg</file> <file>icons/qled/round_black.svg</file>
</qresource> </qresource>
<qresource prefix="/textures">
<file>icons/textures/texture-inner.jpg</file>
<file>icons/textures/texture-outer.jpg</file>
</qresource>
</RCC> </RCC>

21
src/blackmisc/iconlist.cpp
View File

@@ -78,10 +78,10 @@ namespace BlackMisc
CIcon(CIcons::StandardIconArrowMediumSouth16, "arrow south"), CIcon(CIcons::StandardIconArrowMediumSouth16, "arrow south"),
CIcon(CIcons::StandardIconArrowMediumWest16, "arrow west"), CIcon(CIcons::StandardIconArrowMediumWest16, "arrow west"),
CIcon(CIcons::StandardIconClose16, "close"), CIcon(CIcons::StandardIconClose16, "close"),
CIcon(CIcons::StandardIconCross, "cross"), CIcon(CIcons::StandardIconCross16, "cross"),
CIcon(CIcons::StandardIconCrossCircle, "cross circle"), CIcon(CIcons::StandardIconCrossCircle16, "cross circle"),
CIcon(CIcons::StandardIconCrossSmall, "cross (small)"), CIcon(CIcons::StandardIconCrossSmall16, "cross (small)"),
CIcon(CIcons::StandardIconCrossWhite, "cross white"), CIcon(CIcons::StandardIconCrossWhite16, "cross white"),
CIcon(CIcons::StandardIconDelete16, "delete"), CIcon(CIcons::StandardIconDelete16, "delete"),
CIcon(CIcons::StandardIconDockBottom16, "dock bottom"), CIcon(CIcons::StandardIconDockBottom16, "dock bottom"),
CIcon(CIcons::StandardIconDockTop16, "dock top"), CIcon(CIcons::StandardIconDockTop16, "dock top"),
@@ -104,6 +104,7 @@ namespace BlackMisc
CIcon(CIcons::StandardIconResize16, "resize"), CIcon(CIcons::StandardIconResize16, "resize"),
CIcon(CIcons::StandardIconResizeHorizontal16, "resize (horizontal)"), CIcon(CIcons::StandardIconResizeHorizontal16, "resize (horizontal)"),
CIcon(CIcons::StandardIconResizeVertical16, "resize (vertical)"), CIcon(CIcons::StandardIconResizeVertical16, "resize (vertical)"),
CIcon(CIcons::StandardIconSpeakerNetwork16, "speaker (network)"),
CIcon(CIcons::StandardIconStatusBar16, "status bar"), CIcon(CIcons::StandardIconStatusBar16, "status bar"),
CIcon(CIcons::StandardIconSwift24, "swift"), CIcon(CIcons::StandardIconSwift24, "swift"),
CIcon(CIcons::StandardIconSwift48, "swift"), CIcon(CIcons::StandardIconSwift48, "swift"),
@@ -112,15 +113,15 @@ namespace BlackMisc
CIcon(CIcons::StandardIconTableRelationship16, "relationship"), CIcon(CIcons::StandardIconTableRelationship16, "relationship"),
CIcon(CIcons::StandardIconTableSheet16, "table sheet"), CIcon(CIcons::StandardIconTableSheet16, "table sheet"),
CIcon(CIcons::StandardIconText16, "text"), CIcon(CIcons::StandardIconText16, "text"),
CIcon(CIcons::StandardIconTick, "tick"), CIcon(CIcons::StandardIconTick16, "tick"),
CIcon(CIcons::StandardIconTickRed, "tick red"), CIcon(CIcons::StandardIconTickRed16, "tick red"),
CIcon(CIcons::StandardIconTickSmall, "tick (small)"), CIcon(CIcons::StandardIconTickSmall16, "tick (small)"),
CIcon(CIcons::StandardIconTickWhite, "tick white"), CIcon(CIcons::StandardIconTickWhite16, "tick white"),
CIcon(CIcons::StandardIconUnknown16, "unknwon"), CIcon(CIcons::StandardIconUnknown16, "unknwon"),
CIcon(CIcons::StandardIconUser16, "user"), CIcon(CIcons::StandardIconUser16, "user"),
CIcon(CIcons::StandardIconUsers16, "users"), CIcon(CIcons::StandardIconUsers16, "users"),
CIcon(CIcons::StandardIconViewMulticolumn, "view multicolumn"), CIcon(CIcons::StandardIconViewMulticolumn16, "view multicolumn"),
CIcon(CIcons::StandardIconViewTile, "view tile"), CIcon(CIcons::StandardIconViewTile16, "view tile"),
CIcon(CIcons::StandardIconVolumeHigh16, "volume hight"), CIcon(CIcons::StandardIconVolumeHigh16, "volume hight"),
CIcon(CIcons::StandardIconVolumeLow16, "volume low"), CIcon(CIcons::StandardIconVolumeLow16, "volume low"),
CIcon(CIcons::StandardIconVolumeMuted16, "muted"), CIcon(CIcons::StandardIconVolumeMuted16, "muted"),

21
src/blackmisc/icons.cpp
View File

@@ -73,10 +73,10 @@ namespace BlackMisc
case StandardIconArrowMediumSouth16: return arrowMediumSouth16(); case StandardIconArrowMediumSouth16: return arrowMediumSouth16();
case StandardIconArrowMediumWest16: return arrowMediumWest16(); case StandardIconArrowMediumWest16: return arrowMediumWest16();
case StandardIconClose16: return close16(); case StandardIconClose16: return close16();
case StandardIconCross: return cross16(); case StandardIconCross16: return cross16();
case StandardIconCrossCircle: return crossCircle16(); case StandardIconCrossCircle16: return crossCircle16();
case StandardIconCrossSmall: return crossSmall16(); case StandardIconCrossSmall16: return crossSmall16();
case StandardIconCrossWhite: return crossWhite16(); case StandardIconCrossWhite16: return crossWhite16();
case StandardIconDelete16: return delete16(); case StandardIconDelete16: return delete16();
case StandardIconDockBottom16: return dockBottom16(); case StandardIconDockBottom16: return dockBottom16();
case StandardIconDockTop16: return dockTop16(); case StandardIconDockTop16: return dockTop16();
@@ -97,6 +97,7 @@ namespace BlackMisc
case StandardIconResize16: return resize16(); case StandardIconResize16: return resize16();
case StandardIconResizeHorizontal16: return resizeHorizontal16(); case StandardIconResizeHorizontal16: return resizeHorizontal16();
case StandardIconResizeVertical16: return resizeVertical16(); case StandardIconResizeVertical16: return resizeVertical16();
case StandardIconSpeakerNetwork16: return speakerNetwork16();
case StandardIconStatusBar16: return statusBar16(); case StandardIconStatusBar16: return statusBar16();
case StandardIconSwift24: return swift24(); case StandardIconSwift24: return swift24();
case StandardIconSwift48: return swift48(); case StandardIconSwift48: return swift48();
@@ -105,15 +106,15 @@ namespace BlackMisc
case StandardIconTableRelationship16: return tableRelationship16(); case StandardIconTableRelationship16: return tableRelationship16();
case StandardIconTableSheet16: return tableSheet16(); case StandardIconTableSheet16: return tableSheet16();
case StandardIconText16: return text16(); case StandardIconText16: return text16();
case StandardIconTick: return tick16(); case StandardIconTick16: return tick16();
case StandardIconTickRed: return tickRed16(); case StandardIconTickRed16: return tickRed16();
case StandardIconTickSmall: return tickSmall16(); case StandardIconTickSmall16: return tickSmall16();
case StandardIconTickWhite: return tickWhite16(); case StandardIconTickWhite16: return tickWhite16();
case StandardIconUnknown16: return unknown16(); case StandardIconUnknown16: return unknown16();
case StandardIconUser16: return user16(); case StandardIconUser16: return user16();
case StandardIconUsers16: return users16(); case StandardIconUsers16: return users16();
case StandardIconViewMulticolumn: return viewMultiColumn(); case StandardIconViewMulticolumn16: return viewMultiColumn();
case StandardIconViewTile: return viewTile(); case StandardIconViewTile16: return viewTile();
case StandardIconVolumeHigh16: return volumeHigh16(); case StandardIconVolumeHigh16: return volumeHigh16();
case StandardIconVolumeLow16: return volumeLow16(); case StandardIconVolumeLow16: return volumeLow16();
case StandardIconVolumeMuted16: return volumeMuted16(); case StandardIconVolumeMuted16: return volumeMuted16();

49
src/blackmisc/icons.h
View File

@@ -27,7 +27,7 @@ namespace BlackMisc
//! Index for each icon, allows to send them via DBus, efficiently store them, etc. //! Index for each icon, allows to send them via DBus, efficiently store them, etc.
enum IconIndex enum IconIndex
{ {
// keep indexes alphabetically sorted and in sync with CIconList // !! keep indexes alphabetically sorted and in sync with CIconList
AviationAttitudeIndicator, AviationAttitudeIndicator,
AviationAtis, AviationAtis,
AviationMetar, AviationMetar,
@@ -71,10 +71,10 @@ namespace BlackMisc
StandardIconArrowMediumSouth16, StandardIconArrowMediumSouth16,
StandardIconArrowMediumWest16, StandardIconArrowMediumWest16,
StandardIconClose16, StandardIconClose16,
StandardIconCross, StandardIconCross16,
StandardIconCrossCircle, StandardIconCrossCircle16,
StandardIconCrossSmall, StandardIconCrossSmall16,
StandardIconCrossWhite, StandardIconCrossWhite16,
StandardIconDelete16, StandardIconDelete16,
StandardIconDockBottom16, StandardIconDockBottom16,
StandardIconDockTop16, StandardIconDockTop16,
@@ -97,6 +97,7 @@ namespace BlackMisc
StandardIconResize16, StandardIconResize16,
StandardIconResizeHorizontal16, StandardIconResizeHorizontal16,
StandardIconResizeVertical16, StandardIconResizeVertical16,
StandardIconSpeakerNetwork16,
StandardIconStatusBar16, StandardIconStatusBar16,
StandardIconSwift24, StandardIconSwift24,
StandardIconSwift48, StandardIconSwift48,
@@ -105,15 +106,15 @@ namespace BlackMisc
StandardIconTableRelationship16, StandardIconTableRelationship16,
StandardIconTableSheet16, StandardIconTableSheet16,
StandardIconText16, StandardIconText16,
StandardIconTick, StandardIconTick16,
StandardIconTickRed, StandardIconTickRed16,
StandardIconTickSmall, StandardIconTickSmall16,
StandardIconTickWhite, StandardIconTickWhite16,
StandardIconUnknown16, StandardIconUnknown16,
StandardIconUser16, StandardIconUser16,
StandardIconUsers16, StandardIconUsers16,
StandardIconViewMulticolumn, StandardIconViewMulticolumn16,
StandardIconViewTile, StandardIconViewTile16,
StandardIconVolumeHigh16, StandardIconVolumeHigh16,
StandardIconVolumeLow16, StandardIconVolumeLow16,
StandardIconVolumeMuted16, StandardIconVolumeMuted16,
@@ -294,6 +295,20 @@ namespace BlackMisc
return pm; return pm;
} }
//! Radio
static const QPixmap &radio16()
{
static const QPixmap pm(":/diagona/icons/diagona/icons/radio.png");
return pm;
}
//! Speaker (network)
static const QPixmap &speakerNetwork16()
{
static const QPixmap pm(":/diagona/icons/diagona/icons/speaker-network.png");
return pm;
}
//! Joystick //! Joystick
static const QPixmap &joystick16() static const QPixmap &joystick16()
{ {
@@ -564,6 +579,18 @@ namespace BlackMisc
return monitorError16(); return monitorError16();
} }
//! Application audio
static const QPixmap &appAudio16()
{
return speakerNetwork16();
}
//! Voice rooms
static const QPixmap &appVoiceRooms16()
{
return tableRelationship16();
}
// ------------------------------------------------------------- // -------------------------------------------------------------
// Network and aviation // Network and aviation
// ------------------------------------------------------------- // -------------------------------------------------------------

BIN
src/blackmisc/icons/own/arrowWide300x10down.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 267 B

BIN
src/blackmisc/icons/own/arrowWide300x10up.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 260 B

BIN
src/blackmisc/icons/own/transparent1px.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 68 B

BIN
src/blackmisc/icons/textures/texture-inner.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 MiB

BIN
src/blackmisc/icons/textures/texture-outer.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 879 KiB