renderer r1024

openlp/core/ui/__init__.py

@@ -31,7 +31,11 @@ The :mod:`ui` module provides the core user interface for OpenLP
 
 import re
 import sys
-import enchant
+try:
+    import enchant
+    enchant_available = True
+except ImportError:
+    enchant_available = False
 
 from PyQt4 import QtCore, QtGui
 from openlp.core.lib import html_expands, translate, context_menu_action
@@ -41,9 +45,10 @@ class SpellTextEdit(QtGui.QPlainTextEdit):
     def __init__(self, *args):
         QtGui.QPlainTextEdit.__init__(self, *args)
         # Default dictionary based on the current locale.
-        self.dict = enchant.Dict()
+        if enchant_available:
-        self.highlighter = Highlighter(self.document())
+            self.dict = enchant.Dict()
-        self.highlighter.setDict(self.dict)
+            self.highlighter = Highlighter(self.document())
+            self.highlighter.setDict(self.dict)
 
     def mousePressEvent(self, event):
         if event.button() == QtCore.Qt.RightButton:
@@ -63,7 +68,7 @@ class SpellTextEdit(QtGui.QPlainTextEdit):
 
         # Check if the selected word is misspelled and offer spelling
         # suggestions if it is.
-        if self.textCursor().hasSelection():
+        if enchant_available and self.textCursor().hasSelection():
             text = unicode(self.textCursor().selectedText())
             if not self.dict.check(text):
                 spell_menu = QtGui.QMenu(translate('OpenLP.SpellTextEdit',

openlp/core/ui/generaltab.py

@@ -466,7 +466,6 @@ class GeneralTab(SettingsTab):
         Receiver.send_message(u'config_updated')
         # On save update the screens as well
         self.postSetUp()
-        self.overrideChanged = False
 
     def postSetUp(self):
         """
@@ -487,6 +486,7 @@ class GeneralTab(SettingsTab):
             else:
                 self.screens.reset_current_display()
                 Receiver.send_message(u'config_screen_changed')
+        self.overrideChanged = False
 
     def onOverrideCheckBoxToggled(self, checked):
         """

openlp/core/ui/maindisplay.py

@@ -55,6 +55,7 @@ class DisplayWidget(QtGui.QGraphicsView):
             QtCore.Qt.Key_Enter: 'slidecontroller_live_next_noloop',
             QtCore.Qt.Key_0: 'servicemanager_next_item',
             QtCore.Qt.Key_Backspace: 'slidecontroller_live_previous_noloop'}
+        self.setStyleSheet(u'border: none;')
 
     def keyPressEvent(self, event):
         # Key events only needed for live

openlp/core/ui/servicemanager.py

@@ -317,9 +317,8 @@ class ServiceManager(QtGui.QWidget):
         self.serviceItemEditForm.setServiceItem(
             self.serviceItems[item][u'service_item'])
         if self.serviceItemEditForm.exec_():
-            self.serviceItems[item][u'service_item'] = \
+            self.addServiceItem(self.serviceItemEditForm.getServiceItem(),
-                self.serviceItemEditForm.getServiceItem()
+                replace=True)
-            self.repaintServiceList(item, 0)
 
     def nextItem(self):
         """

resources/images/openlp-logo.svg

@@ -10,8 +10,8 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1052.3622"
+   width="467.39178"
-   height="744.09448"
+   height="467.39178"
    id="svg5740"
    sodipodi:version="0.32"
    inkscape:version="0.47 r22583"
@@ -66,7 +66,8 @@
        id="perspective5748" />
     <filter
        inkscape:collect="always"
-       id="filter6926">
+       id="filter6926"
+       color-interpolation-filters="sRGB">
       <feGaussianBlur
          inkscape:collect="always"
          stdDeviation="3.5771872"
@@ -165,14 +166,6 @@
        y1="276.68851"
        x2="469.44925"
        y2="104.30029" />
-    <filter
-       inkscape:collect="always"
-       id="filter4005">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="4.333215"
-         id="feGaussianBlur4007" />
-    </filter>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3208"
@@ -262,14 +255,14 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="1.0119683"
-     inkscape:cx="513.59551"
+     inkscape:cx="501.72348"
-     inkscape:cy="490.71958"
+     inkscape:cy="187.6618"
      inkscape:document-units="px"
      inkscape:current-layer="layer6"
      showgrid="false"
      inkscape:window-width="1600"
      inkscape:window-height="839"
-     inkscape:window-x="-4"
+     inkscape:window-x="1022"
      inkscape:window-y="-3"
      inkscape:window-maximized="1" />
   <metadata
@@ -287,27 +280,32 @@
      inkscape:label="Shadow"
      inkscape:groupmode="layer"
      id="layer1"
-     style="display:inline" />
+     style="display:inline"
+     transform="translate(-11.872025,-13.171852)" />
   <g
      inkscape:groupmode="layer"
      id="layer5"
      inkscape:label="Border"
-     style="display:inline" />
+     style="display:inline"
+     transform="translate(-11.872025,-13.171852)" />
   <g
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="Rays Background"
-     style="display:inline" />
+     style="display:inline"
+     transform="translate(-11.872025,-13.171852)" />
   <g
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Rays Foreground"
-     style="display:inline" />
+     style="display:inline"
+     transform="translate(-11.872025,-13.171852)" />
   <g
      inkscape:groupmode="layer"
      id="layer6"
      inkscape:label="Reflection"
-     style="display:inline">
+     style="display:inline"
+     transform="translate(-11.872025,-13.171852)">
     <g
        id="g4018"
        transform="translate(9.8817328,9.8817328)">
@@ -322,14 +320,14 @@
          sodipodi:cy="395.26932"
          sodipodi:cx="475.31134"
          id="path6903"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.00028753;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline;filter:url(#filter6926)"
+         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline;filter:url(#filter6926)"
          sodipodi:type="arc" />
       <path
          inkscape:export-ydpi="90"
          inkscape:export-xdpi="90"
          inkscape:export-filename="/home/raoul/openlp-logo-0.2.png"
          sodipodi:type="arc"
-         style="fill:#051e52;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.00028753;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+         style="fill:#051e52;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
          id="path6900"
          sodipodi:cx="475.31134"
          sodipodi:cy="395.26932"
@@ -348,19 +346,19 @@
          sodipodi:cy="395.26932"
          sodipodi:cx="475.31134"
          id="path6317"
-         style="fill:url(#linearGradient4053);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.00028753;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+         style="fill:url(#linearGradient4053);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
          sodipodi:type="arc" />
       <path
          inkscape:export-ydpi="90"
          inkscape:export-xdpi="90"
          inkscape:export-filename="/home/raoul/openlp-logo-0.2.png"
          id="path6327"
-         d="M 235.67972,13.233984 C 199.75196,13.233984 165.79894,21.722639 135.704,36.792417 L 296.72396,165.96674 L 452.81639,291.19091 C 457.1409,273.83274 459.43393,255.67894 459.43393,236.98819 C 459.43393,113.48164 359.18627,13.233985 235.67972,13.233984 z M 79.118968,77.210299 C 71.146114,85.023824 63.764822,93.431949 57.026574,102.35694 L 274.63156,209.66285 L 434.20584,288.36064 L 275.3035,193.86221 L 79.118968,77.210299 z M 24.488653,162.95322 C 20.860793,173.29149 17.984378,183.97391 15.896035,194.94138 L 260.17479,255.29332 L 422.98657,295.52794 L 260.21551,241.36595 L 24.488653,162.95322 z M 13.513722,263.49906 C 14.818764,274.53653 16.911081,285.32646 19.764749,295.81301 L 248.30394,302.32874 L 421.76487,307.29698 L 253.55725,289.23619 L 13.513722,263.49906 z M 428.50457,317.76287 L 249.79034,336.84174 L 47.782384,358.40473 C 53.741585,367.60372 60.347088,376.34577 67.553549,384.54909 L 244.45559,351.80755 L 428.50457,317.76287 z M 442.28941,322.97545 L 253.92376,385.15994 L 120.92144,429.05966 C 154.48464,449.16902 193.73296,460.72203 235.67972,460.72204 C 328.7226,460.72204 408.56552,403.84299 442.28941,322.97545 z"
+         d="m 235.67972,13.233984 c -35.92776,0 -69.88078,8.488655 -99.97572,23.558433 L 296.72396,165.96674 452.81639,291.19091 c 4.32451,-17.35817 6.61754,-35.51197 6.61754,-54.20272 0,-123.50655 -100.24766,-223.754205 -223.75421,-223.754206 z M 79.118968,77.210299 C 71.146114,85.023824 63.764822,93.431949 57.026574,102.35694 L 274.63156,209.66285 434.20584,288.36064 275.3035,193.86221 79.118968,77.210299 z M 24.488653,162.95322 c -3.62786,10.33827 -6.504275,21.02069 -8.592618,31.98816 L 260.17479,255.29332 422.98657,295.52794 260.21551,241.36595 24.488653,162.95322 z M 13.513722,263.49906 c 1.305042,11.03747 3.397359,21.8274 6.251027,32.31395 l 228.539191,6.51573 173.46093,4.96824 L 253.55725,289.23619 13.513722,263.49906 z M 428.50457,317.76287 249.79034,336.84174 47.782384,358.40473 c 5.959201,9.19899 12.564704,17.94104 19.771165,26.14436 L 244.45559,351.80755 428.50457,317.76287 z m 13.78484,5.21258 -188.36565,62.18449 -133.00232,43.89972 c 33.5632,20.10936 72.81152,31.66237 114.75828,31.66238 93.04288,0 172.8858,-56.87905 206.60969,-137.74659 z"
-         style="fill:url(#linearGradient4055);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+         style="fill:url(#linearGradient4055);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />
       <path
          id="path3203"
-         d="M 235.67972,13.233984 C 199.75196,13.233984 165.79894,21.722639 135.704,36.792417 L 296.72396,165.96674 L 349.27738,208.13573 C 388.42508,203.26072 423.85383,195.91016 453.73266,186.69491 C 430.89209,87.375898 341.89666,13.233985 235.67972,13.233984 z M 79.118968,77.210299 C 71.146114,85.023824 63.764822,93.431949 57.026574,102.35694 L 274.63156,209.66285 L 282.95948,213.77591 C 290.87301,213.39575 298.68426,212.91815 306.39574,212.35059 L 275.3035,193.86221 L 79.118968,77.210299 z M 24.488653,162.95322 C 21.826867,170.53849 19.56686,178.3145 17.728584,186.24695 C 60.352717,199.56405 114.44154,209.03001 174.67621,212.92072 L 24.488653,162.95322 z"
+         d="m 235.67972,13.233984 c -35.92776,0 -69.88078,8.488655 -99.97572,23.558433 l 161.01996,129.174323 52.55342,42.16899 c 39.1477,-4.87501 74.57645,-12.22557 104.45528,-21.44082 C 430.89209,87.375898 341.89666,13.233985 235.67972,13.233984 z M 79.118968,77.210299 c -7.972854,7.813525 -15.354146,16.22165 -22.092394,25.146641 l 217.604986,107.30591 8.32792,4.11306 c 7.91353,-0.38016 15.72478,-0.85776 23.43626,-1.42532 L 275.3035,193.86221 79.118968,77.210299 z M 24.488653,162.95322 c -2.661786,7.58527 -4.921793,15.36128 -6.760069,23.29373 42.624133,13.3171 96.712956,22.78306 156.947626,26.67377 L 24.488653,162.95322 z"
-         style="fill:url(#linearGradient4057);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.80000019;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+         style="fill:url(#linearGradient4057);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />
     </g>
   </g>
 </svg>