diff --git a/images/actions32.png b/images/actions32.png deleted file mode 100755 index 16d64fc1..00000000 Binary files a/images/actions32.png and /dev/null differ diff --git a/images/delta32.png b/images/delta32.png deleted file mode 100755 index f7d95da0..00000000 Binary files a/images/delta32.png and /dev/null differ diff --git a/images/details32.png b/images/details32.png deleted file mode 100644 index 8ab245b4..00000000 Binary files a/images/details32.png and /dev/null differ diff --git a/images/folderwin32.png b/images/folderwin32.png deleted file mode 100755 index 5e861a4b..00000000 Binary files a/images/folderwin32.png and /dev/null differ diff --git a/images/minus_8.png b/images/minus_8.png new file mode 100644 index 00000000..5495659f Binary files /dev/null and b/images/minus_8.png differ diff --git a/images/plus_8.png b/images/plus_8.png new file mode 100644 index 00000000..1e4bad54 Binary files /dev/null and b/images/plus_8.png differ diff --git a/images/power_marker32.png b/images/power_marker32.png deleted file mode 100755 index 48129026..00000000 Binary files a/images/power_marker32.png and /dev/null differ diff --git a/images/preferences32.png b/images/preferences32.png deleted file mode 100755 index bdbc4051..00000000 Binary files a/images/preferences32.png and /dev/null differ diff --git a/qt/base/dg.qrc b/qt/base/dg.qrc index 52a56271..cf5d5507 100644 --- a/qt/base/dg.qrc +++ b/qt/base/dg.qrc @@ -6,5 +6,7 @@ ../../images/dgme_logo_128.png ../../images/dgse_logo_32.png ../../images/dgse_logo_128.png + ../../images/plus_8.png + ../../images/minus_8.png \ No newline at end of file diff --git a/qt/base/directories_dialog.py b/qt/base/directories_dialog.py index fb5157cf..4655cbf1 100644 --- a/qt/base/directories_dialog.py +++ b/qt/base/directories_dialog.py @@ -6,10 +6,10 @@ # which should be included with this package. The terms are also available at # http://www.hardcoded.net/licenses/bsd_license -from PyQt4.QtCore import QSize, QRect +from PyQt4.QtCore import QRect from PyQt4.QtGui import (QWidget, QFileDialog, QHeaderView, QVBoxLayout, QHBoxLayout, QTreeView, QAbstractItemView, QSpacerItem, QSizePolicy, QPushButton, QApplication, QMessageBox, QMainWindow, - QMenuBar, QMenu) + QMenuBar, QMenu, QIcon, QPixmap) from qtlib.recent import Recent from core.app import NoScannableFileError @@ -116,10 +116,12 @@ class DirectoriesDialog(QMainWindow): header.resizeSection(1, 100) self.verticalLayout.addWidget(self.treeView) self.horizontalLayout = QHBoxLayout() - self.removeFolderButton = QPushButton("Remove", self.centralwidget) + self.removeFolderButton = QPushButton(self.centralwidget) + self.removeFolderButton.setIcon(QIcon(QPixmap(":/minus"))) self.removeFolderButton.setShortcut("Del") self.horizontalLayout.addWidget(self.removeFolderButton) - self.addFolderButton = QPushButton("Add", self.centralwidget) + self.addFolderButton = QPushButton(self.centralwidget) + self.addFolderButton.setIcon(QIcon(QPixmap(":/plus"))) self.horizontalLayout.addWidget(self.addFolderButton) spacerItem1 = QSpacerItem(40, 20, QSizePolicy.Expanding, QSizePolicy.Minimum) self.horizontalLayout.addItem(spacerItem1) diff --git a/qt/base/result_window.py b/qt/base/result_window.py index 9f0e5bd2..05b13ef5 100644 --- a/qt/base/result_window.py +++ b/qt/base/result_window.py @@ -143,7 +143,6 @@ class ResultWindow(QMainWindow): # Action menu actionMenu = QMenu('Actions', self.menubar) - actionMenu.setIcon(QIcon(QPixmap(":/actions"))) actionMenu.addAction(self.actionDeleteMarked) actionMenu.addAction(self.actionHardlinkMarked) actionMenu.addAction(self.actionMoveMarked)