2119 Commits

Author SHA1 Message Date
Jack Ha
a5d9aac91b CURA-4525 placed view menu items in Build Plate submenu 2018-01-04 10:32:54 +01:00
Jack Ha
8854a28d56 CURA-4525 solved merge conflict 2018-01-04 10:24:30 +01:00
Jack Ha
8c7a0d4a8e CURA-4525 created CuraSceneController and took out logic from ObjectsModel and BuildPlateModel 2018-01-04 09:26:15 +01:00
Aleksei S
49ae078396 Adjust 3d view and add Camera View to the menu bar
CURA-4642
2018-01-03 16:45:26 +01:00
ChrisTerBeke
5a9e3a8efd Fix front view button rotation, cleanup view buttons onClicked 2018-01-03 16:18:31 +01:00
Lipu Fei
392be23281 Fix SettingView stakc ID binding
CURA-4708
2018-01-03 15:58:30 +01:00
Jack Ha
62487e8ea2 CURA-4525 cleanups and change comment and added new-lines 2018-01-03 15:41:08 +01:00
Jack Ha
2f965cc053 CURA-4525 switch locations of build plates and objects list 2018-01-03 14:18:40 +01:00
ChrisTerBeke
7eb507484b hide sidebar header when in monitoring mode 2018-01-03 14:12:45 +01:00
Jack Ha
bfa33c721c CURA-4525 solved merge conflicts 2018-01-03 13:52:55 +01:00
Jack Ha
cb1484ee63 CURA-4525 update size and margins of objects list 2018-01-03 12:52:32 +01:00
Lipu Fei
f6168c07f0 Fix material_diameter bindings for metarial menu and page
CURA-4708
2018-01-03 11:27:30 +01:00
Aleksei S
43db2ee2f9 Added ElideRight for the text which is out of boundaries
CURA-4692
2018-01-03 10:34:23 +01:00
Ruben D
689a18ee57
Rename sidebar_collapsed and code style
sidebar_collapsed is more consistent with other options and setting names we use. Better change it before the next release rolls out otherwise we'd have to do a version upgrade.
Also changed some code style things to be in line with our guidelines.

Contributes to issue CURA-4234.
2017-12-30 19:35:46 +01:00
Ghostkeeper
1bcdc0357e
If there is no added printer, disallow closing the window
The state of having no printer added is very weird to the user. Let's prevent that from happening by accident.

Contributes to issue CURA-4736.
2017-12-29 14:32:43 +01:00
Ghostkeeper
8b504c8acc
Fix scroll position after collapsing category not in focus
When collapsing a category, the height of the category is briefly set to 0 and then animated there properly. If the setting list becomes so small then that the scroll bar disappears, the view should automatically get scrolled up. But because the focus changed at the same time it would move the scrollbar such that the category header was in view. This clashed, causing the scroll position to end up not completely at the top even though the scroll bar did disappear. Setting the focus after collapsing the scroll bar prevents this.

Contributes to issue CURA-4732 and fixes #2935.
2017-12-29 14:07:34 +01:00
Ghostkeeper
c786f7a69b
Add Portuguese to language drop-down
So that we can select it.

Contributes to issue CURA-4692.
2017-12-29 11:53:58 +01:00
Ghostkeeper
ac8f3a31be
Include period in translation source text
I suspect that this was originally done this way to prevent breaking a string freeze. I'm now correcting it so that languages that don't use this period will also be able to properly end their sentence (such as Japanese or Chinese).

Contributes to issue CURA-4692.
2017-12-29 11:51:28 +01:00
Ghostkeeper
9b41cc05af
Further fix for MonitorButton
Forgot this one here.

Contributes to issue CURA-4741.
2017-12-28 15:46:06 +01:00
Ghostkeeper
5f240229f9
Fix reference to addAdditionalComponents and updateAdditionalComponents
Nobody ever tested this, I think...

