New alert tag features and song usage dialog

openlp/core/ui/alertstab.py

@@ -83,6 +83,22 @@ class AlertsTab(SettingsTab):
         self.BackgroundColorButton.setObjectName(u'BackgroundColorButton')
         self.ColorLayout.addWidget(self.BackgroundColorButton)
         self.FontLayout.addWidget(self.ColorWidget)
+        self.FontSizeWidget = QtGui.QWidget(self.FontGroupBox)
+        self.FontSizeWidget.setObjectName(u'FontSizeWidget')
+        self.FontSizeLayout = QtGui.QHBoxLayout(self.FontSizeWidget)
+        self.FontSizeLayout.setSpacing(8)
+        self.FontSizeLayout.setMargin(0)
+        self.FontSizeLayout.setObjectName(u'FontSizeLayout')
+        self.FontSizeLabel = QtGui.QLabel(self.FontSizeWidget)
+        self.FontSizeLabel.setObjectName(u'FontSizeLabel')
+        self.FontSizeLayout.addWidget(self.FontSizeLabel)
+        self.FontSizeSpinBox = QtGui.QSpinBox(self.FontSizeWidget)
+        self.FontSizeSpinBox.setObjectName(u'FontSizeSpinBox')
+        self.FontSizeLayout.addWidget(self.FontSizeSpinBox)
+        self.FontSizeSpacer = QtGui.QSpacerItem(147, 20,
+            QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.FontSizeLayout.addItem(self.FontSizeSpacer)
+        self.FontLayout.addWidget(self.FontSizeWidget)
         self.TimeoutWidget = QtGui.QWidget(self.FontGroupBox)
         self.TimeoutWidget.setObjectName(u'TimeoutWidget')
         self.TimeoutLayout = QtGui.QHBoxLayout(self.TimeoutWidget)
@@ -100,6 +116,22 @@ class AlertsTab(SettingsTab):
             QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
         self.TimeoutLayout.addItem(self.TimeoutSpacer)
         self.FontLayout.addWidget(self.TimeoutWidget)
+        self.LocationWidget = QtGui.QWidget(self.FontGroupBox)
+        self.LocationWidget.setObjectName(u'LocationWidget')
+        self.LocationLayout = QtGui.QHBoxLayout(self.LocationWidget)
+        self.LocationLayout.setSpacing(8)
+        self.LocationLayout.setMargin(0)
+        self.LocationLayout.setObjectName(u'LocationLayout')
+        self.LocationLabel = QtGui.QLabel(self.LocationWidget)
+        self.LocationLabel.setObjectName(u'LocationLabel')
+        self.LocationLayout.addWidget(self.LocationLabel)
+        self.LocationComboBox = QtGui.QComboBox(self.LocationWidget)
+        self.LocationComboBox.setObjectName(u'LocationComboBox')
+        self.LocationLayout.addWidget(self.LocationComboBox)
+        self.LocationSpacer = QtGui.QSpacerItem(147, 20,
+            QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.LocationLayout.addItem(self.LocationSpacer)
+        self.FontLayout.addWidget(self.LocationWidget)
         self.SlideLeftLayout.addWidget(self.FontGroupBox)
         self.SlideLeftSpacer = QtGui.QSpacerItem(20, 94,
             QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
@@ -152,10 +184,15 @@ class AlertsTab(SettingsTab):
         self.FontLabel.setText(self.trUtf8('Font Name:'))
         self.FontColorLabel.setText(self.trUtf8('Font Color:'))
         self.BackgroundColorLabel.setText(self.trUtf8('Background Color:'))
+        self.FontSizeLabel.setText(self.trUtf8('Font Size:'))
+        self.FontSizeSpinBox.setSuffix(self.trUtf8('pt'))
         self.TimeoutLabel.setText(self.trUtf8('Alert timeout:'))
         self.TimeoutSpinBox.setSuffix(self.trUtf8('s'))
+        self.LocationLabel.setText(self.trUtf8('Location:'))
         self.PreviewGroupBox.setTitle(self.trUtf8('Preview'))
         self.FontPreview.setText(self.trUtf8('openlp.org 2.0 rocks!'))
+        self.LocationComboBox.addItem(self.trUtf8('Top'))
+        self.LocationComboBox.addItem(self.trUtf8('Bottom'))
 
     def onBackgroundColorButtonClicked(self):
         self.bg_color = QtGui.QColorDialog.getColor(
@@ -181,15 +218,19 @@ class AlertsTab(SettingsTab):
         self.timeout = int(self.config.get_config(u'timeout', 5))
         self.font_color = unicode(
             self.config.get_config(u'font color', u'#ffffff'))
+        self.font_size = int(self.config.get_config(u'font size', 40))
         self.bg_color = unicode(
             self.config.get_config(u'background color', u'#660000'))
         self.font_face = unicode(
             self.config.get_config(u'font face', QtGui.QFont().family()))
+        self.location = int(self.config.get_config(u'location', 0))
+        self.FontSizeSpinBox.setValue(self.font_size)
         self.TimeoutSpinBox.setValue(self.timeout)
         self.FontColorButton.setStyleSheet(
             u'background-color: %s' % self.font_color)
         self.BackgroundColorButton.setStyleSheet(
             u'background-color: %s' % self.bg_color)
+        self.LocationComboBox.setCurrentIndex(self.location)
         font = QtGui.QFont()
         font.setFamily(self.font_face)
         self.FontComboBox.setCurrentFont(font)
@@ -199,8 +240,10 @@ class AlertsTab(SettingsTab):
         self.font_face = self.FontComboBox.currentFont().family()
         self.config.set_config(u'background color', unicode(self.bg_color))
         self.config.set_config(u'font color', unicode(self.font_color))
+        self.config.set_config(u'font size', unicode(self.font_size))
         self.config.set_config(u'font face', unicode(self.font_face))
         self.config.set_config(u'timeout', unicode(self.timeout))
+        self.config.set_config(u'location', unicode(self.FontComboBox.currentIndex()))
 
     def updateDisplay(self):
         font = QtGui.QFont()

openlp/plugins/songusage/forms/songusagedetaildialog.py

@@ -1,197 +1,71 @@
 # -*- coding: utf-8 -*-
-# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
 
-###############################################################################
+# Form implementation generated from reading ui file 'songusagedetaildialog.ui'
-# OpenLP - Open Source Lyrics Projection                                      #
+#
-# --------------------------------------------------------------------------- #
+# Created: Tue Feb  9 07:34:05 2010
-# Copyright (c) 2008-2010 Raoul Snyman                                        #
+#      by: PyQt4 UI code generator 4.6.2
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
+#
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# WARNING! All changes made in this file will be lost!
-# Carsten Tinggaard                                                           #
-# --------------------------------------------------------------------------- #
-# This program is free software; you can redistribute it and/or modify it     #
-# under the terms of the GNU General Public License as published by the Free  #
-# Software Foundation; version 2 of the License.                              #
-#                                                                             #
-# This program is distributed in the hope that it will be useful, but WITHOUT #
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
-# more details.                                                               #
-#                                                                             #
-# You should have received a copy of the GNU General Public License along     #
-# with this program; if not, write to the Free Software Foundation, Inc., 59  #
-# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
-###############################################################################
 
 from PyQt4 import QtCore, QtGui
 
-class Ui_SongUsageDetailDialog(object):
+class Ui_AuditDetailDialog(object):
     def setupUi(self, AuditDetailDialog):
-        AuditDetailDialog.setObjectName(u'AuditDetailDialog')
+        AuditDetailDialog.setObjectName("AuditDetailDialog")
-        AuditDetailDialog.resize(593, 501)
+        AuditDetailDialog.resize(609, 413)
-        self.buttonBox = QtGui.QDialogButtonBox(AuditDetailDialog)
+        self.verticalLayout = QtGui.QVBoxLayout(AuditDetailDialog)
-        self.buttonBox.setGeometry(QtCore.QRect(420, 470, 170, 25))
+        self.verticalLayout.setObjectName("verticalLayout")
-        self.buttonBox.setStandardButtons(
+        self.DateRangeGroupBox = QtGui.QGroupBox(AuditDetailDialog)
-            QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Ok)
+        self.DateRangeGroupBox.setObjectName("DateRangeGroupBox")
-        self.buttonBox.setObjectName(u'buttonBox')
+        self.verticalLayout_2 = QtGui.QVBoxLayout(self.DateRangeGroupBox)
-        self.FileGroupBox = QtGui.QGroupBox(AuditDetailDialog)
+        self.verticalLayout_2.setObjectName("verticalLayout_2")
-        self.FileGroupBox.setGeometry(QtCore.QRect(10, 370, 571, 70))
+        self.DateHorizontalLayout = QtGui.QHBoxLayout()
-        self.FileGroupBox.setObjectName(u'FileGroupBox')
+        self.DateHorizontalLayout.setObjectName("DateHorizontalLayout")
+        self.FromDate = QtGui.QCalendarWidget(self.DateRangeGroupBox)
+        self.FromDate.setObjectName("FromDate")
+        self.DateHorizontalLayout.addWidget(self.FromDate)
+        self.ToLabel = QtGui.QLabel(self.DateRangeGroupBox)
+        self.ToLabel.setScaledContents(False)
+        self.ToLabel.setAlignment(QtCore.Qt.AlignCenter)
+        self.ToLabel.setObjectName("ToLabel")
+        self.DateHorizontalLayout.addWidget(self.ToLabel)
+        self.ToDate = QtGui.QCalendarWidget(self.DateRangeGroupBox)
+        self.ToDate.setObjectName("ToDate")
+        self.DateHorizontalLayout.addWidget(self.ToDate)
+        self.verticalLayout_2.addLayout(self.DateHorizontalLayout)
+        self.FileGroupBox = QtGui.QGroupBox(self.DateRangeGroupBox)
+        self.FileGroupBox.setObjectName("FileGroupBox")
         self.verticalLayout_4 = QtGui.QVBoxLayout(self.FileGroupBox)
-        self.verticalLayout_4.setObjectName(u'verticalLayout_4')
+        self.verticalLayout_4.setObjectName("verticalLayout_4")
         self.horizontalLayout = QtGui.QHBoxLayout()
-        self.horizontalLayout.setObjectName(u'horizontalLayout')
+        self.horizontalLayout.setObjectName("horizontalLayout")
         self.FileLineEdit = QtGui.QLineEdit(self.FileGroupBox)
-        self.FileLineEdit.setObjectName(u'FileLineEdit')
+        self.FileLineEdit.setObjectName("FileLineEdit")
         self.horizontalLayout.addWidget(self.FileLineEdit)
         self.SaveFilePushButton = QtGui.QPushButton(self.FileGroupBox)
         icon = QtGui.QIcon()
-        icon.addPixmap(QtGui.QPixmap(u':/exports/export_load.png'),
+        icon.addPixmap(QtGui.QPixmap(":/exports/export_load.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-            QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.SaveFilePushButton.setIcon(icon)
-        self.SaveFilePushButton.setObjectName(u'SaveFilePushButton')
+        self.SaveFilePushButton.setObjectName("SaveFilePushButton")
         self.horizontalLayout.addWidget(self.SaveFilePushButton)
         self.verticalLayout_4.addLayout(self.horizontalLayout)
-        self.layoutWidget = QtGui.QWidget(AuditDetailDialog)
+        self.verticalLayout_2.addWidget(self.FileGroupBox)
-        self.layoutWidget.setGeometry(QtCore.QRect(10, 10, 561, 361))
+        self.verticalLayout.addWidget(self.DateRangeGroupBox)
-        self.layoutWidget.setObjectName(u'layoutWidget')
+        self.buttonBox = QtGui.QDialogButtonBox(AuditDetailDialog)
-        self.verticalLayout_3 = QtGui.QVBoxLayout(self.layoutWidget)
+        self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Ok)
-        self.verticalLayout_3.setObjectName(u'verticalLayout_3')
+        self.buttonBox.setObjectName("buttonBox")
-        self.ReportTypeGroup = QtGui.QGroupBox(self.layoutWidget)
+        self.verticalLayout.addWidget(self.buttonBox)
-        self.ReportTypeGroup.setObjectName(u'ReportTypeGroup')
-        self.layoutWidget1 = QtGui.QWidget(self.ReportTypeGroup)
-        self.layoutWidget1.setGeometry(QtCore.QRect(50, 40, 481, 23))
-        self.layoutWidget1.setObjectName(u'layoutWidget1')
-        self.ReportHorizontalLayout = QtGui.QHBoxLayout(self.layoutWidget1)
-        self.ReportHorizontalLayout.setObjectName(u'ReportHorizontalLayout')
-        self.SummaryReport = QtGui.QRadioButton(self.layoutWidget1)
-        self.SummaryReport.setObjectName(u'SummaryReport')
-        self.ReportHorizontalLayout.addWidget(self.SummaryReport)
-        self.DetailedReport = QtGui.QRadioButton(self.layoutWidget1)
-        self.DetailedReport.setChecked(True)
-        self.DetailedReport.setObjectName(u'DetailedReport')
-        self.ReportHorizontalLayout.addWidget(self.DetailedReport)
-        self.verticalLayout_3.addWidget(self.ReportTypeGroup)
-        self.DateRangeGroupBox = QtGui.QGroupBox(self.layoutWidget)
-        self.DateRangeGroupBox.setObjectName(u'DateRangeGroupBox')
-        self.verticalLayout_2 = QtGui.QVBoxLayout(self.DateRangeGroupBox)
-        self.verticalLayout_2.setObjectName(u'verticalLayout_2')
-        self.DateHorizontalLayout = QtGui.QHBoxLayout()
-        self.DateHorizontalLayout.setObjectName(u'DateHorizontalLayout')
-        self.FromDateEdit = QtGui.QDateEdit(self.DateRangeGroupBox)
-        self.FromDateEdit.setCalendarPopup(True)
-        self.FromDateEdit.setObjectName(u'FromDateEdit')
-        self.DateHorizontalLayout.addWidget(self.FromDateEdit)
-        self.To = QtGui.QLabel(self.DateRangeGroupBox)
-        self.To.setObjectName(u'To')
-        self.DateHorizontalLayout.addWidget(self.To)
-        self.ToDateEdit = QtGui.QDateEdit(self.DateRangeGroupBox)
-        self.ToDateEdit.setCalendarPopup(True)
-        self.ToDateEdit.setObjectName(u'ToDateEdit')
-        self.DateHorizontalLayout.addWidget(self.ToDateEdit)
-        self.verticalLayout_2.addLayout(self.DateHorizontalLayout)
-        self.verticalLayout_3.addWidget(self.DateRangeGroupBox)
-        self.TimePeriodGroupBox = QtGui.QGroupBox(self.layoutWidget)
-        self.TimePeriodGroupBox.setObjectName(u'TimePeriodGroupBox')
-        self.verticalLayout = QtGui.QVBoxLayout(self.TimePeriodGroupBox)
-        self.verticalLayout.setObjectName(u'verticalLayout')
-        self.FirstHorizontalLayout = QtGui.QHBoxLayout()
-        self.FirstHorizontalLayout.setObjectName(u'FirstHorizontalLayout')
-        self.FirstCheckBox = QtGui.QCheckBox(self.TimePeriodGroupBox)
-        self.FirstCheckBox.setChecked(True)
-        self.FirstCheckBox.setObjectName(u'FirstCheckBox')
-        self.FirstHorizontalLayout.addWidget(self.FirstCheckBox)
-        self.FirstFromTimeEdit = QtGui.QTimeEdit(self.TimePeriodGroupBox)
-        self.FirstFromTimeEdit.setTime(QtCore.QTime(9, 0, 0))
-        self.FirstFromTimeEdit.setObjectName(u'FirstFromTimeEdit')
-        self.FirstHorizontalLayout.addWidget(self.FirstFromTimeEdit)
-        self.FirstTo = QtGui.QLabel(self.TimePeriodGroupBox)
-        self.FirstTo.setObjectName(u'FirstTo')
-        self.FirstHorizontalLayout.addWidget(self.FirstTo)
-        self.FirstToTimeEdit = QtGui.QTimeEdit(self.TimePeriodGroupBox)
-        self.FirstToTimeEdit.setCalendarPopup(True)
-        self.FirstToTimeEdit.setTime(QtCore.QTime(10, 0, 0))
-        self.FirstToTimeEdit.setObjectName(u'FirstToTimeEdit')
-        self.FirstHorizontalLayout.addWidget(self.FirstToTimeEdit)
-        self.verticalLayout.addLayout(self.FirstHorizontalLayout)
-        self.SecondHorizontalLayout = QtGui.QHBoxLayout()
-        self.SecondHorizontalLayout.setObjectName(u'SecondHorizontalLayout')
-        self.SecondCheckBox = QtGui.QCheckBox(self.TimePeriodGroupBox)
-        self.SecondCheckBox.setChecked(True)
-        self.SecondCheckBox.setObjectName(u'SecondCheckBox')
-        self.SecondHorizontalLayout.addWidget(self.SecondCheckBox)
-        self.SecondFromTimeEdit = QtGui.QTimeEdit(self.TimePeriodGroupBox)
-        self.SecondFromTimeEdit.setTime(QtCore.QTime(10, 45, 0))
-        self.SecondFromTimeEdit.setObjectName(u'SecondFromTimeEdit')
-        self.SecondHorizontalLayout.addWidget(self.SecondFromTimeEdit)
-        self.SecondTo = QtGui.QLabel(self.TimePeriodGroupBox)
-        self.SecondTo.setObjectName(u'SecondTo')
-        self.SecondHorizontalLayout.addWidget(self.SecondTo)
-        self.SecondToTimeEdit = QtGui.QTimeEdit(self.TimePeriodGroupBox)
-        self.SecondToTimeEdit.setObjectName(u'SecondToTimeEdit')
-        self.SecondHorizontalLayout.addWidget(self.SecondToTimeEdit)
-        self.verticalLayout.addLayout(self.SecondHorizontalLayout)
-        self.ThirdHorizontalLayout = QtGui.QHBoxLayout()
-        self.ThirdHorizontalLayout.setObjectName(u'ThirdHorizontalLayout')
-        self.ThirdCheckBox = QtGui.QCheckBox(self.TimePeriodGroupBox)
-        self.ThirdCheckBox.setChecked(True)
-        self.ThirdCheckBox.setObjectName(u'ThirdCheckBox')
-        self.ThirdHorizontalLayout.addWidget(self.ThirdCheckBox)
-        self.ThirdFromTimeEdit = QtGui.QTimeEdit(self.TimePeriodGroupBox)
-        self.ThirdFromTimeEdit.setTime(QtCore.QTime(18, 30, 0))
-        self.ThirdFromTimeEdit.setObjectName(u'ThirdFromTimeEdit')
-        self.ThirdHorizontalLayout.addWidget(self.ThirdFromTimeEdit)
-        self.ThirdTo = QtGui.QLabel(self.TimePeriodGroupBox)
-        self.ThirdTo.setObjectName(u'ThirdTo')
-        self.ThirdHorizontalLayout.addWidget(self.ThirdTo)
-        self.ThirdToTimeEdit = QtGui.QTimeEdit(self.TimePeriodGroupBox)
-        self.ThirdToTimeEdit.setTime(QtCore.QTime(19, 30, 0))
-        self.ThirdToTimeEdit.setObjectName(u'ThirdToTimeEdit')
-        self.ThirdHorizontalLayout.addWidget(self.ThirdToTimeEdit)
-        self.verticalLayout.addLayout(self.ThirdHorizontalLayout)
-        self.verticalLayout_3.addWidget(self.TimePeriodGroupBox)
 
         self.retranslateUi(AuditDetailDialog)
-        QtCore.QObject.connect(
+        QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL("accepted()"), AuditDetailDialog.accept)
-            self.buttonBox, QtCore.SIGNAL(u'accepted()'),
+        QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL("rejected()"), AuditDetailDialog.close)
-            AuditDetailDialog.accept)
+        QtCore.QObject.connect(self.SaveFilePushButton, QtCore.SIGNAL("pressed()"), AuditDetailDialog.defineOutputLocation)
-        QtCore.QObject.connect(
-            self.buttonBox, QtCore.SIGNAL(u'rejected()'),
-            AuditDetailDialog.close)
-        QtCore.QObject.connect(
-            self.FirstCheckBox, QtCore.SIGNAL(u'stateChanged(int)'),
-            AuditDetailDialog.changeFirstService)
-        QtCore.QObject.connect(
-            self.SecondCheckBox, QtCore.SIGNAL(u'stateChanged(int)'),
-            AuditDetailDialog.changeSecondService)
-        QtCore.QObject.connect(
-            self.ThirdCheckBox, QtCore.SIGNAL(u'stateChanged(int)'),
-            AuditDetailDialog.changeThirdService)
-        QtCore.QObject.connect(
-            self.SaveFilePushButton, QtCore.SIGNAL(u'pressed()'),
-            AuditDetailDialog.defineOutputLocation)
         QtCore.QMetaObject.connectSlotsByName(AuditDetailDialog)
 
     def retranslateUi(self, AuditDetailDialog):
-        AuditDetailDialog.setWindowTitle(self.trUtf8('Audit Detail Extraction'))
+        AuditDetailDialog.setWindowTitle(QtGui.QApplication.translate("AuditDetailDialog", "Audit Detail Extraction", None, QtGui.QApplication.UnicodeUTF8))
-        self.FileGroupBox.setTitle(self.trUtf8('Report Location'))
+        self.DateRangeGroupBox.setTitle(QtGui.QApplication.translate("AuditDetailDialog", "Select Date Range", None, QtGui.QApplication.UnicodeUTF8))
-        self.ReportTypeGroup.setTitle(self.trUtf8('Report Type'))
+        self.ToLabel.setText(QtGui.QApplication.translate("AuditDetailDialog", "to", None, QtGui.QApplication.UnicodeUTF8))
-        self.SummaryReport.setText(self.trUtf8('Summary'))
+        self.FileGroupBox.setTitle(QtGui.QApplication.translate("AuditDetailDialog", "Report Location", None, QtGui.QApplication.UnicodeUTF8))
-        self.DetailedReport.setText(self.trUtf8('Detailed'))
+
-        self.DateRangeGroupBox.setTitle(self.trUtf8('Select Date Range'))
+import openlp-2_rc
-        self.FromDateEdit.setDisplayFormat(self.trUtf8('dd/MM/yyyy'))
-        self.To.setText(self.trUtf8('to'))
-        self.ToDateEdit.setDisplayFormat(self.trUtf8('dd/MM/yyyy'))
-        self.TimePeriodGroupBox.setTitle(self.trUtf8('Select Time Periods'))
-        self.FirstCheckBox.setText(self.trUtf8('First Service'))
-        self.FirstFromTimeEdit.setDisplayFormat(self.trUtf8('hh:mm AP'))
-        self.FirstTo.setText(self.trUtf8('to'))
-        self.FirstToTimeEdit.setDisplayFormat(self.trUtf8('hh:mm AP'))
-        self.SecondCheckBox.setText(self.trUtf8('Second Service'))
-        self.SecondFromTimeEdit.setDisplayFormat(self.trUtf8('hh:mm AP'))
-        self.SecondTo.setText(self.trUtf8('to'))
-        self.SecondToTimeEdit.setDisplayFormat(self.trUtf8('hh:mm AP'))
-        self.ThirdCheckBox.setText(self.trUtf8('Third Service'))
-        self.ThirdFromTimeEdit.setDisplayFormat(self.trUtf8('hh:mm AP'))
-        self.ThirdTo.setText(self.trUtf8('to'))
-        self.ThirdToTimeEdit.setDisplayFormat(self.trUtf8('hh:mm AP'))

resources/forms/songusagedetaildialog.ui

@@ -6,35 +6,45 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>593</width>
+    <width>609</width>
-    <height>501</height>
+    <height>413</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Audit Detail Extraction</string>
   </property>
-  <widget class="QDialogButtonBox" name="buttonBox">
+  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="geometry">
+   <item>
-    <rect>
+    <widget class="QGroupBox" name="DateRangeGroupBox">
-     <x>420</x>
+     <property name="title">
-     <y>470</y>
+      <string>Select Date Range</string>
-     <width>170</width>
-     <height>25</height>
-    </rect>
      </property>
-   <property name="standardButtons">
+     <layout class="QVBoxLayout" name="verticalLayout_2">
-    <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+      <item>
+       <layout class="QHBoxLayout" name="DateHorizontalLayout">
+        <item>
+         <widget class="QCalendarWidget" name="FromDate"/>
+        </item>
+        <item>
+         <widget class="QLabel" name="ToLabel">
+          <property name="text">
+           <string>to</string>
+          </property>
+          <property name="scaledContents">
+           <bool>false</bool>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
           </property>
          </widget>
+        </item>
+        <item>
+         <widget class="QCalendarWidget" name="ToDate"/>
+        </item>
+       </layout>
+      </item>
+      <item>
        <widget class="QGroupBox" name="FileGroupBox">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>370</y>
-     <width>571</width>
-     <height>70</height>
-    </rect>
-   </property>
         <property name="title">
          <string>Report Location</string>
         </property>
@@ -59,246 +69,18 @@
          </item>
         </layout>
        </widget>
-  <widget class="QWidget" name="layoutWidget">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>10</y>
-     <width>561</width>
-     <height>361</height>
-    </rect>
-   </property>
-   <layout class="QVBoxLayout" name="verticalLayout_3">
-    <item>
-     <widget class="QGroupBox" name="ReportTypeGroup">
-      <property name="title">
-       <string>Report Type</string>
-      </property>
-      <widget class="QWidget" name="layoutWidget">
-       <property name="geometry">
-        <rect>
-         <x>50</x>
-         <y>40</y>
-         <width>481</width>
-         <height>23</height>
-        </rect>
-       </property>
-       <layout class="QHBoxLayout" name="ReportHorizontalLayout">
-        <item>
-         <widget class="QRadioButton" name="SummaryReport">
-          <property name="text">
-           <string>Summary</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QRadioButton" name="DetailedReport">
-          <property name="text">
-           <string>Detailed</string>
-          </property>
-          <property name="checked">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-     </widget>
-    </item>
-    <item>
-     <widget class="QGroupBox" name="DateRangeGroupBox">
-      <property name="title">
-       <string>Select Date Range</string>
-      </property>
-      <layout class="QVBoxLayout" name="verticalLayout_2">
-       <item>
-        <layout class="QHBoxLayout" name="DateHorizontalLayout">
-         <item>
-          <widget class="QDateEdit" name="FromDateEdit">
-           <property name="displayFormat">
-            <string>dd/MM/yyyy</string>
-           </property>
-           <property name="calendarPopup">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="To">
-           <property name="text">
-            <string>to</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QDateEdit" name="ToDateEdit">
-           <property name="displayFormat">
-            <string>dd/MM/yyyy</string>
-           </property>
-           <property name="calendarPopup">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-        </layout>
       </item>
      </layout>
     </widget>
    </item>
    <item>
-     <widget class="QGroupBox" name="TimePeriodGroupBox">
+    <widget class="QDialogButtonBox" name="buttonBox">
-      <property name="title">
+     <property name="standardButtons">
-       <string>Select Time Periods</string>
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-      </property>
-      <layout class="QVBoxLayout" name="verticalLayout">
-       <item>
-        <layout class="QHBoxLayout" name="FirstHorizontalLayout">
-         <item>
-          <widget class="QCheckBox" name="FirstCheckBox">
-           <property name="text">
-            <string>First Service</string>
-           </property>
-           <property name="checked">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QTimeEdit" name="FirstFromTimeEdit">
-           <property name="displayFormat">
-            <string>hh:mm AP</string>
-           </property>
-           <property name="time">
-            <time>
-             <hour>9</hour>
-             <minute>0</minute>
-             <second>0</second>
-            </time>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="FirstTo">
-           <property name="text">
-            <string>to</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QTimeEdit" name="FirstToTimeEdit">
-           <property name="displayFormat">
-            <string>hh:mm AP</string>
-           </property>
-           <property name="calendarPopup">
-            <bool>true</bool>
-           </property>
-           <property name="time">
-            <time>
-             <hour>10</hour>
-             <minute>0</minute>
-             <second>0</second>
-            </time>
      </property>
     </widget>
    </item>
   </layout>
-       </item>
-       <item>
-        <layout class="QHBoxLayout" name="SecondHorizontalLayout">
-         <item>
-          <widget class="QCheckBox" name="SecondCheckBox">
-           <property name="text">
-            <string>Second Service</string>
-           </property>
-           <property name="checked">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QTimeEdit" name="SecondFromTimeEdit">
-           <property name="displayFormat">
-            <string>hh:mm AP</string>
-           </property>
-           <property name="time">
-            <time>
-             <hour>10</hour>
-             <minute>45</minute>
-             <second>0</second>
-            </time>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="SecondTo">
-           <property name="text">
-            <string>to</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QTimeEdit" name="SecondToTimeEdit">
-           <property name="displayFormat">
-            <string>hh:mm AP</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <layout class="QHBoxLayout" name="ThirdHorizontalLayout">
-         <item>
-          <widget class="QCheckBox" name="ThirdCheckBox">
-           <property name="text">
-            <string>Third Service</string>
-           </property>
-           <property name="checked">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QTimeEdit" name="ThirdFromTimeEdit">
-           <property name="displayFormat">
-            <string>hh:mm AP</string>
-           </property>
-           <property name="time">
-            <time>
-             <hour>18</hour>
-             <minute>30</minute>
-             <second>0</second>
-            </time>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="ThirdTo">
-           <property name="text">
-            <string>to</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QTimeEdit" name="ThirdToTimeEdit">
-           <property name="displayFormat">
-            <string>hh:mm AP</string>
-           </property>
-           <property name="time">
-            <time>
-             <hour>19</hour>
-             <minute>30</minute>
-             <second>0</second>
-            </time>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-      </layout>
-     </widget>
-    </item>
-   </layout>
-  </widget>
  </widget>
  <resources>
   <include location="../images/openlp-2.qrc"/>
@@ -336,54 +118,6 @@
     </hint>
    </hints>
   </connection>
-  <connection>
-   <sender>FirstCheckBox</sender>
-   <signal>stateChanged(int)</signal>
-   <receiver>AuditDetailDialog</receiver>
-   <slot>changeFirstService(int)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>26</x>
-     <y>285</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>136</x>
-     <y>483</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>SecondCheckBox</sender>
-   <signal>stateChanged(int)</signal>
-   <receiver>AuditDetailDialog</receiver>
-   <slot>changeSecondService(int)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>41</x>
-     <y>323</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>103</x>
-     <y>494</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>ThirdCheckBox</sender>
-   <signal>stateChanged(int)</signal>
-   <receiver>AuditDetailDialog</receiver>
-   <slot>changeThirdService(int)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>38</x>
-     <y>351</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>155</x>
-     <y>463</y>
-    </hint>
-   </hints>
-  </connection>
   <connection>
    <sender>SaveFilePushButton</sender>
    <signal>pressed()</signal>