2503 Commits

Author SHA1 Message Date
fieldOfView
72bf073101 Fix LayerView layer box width 2017-09-27 11:43:14 +02:00
fieldOfView
7394a0c6ef Fix typo 2017-09-26 11:05:46 +02:00
fieldOfView
c5fd0e6c80 Use screenScaleFactor to consistently adapt sizes to display pixel ratio 2017-09-25 22:07:12 +02:00
ChrisTerBeke
11241642b3 CURA-4354 fixed plugin injected tool icon path finding, example in PerObjectSettingsTool 2017-09-22 16:15:38 +02:00
Ghostkeeper
12ccc8abe0
Merge branch '3.0' 2017-09-22 09:55:05 +02:00
ChrisTerBeke
21ea99d9f2 CURA-4269 small code improvement for z-offset in project loading 2017-09-22 09:34:24 +02:00
ChrisTerBeke
e7e24caf97 CURA-4269 small code improvement for z-offset in project loading 2017-09-22 09:31:11 +02:00
alekseisasin
7c462f5703 After loading a model from a project Y position is ignored
CURA-4269
2017-09-21 17:36:12 +02:00
ChrisTerBeke
ddfb5f0b48 fix conflict after revert 2017-09-21 15:09:04 +02:00
Ghostkeeper
11060e010b
Clarify message title
The title should add something to the message, such as a summary.
2017-09-21 12:52:07 +02:00
Jaime van Kessel
b434fdb875 Layerview scrollbar now has fixed size.
Instead of using the size of the other items. This worked when the bar was still part of the larger view, but since it's now
below the item it broke it.

CURA-4342
2017-09-20 13:35:13 +02:00
Jaime van Kessel
ade1c039ea Print information not being set won't cause crash anymore 2017-09-20 11:03:20 +02:00
Jaime van Kessel
ddacdf523e Fixed some small issues when certain qml objects were null
CURA-4349
2017-09-20 09:48:00 +02:00
Jaime van Kessel
c4f5c970e5 Removed uneeded logging 2017-09-19 16:39:51 +02:00
Jaime van Kessel
e5f3d45385 When project loading needs to create a new machine, also create a new definition changes
CURA-4345
2017-09-19 14:02:01 +02:00
ChrisTerBeke
b7671f3da7 Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-09-18 17:24:05 +02:00
ChrisTerBeke
e18b24add2 CURA-4269 use z offset decorator to keep project file positions below bed 2017-09-18 17:24:00 +02:00
Ghostkeeper
0060909117
Use named arguments for i18n string
Otherwise the i18n system can't figure out which %s belongs to which parameter.

Contributes to issue CURA-4341.
2017-09-18 17:13:01 +02:00
Ghostkeeper
3150420160
Fix i18n with replaced texts
Also added a description for the translator.

Contributes to issue CURA-4341.
2017-09-18 17:01:15 +02:00
ChrisTerBeke
b386bda2c8 more fixes for reverting 11ebdf730389eca66bafc37be7c6a741c5641f46 2017-09-18 15:38:31 +02:00
ChrisTerBeke
3db04c918f fixes for reverting 11ebdf730389eca66bafc37be7c6a741c5641f46 2017-09-18 15:37:17 +02:00
Jaime van Kessel
e5629f26de Merge branch 'master' of github.com:Ultimaker/Cura 2017-09-18 15:31:12 +02:00
Jaime van Kessel
a3b6ced5e5 Changed titles of unable to slice messages
This makes it a bit clearer what is going on and what the "source" of the message is.

CURA-4332
2017-09-18 15:30:40 +02:00
Diego Prado Gesto
e8553e8e69 Fixed double messages and rearrange some code - CURA-4224 2017-09-18 11:47:23 +02:00
ChrisTerBeke
4ca5987ca8 CURA-4269 added a flag to determine wether auto drop should be executed or not 2017-09-18 10:50:52 +02:00
Diego Prado Gesto
255eb2f377 Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-09-15 16:05:28 +02:00
Diego Prado Gesto
f139bbe3f1 Fixed some missed references to the previous variables - CURA-4232 2017-09-15 16:05:24 +02:00
Ghostkeeper
e092b908a0
Add message content for WriteRequestFailedErrors
The content of the exception is directly put inside a message, so we should give the exception a message.
2017-09-15 11:06:32 +02:00
Ghostkeeper
6083989777
Merge branch 'master' of github.com:Ultimaker/Cura 2017-09-15 09:32:15 +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
Ghostkeeper
bf96be3ab2
Improve titles for slice failure messages a bit
The previous ones were very vague.
2017-09-14 16:40:20 +02:00
ChrisTerBeke
11ebdf7303 CURA-4269 disable auto-drop for first time loaded models from project files 2017-09-14 16:06:51 +02:00
Lipu Fei
3812a478cf Only use lowercase for string comparison
CURA-4224
2017-09-14 12:50:55 +02:00
Lipu Fei
ccebadee10 Merge branch 'master' 2017-09-14 12:48:07 +02:00
ChrisTerBeke
c5c6ed8b2b CURA-4318 fix colors and layouts for dark design 2017-09-14 09:59:13 +02:00
Lipu Fei
a48507546f More defensive machine name and version check
CURA-4224
2017-09-14 08:34:01 +02:00
Lipu Fei
9567a6921d Fix code style
CURA-4224
2017-09-14 08:29:46 +02:00
Lipu Fei
be57ccb127 Minor fixes
CURA-4224

 - Fix code style
 - Fix typos
2017-09-13 17:44:53 +02:00
Lipu Fei
2e1c6abe0e Merge branch 'master' 2017-09-13 17:25:47 +02:00
alekseisasin
d0997f7f7e Merge branch 'master' of github.com:Ultimaker/cura 2017-09-13 13:58:39 +02:00
alekseisasin
204019702d Added Title for messages
CURA-4203
2017-09-13 13:58:08 +02:00
Diego Prado Gesto
fd1c76ac80 Merged branch - CURA-4270 2017-09-13 13:25:00 +02:00
Diego Prado Gesto
aa2c7c2ff6 Checking first if the user has enabled the 'check for updates' preference - CURA-4224 2017-09-13 10:22:07 +02:00
Diego Prado Gesto
80992dd44c The checker now runs also when the user adds a new printer - CURA-4224 2017-09-12 17:22:17 +02:00
ChrisTerBeke
92617e2177 remove layerview toolbox arrow 2017-09-12 10:15:08 +02:00
ChrisTerBeke
7d719c4ab5 layer view toolbox height depending on color scheme mode 2017-09-12 09:54:24 +02:00
ChrisTerBeke
7cc8656be3 Merge branch 'master' into CURA-4203-message-redesign 2017-09-12 09:13:37 +02:00
ChrisTerBeke
4143effbe1 only show slider track when layers are available 2017-09-12 09:13:16 +02:00
alekseisasin
637b536536 Merge pull request #2342 from hroncok/localefix
Relocate locales to proper locations
2017-09-11 17:23:12 +02:00