diff --git a/tools/lammps-gui/gtk-go-down.png b/tools/lammps-gui/gtk-go-down.png new file mode 100644 index 0000000000..c073ec5ebd Binary files /dev/null and b/tools/lammps-gui/gtk-go-down.png differ diff --git a/tools/lammps-gui/gtk-go-up.png b/tools/lammps-gui/gtk-go-up.png new file mode 100644 index 0000000000..e8ff52aeec Binary files /dev/null and b/tools/lammps-gui/gtk-go-up.png differ diff --git a/tools/lammps-gui/gtk-zoom-fit.png b/tools/lammps-gui/gtk-zoom-fit.png new file mode 100644 index 0000000000..35994e8bc7 Binary files /dev/null and b/tools/lammps-gui/gtk-zoom-fit.png differ diff --git a/tools/lammps-gui/gtk-zoom-in.png b/tools/lammps-gui/gtk-zoom-in.png new file mode 100644 index 0000000000..46604770dd Binary files /dev/null and b/tools/lammps-gui/gtk-zoom-in.png differ diff --git a/tools/lammps-gui/gtk-zoom-out.png b/tools/lammps-gui/gtk-zoom-out.png new file mode 100644 index 0000000000..72e6eb43c6 Binary files /dev/null and b/tools/lammps-gui/gtk-zoom-out.png differ diff --git a/tools/lammps-gui/imageviewer.cpp b/tools/lammps-gui/imageviewer.cpp index 74bd1dfad4..d492b86bb2 100644 --- a/tools/lammps-gui/imageviewer.cpp +++ b/tools/lammps-gui/imageviewer.cpp @@ -58,12 +58,12 @@ ImageViewer::ImageViewer(const QString &fileName, LammpsWrapper *_lammps, QWidge QVBoxLayout *mainLayout = new QVBoxLayout; - auto *zoomin = new QPushButton("Zoom In"); - auto *zoomout = new QPushButton("Zoom Out"); - auto *rotleft = new QPushButton("Rotate Left"); - auto *rotright = new QPushButton("Rotate Right"); - auto *rotup = new QPushButton("Rotate Up"); - auto *rotdown = new QPushButton("Rotate Down"); + auto *zoomin = new QPushButton(QIcon(":/gtk-zoom-in.png"), "Zoom In"); + auto *zoomout = new QPushButton(QIcon(":/gtk-zoom-out.png"),"Zoom Out"); + auto *rotleft = new QPushButton(QIcon(":/object-rotate-left.png"), "Rotate Left"); + auto *rotright = new QPushButton(QIcon(":/object-rotate-right.png"), "Rotate Right"); + auto *rotup = new QPushButton(QIcon(":/gtk-go-up.png"),"Rotate Up"); + auto *rotdown = new QPushButton(QIcon(":/gtk-go-down.png"),"Rotate Down"); auto *combo = new QComboBox; combo->setObjectName("group"); int ngroup = lammps->id_count("group"); @@ -131,31 +131,31 @@ void ImageViewer::do_zoom_out() createImage(); } -void ImageViewer::do_rot_right() +void ImageViewer::do_rot_left() { vrot -= 15; - if (vrot < 0) vrot += 360; + if (vrot < -180) vrot += 360; createImage(); } -void ImageViewer::do_rot_left() +void ImageViewer::do_rot_right() { vrot += 15; - if (vrot > 360) vrot -= 360; + if (vrot > 180) vrot -= 360; createImage(); } void ImageViewer::do_rot_down() { hrot -= 15; - if (hrot < 0) hrot += 360; + if (hrot < -0) hrot += 180; createImage(); } void ImageViewer::do_rot_up() { hrot += 15; - if (hrot > 360) hrot -= 360; + if (hrot > 180) hrot -= 180; createImage(); } @@ -269,14 +269,17 @@ void ImageViewer::createActions() zoomInAct = viewMenu->addAction(tr("Image Zoom &In (25%)"), this, &ImageViewer::zoomIn); zoomInAct->setShortcut(QKeySequence::ZoomIn); + zoomInAct->setIcon(QIcon(":/gtk-zoom-in.png")); zoomInAct->setEnabled(false); zoomOutAct = viewMenu->addAction(tr("Image Zoom &Out (25%)"), this, &ImageViewer::zoomOut); zoomOutAct->setShortcut(QKeySequence::ZoomOut); + zoomInAct->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->setEnabled(false); viewMenu->addSeparator(); diff --git a/tools/lammps-gui/lammpsgui.qrc b/tools/lammps-gui/lammpsgui.qrc index 830a060510..6d5abb1d3f 100644 --- a/tools/lammps-gui/lammpsgui.qrc +++ b/tools/lammps-gui/lammpsgui.qrc @@ -2,4 +2,25 @@ lammps-icon-128x128.png + + gtk-zoom-in.png + + + gtk-zoom-out.png + + + gtk-zoom-fit.png + + + object-rotate-right.png + + + object-rotate-left.png + + + gtk-go-up.png + + + gtk-go-down.png + diff --git a/tools/lammps-gui/object-rotate-left.png b/tools/lammps-gui/object-rotate-left.png new file mode 100644 index 0000000000..a754bf560a Binary files /dev/null and b/tools/lammps-gui/object-rotate-left.png differ diff --git a/tools/lammps-gui/object-rotate-right.png b/tools/lammps-gui/object-rotate-right.png new file mode 100644 index 0000000000..2103228dd9 Binary files /dev/null and b/tools/lammps-gui/object-rotate-right.png differ