From ca5eed490d3ed8fcf807b39d9fdd00f460f9f733 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Tue, 18 Nov 2008 21:26:14 +0000 Subject: [PATCH] made some changes to our test plugin. bzr-revno: 98 --- openlp/plugins/mediamanageritem.py | 137 +++++++++++++++---- openlp/plugins/test/test_mediamanageritem.py | 7 +- 2 files changed, 113 insertions(+), 31 deletions(-) diff --git a/openlp/plugins/mediamanageritem.py b/openlp/plugins/mediamanageritem.py index 8ea357fc8..b264c7852 100644 --- a/openlp/plugins/mediamanageritem.py +++ b/openlp/plugins/mediamanageritem.py @@ -39,43 +39,124 @@ class MediaManagerItem(QtGui.QWidget): self.icon.addPixmap(QtGui.QPixmap(self.iconname), QtGui.QIcon.Normal, QtGui.QIcon.Off) if self.iconfile is not None: self.icon.addPixmap(QtGui.QPixmap.fromImage(QtGui.QImage(self.iconfile)), QtGui.QIcon.Normal, QtGui.QIcon.Off) - + self.Layout = QtGui.QVBoxLayout(self) self.Layout.setSpacing(0) self.Layout.setMargin(0) - # setup toolbar - self.Toolbar = QtGui.QWidget(self) - self.ToolbarLayout = QtGui.QHBoxLayout(self.Toolbar) - self.ToolbarLayout.setSpacing(0) - self.ToolbarLayout.setMargin(0) + self.SongToolbar = QtGui.QWidget(self) + self.SongToolbar.setObjectName("SongToolbar") + self.SongToolbarLayout = QtGui.QHBoxLayout(self.SongToolbar) + self.SongToolbarLayout.setSpacing(0) + self.SongToolbarLayout.setMargin(0) + self.SongToolbarLayout.setObjectName("SongToolbarLayout") + self.SongNewItem = QtGui.QToolButton(self.SongToolbar) + icon1 = QtGui.QIcon() + icon1.addPixmap(QtGui.QPixmap(":/songs/song_new.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.SongNewItem.setIcon(icon1) + self.SongNewItem.setIconSize(QtCore.QSize(20, 20)) + self.SongNewItem.setAutoRaise(True) + self.SongNewItem.setObjectName("SongNewItem") + self.SongToolbarLayout.addWidget(self.SongNewItem) - self.log.info("Adding toolbar item") - self.ToolbarButtons=[] - self.ToolbarButtons.append(ToolbarButton(self, "LoadItem", ":/images/image_load.png", "Load something", "Load something in")) - self.ToolbarButtons.append(ToolbarButton(self, "DeleteItem", ":/images/image_delete.png", "Delete something", "Delete something from")) + self.SongEditItem = QtGui.QToolButton(self.SongToolbar) + icon2 = QtGui.QIcon() + icon2.addPixmap(QtGui.QPixmap(":/songs/song_edit.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.SongEditItem.setIcon(icon2) + self.SongEditItem.setIconSize(QtCore.QSize(20, 20)) + self.SongEditItem.setAutoRaise(True) + self.SongEditItem.setObjectName("SongEditItem") + self.SongToolbarLayout.addWidget(self.SongEditItem) + self.SongDeleteItem = QtGui.QToolButton(self.SongToolbar) + icon3 = QtGui.QIcon() + icon3.addPixmap(QtGui.QPixmap(":/songs/song_delete.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.SongDeleteItem.setIcon(icon3) + self.SongDeleteItem.setIconSize(QtCore.QSize(20, 20)) + self.SongDeleteItem.setAutoRaise(True) + self.SongDeleteItem.setObjectName("SongDeleteItem") + self.SongToolbarLayout.addWidget(self.SongDeleteItem) + self.SongLine = QtGui.QFrame(self.SongToolbar) + self.SongLine.setMinimumSize(QtCore.QSize(0, 0)) + self.SongLine.setFrameShadow(QtGui.QFrame.Sunken) + self.SongLine.setLineWidth(1) + self.SongLine.setMidLineWidth(0) + self.SongLine.setFrameShape(QtGui.QFrame.VLine) + self.SongLine.setFrameShadow(QtGui.QFrame.Sunken) + self.SongLine.setObjectName("SongLine") + self.SongToolbarLayout.addWidget(self.SongLine) + self.SongPreviewItem = QtGui.QToolButton(self.SongToolbar) + icon4 = QtGui.QIcon() + icon4.addPixmap(QtGui.QPixmap(":/system/system_preview.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.SongPreviewItem.setIcon(icon4) + self.SongPreviewItem.setIconSize(QtCore.QSize(20, 20)) + self.SongPreviewItem.setAutoRaise(True) + self.SongPreviewItem.setObjectName("SongPreviewItem") + self.SongToolbarLayout.addWidget(self.SongPreviewItem) + self.SongLiveItem = QtGui.QToolButton(self.SongToolbar) + icon5 = QtGui.QIcon() + icon5.addPixmap(QtGui.QPixmap(":/system/system_live.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.SongLiveItem.setIcon(icon5) + self.SongLiveItem.setIconSize(QtCore.QSize(20, 20)) + self.SongLiveItem.setAutoRaise(True) + self.SongLiveItem.setObjectName("SongLiveItem") + self.SongToolbarLayout.addWidget(self.SongLiveItem) + self.SongAddItem = QtGui.QToolButton(self.SongToolbar) + icon6 = QtGui.QIcon() + icon6.addPixmap(QtGui.QPixmap(":/system/system_add.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.SongAddItem.setIcon(icon6) + self.SongAddItem.setIconSize(QtCore.QSize(20, 20)) + self.SongAddItem.setAutoRaise(True) + self.SongAddItem.setObjectName("SongAddItem") + self.SongToolbarLayout.addWidget(self.SongAddItem) + spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.SongToolbarLayout.addItem(spacerItem) + self.Layout.addWidget(self.SongToolbar) + self.SongList = QtGui.QTableWidget(self) + self.SongList.setObjectName("SongList") + self.SongList.setColumnCount(0) + self.SongList.setRowCount(0) + self.Layout.addWidget(self.SongList) - # xxx button events - QtCore.QObject.connect(self.ToolbarButtons[0], QtCore.SIGNAL("clicked()"), self.LoadItemclicked) - QtCore.QObject.connect(self.ToolbarButtons[1], QtCore.SIGNAL("clicked()"), self.DeleteItemclicked) - # add somewhere for "choosing" to happen - self.choose_area=QtGui.QWidget(self) - self.Layout.addWidget(self.choose_area) - self.choose_area.text="Stuff and Nonsense" + # Connect the dots! I mean, slots... + QtCore.QObject.connect(self.SongNewItem, QtCore.SIGNAL("clicked()"), self.onSongNewItemClick) + + # + # # setup toolbar + # self.Toolbar = QtGui.QWidget(self) + # self.ToolbarLayout = QtGui.QHBoxLayout(self.Toolbar) + # self.ToolbarLayout.setSpacing(0) + # self.ToolbarLayout.setMargin(0) + # + # self.log.info("Adding toolbar item") + # self.ToolbarButtons=[] + # self.ToolbarButtons.append(ToolbarButton(self, "LoadItem", ":/images/image_load.png", "Load something", "Load something in")) + # self.ToolbarButtons.append(ToolbarButton(self, "DeleteItem", ":/images/image_delete.png", "Delete something", "Delete something from")) + # + # # xxx button events + # QtCore.QObject.connect(self.ToolbarButtons[0], QtCore.SIGNAL("clicked()"), self.LoadItemclicked) + # QtCore.QObject.connect(self.ToolbarButtons[1], QtCore.SIGNAL("clicked()"), self.DeleteItemclicked) + # # add somewhere for "choosing" to happen + # self.choose_area=QtGui.QWidget(self) + # self.Layout.addWidget(self.choose_area) + # self.choose_area.text="Stuff and Nonsense" + + def onSongNewItemClick(self): + self.log.info("onSongNewItemClick") def LoadItemclicked(self): self.log.info("LoadItemClicked") - self.choose_area.text+="+" + #self.choose_area.text+="+" def DeleteItemclicked(self): self.log.info("DeleteItemClicked") - self.choose_area.text+="-" + #self.choose_area.text+="-" def paintEvent(self, evt): - paint = QtGui.QPainter()#self.choose_area) - paint.begin(self) - paint.setPen(QtGui.QColor(168, 34, 3)) - paint.setFont(QtGui.QFont('Decorative', 10)) - paint.drawText(evt.rect(), QtCore.Qt.AlignCenter, self.choose_area.text) - paint.end() + pass + #paint = QtGui.QPainter()#self.choose_area) + #paint.begin(self) + #paint.setPen(QtGui.QColor(168, 34, 3)) + #paint.setFont(QtGui.QFont('Decorative', 10)) + #paint.drawText(evt.rect(), QtCore.Qt.AlignCenter, self.choose_area.text) + #paint.end() @@ -83,7 +164,7 @@ class MediaManagerItem(QtGui.QWidget): # self.LoadItem = QtGui.QToolButton(self.Toolbar) # icon17 = QtGui.QIcon() # icon17.addPixmap(QtGui.QPixmap(":/images/image_load.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) - + # self.LoadItem.setIcon(icon17) # self.LoadItem.setIconSize(QtCore.QSize(20, 20)) # self.LoadItem.setAutoRaise(True) @@ -132,5 +213,5 @@ class MediaManagerItem(QtGui.QWidget): # self.ImageAddItem.setToolTip(QtGui.QApplication.translate("main_window", "Add to Order of Service", None, QtGui.QApplication.UnicodeUTF8)) # self.MediaToolBox.setItemText(self.MediaToolBox.indexOf(self.ImagePage), QtGui.QApplication.translate("main_window", "Images", None, QtGui.QApplication.UnicodeUTF8)) - self.log.info("done init") - + #self.log.info("done init") + diff --git a/openlp/plugins/test/test_mediamanageritem.py b/openlp/plugins/test/test_mediamanageritem.py index 506ecefb6..ceb6c551a 100644 --- a/openlp/plugins/test/test_mediamanageritem.py +++ b/openlp/plugins/test/test_mediamanageritem.py @@ -58,9 +58,10 @@ class TestMediaManager: def test1(self): log=logging.getLogger("test1") log.info("Start") + i1=MediaManagerItem() i2=MediaManagerItem() - i2.choose_area.text="More Stuff" + #i2.choose_area.text="More Stuff" log.info("i1"+str(i1)) log.info("i2"+str(i2)) self.MediaToolBox.addItem(i1, i1.icon, "Test1") @@ -72,10 +73,10 @@ class TestMediaManager: # self.app.exec_() log.info("End") return 1 - + if __name__=="__main__": t=TestMediaManager() t.setup_class() t.test1() log.info("exec") - t.app.exec_() + sys.exit(t.app.exec_())