GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-12 21:28:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
31,174 Commits 290 Branches 260 Tags
Commit Graph

666 Commits

Author SHA1 Message Date
Ghostkeeper
7f11142d50
Fix height and vertical layout of popup 
Many things were made simpler. This took some time to fix...

Contributes to issue CURA-5876.
 2018-11-22 14:57:55 +01:00
Lipu Fei
698409803d Fix null warning in QML 
CURA-5943
 2018-11-22 14:03:03 +01:00
Diego Prado Gesto
9720512f50 Add a new printer selector button that is connected to the output 
devices and shows labels containing the type of printers that are in the
same group.

Contributes to CURA-5942.
 2018-11-22 13:54:10 +01:00
Ghostkeeper
a826dfb156
Fix binding loop in height of view selection bar 
Since these were part of the childrenRect of the bar, and attached to the bottom of the bar, the childrenRect depended on the position of the children and that depends on the childrenRect again. So just attach it to the top, it's logical.

Contributes to issue CURA-5876.
 2018-11-21 16:12:00 +01:00
Ghostkeeper
a052b8ec69
Use Theme.getIcon instead of Theme.icons 
This is better for performance, according to the deprecation warning I got.

Contributes to issue CURA-5876.
 2018-11-21 16:08:29 +01:00
Ghostkeeper
eb056ee17b
Fix display of custom configuration 
Since it had no width, everything was resized to 0.

Contributes to issue CURA-5876.
 2018-11-21 16:06:26 +01:00
Jaime van Kessel
a9672458fd Update extruderIcon to be more in line with the design 
CURA-5785
 2018-11-21 13:46:50 +01:00
Jaime van Kessel
c7dbaa3a00 Add rendertype for labels in quickConfigurationSelector 
CURA-5785
 2018-11-21 13:22:03 +01:00
Ghostkeeper
d42ddad606
Add icons on left and right side of text 
For this I had to implement functionality in ActionButton to be able to display the icon on either side.

Contributes to issue CURA-5876.
 2018-11-20 14:47:41 +01:00
Ghostkeeper
dca286cea5
Give action button a sane default height 
We don't want to give it a default width since that should just adjust to its contents by default, which is fine.

Contributes to issue CURA-5876.
 2018-11-20 14:34:06 +01:00
Ghostkeeper
a1068a3ef2
Rename action_panel_button theme entry to action_button 
Because it's not just used in the save panel.

Contributes to issue CURA-5876.
 2018-11-20 14:24:09 +01:00
Ghostkeeper
42d73836f4
Move default margin by default to Cura's action buttons 
So we don't have to repeat that every time you create a new button.

Contributes to issue CURA-5876.
 2018-11-20 14:19:55 +01:00
Ghostkeeper
cbd5238738
Don't show custom/auto toggle buttons when not connected 
In order to prevent suddenly switching to the other side when the connection is lost or restored, we only evaluate this upon opening the popup. This way you might be surprised that closing and then opening it can show something else, but it will never surprise you while working on the popup itself as a user.

Contributes to issue CURA-5876.
 2018-11-20 13:55:28 +01:00
Ghostkeeper
a04db164e6
Make it possible to swap between auto and custom configuration 
We're going to need to make this disappear when the printer is not connected. But that is for later.

Contributes to issue CURA-5876.
 2018-11-19 17:11:51 +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
Ghostkeeper
7a210087ff
Add header for configuration selector 
It currently always says 'Custom', but we will want to make that dynamic at some point.

Contributes to issue CURA-5876.
 2018-11-19 14:35:34 +01:00
Lipu Fei
b0f3fedc94 Fix import QtQuick versions to suit Qt 5.10 
CURA-5785
 2018-11-19 13:42:22 +01:00
Jaime van Kessel
52b2f4579a Fix a number of QML warnings 
CURA-5785
 2018-11-16 16:13:09 +01:00
Jaime van Kessel
7f99ed1af3 ExtruderIcon will now display that it's disabled correctly 
CURA-5785
 2018-11-16 16:04:11 +01:00
Ghostkeeper
816d844258
Use textwidth instead of round 
CURA-5785

Co-Authored-By: nallath <nallath@gmail.com>
 2018-11-16 15:14:08 +01:00
Jaime van Kessel
3fd1cc0e8c Ensure that the added labels are also themable 
CURA-5785
 2018-11-16 14:58:11 +01:00
Jaime van Kessel
c08aa2205c Fix enabled checkbox for extruder selection 
CURA-5785
 2018-11-15 09:37:54 +01:00
