GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-22 13:49:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
22,028 Commits 287 Branches 260 Tags
Commit Graph

61 Commits

Author SHA1 Message Date
Diego Prado Gesto
111430c9c2 Catch scroll events and not propagate them to the main view 2019-05-09 11:37:59 +02:00
Jaime van Kessel
b70a4ae0a2 Merge branch 'CURA-6015_fix_osx_crash' of github.com:Ultimaker/Cura into 4.0 2018-12-14 13:35:37 +01:00
Jaime van Kessel
6a3ac99551 Ensure that all icons use the same color from theme. 
Also added some fixes for the dark theme
 2018-12-14 11:59:22 +01:00
Lipu Fei
620790ae3d Reduce the creations of ExtrudersModels 
CURA-6015
 2018-12-13 14:12:23 +01:00
Ghostkeeper
b5bb3232f3
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 
Conflicts:
	resources/qml/ActionPanel/OutputProcessWidget.qml -> Due to removed theme entry.
 2018-12-04 15:21:36 +01:00
Diego Prado Gesto
57a852a15a Don't show the background if there are less than 2 extruders to show in the Toolbar 
It caused a very tiny rectangle if the printer has only 1 extruder.

Contributes to CURA-5984.
 2018-12-04 09:19:08 +01:00
Ghostkeeper
7df4c01814
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 
Conflicts:
	cura/Settings/MachineManager.py -> rowCount vs. count
	resources/qml/ExtruderIcon.qml -> Someone changed stuff that I had overwritten.
	resources/qml/Menus/ConfigurationMenu/PrintCoreConfiguration.qml -> Someone changed stuff that I had removed.
	resources/qml/Toolbar.qml -> Git was wrong, not a conflict.
	resources/themes/cura-light/theme.json -> Git was wrong, not a conflict.
 2018-12-03 11:45:05 +01:00
Ghostkeeper
f3af5a72ad
Use ListModel.count instead of rowCount 
The .count property properly updates when the model is changed.

Contributes to issue CURA-5876.
 2018-12-03 11:13:26 +01:00
Jaime van Kessel
bfebb33123
Code style 
CURA-5984

Co-Authored-By: diegopradogesto <d.pradogesto@ultimaker.com>
 2018-11-28 10:28:16 +01:00
Diego Prado Gesto
c1c5eb2219 Rename the properties to quickly identify that they are a boolean 
Contributes to CURA-5984.
 2018-11-28 09:44:37 +01:00
Diego Prado Gesto
14b460a626 Remove unused styles 2018-11-27 17:25:10 +01:00
Diego Prado Gesto
309061ce31 Add a new ToolbarButton 
Now also the Extruder button is a toolbar button since it will show in
the toolbar.
 2018-11-27 17:16:52 +01:00
Diego Prado Gesto
cbee18597e Merge branch 'ui_rework_4_0' into CURA-5785-Restyle_stage_menu 2018-11-21 16:59:03 +01:00
Diego Prado Gesto
669648d3e1 Improve the toolbar style by modifying the rectangles and the behavior 
to get a rounded rectangle on the right-top and right-bottom.

Contributes to CURA-5962.
 2018-11-20 16:28:21 +01:00
Jaime van Kessel
783fe9ab73 Updated the look of the extruder buttons 
CURA-5785
 2018-11-12 15:23:58 +01:00
Diego Prado Gesto
9bf18031ce Apply restyle of the toolbar according to the new designs. 2018-11-11 19:15:02 +01:00
Ghostkeeper
f247c328c6
Show shortcut key in tool tooltips 
In brackets. I couldn't translate it to an icon easily. It was possible but I'd have to create a giant mapping from every key to the key icons and add a bunch of icons and I don't think that's necessary.

Contributes to issue CURA-5634.
 2018-08-10 11:22:42 +02:00
Ghostkeeper
4a22bb3b69
Code style 2018-08-10 11:22:42 +02:00
Mark
b531c0550d Change Math.floor to Math.round as a last try to fix garbled fonts 
CURA-4941
 2018-02-14 09:28:47 +01:00
Mark
b52bf6decf resolve conflict 2018-02-09 13:01:56 +01:00
Jaime van Kessel
a7e1017aa2 Added some missing widths en heights 
GammaRay complained about some objects not having a size
 2017-10-12 19:14:22 +02:00
Mark
9a193ad5c5 Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
fieldOfView
0308d3d9d0 Fix margin between tools and extruders 2017-09-27 11:46:42 +02:00
fieldOfView
c5fd0e6c80 Use screenScaleFactor to consistently adapt sizes to display pixel ratio 2017-09-25 22:07:12 +02:00
ChrisTerBeke
11241642b3 CURA-4354 fixed plugin injected tool icon path finding, example in PerObjectSettingsTool 2017-09-22 16:15:38 +02:00
Jaime van Kessel
78987ba666 When tool icon can not be found in theme, try to find it in the plugin folder 
CURA-4345
 2017-09-21 15:19:00 +02:00
fieldOfView
82d3a98f95 Hide the extruder button for Custom FDM Printers with 1 extruder 2017-07-12 14:47:38 +02:00
fieldOfView
5fec3d4f6d Replace mock borders with true borders 2017-07-03 16:04:18 +02:00
Arjen Hiemstra
80bf6988ca Remove unnecessary Catalog and SettingPropertyProvider 2017-04-26 16:18:14 +02:00
Arjen Hiemstra
89e6313143 Add buttons to select the extruder for the selection to the toolbar 
Contributes to CURA-3577
 2017-04-25 16:11:31 +02:00
Arjen Hiemstra
09f23f5f91 Styling fixes in Toolbar QML 2017-04-25 11:31:59 +02:00
Jaime van Kessel
442fd3ae3d Tool panel switching now properly triggers focus change 
CURA-2197
 2016-09-12 17:05:05 +02:00
fieldOfView
7aa44bdd9e Remove commented out code 2016-08-30 13:38:08 +02:00
Arjen Hiemstra
5e226038d9 Instantiate models instead of using the Models object 
Since Models has been removed
 2016-05-11 17:19:31 +02:00
fieldOfView
db7777a6e7 Move Rotation "tooltip" out of cura.qml and make it useful for other tools as well 
Tool hint is now a child of Toolbar.qml, where it fits with the tools for which it is useful.

CURA-1014
 2016-04-12 17:09:32 +02:00
Jaime van Kessel
b5107b6ffa Misclicking tool panel no longer hides it 2016-03-29 15:47:40 +02:00
Jaime van Kessel
2ab999851c Toolbar correctly shows location of toolpanel when not triggered through QML 
Contributes to CURA-838
 2016-03-07 14:12:44 +01:00
fieldOfView
de28561152 Remove Profiles from Per Object Settings panel 
Also disables Per Object Settings tool button when sidebar is in simple mode.

Contributes to CURA-901
 2016-02-24 00:14:54 +01:00
Arjen Hiemstra
19c25895bf Convert Toolbar.qml and styles.qml to Theme getThing style 2016-02-23 12:24:26 +01:00
Arjen Hiemstra
720324f0c6 Replace Theme property accessors with getThing calls 2016-02-23 12:22:30 +01:00
fieldOfView
42673c7c68 Disable using the toolbar while a tooloperation is ongoing 2016-01-21 15:42:20 +01:00
fieldOfView
f8e2d4f035 Disable toolbar while running tooloperation 2016-01-21 15:42:20 +01:00
fieldOfView
2fa29de4b9 Use PointingRectangle for toolpanel flyouts 2015-12-03 12:09:31 +01:00
fieldOfView
4d29fccb0b Remove cursorShapes for now 2015-12-03 12:09:30 +01:00
fieldOfView
ec46b49847 Use pointingrectangle for toolbutton tooltips 2015-12-03 12:09:30 +01:00
fieldOfView
1d27822970 Rearrange Toolbar 
Start unifying button tooltips
 2015-12-03 12:09:29 +01:00
fieldOfView
ab02aef6cd Rearrange Toolbar 
Reposition MessageStack
 2015-12-03 12:09:28 +01:00
fieldOfView
1ba1009b60 Initial theme rework: 
* Move buttons around
* Resizing
* Colors
* Splash screen
 2015-12-03 12:09:23 +01:00
Arjen Hiemstra
16c5aeba68 Use selection status to disable/enable tools rather than platform activity 
Fixes issues with tool activation.
 2015-10-01 12:37:17 +02:00
Tamara Hogenhout
662dde077b Removes the little square panel thing for the per-object-settings 
Contributes to: issue CURA-181
 2015-09-22 17:31:47 +02:00