Contributes to issue CURA-4741.
2017-12-28 15:45:03 +01:00
ChrisTerBeke
b29047abd3 Small fixes for disable user data triggering preferences window 2017-12-22 11:38:56 +01:00
Jack Ha
663ceab069 Undo emit transformationChanges (caused a crash), themed objects in objects list. CURA-4525 2017-12-21 16:53:43 +01:00
Aleksei S
447c6e7e23 Added Disable link style
CURA-4630
2017-12-21 16:25:13 +01:00
Jack Ha
24ad68aeb5 Fix initial state of 'See only current build plate'. CURA-4525 2017-12-21 15:13:12 +01:00
Jack Ha
fda4badab1 Checked build plates in context menu now actually match the selected item's build plates; changed collapse arrow. CURA-4525 2017-12-21 15:08:46 +01:00
Jack Ha
4b5097f998 Objects menu now collapses animated and it has a border. CURA-4525 2017-12-21 12:41:06 +01:00
Jack Ha
1ca6fa0daa Different arrow for collapsing. CURA-4525 2017-12-21 11:40:59 +01:00
Jack Ha
a47107448e Moved objects menu to lower left and made it collapsible. CURA-4525 2017-12-21 11:39:37 +01:00
Jack Ha
5152b2ae65 Solved merge conflicts. CURA-4525 2017-12-21 10:52:51 +01:00
Diego Prado Gesto
4a211c6ac6 CURA-4495 Change property name and add default values 2017-12-18 11:58:34 +01:00
Diego Prado Gesto
c3ce3724e5 Fix small issue when resetHandler is not defined 2017-12-18 10:00:08 +01:00
ChrisTerBeke
876ad01597 Directly use CuraApplication.backend instead of via property 2017-12-15 13:32:45 +01:00
ChrisTerBeke
79028388a2 Add option for custom reset handler in setting item 2017-12-15 11:05:42 +01:00
ChrisTerBeke
cac561600e Use pyqtProperty instead of slot to bind backend 2017-12-14 15:44:11 +01:00
ChrisTerBeke
9db320bf35 Remove unused backend property 2017-12-14 15:34:58 +01:00
ChrisTerBeke
47e5303a89 Catch situations where backend is not correctly set 2017-12-14 15:16:17 +01:00
ChrisTerBeke
c056fcb23d Fix monitor sidebar machine selection - CURA-4234 2017-12-14 14:58:51 +01:00
Jack Ha
cda6aa2547 CURA-4234 splitted MachineSelection into a separate file and add it to PrintMonitor as well, because now it's part of the sidebar 2017-12-14 14:49:18 +01:00
Jack Ha
f3a6f50e2c CURA-4234 fix topbar resize issues and removed hard coding numbers 2017-12-13 16:47:38 +01:00
Jack Ha
3605edc565 CURA-4234 remove debugging logline 2017-12-13 14:16:35 +01:00
Jack Ha
63eec848fc CURA-4234 view mode button now also moves with the sidebar 2017-12-13 14:15:27 +01:00
Jack Ha
4519f9b46a CURA-4234 rename to cura/sidebar_collapse, fix spelling errors, styling 2017-12-13 14:04:02 +01:00
Jack Ha
f28846acb9 Merge branch 'master' into CURA-4234_expand_collapse 2017-12-12 15:43:32 +01:00
Aleksei S
3516d01f3d Move back machine selection
CURA-4234
2017-12-12 15:30:19 +01:00
Aleksei S
6968c089db Add sidebar_collapse to the saved preferences, typos, move back machine selection to the top bar
CURA-4234
2017-12-12 11:26:17 +01:00
ChrisTerBeke
ca413e0496 Add extra checks to ensure backend exists, use same state everywhere 2017-12-12 11:16:40 +01:00
ChrisTerBeke
84aa9367c7 Cleanup 2017-12-12 10:54:54 +01:00
Aleksei S
00529f37d9 After sidebar expanding the builplate stays in center of the screen
CURA-4234
2017-12-11 18:51:53 +01:00
Ghostkeeper
75df653d47
Merge branch 'feature_local_container_server' 2017-12-11 15:51:17 +01:00
Aleksei S
300f29e11b Add expand button to menu
CURA-4234
2017-12-11 15:30:13 +01:00