Menu
▾
▴
[Performous-commit] Tapio Vierros : Provide fallback icons where themes are not available.
|
From: Tapio V. <aa...@us...> - 2011-01-26 09:15:13
|
Module: editor
Branch: master
Commit: 331277f26fb9d8875ee6cacd875271f96381c8dc
Author: Tapio Vierros <tap...@gm...>
Date: Wed Jan 26 10:19:48 2011 +0200
Provide fallback icons where themes are not available.
---
editor.qrc | 20 +++++++++++++++++++-
editorapp.cc | 33 +++++++++++++++++----------------
icons/application-exit.png | Bin 0 -> 1569 bytes
icons/document-new.png | Bin 0 -> 1248 bytes
icons/document-save-as.png | Bin 0 -> 1342 bytes
icons/document-save.png | Bin 0 -> 968 bytes
icons/edit-redo.png | Bin 0 -> 1330 bytes
icons/edit-undo.png | Bin 0 -> 1398 bytes
icons/green-document-open.png | Bin 0 -> 990 bytes
icons/help-about.png | Bin 0 -> 1471 bytes
icons/help-hint.png | Bin 0 -> 1259 bytes
icons/insert-object.png | Bin 0 -> 1100 bytes
icons/insert-text.png | Bin 0 -> 1066 bytes
icons/media-playback-pause.png | Bin 0 -> 1448 bytes
icons/media-playback-start.png | Bin 0 -> 1474 bytes
icons/media-playback-stop.png | Bin 0 -> 1436 bytes
icons/preferences-other.png | Bin 0 -> 1531 bytes
17 files changed, 36 insertions(+), 17 deletions(-)
diff --git a/editor.qrc b/editor.qrc
index 7646d2b..e301484 100644
--- a/editor.qrc
+++ b/editor.qrc
@@ -1 +1,19 @@
-<RCC/>
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+<file>icons/application-exit.png</file>
+<file>icons/document-new.png</file>
+<file>icons/document-save-as.png</file>
+<file>icons/document-save.png</file>
+<file>icons/edit-redo.png</file>
+<file>icons/edit-undo.png</file>
+<file>icons/green-document-open.png</file>
+<file>icons/help-about.png</file>
+<file>icons/help-hint.png</file>
+<file>icons/insert-object.png</file>
+<file>icons/insert-text.png</file>
+<file>icons/media-playback-pause.png</file>
+<file>icons/media-playback-start.png</file>
+<file>icons/media-playback-stop.png</file>
+<file>icons/preferences-other.png</file>
+</qresource>
+</RCC>
diff --git a/editorapp.cc b/editorapp.cc
index e0972d4..56db07c 100644
--- a/editorapp.cc
+++ b/editorapp.cc
@@ -57,20 +57,21 @@ EditorApp::EditorApp(QWidget *parent): QMainWindow(parent), projectFileName(), h
song.reset(new Song);
// Some icons to make menus etc prettier
- ui.actionNew->setIcon(QIcon::fromTheme("document-new"));
- ui.actionOpen->setIcon(QIcon::fromTheme("document-open"));
- ui.actionSave->setIcon(QIcon::fromTheme("document-save"));
- ui.actionSaveAs->setIcon(QIcon::fromTheme("document-save-as"));
- ui.actionExit->setIcon(QIcon::fromTheme("application-exit"));
- ui.actionUndo->setIcon(QIcon::fromTheme("edit-undo"));
- ui.actionRedo->setIcon(QIcon::fromTheme("edit-redo"));
- ui.actionPreferences->setIcon(QIcon::fromTheme("preferences-other"));
- ui.actionMusicFile->setIcon(QIcon::fromTheme("insert-object"));
- ui.actionLyricsFromFile->setIcon(QIcon::fromTheme("insert-text"));
- ui.actionLyricsFromClipboard->setIcon(QIcon::fromTheme("insert-text"));
- ui.actionAbout->setIcon(QIcon::fromTheme("help-about"));
- ui.cmdPlay->setIcon(QIcon::fromTheme("media-playback-start"));
- ui.cmdStop->setIcon(QIcon::fromTheme("media-playback-stop"));
+ ui.actionNew->setIcon(QIcon::fromTheme("document-new", QIcon(":/icons/document-new.png")));
+ ui.actionOpen->setIcon(QIcon::fromTheme("document-open", QIcon(":/icons/document-open.png")));
+ ui.actionSave->setIcon(QIcon::fromTheme("document-save", QIcon(":/icons/document-save.png")));
+ ui.actionSaveAs->setIcon(QIcon::fromTheme("document-save-as", QIcon(":/icons/document-save-as.png")));
+ ui.actionExit->setIcon(QIcon::fromTheme("application-exit", QIcon(":/icons/application-exit.png")));
+ ui.actionUndo->setIcon(QIcon::fromTheme("edit-undo", QIcon(":/icons/edit-undo.png")));
+ ui.actionRedo->setIcon(QIcon::fromTheme("edit-redo", QIcon(":/icons/edit-redo.png")));
+ ui.actionPreferences->setIcon(QIcon::fromTheme("preferences-other", QIcon(":/icons/preferences-other.png")));
+ ui.actionMusicFile->setIcon(QIcon::fromTheme("insert-object", QIcon(":/icons/insert-object.png")));
+ ui.actionLyricsFromFile->setIcon(QIcon::fromTheme("insert-text", QIcon(":/icons/insert-text.png")));
+ ui.actionLyricsFromClipboard->setIcon(QIcon::fromTheme("insert-text", QIcon(":/icons/insert-text.png")));
+ ui.actionWhatsThis->setIcon(QIcon::fromTheme("help-hint", QIcon(":/icons/help-hint.png")));
+ ui.actionAbout->setIcon(QIcon::fromTheme("help-about", QIcon(":/icons/help-about.png")));
+ ui.cmdPlay->setIcon(QIcon::fromTheme("media-playback-start", QIcon(":/icons/media-playback-start.png")));
+ ui.cmdStop->setIcon(QIcon::fromTheme("media-playback-stop", QIcon(":/icons/media-playback-stop.png")));
statusbarProgress = new QProgressBar(NULL);
ui.statusbar->addPermanentWidget(statusbarProgress);
@@ -511,10 +512,10 @@ void EditorApp::playButton()
{
if (player && player->state() == Phonon::PlayingState) {
ui.cmdPlay->setText(tr("Pause"));
- ui.cmdPlay->setIcon(QIcon::fromTheme("media-playback-pause"));
+ ui.cmdPlay->setIcon(QIcon::fromTheme("media-playback-pause", QIcon(":/icons/media-playback-pause.png")));
} else {
ui.cmdPlay->setText(tr("Play"));
- ui.cmdPlay->setIcon(QIcon::fromTheme("media-playback-start"));
+ ui.cmdPlay->setIcon(QIcon::fromTheme("media-playback-start", QIcon(":/icons/media-playback-start.png")));
}
}
diff --git a/icons/application-exit.png b/icons/application-exit.png
new file mode 100755
index 0000000..974c99f
Binary files /dev/null and b/icons/application-exit.png differ
diff --git a/icons/document-new.png b/icons/document-new.png
new file mode 100755
index 0000000..7460cd1
Binary files /dev/null and b/icons/document-new.png differ
diff --git a/icons/document-save-as.png b/icons/document-save-as.png
new file mode 100755
index 0000000..7538ab6
Binary files /dev/null and b/icons/document-save-as.png differ
diff --git a/icons/document-save.png b/icons/document-save.png
new file mode 100755
index 0000000..6c2e71d
Binary files /dev/null and b/icons/document-save.png differ
diff --git a/icons/edit-redo.png b/icons/edit-redo.png
new file mode 100755
index 0000000..6af7b47
Binary files /dev/null and b/icons/edit-redo.png differ
diff --git a/icons/edit-undo.png b/icons/edit-undo.png
new file mode 100755
index 0000000..cda141f
Binary files /dev/null and b/icons/edit-undo.png differ
diff --git a/icons/green-document-open.png b/icons/green-document-open.png
new file mode 100755
index 0000000..2722e8c
Binary files /dev/null and b/icons/green-document-open.png differ
diff --git a/icons/help-about.png b/icons/help-about.png
new file mode 100755
index 0000000..9b4d9ad
Binary files /dev/null and b/icons/help-about.png differ
diff --git a/icons/help-hint.png b/icons/help-hint.png
new file mode 100755
index 0000000..eb3a53b
Binary files /dev/null and b/icons/help-hint.png differ
diff --git a/icons/insert-object.png b/icons/insert-object.png
new file mode 100755
index 0000000..6389257
Binary files /dev/null and b/icons/insert-object.png differ
diff --git a/icons/insert-text.png b/icons/insert-text.png
new file mode 100755
index 0000000..f765ff6
Binary files /dev/null and b/icons/insert-text.png differ
diff --git a/icons/media-playback-pause.png b/icons/media-playback-pause.png
new file mode 100755
index 0000000..c5202c4
Binary files /dev/null and b/icons/media-playback-pause.png differ
diff --git a/icons/media-playback-start.png b/icons/media-playback-start.png
new file mode 100755
index 0000000..37c4353
Binary files /dev/null and b/icons/media-playback-start.png differ
diff --git a/icons/media-playback-stop.png b/icons/media-playback-stop.png
new file mode 100755
index 0000000..80ece50
Binary files /dev/null and b/icons/media-playback-stop.png differ
diff --git a/icons/preferences-other.png b/icons/preferences-other.png
new file mode 100755
index 0000000..1062aae
Binary files /dev/null and b/icons/preferences-other.png differ
|
