From a10b1de5113e07e7eaa304c009f599d9936bb057 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Mon, 14 Aug 2023 04:01:33 -0400 Subject: [PATCH] complete bundling and assigning icons to actions --- tools/lammps-gui/application-calc.png | Bin 0 -> 2774 bytes tools/lammps-gui/application-plot.png | Bin 0 -> 2293 bytes tools/lammps-gui/chartviewer.cpp | 4 ++++ tools/lammps-gui/imageviewer.cpp | 7 +++++-- tools/lammps-gui/lammpsgui.qrc | 3 +++ tools/lammps-gui/window-close.png | Bin 0 -> 1981 bytes 6 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 tools/lammps-gui/application-calc.png create mode 100644 tools/lammps-gui/application-plot.png create mode 100644 tools/lammps-gui/window-close.png diff --git a/tools/lammps-gui/application-calc.png b/tools/lammps-gui/application-calc.png new file mode 100644 index 0000000000000000000000000000000000000000..0c3bea28bba1041fc5a3ebde9538a4436ace6a9b GIT binary patch literal 2774 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 top->addWidget(columns); saveAsAct = file->addAction("&Save Graph As...", this, &ChartWindow::saveAs); + saveAsAct->setIcon(QIcon(":/document-save-as.png")); exportCsvAct = file->addAction("&Export data to CSV...", this, &ChartWindow::exportCsv); + exportCsvAct->setIcon(QIcon(":/application-calc.png")); exportDatAct = file->addAction("Export data to &Gnuplot...", this, &ChartWindow::exportDat); + exportDatAct->setIcon(QIcon(":/application-plot.png")); file->addSeparator(); closeAct = file->addAction("&Close", this, &QWidget::close); + closeAct->setIcon(QIcon(":/window-close.png")); auto *layout = new QVBoxLayout; layout->addLayout(top); setLayout(layout); diff --git a/tools/lammps-gui/imageviewer.cpp b/tools/lammps-gui/imageviewer.cpp index bef2589a2a..99825de6de 100644 --- a/tools/lammps-gui/imageviewer.cpp +++ b/tools/lammps-gui/imageviewer.cpp @@ -266,13 +266,16 @@ void ImageViewer::createActions() QMenu *fileMenu = menuBar->addMenu(tr("&File")); saveAsAct = fileMenu->addAction(tr("&Save As..."), this, &ImageViewer::saveAs); + saveAsAct->setIcon(QIcon(":/document-save-as.png")); saveAsAct->setEnabled(false); fileMenu->addSeparator(); copyAct = fileMenu->addAction(tr("&Copy"), this, &ImageViewer::copy); + copyAct->setIcon(QIcon(":/edit-copy.png")); copyAct->setShortcut(QKeySequence::Copy); copyAct->setEnabled(false); fileMenu->addSeparator(); QAction *exitAct = fileMenu->addAction(tr("&Close"), this, &QWidget::close); + exitAct->setIcon(QIcon(":/window-close.png")); exitAct->setShortcut(tr("Ctrl+W")); QMenu *viewMenu = menuBar->addMenu(tr("&View")); @@ -284,12 +287,12 @@ void ImageViewer::createActions() zoomOutAct = viewMenu->addAction(tr("Image Zoom &Out (25%)"), this, &ImageViewer::zoomOut); zoomOutAct->setShortcut(QKeySequence::ZoomOut); - zoomInAct->setIcon(QIcon(":/gtk-zoom-out.png")); + zoomOutAct->setIcon(QIcon(":/gtk-zoom-out.png")); zoomOutAct->setEnabled(false); normalSizeAct = viewMenu->addAction(tr("&Reset Image Size"), this, &ImageViewer::normalSize); normalSizeAct->setShortcut(tr("Ctrl+0")); - zoomInAct->setIcon(QIcon(":/gtk-zoom-fit.png")); + normalSizeAct->setIcon(QIcon(":/gtk-zoom-fit.png")); normalSizeAct->setEnabled(false); viewMenu->addSeparator(); diff --git a/tools/lammps-gui/lammpsgui.qrc b/tools/lammps-gui/lammpsgui.qrc index 59a34acc5e..818d24bb87 100644 --- a/tools/lammps-gui/lammpsgui.qrc +++ b/tools/lammps-gui/lammpsgui.qrc @@ -34,5 +34,8 @@ emblem-photos.png process-stop.png emblem-default.png + window-close.png + application-plot.png + application-calc.png diff --git a/tools/lammps-gui/window-close.png b/tools/lammps-gui/window-close.png new file mode 100644 index 0000000000000000000000000000000000000000..fdf3eba2b13d2a1750d7fddab9d50bb1df0e1648 GIT binary patch literal 1981 zcmV;u2SWIXP)WAmF2-#?xS0hCx}x9S=kT4b z;FWT8Thb;^dfJ}v{hsIj-tYb1_cV+#7WRKeSV%xfKuADHKuExI7a)osZPjWs-w^~M zLMb9Dy=u2gr`j7978d@@1PHo}4@JH3V@~d|+5E!1DUGQ13Zjs=EaE!VTcS?${jr=Z zZ{dmjX;H8JlRg_17eL;AQ=g@sYH4j|!=r<2cw~@ucDFN3N%> zHp~VF``ExhFFSR*$SdkKXB8Eo(`&vlSsLzxbVXGetE?_(O-?%-93EgNiVD11oyNFS z@;W^^q^*g0dR?r}SS{H#TN_w^e=pN#i+`o2rmj^?0ENyCcTX3qsjKu0sH!nAdy`dK zjgyiHpR#mO(f!Hh(O551VA3wCQCg-XiQ9uv7(|A$RyT4@<;&KFV;qrUjW9! z1~zhMcLz4_G^Ojq&+H(RMby?+%^_q!1SCKn*A`m?d9jsUo1CDPIN{Zb!jMGX)y_u7 zhFGJ+;unB15Ya>AvA^`$x+Reh`Xv5GMD-j(282Kc)_R>(O5h|0Nke6sMA{Ed9yJtz z(DL-S6%nBb`6eRY*51Oa$#TE9rJ|3*X`Z-20tz<3)@Y{F*Ubt~=A(A9J$C_t zm%|3Xm+{#_;nYjHzT4GFwNAApMy@!4Mu(L)v`cD=f)x=w`79#u1o;*sRpIxnOc2#+ zD}~hYoa`A2DW98i{(R|N;jd(=rjjyK52e(CAVmaC9^UPM=c^YI2dS3UCWdAuD_ci3 zy-y^8MvkQYTk9eCJL zM)JYivIsepFdiElp_X5myCe}yc$AW!KsEl9)ozhIJfCe!7qpi+ah>!V9a1v_k;fwv z8JU@xaS%~je$|KK4rhYgM#`-ux;^v*d4;)C8jUJP>85`C;^i;q5E?Rh8Tf2(vM~n% z(hYoF{PU}WVX|b=1dV`wU$_H#g1nkg!x6{(nqJkE{J-32mB~5$_ zWdW573v)cdN+}U(QI{poq^GCq=>Et>h?1|9l9F~p#FdiEzP66})VtUozR%6iok~eb zNu)8WF@FG;@W%=WAik0hUQ1Yyrru;m15&?WGKXn|FLVIXU?~ZYPqj=&ArQ;ZG810$RGUR;3>LqJ7Fs!jti0TYQXzu!fU&B?Rr-us(-n3<-#0Jarw~-HZ#(# zMihRFj*i~JZEfTtRzFcdfQZ$65C(6KkB{FYh^kwkoj-dQZ6Ip;OT}N_qf%h@!2A0@ zp?h8@V8VC^=H6bv2rm;h5w_u8dL@&Ho1dOJeFqP;;E9^g41U^|TU$u371p^Vq z9TLlhZjXtH*?Tngh(n`Q|4z8A5;DI_OiWCr-*)nQuxinS7a#WE_whS?e!150i8pX# zahzy8$7W7wBcEt3ANMFkaB=dA#Bv*318m0exi)YIg8Yi0(`bN@bzDqz0HXN!5s#YW z5jIzGVv(F=G#3@kKS%QPyF&3=DDZ$%?2n2dZHE403JC}a2nh%YSQh>U2^?9uO&6-2 P00000NkvXXu0mjf=}(vr literal 0 HcmV?d00001