Browse Source

T1244: Replacing Cura2 names with cura-lulzbot or Cura LulzBot Edition.

tags/v2.6.44
Alexei Dorofeev 1 year ago
parent
commit
16b898a73b

+ 5
- 5
CMakeLists.txt View File

@@ -26,7 +26,7 @@ endif()

set(CURA_VERSION "master" CACHE STRING "Version name of Cura")
set(CURA_BUILDTYPE "" CACHE STRING "Build type of Cura, eg. 'PPA'")
configure_file(${CMAKE_SOURCE_DIR}/cura2.desktop.in ${CMAKE_BINARY_DIR}/cura2.desktop @ONLY)
configure_file(${CMAKE_SOURCE_DIR}/cura-lulzbot.desktop.in ${CMAKE_BINARY_DIR}/cura-lulzbot.desktop @ONLY)
configure_file(cura/CuraVersion.py.in CuraVersion.py @ONLY)

if(NOT ${URANIUM_DIR} STREQUAL "")
@@ -67,15 +67,15 @@ if(NOT APPLE AND NOT WIN32)
install(FILES cura_app.py
DESTINATION ${CMAKE_INSTALL_BINDIR}
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
install(FILES run_cura2.sh
install(FILES run_cura-lulzbot.sh
DESTINATION ${CMAKE_INSTALL_BINDIR}
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
RENAME cura2)
RENAME cura-lulzbot)
else()
install(FILES cura_app.py
DESTINATION ${CMAKE_INSTALL_BINDIR}
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
RENAME cura2)
RENAME cura-lulzbot)
endif()

install(DIRECTORY cura
@@ -83,7 +83,7 @@ if(NOT APPLE AND NOT WIN32)
FILES_MATCHING PATTERN *.py)
install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py
DESTINATION ${PYTHON_SITE_PACKAGES_DIR}/cura)
install(FILES ${CMAKE_BINARY_DIR}/cura2.desktop
install(FILES ${CMAKE_BINARY_DIR}/cura-lulzbot.desktop
DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
install(FILES cura.appdata.xml
DESTINATION ${CMAKE_INSTALL_DATADIR}/appdata)

+ 8
- 8
CPackConfig.cmake View File

@@ -45,19 +45,19 @@ message("CPACK_PACKAGE_VERSION_MAJOR ${CURA_MAJOR_VERSION}")
message("CPACK_PACKAGE_VERSION_MINOR ${CURA_MINOR_VERSION}")
message("CPACK_PACKAGE_VERSION_PATCH ${CURA_PATCH_VERSION}")

set(CPACK_PACKAGE_NAME "Cura2")
set(CPACK_PACKAGE_NAME "cura-lulzbot")
set(CPACK_PACKAGE_VENDOR "Ultimaker")
#set(CPACK_PACKAGE_VERSION_MAJOR ${CURA_MAJOR_VERSION})
#set(CPACK_PACKAGE_VERSION_MINOR ${CURA_MINOR_VERSION})
#set(CPACK_PACKAGE_VERSION_PATCH ${CURA_PATCH_VERSION})
set(CPACK_PACKAGE_VERSION ${CURA_VERSION} CACHE STRING "Cura2 package version")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Cura2 3D Printing Software")
set(CPACK_PACKAGE_CONTACT "Arjen Hiemstra <a.hiemstra@ultimaker.com>")
set(CPACK_PACKAGE_VERSION ${CURA_VERSION} CACHE STRING "Cura LulzBot Edition package version")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Cura LulzBot Edition 3D Printing Software")
set(CPACK_PACKAGE_CONTACT "LulzBot <info@lulzbot.com>")
if(NOT BUILD_OS_OSX)
set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/LICENSE)
endif()
set(CPACK_PACKAGE_EXECUTABLES Cura2 "Cura2 ${CURA_MAJOR_VERSION}.${CURA_MINOR_VERSION}.${CURA_PATCH_VERSION}")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "Cura2 ${CURA_MAJOR_VERSION}.${CURA_MINOR_VERSION}")
set(CPACK_PACKAGE_EXECUTABLES cura-lulzbot "cura-lulzbot ${CURA_MAJOR_VERSION}.${CURA_MINOR_VERSION}.${CURA_PATCH_VERSION}")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "cura-lulzbot ${CURA_MAJOR_VERSION}.${CURA_MINOR_VERSION}")

set(RPM_REQUIRES
"python3 >= ${MINIMUM_PYTHON_VERSION}"
@@ -75,7 +75,7 @@ if(DEB_PACKAGE_TARGET_PLATFORM STREQUAL "ubuntu-xenial")
"python3-numpy"
"python3-scipy"
"libgfortran3"
"cura2-python3.5-deps (>=0.1.0)"
"cura-lulzbot-python3.5-deps (>=0.1.0)"
"arcus (>= ${MINIMUM_ARCUS_VERSION})"
"savitar (>= ${MINIMUM_SAVITAR_VERSION})"
"uranium (>= ${MINIMUM_URANIUM_VERSION})"
@@ -112,7 +112,7 @@ set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE amd64)

