GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-20 17:49:14 +08:00
Code Issues Packages Projects Releases Wiki Activity
16,707 Commits 291 Branches 260 Tags
Commit Graph

2979 Commits

Author SHA1 Message Date
Jaime van Kessel
9ab0fdfb68 Move most of the sidebarHeader items to materialAndVariantSelector 
CURA-5772
 2018-10-11 15:05:40 +02:00
Jaime van Kessel
a861b88de1 Move most of the sidebarHeader items to materialAndVariantSelector 
CURA-5772
 2018-10-11 15:03:37 +02:00
Jaime van Kessel
f18d490ca1 Move extruderIcon to it's own location 
This also simplifies the qml that actually handles the display

CURA-5772
 2018-10-11 13:08:57 +02:00
Jaime van Kessel
cc6d5617ee Update documentation & typing 
CURA-5772
 2018-10-11 10:41:29 +02:00
Jaime van Kessel
4743bd8bd5 Merge branch 'cura4.0_header' of github.com:Ultimaker/Cura into cura4.0_header 2018-10-11 10:30:51 +02:00
Jaime van Kessel
85436c1469 Move machine selector to own component & new location 
This also simplifies & cleans up the actually used QML

CURA-5772
 2018-10-11 10:29:59 +02:00
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
Ghostkeeper
b37252f124
Minor code style fixes 
Contributes to issue CURA-5734.
 2018-10-10 14:18:37 +02:00
Jaime van Kessel
b3fc76092d Removed unused EngineLog 2018-10-10 14:01:34 +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
Jaime van Kessel
d1a51b26f7 Simplified QML expression 2018-10-08 17:22:04 +02:00
Jaime van Kessel
5f6b267c77 Merge branch 'fix_credits' of https://github.com/fieldOfView/Cura 2018-10-08 17:07:05 +02:00
Jaime van Kessel
d98eafe041 Merge branch '3.5' of github.com:Ultimaker/Cura 2018-10-08 17:03:25 +02:00
Ghostkeeper
314b966cc9
Improvements to translated strings 
These strings were recently found to have been confusing to the translators. Improvements are:
- Pulling the (untranslated) error message out of the message sentence. We really want the error message to be at the end so we'll force the translators to translate it as a prefix.
- Remove extra spaces at the end.
- Remove Python logic from within the i18nc call, since gettext doesn't understand that.

Contributes to issue CURA-5741.
 2018-10-08 15:03:21 +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
fieldOfView
4e083c7c29 Fix QML typo 2018-10-05 21:51:08 +02:00
fieldOfView
2fb7d8a253 Make the Add Printer dialog less spartan 2018-10-05 21:41:35 +02:00
fieldOfView
94164c5865 Add Charon, Shapely, Trimesh and NetworkX to credits 2018-10-05 15:29:52 +02:00
Diego Prado Gesto
6abd43f690 Add Polish to the list of available languages. Forgotten by mistake. 2018-10-04 17:37:28 +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
51e7b6c388 Change font style for active material in preferences 
CURA-5747
 2018-10-03 10:30:48 +02:00
Jaime van Kessel
fc9f05fc8b Moved SettingVisibilityPreset loading to it's own class 
Since there was so much debate regarding the unit testing of the visiblity presets, i had another look at it.
The old version was almost untestable because all functionalities were mushed together into a single class.

CURA-5734
 2018-10-01 11:32:55 +02:00
Aleksei S
98c3f497d8 Merge branch 'master' of github.com:Ultimaker/Cura 2018-10-01 11:32:39 +02:00
Aleksei S
3f8b7fb6af Fix: Switches to 'Prepare' always go through 'Recomended' mode 
CURA-5731
 2018-10-01 11:30:21 +02:00
Diego Prado Gesto
046fca5d0f Align the "Enable Gradual" text with the corresponding checkbox. 2018-10-01 10:46:45 +02:00
fieldOfView
53b481ff5d Reduce the maximum precision of floats in SettingTextField inputs 
No settings in Cura require more than 3 digits of precision. Many settings are in mm, and CuraEngine does its calculations in while microns. Having more precision in the frontend than in the backend apparently thoroughly confuses some people. Fixes #4368
 2018-09-29 08:16:11 +02:00
Jaime van Kessel
c2f0a33b42
Merge branch 'master' into full_screen_test 2018-09-28 11:24:22 +02:00
ChrisTerBeke
185a1707b2 Merge branch 'master' into CURA-5744-move-oauth-login 2018-09-27 09:40:44 +02:00
Diego Prado Gesto
987ae73078 Remove call to undefined function. 2018-09-25 13:15:26 +02:00
Lipu Fei
51f2386db1 Merge remote-tracking branch 'origin/3.5' 2018-09-25 11:56:12 +02:00
Lipu Fei
8837ffc06d Fix mateial management QML reference 
CURA-5682
 2018-09-25 11:52:53 +02:00
Diego Prado Gesto
e31f35ec95 Merge branch '3.5' 2018-09-25 09:36:08 +02:00
Aleksei S
b44fb7ca24 Select correct material according to the active extruder 
CURA-5682
 2018-09-21 17:35:46 +02:00
Jaime van Kessel
081b2a28fe Expose Account API to QML 
This is done by adding the API as an SingletonType to Cura.

CURA-5744
 2018-09-21 17:23:30 +02:00
Aleksei S
86d8f8517d In material page was not defined the used extruder nr, for generic materials 
CURA-5682
 2018-09-21 13:48:46 +02:00
Jaime van Kessel
054a49c63d Fix issue with inheritance manager button 
Removed one of the special detection cases, since it incorrectly removed a value from a stored profile

CURA=5646
 2018-09-21 09:33:25 +02:00
Jaime van Kessel
2dbaa304a0 Set textFormat for the setting items to PlainText 
Based on the Qt guide on making qml run much faster, it seems that the default of textFormatting (auto)
is quite expensive. As we make a *lot* of settingItems, which we don't want to format, it's better to set it to plain.
I haven't checked how much faster it actually is, but i didn't see visual changes, so it's at least a safe step.
 2018-09-20 15:22:35 +02:00
Ghostkeeper
f6b56a6506
Merge branch '3.5' 2018-09-19 17:16:14 +02:00
Ghostkeeper
ac4ee8c428
Fix context of pause, resume and abort labels 
More in line with what we have in the rest of our code base.

Discovered during work on CL-1053 and CURA-5729.
 2018-09-18 11:25:35 +02:00
Lipu Fei
6929d96119 Merge remote-tracking branch 'origin/3.5' 2018-09-17 16:14:49 +02:00
Ghostkeeper
c6fa9474d6
Merge branch '3.5' 2018-09-17 14:41:45 +02:00