GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-24 23:29:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
12,129 Commits 291 Branches 265 Tags
Commit Graph

12129 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diego Prado Gesto
9561827bda CURA-4680 Checking if there is global stack in the ExtruderManager. 
Intead of checking for it in all the methods in MachineManager, now the
check is done in ExtruderManager when there is no printer in the list.
 2017-12-06 14:12:51 +01:00
Jack Ha
f0c3aaf532 Add built-in profiles to profiles screen. 
Contributes to issue CURA-4243.
 2017-12-06 14:05:09 +01:00
ChrisTerBeke
2d044a37ae Sidebar and main view via loader 2017-12-06 13:33:05 +01:00
ChrisTerBeke
a57a5aab6b Make sidebar view working for active stage 2017-12-06 12:23:41 +01:00
Lipu Fei
c0a502f99c Check if there is an active machine before doing anything else 
CURA-4680
 2017-12-06 11:48:14 +01:00
Jack Ha
20500b5c51 Merge branch 'feature_local_container_server' of github.com:Ultimaker/Cura into feature_local_container_server 2017-12-06 11:03:47 +01:00
Jack Ha
eb171231c2 Fix removeMaterial. 
The base_file must be removed first, or it gets loaded halfway during remove containers.

Contributes to issue CURA-4243.
 2017-12-06 11:02:50 +01:00
Ghostkeeper
ec36424a4d
Update UserProfilesModel when metadata of materials changes 
The metadata may influence which profiles are being shown.

Contributes to issue CURA-4243.
 2017-12-06 10:42:02 +01:00
Ghostkeeper
80f4c9181d
Correct variant name when duplicating materials 
It needs to be the variant name (swapping spaces for underscores) to be consistent with the deserialize functions.

Contributes to issue CURA-4243.
 2017-12-06 10:40:58 +01:00
Ghostkeeper
3e2e133682
Add type hinting for getMachineManager 
I like it when my IDE can give me hints, so return types are important.

Contributes to issue CURA-4243.
 2017-12-06 10:37:06 +01:00
ChrisTerBeke
0e1c9146cf Implement stage model in top bar 2017-12-06 09:58:50 +01:00
ChrisTerBeke
9b4b6b2eae Remove sidebar views from views menu 2017-12-06 09:44:59 +01:00
ChrisTerBeke
f1b9a17611 Remove sidebar controller implementation in favor of stages 2017-12-06 09:44:30 +01:00
ChrisTerBeke
a5b99bd862 Scaffold monitor stage 2017-12-06 09:36:09 +01:00
ChrisTerBeke
84ba486d57 Add plugins for prepare and monitor stages 2017-12-06 09:34:09 +01:00
ChrisTerBeke
840e80a1fb Add missing init 2017-12-06 09:29:09 +01:00
ChrisTerBeke
44c66e2ad2 Get named view in CuraStage 2017-12-06 09:26:37 +01:00
ChrisTerBeke
ab5449b01e Add CuraStage 2017-12-06 09:10:19 +01:00
Adam Rumjahn
a60bfb7b28
Merge branch 'master' into master 2017-12-05 21:27:48 -05:00
Adam Rumjahn
d2e2f13bd7
Merge branch 'master' into master 2017-12-05 21:26:23 -05:00
Adam Rumjahn
f690961900
Deactivated G32 autoleveling 
Update form last commit, complied with new syntax
 2017-12-05 21:20:43 -05:00
Ruben D
aa727df525
Correct description of SOLIDWORKS macro 
The original description was factually incorrect.

Fixes #2839.
 2017-12-06 00:53:43 +01:00
ChrisTerBeke
833593bfa2 Merge branch 'master' into feature_sidebar_plugin_target 2017-12-05 14:14:57 +01:00
ChrisTerBeke
9a538b330a Ignore new plugins 2017-12-05 14:14:52 +01:00
Ghostkeeper
13c7099e2f
Don't show slice info message if the preference is set to not send it 
If the preference was set to not send it but the user never clicked on the message, don't show the message.

