GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-22 05:39:37 +08:00
Code Issues Packages Projects Releases Wiki Activity
36,308 Commits 287 Branches 260 Tags
Commit Graph

146 Commits

Author SHA1 Message Date
Lipu Fei
b14ef41056 Increase the minimumHeight of the workspace summary dialog 
CURA-4428
 2017-10-10 08:30:18 +02:00
Lipu Fei
8a25605413 Fix lock issue with workspace dialog 
CURA-4405

- Add try-except around lock release
- Fix closing the dialog with ESC
 2017-10-09 15:17:56 +02:00
Lipu Fei
185c350a19 Merge remote-tracking branch 'upstream/3.0' 2017-10-05 15:49:18 +02:00
Lipu Fei
8a27b2e97b Fix typo in WorkspaceDialog.qml 2017-10-05 15:48:38 +02:00
Ghostkeeper
d458fcde5c
Revert "Revert "Merge branch 'fix_garbled_fonts_macos' into 3.0"" 
This reverts commit e07e7bc9e714843cf853f0a255ee5a8432696886.

Contributes to issue CURA-4414.
 2017-10-05 10:58:49 +02:00
Ghostkeeper
e07e7bc9e7
Revert "Merge branch 'fix_garbled_fonts_macos' into 3.0" 
This reverts commit b62c19206f5e494fa27eb0b877197556c559e449, reversing
changes made to 104926c6ed1648ec20b4308fdacad4e99c14c8b3.

Contributes to issue CURA-4414.
 2017-10-05 10:28:54 +02:00
Mark
b4154b8cc0 Merge branch '3.0' 2017-09-28 13:01:10 +02:00
Mark
9a193ad5c5 Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
Ghostkeeper
68b4dfd3c3
Fix spelling mistake 
Contributes to issue CURA-4341.
 2017-09-27 17:29:30 +02:00
fieldOfView
7394a0c6ef Fix typo 2017-09-26 11:05:46 +02:00
fieldOfView
c5fd0e6c80 Use screenScaleFactor to consistently adapt sizes to display pixel ratio 2017-09-25 22:07:12 +02:00
fieldOfView
b5d7ec5bd2 Round fractional widths and heights in system-themed qml 2017-07-14 12:58:07 +02:00
Mark
7bc715a9bd fixed too big dialogs and hidden checkboxes 2017-05-31 12:46:07 +02:00
Jack Ha
1a01d1b193 Change permissions back to 644 2017-04-05 10:19:12 +02:00
Jack Ha
2d6df1ae4a Fix workspacedialog booboo typo. 2017-04-05 10:18:36 +02:00
fieldOfView
fd09a1959b Simplify margins and make them DPI aware 2017-04-02 15:54:06 +02:00
fieldOfView
ed8954c1db Replace font.pixelSize with DPI-aware font.pointSize 
This also uses the same pointSize as eg the PreferencesPage.qml uses
 2017-04-02 15:31:35 +02:00
fieldOfView
2e1dd46ea4 Replace hardcoded color with system-theme color 2017-04-02 14:38:11 +02:00
fieldOfView
d536bbd6b9 Fix Hi DPI issues with Workspace and Profile Changes dialogs 2017-04-02 12:38:41 +02:00
Jaime van Kessel
c25c4c1d77 Moved conflict boxes to be aligned with "headers" 
CURA-1263
 2016-12-19 13:04:55 +01:00
Ghostkeeper
76c2e87749
Fix more plural forms 
Forgot these ones.

Contributes to issue CURA-1263.
 2016-12-16 17:17:10 +01:00
Jaime van Kessel
c4e061be60 Changed margins on save & load workspace dialog 
CURA-1263
 2016-12-16 14:38:31 +01:00
Jaime van Kessel
fa3f473b61 Changed order of buttons 2016-12-16 11:35:08 +01:00
Jaime van Kessel
a7135a0f5f Added machine type to load menu 
CURA-1263
 2016-12-16 10:38:30 +01:00
Jaime van Kessel
2be773c9a3 Added num user settings to workspace loading 
CURA-1263
 2016-12-16 10:26:30 +01:00
Jack Ha
a9a9390aa6 Solved (with an ugly fix) that after loading some projects, 'Slicing...' appears without doing anything. CURA-1263 2016-12-14 16:52:49 +01:00
Jaime van Kessel
998f127499 Material resolve box is reset properly 
CURA-1263
 2016-12-14 10:18:05 +01:00
Jaime van Kessel
8f023524d2 Small textual changes for project handling 
CURA-1263
 2016-12-05 11:44:42 +01:00
Jaime van Kessel
56daf80f2f removed pixelRatioSize, as this made the screen look weird on osx 
CURA-1263
 2016-12-05 09:23:37 +01:00
Jaime van Kessel
a1acfe167c Fixed UI spacing if there is no material conflict in project load 
CURA-1263
 2016-12-02 15:31:55 +01:00
Jaime van Kessel
a0813b3af3 Added warning when trying to load project with objects on buildplate 
CURA-1263
 2016-12-02 15:30:21 +01:00
Jaime van Kessel
f782a76324 Material labels are now also displayed in the open project dialog 
CURA-1263
 2016-12-02 14:54:42 +01:00
Jaime van Kessel
c950288b86 Minor UI changes to projectDialog 
CURA-1263
 2016-12-02 13:41:39 +01:00
Jaime van Kessel
9a03e8640b Added spacers to workspace dialog 
CURA-1263
 2016-12-02 13:39:39 +01:00
Jaime van Kessel
3345e918e8 Conflict resolvement boxes are now invisible if there is nothing to resolve 
CURA-1263
 2016-12-02 13:37:56 +01:00
Jaime van Kessel
c236f7d266 Total number of settings is now calculated for open project dialog 
CURA-1263
 2016-12-02 13:31:31 +01:00
Jaime van Kessel
04d268b1fb Machine name is now also displayed in open project dialog 
CURA-1263
 2016-12-02 13:27:39 +01:00
Jaime van Kessel
b3f1f6b4db Project load dialog now also gives information about the quality & quality changes 
CURA-1263
 2016-12-02 13:01:01 +01:00
Jaime van Kessel
6bb1b7ec80 Number of settings & mode are now displayed in open Project 
CURA-1263
 2016-12-02 11:54:28 +01:00
Jaime van Kessel
5119ee9a93 Use correct descriptor for project open 
CURA-1263
 2016-12-02 11:13:21 +01:00
Jaime van Kessel
92a4fd7239 Materials are now also handled in conflict resolvement 
CURA-1263
 2016-11-17 11:16:15 +01:00
Jaime van Kessel
053f0ca031 Replaced hack for setting extruders with more robust setter 
CURA-1263
 2016-11-16 14:54:48 +01:00
Jaime van Kessel
b175e6876f Added material conflict option 
This is still desabled by default due to some architecture issues (so this is temporarily left as it is)

CURA-1263
 2016-11-16 14:45:34 +01:00
Jaime van Kessel
bbf5c73dae Quality_changes user option is now set correctly 
CURA-1263
 2016-11-15 15:11:32 +01:00
Jaime van Kessel
f0eb5e0da3 User can now select what strategy to use per conflict 
CURA-1263
 2016-11-15 15:10:10 +01:00
Jaime van Kessel
cbcc48ff33 Pre-read now checks for conflicts and asks the user what strategy for resolvement to use 
CURA-1263
 2016-11-11 17:17:23 +01:00