Jack Ha
b17685d075
CURA-5296 fix model property mismatch
2018-05-09 13:59:45 +02:00
Ian Paschal
7ac7f91d5d
Merge pull request #3790 from Ultimaker/CURA-5296_bundled_packages
...
Cura-5296 Make bundled resources visible to CuraPackageManager
2018-05-08 17:03:55 +02:00
Ian Paschal
4b931326fd
CURA-5296 Set packages version with super secret method
2018-05-08 15:04:19 +02:00
Ian Paschal
0accdc6320
Cura-5296 Use separate packages.json files in app and user data
2018-05-08 11:54:19 +02:00
Aleksei S
d083426497
Added MimeTypeDatabase for UFP extension
...
CURA-5323
2018-05-08 10:59:05 +02:00
Aleksei S
9779c41071
Use MimeTypeDatabase to find loaded file extension and set proper project name
...
CURA-5323
2018-05-08 10:47:59 +02:00
Ghostkeeper
304c23b87e
Fix check for existence of gcode_dict variable
...
getattr raises an error if it doesn't exist. It doesn't make the variable None or anything.
2018-05-08 10:44:19 +02:00
Jack Ha
467e814f88
Merge branch 'master' of github.com:Ultimaker/Cura
2018-05-07 10:30:50 +02:00
Jack Ha
00d8427e42
Add sanity check for GlobalStack CURA-5045
2018-05-07 10:30:45 +02:00
Diego Prado Gesto
58289a7b45
Remove useful comment
2018-05-04 17:28:39 +02:00
Diego Prado Gesto
2283bb530d
CURA-4644 Fix unselectable item in the Toolbox
2018-05-04 15:49:37 +02:00
Diego Prado Gesto
be81d4c4cc
Merge branch 'master' of github.com:Ultimaker/Cura
2018-05-04 15:01:16 +02:00
Diego Prado Gesto
8c4dc1cc2b
CURA-5264 Don't need the if statement since the hardware-typeid is the
...
right value to look at and it is in the firmware api.
2018-05-04 14:59:59 +02:00
Ian Paschal
858108920a
Merge pull request #3765 from fieldOfView/fix_toolbox_appearance
...
Fix toolbox appearance
2018-05-04 14:25:01 +02:00
Diego Prado Gesto
b00d51a6eb
CURA-4644 Set the property in the component where is being used.
2018-05-04 14:03:26 +02:00
Diego Prado Gesto
6b214d2443
CURA-4644 Change the return type to QObject
2018-05-04 13:05:29 +02:00
fieldOfView
4e305079ec
Simplify
2018-05-04 11:42:45 +02:00
fieldOfView
1f675f505f
Tweak margins
2018-05-04 10:42:03 +02:00
fieldOfView
89322b9db6
Move toolbox button style into theme
2018-05-04 10:41:45 +02:00
Jaime van Kessel
7d2257838b
Added missing typing
2018-05-03 20:42:06 +02:00
Jaime van Kessel
7665f8a7cb
Reading packages from archive now uses With context
2018-05-03 20:22:38 +02:00
Aleksei S
c5e9acf664
Fix: Manually added printer by ip address shows proper printer type
...
CURA-5264
2018-05-03 17:14:56 +02:00
ChrisTerBeke
b62b682570
Make Qt network redirects work in both 5.8 and 5.9+
2018-05-03 13:33:32 +02:00
Diego Prado Gesto
7850f5a18e
Merge branch 'master' of github.com:Ultimaker/Cura
2018-05-03 09:30:29 +02:00
Diego Prado Gesto
65a6c751cd
Change attribute of the download request to follow redirects. That makes the download feature of the Toolbox compatible with Qt 5.8.2.
2018-05-03 09:29:04 +02:00
fieldOfView
c2c5228eee
Fix plugin details
...
Previous fix for QML warnings broke the details display.
2018-05-02 23:19:13 +02:00
fieldOfView
685b80fc3a
Fix more QML warnings
2018-05-02 21:56:23 +02:00
fieldOfView
0aadaa3c9d
Merge branch 'master' into fix_toolbox_appearance
...
# Conflicts:
# plugins/Toolbox/resources/qml/ToolboxDetailPage.qml
2018-05-02 20:37:33 +02:00
fieldOfView
ca8b7bb1da
Fix QML warnings
2018-05-02 20:34:50 +02:00
fieldOfView
46e7a6665d
Theme link colors
2018-05-02 19:20:52 +02:00
fieldOfView
1f542f176d
Fix some more image rendering occurrences
2018-05-02 19:18:03 +02:00
Ian Paschal
5a194bb6d1
CURA-5035 Removed debug statement
2018-05-02 18:43:57 +02:00
Ian Paschal
0872d499f8
CURA-5035 Add compatibility chart
2018-05-02 18:43:12 +02:00
fieldOfView
d326e91008
Fix dpi scaling
2018-05-02 17:54:48 +02:00
fieldOfView
ecbfae2f27
Remove minimise button from toolbox dialog
2018-05-02 17:22:00 +02:00
fieldOfView
132a1a1951
Fix binding loop errors
2018-05-02 17:20:15 +02:00
fieldOfView
00875f0330
Merge branch 'master' into fix_toolbox_appearance
2018-05-02 17:18:43 +02:00
fieldOfView
a3436bb24b
Fix title color on dark theme
2018-05-02 16:25:27 +02:00
fieldOfView
3d0a0da035
Fix text rendering on some OSX systems
2018-05-02 16:22:19 +02:00
fieldOfView
ef436cafbb
Improve thumbnail rendering
2018-05-02 16:13:02 +02:00
Ian Paschal
4e62c58ee6
CURA-5035 No more crash without internet connection
...
Still needs a timer or something to show the fetch failed though.
2018-05-02 14:30:31 +02:00
Ruben D
f7ca8cbf68
Fix binding loop with height of tiles
...
The lining at the bottom of a tile was anchored to the bottom but part of the tile and part of its childrenRect. This caused a binding loop because the childrenRect is dependent on the positioning of this lining (and its height) and the positioning of the lining was dependent on the height of the tile.
Contributes to issue CURA-5035.
2018-05-02 14:28:33 +02:00
Ruben D
2291164a6d
Simplify enabled check for install button
...
That code was a bit wordy there.
Contributes to issue CURA-5035.
2018-05-02 14:28:33 +02:00
Ruben D
14466540f5
Use elide instead of truncating descriptions to 235 characters
...
Just limit it to 3 lines now.
Contributes to issue CURA-5035.
2018-05-02 13:34:24 +02:00
Lipu Fei
554ebb6617
Clean up PackagesModel
...
CURA-5035
2018-05-02 13:06:00 +02:00
Lipu Fei
ad3317a992
Fix docs for VersionUpgrade 3.3 to 3.4
...
CURA-5035
2018-05-02 13:00:02 +02:00
Ruben D
910906b785
Merge branch 'feature_material_marketplace'
2018-05-02 12:42:00 +02:00
Ruben D
0d66850bd4
Code style improvements
...
According to our guidelines: Brackets on new line, spaces around binary operators but not within brackets.
Contributes to issue CURA-5035.
2018-05-02 12:40:59 +02:00
Ian Paschal
87e1f98156
Merge pull request #3663 from Ultimaker/feature_material_marketplace
...
Feature material toolbox; all changes made
2018-05-02 12:23:13 +02:00
Ian Paschal
c2ed2a47e7
CURA-5035 Use elide for text clipping
2018-05-02 12:05:34 +02:00
