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

1277 Commits

Author SHA1 Message Date
Jaime van Kessel
251c043add Removed debug print statements 2015-08-18 14:37:21 +02:00
Jaime van Kessel
c95cf5263b Changes to USB printer manager so its usable by other qml files 2015-08-18 14:12:48 +02:00
Jaime van Kessel
b35912e7ba Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-08-18 10:47:38 +02:00
Jaime van Kessel
2454f78e2d Made machine wizard more dynamic 2015-08-18 10:46:56 +02:00
Tamara Hogenhout
efbae53e6e 15.10 Restyling Toolbar buttons 
Contributes to: issue CURA-60
 2015-08-17 17:30:53 +02:00
Tamara Hogenhout
7adc9732e8 Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-08-17 17:24:21 +02:00
Tamara Hogenhout
42fd35a8c2 15.10 Placement of the buttons in the contentArea 
Contributes to: issue CURA-60
 2015-08-17 17:22:58 +02:00
Jaime van Kessel
a7f33ea5e7 Updated other wizard pages to fit the changed wizard.qml 2015-08-17 15:24:24 +02:00
Jaime van Kessel
2b5627234a Changed selectupgradeparts 2015-08-17 15:18:46 +02:00
Tamara Hogenhout
6a097aaded put wizardcontant in a scrollview 2015-08-17 14:33:48 +02:00
Tamara Hogenhout
3a1e6333cc cleanup 2015-08-13 14:03:03 +02:00
Tamara Hogenhout
062df7c512 Changes the styling of the wizardPages 
commits to #143
 2015-08-13 10:49:24 +02:00
Tamara Hogenhout
b14f3d98bc Adds the styling and wizardPages (more directly) to the generic wizard 
contributes to #143
 2015-08-13 10:48:33 +02:00
Arjen Hiemstra
900e733839 Add a combo box and menu entries to select the current machine variant 2015-08-11 17:36:05 +02:00
Arjen Hiemstra
255caf8693 Add a combo box to select active profile 2015-08-11 17:35:36 +02:00
Arjen Hiemstra
09cfda095b Convert the last bits over to the changed API 2015-08-11 17:02:17 +02:00
Tamara Hogenhout
29c307f364 Adds the backspace as a schortcut to trigger the delete object action. 
This StandardKey only works for MacOS, for more info see http://doc.qt.io/QtVirtualKeyboard/qml-qtquick-enterprise-virtualkeyboard-backspacekey.html

fixes #237
 2015-08-10 12:24:24 +02:00
Arjen Hiemstra
842689d88e Update all uses of the Resources API with the changed API 2015-08-05 17:26:52 +02:00
Arjen Hiemstra
cb06668628 Use OutputDeviceManagerProxy for save menu and button 2015-08-03 17:29:39 +02:00
Arjen Hiemstra
1819caaed4 Merge branch 'output_device' 
* output_device:
  Update all plugin metadata to specify API version
  Remove LocalFileStorage from required plugins and add LocalFileOutputDevice
  Add RemovableDrive plugin that has been moved from Uranium
  Add an icon for "save all" and only enable the action when it makes sense
  Disable recent files if there are no recent files and add an icon
  Properly implement Save Selection
  Return empty string so we get no errors about assigning undefined to string
  Update SaveButton to the changed OutputDevicesModel API
  Update GCodeWriter to the new API
  Add mime types to GCodeWriter plugin
  Write to the right device after changes in Uranium API
  Remove the output_device related stuff from CuraApplication and fix the qml
  Use the OutputDeviceModel for selecting output device
  Try to load all plugins, not just plugins with certain metadata
 2015-07-31 17:37:25 +02:00
Jaime van Kessel
a82717f65c Added views to top bar 
Closes #73 and CURA-38 #close
 2015-07-31 17:05:44 +02:00
Tamara Hogenhout
783b75bcd9 combines work on the wizard by Jaime and myself 
contributes to #128
 2015-07-31 16:42:57 +02:00
Arjen Hiemstra
a8c36282fb Merge branch 'master' into output_device 
* master: (22 commits)
  Added grouping action
  LayerData now works by using decorators
  Do not cause "dictionary changed size during iteration" errors when changing view
  Adds an idle-state for the layerview slider
  Adds an idle-state for the safebutton
  Sets the platform activity on true when a model is loaded
  Sets the platform activity on true when a model is loaded
  Create functions that get & set platform activity
  Send M104 to set the temperature to 0
  Do not store files that fail to load in recent files
  feat: infill wipe dist; wireframe restructure & renaming; bugfix: draft_shield_height inherit_function
  Also add the parent class' command line arguments
  Only process the layer data if the layer view is active.
  Write to the correct variable so bed temperature is properly updated
  Correct a copy-paste error in getConnectionList
  Properly close all open USB connections on shut down
  Catch errors when trying to close the connection thread
  Enlarge the zone where you can use scrolling to look trough the layer mode.
  included retraction_extra_prime_amount
  tiniest detail concerning the padding of the layer count label
  ...
 2015-07-31 12:15:18 +02:00
