raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Style Fixups

Browse Source
This commit is contained in:
Tim Bentley 2010-09-26 13:23:50 +01:00
parent 2f75087e40
commit 0d5fc3c980
2 changed files with 58 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
openlp/core/ui/filerenamedialog.py
View File

@ -1,14 +1,33 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
# Form implementation generated from reading ui file 'filerenamedialog.ui' ###############################################################################
# # OpenLP - Open Source Lyrics Projection #
# Created: Sat Sep 25 16:20:30 2010 # --------------------------------------------------------------------------- #
# by: PyQt4 UI code generator 4.7.3 # Copyright (c) 2008-2010 Raoul Snyman #
# # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
# WARNING! All changes made in this file will be lost! # Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
# --------------------------------------------------------------------------- #
# 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 from PyQt4 import QtCore, QtGui
from openlp.core.lib import translate
class Ui_FileRenameDialog(object): class Ui_FileRenameDialog(object):
def setupUi(self, FileRenameDialog): def setupUi(self, FileRenameDialog):
FileRenameDialog.setObjectName("FileRenameDialog") FileRenameDialog.setObjectName("FileRenameDialog")
@ -33,6 +52,8 @@ class Ui_FileRenameDialog(object):
QtCore.QMetaObject.connectSlotsByName(FileRenameDialog) QtCore.QMetaObject.connectSlotsByName(FileRenameDialog)
def retranslateUi(self, FileRenameDialog): def retranslateUi(self, FileRenameDialog):
FileRenameDialog.setWindowTitle(QtGui.QApplication.translate("FileRenameDialog", "File Rename", None, QtGui.QApplication.UnicodeUTF8)) FileRenameDialog.setWindowTitle(self.transitionGroupBox.setTitle(
self.FileRenameLabel.setText(QtGui.QApplication.translate("FileRenameDialog", "New File Name:", None, QtGui.QApplication.UnicodeUTF8)) translate('OpenLP.FileRenameForm', 'File Rename')))
self.FileRenameLabel.setText(translate('OpenLP.FileRenameForm',
'New File Name:'))

58
openlp/core/ui/thememanager.py
View File

@ -270,37 +270,37 @@ class ThemeManager(QtGui.QWidget):
save_to = os.path.join(self.path, theme_name, filename) save_to = os.path.join(self.path, theme_name, filename)
save_from = oldThemeData.background_filename save_from = oldThemeData.background_filename
new_theme.add_font(unicode(oldThemeData.font_main_name), new_theme.add_font(unicode(oldThemeData.font_main_name),
unicode(oldThemeData.font_main_color), unicode(oldThemeData.font_main_color),
unicode(oldThemeData.font_main_proportion), unicode(oldThemeData.font_main_proportion),
unicode(oldThemeData.font_main_override), u'main', unicode(oldThemeData.font_main_override), u'main',
unicode(oldThemeData.font_main_weight), unicode(oldThemeData.font_main_weight),
unicode(oldThemeData.font_main_italics), unicode(oldThemeData.font_main_italics),
unicode(oldThemeData.font_main_line_adjustment), unicode(oldThemeData.font_main_line_adjustment),
unicode(oldThemeData.font_main_x), unicode(oldThemeData.font_main_x),
unicode(oldThemeData.font_main_y), unicode(oldThemeData.font_main_y),
unicode(oldThemeData.font_main_width), unicode(oldThemeData.font_main_width),
unicode(oldThemeData.font_main_height)) unicode(oldThemeData.font_main_height))
new_theme.add_font(unicode(oldThemeData.font_footer_name), new_theme.add_font(unicode(oldThemeData.font_footer_name),
unicode(oldThemeData.font_footer_color), unicode(oldThemeData.font_footer_color),
unicode(oldThemeData.font_footer_proportion), unicode(oldThemeData.font_footer_proportion),
unicode(oldThemeData.font_footer_override), u'footer', unicode(oldThemeData.font_footer_override), u'footer',
unicode(oldThemeData.font_footer_weight), unicode(oldThemeData.font_footer_weight),
unicode(oldThemeData.font_footer_italics), unicode(oldThemeData.font_footer_italics),
0, # line adjustment 0, # line adjustment
unicode(oldThemeData.font_footer_x), unicode(oldThemeData.font_footer_x),
unicode(oldThemeData.font_footer_y), unicode(oldThemeData.font_footer_y),
unicode(oldThemeData.font_footer_width), unicode(oldThemeData.font_footer_width),
unicode(oldThemeData.font_footer_height)) unicode(oldThemeData.font_footer_height))
new_theme.add_display(unicode(oldThemeData.display_shadow), new_theme.add_display(unicode(oldThemeData.display_shadow),
unicode(oldThemeData.display_shadow_color), unicode(oldThemeData.display_shadow_color),
unicode(oldThemeData.display_outline), unicode(oldThemeData.display_outline),
unicode(oldThemeData.display_outline_color), unicode(oldThemeData.display_outline_color),
unicode(oldThemeData.display_horizontal_align), unicode(oldThemeData.display_horizontal_align),
unicode(oldThemeData.display_vertical_align), unicode(oldThemeData.display_vertical_align),
unicode(oldThemeData.display_wrap_style), unicode(oldThemeData.display_wrap_style),
unicode(oldThemeData.display_slide_transition), unicode(oldThemeData.display_slide_transition),
unicode(oldThemeData.display_shadow_size), unicode(oldThemeData.display_shadow_size),
unicode(oldThemeData.display_outline_size)) unicode(oldThemeData.display_outline_size))
theme = new_theme.extract_xml() theme = new_theme.extract_xml()
pretty_theme = new_theme.extract_formatted_xml() pretty_theme = new_theme.extract_formatted_xml()
self.saveTheme(newThemeName, theme, pretty_theme, save_from, save_to) self.saveTheme(newThemeName, theme, pretty_theme, save_from, save_to)