Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

use iconloader & cleanup previous remnants 

update
This commit is contained in:
narunlifescience 2015-11-30 23:43:26 -06:00
parent f300946c81
commit 2603cf2088
37 changed files with 55 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/globalsearch/globalsearchsettingspage.ui
View File

@ -13,10 +13,6 @@
<property name="windowTitle">
<string comment="Global search settings dialog title.">Search</string>
</property>
<property name="windowIcon">
<iconset resource="../../data/data.qrc">
<normaloff>:/icons/32x32/search.png</normaloff>:/icons/32x32/search.png</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<widget class="QGroupBox" name="sources_group">
@ -141,8 +137,5 @@
<tabstop>show_providers</tabstop>
<tabstop>show_suggestions</tabstop>
</tabstops>
<resources>
<include location="../../data/data.qrc"/>
</resources>
<connections/>
</ui>

7
src/internet/amazon/amazonsettingspage.ui
View File

@ -13,10 +13,6 @@
<property name="windowTitle">
<string>Amazon Cloud Drive</string>
</property>
<property name="windowIcon">
<iconset resource="../../data/data.qrc">
<normaloff>:/providers/amazonclouddrive.png</normaloff>:/providers/amazonclouddrive.png</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QLabel" name="label">
@ -103,8 +99,5 @@
<container>1</container>
</customwidget>
</customwidgets>
<resources>
<include location="../../data/data.qrc"/>
</resources>
<connections/>
</ui>

3
src/internet/amazon/amazonurlhandler.h
View File

@ -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:

7
src/internet/box/boxsettingspage.ui
View File

@ -13,10 +13,6 @@
<property name="windowTitle">
<string>Box</string>
</property>
<property name="windowIcon">
<iconset resource="../../data/data.qrc">
<normaloff>:/providers/box.png</normaloff>:/providers/box.png</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QLabel" name="label">
@ -103,8 +99,5 @@
<container>1</container>
</customwidget>
</customwidgets>
<resources>
<include location="../../data/data.qrc"/>
</resources>
<connections/>
</ui>

3
src/internet/box/boxurlhandler.h
View File

@ -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:

7
src/internet/core/internetshowsettingspage.ui
View File

@ -13,10 +13,6 @@
<property name="windowTitle">
<string comment="Global search settings dialog title.">Internet services</string>
</property>
<property name="windowIcon">
<iconset resource="../../data/data.qrc">
<normaloff>:/icons/32x32/internet-services.png</normaloff>:/icons/32x32/internet-services.png</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<widget class="QGroupBox" name="sources_group">
@ -75,8 +71,5 @@
<tabstops>
<tabstop>sources</tabstop>
</tabstops>
<resources>
<include location="../../data/data.qrc"/>
</resources>
<connections/>
</ui>

7
src/internet/dropbox/dropboxsettingspage.ui
View File

@ -13,10 +13,6 @@
<property name="windowTitle">
<string>Dropbox</string>
</property>
<property name="windowIcon">
<iconset resource="../../data/data.qrc">
<normaloff>:/providers/dropbox.png</normaloff>:/providers/dropbox.png</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QLabel" name="label">
@ -103,8 +99,5 @@
<container>1</container>
</customwidget>
</customwidgets>
<resources>
<include location="../../data/data.qrc"/>
</resources>
<connections/>
</ui>

3
src/internet/dropbox/dropboxurlhandler.h
View File

@ -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:

7
src/internet/googledrive/googledrivesettingspage.ui
View File

@ -13,10 +13,6 @@
<property name="windowTitle">
<string>Google Drive</string>
</property>
<property name="windowIcon">
<iconset resource="../../data/data.qrc">
<normaloff>:/providers/googledrive.png</normaloff>:/providers/googledrive.png</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QLabel" name="label">
@ -103,8 +99,5 @@
<container>1</container>
</customwidget>
</customwidgets>
<resources>
<include location="../../data/data.qrc"/>
</resources>
<connections/>
</ui>

3
src/internet/googledrive/googledriveurlhandler.h
View File

@ -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:

3
src/internet/lastfm/lastfmurlhandler.h
View File

@ -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);

4
src/internet/magnatune/magnatunedownloaddialog.cpp
View File

@ -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);

7
src/internet/magnatune/magnatunedownloaddialog.ui
View File

@ -13,10 +13,6 @@
<property name="windowTitle">
<string>Magnatune Download</string>
</property>
<property name="windowIcon">
<iconset resource="../../data/data.qrc">
<normaloff>:/providers/magnatune.png</normaloff>:/providers/magnatune.png</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="label">
@ -136,9 +132,6 @@
<tabstop>browse</tabstop>
<tabstop>button_box</tabstop>
</tabstops>
<resources>
<include location="../../data/data.qrc"/>
</resources>
<connections>
<connection>
<sender>button_box</sender>

