Restored display of all icons

mangle/about.py

@@ -24,5 +24,4 @@ class DialogAbout(QtGui.QDialog):
     def __init__(self, parent):
         QtGui.QDialog.__init__(self, parent)
         ui = uic.loadUi(os.path.join(resources.get_ui_path(), 'about.ui'), self)
-        label = ui.findChild(QtGui.QLabel, 'label')
-        label.setPixmap(QtGui.QPixmap(os.path.join(resources.get_image_path(), 'banner_about.png')))
+        self.label.setPixmap(QtGui.QPixmap(os.path.join(resources.get_image_path(), 'banner_about.png')))

mangle/book.py

@@ -14,11 +14,13 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-import os, os.path
+import os
+from os.path import join as pjoin
 from PyQt4 import QtGui, QtCore, QtXml, uic
+from PyQt4.QtGui import QIcon
 
 import image
-import resources
+from resources import get_ui_path, get_image_path
 from image import ImageFlags
 from about import DialogAbout
 from options import DialogOptions
@@ -107,7 +109,16 @@ class Book:
 class MainWindowBook(QtGui.QMainWindow):
     def __init__(self, filename=None):
         QtGui.QMainWindow.__init__(self)
-        ui = uic.loadUi(os.path.join(resources.get_ui_path(), 'book.ui'), self)
+        ui = uic.loadUi(os.path.join(get_ui_path(), 'book.ui'), self)
+        self.actionFileNew.setIcon(QIcon(pjoin(get_image_path(), 'file_new.png')))
+        self.actionFileOpen.setIcon(QIcon(pjoin(get_image_path(), 'file_open.png')))
+        self.actionFileSave.setIcon(QIcon(pjoin(get_image_path(), 'save_file.png')))
+        self.actionBookAddFiles.setIcon(QIcon(pjoin(get_image_path(), 'add_file.png')))
+        self.actionBookAddDirectory.setIcon(QIcon(pjoin(get_image_path(), 'add_directory.png')))
+        self.actionBookRemove.setIcon(QIcon(pjoin(get_image_path(), 'remove_files.png')))
+        self.actionBookShiftUp.setIcon(QIcon(pjoin(get_image_path(), 'shift_up.png')))
+        self.actionBookShiftDown.setIcon(QIcon(pjoin(get_image_path(), 'shift_down.png')))
+        self.actionBookExport.setIcon(QIcon(pjoin(get_image_path(), 'export_book.png')))
         self.connect(self.actionFileNew, QtCore.SIGNAL('triggered()'), self.onFileNew)
         self.connect(self.actionFileOpen, QtCore.SIGNAL('triggered()'), self.onFileOpen)
         self.connect(self.actionFileSave, QtCore.SIGNAL('triggered()'), self.onFileSave)

mangle/resources/ui/book.ui

@@ -33,7 +33,7 @@
      <x>0</x>
      <y>0</y>
      <width>800</width>
-     <height>25</height>
+     <height>29</height>
     </rect>
    </property>
    <widget class="QMenu" name="menu_File">
@@ -107,10 +107,6 @@
    <addaction name="actionBookExport"/>
   </widget>
   <action name="actionFileNew">
-   <property name="icon">
-    <iconset resource="../res/resources.qrc">
-     <normaloff>:/img/img/file_new.png</normaloff>:/img/img/file_new.png</iconset>
-   </property>
    <property name="text">
     <string>&amp;New</string>
    </property>
@@ -122,10 +118,6 @@
    </property>
   </action>
   <action name="actionFileOpen">
-   <property name="icon">
-    <iconset resource="../res/resources.qrc">
-     <normaloff>:/img/img/file_open.png</normaloff>:/img/img/file_open.png</iconset>
-   </property>
    <property name="text">
     <string>&amp;Open...</string>
    </property>
@@ -137,10 +129,6 @@
    </property>
   </action>
   <action name="actionFileSave">
-   <property name="icon">
-    <iconset resource="../res/resources.qrc">
-     <normaloff>:/img/img/save_file.png</normaloff>:/img/img/save_file.png</iconset>
-   </property>
    <property name="text">
     <string>&amp;Save</string>
    </property>
@@ -176,10 +164,6 @@
    </property>
   </action>
   <action name="actionBookRemove">
-   <property name="icon">
-    <iconset resource="../res/resources.qrc">
-     <normaloff>:/img/img/remove_files.png</normaloff>:/img/img/remove_files.png</iconset>
-   </property>
    <property name="text">
     <string>&amp;Remove</string>
    </property>
@@ -191,10 +175,6 @@
    </property>
   </action>
   <action name="actionBookExport">
-   <property name="icon">
-    <iconset resource="../res/resources.qrc">
-     <normaloff>:/img/img/export_book.png</normaloff>:/img/img/export_book.png</iconset>
-   </property>
    <property name="text">
     <string>&amp;Export...</string>
    </property>
@@ -222,10 +202,6 @@
    </property>
   </action>
   <action name="actionBookAddFiles">
-   <property name="icon">
-    <iconset resource="../res/resources.qrc">
-     <normaloff>:/img/img/add_file.png</normaloff>:/img/img/add_file.png</iconset>
-   </property>
    <property name="text">
     <string>&amp;Files...</string>
    </property>
@@ -237,10 +213,6 @@
    </property>
   </action>
   <action name="actionBookAddDirectory">
-   <property name="icon">
-    <iconset resource="../res/resources.qrc">
-     <normaloff>:/img/img/add_directory.png</normaloff>:/img/img/add_directory.png</iconset>
-   </property>
    <property name="text">
     <string>&amp;Directory...</string>
    </property>
@@ -252,10 +224,6 @@
    </property>
   </action>
   <action name="actionBookShiftUp">
-   <property name="icon">
-    <iconset resource="../res/resources.qrc">
-     <normaloff>:/img/img/shift_up.png</normaloff>:/img/img/shift_up.png</iconset>
-   </property>
    <property name="text">
     <string>&amp;Up</string>
    </property>
@@ -267,10 +235,6 @@
    </property>
   </action>
   <action name="actionBookShiftDown">
-   <property name="icon">
-    <iconset resource="../res/resources.qrc">
-     <normaloff>:/img/img/shift_down.png</normaloff>:/img/img/shift_down.png</iconset>
-   </property>
    <property name="text">
     <string>&amp;Down</string>
    </property>