GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-31 02:25:57 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,706 Commits 294 Branches 267 Tags
Commit Graph

5311 Commits

Author SHA1 Message Date
Jaime van Kessel
6b55490af8 Fix final QML warnings 
CURA-5785
 2018-11-16 16:30:47 +01:00
Jaime van Kessel
bc5a2ce5b0 Make ViewSelector panel close upon selecting different view 
CURA-5785
 2018-11-16 16:16:15 +01:00
Marijn Deé
1000625d69 Added spaces around all = 2018-11-16 16:07:17 +01:00
Marijn Deé
0062250238 Moved the test to the plugin directory 2018-11-16 16:06:36 +01:00
Marijn Deé
695d45ffbe Initialize the models with None 2018-11-16 15:54:07 +01:00
Jaime van Kessel
320efa443e Merge branch 'CURA-5785-Restyle_stage_menu' of github.com:Ultimaker/Cura into CURA-5785-Restyle_stage_menu 2018-11-16 14:58:47 +01:00
Jaime van Kessel
3fd1cc0e8c Ensure that the added labels are also themable 
CURA-5785
 2018-11-16 14:58:11 +01:00
Marijn Deé
e9e8c49b2d Added tests for SendMaterialJob and refactored SendMaterialJob for 
better testability. This is part of a larger project to create tests
for the UM3NetworkPrinting plugin in preparation for printing from the
cloud
 2018-11-16 14:16:45 +01:00
Ghostkeeper
e087db7c2e
Code style and fixes to comments 
Contributes to issue CURA-5785.
 2018-11-16 14:11:22 +01:00
Ghostkeeper
81b6f3ab11
Update unclear qml ID's 
CURA-5785

Co-Authored-By: nallath <nallath@gmail.com>
 2018-11-16 14:03:39 +01:00
Ghostkeeper
de020b4c75
Remove commented out code 
Co-Authored-By: nallath <nallath@gmail.com>
 2018-11-16 14:02:00 +01:00
Ghostkeeper
e3dd5f1c39
Add documentation about qml z fix 
Co-Authored-By: nallath <nallath@gmail.com>
 2018-11-16 13:59:51 +01:00
Ghostkeeper
bee563f01b
Merge branch 'ui_rework_4_0' into CURA-5785-Restyle_stage_menu 2018-11-16 13:02:24 +01:00
Ghostkeeper
d732a2f953
Merge branch 'master' into ui_rework_4_0 2018-11-15 15:55:08 +01:00
Ghostkeeper
e9216936d7
Compare SDK version as Version instances 
This allows it to compare versions that are remote as integer and local as string, or vice-versa. Much more robust.

Contributes to issue CURA-5940.
 2018-11-15 15:20:21 +01:00
Ghostkeeper
78e6494430
Read SDK version from new semver field 
The sdk_version field should stay the ordinary plain number (the major version number of the semver field) so that older Cura versions don't break. Newly built packages will get built with both sdk_version_semver and the normal sdk_version, so that the packages can be read with any Cura version from 3.6 onwards.

Contributes to issue CURA-5940.
 2018-11-15 15:13:36 +01:00
Ghostkeeper
163f102dda
Make extension menu items translatable 
If these extension plug-ins don't set their menu names, the plug-in name is used as the menu name. The plug-in names are not translated, so this appears as an untranslated string then.
 2018-11-15 09:38:14 +01:00
Jaime van Kessel
20b7a925a0 Remove unused code & outdated todo comment 
CURA-5785
 2018-11-14 16:49:01 +01:00
Jaime van Kessel
9aa5b6fe3f Hide one spacer if there is no viewPanel 
CURA-5785
 2018-11-14 16:47:53 +01:00
Jaime van Kessel
c27f51d944 Make the view selector also use the expandableComponent 
CURA-5785
 2018-11-14 16:44:36 +01:00
Ghostkeeper
8ec7d6dba3
Fix type issues in old version upgrade plug-ins 
The one actual change was this: To give a KeyError when stuff can't be found in a dictionary, rather than returning None there and then getting a TypeError later.

Contributes to issue CURA-5936.
 2018-11-14 13:56:46 +01:00
Jaime van Kessel
b589920f53 Move a few hardcoded sizes to the theme 
CURA-5785
 2018-11-14 13:55:39 +01:00
Ghostkeeper
b67d8d4103
Fix type of fallback variable 
These have to be strings because the configparser getter can only return strings.

Contributes to issue CURA-5936.
 2018-11-14 13:46:13 +01:00
Ghostkeeper
ae2b312472
Add typing for all version upgrade plug-ins 
Hopefully we'll take this typing along when we next copy-paste the stuffs.

Contributes to issue CURA-5936.
 2018-11-14 13:41:23 +01:00
alekseisasin
103d79c89d
Merge pull request #4781 from Ultimaker/fix_legacy_profile_importer 
Fix legacy profile importer
 2018-11-14 13:00:39 +01:00
