Head

openlp/core/lib/theme.py

@@ -178,10 +178,6 @@ class HorizontalType(object):
     Center = 2
 
     Names = [u'left', u'right', u'center']
-    TranslatedNames = [
-        translate('OpenLP.ThemeWizard', 'Left'),
-        translate('OpenLP.ThemeWizard', 'Right'),
-        translate('OpenLP.ThemeWizard', 'Center')]
 
 
 class VerticalType(object):
@@ -193,7 +189,6 @@ class VerticalType(object):
     Bottom = 2
 
     Names = [u'top', u'middle', u'bottom']
-    TranslatedNames = [UiStrings().Top, UiStrings().Middle, UiStrings().Bottom]
 
 
 BOOLEAN_LIST = [u'bold', u'italics', u'override', u'outline', u'shadow',

openlp/core/ui/displaytagdialog.py

@@ -35,13 +35,10 @@ class Ui_DisplayTagDialog(object):
     def setupUi(self, displayTagDialog):
         displayTagDialog.setObjectName(u'displayTagDialog')
         displayTagDialog.resize(725, 548)
-        self.widget = QtGui.QWidget(displayTagDialog)
-        self.widget.setGeometry(QtCore.QRect(10, 10, 701, 521))
-        self.widget.setObjectName(u'widget')
-        self.listdataGridLayout = QtGui.QGridLayout(self.widget)
-        self.listdataGridLayout.setMargin(0)
+        self.listdataGridLayout = QtGui.QGridLayout(displayTagDialog)
+        self.listdataGridLayout.setMargin(8)
         self.listdataGridLayout.setObjectName(u'listdataGridLayout')
-        self.tagTableWidget = QtGui.QTableWidget(self.widget)
+        self.tagTableWidget = QtGui.QTableWidget(displayTagDialog)
         self.tagTableWidget.setHorizontalScrollBarPolicy(
             QtCore.Qt.ScrollBarAlwaysOff)
         self.tagTableWidget.setEditTriggers(
@@ -55,6 +52,7 @@ class Ui_DisplayTagDialog(object):
         self.tagTableWidget.setObjectName(u'tagTableWidget')
         self.tagTableWidget.setColumnCount(4)
         self.tagTableWidget.setRowCount(0)
+        self.tagTableWidget.horizontalHeader().setStretchLastSection(True)
         item = QtGui.QTableWidgetItem()
         self.tagTableWidget.setHorizontalHeaderItem(0, item)
         item = QtGui.QTableWidgetItem()
@@ -69,11 +67,11 @@ class Ui_DisplayTagDialog(object):
         spacerItem = QtGui.QSpacerItem(40, 20,
             QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
         self.horizontalLayout.addItem(spacerItem)
-        self.deletePushButton = QtGui.QPushButton(self.widget)
+        self.deletePushButton = QtGui.QPushButton(displayTagDialog)
         self.deletePushButton.setObjectName(u'deletePushButton')
         self.horizontalLayout.addWidget(self.deletePushButton)
         self.listdataGridLayout.addLayout(self.horizontalLayout, 1, 0, 1, 1)
-        self.editGroupBox = QtGui.QGroupBox(self.widget)
+        self.editGroupBox = QtGui.QGroupBox(displayTagDialog)
         self.editGroupBox.setObjectName(u'editGroupBox')
         self.dataGridLayout = QtGui.QGridLayout(self.editGroupBox)
         self.dataGridLayout.setObjectName(u'dataGridLayout')
@@ -115,9 +113,8 @@ class Ui_DisplayTagDialog(object):
         self.dataGridLayout.addWidget(self.savePushButton, 4, 2, 1, 1)
         self.listdataGridLayout.addWidget(self.editGroupBox, 2, 0, 1, 1)
         self.buttonBox = QtGui.QDialogButtonBox(displayTagDialog)
-        closeButton = QtGui.QDialogButtonBox.Close
         self.buttonBox.setObjectName('displayTagDialogButtonBox')
-        self.buttonBox.setStandardButtons(closeButton)
+        self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Close)
         self.listdataGridLayout.addWidget(self.buttonBox, 3, 0, 1, 1)
 
         self.retranslateUi(displayTagDialog)
@@ -148,6 +145,5 @@ class Ui_DisplayTagDialog(object):
         self.tagTableWidget.horizontalHeaderItem(3).setText(
             translate('OpenLP.DisplayTagDialog', 'End HTML'))
         self.tagTableWidget.setColumnWidth(0, 120)
-        self.tagTableWidget.setColumnWidth(1, 40)
-        self.tagTableWidget.setColumnWidth(2, 240)
-        self.tagTableWidget.setColumnWidth(3, 240)
+        self.tagTableWidget.setColumnWidth(1, 80)
+        self.tagTableWidget.setColumnWidth(2, 330)

openlp/core/ui/displaytagform.py

@@ -138,6 +138,7 @@ class DisplayTagForm(QtGui.QDialog, Ui_DisplayTagDialog):
         # Highlight new row
         self.tagTableWidget.selectRow(self.tagTableWidget.rowCount() - 1)
         self.onRowSelected()
+        self.tagTableWidget.scrollToBottom()
 
     def onDeletePushed(self):
         """

openlp/core/ui/mainwindow.py

@@ -223,7 +223,7 @@ class Ui_MainWindow(object):
         self.modeDefaultItem = checkable_action(
             mainWindow, u'modeDefaultItem', category=UiStrings().ViewMode)
         self.modeSetupItem = checkable_action(
-            mainWindow, u'modeLiveItem', category=UiStrings().ViewMode)
+            mainWindow, u'modeSetupItem', category=UiStrings().ViewMode)
         self.modeLiveItem = checkable_action(
             mainWindow, u'modeLiveItem', True, UiStrings().ViewMode)
         self.modeGroup = QtGui.QActionGroup(mainWindow)

openlp/core/ui/printservicedialog.py

@@ -41,11 +41,6 @@ class ZoomSize(object):
     Fifty = 4
     TwentyFive = 5
 
-    Sizes = [
-        translate('OpenLP.PrintServiceDialog', 'Fit Page'),
-        translate('OpenLP.PrintServiceDialog', 'Fit Width'),
-        u'100%', u'75%', u'50%', u'25%']
-
 
 class Ui_PrintServiceDialog(object):
     def setupUi(self, printServiceDialog):
@@ -59,18 +54,14 @@ class Ui_PrintServiceDialog(object):
         self.toolbar.setIconSize(QtCore.QSize(22, 22))
         self.toolbar.setToolButtonStyle(QtCore.Qt.ToolButtonTextBesideIcon)
         self.printButton = self.toolbar.addAction(
-            build_icon(u':/general/general_print.png'), 'Print')
+            build_icon(u':/general/general_print.png'),
+            translate('OpenLP.PrintServiceForm', 'Print'))
         self.optionsButton = QtGui.QToolButton(self.toolbar)
-        self.optionsButton.setText(translate('OpenLP.PrintServiceForm',
-            'Options'))
         self.optionsButton.setToolButtonStyle(
             QtCore.Qt.ToolButtonTextBesideIcon)
         self.optionsButton.setIcon(build_icon(u':/system/system_configure.png'))
         self.optionsButton.setCheckable(True)
         self.toolbar.addWidget(self.optionsButton)
-        self.closeButton = self.toolbar.addAction(
-            build_icon(u':/system/system_close.png'),
-            translate('OpenLP.PrintServiceForm', 'Close'))
         self.toolbar.addSeparator()
         self.plainCopy = self.toolbar.addAction(
             build_icon(u':/system/system_edit_copy.png'),
@@ -81,24 +72,18 @@ class Ui_PrintServiceDialog(object):
         self.toolbar.addSeparator()
         self.zoomInButton = QtGui.QToolButton(self.toolbar)
         self.zoomInButton.setIcon(build_icon(u':/general/general_zoom_in.png'))
-        self.zoomInButton.setToolTip(translate('OpenLP.PrintServiceForm',
-            'Zoom In'))
         self.zoomInButton.setObjectName(u'zoomInButton')
         self.zoomInButton.setIconSize(QtCore.QSize(22, 22))
         self.toolbar.addWidget(self.zoomInButton)
         self.zoomOutButton = QtGui.QToolButton(self.toolbar)
         self.zoomOutButton.setIcon(
             build_icon(u':/general/general_zoom_out.png'))
-        self.zoomOutButton.setToolTip(translate('OpenLP.PrintServiceForm',
-            'Zoom Out'))
         self.zoomOutButton.setObjectName(u'zoomOutButton')
         self.zoomOutButton.setIconSize(QtCore.QSize(22, 22))
         self.toolbar.addWidget(self.zoomOutButton)
         self.zoomOriginalButton = QtGui.QToolButton(self.toolbar)
         self.zoomOriginalButton.setIcon(
             build_icon(u':/general/general_zoom_original.png'))
-        self.zoomOriginalButton.setToolTip(translate('OpenLP.PrintServiceForm',
-            'Zoom Original'))
         self.zoomOriginalButton.setObjectName(u'zoomOriginalButton')
         self.zoomOriginalButton.setIconSize(QtCore.QSize(22, 22))
         self.toolbar.addWidget(self.zoomOriginalButton)
@@ -116,20 +101,17 @@ class Ui_PrintServiceDialog(object):
         self.optionsLayout.setContentsMargins(8, 8, 8, 8)
         self.titleLabel = QtGui.QLabel(self.optionsWidget)
         self.titleLabel.setObjectName(u'titleLabel')
-        self.titleLabel.setText(u'Title:')
         self.optionsLayout.addWidget(self.titleLabel)
         self.titleLineEdit = QtGui.QLineEdit(self.optionsWidget)
         self.titleLineEdit.setObjectName(u'titleLineEdit')
         self.optionsLayout.addWidget(self.titleLineEdit)
         self.footerLabel = QtGui.QLabel(self.optionsWidget)
         self.footerLabel.setObjectName(u'footerLabel')
-        self.footerLabel.setText(u'Custom Footer Text:')
         self.optionsLayout.addWidget(self.footerLabel)
         self.footerTextEdit = SpellTextEdit(self.optionsWidget)
         self.footerTextEdit.setObjectName(u'footerTextEdit')
         self.optionsLayout.addWidget(self.footerTextEdit)
-        self.optionsGroupBox = QtGui.QGroupBox(
-            translate('OpenLP.PrintServiceForm','Other Options'))
+        self.optionsGroupBox = QtGui.QGroupBox()
         self.groupLayout = QtGui.QVBoxLayout()
         self.slideTextCheckBox = QtGui.QCheckBox()
         self.groupLayout.addWidget(self.slideTextCheckBox)
@@ -150,6 +132,19 @@ class Ui_PrintServiceDialog(object):
 
     def retranslateUi(self, printServiceDialog):
         printServiceDialog.setWindowTitle(UiStrings().PrintService)
+        self.zoomOutButton.setToolTip(translate('OpenLP.PrintServiceForm',
+            'Zoom Out'))
+        self.zoomOriginalButton.setToolTip(translate('OpenLP.PrintServiceForm',
+            'Zoom Original'))
+        self.zoomInButton.setToolTip(translate('OpenLP.PrintServiceForm',
+            'Zoom In'))
+        self.optionsButton.setText(translate('OpenLP.PrintServiceForm',
+            'Options'))
+        self.titleLabel.setText(translate('OpenLP.PrintServiceForm', 'Title:'))
+        self.footerLabel.setText(translate('OpenLP.PrintServiceForm',
+            'Custom Footer Text:'))
+        self.optionsGroupBox.setTitle(
+            translate('OpenLP.PrintServiceForm','Other Options'))
         self.slideTextCheckBox.setText(translate('OpenLP.PrintServiceForm',
             'Include slide text if available'))
         self.pageBreakAfterText.setText(translate('OpenLP.PrintServiceForm',
@@ -160,10 +155,13 @@ class Ui_PrintServiceDialog(object):
             'Include play length of media items'))
         self.titleLineEdit.setText(translate('OpenLP.PrintServiceForm',
             'Service Sheet'))
-        self.zoomComboBox.addItem(ZoomSize.Sizes[ZoomSize.Page])
-        self.zoomComboBox.addItem(ZoomSize.Sizes[ZoomSize.Width])
-        self.zoomComboBox.addItem(ZoomSize.Sizes[ZoomSize.OneHundred])
-        self.zoomComboBox.addItem(ZoomSize.Sizes[ZoomSize.SeventyFive])
-        self.zoomComboBox.addItem(ZoomSize.Sizes[ZoomSize.Fifty])
-        self.zoomComboBox.addItem(ZoomSize.Sizes[ZoomSize.TwentyFive])
+        # Do not change the order.
+        self.zoomComboBox.addItems([
+            translate('OpenLP.PrintServiceDialog', 'Fit Page'),
+            translate('OpenLP.PrintServiceDialog', 'Fit Width'),
+            u'100%',
+            u'75%',
+            u'50%',
+            u'25%']
+        )
 

openlp/core/ui/printserviceform.py

@@ -137,8 +137,6 @@ class PrintServiceForm(QtGui.QDialog, Ui_PrintServiceDialog):
         # Signals
         QtCore.QObject.connect(self.printButton,
             QtCore.SIGNAL(u'triggered()'), self.printServiceOrder)
-        QtCore.QObject.connect(self.closeButton,
-            QtCore.SIGNAL(u'triggered()'), self.accept)
         QtCore.QObject.connect(self.zoomOutButton,
             QtCore.SIGNAL(u'clicked()'), self.zoomOut)
         QtCore.QObject.connect(self.zoomInButton,
@@ -326,8 +324,7 @@ class PrintServiceForm(QtGui.QDialog, Ui_PrintServiceDialog):
         """
         Copies the display text to the clipboard as plain text
         """
-        self.mainWindow.clipboard.setText(
-            self.document.toPlainText())
+        self.mainWindow.clipboard.setText(self.document.toPlainText())
 
     def copyHtmlText(self):
         """

openlp/core/ui/thememanager.py

@@ -298,7 +298,10 @@ class ThemeManager(QtGui.QWidget):
         Copies an existing theme to a new name
         """
         item = self.themeListWidget.currentItem()
-        oldThemeName = unicode(item.data(QtCore.Qt.UserRole).toString())
+        oldThemeName = unicode(
+            translate('OpenLP.ThemeManager', 'Copy of %s',
+            'Copy of <theme name>')) % unicode(
+            item.data(QtCore.Qt.UserRole).toString())
         self.fileRenameForm.fileNameEdit.setText(oldThemeName)
         if self.fileRenameForm.exec_(True):
             newThemeName = unicode(self.fileRenameForm.fileNameEdit.text())

resources/forms/displaytab.ui

@@ -1,295 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DisplaysDialog</class>
- <widget class="QWidget" name="DisplaysDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>620</width>
-    <height>716</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Amend Display Settings</string>
-  </property>
-  <widget class="QWidget" name="layoutWidget">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>40</y>
-     <width>241</width>
-     <height>79</height>
-    </rect>
-   </property>
-   <layout class="QVBoxLayout" name="verticalLayout">
-    <item>
-     <widget class="QGroupBox" name="CurrentGroupBox">
-      <property name="title">
-       <string>Default Settings</string>
-      </property>
-      <layout class="QHBoxLayout" name="horizontalLayout">
-       <item>
-        <layout class="QVBoxLayout" name="verticalLayout_6">
-         <item>
-          <widget class="QLabel" name="XLabel">
-           <property name="text">
-            <string>X</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="Xpos">
-           <property name="text">
-            <string>0</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <layout class="QVBoxLayout" name="verticalLayout_7">
-         <item>
-          <widget class="QLabel" name="YLabel">
-           <property name="text">
-            <string>Y</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="Ypos">
-           <property name="text">
-            <string>0</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <layout class="QVBoxLayout" name="verticalLayout_9">
-         <item>
-          <widget class="QLabel" name="HeightLabel">
-           <property name="maximumSize">
-            <size>
-             <width>100</width>
-             <height>16777215</height>
-            </size>
-           </property>
-           <property name="text">
-            <string>Height</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="Height">
-           <property name="text">
-            <string>0</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <layout class="QVBoxLayout" name="verticalLayout_8">
-         <item>
-          <widget class="QLabel" name="WidthLabel">
-           <property name="text">
-            <string>Width</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="Width">
-           <property name="text">
-            <string>0</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-      </layout>
-     </widget>
-    </item>
-   </layout>
-  </widget>
-  <widget class="QGroupBox" name="CurrentGroupBox_2">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>130</y>
-     <width>248</width>
-     <height>87</height>
-    </rect>
-   </property>
-   <property name="maximumSize">
-    <size>
-     <width>500</width>
-     <height>16777215</height>
-    </size>
-   </property>
-   <property name="title">
-    <string>Amend Settings</string>
-   </property>
-   <layout class="QHBoxLayout" name="horizontalLayout_2">
-    <item>
-     <layout class="QVBoxLayout" name="verticalLayout_2">
-      <item>
-       <widget class="QLabel" name="XAmendLabel">
-        <property name="text">
-         <string>X</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLineEdit" name="XposEdit">
-        <property name="maximumSize">
-         <size>
-          <width>50</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="maxLength">
-         <number>4</number>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </item>
-    <item>
-     <layout class="QVBoxLayout" name="verticalLayout_3">
-      <item>
-       <widget class="QLabel" name="YAmendLabel">
-        <property name="text">
-         <string>Y</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLineEdit" name="YposEdit">
-        <property name="maximumSize">
-         <size>
-          <width>50</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="maxLength">
-         <number>4</number>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </item>
-    <item>
-     <layout class="QVBoxLayout" name="verticalLayout_4">
-      <item>
-       <widget class="QLabel" name="HeightAmendLabel">
-        <property name="text">
-         <string>Height</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLineEdit" name="HeightEdit">
-        <property name="maximumSize">
-         <size>
-          <width>50</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="maxLength">
-         <number>4</number>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </item>
-    <item>
-     <layout class="QVBoxLayout" name="verticalLayout_5">
-      <property name="sizeConstraint">
-       <enum>QLayout::SetMinimumSize</enum>
-      </property>
-      <item>
-       <widget class="QLabel" name="WidthAmendLabel">
-        <property name="maximumSize">
-         <size>
-          <width>100</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Width</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLineEdit" name="WidthEdit">
-        <property name="maximumSize">
-         <size>
-          <width>60</width>
-          <height>16777215</height>
-         </size>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </item>
-   </layout>
-   <zorder>layoutWidget</zorder>
-   <zorder>YAmendLabel</zorder>
-   <zorder>HeightAmendLabel</zorder>
-   <zorder>WidthAmendLabel</zorder>
-   <zorder>YAmendLabel</zorder>
-  </widget>
-  <widget class="QCheckBox" name="OverrideCheckBox">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>10</y>
-     <width>191</width>
-     <height>23</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>Override Output Display</string>
-   </property>
-  </widget>
- </widget>
- <resources/>
- <connections/>
-</ui>