479 Commits

Author SHA1 Message Date
Arjen Hiemstra
4de4053490 Properly implement "set as active extruder" menu entry
Contributes to CURA-2006
2016-08-04 02:08:06 +02:00
fieldOfView
0c8d0a11a9 Fix a couple of qml casting errors 2016-08-01 15:22:21 +02:00
fieldOfView
e01c8a4f10 Add Select All functionality 2016-07-29 19:25:40 +02:00
Jaime van Kessel
1ed0503e02 Backspace now triggers same action as delete
CURA-1891
2016-07-29 10:37:03 +02:00
Jaime van Kessel
bb4d4e7807 Moved viewmode in order so the tooltip is displayed over per-object settings panel
CURA-1651
2016-07-20 11:01:38 +02:00
Jack Ha
7731f9406c Dialog_profile/material/load_path is now saved and used.
CURA-1900
2016-07-19 15:59:44 +02:00
Arjen Hiemstra
0e6a46c9eb Use a simpler fix for dealing with QML Action's shortcuts not working
It is a bit more magical (hence the added documentation) but it makes
things a lot more transparent. This prevents a lot of future issues.

Contributes to CURA-1603
2016-07-18 16:52:33 +02:00
Jaime van Kessel
3e4ff9241e Moved the BlurSettings signal to cura main window
This reduces the number of focus changes from O(N) to O(1) by the blur event
2016-07-18 15:38:57 +02:00
Jaime van Kessel
3e908824b9 Added workaround for singleton not getting shortcuts
CURA-1603
2016-07-18 15:16:20 +02:00
fieldOfView
6eb502730c Add reusable messagebox based on QML MessageDialog
Contributes to CURA-1730 and CURA-1850
2016-07-08 11:24:37 +02:00
Arjen Hiemstra
7008e047f6 Merge branch 'master' of github.com:ultimaker/Cura into feature_material_editing
* 'master' of github.com:ultimaker/Cura: (76 commits)
  Added UMO upgrade selection
  Added stubs for UMO upgrade selection
  Machine action labels are now translatable
  Code style CURA-1676
  Using the correct placeholder
  SplashScreen: Using system-default fontfamily
  USBPrinting: Let's "Print via USB"
  BQ Hephestos2 - Preheating temperature fix When starting a print with the "custom" GCode by BQ, the printer resets the nozzle temperature to 210°C when printing via SD card (no matter what you set on Cura) and only preheats the nozzle to 180°C when printing via USB. So currently the printer begins to print via USB at 180°C and reaches the correct temperature eg.g while printing the brim.
  Fix warning about missing color in theme
  Automatically show the Print Monitor when starting a print
  Fix USBPrinterOutputDevice to work with the Print Monitor
  Properly prevent warning when no printer is connected.
  ZOffset decorator is now correctly copied
  Force focus instead of requesting it.
  Fix two "critical errors" on startup
  Minor check machine action GUI improvements
  Prevent warning when no printer is connected.
  Fix empty material/quality profiles when switching variants
  Disable monitor buttons when there is no job running
  Move message stack "above" the viewport overlay
  ...
2016-07-04 11:45:59 +02:00
fieldOfView
3ea4983a23 Move message stack "above" the viewport overlay
CURA-1036
2016-06-30 11:02:15 +02:00
Arjen Hiemstra
0270aecdc3 Replace separate machine/profile menus in menubar with a single "Settings" menu
Contributes to CURA-342
2016-06-28 17:43:28 +02:00
Arjen Hiemstra
1a56da464c Introduce a "Manage Materials" action
Contributes to CURA-342
2016-06-28 17:42:47 +02:00
Arjen Hiemstra
842015ea10 Move all the menus to individual QML files to make it easier to reuse them
Contributes to CURA-342
2016-06-28 17:32:50 +02:00
fieldOfView
9ac5b0ecf7 Fix warning about property id of null in Cura.qml
CURA-1585
2016-06-28 17:04:28 +02:00
fieldOfView
55af0af755 Merge branch 'master' into feature_print_monitoring
# Conflicts:
#	resources/qml/Cura.qml
2016-06-24 14:55:12 +02:00
fieldOfView
00ad7b23ff Prevent QML warnings when there is no connected printer
CURA-1036
2016-06-24 13:39:24 +02:00
fieldOfView
e8743abe68 Set a sensible minimum width for the window 2016-06-23 18:44:06 +02:00
fieldOfView
fe05aa18cb Resize camera-image with viewport
CURA-338
2016-06-23 17:27:12 +02:00
fieldOfView
6d9eb4028e Merge branch 'master' into feature_print_monitoring
# Conflicts:
#	cura/CuraApplication.py
2016-06-23 15:53:53 +02:00
Jaime van Kessel
3f3a93ae8a Refactoring; Renaming firstRunWizard to machineActionsWizard
CURA-1385
2016-06-23 11:12:58 +02:00
Jaime van Kessel
d5b07d29de Actions are now reset before every run
CURA-1385
2016-06-22 14:39:41 +02:00
fieldOfView
1c83b15290 Tweak viewport overlay
Change color, opacity. Block mouseclicks.
CURA-1036
2016-06-22 14:22:35 +02:00
Jaime van Kessel
8cfc0737ac First run actions are now properly handled
CURA-1385
2016-06-22 11:49:35 +02:00
Jaime van Kessel
a735e92dfa Added camera image overlay when monitoring print
CURA-1036
2016-06-16 11:01:58 +02:00
fieldOfView
aeccfe3509 Rearrange preferences
Merges general & view into a single page
Introduces sections on general page
Cleans up code
2016-06-12 15:25:39 +02:00
fieldOfView
0d7a7d9299 Update wording to make storing/updating/discarding current settings more clear
CURA-970
2016-06-09 19:18:46 +02:00
fieldOfView
d34d398e96 Change the implementation of creating a profile from the current settings
The newly created profile now combines the settings of the active quality profile and the current settings

