ChrisTerBeke
|
acb709e804
|
Fix merge conflicts with #2422
|
2017-09-14 13:27:32 +02:00 |
|
ChrisTerBeke
|
931232ed4d
|
Merge branch 'new_firmware_notification'
|
2017-09-14 13:14:32 +02:00 |
|
ChrisTerBeke
|
648828e49e
|
Merge branch 'new_firmware_notification' of https://github.com/Ultimaker/Cura into new_firmware_notification
|
2017-09-14 13:11:31 +02:00 |
|
ChrisTerBeke
|
17986aa4ad
|
CURA-4318 add border to toolbar buttons in dark theme, outline fix for unknown printer status icon in dark theme
|
2017-09-14 13:04:29 +02:00 |
|
Lipu Fei
|
3812a478cf
|
Only use lowercase for string comparison
CURA-4224
|
2017-09-14 12:50:55 +02:00 |
|
Lipu Fei
|
ccebadee10
|
Merge branch 'master'
|
2017-09-14 12:48:07 +02:00 |
|
ChrisTerBeke
|
af6e2dcb97
|
Merge branch 'master' of https://github.com/Ultimaker/Cura
|
2017-09-14 12:43:18 +02:00 |
|
ChrisTerBeke
|
3073fcf6f7
|
CURA-4318 add white icon for unknown printer status in dark theme
|
2017-09-14 12:43:07 +02:00 |
|
Ghostkeeper
|
4e915bc6b5
|
Merge branch 'fractal_3d_infill_alternate'
Contributes to issue CURA-4095.
|
2017-09-14 12:34:31 +02:00 |
|
Lipu Fei
|
d14ac9e258
|
Fix text overlapping problem for adhesion in recommended mode
CURA-4322
|
2017-09-14 12:08:27 +02:00 |
|
Lipu Fei
|
9683dcae72
|
Remose useless code
CURA-4215
|
2017-09-14 11:44:09 +02:00 |
|
Lipu Fei
|
7144720d78
|
Redesign splash window
CURA-4215
- Rectangle splash window
- Fix for splash window crash
- Enable antialias
- Fix for longer loading text in some languages
|
2017-09-14 11:36:27 +02:00 |
|
ChrisTerBeke
|
c2a3f5509b
|
Merge branch 'master' into new_firmware_notification
|
2017-09-14 11:13:57 +02:00 |
|
ChrisTerBeke
|
6f512e9f97
|
Merge pull request #2423 from Ultimaker/feature_slider_for_quality
CURA-4182 Slider for quality profile
|
2017-09-14 11:09:38 +02:00 |
|
ChrisTerBeke
|
96c1e7ea8b
|
CURA-4182 dark design fixes for quality slider
|
2017-09-14 10:58:22 +02:00 |
|
ChrisTerBeke
|
e7ad4b7f17
|
Merge branch 'master' into feature_slider_for_quality
|
2017-09-14 10:34:34 +02:00 |
|
ChrisTerBeke
|
9ec1d5d54a
|
Add CuraEngine.exe to git ignore
|
2017-09-14 10:21:30 +02:00 |
|
ChrisTerBeke
|
c5c6ed8b2b
|
CURA-4318 fix colors and layouts for dark design
|
2017-09-14 09:59:13 +02:00 |
|
Lipu Fei
|
5df5dfec02
|
Auto-adjust mode tab position based on text length
CURA-4322
|
2017-09-14 08:50:25 +02:00 |
|
Lipu Fei
|
a48507546f
|
More defensive machine name and version check
CURA-4224
|
2017-09-14 08:34:01 +02:00 |
|
Lipu Fei
|
9567a6921d
|
Fix code style
CURA-4224
|
2017-09-14 08:29:46 +02:00 |
|
Lipu Fei
|
be57ccb127
|
Minor fixes
CURA-4224
- Fix code style
- Fix typos
|
2017-09-13 17:44:53 +02:00 |
|
Lipu Fei
|
2e1c6abe0e
|
Merge branch 'master'
|
2017-09-13 17:25:47 +02:00 |
|
Lipu Fei
|
3d6648fc59
|
Rearrange quality profile slider and dropdown box
CURA-4182
- Remove the quality profile dropdown box from Recommended mode
- Move the quality profile dropdown box to Custom mode
|
2017-09-13 17:12:51 +02:00 |
|
Lipu Fei
|
d82a1daacf
|
Add new quality/resolution slider
CURA-4182
|
2017-09-13 16:53:04 +02:00 |
|
Lipu Fei
|
84ad9c6ad1
|
Add "available" flag for quality profiles
CURA-4182
Add "available" flag for quality profile model so the slider can use it
to show available and unavailable profiles.
|
2017-09-13 16:40:59 +02:00 |
|
fieldOfView
|
764514bb90
|
Subdue volume outline
|
2017-09-13 16:15:38 +02:00 |
|
fieldOfView
|
53d2b8ea97
|
Remove solid white background behind simple mode controls
|
2017-09-13 16:15:24 +02:00 |
|
fieldOfView
|
eed96473b1
|
Brighten z axis for readability on dark colors
|
2017-09-13 16:07:50 +02:00 |
|
fieldOfView
|
f2dbde0fe1
|
Fix readability of top bar buttons
|
2017-09-13 16:04:06 +02:00 |
|
fieldOfView
|
72b85fe69a
|
Fix control hover/activefocus indication
|
2017-09-13 15:58:39 +02:00 |
|
fieldOfView
|
b0c7ade930
|
Fix logo readability
|
2017-09-13 15:50:30 +02:00 |
|
fieldOfView
|
a29bdf1ebc
|
Move status icon to correct folder
|
2017-09-13 15:47:38 +02:00 |
|
fieldOfView
|
7b32ba7a9b
|
Subdue buildplate colors
|
2017-09-13 15:45:48 +02:00 |
|
fieldOfView
|
f20f214379
|
Fix status unknown color and background
|
2017-09-13 15:39:36 +02:00 |
|
Mark
|
4ed5796e6f
|
Small improvement on startupscreen
CURA-4215
|
2017-09-13 14:44:56 +02:00 |
|
alekseisasin
|
d0997f7f7e
|
Merge branch 'master' of github.com:Ultimaker/cura
|
2017-09-13 13:58:39 +02:00 |
|
alekseisasin
|
204019702d
|
Added Title for messages
CURA-4203
|
2017-09-13 13:58:08 +02:00 |
|
Diego Prado Gesto
|
fd1c76ac80
|
Merged branch - CURA-4270
|
2017-09-13 13:25:00 +02:00 |
|
Diego Prado Gesto
|
aa2c7c2ff6
|
Checking first if the user has enabled the 'check for updates' preference - CURA-4224
|
2017-09-13 10:22:07 +02:00 |
|
Tim Kuipers
|
15790b3965
|
feat: cross 3d experimental algorithm parameters
|
2017-09-12 20:02:58 +02:00 |
|
Tim Kuipers
|
37ec3bbb26
|
cross pattern for support
|
2017-09-12 18:19:59 +02:00 |
|
Diego Prado Gesto
|
80992dd44c
|
The checker now runs also when the user adds a new printer - CURA-4224
|
2017-09-12 17:22:17 +02:00 |
|
Lipu Fei
|
1fdf103678
|
Merge pull request #2388 from Velleman/master
Added vertex delta k8800
|
2017-09-12 16:24:25 +02:00 |
|
alekseisasin
|
6a9c7539c4
|
Merge branch 'feature_new_splash_window'
CURA-4215
|
2017-09-12 16:06:22 +02:00 |
|
Lipu Fei
|
a28264acae
|
Adjust text positions and sizes
CURA-4215
|
2017-09-12 16:01:57 +02:00 |
|
alekseisasin
|
48cda42ece
|
Adjusted scale factor
CURA-4215
|
2017-09-12 15:49:00 +02:00 |
|
ChrisTerBeke
|
9564b4753e
|
Merge branch 'master' of https://github.com/Ultimaker/Cura
|
2017-09-12 15:41:43 +02:00 |
|
ChrisTerBeke
|
fa72c47866
|
CURA-4203 update margins
|
2017-09-12 15:41:20 +02:00 |
|
Brecht Nuyttens
|
f054f0fafb
|
Fixed minor stuff
|
2017-09-12 15:37:49 +02:00 |
|