refs #304, centralized icons

* icons which can be rotated
* provide metadata
* integrated in CValueObjects
* added SVG support
This commit is contained in:
Klaus Basan
2014-08-02 19:08:17 +02:00
parent 6d5461cff8
commit 5873ec9359
31 changed files with 1262 additions and 564 deletions

View File

@@ -9,7 +9,7 @@
#include "blackmisc/nwvoicecapabilities.h"
#include "blackmisc/blackmiscfreefunctions.h"
#include "blackmisc/iconsnetwork.h"
#include "blackmisc/iconlist.h"
#include <tuple>
using namespace BlackMisc;
@@ -119,25 +119,28 @@ namespace BlackMisc
}
/*
* Equal?
* Icon
*/
const QPixmap &CVoiceCapabilities::toIcon() const
CIcon CVoiceCapabilities::toIcon() const
{
switch (this->m_voiceCapabilities)
{
case Voice:
return CIconsNetworkAndAviation::capabilityVoice();
return CIconList::iconForIndex(CIcons::NetworkCapabilityVoice);
case TextOnly:
return CIconsNetworkAndAviation::capabilityTextOnly();
return CIconList::iconForIndex(CIcons::NetworkCapabilityTextOnly);
case Unknown:
return CIconsNetworkAndAviation::capabilityUnknown();
return CIconList::iconForIndex(CIcons::NetworkCapabilityUnknown);
case VoiceReceivingOnly:
return CIconsNetworkAndAviation::capabilityVoiceReceiveOnly();
return CIconList::iconForIndex(CIcons::NetworkCapabilityVoiceReceiveOnly);
}
Q_ASSERT("Wrong index");
return CIconsNetworkAndAviation::capabilityVoiceReceiveOnly(); // never reached
return CIconList::iconForIndex(CIcons::NetworkCapabilityUnknown); // never reached
}
/*
* Equal?
*/
bool CVoiceCapabilities::operator ==(const CVoiceCapabilities &other) const
{
if (this == &other) return true;