From 338dee788afc0fc2963756262f86d478db987c3d Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 29 Aug 2011 22:07:54 +0200 Subject: [PATCH] add icon --- software/icon.png | Bin 0 -> 3543 bytes software/mainwindow.cpp | 13 +++++++++++++ software/mainwindow.h | 3 +++ software/mainwindow.ui | 12 +++++++++--- software/microview.pro | 3 +++ software/resources.qrc | 5 +++++ 6 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 software/icon.png create mode 100644 software/resources.qrc diff --git a/software/icon.png b/software/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..5817e515d2a4d9ea74583e4e2a1fb14a76aa2736 GIT binary patch literal 3543 zcmYjU2{hDQ8~@vfY#}t(DamAM3}YGF%*fKjq{$nv?E4Iob&!2cDrD@0dWR-iLYB&w zkd(>RDA__|$(}I6H}7}Ocg}auz0dESd!FCD=iX;KH`NMfCcp>g0{}qaqWJ|p3t|5b z5I0NOuIDzkFa|^{x#7 z@Q+`-fVTFY{8-@QYu_8vd$iSD)7n2D*rGtn6}J(>DiZo1UFdr-uNdlbD*2uw)r}M6 zT&i9$qRH$uxgvirA)4?>NY(C_@m(>?GB9FvMOF1@$DRWIA$Qm^1 z2*R0{zc=979@>@Q`=cy16{^HlcqQ`mH;*H>>7AAvKBm}1cE}QZy)dD4XZ>dux$&r3 z?-5fZHF`{|SYBb*C-%2rppzD2%u^Oi5sVjJQa&Rq8mH$z?of+?XcoROK%-PJ4NX_6 zsq%#e2Yp>54%)dUihaTni7v0j2Tinv|{Nb<5t@rd&jUv4y`$uf)J;Lz&bh=tIO zDJs3dvDsdvC}w;dh^zxXLvU^|gdkTa4wT3-XgD-_qP+ZM{PGVsOon>T2T|bZb*_NR ztlbn7t>+}r@+7521L>7TE(l+Bp&WZyy!w_->DS82ovG~AlhfiC≷3JSh6jq28Hq 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 MXo9;?jd70u4+}_u5dZ)H literal 0 HcmV?d00001 diff --git a/software/mainwindow.cpp b/software/mainwindow.cpp index 661fe86..9a15080 100644 --- a/software/mainwindow.cpp +++ b/software/mainwindow.cpp @@ -2,6 +2,7 @@ #include "ui_mainwindow.h" #include #include +#include MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), @@ -30,3 +31,15 @@ MainWindow::MainWindow(QWidget *parent) : MainWindow::~MainWindow() { } + +void MainWindow::on_pushExit_clicked() +{ + close(); +} + +void MainWindow::on_pushAbout_clicked() +{ + QMessageBox aboutBox(QMessageBox::NoIcon, "About µView", QString::fromUtf8("µView\n\nhackerspace brmlab - http://brmlab.cz/\n\nSee README for more info and COPYING for the license." ), QMessageBox::Ok, this); + aboutBox.setIconPixmap(QPixmap(":/icons/icon.png")); + aboutBox.exec(); +} diff --git a/software/mainwindow.h b/software/mainwindow.h index 276d0e1..1799310 100644 --- a/software/mainwindow.h +++ b/software/mainwindow.h @@ -17,6 +17,9 @@ public: private slots: + void on_pushExit_clicked(); + void on_pushAbout_clicked(); + private: Ui::MainWindow *ui; }; diff --git a/software/mainwindow.ui b/software/mainwindow.ui index b273b09..99c572e 100644 --- a/software/mainwindow.ui +++ b/software/mainwindow.ui @@ -13,6 +13,10 @@ µView + + + :/icons/icon.png:/icons/icon.png + @@ -128,7 +132,7 @@ E&xit - + 660 @@ -159,9 +163,11 @@ pushZoomIn pushZoomOut pushSnap - pushAbout_2 + pushAbout pushExit - + + + diff --git a/software/microview.pro b/software/microview.pro index b6ff7f2..25758eb 100644 --- a/software/microview.pro +++ b/software/microview.pro @@ -23,3 +23,6 @@ unix { CONFIG += link_pkgconfig PKGCONFIG += gstreamer-0.10 gstreamer-interfaces-0.10 } + +RESOURCES += \ + resources.qrc diff --git a/software/resources.qrc b/software/resources.qrc new file mode 100644 index 0000000..32e95c2 --- /dev/null +++ b/software/resources.qrc @@ -0,0 +1,5 @@ + + + icon.png + +