62 Commits

Author SHA1 Message Date
fieldOfView
27e3f8b33f Fix color of some texts on Linux with dark theme
Use Label{} instead of Text{}

CURA-1143
2016-04-07 18:57:11 +02:00
fieldOfView
b3b04ff7b0 Removed Olsson block upgrade option from UM2Extended 2016-04-05 09:59:02 +02:00
Jaime van Kessel
479c6c3319 Added extra relative move to prevent nozzle scraping
CURA-1102
2016-03-17 14:57:44 +01:00
Jaime van Kessel
89256b5423 Added explicit home bed before rest of bed leveling
CURA-1102
2016-03-17 14:44:09 +01:00
Jaime van Kessel
90293a4a5c Removed stray broken code
CURA-1102
2016-03-16 16:33:36 +01:00
Jaime van Kessel
9a6615213c Bed should no longer be damaged when leveling
CURA-1102
2016-03-16 15:18:11 +01:00
fieldOfView
bc24a3c95b Add sensible maximum length to machine name and job name entry 2016-03-02 22:39:15 +01:00
fieldOfView
b5c90d67d0 Remove deprecated use of theme sizes from UM2 upgrades wizard
CURA-91
2016-02-25 11:35:21 +01:00
Jaime van Kessel
dc1ee1d73b Merge pull request #636 from Ultimaker/feature_um2upgrades
Support UM2 with Olsson block
2016-02-24 12:07:35 +01:00
fieldOfView
8eb6fecacf Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-23 12:50:26 +01:00
Arjen Hiemstra
720324f0c6 Replace Theme property accessors with getThing calls 2016-02-23 12:22:30 +01:00
fieldOfView
b519c910ea Fix reentry of add machine wizard when skipping bedleveling 2016-02-22 16:41:09 +01:00
fieldOfView
e4d44acefb Add support for Ultimaker 2 Extended with Olsson Block upgrade 2016-02-19 20:39:32 +01:00
fieldOfView
bcf0f507ad Add Add Machine wizard, machine definitions & profiles for Ultimaker 2 with Olsson Block 2016-02-19 20:39:32 +01:00
fieldOfView
3369750b97 Make sure Machine names are always unique and non-zerolength
Applies the same rename behavior introduced in the profiles rework to machine names. Machine names are always accepted, but if they are non-unique a number is added (recursively).

If no name is specified, a logical default is chosen. Robust against leading/trailing spaces, and case insensitive.

Contributes to CURA-425
2016-02-09 15:33:27 +01:00
fieldOfView
c208c01528 Remove commented-out code 2015-12-30 16:36:02 +01:00
fieldOfView
282a0d307d Tweak "Add Printer" dialog 2015-12-30 09:53:29 +01:00
Ghostkeeper
f6ccbab9dc Correct alignment of manufacturer in add printer window
I reduced the font size of the manufacturer to make it appear like a subscript a bit.
2015-12-29 16:38:10 +01:00
Tamara Hogenhout
c746c24e2b fix typo's..
Contributes to #CURA-256
Contributes to #429
2015-11-10 16:45:42 +01:00
Tamara Hogenhout
9320fc1af5 uses a different method to check whether a machine name excists
contributes to #CURA-325
2015-11-09 18:01:35 +01:00
Tamara Hogenhout
968d72863e Wizardpages without hack
Contributes to #CURA-256
Contributes to #429
2015-11-05 18:17:47 +01:00
Tamara Hogenhout
831419d110 Only hides the window when there are no more pages
so it doens't hide before the error message is shown and it doesn't hide when there are extra pages (like for the UMO)

Contributes to #CURA-256
Contributes to #429
2015-11-05 18:17:04 +01:00
Tamara Hogenhout
b2f4e2bf26 Shows an error message when a user tries to add a printer with a name that already excists.
Also auto-generates numbering in the name, when the automatically generated machine-name is non-unique

contributes to #CURA-325
2015-11-04 17:36:20 +01:00
Tamara Hogenhout
4ceb48c3fd Makes the page display the separate test-values.
When the user doesn't finish the checkup and later on re-checks on it, it doens't look like they can't proceed with the check-up.

fixes #CURA-256
2015-10-14 16:19:24 +02:00
Tamara Hogenhout
ed693d57a9 Fixes that the firmware update kan be called from the add machine -> add UMO wizard
fixes #CURA-256
2015-10-14 16:03:29 +02:00
Tamara Hogenhout
f9f0969a6d Fixes problems with the upgraded parts page of the add Original wizard
The setMachineSettingValue functionalities are now bound to whether the checkboxes are checked or not instead of onClicked. Also the wizard now saves the values, so the user cannot get confused when revisiting this part of the wizard.

