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

106 Commits

Author SHA1 Message Date
Arjen Hiemstra
88d87e8e85 Cleanup sidebarheader and fix extruder selection 
Contributes to CURA-340
 2016-06-09 14:32:13 +02:00
Arjen Hiemstra
725086b0dd Remove ProfileSetup and move its contents to SidebaarHeader 
Contributes to CURA-340
 2016-06-09 14:32:13 +02:00
Ghostkeeper
6a520cad47
Change focus upon extruder switch 
This applies a setting that is currently being typed by the user. Otherwise it would take the currently being typed value along to the next tab, since it can't update a setting value while it is in focus.

Contributes to issues CURA-340 and CURA-1278.
 2016-06-09 11:48:37 +02:00
Ghostkeeper
7dbafa06d1
Make SidebarHeader use ExtrudersModel 
This model is also used by the extruder selection drop-downs, and it's automatically filled already so that was double logic.

Contributes to issues CURA-340 and CURA-1278.
 2016-06-08 16:36:01 +02:00
Ghostkeeper
dff94b4559
Make ExtruderManager a QML context item 
There were two singletons of this manager: One created by QML and managed by QML, and one created by us and managed by our own singleton pattern. That won't work! So we now manage just our own singleton type, and make it a context item for QML so it can use the manager too.

Contributes to issues CURA-340 and CURA-1278.
 2016-06-07 11:55:14 +02:00
Ghostkeeper
927d33145f Move creating extruder manager logic to ExtruderManager 
This logic was both in Extruder.py and in MachineManagerModel.py due to a planning mishap.

Contributes to issues CURA-1278 and CURA-340.
 2016-06-06 15:15:33 +02:00
Jaime van Kessel
1e44abb9be Added activeExtruder stack to machineManager model 
CURA-340
 2016-06-05 12:01:46 +02:00
Arjen Hiemstra
6a3b321e5a Re-enable commented code 2016-06-04 19:23:46 +02:00
Arjen Hiemstra
ceb21ce89b Filter material/quality by machine only when we should filter 
Contributes to CURA-1612
 2016-06-02 08:10:55 +02:00
fieldOfView
f0b956c3c6 Add selection "tab" for active extruder 
Only visible for multi-extrusion printers. Doesn't do anything but setting a qml property, but is to be used to change the variant/material per extruder, and to apply a filter to the advanced mode settings.

CURA-340
 2016-05-26 09:42:31 +02:00
fieldOfView
6a77f67c34 Rearrange sidebar top 
CURA-340
 2016-05-26 09:42:04 +02:00
Arjen Hiemstra
b2a8810d04 Filter available materials by the machine definition 
Since we now have some machine-specific materials
 2016-05-25 11:31:48 +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
6ffde62bcf Added stubs for hasVariants & hasMaterials 
CURA-1278
 2016-05-13 11:42:29 +02:00
Jaime van Kessel
f3384b043d Only variants of active machine are now shown 
CURA-1278
 2016-05-13 11:26:08 +02:00
Jaime van Kessel
b3e741e90c Added variant selection 
CURA-1278
 2016-05-13 10:16:58 +02:00
Jaime van Kessel
f5e63f2e71 Changing the material is now possible 
CURA-1278
 2016-05-12 17:38:43 +02:00
Jaime van Kessel
89c0644e4b Added activeMaterial property 
CURA-1278
 2016-05-12 17:01:47 +02:00
Jaime van Kessel
66a29a2f1c Added name for active machine 
CURA-1278
 2016-05-11 16:21:09 +02:00
Jaime van Kessel
573c1c1a5a Added MachineManagerModel to Cura 
CURA-1278
 2016-05-11 15:35:41 +02:00
Jaime van Kessel
9fcc3930ff ContainerStackModel is now used for listing all added machines 
CURA-1278
 2016-05-11 14:30:44 +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
