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

143 Commits

Author SHA1 Message Date
Arjen Hiemstra
3b51c3d339 Remove qmldir from qml resources and use proper Cura namespace for everything 
Since we now properly expose all the qml files in the Cura namespace
we should also use it from there.
 2016-05-31 18:07:33 +02:00
fieldOfView
6aa00a951f Fix triggering actions from the extensions menu 
Contributes to CURA-1540, CURA-1278
 2016-05-27 17:21:14 +02:00
fieldOfView
f7f9dc036e Show correct page when opening profile manager 
CURA-1278
 2016-05-26 09:42:44 +02:00
Arjen Hiemstra
386aec32a8 Merge branch 'settings_rework' 
Contributes to CURA-1278

* settings_rework: (224 commits)
  Improve slice trigger documentation
  Import Cura in materials preferences page so we can use the active definition id
  Add layer height to high quality profile so we have something that changes
  Update example XML material to use the right product names
  Filter available materials by the machine definition
  Show the add machine dialog when we do not have an active machine
  Create machine-specific material containers for machine specific overrides in XML material files
  When creating a new container stack, add empty containers for things where we cannot find containers
  Add preferred variant, material and quality to UM2+ definition
  Account for global container stack being None in the backend plugin
  Use the global stack instance variable and account for it potentially being None
  Store the global container stack as an instance property
  Added wildcard to filtering
  Per object settings filter now uses correct bool types (instead of strings)
  Removed stray = sign.
  Fix creating print job name
  Disable asynchronous loading of SettingItem when Qt Version < 5.5
  Document QTbug
  Properly serialise all settings to g-code file
  Document GCodeWriter class
  ...
 2016-05-25 15:12:25 +02:00
Arjen Hiemstra
2654033fae Show the add machine dialog when we do not have an active machine 2016-05-25 11:31:48 +02:00
Ghostkeeper
c80455c6bc
Fix creating print job name 
Also fixed up the code style of that bit.

Perhaps this should've been done in Python, but that is for later.

Contributes to issue CURA-1278.
 2016-05-24 15:04:08 +02:00
Arjen Hiemstra
f90be96bc6 Add back the Profiles page 2016-05-23 18:21:23 +02:00
Arjen Hiemstra
8284ab9de5 Insert printers and materials pages at the right location 2016-05-23 18:21:23 +02:00
Arjen Hiemstra
b452cf7ba4 Add a materials management page 
Based off Aldo's work which is in a different branch
 2016-05-23 02:19:11 +02:00
Jaime van Kessel
6d25d21126 getting id of definition when none was found no longer causes exception 
CURA-1278
 2016-05-17 12:55:40 +02:00
Jaime van Kessel
dd24e488a8 Materials & variants are now correctly checked when active 
CURA-1278
 2016-05-13 12:04:38 +02:00
Jaime van Kessel
5dbe0bdc03 Machine variants can now be selected from dropdown menu 
CURA-1278
 2016-05-13 11:46:54 +02:00
Jaime van Kessel
d8e4aa9078 Moved machinePage to Cura 
CURA-1278
 2016-05-12 11:24:09 +02:00
Jaime van Kessel
133229d086 Merge branch 'settings_rework' of https://github.com/Ultimaker/Cura into settings_rework 2016-05-12 09:31:43 +02:00
fieldOfView
7c154c78bf Add keyboard shortcuts for grouping/ungrouping 
Contributes (in a way) to CURA-1054, \sa CURA-1531
 2016-05-11 17:58:10 +02:00
Jaime van Kessel
ac9b391e7f Fixed available printers in dropdown menu 
CURA-1278
 2016-05-11 17:20:09 +02:00
Arjen Hiemstra
5e226038d9 Instantiate models instead of using the Models object 
Since Models has been removed
 2016-05-11 17:19:31 +02:00
Arjen Hiemstra
207bdb3cd5 Update Cura.qml to use Actions as singleton instead of instantiating them 2016-05-11 17:19:31 +02:00
Jaime van Kessel
1b9c29579b Reworked add machine (Still stub) 
CURA-1278
 2016-05-09 14:55:01 +02:00
Arjen Hiemstra
44246c0676 Comment out all things that use settings related things so we can at least start 2016-05-09 12:06:11 +02:00
fieldOfView
614726a574 Fix codestyle 
CURA-970
 2016-05-02 09:39:55 +02:00
fieldOfView
b0f55058ed Fix showing the rename profile dialog when creating a new profile 2016-04-28 16:59:58 +02:00
fieldOfView
4939b935d2 Show profile name dialog after creating a profile 
CURA-970
 2016-04-28 14:36:29 +02:00
