From 0e773c7a1b3ddfd640ccdb78fbf2f74d0f3f53d6 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 27 Feb 2011 15:33:08 +0000 Subject: [PATCH] Lists from the web now --- openlp/core/ui/firsttimeform.py | 28 +++++++++++++++- resources/forms/firsttimewizard.ui | 53 +++++++++++++++--------------- 2 files changed, 53 insertions(+), 28 deletions(-) diff --git a/openlp/core/ui/firsttimeform.py b/openlp/core/ui/firsttimeform.py index 35cc65b1f..f739b9a81 100644 --- a/openlp/core/ui/firsttimeform.py +++ b/openlp/core/ui/firsttimeform.py @@ -44,8 +44,14 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard): def __init__(self, parent=None): # check to see if we have web access - self.webAccess = get_web_page(u'http://openlp.org1') + self.webAccess = get_web_page(u'http://openlp.org/files/frw/themes.lst') print self.webAccess + if self.webAccess: + self.themes = self.webAccess.read() + songs = get_web_page(u'http://openlp.org/files/frw/songs.lst') + self.songs = songs.read() + bibles = get_web_page(u'http://openlp.org/files/frw/bibles.lst') + self.bibles = bibles.read() QtGui.QWizard.__init__(self, parent) self.setupUi(self) QtCore.QObject.connect(self.autoLanguageCheckBox, @@ -78,6 +84,26 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard): self.qmList = LanguageManager.get_qm_list() for key in sorted(self.qmList.keys()): self.LanguageComboBox.addItem(key) + treewidgetitem = QtGui.QTreeWidgetItem(self.selectionTreeWidget) + treewidgetitem.setText(0, u'Songs') + self.__loadChild(treewidgetitem, self.songs) + treewidgetitem = QtGui.QTreeWidgetItem(self.selectionTreeWidget) + treewidgetitem.setText(0, u'Bibles') + self.__loadChild(treewidgetitem, self.bibles) + treewidgetitem = QtGui.QTreeWidgetItem(self.selectionTreeWidget) + treewidgetitem.setText(0, u'Themes') + self.__loadChild(treewidgetitem, self.themes) + + def __loadChild(self, tree, list): + list = list.split(u'\n') + for item in list: + if item: + child = QtGui.QTreeWidgetItem(tree) + child.setText(0, item) + child.setCheckState(0, QtCore.Qt.Unchecked) + child.setFlags(QtCore.Qt.ItemIsUserCheckable | + QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) + #self.themeSelectionComboBox.addItem(theme) def accept(self): self.__pluginStatus(self.songsCheckBox, u'songs/status') diff --git a/resources/forms/firsttimewizard.ui b/resources/forms/firsttimewizard.ui index ec55bcd42..5e20b017b 100644 --- a/resources/forms/firsttimewizard.ui +++ b/resources/forms/firsttimewizard.ui @@ -250,10 +250,10 @@ p, li { white-space: pre-wrap; } - 30 - 50 - 441 - 191 + 20 + 0 + 501 + 281 @@ -261,29 +261,28 @@ p, li { white-space: pre-wrap; } - - - - - Sample Songs - - - - - - - Bible XXX (Repeat per bible) - - - - - - - Theme XXX (Repeat per theme) - - - - + + + Qt::ScrollBarAlwaysOff + + + false + + + true + + + QAbstractItemView::NoSelection + + + false + + + + 1 + + +