GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-04 07:04:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,456 Commits 289 Branches 260 Tags
Commit Graph

1127 Commits

Author SHA1 Message Date
Arjen Hiemstra
1cb836aea5 Add a ReadOnlySpinBox control that provides a spinBox with a readOnly property 
Contributes to CURA-342
 2016-06-23 17:33:55 +02:00
Arjen Hiemstra
f71ddc4b9f Start implementing view and edit support in the materials page 
Contributes to CURA-342
 2016-06-23 17:31:50 +02:00
fieldOfView
fe05aa18cb Resize camera-image with viewport 
CURA-338
 2016-06-23 17:27:12 +02:00
Jaime van Kessel
85942583b1 Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-23 16:39:09 +02:00
Jaime van Kessel
0b02a5f12b Machine actions are now when selected (instead of active) machine change 
CURA-1385
 2016-06-23 16:38:04 +02:00
fieldOfView
6d9eb4028e Merge branch 'master' into feature_print_monitoring 
# Conflicts:
#	cura/CuraApplication.py
 2016-06-23 15:53:53 +02:00
fieldOfView
0faecf9b34 Rearrange MachineActions on Machines page 
CURA-1385
 2016-06-23 14:15:39 +02:00
Arjen Hiemstra
8c8caa2cac Use the right property for the property provider 
Otherwise we get a bunch of errors from the per object settings tool
 2016-06-23 13:33:07 +02:00
Arjen Hiemstra
9f9de493f7 Clean up indentation 2016-06-23 13:32:31 +02:00
Arjen Hiemstra
cc027ddf41 Remove unused code 2016-06-23 13:32:20 +02:00
Arjen Hiemstra
de36122531 Use the expanded categories from Cura to expand the proper categories on startup 2016-06-23 13:31:01 +02:00
Aldo Hoeben
488740c60d Merge pull request #819 from Ultimaker/MachineActions 
Machine actions
 2016-06-23 12:59:03 +02:00
Jaime van Kessel
3f3a93ae8a Refactoring; Renaming firstRunWizard to machineActionsWizard 
CURA-1385
 2016-06-23 11:12:58 +02:00
fieldOfView
a6bb0c804a Fix minor codereview issues 
CURA-333
 2016-06-22 17:19:14 +02:00
fieldOfView
cdd38763f6 Tweak sidebar tab bar appearance 
CURA-1036
 2016-06-22 16:06:11 +02:00
Jaime van Kessel
458749ca4e Removed old wizard pages 
CURA-1385
 2016-06-22 15:35:44 +02:00
Jaime van Kessel
d5b07d29de Actions are now reset before every run 
CURA-1385
 2016-06-22 14:39:41 +02:00
fieldOfView
1c83b15290 Tweak viewport overlay 
Change color, opacity. Block mouseclicks.
CURA-1036
 2016-06-22 14:22:35 +02:00
Jaime van Kessel
8cfc0737ac First run actions are now properly handled 
CURA-1385
 2016-06-22 11:49:35 +02:00
fieldOfView
6adc4ef284 Revert "Change spelling of "colour" to "color" for consistency" 
This reverts commit 963a2092efefb62f8f8b1216f0a7d05bbebb884d.

I still say we should use "colour" for consistency, but that change should not be part of this branch.

CURA-333
 2016-06-22 10:19:44 +02:00
fieldOfView
b17d621243 Disable nozzle/material selection on the global tab 
The global tab has no nozzle/material by definition.
CURA-333
 2016-06-22 09:55:25 +02:00
fieldOfView
6fa1fb9d2f Select "Global" tab when switching to a machine that has multiple extruders. 
CURA-333
 2016-06-22 09:55:24 +02:00
fieldOfView
963a2092ef Change spelling of "colour" to "color" for consistency 
I know "colour" is the more correct spelling, but Qt uses the spelling "color" and we have already adopted that spelling in a number of places.

CURA-333
 2016-06-22 09:55:23 +02:00
fieldOfView
92905ada34 Show true extrudernames in Simple Mode support extruder selection combobox 
CURA-333
 2016-06-22 09:55:21 +02:00
fieldOfView
eba2451cf2 Add tooltip to extruder-tabs 
CURA-333
 2016-06-22 09:55:21 +02:00
Jaime van Kessel
65751d7400 Added completed signal to machine action, so model can notify display that it is completed 
CURA-1385
 2016-06-21 16:19:44 +02:00
Jaime van Kessel
181d16aad8 Running machine actions outside of first run is now possible 
CURA-1385
 2016-06-21 14:34:53 +02:00
Jaime van Kessel
924af37dff Fleshing out of bedleveling action 
CURA-1385
 2016-06-21 13:30:36 +02:00
Jaime van Kessel
8237047907 Actions are now added as buttons to machinePages 
CURA-1385
 2016-06-20 13:46:05 +02:00
Jaime van Kessel
96e6477793 Print monitoring tab now has icons indicated if it's paused / connected 
CURA-1036
 2016-06-17 13:06:33 +02:00
Jaime van Kessel
1232ac7df5 Temperatures are now rounded + displayed with celcius sign 
CURA-1036
 2016-06-17 12:05:23 +02:00
Jaime van Kessel
1f9acf0b54 Color of progress bar now changes based on jobstate 
CURA-1036
 2016-06-17 12:01:48 +02:00
Jaime van Kessel
ef9ce7ad55 Made time total & time remaining pretty 
CURA-1036
 2016-06-17 11:55:53 +02:00
Jaime van Kessel
168246d594 Added progress percentage label 
CURA-1036
 2016-06-17 11:02:22 +02:00
Jaime van Kessel
ec34d92500 Resume, pause & abort are handled correctly 
CURA-1036
 2016-06-16 17:47:05 +02:00
Jaime van Kessel
74c4774092 Fixed print /resume button 
CURA-1036
 2016-06-16 17:21:16 +02:00
Jaime van Kessel
8d8b479216 Adding pause / resume buttons for print monitoring 
CURA-1036
 2016-06-16 15:36:51 +02:00
Jaime van Kessel
a735e92dfa Added camera image overlay when monitoring print 
CURA-1036
 2016-06-16 11:01:58 +02:00
Jaime van Kessel
3a46bb8d8a Added CameraImageProvider & camera handling 
CURA-1036 and CURA-338
 2016-06-16 09:34:43 +02:00
Jaime van Kessel
8160f8d5e6 Added more data to the print monitor screen 
CURA-1068
 2016-06-15 16:47:19 +02:00
Jaime van Kessel
8a603c2fc1 Added basic tabs for monitoring print 
CURA-1036
 2016-06-15 16:17:52 +02:00
Jaime van Kessel
12faf23af8 Added a way to check if a printer is connected 
CURA-1036
 2016-06-15 14:13:54 +02:00
fieldOfView
0864b53081 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-15 09:46:08 +02:00
fieldOfView
61db0a7660 Fix extruder tabs for >2 extruders or long extruder names 
CURA-340
 2016-06-15 09:45:55 +02:00
Jaime van Kessel
1bab4032fd Fixed broken perobject setting panel 
CURA-1725
 2016-06-15 09:41:32 +02:00
Arjen Hiemstra
e473d7a4e9 Ensure the control has active focus when clicking a SettingItem 
This way we ensure that things update properly when for example changing
infill pattern.

Fixes CURA-1494
 2016-06-14 17:29:05 +02:00
Simon Edwards
175b5429b4 Refactor the profile and Cura specific import/export code, put the cura stuff in Cura itself. 
Contributes to CURA-1667 Profile import/export
 2016-06-14 11:44:38 +02:00
fieldOfView
4ece9b0997 Add swatch to extruder tabs 
CURA-340
 2016-06-14 10:42:33 +02:00
fieldOfView
24e165b964 Remove error on ProfilesPage 
CURA-1585
 2016-06-14 10:41:06 +02:00
fieldOfView
11b120a483 Redesign extruder selection widget 
Adds a colorswatch instead of coloring the whole widget (which looks like a warning state)

CURA-340
 2016-06-13 18:23:53 +02:00