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
ChrisTerBeke
eb39d857e9 CURA-4341 add documentation for Qt checkbox binding workaround 2017-09-22 15:00:55 +02:00
ChrisTerBeke
07610ea6bb Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0 2017-09-22 14:58:42 +02:00
ChrisTerBeke
0d6c366fa4 CURA-4341 remove debug logging 2017-09-22 14:58:08 +02:00
alekseisasin
07beae0c48 Merge branch '3.0' of github.com:Ultimaker/cura into 3.0 2017-09-22 14:47:34 +02:00
Diego Prado Gesto
cf94c8d37d Working on fixing several issues with profiles - CURA-4327 2017-09-22 14:47:20 +02:00
alekseisasin
ea65457920 After first start (no machine added) the controls on right side are invisible 
CURA-4357
 2017-09-22 14:45:23 +02:00
ChrisTerBeke
bbff49664f Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0 2017-09-22 14:31:24 +02:00
ChrisTerBeke
14429d81cc CURA-4313 fix re-binding checkboxes after manually clicking them 2017-09-22 14:31:19 +02:00
alekseisasin
e1f8676cac Removed tooltip translation in SidebarSimple 
CURA-4182
 2017-09-22 14:02:13 +02:00
alekseisasin
4c3f146995 Merge branch '3.0' of github.com:Ultimaker/cura into 3.0 2017-09-22 13:51:15 +02:00
alekseisasin
9a0926b009 Check undefined text 
CURA-4182
 2017-09-22 13:50:31 +02:00
ChrisTerBeke
07161f5d50 CURA-4341 use existing signals instead to update topbar monitoring 2017-09-22 13:40:55 +02:00
ChrisTerBeke
ce390b50e7 Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0 2017-09-22 13:21:46 +02:00
ChrisTerBeke
358077c726 Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0 2017-09-22 13:12:21 +02:00
ChrisTerBeke
b748bf2011 CURA-4341 add bi-directional signal to update topbar when monitoring 2017-09-22 13:11:57 +02:00
Ghostkeeper
0b166defd3
Merge branch 'master' of github.com:Ultimaker/Cura 2017-09-22 12:58:57 +02:00
Ghostkeeper
2020e355a2
Merge branch '3.0' of github.com:Ultimaker/Cura into 3.0 
Contributes to issue CURA-4357.
 2017-09-22 12:58:20 +02:00
Ghostkeeper
bf6c6891c4
Don't display layer height before a printer is added 
Contributes to issue CURA-4357, somewhat.
 2017-09-22 12:52:22 +02:00
alekseisasin
191854adef Added tooltip text for the infill icons 
CURA-4303
 2017-09-22 12:52:03 +02:00
Ghostkeeper
0183616b8f
Only switch profiles with slider if there is an added machine 
Otherwise we crash and burn.

Contributes to issue CURA-4357.
 2017-09-22 12:48:05 +02:00
ChrisTerBeke
0fa3bdd68b CURA-4182 text color for unavailable quality to disabled 2017-09-22 11:57:05 +02:00
ChrisTerBeke
fe5910dd96 CURA-4182 final tweaks to quality slider color and position 2017-09-22 11:54:59 +02:00
ChrisTerBeke
781f2d56c8 CURA-4182 code improvements for slider property calcs 2 2017-09-22 11:31:24 +02:00
ChrisTerBeke
f016e5346a CURA-4182 code improvements for slider property calcs 2017-09-22 11:29:18 +02:00
ChrisTerBeke
ae6b1a9f15 CURA-4182 better variable names 2017-09-22 11:14:13 +02:00
ChrisTerBeke
7f909df84a CURA-4182 refactor quality slider to use model for updating 2017-09-22 11:04:46 +02:00
Aleksei Sasin
879b3df816 On Windows platform the qualitys slider is properly aligned CURA-4182 2017-09-21 21:20:54 +02:00
ChrisTerBeke
ecafa24888 code cleanup 2017-09-21 17:35:12 +02:00
ChrisTerBeke
a74a6a59fc CURA-4182 fix merge conflicts with 3.0 branch 2017-09-21 15:33:00 +02:00
alekseisasin
bd6bb872b7 Changed Quality slider 
CURA-4182
 2017-09-21 15:24:40 +02:00
Jaime van Kessel
c6e589e7d9 Merge branch '3.0' of github.com:Ultimaker/Cura into 3.0 2017-09-21 15:19:35 +02:00
Jaime van Kessel
78987ba666 When tool icon can not be found in theme, try to find it in the plugin folder 
CURA-4345
 2017-09-21 15:19:00 +02:00
ChrisTerBeke
cdc1b9ba66 CURA-4303 infill slider icon color, border, alignment 2017-09-21 14:28:22 +02:00
Jaime van Kessel
3cdf3f6097 Merge branch '3.0' of github.com:Ultimaker/Cura 2017-09-20 10:43:06 +02:00
Jaime van Kessel
5d4b23e72a Merge branch 'feature_home_camera' of https://github.com/fieldOfView/Cura 2017-09-19 16:47:40 +02:00
Mark
03a159e423 Add some margin for the helper boxes, not perfect yet 
CURA-4303
 2017-09-19 11:36:05 +02:00
Mark
db072eae8e Add some margin for the helper boxes, not perfect yet 
CURA-4303
 2017-09-19 10:11:41 +02:00
ChrisTerBeke
3be1b8ddf9 CURA-4303 fixes after comments on 1st commit 2017-09-18 17:39:14 +02:00
ChrisTerBeke
9553235b42 CURA-4303 finish infill slider, images, gradual checkbox, bindings 2017-09-18 15:15:59 +02:00
ChrisTerBeke
e8df185261 Merge branch 'master' into WIP_feature_infill_slider 2017-09-18 11:02:30 +02:00
ChrisTerBeke
86e5a1ed97 CURA-4182 tweak slider height to fix text cut off 2017-09-18 09:39:08 +02:00
fieldOfView
3f903d2c76 Add menu item to reset the camera 2017-09-16 10:05:45 +02:00
Mark
1f3fa49ceb Merge branch 'master' of github.com:Ultimaker/Cura 2017-09-15 16:48:58 +02:00
Mark
854c915502 Tweaked margins and cleanup 
CURA-4182
 2017-09-15 16:48:49 +02:00
alekseisasin
37869a8b14 Removed unused code. Shifted the last print quality number a bit to the left 
CURA-4182
 2017-09-15 16:36:00 +02:00
Diego Prado Gesto
0e1b9d8c5d Changed the way in which print times are shown in Sidebar - CURA-4232 2017-09-15 10:46:01 +02:00
alekseisasin
aa0ade2e74 Merge branch 'master' of github.com:Ultimaker/cura 2017-09-14 18:05:28 +02:00
alekseisasin
98ab571483 Removed 14bitVoid code accord to a new LGPL license 
CURA-4232
 2017-09-14 18:03:31 +02:00
ChrisTerBeke
a4ebedee83 CURA-4321 make print button blue when available, slight color changes on hover and pressed 2017-09-14 17:40:44 +02:00
Lipu Fei
3188156da3 WIP: infill slider 
CURA-4303
 2017-09-14 17:19:43 +02:00