openlp-core team mailing list archive

[rimach <crichter@xxxxxx>]

rimach has proposed merging lp:~crichter/openlp/testing into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~crichter/openlp/testing/+merge/50445

I tried to implement the new settings appearance.
What do you think about this?
Known problems:
1. Icons are missing at all
    - may we could use svg images in general instead of png's?
    -> we could start a graphics contest for all the items stuff?

-- 
https://code.launchpad.net/~crichter/openlp/testing/+merge/50445
Your team OpenLP Core is requested to review the proposed merge of lp:~crichter/openlp/testing into lp:openlp.

=== modified file 'openlp/core/lib/__init__.py'
--- openlp/core/lib/__init__.py	2011-02-17 12:53:07 +0000
+++ openlp/core/lib/__init__.py	2011-02-19 11:41:56 +0000
@@ -338,6 +338,7 @@
     build_lyrics_outline_css
 from toolbar import OpenLPToolbar
 from dockwidget import OpenLPDockWidget
+from tabwidget import OpenLPTabWidget
 from renderer import Renderer
 from rendermanager import RenderManager
 from mediamanageritem import MediaManagerItem

=== modified file 'openlp/core/ui/settingsdialog.py'
--- openlp/core/ui/settingsdialog.py	2011-02-14 20:32:19 +0000
+++ openlp/core/ui/settingsdialog.py	2011-02-19 11:41:56 +0000
@@ -26,7 +26,7 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import translate, build_icon
+from openlp.core.lib import translate, build_icon, OpenLPTabWidget
 from openlp.core.lib.ui import create_accept_reject_button_box
 
 class Ui_SettingsDialog(object):
@@ -37,7 +37,7 @@
             build_icon(u':/system/system_settings.png'))
         self.settingsLayout = QtGui.QVBoxLayout(settingsDialog)
         self.settingsLayout.setObjectName(u'settingsLayout')
-        self.settingsTabWidget = QtGui.QTabWidget(settingsDialog)
+        self.settingsTabWidget = OpenLPTabWidget(settingsDialog)
         self.settingsTabWidget.setObjectName(u'settingsTabWidget')
         self.settingsLayout.addWidget(self.settingsTabWidget)
         self.buttonBox = create_accept_reject_button_box(settingsDialog, True)

=== modified file 'openlp/plugins/songs/forms/editsongdialog.py'
--- openlp/plugins/songs/forms/editsongdialog.py	2011-02-10 00:36:00 +0000
+++ openlp/plugins/songs/forms/editsongdialog.py	2011-02-19 11:41:56 +0000
@@ -26,7 +26,7 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import build_icon, translate
+from openlp.core.lib import build_icon, translate, OpenLPTabWidget
 from openlp.core.lib.ui import UiStrings, create_accept_reject_button_box
 
 class Ui_EditSongDialog(object):
@@ -38,7 +38,7 @@
         editSongDialog.setModal(True)
         self.dialogLayout = QtGui.QVBoxLayout(editSongDialog)
         self.dialogLayout.setObjectName(u'dialogLayout')
-        self.songTabWidget = QtGui.QTabWidget(editSongDialog)
+        self.songTabWidget = OpenLPTabWidget(editSongDialog)
         self.songTabWidget.setObjectName(u'songTabWidget')
         # lyrics tab
         self.lyricsTab = QtGui.QWidget()