diff --git a/i18n/openlp_en.ts b/i18n/openlp_en.ts index 9c5793e88..3d66550cb 100644 --- a/i18n/openlp_en.ts +++ b/i18n/openlp_en.ts @@ -1,357 +1,9 @@ - - AboutDialog - - - About openlp.org - - - - - License - - - - - Copyright © 2004-2008 openlp.org Foundation - - - - - openlp.org is written and maintained by volunteers. If you would like to see more free Christian software being written, please consider contributing by using the button below. - - - - - 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; either version 2 of the License, or (at your option) any later version. - - - - - 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. - - - - - 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. - - - - - Credits - - - - - Project Lead - Raoul "superfly" Snyman - -Developers - Tim "TRB143" Bentley - Jonathan "gushie" Corwin - Scott "sguerrieri" Guerrieri - Raoul "superfly" Snyman - Martin "mijiti" Thompson - Carsten "catini" Tingaard - - - - - Contribute - - - - - Close - - - - - &Contribute - - - - - AlertForm - - - Alert Message - - - - - Alert Text: - - - - - Display - - - - - Cancel - - - - - AmendThemeDialog - - - Theme Maintance - - - - - Theme Name: - - - - - Background - - - - - Background: - - - - - Opaque - - - - - Transparent - - - - - Background Type: - - - - - Solid Color - - - - - Gradient - - - - - Image - - - - - <Color1> - - - - - <Color2> - - - - - Image: - - - - - Gradient : - - - - - Horizontal - - - - - Vertical - - - - - Circular - - - - - Font Main - - - - - Main Font - - - - - Font: - - - - - Font Color: - - - - - Size: - - - - - pt - - - - - Wrap Indentation - - - - - TextLabel - - - - - Display Location - - - - - Use Default Location: - - - - - X Position: - - - - - Y Position: - - - - - Width: - - - - - Height: - - - - - px - - - - - Font Footer - - - - - Footer Font - - - - - Other Options - - - - - Shadow && Outline - - - - - Outline Color: - - - - - Show Outline: - - - - - Shadow Color: - - - - - Show Shadow: - - - - - Alignment - - - - - Horizontal Align: - - - - - Left - - - - - Right - - - - - Center - - - - - Vertical Align: - - - - - Top - - - - - Middle - - - - - Bottom - - - - - Preview - - - AmendThemeForm - + Open file @@ -359,7 +11,7 @@ Developers AuditDeleteDialog - + Audit Delete @@ -367,1809 +19,77 @@ Developers AuditDetailDialog - + Audit Detail Extraction - + Report Location - + Report Type - + Summary - + Detailed - + Select Date Range - + dd/MM/yyyy - + to - + Select Time Periods - + First Service - + hh:mm AP - + Second Service - + Third Service - - AuthorsDialog - - - Author Maintenance - - - - - Display Name: - - - - - First Name: - - - - - Exit Screen - - - - - Last Name: - - - - - BibleImportDialog - - - Bible Registration - - - - - Licence Details - - - - - Version Name: - - - - - Copyright: - - - - - Permission: - - - - - Import Progress - - - - - %p - - - - - Import - - - - - Cancel - - - - - Osis (Sword) Imports - - - - - OSIS Bible - - - - - Bible Name: - - - - - File Location: - - - - - CSV File Imports - - - - - CVS Bible - - - - - Books Location: - - - - - Verse Location: - - - - - Web Downloads - - - - - Download Options - - - - - Location: - - - - - Crosswalk - - - - - Bible: - - - - - NIV - - - - - KJV - - - - - Proxy Settings (Optional) - - - - - Proxy Address: - - - - - Username: - - - - - Password: - - - - - EditSongDialog - - - Song Editor - - - - - Title && Lyrics - - - - - Title: - - - - - Alternative Title: - - - - - Lyrics: - - - - - Verse Order: - - - - - Add - - - - - Edit - - - - - Edit All - - - - - Delete - - - - - Authors, Topics && Book - - - - - Authors - - - - - &Add to Song - - - - - &Remove - - - - - &Manage Authors, Topics, Books - - - - - Topic - - - - - A&dd to Song - - - - - R&emove - - - - - Song Book - - - - - Theme, Copyright Info && Comments - - - - - Theme - - - - - Add a Theme - - - - - Copyright Information - - - - - © - - - - - CCLI Number: - - - - - Comments - - - - - EditVerseDialog - - - Dialog - - - - - MainWindow - - - openlp.org 2.0 - - - - - &File - - - - - &Import - - - - - &Song - - - - - &Export - - - - - &Options - - - - - &View - - - - - M&ode - - - - - &Language - - - - - &Tools - - - - - &Help - - - - - Media Manager - - - - - Songs - - - - - Add a new song - - - - - New Song - - - - - Edit the current song - - - - - Edit Song - - - - - Delete the currently selected song(s) - - - - - Delete Song - - - - - Preview the selected song - - - - - Send to Preview - - - - - Send the selected song to live - - - - - Send to Live - - - - - Add the currently selected song(s) to the service - - - - - Add to Service - - - - - Bible Verses - - - - - Preview selected verse(s) - - - - - Send selected verse(s) to live - - - - - Add selected verse(s) to service - - - - - Version: - - - - - Reference: - - - - - Search - - - - - Custom Slides - - - - - Add a new custom slide - - - - - New Custom Slide - - - - - Edit selected slide - - - - - Edit Custom Slide - - - - - Delete selected slide(s) - - - - - Delete Custom Slide - - - - - Preview selected slide - - - - - Preview Custom Slide - - - - - Send selected slide to live - - - - - Send Live - - - - - Add selected slide(s) to service - - - - - Add To Service - - - - - Presentations - - - - - Load a presentation - - - - - Load Video - - - - - Remove selected presentation(s) - - - - - RI - - - - - Send selected presentation to live - - - - - Add selected presentation(s) to service - - - - - Videos - - - - - Load a video - - - - - Delete the selected video(s) - - - - - Send the selected video to live - - - - - Add selected video(s) to service - - - - - Images - - - - - Load image(s) - - - - - Load Image - - - - - Remove selected image(s) - - - - - Delete Image - - - - - Send selected image to live - - - - - Add selected image(s) to service - - - - - Service Manager - - - - - Move selected item(s) to the top - - - - - Move To Top - - - - - Move selected item(s) up one position - - - - - Move Up - - - - - Move selected item(s) down one position - - - - - Move Down - - - - - Move selected item(s) to the bottom - - - - - Move To Bottom - - - - - Create new service - - - - - New Service - - - - - Open an existing service - - - - - Open Service - - - - - Save current service - - - - - Save Service - - - - - Theme Manager - - - - - Create a new theme - - - - - New Theme - - - - - Edit selected theme - - - - - Edit Theme - - - - - Delete selected theme(s) - - - - - Delete Theme - - - - - Import theme(s) - - - - - Import Theme - - - - - Export selected theme(s) - - - - - Export Theme - - - - - &New - - - - - Create a new Service - - - - - Ctrl+N - - - - - &Open - - - - - Ctrl+O - - - - - &Save - - - - - Save the current service to disk - - - - - Ctrl+S - - - - - Save &As... - - - - - Save Service As - - - - - Save the current service under a new name - - - - - F12 - - - - - E&xit - - - - - Quit OpenLP 2.0 - - - - - Alt+F4 - - - - - &Bible - - - - - &Theme - - - - - Look && &Feel - - - - - &Settings - - - - - &Media Manager - - - - - Toggle Media Manager - - - - - Toggle the visibility of the Media Manager - - - - - F8 - - - - - &Theme Manager - - - - - Toggle Theme Manager - - - - - Toggle the visibility of the Theme Manager - - - - - F10 - - - - - &Service Manager - - - - - Toggle Service Manager - - - - - Toggle the visibility of the Service Manager - - - - - F9 - - - - - &Alert - - - - - Show an alert message - - - - - F7 - - - - - &User Guide - - - - - &About - - - - - More information about OpenLP - - - - - Ctrl+F1 - - - - - &Online Help - - - - - &Web Site - - - - - OpenSong - - - - - openlp.org 1.0 - - - - - Export songs in openlp.org 1.0 format - - - - - OpenLP 2.0 - - - - - Export songs in OpenLP 2.0 format - - - - - &Translate - - - - - Translate the interface to your language - - - - - English - - - - - Set the interface language to English - - - - - &Add Tool... - - - - - Add an application to the list of tools - - - - - &Preview Pane - - - - - &Live - - - - - OpenLPExportForm - - - openlp.org Song Exporter - - - - - Select openlp.org export filename: - - - - - Full Song List - - - - - Song Title - - - - - Author - - - - - Select All - - - - - Lyrics - - - - - Title - - - - - Song Export List - - - - - Remove Selected - - - - - Progress: - - - - - Ready to export - - - - - Export - - - - - Close - - - - - OpenLPImportForm - - - openlp.org Song Importer - - - - - Select openlp.org songfile to import: - - - - - Import File Song List - - - - - Song Title - - - - - Author - - - - - Select All - - - - - Lyrics - - - - - Title - - - - - Song Import List - - - - - Remove Selected - - - - - Progress: - - - - - Ready to import - - - - - Import - - - - - Close - - - - - OpenSongExportForm - - - OpenSong Song Exporter - - - - - Select OpenSong song folder: - - - - - Full Song List - - - - - Song Title - - - - - Author - - - - - Select All - - - - - Lyrics - - - - - Title - - - - - Song Export List - - - - - Remove Selected - - - - - Progress: - - - - - Ready to export - - - - - Export - - - - - Close - - - - - OpenSongImportForm - - - OpenSong Song Importer - - - - - OpenSong Folder: - - - - - Progress: - - - - - Ready to import - - - - - Import - - - - - Close - - - - - PluginViewDialog - - - Plugin list - - - - - Plugin Details - - - - - Version: - - - - - TextLabel - - - - - About: - - - - - Status: - - - - - Disabled - - - - - Inactive - - - - - Active - - - - - SettingsDialog - - - Settings - - - - - General - - - - - Monitors - - - - - Select monitor for output display: - - - - - Monitor 1 on X11 Windowing System - - - - - Monitor 2 on X11 Windowing System - - - - - Blank Screen - - - - - Show warning on startup - - - - - Auto Open Last Service - - - - - Automatically open the last service at startup - - - - - CCLI Details - - - - - CCLI Number: - - - - - SongSelect Username: - - - - - SongSelect Password: - - - - - Themes - - - - - Global theme - - - - - African Sunset - - - - - Snowy Mountains - - - - - Wilderness - - - - - Theme level - - - - - Song level - - - - - Use the theme from each song in the database. If a song doesn't have a theme associated with it, then use the service's theme. If the service doesn't have a theme, then use the global theme. - - - - - Service level - - - - - Use the theme from the service, overriding any of the individual songs' themes. If the service doesn't have a theme, then use the global theme. - - - - - Global level - - - - - Use the global theme, overriding any themes associated with either the service or the songs. - - - - - Alerts - - - - - Font - - - - - Font Name: - - - - - Font Color: - - - - - Background Color: - - - - - Display length: - - - - - s - - - - - Preview - - - - - SongBookDialog - - - Book Song Maintenance - - - - - Name: - - - - - Publisher: - - - - - SongExportDialog - - - Dialog - - - - - Available Songs - - - - - Select All - - - - - Select Songs - - - - - Deselect Songs - - - - - Selected Songs - - - - - OpenLyric Format - - - - - Text File - - - - - SongMaintenanceDialog - - - Song Maintenance - - - - - New Row - - - - - Types - - - - - -Authors - - - - - -Topics - - - - - -Books/Hymnals - - - - - Add - - - - - Edit - - - - - Delete - - - - - SplashScreen - - - Splash Screen - - - - - ThemeWizard - - - Theme Wizard - - - - - Welcome - - - - - Welcome to the Theme Wizard. This wizard will guide you through the process of creating a new theme. - - - - - Theme Name - - - - - Choose a name for your theme - - - - - Theme Name: - - - - - Select Background - - - - - Select a background type and configure your background - - - - - TopicsDialog - - - Topic Maintenance - - - - - Topic Name: - - - Ui_MainWindow - + Default Theme: - - customEditDialog - - - Edit Custom Slides - - - - - Title: - - - - - Add New - - - - - Edit - - - - - Edit All - - - - - Save - - - - - Delete - - - - - Clear - - - - - Theme: - - - - - Credits: - - - diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py index 77b45b0c0..81d526d33 100644 --- a/openlp/core/lib/mediamanageritem.py +++ b/openlp/core/lib/mediamanageritem.py @@ -205,72 +205,50 @@ class MediaManagerItem(QtGui.QWidget): ## File Button ## if self.hasFileIcon: self.addToolbarButton( - translate( - self.TranslationContext, u'Load %s' % self.PluginTextShort), - translate( - self.TranslationContext, - u'Load a new %s' % self.PluginTextShort), - u':%s_load.png' % self.IconPath, - self.onFileClick, - u'%sFileItem' %self.PluginTextShort) + u'%s %s' % (self.trUtf8(u'Load'), self.PluginTextShort), + u'%s %s' % (self.trUtf8(u'Load a new'), self.PluginTextShort), + u':%s_load.png' % self.IconPath, self.onFileClick, + u'%sFileItem' % self.PluginTextShort) ## New Button ## if self.hasNewIcon: self.addToolbarButton( - translate( - self.TranslationContext, u'New %s' % self.PluginTextShort), - translate( - self.TranslationContext, - u'Add a new %s' % self.PluginTextShort), - u':%s_new.png' % self.IconPath, - self.onNewClick, + u'%s %s' % (self.trUtf8(u'New'), self.PluginTextShort), + u'%s %s' % (self.trUtf8(u'Add a new'), self.PluginTextShort), + u':%s_new.png' % self.IconPath, self.onNewClick, u'%sNewItem' % self.PluginTextShort) ## Edit Button ## if self.hasEditIcon: self.addToolbarButton( - translate( - self.TranslationContext, u'Edit %s' % self.PluginTextShort), - translate( - self.TranslationContext, - u'Edit the selected %s' % self.PluginTextShort), - u':%s_edit.png' % self.IconPath, - self.onEditClick, + u'%s %s' % (self.trUtf8(u'Edit'), self.PluginTextShort), + u'%s %s' % (self.trUtf8(u'Edit the selected'), self.PluginTextShort), + u':%s_edit.png' % self.IconPath, self.onEditClick, u'%sEditItem' % self.PluginTextShort) ## Delete Button ## if self.hasDeleteIcon: self.addToolbarButton( - translate( - self.TranslationContext, u'Delete %s' % self.PluginTextShort), - translate(self.TranslationContext, u'Delete the selected item'), - u':%s_delete.png' % self.IconPath, - self.onDeleteClick, + u'%s %s' % (self.trUtf8(u'Delete'), self.PluginTextShort), + self.trUtf8(u'Delete the selected item'), + u':%s_delete.png' % self.IconPath, self.onDeleteClick, u'%sDeleteItem' % self.PluginTextShort) ## Separator Line ## self.addToolbarSeparator() ## Preview ## self.addToolbarButton( - translate( - self.TranslationContext, u'Preview %s' % self.PluginTextShort), - translate(self.TranslationContext, u'Preview the selected item'), - u':/system/system_preview.png', - self.onPreviewClick, + u'%s %s' % (self.trUtf8(u'Preview'), self.PluginTextShort), + self.trUtf8(u'Preview the selected item'), + u':/system/system_preview.png', self.onPreviewClick, u'PreviewItem') ## Live Button ## self.addToolbarButton( - translate(self.TranslationContext, u'Go Live'), - translate(self.TranslationContext, u'Send the selected item live'), - u':/system/system_live.png', - self.onLiveClick, + self.trUtf8(u'Go Live'), + self.trUtf8(u'Send the selected item live'), + u':/system/system_live.png', self.onLiveClick, u'LiveItem') ## Add to service Button ## self.addToolbarButton( - translate( - self.TranslationContext, - u'Add %s to Service' % self.PluginTextShort), - translate( - self.TranslationContext, - u'Add the selected item(s) to the service'), - u':/system/system_add.png', - self.onAddClick, + u'%s %s %s' % (self.trUtf8(u'Add'), self.trUtf8(u'to Service'), self.PluginTextShort), + self.trUtf8(u'Add the selected item(s) to the service'), + u':/system/system_add.png', self.onAddClick, u'%sAddServiceItem' % self.PluginTextShort) def addListViewToToolBar(self): @@ -283,33 +261,34 @@ class MediaManagerItem(QtGui.QWidget): QtGui.QAbstractItemView.ExtendedSelection) self.ListView.setAlternatingRowColors(True) self.ListView.setDragEnabled(True) - self.ListView.setObjectName(self.PluginTextShort+u'ListView') + self.ListView.setObjectName(u'%sListView' % self.PluginTextShort) #Add tp PageLayout self.PageLayout.addWidget(self.ListView) #define and add the context menu self.ListView.setContextMenuPolicy(QtCore.Qt.ActionsContextMenu) if self.hasEditIcon: - self.ListView.addAction(contextMenuAction(self.ListView, - u':' +self.IconPath+u'_new.png', - translate(self.TranslationContext, - u'&Edit ' + self.PluginTextShort), - self.onEditClick)) + self.ListView.addAction( + contextMenuAction( + self.ListView, u':%s_new.png' % self.IconPath, + u'%s %s' % (self.trUtf8(u'&Edit'), self.PluginTextShort), + self.onEditClick)) self.ListView.addAction(contextMenuSeparator(self.ListView)) - self.ListView.addAction(contextMenuAction( - self.ListView, u':/system/system_preview.png', - translate(self.TranslationContext, - u'&Preview ' + self.PluginTextShort), - self.onPreviewClick)) - self.ListView.addAction(contextMenuAction( - self.ListView, u':/system/system_live.png', - translate(self.TranslationContext, u'&Show Live'), - self.onLiveClick)) - self.ListView.addAction(contextMenuAction( - self.ListView, u':/system/system_add.png', - translate(self.TranslationContext, u'&Add to Service'), - self.onAddClick)) - QtCore.QObject.connect(self.ListView, - QtCore.SIGNAL(u'doubleClicked(QModelIndex)'), self.onPreviewClick) + self.ListView.addAction( + contextMenuAction( + self.ListView, u':/system/system_preview.png', + u'%s %s' % (self.trUtf8(u'&Preview'), self.PluginTextShort), + self.onPreviewClick)) + self.ListView.addAction( + contextMenuAction( + self.ListView, u':/system/system_live.png', + self.trUtf8(u'&Show Live'), self.onLiveClick)) + self.ListView.addAction( + contextMenuAction( + self.ListView, u':/system/system_add.png', + self.trUtf8(u'&Add to Service'), self.onAddClick)) + QtCore.QObject.connect( + self.ListView, QtCore.SIGNAL(u'doubleClicked(QModelIndex)'), + self.onPreviewClick) def initialise(self): """ @@ -332,10 +311,9 @@ class MediaManagerItem(QtGui.QWidget): pass def onFileClick(self): - files = QtGui.QFileDialog.getOpenFileNames(None, - translate(self.TranslationContext, self.OnNewPrompt), - self.parent.config.get_last_dir(), - self.OnNewFileMasks) + files = QtGui.QFileDialog.getOpenFileNames( + self, self.trUtf8(self.OnNewPrompt), + self.parent.config.get_last_dir(), self.OnNewFileMasks) log.info(u'New files(s)%s', unicode(files)) if len(files) > 0: self.loadList(files) @@ -354,22 +332,24 @@ class MediaManagerItem(QtGui.QWidget): return filelist def loadList(self, list): - raise NotImplementedError( - u'MediaManagerItem.loadList needs to be defined by the plugin') + raise NotImplementedError(u'MediaManagerItem.loadList needs to be ' + u'defined by the plugin') def onNewClick(self): - raise NotImplementedError( - u'MediaManagerItem.onNewClick needs to be defined by the plugin') + raise NotImplementedError(u'MediaManagerItem.onNewClick needs to be ' + u'defined by the plugin') def onEditClick(self): - raise NotImplementedError( - u'MediaManagerItem.onEditClick needs to be defined by the plugin') + raise NotImplementedError(u'MediaManagerItem.onEditClick needs to be ' + u'defined by the plugin') def onDeleteClick(self): - raise NotImplementedError(u'MediaManagerItem.onDeleteClick needs to be defined by the plugin') + raise NotImplementedError(u'MediaManagerItem.onDeleteClick needs to ' + u'be defined by the plugin') def generateSlideData(self, item): - raise NotImplementedError(u'MediaManagerItem.generateSlideData needs to be defined by the plugin') + raise NotImplementedError(u'MediaManagerItem.generateSlideData needs ' + u'to be defined by the plugin') def onPreviewClick(self): log.debug(self.PluginTextShort + u' Preview Requested') diff --git a/openlp/core/ui/amendthemedialog.py b/openlp/core/ui/amendthemedialog.py index 9e5c4e4b5..d5b0d0661 100644 --- a/openlp/core/ui/amendthemedialog.py +++ b/openlp/core/ui/amendthemedialog.py @@ -591,7 +591,7 @@ class Ui_AmendThemeDialog(object): self.FontMainWeightComboBox.setItemText(1, self.trUtf8(u'Bold')) self.FontMainWeightComboBox.setItemText(2, self.trUtf8(u'Italics')) self.FontMainWeightComboBox.setItemText(3, self.trUtf8(u'Bold/Italics')) - self.FontMainWeightLabel.setText(translate("AmendThemeDialog", u'Font Weight:')) + self.FontMainWeightLabel.setText(self.trUtf8(u'Font Weight:')) self.MainLocationGroupBox.setTitle(self.trUtf8(u'Display Location')) self.DefaultLocationLabel.setText(self.trUtf8(u'Use Default Location:')) self.FontMainXLabel.setText(self.trUtf8(u'X Position:')) @@ -610,14 +610,10 @@ class Ui_AmendThemeDialog(object): self.FontFooterColorLabel.setText(self.trUtf8(u'Font Color:')) self.FontFooterSizeLabel.setText(self.trUtf8(u'Size:')) self.FontFooterSizeSpinBox.setSuffix(self.trUtf8(u'pt')) - self.FontFooterWeightComboBox.setItemText( - 0, translate("AmendThemeDialog", u'Normal')) - self.FontFooterWeightComboBox.setItemText( - 1, translate("AmendThemeDialog", u'Bold')) - self.FontFooterWeightComboBox.setItemText( - 2, translate("AmendThemeDialog", u'Italics')) - self.FontFooterWeightComboBox.setItemText( - 3, translate("AmendThemeDialog", u'Bold/Italics')) + self.FontFooterWeightComboBox.setItemText(0, self.trUtf8(u'Normal')) + self.FontFooterWeightComboBox.setItemText(1, self.trUtf8(u'Bold')) + self.FontFooterWeightComboBox.setItemText(2, self.trUtf8(u'Italics')) + self.FontFooterWeightComboBox.setItemText(3, self.trUtf8(u'Bold/Italics')) self.FontFooterWeightLabel.setText(self.trUtf8(u'Font Weight:')) self.LocationFooterGroupBox.setTitle(self.trUtf8(u'Display Location')) self.FontFooterDefaultLabel.setText(self.trUtf8(u'Use Default Location:')) diff --git a/openlp/core/ui/generaltab.py b/openlp/core/ui/generaltab.py index 63e9eeae7..6cc5feed7 100644 --- a/openlp/core/ui/generaltab.py +++ b/openlp/core/ui/generaltab.py @@ -167,9 +167,9 @@ class GeneralTab(SettingsTab): def load(self): for screen in self.screen_list: - screen_name = self.trUtf8(u'Screen %d') % (screen[u'number'] + 1) + screen_name = u'%s %d' % (self.trUtf8(u'Screen'), screen[u'number'] + 1) if screen[u'primary']: - screen_name = self.trUtf8(u'%s (primary)') % screen_name + screen_name = u'%s (%s)' % (self.trUtf8(u'primary'), screen_name) self.MonitorComboBox.addItem(screen_name) # Get the configs self.MonitorNumber = int(self.config.get_config(u'Monitor', u'0')) diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 84aeca7e6..c4c5daa1b 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -87,7 +87,11 @@ class SlideController(QtGui.QWidget): self.isLive = isLive self.parent = parent self.image_list = [ - u'Start Loop', u'Stop Loop', u'Loop Separator', u'Image SpinBox'] + self.trUtf8(u'Start Loop'), + self.trUtf8(u'Stop Loop'), + #self.trUtf8(u'Loop Separator'), + self.trUtf8(u'Image SpinBox') + ] self.timer_id = 0 self.commandItem = None self.Panel = QtGui.QWidget(parent.ControlSplitter) @@ -166,7 +170,8 @@ class SlideController(QtGui.QWidget): self.trUtf8(u'Stop Loop'), u':/media/media_stop.png', self.trUtf8(u'Stop continuous loop'), self.onStopLoop) self.DelaySpinBox = QtGui.QSpinBox() - self.Toolbar.addToolbarWidget(u'Image SpinBox', self.DelaySpinBox) + self.Toolbar.addToolbarWidget( + self.trUtf8(u'Image SpinBox'), self.DelaySpinBox) self.DelaySpinBox.setSuffix(self.trUtf8(u's')) self.ControllerLayout.addWidget(self.Toolbar) diff --git a/openlp/core/ui/splashscreen.py b/openlp/core/ui/splashscreen.py index a541efb05..2624f66c4 100644 --- a/openlp/core/ui/splashscreen.py +++ b/openlp/core/ui/splashscreen.py @@ -29,7 +29,8 @@ class SplashScreen(object): def __init__(self, version): self.splash_screen = QtGui.QSplashScreen() self.setupUi() - self.message = self.trUtf8(u'Starting') + u'..... ' + version + self.message = self.splash_screen.trUtf8(u'Starting')\ + + u'..... ' + version def setupUi(self): self.splash_screen.setObjectName(u'splash_screen') @@ -55,7 +56,8 @@ class SplashScreen(object): QtCore.QMetaObject.connectSlotsByName(self.splash_screen) def retranslateUi(self): - self.splash_screen.setWindowTitle(self.trUtf8(u'Splash Screen')) + self.splash_screen.setWindowTitle( + self.splash_screen.trUtf8(u'Splash Screen')) def show(self): self.splash_screen.show() diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py index b306fa823..19e01b2ae 100644 --- a/openlp/core/ui/thememanager.py +++ b/openlp/core/ui/thememanager.py @@ -117,7 +117,7 @@ class ThemeManager(QtGui.QWidget): self.ThemeListWidget.item(count).setText(newName) #Set the new name if themeName == newName: - name = self.trUtf8(u'%s (default)') % newName + name = u'%s (%s)' % (newName, self.trUtf8(u'default')) self.ThemeListWidget.item(count).setText(name) def changeGlobalFromScreen(self, index = -1): @@ -134,7 +134,7 @@ class ThemeManager(QtGui.QWidget): if count == selected_row: self.global_theme = unicode( self.ThemeListWidget.item(count).text()) - name = self.trUtf8(u'%s (default)') % self.global_theme + name = u'%s (%s)' % (self.global_theme, self.trUtf8(u'default')) self.ThemeListWidget.item(count).setText(name) self.config.set_config(u'theme global theme', self.global_theme) Receiver().send_message( diff --git a/openlp/plugins/audit/auditplugin.py b/openlp/plugins/audit/auditplugin.py index 12ee825a7..f4392649b 100644 --- a/openlp/plugins/audit/auditplugin.py +++ b/openlp/plugins/audit/auditplugin.py @@ -62,18 +62,18 @@ class AuditPlugin(Plugin): self.toolsMenu = tools_menu self.AuditMenu = QtGui.QMenu(tools_menu) self.AuditMenu.setObjectName(u'AuditMenu') - self.AuditMenu.setTitle(self.trUtf8(u'&Audit')) + self.AuditMenu.setTitle(tools_menu.trUtf8(u'&Audit')) #Audit Delete self.AuditDelete = QtGui.QAction(tools_menu) - self.AuditDelete.setText(self.trUtf8(u'Audit &Delete')) + self.AuditDelete.setText(tools_menu.trUtf8(u'Audit &Delete')) self.AuditDelete.setStatusTip( - self.trUtf8(u'Delete all audit data to sepecified date')) + tools_menu.trUtf8(u'Delete all audit data to sepecified date')) self.AuditDelete.setObjectName(u'AuditDelete') #Audit Report self.AuditReport = QtGui.QAction(tools_menu) - self.AuditReport.setText(self.trUtf8(u'Au&dit &Extract')) + self.AuditReport.setText(tools_menu.trUtf8(u'Au&dit &Extract')) self.AuditReport.setStatusTip( - self.trUtf8(u'Generate Extracts on Audit Data')) + tools_menu.trUtf8(u'Generate Extracts on Audit Data')) self.AuditReport.setObjectName(u'AuditReport') #Audit activation AuditIcon = buildIcon(u':/tools/tools_alert.png') @@ -81,10 +81,10 @@ class AuditPlugin(Plugin): self.AuditStatus.setIcon(AuditIcon) self.AuditStatus.setCheckable(True) self.AuditStatus.setChecked(False) - self.AuditStatus.setText(self.trUtf8(u'A&udit Status')) + self.AuditStatus.setText(tools_menu.trUtf8(u'A&udit Status')) self.AuditStatus.setStatusTip( - self.trUtf8(u'Start/Stop live song auditing')) - self.AuditStatus.setShortcut(self.trUtf8(u'F4')) + tools_menu.trUtf8(u'Start/Stop live song auditing')) + self.AuditStatus.setShortcut(u'F4') self.AuditStatus.setObjectName(u'AuditStatus') #Add Menus together self.toolsMenu.addAction(self.AuditMenu.menuAction()) diff --git a/openlp/plugins/audit/forms/auditdeletedialog.py b/openlp/plugins/audit/forms/auditdeletedialog.py index dddb5c8c5..75ff8b63d 100644 --- a/openlp/plugins/audit/forms/auditdeletedialog.py +++ b/openlp/plugins/audit/forms/auditdeletedialog.py @@ -11,29 +11,35 @@ from PyQt4 import QtCore, QtGui class Ui_AuditDeleteDialog(object): def setupUi(self, AuditDeleteDialog): - AuditDeleteDialog.setObjectName("AuditDeleteDialog") + AuditDeleteDialog.setObjectName(u'AuditDeleteDialog') AuditDeleteDialog.resize(291, 243) self.layoutWidget = QtGui.QWidget(AuditDeleteDialog) self.layoutWidget.setGeometry(QtCore.QRect(20, 10, 247, 181)) - self.layoutWidget.setObjectName("layoutWidget") + self.layoutWidget.setObjectName(u'layoutWidget') self.verticalLayout = QtGui.QVBoxLayout(self.layoutWidget) - self.verticalLayout.setObjectName("verticalLayout") + self.verticalLayout.setObjectName(u'verticalLayout') self.DeleteCalendar = QtGui.QCalendarWidget(self.layoutWidget) self.DeleteCalendar.setFirstDayOfWeek(QtCore.Qt.Sunday) self.DeleteCalendar.setGridVisible(True) - self.DeleteCalendar.setVerticalHeaderFormat(QtGui.QCalendarWidget.NoVerticalHeader) - self.DeleteCalendar.setObjectName("DeleteCalendar") + self.DeleteCalendar.setVerticalHeaderFormat( + QtGui.QCalendarWidget.NoVerticalHeader) + self.DeleteCalendar.setObjectName(u'DeleteCalendar') self.verticalLayout.addWidget(self.DeleteCalendar) self.buttonBox = QtGui.QDialogButtonBox(AuditDeleteDialog) self.buttonBox.setGeometry(QtCore.QRect(30, 210, 245, 25)) - self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Ok) - self.buttonBox.setObjectName("buttonBox") + self.buttonBox.setStandardButtons( + QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Ok) + self.buttonBox.setObjectName(u'buttonBox') self.retranslateUi(AuditDeleteDialog) - QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL("accepted()"), AuditDeleteDialog.accept) - QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL("rejected()"), AuditDeleteDialog.close) + QtCore.QObject.connect( + self.buttonBox, QtCore.SIGNAL(u'accepted()'), + AuditDeleteDialog.accept) + QtCore.QObject.connect( + self.buttonBox, QtCore.SIGNAL(u'rejected()'), + AuditDeleteDialog.close) QtCore.QMetaObject.connectSlotsByName(AuditDeleteDialog) def retranslateUi(self, AuditDeleteDialog): - AuditDeleteDialog.setWindowTitle(QtGui.QApplication.translate("AuditDeleteDialog", "Audit Delete ", None, QtGui.QApplication.UnicodeUTF8)) + AuditDeleteDialog.setWindowTitle(self.trUtf8(u'Audit Delete')) diff --git a/openlp/plugins/audit/forms/auditdetaildialog.py b/openlp/plugins/audit/forms/auditdetaildialog.py index 6eb1ec2e5..a17181bc5 100644 --- a/openlp/plugins/audit/forms/auditdetaildialog.py +++ b/openlp/plugins/audit/forms/auditdetaildialog.py @@ -11,157 +11,171 @@ from PyQt4 import QtCore, QtGui class Ui_AuditDetailDialog(object): def setupUi(self, AuditDetailDialog): - AuditDetailDialog.setObjectName("AuditDetailDialog") + AuditDetailDialog.setObjectName(u'AuditDetailDialog') AuditDetailDialog.resize(593, 501) self.buttonBox = QtGui.QDialogButtonBox(AuditDetailDialog) self.buttonBox.setGeometry(QtCore.QRect(420, 470, 170, 25)) - self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Ok) - self.buttonBox.setObjectName("buttonBox") + self.buttonBox.setStandardButtons( + QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Ok) + self.buttonBox.setObjectName(u'buttonBox') self.FileGroupBox = QtGui.QGroupBox(AuditDetailDialog) self.FileGroupBox.setGeometry(QtCore.QRect(10, 370, 571, 70)) - self.FileGroupBox.setObjectName("FileGroupBox") + self.FileGroupBox.setObjectName(u'FileGroupBox') self.verticalLayout_4 = QtGui.QVBoxLayout(self.FileGroupBox) - self.verticalLayout_4.setObjectName("verticalLayout_4") + self.verticalLayout_4.setObjectName(u'verticalLayout_4') self.horizontalLayout = QtGui.QHBoxLayout() - self.horizontalLayout.setObjectName("horizontalLayout") + self.horizontalLayout.setObjectName(u'horizontalLayout') self.FileLineEdit = QtGui.QLineEdit(self.FileGroupBox) - self.FileLineEdit.setObjectName("FileLineEdit") + self.FileLineEdit.setObjectName(u'FileLineEdit') self.horizontalLayout.addWidget(self.FileLineEdit) self.SaveFilePushButton = QtGui.QPushButton(self.FileGroupBox) icon = QtGui.QIcon() - icon.addPixmap(QtGui.QPixmap(":/exports/export_load.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + icon.addPixmap(QtGui.QPixmap(u':/exports/export_load.png'), + QtGui.QIcon.Normal, QtGui.QIcon.Off) self.SaveFilePushButton.setIcon(icon) - self.SaveFilePushButton.setObjectName("SaveFilePushButton") + self.SaveFilePushButton.setObjectName(u'SaveFilePushButton') self.horizontalLayout.addWidget(self.SaveFilePushButton) self.verticalLayout_4.addLayout(self.horizontalLayout) self.layoutWidget = QtGui.QWidget(AuditDetailDialog) self.layoutWidget.setGeometry(QtCore.QRect(10, 10, 561, 361)) - self.layoutWidget.setObjectName("layoutWidget") + self.layoutWidget.setObjectName(u'layoutWidget') self.verticalLayout_3 = QtGui.QVBoxLayout(self.layoutWidget) - self.verticalLayout_3.setObjectName("verticalLayout_3") + self.verticalLayout_3.setObjectName(u'verticalLayout_3') self.ReportTypeGroup = QtGui.QGroupBox(self.layoutWidget) - self.ReportTypeGroup.setObjectName("ReportTypeGroup") + self.ReportTypeGroup.setObjectName(u'ReportTypeGroup') self.layoutWidget1 = QtGui.QWidget(self.ReportTypeGroup) self.layoutWidget1.setGeometry(QtCore.QRect(50, 40, 481, 23)) - self.layoutWidget1.setObjectName("layoutWidget1") + self.layoutWidget1.setObjectName(u'layoutWidget1') self.ReportHorizontalLayout = QtGui.QHBoxLayout(self.layoutWidget1) - self.ReportHorizontalLayout.setObjectName("ReportHorizontalLayout") + self.ReportHorizontalLayout.setObjectName(u'ReportHorizontalLayout') self.SummaryReport = QtGui.QRadioButton(self.layoutWidget1) - self.SummaryReport.setObjectName("SummaryReport") + self.SummaryReport.setObjectName(u'SummaryReport') self.ReportHorizontalLayout.addWidget(self.SummaryReport) self.DetailedReport = QtGui.QRadioButton(self.layoutWidget1) self.DetailedReport.setChecked(True) - self.DetailedReport.setObjectName("DetailedReport") + 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("DateRangeGroupBox") + self.DateRangeGroupBox.setObjectName(u'DateRangeGroupBox') self.verticalLayout_2 = QtGui.QVBoxLayout(self.DateRangeGroupBox) - self.verticalLayout_2.setObjectName("verticalLayout_2") + self.verticalLayout_2.setObjectName(u'verticalLayout_2') self.DateHorizontalLayout = QtGui.QHBoxLayout() - self.DateHorizontalLayout.setObjectName("DateHorizontalLayout") + self.DateHorizontalLayout.setObjectName(u'DateHorizontalLayout') self.FromDateEdit = QtGui.QDateEdit(self.DateRangeGroupBox) self.FromDateEdit.setCalendarPopup(True) - self.FromDateEdit.setObjectName("FromDateEdit") + self.FromDateEdit.setObjectName(u'FromDateEdit') self.DateHorizontalLayout.addWidget(self.FromDateEdit) self.To = QtGui.QLabel(self.DateRangeGroupBox) - self.To.setObjectName("To") + self.To.setObjectName(u'To') self.DateHorizontalLayout.addWidget(self.To) self.ToDateEdit = QtGui.QDateEdit(self.DateRangeGroupBox) self.ToDateEdit.setCalendarPopup(True) - self.ToDateEdit.setObjectName("ToDateEdit") + 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("TimePeriodGroupBox") + self.TimePeriodGroupBox.setObjectName(u'TimePeriodGroupBox') self.verticalLayout = QtGui.QVBoxLayout(self.TimePeriodGroupBox) - self.verticalLayout.setObjectName("verticalLayout") + self.verticalLayout.setObjectName(u'verticalLayout') self.FirstHorizontalLayout = QtGui.QHBoxLayout() - self.FirstHorizontalLayout.setObjectName("FirstHorizontalLayout") + self.FirstHorizontalLayout.setObjectName(u'FirstHorizontalLayout') self.FirstCheckBox = QtGui.QCheckBox(self.TimePeriodGroupBox) self.FirstCheckBox.setChecked(True) - self.FirstCheckBox.setObjectName("FirstCheckBox") + 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("FirstFromTimeEdit") + self.FirstFromTimeEdit.setObjectName(u'FirstFromTimeEdit') self.FirstHorizontalLayout.addWidget(self.FirstFromTimeEdit) self.FirstTo = QtGui.QLabel(self.TimePeriodGroupBox) - self.FirstTo.setObjectName("FirstTo") + 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("FirstToTimeEdit") + self.FirstToTimeEdit.setObjectName(u'FirstToTimeEdit') self.FirstHorizontalLayout.addWidget(self.FirstToTimeEdit) self.verticalLayout.addLayout(self.FirstHorizontalLayout) self.SecondHorizontalLayout = QtGui.QHBoxLayout() - self.SecondHorizontalLayout.setObjectName("SecondHorizontalLayout") + self.SecondHorizontalLayout.setObjectName(u'SecondHorizontalLayout') self.SecondCheckBox = QtGui.QCheckBox(self.TimePeriodGroupBox) self.SecondCheckBox.setChecked(True) - self.SecondCheckBox.setObjectName("SecondCheckBox") + 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("SecondFromTimeEdit") + self.SecondFromTimeEdit.setObjectName(u'SecondFromTimeEdit') self.SecondHorizontalLayout.addWidget(self.SecondFromTimeEdit) self.SecondTo = QtGui.QLabel(self.TimePeriodGroupBox) - self.SecondTo.setObjectName("SecondTo") + self.SecondTo.setObjectName(u'SecondTo') self.SecondHorizontalLayout.addWidget(self.SecondTo) self.SecondToTimeEdit = QtGui.QTimeEdit(self.TimePeriodGroupBox) - self.SecondToTimeEdit.setObjectName("SecondToTimeEdit") + self.SecondToTimeEdit.setObjectName(u'SecondToTimeEdit') self.SecondHorizontalLayout.addWidget(self.SecondToTimeEdit) self.verticalLayout.addLayout(self.SecondHorizontalLayout) self.ThirdHorizontalLayout = QtGui.QHBoxLayout() - self.ThirdHorizontalLayout.setObjectName("ThirdHorizontalLayout") + self.ThirdHorizontalLayout.setObjectName(u'ThirdHorizontalLayout') self.ThirdCheckBox = QtGui.QCheckBox(self.TimePeriodGroupBox) self.ThirdCheckBox.setChecked(True) - self.ThirdCheckBox.setObjectName("ThirdCheckBox") + 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("ThirdFromTimeEdit") + self.ThirdFromTimeEdit.setObjectName(u'ThirdFromTimeEdit') self.ThirdHorizontalLayout.addWidget(self.ThirdFromTimeEdit) self.ThirdTo = QtGui.QLabel(self.TimePeriodGroupBox) - self.ThirdTo.setObjectName("ThirdTo") + 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("ThirdToTimeEdit") + 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(self.buttonBox, QtCore.SIGNAL("accepted()"), AuditDetailDialog.accept) - QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL("rejected()"), AuditDetailDialog.close) - QtCore.QObject.connect(self.FirstCheckBox, QtCore.SIGNAL("stateChanged(int)"), AuditDetailDialog.changeFirstService) - QtCore.QObject.connect(self.SecondCheckBox, QtCore.SIGNAL("stateChanged(int)"), AuditDetailDialog.changeSecondService) - QtCore.QObject.connect(self.ThirdCheckBox, QtCore.SIGNAL("stateChanged(int)"), AuditDetailDialog.changeThirdService) - QtCore.QObject.connect(self.SaveFilePushButton, QtCore.SIGNAL("pressed()"), AuditDetailDialog.defineOutputLocation) + QtCore.QObject.connect( + self.buttonBox, QtCore.SIGNAL(u'accepted()'), + AuditDetailDialog.accept) + 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(QtGui.QApplication.translate("AuditDetailDialog", "Audit Detail Extraction", None, QtGui.QApplication.UnicodeUTF8)) - self.FileGroupBox.setTitle(QtGui.QApplication.translate("AuditDetailDialog", "Report Location", None, QtGui.QApplication.UnicodeUTF8)) - self.ReportTypeGroup.setTitle(QtGui.QApplication.translate("AuditDetailDialog", "Report Type", None, QtGui.QApplication.UnicodeUTF8)) - self.SummaryReport.setText(QtGui.QApplication.translate("AuditDetailDialog", "Summary", None, QtGui.QApplication.UnicodeUTF8)) - self.DetailedReport.setText(QtGui.QApplication.translate("AuditDetailDialog", "Detailed", None, QtGui.QApplication.UnicodeUTF8)) - self.DateRangeGroupBox.setTitle(QtGui.QApplication.translate("AuditDetailDialog", "Select Date Range", None, QtGui.QApplication.UnicodeUTF8)) - self.FromDateEdit.setDisplayFormat(QtGui.QApplication.translate("AuditDetailDialog", "dd/MM/yyyy", None, QtGui.QApplication.UnicodeUTF8)) - self.To.setText(QtGui.QApplication.translate("AuditDetailDialog", "to", None, QtGui.QApplication.UnicodeUTF8)) - self.ToDateEdit.setDisplayFormat(QtGui.QApplication.translate("AuditDetailDialog", "dd/MM/yyyy", None, QtGui.QApplication.UnicodeUTF8)) - self.TimePeriodGroupBox.setTitle(QtGui.QApplication.translate("AuditDetailDialog", "Select Time Periods", None, QtGui.QApplication.UnicodeUTF8)) - self.FirstCheckBox.setText(QtGui.QApplication.translate("AuditDetailDialog", "First Service", None, QtGui.QApplication.UnicodeUTF8)) - self.FirstFromTimeEdit.setDisplayFormat(QtGui.QApplication.translate("AuditDetailDialog", "hh:mm AP", None, QtGui.QApplication.UnicodeUTF8)) - self.FirstTo.setText(QtGui.QApplication.translate("AuditDetailDialog", "to", None, QtGui.QApplication.UnicodeUTF8)) - self.FirstToTimeEdit.setDisplayFormat(QtGui.QApplication.translate("AuditDetailDialog", "hh:mm AP", None, QtGui.QApplication.UnicodeUTF8)) - self.SecondCheckBox.setText(QtGui.QApplication.translate("AuditDetailDialog", "Second Service", None, QtGui.QApplication.UnicodeUTF8)) - self.SecondFromTimeEdit.setDisplayFormat(QtGui.QApplication.translate("AuditDetailDialog", "hh:mm AP", None, QtGui.QApplication.UnicodeUTF8)) - self.SecondTo.setText(QtGui.QApplication.translate("AuditDetailDialog", "to", None, QtGui.QApplication.UnicodeUTF8)) - self.SecondToTimeEdit.setDisplayFormat(QtGui.QApplication.translate("AuditDetailDialog", "hh:mm AP", None, QtGui.QApplication.UnicodeUTF8)) - self.ThirdCheckBox.setText(QtGui.QApplication.translate("AuditDetailDialog", "Third Service", None, QtGui.QApplication.UnicodeUTF8)) - self.ThirdFromTimeEdit.setDisplayFormat(QtGui.QApplication.translate("AuditDetailDialog", "hh:mm AP", None, QtGui.QApplication.UnicodeUTF8)) - self.ThirdTo.setText(QtGui.QApplication.translate("AuditDetailDialog", "to", None, QtGui.QApplication.UnicodeUTF8)) - self.ThirdToTimeEdit.setDisplayFormat(QtGui.QApplication.translate("AuditDetailDialog", "hh:mm AP", None, QtGui.QApplication.UnicodeUTF8)) + AuditDetailDialog.setWindowTitle(self.trUtf8(u'Audit Detail Extraction')) + self.FileGroupBox.setTitle(self.trUtf8(u'Report Location')) + self.ReportTypeGroup.setTitle(self.trUtf8(u'Report Type')) + self.SummaryReport.setText(self.trUtf8(u'Summary')) + self.DetailedReport.setText(self.trUtf8(u'Detailed')) + self.DateRangeGroupBox.setTitle(self.trUtf8(u'Select Date Range')) + self.FromDateEdit.setDisplayFormat(self.trUtf8(u'dd/MM/yyyy')) + self.To.setText(self.trUtf8(u'to')) + self.ToDateEdit.setDisplayFormat(self.trUtf8(u'dd/MM/yyyy')) + self.TimePeriodGroupBox.setTitle(self.trUtf8(u'Select Time Periods')) + self.FirstCheckBox.setText(self.trUtf8(u'First Service')) + self.FirstFromTimeEdit.setDisplayFormat(self.trUtf8(u'hh:mm AP')) + self.FirstTo.setText(self.trUtf8(u'to')) + self.FirstToTimeEdit.setDisplayFormat(self.trUtf8(u'hh:mm AP')) + self.SecondCheckBox.setText(self.trUtf8(u'Second Service')) + self.SecondFromTimeEdit.setDisplayFormat(self.trUtf8(u'hh:mm AP')) + self.SecondTo.setText(self.trUtf8(u'to')) + self.SecondToTimeEdit.setDisplayFormat(self.trUtf8(u'hh:mm AP')) + self.ThirdCheckBox.setText(self.trUtf8(u'Third Service')) + self.ThirdFromTimeEdit.setDisplayFormat(self.trUtf8(u'hh:mm AP')) + self.ThirdTo.setText(self.trUtf8(u'to')) + self.ThirdToTimeEdit.setDisplayFormat(self.trUtf8(u'hh:mm AP')) diff --git a/openlp/plugins/bibles/bibleplugin.py b/openlp/plugins/bibles/bibleplugin.py index b504bbc01..5ebebe027 100644 --- a/openlp/plugins/bibles/bibleplugin.py +++ b/openlp/plugins/bibles/bibleplugin.py @@ -73,7 +73,7 @@ class BiblePlugin(Plugin): self.ImportBibleItem = QtGui.QAction(import_menu) self.ImportBibleItem.setObjectName(u'ImportBibleItem') import_menu.addAction(self.ImportBibleItem) - self.ImportBibleItem.setText(self.trUtf8(u'&Bible')) + self.ImportBibleItem.setText(import_menu.trUtf8(u'&Bible')) # Signals and slots QtCore.QObject.connect(self.ImportBibleItem, QtCore.SIGNAL(u'triggered()'), self.onBibleNewClick) @@ -83,7 +83,7 @@ class BiblePlugin(Plugin): self.ExportBibleItem = QtGui.QAction(export_menu) self.ExportBibleItem.setObjectName(u'ExportBibleItem') export_menu.addAction(self.ExportBibleItem) - self.ExportBibleItem.setText(self.trUtf8(u'&Bible')) + self.ExportBibleItem.setText(export_menu.trUtf8(u'&Bible')) self.ExportBibleItem.setVisible(False) def onBibleNewClick(self): diff --git a/openlp/plugins/bibles/lib/manager.py b/openlp/plugins/bibles/lib/manager.py index 4ab850fab..7a8b7eb38 100644 --- a/openlp/plugins/bibles/lib/manager.py +++ b/openlp/plugins/bibles/lib/manager.py @@ -57,7 +57,7 @@ class BibleManager(object): """ self.config = config log.debug(u'Bible Initialising') - self.web = self.trUtf8(u'Web') + self.web = u'Web' # dict of bible database objects self.bible_db_cache = None # dict of bible http readers diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py index e41cb9601..5720a5209 100644 --- a/openlp/plugins/images/lib/mediaitem.py +++ b/openlp/plugins/images/lib/mediaitem.py @@ -48,9 +48,6 @@ class ImageMediaItem(MediaManagerItem): self.PluginTextShort = u'Image' self.ConfigSection = u'images' self.IconPath = u'images/image' - self.OnNewPrompt = self.trUtf8(u'Select Image(s)') - self.OnNewFileMasks = \ - self.trUtf8(u'Images (*.jpg *jpeg *.gif *.png *.bmp)') # this next is a class, not an instance of a class - it will # be instanced by the base MediaManagerItem self.ListViewWithDnD_class = ImageListView @@ -59,6 +56,11 @@ class ImageMediaItem(MediaManagerItem): MediaManagerItem.__init__(self, parent, icon, title) self.overrideActive = False + def retranslateUi(self): + self.OnNewPrompt = self.trUtf8(u'Select Image(s)') + self.OnNewFileMasks = \ + self.trUtf8(u'Images (*.jpg *jpeg *.gif *.png *.bmp)') + def requiredIcons(self): MediaManagerItem.requiredIcons(self) self.hasFileIcon = True diff --git a/openlp/plugins/media/lib/mediatab.py b/openlp/plugins/media/lib/mediatab.py index b24bac094..0c13c4593 100644 --- a/openlp/plugins/media/lib/mediatab.py +++ b/openlp/plugins/media/lib/mediatab.py @@ -31,7 +31,8 @@ class MediaTab(SettingsTab): mediaTab is the media settings tab in the settings dialog. """ def __init__(self): - SettingsTab.__init__(self, translate(u'MediaTab', u'Media'), u'Media') + SettingsTab.__init__(self, u'Media', u'Media') + #SettingsTab.__init__(self, self.trUtf8(u'Media'), u'Media') def setupUi(self): self.setObjectName(u'MediaTab') @@ -57,14 +58,10 @@ class MediaTab(SettingsTab): QtCore.SIGNAL(u'stateChanged(int)'), self.onVMRCheckBoxChanged) def retranslateUi(self): - self.MediaModeGroupBox.setTitle(translate(u'MediaTab', u'Media Mode')) - self.UseVMRCheckBox.setText( - translate(u'MediaTab', u'Use Video Mode Rendering')) - self.UseVMRLabel.setText(translate(u'MediaTab', u'\n' - u'\n' - u'

