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

[AFV] CInputManager stores icon indexes instead of QPixmap instances

Browse Source 
The GUI converts icon indexes to QPixmap indexes when needed.
This fixes the context unittest that was broken by audio context changes.
This commit is contained in:
Mat Sutcliffe
2019-10-08 19:37:07 +01:00
parent 01d144b528
commit 57ff07592a
13 changed files with 48 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/blackmisc/input/actionhotkeydefs.cpp
View File

@@ -18,9 +18,9 @@ namespace BlackMisc
return s;
}
const QPixmap &pttHotkeyIcon()
CIcons::IconIndex pttHotkeyIcon()
{
return CIcons::radio16();
return CIcons::StandardIconRadio16;
}
const QString &pttCom1HotkeyAction()
@@ -35,14 +35,14 @@ namespace BlackMisc
return s;
}
const QPixmap &audioVolumeDecreaseHotkeyIcon()
CIcons::IconIndex audioVolumeDecreaseHotkeyIcon()
{
return CIcons::volumeLow16();
return CIcons::StandardIconVolumeLow16;
}
const QPixmap &audioVolumeIncreaseHotkeyIcon()
CIcons::IconIndex audioVolumeIncreaseHotkeyIcon()
{
return CIcons::volumeHigh16();
return CIcons::StandardIconVolumeHigh16;
}
const QString &audioVolumeDecreaseHotkeyAction()
@@ -57,14 +57,14 @@ namespace BlackMisc
return s;
}
const QPixmap &toggleXPDRStateHotkeyIcon()
CIcons::IconIndex toggleXPDRStateHotkeyIcon()
{
return CIcons::radio16();
return CIcons::StandardIconRadio16;
}
const QPixmap &toggleXPDRIdentHotkeyIcon()
CIcons::IconIndex toggleXPDRIdentHotkeyIcon()
{
return CIcons::radio16();
return CIcons::StandardIconRadio16;
}
const QString &toggleXPDRStateHotkeyAction()

12
src/blackmisc/input/actionhotkeydefs.h
View File

@@ -11,7 +11,7 @@
#ifndef BLACKMISC_INPUT_ACTIONHOTKEYDEFS_H
#define BLACKMISC_INPUT_ACTIONHOTKEYDEFS_H
#include "blackmisc/icon.h"
#include "blackmisc/icons.h"
#include "blackmisc/blackmiscexport.h"
#include <QString>
@@ -30,7 +30,7 @@ namespace BlackMisc
BLACKMISC_EXPORT const QString &pttCom2HotkeyAction();
//! PTT key
BLACKMISC_EXPORT const QPixmap &pttHotkeyIcon();
BLACKMISC_EXPORT BlackMisc::CIcons::IconIndex pttHotkeyIcon();
//! Audio volume + key
BLACKMISC_EXPORT const QString &audioVolumeIncreaseHotkeyAction();
@@ -39,22 +39,22 @@ namespace BlackMisc
BLACKMISC_EXPORT const QString &audioVolumeDecreaseHotkeyAction();
//! Audio icon volume +
BLACKMISC_EXPORT const QPixmap &audioVolumeIncreaseHotkeyIcon();
BLACKMISC_EXPORT BlackMisc::CIcons::IconIndex audioVolumeIncreaseHotkeyIcon();
//! Audio icon volume -
BLACKMISC_EXPORT const QPixmap &audioVolumeDecreaseHotkeyIcon();
BLACKMISC_EXPORT BlackMisc::CIcons::IconIndex audioVolumeDecreaseHotkeyIcon();
//! XPDR state
BLACKMISC_EXPORT const QString &toggleXPDRStateHotkeyAction();
//! XPDR state
BLACKMISC_EXPORT const QPixmap &toggleXPDRStateHotkeyIcon();
BLACKMISC_EXPORT BlackMisc::CIcons::IconIndex toggleXPDRStateHotkeyIcon();
//! XPDR state
BLACKMISC_EXPORT const QString &toggleXPDRIdentHotkeyAction();
//! XPDR ident
BLACKMISC_EXPORT const QPixmap &toggleXPDRIdentHotkeyIcon();
BLACKMISC_EXPORT BlackMisc::CIcons::IconIndex toggleXPDRIdentHotkeyIcon();
} // ns
} // ns