other(UI): add more icons

Author: n0f4ph4mst3r

src/CMakeLists.txt

@@ -13,11 +13,10 @@ set(HEADERS QBrowserApp.h
 			QDbTableView.h
 			QQueryHighlighter.h)
 
+qt_add_resources(RESOURCES res/icons.qrc)
 if(WIN32)
-	set(RESOURCES res/app_icon.rc)
-	source_group("Resource files" FILES ${RESOURCES}) 
+	source_group("Resource files" FILES res/app_icon.rc res/icons.qrc)
+	qt_add_executable(qSQLbrowser MANUAL_FINALIZATION ${SOURCE_FILES} ${HEADERS} ${RESOURCES} res/app_icon.rc)
 else()
-	qt_add_resources(RESOURCES res/app_icon.qrc)
-endif()
-
-qt_add_executable(qSQLbrowser MANUAL_FINALIZATION ${SOURCE_FILES} ${HEADERS} ${RESOURCES})
+	qt_add_executable(qSQLbrowser MANUAL_FINALIZATION ${SOURCE_FILES} ${HEADERS} ${RESOURCES})
+endif()

src/QBrowserApp.cpp

@@ -31,13 +31,13 @@ QBrowserApp::QBrowserApp(QWidget* parent, Qt::WindowFlags flags) : QMainWindow(p
     vSplitter->setStretchFactor(1, 0);
 
     QMenu* mainMenu = menuBar()->addMenu(QObject::tr("&General"));
-    mainMenu->addAction(QObject::tr("Add &Connection..."), [&]() { QMetaObject::invokeMethod(findChild<QConnectionCtrl*>("connectionCtrl"), "showConnectionDialog", Qt::QueuedConnection); });
+    mainMenu->addAction(QIcon(":/icons/dbConnect.png"), QObject::tr("Add &Connection..."), [&]() { QMetaObject::invokeMethod(findChild<QConnectionCtrl*>("connectionCtrl"), "showConnectionDialog", Qt::QueuedConnection); });
     mainMenu->addSeparator();
-    mainMenu->addAction(QObject::tr("&Quit"), []() { qApp->quit(); });
+    mainMenu->addAction(QIcon(":/icons/quit.png"), QObject::tr("&Quit"), []() { qApp->quit(); });
 
     QMenu* helpMenu = menuBar()->addMenu(QObject::tr("&Help"));
-    helpMenu->addAction(QObject::tr("About"), [&]() { about(); });
-    helpMenu->addAction(QObject::tr("About Qt"), []() { qApp->aboutQt(); });
+    helpMenu->addAction(QIcon(":/icons/app_icon.png"), QObject::tr("About"), [&]() { about(); });
+    helpMenu->addAction(QApplication::style()->standardIcon(QStyle::SP_TitleBarMenuButton), QObject::tr("About Qt"), []() { qApp->aboutQt(); });
 
     QVBoxLayout* mainLayout = new QVBoxLayout;
     mainLayout->addWidget(vSplitter);

src/QConnectionCtrl.cpp

@@ -5,7 +5,7 @@
 
 QConnectionCtrl::QConnectionCtrl(QWidget* parent) {
     QTreeWidgetItem* rootItem = new QTreeWidgetItem();
-    rootItem->setIcon(0, QApplication::style()->standardIcon(QStyle::SP_ComputerIcon));
+    rootItem->setIcon(0, QApplication::style()->standardIcon(QStyle::SP_DriveNetIcon));
     rootItem->setText(0, tr("Databases"));
     setHeaderItem(rootItem);
 
@@ -14,13 +14,13 @@ QConnectionCtrl::QConnectionCtrl(QWidget* parent) {
     setFrameStyle(QFrame::Panel | QFrame::Sunken);
     setLineWidth(2);
 
-    QAction* refreshAction = new QAction(tr("Refresh"), this);
-    QAction* shemaAction = new QAction(tr("Show shema"), this);
+    QAction* refreshAction = new QAction(QIcon(":/icons/refresh.png"), tr("Refresh"), this);
+    QAction* shemaAction = new QAction(QIcon(":/icons/metadata.png"), tr("Show shema"), this);
     shemaAction->setEnabled(false);
     shemaAction->setObjectName("shemaAction");
     QAction* separator = new QAction;
     separator->setSeparator(true);
-    QAction* addConnectionAction = new QAction(tr("Add Connection..."), this);
+    QAction* addConnectionAction = new QAction(QIcon(":/icons/dbConnect.png"), tr("Add Connection..."), this);
 
     connect(refreshAction, &QAction::triggered, this, [=]() { refresh(); });
     connect(shemaAction, &QAction::triggered, this, &QConnectionCtrl::showMetaData);
@@ -150,7 +150,7 @@ void QConnectionCtrl::refresh() {
         dbCaption.append(db.databaseName());
 
         rootItem->setText(0, dbCaption);
-        rootItem->setIcon(0, QApplication::style()->standardIcon(QStyle::SP_DriveNetIcon));
+        rootItem->setIcon(0, QIcon(":/icons/db.png"));
         if (connectionNames.at(i) == QSqlDatabase::database(m_activeDb).connectionName()) {
             gotActiveDb = true;
             setActiveDb(rootItem);
@@ -160,7 +160,7 @@ void QConnectionCtrl::refresh() {
             for (int t = 0; t < tableList.count(); ++t) {
                 QTreeWidgetItem* table = new QTreeWidgetItem(rootItem);
                 table->setText(0, tableList.at(t));
-                table->setIcon(0, QApplication::style()->standardIcon(QStyle::SP_DirOpenIcon));
+                table->setIcon(0, QIcon(":/icons/table.png"));
             }
         }
     }

src/QConnectionDialog.cpp

@@ -59,7 +59,7 @@ QConnectionDialog::QConnectionDialog(QWidget* parent, Qt::WindowFlags f) {
     setLayout(dialogLayout);
 
 #ifdef Q_OS_WINDOWS
-    setWindowIcon(QApplication::style()->standardIcon(QStyle::SP_CommandLink));
+    setWindowIcon(QIcon(":/icons/dbConnect.png"));
 #endif
 }
 

src/QDbTableView.cpp

@@ -4,14 +4,14 @@
 #include "QDbTableView.h"
 
 QDbTableView::QDbTableView(QWidget* parent) {
-    m_selectAction = new QAction(tr("Select"), this);
-    m_insertRowAction = new QAction(tr("Insert Row"), this);
-    m_deleteRowAction = new QAction(tr("Delete Row"), this);
+    m_selectAction = new QAction(QIcon(":/icons/selection-tool.png"), tr("Select"), this);
+    m_insertRowAction = new QAction(QIcon(":/icons/insert-row.png"), tr("Insert Row"), this);
+    m_deleteRowAction = new QAction(QIcon(":/icons/delete-row.png"), tr("Delete Row"), this);
     m_fieldStrategyAction = new QAction(tr("Submit on Field Change"), this);
     m_rowStrategyAction = new QAction(tr("Submit on Row Change"), this);
     m_manualStrategyAction = new QAction(tr("Submit Manually"), this);
-    m_submitAction = new QAction(tr("Submit All"), this);
-    m_revertAction = new QAction(tr("Revert All"), this);
+    m_submitAction = new QAction(QIcon(":/icons/submit-all.png"), tr("Submit All"), this);
+    m_revertAction = new QAction(QIcon(":/icons/revert-all.png"), tr("Revert All"), this);
 
     m_fieldStrategyAction->setCheckable(true);
     m_rowStrategyAction->setCheckable(true);

src/main.cpp

@@ -18,7 +18,7 @@ int main(int argc, char* argv[]) {
     }
 
 #ifndef Q_OS_WINDOWS
-    QApplication::setWindowIcon(QIcon(":/app_icon/app_icon.xpm"));
+    QApplication::setWindowIcon(QIcon(":/icons/app_icon.xpm"));
 #endif
 
     QBrowserApp browser;