Skip to content

Commit 7e70b88

Browse files
committed
add QtAwesome, fix lybros#8
1 parent 16eeb0d commit 7e70b88

File tree

6 files changed

+24
-6
lines changed

6 files changed

+24
-6
lines changed

.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "libs/QtAwesome"]
2+
path = libs/QtAwesome
3+
url = https://github.com/Drapegnik/QtAwesome.git

CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@ add_definitions(${Qt5Widgets_DEFINITIONS})
2323
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
2424

2525
# The order below is important:
26+
add_subdirectory(libs/QtAwesome/QtAwesome)
2627
add_subdirectory(src)
2728
add_subdirectory(ui)
2829

2930
add_executable(${PROJECT_NAME} main.cpp)
30-
target_link_libraries(${PROJECT_NAME} src ui)
31+
target_link_libraries(${PROJECT_NAME} src ui QtAwesome)

libs/QtAwesome

Submodule QtAwesome added at c694fe8

main.cpp

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
#include "ui/mainwindow.h"
22
#include <QApplication>
33

4-
int main(int argc, char *argv[])
5-
{
4+
int main(int argc, char* argv[]) {
65
QApplication a(argc, argv);
7-
MainWindow w;
6+
QtAwesome* awesome = new QtAwesome(&a);
7+
MainWindow w(nullptr, awesome);
8+
awesome->initFontAwesome();
89
w.show();
910

1011
return a.exec();

ui/mainwindow.cpp

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,22 @@
11
#include "mainwindow.h"
22
#include "ui_mainwindow.h"
33

4-
MainWindow::MainWindow(QWidget *parent) :
4+
MainWindow::MainWindow(QWidget *parent, QtAwesome *awesome) :
55
QMainWindow(parent),
66
ui(new Ui::MainWindow)
77
{
88
ui->setupUi(this);
99
active_project_ = new Project();
10+
11+
awesome->initFontAwesome();
12+
QVariantMap options;
13+
14+
options.insert("color", QColor(0, 189, 58));
15+
ui->actionRun_Reconstruction->setIcon(awesome->icon(fa::play, options));
16+
options.insert("color", QColor(255, 175, 24));
17+
ui->actionExtract_Features->setIcon(awesome->icon(fa::crosshairs, options));
18+
options.insert("color", QColor(147, 205, 255));
19+
ui->actionMatch_Features->setIcon(awesome->icon(fa::filepictureo, options));
1020
}
1121

1222
void MainWindow::on_actionRun_Reconstruction_triggered()

ui/mainwindow.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
#include <iostream>
55

66
#include <QMainWindow>
7+
#include <QPushButton>
8+
#include "../libs/QtAwesome/QtAwesome/QtAwesome.h"
79

810
#include "newproject.h"
911

@@ -18,7 +20,7 @@ class MainWindow : public QMainWindow
1820
Q_OBJECT
1921

2022
public:
21-
explicit MainWindow(QWidget *parent = 0);
23+
explicit MainWindow(QWidget *parent = 0, QtAwesome *awesome = 0);
2224
~MainWindow();
2325

2426
private slots:

0 commit comments

Comments
 (0)