Jaime van Kessel
429a49aa2e Make the default size of the expandableComponent icon depend on the height of the element 
This is a way more sensible default.

CURA-5785
 2018-11-14 14:06:55 +01:00
Jaime van Kessel
7ca3490097 Make the collapse arrows consistent with the rest of the UI 
CURA-5785
 2018-11-14 14:00:19 +01:00
Jaime van Kessel
c35b4f1d31 Removed old unusued code 
CURA-5785
 2018-11-14 10:00:44 +01:00
Jaime van Kessel
fb72f9a059 Fixed size of expandableItem not being the correct width 
CURA-5785
 2018-11-14 09:59:56 +01:00
Jaime van Kessel
fe4ed46496 Show material name instead of just color 
CURA-5785
 2018-11-12 16:55:42 +01:00
Jaime van Kessel
4be33031d7 Added icons to ExpandableComponent 
This also makes the entire header react to mouse events instead of just the icon/button

CURA-5785
 2018-11-12 14:30:55 +01:00
Jaime van Kessel
e641584021 Made strings in ConfigurationSelector translatable. 
CURA-5785
 2018-11-12 09:45:55 +01:00
Jaime van Kessel
1602bf0999 Re-Add the material & printcore selection to the configuration selector 
CURA-5785
 2018-11-09 16:59:10 +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
6083eda3fa Merge branch 'cura4.0_header' of github.com:Ultimaker/Cura into CURA-5829-Add-preview-stage 2018-10-31 13:45:03 +01:00
Jaime van Kessel
fc6ad4f623 Put back the view menu, since it did more than just show the views 
CURA-5829
 2018-10-29 13:41:46 +01:00
Diego Prado Gesto
5de367bcc4 Merge branch 'ui_rework_4_0' into cura4.0_header 
Conflicts:
plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml
resources/qml/Menus/ViewMenu.qml
resources/themes/cura-dark/theme.json
resources/themes/cura-light/theme.json
 2018-10-29 11:10:25 +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
Ghostkeeper
ebbb7ad88f
Code style 2018-10-25 10:55:10 +02:00
Ghostkeeper
47f820fe69
Don't disable entire view menu when viewing g-code 
Just disable the part about switching views.
Yes, you can still select the view from the actual view selection drop-down in the main window. Well, it's an improvement, not a complete fix. The complete fix is deferred.
 2018-10-25 10:47:21 +02:00
Diego Prado Gesto
15b35da612 Change the TopHeader name to MainWindowHeader, since there is nothing 
more on the top than the header.

Contributes to CURA-5784.
 2018-10-19 16:40:21 +02:00
Diego Prado Gesto
54f32a1d82 Merge branch 'ui_rework_4_0' into cura4.0_header 2018-10-18 19:33:39 +02:00
Diego Prado Gesto
bf6817ce7a Reduce the size of the ApplicationMenu.qml file by moving some 
components out to different files.

Contributes to CURA-5772.
 2018-10-18 17:38:23 +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
Jaime van Kessel
d086e6fa86 Fix review comments 
CURA-5734
 2018-10-17 10:47:34 +02:00
Jaime van Kessel
1e3a9ff57c Removed the expandSidebar action 
Since we don't even have a sidebar anymore, there is no point in expanding it.
 2018-10-15 14:23:42 +02:00
Diego Prado Gesto
49e96980f1 Store the dialogs in a folder called Dialogs. 
Contributes to CURA-5784.
 2018-10-09 17:11:01 +02:00
Diego Prado Gesto
075a9a161f Create a component for the Views selector. This component contains the 
list of the views and also the shortcuts for the camera position.

The theme colors, sizes and the styles have been updated.

Contributes to CURA-5784.
 2018-10-08 12:57:16 +02:00
Jaime van Kessel
fc9f05fc8b Moved SettingVisibilityPreset loading to it's own class 
Since there was so much debate regarding the unit testing of the visiblity presets, i had another look at it.
The old version was almost untestable because all functionalities were mushed together into a single class.

CURA-5734
 2018-10-01 11:32:55 +02:00
Jaime van Kessel
c2f0a33b42
Merge branch 'master' into full_screen_test 2018-09-28 11:24:22 +02:00
Diego Prado Gesto
987ae73078 Remove call to undefined function. 2018-09-25 13:15:26 +02:00
Jaime van Kessel
4cde6c05ae Switch most usages of containerStackId to containerStack for settingPropertyProvider 
This mostly makes the code a bit more logic and also decreases the number of searches in the registry
 2018-09-07 15:23:09 +02:00