openlp-core team mailing list archive

[Andreas Preikschat <googol@xxxxxxxx>]

Andreas Preikschat has proposed merging lp:~googol-hush/openlp/trivial into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)


- fixed a traceback after editing a image item in the servicemanager
- added icons for the up/down buttons and removed the text in the serviceItemEdit dialog
- rearranged the buttons (delete, <space>, up, down) 
-- 
https://code.launchpad.net/~googol-hush/openlp/trivial/+merge/39223
Your team OpenLP Core is requested to review the proposed merge of lp:~googol-hush/openlp/trivial into lp:openlp.

=== modified file 'openlp/core/ui/serviceitemeditdialog.py'
--- openlp/core/ui/serviceitemeditdialog.py	2010-09-14 18:18:47 +0000
+++ openlp/core/ui/serviceitemeditdialog.py	2010-10-24 11:12:51 +0000
@@ -25,6 +25,7 @@
 ###############################################################################
 
 from PyQt4 import QtCore, QtGui
+
 from openlp.core.lib import translate
 
 class Ui_ServiceItemEditDialog(object):
@@ -44,16 +45,26 @@
         self.topLayout.addWidget(self.listWidget)
         self.buttonLayout = QtGui.QVBoxLayout()
         self.buttonLayout.setObjectName(u'buttonLayout')
+        self.deleteButton = QtGui.QPushButton(self.layoutWidget)
+        self.deleteButton.setObjectName(u'deleteButton')
+        self.buttonLayout.addWidget(self.deleteButton)
+        spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum,
+            QtGui.QSizePolicy.Expanding)
+        self.buttonLayout.addItem(spacerItem)
         self.upButton = QtGui.QPushButton(self.layoutWidget)
+        self.upButton.setText(u'')
+        icon = QtGui.QIcon()
+        icon.addPixmap(QtGui.QPixmap(u':/services/service_up.png'),
+            QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.upButton.setIcon(icon)
         self.upButton.setObjectName(u'upButton')
         self.buttonLayout.addWidget(self.upButton)
-        spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum,
-            QtGui.QSizePolicy.Expanding)
-        self.buttonLayout.addItem(spacerItem)
-        self.deleteButton = QtGui.QPushButton(self.layoutWidget)
-        self.deleteButton.setObjectName(u'deleteButton')
-        self.buttonLayout.addWidget(self.deleteButton)
         self.downButton = QtGui.QPushButton(self.layoutWidget)
+        self.downButton.setText(u'')
+        icon = QtGui.QIcon()
+        icon.addPixmap(QtGui.QPixmap(u':/services/service_down.png'),
+            QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.downButton.setIcon(icon)
         self.downButton.setObjectName(u'downButton')
         self.buttonLayout.addWidget(self.downButton)
         self.topLayout.addLayout(self.buttonLayout)
@@ -70,7 +81,5 @@
     def retranslateUi(self, serviceItemEditDialog):
         serviceItemEditDialog.setWindowTitle(
             translate('OpenLP.ServiceItemEditForm', 'Reorder Service Item'))
-        self.upButton.setText(translate('OpenLP.ServiceItemEditForm', 'Up'))
         self.deleteButton.setText(translate('OpenLP.ServiceItemEditForm',
             'Delete'))
-        self.downButton.setText(translate('OpenLP.ServiceItemEditForm', 'Down'))

=== modified file 'openlp/core/ui/servicemanager.py'
--- openlp/core/ui/servicemanager.py	2010-10-08 19:32:07 +0000
+++ openlp/core/ui/servicemanager.py	2010-10-24 11:12:51 +0000
@@ -346,7 +346,7 @@
             self.serviceItems[item][u'service_item'])
         if self.serviceItemEditForm.exec_():
             self.addServiceItem(self.serviceItemEditForm.getServiceItem(),
-                replace=True, expand=self.serviceItems[item][u'expand'])
+                replace=True, expand=self.serviceItems[item][u'expanded'])
 
     def nextItem(self):
         """

=== modified file 'openlp/plugins/custom/forms/editcustomdialog.py'
--- openlp/plugins/custom/forms/editcustomdialog.py	2010-10-10 15:59:11 +0000
+++ openlp/plugins/custom/forms/editcustomdialog.py	2010-10-24 11:12:51 +0000
@@ -110,6 +110,7 @@
         self.titleEdit.setObjectName(u'titleEdit')
         self.horizontalLayout.addWidget(self.titleEdit)
         self.gridLayout.addLayout(self.horizontalLayout, 0, 0, 1, 1)
+
         self.retranslateUi(customEditDialog)
         QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(u'accepted()'),
             customEditDialog.accept)

=== modified file 'resources/forms/serviceitemeditdialog.ui'
--- resources/forms/serviceitemeditdialog.ui	2010-09-14 18:18:47 +0000
+++ resources/forms/serviceitemeditdialog.ui	2010-10-24 11:12:51 +0000
@@ -35,9 +35,9 @@
       <item>
        <layout class="QVBoxLayout" name="buttonLayout">
         <item>
-         <widget class="QPushButton" name="upButton">
+         <widget class="QPushButton" name="deleteButton">
           <property name="text">
-           <string>Up</string>
+           <string>Delete</string>
           </property>
          </widget>
         </item>
@@ -55,16 +55,24 @@
          </spacer>
         </item>
         <item>
-         <widget class="QPushButton" name="deleteButton">
+         <widget class="QPushButton" name="upButton">
           <property name="text">
-           <string>Delete</string>
+           <string/>
+          </property>
+          <property name="icon">
+           <iconset resource="../images/openlp-2.qrc">
+            <normaloff>:/services/service_up.png</normaloff>:/services/service_up.png</iconset>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QPushButton" name="downButton">
           <property name="text">
-           <string>Down</string>
+           <string/>
+          </property>
+          <property name="icon">
+           <iconset resource="../images/openlp-2.qrc">
+            <normaloff>:/services/service_down.png</normaloff>:/services/service_down.png</iconset>
           </property>
          </widget>
         </item>
@@ -82,6 +90,8 @@
    </layout>
   </widget>
  </widget>
- <resources/>
+ <resources>
+  <include location="../images/openlp-2.qrc"/>
+ </resources>
  <connections/>
 </ui>