Commit graph

256 commits

Author SHA1 Message Date
zorro.zhang
e6e72a90b6 ENH: adjust right area scrolBar and text color
Change-Id: Ic430728bef302fec47a4304679cc5955a435d5e3
(cherry picked from commit 2a28dd67098e298957a83bb4d446623844db6bd8)
2022-12-15 04:38:15 -05:00
salt.wei
053c8435b6 ENH: update p1p picture
Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I89477ad69a3b1aeeee42cfe682d91656ad69f933
2022-12-15 04:38:15 -05:00
zorro.zhang
819e1192b7 ENH: ADJUST MENU BUTTON HEIGHT
Change-Id: I3b252b94ed8811145cfa236302d998c64ac9945a
(cherry picked from commit 0021bc7182b73e165227b6c90045589cfad452be)
2022-12-15 04:38:15 -05:00
zorro.zhang
ec66e7750f ENH: fix some color again
Change-Id: I8d06c7859cdcb232b0625ef1c22e562253be4dcf
(cherry picked from commit 32d143fe029e36715231156ce857fd841a4a3748)
2022-12-15 04:38:15 -05:00
zorro.zhang
e020ad3c39 ENH: fix some color problem
Change-Id: Iaae11323cfab96b05746208b8c31b20f3ab56fba
(cherry picked from commit dbe62188c877afdecc522534a2f85f7a0ea80ef4)
2022-12-15 04:38:15 -05:00
zorro.zhang
eb8c97f150 FIX: adjust background color
Change-Id: I7e32013dbd348c74dc79f0fdd38de4c46e38554d
2022-12-15 04:38:15 -05:00
zorro.zhang
670641fe7b FIX: login Username display
Change-Id: Ibc319d27b0f022d8132936b2eb275419e5f1a7ea
2022-12-15 04:38:15 -05:00
zorro.zhang
30a473c977 ENH: Add darkmode of Html,depend on UserAgent
Change-Id: I8b60db9e2cb7b0d163288e3d8a23db10b64b9bb3
2022-12-15 04:38:15 -05:00
zorro.zhang
7d717a9cb4 ENH: In case of low resolution, UserGuide Display
Change-Id: I14b764dc5f34421cadba329c9cd7a13fde0f2387
(cherry picked from commit 7c9ba185143a3d6ba96b2f28e479add3e6fe32df)
2022-12-15 04:38:15 -05:00
zorro.zhang
9ec439c8f5 NEW: add model Depot Button
Change-Id: I64f3e54dab3cd66b400d7dc1519f3ce84eba2fae
(cherry picked from commit 84e964bdd8eb63347a3fefcefe82c9cae6e52c5f)
2022-12-15 04:33:48 -05:00
SoftFever
4a20f7c22a uncheck send data by default 2022-11-29 23:06:09 +08:00
SoftFever
35455e6533 Merge branch 'master-remote' into feature/merge_remote_1.3
# Conflicts:
#	bbl/i18n/zh_cn/BambuStudio_zh_CN.po
#	resources/i18n/zh_cn/BambuStudio.mo
#	resources/profiles/Voron.json
#	resources/profiles/Voron/filament/Voron Generic ABS.json
#	resources/profiles/Voron/filament/Voron Generic ASA.json
#	resources/profiles/Voron/filament/Voron Generic PA-CF.json
#	resources/profiles/Voron/filament/Voron Generic PA.json
#	resources/profiles/Voron/filament/Voron Generic PC.json
#	resources/profiles/Voron/filament/Voron Generic PETG.json
#	resources/profiles/Voron/filament/Voron Generic PLA-CF.json
#	resources/profiles/Voron/filament/Voron Generic PLA.json
#	resources/profiles/Voron/filament/Voron Generic PVA.json
#	resources/profiles/Voron/filament/Voron Generic TPU.json
#	resources/profiles/Voron/filament/fdm_filament_abs.json
#	resources/profiles/Voron/filament/fdm_filament_asa.json
#	resources/profiles/Voron/filament/fdm_filament_common.json
#	resources/profiles/Voron/filament/fdm_filament_pa.json
#	resources/profiles/Voron/filament/fdm_filament_pc.json
#	resources/profiles/Voron/filament/fdm_filament_pet.json
#	resources/profiles/Voron/filament/fdm_filament_pla.json
#	resources/profiles/Voron/filament/fdm_filament_pva.json
#	resources/profiles/Voron/filament/fdm_filament_tpu.json
#	resources/profiles/Voron/machine/Voron 0.1 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron 0.1.json
#	resources/profiles/Voron/machine/Voron 2.4 250 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron 2.4 250.json
#	resources/profiles/Voron/machine/Voron 2.4 300 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron 2.4 300.json
#	resources/profiles/Voron/machine/Voron 2.4 350 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron 2.4 350.json
#	resources/profiles/Voron/machine/Voron Trident 250 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron Trident 250.json
#	resources/profiles/Voron/machine/Voron Trident 300 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron Trident 300.json
#	resources/profiles/Voron/machine/Voron Trident 350 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron Trident 350.json
#	resources/profiles/Voron/machine/fdm_klipper_common.json
#	resources/profiles/Voron/process/0.08mm Extra Fine @Voron.json
#	resources/profiles/Voron/process/0.12mm Fine @Voron.json
#	resources/profiles/Voron/process/0.15mm Optimal @Voron.json
#	resources/profiles/Voron/process/0.20mm Standard @Voron.json
#	resources/profiles/Voron/process/0.24mm Draft @Voron.json
#	resources/profiles/Voron/process/0.28mm Extra Draft @Voron.json
#	resources/profiles/Voron/process/fdm_process_voron_common.json
#	src/libslic3r/Preset.cpp
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/PrintConfig.hpp
#	src/libslic3r/PrintObject.cpp
#	src/slic3r/GUI/BackgroundSlicingProcess.cpp
#	src/slic3r/GUI/Field.cpp
#	src/slic3r/GUI/GLToolbar.cpp
#	src/slic3r/GUI/GLToolbar.hpp
#	src/slic3r/GUI/MainFrame.cpp
#	src/slic3r/GUI/MainFrame.hpp
#	src/slic3r/GUI/NotificationManager.cpp
#	src/slic3r/GUI/PhysicalPrinterDialog.cpp
#	src/slic3r/GUI/PhysicalPrinterDialog.hpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/Plater.hpp
#	src/slic3r/GUI/PrintHostDialogs.cpp
#	src/slic3r/GUI/PrintHostDialogs.hpp
#	src/slic3r/Utils/PrintHost.cpp
2022-10-20 23:12:00 +08:00
salt.wei
aca131cfc0 ENH: change picture size of ender3
Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I2b7c2b4e7d35dd8d19473e13918cc27bf9d75649
2022-10-20 19:34:37 +08:00
zorro.zhang
428f5ed6a9 ENH: Only Default Choose Bambu 0.4 Nozzel
Change-Id: I4fe32929e50cc9f45fda620399c7ea3e49cf998f
(cherry picked from commit 0df73d322859145ff65ccbbaa08205881209a9f2)
2022-10-20 19:34:37 +08:00
salt.wei
d47d82bf43 ENH: add preset for ender3 printer
As title.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I2d9b1aaeadfe945a6a90f34cdb10a1f240a50ae4
(cherry picked from commit a223ab23605c3ef96ae878b9c4d2199520b4f201)
2022-10-20 19:34:37 +08:00
salt.wei
cd82f70002 ENH: add preset of voron
As title. Thanks SoftFever.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I752413251b7699f8d1d26c44d71d912e1ef09c7b
(cherry picked from commit 606a69173e10d0a45e1f1987c36e45c3c89a7f09)
2022-10-20 19:34:37 +08:00
SoftFever
764b7d62a0 Merge mainstream changes 2022-10-04 13:51:34 +08:00
SoftFever
5db7c30463 Revert "Add support for FLSun V400(WIP)"
This reverts commit 58871a08e0.
2022-09-30 16:18:32 +08:00
zorro.zhang
b8413d3a6c ENH: Homepage-contextmenu UI same with prepare-ui
Change-Id: I8745ce516f2d1dd945826ec6e1f14aba6ec793bb
2022-09-29 11:16:43 +08:00
SoftFever
58871a08e0 Add support for FLSun V400(WIP) 2022-09-25 13:41:43 +08:00
SoftFever
de874acc99 Merge branch 'master-remote' into SoftFever
# Conflicts:
#	src/slic3r/GUI/MediaPlayCtrl.cpp
2022-09-13 23:04:58 +08:00
yifan.wu
f846276740 ENH: update 3d text cover
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: Ieef62398bcd88cbfcb1fc82775d0bbcc1f61aaf5
2022-09-13 19:42:32 +08:00
SoftFever
61de853138 Revert "Revert "ENH: filament just show bundle machine""
This reverts commit bf416a975c.
2022-09-10 00:44:55 +08:00
SoftFever
bb74438f7c Merge remote-tracking branch 'remote/master' into SoftFever
# Conflicts:
#	src/libslic3r/Preset.cpp
2022-09-09 21:54:57 +08:00
zorro.zhang
15ccd3661e ENH: self-adaption UserGuide Icon arrange
Change-Id: I6b04d7b54bd73ae0c7864cc6e1661b44c6d6c059
2022-09-09 19:59:27 +08:00
yifan.wu
cd175eeba9 ENH: add Chinese text for user manual
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: Ie0b95d53e3c50fa8a9462c79ea0ae713540db254
2022-09-09 19:59:27 +08:00
zorro.zhang
c818ca165f ENH: Fix Default Material Logic
Change-Id: Iac40c7717e55ca7c2502cfd1012e33e1e6d88695
2022-09-09 19:59:27 +08:00
yifan.wu
4cbba82cee ENH: refine text & icon for Recent's context menu
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I194afa16ad9b2c928548e7011a40718f9a53be8c
2022-09-08 21:49:36 +08:00
yifan.wu
7b2d839642 ENH: update user manual covers
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I24eb5f391ebf2b350afafa4062e11852a7a3c669
2022-09-08 21:49:36 +08:00
zorro.zhang
aae2a0484a ENH: Adjust Homepage UI
1, User Guide Image, Top add round corner
2, Change Guide description text color
3, New UI of Mouse Right Button Menu

