From 9741d0e10aa7ace501ef3bd2df322be5b23db82d Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Fri, 2 Oct 2009 13:16:54 +0100 Subject: [PATCH 1/3] More Plugin list work --- openlp/core/ui/plugindialoglistform.py | 17 +++++++-- resources/forms/plugindialoglistform.ui | 50 +++++++++++++++++++++++-- 2 files changed, 61 insertions(+), 6 deletions(-) diff --git a/openlp/core/ui/plugindialoglistform.py b/openlp/core/ui/plugindialoglistform.py index bd33c70f8..8224c55c0 100644 --- a/openlp/core/ui/plugindialoglistform.py +++ b/openlp/core/ui/plugindialoglistform.py @@ -23,9 +23,9 @@ class PluginForm(QtGui.QDialog): def setupUi(self, PluginForm): PluginForm.setObjectName(u'PluginForm') - PluginForm.resize(400, 393) + PluginForm.resize(400, 568) self.PluginViewList = QtGui.QTableWidget(PluginForm) - self.PluginViewList.setGeometry(QtCore.QRect(20, 10, 371, 331)) + self.PluginViewList.setGeometry(QtCore.QRect(20, 10, 371, 261)) self.PluginViewList.setObjectName(u'PluginViewList') self.PluginViewList.setShowGrid(False) self.PluginViewList.setGridStyle(QtCore.Qt.SolidLine) @@ -38,11 +38,21 @@ class PluginForm(QtGui.QDialog): item = QtGui.QTableWidgetItem() self.PluginViewList.setHorizontalHeaderItem(2, item) self.PluginViewList.horizontalHeader().setVisible(True) + self.PluginViewList.horizontalHeader().setStretchLastSection(True) self.PluginViewList.verticalHeader().setVisible(False) self.ButtonBox = QtGui.QDialogButtonBox(PluginForm) - self.ButtonBox.setGeometry(QtCore.QRect(220, 350, 170, 25)) + self.ButtonBox.setGeometry(QtCore.QRect(220, 530, 170, 25)) self.ButtonBox.setStandardButtons(QtGui.QDialogButtonBox.Ok) self.ButtonBox.setObjectName(u'ButtonBox') + self.PluginInfoGroupBox = QtGui.QGroupBox(PluginForm) + self.PluginInfoGroupBox.setGeometry(QtCore.QRect(20, 270, 371, 241)) + self.PluginInfoGroupBox.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) + self.PluginInfoGroupBox.setFlat(False) + self.PluginInfoGroupBox.setObjectName("PluginInfoGroupBox") + self.AboutTextLabel = QtGui.QLabel(self.PluginInfoGroupBox) + self.AboutTextLabel.setGeometry(QtCore.QRect(10, 30, 351, 191)) + self.AboutTextLabel.setObjectName("AboutTextLabel") + self.retranslateUi(PluginForm) QtCore.QObject.connect(self.ButtonBox, @@ -53,6 +63,7 @@ class PluginForm(QtGui.QDialog): def retranslateUi(self, PluginForm): PluginForm.setWindowTitle(translate(u'PluginForm', u'Plugin list')) + self.PluginInfoGroupBox.setTitle(translate("PluginForm", "Selected Plugin Information")) self.PluginViewList.horizontalHeaderItem(0).setText( translate(u'PluginForm', u'Name')) self.PluginViewList.horizontalHeaderItem(1).setText( diff --git a/resources/forms/plugindialoglistform.ui b/resources/forms/plugindialoglistform.ui index 3e76962bd..d8b18e2e4 100644 --- a/resources/forms/plugindialoglistform.ui +++ b/resources/forms/plugindialoglistform.ui @@ -7,7 +7,7 @@ 0 0 400 - 393 + 568 @@ -19,7 +19,7 @@ 20 10 371 - 331 + 261 @@ -34,12 +34,24 @@ true + + false + true + + true + false + + true + + + false + @@ -76,7 +88,7 @@ 220 - 350 + 530 170 25 @@ -85,6 +97,38 @@ QDialogButtonBox::Ok + + + + 20 + 270 + 371 + 241 + + + + GroupBox + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + false + + + + + 10 + 30 + 351 + 191 + + + + TextLabel + + + From 6c3fd8b096a90aa3a2d849086f7e01e2b550f5d3 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Fri, 2 Oct 2009 14:50:45 +0100 Subject: [PATCH 2/3] Sort out text display on dialog --- openlp/core/ui/plugindialoglistform.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/openlp/core/ui/plugindialoglistform.py b/openlp/core/ui/plugindialoglistform.py index 1cfc04f4f..b9a27b632 100644 --- a/openlp/core/ui/plugindialoglistform.py +++ b/openlp/core/ui/plugindialoglistform.py @@ -53,6 +53,8 @@ class PluginForm(QtGui.QDialog): self.PluginInfoGroupBox.setObjectName("PluginInfoGroupBox") self.AboutTextLabel = QtGui.QLabel(self.PluginInfoGroupBox) self.AboutTextLabel.setGeometry(QtCore.QRect(10, 30, 351, 191)) + self.AboutTextLabel.setAlignment(QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop) + self.AboutTextLabel.setWordWrap(True) self.AboutTextLabel.setObjectName("AboutTextLabel") @@ -106,9 +108,5 @@ class PluginForm(QtGui.QDialog): row = self.PluginViewList.row(item) text = self.parent.plugin_manager.plugins[row].about() if text is not None: - ret = QtGui.QMessageBox.information(self, - translate(u'PluginList', u'Plugin Information'), - translate(u'PluginList', text), - QtGui.QMessageBox.StandardButtons( - QtGui.QMessageBox.Ok), - QtGui.QMessageBox.Ok) + self.AboutTextLabel.setText(translate(u'PluginList', text)) + From e25c9937c7550a33b2b55ee16776dc64e4c09a40 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Fri, 2 Oct 2009 15:19:36 +0100 Subject: [PATCH 3/3] Update UI --- openlp/core/ui/plugindialoglistform.py | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/openlp/core/ui/plugindialoglistform.py b/openlp/core/ui/plugindialoglistform.py index b9a27b632..5826578f9 100644 --- a/openlp/core/ui/plugindialoglistform.py +++ b/openlp/core/ui/plugindialoglistform.py @@ -89,18 +89,22 @@ class PluginForm(QtGui.QDialog): item2 = QtGui.QTableWidgetItem(plugin.version) item2.setTextAlignment(QtCore.Qt.AlignVCenter) item2.setFlags(QtCore.Qt.ItemIsSelectable) - if plugin.status == PluginStatus.Active: - item3 = QtGui.QTableWidgetItem( - translate(u'PluginForm', u'Active')) - else: - item3 = QtGui.QTableWidgetItem( - translate(u'PluginForm', u'Inactive')) - item3.setTextAlignment(QtCore.Qt.AlignVCenter) - item3.setFlags(QtCore.Qt.ItemIsSelectable) self.PluginViewList.setItem(row, 0, item1) self.PluginViewList.setItem(row, 1, item2) - self.PluginViewList.setItem(row, 2, item3) - self.PluginViewList.setRowHeight(row, 15) + if plugin.can_be_disabled(): + combo = QtGui.QComboBox() + self.PluginViewList.setCellWidget(row, 2, combo) + combo.addItem(translate(u'PluginForm', u'Active')) + combo.addItem(translate(u'PluginForm', u'Inactive')) +# if plugin.status == PluginStatus.Active: + self.PluginViewList.setRowHeight(row, 25) + else: + item3 = QtGui.QTableWidgetItem( + translate(u'PluginForm', u'Active')) + item3.setTextAlignment(QtCore.Qt.AlignVCenter) + item3.setFlags(QtCore.Qt.ItemIsSelectable) + self.PluginViewList.setItem(row, 2, item3) + self.PluginViewList.setRowHeight(row, 15) def displayAbout(self, item): if item is None: