Jack Ha
cffeff0299
CURA-4805 remove modifiable settings when loading non sliceable file (gcode)
2018-01-16 15:58:14 +01:00
Lipu Fei
223d9b6025
Update QtQuick import versions
...
CURA-4758
2018-01-05 11:55:18 +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
af9181287a
Merge branch 'master' into qtquick-controls-2.0
2018-01-04 11:17:50 +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
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
27ca743e58
Merge branch 'master' into qtquick-controls-2.0
2018-01-03 11:03:17 +01:00
ChrisTerBeke
9db320bf35
Remove unused backend property
2017-12-14 15:34:58 +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
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
Aleksei S
a5cb4cd316
Expand/Collapse sidebar
...
CURA-4234
2017-12-11 10:53:48 +01:00
ChrisTerBeke
2986a17c1d
Fix for showing printer connect button on component load, use newer CuraApplication as target
2017-12-08 16:02:22 +01:00
ChrisTerBeke
7a6d75fd08
Fix sidebar top margin for um3 network monitor controls
2017-12-07 11:02:52 +01:00
ChrisTerBeke
71ae78f7b6
Fix monitoring sidebar top margin
2017-12-07 10:45:54 +01:00
ChrisTerBeke
9702ffb794
Small fixes to sidebar layout after refactoring
2017-12-06 18:09:02 +01:00
ChrisTerBeke
ee643610e5
Fix sidebar loading and unloading depending on active stage
2017-12-06 17:46:18 +01:00
ChrisTerBeke
2d044a37ae
Sidebar and main view via loader
2017-12-06 13:33:05 +01:00
ChrisTerBeke
a57a5aab6b
Make sidebar view working for active stage
2017-12-06 12:23:41 +01:00
ChrisTerBeke
f1b9a17611
Remove sidebar controller implementation in favor of stages
2017-12-06 09:44:30 +01:00
ChrisTerBeke
51405ca0f7
tmp
2017-12-05 13:29:04 +01:00
ChrisTerBeke
030dc74f3f
Fix now showing any sidebar when in monitor mode
2017-12-05 12:19:00 +01:00
ChrisTerBeke
e33288b7c8
Move sidebar target for plugins to only middle section
2017-12-05 10:56:59 +01:00
fieldOfView
9564bb645f
Remove test code
2017-11-30 15:54:24 +01:00
fieldOfView
4303278602
Tweak layout and alignment of print time and (material) cost estimation...
...
improving readability
* table takes the full width and values are right-aligned
* time estimates are shortened
* values are right aligned
* feature/time/percentage are on a single line again
* handle long feature & material names gracefully
Fixes #2712
* totals are only shown when there are multiple extruders
2017-11-30 10:35:31 +01:00
Diego Prado Gesto
b776afaf3d
CURA-4509 Changing layout of the print time information tooltip,
...
now in two lines per feature. This is for avoid trimming the labels
because they depend on the language.
2017-11-22 20:09:39 +01:00
Jaime van Kessel
7d28b26ff2
Merge branch 'master' of github.com:Ultimaker/Cura into qtquick-controls-2.0
2017-11-16 16:48:22 +01:00
Aleksei S
87a7bf72a8
Monitor view, "connect" button position
...
CURA-4509
2017-11-01 15:57:30 +01:00
fieldOfView
2d109090bc
Show material name instead of extruder number
2017-10-30 12:40:41 +01:00
fieldOfView
84002a70d0
Remove binding loop by cleaning up tooltipText creation
2017-10-30 11:50:57 +01:00
fieldOfView
6d4ea381f0
Create cost specification tooltip
2017-10-29 11:47:49 +01:00
fieldOfView
0372475560
Rearrange print specs area
...
* remove superfluous "Print time" label
* format print time tooltip
* add elide to cost spec
* add (empty) cost spec tooltip
2017-10-29 10:09:52 +01:00
Lipu Fei
946b8ae92d
Remove executable bit for non-executable files
2017-10-19 10:28:57 +02:00
ChrisTerBeke
5c0488c182
Merge pull request #2603 from fieldOfView/fix_textinput_rendertype
...
Change renderType for TextInput elements
2017-10-16 10:33:05 +02:00
fieldOfView
f9ca353f6a
Fix one more fractional pixel offset affecting text placement
2017-10-14 11:49:27 +02:00
Jaime van Kessel
799d1a5b0c
Updated setting items & sidebar to qtQuick controls 2.0
2017-10-11 21:02:27 +02:00
Mark
3a7fbdb173
Changed parseInt to Math.floor
2017-10-11 17:06:13 +02:00
Mark
eaa7b75f0e
Changed parseInt to Math.floor
2017-10-11 16:47:40 +02:00
Mark
00205996da
Change Text to Label and cast all sizes to int
...
CURA-4437
2017-10-11 14:53:46 +02:00
Mark
d4a8dbdee7
Change Text to Label and cast all sizes to int
...
CURA-4437
2017-10-11 12:48:42 +02:00
ChrisTerBeke
30c9ccfb7f
Merge branch '3.0'
2017-10-10 16:31:29 +02:00
Lipu Fei
c7ccc3c1b8
Fix long text display in mode toggle buttons
...
CURA-4341
2017-10-10 14:47:13 +02:00
Lipu Fei
0e45ec1197
Fix auto-adjust for "Print Setup" text
...
CURA-4341
2017-10-10 14:26:55 +02:00
Ghostkeeper
d458fcde5c
Revert "Revert "Merge branch 'fix_garbled_fonts_macos' into 3.0""
...
This reverts commit e07e7bc9e714843cf853f0a255ee5a8432696886.
Contributes to issue CURA-4414.
2017-10-05 10:58:49 +02:00
Mark
e9a8ae15f3
Move text back to label and remove unused font
2017-10-05 10:57:43 +02:00
Ghostkeeper
e07e7bc9e7
Revert "Merge branch 'fix_garbled_fonts_macos' into 3.0"
...
This reverts commit b62c19206f5e494fa27eb0b877197556c559e449, reversing
changes made to 104926c6ed1648ec20b4308fdacad4e99c14c8b3.
Contributes to issue CURA-4414.
2017-10-05 10:28:54 +02:00
