GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-29 09:38:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,059 Commits 294 Branches 267 Tags
Commit Graph

1423 Commits

Author SHA1 Message Date
Ghostkeeper
39fbe542b9
Fix font rendering issues in job spec details 
Labels render with system settings. Text renders with our settings.

Contributes to issue CURA-3389.
 2017-04-14 16:08:12 +02:00
Mark
bfda8712e1 Change all Label to Text so fonts are rendered correct 
CURA-3389
 2017-04-14 13:16:48 +02:00
Mark
81ab6dd754 Merge branch 'master' of github.com:Ultimaker/Cura 2017-04-14 11:41:29 +02:00
Mark
8ede111001 Texts in the mainwindow should be Text instead of Label 
CURA-3389
 2017-04-14 11:41:12 +02:00
Jaime van Kessel
397b08ce6d Merge branch 'feature_filter_materials_by_diameter' of git://github.com/fieldOfView/Cura 2017-04-14 11:22:35 +02:00
Mark
c0f35a620a Use the correct i18n catalog name for translations in the right-click menu 
CURA-3660
 2017-04-13 13:52:11 +02:00
Tim Kuipers
ef9b705cc4 Merge remote-tracking branch 'origin/feature_support_mesh' 2017-04-13 11:13:25 +02:00
Ghostkeeper
f35124400b
Merge branch '2.5' 2017-04-13 09:50:27 +02:00
Ghostkeeper
cf25eeea5f
Remove Japanese and Korean translations 
They are not complete (by far).

Contributes to issue CURA-3487.
 2017-04-13 09:39:10 +02:00
fieldOfView
e92aaca7b6 Filter materials by the (approximate) material diameter of the printer 
If a machine defines material diameter of 2.85mm, there is no use to show the 1.75mm materials and vice-versa
 2017-04-12 23:03:58 +02:00
Lipu Fei
5945212e4b Remove pixel ratio for childrenRect in OpenFilesIncludingProjectsDialog 
CURA-3642
 2017-04-12 08:55:17 +02:00
Lipu Fei
f4e1212005 Use screen pixel ratio for OpenFilesIncludingProjectsDialog 
CURA-3642
 2017-04-12 08:43:48 +02:00
Jaime van Kessel
bc78bf94ab Fixed buttons not visible on my screen 
CURA-3642
 2017-04-10 14:06:10 +02:00
Lipu Fei
1965b02fdf Fix size problem for open project dialog 
CURA-3642
 2017-04-06 14:28:45 +02:00
Jack Ha
07ed1bedc3 Fix boo boo with open multi files including project files. 2017-04-05 16:07:02 +02:00
Jaime van Kessel
ecf905f580 Merge branch 'feature_arrange_cleanup' of github.com:Ultimaker/Cura 2017-04-05 10:45:42 +02:00
Lipu Fei
6b9d3e8041 Merge pull request #1636 from fieldOfView/fix_recent_dialogs 
Fix issues with Workspace and Profile Changes dialogs
 2017-04-04 14:35:12 +02:00
jack
0ad344f91d Merge pull request #1640 from Ultimaker/bugfix_CURA-3421_per_model_combobox 
CURA-3421 Set SettingsComboBox value if we get undefined from resolve
 2017-04-04 10:57:42 +02:00
Ghostkeeper
db4854702b
Add Japanese and Hangul to the language drop-down 
These are partial translations at the moment, and normally we don't allow them in the drop-down then. But this is an exception, orders from higher up.

Contributes to issue CURA-3487.
 2017-04-04 09:05:12 +02:00
Ghostkeeper
a127d463bc
Add Japanese and Hangul to the language drop-down 
These are partial translations at the moment, and normally we don't allow them in the drop-down then. But this is an exception, orders from higher up.

Contributes to issue CURA-3487.
 2017-04-04 09:04:45 +02:00
Tim Kuipers
7f07be3444 JSOn rename: Enable Support ==> Generate Support (CURA-2747) 
The generate support settings has been renamed because support will still be printed even when it is not generated by the engine,
but given by a support mesh
 2017-04-03 17:11:57 +02:00
Jack Ha
a83b1dd638 Split ShapeArray from Arranger. CURA-3239 2017-04-03 14:48:31 +02:00
Lipu Fei
6153fd70a8 Set SettingsComboBox value if we get undefined from resolve 
CURA-3421
 2017-04-03 11:10:05 +02:00
Lipu Fei
f57e866119 Move custom functions into FileDialog 
CURA-3495
 2017-04-03 10:58:26 +02:00
