3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 22:13:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9
16094 commits 313 branches 275 tags 718 MiB
Commit graph

16094 commits

This branch
This branch
All branches
Author SHA1 Message Date
Diego Prado Gesto
d49a4f1179 Merge branch 'cura4.0_header' of github.com:Ultimaker/Cura into cura4.0_header 2018-10-10 16:36:11 +02:00
Diego Prado Gesto
5befc0b256 Restyle the dropdown of the accounts, with information about the user 
and available operations that can be done when the user is logged in or
not.

Contributes to CURA-5784.
 2018-10-10 16:34:55 +02:00
Jaime van Kessel
1ed3558b9a Move ViewOrientationControl to lower left corner 
This also renames the component to better reflect what it is (the old name implied that it
had something to do with orientation views, wheres it's actually a set of controls to change orientation)

CURA-5772
 2018-10-10 14:21:09 +02:00
Jaime van Kessel
b3fc76092d Removed unused EngineLog 2018-10-10 14:01:34 +02:00
Diego Prado Gesto
b89c220a4d Add linings between tabs in the top header. 
Contributes to CURA-5784.
 2018-10-10 11:17:09 +02:00
Diego Prado Gesto
0df7fa1a6c Add style to the top header tabs. 
Contributes to CURA-5784.
 2018-10-10 11:04:08 +02:00
Diego Prado Gesto
49e96980f1 Store the dialogs in a folder called Dialogs. 
Contributes to CURA-5784.
 2018-10-09 17:11:01 +02:00
Diego Prado Gesto
77a1b08f38 Add the callout panel to the account panel, with the two components that 
will show up when the user is logged in or when not.

Contributes to CURA-5784.
 2018-10-09 15:58:13 +02:00
Diego Prado Gesto
2ffcf03f43 Create an AvatarImage component that will show the profile image of the 
user. Still WIP.
Create an AccountWidget (WIP) that shows the avatar image and the
dropdown menu to manage accounts.

Contributes to CURA-5784.
 2018-10-08 17:35:24 +02:00
Diego Prado Gesto
41add97b13 Add Toolbox shortcut to the TopHeader and align the stage tabs to the 
center.

Contributes to CURA-5784.
 2018-10-08 14:50:13 +02:00
Diego Prado Gesto
075a9a161f Create a component for the Views selector. This component contains the 
list of the views and also the shortcuts for the camera position.

The theme colors, sizes and the styles have been updated.

Contributes to CURA-5784.
 2018-10-08 12:57:16 +02:00
Diego Prado Gesto
3acfdadd12 Organize the components in a Column. Separate the TopHeader and place it 
below the application menu, using all the width.

Contributes to CURA-5784.
 2018-10-08 11:31:53 +02:00
Diego Prado Gesto
8bdd27183f Move TopBar to the Skeleton folder. 
Clean up the Cura.qml even more by moving some components to the
ApplicationMenu, where they are called.

Contributes to CURA-5784.
 2018-10-08 10:59:46 +02:00
Diego Prado Gesto
193f113851 Clean up Cura.qml: 
- Create a Skeleton folder where the main parts of the application will
be stored.
- Separate the top menus to a different file.

Contributes to CURA-5784.
 2018-10-08 10:33:01 +02:00
Aleksei S
436860f841 Don't show prime tower shadow if only one extruder is enabled 
CURA-5740
 2018-10-04 11:36:02 +02:00
Lipu Fei
d91d0fab10 Fix SimulationView: missing import 2018-10-03 17:27:21 +02:00
Diego Prado Gesto
4ca63f84b8 Add missing quote. 
Contributes to CURA-5741.
 2018-10-03 16:57:26 +02:00
Jaime van Kessel
37eedb0256 Merge branch 'master' of github.com:Ultimaker/Cura 2018-10-03 16:37:34 +02:00
Jaime van Kessel
adf8285d20 Typing fixes 
Since I was stupid enough to touch it, I was also forced to boyscout the code.
 2018-10-03 16:36:58 +02:00
Diego Prado Gesto
a4e02a6eae Revert "Update date format" 
This reverts commit 959f698b03.
 2018-10-03 16:27:30 +02:00
Diego Prado Gesto
e3721fe539 Revert "Format date strings to ISO YYYY/MM/DD in Toolbox" 
This reverts commit 254106bb26.
 2018-10-03 16:27:13 +02:00
Jaime van Kessel
2e529452dd Moved the actual adding of containers by script to initialize 
This ensures that when loading scripts (and checking they are valid) we don't start adding unneeded containers
 2018-10-03 15:58:16 +02:00
Lipu Fei
254106bb26 Format date strings to ISO YYYY/MM/DD in Toolbox 
CURA-5762
 2018-10-03 15:39:25 +02:00
alekseisasin
742f135733
Merge pull request #4268 from smartavionics/mb-extruder-cooling-fan-number-gui 
Added extruder setting field for cooling fan number.
 2018-10-03 15:17:35 +02:00
alekseisasin
5cd4d741c9
Merge pull request #4267 from smartavionics/mb-extruder-cooling-fan-number 
Add machine_extruder_cooling_fan_number setting to specify print cooling fan for each extruder.
 2018-10-03 15:17:02 +02:00
Jaime van Kessel
9986e38dca Merge branch 'master' of github.com:Ultimaker/Cura 2018-10-03 13:25:19 +02:00
Jaime van Kessel
dabe747ec0 Merge branch 'CURA-5744-move-oauth-login' of github.com:Ultimaker/Cura 2018-10-03 13:25:09 +02:00
Aleksei S
7a87783237 Merge branch 'master' of github.com:Ultimaker/Cura 2018-10-03 13:24:20 +02:00
Aleksei S
959f698b03 Update date format 
CURA-5762
 2018-10-03 13:23:37 +02:00
Lipu Fei
b97f4ea30c Merge remote-tracking branch 'origin/3.5' 2018-10-03 11:49:38 +02:00
Lipu Fei
c3e7e426ff Fix getDefaultVariantNode for UM2 
CURA-5790

UM2 has optional variant which depends on whether Olsson Block is
enabled. getDefaultVariantNode() should take that into account.
 2018-10-03 11:24:27 +02:00
Diego Prado Gesto
6db1342255 Fix the layer view when there is a print job with only one layer. 
Contributes to CURA-5789.
 2018-10-03 10:44:20 +02:00
alekseisasin
5456637e4a
Merge pull request #4369 from fieldOfView/fix_usb_temperature_while_heating 
Fix updating temperature while preheating bed or extruder
 2018-10-03 10:35:30 +02:00
Aleksei S
0edcd316d3 Merge branch 'master' of github.com:Ultimaker/Cura 2018-10-03 10:33:06 +02:00
Aleksei S
51e7b6c388 Change font style for active material in preferences 
CURA-5747
 2018-10-03 10:30:48 +02:00
Diego Prado Gesto
c0c66649b8 Merge branch '3.5' 2018-10-02 20:27:18 +02:00
Diego Prado Gesto
46e0a39c15 Merge branch 'Patola-3.5' into 3.5 2018-10-02 17:48:56 +02:00
Diego Prado Gesto
afccd38a5d Add preposition to be consistent with other strings. 
Contributes to CURA-5741.
 2018-10-02 17:48:25 +02:00
Diego Prado Gesto
04c72c0875 Merge branch '3.5' of git://github.com/Patola/Cura into Patola-3.5 2018-10-02 17:26:14 +02:00
Diego Prado Gesto
a99241d20b Add missing quote. 
Contributes to CURA-5741.
 2018-10-02 15:53:06 +02:00
Diego Prado Gesto
19b76d0c27 Merge branch '3.5' of github.com:Ultimaker/Cura into 3.5 2018-10-02 15:45:25 +02:00
Jaime van Kessel
13ab9ba384 Merge branch 'patch-1' of https://github.com/adecastilho/Cura 2018-10-02 13:15:48 +02:00
Jaime van Kessel
9970f0e752 Merge branch 'fix_polygon_connector_setting' of https://github.com/BagelOrb/Cura 2018-10-02 13:12:21 +02:00
Cláudio 'Patola' Sampaio
e457b2e67c Merge branch '3.5' of https://github.com/Ultimaker/Cura into 3.5 
Updated to push to upstream
 2018-10-02 07:01:39 -03:00
Cláudio 'Patola' Sampaio
6d17144766 Updated strings to Cura 3.5 2018-10-02 07:00:14 -03:00
Jaime van Kessel
13eaa14752 Set preference for sending info to default state instead of removing them 
CURA-5095
 2018-10-02 11:37:04 +02:00
alekseisasin
84c667265d
Merge pull request #4200 from BagelOrb/top_bottom_settings_enabled_function 
JSON fix: only enable skin settings when there is skin
 2018-10-02 11:21:15 +02:00
Jaime van Kessel
7ffcfa25e9 Merge branch 'CURA-5095_reset_slice_info_collection' of github.com:Ultimaker/Cura into 3.5 2018-10-02 11:17:39 +02:00
Mark
d39f6d061b
Merge pull request #4365 from smartavionics/mb-gyroid-infill 
Add gyroid infill pattern.
 2018-10-02 10:43:41 +02:00
Jaime van Kessel
18361b9434 Ensure that CuraAPI can be called in the same way as before 
This should prevent another API break.

CURA-5744
 2018-10-02 10:42:15 +02:00