GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-04 02:54:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
34,356 Commits 289 Branches 260 Tags
Commit Graph

6082 Commits

Author SHA1 Message Date
Jaime van Kessel
482d773971 Added some hardcoded strings to catalog 2015-09-02 13:37:27 +02:00
Arjen Hiemstra
39b6f81bdf Use machine manager to get the platform width/depth 2015-09-02 12:23:51 +02:00
Arjen Hiemstra
de60fb47bf Remove superfluous log and unneeded hide 2015-09-02 12:23:14 +02:00
Arjen Hiemstra
8833e11cdb Fix machine selection drop down 
Not sure if this was a merge issue or just not properly renamed
 2015-09-02 12:22:37 +02:00
Arjen Hiemstra
82c7dd8d0a Merge branch 'master' of github.com:ultimaker/Cura into per_object_settings 
* 'master' of github.com:ultimaker/Cura:
  15.10 restyling of the sidebar header
 2015-09-01 18:04:06 +02:00
Arjen Hiemstra
c9f62a4eab Remove duplicate i18n catalog 2015-09-01 17:29:37 +02:00
Arjen Hiemstra
f6dbc73d6d Use the right property for active machine instance name 2015-09-01 17:29:25 +02:00
Tamara Hogenhout
3088579aad 15.10 restyling of the sidebar header 
Contributes to: issue CURA-60
 2015-09-01 17:26:35 +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
Arjen Hiemstra
5e3d492aba Set wizard to null so we do not get complaints from QML 2015-09-01 15:07:45 +02:00
Arjen Hiemstra
f7ecc1dc40 Properly set the current index of variant/profile combo boxes 2015-09-01 15:07:13 +02:00
Tamara Hogenhout
3df4d69c37 15.10 restyling of the sidebar header 
Not yet finished

Contributes to: issue CURA-60
 2015-08-31 17:28:36 +02:00
Tamara Hogenhout
33aa5f596f 15.10 restyling of the sidebar 
Contributes to: issue CURA-60
 2015-08-31 17:26:40 +02:00
Jaime van Kessel
dd7e450d1c Added preference to disable automatic scale 
Ultimaker/Cura#142 #CURA-89
 2015-08-28 16:42:11 +02:00
Jaime van Kessel
22feb03d88 Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-08-28 11:44:28 +02:00
Jaime van Kessel
8cbe802881 Added missing ) 2015-08-28 11:44:19 +02:00
Tamara Hogenhout
bd5e85144c Merging of mine and Jaimes work 2015-08-28 10:15:17 +02:00
Jaime van Kessel
ccd95c2ecf Removed font from rectangle 2015-08-27 17:18:44 +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
Jaime van Kessel
4fb577b893 Fixed default button for general and view page 
contributes to Ultimaker/Cura#245
 2015-08-26 15:49:53 +02:00
Jaime van Kessel
87364f37a6 Fixed double ID in qml 2015-08-26 15:37:10 +02:00
Jaime van Kessel
a49ce21fbe Adding a machine now hides if there are no more pages 2015-08-26 15:18:01 +02:00
Jaime van Kessel
97f80914c5 Fixed slice settings sender 2015-08-26 15:09:53 +02:00
Arjen Hiemstra
9a88176f6f Clean up Add Machine Wizard and use the new MachineDefintionsModel 2015-08-25 18:14:48 +02:00
Arjen Hiemstra
1fc4d28864 Use firstRun property for the Add machine wizard 2015-08-25 18:12:24 +02:00
Tamara Hogenhout
534c277b00 15.10 restyling of the layerview slider 
Adds a textfield to the handle for per layer selection and removes the display of the min- and maxvalue

Contributes to: issue CURA-60
 2015-08-25 12:20:13 +02:00
Arjen Hiemstra
f081bf4026 Use the right resource path for locating Qml resources 2015-08-21 18:29:13 +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
21d8eb941b Fixed usage of wrong checkbox in viewpage 2015-08-20 11:55:03 +02:00
Jaime van Kessel
bbf0b92f87 Added preference to disable automatic push free 
fix #49
 2015-08-20 11:53:30 +02:00
Jaime van Kessel
04999a42c8 Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-08-20 10:55:25 +02:00
Jaime van Kessel
f68fdb01b4 Added preference to disable auto center when selecting object 2015-08-20 10:55:13 +02:00
Tamara Hogenhout
b7e9accf75 15.10 Restyling toolbar, viewmode button 
Contributes to: issue CURA-60
 2015-08-19 17:05:59 +02:00
Jaime van Kessel
5cab8b9467 Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-08-19 16:51:47 +02:00
Jaime van Kessel
07c19498f1 Added rudementary 3 point bed leveling 2015-08-19 16:47:48 +02:00
Tamara Hogenhout
ab9cd7793c Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-08-19 14:53:25 +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
43aee84f12 15.10 Changes the label names for the different action buttons 
Contributes to: issue CURA-60
 2015-08-19 14:51:03 +02:00
Jaime van Kessel
d7704a1ae5 Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-08-19 14:35:47 +02:00
Jaime van Kessel
7fda5e9a39 Endstop now stops listening upon destruction 2015-08-19 14:35:35 +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
Jaime van Kessel
83426878d2 Cleaned up code a bit 2015-08-19 11:55:24 +02:00