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

@@ -3,32 +3,275 @@
<file>translations/blackmisc_i18n_de.qm</file>
<file>translations/blackmisc_i18n_fr.qm</file>
<file>translations/blackmisc_i18n_en.qm</file>
<file>icons/critical.png</file>
<file>icons/ico_note.png</file>
<file>icons/ico_note_attention.png</file>
<file>icons/information.png</file>
<file>icons/question.png</file>
<file>icons/warning.png</file>
<file>icons/C1.png</file>
<file>icons/C3.png</file>
<file>icons/I1.png</file>
<file>icons/I3.png</file>
<file>icons/MNT.png</file>
<file>icons/OBS.png</file>
<file>icons/S1.png</file>
<file>icons/S2.png</file>
<file>icons/S3.png</file>
<file>icons/SUP.png</file>
<file>icons/aeropuerto.png</file>
<file>icons/tower.png</file>
<file>icons/aircraft_departure.jpg</file>
<file>icons/aircraft_arrival.jpg</file>
<file>icons/sky.jpg</file>
<file>icons/tower_framed.jpg</file>
<file>icons/gnd_framed.jpg</file>
<file>icons/captextonly.png</file>
<file>icons/capunknown.png</file>
<file>icons/capvoice.png</file>
<file>icons/capvoicereceive.png</file>
</qresource>
<qresource prefix="/pastel">
<file>icons/pastel/16/accept.png</file>
<file>icons/pastel/16/add.png</file>
<file>icons/pastel/16/user.png</file>
<file>icons/pastel/16/plugin.png</file>
<file>icons/pastel/16/plugin-add.png</file>
<file>icons/pastel/16/plugin-delete.png</file>
<file>icons/pastel/16/plugin-disabled.png</file>
<file>icons/pastel/16/plugin-edit.png</file>
<file>icons/pastel/16/plugin-error.png</file>
<file>icons/pastel/16/plugin-go.png</file>
<file>icons/pastel/16/plugin-key.png</file>
<file>icons/pastel/16/plugin-link.png</file>
<file>icons/pastel/16/anchor-previous.png</file>
<file>icons/pastel/16/application-add.png</file>
<file>icons/pastel/16/application-cascade.png</file>
<file>icons/pastel/16/application-delete.png</file>
<file>icons/pastel/16/application-double.png</file>
<file>icons/pastel/16/application-tile-horizontal.png</file>
<file>icons/pastel/16/application-tile-vertical.png</file>
<file>icons/pastel/16/application-title-vertical.png</file>
<file>icons/pastel/16/application-view-list.png</file>
<file>icons/pastel/16/application-view-multicolumns.png</file>
<file>icons/pastel/16/application-view-tile.png</file>
<file>icons/pastel/16/application-view-tree.png</file>
<file>icons/pastel/16/cancel.png</file>
<file>icons/pastel/16/close.png</file>
<file>icons/pastel/16/close-red.png</file>
<file>icons/pastel/16/exclamation.png</file>
<file>icons/pastel/16/bullet-error.png</file>
<file>icons/pastel/16/infomation.png</file>
<file>icons/pastel/16/page-information.png</file>
<file>icons/pastel/16/help.png</file>
<file>icons/pastel/16/help-go.png</file>
<file>icons/pastel/16/email.png</file>
<file>icons/pastel/16/application-view-text.png</file>
<file>icons/pastel/16/options-wrench.png</file>
<file>icons/pastel/16/wrench.png</file>
<file>icons/pastel/16/wrench-go.png</file>
<file>icons/pastel/16/wrench-orange.png</file>
<file>icons/pastel/16/font-size.png</file>
<file>icons/pastel/16/table-relationship.png</file>
<file>icons/pastel/16/application-statusbar.png</file>
<file>icons/pastel/16/monitor.png</file>
<file>icons/pastel/16/monitor-error.png</file>
<file>icons/pastel/16/monitor-go.png</file>
<file>icons/pastel/16/monitor-lightning.png</file>
<file>icons/pastel/16/monitor-terminal.png</file>
<file>icons/pastel/16/text-heading-1.png</file>
</qresource>
<qresource prefix="/vatsim">
<file>icons/vatsim/C1.png</file>
<file>icons/vatsim/C3.png</file>
<file>icons/vatsim/I1.png</file>
<file>icons/vatsim/I3.png</file>
<file>icons/vatsim/MNT.png</file>
<file>icons/vatsim/OBS.png</file>
<file>icons/vatsim/S1.png</file>
<file>icons/vatsim/S2.png</file>
<file>icons/vatsim/S3.png</file>
<file>icons/vatsim/SUP.png</file>
</qresource>
<qresource prefix="/diagona">
<file>icons/diagona/icons/application-cloud.png</file>
<file>icons/diagona/icons/application-dock.png</file>
<file>icons/diagona/icons/application-dock-090.png</file>
<file>icons/diagona/icons/application-dock-180.png</file>
<file>icons/diagona/icons/application-dock-270.png</file>
<file>icons/diagona/icons/application-dock-tab.png</file>
<file>icons/diagona/icons/weather.png</file>
<file>icons/diagona/icons/weather-cloud.png</file>
<file>icons/diagona/icons/weather-clouds.png</file>
<file>icons/diagona/icons/weather-cloud-small.png</file>
<file>icons/diagona/icons/weather-cloudy.png</file>
<file>icons/diagona/icons/weather-fog.png</file>
<file>icons/diagona/icons/weather-lightning.png</file>
<file>icons/diagona/icons/weather-moon.png</file>
<file>icons/diagona/icons/weather-moon-clouds.png</file>
<file>icons/diagona/icons/weather-moon-fog.png</file>
<file>icons/diagona/icons/weather-moon-half.png</file>
<file>icons/diagona/icons/weather-rain.png</file>
<file>icons/diagona/icons/weather-rain-little.png</file>
<file>icons/diagona/icons/weather-snow.png</file>
<file>icons/diagona/icons/weather-snowflake.png</file>
<file>icons/diagona/icons/weather-snow-little.png</file>
<file>icons/diagona/icons/weather-tornado.png</file>
<file>icons/diagona/icons/weather-wind.png</file>
<file>icons/diagona/icons/arrow-in-out.png</file>
<file>icons/diagona/icons/arrow-join.png</file>
<file>icons/diagona/icons/arrow-join-090.png</file>
<file>icons/diagona/icons/arrow-join-180.png</file>
<file>icons/diagona/icons/arrow-join-270.png</file>
<file>icons/diagona/icons/arrow-merge.png</file>
<file>icons/diagona/icons/arrow-merge-000-left.png</file>
<file>icons/diagona/icons/arrow-merge-090.png</file>
<file>icons/diagona/icons/arrow-merge-090-left.png</file>
<file>icons/diagona/icons/arrow-merge-180.png</file>
<file>icons/diagona/icons/arrow-merge-180-left.png</file>
<file>icons/diagona/icons/arrow-merge-270.png</file>
<file>icons/diagona/icons/arrow-merge-270-left.png</file>
<file>icons/diagona/icons/arrow-move.png</file>
<file>icons/diagona/icons/user.png</file>
<file>icons/diagona/icons/user-gray.png</file>
<file>icons/diagona/icons/user--minus.png</file>
<file>icons/diagona/icons/user--plus.png</file>
<file>icons/diagona/icons/users.png</file>
<file>icons/diagona/icons/exclamation-circle.png</file>
<file>icons/diagona/icons/exclamation-circle-frame.png</file>
<file>icons/diagona/icons/exclamation-shield-frame.png</file>
<file>icons/diagona/icons/exclamation-shield.png</file>
<file>icons/diagona/icons/exclamation.png</file>
<file>icons/diagona/icons/exclamation-diamond.png</file>
<file>icons/diagona/icons/exclamation-diamond-frame.png</file>
<file>icons/diagona/icons/exclamation--frame.png</file>
<file>icons/diagona/icons/exclamation-octagon.png</file>
<file>icons/diagona/icons/exclamation-octagon-frame.png</file>
<file>icons/diagona/icons/question-button.png</file>
<file>icons/diagona/icons/question-octagon.png</file>
<file>icons/diagona/icons/question-octagon-frame.png</file>
<file>icons/diagona/icons/question-small-white.png</file>
<file>icons/diagona/icons/question-white.png</file>
<file>icons/diagona/icons/question.png</file>
<file>icons/diagona/icons/question-balloon.png</file>
<file>icons/diagona/icons/question-frame.png</file>
<file>icons/diagona/icons/question-small.png</file>
<file>icons/diagona/icons/sort-alphabet.png</file>
<file>icons/diagona/icons/sort-alphabet-column.png</file>
<file>icons/diagona/icons/sort-alphabet-descending.png</file>
<file>icons/diagona/icons/sort--arrow.png</file>
<file>icons/diagona/icons/sort-date.png</file>
<file>icons/diagona/icons/sort-date-descending.png</file>
<file>icons/diagona/icons/sort--exclamation.png</file>
<file>icons/diagona/icons/sort--minus.png</file>
<file>icons/diagona/icons/sort-number.png</file>
<file>icons/diagona/icons/sort-number-column.png</file>
<file>icons/diagona/icons/sort-number-descending.png</file>
<file>icons/diagona/icons/sort--pencil.png</file>
<file>icons/diagona/icons/sort--plus.png</file>
<file>icons/diagona/icons/sort-price.png</file>
<file>icons/diagona/icons/sort-price-descending.png</file>
<file>icons/diagona/icons/sort-quantity.png</file>
<file>icons/diagona/icons/sort-quantity-descending.png</file>
<file>icons/diagona/icons/sort-rating.png</file>
<file>icons/diagona/icons/sort-rating-descending.png</file>
<file>icons/diagona/icons/sort-small.png</file>
<file>icons/diagona/icons/cross-button.png</file>
<file>icons/diagona/icons/cross-white.png</file>
<file>icons/diagona/icons/cross-shield.png</file>
<file>icons/diagona/icons/cross.png</file>
<file>icons/diagona/icons/cross-circle.png</file>
<file>icons/diagona/icons/cross-circle-frame.png</file>
<file>icons/diagona/icons/cross-octagon.png</file>
<file>icons/diagona/icons/cross-octagon-frame.png</file>
<file>icons/diagona/icons/cross-small.png</file>
<file>icons/diagona/icons/speaker-volume.png</file>
<file>icons/diagona/icons/speaker-volume-control.png</file>
<file>icons/diagona/icons/speaker-volume-control-mute.png</file>
<file>icons/diagona/icons/speaker-volume-control-up.png</file>
<file>icons/diagona/icons/speaker-volume-low.png</file>
<file>icons/diagona/icons/speaker-volume-none.png</file>
<file>icons/diagona/icons/arrow-resize.png</file>
<file>icons/diagona/icons/arrow-resize-045.png</file>
<file>icons/diagona/icons/arrow-resize-090.png</file>
<file>icons/diagona/icons/arrow-resize-135.png</file>
<file>icons/diagona/icons/document-resize.png</file>
<file>icons/diagona/icons/document-resize-actual.png</file>
<file>icons/diagona/icons/image-resize.png</file>
<file>icons/diagona/icons/image-resize-actual.png</file>
<file>icons/diagona/icons/ui-panel-resize.png</file>
<file>icons/diagona/icons/ui-panel-resize-actual.png</file>
<file>icons/diagona/icons/radar.png</file>
<file>icons/diagona/icons/paper-plane.png</file>
<file>icons/diagona/icons/paper-plane--arrow.png</file>
<file>icons/diagona/icons/paper-plane--exclamation.png</file>
<file>icons/diagona/icons/paper-plane--minus.png</file>
<file>icons/diagona/icons/paper-plane--pencil.png</file>
<file>icons/diagona/icons/paper-plane--plus.png</file>
<file>icons/diagona/icons/paper-plane-return.png</file>
<file>icons/diagona/icons/table-sheet.png</file>
<file>icons/diagona/icons/joystick.png</file>
<file>icons/diagona/icons/headphone-microphone.png</file>
<file>icons/diagona/icons/microphone.png</file>
<file>icons/diagona/icons/microphone--arrow.png</file>
<file>icons/diagona/icons/microphone--exclamation.png</file>
<file>icons/diagona/icons/microphone--minus.png</file>
<file>icons/diagona/icons/microphone--pencil.png</file>
<file>icons/diagona/icons/microphone--plus.png</file>
<file>icons/diagona/icons/headphone.png</file>
<file>icons/diagona/icons/headphone--arrow.png</file>
<file>icons/diagona/icons/headphone--exclamation.png</file>
<file>icons/diagona/icons/headphone--minus.png</file>
<file>icons/diagona/icons/headphone--pencil.png</file>
<file>icons/diagona/icons/headphone--plus.png</file>
<file>icons/diagona/icons/anchor.png</file>
<file>icons/diagona/icons/android.png</file>
<file>icons/diagona/icons/animal-dog.png</file>
<file>icons/diagona/icons/animal-monkey.png</file>
<file>icons/diagona/icons/animal-penguin.png</file>
<file>icons/diagona/icons/application.png</file>
<file>icons/diagona/icons/application-resize.png</file>
<file>icons/diagona/icons/application-resize-actual.png</file>
<file>icons/diagona/icons/application-resize-full.png</file>
<file>icons/diagona/icons/application-run.png</file>
<file>icons/diagona/icons/application-search-result.png</file>
<file>icons/diagona/icons/compass.png</file>
<file>icons/diagona/icons/compass--arrow.png</file>
<file>icons/diagona/icons/compass--exclamation.png</file>
<file>icons/diagona/icons/compass--minus.png</file>
<file>icons/diagona/icons/compass--pencil.png</file>
<file>icons/diagona/icons/compass--plus.png</file>
</qresource>
<qresource prefix="/own">
<file>icons/own/app.jpg</file>
<file>icons/own/ctr.jpg</file>
<file>icons/own/del.jpg</file>
<file>icons/own/gnd.jpg</file>
<file>icons/own/pilot.png</file>
<file>icons/own/logingreen.png</file>
<file>icons/own/loginred.png</file>
<file>icons/own/loginyellow.png</file>
<file>icons/own/attitude_indicator_climbing_16.png</file>
<file>icons/own/attitude_indicator_climbing_24.png</file>
<file>icons/own/attitude_indicator_descend_right_turn_16.png</file>
<file>icons/own/attitude_indicator_descend_right_turn_24.png</file>
<file>icons/own/swift/swift24.png</file>
<file>icons/own/swift/swift48.png</file>
<file>icons/own/swift/swiftCartoonNova24.png</file>
<file>icons/own/swift/swiftCartoonNova48.png</file>
<file>icons/own/twr.jpg</file>
</qresource>
<qresource prefix="/qled">
<file>icons/qled/circle_black.svg</file>
<file>icons/qled/circle_blue.svg</file>
<file>icons/qled/circle_green.svg</file>
<file>icons/qled/circle_grey.svg</file>
<file>icons/qled/circle_orange.svg</file>
<file>icons/qled/circle_purple.svg</file>
<file>icons/qled/circle_red.svg</file>
<file>icons/qled/circle_yellow.svg</file>
<file>icons/qled/led_triangular_1_green.svg</file>
<file>icons/qled/led_triangular_1_grey.svg</file>
<file>icons/qled/led_triangular_1_red.svg</file>
<file>icons/qled/molumen_multicolor_power_buttons.svg</file>
<file>icons/qled/qled.png</file>
<file>icons/qled/rect_green.svg</file>
<file>icons/qled/rect_grey.svg</file>
<file>icons/qled/round_blue.svg</file>
<file>icons/qled/round_green.svg</file>
<file>icons/qled/round_grey.svg</file>
<file>icons/qled/round_orange.svg</file>
<file>icons/qled/round_purple.svg</file>
<file>icons/qled/round_red.svg</file>
<file>icons/qled/round_yellow.svg</file>
<file>icons/qled/screenshot.png</file>
<file>icons/qled/screenshot2.png</file>
<file>icons/qled/square_blue.svg</file>
<file>icons/qled/square_green.svg</file>
<file>icons/qled/square_grey.svg</file>
<file>icons/qled/square_orange.svg</file>
<file>icons/qled/square_purple.svg</file>
<file>icons/qled/square_red.svg</file>
<file>icons/qled/square_yellow.svg</file>
<file>icons/qled/triang_blue.svg</file>
<file>icons/qled/triang_green.svg</file>
<file>icons/qled/triang_grey.svg</file>
<file>icons/qled/triang_orange.svg</file>
<file>icons/qled/triang_purple.svg</file>
<file>icons/qled/triang_red.svg</file>
<file>icons/qled/triang_yellow.svg</file>
</qresource>
</RCC>

