openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/wizard into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~trb143/openlp/wizard/+merge/52444

Only allow songs download if there is no songs database
-- 
https://code.launchpad.net/~trb143/openlp/wizard/+merge/52444
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/wizard into lp:openlp.

=== modified file 'openlp/core/ui/firsttimeform.py'
--- openlp/core/ui/firsttimeform.py	2011-03-06 20:09:03 +0000
+++ openlp/core/ui/firsttimeform.py	2011-03-07 17:46:32 +0000
@@ -83,9 +83,13 @@
         if self.webAccess:
             self.internetGroupBox.setVisible(True)
             self.noInternetLabel.setVisible(False)
-            treewidgetitem = QtGui.QTreeWidgetItem(self.selectionTreeWidget)
-            treewidgetitem.setText(0, self.songsText)
-            self._loadChild(treewidgetitem, u'songs', u'languages', u'songs')
+            # If songs database exists do not allow a copy
+            songs = os.path.join(AppLocation.get_section_data_path(u'songs'),
+                u'songs.sqlite')
+            if not os.path.exists(songs):
+                treewidgetitem = QtGui.QTreeWidgetItem(self.selectionTreeWidget)
+                treewidgetitem.setText(0, self.songsText)
+                self._loadChild(treewidgetitem, u'songs', u'languages', u'songs')
             treewidgetitem = QtGui.QTreeWidgetItem(self.selectionTreeWidget)
             treewidgetitem.setText(0, self.biblesText)
             self._loadChild(treewidgetitem, u'bibles', u'translations',