Jack Ha
abb5d1e76e Arranger: moved functions, split Arrange into Arrange All and Arrange Selection. CURA-3239 2017-04-03 10:40:04 +02:00
fieldOfView
fd09a1959b Simplify margins and make them DPI aware 2017-04-02 15:54:06 +02:00
fieldOfView
ed8954c1db Replace font.pixelSize with DPI-aware font.pointSize 
This also uses the same pointSize as eg the PreferencesPage.qml uses
 2017-04-02 15:31:35 +02:00
fieldOfView
2e1dd46ea4 Replace hardcoded color with system-theme color 2017-04-02 14:38:11 +02:00
fieldOfView
c3e19b5ecb Add missing import for Screen.devicePixelRatio to work 2017-04-02 14:36:40 +02:00
fieldOfView
d536bbd6b9 Fix Hi DPI issues with Workspace and Profile Changes dialogs 2017-04-02 12:38:41 +02:00
Ghostkeeper
dd2c25868b
Allow strings with actual text 
Previously string fields would only accept numbers, which is ridiculous.
 2017-03-30 20:57:23 +02:00
Jaime van Kessel
f82aecb7ca Refactoring; no longer use "Printer" to identify CuraApplication 2017-03-30 20:19:05 +02:00
jack
a8be748df7 Merge pull request #1599 from Ultimaker/feature_CURA-3495_open_menu 
CURA-3495 Open project/files menu
 2017-03-29 12:58:24 +02:00
Lipu Fei
e92c21af28 Remove FIXME 
CURA-3495
 2017-03-29 12:53:19 +02:00
Lipu Fei
42b8f06e99 Ignore gcode when selected multiple files 
CURA-3495
 2017-03-29 12:52:56 +02:00
Jack Ha
02bb575ced Fixed extruder per gcode layer. Created show_caution preference for gcode reader. CURA-3390 2017-03-29 10:56:36 +02:00
Lipu Fei
208935960f Add comments for putting open file logic in qml 
CURA-3495
 2017-03-28 15:02:50 +02:00
Lipu Fei
e4af8e36bb Fix dialog text for opening multiple files with project(s) 
CURA-3495
 2017-03-28 14:38:26 +02:00
Lipu Fei
1fc7120fff Fix dialog text "file(s)" -> "files" 
CURA-3495
 2017-03-28 14:27:40 +02:00
Lipu Fei
5bec46a29c Drag-and-drop files behave the same as open file menu 
CURA-3495
 2017-03-28 14:27:40 +02:00
Jack Ha
bf08d30e7d Added first arrange function and smart placement after loading. CURA-3239 2017-03-28 14:27:22 +02:00
Tim Kuipers
7a67ab4e66 Merge branch '2.5' 2017-03-28 12:55:18 +02:00
Jaime van Kessel
6367755875 Disabled center_on_select for windows, as pyqt has a bug with it 2017-03-28 10:21:52 +02:00
Lipu Fei
50266f760b
Revert "Prevent MachineSettings dialog go beyond the top of screen" 
This reverts commit a0f841e8eb2e3fc41a5d053232ea29cf538e30be.
 2017-03-27 16:00:08 +02:00
Jaime van Kessel
88704051d1 Filter bar is now always visible 
CURA-3574
 2017-03-27 15:47:30 +02:00
Lipu Fei
6644a4d386 Revert "Prevent MachineSettings dialog go beyond the top of screen" 
This reverts commit a0f841e8eb2e3fc41a5d053232ea29cf538e30be.
 2017-03-27 11:09:40 +02:00
Jaime van Kessel
dafeab4e8a Merge branch 'feature_CURA-3495_open_menu' of github.com:Ultimaker/Cura 2017-03-24 11:52:26 +01:00
fieldOfView
33f20710d9 Ups the limit of the maximum cost of a spool of filament 
This is necessary for currencies such as Japanese Yen or South Korean Won, where prices can easily exceed 1000. This PR sets the limit to 100,000,000. If the price of a spool exceeds this amount, perhaps the user should consider moving to a more stable country.

Fixes https://github.com/Ultimaker/Cura/issues/1567
 2017-03-24 11:23:40 +01:00
Ghostkeeper
e76c3f72e7
Lower QtQuick requirement further to 2.2 
2.2 is required for the modifications we make to the Button objects.
 2017-03-24 10:49:46 +01:00
Lipu Fei
7ad5a64b91 Add msg dialog for ignoring gcode in multiple file selection 
CURA-3495
 2017-03-24 09:53:12 +01:00