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

3755 Commits

Author SHA1 Message Date
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
Jaime van Kessel
f1efcea088 Added missing checks 2015-09-08 09:46:38 +02:00
Jaime van Kessel
995c077627 Fixed wrong saving of preferences. 
Fixes #Cura-110
 2015-09-08 09:30:45 +02:00
Jaime van Kessel
0530f107c7 Fixed qml undefined errors 2015-09-07 15:17:15 +02:00
Jaime van Kessel
a5720adb66 State is now only changed when its different 
Fixes Ultimaker/Cura#327
 2015-09-07 14:44:57 +02:00
fieldOfView
4c1e0907ab Change the default UMO uprade options 2015-09-04 22:39:31 +02:00
Jaime van Kessel
3f85b4aafd Added extra checks to ultimaker checkup to prevent error messages 2015-09-04 11:48:34 +02:00
Jaime van Kessel
b1a5ae4895 Fixed save button 2015-09-04 10:51:07 +02:00
Arjen Hiemstra
7083ffd351 Use a minimum size for the save button 2015-09-03 10:14:45 -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
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
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