3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-14 02:07:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
34356 commits 302 branches 270 tags 770 MiB
Commit graph

15419 commits

Author SHA1 Message Date
Jaime van Kessel
b1a5ae4895 Fixed save button 2015-09-04 10:51:07 +02:00
Tim Kuipers
6d207a75d1 Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-09-04 10:12:20 +02:00
Tim Kuipers
77f894d8a4 JSON: Fuzzy mode changes 2015-09-04 10:12:07 +02:00
Arjen Hiemstra
5e332c4cb2 Merge branch 'master' of https://github.com/ultimaker/cura 2015-09-03 10:19:01 -07:00
Arjen Hiemstra
7083ffd351 Use a minimum size for the save button 2015-09-03 10:14:45 -07:00
Arjen Hiemstra
690bd7b861 Fix add machine pages for UMO/+ 2015-09-03 10:14:17 -07:00
Arjen Hiemstra
73ec6e9f1c Use resolvedUrl since that does give the right path for qml files 2015-09-03 10:13:47 -07:00
Tim Kuipers
2ecdac441f Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-09-03 18:34:48 +02:00
Tim Kuipers
4579fe729f feat: fuzzy skin magic mode 2015-09-03 18:33:58 +02:00
Tamara Hogenhout
4897c9392a 15.10 last minute restyling 
Contributes to: issue CURA-60
 2015-09-03 17:06:41 +02:00
Tamara Hogenhout
04d1ae0b22 15.10 minimal version of the simple mode 
Contributes to: issue CURA-60
 2015-09-03 16:42:47 +02:00
Tamara Hogenhout
a0c2bbb812 15.10 disables the savebutton textfield 
Contributes to: issue CURA-60
 2015-09-03 15:51:18 +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
a839371832 15.10 rework of the automatic filename functionality 
Contributes to: issue CURA-60
 2015-09-02 17:59:20 +02:00
Tamara Hogenhout
546872aa87 15.10 restyling of the profile setup 
Contributes to: issue CURA-60
 2015-09-02 16:34:37 +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
Jaime van Kessel
a9208ccf3f Fixes namechanges caused by api change 2015-09-02 13:50:04 +02:00
Jaime van Kessel
0daf2301a7 Addded string to catalog 2015-09-02 13:38:59 +02:00
Jaime van Kessel
c094344ae7 Enforcing coding convention 2015-09-02 13:38:06 +02:00
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
5a3e780ef6 Replace all active_if with enabled functions 2015-09-02 12:21: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
Arjen Hiemstra
0cda05ae92 Change "active_if" to "enabled" for all Wireframe settings 2015-09-01 17:28:58 +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
90a7368fce Fix options that were added to master to be dictionaries rather than arrays 2015-09-01 17:25:37 +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
2d92bd660f Set enabled property to false instead of visible for material settings in UM2 2015-09-01 15:19:20 +02:00
Arjen Hiemstra
251ce2f73d Change active_if to enabled functions 2015-09-01 15:18:44 +02:00
Arjen Hiemstra
516c0cd516 Change all min/max/warning values in fdmprinter to functions 2015-09-01 15:18:26 +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
9fd5ea4f9f 15.10 restyling of the sidebar header 
Not yet finished

Contributes to: issue CURA-60
 2015-08-31 17:27:53 +02:00
Tamara Hogenhout
33aa5f596f 15.10 restyling of the sidebar 
Contributes to: issue CURA-60
 2015-08-31 17:26:40 +02:00
Tim Kuipers
5cbeed753c Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-08-31 14:32:21 +02:00
Tim Kuipers
2b396814ca split magic_mesh)surface_mode into Normal, Surface, Both 2015-08-31 14:31: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
Tim Kuipers
75cf4c922a Merge branch 'master' of 
https://github.com/Ultimaker/Cura
 2015-08-28 09:20:56 +02:00
adamarumjahn
99ff043596 Update innovo-inventor.json 
added manufacturer and author
 2015-08-27 12:48:50 -05:00