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

2286 Commits

Author SHA1 Message Date
Diego Prado Gesto
becb0cf7b9 CURA-4461 Add dropdown menu in the UI for selecting the buildplate if 
the printer has different buildplates.
 2018-01-09 15:42:10 +01:00
Jack Ha
d05f4a493b CURA-4525 fix qml undefined QString 2018-01-08 14:41:39 +01:00
Jack Ha
164e5fdc8e CURA-4525 change active build plate if that build plate does not exist anymore; disable context menu items for build plates when no selection 2018-01-08 13:55:42 +01:00
Jaime van Kessel
99de75a3fd Fixed connection label state 
CL-541
 2018-01-08 13:44:20 +01:00
Jaime van Kessel
df1bf419d9 Don't show "active print" header if no printer is connected 
CL-541
 2018-01-08 11:44:30 +01:00
Jack Ha
e638c21acb CURA-4525 fix selected object will select correct build plate (not only visualization) 2018-01-08 11:30:57 +01:00
Jack Ha
733d6234e6 CURA-4525 moved experimental preferences to bottom with its own label; all settings are by default off 2018-01-08 11:13:16 +01:00
Jaime van Kessel
ed9634ebe0 Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2018-01-08 10:56:12 +01:00
Tyler Gibson
203fc37c7c Merge branch 'master' into malyan_m200 
# Conflicts:
#	resources/qml/SidebarSimple.qml

Resolving with updated 2 digit truncation
 2018-01-07 22:54:56 -08:00
ChrisTerBeke
39921795ce Properly align printer not connected label from top 2018-01-05 14:46:16 +01:00
Lipu Fei
8c98ab027a Fix code style 
CURA-4758
 2018-01-05 11:55:18 +01:00
Lipu Fei
223d9b6025 Update QtQuick import versions 
CURA-4758
 2018-01-05 11:55:18 +01:00
Lipu Fei
65e8762546 Fix layer height slider update issue 
CURA-4758
 2018-01-05 11:55:17 +01:00
ChrisTerBeke
9784faf181
Merge pull request #3017 from fieldOfView/feature_textfield_select 
Select text when gaining focus
 2018-01-04 17:01:46 +01:00
Jack Ha
4f224a4311 CURA-4525 do not show build plate view item when disabled 2018-01-04 16:12:39 +01:00
Lipu Fei
d20895a055 Fix code style 
CURA-4758
 2018-01-04 13:51:47 +01:00
Lipu Fei
84adbc5f41 Use the 5.8 versions of QtQuick modules in QMLs 
CURA-4758
 2018-01-04 13:26:14 +01:00
ChrisTerBeke
4cec27b181 Fix QML warnings for combo boxes - CURA-4758 2018-01-04 11:53:34 +01:00
ChrisTerBeke
3f7d8997a1 Fix icon positions - CURA-4758 2018-01-04 11:33:12 +01:00
ChrisTerBeke
af9181287a Merge branch 'master' into qtquick-controls-2.0 2018-01-04 11:17:50 +01:00
Jack Ha
a5d9aac91b CURA-4525 placed view menu items in Build Plate submenu 2018-01-04 10:32:54 +01:00
Jaime van Kessel
4cb7bc03ad Sidebar tooltips are now visible again 
CL-541
 2018-01-04 10:30:03 +01:00
Jack Ha
8854a28d56 CURA-4525 solved merge conflict 2018-01-04 10:24:30 +01:00
Jaime van Kessel
b6ebb804ba OutputDevice header now shows name of active printer 
CL-541
 2018-01-04 10:13:55 +01:00
Jaime van Kessel
faa4af634a Show pause text even if there is nothing to pause 
CL-541
 2018-01-04 09:58:15 +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
182e7de07d
Merge branch 'master' into network_rewrite 2018-01-03 14:17:48 +01:00
ChrisTerBeke
7eb507484b hide sidebar header when in monitoring mode 2018-01-03 14:12:45 +01:00
ChrisTerBeke
1686f951c9 Finish styling mode switch buttons 2018-01-03 14:02:35 +01:00
Jack Ha
bfa33c721c CURA-4525 solved merge conflicts 2018-01-03 13:52:55 +01:00
ChrisTerBeke
4f77b2ea6d More layout and font fixes 2018-01-03 13:50:06 +01:00
ChrisTerBeke
1476e95adc Fix mode switching buttons functionality 2018-01-03 13:45:18 +01:00
ChrisTerBeke
b7aadbe3c3 Fix extruder dropdown text model 2018-01-03 13:08:20 +01:00
ChrisTerBeke
1fa3031486 Fix text color for extruder comboboxes 2018-01-03 12:52:40 +01:00
Jack Ha
cb1484ee63 CURA-4525 update size and margins of objects list 2018-01-03 12:52:32 +01:00
ChrisTerBeke
3a2b2d3333 Also fix combobox list item heights for extruder dropdowns 2018-01-03 12:48:33 +01:00
ChrisTerBeke
1fe653b231 Fix combobox dropdown item height 2018-01-03 12:47:08 +01:00
ChrisTerBeke
77c8ac3950 Layout fixes for controls 2.0 2018-01-03 11:46:20 +01:00
Lipu Fei
f6168c07f0 Fix material_diameter bindings for metarial menu and page 
CURA-4708
 2018-01-03 11:27:30 +01:00
ChrisTerBeke
27ca743e58 Merge branch 'master' into qtquick-controls-2.0 2018-01-03 11:03:17 +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