set(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON)
set(CPACK_NSIS_EXECUTABLES_DIRECTORY ".")
set(CPACK_NSIS_MUI_FINISHPAGE_RUN "Cura2.exe")
set(CPACK_NSIS_MUI_FINISHPAGE_RUN "cura-lulzbot.exe")
set(CPACK_NSIS_MENU_LINKS
"https://ultimaker.com/en/support/software" "Cura Online Documentation"
"https://github.com/ultimaker/cura" "Cura Development Resources"

+ 1
- 1
README.md View File

@@ -33,7 +33,7 @@ Dependencies

Configuring Cura
----------------
* Link your CuraEngine backend by inserting the following line in ~/.config/cura2_lulzbot/config.cfg :
* Link your CuraEngine backend by inserting the following line in ~/.config/cura_lulzbot/config.cfg :
[backend]
location = /[path_to_the..]/CuraEngine/build/CuraEngine


cura2.desktop.in → cura-lulzbot.desktop.in View File

@@ -1,11 +1,11 @@
[Desktop Entry]
Name=Cura 2 LulzBot Edition
Name[de]=Cura 2 LulzBot Edition
Name=Cura LulzBot Edition
Name[de]=Cura LulzBot Edition
GenericName=3D Printing Software
GenericName[de]=3D-Druck-Software
Comment=Cura converts 3D models into paths for a 3D printer. It prepares your print for maximum accuracy, minimum printing time and good reliability with many extra features that make your print come out great.
Exec=@CMAKE_INSTALL_FULL_BINDIR@/cura2 %F
TryExec=@CMAKE_INSTALL_FULL_BINDIR@/cura2
Exec=@CMAKE_INSTALL_FULL_BINDIR@/cura-lulzbot %F
TryExec=@CMAKE_INSTALL_FULL_BINDIR@/cura-lulzbot
Comment[de]=Cura wandelt 3D-Modelle in Pfade für einen 3D-Drucker um. Es bereitet Ihren Druck für maximale Genauigkeit, minimale Druckzeit und guter Zuverlässigkeit mit vielen zusätzlichen Funktionen vor, damit Ihr Druck großartig wird.
Icon=@CMAKE_INSTALL_FULL_DATADIR@/cura/resources/images/cura-icon.png
Terminal=false

+ 4
- 4
cura.appdata.xml View File

@@ -4,13 +4,13 @@
<id>cura.desktop</id>
<metadata_license>CC0-1.0</metadata_license>
<project_license>AGPL-3.0 and CC-BY-SA-4.0</project_license>
<name>Cura2 LulzBot Edition</name>
<name>Cura LulzBot Edition</name>
<summary>The world's most advanced 3d printer software</summary>
<description>
<p>
Cura2 creates a seamless integration between hardware, software and
Cura LulzBot Edition creates a seamless integration between hardware, software and
materials for the best 3D printing experience around.
Cura supports the 3MF, OBJ and STL file formats and is available on
Cura LulzBot Editionsupports the 3MF, OBJ and STL file formats and is available on
Windows, Mac and Linux.
</p>
<ul>
@@ -18,7 +18,7 @@
<li>Experts are able to customize 200 settings to achieve the best results</li>
<li>Optimized profiles for LulzBot printers</li>
<li>Print multiple objects at once with different settings for each object</li>
<li>Cura supports STL, 3MF and OBJ file formats</li>
<li>Cura LulzBot Edition supports STL, 3MF and OBJ file formats</li>
<li>Open source and completely free</li>
</ul>
</description>

+ 2
- 2
cura/CuraApplication.py View File

@@ -199,7 +199,7 @@ class CuraApplication(QtApplication):
except:
try:
self._components_version = json.load(open(
os.path.join(QtApplication.getInstallPrefix(), "cura2","version.json"), "r"))
os.path.join(QtApplication.getInstallPrefix(), "cura-lulzbot","version.json"), "r"))
except:
self._components_version = {"cura_version": "master"}

@@ -211,7 +211,7 @@ class CuraApplication(QtApplication):

Preferences.getInstance().addPreference("info/automatic_update_check", False)

super().__init__(name = "cura2_lulzbot", version = self.getComponentVersion("cura_version"), buildtype = CuraBuildType)
super().__init__(name = "cura_lulzbot", version = self.getComponentVersion("cura_version"), buildtype = CuraBuildType)

Logger.log("d", "Trying to Set icon : \"" + str(Resources.getPath(Resources.Images, "cura-icon.png")) + "\"")
self.setWindowIcon(QIcon(Resources.getPath(Resources.Images, "cura-icon.png")))

+ 1
- 1
plugins/CuraProfileReader/__init__.py View File

@@ -18,7 +18,7 @@ def getMetaData():
"profile_reader": [
{
"extension": "curaprofile",
"description": catalog.i18nc("@item:inlistbox", "Cura 2 Profile")
"description": catalog.i18nc("@item:inlistbox", "Cura LulzBot Edition Profile")
}
]
}

+ 1
- 1
plugins/CuraProfileWriter/__init__.py View File