Jaime van Kessel
fcfe95c7d0 Move OpenFile button to be instantiated left so it's tooltip doesn't get messed up 
CURA-5785
 2018-11-14 12:57:57 +01:00
Jaime van Kessel
fb72f9a059 Fixed size of expandableItem not being the correct width 
CURA-5785
 2018-11-14 09:59:56 +01:00
Jaime van Kessel
1569fd7396 Merge branch 'ui_rework_4_0' of github.com:Ultimaker/Cura into CURA-5785-Restyle_stage_menu 2018-11-14 09:34:08 +01:00
Jaime van Kessel
12c2962414 Update the look & feel of openButton to the new design 
CURA-5785
 2018-11-13 16:59:02 +01:00
Jaime van Kessel
a9fdd455eb Add seperator lines for the stageMenu's 
CURA-5785
 2018-11-13 16:47:39 +01:00
Jaime van Kessel
551bc2fbd4 Removed line around the headerbar 
I was checking an old design, the new one doesn't have a line around it

CURA-5785
 2018-11-13 16:40:51 +01:00
Jaime van Kessel
b83175a380 Add rounded corners to stage menus 
CURA-5785
 2018-11-13 16:32:24 +01:00
Ghostkeeper
266e08fdff
Merge branch 'master' into ui_rework_4_0 
Conflicts:
	plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml - The compatibility chart being added in 3.6 which was kind of hacky.
	resources/qml/SidebarHeader.qml - Removed in UI rework, edited on master.
 2018-11-13 16:23:36 +01:00
Jaime van Kessel
20e2f317de Add background to viewModeSelection 
CURA-5785
 2018-11-13 16:02:45 +01:00
Jaime van Kessel
785c2661a2 Make SimulationViewMenuComponent also use the ExpandableComponent 
CURA-5785
 2018-11-13 15:57:00 +01:00
Jaime van Kessel
deb5fd1926 Fix PrintSetupSelector for previewStage 
CURA-5785
 2018-11-13 15:35:05 +01:00
Remco Burema
5f4e3948d3 Merge branch 'master' into CURA-5840-make-plugin-sdk-use-semantic-versioning 2018-11-13 13:16:22 +01:00
Ghostkeeper
87cbc3907c
Convert to string before storing in configparser 
Because configparser can only handle strings.

Contributes to issue CURA-5929.
 2018-11-13 12:05:14 +01:00
Ghostkeeper
7bd55f5064
Add test for read() function 
This is complex.
I don't want to get into the actual translations from the DoD here.

Contributes to issue CURA-5929.
 2018-11-12 16:28:29 +01:00
Jaime van Kessel
4c1a45f904 Added sizes to the stage menu 
This isn't themed, but right now it does adhere to the sizes I got from UX

CURA-5785
 2018-11-12 15:53:09 +01:00
Ghostkeeper
bfe5ae6f9c
Merge branch '3.6' 2018-11-12 15:48:22 +01:00
Jaime van Kessel
f14687a749 Merge branch 'ui_rework_4_0' of github.com:Ultimaker/Cura into CURA-5785-Restyle_stage_menu 2018-11-12 14:32:06 +01:00
Ghostkeeper
7e87a303cb
Remove config_section parameter 
Just always take 'profile'. We don't need to test with anything else. Just adjust the data to it.

Contributes to issue CURA-5929.
 2018-11-12 13:49:13 +01:00
Ghostkeeper
e18ea4bca4
Expect a NoSectionError if testing with a section that is missing 
We want to get that error in order to debug.

Contributes to issue CURA-5929.
 2018-11-12 13:47:24 +01:00
Ghostkeeper
53c9cdc3fe
Add alternative scenarios for prepareLocals 
Contributes to issue CURA-5929.
 2018-11-12 13:42:14 +01:00
Ghostkeeper
91e8c177fe
Add test for prepareLocal 
Contributes to issue CURA-5929.
 2018-11-12 13:35:18 +01:00
Ghostkeeper
0bf7bf4cbe
Fix handling dictionaries without 'defaults' section 
According to the test, this should return an empty dict then.

Contributes to issue CURA-5929.
 2018-11-12 13:33:44 +01:00
Ghostkeeper
bbbb08c793
Add test for prepareDefaults 
Contributes to issue CURA-5929.
 2018-11-12 13:02:28 +01:00
Ghostkeeper
27aff4e5da
Fix typing issues 
Because this function now has typing, it's raising a load of issues with it.

Contributes to issue CURA-5929.
 2018-11-12 12:48:49 +01:00
Ghostkeeper
6022ed0f23
Update target version in DoD 
There are no changes to these settings, luckily.
This target version is now only here for documentation (like source_version was). It is no longer actually used by the code.

Contributes to issue CURA-5929.
 2018-11-12 12:06:00 +01:00