GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-23 21:19:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
12,148 Commits 290 Branches 265 Tags
Commit Graph

2161 Commits

Author SHA1 Message Date
Lipu Fei
1e5b032cff Make canvas use a one-time Timer to update 
CURA-4182

The canvas approach has a drawback on the UI update: when a printcore
or a material is changed, calling requestPaint() to the canvas doesn't
trigger an immediate update. The solution is to have a built-in Timer in
the Canvas and to use that to update. Somehow this just works. The
problem with this approach is that the Timer constantly updates the
canvas which eats a lot of CPU power. To solve this, I changed the timer
to be a one-time timer and it will be started when there is a
material/print core update.
 2017-09-14 15:59:12 +02:00
ChrisTerBeke
46cd712367 back to rectangle 2017-09-14 13:37:20 +02:00
ChrisTerBeke
f57fc6bb72 Merge branch 'master' into fix_dark_theme 2017-09-14 13:26:11 +02:00
Mark
159c79ab4b Tweaked the margins to align better 
CURA-4182
 2017-09-14 13:17:35 +02:00
Lipu Fei
d14ac9e258 Fix text overlapping problem for adhesion in recommended mode 
CURA-4322
 2017-09-14 12:08:27 +02:00
ChrisTerBeke
e7ad4b7f17 Merge branch 'master' into feature_slider_for_quality 2017-09-14 10:34:34 +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
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
53d2b8ea97 Remove solid white background behind simple mode controls 2017-09-13 16:15:24 +02:00
Mark
766bc9ae97 Changed bold fonts to normal 
CURA-4148
 2017-09-12 14:37:29 +02:00
ChrisTerBeke
3a098f4b4c CURA-4319 material compatibility link style 2017-09-12 13:24:33 +02:00
ChrisTerBeke
073c2d3335 style and code improvements for combobox with color swatch 2017-09-12 12:11:23 +02:00
ChrisTerBeke
9e62c4db15 CURA-4318 remove active printer hover underline, theme inheritance, theme names 2017-09-12 11:39:48 +02:00
alekseisasin
637b536536 Merge pull request #2342 from hroncok/localefix 
Relocate locales to proper locations
 2017-09-11 17:23:12 +02:00
ChrisTerBeke
485b71c010 top bar improvements 2017-09-11 15:08:06 +02:00
ChrisTerBeke
7efe3a3b9e Merge branch 'master' into feature_top_right_layer_view 2017-09-11 11:50:18 +02:00
Lipu Fei
a041d005fa Merge pull request #2335 from fieldOfView/fix_simple_mode_disabled_features 
Hide adhesion & support options if they are disabled
 2017-09-11 11:43:48 +02:00
Lipu Fei
b2eead7736 Resolve merge conflicts from master 
CURA-4212
 2017-09-11 10:32:34 +02:00
Ruben D
08d0d90389
Change Pirate language to en_7S 
Since it's English from the seven seas.

Contributes to issue CURA-4263.
 2017-09-10 14:01:07 +02:00
Ruben D
48778a2801
Update language codes 
The folders were renamed, so they should get renamed here as well.

Contributes to issue CURA-4263.
 2017-09-10 14:00:57 +02:00
Miro Hrončok
e394811ce1
Relocate locales to proper locations 
Fixes https://github.com/Ultimaker/Uranium/issues/246
Fixes https://github.com/Ultimaker/Uranium/issues/277
 2017-09-10 14:00:05 +02:00
Mark
41ab160e62 Merge branch 'master' of github.com:Ultimaker/Cura 2017-09-08 16:35:17 +02:00
Mark
3b12e39ba8 Selected state font is not bold anymore for custom and recommended 
CURA-4148
 2017-09-08 16:35:08 +02:00
Diego Prado Gesto
b3a01d5fcc Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-09-08 16:22:53 +02:00
Diego Prado Gesto
c3d6023418 Fixed an issue that doesn't generate the jobname again once the user removes the models. - CURA-4276 2017-09-08 16:22:45 +02:00
Mark
db77a4690c Made the selected borders a little thicker 
CURA-4148
 2017-09-08 15:18:40 +02:00
fieldOfView
0896899179 Merge branch 'master' into fix_simple_mode_disabled_features 2017-09-08 14:24:05 +02:00
Mark
748c72760b Typo 2017-09-08 13:53:21 +02:00
Mark
c8b199c8f7 Merge pull request #2393 from Ultimaker/feature_change_icons_margins 
CURA-4148: Change icons and margins
 2017-09-08 13:50:16 +02:00
Mark
a50e228ba1 Fix onHover border for extruder buttons 
CURA-4148
 2017-09-08 11:56:37 +02:00
Lipu Fei
c59bd6cc09 Change LayView Mode button to a dropdown 
CURA-4212
 2017-09-07 16:24:49 +02:00
Lipu Fei
dd62367937 Move View mode button and LayerView panel to top right 
CURA-4212
 2017-09-07 16:24:43 +02:00
Lipu Fei
b0916e4b67 Fix job name mismatching 
CURA-4276
 2017-09-06 18:09:19 +02:00
Lipu Fei
24e5c72e47 Update colour for light theme 
CURA-4148
 2017-09-06 16:04:31 +02:00
Lipu Fei
e18528d2ca Fix position of the material compatibility warning 
CURA-4148
 2017-09-06 15:49:54 +02:00
Lipu Fei
d561af63e0 Merge branch 'master' into feature_move_logo_icons 2017-09-06 15:36:22 +02:00
Mark
34f8db5450 Changed some margins to improve alignment 
CURA-4211
 2017-09-06 14:52:16 +02:00
Lipu Fei
e163cc0d84 Remove "Extruder Configuration" text 
CURA-4211
 2017-09-06 12:43:42 +02:00
Lipu Fei
fc7207e77e Remove "Sync" button 
CURA-4211
 2017-09-06 12:17:40 +02:00
Lipu Fei
e15a96263d Update extruder button styles 
CURA-4211
 2017-09-06 12:00:53 +02:00
Lipu Fei
60c7d2f22e Update topbar 
CURA-4213
 2017-09-05 18:05:30 +02:00
Lipu Fei
63e75ec6b7 Merge branch 'master' 
CURA-4213
 2017-09-05 12:42:23 +02:00
Lipu Fei
4b08a5611a Make topbar transparent and update text style 
CURA-4213
 2017-09-05 11:37:05 +02:00
Lipu Fei
3f6f4a1291 Fix merge conflict for topbar monitor button 
CURA-4106
 2017-09-05 11:12:49 +02:00
Lipu Fei
3e3f15d33f Larger gap between the logo and topbar buttons 
CURA-4213
 2017-09-05 11:12:47 +02:00
Jaime van Kessel
bcd8e2ca67 Merge branch 'feature_extruder_buttons' of github.com:Ultimaker/Cura 2017-09-05 09:57:14 +02:00
Lipu Fei
77adfe345d Fix merge conflicts from master 
CURA-4213
 2017-09-05 08:41:44 +02:00