Merge pull request #1715 from ctrlaltca/pr_1668

Add gear icon to settings menu entry

cockatrice/src/main.cpp

@@ -132,6 +132,10 @@ int main(int argc, char *argv[])
     QCoreApplication::setOrganizationDomain("cockatrice.de");
     QCoreApplication::setApplicationName("Cockatrice");
 
+#ifdef Q_OS_MAC
+    qApp->setAttribute(Qt::AA_DontShowIconsInMenus, true);
+#endif
+
 #ifdef Q_OS_MAC
     translationPath = qApp->applicationDirPath() + "/../Resources/translations";
 #elif defined(Q_OS_WIN)

cockatrice/src/window_main.cpp

@@ -485,6 +485,7 @@ void MainWindow::retranslateUi()
     aFullScreen->setText(tr("&Full screen"));
     aRegister->setText(tr("&Register to server..."));
     aSettings->setText(tr("&Settings..."));
+    aSettings->setIcon(QPixmap("theme:icons/settings"));
     aExit->setText(tr("&Exit"));
 
 #if defined(__APPLE__)  /* For OSX */