View File

@@ -0,0 +1,203 @@
/* Copyright (C) 2013
* Swift Project Community / Contributors
*
* This file is part of Swift Project. It is subject to the license terms in the LICENSE file found in the top-level
* directory of this distribution and at http://www.swift-project.org/license.html. No part of Swift Project,
* including this file, may be copied, modified, propagated, or distributed except according to the terms
* contained in the LICENSE file.
*/
#ifndef BLACKMISC_ICONSNETWORK_H
#define BLACKMISC_ICONSNETWORK_H
#include <QPixmap>
#include "iconsstandard.h"
//! \file
namespace BlackMisc
{
//! Standard icons
class CIconsNetworkAndAviation
{
private:
//! Constructor, use class static only
CIconsNetworkAndAviation();
public:
//! C1
static const QPixmap &roleC1()
{
static const QPixmap pm(":/vatsim/icons/vatsim/C1.png");
return pm;
}
//! C2
static const QPixmap &roleC2()
{
static const QPixmap pm(":/vatsim/icons/vatsim/C2.png");
return pm;
}
//! C3
static const QPixmap &roleC3()
{
static const QPixmap pm(":/vatsim/icons/vatsim/C2.png");
return pm;
}
//! S1
static const QPixmap &roleS1()
{
static const QPixmap pm(":/vatsim/icons/vatsim/S1.png");
return pm;
}
//! S2
static const QPixmap &roleS2()
{
static const QPixmap pm(":/vatsim/icons/vatsim/S2.png");
return pm;
}
//! S3
static const QPixmap &roleS3()
{
static const QPixmap pm(":/vatsim/icons/vatsim/S3.png");
return pm;
}
//! I1
static const QPixmap &roleI1()
{
static const QPixmap pm(":/vatsim/icons/vatsim/I1.png");
return pm;
}
//! I3
static const QPixmap &roleI3()
{
static const QPixmap pm(":/vatsim/icons/vatsim/I3.png");
return pm;
}
//! MNT
static const QPixmap &roleMnt()
{
static const QPixmap pm(":/vatsim/icons/vatsim/MNT.png");
return pm;
}
//! OBS
static const QPixmap &roleObs()
{
static const QPixmap pm(":/vatsim/icons/vatsim/OBS.png");
return pm;
}
//! SUP
static const QPixmap &roleSup()
{
static const QPixmap pm(":/vatsim/icons/vatsim/SUP.png");
return pm;
}
//! Pilot
static const QPixmap &rolePilot()
{
static const QPixmap pm(QPixmap(":/own/icons/own/pilot.png").scaledToWidth(16, Qt::SmoothTransformation));
return pm;
}
//! Approach
static const QPixmap &roleApproach()
{
static const QPixmap pm(QPixmap(":/own/icons/own/app.jpg").scaledToWidth(16, Qt::SmoothTransformation));
return pm;
}
//! Ground
static const QPixmap &roleGround()
{
static const QPixmap pm(QPixmap(":/own/icons/own/gnd.jpg").scaledToWidth(16, Qt::SmoothTransformation));
return pm;
}
//! Delivery
static const QPixmap &roleDelivery()
{
static const QPixmap pm(QPixmap(":/own/icons/own/del.jpg").scaledToWidth(16, Qt::SmoothTransformation));
return pm;
}
//! Tower
static const QPixmap &roleTower()
{
static const QPixmap pm(QPixmap(":/own/icons/own/twr.jpg").scaledToWidth(16, Qt::SmoothTransformation));
return pm;
}
//! Center
static const QPixmap &roleCenter()
{
static const QPixmap pm(QPixmap(":/own/icons/own/ctr.jpg").scaledToWidth(16, Qt::SmoothTransformation));
return pm;
}
//! Unknown
static const QPixmap &roleUnknown()
{
static const QPixmap pm(":/pastel/icons/pastel/16/help.png");
return pm;
}
//! Connected
static const QPixmap &statusConnected()
{
static const QPixmap pm(":/own/icons/own/logingreen.png");
return pm;
}
//! Disconnected
static const QPixmap &statusDisconnected()
{
static const QPixmap pm(":/own/icons/own/loginred.png");
return pm;
}
//! Transition
static const QPixmap &statusTransition()
{
static const QPixmap pm(":/own/icons/own/loginyellow.png");
return pm;
}
//! Full voice capability
static const QPixmap &capabilityVoice()
{
static const QPixmap pm(":/diagona/icons/diagona/icons/headphone.png");
return pm;
}
//! Voice receive only
static const QPixmap &capabilityVoiceReceiveOnly()
{
static const QPixmap pm(":/diagona/icons/diagona/icons/headphone.png");
return pm;
}
//! Text only
static const QPixmap &capabilityTextOnly()
{
return CIconsStandard::appTextMessages16();
}
//! Text only
static const QPixmap &capabilityUnknown()
{
return CIconsStandard::unknown16();
}
};
}
#endif // guard

