3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Rearrange preferences

Browse source 
Merges general & view into a single page
Introduces sections on general page
Cleans up code
This commit is contained in:
fieldOfView 2016-06-12 15:25:39 +02:00
parent 17d1dbd804
commit aeccfe3509
4 changed files with 138 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

19
resources/qml/Cura.qml
View file

@ -545,16 +545,13 @@ UM.MainWindow
{
//; Remove & re-add the general page as we want to use our own instead of uranium standard.
removePage(0);
insertPage(0, catalog.i18nc("@title:tab","General"), Qt.resolvedUrl("GeneralPage.qml"));
insertPage(0, catalog.i18nc("@title:tab","General"), Qt.resolvedUrl("Preferences/GeneralPage.qml"));
//: View preferences page title
insertPage(1, catalog.i18nc("@title:tab","View"), Qt.resolvedUrl("ViewPage.qml"));
insertPage(2, catalog.i18nc("@title:tab", "Printers"), Qt.resolvedUrl("Preferences/MachinesPage.qml"));
insertPage(3, catalog.i18nc("@title:tab", "Printers"), Qt.resolvedUrl("MachinesPage.qml"));
insertPage(3, catalog.i18nc("@title:tab", "Materials"), Qt.resolvedUrl("Preferences/MaterialsPage.qml"));
insertPage(4, catalog.i18nc("@title:tab", "Materials"), Qt.resolvedUrl("Preferences/MaterialsPage.qml"));
insertPage(5, catalog.i18nc("@title:tab", "Profiles"), Qt.resolvedUrl("Preferences/ProfilesPage.qml"));
insertPage(4, catalog.i18nc("@title:tab", "Profiles"), Qt.resolvedUrl("Preferences/ProfilesPage.qml"));
//Force refresh
setPage(0);
@ -583,7 +580,7 @@ UM.MainWindow
onTriggered:
{
Cura.MachineManager.newQualityContainerFromQualityAndUser();
preferences.setPage(5);
preferences.setPage(4);
preferences.show();
// Show the renameDialog after a very short delay so the preference page has time to initiate
@ -597,7 +594,7 @@ UM.MainWindow
onTriggered:
{
preferences.visible = true;
preferences.setPage(3);
preferences.setPage(2);
}
}
@ -607,7 +604,7 @@ UM.MainWindow
onTriggered:
{
preferences.visible = true;
preferences.setPage(5);
preferences.setPage(4);
}
}
@ -617,7 +614,7 @@ UM.MainWindow
onTriggered:
{
preferences.visible = true;
preferences.setPage(2);
preferences.setPage(1);
preferences.getCurrentItem().scrollToSection(source.key);
}
}