3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 22:54:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
18976 commits 306 branches 272 tags 787 MiB
Commit graph

3715 commits

Author SHA1 Message Date
Lipu Fei
4e5d08f320 Fix merge conflicts with master 2019-03-21 14:59:53 +01:00
Diego Prado Gesto
fceffce56e Show the slider in the middle when there is only one quality profile available. 
Contributes to CURA-6121.
 2019-03-21 14:18:07 +01:00
Lipu Fei
0671f68616 Remove unnecessary code 2019-03-21 09:57:20 +01:00
Remco Burema
139edbb0b7
Merge pull request #5460 from Ultimaker/WIP_onboarding_by_ip 
'WIP-onboarding-by-ip' into 'parent' branch
 2019-03-21 09:52:39 +01:00
Remco Burema
8f9bd0ad06 Adapted to more review comments. [CURA-6294] 2019-03-20 17:20:06 +01:00
Remco Burema
9a2b800fe8 Future proof: also accept IPv6 address. [CURA-6294] 2019-03-20 17:01:37 +01:00
Remco Burema
1f2fea14ce Little refactors (apply review comments). [CURA-6294] 2019-03-20 16:08:50 +01:00
Lipu Fei
c6bd31e5f6 Simplify code 2019-03-20 14:07:13 +01:00
Lipu Fei
8cc05a2a62 Bind no printer label visible to item count 2019-03-20 14:05:52 +01:00
Lipu Fei
428fb5a3a1 Use Item instead of transparent Rectangle 2019-03-20 13:49:14 +01:00
Lipu Fei
95a0a5fb24 Theme window_disabled_background 2019-03-20 13:46:54 +01:00
Remco Burema
ad6603bab8 Merge branch 'WIP_onboarding' into WIP_onboarding_by_ip 2019-03-20 13:33:19 +01:00
Remco Burema
61d2aa5c5f No more hardcoded margins (and other QML fixes) in 'add-by-ip'. [CURA-6294] 2019-03-20 13:16:10 +01:00
Lipu Fei
79ab09ca01 Fix troubleshooting typos 2019-03-20 11:33:43 +01:00
Lipu Fei
d46d0f2999 Change Scroll policy to AsNeeded 2019-03-20 11:17:58 +01:00
Lipu Fei
3114072038 Fix code style 2019-03-20 11:16:45 +01:00
Lipu Fei
f0104f6245 Remove unused code 2019-03-20 11:15:33 +01:00
Lipu Fei
838944dc2b Change scroll policy to AsNeeded 2019-03-20 11:14:34 +01:00
Lipu Fei
3a3e65224b Remove debugging shortcut 2019-03-20 11:11:30 +01:00
Lipu Fei
e623c807ce Rename SectionName to DiscoverySource in GlobalStacksModel 2019-03-20 10:39:23 +01:00
Remco Burema
42f7139b42 Merge branch 'WIP_onboarding' into WIP_onboarding_by_ip 2019-03-19 14:39:28 +01:00
Ghostkeeper
cb44223eca
Consistent capitalisation 2019-03-18 15:16:49 +01:00
Ghostkeeper
c79ffab9fb
Merge branch '4.0' 2019-03-18 11:24:23 +01:00
Remco Burema
5b31feebba Remove UserAgreement-plugin in favour of Welcome-Pages. [CURA-6057] 2019-03-15 13:58:36 +01:00
Remco Burema
4a95564277 Only show Welcome-Pages when needed. [CURA-6057] 2019-03-15 11:30:07 +01:00
Remco Burema
0f116fa3f4 Replace old User-Agreement-page with new Welcome-Pages. [CURA-6057] 2019-03-14 14:59:04 +01:00
Ghostkeeper
0f8a30d37b
Add period to tooltip sentence 
A lot of translators got this wrong.

Contributes to issue CURA-6257.
 2019-03-14 14:30:57 +01:00
Lipu Fei
49233216ec Fix machine management page section 2019-03-14 13:43:24 +01:00
Remco Burema
2693eecd33 (Add-by-IP/onboard) Cleanup and use discovered-printer instead of machine-manager. [CURA-6294] 2019-03-14 13:33:24 +01:00
Remco Burema
61821e6378 Merge remote-tracking branch 'origin/WIP_onboarding' into WIP_onboarding_by_ip 2019-03-14 11:40:44 +01:00
Lipu Fei
4f05a2ab5f WIP: Use GlobalStackModel for Machine management page 2019-03-14 11:21:09 +01:00
Lipu Fei
b3621bae84 WIP: Disable unknown printer type buttons 2019-03-14 11:18:39 +01:00
Jaime van Kessel
8b3290fb1e Prevent the deletion of materials that are still active 2019-03-14 10:50:53 +01:00
Lipu Fei
2b0e9ea439 WIP: Fix refresh and naming 2019-03-14 08:56:31 +01:00
Remco Burema
b12b6892ca Add-by-IP onboarding: Create (and set active) new device. [CURA-6294] 2019-03-13 17:36:03 +01:00
Remco Burema
bb17ab14da (WIP) Connect manual-device-added signals to AddPrinterByIP-page. [CURA-6294] 2019-03-13 15:46:02 +01:00
Lipu Fei
e5b51c8edf WIP: Implement refreshConnections() 2019-03-13 15:34:18 +01:00
Ghostkeeper
cfa02c39ec
Don't allow translating 'Ultimaker Cloud' 
It is a marketing name and shouldn't be translated then.

Contributes to issue CURA-6257.
 2019-03-13 14:29:07 +01:00
Ghostkeeper
04f11e4abf
Make translation a bit easier to get grammatically correct 
We should not append translations to each other. That doesn't work in different languages.

Contributes to issue CURA-6257.
 2019-03-13 14:13:49 +01:00
Lipu Fei
20933e8bef WIP: Add label for no discovered network printer 2019-03-13 14:12:05 +01:00
Lipu Fei
764f7281c2 WIP: Show full name of network printer types 2019-03-13 13:03:41 +01:00
Lipu Fei
de9f6f47bd WIP: Implement add machine from network device 2019-03-13 12:04:52 +01:00
Lipu Fei
f7f5123fea WIP: Fix highlighting of selected network printer 2019-03-13 11:03:23 +01:00
Lipu Fei
60f6d881a3 WIP: Fixes and add cloud logic to cloud welcome page 2019-03-13 10:37:41 +01:00
Lipu Fei
5fa2c72b0d WIP: Complete add network and local printer flow 2019-03-13 10:31:47 +01:00
Lipu Fei
cc35eb0195 WIP: Add gotoPage 2019-03-11 15:34:53 +01:00
Lipu Fei
53ea944da1 WIP: Add comments 2019-03-11 15:04:09 +01:00
Lipu Fei
0c94ded93d WIP: Refactor and fix network printer list 2019-03-11 14:57:02 +01:00
Lipu Fei
6f6e54fb06 WIP: Add comments 2019-03-11 09:22:41 +01:00
Lipu Fei
6b2642ee9a Merge remote-tracking branch 'origin/master' into WIP_onboarding 2019-03-11 09:05:43 +01:00