From 9d77444ddf9c380017c1ac7c846d6a1056253653 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Fri, 9 Jul 2010 21:27:18 +0100
Subject: [PATCH] Revert Changes

---
 openlp/core/ui/amendthemedialog.py | 21 +++++++--------------
 openlp/core/ui/amendthemeform.py   | 14 +-------------
 openlp/core/ui/thememanager.py     |  2 +-
 3 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/openlp/core/ui/amendthemedialog.py b/openlp/core/ui/amendthemedialog.py
index e8b9c64e3..a5cd69610 100644
--- a/openlp/core/ui/amendthemedialog.py
+++ b/openlp/core/ui/amendthemedialog.py
@@ -646,20 +646,13 @@ class Ui_AmendThemeDialog(object):
             QtGui.QDialogButtonBox.Ok)
         self.ThemeButtonBox.setObjectName(u'ThemeButtonBox')
         self.AmendThemeLayout.addWidget(self.ThemeButtonBox)
-        self.SaveAsButton = QtGui.QPushButton(
-            translate('AmendThemeForm','Save &as'))
-        self.SaveAsButton.setCheckable(True)
-        self.SaveAsButton.setAutoDefault(False)
-        self.ThemeButtonBox.addButton(self.SaveAsButton,
-            QtGui.QDialogButtonBox.ActionRole)
+
         self.retranslateUi(AmendThemeDialog)
         self.ThemeTabWidget.setCurrentIndex(0)
         QtCore.QObject.connect(self.ThemeButtonBox,
             QtCore.SIGNAL(u'accepted()'), AmendThemeDialog.accept)
         QtCore.QObject.connect(self.ThemeButtonBox,
             QtCore.SIGNAL(u'rejected()'), AmendThemeDialog.reject)
-        QtCore.QObject.connect(self.SaveAsButton,
-            QtCore.SIGNAL(u'clicked()'), AmendThemeDialog.saveAs)
         QtCore.QMetaObject.connectSlotsByName(AmendThemeDialog)
         AmendThemeDialog.setTabOrder(self.ThemeButtonBox, self.ThemeNameEdit)
         AmendThemeDialog.setTabOrder(self.ThemeNameEdit, self.ThemeTabWidget)
@@ -855,19 +848,19 @@ class Ui_AmendThemeDialog(object):
             translate('AmendThemeForm', 'Alignment'))
         self.HorizontalLabel.setText(
             translate('AmendThemeForm', 'Horizontal align:'))
-        self.HorizontalComboBox.setItemText(0,
+        self.HorizontalComboBox.setItemText(0, 
             translate('AmendThemeForm', 'Left'))
-        self.HorizontalComboBox.setItemText(1,
+        self.HorizontalComboBox.setItemText(1, 
             translate('AmendThemeForm', 'Right'))
-        self.HorizontalComboBox.setItemText(2,
+        self.HorizontalComboBox.setItemText(2, 
             translate('AmendThemeForm', 'Center'))
         self.VerticalLabel.setText(
             translate('AmendThemeForm', 'Vertical align:'))
-        self.VerticalComboBox.setItemText(0,
+        self.VerticalComboBox.setItemText(0, 
             translate('AmendThemeForm', 'Top'))
-        self.VerticalComboBox.setItemText(1,
+        self.VerticalComboBox.setItemText(1, 
             translate('AmendThemeForm', 'Middle'))
-        self.VerticalComboBox.setItemText(2,
+        self.VerticalComboBox.setItemText(2, 
             translate('AmendThemeForm', 'Bottom'))
         self.TransitionGroupBox.setTitle(
             translate('AmendThemeForm', 'Slide Transition'))
diff --git a/openlp/core/ui/amendthemeform.py b/openlp/core/ui/amendthemeform.py
index f827b1639..1c2658dc3 100644
--- a/openlp/core/ui/amendthemeform.py
+++ b/openlp/core/ui/amendthemeform.py
@@ -137,12 +137,6 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog):
             QtCore.SIGNAL(u'stateChanged(int)'),
             self.onSlideTransitionCheckBoxChanged)
 
-    def saveAs(self):
-        self.ThemeNameEdit.setEnabled(True)
-        self.SaveAsButton.setEnabled(False)
-        self.ThemeNameEdit.setText(u'')
-        self.ThemeNameEdit.setFocus()
-
     def accept(self):
         new_theme = ThemeXML()
         theme_name = unicode(self.ThemeNameEdit.text())
@@ -206,7 +200,7 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog):
             save_from, save_to) is not False:
             return QtGui.QDialog.accept(self)
 
-    def loadTheme(self, theme, newTheme=False):
+    def loadTheme(self, theme):
         log.debug(u'LoadTheme %s', theme)
         self.theme = theme
         # Stop the initial screen setup generating 1 preview per field!
@@ -214,12 +208,6 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog):
         self.paintUi(self.theme)
         self.allowPreview = True
         self.previewTheme()
-        self.ThemeNameEdit.setEnabled(True)
-        self.SaveAsButton.setEnabled(False)
-        if not newTheme:
-            self.ThemeNameEdit.setEnabled(False)
-            self.SaveAsButton.setEnabled(True)
-
 
     def onImageToolButtonClicked(self):
         images_filter = get_images_filter()
diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py
index 43f214690..46b4d0c50 100644
--- a/openlp/core/ui/thememanager.py
+++ b/openlp/core/ui/thememanager.py
@@ -173,7 +173,7 @@ class ThemeManager(QtGui.QWidget):
         editing form for the user to make their customisations.
         """
         theme = self.createThemeFromXml(self.baseTheme(), self.path)
-        self.amendThemeForm.loadTheme(theme, True)
+        self.amendThemeForm.loadTheme(theme)
         self.saveThemeName = u''
         self.amendThemeForm.exec_()