From dd70dbe515224a43abb497d124ce66e39a2ba70b Mon Sep 17 00:00:00 2001
From: suutari-olli <suutari.olli@gmail.com>
Date: Wed, 16 Mar 2016 19:37:54 +0200
Subject: [PATCH] Changed word order from "show nothing default" to "default
 show nothing" to better match other settings in the set.

---
 openlp/core/common/settings.py | 2 +-
 openlp/core/ui/advancedtab.py  | 4 ++--
 openlp/core/ui/maindisplay.py  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/openlp/core/common/settings.py b/openlp/core/common/settings.py
index d083cae7a..691bd2a69 100644
--- a/openlp/core/common/settings.py
+++ b/openlp/core/common/settings.py
@@ -121,7 +121,7 @@ class Settings(QtCore.QSettings):
         'advanced/double click live': False,
         'advanced/enable exit confirmation': True,
         'advanced/expand service item': False,
-        'advanced/show nothing default': False,
+        'advanced/default show nothing': False,
         'advanced/hide mouse': True,
         'advanced/is portable': False,
         'advanced/max recent files': 20,
diff --git a/openlp/core/ui/advancedtab.py b/openlp/core/ui/advancedtab.py
index f95da5595..2ffeb20ba 100644
--- a/openlp/core/ui/advancedtab.py
+++ b/openlp/core/ui/advancedtab.py
@@ -357,7 +357,7 @@ class AdvancedTab(SettingsTab):
         self.x11_bypass_check_box.setChecked(settings.value('x11 bypass wm'))
         self.default_color = settings.value('default color')
         self.default_file_edit.setText(settings.value('default image'))
-        self.default_show_nothing_check_box.setChecked(settings.value('show nothing default'))
+        self.default_show_nothing_check_box.setChecked(settings.value('default show nothing'))
         self.slide_limits = settings.value('slide limits')
         self.is_search_as_you_type_enabled = settings.value('search as type')
         self.search_as_type_check_box.setChecked(self.is_search_as_you_type_enabled)
@@ -431,7 +431,7 @@ class AdvancedTab(SettingsTab):
         settings.setValue('alternate rows', self.alternate_rows_check_box.isChecked())
         settings.setValue('default color', self.default_color)
         settings.setValue('default image', self.default_file_edit.text())
-        settings.setValue('show nothing default', self.default_show_nothing_check_box.isChecked())
+        settings.setValue('default show nothing', self.default_show_nothing_check_box.isChecked())
         settings.setValue('slide limits', self.slide_limits)
         if self.x11_bypass_check_box.isChecked() != settings.value('x11 bypass wm'):
             settings.setValue('x11 bypass wm', self.x11_bypass_check_box.isChecked())
diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index c5cc6fbd5..301cf5041 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -253,7 +253,7 @@ class MainDisplay(OpenLPMixin, Display, RegistryProperties):
         Display.setup(self)
         if self.is_live:
             # If "Show no Logo or Image on startup" is enabled, display transparent background instead.
-            if Settings().value('advanced/show nothing default'):
+            if Settings().value('advanced/default show nothing'):
                 self.setAttribute(QtCore.Qt.WA_TranslucentBackground)
                 self.setStyleSheet(TRANSPARENT_STYLESHEET)
             else: