More bits

openlp/core/ui/icons.py

@@ -91,8 +91,10 @@ class UiIcons(object):
             'stop': 'fa.stop',
             'theme': 'fa.file-image-o',
             'top': 'fa.angle-double-up',
+            'undo': 'fa.undo',
             'upload': 'fa.cloud-upload',
             'user': 'fa.user',
+            'users': 'fa.users',
             'video': 'fa.file-video-o'
         }
 
@@ -105,7 +107,7 @@ class UiIcons(object):
     @staticmethod
     def _print_icons():
         """
-        Have ability to dump icons to see what is available
+        Have ability to dump icons to see what is available.  Can only run within an application
         :return:
         """
         ico = qta._resource['iconic']

openlp/core/widgets/buttons.py

@@ -49,7 +49,7 @@ class ColorButton(QtWidgets.QPushButton):
         """
         Sets the _color variable and the background color.
 
-        :param color:  String representation of a hexidecimal color
+        :param color:  String representation of a hexadecimal color
         """
         self._color = color
         self.setStyleSheet('background-color: %s' % color)
@@ -59,7 +59,7 @@ class ColorButton(QtWidgets.QPushButton):
         """
         Property method to return the color variable
 
-        :return:  String representation of a hexidecimal color
+        :return:  String representation of a hexadecimal color
         """
         return self._color
 
@@ -68,7 +68,7 @@ class ColorButton(QtWidgets.QPushButton):
         """
         Property setter to change the instance color
 
-        :param color:  String representation of a hexidecimal color
+        :param color:  String representation of a hexadecimal color
         """
         self.change_color(color)
 

openlp/core/widgets/edits.py

@@ -33,6 +33,7 @@ from openlp.core.common.path import Path, path_to_str, str_to_path
 from openlp.core.common.settings import Settings
 from openlp.core.lib import FormattingTags, build_icon
 from openlp.core.lib.ui import create_widget_action, create_action
+from openlp.core.ui.icons import UiIcons
 from openlp.core.widgets.dialogs import FileDialog
 from openlp.core.widgets.enums import PathEditType
 
@@ -229,10 +230,10 @@ class PathEdit(QtWidgets.QWidget):
         self.line_edit = QtWidgets.QLineEdit(self)
         widget_layout.addWidget(self.line_edit)
         self.browse_button = QtWidgets.QToolButton(self)
-        self.browse_button.setIcon(build_icon(':/general/general_open.png'))
+        self.browse_button.setIcon(UiIcons().open)
         widget_layout.addWidget(self.browse_button)
         self.revert_button = QtWidgets.QToolButton(self)
-        self.revert_button.setIcon(build_icon(':/general/general_revert.png'))
+        self.revert_button.setIcon(UiIcons().undo)
         self.revert_button.setVisible(show_revert)
         widget_layout.addWidget(self.revert_button)
         self.setLayout(widget_layout)

openlp/plugins/songs/forms/editversedialog.py

@@ -26,6 +26,7 @@ from openlp.core.common.i18n import UiStrings, translate
 from openlp.core.common.settings import Settings
 from openlp.core.lib import build_icon
 from openlp.core.lib.ui import create_button_box
+from openlp.core.ui.icons import UiIcons
 from openlp.core.widgets.edits import SpellTextEdit
 from openlp.plugins.songs.lib import VerseType
 
@@ -44,11 +45,11 @@ class Ui_EditVerseDialog(object):
         self.verse_type_layout = QtWidgets.QHBoxLayout()
         self.verse_type_layout.setObjectName('verse_type_layout')
         self.forced_split_button = QtWidgets.QPushButton(edit_verse_dialog)
-        self.forced_split_button.setIcon(build_icon(':/general/general_add.png'))
+        self.forced_split_button.setIcon(UiIcons().add)
         self.forced_split_button.setObjectName('forced_split_button')
         self.verse_type_layout.addWidget(self.forced_split_button)
         self.overflow_split_button = QtWidgets.QPushButton(edit_verse_dialog)
-        self.overflow_split_button.setIcon(build_icon(':/general/general_add.png'))
+        self.overflow_split_button.setIcon(UiIcons().add)
         self.overflow_split_button.setObjectName('overflow_split_button')
         self.verse_type_layout.addWidget(self.overflow_split_button)
         self.verse_type_label = QtWidgets.QLabel(edit_verse_dialog)
@@ -64,7 +65,7 @@ class Ui_EditVerseDialog(object):
         self.verse_number_box.setObjectName('verse_number_box')
         self.verse_type_layout.addWidget(self.verse_number_box)
         self.insert_button = QtWidgets.QPushButton(edit_verse_dialog)
-        self.insert_button.setIcon(build_icon(':/general/general_add.png'))
+        self.insert_button.setIcon(UiIcons().add)
         self.insert_button.setObjectName('insert_button')
         self.verse_type_layout.addWidget(self.insert_button)
         self.verse_type_layout.addStretch()
@@ -76,11 +77,11 @@ class Ui_EditVerseDialog(object):
             self.transpose_label.setObjectName('transpose_label')
             self.transpose_layout.addWidget(self.transpose_label)
             self.transpose_up_button = QtWidgets.QPushButton(edit_verse_dialog)
-            self.transpose_up_button.setIcon(build_icon(':/services/service_up.png'))
+            self.transpose_up_button.setIcon(UiIcons().arrow_up)
             self.transpose_up_button.setObjectName('transpose_up')
             self.transpose_layout.addWidget(self.transpose_up_button)
             self.transpose_down_button = QtWidgets.QPushButton(edit_verse_dialog)
-            self.transpose_down_button.setIcon(build_icon(':/services/service_down.png'))
+            self.transpose_down_button.setIcon(UiIcons().arrow_down)
             self.transpose_down_button.setObjectName('transpose_down')
             self.transpose_layout.addWidget(self.transpose_down_button)
             self.dialog_layout.addLayout(self.transpose_layout)