diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py
index 0a183e4b3..d6e4b6911 100644
--- a/openlp/core/lib/__init__.py
+++ b/openlp/core/lib/__init__.py
@@ -105,9 +105,25 @@ def build_icon(icon):
ButtonIcon.addPixmap(
QtGui.QPixmap(icon), QtGui.QIcon.Normal, QtGui.QIcon.Off)
else:
- if len(icon) < 5:
+ if len(icon) > 2:
ButtonIcon.addPixmap(QtGui.QPixmap.fromImage(QtGui.QImage(icon)),
QtGui.QIcon.Normal, QtGui.QIcon.Off)
+ else:
+ #lets build a Icon from text
+ pmap = QtGui.QPixmap(u':/pages/slide.png')
+ painter = QtGui.QPainter(pmap)
+ painter.setPen(QtGui.QColor(QtGui.QColor.black))
+ font = QtGui.QFont()
+ font.setFamily(u'Arial')
+ font.setBold(True)
+ font.setPointSize(12)
+ painter.setFont(font)
+ metrics = QtGui.QFontMetrics(font)
+ painter.drawText(5, 3 + metrics.ascent(), icon)
+ painter.end()
+ ButtonIcon.addPixmap(
+ pmap, QtGui.QIcon.Normal, QtGui.QIcon.Off)
+
elif type(icon) is QtGui.QImage:
ButtonIcon = QtGui.QIcon()
ButtonIcon.addPixmap(
diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py
index d9b078e9e..b85eb30e7 100644
--- a/openlp/core/lib/mediamanageritem.py
+++ b/openlp/core/lib/mediamanageritem.py
@@ -269,7 +269,7 @@ class MediaManagerItem(QtGui.QWidget):
if self.hasEditIcon:
self.ListView.addAction(
contextMenuAction(
- self.ListView, u':%s_new.png' % self.IconPath,
+ self.ListView, u':/%s_new.png' % self.IconPath,
u'%s %s' % (self.trUtf8('&Edit'), self.PluginNameVisible),
self.onEditClick))
self.ListView.addAction(contextMenuSeparator(self.ListView))
diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index ac6a759a8..04c923901 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -173,7 +173,7 @@ class SlideController(QtGui.QWidget):
self.trUtf8('Move to live'), self.onGoLive)
self.Toolbar.addToolbarSeparator(u'Close Separator')
self.Toolbar.addToolbarButton(
- u'Edit Song', u':songs/song_edit.png',
+ u'Edit Song', u':/songs/song_edit.png',
self.trUtf8('Edit and re-preview Song'), self.onEditSong)
if isLive:
self.Toolbar.addToolbarSeparator(u'Loop Separator')
@@ -210,16 +210,16 @@ class SlideController(QtGui.QWidget):
if isLive:
self.Songbar = OpenLPToolbar(self)
self.Songbar.addToolbarButton(
- u'Bridge:1', u':/pages/page_bridge.png',
+ u'Bridge:1', u'B',
self.trUtf8('Bridge'),
self.onSongBarHandler)
self.Songbar.addToolbarButton(
- u'Chorus:1', u':/pages/page_chorus.png',
+ u'Chorus:1', u'C',
self.trUtf8('Chorus'),
self.onSongBarHandler)
for verse in range(1, 12):
self.Songbar.addToolbarButton(
- unicode(u'Verse:%s'% verse), u':/pages/page_%s.png' % verse,
+ unicode(u'Verse:%s'% verse), u'%s' % verse,
unicode(self.trUtf8('Verse %s'))% verse,
self.onSongBarHandler)
self.ControllerLayout.addWidget(self.Songbar)
@@ -488,7 +488,6 @@ class SlideController(QtGui.QWidget):
if self.isLive:
self.serviceItem.request_audit()
log.debug(u'displayServiceManagerItems End')
- print self.slideList
#Screen event methods
def onSlideSelectedFirst(self):
diff --git a/resources/images/openlp-2.qrc b/resources/images/openlp-2.qrc
index c9d81cf89..244a70d29 100644
--- a/resources/images/openlp-2.qrc
+++ b/resources/images/openlp-2.qrc
@@ -126,19 +126,6 @@
theme_import.png
- page_chorus.png
- page_bridge.png
- page_1.png
- page_2.png
- page_3.png
- page_4.png
- page_5.png
- page_6.png
- page_7.png
- page_8.png
- page_9.png
- page_10.png
- page_11.png
- page_12.png
+ slide.png
diff --git a/resources/images/page_1.png b/resources/images/page_1.png
deleted file mode 100644
index 091ab47f0..000000000
Binary files a/resources/images/page_1.png and /dev/null differ
diff --git a/resources/images/page_10.png b/resources/images/page_10.png
deleted file mode 100644
index a4b2f7491..000000000
Binary files a/resources/images/page_10.png and /dev/null differ
diff --git a/resources/images/page_11.png b/resources/images/page_11.png
deleted file mode 100644
index a4b2f7491..000000000
Binary files a/resources/images/page_11.png and /dev/null differ
diff --git a/resources/images/page_12.png b/resources/images/page_12.png
deleted file mode 100644
index a4b2f7491..000000000
Binary files a/resources/images/page_12.png and /dev/null differ
diff --git a/resources/images/page_2.png b/resources/images/page_2.png
deleted file mode 100644
index c4661947f..000000000
Binary files a/resources/images/page_2.png and /dev/null differ
diff --git a/resources/images/page_3.png b/resources/images/page_3.png
deleted file mode 100644
index 30f65b2d9..000000000
Binary files a/resources/images/page_3.png and /dev/null differ
diff --git a/resources/images/page_4.png b/resources/images/page_4.png
deleted file mode 100644
index 7749bc3c3..000000000
Binary files a/resources/images/page_4.png and /dev/null differ
diff --git a/resources/images/page_5.png b/resources/images/page_5.png
deleted file mode 100644
index 065dfa293..000000000
Binary files a/resources/images/page_5.png and /dev/null differ
diff --git a/resources/images/page_6.png b/resources/images/page_6.png
deleted file mode 100644
index a4b2f7491..000000000
Binary files a/resources/images/page_6.png and /dev/null differ
diff --git a/resources/images/page_7.png b/resources/images/page_7.png
deleted file mode 100644
index a4b2f7491..000000000
Binary files a/resources/images/page_7.png and /dev/null differ
diff --git a/resources/images/page_8.png b/resources/images/page_8.png
deleted file mode 100644
index a4b2f7491..000000000
Binary files a/resources/images/page_8.png and /dev/null differ
diff --git a/resources/images/page_9.png b/resources/images/page_9.png
deleted file mode 100644
index a4b2f7491..000000000
Binary files a/resources/images/page_9.png and /dev/null differ
diff --git a/resources/images/page_bridge.png b/resources/images/page_bridge.png
deleted file mode 100644
index 7d81a4a71..000000000
Binary files a/resources/images/page_bridge.png and /dev/null differ
diff --git a/resources/images/page_chorus.png b/resources/images/page_chorus.png
deleted file mode 100644
index 80c3a6d53..000000000
Binary files a/resources/images/page_chorus.png and /dev/null differ