diff --git a/SavegameWidget.cpp b/SavegameWidget.cpp index 18c37b0..21b2e75 100755 --- a/SavegameWidget.cpp +++ b/SavegameWidget.cpp @@ -176,21 +176,21 @@ void SavegameWidget::contextMenuEvent(QContextMenuEvent *ev) { QMenu contextMenu(this); contextMenu.addAction(tr("&View"), this, SLOT(on_cmdView_clicked())); - contextMenu.addAction(QIcon::fromTheme("document-save"), tr("&Export"), this, SLOT(on_cmdCopy_clicked())); - contextMenu.addAction(QIcon::fromTheme("edit-delete"), tr("&Remove"), this, SLOT(on_cmdDelete_clicked())); + contextMenu.addAction(tr("&Export"), this, SLOT(on_cmdCopy_clicked())); + contextMenu.addAction(tr("&Remove"), this, SLOT(on_cmdDelete_clicked())); if (ui->cbSelected->isVisible()) { contextMenu.addSeparator(); if (!ui->cbSelected->isChecked()) { contextMenu.addAction(tr("&Select"), this, SLOT(savegameSelected())); } if (ui->cbSelected->isChecked()) { contextMenu.addAction(tr("&Deselect"), this, SLOT(savegameSelected())); } - contextMenu.addAction(QIcon::fromTheme("edit-select-all"), tr("Select &All"), this, SLOT(selectAllWidgets()), QKeySequence::fromString("Ctrl+A")); - contextMenu.addAction(QIcon::fromTheme("edit-clear"), tr("&Deselect All"), this, SLOT(deselectAllWidgets()), QKeySequence::fromString("Ctrl+D")); + contextMenu.addAction(tr("Select &All"), this, SLOT(selectAllWidgets()), QKeySequence::fromString("Ctrl+A")); + contextMenu.addAction(tr("&Deselect All"), this, SLOT(deselectAllWidgets()), QKeySequence::fromString("Ctrl+D")); } else { contextMenu.addSeparator(); contextMenu.addAction(tr("&Select"), this, SLOT(savegameSelected())); - contextMenu.addAction(QIcon::fromTheme("edit-select-all"), tr("Select &All"), this, SLOT(selectAllWidgets()), QKeySequence::fromString("Ctrl+A")); + contextMenu.addAction(tr("Select &All"), this, SLOT(selectAllWidgets()), QKeySequence::fromString("Ctrl+A")); } //ui->SavegameFrame->setStyleSheet(QString("QFrame#SavegameFrame{background-color: rgb(%1, %2, %3)}QLabel#labSavegameStr{color: rgb(%4, %5, %6)}").arg(QString::number(highlightBackColor.red()), QString::number(highlightBackColor.green()), QString::number(highlightBackColor.blue()), QString::number(highlightTextColor.red()), QString::number(highlightTextColor.green()), QString::number(highlightTextColor.blue()))); contextMenu.exec(ev->globalPos()); diff --git a/SnapmaticWidget.cpp b/SnapmaticWidget.cpp index bf01ed8..8fe57ec 100755 --- a/SnapmaticWidget.cpp +++ b/SnapmaticWidget.cpp @@ -191,25 +191,24 @@ void SnapmaticWidget::contextMenuEvent(QContextMenuEvent *ev) { QMenu contextMenu(this); QMenu exportMenu(tr("&Export"), this); - exportMenu.setIcon(QIcon::fromTheme("document-save")); exportMenu.addAction(tr("Export as &JPG picture..."), this, SLOT(on_cmdExport_clicked())); exportMenu.addAction(tr("Export as >A Snapmatic..."), this, SLOT(on_cmdCopy_clicked())); - contextMenu.addAction(QIcon::fromTheme("image-x-generic"), tr("&View"), this, SLOT(on_cmdView_clicked())); + contextMenu.addAction(tr("&View"), this, SLOT(on_cmdView_clicked())); contextMenu.addMenu(&exportMenu); - contextMenu.addAction(QIcon::fromTheme("edit-delete"), tr("&Remove"), this, SLOT(on_cmdDelete_clicked())); + contextMenu.addAction(tr("&Remove"), this, SLOT(on_cmdDelete_clicked())); if (ui->cbSelected->isVisible()) { contextMenu.addSeparator(); if (!ui->cbSelected->isChecked()) { contextMenu.addAction(tr("&Select"), this, SLOT(pictureSelected())); } if (ui->cbSelected->isChecked()) { contextMenu.addAction(tr("&Deselect"), this, SLOT(pictureSelected())); } - contextMenu.addAction(QIcon::fromTheme("edit-select-all"), tr("Select &All"), this, SLOT(selectAllWidgets()), QKeySequence::fromString("Ctrl+A")); - contextMenu.addAction(QIcon::fromTheme("edit-clear"), tr("&Deselect All"), this, SLOT(deselectAllWidgets()), QKeySequence::fromString("Ctrl+D")); + contextMenu.addAction(tr("Select &All"), this, SLOT(selectAllWidgets()), QKeySequence::fromString("Ctrl+A")); + contextMenu.addAction(tr("&Deselect All"), this, SLOT(deselectAllWidgets()), QKeySequence::fromString("Ctrl+D")); } else { contextMenu.addSeparator(); contextMenu.addAction(tr("&Select"), this, SLOT(pictureSelected())); - contextMenu.addAction(QIcon::fromTheme("edit-select-all"), tr("Select &All"), this, SLOT(selectAllWidgets()), QKeySequence::fromString("Ctrl+A")); + contextMenu.addAction(tr("Select &All"), this, SLOT(selectAllWidgets()), QKeySequence::fromString("Ctrl+A")); } contextMenu.exec(ev->globalPos()); } diff --git a/UserInterface.ui b/UserInterface.ui index 02e61d6..bbf3453 100755 --- a/UserInterface.ui +++ b/UserInterface.ui @@ -128,7 +128,7 @@ 0 0 625 - 21 + 19 @@ -214,7 +214,7 @@ - + .. @@ -226,7 +226,7 @@ - + .. @@ -238,7 +238,7 @@ - + .. @@ -258,7 +258,7 @@ - + .. @@ -270,7 +270,7 @@ - + ..