forked from openlp/openlp
Cleanups
This commit is contained in:
parent
8a42d3c7f2
commit
9239c0cdf3
@ -25,7 +25,7 @@
|
|||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
from PyQt4 import QtGui, QtCore
|
from PyQt4 import QtCore
|
||||||
|
|
||||||
from renderer import Renderer
|
from renderer import Renderer
|
||||||
from openlp.core.lib import ThemeLevel, resize_image
|
from openlp.core.lib import ThemeLevel, resize_image
|
||||||
|
@ -42,4 +42,4 @@ from mainwindow import MainWindow
|
|||||||
|
|
||||||
__all__ = ['SplashScreen', 'AboutForm', 'SettingsForm', 'MainWindow',
|
__all__ = ['SplashScreen', 'AboutForm', 'SettingsForm', 'MainWindow',
|
||||||
'MainDisplay', 'SlideController', 'ServiceManager', 'ThemeManager',
|
'MainDisplay', 'SlideController', 'ServiceManager', 'ThemeManager',
|
||||||
'AmendThemeForm', 'MediaDockManager', 'ThemeLevel']
|
'AmendThemeForm', 'MediaDockManager']
|
||||||
|
@ -25,7 +25,6 @@
|
|||||||
|
|
||||||
from PyQt4 import QtCore, QtGui
|
from PyQt4 import QtCore, QtGui
|
||||||
|
|
||||||
from openlp.core.lib import build_icon
|
|
||||||
from aboutdialog import Ui_AboutDialog
|
from aboutdialog import Ui_AboutDialog
|
||||||
|
|
||||||
class AboutForm(QtGui.QDialog, Ui_AboutDialog):
|
class AboutForm(QtGui.QDialog, Ui_AboutDialog):
|
||||||
|
@ -25,7 +25,6 @@
|
|||||||
|
|
||||||
import logging
|
import logging
|
||||||
import os
|
import os
|
||||||
import time
|
|
||||||
|
|
||||||
from PyQt4 import QtCore, QtGui
|
from PyQt4 import QtCore, QtGui
|
||||||
from PyQt4.phonon import Phonon
|
from PyQt4.phonon import Phonon
|
||||||
|
@ -30,8 +30,8 @@ import zipfile
|
|||||||
|
|
||||||
from PyQt4 import QtCore, QtGui
|
from PyQt4 import QtCore, QtGui
|
||||||
from openlp.core.lib import PluginConfig, OpenLPToolbar, ServiceItem, \
|
from openlp.core.lib import PluginConfig, OpenLPToolbar, ServiceItem, \
|
||||||
ServiceItemType, contextMenuAction, contextMenuSeparator, contextMenu, \
|
contextMenuAction, contextMenuSeparator, contextMenu, Receiver, \
|
||||||
Receiver, contextMenu, str_to_bool
|
contextMenu, str_to_bool
|
||||||
|
|
||||||
class ServiceManagerList(QtGui.QTreeWidget):
|
class ServiceManagerList(QtGui.QTreeWidget):
|
||||||
|
|
||||||
|
@ -34,8 +34,8 @@ from PyQt4 import QtCore, QtGui
|
|||||||
from openlp.core.ui import AmendThemeForm
|
from openlp.core.ui import AmendThemeForm
|
||||||
from openlp.core.theme import Theme
|
from openlp.core.theme import Theme
|
||||||
from openlp.core.lib import PluginConfig, OpenLPToolbar, contextMenuAction, \
|
from openlp.core.lib import PluginConfig, OpenLPToolbar, contextMenuAction, \
|
||||||
ThemeXML, ThemeLevel, str_to_bool, get_text_file_string, build_icon, \
|
ThemeXML, str_to_bool, get_text_file_string, build_icon, Receiver, \
|
||||||
Receiver, contextMenuSeparator
|
contextMenuSeparator
|
||||||
from openlp.core.utils import ConfigHelper
|
from openlp.core.utils import ConfigHelper
|
||||||
|
|
||||||
class ThemeManager(QtGui.QWidget):
|
class ThemeManager(QtGui.QWidget):
|
||||||
|
@ -26,7 +26,6 @@
|
|||||||
import logging
|
import logging
|
||||||
import os
|
import os
|
||||||
import os.path
|
import os.path
|
||||||
from time import sleep
|
|
||||||
|
|
||||||
from PyQt4 import QtCore, QtGui
|
from PyQt4 import QtCore, QtGui
|
||||||
|
|
||||||
|
@ -23,13 +23,11 @@
|
|||||||
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
|
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
import os
|
|
||||||
import os.path
|
|
||||||
import logging
|
import logging
|
||||||
import chardet
|
import chardet
|
||||||
import codecs
|
import codecs
|
||||||
from lxml import objectify
|
|
||||||
|
|
||||||
|
from lxml import objectify
|
||||||
from PyQt4 import QtCore
|
from PyQt4 import QtCore
|
||||||
|
|
||||||
from openlp.core.lib import Receiver
|
from openlp.core.lib import Receiver
|
||||||
|
@ -147,4 +147,4 @@ if __name__ == u'__main__':
|
|||||||
newdb = os.path.join(newpath, u'songs.sqlite')
|
newdb = os.path.join(newpath, u'songs.sqlite')
|
||||||
mig.convert_sqlite2_to_3(olddb, newdb)
|
mig.convert_sqlite2_to_3(olddb, newdb)
|
||||||
mig.process()
|
mig.process()
|
||||||
#mig.move_log_file()
|
#mig.move_log_file()
|
||||||
|
Loading…
Reference in New Issue
Block a user