1234 Commits

Author SHA1 Message Date
Jaime van Kessel
56e8b01f22 Fixed resetting to center of groups
Fixes #CURA-112
2015-09-08 11:48:08 +02:00
Jaime van Kessel
ee513b0b83 Fixed resetting transformation / position of groups.
Contributes to #CURA-112
2015-09-08 11:34:05 +02:00
Jaime van Kessel
7463979bcc Updated version string 2015-09-04 11:10:14 +02:00
Jaime van Kessel
a9208ccf3f Fixes namechanges caused by api change 2015-09-02 13:50:04 +02:00
Jaime van Kessel
63ddfccd52 updated cura application to new API 2015-09-02 11:23:09 +02:00
Jaime van Kessel
b16933d68f Fix of crash caused by merge 2015-09-02 11:10:05 +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
f618b54d69 Connect to MachineManager's addMachineRequested so we can show the add printer dialog 2015-09-01 15:03:59 +02:00
Jaime van Kessel
dd7e450d1c Added preference to disable automatic scale
Ultimaker/Cura#142 #CURA-89
2015-08-28 16:42:11 +02:00
Arjen Hiemstra
4d4192d6d6 Ignore some active machine changes since we need to port code 2015-08-27 09:35:05 +02:00
Arjen Hiemstra
5637c9ad94 Remove active machine preference from CuraApplication, it is now handled by MachineManager 2015-08-27 09:34:22 +02:00
Jaime van Kessel
fdd8a7bb6c Removed unused import 2015-08-26 15:30:26 +02:00
Jaime van Kessel
f92b4d72c7 Added getPrintInformation to curaApp 2015-08-25 14:16:35 +02:00
Jaime van Kessel
ed24f5e451 Duplication now takes sunk into bottom into account.
Fixes Ultimaker/Cura#286
2015-08-24 14:37:20 +02:00
Jaime van Kessel
45aef7903b Duplicate object now also copies rotation.
Fixes Ultimaker/Cura#281
2015-08-24 13:26:34 +02:00
Arjen Hiemstra
f081bf4026 Use the right resource path for locating Qml resources 2015-08-21 18:29:13 +02:00
Arjen Hiemstra
9888a6eb42 Fix a merge error 2015-08-21 18:28:53 +02:00
Arjen Hiemstra
f099c30dfd Merge branch 'master' of github.com:ultimaker/Cura into per_object_settings
* 'master' of github.com:ultimaker/Cura: (98 commits)
  15.10 Restyling of the message stack
  Fixed machine head polygons
  Removed unused settings from fdmprinter
  Added action for togling fullscreen
  Fixed usage of wrong checkbox in viewpage
  Added preference to disable automatic push free
  Added preference to disable auto center when selecting object
  Cleanup
  15.10 Restyling toolbar, viewmode button
  Update README.md
  Update README.md
  Added rudementary 3 point bed leveling
  15.10 New font for Cura
  15.10 Changes the styling for the open file button
  15.10 Changes the label names for the different action buttons
  Fixed typo
  Endstop now stops listening upon destruction
  15.10 Re-alignment of the messagestack
  Cleaned up code a bit
  Added heated bed check
  ...
2015-08-21 13:29:30 +02:00
Tamara Hogenhout
3cb3cce31c Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-08-21 10:55:44 +02:00
Tamara Hogenhout
720577ff8e 15.10 Restyling of the message stack
specifically the progressbar, styling of the messages and colors

Contributes to: issue CURA-60
2015-08-21 10:54:39 +02:00
Jaime van Kessel
f68fdb01b4 Added preference to disable auto center when selecting object 2015-08-20 10:55:13 +02:00
Arjen Hiemstra
a425036c4c Merge branch '15.06'
* 15.06:
  Fix poor visibility of MessageStack against grid
  Fix USB printer detection and reconnect after firmware update on MacOSX
  Correct the icon for the Cura .desktop file
  Bump version
  support defaults to ZigZag instead of Lines
  Fix the platform activity check
2015-08-18 17:59:16 +02:00
Jaime van Kessel
49e39d637c Added cutoff distance 2015-08-13 11:25:34 +02:00
Arjen Hiemstra
09cfda095b Convert the last bits over to the changed API 2015-08-11 17:02:17 +02:00
Arjen Hiemstra
ae79139cc4 Handle Open File events on Mac OSX 2015-08-11 16:48:50 +02:00
Jaime van Kessel
2119d76ab2 Changes to meshreading, which now returns node instead of mesh 2015-08-11 11:35:25 +02:00
Arjen Hiemstra
f60dc01e66 Disable machine detection code for the moment as it needs to be ported 2015-08-05 21:12:21 +02:00
Arjen Hiemstra
1947d773a3 Update all usage of activeMachine to the new API 2015-08-05 20:12:29 +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
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
Arjen Hiemstra
b96b069c21 Remove LocalFileStorage from required plugins and add LocalFileOutputDevice 2015-07-31 17:07:06 +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
Arjen Hiemstra
b22b79dcb6 Bump version 2015-07-27 16:39:05 +02:00
Jaime van Kessel
4318b7e5ab Original center is now used for merging 2015-07-27 14:36:24 +02:00
Jaime van Kessel
19d711fb80 Added merging for multi material 2015-07-27 14:25:27 +02:00
Jaime van Kessel
1d4dbcc990 Delting now correctly deletes the group 2015-07-16 11:12:52 +02:00
Jaime van Kessel
cc2f0fc009 Ungroupning with nested groups now works correctly 2015-07-15 17:22:33 +02:00
Jaime van Kessel
ba612f188a Grouping & ungrouping now has correct selection behaviour 2015-07-15 14:36:43 +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
a3cc4b98b8 Bump application version 2015-07-14 16:02:03 +02:00
Jaime van Kessel
2683fa0958 Added grouping action 2015-07-14 10:25:08 +02:00
Arjen Hiemstra
89b175bc5c Merge branch '15.06'
* 15.06:
  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
2015-07-13 13:52:33 +02:00
Tamara Hogenhout
d41f1a410c Merge branch '15.06' of https://github.com/Ultimaker/Cura into 15.06 2015-07-10 17:53:55 +02:00
Tamara Hogenhout
a5f00f30ca Create functions that get & set platform activity
The platform activity is determined by whether there is a mesh in the build platform or not

Contributes to #128
2015-07-10 17:50:15 +02:00
Arjen Hiemstra
3e27c8b791 Do not store files that fail to load in recent files
Contributes to Ultimaker/Cura#103
2015-07-10 15:58:34 +02:00
Arjen Hiemstra
fec2207b50 Merge branch '15.06'
* 15.06:
  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.
  tiniest detail concerning the padding of the layer count label
  Adds layer count
2015-07-10 13:10:15 +02:00
Arjen Hiemstra
8fa0468787 Also add the parent class' command line arguments
Contributes to #96
2015-07-10 11:25:40 +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
6e4300b299 Try to load all plugins, not just plugins with certain metadata 2015-07-08 21:26:23 +02:00