Cleanups and fixes

openlp/core/lib/settingsmanager.py

@@ -27,7 +27,9 @@ class SettingsManager(object):
         self.screen = screen[0]
         self.width = self.screen[u'size'].width()
         self.height = self.screen[u'size'].height()
-        self.mainwindow_width = self.width * 0.8
         self.mainwindow_height = self.height * 0.8
         self.mainwindow_docbars = self.width / 3
-        self.mainwindow_slidecontroller = self.width / 6
+        if self.mainwindow_docbars > 300:
+            self.mainwindow_docbars = 300
+        self.mainwindow_slidecontroller = (self.width - (self.mainwindow_docbars * 2  ) / 2) / 2
+        print self.width,  self.mainwindow_docbars, self.mainwindow_slidecontroller

openlp/core/ui/mainwindow.py

@@ -106,7 +106,7 @@ class Ui_MainWindow(object):
         self.MediaManagerDock.setWindowIcon(icon)
         self.MediaManagerDock.setFloating(False)
         self.MediaManagerDock.setObjectName(u'MediaManagerDock')
-        self.MediaManagerDock.setMinimumWidth(300)
+        self.MediaManagerDock.setMinimumWidth(self.settingsmanager.mainwindow_docbars)
         self.MediaManagerContents = QtGui.QWidget()
         self.MediaManagerContents.setObjectName(u'MediaManagerContents')
         self.MediaManagerLayout = QtGui.QHBoxLayout(self.MediaManagerContents)
@@ -128,7 +128,7 @@ class Ui_MainWindow(object):
         self.ServiceManagerDock.setFeatures(
             QtGui.QDockWidget.AllDockWidgetFeatures)
         self.ServiceManagerDock.setObjectName(u'ServiceManagerDock')
-        self.ServiceManagerDock.setMinimumWidth(300)
+        self.ServiceManagerDock.setMinimumWidth(self.settingsmanager.mainwindow_docbars)
         self.ServiceManagerContents = ServiceManager(self)
         self.ServiceManagerDock.setWidget(self.ServiceManagerContents)
         MainWindow.addDockWidget(

openlp/core/ui/servicemanager.py

@@ -117,7 +117,7 @@ class ServiceManager(QtGui.QWidget):
         self.Layout.addWidget(self.Toolbar)
         # Create the service manager list
         self.ServiceManagerList = ServiceManagerList(self)
-        self.ServiceManagerList.setEditTriggers(QtGui.QAbstractItemView.CurrentChanged|QtGui.QAbstractItemView.DoubleClicked|QtGui.QAbstractItemView.EditKeyPressed)
+        self.ServiceManagerList.setEditTriggers(QtGui.QAbstractItemView.CurrentChanged|QtGui.QAbstractItemView.        DoubleClicked|QtGui.QAbstractItemView.EditKeyPressed)
         self.ServiceManagerList.setDragDropMode(QtGui.QAbstractItemView.DragDrop)
         self.ServiceManagerList.setAlternatingRowColors(True)
         self.ServiceManagerList.setHeaderHidden(True)
@@ -137,21 +137,28 @@ class ServiceManager(QtGui.QWidget):
         self.ServiceManagerList.addAction(contextMenuSeparator(self.ServiceManagerList))
         self.ServiceManagerList.addAction(contextMenuAction(
             self.ServiceManagerList, ':/services/service_delete',
-            translate(u'ServiceManager',u'&Remove from Service'), self.onDeleteFromService))
+            translate(u'ServiceManager',u'&Remove from Service'),
+            self.onDeleteFromService))
         self.Layout.addWidget(self.ServiceManagerList)
         # Add the bottom toolbar
         self.OrderToolbar = OpenLPToolbar(self)
-        self.OrderToolbar.addToolbarButton(u'Move to top', u':/services/service_top.png',
+        self.OrderToolbar.addToolbarButton(u'Move to top',
+            u':/services/service_top.png',
             translate(u'ServiceManager', u'Move to top'), self.onServiceTop)
-        self.OrderToolbar.addToolbarButton(u'Move up', u':/services/service_up.png',
+        self.OrderToolbar.addToolbarButton(u'Move up',
+            u':/services/service_up.png',
             translate(u'ServiceManager', u'Move up order'), self.onServiceUp)
-        self.OrderToolbar.addToolbarButton(u'Move down', u':/services/service_down.png',
+        self.OrderToolbar.addToolbarButton(u'Move down',
+            u':/services/service_down.png',
             translate(u'ServiceManager', u'Move down order'), self.onServiceDown)
-        self.OrderToolbar.addToolbarButton(u'Move to bottom', u':/services/service_bottom.png',
+        self.OrderToolbar.addToolbarButton(u'Move to bottom',
+            u':/services/service_bottom.png',
             translate(u'ServiceManager', u'Move to end'), self.onServiceEnd)
         self.OrderToolbar.addSeparator()
-        self.OrderToolbar.addToolbarButton(u'Delete From Service', u':/services/service_delete.png',
-            translate(u'ServiceManager', u'Delete From Service'), self.onDeleteFromService)
+        self.OrderToolbar.addToolbarButton(u'Delete From Service',
+            u':/services/service_delete.png',
+            translate(u'ServiceManager', u'Delete From Service'),
+            self.onDeleteFromService)
         self.Layout.addWidget(self.OrderToolbar)
         # Connect up our signals and slots
         QtCore.QObject.connect(self.ThemeComboBox,

openlp/plugins/presentations/lib/impresscom.py

@@ -182,7 +182,7 @@ class ImpressCOMSlide(object):
 if __name__ == '__main__':
     ooo = Openoffice()
     ooo.createResolver()
-    #show = ImpressCOMPres(ooo, u'/home/timali/test1.odp')
-    #show.go()
+    show = ImpressCOMPres(ooo, u'/home/timali/test1.odp')
+    show.go()
     #show.resume()
     #show.nextStep()