Andreas Preikschat has proposed merging lp:~googol-hush/openlp/trivial2 into lp:openlp.
Requested reviews: OpenLP Core (openlp-core) For more details, see: https://code.launchpad.net/~googol-hush/openlp/trivial2/+merge/65898 Hello, I removed not used "display tab" (it has been a settings tab) ui file from resources/forms/ directory -- https://code.launchpad.net/~googol-hush/openlp/trivial2/+merge/65898 Your team OpenLP Core is requested to review the proposed merge of lp:~googol-hush/openlp/trivial2 into lp:openlp.
=== removed file 'resources/forms/displaytab.ui' --- resources/forms/displaytab.ui 2010-09-14 18:18:47 +0000 +++ resources/forms/displaytab.ui 1970-01-01 00:00:00 +0000 @@ -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>
_______________________________________________ Mailing list: https://launchpad.net/~openlp-core Post to : [email protected] Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp

