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

4956 Commits

Author SHA1 Message Date
Jaime van Kessel
560c0c8657
Merge branch 'feature_add_local_printer_ux' of https://github.com/fieldOfView/Cura 2020-06-16 14:17:16 +02:00
Kostas Karmas
87a97afd84 Add newlines at the end of files 
CURA-7418
 2020-06-16 13:35:28 +02:00
Jaime van Kessel
ec1ed80c9f
Add initials when no avatar is set 
CURA-7418
 2020-06-16 09:17:58 +02:00
Jaime van Kessel
1b6ef4c28c
Merge branch 'mb-modify-tool-panel-anchor-point' of https://github.com/smartavionics/Cura 2020-06-15 14:53:29 +02:00
Jaime van Kessel
f6e9bc7c3c
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-7418-update-profile-window 2020-06-15 14:10:20 +02:00
Jaime van Kessel
0edb93176a
Fix some layout issues 
CURA-7418
 2020-06-15 14:09:01 +02:00
Jaime van Kessel
a7e7ddf4b5
Add the digital factory button 
CURA-7418
 2020-06-15 13:33:47 +02:00
Jaime van Kessel
200e3d6ee7
Add tertiary button as a reusable component 
CURA-7418
 2020-06-15 13:19:50 +02:00
Ghostkeeper
09298eac93
Elide setting name if it's too long 
This keeps the text readable.

Fixes #7926.
 2020-06-15 12:24:39 +02:00
Ghostkeeper
c7929fa053
Fix theming of width/height of this dialogue 
Also allow resizing it, because why not.

Contributes to #7926.
 2020-06-15 12:22:20 +02:00
Nino van Hooff
e5a7ad2eca
Merge pull request #7904 from Ultimaker/CURA-7454_Add_remove_printers_button_in_removed_printers_from_account_message 
CURA-7454: Add "remove printers" button in removed printers from account message
 2020-06-12 17:35:09 +02:00
Jaime van Kessel
d33529f932
Use property & states instead of listening to changed signal 
It makes a lot more sense to me to use states and an actual property.

CURA-7418
 2020-06-11 17:31:19 +02:00
Jaime van Kessel
f4c5a134c2
Move palette to syncstate 
It should be there, since that is the only place it's being used

CURA-7418
 2020-06-11 17:02:37 +02:00
Jaime van Kessel
d8d3f16c9f
Remove unneeded width property 
CURA-7418
 2020-06-11 17:01:04 +02:00
Jaime van Kessel
6d86cbf03c
Convert the account details into an item 
No idea why it was a column.

CURA-7454
 2020-06-11 16:58:28 +02:00
Jaime van Kessel
1f402569ad
Move properties into account details itself 
There isn't really a point to setting them from when the object is created...

CURA-7418
 2020-06-11 16:51:42 +02:00
Nino van Hooff
64064fe8d5
Merge pull request #7911 from Ultimaker/CURA-7479_ConfigurationMenu_nozzles_get_stacked_together 
CURA-7479: Change preferredWidth according to the model count in ConfigurationMenu
 2020-06-10 16:26:26 +02:00
Kostas Karmas
20c9be285f Remove unnecessary variable from CuraApplication 
In response to feedback comment https://github.com/Ultimaker/Cura/pull/7904#discussion_r438022415

CURA-7454
 2020-06-10 12:50:03 +02:00
Nino van Hooff
feeeb972f7
Merge pull request #7873 from Ultimaker/CURA-7438_Show_cloud_connection_not_available_printer_removed_from_account 
CURA-7438 Handle the case when a cloud printer is removed from the account
 2020-06-10 11:46:10 +02:00
Kostas Karmas
df2c20f647 Convert back Row to RowLayout 
RowLayout is better for resizable interfaces

CURA-7479
 2020-06-10 11:37:51 +02:00
Kostas Karmas
62047d585f Convert RowLayout into Row in ConfigurationMenu 
CURA-7479
 2020-06-10 11:23:17 +02:00
Kostas Karmas
5c898b8c57 Allow the machine manager to set an empty active machine 
Gracefully handle the case where the machine manager is requested to
delete the last machine in Cura. In this case, instead of deleting
everything of this machine and still keep it as an active machine,
the machine manager will set the active machine to None.

The QML files which depend on the active machine were changed to
properly handle themselves when there is no active machine.

CURA-7454
 2020-06-09 15:33:22 +02:00
Kostas Karmas
669dcc62dd Add extra "AddPrinterPagesModel" without the cancel button 
This commit adds an additional AddPrinterPagesModel in Cura that does
not have the "Cancel" button in the "Add Printer" page. To achieve
that, the AddPrinterPagesModel is modified so that its initialize
function decides whether or not it will add the cancel button.

If Cura ends up in a state without an active machine, the AddPrinters
dialog will open up using the showAddPrintersUncancellableDialog signal
and display the new "Uncancellable" (is this a word?)
AddPrinterPagesModel, so that the dialog cannot be dismissed.

If Cura is closed at that point, the next time it is initiated, if the
user is logged in and there is no ActiveMachine, then instead of
displaying the entire WelcomePages wizard, it will show the
uncancellable AddPrinterPagesModel, forcing the user to add a printer.

CURA-7454
 2020-06-09 15:20:15 +02:00
Kostas Karmas
8e1ed6cd29 Merge branch 'master' into CURA-7454_Add_remove_printers_button_in_removed_printers_from_account_message 2020-06-09 15:03:23 +02:00
Ghostkeeper
d9c768e0d3
Merge branch 'CURA-7480_Remove_flicabkle_config_panel' 2020-06-08 14:26:21 +02:00
Kostas Karmas
7ba400254d Merge branch 'CURA-7455_Keep_printer_configurations_when_cloud_printer_removed_from_account' into CURA-7454_Add_remove_printers_button_in_removed_printers_from_account_message 2020-06-08 09:22:39 +02:00
Mark Burton
2669fbe608 Set padding to 0 to remove vertical shift on Linux builds. 2020-06-05 15:31:57 +01:00
Kostas Karmas
3073d7c349 Fix height binding loop QmlWarning in ConfigurationListView 
Done during Turbo Testing and Tooling
 2020-06-05 15:54:53 +02:00
Ghostkeeper
9404fe0fb9
Fix getting contentWidth in variable width mode 
Undefined seems to work fine as well though.

Done during Turbo Testing and Tooling to reduce the number of warnings in our log.
 2020-06-05 15:18:10 +02:00
Kostas Karmas
ec62cd5671 Fix "Unable to assing null to double" QmlWarning 2020-06-05 14:20:52 +02:00
Kostas Karmas
306f58f96e Fix contentWidth reference error in ActionButton 2020-06-05 14:13:36 +02:00
fieldOfView
33eaebe397 Change wording 2020-06-05 11:42:11 +02:00
Kostas Karmas
4bebaaaddb Display an appropriate tooltip when device is removed from the account 
The tooltip is updated to reflect the case where a cloud printer is
removed from the users account.

CURA-7438
 2020-06-04 15:08:27 +02:00
Kostas Karmas
65dd0250b3 Change property connectionStatusMessage into a get function 
This way the tooltip text can be re-evaluated every time we hover over
the instead of only once when the active machine is updated. With this
change, the text will be updated properly when there is a change.

CURA-7438
 2020-06-04 14:22:14 +02:00
Jaime van Kessel
c095cb1f22
Converted the listview into a RowLayout 
I have no idea why i thought a listview was needed for this when
this was made. The data shouldn't be flicable, so it makes way more sense to
use a row layout

CURA-7480
 2020-06-04 14:06:03 +02:00
Mark Burton
f8c86cce4d Improve readability and add comments. 2020-06-04 12:04:29 +01:00
Mark Burton
74984ca12a Stop panel growing above first tool button. 2020-06-04 11:30:13 +01:00
Mark Burton
700533b4aa Change the panelBorder rectangle anchor to the bottom for lower toolbar buttons. 
This makes the panel grow upwards into clear space rather than downwards which is a problem
when the Cura window height is restricted.
 2020-06-03 08:15:10 +01:00
Kostas Karmas
a06035cf38 Display appropriate tooltip message when cloud printer is offline 
Display a different message in the popup tooltip when the internet
is reachable but the printer is offline.

CURA-7460
 2020-06-02 16:12:05 +02:00
Jaime van Kessel
fbbd2f7484
Fix small copy paste error 
CURA-7477
 2020-06-02 14:19:13 +02:00
Jaime van Kessel
0885d1a8e2
Merge branch 'feature_single_instance_preference' of https://github.com/fieldOfView/Cura 2020-06-02 14:16:18 +02:00
fieldOfView
aa2ed1aa4b Remove now defunct variable 2020-05-29 21:34:00 +02:00
Ghostkeeper
b68c3b7301
Remove usage of deprecated extruders property 
Initially PyCharm didn't find this because it's not typed.

Done during Turbo Testing and Tooling.
 2020-05-29 18:06:02 +02:00
Ghostkeeper
fc6867a4a0
Use extruderList rather than deprecated extruders property 
Done during Turbo Testing and Tooling.
 2020-05-29 17:56:56 +02:00
Ghostkeeper
458acb356f
Use extruderList rather than deprecated extruders property 
Once more into the fray.

Done during Turbo Testing and Tooling.
 2020-05-29 17:55:12 +02:00
fieldOfView
cb73cfb0f3 Make add printer dialog resize-aware 2020-05-29 17:22:46 +02:00
fieldOfView
7c8c1838e0 Make printer name field look less like a search field 2020-05-29 16:21:18 +02:00
fieldOfView
8ce5593eec Add visible scrollbar to list of printer profiles 2020-05-29 13:49:03 +02:00
Konstantinos Karmas
56e8827d00
Merge pull request #7831 from Ultimaker/CURA-7437_no_internet_cloud_status 
CURA-7437_no_internet_cloud_status
 2020-05-28 10:02:15 +02:00
Nino van Hooff
e24797b94e Fix tooltip with alpha 0 stealing clicks 
CURA-7437
 2020-05-27 17:21:50 +02:00