Fixes #2840.
 2017-12-05 13:30:12 +01:00
ChrisTerBeke
51405ca0f7 tmp 2017-12-05 13:29:04 +01:00
ChrisTerBeke
a6a3602840 View default view selected in view menu 2017-12-05 12:27:13 +01:00
ChrisTerBeke
030dc74f3f Fix now showing any sidebar when in monitor mode 2017-12-05 12:19:00 +01:00
Jack Ha
7d24933835 Fix save to file. 
Changed order of setting metadata for correct overwriting.

Contributes to issue CURA-4243.
 2017-12-05 11:55:54 +01:00
ChrisTerBeke
e33288b7c8 Move sidebar target for plugins to only middle section 2017-12-05 10:56:59 +01:00
Lipu Fei
0ac7b77572
Merge pull request #2908 from Ultimaker/thopiekar-extruder-row-comment 
SidebarHeader: Adding missing comment about "extruder row"
 2017-12-05 10:56:10 +01:00
Jack Ha
ce78bddfbb Prefer a read-only material in findDefaultMaterial. 
Contributes to CURA-4243.
 2017-12-05 09:51:57 +01:00
Thomas Karl Pietrowski
6f8ed09d3d
SidebarHeader: Adding missing comment about "extruder row" 
Just read the code and noticed that.
 2017-12-05 00:14:19 +01:00
ChrisTerBeke
5673a834bc Fix showing default sidebar, cleanup needed 2017-12-04 19:48:42 +01:00
ChrisTerBeke
caf56587fe Implement switching sidebar views 2017-12-04 19:37:03 +01:00
Ghostkeeper
9e62b6e14b
Merge branch '3.1' 2017-12-04 17:13:52 +01:00
Jack Ha
41cde7c7f4 Fix connecting material name change signal on startup. Contributes to CURA-4243. 2017-12-04 17:07:37 +01:00
Ghostkeeper
a3818be46f
Reactivate layer view translation 
The layer view mode was renamed back from Simulation View to Layer View after the string freeze. Luckily we still have this old translation.

Contributes to issue CURA-4601.
3.1.0 		2017-12-04 17:05:38 +01:00
Jack Ha
3b25191949 Undo a fix that causes Cura to crash when starting up clean. 
Contributes to issue CURA-4243.
 2017-12-04 17:00:43 +01:00
Jack Ha
90e8256f46 Fix that renaming a custom material also updates the selected material. 
The namechanged signal was not connected at startup, so the update would only work if you change material first before renaming.

Contributes to CURA-4243.
 2017-12-04 16:30:21 +01:00
Jack Ha
c52451217b Use timer instead of calling _update directly. 
Speeds up when the signal is called very often in a small period.

Contributes to issue CURA-4243.
 2017-12-04 16:29:21 +01:00
ChrisTerBeke
3c863fc388 Get default settings view to work as sidebar component 2017-12-04 16:28:35 +01:00
Cláudio Sampaio (Patola)
6315cbae4e updated brazilian portuguese translations 2017-12-04 12:48:19 -02:00
Jack Ha
ac97d0d83f Sort materials by brand, material, name, color_name. 
Contributes to issue CURA-4243.
 2017-12-04 13:23:30 +01:00
ChrisTerBeke
5eeb98bbcf Move sidebar controller init 2017-12-04 13:20:16 +01:00
Ghostkeeper
cd2c4361b8
Merge branch 'master' of github.com:Ultimaker/Cura 2017-12-04 12:55:58 +01:00
ChrisTerBeke
e8f1073af8 Add menu seperator 2017-12-04 12:48:07 +01:00
ChrisTerBeke
4ef39ca313 Add sidebar views menu item and expose model to QML 2017-12-04 12:47:08 +01:00
ChrisTerBeke
713055e320 Get meta data per sidebar view in sidebar view model 2017-12-04 12:37:29 +01:00
ChrisTerBeke
f2b4cbe182 Register sidebar controller in application, start with default sidebar view 2017-12-04 11:37:49 +01:00