fieldOfView
f6ce963b73 Add "Update Current Profile" and "Reset Current Profile" menu items to profile dropdowns 
CURA-970
 2016-04-28 10:29:51 +02:00
fieldOfView
db7777a6e7 Move Rotation "tooltip" out of cura.qml and make it useful for other tools as well 
Tool hint is now a child of Toolbar.qml, where it fits with the tools for which it is useful.

CURA-1014
 2016-04-12 17:09:32 +02:00
fieldOfView
256647b83b Prevent bindingloop warning 
CURA-1143
 2016-04-04 12:08:46 +02:00
fieldOfView
a32c00141a Apply style to rotate-tool tooltip 
See https://github.com/Ultimaker/Cura/issues/685

CURA-1143
 2016-04-04 11:33:37 +02:00
fieldOfView
6b2b948623 Prevent qml errors when adding/deleting profiles 
CURA-855
 2016-03-21 16:28:58 +01:00
fieldOfView
2e5868cb82 Removed separators from profilesmodel 
Profile menu now inserts separators in QML
CURA-855
 2016-03-21 13:47:14 +01:00
Ghostkeeper
e5a5cffe7d
Remove unnecessary parameter to JS toString 
This parameter has no effect.

Contributes to issue CURA-1110.
 2016-03-18 15:59:05 +01:00
Jaime van Kessel
43d13096a1 Added decodeURIComponent to mesh names 
Fixes CURA-1110
 2016-03-18 14:56:35 +01:00
fieldOfView
cdc9ece474 Show separator between readonly profiles and custom profiles in profiles menu and sidebar profiles dropdown 
Contributes to CURA-855
 2016-03-10 11:57:47 +01:00
Jaime van Kessel
ff3bca19ac Renamed getdefaultsavepath 2016-03-01 10:40:35 +01:00
Jaime van Kessel
06afed5283 Loading files now uses home folder as default location 
CURA-906
 2016-02-29 16:11:48 +01:00
Arjen Hiemstra
222b4666d3 Do not load the theme again when the UI has been loaded 
Theme is now loaded on creation instead
 2016-02-23 12:24:27 +01:00
Arjen Hiemstra
074048f83c Use the key property of action's source to scroll setting visibility 2016-02-23 12:24:27 +01:00
Arjen Hiemstra
e6ef4405c3 Replace a bunch of Theme property accessors with getThing calls 2016-02-23 12:24:26 +01:00
Arjen Hiemstra
d208885755 Load preference pages dynamically and reset the current page to 0 on close 2016-02-23 12:24:26 +01:00
Arjen Hiemstra
e2b2088246 Add a configureSettingsAction that will open the setting visibility page 2016-02-23 12:24:26 +01:00
Arjen Hiemstra
720324f0c6 Replace Theme property accessors with getThing calls 2016-02-23 12:22:30 +01:00
Ghostkeeper
bcbb28dd9f Fix application menu save-to-file option 
Turns out that named parameters never worked. I've changed it into key-word arguments, but then not really key-word arguments but a QVariantMap.

Contributes to issues CURA-611 and CURA-898.
 2016-02-18 13:30:24 +01:00
fieldOfView
b8113a9740 Reset menu selection without modifying the model 
Contributes to CURA-853
 2016-02-17 22:04:05 +01:00
Ghostkeeper
ccd937a56f Make boolean trap more readable 
This doesn't entirely remove it but it looks a bit better. In other calls, the variable name that's filled in the parameter sort of makes it clear what the boolean indicates.

Contributes to issue CURA-611.
 2016-02-15 16:56:42 +01:00
fieldOfView
5613a5de20 Reset menu selection when canceling profile switch 
Contributes to CURA-853
 2016-02-15 14:19:32 +01:00
Ghostkeeper
edb7803760 Make the machine file types filter optional for OutputDevice 
The call to OutputDevice from the save button filters by the file types available to the machine. The call to OutputDevice from the application menu doesn't.

Contributes to issue CURA-611.
 2016-02-10 13:39:49 +01:00
fieldOfView
828752af30 Remove dialogs that were moved to Uranium 2016-02-08 09:18:35 +01:00
fieldOfView
f97e2fa6aa Prepare "Add profile" dialog 2016-02-08 09:18:33 +01:00
Jaime van Kessel
2867f03840 Fixes rotation hint 
CURA-816
 2016-02-03 14:30:00 +01:00
Jaime van Kessel
d68e17c9f5 Merge pull request #624 from Ultimaker/fast_advanced_switch 
Fast Simple<->Advanced Switch
 2016-02-01 10:48:27 +01:00
Arjen Hiemstra
5d136a1da7 ActiveTool.properties now returns a ContainerProxy object 2016-01-29 15:18:19 +01:00