commits to #143
contributes to #CURA-256
2015-10-14 15:00:27 +02:00
Tamara Hogenhout
861b535f9d Implementing missing functionalities on the addmachine -> add original wizard
contributes to #CURA-256
2015-10-14 11:53:53 +02:00
Tamara Hogenhout
a855da5c4c contributes to #CURA-256 2015-10-12 18:39:53 +02:00
Arjen Hiemstra
acfd2861f1 Make the UMO upgrade selection page work properly 2015-10-05 16:47:45 +02:00
Arjen Hiemstra
3b5664f250 Try to add a page when the name of a wizard page is unknown
Contributes to CURA-91
2015-09-29 16:58:04 +02:00
Jaime van Kessel
4808f52f59 Fixed heatup bed command in checking wizard 2015-09-17 10:43:56 +02:00
Tamara Hogenhout
bb961ad1b1 styling of the UMO wizard pages
fixes issue CURA-64
2015-09-16 16:22:34 +02:00
Tamara Hogenhout
cf4bd45f3f Insert nescessary strings for Addmachine Wizard for string freeze
Contributes to: issue CURA-132
2015-09-11 17:41:24 +02:00
Jaime van Kessel
98ee8cab85 Pages are now reset when adding a new machine.
Contributes to Ultimaker/Cura#353
2015-09-09 13:16:24 +02:00
Tamara Hogenhout
28aec71c02 adds/adapts translation context markers
all nescessary in folder: Cura/resources

Contributes to: issue CURA-116
2015-09-08 16:30:10 +02:00
fieldOfView
4c1e0907ab Change the default UMO uprade options 2015-09-04 22:39:31 +02:00
Jaime van Kessel
3f85b4aafd Added extra checks to ultimaker checkup to prevent error messages 2015-09-04 11:48:34 +02:00
Arjen Hiemstra
73ec6e9f1c Use resolvedUrl since that does give the right path for qml files 2015-09-03 10:13:47 -07:00
Arjen Hiemstra
39b6f81bdf Use machine manager to get the platform width/depth 2015-09-02 12:23:51 +02:00
Arjen Hiemstra
de60fb47bf Remove superfluous log and unneeded hide 2015-09-02 12:23:14 +02:00
Arjen Hiemstra
c9f62a4eab Remove duplicate i18n catalog 2015-09-01 17:29:37 +02:00
Arjen Hiemstra
57b2ce4f3e Merge branch 'master' of github.com:ultimaker/Cura into per_object_settings
* 'master' of github.com:ultimaker/Cura: (49 commits)
  15.10 restyling of the sidebar header
  15.10 restyling of the sidebar header
  15.10 restyling of the sidebar
  split magic_mesh)surface_mode into Normal, Surface, Both
  Added preference to disable automatic scale
  Removed unused import
  Added changeLog plugin
  Added missing )
  Merging of mine and Jaimes work
  Removed font from rectangle
  JSON: git diff! removed triangles and grid top/bottom skin options (though they are available)
  Code style & switch to translation catalog
  15.10 re-alignment of the toolbar
  15.10 New Icons
  15.10 restyling of the savebutton Area
  Added message asking about sending data to server
  Added exception handling for checking overlap.
  Fixed default button for general and view page
  Fixed double ID in qml
  Removed unused import
  ...
2015-09-01 15:44:19 +02:00
Arjen Hiemstra
5e3d492aba Set wizard to null so we do not get complaints from QML 2015-09-01 15:07:45 +02:00
Jaime van Kessel
d195c859a2 Code style & switch to translation catalog 2015-08-27 16:04:02 +02:00
Jaime van Kessel
a49ce21fbe Adding a machine now hides if there are no more pages 2015-08-26 15:18:01 +02:00
Arjen Hiemstra
9a88176f6f Clean up Add Machine Wizard and use the new MachineDefintionsModel 2015-08-25 18:14:48 +02:00
Jaime van Kessel
f68fdb01b4 Added preference to disable auto center when selecting object 2015-08-20 10:55:13 +02:00
Jaime van Kessel
07c19498f1 Added rudementary 3 point bed leveling 2015-08-19 16:47:48 +02:00
Jaime van Kessel
7fda5e9a39 Endstop now stops listening upon destruction 2015-08-19 14:35:35 +02:00
Jaime van Kessel
83426878d2 Cleaned up code a bit 2015-08-19 11:55:24 +02:00