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

44 Commits

Author SHA1 Message Date
Remco Burema
c4265c1f67 Scale instead of center for preview/prepare-menus. [CURA-6478] 2019-04-25 21:50:24 +02:00
Satish
c98a73f8fd Added id's to printer button, installed plugins, material fields and profile tab for integration tests 2019-03-01 12:47:29 +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
Diego Prado Gesto
07d58c3aef Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-05 13:56:21 +01:00
Ghostkeeper
4d87c46423
Remove sourceSize.width: width from all RecolorImages 
It is now the default in Uranium.

Contributes to issue CURA-5876.
 2018-12-04 15:04:51 +01:00
Diego Prado Gesto
7dc3320b06 Remove all the signal propagation for the tooltip and allow only Cura.qml to handle them 
Contributes to CURA-5941.
 2018-12-02 20:32:55 +01:00
Diego Prado Gesto
85b34d6005 Refactor the PrintSetupSelector 
The file was splitted in several other files to improve readability.
There is a new folder called PrintSetupSelector where all those files
will be.

Contributes to CURA-5941.
 2018-11-28 13:07:39 +01:00
Ghostkeeper
289399825b
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 
Conflicts:
	plugins/PrepareStage/PrepareMenu.qml: Git was wrong, this was not really a conflict.
	resources/qml/ActionButton.qml: With iconSource being modified on ui_rework_4_0 and me modifying the icon to be able to display it on the left hand side.
	resources/qml/ActionPanel/OutputProcessWidget.qml: Git was wrong, not really a conflict.
	resources/qml/ActionPanel/SliceProcessWidget.qml: Git was wrong, not really a conflict.
	resources/qml/ExpandableComponent.qml: Both ui_rework_4_0 and me implemented a border around popups.
	resources/qml/MainWindow/MainWindowHeader.qml: Git was wrong, not really a conflict.
	resources/themes/cura-light/theme.json: Theme item was added in a place where I added whitespace.
 2018-11-27 15:01:48 +01:00
Diego Prado Gesto
fcde6e3a34 Fix the open file button 
Now it has the correct size and it doesn't look blurry.

Contributes to CURA-5942.
 2018-11-27 13:28:28 +01:00
Jaime van Kessel
1a6822436d Add missing HoverEnabled property 
Some systems, like mine, don't have the hoverEnabled default set to true.
 2018-11-27 12:01:43 +01:00
Jaime van Kessel
e04f14b50c Also add shadow to openFile button 2018-11-27 12:01:05 +01:00
Diego Prado Gesto
ad3fa9548a Add sourceSize to the open file button. 
Contributes to CURA-5942.
 2018-11-26 17:53:38 +01:00
Diego Prado Gesto
84f263f111 Fix style for the open file button in the prepare menu. 
Contributes to CURA-5942.
 2018-11-26 15:08:33 +01:00
Ghostkeeper
826044da7e
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 
Conflicts:
	plugins/PrepareStage/PrepareMenu.qml: Some indentation change caused it to misalign the diffs, thinking it couldn't merge two of the same lines which actually weren't the same lines.
	resources/qml/Menus/ConfigurationMenu/QuickConfigurationSelector.qml: This file was deleted in my branch. I'm holding for the new version.
 2018-11-26 13:43:20 +01:00
Diego Prado Gesto
a3bcdaf3b6 Make the popup in the printer selector resizable depending on the 
contents. Also there is a maximum height that will fit 9 printers.

Contributes to CURA-5942.
 2018-11-23 16:58:57 +01:00
Diego Prado Gesto
fe7d1825d4 Add styling to the buttons in the printer list. 
Contributes to CURA-5942.
 2018-11-21 16:54:57 +01:00
Jaime van Kessel
bd636e61a0 Minor changes suggested in review 
CURA-5785
 2018-11-21 13:17:36 +01:00
Diego Prado Gesto
4772972145 Merge branch 'CURA-5785-Restyle_stage_menu' into CURA-5942_printer_selector 2018-11-21 12:18:51 +01:00
Jaime van Kessel
eef6ad662d Added enum for the roundedCorner property 
This makes it a whole lot easier to read what is being set.

CURA-5785
 2018-11-21 11:50:39 +01:00
Jaime van Kessel
b826a42026 Add the RoundedRectangle as background to the ExpandableComponent 
This way the expandable components can have rounded corners only on one side,
thus preventing the need to do add backgrounds to the rows that they are in.

CURA-5785
 2018-11-21 11:37:58 +01:00
Diego Prado Gesto
8e47d04756 Adjust sizes and alignments to the print selector panel. 
Contributes to CURA-5942.
 2018-11-21 11:12:59 +01:00
Ghostkeeper
00a49fff26
Rename QuickConfigurationSelector to ConfigurationMenu 
This is going to function as our main item for the configuration menu. It contains the part in the top bar and the glue item for the part in the popup.

Contributes to issue CURA-5876.
 2018-11-19 14:39:19 +01:00
Jaime van Kessel
a490e420f0 Prevent the setting items from being recreated every stage switch 
CURA-5785
 2018-11-19 11:42:04 +01:00
Ghostkeeper
e3dd5f1c39
Add documentation about qml z fix 
Co-Authored-By: nallath <nallath@gmail.com>
 2018-11-16 13:59:51 +01:00
Jaime van Kessel
b589920f53 Move a few hardcoded sizes to the theme 
CURA-5785
 2018-11-14 13:55:39 +01:00
Jaime van Kessel
fcfe95c7d0 Move OpenFile button to be instantiated left so it's tooltip doesn't get messed up 
CURA-5785
 2018-11-14 12:57:57 +01:00
Jaime van Kessel
12c2962414 Update the look & feel of openButton to the new design 
CURA-5785
 2018-11-13 16:59:02 +01:00
Jaime van Kessel
a9fdd455eb Add seperator lines for the stageMenu's 
CURA-5785
 2018-11-13 16:47:39 +01:00
Jaime van Kessel
551bc2fbd4 Removed line around the headerbar 
I was checking an old design, the new one doesn't have a line around it

CURA-5785
 2018-11-13 16:40:51 +01:00
Jaime van Kessel
b83175a380 Add rounded corners to stage menus 
CURA-5785
 2018-11-13 16:32:24 +01:00
Jaime van Kessel
4c1a45f904 Added sizes to the stage menu 
This isn't themed, but right now it does adhere to the sizes I got from UX

CURA-5785
 2018-11-12 15:53:09 +01:00
Jaime van Kessel
b60977e435 Convert PrintSetupSelector to an ExpandableComponent 
CURA-5785
 2018-11-12 11:14:39 +01:00
Jaime van Kessel
2c7bdba7d0 Update ConfigurationSelector header to that it looks more like the new design 
CURA-5785
 2018-11-09 15:23:10 +01:00
Jaime van Kessel
300d109cfe Set the Z of the machine selector so the tooltip doesn't get hidden 
CURA-5772
 2018-11-02 13:37:57 +01:00
Diego Prado Gesto
90e8a05aab Remove all the entries in the theme that make reference to the sidebar, 
because there is no sidebar anymore.

Several different margins and linings were created depending on the
side, not depending on where it belongs.

Contributes to CURA-5784.
 2018-10-26 17:51:28 +02:00
Diego Prado Gesto
c8bdf7321c Move the visible check within the component. 
Contributes to CURA-5772.
 2018-10-26 16:31:03 +02:00
Diego Prado Gesto
5a5adb71cd Make the height of the Print setup selector themable. 
Contributes to CURA-5772.
 2018-10-26 16:16:33 +02:00
Diego Prado Gesto
e64698209c Adjust the minimum size to be something around 1280x1024. 
Also adjust some colors color for the dark theme.

Contributes to CURA-5772.
 2018-10-25 17:41:35 +02:00
Diego Prado Gesto
93b04190f8 Change name of some components to make them more indicative of what they 
do.

Contributes to CURA-5772.
 2018-10-18 17:13:15 +02:00
Diego Prado Gesto
1cc7e0e586 Set the height of the stage menu in the theme instead of hardcoded. 
I also adjusted a bit the design to fulfill the requirments from UX/UI
team.

Contributes to CURA-5772.
 2018-10-18 16:33:13 +02:00
Ghostkeeper
1bcd134f85
Fix code style 
Most stuff here was recently changed. Some of it was where I found a pattern in something that was likely copy-pasted from somewhere else, so I did a global search and replace on that.

Contributes to issue CURA-5784.
 2018-10-18 14:30:33 +02:00
Jaime van Kessel
cd5a0a84a8 Horizontally align the prepare menu bar 
CURA-5772
 2018-10-15 15:14:05 +02:00
Jaime van Kessel
d2baef97c4 Fix tooltips for settings 
CURA-5772
 2018-10-15 11:07:03 +02:00
Jaime van Kessel
7d5472b09f Moved the prepareMenu into the prepare stage plugin 
CURA-5772
 2018-10-12 13:29:57 +02:00