diff --git a/SavegameWidget.cpp b/SavegameWidget.cpp index 5e4edc8..54a1b2e 100755 --- a/SavegameWidget.cpp +++ b/SavegameWidget.cpp @@ -189,21 +189,21 @@ void SavegameWidget::contextMenuEvent(QContextMenuEvent *ev) { QMenu contextMenu(this); contextMenu.addAction(tr("&View"), this, SLOT(on_cmdView_clicked())); - contextMenu.addAction(tr("&Export"), this, SLOT(on_cmdCopy_clicked())); - contextMenu.addAction(tr("&Remove"), this, SLOT(on_cmdDelete_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())); 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(tr("Select &All"), this, SLOT(selectAllWidgets()), QKeySequence::fromString("Ctrl+A")); - contextMenu.addAction(tr("&Deselect All"), this, SLOT(deselectAllWidgets()), QKeySequence::fromString("Ctrl+D")); + 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")); } else { contextMenu.addSeparator(); contextMenu.addAction(tr("&Select"), this, SLOT(savegameSelected())); - contextMenu.addAction(tr("Select &All"), this, SLOT(selectAllWidgets()), QKeySequence::fromString("Ctrl+A")); + contextMenu.addAction(QIcon::fromTheme("edit-select-all"), 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 93a5f3b..b56fea7 100755 --- a/SnapmaticWidget.cpp +++ b/SnapmaticWidget.cpp @@ -203,24 +203,25 @@ 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(tr("&View"), this, SLOT(on_cmdView_clicked())); + contextMenu.addAction(QIcon::fromTheme("image-x-generic"), tr("&View"), this, SLOT(on_cmdView_clicked())); contextMenu.addMenu(&exportMenu); - contextMenu.addAction(tr("&Remove"), this, SLOT(on_cmdDelete_clicked())); + contextMenu.addAction(QIcon::fromTheme("edit-delete"), 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(tr("Select &All"), this, SLOT(selectAllWidgets()), QKeySequence::fromString("Ctrl+A")); - contextMenu.addAction(tr("&Deselect All"), this, SLOT(deselectAllWidgets()), QKeySequence::fromString("Ctrl+D")); + 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")); } else { contextMenu.addSeparator(); contextMenu.addAction(tr("&Select"), this, SLOT(pictureSelected())); - contextMenu.addAction(tr("Select &All"), this, SLOT(selectAllWidgets()), QKeySequence::fromString("Ctrl+A")); + contextMenu.addAction(QIcon::fromTheme("edit-select-all"), tr("Select &All"), this, SLOT(selectAllWidgets()), QKeySequence::fromString("Ctrl+A")); } //ui->SnapmaticFrame->setStyleSheet(QString("QFrame#SnapmaticFrame{background-color: rgb(%1, %2, %3)}QLabel#labPicStr{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/UserInterface.cpp b/UserInterface.cpp index d248b36..cb9f919 100755 --- a/UserInterface.cpp +++ b/UserInterface.cpp @@ -47,6 +47,7 @@ UserInterface::UserInterface(ProfileDatabase *profileDB, CrewDatabase *crewDB, D profileUI = 0; ui->menuProfile->setEnabled(false); ui->actionSelect_profile->setEnabled(false); + ui->actionAbout_gta5sync->setIcon(IconLoader::loadingAppIcon()); defaultWindowTitle = tr("gta5sync - %1"); this->setWindowTitle(defaultWindowTitle.arg(tr("Select Profile"))); diff --git a/UserInterface.ui b/UserInterface.ui index c95c803..314e74e 100755 --- a/UserInterface.ui +++ b/UserInterface.ui @@ -128,7 +128,7 @@ 0 0 625 - 21 + 25 @@ -178,7 +178,8 @@ - + + .. &Exit @@ -199,6 +200,9 @@ + + + &Settings @@ -207,6 +211,9 @@ + + + Select &All @@ -215,6 +222,9 @@ + + + &Deselect All @@ -223,6 +233,9 @@ + + + &Export selected... @@ -239,6 +252,9 @@ + + + &Import files... @@ -248,7 +264,8 @@ - + + .. &Open File...