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

refs #452, added icons to blackmisc

Browse Source
This commit is contained in:
Klaus Basan
2015-09-23 02:48:34 +02:00
committed by Mathew Sutcliffe
parent abd1927eb9
commit 7ca06c196d
17 changed files with 916 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/blackmisc/icon.h
View File

@@ -53,8 +53,8 @@ namespace BlackMisc
* the derived class uses this macro to disambiguate the inherited members.
*/
# define BLACKMISC_DECLARE_USING_MIXIN_ICON(DERIVED) \
using ::BlackMisc::Mixin::Icon<DERIVED>::toIcon; \
using ::BlackMisc::Mixin::Icon<DERIVED>::toPixmap;
using ::BlackMisc::Mixin::Icon<DERIVED>::toIcon; \
using ::BlackMisc::Mixin::Icon<DERIVED>::toPixmap;
} // Mixin
//! Value object for icons. An icon is stored in the global icon repository and
@@ -75,14 +75,31 @@ namespace BlackMisc
CIcon() = default;
//! Constructor.
CIcon(CIcons::IconIndex index, const QString &descriptiveText) :
m_index(static_cast<int>(index)), m_descriptiveText(descriptiveText) {}
CIcon(CIcons::IconIndex index, const QString &descriptiveText);
//! Constructor for generated icon
CIcon(const QPixmap &pixmap, const QString &descriptiveText);
//! Construcror for file icons
CIcon(const QString &resourceFilePath, const QString &descriptiveText);
//! Get descriptive text
const QString &getDescriptiveText() const { return this->m_descriptiveText; }
//! Index
CIcons::IconIndex getIndex() const { return static_cast< CIcons::IconIndex>(this->m_index);}
CIcons::IconIndex getIndex() const;
//! Index based
bool isIndexBased() const;
//! Generated icon
bool isGenerated() const;
//! File based?
bool isFileBased() const;
//! Icon set?
bool isSet() const;
//! Corresponding pixmap
QPixmap toPixmap() const;
@@ -90,9 +107,6 @@ namespace BlackMisc
//! A QIcon
QIcon toQIcon() const;
//! Icon set?
bool isSet() const { return (this->m_index != static_cast<int>(CIcons::NotSet));}
//! Rotate by n degrees
void setRotation(int degrees) { this->m_rotateDegrees = degrees; }
@@ -117,8 +131,9 @@ namespace BlackMisc
private:
BLACK_ENABLE_TUPLE_CONVERSION(CIcon)
int m_index = static_cast<int>(CIcons::NotSet);
int m_rotateDegrees = 0;
QString m_descriptiveText;
int m_rotateDegrees = 0; //!< Rotation
QString m_descriptiveText; //!< what does it represent?
QPixmap m_pixmap; //!< Used with generated pixmaps, when not used with index
};
namespace Private
@@ -142,7 +157,12 @@ namespace BlackMisc
}
} // namespace
BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::CIcon, (o.m_index, o.m_descriptiveText))
BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::CIcon, (
attr(o.m_index),
attr(o.m_rotateDegrees, flags < DisabledForComparison | DisabledForHashing > ()),
attr(o.m_descriptiveText)
))
Q_DECLARE_METATYPE(BlackMisc::CIcon)
#endif // guard