GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 11:45:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix codestyle

Browse Source 
CURA-970
This commit is contained in:
fieldOfView 2016-05-02 09:39:55 +02:00
parent b0f55058ed
commit 614726a574
1 changed files with 38 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
resources/qml/Cura.qml
View File

@ -144,10 +144,10 @@ UM.MainWindow
{ {
title: catalog.i18nc("@title:menu menubar:toplevel","&View"); title: catalog.i18nc("@title:menu menubar:toplevel","&View");
id: top_view_menu id: top_view_menu
Instantiator Instantiator
{ {
model: UM.ViewModel { } model: UM.ViewModel { }
MenuItem MenuItem
{ {
text: model.name; text: model.name;
checkable: true; checkable: true;
@ -547,7 +547,7 @@ UM.MainWindow
insertPage(1, catalog.i18nc("@title:tab","View"), Qt.resolvedUrl("ViewPage.qml")); insertPage(1, catalog.i18nc("@title:tab","View"), Qt.resolvedUrl("ViewPage.qml"));
//Force refresh //Force refresh
setPage(0) setPage(0);
} }
onVisibleChanged: onVisibleChanged:
@ -576,7 +576,7 @@ UM.MainWindow
deleteSelection.onTriggered: deleteSelection.onTriggered:
{ {
Printer.deleteSelection() Printer.deleteSelection();
} }
deleteObject.onTriggered: deleteObject.onTriggered:
@ -605,29 +605,30 @@ UM.MainWindow
objectContextMenu.objectId = 0; objectContextMenu.objectId = 0;
} }
} }
groupObjects.onTriggered: groupObjects.onTriggered:
{ {
Printer.groupSelected() Printer.groupSelected();
} }
unGroupObjects.onTriggered: unGroupObjects.onTriggered:
{ {
Printer.ungroupSelected() Printer.ungroupSelected();
} }
mergeObjects.onTriggered: mergeObjects.onTriggered:
{ {
Printer.mergeSelected() Printer.mergeSelected();
} }
deleteAll.onTriggered: Printer.deleteAll() deleteAll.onTriggered: Printer.deleteAll();
resetAllTranslation.onTriggered: Printer.resetAllTranslation() resetAllTranslation.onTriggered: Printer.resetAllTranslation();
resetAll.onTriggered: Printer.resetAll() resetAll.onTriggered: Printer.resetAll();
reloadAll.onTriggered: Printer.reloadAll() reloadAll.onTriggered: Printer.reloadAll();
addMachine.onTriggered: addMachineWizard.visible = true; addMachine.onTriggered: addMachineWizard.visible = true;
addProfile.onTriggered: { addProfile.onTriggered:
{
UM.MachineManager.createProfile(); UM.MachineManager.createProfile();
preferences.setPage(4); preferences.setPage(4);
preferences.show(); preferences.show();
@ -635,21 +636,30 @@ UM.MainWindow
// Show the renameDialog after a very short delay so the preference page has time to initiate // Show the renameDialog after a very short delay so the preference page has time to initiate
showProfileNameDialogTimer.start(); showProfileNameDialogTimer.start();
} }
updateProfile.onTriggered: { UM.ActiveProfile.updateProfile() } updateProfile.onTriggered: UM.ActiveProfile.updateProfile();
resetProfile.onTriggered: { UM.ActiveProfile.discardChanges() } resetProfile.onTriggered: UM.ActiveProfile.discardChanges();
preferences.onTriggered: { preferences.visible = true; } preferences.onTriggered: preferences.visible = true;
configureMachines.onTriggered: { preferences.visible = true; preferences.setPage(3); } configureMachines.onTriggered:
manageProfiles.onTriggered: { preferences.visible = true; preferences.setPage(4); } {
preferences.visible = true;
preferences.setPage(3);
}
manageProfiles.onTriggered:
{
preferences.visible = true;
preferences.setPage(4);
}
documentation.onTriggered: CuraActions.openDocumentation(); documentation.onTriggered: CuraActions.openDocumentation();
reportBug.onTriggered: CuraActions.openBugReportPage(); reportBug.onTriggered: CuraActions.openBugReportPage();
showEngineLog.onTriggered: engineLog.visible = true; showEngineLog.onTriggered: engineLog.visible = true;
about.onTriggered: aboutDialog.visible = true; about.onTriggered: aboutDialog.visible = true;
toggleFullScreen.onTriggered: base.toggleFullscreen() toggleFullScreen.onTriggered: base.toggleFullscreen();
} }
Timer { Timer
{
id: showProfileNameDialogTimer id: showProfileNameDialogTimer
repeat: false repeat: false
interval: 1 interval: 1
@ -670,9 +680,9 @@ UM.MainWindow
MenuItem { action: actions.reloadAll; } MenuItem { action: actions.reloadAll; }
MenuItem { action: actions.resetAllTranslation; } MenuItem { action: actions.resetAllTranslation; }
MenuItem { action: actions.resetAll; } MenuItem { action: actions.resetAll; }
MenuItem { action: actions.groupObjects;} MenuItem { action: actions.groupObjects; }
MenuItem { action: actions.mergeObjects;} MenuItem { action: actions.mergeObjects; }
MenuItem { action: actions.unGroupObjects;} MenuItem { action: actions.unGroupObjects; }
} }
Menu Menu
@ -682,9 +692,9 @@ UM.MainWindow
MenuItem { action: actions.reloadAll; } MenuItem { action: actions.reloadAll; }
MenuItem { action: actions.resetAllTranslation; } MenuItem { action: actions.resetAllTranslation; }
MenuItem { action: actions.resetAll; } MenuItem { action: actions.resetAll; }
MenuItem { action: actions.groupObjects;} MenuItem { action: actions.groupObjects; }
MenuItem { action: actions.mergeObjects;} MenuItem { action: actions.mergeObjects; }
MenuItem { action: actions.unGroupObjects;} MenuItem { action: actions.unGroupObjects; }
} }
Connections Connections