diff --git a/tools/lammps-gui/chartviewer.cpp b/tools/lammps-gui/chartviewer.cpp index 7ea8a77385..bc9ebd56c4 100644 --- a/tools/lammps-gui/chartviewer.cpp +++ b/tools/lammps-gui/chartviewer.cpp @@ -35,14 +35,14 @@ ChartWindow::ChartWindow(const QString &_filename, QWidget *parent) : top->addWidget(new QLabel("Select data:")); top->addWidget(columns); saveAsAct = file->addAction("&Save Graph As...", this, &ChartWindow::saveAs); - saveAsAct->setIcon(QIcon(":/document-save-as.png")); + saveAsAct->setIcon(QIcon(":/icons/document-save-as.png")); exportCsvAct = file->addAction("&Export data to CSV...", this, &ChartWindow::exportCsv); - exportCsvAct->setIcon(QIcon(":/application-calc.png")); + exportCsvAct->setIcon(QIcon(":/icons/application-calc.png")); exportDatAct = file->addAction("Export data to &Gnuplot...", this, &ChartWindow::exportDat); - exportDatAct->setIcon(QIcon(":/application-plot.png")); + exportDatAct->setIcon(QIcon(":/icons/application-plot.png")); file->addSeparator(); closeAct = file->addAction("&Close", this, &QWidget::close); - closeAct->setIcon(QIcon(":/window-close.png")); + closeAct->setIcon(QIcon(":/icons/window-close.png")); auto *layout = new QVBoxLayout; layout->addLayout(top); setLayout(layout); diff --git a/tools/lammps-gui/codeeditor.cpp b/tools/lammps-gui/codeeditor.cpp index 01e71d087c..bf94568f37 100644 --- a/tools/lammps-gui/codeeditor.cpp +++ b/tools/lammps-gui/codeeditor.cpp @@ -657,18 +657,18 @@ void CodeEditor::contextMenuEvent(QContextMenuEvent *event) auto *menu = createStandardContextMenu(); menu->addSeparator(); auto action = menu->addAction(QString("Display available completions for '%1'").arg(help)); - action->setIcon(QIcon(":/expand-text.png")); + action->setIcon(QIcon(":/icons/expand-text.png")); connect(action, &QAction::triggered, this, &CodeEditor::runCompletion); if (!page.isEmpty()) { menu->addSeparator(); action = menu->addAction(QString("Reformat '%1' command").arg(help)); - action->setIcon(QIcon(":/format-indent-less-3.png")); + action->setIcon(QIcon(":/icons/format-indent-less-3.png")); connect(action, &QAction::triggered, this, &CodeEditor::reformatCurrentLine); menu->addSeparator(); action = menu->addAction(QString("View Documentation for '%1'").arg(help)); - action->setIcon(QIcon(":/system-help.png")); + action->setIcon(QIcon(":/icons/system-help.png")); action->setData(page); connect(action, &QAction::triggered, this, &CodeEditor::open_help); // if we link to help with specific styles (fix, compute, pair, bond, ...) @@ -679,13 +679,13 @@ void CodeEditor::contextMenuEvent(QContextMenuEvent *event) page = words.at(0); page += ".html"; auto action2 = menu->addAction(QString("View Documentation for '%1'").arg(help)); - action2->setIcon(QIcon(":/system-help.png")); + action2->setIcon(QIcon(":/icons/system-help.png")); action2->setData(page); connect(action2, &QAction::triggered, this, &CodeEditor::open_help); } } auto action3 = menu->addAction(QString("LAMMPS Manual")); - action3->setIcon(QIcon(":/help-browser.png")); + action3->setIcon(QIcon(":/icons/help-browser.png")); action3->setData(QString()); connect(action3, &QAction::triggered, this, &CodeEditor::open_help); diff --git a/tools/lammps-gui/antialias.png b/tools/lammps-gui/icons/antialias.png similarity index 100% rename from tools/lammps-gui/antialias.png rename to tools/lammps-gui/icons/antialias.png diff --git a/tools/lammps-gui/application-calc.png b/tools/lammps-gui/icons/application-calc.png similarity index 100% rename from tools/lammps-gui/application-calc.png rename to tools/lammps-gui/icons/application-calc.png diff --git a/tools/lammps-gui/application-exit.png b/tools/lammps-gui/icons/application-exit.png similarity index 100% rename from tools/lammps-gui/application-exit.png rename to tools/lammps-gui/icons/application-exit.png diff --git a/tools/lammps-gui/application-plot.png b/tools/lammps-gui/icons/application-plot.png similarity index 100% rename from tools/lammps-gui/application-plot.png rename to tools/lammps-gui/icons/application-plot.png diff --git a/tools/lammps-gui/axes-img.png b/tools/lammps-gui/icons/axes-img.png similarity index 100% rename from tools/lammps-gui/axes-img.png rename to tools/lammps-gui/icons/axes-img.png diff --git a/tools/lammps-gui/document-new.png b/tools/lammps-gui/icons/document-new.png similarity index 100% rename from tools/lammps-gui/document-new.png rename to tools/lammps-gui/icons/document-new.png diff --git a/tools/lammps-gui/document-open-recent.png b/tools/lammps-gui/icons/document-open-recent.png similarity index 100% rename from tools/lammps-gui/document-open-recent.png rename to tools/lammps-gui/icons/document-open-recent.png diff --git a/tools/lammps-gui/document-open.png b/tools/lammps-gui/icons/document-open.png similarity index 100% rename from tools/lammps-gui/document-open.png rename to tools/lammps-gui/icons/document-open.png diff --git a/tools/lammps-gui/document-revert.png b/tools/lammps-gui/icons/document-revert.png similarity index 100% rename from tools/lammps-gui/document-revert.png rename to tools/lammps-gui/icons/document-revert.png diff --git a/tools/lammps-gui/document-save-as.png b/tools/lammps-gui/icons/document-save-as.png similarity index 100% rename from tools/lammps-gui/document-save-as.png rename to tools/lammps-gui/icons/document-save-as.png diff --git a/tools/lammps-gui/document-save.png b/tools/lammps-gui/icons/document-save.png similarity index 100% rename from tools/lammps-gui/document-save.png rename to tools/lammps-gui/icons/document-save.png diff --git a/tools/lammps-gui/edit-copy.png b/tools/lammps-gui/icons/edit-copy.png similarity index 100% rename from tools/lammps-gui/edit-copy.png rename to tools/lammps-gui/icons/edit-copy.png diff --git a/tools/lammps-gui/edit-cut.png b/tools/lammps-gui/icons/edit-cut.png similarity index 100% rename from tools/lammps-gui/edit-cut.png rename to tools/lammps-gui/icons/edit-cut.png diff --git a/tools/lammps-gui/edit-delete.png b/tools/lammps-gui/icons/edit-delete.png similarity index 100% rename from tools/lammps-gui/edit-delete.png rename to tools/lammps-gui/icons/edit-delete.png diff --git a/tools/lammps-gui/edit-paste.png b/tools/lammps-gui/icons/edit-paste.png similarity index 100% rename from tools/lammps-gui/edit-paste.png rename to tools/lammps-gui/icons/edit-paste.png diff --git a/tools/lammps-gui/edit-redo.png b/tools/lammps-gui/icons/edit-redo.png similarity index 100% rename from tools/lammps-gui/edit-redo.png rename to tools/lammps-gui/icons/edit-redo.png diff --git a/tools/lammps-gui/edit-undo.png b/tools/lammps-gui/icons/edit-undo.png similarity index 100% rename from tools/lammps-gui/edit-undo.png rename to tools/lammps-gui/icons/edit-undo.png diff --git a/tools/lammps-gui/emblem-photos.png b/tools/lammps-gui/icons/emblem-photos.png similarity index 100% rename from tools/lammps-gui/emblem-photos.png rename to tools/lammps-gui/icons/emblem-photos.png diff --git a/tools/lammps-gui/expand-text.png b/tools/lammps-gui/icons/expand-text.png similarity index 100% rename from tools/lammps-gui/expand-text.png rename to tools/lammps-gui/icons/expand-text.png diff --git a/tools/lammps-gui/export-movie.png b/tools/lammps-gui/icons/export-movie.png similarity index 100% rename from tools/lammps-gui/export-movie.png rename to tools/lammps-gui/icons/export-movie.png diff --git a/tools/lammps-gui/format-indent-less-3.png b/tools/lammps-gui/icons/format-indent-less-3.png similarity index 100% rename from tools/lammps-gui/format-indent-less-3.png rename to tools/lammps-gui/icons/format-indent-less-3.png diff --git a/tools/lammps-gui/go-first.png b/tools/lammps-gui/icons/go-first.png similarity index 100% rename from tools/lammps-gui/go-first.png rename to tools/lammps-gui/icons/go-first.png diff --git a/tools/lammps-gui/go-last.png b/tools/lammps-gui/icons/go-last.png similarity index 100% rename from tools/lammps-gui/go-last.png rename to tools/lammps-gui/icons/go-last.png diff --git a/tools/lammps-gui/go-next-2.png b/tools/lammps-gui/icons/go-next-2.png similarity index 100% rename from tools/lammps-gui/go-next-2.png rename to tools/lammps-gui/icons/go-next-2.png diff --git a/tools/lammps-gui/go-previous-2.png b/tools/lammps-gui/icons/go-previous-2.png similarity index 100% rename from tools/lammps-gui/go-previous-2.png rename to tools/lammps-gui/icons/go-previous-2.png diff --git a/tools/lammps-gui/gtk-go-down.png b/tools/lammps-gui/icons/gtk-go-down.png similarity index 100% rename from tools/lammps-gui/gtk-go-down.png rename to tools/lammps-gui/icons/gtk-go-down.png diff --git a/tools/lammps-gui/gtk-go-up.png b/tools/lammps-gui/icons/gtk-go-up.png similarity index 100% rename from tools/lammps-gui/gtk-go-up.png rename to tools/lammps-gui/icons/gtk-go-up.png diff --git a/tools/lammps-gui/gtk-zoom-fit.png b/tools/lammps-gui/icons/gtk-zoom-fit.png similarity index 100% rename from tools/lammps-gui/gtk-zoom-fit.png rename to tools/lammps-gui/icons/gtk-zoom-fit.png diff --git a/tools/lammps-gui/gtk-zoom-in.png b/tools/lammps-gui/icons/gtk-zoom-in.png similarity index 100% rename from tools/lammps-gui/gtk-zoom-in.png rename to tools/lammps-gui/icons/gtk-zoom-in.png diff --git a/tools/lammps-gui/gtk-zoom-out.png b/tools/lammps-gui/icons/gtk-zoom-out.png similarity index 100% rename from tools/lammps-gui/gtk-zoom-out.png rename to tools/lammps-gui/icons/gtk-zoom-out.png diff --git a/tools/lammps-gui/hd-img.png b/tools/lammps-gui/icons/hd-img.png similarity index 100% rename from tools/lammps-gui/hd-img.png rename to tools/lammps-gui/icons/hd-img.png diff --git a/tools/lammps-gui/help-about.png b/tools/lammps-gui/icons/help-about.png similarity index 100% rename from tools/lammps-gui/help-about.png rename to tools/lammps-gui/icons/help-about.png diff --git a/tools/lammps-gui/help-browser.png b/tools/lammps-gui/icons/help-browser.png similarity index 100% rename from tools/lammps-gui/help-browser.png rename to tools/lammps-gui/icons/help-browser.png diff --git a/tools/lammps-gui/help-faq.png b/tools/lammps-gui/icons/help-faq.png similarity index 100% rename from tools/lammps-gui/help-faq.png rename to tools/lammps-gui/icons/help-faq.png diff --git a/tools/lammps-gui/image-x-generic.png b/tools/lammps-gui/icons/image-x-generic.png similarity index 100% rename from tools/lammps-gui/image-x-generic.png rename to tools/lammps-gui/icons/image-x-generic.png diff --git a/tools/lammps-gui/lammps-icon-128x128.png b/tools/lammps-gui/icons/lammps-icon-128x128.png similarity index 100% rename from tools/lammps-gui/lammps-icon-128x128.png rename to tools/lammps-gui/icons/lammps-icon-128x128.png diff --git a/tools/lammps-gui/media-playback-start-2.png b/tools/lammps-gui/icons/media-playback-start-2.png similarity index 100% rename from tools/lammps-gui/media-playback-start-2.png rename to tools/lammps-gui/icons/media-playback-start-2.png diff --git a/tools/lammps-gui/media-playlist-repeat.png b/tools/lammps-gui/icons/media-playlist-repeat.png similarity index 100% rename from tools/lammps-gui/media-playlist-repeat.png rename to tools/lammps-gui/icons/media-playlist-repeat.png diff --git a/tools/lammps-gui/object-rotate-left.png b/tools/lammps-gui/icons/object-rotate-left.png similarity index 100% rename from tools/lammps-gui/object-rotate-left.png rename to tools/lammps-gui/icons/object-rotate-left.png diff --git a/tools/lammps-gui/object-rotate-right.png b/tools/lammps-gui/icons/object-rotate-right.png similarity index 100% rename from tools/lammps-gui/object-rotate-right.png rename to tools/lammps-gui/icons/object-rotate-right.png diff --git a/tools/lammps-gui/ovito.png b/tools/lammps-gui/icons/ovito.png similarity index 100% rename from tools/lammps-gui/ovito.png rename to tools/lammps-gui/icons/ovito.png diff --git a/tools/lammps-gui/preferences-desktop-font.png b/tools/lammps-gui/icons/preferences-desktop-font.png similarity index 100% rename from tools/lammps-gui/preferences-desktop-font.png rename to tools/lammps-gui/icons/preferences-desktop-font.png diff --git a/tools/lammps-gui/preferences-desktop-personal.png b/tools/lammps-gui/icons/preferences-desktop-personal.png similarity index 100% rename from tools/lammps-gui/preferences-desktop-personal.png rename to tools/lammps-gui/icons/preferences-desktop-personal.png diff --git a/tools/lammps-gui/preferences-desktop.png b/tools/lammps-gui/icons/preferences-desktop.png similarity index 100% rename from tools/lammps-gui/preferences-desktop.png rename to tools/lammps-gui/icons/preferences-desktop.png diff --git a/tools/lammps-gui/process-stop.png b/tools/lammps-gui/icons/process-stop.png similarity index 100% rename from tools/lammps-gui/process-stop.png rename to tools/lammps-gui/icons/process-stop.png diff --git a/tools/lammps-gui/run-file.png b/tools/lammps-gui/icons/run-file.png similarity index 100% rename from tools/lammps-gui/run-file.png rename to tools/lammps-gui/icons/run-file.png diff --git a/tools/lammps-gui/system-box.png b/tools/lammps-gui/icons/system-box.png similarity index 100% rename from tools/lammps-gui/system-box.png rename to tools/lammps-gui/icons/system-box.png diff --git a/tools/lammps-gui/system-help.png b/tools/lammps-gui/icons/system-help.png similarity index 100% rename from tools/lammps-gui/system-help.png rename to tools/lammps-gui/icons/system-help.png diff --git a/tools/lammps-gui/system-run.png b/tools/lammps-gui/icons/system-run.png similarity index 100% rename from tools/lammps-gui/system-run.png rename to tools/lammps-gui/icons/system-run.png diff --git a/tools/lammps-gui/utilities-terminal.png b/tools/lammps-gui/icons/utilities-terminal.png similarity index 100% rename from tools/lammps-gui/utilities-terminal.png rename to tools/lammps-gui/icons/utilities-terminal.png diff --git a/tools/lammps-gui/vdw-style.png b/tools/lammps-gui/icons/vdw-style.png similarity index 100% rename from tools/lammps-gui/vdw-style.png rename to tools/lammps-gui/icons/vdw-style.png diff --git a/tools/lammps-gui/vmd.png b/tools/lammps-gui/icons/vmd.png similarity index 100% rename from tools/lammps-gui/vmd.png rename to tools/lammps-gui/icons/vmd.png diff --git a/tools/lammps-gui/window-close.png b/tools/lammps-gui/icons/window-close.png similarity index 100% rename from tools/lammps-gui/window-close.png rename to tools/lammps-gui/icons/window-close.png diff --git a/tools/lammps-gui/x-office-drawing.png b/tools/lammps-gui/icons/x-office-drawing.png similarity index 100% rename from tools/lammps-gui/x-office-drawing.png rename to tools/lammps-gui/icons/x-office-drawing.png diff --git a/tools/lammps-gui/imageviewer.cpp b/tools/lammps-gui/imageviewer.cpp index 139d73cb38..c7186c40aa 100644 --- a/tools/lammps-gui/imageviewer.cpp +++ b/tools/lammps-gui/imageviewer.cpp @@ -79,7 +79,7 @@ ImageViewer::ImageViewer(const QString &fileName, LammpsWrapper *_lammps, QWidge QSettings settings; vdwfactor = 0.5; - auto pix = QPixmap(":/emblem-photos.png"); + auto pix = QPixmap(":/icons/emblem-photos.png"); auto *renderstatus = new QLabel(QString()); renderstatus->setPixmap(pix.scaled(22, 22, Qt::KeepAspectRatio)); @@ -107,39 +107,39 @@ ImageViewer::ImageViewer(const QString &fileName, LammpsWrapper *_lammps, QWidge auto *dummy = new QPushButton(QIcon(), ""); dummy->hide(); - auto *dossao = new QPushButton(QIcon(":/hd-img.png"), ""); + auto *dossao = new QPushButton(QIcon(":/icons/hd-img.png"), ""); dossao->setCheckable(true); dossao->setToolTip("Toggle SSAO rendering"); dossao->setObjectName("ssao"); - auto *doanti = new QPushButton(QIcon(":/antialias.png"), ""); + auto *doanti = new QPushButton(QIcon(":/icons/antialias.png"), ""); doanti->setCheckable(true); doanti->setToolTip("Toggle anti-aliasing"); doanti->setObjectName("antialias"); - auto *dovdw = new QPushButton(QIcon(":/vdw-style.png"), ""); + auto *dovdw = new QPushButton(QIcon(":/icons/vdw-style.png"), ""); dovdw->setCheckable(true); dovdw->setToolTip("Toggle VDW style representation"); dovdw->setObjectName("vdw"); - auto *dobox = new QPushButton(QIcon(":/system-box.png"), ""); + auto *dobox = new QPushButton(QIcon(":/icons/system-box.png"), ""); dobox->setCheckable(true); dobox->setToolTip("Toggle displaying box"); dobox->setObjectName("box"); - auto *doaxes = new QPushButton(QIcon(":/axes-img.png"), ""); + auto *doaxes = new QPushButton(QIcon(":/icons/axes-img.png"), ""); doaxes->setCheckable(true); doaxes->setToolTip("Toggle displaying axes"); doaxes->setObjectName("axes"); - auto *zoomin = new QPushButton(QIcon(":/gtk-zoom-in.png"), ""); + auto *zoomin = new QPushButton(QIcon(":/icons/gtk-zoom-in.png"), ""); zoomin->setToolTip("Zoom in by 10 percent"); - auto *zoomout = new QPushButton(QIcon(":/gtk-zoom-out.png"), ""); + auto *zoomout = new QPushButton(QIcon(":/icons/gtk-zoom-out.png"), ""); zoomout->setToolTip("Zoom out by 10 percent"); - auto *rotleft = new QPushButton(QIcon(":/object-rotate-left.png"), ""); + auto *rotleft = new QPushButton(QIcon(":/icons/object-rotate-left.png"), ""); rotleft->setToolTip("Rotate left by 15 degrees"); - auto *rotright = new QPushButton(QIcon(":/object-rotate-right.png"), ""); + auto *rotright = new QPushButton(QIcon(":/icons/object-rotate-right.png"), ""); rotright->setToolTip("Rotate right by 15 degrees"); - auto *rotup = new QPushButton(QIcon(":/gtk-go-up.png"), ""); + auto *rotup = new QPushButton(QIcon(":/icons/gtk-go-up.png"), ""); rotup->setToolTip("Rotate up by 15 degrees"); - auto *rotdown = new QPushButton(QIcon(":/gtk-go-down.png"), ""); + auto *rotdown = new QPushButton(QIcon(":/icons/gtk-go-down.png"), ""); rotdown->setToolTip("Rotate down by 15 degrees"); - auto *reset = new QPushButton(QIcon(":/gtk-zoom-fit.png"), ""); + auto *reset = new QPushButton(QIcon(":/icons/gtk-zoom-fit.png"), ""); reset->setToolTip("Reset view to defaults"); auto *combo = new QComboBox; combo->setObjectName("group"); @@ -192,7 +192,7 @@ ImageViewer::ImageViewer(const QString &fileName, LammpsWrapper *_lammps, QWidge mainLayout->addLayout(menuLayout); mainLayout->addWidget(scrollArea); mainLayout->addWidget(buttonBox); - setWindowIcon(QIcon(":/lammps-icon-128x128.png")); + setWindowIcon(QIcon(":/icons/lammps-icon-128x128.png")); setWindowTitle(QString("Image Viewer: ") + QFileInfo(fileName).fileName()); createActions(); @@ -475,16 +475,16 @@ void ImageViewer::createActions() QMenu *fileMenu = menuBar->addMenu("&File"); saveAsAct = fileMenu->addAction("&Save As...", this, &ImageViewer::saveAs); - saveAsAct->setIcon(QIcon(":/document-save-as.png")); + saveAsAct->setIcon(QIcon(":/icons/document-save-as.png")); saveAsAct->setEnabled(false); fileMenu->addSeparator(); copyAct = fileMenu->addAction("&Copy", this, &ImageViewer::copy); - copyAct->setIcon(QIcon(":/edit-copy.png")); + copyAct->setIcon(QIcon(":/icons/edit-copy.png")); copyAct->setShortcut(QKeySequence::Copy); copyAct->setEnabled(false); fileMenu->addSeparator(); QAction *exitAct = fileMenu->addAction("&Close", this, &QWidget::close); - exitAct->setIcon(QIcon(":/window-close.png")); + exitAct->setIcon(QIcon(":/icons/window-close.png")); exitAct->setShortcut(QKeySequence::fromString("Ctrl+W")); } diff --git a/tools/lammps-gui/lammpsgui.cpp b/tools/lammps-gui/lammpsgui.cpp index 599b9d5097..870f464ff1 100644 --- a/tools/lammps-gui/lammpsgui.cpp +++ b/tools/lammps-gui/lammpsgui.cpp @@ -146,7 +146,7 @@ LammpsGui::LammpsGui(QWidget *parent, const char *filename) : lammps_args.push_back(mystrdup("-log")); lammps_args.push_back(mystrdup("none")); - setWindowIcon(QIcon(":/lammps-icon-128x128.png")); + setWindowIcon(QIcon(":/icons/lammps-icon-128x128.png")); QFont all_font("Arial", -1); all_font.setStyleHint(QFont::SansSerif, QFont::PreferOutline); @@ -163,7 +163,7 @@ LammpsGui::LammpsGui(QWidget *parent, const char *filename) : varwindow = new QLabel(QString()); varwindow->setWindowTitle("LAMMPS-GUI - Current Variables:"); - varwindow->setWindowIcon(QIcon(":/lammps-icon-128x128.png")); + varwindow->setWindowIcon(QIcon(":/icons/lammps-icon-128x128.png")); varwindow->setMinimumSize(100, 50); varwindow->setText("(none)"); varwindow->setFont(text_font); @@ -226,15 +226,15 @@ LammpsGui::LammpsGui(QWidget *parent, const char *filename) : #endif lammpsstatus = new QLabel(QString()); - auto pix = QPixmap(":/lammps-icon-128x128.png"); + auto pix = QPixmap(":/icons/lammps-icon-128x128.png"); lammpsstatus->setPixmap(pix.scaled(22, 22, Qt::KeepAspectRatio)); ui->statusbar->addWidget(lammpsstatus); lammpsstatus->setToolTip("LAMMPS instance is active"); lammpsstatus->hide(); - auto *lammpsrun = new QPushButton(QIcon(":/system-run.png"), ""); - auto *lammpsstop = new QPushButton(QIcon(":/process-stop.png"), ""); - auto *lammpsimage = new QPushButton(QIcon(":/emblem-photos.png"), ""); + auto *lammpsrun = new QPushButton(QIcon(":/icons/system-run.png"), ""); + auto *lammpsstop = new QPushButton(QIcon(":/icons/process-stop.png"), ""); + auto *lammpsimage = new QPushButton(QIcon(":/icons/emblem-photos.png"), ""); lammpsrun->setToolTip("Run LAMMPS on input"); lammpsstop->setToolTip("Stop LAMMPS"); lammpsimage->setToolTip("Create snapshot image"); @@ -1015,7 +1015,7 @@ void LammpsGui::do_run(bool use_buffer) else logwindow->setWindowTitle("LAMMPS-GUI - Output from running LAMMPS on file - " + current_file); - logwindow->setWindowIcon(QIcon(":/lammps-icon-128x128.png")); + logwindow->setWindowIcon(QIcon(":/icons/lammps-icon-128x128.png")); QFont text_font; text_font.fromString(settings.value("textfont", text_font.toString()).toString()); logwindow->document()->setDefaultFont(text_font); @@ -1039,7 +1039,7 @@ void LammpsGui::do_run(bool use_buffer) else chartwindow->setWindowTitle("LAMMPS-GUI - Thermo charts from running LAMMPS on file - " + current_file); - chartwindow->setWindowIcon(QIcon(":/lammps-icon-128x128.png")); + chartwindow->setWindowIcon(QIcon(":/icons/lammps-icon-128x128.png")); chartwindow->setMinimumSize(400, 300); shortcut = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_W), chartwindow); QObject::connect(shortcut, &QShortcut::activated, chartwindow, &ChartWindow::close); @@ -1202,10 +1202,10 @@ void LammpsGui::about() QMessageBox msg; msg.setWindowTitle("About LAMMPS"); - msg.setWindowIcon(QIcon(":/lammps-icon-128x128.png")); + msg.setWindowIcon(QIcon(":/icons/lammps-icon-128x128.png")); msg.setText(version.c_str()); msg.setInformativeText(info.c_str()); - msg.setIconPixmap(QPixmap(":/lammps-icon-128x128.png").scaled(64, 64)); + msg.setIconPixmap(QPixmap(":/icons/lammps-icon-128x128.png").scaled(64, 64)); msg.setStandardButtons(QMessageBox::Close); QFont font; font.setPointSizeF(font.pointSizeF() * 0.75); @@ -1222,7 +1222,7 @@ void LammpsGui::help() { QMessageBox msg; msg.setWindowTitle("LAMMPS-GUI Quick Help"); - msg.setWindowIcon(QIcon(":/lammps-icon-128x128.png")); + msg.setWindowIcon(QIcon(":/icons/lammps-icon-128x128.png")); msg.setText("
This is LAMMPS-GUI version " LAMMPS_GUI_VERSION "
"); msg.setInformativeText("

LAMMPS GUI is a graphical text editor that is linked to the LAMMPS " "library and thus can run LAMMPS directly using the contents of the " @@ -1262,7 +1262,7 @@ void LammpsGui::help() "accelerator packages and number of OpenMP threads. Due to its nature " "as a graphical application, it is not possible to use the " "LAMMPS GUI in parallel with MPI.

"); - msg.setIconPixmap(QPixmap(":/lammps-icon-128x128.png").scaled(64, 64)); + msg.setIconPixmap(QPixmap(":/icons/lammps-icon-128x128.png").scaled(64, 64)); msg.setStandardButtons(QMessageBox::Close); msg.exec(); } diff --git a/tools/lammps-gui/lammpsgui.qrc b/tools/lammps-gui/lammpsgui.qrc index 0baca37aac..6405d66d7a 100644 --- a/tools/lammps-gui/lammpsgui.qrc +++ b/tools/lammps-gui/lammpsgui.qrc @@ -1,62 +1,62 @@ - lammps-icon-128x128.png + icons/lammps-icon-128x128.png help_index.table lammps_internal_commands.txt - antialias.png - application-calc.png - application-exit.png - application-plot.png - axes-img.png - document-new.png - document-open-recent.png - document-open.png - document-revert.png - document-save-as.png - document-save.png - edit-copy.png - edit-cut.png - edit-delete.png - edit-paste.png - edit-redo.png - edit-undo.png - emblem-photos.png - expand-text.png - export-movie.png - format-indent-less-3.png - go-first.png - go-last.png - go-next-2.png - go-previous-2.png - gtk-go-down.png - gtk-go-up.png - gtk-zoom-fit.png - gtk-zoom-in.png - gtk-zoom-out.png - hd-img.png - help-about.png - help-browser.png - help-faq.png - image-x-generic.png - media-playback-start-2.png - media-playlist-repeat.png - object-rotate-left.png - object-rotate-right.png - ovito.png - preferences-desktop-font.png - preferences-desktop-personal.png - preferences-desktop.png - process-stop.png - run-file.png - system-box.png - system-help.png - system-run.png - utilities-terminal.png - vdw-style.png - vmd.png - window-close.png - x-office-drawing.png + icons/antialias.png + icons/application-calc.png + icons/application-exit.png + icons/application-plot.png + icons/axes-img.png + icons/document-new.png + icons/document-open-recent.png + icons/document-open.png + icons/document-revert.png + icons/document-save-as.png + icons/document-save.png + icons/edit-copy.png + icons/edit-cut.png + icons/edit-delete.png + icons/edit-paste.png + icons/edit-redo.png + icons/edit-undo.png + icons/emblem-photos.png + icons/expand-text.png + icons/export-movie.png + icons/format-indent-less-3.png + icons/go-first.png + icons/go-last.png + icons/go-next-2.png + icons/go-previous-2.png + icons/gtk-go-down.png + icons/gtk-go-up.png + icons/gtk-zoom-fit.png + icons/gtk-zoom-in.png + icons/gtk-zoom-out.png + icons/hd-img.png + icons/help-about.png + icons/help-browser.png + icons/help-faq.png + icons/image-x-generic.png + icons/media-playback-start-2.png + icons/media-playlist-repeat.png + icons/object-rotate-left.png + icons/object-rotate-right.png + icons/ovito.png + icons/preferences-desktop-font.png + icons/preferences-desktop-personal.png + icons/preferences-desktop.png + icons/process-stop.png + icons/run-file.png + icons/system-box.png + icons/system-help.png + icons/system-run.png + icons/utilities-terminal.png + icons/vdw-style.png + icons/vmd.png + icons/window-close.png + icons/x-office-drawing.png diff --git a/tools/lammps-gui/lammpsgui.ui b/tools/lammps-gui/lammpsgui.ui index 77257b23c2..bb9af2e17e 100644 --- a/tools/lammps-gui/lammpsgui.ui +++ b/tools/lammps-gui/lammpsgui.ui @@ -105,7 +105,7 @@ - + &New @@ -116,7 +116,7 @@ - + &Open @@ -127,7 +127,7 @@ - + &Save @@ -138,7 +138,7 @@ - + Save &As @@ -149,7 +149,7 @@ - + &Quit @@ -160,7 +160,7 @@ - + Cu&t @@ -171,7 +171,7 @@ - + &Copy @@ -182,7 +182,7 @@ - + &Paste @@ -193,7 +193,7 @@ - + &Undo @@ -204,7 +204,7 @@ - + &Redo @@ -215,7 +215,7 @@ - + &Run LAMMPS from Editor Buffer @@ -226,7 +226,7 @@ - + &Run LAMMPS from File @@ -237,7 +237,7 @@ - + &Stop LAMMPS @@ -248,7 +248,7 @@ - + Create &Image @@ -259,7 +259,7 @@ - + &About LAMMPS @@ -270,7 +270,7 @@ - + Quick &Help @@ -281,7 +281,7 @@ - + Pre&ferences... @@ -292,7 +292,7 @@ - + LAMMPS &Manual @@ -303,7 +303,7 @@ - + Reset to &Defaults @@ -311,7 +311,7 @@ - + View in &OVITO @@ -322,7 +322,7 @@ - + View in VM&D @@ -333,7 +333,7 @@ - + &Log Window @@ -344,7 +344,7 @@ - + &Chart Window @@ -355,7 +355,7 @@ - + &Slide Show Window @@ -366,7 +366,7 @@ - + &1. @@ -374,7 +374,7 @@ - + &2. @@ -382,7 +382,7 @@ - + &3. @@ -390,7 +390,7 @@ - + &4. @@ -398,7 +398,7 @@ - + &5. @@ -406,7 +406,7 @@ - + &Image Window @@ -417,7 +417,7 @@ - + Set &Variables... @@ -428,7 +428,7 @@ - + &Variables Window @@ -439,7 +439,7 @@ - + LAMMPS GUI Howto diff --git a/tools/lammps-gui/preferences.cpp b/tools/lammps-gui/preferences.cpp index b6224d452e..5b8cc7afdb 100644 --- a/tools/lammps-gui/preferences.cpp +++ b/tools/lammps-gui/preferences.cpp @@ -73,7 +73,7 @@ Preferences::Preferences(LammpsWrapper *_lammps, QWidget *parent) : layout->addWidget(tabWidget); layout->addWidget(buttonBox); setLayout(layout); - setWindowIcon(QIcon(":/lammps-icon-128x128.png")); + setWindowIcon(QIcon(":/icons/lammps-icon-128x128.png")); setWindowTitle("LAMMPS-GUI - Preferences"); resize(600, 450); } @@ -242,9 +242,9 @@ GeneralTab::GeneralTab(QSettings *_settings, LammpsWrapper *_lammps, QWidget *pa auto *fontlayout = new QHBoxLayout; auto *getallfont = - new QPushButton(QIcon(":/preferences-desktop-font.png"), "Select Default Font..."); + new QPushButton(QIcon(":/icons/preferences-desktop-font.png"), "Select Default Font..."); auto *gettextfont = - new QPushButton(QIcon(":/preferences-desktop-font.png"), "Select Text Font..."); + new QPushButton(QIcon(":/icons/preferences-desktop-font.png"), "Select Text Font..."); fontlayout->addWidget(getallfont); fontlayout->addWidget(gettextfont); connect(getallfont, &QPushButton::released, this, &GeneralTab::newallfont); diff --git a/tools/lammps-gui/setvariables.cpp b/tools/lammps-gui/setvariables.cpp index fbbacb70bd..db5eb1cdea 100644 --- a/tools/lammps-gui/setvariables.cpp +++ b/tools/lammps-gui/setvariables.cpp @@ -32,7 +32,7 @@ SetVariables::SetVariables(QList> &_vars, QWidget *paren auto *row = new QHBoxLayout; auto *name = new QLineEdit(v.first); auto *val = new QLineEdit(v.second); - auto *del = new QPushButton(QIcon(":/edit-delete.png"), ""); + auto *del = new QPushButton(QIcon(":/icons/edit-delete.png"), ""); name->setObjectName("varname"); val->setObjectName("varval"); del->setObjectName(QString::number(i)); @@ -55,7 +55,7 @@ SetVariables::SetVariables(QList> &_vars, QWidget *paren layout->addWidget(buttonBox); setLayout(layout); - setWindowIcon(QIcon(":/lammps-icon-128x128.png")); + setWindowIcon(QIcon(":/icons/lammps-icon-128x128.png")); setWindowTitle("LAMMPS-GUI - Set Variables"); resize(300, 200); } @@ -81,7 +81,7 @@ void SetVariables::add_row() auto *row = new QHBoxLayout; auto *name = new QLineEdit(QString()); auto *val = new QLineEdit(QString()); - auto *del = new QPushButton(QIcon(":/edit-delete.png"), ""); + auto *del = new QPushButton(QIcon(":/icons/edit-delete.png"), ""); name->setObjectName("varname"); val->setObjectName("varval"); del->setObjectName(QString::number(nrows - 2)); diff --git a/tools/lammps-gui/slideshow.cpp b/tools/lammps-gui/slideshow.cpp index e92bfdc2d5..68544040e6 100644 --- a/tools/lammps-gui/slideshow.cpp +++ b/tools/lammps-gui/slideshow.cpp @@ -64,33 +64,33 @@ SlideShow::SlideShow(const QString &fileName, QWidget *parent) : auto *dummy = new QPushButton(QIcon(), ""); dummy->hide(); - auto *tomovie = new QPushButton(QIcon(":/export-movie.png"), ""); + auto *tomovie = new QPushButton(QIcon(":/icons/export-movie.png"), ""); tomovie->setToolTip("Export to movie file"); tomovie->setEnabled(has_exe("ffmpeg")); - auto *gofirst = new QPushButton(QIcon(":/go-first.png"), ""); + auto *gofirst = new QPushButton(QIcon(":/icons/go-first.png"), ""); gofirst->setToolTip("Go to first Image"); - auto *goprev = new QPushButton(QIcon(":/go-previous-2.png"), ""); + auto *goprev = new QPushButton(QIcon(":/icons/go-previous-2.png"), ""); goprev->setToolTip("Go to previous Image"); - auto *goplay = new QPushButton(QIcon(":/media-playback-start-2.png"), ""); + auto *goplay = new QPushButton(QIcon(":/icons/media-playback-start-2.png"), ""); goplay->setToolTip("Play animation"); goplay->setCheckable(true); goplay->setChecked(playtimer); goplay->setObjectName("play"); - auto *gonext = new QPushButton(QIcon(":/go-next-2.png"), ""); + auto *gonext = new QPushButton(QIcon(":/icons/go-next-2.png"), ""); gonext->setToolTip("Go to next Image"); - auto *golast = new QPushButton(QIcon(":/go-last.png"), ""); + auto *golast = new QPushButton(QIcon(":/icons/go-last.png"), ""); golast->setToolTip("Go to last Image"); - auto *goloop = new QPushButton(QIcon(":/media-playlist-repeat.png"), ""); + auto *goloop = new QPushButton(QIcon(":/icons/media-playlist-repeat.png"), ""); goloop->setToolTip("Loop animation"); goloop->setCheckable(true); goloop->setChecked(do_loop); - auto *zoomin = new QPushButton(QIcon(":/gtk-zoom-in.png"), ""); + auto *zoomin = new QPushButton(QIcon(":/icons/gtk-zoom-in.png"), ""); zoomin->setToolTip("Zoom in by 10 percent"); - auto *zoomout = new QPushButton(QIcon(":/gtk-zoom-out.png"), ""); + auto *zoomout = new QPushButton(QIcon(":/icons/gtk-zoom-out.png"), ""); zoomout->setToolTip("Zoom out by 10 percent"); - auto *normal = new QPushButton(QIcon(":/gtk-zoom-fit.png"), ""); + auto *normal = new QPushButton(QIcon(":/icons/gtk-zoom-fit.png"), ""); normal->setToolTip("Reset zoom to normal"); connect(tomovie, &QPushButton::released, this, &SlideShow::movie); @@ -127,7 +127,7 @@ SlideShow::SlideShow(const QString &fileName, QWidget *parent) : botLayout->setStretch(0, 3); mainLayout->addLayout(botLayout); - setWindowIcon(QIcon(":/lammps-icon-128x128.png")); + setWindowIcon(QIcon(":/icons/lammps-icon-128x128.png")); setWindowTitle(QString("LAMMPS-GUI - Slide Show: ") + QFileInfo(fileName).fileName()); imagefiles.clear();