No video preview available with VMR enabled

')) + self.MediaModeGroupBox.setTitle(self.trUtf8(u'Media Mode')) + self.UseVMRCheckBox.setText(self.trUtf8(u'Use Video Mode Rendering')) + self.UseVMRLabel.setText( + self.trUtf8(u'No video preview available with VMR enabled')) def onVMRCheckBoxChanged(self): use_vmr_mode = self.UseVMRCheckBox.checkState() diff --git a/openlp/plugins/presentations/lib/mediaitem.py b/openlp/plugins/presentations/lib/mediaitem.py index edb66f98d..f5150827a 100644 --- a/openlp/plugins/presentations/lib/mediaitem.py +++ b/openlp/plugins/presentations/lib/mediaitem.py @@ -84,8 +84,7 @@ class PresentationMediaItem(MediaManagerItem): self.DisplayTypeLabel = QtGui.QLabel(self.PresentationWidget) self.DisplayTypeLabel.setObjectName(u'SearchTypeLabel') self.DisplayLayout.addWidget(self.DisplayTypeLabel, 0, 0, 1, 1) - self.DisplayTypeLabel.setText( - translate(u'PresentationMediaItem', u'Present using:')) + self.DisplayTypeLabel.setText(self.trUtf8(u'Present using:')) # Add the Presentation widget to the page layout self.PageLayout.addWidget(self.PresentationWidget) @@ -107,8 +106,9 @@ class PresentationMediaItem(MediaManagerItem): continue (path, filename) = os.path.split(unicode(file)) if titles.count(filename) > 0: - QtGui.QMessageBox.critical(self, u'File exists', - u'A presentation with that filename already exists.', + QtGui.QMessageBox.critical( + self, self.trUtf8(u'File exists'), + self.trUtf8(u'A presentation with that filename already exists.'), QtGui.QMessageBox.Ok) else: item_name = QtGui.QListWidgetItem(filename) diff --git a/openlp/plugins/presentations/lib/presentationtab.py b/openlp/plugins/presentations/lib/presentationtab.py index 307cb8c76..33eb78eb9 100644 --- a/openlp/plugins/presentations/lib/presentationtab.py +++ b/openlp/plugins/presentations/lib/presentationtab.py @@ -32,8 +32,7 @@ class PresentationTab(SettingsTab): """ def __init__(self, controllers): self.controllers = controllers - SettingsTab.__init__(self, - translate(u'PresentationTab', u'Presentation'), u'Presentations') + SettingsTab.__init__(self, u'Presentation', u'Presentations') def setupUi(self): self.setObjectName(u'PresentationTab') @@ -98,8 +97,8 @@ class PresentationTab(SettingsTab): for key in self.controllers: controller = self.controllers[key] checkbox = self.PresenterCheckboxes[controller.name] - checkbox.setText(translate(u'PresentationTab', - controller.name + u' available:')) + checkbox.setText( + u'%s %s:' % (controller.name, self.trUtf8(u'available'))) def load(self): for key in self.controllers: diff --git a/openlp/plugins/remotes/lib/remotetab.py b/openlp/plugins/remotes/lib/remotetab.py index 5a6acf214..aee3c57a2 100644 --- a/openlp/plugins/remotes/lib/remotetab.py +++ b/openlp/plugins/remotes/lib/remotetab.py @@ -27,8 +27,7 @@ class RemoteTab(SettingsTab): RemoteTab is the Remotes settings tab in the settings dialog. """ def __init__(self): - SettingsTab.__init__( - self, translate(u'RemoteTab', u'Remotes'), u'Remotes') + SettingsTab.__init__(self, u'Remotes', u'Remotes') def setupUi(self): self.setObjectName(u'RemoteTab') @@ -48,8 +47,7 @@ class RemoteTab(SettingsTab): 0, QtGui.QFormLayout.LabelRole, self.RemoteModeGroupBox) def retranslateUi(self): - self.RemoteModeGroupBox.setTitle( - translate(u'RemoteTab', u'Remotes Receiver Port')) + self.RemoteModeGroupBox.setTitle(self.trUtf8(u'Remotes Receiver Port')) def load(self): self.RemotePortSpinBox.setValue( diff --git a/openlp/plugins/songs/forms/authorsdialog.py b/openlp/plugins/songs/forms/authorsdialog.py index 63761b196..d9bfde967 100644 --- a/openlp/plugins/songs/forms/authorsdialog.py +++ b/openlp/plugins/songs/forms/authorsdialog.py @@ -73,11 +73,7 @@ class Ui_AuthorsDialog(object): QtCore.QMetaObject.connectSlotsByName(AuthorsDialog) def retranslateUi(self, AuthorsDialog): - AuthorsDialog.setWindowTitle( - translate(u'AuthorsDialog', u'Author Maintenance')) - self.DisplayLabel.setText( - translate(u'AuthorsDialog', u'Display name:')) - self.FirstNameLabel.setText( - translate(u'AuthorsDialog', u'First name:')) - self.LastNameLabel.setText( - translate(u'AuthorsDialog', u'Last name:')) + AuthorsDialog.setWindowTitle(self.trUtf8(u'Author Maintenance')) + self.DisplayLabel.setText(self.trUtf8(u'Display name:')) + self.FirstNameLabel.setText(self.trUtf8(u'First name:')) + self.LastNameLabel.setText(self.trUtf8(u'Last name:')) diff --git a/openlp/plugins/songs/forms/authorsform.py b/openlp/plugins/songs/forms/authorsform.py index c85b38000..967a8de50 100644 --- a/openlp/plugins/songs/forms/authorsform.py +++ b/openlp/plugins/songs/forms/authorsform.py @@ -74,23 +74,25 @@ class AuthorsForm(QtGui.QDialog, Ui_AuthorsDialog): def accept(self): if not self.FirstNameEdit.text(): - QtGui.QMessageBox.critical(self, - translate(u'AuthorsDialog', u'Error'), - translate(u'AuthorsDialog', u'You need to type in the first name of the author.'), + QtGui.QMessageBox.critical( + self, self.trUtf8(u'Error'), + self.trUtf8(u'You need to type in the first name of the author.'), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) self.FirstNameEdit.setFocus() return False elif not self.LastNameEdit.text(): - QtGui.QMessageBox.critical(self, - translate(u'AuthorsDialog', u'Error'), - translate(u'AuthorsDialog', u'You need to type in the last name of the author.'), + QtGui.QMessageBox.critical( + self, self.trUtf8(u'Error'), + self.trUtf8(u'You need to type in the last name of the author.'), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) self.LastNameEdit.setFocus() return False elif not self.DisplayEdit.text(): - if QtGui.QMessageBox.critical(self, - translate(u'AuthorsDialog', u'Error'), - translate(u'AuthorsDialog', u'You haven\'t set a display name for the author, would you like me to combine the first and last names for you?'), + if QtGui.QMessageBox.critical( + self, self.trUtf8(u'Error'), + self.trUtf8(u'You haven\'t set a display name for the ' + u'author, would you like me to combine the first and ' + u'last names for you?'), QtGui.QMessageBox.StandardButtons( QtGui.QMessageBox.Yes | QtGui.QMessageBox.No) ) == QtGui.QMessageBox.Yes: diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py index 1541c9311..c1f675f56 100644 --- a/openlp/plugins/songs/forms/editsongform.py +++ b/openlp/plugins/songs/forms/editsongform.py @@ -353,18 +353,15 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): if len(self.TitleEditItem.displayText()) == 0: self.SongTabWidget.setCurrentIndex(0) self.TitleEditItem.setFocus() - return False, translate( - u'SongFormDialog', u'You need to enter a song title.') + return False, self.trUtf8(u'You need to enter a song title.') if self.VerseListWidget.count() == 0: self.SongTabWidget.setCurrentIndex(0) self.VerseListWidget.setFocus() - return False, translate( - u'SongFormDialog', u'You need to enter some verses.') + return False, self.trUtf8(u'You need to enter some verses.') if self.AuthorsListView.count() == 0: self.SongTabWidget.setCurrentIndex(2) self.AuthorsListView.setFocus() - return False, translate( - u'SongFormDialog', u'You need to provide at least one author.') + return False, self.trUtf8(u'You need to provide at least one author.') return True, u'' def onTitleEditItemLostFocus(self): @@ -398,9 +395,9 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): log.debug(u'accept') valid, message = self._validate_song() if not valid: - QtGui.QMessageBox.critical(self, - translate(u'SongFormDialog', u'Error'), message, - QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) + QtGui.QMessageBox.critical( + self, self.trUtf8(u'Error'), message, + QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) return self.song.title = unicode(self.TitleEditItem.displayText()) self.song.copyright = unicode(self.CopyrightEditItem.displayText()) diff --git a/openlp/plugins/songs/forms/editversedialog.py b/openlp/plugins/songs/forms/editversedialog.py index d08a13809..b0889515d 100644 --- a/openlp/plugins/songs/forms/editversedialog.py +++ b/openlp/plugins/songs/forms/editversedialog.py @@ -50,4 +50,4 @@ class Ui_EditVerseDialog(object): self.VerseTextEdit.setFocus(QtCore.Qt.OtherFocusReason) def retranslateUi(self, EditVerseDialog): - EditVerseDialog.setWindowTitle(translate(u'EditVerseDialog', u'Song Verse Edit Dialog')) + EditVerseDialog.setWindowTitle(self.trUtf8(u'Edit Verse')) diff --git a/openlp/plugins/songs/forms/openlpexportdialog.py b/openlp/plugins/songs/forms/openlpexportdialog.py new file mode 100644 index 000000000..8f8ca589a --- /dev/null +++ b/openlp/plugins/songs/forms/openlpexportdialog.py @@ -0,0 +1,305 @@ +# -*- coding: utf-8 -*- +# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 + +############################################################################### +# OpenLP - Open Source Lyrics Projection # +# --------------------------------------------------------------------------- # +# Copyright (c) 2008-2009 Raoul Snyman # +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # +# --------------------------------------------------------------------------- # +# 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_OpenLPExportDialog(object): + def setupUi(self, OpenLPExportDialog): + OpenLPExportDialog.setObjectName(u'OpenLPExportDialog') + OpenLPExportDialog.resize(473, 459) + icon = QtGui.QIcon() + icon.addPixmap(QtGui.QPixmap(u':/icon/openlp.org-icon-32.bmp'), QtGui.QIcon.Normal, QtGui.QIcon.Off) + OpenLPExportDialog.setWindowIcon(icon) + self.verticalLayout_5 = QtGui.QVBoxLayout(OpenLPExportDialog) + self.verticalLayout_5.setMargin(8) + self.verticalLayout_5.setObjectName(u'verticalLayout_5') + self.ExportFileWidget = QtGui.QWidget(OpenLPExportDialog) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.ExportFileWidget.sizePolicy().hasHeightForWidth()) + self.ExportFileWidget.setSizePolicy(sizePolicy) + self.ExportFileWidget.setObjectName(u'ExportFileWidget') + self.horizontalLayout = QtGui.QHBoxLayout(self.ExportFileWidget) + self.horizontalLayout.setSpacing(3) + self.horizontalLayout.setMargin(0) + self.horizontalLayout.setObjectName(u'horizontalLayout') + self.ExportFileLabel = QtGui.QLabel(self.ExportFileWidget) + self.ExportFileLabel.setObjectName(u'ExportFileLabel') + self.horizontalLayout.addWidget(self.ExportFileLabel) + self.ExportFileLineEdit = QtGui.QLineEdit(self.ExportFileWidget) + self.ExportFileLineEdit.setObjectName(u'ExportFileLineEdit') + self.horizontalLayout.addWidget(self.ExportFileLineEdit) + self.ExportFileSelectPushButton = QtGui.QPushButton(self.ExportFileWidget) + icon1 = QtGui.QIcon() + icon1.addPixmap(QtGui.QPixmap(u':/exports/export_load.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.ExportFileSelectPushButton.setIcon(icon1) + self.ExportFileSelectPushButton.setObjectName(u'ExportFileSelectPushButton') + self.horizontalLayout.addWidget(self.ExportFileSelectPushButton) + self.verticalLayout_5.addWidget(self.ExportFileWidget) + self.SongListFrame = QtGui.QFrame(OpenLPExportDialog) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.SongListFrame.sizePolicy().hasHeightForWidth()) + self.SongListFrame.setSizePolicy(sizePolicy) + self.SongListFrame.setFrameShape(QtGui.QFrame.Box) + self.SongListFrame.setFrameShadow(QtGui.QFrame.Raised) + self.SongListFrame.setObjectName(u'SongListFrame') + self.horizontalLayout_6 = QtGui.QHBoxLayout(self.SongListFrame) + self.horizontalLayout_6.setSpacing(8) + self.horizontalLayout_6.setMargin(8) + self.horizontalLayout_6.setObjectName(u'horizontalLayout_6') + self.ExportFileSongListWidget = QtGui.QWidget(self.SongListFrame) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.ExportFileSongListWidget.sizePolicy().hasHeightForWidth()) + self.ExportFileSongListWidget.setSizePolicy(sizePolicy) + self.ExportFileSongListWidget.setObjectName(u'ExportFileSongListWidget') + self.verticalLayout = QtGui.QVBoxLayout(self.ExportFileSongListWidget) + self.verticalLayout.setSpacing(6) + self.verticalLayout.setMargin(0) + self.verticalLayout.setObjectName(u'verticalLayout') + self.ExportListLabel = QtGui.QLabel(self.ExportFileSongListWidget) + self.ExportListLabel.setObjectName(u'ExportListLabel') + self.verticalLayout.addWidget(self.ExportListLabel) + self.ExportListTable = QtGui.QTableWidget(self.ExportFileSongListWidget) + self.ExportListTable.setSelectionMode(QtGui.QAbstractItemView.MultiSelection) + self.ExportListTable.setShowGrid(False) + self.ExportListTable.setWordWrap(False) + self.ExportListTable.setCornerButtonEnabled(False) + self.ExportListTable.setObjectName(u'ExportListTable') + self.ExportListTable.setColumnCount(2) + self.ExportListTable.setRowCount(0) + item = QtGui.QTableWidgetItem() + self.ExportListTable.setHorizontalHeaderItem(0, item) + item = QtGui.QTableWidgetItem() + self.ExportListTable.setHorizontalHeaderItem(1, item) + self.verticalLayout.addWidget(self.ExportListTable) + self.ExportSelectAllWidget = QtGui.QWidget(self.ExportFileSongListWidget) + self.ExportSelectAllWidget.setObjectName(u'ExportSelectAllWidget') + self.horizontalLayout_2 = QtGui.QHBoxLayout(self.ExportSelectAllWidget) + self.horizontalLayout_2.setSpacing(6) + self.horizontalLayout_2.setMargin(0) + self.horizontalLayout_2.setObjectName(u'horizontalLayout_2') + self.ExportSelectAllPushButton = QtGui.QPushButton(self.ExportSelectAllWidget) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.ExportSelectAllPushButton.sizePolicy().hasHeightForWidth()) + self.ExportSelectAllPushButton.setSizePolicy(sizePolicy) + self.ExportSelectAllPushButton.setMinimumSize(QtCore.QSize(100, 0)) + icon2 = QtGui.QIcon() + icon2.addPixmap(QtGui.QPixmap(u':/exports/export_selectall.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.ExportSelectAllPushButton.setIcon(icon2) + self.ExportSelectAllPushButton.setObjectName(u'ExportSelectAllPushButton') + self.horizontalLayout_2.addWidget(self.ExportSelectAllPushButton) + spacerItem = QtGui.QSpacerItem(89, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.horizontalLayout_2.addItem(spacerItem) + self.verticalLayout.addWidget(self.ExportSelectAllWidget) + self.exportFilterWidget = QtGui.QWidget(self.ExportFileSongListWidget) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.exportFilterWidget.sizePolicy().hasHeightForWidth()) + self.exportFilterWidget.setSizePolicy(sizePolicy) + self.exportFilterWidget.setMinimumSize(QtCore.QSize(0, 0)) + self.exportFilterWidget.setObjectName(u'exportFilterWidget') + self.horizontalLayout_3 = QtGui.QHBoxLayout(self.exportFilterWidget) + self.horizontalLayout_3.setMargin(0) + self.horizontalLayout_3.setObjectName(u'horizontalLayout_3') + self.ExportFilterComboBox = QtGui.QComboBox(self.exportFilterWidget) + self.ExportFilterComboBox.setMinimumSize(QtCore.QSize(70, 0)) + self.ExportFilterComboBox.setObjectName(u'ExportFilterComboBox') + self.ExportFilterComboBox.addItem(QtCore.QString()) + self.ExportFilterComboBox.addItem(QtCore.QString()) + self.ExportFilterComboBox.addItem(QtCore.QString()) + self.horizontalLayout_3.addWidget(self.ExportFilterComboBox) + self.ExportFilterLineEdit = QtGui.QLineEdit(self.exportFilterWidget) + self.ExportFilterLineEdit.setObjectName(u'ExportFilterLineEdit') + self.horizontalLayout_3.addWidget(self.ExportFilterLineEdit) + self.verticalLayout.addWidget(self.exportFilterWidget) + self.horizontalLayout_6.addWidget(self.ExportFileSongListWidget) + self.AddSelectedWidget = QtGui.QWidget(self.SongListFrame) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.AddSelectedWidget.sizePolicy().hasHeightForWidth()) + self.AddSelectedWidget.setSizePolicy(sizePolicy) + self.AddSelectedWidget.setObjectName(u'AddSelectedWidget') + self.verticalLayout_3 = QtGui.QVBoxLayout(self.AddSelectedWidget) + self.verticalLayout_3.setMargin(0) + self.verticalLayout_3.setObjectName(u'verticalLayout_3') + spacerItem1 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.verticalLayout_3.addItem(spacerItem1) + self.AddSelectedPushButton = QtGui.QPushButton(self.AddSelectedWidget) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Minimum) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.AddSelectedPushButton.sizePolicy().hasHeightForWidth()) + self.AddSelectedPushButton.setSizePolicy(sizePolicy) + self.AddSelectedPushButton.setMinimumSize(QtCore.QSize(25, 25)) + icon3 = QtGui.QIcon() + icon3.addPixmap(QtGui.QPixmap(u':/exports/export_move_to_list.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.AddSelectedPushButton.setIcon(icon3) + self.AddSelectedPushButton.setObjectName(u'AddSelectedPushButton') + self.verticalLayout_3.addWidget(self.AddSelectedPushButton) + spacerItem2 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.verticalLayout_3.addItem(spacerItem2) + self.horizontalLayout_6.addWidget(self.AddSelectedWidget) + self.SelectedFileListWidget = QtGui.QWidget(self.SongListFrame) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.SelectedFileListWidget.sizePolicy().hasHeightForWidth()) + self.SelectedFileListWidget.setSizePolicy(sizePolicy) + self.SelectedFileListWidget.setObjectName(u'SelectedFileListWidget') + self.verticalLayout_2 = QtGui.QVBoxLayout(self.SelectedFileListWidget) + self.verticalLayout_2.setMargin(0) + self.verticalLayout_2.setObjectName(u'verticalLayout_2') + self.SelectedListLabel = QtGui.QLabel(self.SelectedFileListWidget) + self.SelectedListLabel.setObjectName(u'SelectedListLabel') + self.verticalLayout_2.addWidget(self.SelectedListLabel) + self.SelectedListTable = QtGui.QTableWidget(self.SelectedFileListWidget) + self.SelectedListTable.setSelectionMode(QtGui.QAbstractItemView.MultiSelection) + self.SelectedListTable.setShowGrid(False) + self.SelectedListTable.setWordWrap(False) + self.SelectedListTable.setCornerButtonEnabled(False) + self.SelectedListTable.setObjectName(u'SelectedListTable') + self.SelectedListTable.setColumnCount(2) + self.SelectedListTable.setRowCount(0) + item = QtGui.QTableWidgetItem() + self.SelectedListTable.setHorizontalHeaderItem(0, item) + item = QtGui.QTableWidgetItem() + self.SelectedListTable.setHorizontalHeaderItem(1, item) + self.verticalLayout_2.addWidget(self.SelectedListTable) + self.SelectedSelectAllWidget = QtGui.QWidget(self.SelectedFileListWidget) + self.SelectedSelectAllWidget.setObjectName(u'SelectedSelectAllWidget') + self.horizontalLayout_4 = QtGui.QHBoxLayout(self.SelectedSelectAllWidget) + self.horizontalLayout_4.setSpacing(6) + self.horizontalLayout_4.setMargin(0) + self.horizontalLayout_4.setObjectName(u'horizontalLayout_4') + self.SelectedSelectAllPushButton = QtGui.QPushButton(self.SelectedSelectAllWidget) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.SelectedSelectAllPushButton.sizePolicy().hasHeightForWidth()) + self.SelectedSelectAllPushButton.setSizePolicy(sizePolicy) + self.SelectedSelectAllPushButton.setMinimumSize(QtCore.QSize(100, 0)) + self.SelectedSelectAllPushButton.setIcon(icon2) + self.SelectedSelectAllPushButton.setObjectName(u'SelectedSelectAllPushButton') + self.horizontalLayout_4.addWidget(self.SelectedSelectAllPushButton) + spacerItem3 = QtGui.QSpacerItem(92, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.horizontalLayout_4.addItem(spacerItem3) + self.verticalLayout_2.addWidget(self.SelectedSelectAllWidget) + self.SelectedRemoveSelectedWidget = QtGui.QWidget(self.SelectedFileListWidget) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.SelectedRemoveSelectedWidget.sizePolicy().hasHeightForWidth()) + self.SelectedRemoveSelectedWidget.setSizePolicy(sizePolicy) + self.SelectedRemoveSelectedWidget.setObjectName(u'SelectedRemoveSelectedWidget') + self.horizontalLayout_5 = QtGui.QHBoxLayout(self.SelectedRemoveSelectedWidget) + self.horizontalLayout_5.setMargin(0) + self.horizontalLayout_5.setObjectName(u'horizontalLayout_5') + self.SelectedRemoveSelectedButton = QtGui.QPushButton(self.SelectedRemoveSelectedWidget) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.SelectedRemoveSelectedButton.sizePolicy().hasHeightForWidth()) + self.SelectedRemoveSelectedButton.setSizePolicy(sizePolicy) + self.SelectedRemoveSelectedButton.setMinimumSize(QtCore.QSize(140, 0)) + icon4 = QtGui.QIcon() + icon4.addPixmap(QtGui.QPixmap(u':/exports/export_remove.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.SelectedRemoveSelectedButton.setIcon(icon4) + self.SelectedRemoveSelectedButton.setObjectName(u'SelectedRemoveSelectedButton') + self.horizontalLayout_5.addWidget(self.SelectedRemoveSelectedButton) + spacerItem4 = QtGui.QSpacerItem(49, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.horizontalLayout_5.addItem(spacerItem4) + self.verticalLayout_2.addWidget(self.SelectedRemoveSelectedWidget) + self.horizontalLayout_6.addWidget(self.SelectedFileListWidget) + self.verticalLayout_5.addWidget(self.SongListFrame) + self.ProgressGroupBox = QtGui.QGroupBox(OpenLPExportDialog) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.ProgressGroupBox.sizePolicy().hasHeightForWidth()) + self.ProgressGroupBox.setSizePolicy(sizePolicy) + self.ProgressGroupBox.setObjectName(u'ProgressGroupBox') + self.verticalLayout_4 = QtGui.QVBoxLayout(self.ProgressGroupBox) + self.verticalLayout_4.setSpacing(8) + self.verticalLayout_4.setContentsMargins(8, 0, 8, 8) + self.verticalLayout_4.setObjectName(u'verticalLayout_4') + self.ProgressLabel = QtGui.QLabel(self.ProgressGroupBox) + self.ProgressLabel.setObjectName(u'ProgressLabel') + self.verticalLayout_4.addWidget(self.ProgressLabel) + self.ProgressBar = QtGui.QProgressBar(self.ProgressGroupBox) + self.ProgressBar.setProperty(u'value', QtCore.QVariant(24)) + self.ProgressBar.setObjectName(u'ProgressBar') + self.verticalLayout_4.addWidget(self.ProgressBar) + self.verticalLayout_5.addWidget(self.ProgressGroupBox) + self.ButtonBarWidget = QtGui.QWidget(OpenLPExportDialog) + self.ButtonBarWidget.setObjectName(u'ButtonBarWidget') + self.horizontalLayout_7 = QtGui.QHBoxLayout(self.ButtonBarWidget) + self.horizontalLayout_7.setSpacing(8) + self.horizontalLayout_7.setMargin(0) + self.horizontalLayout_7.setObjectName(u'horizontalLayout_7') + spacerItem5 = QtGui.QSpacerItem(288, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.horizontalLayout_7.addItem(spacerItem5) + self.ExportPushButton = QtGui.QPushButton(self.ButtonBarWidget) + self.ExportPushButton.setObjectName(u'ExportPushButton') + self.horizontalLayout_7.addWidget(self.ExportPushButton) + self.ClosePushButton = QtGui.QPushButton(self.ButtonBarWidget) + self.ClosePushButton.setObjectName(u'ClosePushButton') + self.horizontalLayout_7.addWidget(self.ClosePushButton) + self.verticalLayout_5.addWidget(self.ButtonBarWidget) + + self.retranslateUi(OpenLPExportDialog) + QtCore.QObject.connect(self.ClosePushButton, QtCore.SIGNAL(u'clicked()'), OpenLPExportDialog.close) + QtCore.QObject.connect(self.ExportSelectAllPushButton, QtCore.SIGNAL(u'clicked()'), self.ExportListTable.selectAll) + QtCore.QObject.connect(self.SelectedSelectAllPushButton, QtCore.SIGNAL(u'clicked()'), self.SelectedListTable.selectAll) + QtCore.QObject.connect(self.SelectedRemoveSelectedButton, QtCore.SIGNAL(u'clicked()'), self.SelectedListTable.clear) + QtCore.QMetaObject.connectSlotsByName(OpenLPExportDialog) + + def retranslateUi(self, OpenLPExportDialog): + OpenLPExportDialog.setWindowTitle(self.trUtf8(u'openlp.org Song Exporter')) + self.ExportFileLabel.setText(self.trUtf8(u'Select openlp.org export filename:')) + self.ExportListLabel.setText(self.trUtf8(u'Full Song List')) + self.ExportListTable.horizontalHeaderItem(0).setText(self.trUtf8(u'Song Title')) + self.ExportListTable.horizontalHeaderItem(1).setText(self.trUtf8(u'Author')) + self.ExportSelectAllPushButton.setText(self.trUtf8(u'Select All')) + self.ExportFilterComboBox.setItemText(0, self.trUtf8(u'Lyrics')) + self.ExportFilterComboBox.setItemText(1, self.trUtf8(u'Title')) + self.ExportFilterComboBox.setItemText(2, self.trUtf8(u'Author')) + self.SelectedListLabel.setText(self.trUtf8(u'Song Export List')) + self.SelectedListTable.horizontalHeaderItem(0).setText(self.trUtf8(u'Song Title')) + self.SelectedListTable.horizontalHeaderItem(1).setText(self.trUtf8(u'Author')) + self.SelectedSelectAllPushButton.setText(self.trUtf8(u'Select All')) + self.SelectedRemoveSelectedButton.setText(self.trUtf8(u'Remove Selected')) + self.ProgressGroupBox.setTitle(self.trUtf8(u'Progress:')) + self.ProgressLabel.setText(self.trUtf8(u'Ready to export')) + self.ExportPushButton.setText(self.trUtf8(u'Export')) + self.ClosePushButton.setText(self.trUtf8(u'Close')) + diff --git a/openlp/plugins/songs/forms/openlpexportform.py b/openlp/plugins/songs/forms/openlpexportform.py index b69ed3995..48a1303f4 100644 --- a/openlp/plugins/songs/forms/openlpexportform.py +++ b/openlp/plugins/songs/forms/openlpexportform.py @@ -23,286 +23,11 @@ ############################################################################### from PyQt4 import QtCore, QtGui -from openlp.core.lib import translate, buildIcon +from openlp.plugins.songs.forms.openlpexportdialog import Ui_OpenLPExportDialog -class OpenLPExportForm(object): +class OpenLPExportForm(QtGui.QDialog, Ui_OpenLPExportDialog): - def __init__(self): - self.OpenLPExportForm = QtGui.QWidget() - self.setupUi() + def __init__(self, parent=None): + QtGui.QDialog.__init__(self, parent) + self.setupUi(self) - def setupUi(self): - self.OpenLPExportForm.setObjectName(u'OpenLPExportForm') - self.OpenLPExportForm.resize(473, 459) - icon = buildIcon(u':/icon/openlp-logo-16x16.png') - self.OpenLPExportForm.setWindowIcon(icon) - self.verticalLayout_5 = QtGui.QVBoxLayout(self.OpenLPExportForm) - self.verticalLayout_5.setMargin(8) - self.verticalLayout_5.setObjectName(u'verticalLayout_5') - self.ExportFileWidget = QtGui.QWidget(self.OpenLPExportForm) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.ExportFileWidget.sizePolicy().hasHeightForWidth()) - self.ExportFileWidget.setSizePolicy(sizePolicy) - self.ExportFileWidget.setObjectName(u'ExportFileWidget') - self.horizontalLayout = QtGui.QHBoxLayout(self.ExportFileWidget) - self.horizontalLayout.setSpacing(3) - self.horizontalLayout.setMargin(0) - self.horizontalLayout.setObjectName(u'horizontalLayout') - self.ExportFileLabel = QtGui.QLabel(self.ExportFileWidget) - self.ExportFileLabel.setObjectName(u'ExportFileLabel') - self.horizontalLayout.addWidget(self.ExportFileLabel) - self.ExportFileLineEdit = QtGui.QLineEdit(self.ExportFileWidget) - self.ExportFileLineEdit.setObjectName(u'ExportFileLineEdit') - self.horizontalLayout.addWidget(self.ExportFileLineEdit) - self.ExportFileSelectPushButton = QtGui.QPushButton(self.ExportFileWidget) - icon1 = buildIcon(u':/exports/export_load.png') - self.ExportFileSelectPushButton.setIcon(icon1) - self.ExportFileSelectPushButton.setObjectName(u'ExportFileSelectPushButton') - self.horizontalLayout.addWidget(self.ExportFileSelectPushButton) - self.verticalLayout_5.addWidget(self.ExportFileWidget) - self.SongListFrame = QtGui.QFrame(self.OpenLPExportForm) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SongListFrame.sizePolicy().hasHeightForWidth()) - self.SongListFrame.setSizePolicy(sizePolicy) - self.SongListFrame.setFrameShape(QtGui.QFrame.Box) - self.SongListFrame.setFrameShadow(QtGui.QFrame.Raised) - self.SongListFrame.setObjectName(u'SongListFrame') - self.horizontalLayout_6 = QtGui.QHBoxLayout(self.SongListFrame) - self.horizontalLayout_6.setSpacing(8) - self.horizontalLayout_6.setMargin(8) - self.horizontalLayout_6.setObjectName(u'horizontalLayout_6') - self.ExportFileSongListWidget = QtGui.QWidget(self.SongListFrame) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.ExportFileSongListWidget.sizePolicy().hasHeightForWidth()) - self.ExportFileSongListWidget.setSizePolicy(sizePolicy) - self.ExportFileSongListWidget.setObjectName(u'ExportFileSongListWidget') - self.verticalLayout = QtGui.QVBoxLayout(self.ExportFileSongListWidget) - self.verticalLayout.setSpacing(6) - self.verticalLayout.setMargin(0) - self.verticalLayout.setObjectName(u'verticalLayout') - self.ExportListLabel = QtGui.QLabel(self.ExportFileSongListWidget) - self.ExportListLabel.setObjectName(u'ExportListLabel') - self.verticalLayout.addWidget(self.ExportListLabel) - self.ExportListTable = QtGui.QTableWidget(self.ExportFileSongListWidget) - self.ExportListTable.setSelectionMode(QtGui.QAbstractItemView.MultiSelection) - self.ExportListTable.setShowGrid(False) - self.ExportListTable.setWordWrap(False) - self.ExportListTable.setCornerButtonEnabled(False) - self.ExportListTable.setObjectName(u'ExportListTable') - self.ExportListTable.setColumnCount(2) - self.ExportListTable.setRowCount(0) - item = QtGui.QTableWidgetItem() - self.ExportListTable.setHorizontalHeaderItem(0, item) - item = QtGui.QTableWidgetItem() - self.ExportListTable.setHorizontalHeaderItem(1, item) - self.verticalLayout.addWidget(self.ExportListTable) - self.ExportSelectAllWidget = QtGui.QWidget(self.ExportFileSongListWidget) - self.ExportSelectAllWidget.setObjectName(u'ExportSelectAllWidget') - self.horizontalLayout_2 = QtGui.QHBoxLayout(self.ExportSelectAllWidget) - self.horizontalLayout_2.setSpacing(6) - self.horizontalLayout_2.setMargin(0) - self.horizontalLayout_2.setObjectName(u'horizontalLayout_2') - self.ExportSelectAllPushButton = QtGui.QPushButton(self.ExportSelectAllWidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.ExportSelectAllPushButton.sizePolicy().hasHeightForWidth()) - self.ExportSelectAllPushButton.setSizePolicy(sizePolicy) - self.ExportSelectAllPushButton.setMinimumSize(QtCore.QSize(100, 0)) - icon2 = buildIcon(u':/exports/export_selectall.png') - self.ExportSelectAllPushButton.setIcon(icon2) - self.ExportSelectAllPushButton.setObjectName(u'ExportSelectAllPushButton') - self.horizontalLayout_2.addWidget(self.ExportSelectAllPushButton) - spacerItem = QtGui.QSpacerItem(89, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_2.addItem(spacerItem) - self.verticalLayout.addWidget(self.ExportSelectAllWidget) - self.exportFilterWidget = QtGui.QWidget(self.ExportFileSongListWidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.exportFilterWidget.sizePolicy().hasHeightForWidth()) - self.exportFilterWidget.setSizePolicy(sizePolicy) - self.exportFilterWidget.setMinimumSize(QtCore.QSize(0, 0)) - self.exportFilterWidget.setObjectName(u'exportFilterWidget') - self.horizontalLayout_3 = QtGui.QHBoxLayout(self.exportFilterWidget) - self.horizontalLayout_3.setMargin(0) - self.horizontalLayout_3.setObjectName(u'horizontalLayout_3') - self.ExportFilterComboBox = QtGui.QComboBox(self.exportFilterWidget) - self.ExportFilterComboBox.setMinimumSize(QtCore.QSize(70, 0)) - self.ExportFilterComboBox.setObjectName(u'ExportFilterComboBox') - self.ExportFilterComboBox.addItem(QtCore.QString()) - self.ExportFilterComboBox.addItem(QtCore.QString()) - self.ExportFilterComboBox.addItem(QtCore.QString()) - self.horizontalLayout_3.addWidget(self.ExportFilterComboBox) - self.ExportFilterLineEdit = QtGui.QLineEdit(self.exportFilterWidget) - self.ExportFilterLineEdit.setObjectName(u'ExportFilterLineEdit') - self.horizontalLayout_3.addWidget(self.ExportFilterLineEdit) - self.verticalLayout.addWidget(self.exportFilterWidget) - self.horizontalLayout_6.addWidget(self.ExportFileSongListWidget) - self.AddSelectedWidget = QtGui.QWidget(self.SongListFrame) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.AddSelectedWidget.sizePolicy().hasHeightForWidth()) - self.AddSelectedWidget.setSizePolicy(sizePolicy) - self.AddSelectedWidget.setObjectName(u'AddSelectedWidget') - self.verticalLayout_3 = QtGui.QVBoxLayout(self.AddSelectedWidget) - self.verticalLayout_3.setMargin(0) - self.verticalLayout_3.setObjectName(u'verticalLayout_3') - spacerItem1 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.verticalLayout_3.addItem(spacerItem1) - self.AddSelectedPushButton = QtGui.QPushButton(self.AddSelectedWidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Minimum) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.AddSelectedPushButton.sizePolicy().hasHeightForWidth()) - self.AddSelectedPushButton.setSizePolicy(sizePolicy) - self.AddSelectedPushButton.setMinimumSize(QtCore.QSize(25, 25)) - icon3 = buildIcon(u':/exports/export_move_to_list.png') - self.AddSelectedPushButton.setIcon(icon3) - self.AddSelectedPushButton.setObjectName(u'AddSelectedPushButton') - self.verticalLayout_3.addWidget(self.AddSelectedPushButton) - spacerItem2 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.verticalLayout_3.addItem(spacerItem2) - self.horizontalLayout_6.addWidget(self.AddSelectedWidget) - self.SelectedFileListWidget = QtGui.QWidget(self.SongListFrame) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SelectedFileListWidget.sizePolicy().hasHeightForWidth()) - self.SelectedFileListWidget.setSizePolicy(sizePolicy) - self.SelectedFileListWidget.setObjectName(u'SelectedFileListWidget') - self.verticalLayout_2 = QtGui.QVBoxLayout(self.SelectedFileListWidget) - self.verticalLayout_2.setMargin(0) - self.verticalLayout_2.setObjectName(u'verticalLayout_2') - self.SelectedListLabel = QtGui.QLabel(self.SelectedFileListWidget) - self.SelectedListLabel.setObjectName(u'SelectedListLabel') - self.verticalLayout_2.addWidget(self.SelectedListLabel) - self.SelectedListTable = QtGui.QTableWidget(self.SelectedFileListWidget) - self.SelectedListTable.setSelectionMode(QtGui.QAbstractItemView.MultiSelection) - self.SelectedListTable.setShowGrid(False) - self.SelectedListTable.setWordWrap(False) - self.SelectedListTable.setCornerButtonEnabled(False) - self.SelectedListTable.setObjectName(u'SelectedListTable') - self.SelectedListTable.setColumnCount(2) - self.SelectedListTable.setRowCount(0) - item = QtGui.QTableWidgetItem() - self.SelectedListTable.setHorizontalHeaderItem(0, item) - item = QtGui.QTableWidgetItem() - self.SelectedListTable.setHorizontalHeaderItem(1, item) - self.verticalLayout_2.addWidget(self.SelectedListTable) - self.SelectedSelectAllWidget = QtGui.QWidget(self.SelectedFileListWidget) - self.SelectedSelectAllWidget.setObjectName(u'SelectedSelectAllWidget') - self.horizontalLayout_4 = QtGui.QHBoxLayout(self.SelectedSelectAllWidget) - self.horizontalLayout_4.setSpacing(6) - self.horizontalLayout_4.setMargin(0) - self.horizontalLayout_4.setObjectName(u'horizontalLayout_4') - self.SelectedSelectAllPushButton = QtGui.QPushButton(self.SelectedSelectAllWidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SelectedSelectAllPushButton.sizePolicy().hasHeightForWidth()) - self.SelectedSelectAllPushButton.setSizePolicy(sizePolicy) - self.SelectedSelectAllPushButton.setMinimumSize(QtCore.QSize(100, 0)) - self.SelectedSelectAllPushButton.setIcon(icon2) - self.SelectedSelectAllPushButton.setObjectName(u'SelectedSelectAllPushButton') - self.horizontalLayout_4.addWidget(self.SelectedSelectAllPushButton) - spacerItem3 = QtGui.QSpacerItem(92, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_4.addItem(spacerItem3) - self.verticalLayout_2.addWidget(self.SelectedSelectAllWidget) - self.SelectedRemoveSelectedWidget = QtGui.QWidget(self.SelectedFileListWidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SelectedRemoveSelectedWidget.sizePolicy().hasHeightForWidth()) - self.SelectedRemoveSelectedWidget.setSizePolicy(sizePolicy) - self.SelectedRemoveSelectedWidget.setObjectName(u'SelectedRemoveSelectedWidget') - self.horizontalLayout_5 = QtGui.QHBoxLayout(self.SelectedRemoveSelectedWidget) - self.horizontalLayout_5.setMargin(0) - self.horizontalLayout_5.setObjectName(u'horizontalLayout_5') - self.SelectedRemoveSelectedButton = QtGui.QPushButton(self.SelectedRemoveSelectedWidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SelectedRemoveSelectedButton.sizePolicy().hasHeightForWidth()) - self.SelectedRemoveSelectedButton.setSizePolicy(sizePolicy) - self.SelectedRemoveSelectedButton.setMinimumSize(QtCore.QSize(140, 0)) - icon4 = buildIcon(u':/exports/export_remove.png') - self.SelectedRemoveSelectedButton.setIcon(icon4) - self.SelectedRemoveSelectedButton.setObjectName(u'SelectedRemoveSelectedButton') - self.horizontalLayout_5.addWidget(self.SelectedRemoveSelectedButton) - spacerItem4 = QtGui.QSpacerItem(49, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_5.addItem(spacerItem4) - self.verticalLayout_2.addWidget(self.SelectedRemoveSelectedWidget) - self.horizontalLayout_6.addWidget(self.SelectedFileListWidget) - self.verticalLayout_5.addWidget(self.SongListFrame) - self.ProgressGroupBox = QtGui.QGroupBox(self.OpenLPExportForm) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.ProgressGroupBox.sizePolicy().hasHeightForWidth()) - self.ProgressGroupBox.setSizePolicy(sizePolicy) - self.ProgressGroupBox.setObjectName(u'ProgressGroupBox') - self.verticalLayout_4 = QtGui.QVBoxLayout(self.ProgressGroupBox) - self.verticalLayout_4.setSpacing(8) - self.verticalLayout_4.setContentsMargins(8, 0, 8, 8) - self.verticalLayout_4.setObjectName(u'verticalLayout_4') - self.ProgressLabel = QtGui.QLabel(self.ProgressGroupBox) - self.ProgressLabel.setObjectName(u'ProgressLabel') - self.verticalLayout_4.addWidget(self.ProgressLabel) - self.ProgressBar = QtGui.QProgressBar(self.ProgressGroupBox) - self.ProgressBar.setProperty(u'value', QtCore.QVariant(24)) - self.ProgressBar.setObjectName(u'ProgressBar') - self.verticalLayout_4.addWidget(self.ProgressBar) - self.verticalLayout_5.addWidget(self.ProgressGroupBox) - self.ButtonBarWidget = QtGui.QWidget(self.OpenLPExportForm) - self.ButtonBarWidget.setObjectName(u'ButtonBarWidget') - self.horizontalLayout_7 = QtGui.QHBoxLayout(self.ButtonBarWidget) - self.horizontalLayout_7.setSpacing(8) - self.horizontalLayout_7.setMargin(0) - self.horizontalLayout_7.setObjectName(u'horizontalLayout_7') - spacerItem5 = QtGui.QSpacerItem(288, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_7.addItem(spacerItem5) - self.ExportPushButton = QtGui.QPushButton(self.ButtonBarWidget) - self.ExportPushButton.setObjectName(u'ExportPushButton') - self.horizontalLayout_7.addWidget(self.ExportPushButton) - self.ClosePushButton = QtGui.QPushButton(self.ButtonBarWidget) - self.ClosePushButton.setObjectName(u'ClosePushButton') - self.horizontalLayout_7.addWidget(self.ClosePushButton) - self.verticalLayout_5.addWidget(self.ButtonBarWidget) - - self.retranslateUi() - QtCore.QObject.connect(self.ClosePushButton, QtCore.SIGNAL(u'clicked()'), self.OpenLPExportForm.close) - QtCore.QObject.connect(self.ExportSelectAllPushButton, QtCore.SIGNAL(u'clicked()'), self.ExportListTable.selectAll) - QtCore.QObject.connect(self.SelectedSelectAllPushButton, QtCore.SIGNAL(u'clicked()'), self.SelectedListTable.selectAll) - QtCore.QObject.connect(self.SelectedRemoveSelectedButton, QtCore.SIGNAL(u'clicked()'), self.SelectedListTable.clear) - QtCore.QMetaObject.connectSlotsByName(self.OpenLPExportForm) - - def retranslateUi(self): - self.OpenLPExportForm.setWindowTitle(translate(u'OpenLPExportForm', u'openlp.org Song Exporter')) - self.ExportFileLabel.setText(translate(u'OpenLPExportForm', u'Select openlp.org export filename:')) - self.ExportListLabel.setText(translate(u'OpenLPExportForm', u'Full Song List')) - self.ExportListTable.horizontalHeaderItem(0).setText(translate(u'OpenLPExportForm', u'Song Title')) - self.ExportListTable.horizontalHeaderItem(1).setText(translate(u'OpenLPExportForm', u'Author')) - self.ExportSelectAllPushButton.setText(translate(u'OpenLPExportForm', u'Select All')) - self.ExportFilterComboBox.setItemText(0, translate(u'OpenLPExportForm', u'Lyrics')) - self.ExportFilterComboBox.setItemText(1, translate(u'OpenLPExportForm', u'Title')) - self.ExportFilterComboBox.setItemText(2, translate(u'OpenLPExportForm', u'Author')) - self.SelectedListLabel.setText(translate(u'OpenLPExportForm', u'Song Export List')) - self.SelectedListTable.horizontalHeaderItem(0).setText(translate(u'OpenLPExportForm', u'Song Title')) - self.SelectedListTable.horizontalHeaderItem(1).setText(translate(u'OpenLPExportForm', u'Author')) - self.SelectedSelectAllPushButton.setText(translate(u'OpenLPExportForm', u'Select All')) - self.SelectedRemoveSelectedButton.setText(translate(u'OpenLPExportForm', u'Remove Selected')) - self.ProgressGroupBox.setTitle(translate(u'OpenLPExportForm', u'Progress:')) - self.ProgressLabel.setText(translate(u'OpenLPExportForm', u'Ready to export')) - self.ExportPushButton.setText(translate(u'OpenLPExportForm', u'Export')) - self.ClosePushButton.setText(translate(u'OpenLPExportForm', u'Close')) - - def show(self): - self.OpenLPExportForm.show() diff --git a/openlp/plugins/songs/forms/openlpimportdialog.py b/openlp/plugins/songs/forms/openlpimportdialog.py new file mode 100644 index 000000000..fc3867c69 --- /dev/null +++ b/openlp/plugins/songs/forms/openlpimportdialog.py @@ -0,0 +1,305 @@ +# -*- coding: utf-8 -*- +# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 + +############################################################################### +# OpenLP - Open Source Lyrics Projection # +# --------------------------------------------------------------------------- # +# Copyright (c) 2008-2009 Raoul Snyman # +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # +# --------------------------------------------------------------------------- # +# 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_OpenLPImportDialog(object): + def setupUi(self, OpenLPImportDialog): + OpenLPImportDialog.setObjectName(u'OpenLPImportDialog') + OpenLPImportDialog.resize(473, 459) + icon = QtGui.QIcon() + icon.addPixmap(QtGui.QPixmap(u':/icon/openlp.org-icon-32.bmp'), QtGui.QIcon.Normal, QtGui.QIcon.Off) + OpenLPImportDialog.setWindowIcon(icon) + self.verticalLayout_5 = QtGui.QVBoxLayout(OpenLPImportDialog) + self.verticalLayout_5.setMargin(8) + self.verticalLayout_5.setObjectName(u'verticalLayout_5') + self.ImportFileWidget = QtGui.QWidget(OpenLPImportDialog) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.ImportFileWidget.sizePolicy().hasHeightForWidth()) + self.ImportFileWidget.setSizePolicy(sizePolicy) + self.ImportFileWidget.setObjectName(u'ImportFileWidget') + self.horizontalLayout = QtGui.QHBoxLayout(self.ImportFileWidget) + self.horizontalLayout.setSpacing(3) + self.horizontalLayout.setMargin(0) + self.horizontalLayout.setObjectName(u'horizontalLayout') + self.ImportFileLabel = QtGui.QLabel(self.ImportFileWidget) + self.ImportFileLabel.setObjectName(u'ImportFileLabel') + self.horizontalLayout.addWidget(self.ImportFileLabel) + self.ImportFileLineEdit = QtGui.QLineEdit(self.ImportFileWidget) + self.ImportFileLineEdit.setObjectName(u'ImportFileLineEdit') + self.horizontalLayout.addWidget(self.ImportFileLineEdit) + self.ImportFileSelectPushButton = QtGui.QPushButton(self.ImportFileWidget) + icon1 = QtGui.QIcon() + icon1.addPixmap(QtGui.QPixmap(u':/imports/import_load.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.ImportFileSelectPushButton.setIcon(icon1) + self.ImportFileSelectPushButton.setObjectName(u'ImportFileSelectPushButton') + self.horizontalLayout.addWidget(self.ImportFileSelectPushButton) + self.verticalLayout_5.addWidget(self.ImportFileWidget) + self.SongListFrame = QtGui.QFrame(OpenLPImportDialog) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.SongListFrame.sizePolicy().hasHeightForWidth()) + self.SongListFrame.setSizePolicy(sizePolicy) + self.SongListFrame.setFrameShape(QtGui.QFrame.Box) + self.SongListFrame.setFrameShadow(QtGui.QFrame.Raised) + self.SongListFrame.setObjectName(u'SongListFrame') + self.horizontalLayout_6 = QtGui.QHBoxLayout(self.SongListFrame) + self.horizontalLayout_6.setSpacing(8) + self.horizontalLayout_6.setMargin(8) + self.horizontalLayout_6.setObjectName(u'horizontalLayout_6') + self.ImportFileSongListWidget = QtGui.QWidget(self.SongListFrame) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.ImportFileSongListWidget.sizePolicy().hasHeightForWidth()) + self.ImportFileSongListWidget.setSizePolicy(sizePolicy) + self.ImportFileSongListWidget.setObjectName(u'ImportFileSongListWidget') + self.verticalLayout = QtGui.QVBoxLayout(self.ImportFileSongListWidget) + self.verticalLayout.setSpacing(6) + self.verticalLayout.setMargin(0) + self.verticalLayout.setObjectName(u'verticalLayout') + self.ImportListLabel = QtGui.QLabel(self.ImportFileSongListWidget) + self.ImportListLabel.setObjectName(u'ImportListLabel') + self.verticalLayout.addWidget(self.ImportListLabel) + self.ImportListTable = QtGui.QTableWidget(self.ImportFileSongListWidget) + self.ImportListTable.setSelectionMode(QtGui.QAbstractItemView.MultiSelection) + self.ImportListTable.setShowGrid(False) + self.ImportListTable.setWordWrap(False) + self.ImportListTable.setCornerButtonEnabled(False) + self.ImportListTable.setObjectName(u'ImportListTable') + self.ImportListTable.setColumnCount(2) + self.ImportListTable.setRowCount(0) + item = QtGui.QTableWidgetItem() + self.ImportListTable.setHorizontalHeaderItem(0, item) + item = QtGui.QTableWidgetItem() + self.ImportListTable.setHorizontalHeaderItem(1, item) + self.verticalLayout.addWidget(self.ImportListTable) + self.ImportSelectAllWidget = QtGui.QWidget(self.ImportFileSongListWidget) + self.ImportSelectAllWidget.setObjectName(u'ImportSelectAllWidget') + self.horizontalLayout_2 = QtGui.QHBoxLayout(self.ImportSelectAllWidget) + self.horizontalLayout_2.setSpacing(6) + self.horizontalLayout_2.setMargin(0) + self.horizontalLayout_2.setObjectName(u'horizontalLayout_2') + self.ImportSelectAllPushButton = QtGui.QPushButton(self.ImportSelectAllWidget) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.ImportSelectAllPushButton.sizePolicy().hasHeightForWidth()) + self.ImportSelectAllPushButton.setSizePolicy(sizePolicy) + self.ImportSelectAllPushButton.setMinimumSize(QtCore.QSize(100, 0)) + icon2 = QtGui.QIcon() + icon2.addPixmap(QtGui.QPixmap(u':/imports/import_selectall.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.ImportSelectAllPushButton.setIcon(icon2) + self.ImportSelectAllPushButton.setObjectName(u'ImportSelectAllPushButton') + self.horizontalLayout_2.addWidget(self.ImportSelectAllPushButton) + spacerItem = QtGui.QSpacerItem(89, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.horizontalLayout_2.addItem(spacerItem) + self.verticalLayout.addWidget(self.ImportSelectAllWidget) + self.importFilterWidget = QtGui.QWidget(self.ImportFileSongListWidget) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.importFilterWidget.sizePolicy().hasHeightForWidth()) + self.importFilterWidget.setSizePolicy(sizePolicy) + self.importFilterWidget.setMinimumSize(QtCore.QSize(0, 0)) + self.importFilterWidget.setObjectName(u'importFilterWidget') + self.horizontalLayout_3 = QtGui.QHBoxLayout(self.importFilterWidget) + self.horizontalLayout_3.setMargin(0) + self.horizontalLayout_3.setObjectName(u'horizontalLayout_3') + self.ImportFilterComboBox = QtGui.QComboBox(self.importFilterWidget) + self.ImportFilterComboBox.setMinimumSize(QtCore.QSize(70, 0)) + self.ImportFilterComboBox.setObjectName(u'ImportFilterComboBox') + self.ImportFilterComboBox.addItem(QtCore.QString()) + self.ImportFilterComboBox.addItem(QtCore.QString()) + self.ImportFilterComboBox.addItem(QtCore.QString()) + self.horizontalLayout_3.addWidget(self.ImportFilterComboBox) + self.importFilterLineEdit = QtGui.QLineEdit(self.importFilterWidget) + self.importFilterLineEdit.setObjectName(u'importFilterLineEdit') + self.horizontalLayout_3.addWidget(self.importFilterLineEdit) + self.verticalLayout.addWidget(self.importFilterWidget) + self.horizontalLayout_6.addWidget(self.ImportFileSongListWidget) + self.AddSelectedWidget = QtGui.QWidget(self.SongListFrame) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.AddSelectedWidget.sizePolicy().hasHeightForWidth()) + self.AddSelectedWidget.setSizePolicy(sizePolicy) + self.AddSelectedWidget.setObjectName(u'AddSelectedWidget') + self.verticalLayout_3 = QtGui.QVBoxLayout(self.AddSelectedWidget) + self.verticalLayout_3.setMargin(0) + self.verticalLayout_3.setObjectName(u'verticalLayout_3') + spacerItem1 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.verticalLayout_3.addItem(spacerItem1) + self.AddSelectedPushButton = QtGui.QPushButton(self.AddSelectedWidget) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Minimum) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.AddSelectedPushButton.sizePolicy().hasHeightForWidth()) + self.AddSelectedPushButton.setSizePolicy(sizePolicy) + self.AddSelectedPushButton.setMinimumSize(QtCore.QSize(25, 25)) + icon3 = QtGui.QIcon() + icon3.addPixmap(QtGui.QPixmap(u':/imports/import_move_to_list.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.AddSelectedPushButton.setIcon(icon3) + self.AddSelectedPushButton.setObjectName(u'AddSelectedPushButton') + self.verticalLayout_3.addWidget(self.AddSelectedPushButton) + spacerItem2 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.verticalLayout_3.addItem(spacerItem2) + self.horizontalLayout_6.addWidget(self.AddSelectedWidget) + self.SelectedFileListWidget = QtGui.QWidget(self.SongListFrame) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.SelectedFileListWidget.sizePolicy().hasHeightForWidth()) + self.SelectedFileListWidget.setSizePolicy(sizePolicy) + self.SelectedFileListWidget.setObjectName(u'SelectedFileListWidget') + self.verticalLayout_2 = QtGui.QVBoxLayout(self.SelectedFileListWidget) + self.verticalLayout_2.setMargin(0) + self.verticalLayout_2.setObjectName(u'verticalLayout_2') + self.SelectedListLabel = QtGui.QLabel(self.SelectedFileListWidget) + self.SelectedListLabel.setObjectName(u'SelectedListLabel') + self.verticalLayout_2.addWidget(self.SelectedListLabel) + self.SelectedListTable = QtGui.QTableWidget(self.SelectedFileListWidget) + self.SelectedListTable.setSelectionMode(QtGui.QAbstractItemView.MultiSelection) + self.SelectedListTable.setShowGrid(False) + self.SelectedListTable.setWordWrap(False) + self.SelectedListTable.setCornerButtonEnabled(False) + self.SelectedListTable.setObjectName(u'SelectedListTable') + self.SelectedListTable.setColumnCount(2) + self.SelectedListTable.setRowCount(0) + item = QtGui.QTableWidgetItem() + self.SelectedListTable.setHorizontalHeaderItem(0, item) + item = QtGui.QTableWidgetItem() + self.SelectedListTable.setHorizontalHeaderItem(1, item) + self.verticalLayout_2.addWidget(self.SelectedListTable) + self.SelectedSelectAllWidget = QtGui.QWidget(self.SelectedFileListWidget) + self.SelectedSelectAllWidget.setObjectName(u'SelectedSelectAllWidget') + self.horizontalLayout_4 = QtGui.QHBoxLayout(self.SelectedSelectAllWidget) + self.horizontalLayout_4.setSpacing(6) + self.horizontalLayout_4.setMargin(0) + self.horizontalLayout_4.setObjectName(u'horizontalLayout_4') + self.SelectedSelectAllPushButton = QtGui.QPushButton(self.SelectedSelectAllWidget) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.SelectedSelectAllPushButton.sizePolicy().hasHeightForWidth()) + self.SelectedSelectAllPushButton.setSizePolicy(sizePolicy) + self.SelectedSelectAllPushButton.setMinimumSize(QtCore.QSize(100, 0)) + self.SelectedSelectAllPushButton.setIcon(icon2) + self.SelectedSelectAllPushButton.setObjectName(u'SelectedSelectAllPushButton') + self.horizontalLayout_4.addWidget(self.SelectedSelectAllPushButton) + spacerItem3 = QtGui.QSpacerItem(92, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.horizontalLayout_4.addItem(spacerItem3) + self.verticalLayout_2.addWidget(self.SelectedSelectAllWidget) + self.SelectedRemoveSelectedWidget = QtGui.QWidget(self.SelectedFileListWidget) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.SelectedRemoveSelectedWidget.sizePolicy().hasHeightForWidth()) + self.SelectedRemoveSelectedWidget.setSizePolicy(sizePolicy) + self.SelectedRemoveSelectedWidget.setObjectName(u'SelectedRemoveSelectedWidget') + self.horizontalLayout_5 = QtGui.QHBoxLayout(self.SelectedRemoveSelectedWidget) + self.horizontalLayout_5.setMargin(0) + self.horizontalLayout_5.setObjectName(u'horizontalLayout_5') + self.SelectedRemoveSelectedButton = QtGui.QPushButton(self.SelectedRemoveSelectedWidget) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.SelectedRemoveSelectedButton.sizePolicy().hasHeightForWidth()) + self.SelectedRemoveSelectedButton.setSizePolicy(sizePolicy) + self.SelectedRemoveSelectedButton.setMinimumSize(QtCore.QSize(140, 0)) + icon4 = QtGui.QIcon() + icon4.addPixmap(QtGui.QPixmap(u':/imports/import_remove.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.SelectedRemoveSelectedButton.setIcon(icon4) + self.SelectedRemoveSelectedButton.setObjectName(u'SelectedRemoveSelectedButton') + self.horizontalLayout_5.addWidget(self.SelectedRemoveSelectedButton) + spacerItem4 = QtGui.QSpacerItem(49, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.horizontalLayout_5.addItem(spacerItem4) + self.verticalLayout_2.addWidget(self.SelectedRemoveSelectedWidget) + self.horizontalLayout_6.addWidget(self.SelectedFileListWidget) + self.verticalLayout_5.addWidget(self.SongListFrame) + self.ProgressGroupBox = QtGui.QGroupBox(OpenLPImportDialog) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.ProgressGroupBox.sizePolicy().hasHeightForWidth()) + self.ProgressGroupBox.setSizePolicy(sizePolicy) + self.ProgressGroupBox.setObjectName(u'ProgressGroupBox') + self.verticalLayout_4 = QtGui.QVBoxLayout(self.ProgressGroupBox) + self.verticalLayout_4.setSpacing(8) + self.verticalLayout_4.setContentsMargins(8, 0, 8, 8) + self.verticalLayout_4.setObjectName(u'verticalLayout_4') + self.ProgressLabel = QtGui.QLabel(self.ProgressGroupBox) + self.ProgressLabel.setObjectName(u'ProgressLabel') + self.verticalLayout_4.addWidget(self.ProgressLabel) + self.ProgressBar = QtGui.QProgressBar(self.ProgressGroupBox) + self.ProgressBar.setProperty(u'value', QtCore.QVariant(24)) + self.ProgressBar.setObjectName(u'ProgressBar') + self.verticalLayout_4.addWidget(self.ProgressBar) + self.verticalLayout_5.addWidget(self.ProgressGroupBox) + self.ButtonBarWidget = QtGui.QWidget(OpenLPImportDialog) + self.ButtonBarWidget.setObjectName(u'ButtonBarWidget') + self.horizontalLayout_7 = QtGui.QHBoxLayout(self.ButtonBarWidget) + self.horizontalLayout_7.setSpacing(8) + self.horizontalLayout_7.setMargin(0) + self.horizontalLayout_7.setObjectName(u'horizontalLayout_7') + spacerItem5 = QtGui.QSpacerItem(288, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.horizontalLayout_7.addItem(spacerItem5) + self.ImportPushButton = QtGui.QPushButton(self.ButtonBarWidget) + self.ImportPushButton.setObjectName(u'ImportPushButton') + self.horizontalLayout_7.addWidget(self.ImportPushButton) + self.ClosePushButton = QtGui.QPushButton(self.ButtonBarWidget) + self.ClosePushButton.setObjectName(u'ClosePushButton') + self.horizontalLayout_7.addWidget(self.ClosePushButton) + self.verticalLayout_5.addWidget(self.ButtonBarWidget) + + self.retranslateUi(OpenLPImportDialog) + QtCore.QObject.connect(self.ClosePushButton, QtCore.SIGNAL(u'clicked()'), OpenLPImportDialog.close) + QtCore.QObject.connect(self.ImportSelectAllPushButton, QtCore.SIGNAL(u'clicked()'), self.ImportListTable.selectAll) + QtCore.QObject.connect(self.SelectedSelectAllPushButton, QtCore.SIGNAL(u'clicked()'), self.SelectedListTable.selectAll) + QtCore.QObject.connect(self.SelectedRemoveSelectedButton, QtCore.SIGNAL(u'clicked()'), self.SelectedListTable.clear) + QtCore.QMetaObject.connectSlotsByName(OpenLPImportDialog) + + def retranslateUi(self, OpenLPImportDialog): + OpenLPImportDialog.setWindowTitle(self.trUtf8(u'openlp.org Song Importer')) + self.ImportFileLabel.setText(self.trUtf8(u'Select openlp.org songfile to import:')) + self.ImportListLabel.setText(self.trUtf8(u'Import File Song List')) + self.ImportListTable.horizontalHeaderItem(0).setText(self.trUtf8(u'Song Title')) + self.ImportListTable.horizontalHeaderItem(1).setText(self.trUtf8(u'Author')) + self.ImportSelectAllPushButton.setText(self.trUtf8(u'Select All')) + self.ImportFilterComboBox.setItemText(0, self.trUtf8(u'Lyrics')) + self.ImportFilterComboBox.setItemText(1, self.trUtf8(u'Title')) + self.ImportFilterComboBox.setItemText(2, self.trUtf8(u'Author')) + self.SelectedListLabel.setText(self.trUtf8(u'Song Import List')) + self.SelectedListTable.horizontalHeaderItem(0).setText(self.trUtf8(u'Song Title')) + self.SelectedListTable.horizontalHeaderItem(1).setText(self.trUtf8(u'Author')) + self.SelectedSelectAllPushButton.setText(self.trUtf8(u'Select All')) + self.SelectedRemoveSelectedButton.setText(self.trUtf8(u'Remove Selected')) + self.ProgressGroupBox.setTitle(self.trUtf8(u'Progress:')) + self.ProgressLabel.setText(self.trUtf8(u'Ready to import')) + self.ImportPushButton.setText(self.trUtf8(u'Import')) + self.ClosePushButton.setText(self.trUtf8(u'Close')) + diff --git a/openlp/plugins/songs/forms/openlpimportform.py b/openlp/plugins/songs/forms/openlpimportform.py index 2e60982f9..6254226eb 100644 --- a/openlp/plugins/songs/forms/openlpimportform.py +++ b/openlp/plugins/songs/forms/openlpimportform.py @@ -23,286 +23,11 @@ ############################################################################### from PyQt4 import QtCore, QtGui -from openlp.core.lib import translate, buildIcon +from openlp.plugins.songs.forms.openlpimportdialog import Ui_OpenLPImportDialog -class OpenLPImportForm(object): +class OpenLPImportForm(QtGui.QDialog, Ui_OpenLPImportDialog): - def __init__(self): - self.OpenLPImportForm = QtGui.QWidget() - self.setupUi() + def __init__(self, parent=None): + QtGui.QDialog.__init__(self, parent) + self.setupUi(self) - def setupUi(self): - self.OpenLPImportForm.setObjectName(u'OpenLPImportForm') - self.OpenLPImportForm.resize(473, 459) - icon = buildIcon(u':/icon/openlp-logo-16x16.png') - self.OpenLPImportForm.setWindowIcon(icon) - self.verticalLayout_5 = QtGui.QVBoxLayout(self.OpenLPImportForm) - self.verticalLayout_5.setMargin(8) - self.verticalLayout_5.setObjectName(u'verticalLayout_5') - self.ImportFileWidget = QtGui.QWidget(self.OpenLPImportForm) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.ImportFileWidget.sizePolicy().hasHeightForWidth()) - self.ImportFileWidget.setSizePolicy(sizePolicy) - self.ImportFileWidget.setObjectName(u'ImportFileWidget') - self.horizontalLayout = QtGui.QHBoxLayout(self.ImportFileWidget) - self.horizontalLayout.setSpacing(3) - self.horizontalLayout.setMargin(0) - self.horizontalLayout.setObjectName(u'horizontalLayout') - self.ImportFileLabel = QtGui.QLabel(self.ImportFileWidget) - self.ImportFileLabel.setObjectName(u'ImportFileLabel') - self.horizontalLayout.addWidget(self.ImportFileLabel) - self.ImportFileLineEdit = QtGui.QLineEdit(self.ImportFileWidget) - self.ImportFileLineEdit.setObjectName(u'ImportFileLineEdit') - self.horizontalLayout.addWidget(self.ImportFileLineEdit) - self.ImportFileSelectPushButton = QtGui.QPushButton(self.ImportFileWidget) - icon1 = buildIcon(u':/imports/import_load.png') - self.ImportFileSelectPushButton.setIcon(icon1) - self.ImportFileSelectPushButton.setObjectName(u'ImportFileSelectPushButton') - self.horizontalLayout.addWidget(self.ImportFileSelectPushButton) - self.verticalLayout_5.addWidget(self.ImportFileWidget) - self.SongListFrame = QtGui.QFrame(self.OpenLPImportForm) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SongListFrame.sizePolicy().hasHeightForWidth()) - self.SongListFrame.setSizePolicy(sizePolicy) - self.SongListFrame.setFrameShape(QtGui.QFrame.Box) - self.SongListFrame.setFrameShadow(QtGui.QFrame.Raised) - self.SongListFrame.setObjectName(u'SongListFrame') - self.horizontalLayout_6 = QtGui.QHBoxLayout(self.SongListFrame) - self.horizontalLayout_6.setSpacing(8) - self.horizontalLayout_6.setMargin(8) - self.horizontalLayout_6.setObjectName(u'horizontalLayout_6') - self.ImportFileSongListWidget = QtGui.QWidget(self.SongListFrame) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.ImportFileSongListWidget.sizePolicy().hasHeightForWidth()) - self.ImportFileSongListWidget.setSizePolicy(sizePolicy) - self.ImportFileSongListWidget.setObjectName(u'ImportFileSongListWidget') - self.verticalLayout = QtGui.QVBoxLayout(self.ImportFileSongListWidget) - self.verticalLayout.setSpacing(6) - self.verticalLayout.setMargin(0) - self.verticalLayout.setObjectName(u'verticalLayout') - self.ImportListLabel = QtGui.QLabel(self.ImportFileSongListWidget) - self.ImportListLabel.setObjectName(u'ImportListLabel') - self.verticalLayout.addWidget(self.ImportListLabel) - self.ImportListTable = QtGui.QTableWidget(self.ImportFileSongListWidget) - self.ImportListTable.setSelectionMode(QtGui.QAbstractItemView.MultiSelection) - self.ImportListTable.setShowGrid(False) - self.ImportListTable.setWordWrap(False) - self.ImportListTable.setCornerButtonEnabled(False) - self.ImportListTable.setObjectName(u'ImportListTable') - self.ImportListTable.setColumnCount(2) - self.ImportListTable.setRowCount(0) - item = QtGui.QTableWidgetItem() - self.ImportListTable.setHorizontalHeaderItem(0, item) - item = QtGui.QTableWidgetItem() - self.ImportListTable.setHorizontalHeaderItem(1, item) - self.verticalLayout.addWidget(self.ImportListTable) - self.ImportSelectAllWidget = QtGui.QWidget(self.ImportFileSongListWidget) - self.ImportSelectAllWidget.setObjectName(u'ImportSelectAllWidget') - self.horizontalLayout_2 = QtGui.QHBoxLayout(self.ImportSelectAllWidget) - self.horizontalLayout_2.setSpacing(6) - self.horizontalLayout_2.setMargin(0) - self.horizontalLayout_2.setObjectName(u'horizontalLayout_2') - self.ImportSelectAllPushButton = QtGui.QPushButton(self.ImportSelectAllWidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.ImportSelectAllPushButton.sizePolicy().hasHeightForWidth()) - self.ImportSelectAllPushButton.setSizePolicy(sizePolicy) - self.ImportSelectAllPushButton.setMinimumSize(QtCore.QSize(100, 0)) - icon2 = buildIcon(u':/imports/import_selectall.png') - self.ImportSelectAllPushButton.setIcon(icon2) - self.ImportSelectAllPushButton.setObjectName(u'ImportSelectAllPushButton') - self.horizontalLayout_2.addWidget(self.ImportSelectAllPushButton) - spacerItem = QtGui.QSpacerItem(89, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_2.addItem(spacerItem) - self.verticalLayout.addWidget(self.ImportSelectAllWidget) - self.importFilterWidget = QtGui.QWidget(self.ImportFileSongListWidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.importFilterWidget.sizePolicy().hasHeightForWidth()) - self.importFilterWidget.setSizePolicy(sizePolicy) - self.importFilterWidget.setMinimumSize(QtCore.QSize(0, 0)) - self.importFilterWidget.setObjectName(u'importFilterWidget') - self.horizontalLayout_3 = QtGui.QHBoxLayout(self.importFilterWidget) - self.horizontalLayout_3.setMargin(0) - self.horizontalLayout_3.setObjectName(u'horizontalLayout_3') - self.ImportFilterComboBox = QtGui.QComboBox(self.importFilterWidget) - self.ImportFilterComboBox.setMinimumSize(QtCore.QSize(70, 0)) - self.ImportFilterComboBox.setObjectName(u'ImportFilterComboBox') - self.ImportFilterComboBox.addItem(QtCore.QString()) - self.ImportFilterComboBox.addItem(QtCore.QString()) - self.ImportFilterComboBox.addItem(QtCore.QString()) - self.horizontalLayout_3.addWidget(self.ImportFilterComboBox) - self.importFilterLineEdit = QtGui.QLineEdit(self.importFilterWidget) - self.importFilterLineEdit.setObjectName(u'importFilterLineEdit') - self.horizontalLayout_3.addWidget(self.importFilterLineEdit) - self.verticalLayout.addWidget(self.importFilterWidget) - self.horizontalLayout_6.addWidget(self.ImportFileSongListWidget) - self.AddSelectedWidget = QtGui.QWidget(self.SongListFrame) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.AddSelectedWidget.sizePolicy().hasHeightForWidth()) - self.AddSelectedWidget.setSizePolicy(sizePolicy) - self.AddSelectedWidget.setObjectName(u'AddSelectedWidget') - self.verticalLayout_3 = QtGui.QVBoxLayout(self.AddSelectedWidget) - self.verticalLayout_3.setMargin(0) - self.verticalLayout_3.setObjectName(u'verticalLayout_3') - spacerItem1 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.verticalLayout_3.addItem(spacerItem1) - self.AddSelectedPushButton = QtGui.QPushButton(self.AddSelectedWidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Minimum) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.AddSelectedPushButton.sizePolicy().hasHeightForWidth()) - self.AddSelectedPushButton.setSizePolicy(sizePolicy) - self.AddSelectedPushButton.setMinimumSize(QtCore.QSize(25, 25)) - icon3 = buildIcon(u':/imports/import_move_to_list.png') - self.AddSelectedPushButton.setIcon(icon3) - self.AddSelectedPushButton.setObjectName(u'AddSelectedPushButton') - self.verticalLayout_3.addWidget(self.AddSelectedPushButton) - spacerItem2 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.verticalLayout_3.addItem(spacerItem2) - self.horizontalLayout_6.addWidget(self.AddSelectedWidget) - self.SelectedFileListWidget = QtGui.QWidget(self.SongListFrame) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SelectedFileListWidget.sizePolicy().hasHeightForWidth()) - self.SelectedFileListWidget.setSizePolicy(sizePolicy) - self.SelectedFileListWidget.setObjectName(u'SelectedFileListWidget') - self.verticalLayout_2 = QtGui.QVBoxLayout(self.SelectedFileListWidget) - self.verticalLayout_2.setMargin(0) - self.verticalLayout_2.setObjectName(u'verticalLayout_2') - self.SelectedListLabel = QtGui.QLabel(self.SelectedFileListWidget) - self.SelectedListLabel.setObjectName(u'SelectedListLabel') - self.verticalLayout_2.addWidget(self.SelectedListLabel) - self.SelectedListTable = QtGui.QTableWidget(self.SelectedFileListWidget) - self.SelectedListTable.setSelectionMode(QtGui.QAbstractItemView.MultiSelection) - self.SelectedListTable.setShowGrid(False) - self.SelectedListTable.setWordWrap(False) - self.SelectedListTable.setCornerButtonEnabled(False) - self.SelectedListTable.setObjectName(u'SelectedListTable') - self.SelectedListTable.setColumnCount(2) - self.SelectedListTable.setRowCount(0) - item = QtGui.QTableWidgetItem() - self.SelectedListTable.setHorizontalHeaderItem(0, item) - item = QtGui.QTableWidgetItem() - self.SelectedListTable.setHorizontalHeaderItem(1, item) - self.verticalLayout_2.addWidget(self.SelectedListTable) - self.SelectedSelectAllWidget = QtGui.QWidget(self.SelectedFileListWidget) - self.SelectedSelectAllWidget.setObjectName(u'SelectedSelectAllWidget') - self.horizontalLayout_4 = QtGui.QHBoxLayout(self.SelectedSelectAllWidget) - self.horizontalLayout_4.setSpacing(6) - self.horizontalLayout_4.setMargin(0) - self.horizontalLayout_4.setObjectName(u'horizontalLayout_4') - self.SelectedSelectAllPushButton = QtGui.QPushButton(self.SelectedSelectAllWidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SelectedSelectAllPushButton.sizePolicy().hasHeightForWidth()) - self.SelectedSelectAllPushButton.setSizePolicy(sizePolicy) - self.SelectedSelectAllPushButton.setMinimumSize(QtCore.QSize(100, 0)) - self.SelectedSelectAllPushButton.setIcon(icon2) - self.SelectedSelectAllPushButton.setObjectName(u'SelectedSelectAllPushButton') - self.horizontalLayout_4.addWidget(self.SelectedSelectAllPushButton) - spacerItem3 = QtGui.QSpacerItem(92, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_4.addItem(spacerItem3) - self.verticalLayout_2.addWidget(self.SelectedSelectAllWidget) - self.SelectedRemoveSelectedWidget = QtGui.QWidget(self.SelectedFileListWidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SelectedRemoveSelectedWidget.sizePolicy().hasHeightForWidth()) - self.SelectedRemoveSelectedWidget.setSizePolicy(sizePolicy) - self.SelectedRemoveSelectedWidget.setObjectName(u'SelectedRemoveSelectedWidget') - self.horizontalLayout_5 = QtGui.QHBoxLayout(self.SelectedRemoveSelectedWidget) - self.horizontalLayout_5.setMargin(0) - self.horizontalLayout_5.setObjectName(u'horizontalLayout_5') - self.SelectedRemoveSelectedButton = QtGui.QPushButton(self.SelectedRemoveSelectedWidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SelectedRemoveSelectedButton.sizePolicy().hasHeightForWidth()) - self.SelectedRemoveSelectedButton.setSizePolicy(sizePolicy) - self.SelectedRemoveSelectedButton.setMinimumSize(QtCore.QSize(140, 0)) - icon4 = buildIcon(u':/imports/import_remove.png') - self.SelectedRemoveSelectedButton.setIcon(icon4) - self.SelectedRemoveSelectedButton.setObjectName(u'SelectedRemoveSelectedButton') - self.horizontalLayout_5.addWidget(self.SelectedRemoveSelectedButton) - spacerItem4 = QtGui.QSpacerItem(49, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_5.addItem(spacerItem4) - self.verticalLayout_2.addWidget(self.SelectedRemoveSelectedWidget) - self.horizontalLayout_6.addWidget(self.SelectedFileListWidget) - self.verticalLayout_5.addWidget(self.SongListFrame) - self.ProgressGroupBox = QtGui.QGroupBox(self.OpenLPImportForm) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.ProgressGroupBox.sizePolicy().hasHeightForWidth()) - self.ProgressGroupBox.setSizePolicy(sizePolicy) - self.ProgressGroupBox.setObjectName(u'ProgressGroupBox') - self.verticalLayout_4 = QtGui.QVBoxLayout(self.ProgressGroupBox) - self.verticalLayout_4.setSpacing(8) - self.verticalLayout_4.setContentsMargins(8, 0, 8, 8) - self.verticalLayout_4.setObjectName(u'verticalLayout_4') - self.ProgressLabel = QtGui.QLabel(self.ProgressGroupBox) - self.ProgressLabel.setObjectName(u'ProgressLabel') - self.verticalLayout_4.addWidget(self.ProgressLabel) - self.ProgressBar = QtGui.QProgressBar(self.ProgressGroupBox) - self.ProgressBar.setProperty(u'value', QtCore.QVariant(0)) - self.ProgressBar.setObjectName(u'ProgressBar') - self.verticalLayout_4.addWidget(self.ProgressBar) - self.verticalLayout_5.addWidget(self.ProgressGroupBox) - self.ButtonBarWidget = QtGui.QWidget(self.OpenLPImportForm) - self.ButtonBarWidget.setObjectName(u'ButtonBarWidget') - self.horizontalLayout_7 = QtGui.QHBoxLayout(self.ButtonBarWidget) - self.horizontalLayout_7.setSpacing(8) - self.horizontalLayout_7.setMargin(0) - self.horizontalLayout_7.setObjectName(u'horizontalLayout_7') - spacerItem5 = QtGui.QSpacerItem(288, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_7.addItem(spacerItem5) - self.ImportPushButton = QtGui.QPushButton(self.ButtonBarWidget) - self.ImportPushButton.setObjectName(u'ImportPushButton') - self.horizontalLayout_7.addWidget(self.ImportPushButton) - self.ClosePushButton = QtGui.QPushButton(self.ButtonBarWidget) - self.ClosePushButton.setObjectName(u'ClosePushButton') - self.horizontalLayout_7.addWidget(self.ClosePushButton) - self.verticalLayout_5.addWidget(self.ButtonBarWidget) - - self.retranslateUi() - QtCore.QObject.connect(self.ClosePushButton, QtCore.SIGNAL(u'clicked()'), self.OpenLPImportForm.close) - QtCore.QObject.connect(self.ImportSelectAllPushButton, QtCore.SIGNAL(u'clicked()'), self.ImportListTable.selectAll) - QtCore.QObject.connect(self.SelectedSelectAllPushButton, QtCore.SIGNAL(u'clicked()'), self.SelectedListTable.selectAll) - QtCore.QObject.connect(self.SelectedRemoveSelectedButton, QtCore.SIGNAL(u'clicked()'), self.SelectedListTable.clear) - QtCore.QMetaObject.connectSlotsByName(self.OpenLPImportForm) - - def retranslateUi(self): - self.OpenLPImportForm.setWindowTitle(translate(u'OpenLPImportForm', u'openlp.org Song Importer')) - self.ImportFileLabel.setText(translate(u'OpenLPImportForm', u'Select openlp.org songfile to import:')) - self.ImportListLabel.setText(translate(u'OpenLPImportForm', u'Import File Song List')) - self.ImportListTable.horizontalHeaderItem(0).setText(translate(u'OpenLPImportForm', u'Song Title')) - self.ImportListTable.horizontalHeaderItem(1).setText(translate(u'OpenLPImportForm', u'Author')) - self.ImportSelectAllPushButton.setText(translate(u'OpenLPImportForm', u'Select All')) - self.ImportFilterComboBox.setItemText(0, translate(u'OpenLPImportForm', u'Lyrics')) - self.ImportFilterComboBox.setItemText(1, translate(u'OpenLPImportForm', u'Title')) - self.ImportFilterComboBox.setItemText(2, translate(u'OpenLPImportForm', u'Author')) - self.SelectedListLabel.setText(translate(u'OpenLPImportForm', u'Song Import List')) - self.SelectedListTable.horizontalHeaderItem(0).setText(translate(u'OpenLPImportForm', u'Song Title')) - self.SelectedListTable.horizontalHeaderItem(1).setText(translate(u'OpenLPImportForm', u'Author')) - self.SelectedSelectAllPushButton.setText(translate(u'OpenLPImportForm', u'Select All')) - self.SelectedRemoveSelectedButton.setText(translate(u'OpenLPImportForm', u'Remove Selected')) - self.ProgressGroupBox.setTitle(translate(u'OpenLPImportForm', u'Progress:')) - self.ProgressLabel.setText(translate(u'OpenLPImportForm', u'Ready to import')) - self.ImportPushButton.setText(translate(u'OpenLPImportForm', u'Import')) - self.ClosePushButton.setText(translate(u'OpenLPImportForm', u'Close')) - - def show(self): - self.OpenLPImportForm.show() diff --git a/openlp/plugins/songs/forms/opensongexportdialog.py b/openlp/plugins/songs/forms/opensongexportdialog.py new file mode 100644 index 000000000..bfe775416 --- /dev/null +++ b/openlp/plugins/songs/forms/opensongexportdialog.py @@ -0,0 +1,305 @@ +# -*- coding: utf-8 -*- +# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 + +############################################################################### +# OpenLP - Open Source Lyrics Projection # +# --------------------------------------------------------------------------- # +# Copyright (c) 2008-2009 Raoul Snyman # +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # +# --------------------------------------------------------------------------- # +# 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_OpenSongExportDialog(object): + def setupUi(self, OpenSongExportDialog): + OpenSongExportDialog.setObjectName(u'OpenSongExportDialog') + OpenSongExportDialog.resize(473, 459) + icon = QtGui.QIcon() + icon.addPixmap(QtGui.QPixmap(u':/icon/openlp.org-icon-32.bmp'), QtGui.QIcon.Normal, QtGui.QIcon.Off) + OpenSongExportDialog.setWindowIcon(icon) + self.verticalLayout_5 = QtGui.QVBoxLayout(OpenSongExportDialog) + self.verticalLayout_5.setMargin(8) + self.verticalLayout_5.setObjectName(u'verticalLayout_5') + self.ExportFileWidget = QtGui.QWidget(OpenSongExportDialog) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.ExportFileWidget.sizePolicy().hasHeightForWidth()) + self.ExportFileWidget.setSizePolicy(sizePolicy) + self.ExportFileWidget.setObjectName(u'ExportFileWidget') + self.horizontalLayout = QtGui.QHBoxLayout(self.ExportFileWidget) + self.horizontalLayout.setSpacing(3) + self.horizontalLayout.setMargin(0) + self.horizontalLayout.setObjectName(u'horizontalLayout') + self.ExportFileLabel = QtGui.QLabel(self.ExportFileWidget) + self.ExportFileLabel.setObjectName(u'ExportFileLabel') + self.horizontalLayout.addWidget(self.ExportFileLabel) + self.ExportFileLineEdit = QtGui.QLineEdit(self.ExportFileWidget) + self.ExportFileLineEdit.setObjectName(u'ExportFileLineEdit') + self.horizontalLayout.addWidget(self.ExportFileLineEdit) + self.ExportFileSelectPushButton = QtGui.QPushButton(self.ExportFileWidget) + icon1 = QtGui.QIcon() + icon1.addPixmap(QtGui.QPixmap(u':/exports/export_load.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.ExportFileSelectPushButton.setIcon(icon1) + self.ExportFileSelectPushButton.setObjectName(u'ExportFileSelectPushButton') + self.horizontalLayout.addWidget(self.ExportFileSelectPushButton) + self.verticalLayout_5.addWidget(self.ExportFileWidget) + self.SongListFrame = QtGui.QFrame(OpenSongExportDialog) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.SongListFrame.sizePolicy().hasHeightForWidth()) + self.SongListFrame.setSizePolicy(sizePolicy) + self.SongListFrame.setFrameShape(QtGui.QFrame.Box) + self.SongListFrame.setFrameShadow(QtGui.QFrame.Raised) + self.SongListFrame.setObjectName(u'SongListFrame') + self.horizontalLayout_6 = QtGui.QHBoxLayout(self.SongListFrame) + self.horizontalLayout_6.setSpacing(8) + self.horizontalLayout_6.setMargin(8) + self.horizontalLayout_6.setObjectName(u'horizontalLayout_6') + self.ExportFileSongListWidget = QtGui.QWidget(self.SongListFrame) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.ExportFileSongListWidget.sizePolicy().hasHeightForWidth()) + self.ExportFileSongListWidget.setSizePolicy(sizePolicy) + self.ExportFileSongListWidget.setObjectName(u'ExportFileSongListWidget') + self.verticalLayout = QtGui.QVBoxLayout(self.ExportFileSongListWidget) + self.verticalLayout.setSpacing(6) + self.verticalLayout.setMargin(0) + self.verticalLayout.setObjectName(u'verticalLayout') + self.ExportListLabel = QtGui.QLabel(self.ExportFileSongListWidget) + self.ExportListLabel.setObjectName(u'ExportListLabel') + self.verticalLayout.addWidget(self.ExportListLabel) + self.ExportListTable = QtGui.QTableWidget(self.ExportFileSongListWidget) + self.ExportListTable.setSelectionMode(QtGui.QAbstractItemView.MultiSelection) + self.ExportListTable.setShowGrid(False) + self.ExportListTable.setWordWrap(False) + self.ExportListTable.setCornerButtonEnabled(False) + self.ExportListTable.setObjectName(u'ExportListTable') + self.ExportListTable.setColumnCount(2) + self.ExportListTable.setRowCount(0) + item = QtGui.QTableWidgetItem() + self.ExportListTable.setHorizontalHeaderItem(0, item) + item = QtGui.QTableWidgetItem() + self.ExportListTable.setHorizontalHeaderItem(1, item) + self.verticalLayout.addWidget(self.ExportListTable) + self.ExportSelectAllWidget = QtGui.QWidget(self.ExportFileSongListWidget) + self.ExportSelectAllWidget.setObjectName(u'ExportSelectAllWidget') + self.horizontalLayout_2 = QtGui.QHBoxLayout(self.ExportSelectAllWidget) + self.horizontalLayout_2.setSpacing(6) + self.horizontalLayout_2.setMargin(0) + self.horizontalLayout_2.setObjectName(u'horizontalLayout_2') + self.ExportSelectAllPushButton = QtGui.QPushButton(self.ExportSelectAllWidget) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.ExportSelectAllPushButton.sizePolicy().hasHeightForWidth()) + self.ExportSelectAllPushButton.setSizePolicy(sizePolicy) + self.ExportSelectAllPushButton.setMinimumSize(QtCore.QSize(100, 0)) + icon2 = QtGui.QIcon() + icon2.addPixmap(QtGui.QPixmap(u':/exports/export_selectall.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.ExportSelectAllPushButton.setIcon(icon2) + self.ExportSelectAllPushButton.setObjectName(u'ExportSelectAllPushButton') + self.horizontalLayout_2.addWidget(self.ExportSelectAllPushButton) + spacerItem = QtGui.QSpacerItem(89, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.horizontalLayout_2.addItem(spacerItem) + self.verticalLayout.addWidget(self.ExportSelectAllWidget) + self.exportFilterWidget = QtGui.QWidget(self.ExportFileSongListWidget) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.exportFilterWidget.sizePolicy().hasHeightForWidth()) + self.exportFilterWidget.setSizePolicy(sizePolicy) + self.exportFilterWidget.setMinimumSize(QtCore.QSize(0, 0)) + self.exportFilterWidget.setObjectName(u'exportFilterWidget') + self.horizontalLayout_3 = QtGui.QHBoxLayout(self.exportFilterWidget) + self.horizontalLayout_3.setMargin(0) + self.horizontalLayout_3.setObjectName(u'horizontalLayout_3') + self.ExportFilterComboBox = QtGui.QComboBox(self.exportFilterWidget) + self.ExportFilterComboBox.setMinimumSize(QtCore.QSize(70, 0)) + self.ExportFilterComboBox.setObjectName(u'ExportFilterComboBox') + self.ExportFilterComboBox.addItem(QtCore.QString()) + self.ExportFilterComboBox.addItem(QtCore.QString()) + self.ExportFilterComboBox.addItem(QtCore.QString()) + self.horizontalLayout_3.addWidget(self.ExportFilterComboBox) + self.ExportFilterLineEdit = QtGui.QLineEdit(self.exportFilterWidget) + self.ExportFilterLineEdit.setObjectName(u'ExportFilterLineEdit') + self.horizontalLayout_3.addWidget(self.ExportFilterLineEdit) + self.verticalLayout.addWidget(self.exportFilterWidget) + self.horizontalLayout_6.addWidget(self.ExportFileSongListWidget) + self.AddSelectedWidget = QtGui.QWidget(self.SongListFrame) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.AddSelectedWidget.sizePolicy().hasHeightForWidth()) + self.AddSelectedWidget.setSizePolicy(sizePolicy) + self.AddSelectedWidget.setObjectName(u'AddSelectedWidget') + self.verticalLayout_3 = QtGui.QVBoxLayout(self.AddSelectedWidget) + self.verticalLayout_3.setMargin(0) + self.verticalLayout_3.setObjectName(u'verticalLayout_3') + spacerItem1 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.verticalLayout_3.addItem(spacerItem1) + self.AddSelectedPushButton = QtGui.QPushButton(self.AddSelectedWidget) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Minimum) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.AddSelectedPushButton.sizePolicy().hasHeightForWidth()) + self.AddSelectedPushButton.setSizePolicy(sizePolicy) + self.AddSelectedPushButton.setMinimumSize(QtCore.QSize(25, 25)) + icon3 = QtGui.QIcon() + icon3.addPixmap(QtGui.QPixmap(u':/exports/export_move_to_list.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.AddSelectedPushButton.setIcon(icon3) + self.AddSelectedPushButton.setObjectName(u'AddSelectedPushButton') + self.verticalLayout_3.addWidget(self.AddSelectedPushButton) + spacerItem2 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.verticalLayout_3.addItem(spacerItem2) + self.horizontalLayout_6.addWidget(self.AddSelectedWidget) + self.SelectedFileListWidget = QtGui.QWidget(self.SongListFrame) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.SelectedFileListWidget.sizePolicy().hasHeightForWidth()) + self.SelectedFileListWidget.setSizePolicy(sizePolicy) + self.SelectedFileListWidget.setObjectName(u'SelectedFileListWidget') + self.verticalLayout_2 = QtGui.QVBoxLayout(self.SelectedFileListWidget) + self.verticalLayout_2.setMargin(0) + self.verticalLayout_2.setObjectName(u'verticalLayout_2') + self.SelectedListLabel = QtGui.QLabel(self.SelectedFileListWidget) + self.SelectedListLabel.setObjectName(u'SelectedListLabel') + self.verticalLayout_2.addWidget(self.SelectedListLabel) + self.SelectedListTable = QtGui.QTableWidget(self.SelectedFileListWidget) + self.SelectedListTable.setSelectionMode(QtGui.QAbstractItemView.MultiSelection) + self.SelectedListTable.setShowGrid(False) + self.SelectedListTable.setWordWrap(False) + self.SelectedListTable.setCornerButtonEnabled(False) + self.SelectedListTable.setObjectName(u'SelectedListTable') + self.SelectedListTable.setColumnCount(2) + self.SelectedListTable.setRowCount(0) + item = QtGui.QTableWidgetItem() + self.SelectedListTable.setHorizontalHeaderItem(0, item) + item = QtGui.QTableWidgetItem() + self.SelectedListTable.setHorizontalHeaderItem(1, item) + self.verticalLayout_2.addWidget(self.SelectedListTable) + self.SelectedSelectAllWidget = QtGui.QWidget(self.SelectedFileListWidget) + self.SelectedSelectAllWidget.setObjectName(u'SelectedSelectAllWidget') + self.horizontalLayout_4 = QtGui.QHBoxLayout(self.SelectedSelectAllWidget) + self.horizontalLayout_4.setSpacing(6) + self.horizontalLayout_4.setMargin(0) + self.horizontalLayout_4.setObjectName(u'horizontalLayout_4') + self.SelectedSelectAllPushButton = QtGui.QPushButton(self.SelectedSelectAllWidget) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.SelectedSelectAllPushButton.sizePolicy().hasHeightForWidth()) + self.SelectedSelectAllPushButton.setSizePolicy(sizePolicy) + self.SelectedSelectAllPushButton.setMinimumSize(QtCore.QSize(100, 0)) + self.SelectedSelectAllPushButton.setIcon(icon2) + self.SelectedSelectAllPushButton.setObjectName(u'SelectedSelectAllPushButton') + self.horizontalLayout_4.addWidget(self.SelectedSelectAllPushButton) + spacerItem3 = QtGui.QSpacerItem(92, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.horizontalLayout_4.addItem(spacerItem3) + self.verticalLayout_2.addWidget(self.SelectedSelectAllWidget) + self.SelectedRemoveSelectedWidget = QtGui.QWidget(self.SelectedFileListWidget) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.SelectedRemoveSelectedWidget.sizePolicy().hasHeightForWidth()) + self.SelectedRemoveSelectedWidget.setSizePolicy(sizePolicy) + self.SelectedRemoveSelectedWidget.setObjectName(u'SelectedRemoveSelectedWidget') + self.horizontalLayout_5 = QtGui.QHBoxLayout(self.SelectedRemoveSelectedWidget) + self.horizontalLayout_5.setMargin(0) + self.horizontalLayout_5.setObjectName(u'horizontalLayout_5') + self.SelectedRemoveSelectedButton = QtGui.QPushButton(self.SelectedRemoveSelectedWidget) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.SelectedRemoveSelectedButton.sizePolicy().hasHeightForWidth()) + self.SelectedRemoveSelectedButton.setSizePolicy(sizePolicy) + self.SelectedRemoveSelectedButton.setMinimumSize(QtCore.QSize(140, 0)) + icon4 = QtGui.QIcon() + icon4.addPixmap(QtGui.QPixmap(u':/exports/export_remove.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.SelectedRemoveSelectedButton.setIcon(icon4) + self.SelectedRemoveSelectedButton.setObjectName(u'SelectedRemoveSelectedButton') + self.horizontalLayout_5.addWidget(self.SelectedRemoveSelectedButton) + spacerItem4 = QtGui.QSpacerItem(49, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.horizontalLayout_5.addItem(spacerItem4) + self.verticalLayout_2.addWidget(self.SelectedRemoveSelectedWidget) + self.horizontalLayout_6.addWidget(self.SelectedFileListWidget) + self.verticalLayout_5.addWidget(self.SongListFrame) + self.ProgressGroupBox = QtGui.QGroupBox(OpenSongExportDialog) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.ProgressGroupBox.sizePolicy().hasHeightForWidth()) + self.ProgressGroupBox.setSizePolicy(sizePolicy) + self.ProgressGroupBox.setObjectName(u'ProgressGroupBox') + self.verticalLayout_4 = QtGui.QVBoxLayout(self.ProgressGroupBox) + self.verticalLayout_4.setSpacing(8) + self.verticalLayout_4.setContentsMargins(8, 0, 8, 8) + self.verticalLayout_4.setObjectName(u'verticalLayout_4') + self.ProgressLabel = QtGui.QLabel(self.ProgressGroupBox) + self.ProgressLabel.setObjectName(u'ProgressLabel') + self.verticalLayout_4.addWidget(self.ProgressLabel) + self.ProgressBar = QtGui.QProgressBar(self.ProgressGroupBox) + self.ProgressBar.setProperty(u'value', QtCore.QVariant(24)) + self.ProgressBar.setObjectName(u'ProgressBar') + self.verticalLayout_4.addWidget(self.ProgressBar) + self.verticalLayout_5.addWidget(self.ProgressGroupBox) + self.ButtonBarWidget = QtGui.QWidget(OpenSongExportDialog) + self.ButtonBarWidget.setObjectName(u'ButtonBarWidget') + self.horizontalLayout_7 = QtGui.QHBoxLayout(self.ButtonBarWidget) + self.horizontalLayout_7.setSpacing(8) + self.horizontalLayout_7.setMargin(0) + self.horizontalLayout_7.setObjectName(u'horizontalLayout_7') + spacerItem5 = QtGui.QSpacerItem(288, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.horizontalLayout_7.addItem(spacerItem5) + self.ExportPushButton = QtGui.QPushButton(self.ButtonBarWidget) + self.ExportPushButton.setObjectName(u'ExportPushButton') + self.horizontalLayout_7.addWidget(self.ExportPushButton) + self.ClosePushButton = QtGui.QPushButton(self.ButtonBarWidget) + self.ClosePushButton.setObjectName(u'ClosePushButton') + self.horizontalLayout_7.addWidget(self.ClosePushButton) + self.verticalLayout_5.addWidget(self.ButtonBarWidget) + + self.retranslateUi(OpenSongExportDialog) + QtCore.QObject.connect(self.ClosePushButton, QtCore.SIGNAL(u'clicked()'), OpenSongExportDialog.close) + QtCore.QObject.connect(self.ExportSelectAllPushButton, QtCore.SIGNAL(u'clicked()'), self.ExportListTable.selectAll) + QtCore.QObject.connect(self.SelectedSelectAllPushButton, QtCore.SIGNAL(u'clicked()'), self.SelectedListTable.selectAll) + QtCore.QObject.connect(self.SelectedRemoveSelectedButton, QtCore.SIGNAL(u'clicked()'), self.SelectedListTable.clear) + QtCore.QMetaObject.connectSlotsByName(OpenSongExportDialog) + + def retranslateUi(self, OpenSongExportDialog): + OpenSongExportDialog.setWindowTitle(self.trUtf8(u'OpenSong Song Exporter')) + self.ExportFileLabel.setText(self.trUtf8(u'Select OpenSong song folder:')) + self.ExportListLabel.setText(self.trUtf8(u'Full Song List')) + self.ExportListTable.horizontalHeaderItem(0).setText(self.trUtf8(u'Song Title')) + self.ExportListTable.horizontalHeaderItem(1).setText(self.trUtf8(u'Author')) + self.ExportSelectAllPushButton.setText(self.trUtf8(u'Select All')) + self.ExportFilterComboBox.setItemText(0, self.trUtf8(u'Lyrics')) + self.ExportFilterComboBox.setItemText(1, self.trUtf8(u'Title')) + self.ExportFilterComboBox.setItemText(2, self.trUtf8(u'Author')) + self.SelectedListLabel.setText(self.trUtf8(u'Song Export List')) + self.SelectedListTable.horizontalHeaderItem(0).setText(self.trUtf8(u'Song Title')) + self.SelectedListTable.horizontalHeaderItem(1).setText(self.trUtf8(u'Author')) + self.SelectedSelectAllPushButton.setText(self.trUtf8(u'Select All')) + self.SelectedRemoveSelectedButton.setText(self.trUtf8(u'Remove Selected')) + self.ProgressGroupBox.setTitle(self.trUtf8(u'Progress:')) + self.ProgressLabel.setText(self.trUtf8(u'Ready to export')) + self.ExportPushButton.setText(self.trUtf8(u'Export')) + self.ClosePushButton.setText(self.trUtf8(u'Close')) + diff --git a/openlp/plugins/songs/forms/opensongexportform.py b/openlp/plugins/songs/forms/opensongexportform.py index 894764c32..4f6fddcf1 100644 --- a/openlp/plugins/songs/forms/opensongexportform.py +++ b/openlp/plugins/songs/forms/opensongexportform.py @@ -23,286 +23,11 @@ ############################################################################### from PyQt4 import QtCore, QtGui -from openlp.core.lib import translate, buildIcon +from openlp.plugins.songs.forms.opensongexportdialog import Ui_OpenSongExportDialog -class OpenSongExportForm(object): +class OpenSongExportForm(QtGui.QDialog, Ui_OpenSongExportDialog): - def __init__(self): - self.OpenSongExportForm = QtGui.QWidget() - self.setupUi() + def __init__(self, parent=None): + QtGui.QDialog.__init__(self, parent) + self.setupUi(self) - def setupUi(self): - self.OpenSongExportForm.setObjectName(u'OpenSongExportForm') - self.OpenSongExportForm.resize(473, 459) - icon = buildIcon(u':/icon/openlp-logo-16x16.png') - self.OpenSongExportForm.setWindowIcon(icon) - self.verticalLayout_5 = QtGui.QVBoxLayout(self.OpenSongExportForm) - self.verticalLayout_5.setMargin(8) - self.verticalLayout_5.setObjectName(u'verticalLayout_5') - self.ExportFileWidget = QtGui.QWidget(self.OpenSongExportForm) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.ExportFileWidget.sizePolicy().hasHeightForWidth()) - self.ExportFileWidget.setSizePolicy(sizePolicy) - self.ExportFileWidget.setObjectName(u'ExportFileWidget') - self.horizontalLayout = QtGui.QHBoxLayout(self.ExportFileWidget) - self.horizontalLayout.setSpacing(3) - self.horizontalLayout.setMargin(0) - self.horizontalLayout.setObjectName(u'horizontalLayout') - self.ExportFileLabel = QtGui.QLabel(self.ExportFileWidget) - self.ExportFileLabel.setObjectName(u'ExportFileLabel') - self.horizontalLayout.addWidget(self.ExportFileLabel) - self.ExportFileLineEdit = QtGui.QLineEdit(self.ExportFileWidget) - self.ExportFileLineEdit.setObjectName(u'ExportFileLineEdit') - self.horizontalLayout.addWidget(self.ExportFileLineEdit) - self.ExportFileSelectPushButton = QtGui.QPushButton(self.ExportFileWidget) - icon1 = buildIcon(u':/exports/export_load.png') - self.ExportFileSelectPushButton.setIcon(icon1) - self.ExportFileSelectPushButton.setObjectName(u'ExportFileSelectPushButton') - self.horizontalLayout.addWidget(self.ExportFileSelectPushButton) - self.verticalLayout_5.addWidget(self.ExportFileWidget) - self.SongListFrame = QtGui.QFrame(self.OpenSongExportForm) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SongListFrame.sizePolicy().hasHeightForWidth()) - self.SongListFrame.setSizePolicy(sizePolicy) - self.SongListFrame.setFrameShape(QtGui.QFrame.Box) - self.SongListFrame.setFrameShadow(QtGui.QFrame.Raised) - self.SongListFrame.setObjectName(u'SongListFrame') - self.horizontalLayout_6 = QtGui.QHBoxLayout(self.SongListFrame) - self.horizontalLayout_6.setSpacing(8) - self.horizontalLayout_6.setMargin(8) - self.horizontalLayout_6.setObjectName(u'horizontalLayout_6') - self.ExportFileSongListWidget = QtGui.QWidget(self.SongListFrame) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.ExportFileSongListWidget.sizePolicy().hasHeightForWidth()) - self.ExportFileSongListWidget.setSizePolicy(sizePolicy) - self.ExportFileSongListWidget.setObjectName(u'ExportFileSongListWidget') - self.verticalLayout = QtGui.QVBoxLayout(self.ExportFileSongListWidget) - self.verticalLayout.setSpacing(6) - self.verticalLayout.setMargin(0) - self.verticalLayout.setObjectName(u'verticalLayout') - self.ExportListLabel = QtGui.QLabel(self.ExportFileSongListWidget) - self.ExportListLabel.setObjectName(u'ExportListLabel') - self.verticalLayout.addWidget(self.ExportListLabel) - self.ExportListTable = QtGui.QTableWidget(self.ExportFileSongListWidget) - self.ExportListTable.setSelectionMode(QtGui.QAbstractItemView.MultiSelection) - self.ExportListTable.setShowGrid(False) - self.ExportListTable.setWordWrap(False) - self.ExportListTable.setCornerButtonEnabled(False) - self.ExportListTable.setObjectName(u'ExportListTable') - self.ExportListTable.setColumnCount(2) - self.ExportListTable.setRowCount(0) - item = QtGui.QTableWidgetItem() - self.ExportListTable.setHorizontalHeaderItem(0, item) - item = QtGui.QTableWidgetItem() - self.ExportListTable.setHorizontalHeaderItem(1, item) - self.verticalLayout.addWidget(self.ExportListTable) - self.ExportSelectAllWidget = QtGui.QWidget(self.ExportFileSongListWidget) - self.ExportSelectAllWidget.setObjectName(u'ExportSelectAllWidget') - self.horizontalLayout_2 = QtGui.QHBoxLayout(self.ExportSelectAllWidget) - self.horizontalLayout_2.setSpacing(6) - self.horizontalLayout_2.setMargin(0) - self.horizontalLayout_2.setObjectName(u'horizontalLayout_2') - self.ExportSelectAllPushButton = QtGui.QPushButton(self.ExportSelectAllWidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.ExportSelectAllPushButton.sizePolicy().hasHeightForWidth()) - self.ExportSelectAllPushButton.setSizePolicy(sizePolicy) - self.ExportSelectAllPushButton.setMinimumSize(QtCore.QSize(100, 0)) - icon2 = buildIcon(u':/exports/export_selectall.png') - self.ExportSelectAllPushButton.setIcon(icon2) - self.ExportSelectAllPushButton.setObjectName(u'ExportSelectAllPushButton') - self.horizontalLayout_2.addWidget(self.ExportSelectAllPushButton) - spacerItem = QtGui.QSpacerItem(89, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_2.addItem(spacerItem) - self.verticalLayout.addWidget(self.ExportSelectAllWidget) - self.exportFilterWidget = QtGui.QWidget(self.ExportFileSongListWidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.exportFilterWidget.sizePolicy().hasHeightForWidth()) - self.exportFilterWidget.setSizePolicy(sizePolicy) - self.exportFilterWidget.setMinimumSize(QtCore.QSize(0, 0)) - self.exportFilterWidget.setObjectName(u'exportFilterWidget') - self.horizontalLayout_3 = QtGui.QHBoxLayout(self.exportFilterWidget) - self.horizontalLayout_3.setMargin(0) - self.horizontalLayout_3.setObjectName(u'horizontalLayout_3') - self.ExportFilterComboBox = QtGui.QComboBox(self.exportFilterWidget) - self.ExportFilterComboBox.setMinimumSize(QtCore.QSize(70, 0)) - self.ExportFilterComboBox.setObjectName(u'ExportFilterComboBox') - self.ExportFilterComboBox.addItem(QtCore.QString()) - self.ExportFilterComboBox.addItem(QtCore.QString()) - self.ExportFilterComboBox.addItem(QtCore.QString()) - self.horizontalLayout_3.addWidget(self.ExportFilterComboBox) - self.ExportFilterLineEdit = QtGui.QLineEdit(self.exportFilterWidget) - self.ExportFilterLineEdit.setObjectName(u'ExportFilterLineEdit') - self.horizontalLayout_3.addWidget(self.ExportFilterLineEdit) - self.verticalLayout.addWidget(self.exportFilterWidget) - self.horizontalLayout_6.addWidget(self.ExportFileSongListWidget) - self.AddSelectedWidget = QtGui.QWidget(self.SongListFrame) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.AddSelectedWidget.sizePolicy().hasHeightForWidth()) - self.AddSelectedWidget.setSizePolicy(sizePolicy) - self.AddSelectedWidget.setObjectName(u'AddSelectedWidget') - self.verticalLayout_3 = QtGui.QVBoxLayout(self.AddSelectedWidget) - self.verticalLayout_3.setMargin(0) - self.verticalLayout_3.setObjectName(u'verticalLayout_3') - spacerItem1 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.verticalLayout_3.addItem(spacerItem1) - self.AddSelectedPushButton = QtGui.QPushButton(self.AddSelectedWidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Minimum) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.AddSelectedPushButton.sizePolicy().hasHeightForWidth()) - self.AddSelectedPushButton.setSizePolicy(sizePolicy) - self.AddSelectedPushButton.setMinimumSize(QtCore.QSize(25, 25)) - icon3 = buildIcon(u':/exports/export_move_to_list.png') - self.AddSelectedPushButton.setIcon(icon3) - self.AddSelectedPushButton.setObjectName(u'AddSelectedPushButton') - self.verticalLayout_3.addWidget(self.AddSelectedPushButton) - spacerItem2 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.verticalLayout_3.addItem(spacerItem2) - self.horizontalLayout_6.addWidget(self.AddSelectedWidget) - self.SelectedFileListWidget = QtGui.QWidget(self.SongListFrame) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SelectedFileListWidget.sizePolicy().hasHeightForWidth()) - self.SelectedFileListWidget.setSizePolicy(sizePolicy) - self.SelectedFileListWidget.setObjectName(u'SelectedFileListWidget') - self.verticalLayout_2 = QtGui.QVBoxLayout(self.SelectedFileListWidget) - self.verticalLayout_2.setMargin(0) - self.verticalLayout_2.setObjectName(u'verticalLayout_2') - self.SelectedListLabel = QtGui.QLabel(self.SelectedFileListWidget) - self.SelectedListLabel.setObjectName(u'SelectedListLabel') - self.verticalLayout_2.addWidget(self.SelectedListLabel) - self.SelectedListTable = QtGui.QTableWidget(self.SelectedFileListWidget) - self.SelectedListTable.setSelectionMode(QtGui.QAbstractItemView.MultiSelection) - self.SelectedListTable.setShowGrid(False) - self.SelectedListTable.setWordWrap(False) - self.SelectedListTable.setCornerButtonEnabled(False) - self.SelectedListTable.setObjectName(u'SelectedListTable') - self.SelectedListTable.setColumnCount(2) - self.SelectedListTable.setRowCount(0) - item = QtGui.QTableWidgetItem() - self.SelectedListTable.setHorizontalHeaderItem(0, item) - item = QtGui.QTableWidgetItem() - self.SelectedListTable.setHorizontalHeaderItem(1, item) - self.verticalLayout_2.addWidget(self.SelectedListTable) - self.SelectedSelectAllWidget = QtGui.QWidget(self.SelectedFileListWidget) - self.SelectedSelectAllWidget.setObjectName(u'SelectedSelectAllWidget') - self.horizontalLayout_4 = QtGui.QHBoxLayout(self.SelectedSelectAllWidget) - self.horizontalLayout_4.setSpacing(6) - self.horizontalLayout_4.setMargin(0) - self.horizontalLayout_4.setObjectName(u'horizontalLayout_4') - self.SelectedSelectAllPushButton = QtGui.QPushButton(self.SelectedSelectAllWidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SelectedSelectAllPushButton.sizePolicy().hasHeightForWidth()) - self.SelectedSelectAllPushButton.setSizePolicy(sizePolicy) - self.SelectedSelectAllPushButton.setMinimumSize(QtCore.QSize(100, 0)) - self.SelectedSelectAllPushButton.setIcon(icon2) - self.SelectedSelectAllPushButton.setObjectName(u'SelectedSelectAllPushButton') - self.horizontalLayout_4.addWidget(self.SelectedSelectAllPushButton) - spacerItem3 = QtGui.QSpacerItem(92, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_4.addItem(spacerItem3) - self.verticalLayout_2.addWidget(self.SelectedSelectAllWidget) - self.SelectedRemoveSelectedWidget = QtGui.QWidget(self.SelectedFileListWidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SelectedRemoveSelectedWidget.sizePolicy().hasHeightForWidth()) - self.SelectedRemoveSelectedWidget.setSizePolicy(sizePolicy) - self.SelectedRemoveSelectedWidget.setObjectName(u'SelectedRemoveSelectedWidget') - self.horizontalLayout_5 = QtGui.QHBoxLayout(self.SelectedRemoveSelectedWidget) - self.horizontalLayout_5.setMargin(0) - self.horizontalLayout_5.setObjectName(u'horizontalLayout_5') - self.SelectedRemoveSelectedButton = QtGui.QPushButton(self.SelectedRemoveSelectedWidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SelectedRemoveSelectedButton.sizePolicy().hasHeightForWidth()) - self.SelectedRemoveSelectedButton.setSizePolicy(sizePolicy) - self.SelectedRemoveSelectedButton.setMinimumSize(QtCore.QSize(140, 0)) - icon4 = buildIcon(u':/exports/export_remove.png') - self.SelectedRemoveSelectedButton.setIcon(icon4) - self.SelectedRemoveSelectedButton.setObjectName(u'SelectedRemoveSelectedButton') - self.horizontalLayout_5.addWidget(self.SelectedRemoveSelectedButton) - spacerItem4 = QtGui.QSpacerItem(49, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_5.addItem(spacerItem4) - self.verticalLayout_2.addWidget(self.SelectedRemoveSelectedWidget) - self.horizontalLayout_6.addWidget(self.SelectedFileListWidget) - self.verticalLayout_5.addWidget(self.SongListFrame) - self.ProgressGroupBox = QtGui.QGroupBox(self.OpenSongExportForm) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.ProgressGroupBox.sizePolicy().hasHeightForWidth()) - self.ProgressGroupBox.setSizePolicy(sizePolicy) - self.ProgressGroupBox.setObjectName(u'ProgressGroupBox') - self.verticalLayout_4 = QtGui.QVBoxLayout(self.ProgressGroupBox) - self.verticalLayout_4.setSpacing(8) - self.verticalLayout_4.setContentsMargins(8, 0, 8, 8) - self.verticalLayout_4.setObjectName(u'verticalLayout_4') - self.ProgressLabel = QtGui.QLabel(self.ProgressGroupBox) - self.ProgressLabel.setObjectName(u'ProgressLabel') - self.verticalLayout_4.addWidget(self.ProgressLabel) - self.ProgressBar = QtGui.QProgressBar(self.ProgressGroupBox) - self.ProgressBar.setProperty(u'value', QtCore.QVariant(24)) - self.ProgressBar.setObjectName(u'ProgressBar') - self.verticalLayout_4.addWidget(self.ProgressBar) - self.verticalLayout_5.addWidget(self.ProgressGroupBox) - self.ButtonBarWidget = QtGui.QWidget(self.OpenSongExportForm) - self.ButtonBarWidget.setObjectName(u'ButtonBarWidget') - self.horizontalLayout_7 = QtGui.QHBoxLayout(self.ButtonBarWidget) - self.horizontalLayout_7.setSpacing(8) - self.horizontalLayout_7.setMargin(0) - self.horizontalLayout_7.setObjectName(u'horizontalLayout_7') - spacerItem5 = QtGui.QSpacerItem(288, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_7.addItem(spacerItem5) - self.ExportPushButton = QtGui.QPushButton(self.ButtonBarWidget) - self.ExportPushButton.setObjectName(u'ExportPushButton') - self.horizontalLayout_7.addWidget(self.ExportPushButton) - self.ClosePushButton = QtGui.QPushButton(self.ButtonBarWidget) - self.ClosePushButton.setObjectName(u'ClosePushButton') - self.horizontalLayout_7.addWidget(self.ClosePushButton) - self.verticalLayout_5.addWidget(self.ButtonBarWidget) - - self.retranslateUi() - QtCore.QObject.connect(self.ClosePushButton, QtCore.SIGNAL(u'clicked()'), self.OpenSongExportForm.close) - QtCore.QObject.connect(self.ExportSelectAllPushButton, QtCore.SIGNAL(u'clicked()'), self.ExportListTable.selectAll) - QtCore.QObject.connect(self.SelectedSelectAllPushButton, QtCore.SIGNAL(u'clicked()'), self.SelectedListTable.selectAll) - QtCore.QObject.connect(self.SelectedRemoveSelectedButton, QtCore.SIGNAL(u'clicked()'), self.SelectedListTable.clear) - QtCore.QMetaObject.connectSlotsByName(self.OpenSongExportForm) - - def retranslateUi(self): - self.OpenSongExportForm.setWindowTitle(translate(u'OpenSongExportForm', u'OpenSong Song Exporter')) - self.ExportFileLabel.setText(translate(u'OpenSongExportForm', u'Select OpenSong song folder:')) - self.ExportListLabel.setText(translate(u'OpenSongExportForm', u'Full Song List')) - self.ExportListTable.horizontalHeaderItem(0).setText(translate(u'OpenSongExportForm', u'Song Title')) - self.ExportListTable.horizontalHeaderItem(1).setText(translate(u'OpenSongExportForm', u'Author')) - self.ExportSelectAllPushButton.setText(translate(u'OpenSongExportForm', u'Select All')) - self.ExportFilterComboBox.setItemText(0, translate(u'OpenSongExportForm', u'Lyrics')) - self.ExportFilterComboBox.setItemText(1, translate(u'OpenSongExportForm', u'Title')) - self.ExportFilterComboBox.setItemText(2, translate(u'OpenSongExportForm', u'Author')) - self.SelectedListLabel.setText(translate(u'OpenSongExportForm', u'Song Export List')) - self.SelectedListTable.horizontalHeaderItem(0).setText(translate(u'OpenSongExportForm', u'Song Title')) - self.SelectedListTable.horizontalHeaderItem(1).setText(translate(u'OpenSongExportForm', u'Author')) - self.SelectedSelectAllPushButton.setText(translate(u'OpenSongExportForm', u'Select All')) - self.SelectedRemoveSelectedButton.setText(translate(u'OpenSongExportForm', u'Remove Selected')) - self.ProgressGroupBox.setTitle(translate(u'OpenSongExportForm', u'Progress:')) - self.ProgressLabel.setText(translate(u'OpenSongExportForm', u'Ready to export')) - self.ExportPushButton.setText(translate(u'OpenSongExportForm', u'Export')) - self.ClosePushButton.setText(translate(u'OpenSongExportForm', u'Close')) - - def show(self): - self.OpenSongExportForm.show() diff --git a/openlp/plugins/songs/forms/opensongimportdialog.py b/openlp/plugins/songs/forms/opensongimportdialog.py new file mode 100644 index 000000000..f4ceb488c --- /dev/null +++ b/openlp/plugins/songs/forms/opensongimportdialog.py @@ -0,0 +1,108 @@ +# -*- coding: utf-8 -*- +# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 + +############################################################################### +# OpenLP - Open Source Lyrics Projection # +# --------------------------------------------------------------------------- # +# Copyright (c) 2008-2009 Raoul Snyman # +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # +# --------------------------------------------------------------------------- # +# 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_OpenSongImportDialog(object): + def setupUi(self, OpenSongImportDialog): + OpenSongImportDialog.setObjectName(u'OpenSongImportDialog') + OpenSongImportDialog.resize(481, 172) + icon = QtGui.QIcon() + icon.addPixmap(QtGui.QPixmap(u':/icon/openlp.org-icon-32.bmp'), QtGui.QIcon.Normal, QtGui.QIcon.Off) + OpenSongImportDialog.setWindowIcon(icon) + self.verticalLayout = QtGui.QVBoxLayout(OpenSongImportDialog) + self.verticalLayout.setSpacing(6) + self.verticalLayout.setMargin(8) + self.verticalLayout.setObjectName(u'verticalLayout') + self.ImportFileWidget = QtGui.QWidget(OpenSongImportDialog) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.ImportFileWidget.sizePolicy().hasHeightForWidth()) + self.ImportFileWidget.setSizePolicy(sizePolicy) + self.ImportFileWidget.setObjectName(u'ImportFileWidget') + self.horizontalLayout = QtGui.QHBoxLayout(self.ImportFileWidget) + self.horizontalLayout.setSpacing(6) + self.horizontalLayout.setMargin(0) + self.horizontalLayout.setObjectName(u'horizontalLayout') + self.ImportFileLabel = QtGui.QLabel(self.ImportFileWidget) + self.ImportFileLabel.setObjectName(u'ImportFileLabel') + self.horizontalLayout.addWidget(self.ImportFileLabel) + self.ImportFileLineEdit = QtGui.QLineEdit(self.ImportFileWidget) + self.ImportFileLineEdit.setObjectName(u'ImportFileLineEdit') + self.horizontalLayout.addWidget(self.ImportFileLineEdit) + self.ImportFileSelectPushButton = QtGui.QPushButton(self.ImportFileWidget) + icon1 = QtGui.QIcon() + icon1.addPixmap(QtGui.QPixmap(u':/imports/import_load.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.ImportFileSelectPushButton.setIcon(icon1) + self.ImportFileSelectPushButton.setObjectName(u'ImportFileSelectPushButton') + self.horizontalLayout.addWidget(self.ImportFileSelectPushButton) + self.verticalLayout.addWidget(self.ImportFileWidget) + self.ProgressGroupBox = QtGui.QGroupBox(OpenSongImportDialog) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.ProgressGroupBox.sizePolicy().hasHeightForWidth()) + self.ProgressGroupBox.setSizePolicy(sizePolicy) + self.ProgressGroupBox.setObjectName(u'ProgressGroupBox') + self.verticalLayout_4 = QtGui.QVBoxLayout(self.ProgressGroupBox) + self.verticalLayout_4.setSpacing(6) + self.verticalLayout_4.setContentsMargins(6, 0, 8, 8) + self.verticalLayout_4.setObjectName(u'verticalLayout_4') + self.ProgressLabel = QtGui.QLabel(self.ProgressGroupBox) + self.ProgressLabel.setObjectName(u'ProgressLabel') + self.verticalLayout_4.addWidget(self.ProgressLabel) + self.ProgressBar = QtGui.QProgressBar(self.ProgressGroupBox) + self.ProgressBar.setProperty(u'value', QtCore.QVariant(24)) + self.ProgressBar.setObjectName(u'ProgressBar') + self.verticalLayout_4.addWidget(self.ProgressBar) + self.verticalLayout.addWidget(self.ProgressGroupBox) + self.ButtonBarWidget = QtGui.QWidget(OpenSongImportDialog) + self.ButtonBarWidget.setObjectName(u'ButtonBarWidget') + self.horizontalLayout_7 = QtGui.QHBoxLayout(self.ButtonBarWidget) + self.horizontalLayout_7.setSpacing(8) + self.horizontalLayout_7.setMargin(0) + self.horizontalLayout_7.setObjectName(u'horizontalLayout_7') + spacerItem = QtGui.QSpacerItem(288, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.horizontalLayout_7.addItem(spacerItem) + self.ImportPushButton = QtGui.QPushButton(self.ButtonBarWidget) + self.ImportPushButton.setObjectName(u'ImportPushButton') + self.horizontalLayout_7.addWidget(self.ImportPushButton) + self.ClosePushButton = QtGui.QPushButton(self.ButtonBarWidget) + self.ClosePushButton.setObjectName(u'ClosePushButton') + self.horizontalLayout_7.addWidget(self.ClosePushButton) + self.verticalLayout.addWidget(self.ButtonBarWidget) + + self.retranslateUi(OpenSongImportDialog) + QtCore.QObject.connect(self.ClosePushButton, QtCore.SIGNAL(u'clicked()'), OpenSongImportDialog.close) + QtCore.QMetaObject.connectSlotsByName(OpenSongImportDialog) + + def retranslateUi(self, OpenSongImportDialog): + OpenSongImportDialog.setWindowTitle(self.trUtf8(u'OpenSong Song Importer')) + self.ImportFileLabel.setText(self.trUtf8(u'OpenSong Folder:')) + self.ProgressGroupBox.setTitle(self.trUtf8(u'Progress:')) + self.ProgressLabel.setText(self.trUtf8(u'Ready to import')) + self.ImportPushButton.setText(self.trUtf8(u'Import')) + self.ClosePushButton.setText(self.trUtf8(u'Close')) + diff --git a/openlp/plugins/songs/forms/opensongimportform.py b/openlp/plugins/songs/forms/opensongimportform.py index 6411a7d21..80418f961 100644 --- a/openlp/plugins/songs/forms/opensongimportform.py +++ b/openlp/plugins/songs/forms/opensongimportform.py @@ -23,92 +23,11 @@ ############################################################################### from PyQt4 import QtCore, QtGui -from openlp.core.lib import translate, buildIcon +from openlp.plugins.songs.forms.opensongimportdialog import Ui_OpenSongImportDialog -class OpenSongImportForm(object): +class OpenSongImportForm(QtGui.QDialog, Ui_OpenSongImportDialog): - def __init__(self): - self.OpenSongImportForm = QtGui.QWidget() - self.setupUi() + def __init__(self, parent=None): + QtGui.QDialog.__init__(self, parent) + self.setupUi(self) - def setupUi(self): - self.OpenSongImportForm.setObjectName(u'OpenSongImportForm') - self.OpenSongImportForm.resize(481, 153) - icon = buildIcon(u':/icon/openlp-logo-16x16.png') - self.OpenSongImportForm.setWindowIcon(icon) - self.verticalLayout = QtGui.QVBoxLayout(self.OpenSongImportForm) - self.verticalLayout.setSpacing(6) - self.verticalLayout.setMargin(8) - self.verticalLayout.setObjectName(u'verticalLayout') - self.ImportFileWidget = QtGui.QWidget(self.OpenSongImportForm) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.ImportFileWidget.sizePolicy().hasHeightForWidth()) - self.ImportFileWidget.setSizePolicy(sizePolicy) - self.ImportFileWidget.setObjectName(u'ImportFileWidget') - self.horizontalLayout = QtGui.QHBoxLayout(self.ImportFileWidget) - self.horizontalLayout.setSpacing(6) - self.horizontalLayout.setMargin(0) - self.horizontalLayout.setObjectName(u'horizontalLayout') - self.ImportFileLabel = QtGui.QLabel(self.ImportFileWidget) - self.ImportFileLabel.setObjectName(u'ImportFileLabel') - self.horizontalLayout.addWidget(self.ImportFileLabel) - self.ImportFileLineEdit = QtGui.QLineEdit(self.ImportFileWidget) - self.ImportFileLineEdit.setObjectName(u'ImportFileLineEdit') - self.horizontalLayout.addWidget(self.ImportFileLineEdit) - self.ImportFileSelectPushButton = QtGui.QPushButton(self.ImportFileWidget) - icon1 = buildIcon(u':/imports/import_load.png') - self.ImportFileSelectPushButton.setIcon(icon1) - self.ImportFileSelectPushButton.setObjectName(u'ImportFileSelectPushButton') - self.horizontalLayout.addWidget(self.ImportFileSelectPushButton) - self.verticalLayout.addWidget(self.ImportFileWidget) - self.ProgressGroupBox = QtGui.QGroupBox(self.OpenSongImportForm) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.ProgressGroupBox.sizePolicy().hasHeightForWidth()) - self.ProgressGroupBox.setSizePolicy(sizePolicy) - self.ProgressGroupBox.setObjectName(u'ProgressGroupBox') - self.verticalLayout_4 = QtGui.QVBoxLayout(self.ProgressGroupBox) - self.verticalLayout_4.setSpacing(6) - self.verticalLayout_4.setContentsMargins(6, 0, 8, 8) - self.verticalLayout_4.setObjectName(u'verticalLayout_4') - self.ProgressLabel = QtGui.QLabel(self.ProgressGroupBox) - self.ProgressLabel.setObjectName(u'ProgressLabel') - self.verticalLayout_4.addWidget(self.ProgressLabel) - self.ProgressBar = QtGui.QProgressBar(self.ProgressGroupBox) - self.ProgressBar.setProperty(u'value', QtCore.QVariant(24)) - self.ProgressBar.setObjectName(u'ProgressBar') - self.verticalLayout_4.addWidget(self.ProgressBar) - self.verticalLayout.addWidget(self.ProgressGroupBox) - self.ButtonBarWidget = QtGui.QWidget(self.OpenSongImportForm) - self.ButtonBarWidget.setObjectName(u'ButtonBarWidget') - self.horizontalLayout_7 = QtGui.QHBoxLayout(self.ButtonBarWidget) - self.horizontalLayout_7.setSpacing(8) - self.horizontalLayout_7.setMargin(0) - self.horizontalLayout_7.setObjectName(u'horizontalLayout_7') - spacerItem = QtGui.QSpacerItem(288, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_7.addItem(spacerItem) - self.ImportPushButton = QtGui.QPushButton(self.ButtonBarWidget) - self.ImportPushButton.setObjectName(u'ImportPushButton') - self.horizontalLayout_7.addWidget(self.ImportPushButton) - self.ClosePushButton = QtGui.QPushButton(self.ButtonBarWidget) - self.ClosePushButton.setObjectName(u'ClosePushButton') - self.horizontalLayout_7.addWidget(self.ClosePushButton) - self.verticalLayout.addWidget(self.ButtonBarWidget) - - self.retranslateUi() - QtCore.QObject.connect(self.ClosePushButton, QtCore.SIGNAL(u'clicked()'), self.OpenSongImportForm.close) - QtCore.QMetaObject.connectSlotsByName(self.OpenSongImportForm) - - def retranslateUi(self): - self.OpenSongImportForm.setWindowTitle(translate(u'OpenSongImportForm', u'OpenSong Song Importer')) - self.ImportFileLabel.setText(translate(u'OpenSongImportForm', u'OpenSong Folder:')) - self.ProgressGroupBox.setTitle(translate(u'OpenSongImportForm', u'Progress:')) - self.ProgressLabel.setText(translate(u'OpenSongImportForm', u'Ready to import')) - self.ImportPushButton.setText(translate(u'OpenSongImportForm', u'Import')) - self.ClosePushButton.setText(translate(u'OpenSongImportForm', u'Close')) - - def show(self): - self.OpenSongImportForm.show() diff --git a/openlp/plugins/songs/forms/songbookdialog.py b/openlp/plugins/songs/forms/songbookdialog.py index f9ace28a5..10f560a58 100644 --- a/openlp/plugins/songs/forms/songbookdialog.py +++ b/openlp/plugins/songs/forms/songbookdialog.py @@ -65,9 +65,6 @@ class Ui_SongBookDialog(object): QtCore.QMetaObject.connectSlotsByName(SongBookDialog) def retranslateUi(self, SongBookDialog): - SongBookDialog.setWindowTitle( - translate(u'SongBookDialog', u'Edit Book')) - self.NameLabel.setText( - translate(u'SongBookDialog', u'Name:')) - self.PublisherLabel.setText( - translate(u'SongBookDialog', u'Publisher:')) + SongBookDialog.setWindowTitle(self.trUtf8(u'Edit Book')) + self.NameLabel.setText(self.trUtf8(u'Name:')) + self.PublisherLabel.setText(self.trUtf8(u'Publisher:')) diff --git a/openlp/plugins/songs/forms/songbookform.py b/openlp/plugins/songs/forms/songbookform.py index bcc72d65a..a662749df 100644 --- a/openlp/plugins/songs/forms/songbookform.py +++ b/openlp/plugins/songs/forms/songbookform.py @@ -47,9 +47,9 @@ class SongBookForm(QtGui.QDialog, Ui_SongBookDialog): def accept(self): if not self.NameEdit.text(): - QtGui.QMessageBox.critical(self, - translate(u'SongBookDialog', u'Error'), - translate(u'SongBookDialog', u'You need to type in a book name!'), + QtGui.QMessageBox.critical( + self, self.trUtf8(u'Error'), + self.trUtf8(u'You need to type in a book name!'), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) self.NameEdit.setFocus() return False diff --git a/openlp/plugins/songs/forms/songmaintenancedialog.py b/openlp/plugins/songs/forms/songmaintenancedialog.py index 73921943d..7de15fb4f 100644 --- a/openlp/plugins/songs/forms/songmaintenancedialog.py +++ b/openlp/plugins/songs/forms/songmaintenancedialog.py @@ -207,30 +207,17 @@ class Ui_SongMaintenanceDialog(object): QtCore.QMetaObject.connectSlotsByName(SongMaintenanceDialog) def retranslateUi(self, SongMaintenanceDialog): - SongMaintenanceDialog.setWindowTitle( - translate(u'SongMaintenanceDialog', u'Song Maintenance')) - self.TypeListWidget.item(0).setText( - translate(u'SongMaintenanceDialog', u'Authors')) - self.TypeListWidget.item(1).setText( - translate(u'SongMaintenanceDialog', u'Topics')) - self.TypeListWidget.item(2).setText( - translate(u'SongMaintenanceDialog', u'Books/Hymnals')) - self.AuthorAddButton.setText( - translate(u'SongMaintenanceDialog', u'Add')) - self.AuthorEditButton.setText( - translate(u'SongMaintenanceDialog', u'Edit')) - self.AuthorDeleteButton.setText( - translate(u'SongMaintenanceDialog', u'Delete')) - self.TopicAddButton.setText( - translate(u'SongMaintenanceDialog', u'Add')) - self.TopicEditButton.setText( - translate(u'SongMaintenanceDialog', u'Edit')) - self.TopicDeleteButton.setText( - translate(u'SongMaintenanceDialog', u'Delete')) - self.BookAddButton.setText( - translate(u'SongMaintenanceDialog', u'Add')) - self.BookEditButton.setText( - translate(u'SongMaintenanceDialog', u'Edit')) - self.BookDeleteButton.setText( - translate(u'SongMaintenanceDialog', u'Delete')) + SongMaintenanceDialog.setWindowTitle(self.trUtf8(u'Song Maintenance')) + self.TypeListWidget.item(0).setText(self.trUtf8(u'Authors')) + self.TypeListWidget.item(1).setText(self.trUtf8(u'Topics')) + self.TypeListWidget.item(2).setText(self.trUtf8(u'Books/Hymnals')) + self.AuthorAddButton.setText(self.trUtf8(u'Add')) + self.AuthorEditButton.setText(self.trUtf8(u'Edit')) + self.AuthorDeleteButton.setText(self.trUtf8(u'Delete')) + self.TopicAddButton.setText(self.trUtf8(u'Add')) + self.TopicEditButton.setText(self.trUtf8(u'Edit')) + self.TopicDeleteButton.setText(self.trUtf8(u'Delete')) + self.BookAddButton.setText(self.trUtf8(u'Add')) + self.BookEditButton.setText(self.trUtf8(u'Edit')) + self.BookDeleteButton.setText(self.trUtf8(u'Delete')) diff --git a/openlp/plugins/songs/forms/songmaintenanceform.py b/openlp/plugins/songs/forms/songmaintenanceform.py index a319358cd..c73452282 100644 --- a/openlp/plugins/songs/forms/songmaintenanceform.py +++ b/openlp/plugins/songs/forms/songmaintenanceform.py @@ -130,9 +130,9 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog): if self.songmanager.save_author(author): self.resetAuthors() else: - QtGui.QMessageBox.critical(self, - translate(u'SongMaintenanceForm', u'Error'), - translate(u'SongMaintenanceForm', u'Couldn\'t add your author!'), + QtGui.QMessageBox.critical( + self, self.trUtf8(u'Error'), + self.trUtf8(u'Couldn\'t add your author!'), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) def onTopicAddButtonClick(self): @@ -141,9 +141,9 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog): if self.songmanager.save_topic(topic): self.resetTopics() else: - QtGui.QMessageBox.critical(self, - translate(u'SongMaintenanceForm', u'Error'), - translate(u'SongMaintenanceForm', u'Couldn\'t add your topic!'), + QtGui.QMessageBox.critical( + self, self.trUtf8(u'Error'), + self.trUtf8(u'Couldn\'t add your topic!'), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) def onBookAddButtonClick(self): @@ -153,9 +153,9 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog): if self.songmanager.save_book(book): self.resetBooks() else: - QtGui.QMessageBox.critical(self, - translate(u'SongMaintenanceForm', u'Error'), - translate(u'SongMaintenanceForm', u'Couldn\'t add your book!'), + QtGui.QMessageBox.critical( + self, self.trUtf8(u'Error'), + self.trUtf8(u'Couldn\'t add your book!'), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) def onAuthorEditButtonClick(self): @@ -173,9 +173,9 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog): if self.songmanager.save_author(author): self.resetAuthors() else: - QtGui.QMessageBox.critical(self, - translate(u'SongMaintenanceForm', u'Error'), - translate(u'SongMaintenanceForm', u'Couldn\'t save your author!'), + QtGui.QMessageBox.critical( + self, self.trUtf8(u'Error'), + self.trUtf8(u'Couldn\'t save your author!'), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) def onTopicEditButtonClick(self): @@ -188,9 +188,9 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog): if self.songmanager.save_topic(topic): self.resetTopics() else: - QtGui.QMessageBox.critical(self, - translate(u'SongMaintenanceForm', u'Error'), - translate(u'SongMaintenanceForm', u'Couldn\'t save your topic!'), + QtGui.QMessageBox.critical( + self, self.trUtf8(u'Error'), + self.trUtf8(u'Couldn\'t save your topic!'), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) def onBookEditButtonClick(self): @@ -205,40 +205,46 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog): if self.songmanager.save_book(book): self.resetBooks() else: - QtGui.QMessageBox.critical(self, - translate(u'SongMaintenanceForm', u'Error'), - translate(u'SongMaintenanceForm', u'Couldn\'t save your book!'), + QtGui.QMessageBox.critical( + self, self.trUtf8(u'Error'), + self.trUtf8(u'Couldn\'t save your book!'), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) def onAuthorDeleteButtonClick(self): """ Delete the author if the author is not attached to any songs """ - self._deleteItem(self.AuthorsListWidget, self.songmanager.get_author, + self._deleteItem( + self.AuthorsListWidget, self.songmanager.get_author, self.songmanager.delete_author, self.resetAuthors, - translate(u'SongMaintenanceForm', u'Delete Author'), - translate(u'SongMaintenanceForm', u'Are you sure you want to delete the selected author?'), - translate(u'SongMaintenanceForm', u'This author can\'t be deleted, they are currently assigned to at least one song!'), - translate(u'SongMaintenanceForm', u'No author selected!')) + self.trUtf8(u'Delete Author'), + self.trUtf8(u'Are you sure you want to delete the selected author?'), + self.trUtf8(u'This author can\'t be deleted, they are currently ' + u'assigned to at least one song!'), + self.trUtf8(u'No author selected!')) def onTopicDeleteButtonClick(self): """ Delete the Book is the Book is not attached to any songs """ - self._deleteItem(self.TopicsListWidget, self.songmanager.get_topic, + self._deleteItem( + self.TopicsListWidget, self.songmanager.get_topic, self.songmanager.delete_topic, self.resetTopics, - translate(u'SongMaintenanceForm', u'Delete Topic'), - translate(u'SongMaintenanceForm', u'Are you sure you want to delete the selected topic?'), - translate(u'SongMaintenanceForm', u'This topic can\'t be deleted, it is currently assigned to at least one song!'), - translate(u'SongMaintenanceForm', u'No topic selected!')) + self.trUtf8(u'Delete Topic'), + self.trUtf8(u'Are you sure you want to delete the selected topic?'), + self.trUtf8(u'This topic can\'t be deleted, it is currently ' + u'assigned to at least one song!'), + self.trUtf8(u'No topic selected!')) def onBookDeleteButtonClick(self): """ Delete the Book is the Book is not attached to any songs """ - self._deleteItem(self.BooksListWidget, self.songmanager.get_book, + self._deleteItem( + self.BooksListWidget, self.songmanager.get_book, self.songmanager.delete_book, self.resetBooks, - translate(u'SongMaintenanceForm', u'Delete Book'), - translate(u'SongMaintenanceForm', u'Are you sure you want to delete the selected book?'), - translate(u'SongMaintenanceForm', u'This book can\'t be deleted, it is currently assigned to at least one song!'), - translate(u'SongMaintenanceForm', u'No book selected!')) + self.trUtf8(u'Delete Book'), + self.trUtf8(u'Are you sure you want to delete the selected book?'), + self.trUtf8(u'This book can\'t be deleted, it is currently ' + u'assigned to at least one song!'), + self.trUtf8(u'No book selected!')) diff --git a/openlp/plugins/songs/forms/topicsdialog.py b/openlp/plugins/songs/forms/topicsdialog.py index 5ada21dd4..f66b1c222 100644 --- a/openlp/plugins/songs/forms/topicsdialog.py +++ b/openlp/plugins/songs/forms/topicsdialog.py @@ -59,8 +59,6 @@ class Ui_TopicsDialog(object): QtCore.QMetaObject.connectSlotsByName(TopicsDialog) def retranslateUi(self, TopicsDialog): - TopicsDialog.setWindowTitle( - translate(u'TopicsDialog', u'Topic Maintenance')) - self.NameLabel.setText( - translate(u'TopicsDialog', u'Topic name:')) + TopicsDialog.setWindowTitle(self.trUtf8(u'Topic Maintenance')) + self.NameLabel.setText(self.trUtf8(u'Topic name:')) diff --git a/openlp/plugins/songs/forms/topicsform.py b/openlp/plugins/songs/forms/topicsform.py index 6598219bf..f7b8fc56a 100644 --- a/openlp/plugins/songs/forms/topicsform.py +++ b/openlp/plugins/songs/forms/topicsform.py @@ -46,9 +46,9 @@ class TopicsForm(QtGui.QDialog, Ui_TopicsDialog): def accept(self): if not self.NameEdit.text(): - QtGui.QMessageBox.critical(self, - translate(u'SongBookDialog', u'Error'), - translate(u'SongBookDialog', u'You need to type in a topic name!'), + QtGui.QMessageBox.critical( + self, self.trUtf8(u'Error'), + self.trUtf8(u'You need to type in a topic name!'), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) self.NameEdit.setFocus() return False diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py index 6a02f5ff6..6718ef581 100644 --- a/openlp/plugins/songs/lib/mediaitem.py +++ b/openlp/plugins/songs/lib/mediaitem.py @@ -63,9 +63,8 @@ class SongMediaItem(MediaManagerItem): def addEndHeaderBar(self): self.addToolbarSeparator() ## Song Maintenance Button ## - self.addToolbarButton(translate(u'SongMediaItem', u'Song Maintenance'), - translate(u'SongMediaItem', - u'Maintain the lists of authors, topics and books'), + self.addToolbarButton(self.trUtf8(u'Song Maintenance'), + self.trUtf8(u'Maintain the lists of authors, topics and books'), ':/songs/song_maintenance.png', self.onSongMaintenanceClick, 'SongMaintenanceItem') self.PageLayout.setSpacing(4) @@ -128,15 +127,15 @@ class SongMediaItem(MediaManagerItem): self.parent.config.get_config(u'search as type', u'False')) def retranslateUi(self): - self.SearchTextLabel.setText(translate(u'SongMediaItem', u'Search:')) - self.SearchTypeLabel.setText(translate(u'SongMediaItem', u'Type:')) - self.ClearTextButton.setText(translate(u'SongMediaItem', u'Clear')) - self.SearchTextButton.setText(translate(u'SongMediaItem', u'Search')) + self.SearchTextLabel.setText(self.trUtf8(u'Search:')) + self.SearchTypeLabel.setText(self.trUtf8(u'Type:')) + self.ClearTextButton.setText(self.trUtf8(u'Clear')) + self.SearchTextButton.setText(self.trUtf8(u'Search')) def initialise(self): - self.SearchTypeComboBox.addItem(translate(u'SongMediaItem', u'Titles')) - self.SearchTypeComboBox.addItem(translate(u'SongMediaItem', u'Lyrics')) - self.SearchTypeComboBox.addItem(translate(u'SongMediaItem', u'Authors')) + self.SearchTypeComboBox.addItem(self.trUtf8(u'Titles')) + self.SearchTypeComboBox.addItem(self.trUtf8(u'Lyrics')) + self.SearchTypeComboBox.addItem(self.trUtf8(u'Authors')) self.configUpdated() def onSearchTextButtonClick(self): @@ -270,7 +269,7 @@ class SongMediaItem(MediaManagerItem): raw_footer.append(author_list) raw_footer.append(song.copyright ) raw_footer.append(unicode( - translate(u'SongMediaItem', u'CCL Licence: ') + ccl)) + self.trUtf8(u'CCL Licence: ') + ccl)) service_item.raw_footer = raw_footer service_item.audit = [song.title, author_audit, song.copyright, song.ccli_number] return True diff --git a/openlp/plugins/songs/lib/songstab.py b/openlp/plugins/songs/lib/songstab.py index 09ef75fab..864e97e59 100644 --- a/openlp/plugins/songs/lib/songstab.py +++ b/openlp/plugins/songs/lib/songstab.py @@ -31,7 +31,7 @@ class SongsTab(SettingsTab): SongsTab is the Songs settings tab in the settings dialog. """ def __init__(self): - SettingsTab.__init__(self, translate(u'SongsTab', u'Songs'), u'Songs') + SettingsTab.__init__(self, u'Songs', u'Songs') def setupUi(self): self.setObjectName(u'SongsTab') @@ -53,9 +53,8 @@ class SongsTab(SettingsTab): self.onSearchAsTypeCheckBoxChanged) def retranslateUi(self): - self.SongsModeGroupBox.setTitle(translate(u'SongsTab', u'Songs Mode')) - self.SearchAsTypeCheckBox.setText( - translate(u'SongsTab', u'Enable search as you type:')) + self.SongsModeGroupBox.setTitle(self.trUtf8(u'Songs Mode')) + self.SearchAsTypeCheckBox.setText(self.trUtf8(u'Enable search as you type:')) def onSearchAsTypeCheckBoxChanged(self, check_state): self.bible_search = False diff --git a/openlp/plugins/songs/songsplugin.py b/openlp/plugins/songs/songsplugin.py index 0e7848162..21eb832d1 100644 --- a/openlp/plugins/songs/songsplugin.py +++ b/openlp/plugins/songs/songsplugin.py @@ -112,19 +112,18 @@ class SongsPlugin(Plugin): self.ImportSongMenu.addAction(self.ImportOpenSongItem) import_menu.addAction(self.ImportSongMenu.menuAction()) # Translations... - self.ImportSongMenu.setTitle(translate(u'main_window', u'&Song')) - self.ImportOpenSongItem.setText(translate(u'main_window', u'OpenSong')) - self.ImportOpenlp1Item.setText( - translate(u'main_window', u'openlp.org 1.0')) + self.ImportSongMenu.setTitle(import_menu.trUtf8(u'&Song')) + self.ImportOpenSongItem.setText(import_menu.trUtf8(u'OpenSong')) + self.ImportOpenlp1Item.setText(import_menu.trUtf8(u'openlp.org 1.0')) self.ImportOpenlp1Item.setToolTip( - translate(u'main_window', u'Export songs in openlp.org 1.0 format')) + import_menu.trUtf8(u'Export songs in openlp.org 1.0 format')) self.ImportOpenlp1Item.setStatusTip( - translate(u'main_window', u'Export songs in openlp.org 1.0 format')) - self.ImportOpenlp2Item.setText(translate(u'main_window', u'OpenLP 2.0')) + import_menu.trUtf8(u'Export songs in openlp.org 1.0 format')) + self.ImportOpenlp2Item.setText(import_menu.trUtf8(u'OpenLP 2.0')) self.ImportOpenlp2Item.setToolTip( - translate(u'main_window', u'Export songs in OpenLP 2.0 format')) + import_menu.trUtf8(u'Export songs in OpenLP 2.0 format')) self.ImportOpenlp2Item.setStatusTip( - translate(u'main_window', u'Export songs in OpenLP 2.0 format')) + import_menu.trUtf8(u'Export songs in OpenLP 2.0 format')) # Signals and slots QtCore.QObject.connect(self.ImportOpenlp1Item, QtCore.SIGNAL(u'triggered()'), self.onImportOpenlp1ItemClick) @@ -157,11 +156,10 @@ class SongsPlugin(Plugin): self.ExportSongMenu.addAction(self.ExportOpenSongItem) export_menu.addAction(self.ExportSongMenu.menuAction()) # Translations... - self.ExportSongMenu.setTitle(translate(u'main_window', u'&Song')) - self.ExportOpenSongItem.setText(translate(u'main_window', u'OpenSong')) - self.ExportOpenlp1Item.setText( - translate(u'main_window', u'openlp.org 1.0')) - self.ExportOpenlp2Item.setText(translate(u'main_window', u'OpenLP 2.0')) + self.ExportSongMenu.setTitle(export_menu.trUtf8(u'&Song')) + self.ExportOpenSongItem.setText(export_menu.trUtf8(u'OpenSong')) + self.ExportOpenlp1Item.setText(export_menu.trUtf8(u'openlp.org 1.0')) + self.ExportOpenlp2Item.setText(export_menu.trUtf8(u'OpenLP 2.0')) # Signals and slots QtCore.QObject.connect(self.ExportOpenlp1Item, QtCore.SIGNAL(u'triggered()'), self.onExportOpenlp1ItemClicked) diff --git a/resources/forms/openlpexportform.ui b/resources/forms/openlpexportform.ui index 4dc81d21c..2ccb86a0d 100644 --- a/resources/forms/openlpexportform.ui +++ b/resources/forms/openlpexportform.ui @@ -1,7 +1,8 @@ - - OpenLPExportForm - - + + + OpenLPExportDialog + + 0 0 @@ -9,49 +10,49 @@ 459 - + openlp.org Song Exporter - - + + :/icon/openlp.org-icon-32.bmp:/icon/openlp.org-icon-32.bmp - - + + 8 - - - + + + 0 0 - - + + 3 - + 0 - - + + Select openlp.org export filename: - + - - + + - - + + :/exports/export_load.png:/exports/export_load.png @@ -60,115 +61,115 @@ - - - + + + 0 0 - + QFrame::Box - + QFrame::Raised - - + + 8 - + 8 - - - + + + 0 0 - - + + 6 - + 0 - - + + Full Song List - - + + QAbstractItemView::MultiSelection - + false - + false - + false - + Song Title - + Author - - - + + + 6 - + 0 - - - + + + 0 0 - + 100 0 - + Select All - - + + :/exports/export_selectall.png:/exports/export_selectall.png - - + + Qt::Horizontal - + QSizePolicy::Expanding - + 89 20 @@ -180,50 +181,50 @@ - - - + + + 0 0 - + 0 0 - - + + 0 - - + + 70 0 - + Lyrics - + Title - + Author - + @@ -236,23 +237,23 @@ - - - + + + 0 0 - - + + 0 - - + + Qt::Vertical - + 20 40 @@ -261,34 +262,34 @@ - - - + + + 0 0 - + 25 25 - + - - + + :/exports/export_move_to_list.png:/exports/export_move_to_list.png - - + + Qt::Vertical - + 20 40 @@ -300,91 +301,91 @@ - - - + + + 0 0 - - + + 0 - - + + Song Export List - - + + QAbstractItemView::MultiSelection - + false - + false - + false - + Song Title - + Author - - - + + + 6 - + 0 - - - + + + 0 0 - + 100 0 - + Select All - - + + :/exports/export_selectall.png:/exports/export_selectall.png - - + + Qt::Horizontal - + QSizePolicy::Expanding - + 92 20 @@ -396,46 +397,46 @@ - - - + + + 0 0 - - + + 0 - - - + + + 0 0 - + 140 0 - + Remove Selected - - + + :/exports/export_remove.png:/exports/export_remove.png - - + + Qt::Horizontal - + 49 20 @@ -456,42 +457,42 @@ - - - + + + 0 0 - + Progress: - - + + 8 - + 8 - + 0 - + 8 - + 8 - - + + Ready to export - - + + 24 @@ -500,20 +501,20 @@ - - - + + + 8 - + 0 - - + + Qt::Horizontal - + 288 20 @@ -522,15 +523,15 @@ - - + + Export - - + + Close @@ -541,20 +542,20 @@ - + ClosePushButton clicked() - OpenLPExportForm + OpenLPExportDialog close() - + 436 436 - + 462 455 @@ -566,11 +567,11 @@ ExportListTable selectAll() - + 75 281 - + 88 176 @@ -582,11 +583,11 @@ SelectedListTable selectAll() - + 311 277 - + 339 190 @@ -598,11 +599,11 @@ SelectedListTable clear() - + 379 308 - + 389 188 diff --git a/resources/forms/openlpimportform.ui b/resources/forms/openlpimportform.ui index f033ad7a6..5d21b141c 100644 --- a/resources/forms/openlpimportform.ui +++ b/resources/forms/openlpimportform.ui @@ -1,7 +1,8 @@ - - OpenLPImportForm - - + + + OpenLPImportDialog + + 0 0 @@ -9,49 +10,49 @@ 459 - + openlp.org Song Importer - - + + :/icon/openlp.org-icon-32.bmp:/icon/openlp.org-icon-32.bmp - - + + 8 - - - + + + 0 0 - - + + 3 - + 0 - - + + Select openlp.org songfile to import: - + - - + + - - + + :/imports/import_load.png:/imports/import_load.png @@ -60,115 +61,115 @@ - - - + + + 0 0 - + QFrame::Box - + QFrame::Raised - - + + 8 - + 8 - - - + + + 0 0 - - + + 6 - + 0 - - + + Import File Song List - - + + QAbstractItemView::MultiSelection - + false - + false - + false - + Song Title - + Author - - - + + + 6 - + 0 - - - + + + 0 0 - + 100 0 - + Select All - - + + :/imports/import_selectall.png:/imports/import_selectall.png - - + + Qt::Horizontal - + QSizePolicy::Expanding - + 89 20 @@ -180,50 +181,50 @@ - - - + + + 0 0 - + 0 0 - - + + 0 - - + + 70 0 - + Lyrics - + Title - + Author - + @@ -236,23 +237,23 @@ - - - + + + 0 0 - - + + 0 - - + + Qt::Vertical - + 20 40 @@ -261,34 +262,34 @@ - - - + + + 0 0 - + 25 25 - + - - + + :/imports/import_move_to_list.png:/imports/import_move_to_list.png - - + + Qt::Vertical - + 20 40 @@ -300,91 +301,91 @@ - - - + + + 0 0 - - + + 0 - - + + Song Import List - - + + QAbstractItemView::MultiSelection - + false - + false - + false - + Song Title - + Author - - - + + + 6 - + 0 - - - + + + 0 0 - + 100 0 - + Select All - - + + :/imports/import_selectall.png:/imports/import_selectall.png - - + + Qt::Horizontal - + QSizePolicy::Expanding - + 92 20 @@ -396,46 +397,46 @@ - - - + + + 0 0 - - + + 0 - - - + + + 0 0 - + 140 0 - + Remove Selected - - + + :/imports/import_remove.png:/imports/import_remove.png - - + + Qt::Horizontal - + 49 20 @@ -456,42 +457,42 @@ - - - + + + 0 0 - + Progress: - - + + 8 - + 8 - + 0 - + 8 - + 8 - - + + Ready to import - - + + 24 @@ -500,20 +501,20 @@ - - - + + + 8 - + 0 - - + + Qt::Horizontal - + 288 20 @@ -522,15 +523,15 @@ - - + + Import - - + + Close @@ -541,20 +542,20 @@ - + ClosePushButton clicked() - OpenLPImportForm + OpenLPImportDialog close() - + 436 436 - + 462 455 @@ -566,11 +567,11 @@ ImportListTable selectAll() - + 75 281 - + 88 176 @@ -582,11 +583,11 @@ SelectedListTable selectAll() - + 311 277 - + 339 190 @@ -598,11 +599,11 @@ SelectedListTable clear() - + 379 308 - + 389 188 diff --git a/resources/forms/opensongexportform.ui b/resources/forms/opensongexportform.ui index 4263877ca..54f6bd9cd 100644 --- a/resources/forms/opensongexportform.ui +++ b/resources/forms/opensongexportform.ui @@ -1,7 +1,8 @@ - - OpenSongExportForm - - + + + OpenSongExportDialog + + 0 0 @@ -9,49 +10,49 @@ 459 - + OpenSong Song Exporter - - + + :/icon/openlp.org-icon-32.bmp:/icon/openlp.org-icon-32.bmp - - + + 8 - - - + + + 0 0 - - + + 3 - + 0 - - + + Select OpenSong song folder: - + - - + + - - + + :/exports/export_load.png:/exports/export_load.png @@ -60,115 +61,115 @@ - - - + + + 0 0 - + QFrame::Box - + QFrame::Raised - - + + 8 - + 8 - - - + + + 0 0 - - + + 6 - + 0 - - + + Full Song List - - + + QAbstractItemView::MultiSelection - + false - + false - + false - + Song Title - + Author - - - + + + 6 - + 0 - - - + + + 0 0 - + 100 0 - + Select All - - + + :/exports/export_selectall.png:/exports/export_selectall.png - - + + Qt::Horizontal - + QSizePolicy::Expanding - + 89 20 @@ -180,50 +181,50 @@ - - - + + + 0 0 - + 0 0 - - + + 0 - - + + 70 0 - + Lyrics - + Title - + Author - + @@ -236,23 +237,23 @@ - - - + + + 0 0 - - + + 0 - - + + Qt::Vertical - + 20 40 @@ -261,34 +262,34 @@ - - - + + + 0 0 - + 25 25 - + - - + + :/exports/export_move_to_list.png:/exports/export_move_to_list.png - - + + Qt::Vertical - + 20 40 @@ -300,91 +301,91 @@ - - - + + + 0 0 - - + + 0 - - + + Song Export List - - + + QAbstractItemView::MultiSelection - + false - + false - + false - + Song Title - + Author - - - + + + 6 - + 0 - - - + + + 0 0 - + 100 0 - + Select All - - + + :/exports/export_selectall.png:/exports/export_selectall.png - - + + Qt::Horizontal - + QSizePolicy::Expanding - + 92 20 @@ -396,46 +397,46 @@ - - - + + + 0 0 - - + + 0 - - - + + + 0 0 - + 140 0 - + Remove Selected - - + + :/exports/export_remove.png:/exports/export_remove.png - - + + Qt::Horizontal - + 49 20 @@ -456,42 +457,42 @@ - - - + + + 0 0 - + Progress: - - + + 8 - + 8 - + 0 - + 8 - + 8 - - + + Ready to export - - + + 24 @@ -500,20 +501,20 @@ - - - + + + 8 - + 0 - - + + Qt::Horizontal - + 288 20 @@ -522,15 +523,15 @@ - - + + Export - - + + Close @@ -541,20 +542,20 @@ - + ClosePushButton clicked() - OpenSongExportForm + OpenSongExportDialog close() - + 436 436 - + 462 455 @@ -566,11 +567,11 @@ ExportListTable selectAll() - + 75 281 - + 88 176 @@ -582,11 +583,11 @@ SelectedListTable selectAll() - + 311 277 - + 339 190 @@ -598,11 +599,11 @@ SelectedListTable clear() - + 379 308 - + 389 188 diff --git a/resources/forms/opensongimportform.ui b/resources/forms/opensongimportform.ui index b16d02ede..5e8a20fd6 100644 --- a/resources/forms/opensongimportform.ui +++ b/resources/forms/opensongimportform.ui @@ -1,60 +1,61 @@ - - OpenSongImportForm - - + + + OpenSongImportDialog + + 0 0 481 - 153 + 172 - + OpenSong Song Importer - - + + :/icon/openlp.org-icon-32.bmp:/icon/openlp.org-icon-32.bmp - - + + 6 - + 8 - - - + + + 0 0 - - + + 6 - + 0 - - + + OpenSong Folder: - + - - + + - - + + :/imports/import_load.png:/imports/import_load.png @@ -63,42 +64,42 @@ - - - + + + 0 0 - + Progress: - - + + 6 - + 6 - + 0 - + 8 - + 8 - - + + Ready to import - - + + 24 @@ -107,20 +108,20 @@ - - - + + + 8 - + 0 - - + + Qt::Horizontal - + 288 20 @@ -129,15 +130,15 @@ - - + + Import - - + + Close @@ -148,20 +149,20 @@ - + ClosePushButton clicked() - OpenSongImportForm + OpenSongImportDialog close() - + 424 132 - + 288 -25