1449 Commits

Author SHA1 Message Date
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
fieldOfView
6474f3eb25 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 09:12:48 +01:00
Jaime van Kessel
8023341090 Merge branch '2.5' of github.com:Ultimaker/Cura 2017-03-23 15:15:08 +01:00
Lipu Fei
a0f841e8eb Prevent MachineSettings dialog go beyond the top of screen 2017-03-23 13:46:01 +01:00
Lipu Fei
08f6ee319e Use default font for open file dialog text
CURA-3495
2017-03-23 08:46:48 +01:00
Lipu Fei
ef0a502dcf Add { } around statements in "if"
Make nitpicking people happy :P
2017-03-22 21:05:45 +01:00
Lipu Fei
fa7dc3a708 Use onActivated for profile override combobox 2017-03-22 16:01:50 +01:00
Jack Ha
bd10e50249 Merge branch 'master' of github.com:Ultimaker/Cura 2017-03-22 13:24:37 +01:00
Jack Ha
4eff58995d Merge branch '2.5' 2017-03-22 13:24:32 +01:00
Lipu Fei
f9e377ec43 Enable/disable Keep/Discard buttons according to selection 2017-03-22 13:07:58 +01:00
Lipu Fei
12918b02b5 CTRL-P only works when the button is enabled
CURA-3496
2017-03-22 12:01:41 +01:00
Jack Ha
f2eebc165f Merge branch '2.5' 2017-03-21 14:37:42 +01:00
Lipu Fei
2d48809214 Also asks when opening a recent project file
CURA-3495
2017-03-21 13:56:11 +01:00
Lipu Fei
f3167bb84b Add dialog for opening a project file
CURA-3495
2017-03-21 13:56:09 +01:00
Jaime van Kessel
70dbeaf256 Merge branch '2.5' of github.com:Ultimaker/Cura 2017-03-21 13:24:06 +01:00
Lipu Fei
8dbb1d47e1 Shrink the widht of profile override combobox 2017-03-21 11:14:55 +01:00
Lipu Fei
8f3e7c6fa5 More spacing for override profile combobox 2017-03-21 11:05:37 +01:00
Lipu Fei
eaad358e42 Remove shortcut text in the SaveButton 2017-03-21 09:51:07 +01:00
Jaime van Kessel
8a1ad98ed5 Merge branch 'master' of github.com:Ultimaker/Cura 2017-03-21 09:39:27 +01:00
Jaime van Kessel
a8cec631b4 Lowered the required qtquick number for open dialog 2017-03-21 09:39:07 +01:00
Lipu Fei
139bb76806 Add CTRL+P shortcut for save/print button
CURA-3496
2017-03-21 09:28:03 +01:00
Lipu Fei
555cd58f5e Save with code names for profile override preference
CURA-3561
2017-03-21 09:09:17 +01:00
Jack Ha
b6d9fdcd13 Merge branch 'master' of github.com:Ultimaker/Cura 2017-03-20 15:10:14 +01:00
Jack Ha
1faa195c35 Renamed 'Save As' to 'Save As...' CURA-3496 2017-03-20 15:10:01 +01:00
Lipu Fei
892225d398 Move some code to OpenFilesIncludingProjectsDialog.qml
CURA-3495
2017-03-20 14:59:23 +01:00