CURA-970, CURA-1585
2016-06-09 18:40:42 +02:00
Arjen Hiemstra
4a43b50b7a Remove unused action properties from Sidebar 2016-06-09 15:07:57 +02:00
fieldOfView
cd803bc36e Determine readonly state from location in filesystem instead of a metadata property
CURA-1684
2016-06-09 13:16:23 +02:00
fieldOfView
a2def606c6 Fix Profile (application-)menu and add separators to profiles dropdown
CURA-1585
2016-06-06 17:10:56 +02:00
Arjen Hiemstra
0a9382aa11 Fix exclusiveGroup for machine selection in the menu
Contributes to CURA-1278
2016-06-04 21:22:21 +02:00
Jaime van Kessel
d29cc37d6b Adds way to convert user settings into quality settings
CURA-1585
2016-06-03 11:58:59 +02:00
fieldOfView
bb18bf6a30 Fix creating a jobname after loading a file
Moves jobname creation out of qml and into python.
CURA-1619
2016-06-02 16:38:06 +02:00
fieldOfView
ffa6a0376d Fix typo
Contributes to CURA-1540, CURA-1278
2016-06-01 21:44:56 +02:00
Arjen Hiemstra
3b51c3d339 Remove qmldir from qml resources and use proper Cura namespace for everything
Since we now properly expose all the qml files in the Cura namespace
we should also use it from there.
2016-05-31 18:07:33 +02:00
fieldOfView
6aa00a951f Fix triggering actions from the extensions menu
Contributes to CURA-1540, CURA-1278
2016-05-27 17:21:14 +02:00
fieldOfView
f7f9dc036e Show correct page when opening profile manager
CURA-1278
2016-05-26 09:42:44 +02:00
Arjen Hiemstra
386aec32a8 Merge branch 'settings_rework'
Contributes to CURA-1278

* settings_rework: (224 commits)
  Improve slice trigger documentation
  Import Cura in materials preferences page so we can use the active definition id
  Add layer height to high quality profile so we have something that changes
  Update example XML material to use the right product names
  Filter available materials by the machine definition
  Show the add machine dialog when we do not have an active machine
  Create machine-specific material containers for machine specific overrides in XML material files
  When creating a new container stack, add empty containers for things where we cannot find containers
  Add preferred variant, material and quality to UM2+ definition
  Account for global container stack being None in the backend plugin
  Use the global stack instance variable and account for it potentially being None
  Store the global container stack as an instance property
  Added wildcard to filtering
  Per object settings filter now uses correct bool types (instead of strings)
  Removed stray = sign.
  Fix creating print job name
  Disable asynchronous loading of SettingItem when Qt Version < 5.5
  Document QTbug
  Properly serialise all settings to g-code file
  Document GCodeWriter class
  ...
2016-05-25 15:12:25 +02:00
Arjen Hiemstra
2654033fae Show the add machine dialog when we do not have an active machine 2016-05-25 11:31:48 +02:00
Ghostkeeper
c80455c6bc
Fix creating print job name
Also fixed up the code style of that bit.

Perhaps this should've been done in Python, but that is for later.

Contributes to issue CURA-1278.
2016-05-24 15:04:08 +02:00
Arjen Hiemstra
f90be96bc6 Add back the Profiles page 2016-05-23 18:21:23 +02:00
Arjen Hiemstra
8284ab9de5 Insert printers and materials pages at the right location 2016-05-23 18:21:23 +02:00
Arjen Hiemstra
b452cf7ba4 Add a materials management page
Based off Aldo's work which is in a different branch
2016-05-23 02:19:11 +02:00
Jaime van Kessel
6d25d21126 getting id of definition when none was found no longer causes exception
CURA-1278
2016-05-17 12:55:40 +02:00
Jaime van Kessel
dd24e488a8 Materials & variants are now correctly checked when active
CURA-1278
2016-05-13 12:04:38 +02:00
Jaime van Kessel
5dbe0bdc03 Machine variants can now be selected from dropdown menu
CURA-1278
2016-05-13 11:46:54 +02:00
Jaime van Kessel
d8e4aa9078 Moved machinePage to Cura
CURA-1278
2016-05-12 11:24:09 +02:00
Jaime van Kessel
133229d086 Merge branch 'settings_rework' of https://github.com/Ultimaker/Cura into settings_rework 2016-05-12 09:31:43 +02:00