479 Commits

Author SHA1 Message Date
Arjen Hiemstra
2efcbc3c1f Revert "temporary hack so Ruben can test the update firmware fix"
This reverts commit 7eb9845dedb0f292c837fd02cc876dd8e958c0f9.
2015-11-01 21:32:08 +01:00
Tamara Hogenhout
7eb9845ded temporary hack so Ruben can test the update firmware fix 2015-10-30 16:29:20 +01:00
fieldOfView
9bf3b2a226 Always show "General" page when reopening preferences 2015-10-29 14:29:04 +01:00
Arjen Hiemstra
a94961d28b Remove full screen from menu and disable the shortcut key
Upstream is unfortunately riddled with bugs, so it is better to disable
full screen for now.

CURA-317 #Ready-for-Review
2015-10-26 16:23:49 +01:00
Tamara Hogenhout
4ffbfcf69f Merge branch '15.10' of https://github.com/Ultimaker/Cura into 15.10 2015-10-16 11:02:27 +02:00
Tamara Hogenhout
a7d43efe15 Binds the backspace button to deleteSelection functionality
fixes #CURA-249
2015-10-16 11:02:02 +02:00
Arjen Hiemstra
0b9047f6ca Properly set the current folder on file open
This makes sure the next time the file dialog is opened the last folder
used is openend.

CURA-246 #Start-Review
2015-10-15 09:42:52 +02:00
Arjen Hiemstra
769ff84c15 Delay showing the main window a little so we do not get garbage on the window
CURA-160 #Start-Review
2015-10-14 17:57:00 +02:00
Arjen Hiemstra
03ad005462 Update preference dialog to the changed API 2015-10-05 14:40:02 +02:00
Arjen Hiemstra
a63db94d06 Never disable the view button
Fixes #443
CURA-225 #done
2015-10-01 12:37:17 +02:00
Tamara Hogenhout
4dba1cefcb When you click [Manage Printers..] it brings you to the right page
Fixes: issue CURA-128
2015-09-29 11:07:51 +02:00
Arjen Hiemstra
c486794f33 Delay showing the Add Machine dialog until after the main window is properly shown
Showing the main window causes the Add Machine window to hide apparently
so instead make sure we show the add machine dialog after showing the
main window.

This also handles the "there is no machine" situation a little more
cleanly.
2015-09-24 19:22:00 +02:00
Arjen Hiemstra
d4ea9246f6 Use the job name for saving files
CURA-183 #Done
2015-09-23 18:21:39 +02:00
Tamara Hogenhout
c3036101f4 Adds an inactive states
contributes to: issue CURA-184
2015-09-22 15:32:01 +02:00
Tamara Hogenhout
d6793bc197 adapts the sizes between buttons etc
fixes: issue CURA-194
2015-09-21 14:31:43 +02:00
Tamara Hogenhout
c352c6f369 addapts the sizes of primarily the buttons
fixes: issue CURA-194
2015-09-21 14:14:28 +02:00
Tamara Hogenhout
0765dbe694 adds the sendmeshname functionality to the DropArea
fixes: issue CURA-179
2015-09-18 13:49:49 +02:00
Tamara Hogenhout
f3dd1ca06e Adds some new icons
Contributes to: issue CURA-178
2015-09-17 16:30:35 +02:00
Tamara Hogenhout
aeb935489e Fixes the tooltip placement for the view mode button
Fixes: issue CURA-152
2015-09-16 17:15:21 +02:00
Arjen Hiemstra
fa3edf5086 Delay showing the window until componentComplete
This way most of the UI parsing and construction will be done while the
window is not yet visible, reducing the time we show a window with no
contents.

Contributes to #74
2015-09-12 20:08:41 +02:00
Arjen Hiemstra
14dd919ade Increase sidebar width and set the right viewport size 2015-09-12 20:08:41 +02:00
Arjen Hiemstra
80c5adc59a Add several actions to menus that were missing 2015-09-10 16:30:51 +02:00
Tamara Hogenhout
7ef41d1556 implements the new load file button styling
(so that the mouse-over label can be translated..). The final icon will be added later.

Contributes to: issue CURA-129
2015-09-10 14:57:55 +02:00
Tamara Hogenhout
096065a441 changes some word-usage and the use of capital letters
Contributes to: issue CURA-129
2015-09-10 14:23:47 +02:00
Tamara Hogenhout
34c252b2db Merge branch '15.10' of https://github.com/Ultimaker/Cura into 15.10 2015-09-08 16:30:38 +02:00
Tamara Hogenhout
28aec71c02 adds/adapts translation context markers
all nescessary in folder: Cura/resources

Contributes to: issue CURA-116
2015-09-08 16:30:10 +02:00
Jaime van Kessel
dd0c6f9f41 Extentions with no options are no longer shown
Fixes CURA-118
2015-09-08 15:31:10 +02:00
Tamara Hogenhout
d6fde94e92 15.10 adds a ManageProfilesAction
Moves it from the button to the bottom of the menu

Contributes to: issue CURA-60
2015-09-03 15:50:48 +02:00
Tamara Hogenhout
de8dbb4856 Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-09-02 14:31:21 +02:00
Tamara Hogenhout
02206c5540 15.10 restyling Sava-button
solves problem with the buttonsize and adds a filename to the textfield

