aboutsummaryrefslogtreecommitdiffstats
path: root/ui/qt/stock_icon.cpp
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2014-11-18 16:21:42 -0800
committerGerald Combs <gerald@wireshark.org>2014-12-09 21:25:33 +0000
commit4921e559906aee70c4665f1c739057e227787e01 (patch)
tree4465cb9e9de152bfb57f00852e437994e2d85cd9 /ui/qt/stock_icon.cpp
parent3147087de323c0294b51006f97b641fc408f1b06 (diff)
Qt: Initial VoIP Calls dialog.
Add Telephony menu items for VoIP Calls and SIP Flows. Put VoIP Calls at the top, since that seems to be the primary item. Add configure-time checks for QtMultimediaWidgets in anticipation of adding a VoIP playback dialog. Add an icon for the playback button. (Yes, I've been avoiding GNOME-level gratuitous icons so far but this is one of the rare occiasions where it makes sense.) Add a help link define for the VoIP calls dialog. Change-Id: I5d0799685c598ad9af76fe9667f8ea7d14b66050 Reviewed-on: https://code.wireshark.org/review/5674 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt/stock_icon.cpp')
-rw-r--r--ui/qt/stock_icon.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/ui/qt/stock_icon.cpp b/ui/qt/stock_icon.cpp
index 03c50e0325..86e953e3dd 100644
--- a/ui/qt/stock_icon.cpp
+++ b/ui/qt/stock_icon.cpp
@@ -75,15 +75,16 @@ StockIcon::StockIcon(const char *icon_name) :
#endif
return;
} else {
- QStringList types = QStringList() << "16x16" << "24x24";
+ QStringList types = QStringList() << "12x12" << "16x16" << "24x24";
foreach (QString type, types) {
- // Along with each name check for "<name>.on" to use for the on (checked) state.
- // XXX Add checks for each combination of QIcon::Mode + QIcon::State
QString icon_path = path_pfx_ + QString("%1/%2.png").arg(type).arg(icon_name);
- QString icon_path_on = path_pfx_ + QString("%1/%2.on.png").arg(type).arg(icon_name);
if (QFile::exists(icon_path)) {
addFile(icon_path);
}
+
+ // Along with each name check for "<name>.on" to use for the on (checked) state.
+ // XXX Add checks for each combination of QIcon::Mode + QIcon::State
+ QString icon_path_on = path_pfx_ + QString("%1/%2.on.png").arg(type).arg(icon_name);
if (QFile::exists(icon_path_on)) {
addFile(icon_path_on, QSize(), QIcon::Normal, QIcon::On);
}