Change-Id: I82cf82a97e35f16478020fabada17b5637cff625
(cherry picked from commit a3a56392788a9eabc9bb0cc20ecb48050869476b)
2022-09-08 21:49:36 +08:00
zorro.zhang
2f59e77ca9 ENH: Adjust Homepage UI
Change-Id: I6d2556241d7a3eb68f4e73ef905c12d07a8ad77f
(cherry picked from commit 8ebcf2de6991d4aaad1f49571493fd9d99fdd9cc)
2022-09-08 21:49:36 +08:00
zorro.zhang
63d7d05f68 ENH: new default recentfile image
Change-Id: Ibb46b5a754e42f40b4d3ea773ca551208e0aef46
(cherry picked from commit b3a66ec1a387426842b8c43f38986ef8ada59d6f)
2022-09-08 21:49:36 +08:00
SoftFever
bf416a975c Revert "ENH: filament just show bundle machine"
This reverts commit 2ac9267e42.
2022-09-05 21:59:19 +08:00
SoftFever
4fd174175c Merge remote-tracking branch 'remote/master' into SoftFever 2022-09-03 00:17:59 +08:00
yifan.wu
1569909cc3 ENH: refine the guide pages
1. remove editable status of pages
2. refine the user manual text

Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I39ca064e15f5c7c58e491b1929eb69e4a6692a08
2022-09-02 13:16:54 +08:00
yifan.wu
02f35c1617 ENH: add contents to user guide
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I46e943ce40049a80715ba67c4e73a3587991fe82
2022-09-02 13:16:54 +08:00
zorro.zhang
f44a0b88d9 NEW: homepage and UserManual
Change-Id: Iecdb4d0151a0cf76614548aee69e525ad7e1fe68
(cherry picked from commit 4c7403683b334e42d8676a933012e2133cd1ce7f)
2022-09-02 12:52:18 +08:00
liz.li
121dccc59c ENH:close dialog by pressing esc key
Change-Id: Ib883e7119699e06f63c61dd083ad761ba58bc19c
2022-09-02 12:52:18 +08:00
SoftFever
769bc14a8a Merge remote-tracking branch 'remote/master' into SoftFever
# Conflicts:
#	src/libslic3r/PerimeterGenerator.cpp
2022-08-28 12:03:49 +08:00
zorro.zhang
2ac9267e42 ENH: filament just show bundle machine
Change-Id: If0a35037dc4b08df7cd3aaf88662638a334196e3
(cherry picked from commit 5ebd67880a679c3013fe10b63b509761eab30670)
2022-08-26 09:25:59 +08:00
liz.li
cd3a721f86 ENH:add shortcut in macos
Change-Id: I2c2145caab987fcb8073c4e7891769142dab840a
2022-08-26 09:25:59 +08:00
SoftFever
a3b3b368e2
Profile rework (#4)
* default BBL profile

* voron

* wip

* Voron profile

* Prusa MK3S

* add Prusa mk3s

* fix an issue that print_host value was not retrieved.

* add chamber temperature option for filament

* slightly adjust thumbernail angle

* Revert "slightly adjust thumbernail angle"

This reverts commit 6ad38efb36c66abe82c7fdeb23f6a24aac43654e.

* add `one wall on first layer` option

* save preset for connection

* remove unused options

* set default 3000 accl for MK3S

* tweak profile

* update Voron logo

* UI twwaks

* Readme update

* change abs default nozzle temp

* misc

* tweak profiles

* Update README
2022-08-24 15:40:43 +08:00
SoftFever
159ff850e4 Merge branch 'master' into SoftFever 2022-08-11 20:06:32 +08:00
zorro.zhang
cd73537f6f ENH: Optimize some web UI
Change-Id: I91f6691e5e5c19274c1bc3e6a9386e3f76ab259d
2022-08-05 16:11:42 +08:00
liz.li
430021267c ENH:adjust button border color in webview
Change-Id: Iea050335b1f51d95c4f14ab06bc1514b0f7209f4
2022-08-05 16:11:42 +08:00
zorro.zhang
6eb4d671b5 ENH: Login button add Largen UI-Action
Change-Id: I40f668364730205c6cc1b916ef486fce836c08d8
2022-08-05 16:11:42 +08:00
zorro.zhang
e43f80e875 ENH: support 3rd printer model
Change-Id: Ib8c2c846f73a6ac14339e1d0222204d7440de014
2022-08-05 16:11:42 +08:00
liz.li
1a8e5295b2 ENH:keyboard shortcut in macos
1.fix:global shortcut cannot use in webview panel
2.fix:ban original web-shortcut in webview
3.add cmd+q & cmd+h shortcut in macos
4.move some global shortcut to prepare panel

Change-Id: I17ba3c86069dab92df754a319d0c0c3d77b34d74
2022-08-05 16:11:42 +08:00
SoftFever
b806df7710 Merge remote-tracking branch 'remote/master' into SoftFever
# Conflicts:
#	resources/profiles/BBL/filament/Bambu PC @BBL X1C.json
#	resources/profiles/BBL/filament/Bambu TPU 95A @BBL X1C.json
2022-07-23 20:29:33 +08:00
SoftFever
02e8f6c697 Add Anycubic 4Max Pro support 2022-07-23 10:31:41 +08:00
lane.wei
e9e4d75877 Update the codes to 01.01.00.10 for the formal release
1. first formal version of macos
2. add the bambu networking plugin install logic
3. auto compute the wipe volume when filament change
4. add the logic of wiping into support
5. refine the GUI layout and icons, improve the gui apperance in lots of
   small places
6. serveral improve to support
7. support AMS auto-mapping
8. disable lots of unstable features: such as params table, media file download, HMS
9. fix serveral kinds of bugs
10. update the document of building
11. ...
2022-07-22 20:35:34 +08:00
SoftFever
dbaef259cf Add Voron 0.1 and Prusa MK3S support 2022-07-19 06:27:26 -07:00
SoftFever
8b429ccd4a fix voron image ratio issue 2022-07-19 06:27:26 -07:00
SoftFever
9a57fc204f reduce image size 2022-07-19 06:27:26 -07:00
SoftFever
e4b79afeac Add Voron machine support 2022-07-19 06:27:26 -07:00
lane.wei
1555904bef Add the full source of BambuStudio
using version 1.0.10
2022-07-15 23:42:08 +08:00