refs #304, centralized icons

This commit is contained in:
Klaus Basan
2014-07-27 03:19:41 +02:00
parent 8a5a268a77
commit 878e800ba0
5 changed files with 807 additions and 44 deletions

View File

@@ -9,8 +9,11 @@
#include "blackmisc/nwvoicecapabilities.h"
#include "blackmisc/blackmiscfreefunctions.h"
#include "blackmisc/iconsnetwork.h"
#include <tuple>
using namespace BlackMisc;
namespace BlackMisc
{
namespace Network
@@ -120,24 +123,19 @@ namespace BlackMisc
*/
const QPixmap &CVoiceCapabilities::toIcon() const
{
static const QPixmap v(QPixmap(":/blackmisc/icons/capvoice.png").scaledToWidth(16, Qt::SmoothTransformation));
static const QPixmap t(QPixmap(":/blackmisc/icons/captextonly.png").scaledToWidth(16, Qt::SmoothTransformation));
static const QPixmap u(QPixmap(":/blackmisc/icons/capunknown.png").scaledToWidth(16, Qt::SmoothTransformation));
static const QPixmap r(QPixmap(":/blackmisc/icons/capvoicereceive.png").scaledToWidth(16, Qt::SmoothTransformation));
switch (this->m_voiceCapabilities)
{
case Voice:
return v;
return CIconsNetworkAndAviation::capabilityVoice();
case TextOnly:
return t;
return CIconsNetworkAndAviation::capabilityTextOnly();
case Unknown:
return u;
return CIconsNetworkAndAviation::capabilityUnknown();
case VoiceReceivingOnly:
return r;
return CIconsNetworkAndAviation::capabilityVoiceReceiveOnly();
}
Q_ASSERT("Wrong index");
return u; // never reached
return CIconsNetworkAndAviation::capabilityVoiceReceiveOnly(); // never reached
}
bool CVoiceCapabilities::operator ==(const CVoiceCapabilities &other) const