Fix dialogs to be Qwidget instead of Qdialog

bzr-revno: 323
This commit is contained in:
Tim Bentley 2009-02-19 18:35:37 +00:00
parent e1cdfb618a
commit 338f573ed1
4 changed files with 207 additions and 89 deletions

View File

@ -0,0 +1,54 @@
# -*- coding: utf-8 -*-
# Form implementation generated from reading ui file 'bibleeditdialog.ui'
#
# Created: Wed Feb 18 06:02:58 2009
# by: PyQt4 UI code generator 4.4.4
#
# WARNING! All changes made in this file will be lost!
from PyQt4 import QtCore, QtGui
class Ui_dialog(object):
def setupUi(self, dialog):
dialog.setObjectName("dialog")
dialog.resize(400, 300)
icon = QtGui.QIcon()
icon.addPixmap(QtGui.QPixmap(":/icon/openlp.org-icon-32.bmp"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
dialog.setWindowIcon(icon)
self.verticalLayout = QtGui.QVBoxLayout(dialog)
self.verticalLayout.setSpacing(8)
self.verticalLayout.setMargin(8)
self.verticalLayout.setObjectName("verticalLayout")
self.EditGroupBox = QtGui.QGroupBox(dialog)
self.EditGroupBox.setObjectName("EditGroupBox")
self.gridLayout = QtGui.QGridLayout(self.EditGroupBox)
self.gridLayout.setMargin(8)
self.gridLayout.setSpacing(8)
self.gridLayout.setObjectName("gridLayout")
self.VerseTextEdit = QtGui.QPlainTextEdit(self.EditGroupBox)
self.VerseTextEdit.setObjectName("VerseTextEdit")
self.gridLayout.addWidget(self.VerseTextEdit, 0, 0, 1, 1)
self.verticalLayout.addWidget(self.EditGroupBox)
self.ButtonLoayout = QtGui.QHBoxLayout()
self.ButtonLoayout.setSpacing(8)
self.ButtonLoayout.setMargin(8)
self.ButtonLoayout.setObjectName("ButtonLoayout")
self.SaveButton = QtGui.QPushButton(dialog)
self.SaveButton.setObjectName("SaveButton")
self.ButtonLoayout.addWidget(self.SaveButton)
self.CancelButton = QtGui.QPushButton(dialog)
self.CancelButton.setObjectName("CancelButton")
self.ButtonLoayout.addWidget(self.CancelButton)
self.verticalLayout.addLayout(self.ButtonLoayout)
self.retranslateUi(dialog)
QtCore.QMetaObject.connectSlotsByName(dialog)
dialog.setTabOrder(self.VerseTextEdit, self.SaveButton)
dialog.setTabOrder(self.SaveButton, self.CancelButton)
def retranslateUi(self, dialog):
dialog.setWindowTitle(QtGui.QApplication.translate("dialog", "Bible Edit Dialog", None, QtGui.QApplication.UnicodeUTF8))
self.EditGroupBox.setTitle(QtGui.QApplication.translate("dialog", "Edit Verse Text", None, QtGui.QApplication.UnicodeUTF8))
self.SaveButton.setText(QtGui.QApplication.translate("dialog", "Save", None, QtGui.QApplication.UnicodeUTF8))
self.CancelButton.setText(QtGui.QApplication.translate("dialog", "Cancel", None, QtGui.QApplication.UnicodeUTF8))

View File

@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'bibleimportdialog.ui'
#
# Created: Sat Feb 14 08:25:46 2009
# Created: Thu Feb 19 16:01:11 2009
# by: PyQt4 UI code generator 4.4.4
#
# WARNING! All changes made in this file will be lost!
@ -17,13 +17,14 @@ class Ui_BibleImportDialog(object):
icon.addPixmap(QtGui.QPixmap(":/icon/openlp.org-icon-32.bmp"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
BibleImportDialog.setWindowIcon(icon)
self.ImportToolBox = QtGui.QToolBox(BibleImportDialog)
self.ImportToolBox.setGeometry(QtCore.QRect(10, 0, 471, 431))
self.ImportToolBox.setGeometry(QtCore.QRect(20, 20, 451, 401))
self.ImportToolBox.setFrameShape(QtGui.QFrame.StyledPanel)
self.ImportToolBox.setObjectName("ImportToolBox")
self.FileImportPage = QtGui.QWidget()
self.FileImportPage.setGeometry(QtCore.QRect(0, 0, 471, 371))
self.FileImportPage.setGeometry(QtCore.QRect(0, 0, 447, 337))
self.FileImportPage.setObjectName("FileImportPage")
self.OSISGroupBox = QtGui.QGroupBox(self.FileImportPage)
self.OSISGroupBox.setGeometry(QtCore.QRect(8, 65, 451, 81))
self.OSISGroupBox.setGeometry(QtCore.QRect(18, 65, 411, 81))
self.OSISGroupBox.setObjectName("OSISGroupBox")
self.gridLayout_2 = QtGui.QGridLayout(self.OSISGroupBox)
self.gridLayout_2.setMargin(8)
@ -42,7 +43,7 @@ class Ui_BibleImportDialog(object):
self.OsisFileButton.setObjectName("OsisFileButton")
self.gridLayout_2.addWidget(self.OsisFileButton, 0, 2, 1, 1)
self.CVSGroupBox = QtGui.QGroupBox(self.FileImportPage)
self.CVSGroupBox.setGeometry(QtCore.QRect(10, 170, 451, 191))
self.CVSGroupBox.setGeometry(QtCore.QRect(20, 170, 411, 191))
self.CVSGroupBox.setObjectName("CVSGroupBox")
self.gridLayout = QtGui.QGridLayout(self.CVSGroupBox)
self.gridLayout.setMargin(8)
@ -76,7 +77,7 @@ class Ui_BibleImportDialog(object):
self.BibleNameLabel.setObjectName("BibleNameLabel")
self.ImportToolBox.addItem(self.FileImportPage, "")
self.WebBiblePage = QtGui.QWidget()
self.WebBiblePage.setGeometry(QtCore.QRect(0, 0, 471, 371))
self.WebBiblePage.setGeometry(QtCore.QRect(0, 0, 192, 228))
self.WebBiblePage.setObjectName("WebBiblePage")
self.WebBibleLayout = QtGui.QVBoxLayout(self.WebBiblePage)
self.WebBibleLayout.setSpacing(8)
@ -84,23 +85,25 @@ class Ui_BibleImportDialog(object):
self.WebBibleLayout.setObjectName("WebBibleLayout")
self.OptionsGroupBox = QtGui.QGroupBox(self.WebBiblePage)
self.OptionsGroupBox.setObjectName("OptionsGroupBox")
self.formLayout_2 = QtGui.QFormLayout(self.OptionsGroupBox)
self.formLayout_2.setObjectName("formLayout_2")
self.LocationLabel = QtGui.QLabel(self.OptionsGroupBox)
self.LocationLabel.setGeometry(QtCore.QRect(11, 27, 54, 16))
self.LocationLabel.setObjectName("LocationLabel")
self.formLayout_2.setWidget(0, QtGui.QFormLayout.LabelRole, self.LocationLabel)
self.LocationComboBox = QtGui.QComboBox(self.OptionsGroupBox)
self.LocationComboBox.setGeometry(QtCore.QRect(71, 27, 371, 21))
self.LocationComboBox.setObjectName("LocationComboBox")
self.LocationComboBox.addItem(QtCore.QString())
self.formLayout_2.setWidget(0, QtGui.QFormLayout.FieldRole, self.LocationComboBox)
self.BibleLabel = QtGui.QLabel(self.OptionsGroupBox)
self.BibleLabel.setGeometry(QtCore.QRect(11, 54, 34, 16))
self.BibleLabel.setObjectName("BibleLabel")
self.formLayout_2.setWidget(1, QtGui.QFormLayout.LabelRole, self.BibleLabel)
self.BibleComboBox = QtGui.QComboBox(self.OptionsGroupBox)
self.BibleComboBox.setGeometry(QtCore.QRect(71, 54, 371, 21))
self.BibleComboBox.setObjectName("BibleComboBox")
self.BibleComboBox.addItem(QtCore.QString())
self.BibleComboBox.setItemText(0, "")
self.BibleComboBox.addItem(QtCore.QString())
self.BibleComboBox.addItem(QtCore.QString())
self.formLayout_2.setWidget(1, QtGui.QFormLayout.FieldRole, self.BibleComboBox)
self.WebBibleLayout.addWidget(self.OptionsGroupBox)
self.ProxyGroupBox = QtGui.QGroupBox(self.WebBiblePage)
self.ProxyGroupBox.setObjectName("ProxyGroupBox")
@ -156,7 +159,7 @@ class Ui_BibleImportDialog(object):
self.PermisionEdit.setObjectName("PermisionEdit")
self.formLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.PermisionEdit)
self.MessageLabel = QtGui.QLabel(BibleImportDialog)
self.MessageLabel.setGeometry(QtCore.QRect(20, 670, 451, 17))
self.MessageLabel.setGeometry(QtCore.QRect(20, 670, 271, 17))
self.MessageLabel.setObjectName("MessageLabel")
self.ProgressGroupBox = QtGui.QGroupBox(BibleImportDialog)
self.ProgressGroupBox.setGeometry(QtCore.QRect(10, 600, 471, 70))
@ -182,7 +185,7 @@ class Ui_BibleImportDialog(object):
self.horizontalLayout.addWidget(self.CancelButton)
self.retranslateUi(BibleImportDialog)
self.ImportToolBox.setCurrentIndex(1)
self.ImportToolBox.setCurrentIndex(0)
QtCore.QMetaObject.connectSlotsByName(BibleImportDialog)
BibleImportDialog.setTabOrder(self.BibleNameEdit, self.OSISLocationEdit)
BibleImportDialog.setTabOrder(self.OSISLocationEdit, self.OsisFileButton)

View File

@ -0,0 +1,80 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>dialog</class>
<widget class="QWidget" name="dialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>300</height>
</rect>
</property>
<property name="windowTitle">
<string>Bible Edit Dialog</string>
</property>
<property name="windowIcon">
<iconset resource="../images/openlp-2.qrc">
<normaloff>:/icon/openlp.org-icon-32.bmp</normaloff>:/icon/openlp.org-icon-32.bmp</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>8</number>
</property>
<property name="margin">
<number>8</number>
</property>
<item>
<widget class="QGroupBox" name="EditGroupBox">
<property name="title">
<string>Edit Verse Text</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="margin">
<number>8</number>
</property>
<property name="spacing">
<number>8</number>
</property>
<item row="0" column="0">
<widget class="QPlainTextEdit" name="VerseTextEdit"/>
</item>
</layout>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="ButtonLoayout">
<property name="spacing">
<number>8</number>
</property>
<property name="margin">
<number>8</number>
</property>
<item>
<widget class="QPushButton" name="SaveButton">
<property name="text">
<string>Save</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="CancelButton">
<property name="text">
<string>Cancel</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<tabstops>
<tabstop>VerseTextEdit</tabstop>
<tabstop>SaveButton</tabstop>
<tabstop>CancelButton</tabstop>
</tabstops>
<resources>
<include location="../images/openlp-2.qrc"/>
</resources>
<connections/>
</ui>

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>BibleImportDialog</class>
<widget class="QDialog" name="BibleImportDialog">
<widget class="QWidget" name="BibleImportDialog">
<property name="geometry">
<rect>
<x>0</x>
@ -20,22 +20,25 @@
<widget class="QToolBox" name="ImportToolBox">
<property name="geometry">
<rect>
<x>10</x>
<y>0</y>
<width>471</width>
<height>431</height>
<x>20</x>
<y>20</y>
<width>451</width>
<height>401</height>
</rect>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="currentIndex">
<number>1</number>
<number>0</number>
</property>
<widget class="QWidget" name="FileImportPage">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>471</width>
<height>371</height>
<width>447</width>
<height>337</height>
</rect>
</property>
<attribute name="label">
@ -44,9 +47,9 @@
<widget class="QGroupBox" name="OSISGroupBox">
<property name="geometry">
<rect>
<x>8</x>
<x>18</x>
<y>65</y>
<width>451</width>
<width>411</width>
<height>81</height>
</rect>
</property>
@ -86,9 +89,9 @@
<widget class="QGroupBox" name="CVSGroupBox">
<property name="geometry">
<rect>
<x>10</x>
<x>20</x>
<y>170</y>
<width>451</width>
<width>411</width>
<height>191</height>
</rect>
</property>
@ -175,8 +178,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>471</width>
<height>371</height>
<width>192</width>
<height>228</height>
</rect>
</property>
<attribute name="label">
@ -194,72 +197,50 @@
<property name="title">
<string>Download Options</string>
</property>
<widget class="QLabel" name="LocationLabel">
<property name="geometry">
<rect>
<x>11</x>
<y>27</y>
<width>54</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>Location:</string>
</property>
</widget>
<widget class="QComboBox" name="LocationComboBox">
<property name="geometry">
<rect>
<x>71</x>
<y>27</y>
<width>371</width>
<height>21</height>
</rect>
</property>
<item>
<property name="text">
<string>Crosswalk</string>
</property>
<layout class="QFormLayout" name="formLayout_2">
<item row="0" column="0">
<widget class="QLabel" name="LocationLabel">
<property name="text">
<string>Location:</string>
</property>
</widget>
</item>
</widget>
<widget class="QLabel" name="BibleLabel">
<property name="geometry">
<rect>
<x>11</x>
<y>54</y>
<width>34</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>Bible:</string>
</property>
</widget>
<widget class="QComboBox" name="BibleComboBox">
<property name="geometry">
<rect>
<x>71</x>
<y>54</y>
<width>371</width>
<height>21</height>
</rect>
</property>
<item>
<property name="text">
<string/>
</property>
<item row="0" column="1">
<widget class="QComboBox" name="LocationComboBox">
<item>
<property name="text">
<string>Crosswalk</string>
</property>
</item>
</widget>
</item>
<item>
<property name="text">
<string>NIV</string>
</property>
<item row="1" column="0">
<widget class="QLabel" name="BibleLabel">
<property name="text">
<string>Bible:</string>
</property>
</widget>
</item>
<item>
<property name="text">
<string>KJV</string>
</property>
<item row="1" column="1">
<widget class="QComboBox" name="BibleComboBox">
<item>
<property name="text">
<string/>
</property>
</item>
<item>
<property name="text">
<string>NIV</string>
</property>
</item>
<item>
<property name="text">
<string>KJV</string>
</property>
</item>
</widget>
</item>
</widget>
</layout>
<zorder>BibleComboBox</zorder>
<zorder>LocationLabel</zorder>
<zorder>BibleLabel</zorder>
@ -382,7 +363,7 @@
<rect>
<x>20</x>
<y>670</y>
<width>451</width>
<width>271</width>
<height>17</height>
</rect>
</property>