Tamara Hogenhout
b4a8973975 cleanup 2015-07-30 19:36:05 +02:00
Tamara Hogenhout
8596c08a80 Adds a generic wizard 
contributes to #128
 2015-07-30 19:11:48 +02:00
Arjen Hiemstra
3e024e1618 Add an icon for "save all" and only enable the action when it makes sense 2015-07-30 17:08:10 +02:00
Arjen Hiemstra
619e178f0c Disable recent files if there are no recent files and add an icon 2015-07-30 17:07:46 +02:00
Arjen Hiemstra
db59954521 Properly implement Save Selection 2015-07-30 17:07:18 +02:00
Arjen Hiemstra
b5e8f01cfa Return empty string so we get no errors about assigning undefined to string 2015-07-30 16:53:16 +02:00
Jaime van Kessel
7c2617133e Updated how machine selection works; Id now identifies a type of machine so multiple variations of the same machine are possible without cluttering your selection 2015-07-30 15:09:50 +02:00
Jaime van Kessel
3175788dd3 Updated code styling addmachine wizard 2015-07-30 12:17:17 +02:00
Arjen Hiemstra
68cde3f780 Update SaveButton to the changed OutputDevicesModel API 2015-07-30 09:31:28 +02:00
Jaime van Kessel
19d711fb80 Added merging for multi material 2015-07-27 14:25:27 +02:00
Jaime van Kessel
4c1d86d28c Grouping & ungrouping is now in both context menus 2015-07-27 10:53:47 +02:00
Jaime van Kessel
d01279c115 Added ungrouping 2015-07-15 14:32:06 +02:00
Arjen Hiemstra
a84a5d784a Fix the platform activity check 
Contributes to #128
 2015-07-15 10:15:02 +02:00
Arjen Hiemstra
d659e5b8b8 Merge branch '15.06' 
Conflicts:
	cura/CuraApplication.py
 2015-07-15 00:38:29 +02:00
Arjen Hiemstra
0bcd5d875d Display the actual application version in the about dialog 
This helps people reporting issues since they can report the proper
application version
 2015-07-14 11:16:10 +02:00
Jaime van Kessel
2683fa0958 Added grouping action 2015-07-14 10:25:08 +02:00
Tamara Hogenhout
81aa047ae3 Adds an idle-state for the safebutton 
When there is no model, the safebutton goes back into the idle state

contributes to #128
 2015-07-10 18:43:47 +02:00
Tamara Hogenhout
a687c9c89e Sets the platform activity on true when a model is loaded 
Also solved a problem with the deleteSelection trigger

contributes to #128
 2015-07-10 18:41:24 +02:00
Arjen Hiemstra
078295d6e1 Write to the right device after changes in Uranium API 2015-07-08 22:04:50 +02:00
Arjen Hiemstra
c2e672591c Remove the output_device related stuff from CuraApplication and fix the qml 
This is now properly handled by the Output Device API in Uranium
 2015-07-08 21:42:20 +02:00
Arjen Hiemstra
baf4ea9523 Use the OutputDeviceModel for selecting output device 
Replaces the stuff in CuraApplication which really should not be there
 2015-07-08 21:26:54 +02:00
Tamara Hogenhout
caa7fdb147 Styling to add descriptive tooltips to the settings -> preferences -> view page. 
contributes to issue from Asana: #unknown
 2015-07-01 16:35:33 +02:00
Arjen Hiemstra
651b4fdfea Final changes for release 
Adds the release splash and changes the version to 15.06
 2015-06-30 17:40:58 +02:00
Tamara Hogenhout
c6151c2343 Restyling of the save to toolpath button 
The save to button only shows a short description, not the entire description including device-name.

Contributes to #54
 2015-06-25 18:38:43 +02:00
Tamara Hogenhout
d13eedee64 Merge branch '15.06' of https://github.com/Ultimaker/Cura into 15.06 2015-06-25 16:53:33 +02:00
Tamara Hogenhout
a9f87d5d34 Restyling of the save to toolpath button 
When the text is to long for the infobox, it is elided of the "Estimated print-time" message is not shown.

Contributes to #54
 2015-06-25 16:49:57 +02:00
Arjen Hiemstra
ad68111c0c Disable the low/high quality slicing and slider settings if we are not in simple mode 
Contributes to #11
 2015-06-25 12:04:25 +02:00