Contributes to: issue CURA-60
2015-09-02 14:30:43 +02:00
Arjen Hiemstra
57b2ce4f3e Merge branch 'master' of github.com:ultimaker/Cura into per_object_settings
* 'master' of github.com:ultimaker/Cura: (49 commits)
  15.10 restyling of the sidebar header
  15.10 restyling of the sidebar header
  15.10 restyling of the sidebar
  split magic_mesh)surface_mode into Normal, Surface, Both
  Added preference to disable automatic scale
  Removed unused import
  Added changeLog plugin
  Added missing )
  Merging of mine and Jaimes work
  Removed font from rectangle
  JSON: git diff! removed triangles and grid top/bottom skin options (though they are available)
  Code style & switch to translation catalog
  15.10 re-alignment of the toolbar
  15.10 New Icons
  15.10 restyling of the savebutton Area
  Added message asking about sending data to server
  Added exception handling for checking overlap.
  Fixed default button for general and view page
  Fixed double ID in qml
  Removed unused import
  ...
2015-09-01 15:44:19 +02:00
Arjen Hiemstra
6306bb8901 Add toggle fullscreen action to view menu 2015-09-01 15:19:40 +02:00
Arjen Hiemstra
7161ed63aa Use rowCount() not count for getting devicesModel's row count 2015-09-01 15:08:15 +02:00
Jaime van Kessel
74a1a5f6f1 Fixed merge issues 2015-08-27 16:09:42 +02:00
Jaime van Kessel
d195c859a2 Code style & switch to translation catalog 2015-08-27 16:04:02 +02:00
Tamara Hogenhout
3d5f4e6bd6 15.10 re-alignment of the toolbar
This is a test to be reviewed

Contributes to: issue CURA-60
2015-08-27 14:59:33 +02:00
Tamara Hogenhout
55f51a53b6 15.10 restyling of the savebutton Area
More elaborate shortdescription for especially the outputdevices still have to be implemented. And the filename textfield is not finished.

Contributes to: issue CURA-60
2015-08-27 14:29:44 +02:00
Arjen Hiemstra
1fc4d28864 Use firstRun property for the Add machine wizard 2015-08-25 18:12:24 +02:00
Arjen Hiemstra
f099c30dfd Merge branch 'master' of github.com:ultimaker/Cura into per_object_settings
* 'master' of github.com:ultimaker/Cura: (98 commits)
  15.10 Restyling of the message stack
  Fixed machine head polygons
  Removed unused settings from fdmprinter
  Added action for togling fullscreen
  Fixed usage of wrong checkbox in viewpage
  Added preference to disable automatic push free
  Added preference to disable auto center when selecting object
  Cleanup
  15.10 Restyling toolbar, viewmode button
  Update README.md
  Update README.md
  Added rudementary 3 point bed leveling
  15.10 New font for Cura
  15.10 Changes the styling for the open file button
  15.10 Changes the label names for the different action buttons
  Fixed typo
  Endstop now stops listening upon destruction
  15.10 Re-alignment of the messagestack
  Cleaned up code a bit
  Added heated bed check
  ...
2015-08-21 13:29:30 +02:00
Tamara Hogenhout
3cb3cce31c Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-08-21 10:55:44 +02:00
Tamara Hogenhout
720577ff8e 15.10 Restyling of the message stack
specifically the progressbar, styling of the messages and colors

Contributes to: issue CURA-60
2015-08-21 10:54:39 +02:00
Jaime van Kessel
5f844d4039 Added action for togling fullscreen
Contributes to CURA-52
2015-08-20 13:33:10 +02:00
Jaime van Kessel
bbf0b92f87 Added preference to disable automatic push free
fix #49
2015-08-20 11:53:30 +02:00
Tamara Hogenhout
2df2c9c6c8 15.10 Changes the styling for the open file button
Everything related to the font is not changed yet, first we have to agree on the chosen font

Contributes to: issue CURA-60
2015-08-19 14:52:38 +02:00
Tamara Hogenhout
b799acafab 15.10 Re-alignment of the messagestack
Contributes to: issue CURA-60
2015-08-19 12:18:01 +02:00
Arjen Hiemstra
a425036c4c Merge branch '15.06'
* 15.06:
  Fix poor visibility of MessageStack against grid
  Fix USB printer detection and reconnect after firmware update on MacOSX
  Correct the icon for the Cura .desktop file
  Bump version
  support defaults to ZigZag instead of Lines
  Fix the platform activity check
2015-08-18 17:59:16 +02:00
Tamara Hogenhout
42fd35a8c2 15.10 Placement of the buttons in the contentArea
Contributes to: issue CURA-60
2015-08-17 17:22:58 +02:00
Arjen Hiemstra
900e733839 Add a combo box and menu entries to select the current machine variant 2015-08-11 17:36:05 +02:00
Arjen Hiemstra
09cfda095b Convert the last bits over to the changed API 2015-08-11 17:02:17 +02:00
Arjen Hiemstra
842689d88e Update all uses of the Resources API with the changed API 2015-08-05 17:26:52 +02:00