3
src/internet/magnatune/magnatuneurlhandler.h
View File

@ -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:

7
src/internet/podcasts/addpodcastbyurl.ui
View File

@ -13,10 +13,6 @@
<property name="windowTitle">
<string>Enter a URL</string>
</property>
<property name="windowIcon">
<iconset resource="../../data/data.qrc">
<normaloff>:/providers/podcast32.png</normaloff>:/providers/podcast32.png</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="margin">
<number>0</number>
@ -44,9 +40,6 @@
</item>
</layout>
</widget>
<resources>
<include location="../../data/data.qrc"/>
</resources>
<connections>
<connection>
<sender>url</sender>

7
src/internet/podcasts/gpoddersearchpage.ui
View File

@ -13,10 +13,6 @@
<property name="windowTitle">
<string>Search gpodder.net</string>
</property>
<property name="windowIcon">
<iconset resource="../../data/data.qrc">
<normaloff>:/providers/mygpo32.png</normaloff>:/providers/mygpo32.png</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="margin">
<number>0</number>
@ -44,9 +40,6 @@
</item>
</layout>
</widget>
<resources>
<include location="../../data/data.qrc"/>
</resources>
<connections>
<connection>
<sender>query</sender>

7
src/internet/podcasts/itunessearchpage.ui
View File

@ -13,10 +13,6 @@
<property name="windowTitle">
<string>Search iTunes</string>
</property>
<property name="windowIcon">
<iconset resource="../../data/data.qrc">
<normaloff>:/providers/itunes.png</normaloff>:/providers/itunes.png</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="margin">
<number>0</number>
@ -44,9 +40,6 @@
</item>
</layout>
</widget>
<resources>
<include location="../../data/data.qrc"/>
</resources>
<connections>
<connection>
<sender>query</sender>

7
src/internet/podcasts/podcastsettingspage.ui
View File

@ -13,10 +13,6 @@
<property name="windowTitle">
<string>Podcasts</string>
</property>
<property name="windowIcon">
<iconset resource="../../data/data.qrc">
<normaloff>:/providers/podcast32.png</normaloff>:/providers/podcast32.png</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QGroupBox" name="groupBox">
@ -290,8 +286,5 @@
<tabstop>device_name</tabstop>
<tabstop>login</tabstop>
</tabstops>
<resources>
<include location="../../data/data.qrc"/>
</resources>
<connections/>
</ui>

3
src/internet/seafile/seafileurlhandler.h
View File

@ -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:

7
src/internet/skydrive/skydrivesettingspage.ui
View File

@ -13,10 +13,6 @@
<property name="windowTitle">
<string>OneDrive</string>
</property>
<property name="windowIcon">
<iconset resource="../../data/data.qrc">
<normaloff>:/providers/skydrive.png</normaloff>:/providers/skydrive.png</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QLabel" name="label">
@ -103,8 +99,5 @@
<container>1</container>
</customwidget>
</customwidgets>
<resources>
<include location="../../data/data.qrc"/>
</resources>
<connections/>
</ui>

3
src/internet/skydrive/skydriveurlhandler.h
View File

@ -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:

7
src/internet/soundcloud/soundcloudsettingspage.ui
View File

@ -13,10 +13,6 @@
<property name="windowTitle">
<string>SoundCloud</string>
</property>
<property name="windowIcon">
<iconset resource="../../data/data.qrc">
<normaloff>:/providers/soundcloud.png</normaloff>:/providers/soundcloud.png</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QLabel" name="label">
@ -106,8 +102,5 @@
<container>1</container>
</customwidget>
</customwidgets>
<resources>
<include location="../../data/data.qrc"/>
</resources>
<connections/>
</ui>

4
src/internet/spotify/spotifysettingspage.ui
View File

@ -188,7 +188,7 @@
</size>
</property>
<property name="pixmap">
<pixmap resource="../../data/data.qrc">:/spotify-attribution.png</pixmap>
<pixmap resource="../../../data/data.qrc">:/spotify-attribution.png</pixmap>
</property>
</widget>
</item>
@ -205,7 +205,7 @@
</customwidget>
</customwidgets>
<resources>
<include location="../../data/data.qrc"/>
<include location="../../../data/data.qrc"/>
</resources>
<connections/>
</ui>

3
src/internet/subsonic/subsonicurlhandler.h
View File

@ -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);

7
src/internet/vk/vksettingspage.ui
View File

@ -13,10 +13,6 @@
<property name="windowTitle">
<string>Vk.com</string>
</property>
<property name="windowIcon">
<iconset resource="../../data/data.qrc">
<normaloff>:/providers/vk.png</normaloff>:/providers/vk.png</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QGroupBox" name="account">
@ -215,8 +211,5 @@
</item>
</layout>
</widget>
<resources>
<include location="../../data/data.qrc"/>
</resources>
<connections/>
</ui>

4
src/internet/vk/vkurlhandler.h
View File

@ -20,6 +20,8 @@
#define INTERNET_VK_VKURLHANDLER_H_
#include "core/urlhandler.h"
#include "ui/iconloader.h"
#include <QFile>
#include <QNetworkAccessManager>
#include <QNetworkReply>
@ -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);

4
src/ui/edittagdialog.cpp
View File

@ -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<int>() << 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<QLabel*>()) {

4
src/ui/edittagdialog.ui
View File

@ -868,10 +868,6 @@
<property name="text">
<string>Complete tags automatically</string>
</property>
<property name="icon">
<iconset resource="../../data/data.qrc">
<normaloff>:/providers/musicbrainz.png</normaloff>:/providers/musicbrainz.png</iconset>
</property>
<property name="iconSize">
<size>
<width>38</width>

1
src/ui/mainwindow.cpp
View File

@ -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*)),

8
src/ui/mainwindow.ui
View File

@ -543,10 +543,6 @@
<property name="enabled">
<bool>false</bool>
</property>
<property name="icon">
<iconset resource="../../data/data.qrc">
<normaloff>:/last.fm/love.png</normaloff>:/last.fm/love.png</iconset>
</property>
<property name="text">
<string>Love</string>
</property>
@ -802,7 +798,7 @@
</action>
<action name="action_auto_complete_tags">
<property name="icon">
<iconset resource="../../data/data.qrc">
<iconset>
<normaloff>:/providers/musicbrainz.png</normaloff>:/providers/musicbrainz.png</iconset>
</property>
<property name="text">
@ -819,7 +815,7 @@
</action>
<action name="action_add_podcast">
<property name="icon">
<iconset resource="../../data/data.qrc">
<iconset>
<normaloff>:/providers/podcast16.png</normaloff>:/providers/podcast16.png</iconset>
</property>
<property name="text">

6
src/widgets/loginstatewidget.cpp
View File

@ -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);

18
src/widgets/loginstatewidget.ui
View File

@ -59,16 +59,13 @@
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label_4">
<widget class="QLabel" name="signed_in_icon_label">
<property name="minimumSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
<property name="pixmap">
<pixmap resource="../../data/data.qrc">:/icons/22x22/dialog-ok-apply.png</pixmap>
</property>
</widget>
</item>
<item>
@ -104,16 +101,13 @@
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label">
<widget class="QLabel" name="expires_icon_label">
<property name="minimumSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
<property name="pixmap">
<pixmap resource="../../data/data.qrc">:/icons/22x22/user-away.png</pixmap>
</property>
</widget>
</item>
<item>
@ -136,16 +130,13 @@
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label_6">
<widget class="QLabel" name="account_type_icon_label">
<property name="minimumSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
<property name="pixmap">
<pixmap resource="../../data/data.qrc">:/icons/22x22/dialog-warning.png</pixmap>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
@ -187,8 +178,5 @@
<container>1</container>
</customwidget>
</customwidgets>
<resources>
<include location="../../data/data.qrc"/>
</resources>
<connections/>
</ui>

4
src/widgets/osd.cpp
View File

@ -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,

6
src/wiimotedev/wiimotesettingspage.cpp
View File

@ -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");

12
src/wiimotedev/wiimotesettingspage.ui
View File

@ -145,10 +145,6 @@
<property name="text">
<string>Add action</string>
</property>
<property name="icon">
<iconset resource="../../data/data.qrc">
<normaloff>:/icons/22x22/list-add.png</normaloff>:/icons/22x22/list-add.png</iconset>
</property>
</widget>
</item>
<item>
@ -156,10 +152,6 @@
<property name="text">
<string>Remove action</string>
</property>
<property name="icon">
<iconset resource="../../data/data.qrc">
<normaloff>:/icons/22x22/list-remove.png</normaloff>:/icons/22x22/list-remove.png</iconset>
</property>
</widget>
</item>
<item>
@ -167,10 +159,6 @@
<property name="text">
<string>Defaults</string>
</property>
<property name="icon">
<iconset resource="../../data/data.qrc">
<normaloff>:/icons/22x22/view-refresh.png</normaloff>:/icons/22x22/view-refresh.png</iconset>
</property>
</widget>
</item>
<item>

3
src/wiimotedev/wiimoteshortcutgrabber.cpp
View File

@ -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,

7
src/wiimotedev/wiimoteshortcutgrabber.ui
View File

@ -13,10 +13,6 @@
<property name="windowTitle">
<string>Add wiimotedev action</string>
</property>
<property name="windowIcon">
<iconset resource="../../data/data.qrc">
<normaloff>:/icons/32x32/wiimotedev.png</normaloff>:/icons/32x32/wiimotedev.png</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
@ -112,8 +108,5 @@
</item>
</layout>
</widget>
<resources>
<include location="../../data/data.qrc"/>
</resources>
<connections/>
</ui>