GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-11 22:09:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
23,916 Commits 290 Branches 260 Tags
Commit Graph

23916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jaime van Kessel
476533b416 Merge pull request #310 from fieldOfView/fix_buildvolume_brokenprofile 
Fix crash when a profile cannot be loaded
 2015-09-02 15:03:05 +02:00
Jaime van Kessel
34a31bc61a Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-09-02 14:49:53 +02:00
Jaime van Kessel
610792a077 Updated slice info for new API 2015-09-02 14:49:43 +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
4861e98624 Updated sliceobjectlistjob to new API 2015-09-02 14:30:36 +02:00
Jaime van Kessel
fc4f8da242 Added logging when not slicing due to error values 2015-09-02 14:05:49 +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
ac2184ef71 Use profile for getting setting values 2015-09-02 12:21:03 +02:00
Jaime van Kessel
63ddfccd52 updated cura application to new API 2015-09-02 11:23:09 +02:00
Jaime van Kessel
b16933d68f Fix of crash caused by merge 2015-09-02 11:10:05 +02:00
Jaime van Kessel
7d2eb5468c Reverted to older version of the proto file so it no longer crashes 2015-09-02 09:51:32 +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
Arjen Hiemstra
5aa95f1258 Use the active machine instance for Build Volume 2015-09-01 15:06:03 +02:00
Arjen Hiemstra
510f5978f0 Remove most of the PrintInformation code and fix the material amount to use profile 2015-09-01 15:05:31 +02:00
Arjen Hiemstra
1f82e83093 Use SettingOverrideDecorator::getAllSettingValues to get per-object settings 2015-09-01 15:04:55 +02:00
Arjen Hiemstra
f618b54d69 Connect to MachineManager's addMachineRequested so we can show the add printer dialog 2015-09-01 15:03:59 +02:00
Arjen Hiemstra
47e96a9e2a Fix ConvexHull{Decorator,Job} to work with the new profile structure 2015-09-01 15:03:29 +02:00
fieldOfView
b3cb24f76a Fix crash when a profile cannot be loaded, which caused the width & height of the buildvolume to be set to None 2015-09-01 15:03:22 +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
709ec79918 Removed unused import 2015-08-28 16:31:47 +02:00
Jaime van Kessel
ff9a222097 Added changeLog plugin 2015-08-28 16:24:38 +02:00