iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use standard theme icon for collections page

Browse Source
This commit is contained in:
craig.p.drummond
2014-07-17 16:15:10 +00:00
committed by craig.p.drummond
parent ba881e6457
commit 160f92467a
10 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cantata.qrc
View File

@@ -61,10 +61,6 @@
<file alias="artist64.png">icons/view-media-artist64.png</file>
<file alias="artist128.png">icons/view-media-artist128.png</file>
<file alias="artist.svg">icons/view-media-artist.svg</file>
<file alias="lib16.png">icons/view-media-library16.png</file>
<file alias="lib22.png">icons/view-media-library22.png</file>
<file alias="lib32.png">icons/view-media-library32.png</file>
<file alias="lib48.png">icons/view-media-library48.png</file>
<file alias="radio16.png">icons/view-radiostream16.png</file>
<file alias="radio22.png">icons/view-radiostream22.png</file>
<file alias="radio32.png">icons/view-radiostream32.png</file>

2
gui/initialsettingswizard.cpp
View File

@@ -78,7 +78,7 @@ InitialSettingsWizard::InitialSettingsWizard(QWidget *p)
#else
introPage->setBackground(Icons::self()->appIcon);
#endif
connectionPage->setBackground(Icons::self()->libraryIcon);
connectionPage->setBackground(Icons::self()->audioFileIcon);
filesPage->setBackground(Icons::self()->filesIcon);
finishedPage->setBackground(Icon("dialog-ok"));

8
gui/preferencesdialog.cpp
View File

@@ -82,7 +82,7 @@ PreferencesDialog::PreferencesDialog(QWidget *parent)
interface->load();
context->load();
scrobbling->load();
pages.insert(QLatin1String("collection"), pageWidget->addPage(server, i18n("Collection"), Icons::self()->libraryIcon, i18n("Collection Settings")));
pages.insert(QLatin1String("collection"), pageWidget->addPage(server, i18n("Collection"), Icons::self()->audioFileIcon, i18n("Collection Settings")));
pageWidget->addPage(playback, i18n("Playback"), Icon("media-playback-start"), i18n("Playback Settings"));
pageWidget->addPage(files, i18n("Files"), Icons::self()->filesIcon, i18n("File Settings"));
pages.insert(QLatin1String("interface"), pageWidget->addPage(interface, i18n("Interface"), Icon("preferences-other"), i18n("Interface Settings")));
@@ -102,11 +102,7 @@ PreferencesDialog::PreferencesDialog(QWidget *parent)
http = new HttpServerSettings(0);
if (http->haveMultipleInterfaces()) {
http->load();
Icon icon("network-server");
if (icon.isNull()) {
icon=Icons::self()->audioFileIcon;
}
pageWidget->addPage(http, i18n("HTTP Server"), icon, i18n("HTTP Server Settings"));
pageWidget->addPage(http, i18n("HTTP Server"), Icon("network-server"), i18n("HTTP Server Settings"));
} else {
http->deleteLater();
http=0;

BIN
icons/view-media-library.svgz
View File

Binary file not shown.

BIN
icons/view-media-library16.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 525 B

BIN
icons/view-media-library22.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 698 B

BIN
icons/view-media-library32.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1002 B

BIN
icons/view-media-library48.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.5 KiB

3
widgets/icons.cpp
View File

@@ -405,7 +405,6 @@ Icons::Icons()
if (importIcon.isNull()) {
importIcon=Icon("down");
}
libraryIcon=Icon::create("lib", constStdSizes);
radioStreamIcon=Icon::create("radio", constStdSizes);
addRadioStreamIcon=Icon::create("addradio", constStdSizes);
variousArtistsIcon=Icon::create("va", QList<int>() << 16 << 22 << 32 << 48 << 64 << 128, true);
@@ -466,7 +465,7 @@ Icons::Icons()
#ifdef ENABLE_STREAMS
if (streamCategoryIcon.isNull()) {
streamCategoryIcon=libraryIcon;
streamCategoryIcon=folderIcon;
}
#endif
}

1
widgets/icons.h
View File

@@ -54,7 +54,6 @@ public:
Icon consumeIcon;
Icon repeatIcon;
Icon shuffleIcon;
Icon libraryIcon;
#ifdef ENABLE_STREAMS
Icon streamCategoryIcon;
#endif