openlp-core team mailing list archive

[Unit 193 <unit193@xxxxxxxxx>]

Unit 193 has proposed merging lp:~unit193/openlp/debian-package into lp:openlp/debian-package.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~unit193/openlp/debian-package/+merge/152366

Quick and small fix to the patches
-- 
https://code.launchpad.net/~unit193/openlp/debian-package/+merge/152366
Your team OpenLP Core is requested to review the proposed merge of lp:~unit193/openlp/debian-package into lp:openlp/debian-package.

=== modified file 'debian/patches/disable-version-check.patch'
--- debian/patches/disable-version-check.patch	2013-02-21 12:07:47 +0000
+++ debian/patches/disable-version-check.patch	2013-03-08 10:21:20 +0000
@@ -3,19 +3,14 @@
 Forwarded: not-needed
 --- old/openlp/core/__init__.py        2012-12-30 19:41:24 +0000
 +++ new/openlp/core/__init__.py        2013-02-21 11:38:27 +0000
-@@ -159,10 +159,10 @@
+@@ -149,9 +149,6 @@
          self.processEvents()
          if not has_run_wizard:
-             self.mainWindow.firstTime()
--        update_check = Settings().value(
--            u'general/update check', QtCore.QVariant(True)).toBool()
+             self.main_window.first_time()
+-        update_check = Settings().value(u'general/update check')
 -        if update_check:
--            VersionThread(self.mainWindow).start()
-+        #update_check = Settings().value(
-+        #    u'general/update check', QtCore.QVariant(True)).toBool()
-+        #if update_check:
-+        #    VersionThread(self.mainWindow).start()
-         Receiver.send_message(u'live_display_blank_check')
-         self.mainWindow.appStartup()
-         # Skip exec_() for gui tests
+-            VersionThread(self.main_window).start()
+         self.main_window.is_display_blank()
+         self.main_window.app_startup()
+         return self.exec_()
 

=== modified file 'debian/patches/hide-check-setting.patch'
--- debian/patches/hide-check-setting.patch	2013-02-22 20:38:35 +0000
+++ debian/patches/hide-check-setting.patch	2013-03-08 10:21:20 +0000
@@ -2,7 +2,7 @@
 Author: Raoul Snyman <raoulsnyman@xxxxxxxxxx>
 --- old/openlp/core/ui/generaltab.py	2012-12-30 19:41:24 +0000
 +++ new/openlp/core/ui/generaltab.py	2013-02-22 20:32:35 +0000
-@@ -164,6 +164,7 @@
+@@ -165,6 +165,7 @@
          self.startupLayout.addWidget(self.showSplashCheckBox)
          self.checkForUpdatesCheckBox = QtGui.QCheckBox(self.startupGroupBox)
          self.checkForUpdatesCheckBox.setObjectName(u'checkForUpdatesCheckBox')