Refs issue #43: placed icons and dias in resources dir

snailsnap · Jun 11, 2018 · bbec3b1 · bbec3b1
1 parent dc3e3a9
commit bbec3b1
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 3 deletions.
diff --git a/resources/back.png b/resources/back.png
diff --git a/resources/camera.png b/resources/camera.png
diff --git a/resources/dia1.png b/resources/dia1.png
diff --git a/resources/dia2.png b/resources/dia2.png
diff --git a/resources/share.png b/resources/share.png
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -232,7 +232,7 @@ void MainWindow::showSidebar(
 
 void MainWindow::initButton(QPushButton* button, std::string icon, int row, int column, bool visible) {
     const int iconSize = 100;
-    button->setIcon(QIcon(m_data + "/" + icon.c_str()));
+    button->setIcon(QIcon("resources/" + QString::fromStdString(icon)));
     button->setIconSize(QSize(iconSize, iconSize));
     button->setFixedSize(iconSize, iconSize);
     button->setStyleSheet("text-align:center; background: black; border: none");
@@ -319,11 +319,11 @@ void MainWindow::countdownChange() {
 void MainWindow::diaChange() {
     if (m_dia1) {
         m_dia1 = !m_dia1;
-        this->processAndShowPicture(std::make_shared<QImage>(QString::fromStdString(m_data.toStdString() + "/dia1.png")));
+        this->processAndShowPicture(std::make_shared<QImage>("resources/dia1.png"));
     }
     else {
         m_dia1 = !m_dia1;
-        this->processAndShowPicture(std::make_shared<QImage>(QString::fromStdString(m_data.toStdString() + "/dia2.png")));
+        this->processAndShowPicture(std::make_shared<QImage>("resources/dia2.png"));
     }
     m_backButton->setVisible(false);
     m_shareButton->setVisible(false);