@@ -18,7 +18,7 @@ def getMetaData():
"profile_writer": [
{
"extension": "curaprofile",
"description": catalog.i18nc("@item:inlistbox", "Cura 2 Profile")
"description": catalog.i18nc("@item:inlistbox", "Cura LulzBot Edition Profile")
}
]
}

+ 1
- 1
plugins/GCodeWriter/GCodeWriter.py View File

@@ -62,7 +62,7 @@ class GCodeWriter(MeshWriter):
scene = Application.getInstance().getController().getScene()
gcode_list = getattr(scene, "gcode_list")
if gcode_list:
stream.write(";Generated by Cura 2 GCodeWriter Version: "+Application.getInstance().getVersion()+"\n")
stream.write(";Generated by Cura LulzBot Edition GCodeWriter Version: "+Application.getInstance().getVersion()+"\n")
for gcode in gcode_list:
stream.write(gcode)
# Serialise the current container stack and put it at the end of the file.

resources/images/source/Cura2_SplashScreen_TypeTreatment.svg → resources/images/source/cura-lulzbot_splashscreen_typetreatment.svg View File

@@ -16,7 +16,7 @@
version="1.1"
id="svg8"
inkscape:version="0.92.1 r15371"
sodipodi:docname="Cura2_SplashScreen_TypeTreatment.svg"
sodipodi:docname="cura-lulzbot_splashscreen_typetreatment.svg"
inkscape:export-filename="/home/aleph/shared-j/Documents/Creative/UI/splash screen/ready/CuraLE2017_SplashScreen_Final.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96">

+ 1
- 1
resources/qml/AboutDialog.qml View File

@@ -116,7 +116,7 @@ UM.Dialog
}
Component.onCompleted:
{
projectsModel.append({ name:"Cura", description: catalog.i18nc("@label", "Graphical user interface"), license: "AGPLv3", url: "https://code.alephobjects.com/source/Cura2/" });
projectsModel.append({ name:"Cura", description: catalog.i18nc("@label", "Graphical user interface"), license: "AGPLv3", url: "https://code.alephobjects.com/source/cura-lulzbot/" });
projectsModel.append({ name:"Uranium", description: catalog.i18nc("@label", "Application framework"), license: "AGPLv3", url: "https://code.alephobjects.com/diffusion/U/" });
projectsModel.append({ name:"CuraEngine", description: catalog.i18nc("@label", "GCode generator"), license: "AGPLv3", url: "https://code.alephobjects.com/diffusion/CTE/" });
projectsModel.append({ name:"libArcus", description: catalog.i18nc("@label", "Interprocess communication library"), license: "AGPLv3", url: "https://code.alephobjects.com/source/arcus/" });

+ 1
- 1
resources/qml/Cura.qml View File

@@ -16,7 +16,7 @@ UM.MainWindow
{
id: base
//: Cura application window title
title: catalog.i18nc("@title:window","Cura 2 (BETA) - ") + UM.Application.version;
title: catalog.i18nc("@title:window","Cura LulzBot Edition (BETA) - ") + UM.Application.version;
viewportRect: Qt.rect(0, 0, (base.width - sidebar.width) / base.width, 1.0)
property bool monitoringPrint: false


+ 23
- 0
run_cura-lulzbot.sh View File

@@ -0,0 +1,23 @@
#!/bin/bash
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

# Set up Qt-related ENV variables
if [ -e /opt/qt58/bin/qt58-env.sh ]; then
source /opt/qt58/bin/qt58-env.sh
elif [ -e /opt/qt56/bin/qt56-env.sh ]; then
source /opt/qt56/bin/qt56-env.sh
fi

# Set up custom python3 site packages related to cura-lulzbot
export PYTHONPATH=/opt/cura-lulzbot/python3.5/site-packages

# Protobuf Custom location
if [ -z "$CURA_LULZBOT_LIBS" ]; then
CURA_LULZBOT_LIBS="/opt/cura-lulzbot/lib"
fi
if [ ! -z "$CURA_LULZBOT_LIBS" ]; then
export LD_LIBRARY_PATH="$CURA_LULZBOT_LIBS:$LD_LIBRARY_PATH"
fi
# run cura-lulzbot

$DIR/cura_app.py

+ 0
- 23
run_cura2.sh View File

@@ -1,23 +0,0 @@
#!/bin/bash
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

# Set up Qt-related ENV variables
if [ -e /opt/qt58/bin/qt58-env.sh ]; then
source /opt/qt58/bin/qt58-env.sh
elif [ -e /opt/qt56/bin/qt56-env.sh ]; then
source /opt/qt56/bin/qt56-env.sh
fi

# Set up custom python3 site packages related to Cura2
export PYTHONPATH=/opt/cura2/python3.5/site-packages

# Protobuf Custom location
if [ -z "$CURA2_LIBS" ]; then
CURA2_LIBS="/opt/cura2/lib"
fi
if [ ! -z "$CURA2_LIBS" ]; then
export LD_LIBRARY_PATH="$CURA2_LIBS:$LD_LIBRARY_PATH"
fi
# run Cura2

$DIR/cura_app.py

Loading…
Cancel
Save