3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-22 06:03:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Rename everything "Printer" to either "Cura" or drop the prefix since it is no longer needed

Browse source
This commit is contained in:
Arjen Hiemstra 2015-05-06 18:41:22 +02:00
parent 0a6562a8f1
commit cc7ce1d408
7 changed files with 18 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cura.py Executable file
View file

@ -0,0 +1,6 @@
#!/usr/bin/env python3
from src.CuraApplication import CuraApplication
app = CuraApplication.getInstance()
app.run()

6
printer.py
View file

@ -1,6 +0,0 @@
#!/usr/bin/env python3
from src.PrinterApplication import PrinterApplication
app = PrinterApplication.getInstance()
app.run()

0
resources/qml/PrinterActions.qml → resources/qml/Actions.qml
View file

11
resources/qml/Printer.qml → resources/qml/Cura.qml
View file

@ -190,10 +190,11 @@ UM.MainWindow {
source: UM.ActiveView.valid ? UM.ActiveView.activeViewPanel : ""; source: UM.ActiveView.valid ? UM.ActiveView.activeViewPanel : "";
} }
PrinterButton { Button {
id: openFileButton; id: openFileButton;
iconSource: UM.Theme.icons.open; iconSource: UM.Theme.icons.open;
style: UM.Theme.styles.tool_button;
anchors { anchors {
top: parent.top; top: parent.top;
@ -220,7 +221,7 @@ UM.MainWindow {
sourceSize.height: height; sourceSize.height: height;
} }
PrinterButton { Button {
anchors { anchors {
top: parent.top; top: parent.top;
topMargin: UM.Theme.sizes.window_margin.height; topMargin: UM.Theme.sizes.window_margin.height;
@ -232,6 +233,8 @@ UM.MainWindow {
text: qsTr("View Mode"); text: qsTr("View Mode");
iconSource: UM.Theme.icons.viewmode; iconSource: UM.Theme.icons.viewmode;
style: UM.Theme.styles.tool_button;
menu: Menu { menu: Menu {
id: viewMenu; id: viewMenu;
Instantiator { Instantiator {
@ -251,7 +254,7 @@ UM.MainWindow {
} }
} }
PrinterToolbar { Toolbar {
id: toolbar; id: toolbar;
anchors { anchors {
@ -272,7 +275,7 @@ UM.MainWindow {
} }
} }
PrinterActions { Actions {
id: actions; id: actions;
open.onTriggered: openDialog.open(); open.onTriggered: openDialog.open();

11
resources/qml/PrinterButton.qml
View file

@ -1,11 +0,0 @@
import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Styles 1.1
import QtQuick.Layouts 1.1
import UM 1.0 as UM
Button {
id: base;
style: UM.Theme.styles.tool_button;
}

4
resources/qml/PrinterToolbar.qml → resources/qml/Toolbar.qml
View file

@ -24,7 +24,7 @@ Item {
model: UM.Models.toolModel model: UM.Models.toolModel
PrinterButton { Button {
text: model.name; text: model.name;
iconSource: UM.Theme.icons[model.icon]; iconSource: UM.Theme.icons[model.icon];
tooltip: model.description; tooltip: model.description;
@ -32,6 +32,8 @@ Item {
checkable: true; checkable: true;
checked: model.active; checked: model.active;
style: UM.Theme.styles.tool_button;
//Workaround since using ToolButton"s onClicked would break the binding of the checked property, instead //Workaround since using ToolButton"s onClicked would break the binding of the checked property, instead
//just catch the click so we do not trigger that behaviour. //just catch the click so we do not trigger that behaviour.
MouseArea { MouseArea {

4
src/PrinterApplication.py → src/CuraApplication.py
View file

@ -37,7 +37,7 @@ import os.path
import numpy import numpy
numpy.seterr(all="ignore") numpy.seterr(all="ignore")
class PrinterApplication(QtApplication): class CuraApplication(QtApplication):
def __init__(self): def __init__(self):
if not hasattr(sys, "frozen"): if not hasattr(sys, "frozen"):
Resources.addResourcePath(os.path.join(os.path.abspath(os.path.dirname(__file__)), "..")) Resources.addResourcePath(os.path.join(os.path.abspath(os.path.dirname(__file__)), ".."))
@ -129,7 +129,7 @@ class PrinterApplication(QtApplication):
self.showSplashMessage(self._i18n_catalog.i18nc("Splash screen message", "Loading interface...")) self.showSplashMessage(self._i18n_catalog.i18nc("Splash screen message", "Loading interface..."))
self.setMainQml(Resources.getPath(Resources.QmlFilesLocation, "Printer.qml")) self.setMainQml(Resources.getPath(Resources.QmlFilesLocation, "Cura.qml"))
self.initializeEngine() self.initializeEngine()
self.getStorageDevice("LocalFileStorage").removableDrivesChanged.connect(self._removableDrivesChanged) self.getStorageDevice("LocalFileStorage").removableDrivesChanged.connect(self._removableDrivesChanged)