d7aa8e71bf Rearrange nozzle/material selection into one line 
In preparation for CURA-330, where we will need multiple instances of the nozzle/material combo.
 2016-04-27 20:29:21 +02:00
Arjen Hiemstra
e6ef4405c3 Replace a bunch of Theme property accessors with getThing calls 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
fieldOfView
b8113a9740 Reset menu selection without modifying the model 
Contributes to CURA-853
 2016-02-17 22:04:05 +01:00
fieldOfView
5613a5de20 Reset menu selection when canceling profile switch 
Contributes to CURA-853
 2016-02-15 14:19:32 +01:00
fieldOfView
faefbb6b8e Rename materials model to MachineMaterialsModel 2016-02-08 09:18:30 +01:00
fieldOfView
47d299b8c3 Add material profile selection to sidebar 2016-02-08 09:18:30 +01:00
fieldOfView
aa2563b891 Rename "Machines" to "Printers" 2015-12-30 09:53:28 +01:00
fieldOfView
b7f413dbb7 Move Variant selection to directly below Machine selection 2015-12-30 09:53:28 +01:00
fieldOfView
4d29fccb0b Remove cursorShapes for now 2015-12-03 12:09:30 +01:00
fieldOfView
5b01ce7f96 Hide sidebar header for now 2015-12-03 12:09:27 +01:00
fieldOfView
3a8de56f66 Fix cursorShape for sidebar controls 2015-12-03 12:09:27 +01:00
fieldOfView
2477617155 Reorient LayerView slider 
Fix toolbar tooltip collisions
Refactor use of colors.text_default
 2015-12-03 12:09:26 +01:00
fieldOfView
64bd41e611 Move mode-toggle out of header 
Tweak tool-buttons and fonts
 2015-12-03 12:09:24 +01:00
Adam Goldsmith
95a695545b Fix unset text colors on bright backgrounds 
Adds a text_default color for use where the background color is set to
something bright. This avoids falling back on the user's theme, in which
the default text color might be also be bright.
 2015-10-28 10:32:47 -04:00
Tamara Hogenhout
f866ecdd63 Restyling of the sidebar header and and profile setup 
commits to: issue CURA-177
 2015-09-21 16:03:53 +02:00
Tamara Hogenhout
d6793bc197 adapts the sizes between buttons etc 
fixes: issue CURA-194
 2015-09-21 14:31:43 +02:00
Arjen Hiemstra
fa9ab24959 Properly handle dynamic initialization of Sidebar header 2015-09-12 20:08:41 +02:00
Arjen Hiemstra
67086b4d9f Update translated strings and contexts 2015-09-12 20:08:41 +02:00
Tamara Hogenhout
096065a441 changes some word-usage and the use of capital letters 
Contributes to: issue CURA-129
 2015-09-10 14:23:47 +02:00
Tamara Hogenhout
28aec71c02 adds/adapts translation context markers 
all nescessary in folder: Cura/resources

Contributes to: issue CURA-116
 2015-09-08 16:30:10 +02:00
Arjen Hiemstra
8833e11cdb Fix machine selection drop down 
Not sure if this was a merge issue or just not properly renamed
 2015-09-02 12:22:37 +02:00
Arjen Hiemstra
82c7dd8d0a Merge branch 'master' of github.com:ultimaker/Cura into per_object_settings 
* 'master' of github.com:ultimaker/Cura:
  15.10 restyling of the sidebar header
 2015-09-01 18:04:06 +02:00
Arjen Hiemstra
f6dbc73d6d Use the right property for active machine instance name 2015-09-01 17:29:25 +02:00
Tamara Hogenhout
3088579aad 15.10 restyling of the sidebar header 
Contributes to: issue CURA-60
 2015-09-01 17:26:35 +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
Tamara Hogenhout
3df4d69c37 15.10 restyling of the sidebar header 
Not yet finished

Contributes to: issue CURA-60
 2015-08-31 17:28:36 +02:00