From 2603cf2088e0b032be3ea0cca3a823e0868064f4 Mon Sep 17 00:00:00 2001 From: narunlifescience Date: Mon, 30 Nov 2015 23:43:26 -0600 Subject: [PATCH] use iconloader & cleanup previous remnants update --- src/globalsearch/globalsearchsettingspage.ui | 7 ------- src/internet/amazon/amazonsettingspage.ui | 7 ------- src/internet/amazon/amazonurlhandler.h | 3 ++- src/internet/box/boxsettingspage.ui | 7 ------- src/internet/box/boxurlhandler.h | 3 ++- src/internet/core/internetshowsettingspage.ui | 7 ------- src/internet/dropbox/dropboxsettingspage.ui | 7 ------- src/internet/dropbox/dropboxurlhandler.h | 3 ++- .../googledrive/googledrivesettingspage.ui | 7 ------- .../googledrive/googledriveurlhandler.h | 3 ++- src/internet/lastfm/lastfmurlhandler.h | 3 ++- .../magnatune/magnatunedownloaddialog.cpp | 4 ++++ .../magnatune/magnatunedownloaddialog.ui | 7 ------- src/internet/magnatune/magnatuneurlhandler.h | 3 ++- src/internet/podcasts/addpodcastbyurl.ui | 7 ------- src/internet/podcasts/gpoddersearchpage.ui | 7 ------- src/internet/podcasts/itunessearchpage.ui | 7 ------- src/internet/podcasts/podcastsettingspage.ui | 7 ------- src/internet/seafile/seafileurlhandler.h | 3 ++- src/internet/skydrive/skydrivesettingspage.ui | 7 ------- src/internet/skydrive/skydriveurlhandler.h | 3 ++- .../soundcloud/soundcloudsettingspage.ui | 7 ------- src/internet/spotify/spotifysettingspage.ui | 4 ++-- src/internet/subsonic/subsonicurlhandler.h | 3 ++- src/internet/vk/vksettingspage.ui | 7 ------- src/internet/vk/vkurlhandler.h | 4 +++- src/ui/edittagdialog.cpp | 4 ++++ src/ui/edittagdialog.ui | 4 ---- src/ui/mainwindow.cpp | 1 + src/ui/mainwindow.ui | 8 ++------ src/widgets/loginstatewidget.cpp | 6 ++++++ src/widgets/loginstatewidget.ui | 18 +++--------------- src/widgets/osd.cpp | 4 +++- src/wiimotedev/wiimotesettingspage.cpp | 6 ++++++ src/wiimotedev/wiimotesettingspage.ui | 12 ------------ src/wiimotedev/wiimoteshortcutgrabber.cpp | 3 +++ src/wiimotedev/wiimoteshortcutgrabber.ui | 7 ------- 37 files changed, 55 insertions(+), 155 deletions(-) diff --git a/src/globalsearch/globalsearchsettingspage.ui b/src/globalsearch/globalsearchsettingspage.ui index 528964fde..5e3d34240 100644 --- a/src/globalsearch/globalsearchsettingspage.ui +++ b/src/globalsearch/globalsearchsettingspage.ui @@ -13,10 +13,6 @@ Search - - - :/icons/32x32/search.png:/icons/32x32/search.png - @@ -141,8 +137,5 @@ show_providers show_suggestions - - - diff --git a/src/internet/amazon/amazonsettingspage.ui b/src/internet/amazon/amazonsettingspage.ui index adf43a500..0b6e6fa52 100644 --- a/src/internet/amazon/amazonsettingspage.ui +++ b/src/internet/amazon/amazonsettingspage.ui @@ -13,10 +13,6 @@ Amazon Cloud Drive - - - :/providers/amazonclouddrive.png:/providers/amazonclouddrive.png - @@ -103,8 +99,5 @@ 1 - - - diff --git a/src/internet/amazon/amazonurlhandler.h b/src/internet/amazon/amazonurlhandler.h index 807f24732..513d963c1 100644 --- a/src/internet/amazon/amazonurlhandler.h +++ b/src/internet/amazon/amazonurlhandler.h @@ -19,6 +19,7 @@ #define INTERNET_AMAZON_AMAZONURLHANDLER_H_ #include "core/urlhandler.h" +#include "ui/iconloader.h" class AmazonCloudDrive; @@ -29,7 +30,7 @@ class AmazonUrlHandler : public UrlHandler { AmazonCloudDrive* service, QObject* parent = nullptr); QString scheme() const { return "amazonclouddrive"; } - QIcon icon() const { return QIcon(":providers/amazonclouddrive.png"); } + QIcon icon() const { return IconLoader::Load("amazonclouddrive", IconLoader::Provider); } LoadResult StartLoading(const QUrl& url); private: diff --git a/src/internet/box/boxsettingspage.ui b/src/internet/box/boxsettingspage.ui index 45352db8c..c18021a9c 100644 --- a/src/internet/box/boxsettingspage.ui +++ b/src/internet/box/boxsettingspage.ui @@ -13,10 +13,6 @@ Box - - - :/providers/box.png:/providers/box.png - @@ -103,8 +99,5 @@ 1 - - - diff --git a/src/internet/box/boxurlhandler.h b/src/internet/box/boxurlhandler.h index 770b18119..b58771585 100644 --- a/src/internet/box/boxurlhandler.h +++ b/src/internet/box/boxurlhandler.h @@ -20,6 +20,7 @@ #define INTERNET_BOX_BOXURLHANDLER_H_ #include "core/urlhandler.h" +#include "ui/iconloader.h" class BoxService; @@ -30,7 +31,7 @@ class BoxUrlHandler : public UrlHandler { explicit BoxUrlHandler(BoxService* service, QObject* parent = nullptr); QString scheme() const { return "box"; } - QIcon icon() const { return QIcon(":/providers/box.png"); } + QIcon icon() const { return IconLoader::Load("box", IconLoader::Provider); } LoadResult StartLoading(const QUrl& url); private: diff --git a/src/internet/core/internetshowsettingspage.ui b/src/internet/core/internetshowsettingspage.ui index 7b019a029..88fae1d80 100644 --- a/src/internet/core/internetshowsettingspage.ui +++ b/src/internet/core/internetshowsettingspage.ui @@ -13,10 +13,6 @@ Internet services - - - :/icons/32x32/internet-services.png:/icons/32x32/internet-services.png - @@ -75,8 +71,5 @@ sources - - - diff --git a/src/internet/dropbox/dropboxsettingspage.ui b/src/internet/dropbox/dropboxsettingspage.ui index 07b9b458b..fea285e77 100644 --- a/src/internet/dropbox/dropboxsettingspage.ui +++ b/src/internet/dropbox/dropboxsettingspage.ui @@ -13,10 +13,6 @@ Dropbox - - - :/providers/dropbox.png:/providers/dropbox.png - @@ -103,8 +99,5 @@ 1 - - - diff --git a/src/internet/dropbox/dropboxurlhandler.h b/src/internet/dropbox/dropboxurlhandler.h index c18e113a9..95928b103 100644 --- a/src/internet/dropbox/dropboxurlhandler.h +++ b/src/internet/dropbox/dropboxurlhandler.h @@ -20,6 +20,7 @@ #define INTERNET_DROPBOX_DROPBOXURLHANDLER_H_ #include "core/urlhandler.h" +#include "ui/iconloader.h" class DropboxService; @@ -29,7 +30,7 @@ class DropboxUrlHandler : public UrlHandler { explicit DropboxUrlHandler(DropboxService* service, QObject* parent = nullptr); QString scheme() const { return "dropbox"; } - QIcon icon() const { return QIcon(":providers/dropbox.png"); } + QIcon icon() const { return IconLoader::Load("dropbox", IconLoader::Provider); } LoadResult StartLoading(const QUrl& url); private: diff --git a/src/internet/googledrive/googledrivesettingspage.ui b/src/internet/googledrive/googledrivesettingspage.ui index 65d3638aa..bd1a92db1 100644 --- a/src/internet/googledrive/googledrivesettingspage.ui +++ b/src/internet/googledrive/googledrivesettingspage.ui @@ -13,10 +13,6 @@ Google Drive - - - :/providers/googledrive.png:/providers/googledrive.png - @@ -103,8 +99,5 @@ 1 - - - diff --git a/src/internet/googledrive/googledriveurlhandler.h b/src/internet/googledrive/googledriveurlhandler.h index 131b09c8e..81faedfed 100644 --- a/src/internet/googledrive/googledriveurlhandler.h +++ b/src/internet/googledrive/googledriveurlhandler.h @@ -20,6 +20,7 @@ #define INTERNET_GOOGLEDRIVE_GOOGLEDRIVEURLHANDLER_H_ #include "core/urlhandler.h" +#include "ui/iconloader.h" class GoogleDriveService; @@ -30,7 +31,7 @@ class GoogleDriveUrlHandler : public UrlHandler { explicit GoogleDriveUrlHandler(GoogleDriveService* service, QObject* parent = nullptr); QString scheme() const { return "googledrive"; } - QIcon icon() const { return QIcon(":providers/googledrive.png"); } + QIcon icon() const { return IconLoader::Load("googledrive", IconLoader::Provider); } LoadResult StartLoading(const QUrl& url); private: diff --git a/src/internet/lastfm/lastfmurlhandler.h b/src/internet/lastfm/lastfmurlhandler.h index 9f90210f1..1819cef14 100644 --- a/src/internet/lastfm/lastfmurlhandler.h +++ b/src/internet/lastfm/lastfmurlhandler.h @@ -21,6 +21,7 @@ #define INTERNET_LASTFM_LASTFMURLHANDLER_H_ #include "core/urlhandler.h" +#include "ui/iconloader.h" class LastFMService; @@ -31,7 +32,7 @@ class LastFMUrlHandler : public UrlHandler { LastFMUrlHandler(LastFMService* service, QObject* parent); QString scheme() const { return "lastfm"; } - QIcon icon() const { return QIcon(":last.fm/as.png"); } + QIcon icon() const { return IconLoader::Load("as", IconLoader::Lastfm); } LoadResult StartLoading(const QUrl& url); LoadResult LoadNext(const QUrl& url); diff --git a/src/internet/magnatune/magnatunedownloaddialog.cpp b/src/internet/magnatune/magnatunedownloaddialog.cpp index c502a0682..eabbee318 100644 --- a/src/internet/magnatune/magnatunedownloaddialog.cpp +++ b/src/internet/magnatune/magnatunedownloaddialog.cpp @@ -38,6 +38,7 @@ #include "core/logging.h" #include "core/network.h" #include "core/utilities.h" +#include "ui/iconloader.h" #include "widgets/progressitemdelegate.h" MagnatuneDownloadDialog::MagnatuneDownloadDialog(MagnatuneService* service, @@ -49,6 +50,9 @@ MagnatuneDownloadDialog::MagnatuneDownloadDialog(MagnatuneService* service, current_reply_(nullptr), next_row_(0) { ui_->setupUi(this); + + setWindowIcon(IconLoader::Load("magnatune", IconLoader::Provider)); + ui_->albums->header()->setResizeMode(QHeaderView::ResizeToContents); ui_->albums->header()->setResizeMode(1, QHeaderView::Fixed); ui_->albums->header()->resizeSection(1, 150); diff --git a/src/internet/magnatune/magnatunedownloaddialog.ui b/src/internet/magnatune/magnatunedownloaddialog.ui index 4060de14e..d51d3ea96 100644 --- a/src/internet/magnatune/magnatunedownloaddialog.ui +++ b/src/internet/magnatune/magnatunedownloaddialog.ui @@ -13,10 +13,6 @@ Magnatune Download - - - :/providers/magnatune.png:/providers/magnatune.png - @@ -136,9 +132,6 @@ browse button_box - - - button_box diff --git a/src/internet/magnatune/magnatuneurlhandler.h b/src/internet/magnatune/magnatuneurlhandler.h index fae06385b..47eab5a6c 100644 --- a/src/internet/magnatune/magnatuneurlhandler.h +++ b/src/internet/magnatune/magnatuneurlhandler.h @@ -21,6 +21,7 @@ #define INTERNET_MAGNATUNE_MAGNATUNEURLHANDLER_H_ #include "core/urlhandler.h" +#include "ui/iconloader.h" class MagnatuneService; @@ -29,7 +30,7 @@ class MagnatuneUrlHandler : public UrlHandler { MagnatuneUrlHandler(MagnatuneService* service, QObject* parent); QString scheme() const { return "magnatune"; } - QIcon icon() const { return QIcon(":providers/magnatune.png"); } + QIcon icon() const { return IconLoader::Load("magnatune", IconLoader::Provider); } LoadResult StartLoading(const QUrl& url); private: diff --git a/src/internet/podcasts/addpodcastbyurl.ui b/src/internet/podcasts/addpodcastbyurl.ui index 1ec337fdd..0b612024b 100644 --- a/src/internet/podcasts/addpodcastbyurl.ui +++ b/src/internet/podcasts/addpodcastbyurl.ui @@ -13,10 +13,6 @@ Enter a URL - - - :/providers/podcast32.png:/providers/podcast32.png - 0 @@ -44,9 +40,6 @@ - - - url diff --git a/src/internet/podcasts/gpoddersearchpage.ui b/src/internet/podcasts/gpoddersearchpage.ui index b89daa827..c95459890 100644 --- a/src/internet/podcasts/gpoddersearchpage.ui +++ b/src/internet/podcasts/gpoddersearchpage.ui @@ -13,10 +13,6 @@ Search gpodder.net - - - :/providers/mygpo32.png:/providers/mygpo32.png - 0 @@ -44,9 +40,6 @@ - - - query diff --git a/src/internet/podcasts/itunessearchpage.ui b/src/internet/podcasts/itunessearchpage.ui index 6a78ad499..a474a2300 100644 --- a/src/internet/podcasts/itunessearchpage.ui +++ b/src/internet/podcasts/itunessearchpage.ui @@ -13,10 +13,6 @@ Search iTunes - - - :/providers/itunes.png:/providers/itunes.png - 0 @@ -44,9 +40,6 @@ - - - query diff --git a/src/internet/podcasts/podcastsettingspage.ui b/src/internet/podcasts/podcastsettingspage.ui index 9fc888135..bb42912ee 100644 --- a/src/internet/podcasts/podcastsettingspage.ui +++ b/src/internet/podcasts/podcastsettingspage.ui @@ -13,10 +13,6 @@ Podcasts - - - :/providers/podcast32.png:/providers/podcast32.png - @@ -290,8 +286,5 @@ device_name login - - - diff --git a/src/internet/seafile/seafileurlhandler.h b/src/internet/seafile/seafileurlhandler.h index e0f0f15d6..02aec04a1 100644 --- a/src/internet/seafile/seafileurlhandler.h +++ b/src/internet/seafile/seafileurlhandler.h @@ -20,6 +20,7 @@ #define INTERNET_SEAFILE_SEAFILEURLHANDLER_H_ #include "core/urlhandler.h" +#include "ui/iconloader.h" class SeafileService; @@ -29,7 +30,7 @@ class SeafileUrlHandler : public UrlHandler { explicit SeafileUrlHandler(SeafileService* service, QObject* parent = nullptr); QString scheme() const { return "seafile"; } - QIcon icon() const { return QIcon(":/providers/seafile.png"); } + QIcon icon() const { return IconLoader::Load("seafile", IconLoader::Provider); } LoadResult StartLoading(const QUrl& url); private: diff --git a/src/internet/skydrive/skydrivesettingspage.ui b/src/internet/skydrive/skydrivesettingspage.ui index 6fd3bb7e0..f1791d06f 100644 --- a/src/internet/skydrive/skydrivesettingspage.ui +++ b/src/internet/skydrive/skydrivesettingspage.ui @@ -13,10 +13,6 @@ OneDrive - - - :/providers/skydrive.png:/providers/skydrive.png - @@ -103,8 +99,5 @@ 1 - - - diff --git a/src/internet/skydrive/skydriveurlhandler.h b/src/internet/skydrive/skydriveurlhandler.h index dd18346b7..cc56aca10 100644 --- a/src/internet/skydrive/skydriveurlhandler.h +++ b/src/internet/skydrive/skydriveurlhandler.h @@ -20,6 +20,7 @@ #define INTERNET_SKYDRIVE_SKYDRIVEURLHANDLER_H_ #include "core/urlhandler.h" +#include "ui/iconloader.h" class SkydriveService; @@ -30,7 +31,7 @@ class SkydriveUrlHandler : public UrlHandler { explicit SkydriveUrlHandler(SkydriveService* service, QObject* parent = nullptr); QString scheme() const { return "skydrive"; } - QIcon icon() const { return QIcon(":providers/skydrive.png"); } + QIcon icon() const { return IconLoader::Load("skydrive", IconLoader::Provider); } LoadResult StartLoading(const QUrl& url); private: diff --git a/src/internet/soundcloud/soundcloudsettingspage.ui b/src/internet/soundcloud/soundcloudsettingspage.ui index e4b2d1c08..6d5272cf6 100644 --- a/src/internet/soundcloud/soundcloudsettingspage.ui +++ b/src/internet/soundcloud/soundcloudsettingspage.ui @@ -13,10 +13,6 @@ SoundCloud - - - :/providers/soundcloud.png:/providers/soundcloud.png - @@ -106,8 +102,5 @@ 1 - - - diff --git a/src/internet/spotify/spotifysettingspage.ui b/src/internet/spotify/spotifysettingspage.ui index cc7d9632d..f56dfa5d5 100644 --- a/src/internet/spotify/spotifysettingspage.ui +++ b/src/internet/spotify/spotifysettingspage.ui @@ -188,7 +188,7 @@ - :/spotify-attribution.png + :/spotify-attribution.png @@ -205,7 +205,7 @@ - + diff --git a/src/internet/subsonic/subsonicurlhandler.h b/src/internet/subsonic/subsonicurlhandler.h index fb8c6de9c..290a6b4b9 100644 --- a/src/internet/subsonic/subsonicurlhandler.h +++ b/src/internet/subsonic/subsonicurlhandler.h @@ -21,6 +21,7 @@ #define INTERNET_SUBSONIC_SUBSONICURLHANDLER_H_ #include "core/urlhandler.h" +#include "ui/iconloader.h" class SubsonicService; @@ -31,7 +32,7 @@ class SubsonicUrlHandler : public UrlHandler { SubsonicUrlHandler(SubsonicService* service, QObject* parent); QString scheme() const { return "subsonic"; } - QIcon icon() const { return QIcon(":providers/subsonic-32.png"); } + QIcon icon() const { return IconLoader::Load("subsonic", IconLoader::Provider); } LoadResult StartLoading(const QUrl& url); // LoadResult LoadNext(const QUrl& url); diff --git a/src/internet/vk/vksettingspage.ui b/src/internet/vk/vksettingspage.ui index abc500411..4120c14dc 100644 --- a/src/internet/vk/vksettingspage.ui +++ b/src/internet/vk/vksettingspage.ui @@ -13,10 +13,6 @@ Vk.com - - - :/providers/vk.png:/providers/vk.png - @@ -215,8 +211,5 @@ - - - diff --git a/src/internet/vk/vkurlhandler.h b/src/internet/vk/vkurlhandler.h index 91334edb2..cf5b92512 100644 --- a/src/internet/vk/vkurlhandler.h +++ b/src/internet/vk/vkurlhandler.h @@ -20,6 +20,8 @@ #define INTERNET_VK_VKURLHANDLER_H_ #include "core/urlhandler.h" +#include "ui/iconloader.h" + #include #include #include @@ -32,7 +34,7 @@ class VkUrlHandler : public UrlHandler { public: VkUrlHandler(VkService* service, QObject* parent); QString scheme() const { return "vk"; } - QIcon icon() const { return QIcon(":providers/vk.png"); } + QIcon icon() const { return IconLoader::Load("vk", IconLoader::Provider); } LoadResult StartLoading(const QUrl& url); void TrackSkipped(); LoadResult LoadNext(const QUrl& url); diff --git a/src/ui/edittagdialog.cpp b/src/ui/edittagdialog.cpp index 6eb8ffe1f..de8a606ad 100644 --- a/src/ui/edittagdialog.cpp +++ b/src/ui/edittagdialog.cpp @@ -43,6 +43,7 @@ #include "ui/albumcoverchoicecontroller.h" #include "ui/albumcovermanager.h" #include "ui/coverfromurldialog.h" +#include "ui/iconloader.h" #include "ui/trackselectiondialog.h" const char* EditTagDialog::kHintText = @@ -82,6 +83,9 @@ EditTagDialog::EditTagDialog(Application* app, QWidget* parent) ui_->splitter->setSizes(QList() << 200 << width() - 200); ui_->loading_label->hide(); + ui_->fetch_tag->setIcon(IconLoader::Load("musicbrainz", + IconLoader::Provider)); + // An editable field is one that has a label as a buddy. The label is // important because it gets turned bold when the field is changed. for (QLabel* label : findChildren()) { diff --git a/src/ui/edittagdialog.ui b/src/ui/edittagdialog.ui index fb7e30604..3c32cffcc 100644 --- a/src/ui/edittagdialog.ui +++ b/src/ui/edittagdialog.ui @@ -868,10 +868,6 @@ Complete tags automatically - - - :/providers/musicbrainz.png:/providers/musicbrainz.png - 38 diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp index 6bf2b08e7..abdf99a80 100644 --- a/src/ui/mainwindow.cpp +++ b/src/ui/mainwindow.cpp @@ -326,6 +326,7 @@ MainWindow::MainWindow(Application* app, SystemTrayIcon* tray_icon, OSD* osd, ui_->action_hypnotoad->setIcon(IconLoader::Load("hypnotoad", IconLoader::Base)); ui_->action_kittens->setIcon(IconLoader::Load("kittens", IconLoader::Base)); ui_->action_enterprise->setIcon(IconLoader::Load("enterprise", IconLoader::Base)); + ui_->action_love->setIcon(IconLoader::Load("love", IconLoader::Lastfm)); // File view connections connect(file_view_, SIGNAL(AddToPlaylist(QMimeData*)), diff --git a/src/ui/mainwindow.ui b/src/ui/mainwindow.ui index 343c24c89..88d63200e 100644 --- a/src/ui/mainwindow.ui +++ b/src/ui/mainwindow.ui @@ -543,10 +543,6 @@ false - - - :/last.fm/love.png:/last.fm/love.png - Love @@ -802,7 +798,7 @@ - + :/providers/musicbrainz.png:/providers/musicbrainz.png @@ -819,7 +815,7 @@ - + :/providers/podcast16.png:/providers/podcast16.png diff --git a/src/widgets/loginstatewidget.cpp b/src/widgets/loginstatewidget.cpp index 923c7f10a..504673de1 100644 --- a/src/widgets/loginstatewidget.cpp +++ b/src/widgets/loginstatewidget.cpp @@ -33,6 +33,12 @@ LoginStateWidget::LoginStateWidget(QWidget* parent) ui_->busy->hide(); ui_->sign_out->setIcon(IconLoader::Load("list-remove", IconLoader::Base)); + ui_->signed_in_icon_label->setPixmap(IconLoader::Load("dialog-ok-apply", + IconLoader::Base).pixmap(22)); + ui_->expires_icon_label->setPixmap(IconLoader::Load("user-away", + IconLoader::Base).pixmap(22)); + ui_->account_type_icon_label->setPixmap(IconLoader::Load("dialog-warning", + IconLoader::Base).pixmap(22)); QFont bold_font(font()); bold_font.setBold(true); diff --git a/src/widgets/loginstatewidget.ui b/src/widgets/loginstatewidget.ui index cb0bf3ef4..20ef1e32e 100644 --- a/src/widgets/loginstatewidget.ui +++ b/src/widgets/loginstatewidget.ui @@ -59,16 +59,13 @@ 0 - + 22 22 - - :/icons/22x22/dialog-ok-apply.png - @@ -104,16 +101,13 @@ 0 - + 22 22 - - :/icons/22x22/user-away.png - @@ -136,16 +130,13 @@ 0 - + 22 22 - - :/icons/22x22/dialog-warning.png - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop @@ -187,8 +178,5 @@ 1 - - - diff --git a/src/widgets/osd.cpp b/src/widgets/osd.cpp index ba00e9188..54ef30881 100644 --- a/src/widgets/osd.cpp +++ b/src/widgets/osd.cpp @@ -21,6 +21,7 @@ #include "covers/currentartloader.h" #include "osd.h" #include "osdpretty.h" +#include "ui/iconloader.h" #include "ui/systemtrayicon.h" #ifdef HAVE_DBUS @@ -194,7 +195,8 @@ void OSD::MagnatuneDownloadFinished(const QStringList& albums) { message = tr("%1 albums").arg(albums.count()); ShowMessage(tr("Magnatune download finished"), message, QString(), - QImage(":/providers/magnatune.png")); + QImage(IconLoader::Load("magnatune", + IconLoader::Provider).pixmap(16).toImage())); } void OSD::ShowMessage(const QString& summary, const QString& message, diff --git a/src/wiimotedev/wiimotesettingspage.cpp b/src/wiimotedev/wiimotesettingspage.cpp index 2b705ad9c..529ec3d23 100644 --- a/src/wiimotedev/wiimotesettingspage.cpp +++ b/src/wiimotedev/wiimotesettingspage.cpp @@ -29,6 +29,12 @@ WiimoteSettingsPage::WiimoteSettingsPage(SettingsDialog* dialog) ui_->setupUi(this); ui_->list->header()->setResizeMode(QHeaderView::ResizeToContents); setWindowIcon(IconLoader::Load("wiimotedev", IconLoader::Base)); + ui_->wiimotedev_add_action->setIcon(IconLoader::Load("list-add", + IconLoader::Base)); + ui_->wiimotedev_delete_action->setIcon(IconLoader::Load("list-remove", + IconLoader::Base)); + ui_->wiimotedev_reload->setIcon(IconLoader::Load("view-refresh", + IconLoader::Base)); text_buttons_.insert(WIIMOTE_BTN_1, "Wiiremote 1"); text_buttons_.insert(WIIMOTE_BTN_2, "Wiiremote 2"); diff --git a/src/wiimotedev/wiimotesettingspage.ui b/src/wiimotedev/wiimotesettingspage.ui index e70eb981e..4cd9962ce 100644 --- a/src/wiimotedev/wiimotesettingspage.ui +++ b/src/wiimotedev/wiimotesettingspage.ui @@ -145,10 +145,6 @@ Add action - - - :/icons/22x22/list-add.png:/icons/22x22/list-add.png - @@ -156,10 +152,6 @@ Remove action - - - :/icons/22x22/list-remove.png:/icons/22x22/list-remove.png - @@ -167,10 +159,6 @@ Defaults - - - :/icons/22x22/view-refresh.png:/icons/22x22/view-refresh.png - diff --git a/src/wiimotedev/wiimoteshortcutgrabber.cpp b/src/wiimotedev/wiimoteshortcutgrabber.cpp index 6e2259fa0..4de606996 100644 --- a/src/wiimotedev/wiimoteshortcutgrabber.cpp +++ b/src/wiimotedev/wiimoteshortcutgrabber.cpp @@ -18,6 +18,7 @@ #include "consts.h" #include "wiimoteshortcutgrabber.h" #include "ui_wiimoteshortcutgrabber.h" +#include "ui/iconloader.h" WiimoteShortcutGrabber::WiimoteShortcutGrabber(quint32 action, quint32 device, WiimoteSettingsPage* parent) @@ -31,6 +32,8 @@ WiimoteShortcutGrabber::WiimoteShortcutGrabber(quint32 action, quint32 device, remember_nunchuk_shifts_(0) { ui_->setupUi(this); + setWindowIcon(IconLoader::Load("wiimotedev", IconLoader::Base)); + if (QDBusConnection::systemBus().isConnected()) { wiimotedev_iface_.reset(new OrgWiimotedevDeviceEventsInterface( WIIMOTEDEV_DBUS_SERVICE_NAME, WIIMOTEDEV_DBUS_EVENTS_OBJECT, diff --git a/src/wiimotedev/wiimoteshortcutgrabber.ui b/src/wiimotedev/wiimoteshortcutgrabber.ui index b67d3dc30..4adc97d3c 100644 --- a/src/wiimotedev/wiimoteshortcutgrabber.ui +++ b/src/wiimotedev/wiimoteshortcutgrabber.ui @@ -13,10 +13,6 @@ Add wiimotedev action - - - :/icons/32x32/wiimotedev.png:/icons/32x32/wiimotedev.png - @@ -112,8 +108,5 @@ - - -