View File

@@ -0,0 +1,321 @@
/* Copyright (C) 2013
* Swift Project Community / Contributors
*
* This file is part of Swift Project. It is subject to the license terms in the LICENSE file found in the top-level
* directory of this distribution and at http://www.swift-project.org/license.html. No part of Swift Project,
* including this file, may be copied, modified, propagated, or distributed except according to the terms
* contained in the LICENSE file.
*/
#ifndef BLACKMISC_ICONSSTANDARD_H
#define BLACKMISC_ICONSSTANDARD_H
#include <QPixmap>
//! \file
namespace BlackMisc
{
//! Standard icons
class CIconsStandard
{
private:
//! Constructor, use class static only
CIconsStandard();
public:
//! Info
static const QPixmap &info16()
{
static const QPixmap pm(":/pastel/icons/pastel/16/infomation.png");
return pm;
}
//! Warning
static const QPixmap &warning16()
{
static const QPixmap pm(":/pastel/icons/pastel/16/bullet-error.png");
return pm;
}
//! Error
static const QPixmap &error16()
{
static const QPixmap pm(":/pastel/icons/pastel/16/close-red.png");
return pm;
}
//! Close
static const QPixmap &close16()
{
static const QPixmap pm(":/diagona/icons/diagona/icons/cross-button.png");
return pm;
}
//! Resize
static const QPixmap &resize16()
{
static const QPixmap pm(":/diagona/icons/diagona/icons/arrow-resize-135.png");
return pm;
}
//! Text
static const QPixmap &text16()
{
static const QPixmap pm(":/pastel/icons/pastel/16/application-view-text.png");
return pm;
}
//! Heading 1
static const QPixmap &headingOne16()
{
static const QPixmap pm(":/pastel/icons/pastel/16/text-heading-1.png");
return pm;
}
//! User
static const QPixmap &user16()
{
static const QPixmap pm(":/pastel/icons/pastel/16/user.png");
return pm;
}
//! Users
static const QPixmap &users16()
{
static const QPixmap pm(":/diagona/icons/diagona/icons/users.png");
return pm;
}
//! Joystick
static const QPixmap &joystick16()
{
static const QPixmap pm(":/diagona/icons/diagona/icons/joystick.png");
return pm;
}
//! Plugin
static const QPixmap &plugin16()
{
static const QPixmap pm(":/pastel/icons/pastel/16/plugin.png");
return pm;
}
//! Docking
static const QPixmap &dockTop16()
{
static const QPixmap pm(":/diagona/icons/diagona/icons/application-dock-090.png");
return pm;
}
//! Docking
static const QPixmap &dockBottom16()
{
static const QPixmap pm(":/diagona/icons/diagona/icons/application-dock-270.png");
return pm;
}
//! Float all
static const QPixmap &floatAll16()
{
static const QPixmap pm(":/pastel/icons/pastel/16/application-cascade.png");
return pm;
}
//! Float all
static const QPixmap &floatOne16()
{
static const QPixmap pm(":/pastel/icons/pastel/16/application-double.png");
return pm;
}
//! Sound volume high
static const QPixmap &volumneHigh16()
{
static const QPixmap pm(":/diagona/icons/diagona/icons/speaker-volume.png");
return pm;
}
//! Sound volume low
static const QPixmap &volumneLow16()
{
static const QPixmap pm(":/diagona/icons/diagona/icons/speaker-volume-low.png");
return pm;
}
//! Sound volume muted
static const QPixmap &volumneMuted16()
{
static const QPixmap pm(":/diagona/icons/diagona/icons/speaker-volume-control-mute.png");
return pm;
}
//! Wrench
static const QPixmap &wrench16()
{
static const QPixmap pm(":/pastel/icons/pastel/16/wrench.png");
return pm;
}
//! Radar
static const QPixmap &radar16()
{
static const QPixmap pm(":/diagona/icons/diagona/icons/radar.png");
return pm;
}
//! Radar
static const QPixmap &tableRelationship16()
{
static const QPixmap pm(":/pastel/icons/pastel/16/table-relationship.png");
return pm;
}
//! Paper plane
static const QPixmap &paperPlane16()
{
static const QPixmap pm(":/diagona/icons/diagona/icons/paper-plane.png");
return pm;
}
//! Table sheet
static const QPixmap &tableSheet16()
{
static const QPixmap pm(":/diagona/icons/diagona/icons/table-sheet.png");
return pm;
}
//! Clouds
static const QPixmap &weatherCloudy16()
{
static const QPixmap pm(":/diagona/icons/diagona/icons/weather-cloudy.png");
return pm;
}
//! Monitor error
static const QPixmap &monitorError16()
{
static const QPixmap pm(":/pastel/icons/pastel/16/monitor-error.png");
return pm;
}
//! Status bar
static const QPixmap &statusBar16()
{
static const QPixmap pm(":/pastel/icons/pastel/16/application-statusbar.png");
return pm;
}
//! Unknown
static const QPixmap &unknown16()
{
static const QPixmap pm(":/pastel/icons/pastel/16/help.png");
return pm;
}
//! Empty icon
static const QPixmap &empty()
{
static const QPixmap pm;
return pm;
}
//! Empty icon
static const QPixmap &empty16()
{
static const QPixmap pm(16, 16);
return pm;
}
//! swift icon
static const QPixmap &swift24()
{
static const QPixmap pm(":/own/icons/own/swift/swift24.png");
return pm;
}
//! swift icon
static const QPixmap &swift48()
{
static const QPixmap pm(":/own/icons/own/swift/swift48.png");
return pm;
}
//! swift icon (nova)
static const QPixmap &swiftNova24()
{
static const QPixmap pm(":/own/icons/own/swift/swiftCartoonNova24.png");
return pm;
}
//! swift icon (nova)
static const QPixmap &swiftNova48()
{
static const QPixmap pm(":/own/icons/own/swift/swiftCartoonNova48.png");
return pm;
}
//! Application weather
static const QPixmap &appWeather16()
{
return weatherCloudy16();
}
//! Application settings
static const QPixmap &appSettings16()
{
return wrench16();
}
//! Application users
static const QPixmap &appUsers16()
{
return users16();
}
//! Application flight plan
static const QPixmap &appFlightplan16()
{
return tableSheet16();
}
//! Application simulator
static const QPixmap &appSimulator16()
{
return joystick16();
}
//! Application text messages
static const QPixmap &appTextMessages16()
{
return text16();
}
//! Application ATC
static const QPixmap &appAtc16()
{
return radar16();
}
//! Application aircrafts
static const QPixmap &appAircrafts16()
{
return paperPlane16();
}
//! Application mappings
static const QPixmap &appMappings16()
{
return tableRelationship16();
}
//! Application log/status messages
static const QPixmap &appLog16()
{
return monitorError16();
}
};
}
#endif // guard

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

View File

@@ -9,6 +9,7 @@
#include "statusmessage.h"
#include "blackmiscfreefunctions.h"
#include "iconsstandard.h"
#include <QMetaEnum>
namespace BlackMisc
@@ -110,15 +111,12 @@ namespace BlackMisc
*/
const QPixmap &CStatusMessage::convertToIcon(const CStatusMessage &statusMessage)
{
static const QPixmap w(QPixmap(":/blackmisc/icons/warning.png").scaledToWidth(16, Qt::SmoothTransformation));
static const QPixmap e(QPixmap(":/blackmisc/icons/critical.png").scaledToWidth(16, Qt::SmoothTransformation));
static const QPixmap i(QPixmap(":/blackmisc/icons/information.png").scaledToWidth(16, Qt::SmoothTransformation));
switch (statusMessage.getSeverity())
{
case SeverityInfo: return i;
case SeverityWarning: return w;
case SeverityError: return e;
default: return i;
case SeverityInfo: return CIconsStandard::info16();
case SeverityWarning: return CIconsStandard::warning16();
case SeverityError: return CIconsStandard::error16();
default: return CIconsStandard::info16();
}
}