From ccb75ad3b6ca7bed5a9c017406c5320f7b636819 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Wed, 8 Sep 2010 19:12:16 +0100
Subject: [PATCH] Fix display to work on 1024x768 resolution without nasty
 slider movements

Fixes: https://launchpad.net/bugs/594808
---
 openlp/core/lib/htmlbuilder.py    |  1 -
 openlp/core/ui/slidecontroller.py | 14 ++------------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py
index 0d6482797..acf00bdeb 100644
--- a/openlp/core/lib/htmlbuilder.py
+++ b/openlp/core/lib/htmlbuilder.py
@@ -519,7 +519,6 @@ def build_footer_css(item):
     font-size: %spt;
     color: %s;
     text-align: %s;
-    vertical-align: bottom;
     """
     theme = item.themedata
     if not theme or not item.footer:
diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index 5d688b890..2ea985598 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -162,11 +162,6 @@ class SlideController(QtGui.QWidget):
         sizeToolbarPolicy.setHeightForWidth(
             self.Toolbar.sizePolicy().hasHeightForWidth())
         self.Toolbar.setSizePolicy(sizeToolbarPolicy)
-#        if self.isLive:
-#            self.Toolbar.addToolbarButton(
-#                u'First Slide', u':/slides/slide_first.png',
-#                translate('OpenLP.SlideController', 'Move to first'),
-#                self.onSlideSelectedFirst)
         self.Toolbar.addToolbarButton(
             u'Previous Slide', u':/slides/slide_previous.png',
             translate('OpenLP.SlideController', 'Move to previous'),
@@ -175,11 +170,6 @@ class SlideController(QtGui.QWidget):
             u'Next Slide', u':/slides/slide_next.png',
             translate('OpenLP.SlideController', 'Move to next'),
             self.onSlideSelectedNext)
-#        if self.isLive:
-#            self.Toolbar.addToolbarButton(
-#                u'Last Slide', u':/slides/slide_last.png',
-#                translate('OpenLP.SlideController', 'Move to last'),
-#                self.onSlideSelectedLast)
         if self.isLive:
             self.Toolbar.addToolbarSeparator(u'Close Separator')
             self.HideMenu = QtGui.QToolButton(self.Toolbar)
@@ -279,11 +269,11 @@ class SlideController(QtGui.QWidget):
         if isLive:
             self.SongMenu = QtGui.QToolButton(self.Toolbar)
             self.SongMenu.setText(translate('OpenLP.SlideController',
-                'Go to Verse'))
+                'Go to'))
             self.SongMenu.setPopupMode(QtGui.QToolButton.InstantPopup)
             self.Toolbar.addToolbarWidget(u'Song Menu', self.SongMenu)
             self.SongMenu.setMenu(QtGui.QMenu(
-                translate('OpenLP.SlideController', 'Go to Verse'),
+                translate('OpenLP.SlideController', 'Go to'),
                 self.Toolbar))
             self.Toolbar.makeWidgetsInvisible([u'Song Menu'])
         # Screen preview area