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

179 Commits

Author SHA1 Message Date
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
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
Mark
dcb630a24e Move text back to label and remove unused font 2017-10-03 14:02:07 +02:00
Mark
b4154b8cc0 Merge branch '3.0' 2017-09-28 13:01:10 +02:00
Mark
9a193ad5c5 Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
Ghostkeeper
c4fc4a7198
Add better descriptions for abbreviated units 
This should help the translators next time to find better translations.

Contributes to issue CURA-4341.
 2017-09-27 17:34:12 +02:00
alekseisasin
ea65457920 After first start (no machine added) the controls on right side are invisible 
CURA-4357
 2017-09-22 14:45:23 +02:00
Diego Prado Gesto
0e1b9d8c5d Changed the way in which print times are shown in Sidebar - CURA-4232 2017-09-15 10:46:01 +02:00
alekseisasin
aa0ade2e74 Merge branch 'master' of github.com:Ultimaker/cura 2017-09-14 18:05:28 +02:00
alekseisasin
98ab571483 Removed 14bitVoid code accord to a new LGPL license 
CURA-4232
 2017-09-14 18:03:31 +02:00
ChrisTerBeke
e7ad4b7f17 Merge branch 'master' into feature_slider_for_quality 2017-09-14 10:34:34 +02:00
Lipu Fei
5df5dfec02 Auto-adjust mode tab position based on text length 
CURA-4322
 2017-09-14 08:50:25 +02:00
Lipu Fei
3d6648fc59 Rearrange quality profile slider and dropdown box 
CURA-4182

- Remove the quality profile dropdown box from Recommended mode
- Move the quality profile dropdown box to Custom mode
 2017-09-13 17:12:51 +02:00
Mark
766bc9ae97 Changed bold fonts to normal 
CURA-4148
 2017-09-12 14:37:29 +02:00
Mark
3b12e39ba8 Selected state font is not bold anymore for custom and recommended 
CURA-4148
 2017-09-08 16:35:08 +02:00
Mark
db77a4690c Made the selected borders a little thicker 
CURA-4148
 2017-09-08 15:18:40 +02:00
Lipu Fei
24e5c72e47 Update colour for light theme 
CURA-4148
 2017-09-06 16:04:31 +02:00
Mark
34f8db5450 Changed some margins to improve alignment 
CURA-4211
 2017-09-06 14:52:16 +02:00
alekseisasin
24c9dc9bee Merge branch 'feature_light_colours_icons' 
CURA-4148
 2017-09-01 19:25:29 +02:00
Jaime van Kessel
9ec7ef8dba Made print spec invisible when monitoring print 2017-09-01 13:07:00 +02:00
Ghostkeeper
062957c249
Hide the header if it would be empty 
It would be empty if the machine is single extrusion and has no materials or variants.

Contributes to issue CURA-4241.
 2017-08-31 15:51:51 +02:00
Ghostkeeper
0fc40d571a
Only make separator visible if the element above and below it are visible 
The behaviour should be the same, if it was implemented correctly previously.

Contributes to issue CURA-4241.
 2017-08-31 15:47:29 +02:00
Ghostkeeper
ed7e204cc0
Fix colour of time estimates text 
I'd like it to be the same colour as the text underneath it, so subtext it is.

Contributes to issue CURA-4148.
 2017-08-31 10:21:28 +02:00
Lipu Fei
3fbdb27e8e Merge branch 'master' into feature_dark_colours_icons 
CURA-4148

Resolve merge conflicts.
 2017-08-28 11:13:38 +02:00
Ghostkeeper
165665247f
Remove unused property valueWarning 
It is unused here. There is such a property being used by the profile selection drop-down but that one uses the valueWarning property in SidebarHeader.qml which is exactly the same.

Contributes to issue CURA-4148.
 2017-08-25 14:03:54 +02:00
Ghostkeeper
09a5cf1de2
Shift sidebar tooltips with the arrow outside of sidebar 
Because now the arrow has the same colour as the sidebar so you won't see it otherwise.

Contributes to issue CURA-4148.
 2017-08-23 17:53:00 +02:00
Ghostkeeper
11f8204644
Change margins in the side bar 
These are more or less all margins in the side bar.

Contributes to issue CURA-4148.
 2017-08-23 16:28:28 +02:00
Lipu Fei
28670edf8e Align profile dropdown box correctly 
CURA-4147
 2017-08-22 16:11:15 +02:00
Ghostkeeper
b2338d9c2e
Re-use action button styling now that toggle is gone 
We should keep these two types of buttons in sync, so have them share a theme.

Contributes to issue CURA-4148.
 2017-08-21 15:11:07 +02:00
Ghostkeeper
d94956dd23
Give time estimate a different text colour 
Apparently it needs to be highlit a bit more than the rest.

Contributes to issue CURA-4148.
 2017-08-21 13:51:36 +02:00
Lipu Fei
662e3b9cd1 Fix coding style 
CURA-4147
 2017-08-18 13:38:16 +02:00
alekseisasin
7978b0efe9 Move quality profile, material and print core to it's new location 
CURA-4147
 2017-08-18 09:15:17 +02:00
Lipu Fei
3a22d1916f Go back to "Recommended/Custom" tabs 
CURA-4146
 2017-08-15 17:42:34 +02:00
alekseisasin
a4ddd28e8f Removed gap between material length and it's measuring unit 
feature_move_printing_time
 2017-08-14 13:09:31 +02:00