forked from openlp/openlp
Start to add ServiceManager
This commit is contained in:
parent
b2f9f24120
commit
db2efd386d
@ -17,8 +17,8 @@ You should have received a copy of the GNU General Public License along with
|
|||||||
this program; if not, write to the Free Software Foundation, Inc., 59 Temple
|
this program; if not, write to the Free Software Foundation, Inc., 59 Temple
|
||||||
Place, Suite 330, Boston, MA 02111-1307 USA
|
Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
"""
|
"""
|
||||||
from settingsmanager import SettingsManager
|
#from settingsmanager import SettingsManager
|
||||||
from openlp.core.lib.pluginmanager import PluginManager
|
#from openlp.core.lib.pluginmanager import PluginManager
|
||||||
|
#
|
||||||
__all__ = ['SettingsManager', 'PluginManager' ]
|
#__all__ = ['SettingsManager', 'PluginManager' ]
|
||||||
|
|
||||||
|
@ -57,13 +57,15 @@ def contextMenuSeparator(base):
|
|||||||
action.setSeparator(True)
|
action.setSeparator(True)
|
||||||
return action
|
return action
|
||||||
|
|
||||||
|
from settingsmanager import SettingsManager
|
||||||
from pluginconfig import PluginConfig
|
from pluginconfig import PluginConfig
|
||||||
from plugin import Plugin
|
from plugin import Plugin
|
||||||
|
from eventmanager import EventManager
|
||||||
|
from pluginmanager import PluginManager
|
||||||
from settingstab import SettingsTab
|
from settingstab import SettingsTab
|
||||||
from mediamanageritem import MediaManagerItem
|
from mediamanageritem import MediaManagerItem
|
||||||
from event import Event
|
from event import Event
|
||||||
from event import EventType
|
from event import EventType
|
||||||
from eventmanager import EventManager
|
|
||||||
from xmlrootclass import XmlRootClass
|
from xmlrootclass import XmlRootClass
|
||||||
from serviceitem import ServiceItem
|
from serviceitem import ServiceItem
|
||||||
from eventreceiver import Receiver
|
from eventreceiver import Receiver
|
||||||
@ -79,5 +81,4 @@ from baselistwithdnd import BaseListWithDnD
|
|||||||
from listwithpreviews import ListWithPreviews
|
from listwithpreviews import ListWithPreviews
|
||||||
|
|
||||||
__all__ = [ 'translate', 'file_to_xml', 'str_to_bool',
|
__all__ = [ 'translate', 'file_to_xml', 'str_to_bool',
|
||||||
'contextMenuAction', 'contextMenuSeparator','ServiceItem'
|
'contextMenuAction', 'contextMenuSeparator','ServiceItem']
|
||||||
]
|
|
||||||
|
@ -19,5 +19,9 @@ Place, Suite 330, Boston, MA 02111-1307 USA
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
class SettingsManager(object):
|
class SettingsManager(object):
|
||||||
def __init__(self):
|
"""
|
||||||
|
Class to control the size of the UI components so they size correctly
|
||||||
|
This class is created by the main window and then calculates the size of individual components
|
||||||
|
"""
|
||||||
|
def __init__(self, screen):
|
||||||
pass
|
pass
|
@ -25,8 +25,7 @@ from PyQt4 import QtCore, QtGui
|
|||||||
from openlp.core.ui import AboutForm, SettingsForm, AlertForm, ServiceManager, \
|
from openlp.core.ui import AboutForm, SettingsForm, AlertForm, ServiceManager, \
|
||||||
ThemeManager, MainDisplay, SlideController
|
ThemeManager, MainDisplay, SlideController
|
||||||
from openlp.core.lib import translate, Plugin, MediaManagerItem, SettingsTab, \
|
from openlp.core.lib import translate, Plugin, MediaManagerItem, SettingsTab, \
|
||||||
EventManager, RenderManager, PluginConfig
|
EventManager, RenderManager, PluginConfig, SettingsManager, PluginManager
|
||||||
from openlp.core import PluginManager
|
|
||||||
|
|
||||||
class MainWindow(object):
|
class MainWindow(object):
|
||||||
"""
|
"""
|
||||||
@ -42,6 +41,7 @@ class MainWindow(object):
|
|||||||
plugins.
|
plugins.
|
||||||
"""
|
"""
|
||||||
self.oosNotSaved = False
|
self.oosNotSaved = False
|
||||||
|
self.settingsmanager = SettingsManager(screens)
|
||||||
self.mainWindow = QtGui.QMainWindow()
|
self.mainWindow = QtGui.QMainWindow()
|
||||||
self.mainWindow.__class__.closeEvent = self.onCloseEvent
|
self.mainWindow.__class__.closeEvent = self.onCloseEvent
|
||||||
self.mainDisplay = MainDisplay(None, screens)
|
self.mainDisplay = MainDisplay(None, screens)
|
||||||
|
Loading…
Reference in New Issue
Block a user