diff --git a/CODEOWNERS b/CODEOWNERS index 25516d49d..520b8e04d 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -3,4 +3,4 @@ # the repo. Unless a later match takes precedence, # all of these owners will be required for # review when a pull request is opened. -* @aroschli @cadkin @liamnwhite1 @mborish @AshGannon +* @aroschli @cadkin @liamnwhite1 @AshGannon diff --git a/README.md b/README.md index 7fec06cdd..e701c6bef 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Slicer-2 -Slicer-2 Logo +Slicer-2 Logo Slicer-2 is an open‑source toolpath planning and slicing framework developed at Oak Ridge National Laboratory (ORNL) for additive manufacturing processes. It provides advanced algorithms for generating efficient, reliable toolpaths for technologies such as Fused Deposition Modeling (FDM) and Directed Energy Deposition (DED), with an emphasis on print quality, process optimization, and extensibility. @@ -45,7 +45,7 @@ Before opening a new issue, please search existing ones to avoid duplicates. ### User Guide -Slicer-2 includes a comprehensive [user guide](https://github.com/ORNLSlicer/Slicer-2/blob/master/doc/assets/slicer-2_user_guide.pdf) This guide details the operation of Slicer-2 as well as explanations of every setting and its impact on the slicing process. The user guide also describes the command line mode and includes examples. +Slicer-2 includes a comprehensive [User Guide](https://github.com/ORNLSlicer/Slicer-2/blob/Master/doc/slicer-2_user_guide.pdf). This guide details the operation of Slicer-2 as well as explanations of every setting and its impact on the slicing process. The user guide also describes the command line mode and includes examples. @@ -80,12 +80,12 @@ Development has benefited from numerous research partners and many interns whose ## Contact -General inquiries: `slicer@ornl.gov` +General inquiries: [slicer@ornl.gov](mailto:slicer@ornl.gov) --- ## Share -Use the QR code below to quickly share or access the repository (also available in `doc/assets/`). +Use the QR code below to quickly share or access the repository. -![Share/Connect](doc/assets/slicer-2_qr.png) +![Share/Connect](resources/icons/slicer-2_qr.png) diff --git a/doc/assets/slicer-2_logo.png b/doc/assets/slicer-2_logo.png deleted file mode 100644 index 0b96de377..000000000 --- a/doc/assets/slicer-2_logo.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0b7b1626b3854f85c100e0f820149445ab67c8ddae0daa8fc0805663648475db -size 201314 diff --git a/flake.nix b/flake.nix index 256262414..403cacdd5 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - description = "ORNL Slicer 2 - An advanced object slicer"; + description = "ORNL Slicer-2 - An advanced slicing application for Additive Manufacturing"; inputs = { nixpkgs.url = gitlab:mdf/nixpkgs/slicer2?host=code.ornl.gov; diff --git a/include/graphics/objects/cube_object.h b/include/graphics/objects/cube_object.h index b2ed1af51..ace2ba639 100644 --- a/include/graphics/objects/cube_object.h +++ b/include/graphics/objects/cube_object.h @@ -10,7 +10,7 @@ namespace ORNL { * * \note * QVector text = { - * QImage(":/icons/slicer2.png"), + * QImage(":/icons/slicer-2_logo.png"), * QImage(":/icons/3d_chart.png"), * QImage(":/icons/3d_graph.png"), * QImage(":/icons/arrow.png"), diff --git a/include/slicing/buffered_slicer.h b/include/slicing/buffered_slicer.h index f4cb68430..c70a0189c 100644 --- a/include/slicing/buffered_slicer.h +++ b/include/slicing/buffered_slicer.h @@ -38,7 +38,7 @@ class BufferedSlicer { //! \param ranges the ranges the apply settings along //! \param previous_buffer the number of past slices to track //! \param future_buffer the numer of future slices to buffer - //! \param use_cgal_cross_section use cgal cross-sectioning in place of ORNL slicer 2's + //! \param use_cgal_cross_section use cgal cross-sectioning in place of ORNL Slicer-2's BufferedSlicer(const QSharedPointer& mesh, const QSharedPointer& settings, QVector> settings_parts, QMap> ranges = QMap>(), diff --git a/include/utilities/enums.h b/include/utilities/enums.h index 23c177643..d95399c01 100644 --- a/include/utilities/enums.h +++ b/include/utilities/enums.h @@ -711,7 +711,7 @@ inline QString VisualizationColorsName(VisualizationColors color) { default: QMessageBox::critical( - Q_NULLPTR, "ORNL Slicer 2", + Q_NULLPTR, "ORNL Slicer-2", "Unimplemented corosponding visualization colors string.\n" "With a new enum entry for color, a corrosponding name (in VisualizationColorsName) and\n" "default color value (in VisualizationColorsDefaults) needs to be created.", @@ -779,7 +779,7 @@ inline constexpr const QColor VisualizationColorsDefaults(VisualizationColors co default: QMessageBox::critical( - Q_NULLPTR, "ORNL Slicer 2", + Q_NULLPTR, "ORNL Slicer-2", "Unimplemented corosponding visualization default color.\n" "With a new enum entry for color, a corrosponding name (in VisualizationColorsName) and\n" "default color value (in VisualizationColorsDefaults) needs to be created.", diff --git a/resources/icons/icons.qrc b/resources/icons/icons.qrc index 77e34c204..a3bfea489 100644 --- a/resources/icons/icons.qrc +++ b/resources/icons/icons.qrc @@ -348,8 +348,8 @@ align.png location_marker.png support_overhang.png - slicer2.ico - slicer2.png + slicer-2_logo.ico + slicer-2_logo.png hybrid_logo.png name_black.png name_white.png diff --git a/resources/icons/slicer-2_logo.ico b/resources/icons/slicer-2_logo.ico new file mode 100644 index 000000000..cd6de608f --- /dev/null +++ b/resources/icons/slicer-2_logo.ico @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:49d0cc6634255cbc2e60635b0dda90010643f9615d8188e759775ae7e8bf2f78 +size 151639 diff --git a/resources/icons/slicer-2_logo.png b/resources/icons/slicer-2_logo.png new file mode 100644 index 000000000..358f06df6 --- /dev/null +++ b/resources/icons/slicer-2_logo.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:42a3b309e1efd032a29a68de95cb9e5421c9fcb21ce72667bd54a499cf53abde +size 27248 diff --git a/doc/assets/slicer-2_qr.png b/resources/icons/slicer-2_qr.png similarity index 100% rename from doc/assets/slicer-2_qr.png rename to resources/icons/slicer-2_qr.png diff --git a/resources/icons/slicer2.ico b/resources/icons/slicer2.ico deleted file mode 100644 index 0f9cefd29..000000000 --- a/resources/icons/slicer2.ico +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b1f75f2a89d726c980eff829cd40f3c317e4b2b38f38f17e9d01882e268f1199 -size 306454 diff --git a/resources/icons/slicer2.png b/resources/icons/slicer2.png deleted file mode 100644 index 0b96de377..000000000 --- a/resources/icons/slicer2.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0b7b1626b3854f85c100e0f820149445ab67c8ddae0daa8fc0805663648475db -size 201314 diff --git a/scripts/installer.nsi b/scripts/installer.nsi index 540942ca3..3c034545d 100644 --- a/scripts/installer.nsi +++ b/scripts/installer.nsi @@ -10,7 +10,7 @@ Unicode true !define APPLICATION "slicer2" !define HUMAN_ORG "ORNL" -!define HUMAN_APPLICATION "ORNL Slicer 2" +!define HUMAN_APPLICATION "ORNL Slicer-2" ;!tempfile VER_TEMP ;!system 'echo "!define VERSION_MAJOR $(jq -j .major ../version.json)" >> ${VER_TEMP}' @@ -23,10 +23,10 @@ Unicode true ;!define VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}+${VERSION_SUFFIX}" !system "echo ${APPLICATION} version: ${VERSION}" -!define ICON "../resources/icons/slicer2.ico" +!define ICON "../resources/icons/slicer-2_logo.ico" ; Info -Name "ORNL Slicer 2" +Name "ORNL Slicer-2" LicenseData "../LICENSE.md" Icon "${ICON}" UninstallIcon "${ICON}" @@ -58,7 +58,7 @@ Section "${HUMAN_APPLICATION}" ; Generate uninstaller WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION}" "DisplayName" "${HUMAN_APPLICATION}" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION}" "DisplayIcon" "$INSTDIR\slicer2.ico" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION}" "DisplayIcon" "$INSTDIR\slicer-2_logo.ico" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION}" "Publisher" "Oak Ridge National Lab" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION}" "InstallLocation" "$INSTDIR" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION}" "DisplayVersion" "${VERSION}" @@ -82,8 +82,8 @@ Section "Start Menu Shortcuts" SetShellVarContext all CreateDirectory "$SMPROGRAMS\${HUMAN_ORG}\${HUMAN_APPLICATION}" - CreateShortcut "$SMPROGRAMS\${HUMAN_ORG}\${HUMAN_APPLICATION}\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\slicer2.ico" 0 - CreateShortcut "$SMPROGRAMS\${HUMAN_ORG}\${HUMAN_APPLICATION}\${HUMAN_APPLICATION}.lnk" "$INSTDIR\bin\${APPLICATION}.exe" "" "$INSTDIR\slicer2.ico" 0 + CreateShortcut "$SMPROGRAMS\${HUMAN_ORG}\${HUMAN_APPLICATION}\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\slicer-2_logo.ico" 0 + CreateShortcut "$SMPROGRAMS\${HUMAN_ORG}\${HUMAN_APPLICATION}\${HUMAN_APPLICATION}.lnk" "$INSTDIR\bin\${APPLICATION}.exe" "" "$INSTDIR\slicer-2_logo.ico" 0 SectionEnd Section "Uninstall" diff --git a/src/console/command_line_processor.cpp b/src/console/command_line_processor.cpp index 5da93b6e8..e407134d8 100644 --- a/src/console/command_line_processor.cpp +++ b/src/console/command_line_processor.cpp @@ -21,7 +21,7 @@ void CommandLineConverter::setupCommandLineParser(QCommandLineParser& parser) { // custom options needed for loading/slicing parser.addOption({Constants::ConsoleOptionStrings::kInputProjectFile, - "Run Slicer 2 using project file at .", "directory", ""}); + "Run Slicer-2 using project file at .", "directory", ""}); parser.addOption({Constants::ConsoleOptionStrings::kInputStlFiles, "List of STLs to load for slicing. Parameter can be specified multiple times.", "file-list", ""}); parser.addOption({Constants::ConsoleOptionStrings::kInputSupportStlFiles, @@ -107,7 +107,7 @@ void CommandLineConverter::setupCommandLineParser(QCommandLineParser& parser) { "List of layer numbers to slice in lieu of slicing the entire object. Mutually exclusive to " "single_slice_height. Parameter can be specified multiple times.", "layer-list", ""}); - parser.addOption({Constants::ConsoleOptionStrings::kVersion, "Current Slicer 2 Version"}); + parser.addOption({Constants::ConsoleOptionStrings::kVersion, "Current Slicer-2 Version"}); } bool CommandLineConverter::checkRequiredSettings(QCommandLineParser& parser, QSharedPointer options) { diff --git a/src/gcode/writers/writer_base.cpp b/src/gcode/writers/writer_base.cpp index 10afdc107..2073d078c 100644 --- a/src/gcode/writers/writer_base.cpp +++ b/src/gcode/writers/writer_base.cpp @@ -78,7 +78,7 @@ QString WriterBase::writeSlicerHeader(const QString& syntax) { else if (syntax == PRS::SyntaxString::kMeltio) rv += "%\n"; - rv += commentLine(QString("G-Code generated by ORNL Slicer 2 " BOOST_PP_STRINGIZE(SLICER2_VERSION))) % + rv += commentLine(QString("G-Code generated by ORNL Slicer-2 " BOOST_PP_STRINGIZE(SLICER2_VERSION))) % commentLine(QString("Copyright " % QString::number(QDate::currentDate().year()) % " ORNL")) % commentLine(QString("G-Code Syntax: ") % syntax) % commentLine(QString("Filename: ")) % m_newline; diff --git a/src/managers/settings/settings_manager.cpp b/src/managers/settings/settings_manager.cpp index 7053ce5cc..6284a3271 100644 --- a/src/managers/settings/settings_manager.cpp +++ b/src/managers/settings/settings_manager.cpp @@ -217,7 +217,7 @@ int SettingsManager::checkVersion(QString filename, fifojson& settings_data, boo int ret = m_yes_to_all_update; if (!ret) ret = QMessageBox::warning( - nullptr, "ORNL Slicer 2", + nullptr, "ORNL Slicer-2", filename + "is outdated. Do you want to update this template to the newest compatible version? " "Failure to do so may result in program instability.", QMessageBox::Yes | QMessageBox::YesToAll | QMessageBox::No); diff --git a/src/managers/settings/settings_version_control.cpp b/src/managers/settings/settings_version_control.cpp index 38a604239..b11327f9c 100644 --- a/src/managers/settings/settings_version_control.cpp +++ b/src/managers/settings/settings_version_control.cpp @@ -15,7 +15,7 @@ void SettingsVersionControl::rollSettingsForward(double& version, fifojson& sett void SettingsVersionControl::formatSettings(double version, fifojson& settings) { QString dt = QDateTime::currentDateTime().toString(); fifojson new_format; - new_format[Constants::SettingFileStrings::kHeader][Constants::SettingFileStrings::kCreatedBy] = "ORNL Slicer 2"; + new_format[Constants::SettingFileStrings::kHeader][Constants::SettingFileStrings::kCreatedBy] = "ORNL Slicer-2"; new_format[Constants::SettingFileStrings::kHeader][Constants::SettingFileStrings::kCreatedOn] = dt.toStdString(); new_format[Constants::SettingFileStrings::kHeader][Constants::SettingFileStrings::kLastModified] = dt.toStdString(); new_format[Constants::SettingFileStrings::kHeader][Constants::SettingFileStrings::kVersion] = version; diff --git a/src/threading/gcode_tormach_saver.cpp b/src/threading/gcode_tormach_saver.cpp index 62e8a92a3..3a189b8f2 100644 --- a/src/threading/gcode_tormach_saver.cpp +++ b/src/threading/gcode_tormach_saver.cpp @@ -44,7 +44,7 @@ void GCodeTormachSaver::run() { file.open(QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Text); QTextStream out(&file); - out << "$$ ORNL SLICER 2" % newline; + out << "$$ ORNL SLICER-2" % newline; out << "$$*" % newline; out << "$$ -> MFGNO" % newline; out << "PARTNO / CF HY-80 3 x 1 1 1 CF HY-80 3 x 1" % newline; diff --git a/src/widgets/gcode_info_control.cpp b/src/widgets/gcode_info_control.cpp index 8b3a7e29e..bafd2f9a3 100644 --- a/src/widgets/gcode_info_control.cpp +++ b/src/widgets/gcode_info_control.cpp @@ -183,7 +183,7 @@ void GCodeInfoControl::setupHeaderWidget() { hlayout->setContentsMargins(0, 0, 0, 0); QLabel* picture = new QLabel; - picture->setPixmap((new QIcon(":/icons/slicer2.png"))->pixmap(QSize(28, 28), QIcon::Normal, QIcon::On)); + picture->setPixmap((new QIcon(":/icons/slicer-2_logo.png"))->pixmap(QSize(28, 28), QIcon::Normal, QIcon::On)); QFrame* line = new QFrame; line->setFrameShape(QFrame::VLine); diff --git a/src/widgets/part_widget/part_control/part_control_tree_item.cpp b/src/widgets/part_widget/part_control/part_control_tree_item.cpp index 6977fe8d9..955d6df1d 100644 --- a/src/widgets/part_widget/part_control/part_control_tree_item.cpp +++ b/src/widgets/part_widget/part_control/part_control_tree_item.cpp @@ -67,7 +67,7 @@ void PartControlTreeItem::updateToolTip() { if (!m_is_mesh_closed) tooltip.append( - "\nThis model contains errors and is not a closed volume. Some Slicer 2 features may be unavailable."); + "\nThis model contains errors and is not a closed volume. Some Slicer-2 features may be unavailable."); if (!m_is_mesh_inside_volume) tooltip.append("\nThis model is outside the print volume."); @@ -95,7 +95,7 @@ PartControlTreeItem::Container::Container(QString name, bool closed, QWidget* pa auto error_label = new QLabel(this); error_label->setAttribute(Qt::WA_TranslucentBackground); error_label->setToolTip( - "This model contains errors is not a closed volume. Some Slicer 2 features may be unavailable."); + "This model contains errors is not a closed volume. Some Slicer-2 features may be unavailable."); error_label->setPixmap(error_icon.pixmap(QSize(20, 20))); layout->addWidget(error_label); diff --git a/src/widgets/settings/setting_bar.cpp b/src/widgets/settings/setting_bar.cpp index c700c05c6..d459b4635 100644 --- a/src/widgets/settings/setting_bar.cpp +++ b/src/widgets/settings/setting_bar.cpp @@ -52,7 +52,7 @@ void SettingBar::barTabWarning(int count, QString pane) { SettingTab* SettingBar::getTab(QString major, QString minor) { SettingTab* tab = this->getPane(major)->getTab(minor); if (tab == nullptr) - tab = this->getPane(major)->newTab(minor, QIcon(":/icons/slicer2.png"), + tab = this->getPane(major)->newTab(minor, QIcon(":/icons/slicer-2_logo.png"), PreferencesManager::getInstance()->isSettingHidden(major, minor)); return tab; diff --git a/src/widgets/settings/setting_tab.cpp b/src/widgets/settings/setting_tab.cpp index cd358134e..fc86430fc 100644 --- a/src/widgets/settings/setting_tab.cpp +++ b/src/widgets/settings/setting_tab.cpp @@ -122,7 +122,7 @@ void SettingTab::headerWarning(int count) { m_header->setIcon(QIcon(":/icons/warning.png")); } else { - m_header->setIcon(QIcon(":/icons/slicer2.png")); + m_header->setIcon(QIcon(":/icons/slicer-2_logo.png")); } } diff --git a/src/windows/about.cpp b/src/windows/about.cpp index 8ef1e7737..b097760f3 100644 --- a/src/windows/about.cpp +++ b/src/windows/about.cpp @@ -16,8 +16,8 @@ AboutWindow::AboutWindow(QWidget* parent) : QWidget() { // windows setWindowModality(Qt::ApplicationModal); - setWindowTitle("About ORNL Slicer 2"); - setWindowIcon(QIcon(":/icons/slicer2.png")); + setWindowTitle("About ORNL Slicer-2"); + setWindowIcon(QIcon(":/icons/slicer-2_logo.png")); QGridLayout* layout = new QGridLayout(); diff --git a/src/windows/dialogs/template_save.cpp b/src/windows/dialogs/template_save.cpp index 053942748..a0bd5e183 100644 --- a/src/windows/dialogs/template_save.cpp +++ b/src/windows/dialogs/template_save.cpp @@ -134,7 +134,7 @@ void TemplateSaveDialog::fileDialog() { QFileDialog save_dialog; save_dialog.setWindowTitle("Save Template Location"); save_dialog.setAcceptMode(QFileDialog::AcceptSave); - save_dialog.setNameFilters(QStringList() << "Slicer 2 Configuration/Template File (*.s2c)" << "Any Files (*)"); + save_dialog.setNameFilters(QStringList() << "Slicer-2 Configuration/Template File (*.s2c)" << "Any Files (*)"); save_dialog.setDirectory(m_filename); save_dialog.setDefaultSuffix("s2c"); diff --git a/src/windows/external_file_window.cpp b/src/windows/external_file_window.cpp index ce07f26f0..9a16eaffe 100644 --- a/src/windows/external_file_window.cpp +++ b/src/windows/external_file_window.cpp @@ -8,7 +8,7 @@ namespace ORNL { ExternalFileWindow::ExternalFileWindow(QWidget* parent) { QIcon icon; - icon.addFile(QStringLiteral(":/icons/slicer2.png"), QSize(), QIcon::Normal, QIcon::Off); + icon.addFile(QStringLiteral(":/icons/slicer-2_logo.png"), QSize(), QIcon::Normal, QIcon::Off); setWindowIcon(icon); m_layout = new QGridLayout(); diff --git a/src/windows/flowratecalc.cpp b/src/windows/flowratecalc.cpp index 6227faf4d..1d90d45df 100644 --- a/src/windows/flowratecalc.cpp +++ b/src/windows/flowratecalc.cpp @@ -15,7 +15,7 @@ FlowrateCalcWindow::FlowrateCalcWindow(QWidget* parent) : QWidget() { // setFixedSize(420,260); setWindowTitle("Slicer-2: Flowrate Calculator"); QIcon icon; - icon.addFile(QStringLiteral(":/icons/slicer2.png"), QSize(), QIcon::Normal, QIcon::Off); + icon.addFile(QStringLiteral(":/icons/slicer-2_logo.png"), QSize(), QIcon::Normal, QIcon::Off); setWindowIcon(icon); m_layout = new QGridLayout(); diff --git a/src/windows/gcode_export.cpp b/src/windows/gcode_export.cpp index 1fce458e6..49162b5c9 100644 --- a/src/windows/gcode_export.cpp +++ b/src/windows/gcode_export.cpp @@ -22,10 +22,10 @@ namespace ORNL { GcodeExport::GcodeExport(QWidget* parent) { - setWindowTitle("Slicer 2: G-Code/Project Export"); + setWindowTitle("Slicer-2: G-Code/Project Export"); QIcon icon; - icon.addFile(QStringLiteral(":/icons/slicer2.png"), QSize(), QIcon::Normal, QIcon::Off); + icon.addFile(QStringLiteral(":/icons/slicer-2_logo.png"), QSize(), QIcon::Normal, QIcon::Off); setWindowIcon(icon); m_layout = new QVBoxLayout(); diff --git a/src/windows/layer_times_window.cpp b/src/windows/layer_times_window.cpp index ae4b33ac5..c2464a840 100644 --- a/src/windows/layer_times_window.cpp +++ b/src/windows/layer_times_window.cpp @@ -8,7 +8,7 @@ namespace ORNL { LayerTimesWindow::LayerTimesWindow(QWidget* parent) { QIcon icon; - icon.addFile(QStringLiteral(":/icons/slicer2.png"), QSize(), QIcon::Normal, QIcon::Off); + icon.addFile(QStringLiteral(":/icons/slicer-2_logo.png"), QSize(), QIcon::Normal, QIcon::Off); setWindowIcon(icon); m_layout = new QGridLayout(); diff --git a/src/windows/main_window.cpp b/src/windows/main_window.cpp index d88bd667e..307d46a41 100644 --- a/src/windows/main_window.cpp +++ b/src/windows/main_window.cpp @@ -155,7 +155,7 @@ void MainWindow::setupWindows() { this->resize(Constants::UI::MainWindow::kWindowSize); QIcon icon; - icon.addFile(QStringLiteral(":/icons/slicer2.png"), QSize(), QIcon::Normal, QIcon::Off); + icon.addFile(QStringLiteral(":/icons/slicer-2_logo.png"), QSize(), QIcon::Normal, QIcon::Off); this->setWindowIcon(icon); // Preferences Window @@ -428,7 +428,7 @@ void MainWindow::setupActions() { m_actions["manual"] = {"User's Manual", ":/icons/help_black.png", false, QKeySequence(), nullptr}; m_actions["repo"] = {"Open Website/Repository", ":/icons/web_black.png", false, QKeySequence(), nullptr}; m_actions["bug"] = {"Report Bug", ":/icons/bug_black.png", false, QKeySequence(), nullptr}; - m_actions["about_s2"] = {"About ORNL Slicer 2", ":/icons/slicer2.png", false, QKeySequence(), nullptr}; + m_actions["about_s2"] = {"About ORNL Slicer-2", ":/icons/slicer-2_logo.png", false, QKeySequence(), nullptr}; m_actions["about_qt"] = {"About Qt", ":/icons/qt.png", false, QKeySequence(), nullptr}; // Menu Debug @@ -684,7 +684,7 @@ void MainWindow::setupEvents() { connect(m_actions["manual"].action, &QAction::triggered, this, [this] { QDesktopServices::openUrl( - QUrl::fromLocalFile(qApp->applicationDirPath() + "/../share/doc/slicer2/slicer2_user_guide.pdf")); + QUrl::fromLocalFile(qApp->applicationDirPath() + "/../share/doc/slicer2/slicer-2_user_guide.pdf")); }); connect(m_actions["repo"].action, &QAction::triggered, this, [this] { QDesktopServices::openUrl(QUrl("https://github.com/ORNLSlicer/Slicer-2")); }); @@ -924,7 +924,7 @@ void MainWindow::removeHiddenSetting(QMenu* menu, QString panel, QString setting } void MainWindow::retranslateUi() { - this->setWindowTitle(QApplication::translate("MainWindow", "ORNL Slicer 2", nullptr)); + this->setWindowTitle(QApplication::translate("MainWindow", "ORNL Slicer-2", nullptr)); // Iterate through the actions and retranslate them. for (menu_info curr_act : m_actions) { @@ -1108,7 +1108,7 @@ void MainWindow::saveSession() { save_dialog.setWindowTitle("Save project"); save_dialog.setDirectory(CSM->getMostRecentProjectLocation()); save_dialog.setAcceptMode(QFileDialog::AcceptSave); - save_dialog.setNameFilters(QStringList() << "Slicer 2 Project File (*.s2p)" << "Any Files (*)"); + save_dialog.setNameFilters(QStringList() << "Slicer-2 Project File (*.s2p)" << "Any Files (*)"); save_dialog.setDefaultSuffix("s2p"); if (!save_dialog.exec()) return; @@ -1130,7 +1130,7 @@ void MainWindow::loadSession() { load_dialog.setWindowTitle("Load project"); load_dialog.setDirectory(CSM->getMostRecentProjectLocation()); load_dialog.setAcceptMode(QFileDialog::AcceptOpen); - load_dialog.setNameFilters(QStringList() << "Slicer 2 Project File (*.s2p)" << "Any Files (*)"); + load_dialog.setNameFilters(QStringList() << "Slicer-2 Project File (*.s2p)" << "Any Files (*)"); load_dialog.setDefaultSuffix("s2p"); if (!load_dialog.exec()) return; @@ -1215,7 +1215,7 @@ void MainWindow::loadTemplate() { QFileDialog load_dialog; load_dialog.setWindowTitle("Load Template"); load_dialog.setAcceptMode(QFileDialog::AcceptOpen); - load_dialog.setNameFilters(QStringList() << "Slicer 2 Configuration/Template File (*.s2c)" + load_dialog.setNameFilters(QStringList() << "Slicer-2 Configuration/Template File (*.s2c)" << "Any Files (*)"); load_dialog.setDefaultSuffix("s2c"); if (!load_dialog.exec()) @@ -1296,7 +1296,7 @@ void MainWindow::setLock(bool lock) { m_gcodebar->setDisabled(lock); } -void MainWindow::setTitleInfo(const QString& str) { this->setWindowTitle("ORNL Slicer 2 - " + str); } +void MainWindow::setTitleInfo(const QString& str) { this->setWindowTitle("ORNL Slicer-2 - " + str); } void MainWindow::enableSelectionMenu(bool partSelected) { m_actions["reload"].action->setEnabled(partSelected); diff --git a/src/windows/preferences_window.cpp b/src/windows/preferences_window.cpp index 8f37e00f2..55d04b98f 100644 --- a/src/windows/preferences_window.cpp +++ b/src/windows/preferences_window.cpp @@ -26,7 +26,7 @@ void PreferencesWindow::setupLayout() { setWindowTitle("Preferences"); QIcon icon; - icon.addFile(QStringLiteral(":/icons/slicer2.png"), QSize(), QIcon::Normal, QIcon::Off); + icon.addFile(QStringLiteral(":/icons/slicer-2_logo.png"), QSize(), QIcon::Normal, QIcon::Off); setWindowIcon(icon); QMenuBar* menubar = new QMenuBar(); diff --git a/src/windows/xtrudecalc.cpp b/src/windows/xtrudecalc.cpp index a30b57995..2a45c2bc7 100644 --- a/src/windows/xtrudecalc.cpp +++ b/src/windows/xtrudecalc.cpp @@ -28,7 +28,7 @@ XtrudeCalcWindow::XtrudeCalcWindow(QWidget* parent) : QWidget() { // setFixedSize(420,260); setWindowTitle("Slicer-2: Xtrude Calculator"); QIcon icon; - icon.addFile(QStringLiteral(":/icons/slicer2.ico"), QSize(), QIcon::Normal, QIcon::Off); + icon.addFile(QStringLiteral(":/icons/slicer-2_logo.ico"), QSize(), QIcon::Normal, QIcon::Off); setWindowIcon(icon); // Printing Parameter Section diff --git a/version.json b/version.json index 8c1471395..506ab40ad 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "major": "1", "minor": "3", - "patch": "006", + "patch": "007", "suffix": "BETA" }