Lipu Fei
|
7ca2ae9771
|
Adjust alignments for ComboBoxes in MachineSettings dialog
CURA-4428
|
2017-10-10 08:20:39 +02:00 |
|
ChrisTerBeke
|
e7e5e86611
|
Finish layer slider label positions and cursor manipulation - CURA-4412
|
2017-10-09 17:00:03 +02:00 |
|
Simon Edwards
|
ebb8437bff
|
Avoid using fractional pixel sizes and positions. It causes poor text rendering on Windows (and may be others)
|
2017-10-09 16:39:57 +02:00 |
|
Simon Edwards
|
0191215215
|
Let the printer state text wrap too
CL-521
|
2017-10-09 16:39:57 +02:00 |
|
Diego Prado Gesto
|
1d70426224
|
onVisibilityChanged function removed because it's never called - CURA-4405
|
2017-10-09 16:36:48 +02:00 |
|
ChrisTerBeke
|
30a14dd7d6
|
Merge branch '3.0' into layerview-slider-refactor
|
2017-10-09 16:14:17 +02:00 |
|
ChrisTerBeke
|
f8a1187a8c
|
Re-sending after cancelling print job now really works - CURA-4398
|
2017-10-09 16:14:02 +02:00 |
|
ChrisTerBeke
|
52eac6635f
|
Improve layer slider label positions - CURA-4412
|
2017-10-09 16:11:50 +02:00 |
|
Lipu Fei
|
8a25605413
|
Fix lock issue with workspace dialog
CURA-4405
- Add try-except around lock release
- Fix closing the dialog with ESC
|
2017-10-09 15:17:56 +02:00 |
|
ChrisTerBeke
|
84ec494023
|
Merge branch '3.0' into layerview-slider-refactor
|
2017-10-09 14:59:00 +02:00 |
|
ChrisTerBeke
|
f8122320d4
|
Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0
|
2017-10-09 14:49:48 +02:00 |
|
ChrisTerBeke
|
cbd0bcd1b5
|
Manually trigger upload finished callback after request finished - CURA-4398
|
2017-10-09 14:49:18 +02:00 |
|
A.Sasin
|
14936f7999
|
Merge branch '3.0' of github.com:Ultimaker/cura into 3.0
|
2017-10-09 14:24:43 +02:00 |
|
A.Sasin
|
97c107d011
|
Change log update for version 3.0.0 Beta
|
2017-10-09 14:23:52 +02:00 |
|
ChrisTerBeke
|
5740af04bb
|
continue layer slider labels - CURA-4412
|
2017-10-09 14:19:21 +02:00 |
|
Lipu Fei
|
2b06d04327
|
Fix container indices in upgrade script from 2.5 to 2.6
|
2017-10-09 13:54:17 +02:00 |
|
Lipu Fei
|
7d8fa71c4c
|
Exclude other UM2 machine during quality profile upgrade
CURA-4420
|
2017-10-09 13:04:55 +02:00 |
|
Lipu Fei
|
f10397acf9
|
Always set finish flag when finalizing post_reply
CURA-4398
|
2017-10-09 12:38:18 +02:00 |
|
Mark
|
2e957069a8
|
first hide the dialog then release the lock
CURA-4405
|
2017-10-09 11:58:58 +02:00 |
|
Mark
|
daad5a3a97
|
Merge branch '3.0' of github.com:Ultimaker/Cura into 3.0
|
2017-10-09 11:58:13 +02:00 |
|
Mark
|
59fbbef43e
|
first hide the dialog then release the lock
CURA-4405
|
2017-10-09 11:58:00 +02:00 |
|
ChrisTerBeke
|
ee0dabd837
|
Merge branch '3.0' into layerview-slider-refactor
|
2017-10-09 11:33:22 +02:00 |
|
ChrisTerBeke
|
6c51034e5f
|
Fix sending another file after aborting an upload - CURA-4398
|
2017-10-09 11:31:32 +02:00 |
|
ChrisTerBeke
|
48e938675f
|
start adding back slider labels - CURA-4412
|
2017-10-09 11:26:26 +02:00 |
|
A.Sasin
|
2288997697
|
Fixed: while project loading pass call upgrade plugin for preferences
CURA-4344
|
2017-10-06 18:56:17 +02:00 |
|
ChrisTerBeke
|
d435541908
|
create separate layerslider component, fix updating when changing view
|
2017-10-06 17:29:37 +02:00 |
|
Ghostkeeper
|
bc419370d0
|
Merge branch '3.0'
|
2017-10-06 16:02:13 +02:00 |
|
Jaime van Kessel
|
fddb829273
|
Added check to see if selectedPrinter is set
CL-500
|
2017-10-06 14:15:15 +02:00 |
|
Jaime van Kessel
|
a2dabc6442
|
Re-added elide properties that seem to have gone lost in re-work
CL-521
|
2017-10-06 13:51:18 +02:00 |
|
Jaime van Kessel
|
8913a64fdc
|
Removed some hardcoded UI values
|
2017-10-06 13:46:17 +02:00 |
|
Jaime van Kessel
|
af0615f985
|
Codestyle fixes
CL-524
|
2017-10-06 13:37:48 +02:00 |
|
Jaime van Kessel
|
21ad2548b7
|
Also check the status of the job if it's not printing
CL-524
|
2017-10-06 13:32:06 +02:00 |
|
Lipu Fei
|
e9462b17c8
|
Add try-excepts for signal disconnections
|
2017-10-06 12:04:16 +02:00 |
|
Ghostkeeper
|
7e00914e38
|
Merge branch '3.0'
|
2017-10-06 10:00:19 +02:00 |
|
Lipu Fei
|
39fc03c550
|
Revert "Replace new message string with a logging line"
This reverts commit e052c3ba83 .
CURA-4398
|
2017-10-06 09:57:45 +02:00 |
|
Lipu Fei
|
e052c3ba83
|
Replace new message string with a logging line
CURA-4398
|
2017-10-06 09:50:03 +02:00 |
|
Lipu Fei
|
71f794f76d
|
Upgrade ultimaker2 quality_changes
CURA-4420
Ultimaker 2 quality_changes profiles were saved with definition =
fdmprinter in Cura 2.7. In Cura 3.0, that should be "ultimaker2".
|
2017-10-06 09:38:10 +02:00 |
|
Diego Prado Gesto
|
c9e8f7c743
|
Block sending several files now works even if there is a mismatching - CURA-4398
|
2017-10-05 18:16:53 +02:00 |
|
Lipu Fei
|
185c350a19
|
Merge remote-tracking branch 'upstream/3.0'
|
2017-10-05 15:49:18 +02:00 |
|
Lipu Fei
|
8a27b2e97b
|
Fix typo in WorkspaceDialog.qml
|
2017-10-05 15:48:38 +02:00 |
|
Lipu Fei
|
18e636f928
|
Cleanup post_reply cleanup code
CURA-4398
- Create 2 separate try-except blocks for disconnect()s
- Remove duplicated post_reply cleanup code by creating a function to do
so
|
2017-10-05 15:02:30 +02:00 |
|
Lipu Fei
|
0eeded7930
|
Fix KeyError in WorkspaceDialog
CURA-4404
|
2017-10-05 14:11:16 +02:00 |
|
ChrisTerBeke
|
cd59048475
|
Disconnect upload finished signals, move already uploading check down, CURA-4398
|
2017-10-05 13:11:45 +02:00 |
|
Ghostkeeper
|
d458fcde5c
|
Revert "Revert "Merge branch 'fix_garbled_fonts_macos' into 3.0""
This reverts commit e07e7bc9e7 .
Contributes to issue CURA-4414.
|
2017-10-05 10:58:49 +02:00 |
|
Ghostkeeper
|
ff41b043b1
|
Merge branch '3.0'
|
2017-10-05 10:58:21 +02:00 |
|
Ghostkeeper
|
e07e7bc9e7
|
Revert "Merge branch 'fix_garbled_fonts_macos' into 3.0"
This reverts commit b62c19206f , reversing
changes made to 104926c6ed .
Contributes to issue CURA-4414.
|
2017-10-05 10:28:54 +02:00 |
|
Jaime van Kessel
|
512a942f75
|
Added a tickle to zipping state of messages
|
2017-10-04 16:09:53 +02:00 |
|
Ghostkeeper
|
b142a15266
|
Remove unused import
And fixed the header and documentation spelling.
|
2017-10-04 14:59:39 +02:00 |
|
Ghostkeeper
|
ea39cd4615
|
Merge branch 'master' of github.com:Ultimaker/Cura
|
2017-10-04 14:57:40 +02:00 |
|
Ghostkeeper
|
0fab6fcc21
|
Merge branch 'thopiekar-RemovableDrivePlugin-cleanup'
|
2017-10-04 14:55:36 +02:00 |
|