forked from openlp/openlp
Fix import painting and allow import to Cancel
bzr-revno: 307
This commit is contained in:
parent
fcc9b37df6
commit
feca659f11
@ -23,6 +23,7 @@ import sys
|
|||||||
import logging
|
import logging
|
||||||
|
|
||||||
from PyQt4 import QtCore, QtGui
|
from PyQt4 import QtCore, QtGui
|
||||||
|
from openlp.core.lib import Receiver
|
||||||
|
|
||||||
logging.basicConfig(level=logging.DEBUG,
|
logging.basicConfig(level=logging.DEBUG,
|
||||||
format='%(asctime)s %(name)-12s %(levelname)-8s %(message)s',
|
format='%(asctime)s %(name)-12s %(levelname)-8s %(message)s',
|
||||||
@ -36,6 +37,8 @@ from openlp.core.ui import MainWindow, SplashScreen
|
|||||||
class OpenLP(QtGui.QApplication):
|
class OpenLP(QtGui.QApplication):
|
||||||
|
|
||||||
def run(self):
|
def run(self):
|
||||||
|
QtCore.QObject.connect(Receiver().get_receiver(),QtCore.SIGNAL("openlpprocessevents"),self.processEvents)
|
||||||
|
|
||||||
self.setApplicationName('openlp.org')
|
self.setApplicationName('openlp.org')
|
||||||
self.setApplicationVersion('1.9.0')
|
self.setApplicationVersion('1.9.0')
|
||||||
self.splash = SplashScreen()
|
self.splash = SplashScreen()
|
||||||
|
@ -25,7 +25,7 @@ from PyQt4 import QtCore, QtGui
|
|||||||
|
|
||||||
from openlp.core.resources import *
|
from openlp.core.resources import *
|
||||||
from openlp.core.ui import AboutForm, AlertForm, SettingsDialog, SlideController
|
from openlp.core.ui import AboutForm, AlertForm, SettingsDialog, SlideController
|
||||||
from openlp.core.lib import Plugin, MediaManagerItem, SettingsTab, Receiver
|
from openlp.core.lib import Plugin, MediaManagerItem, SettingsTab
|
||||||
|
|
||||||
from openlp.core import PluginManager
|
from openlp.core import PluginManager
|
||||||
|
|
||||||
@ -40,10 +40,6 @@ class MainWindow(object):
|
|||||||
pluginpath = os.path.abspath(os.path.join(pluginpath, '..', '..','plugins'))
|
pluginpath = os.path.abspath(os.path.join(pluginpath, '..', '..','plugins'))
|
||||||
self.plugin_manager = PluginManager(pluginpath)
|
self.plugin_manager = PluginManager(pluginpath)
|
||||||
self.setupUi()
|
self.setupUi()
|
||||||
QtCore.QObject.connect(Receiver().get_receiver(),QtCore.SIGNAL("openlprepaint"),self.repaint)
|
|
||||||
|
|
||||||
def repaint(self):
|
|
||||||
self.main_window.repaint()
|
|
||||||
|
|
||||||
def setupUi(self):
|
def setupUi(self):
|
||||||
self.main_window.setObjectName("main_window")
|
self.main_window.setObjectName("main_window")
|
||||||
|
@ -48,11 +48,7 @@ class BiblePlugin(Plugin, PluginUtils):
|
|||||||
#Register the bible Manager
|
#Register the bible Manager
|
||||||
self.biblemanager = BibleManager(self.config)
|
self.biblemanager = BibleManager(self.config)
|
||||||
self.searchresults = {} # place to store the search results
|
self.searchresults = {} # place to store the search results
|
||||||
self.receiver = Receiver()
|
QtCore.QObject.connect(Receiver().get_receiver(),QtCore.SIGNAL("openlpreloadbibles"),self.reload_bibles)
|
||||||
QtCore.QObject.connect(self.receiver.get_receiver(),QtCore.SIGNAL("openlprepaint"),self.repaint)
|
|
||||||
|
|
||||||
def repaint(self):
|
|
||||||
self.MediaManagerItem.repaint()
|
|
||||||
|
|
||||||
def get_media_manager_item(self):
|
def get_media_manager_item(self):
|
||||||
# Create the MediaManagerItem object
|
# Create the MediaManagerItem object
|
||||||
|
@ -41,11 +41,6 @@ class BibleImportForm(QDialog, Ui_BibleImportDialog, PluginUtils):
|
|||||||
QtCore.QObject.connect(self.LocationComboBox, QtCore.SIGNAL("activated(int)"), self.onLocationComboBox)
|
QtCore.QObject.connect(self.LocationComboBox, QtCore.SIGNAL("activated(int)"), self.onLocationComboBox)
|
||||||
QtCore.QObject.connect(self.TypeComboBox, QtCore.SIGNAL("activated(int)"), self.onTypeComboBox)
|
QtCore.QObject.connect(self.TypeComboBox, QtCore.SIGNAL("activated(int)"), self.onTypeComboBox)
|
||||||
QtCore.QObject.connect(self.BibleComboBox, QtCore.SIGNAL("activated(int)"), self.onBibleComboBox)
|
QtCore.QObject.connect(self.BibleComboBox, QtCore.SIGNAL("activated(int)"), self.onBibleComboBox)
|
||||||
QtCore.QObject.connect(self.ProgressBar, QtCore.SIGNAL("valueChanged(int)"), self.on_ProgressBar_changed)
|
|
||||||
QtCore.QObject.connect(Receiver().get_receiver(),QtCore.SIGNAL("openlprepaint"),self.on_ProgressBar_changed)
|
|
||||||
|
|
||||||
def on_ProgressBar_changed(self):
|
|
||||||
self.repaint()
|
|
||||||
|
|
||||||
@pyqtSignature("")
|
@pyqtSignature("")
|
||||||
def on_VersesFileButton_clicked(self):
|
def on_VersesFileButton_clicked(self):
|
||||||
@ -123,6 +118,8 @@ class BibleImportForm(QDialog, Ui_BibleImportDialog, PluginUtils):
|
|||||||
|
|
||||||
@pyqtSignature("")
|
@pyqtSignature("")
|
||||||
def on_CancelButton_clicked(self):
|
def on_CancelButton_clicked(self):
|
||||||
|
print "Closed selected"
|
||||||
|
Receiver().send_message("openlpstopimport")
|
||||||
self.close()
|
self.close()
|
||||||
|
|
||||||
@pyqtSignature("")
|
@pyqtSignature("")
|
||||||
@ -137,7 +134,7 @@ class BibleImportForm(QDialog, Ui_BibleImportDialog, PluginUtils):
|
|||||||
self._import_bible()
|
self._import_bible()
|
||||||
self.MessageLabel.setText("Import Complete")
|
self.MessageLabel.setText("Import Complete")
|
||||||
self.ProgressBar.setValue(self.barmax)
|
self.ProgressBar.setValue(self.barmax)
|
||||||
self.bibleplugin.reload_bibles() # Update form as we have a new bible
|
Receiver().send_message("openlpreloadbibles")
|
||||||
|
|
||||||
def setMax(self, max):
|
def setMax(self, max):
|
||||||
log.debug("set Max %s", max)
|
log.debug("set Max %s", max)
|
||||||
|
Loading…
Reference in New Issue
Block a user