From 2a032dcb6151bd8b019c88f6ef1db1a8c1e5b61e Mon Sep 17 00:00:00 2001
From: Joel Holdsworth <joel@airwebreathe.org.uk>
Date: Tue, 15 Jan 2013 19:25:43 +0000
Subject: [PATCH] Added File>Quit menu item

---
 icons/application-exit.png | Bin 0 -> 1084 bytes
 pv/mainwindow.cpp          |  16 +++++++++++++++-
 pv/mainwindow.h            |   2 ++
 3 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 icons/application-exit.png

diff --git a/icons/application-exit.png b/icons/application-exit.png
new file mode 100644
index 0000000000000000000000000000000000000000..28ac66f09548e2880e9f6688e7fe4a3245a539d0
GIT binary patch
literal 1084
zcmV-C1jGA@P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11Gz~=K~y-6jg`-99aR*^Klk35JM(^+rg=?@K0;$mgtj52l2r@3
zXpFcEv?48PF<8NkblDUHHz7iCQ}rLHh=^Ue5L_jTO1fxTTr|*9Ucnly@Dg7p@8_K#
z*Twtcd&vuW;4s6?;WOWR=KK)WTK<O#Kmtzd3SfZ<h+FqP<^a6+!KEc*%=Lq)N-5Im
zGy?;N@I4QJFbZ*9eRFx~i)%oAFWdnz#$12r{JRti1*+95wOWl@t%flMV+>MCrl+R4
za^)kWYznT|Ykc+1*PjAQfN3f31p|1Vht`@f42hzMIF3n@1OTlyLqkI-rBF%%kWOb9
z86E~m1KWL50pR;ST5F;xB1sb3xi`k(c^;We1|cLuG!+X0T6;Z=zF@62zVG)yg%C(7
z(OToRa@%dKw1|FS*&XCK4xZ=X`#!$!<9S}kwbqEf2>2nJedBu}ZuM0xrR=y;3deDn
zn3y1rV~WKhuIu)N{yaT>@$l5t_2AJX^_>tOw;o3w#qDEv`{w2*zV9<RIobJXZL>*&
zbL(5O`TXK*SFd_XsYohSmX1>vQ0z(kUa+;6LZQH^Q>QS-bmGDw;LiL!<HN&@pFQi_
zQi<1Z-0<7)e_2@Yd%$~DXEGUPW@fm1_b$he9|xfF^eL-zbBxZ+Fg!ZS?#c>Si%<%i
zBn-^XBBW%WVj)E511C<L;Muchlu9L1sT2UeUbw)Kkr4)cpWW3}Y!s1HDkPN(GL<5A
z@+1hsfr|6_Jk@HIhYuf;&1P|&X6WggH@P!Ek7Eok0QHRxY^#v~8c&{J<9L5@x4~Om
zTkP!YkWQ!3S_6<I2}jPH;mx%*R?eN{a5lry)2ERG1I><6inv+@`gBbj9EM@1#H5rI
z3I(K;jE#+vdu5#2d-wS1>>28toApu0@qb%eGxp!U_*)(X?yhIYaVV8a>;yYhDrMq0
zMhzaKv3QMgt+w)bW20svxn!-|@)!4k+i;~6T5F2MBJ20p(Viy%Ql4BcM-)XEW2l-2
z=eM^%sg=uL3V7Vj=sQ5P)&xPo`uaUy9v|cK<@Y&uY^*u`qL45OiQ|}HcNd^>F^WD1
zKI;p%)}oZcTFZk6_c=5;z=sQ$$>nmmu1g$;)anreuojXeCI|w61_y1BIF6B0^8Byo
z2rO^CJx40#<GOBh*oR@y2(vU>`ai+JPQV|3{?5d!&Eq00jYge@X*7Wys^~D1#8Ro0
zp}9T!gGY{zEZ_d|_F{MEiGyZjSL(FZ%j{W6ZTko3rFxN?8<a@^0000<MNUMnLSTZd
Ck^8g&

literal 0
HcmV?d00001

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 3a59bea1..35b0da57 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -92,9 +92,18 @@ void MainWindow::setup_ui()
 	_action_open->setIcon(QIcon::fromTheme("document-open",
 		QIcon(":/icons/document-open.png")));
 	_action_open->setObjectName(QString::fromUtf8("actionOpen"));
-
 	_menu_file->addAction(_action_open);
 
+	_menu_file->addSeparator();
+
+	_action_quit = new QAction(this);
+	_action_quit->setText(QApplication::translate(
+		"MainWindow", "&Quit", 0, QApplication::UnicodeUTF8));
+	_action_quit->setIcon(QIcon::fromTheme("application-exit",
+		QIcon(":/icons/application-exit.png")));
+	_action_quit->setObjectName(QString::fromUtf8("actionQuit"));
+	_menu_file->addAction(_action_quit);
+
 	// View Menu
 	_menu_view = new QMenu(_menu_bar);
 	_menu_view->setTitle(QApplication::translate(
@@ -177,6 +186,11 @@ void MainWindow::on_actionOpen_triggered()
 	_session.load_file(file_name.toStdString());
 }
 
+void MainWindow::on_actionQuit_triggered()
+{
+	close();
+}
+
 void MainWindow::on_actionViewZoomIn_triggered()
 {
 	_view->zoom(1);
diff --git a/pv/mainwindow.h b/pv/mainwindow.h
index a68c37de..b53138ee 100644
--- a/pv/mainwindow.h
+++ b/pv/mainwindow.h
@@ -59,6 +59,7 @@ private:
 	QMenuBar *_menu_bar;
 	QMenu *_menu_file;
 	QAction *_action_open;
+	QAction *_action_quit;
 
 	QMenu *_menu_view;
 	QAction *_action_view_zoom_in;
@@ -77,6 +78,7 @@ private:
 private slots:
 
 	void on_actionOpen_triggered();
+	void on_actionQuit_triggered();
 
 	void on_actionViewZoomIn_triggered();
 
-- 
2.30.2