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

106 Commits

Author SHA1 Message Date
Jaime van Kessel
01ecc799fa Change background color of Discard or keepchanges dialog 
CURA-8951
 2022-03-09 13:06:28 +01:00
Ghostkeeper
45fa33584b
Restore loadProjectFile function 
It is being used when you want to load a project file. Pretty important!

Discovered while testing CURA-7950.
 2022-03-04 15:05:27 +01:00
Jaime van Kessel
ea588d85fb Remove unneeded anchor from workspace summary dialog 
CURA-8688
 2022-02-28 13:47:27 +01:00
Jaime van Kessel
8d3a5ac7e4 Ensure AskOpenAsProjectOrModel dialog uses cura styling 
CURA-8688
 2022-02-28 11:47:10 +01:00
Jaime van Kessel
78c19559d2 Ensure that Cura styling is applied to the workspace summary dialog 
CURA-8688
 2022-02-28 11:41:56 +01:00
j.delarago
aba025b5b6 Unify dialog background coloring. 
CURA-8988
 2022-02-25 13:32:02 +01:00
casper
2d4a389825 Fix dark mode issues for about dialog 
CURA-8688
 2022-02-25 12:12:57 +01:00
j.delarago
b14e29d214 Make general menu combox wider 
CURA-8688
 2022-02-23 15:13:36 +01:00
casper
6f27199bb9 Merge remote-tracking branch 'origin/CURA-8688_qt6_cleanup' into CURA-8688_qt6_cleanup 2022-02-23 14:09:58 +01:00
casper
e03176a1fa Replace UM.MessageDialog with newly added Cura.MessageDialog 
This dialog is different from the `UM.MessageDialog` in that it

CURA-8688
 2022-02-23 14:09:38 +01:00
j.delarago
c3abfec535 Combobox height/width was being resized by RowLayout causing it to be squished. Assigned a implicit width/height which is used instead of height/width. 
CURA-8688
 2022-02-23 12:00:11 +01:00
j.delarago
7c9038b43c Merge remote-tracking branch 'origin/CURA-8688_qt6_cleanup' into CURA-8688_qt6_cleanup 2022-02-18 16:11:34 +01:00
j.delarago
2ed1894a27 Set Dialog margin as it was in 4.13 
CURA-8688
 2022-02-18 16:11:18 +01:00
casper
ec186f140b Use cura-styled button in about page 
CURA-8688
 2022-02-18 16:01:51 +01:00
Jaime van Kessel
b5136ba70c Fix merge conflics 2022-02-17 15:07:48 +01:00
Jaime van Kessel
f682f56923 Merge branch 'master' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2 2022-02-17 15:02:03 +01:00
Casper Lamboo
5063b84c9a
Remove superfluous semicolumn 
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2022-02-11 11:32:12 +01:00
Casper Lamboo
b2f3b365c9
Remove setting duplicate properties of UM.Label default settings 
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2022-02-11 11:31:30 +01:00
casper
adcf312de7 Resolve Qt warnings 
CURA 8687
 2022-02-09 13:11:17 +01:00
casper
6ca14ecbae Update DiscardOrKeepProfileChangesDialog 
CURA 8687
 2022-02-09 13:05:48 +01:00
casper
72c038a8b1 Update AskOpenAsProjectOrModelsDialog 
CURA 8687
 2022-02-09 12:36:56 +01:00
casper
f59a23fd82 Update OpenFiles Dialog 
CURA 8687
 2022-02-09 12:36:00 +01:00
casper
8fc0fb2737 Update AboutDialog 
CURA 8687
 2022-02-09 12:34:18 +01:00
casper
6b85423948 Update WorkSpaceSummaryDialog 
CURA 8687
 2022-02-09 12:31:26 +01:00
Ghostkeeper
ee81326d6a
Fix remaining merge conflicts 
- When both branches added Controls1 as OldControls, it's not marked as a merge conflict. But the merge removed the need for OldControls, so the import can be removed.
- There was one instance where I had removed the OldControls for a checkbox but there it should remain since the checkboxes are updated in a separate ticket.

Contributes to issue CURA-8684.
 2022-01-31 17:08:56 +01:00
Ghostkeeper
6db4a55f6e
Merge branch 'replace_controls_1_for_controls_2' into CURA-8684_QtControls_replacement_Buttons,_Actions_&_'Exclusivity' 
Conflicts:
	plugins/ImageReader/ConfigUI.qml
	plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
	plugins/PerObjectSettingsTool/SettingPickDialog.qml
	resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml
	resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml
	resources/qml/Preferences/GeneralPage.qml
	resources/qml/Preferences/Materials/MaterialsPage.qml
	resources/qml/Preferences/Materials/MaterialsView.qml
	resources/qml/Preferences/ProfilesPage.qml

These conflicts are all arising from headers/includes being updated at the same time, or from the two branches marking the other one's components as needing OldControls.
This introduced more OldControls markers which don't get marked as merge conflicts by Git. This happens when an element could just be left as the original name but from the new import (e.g. a Button stays a Button in Controls 2, but should be marked as from OldControls on the branch that doesn't update the Button).
 2022-01-31 16:53:45 +01:00
Casper Lamboo
69de60eb14
Update resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml 
Co-authored-by: Ghostkeeper <Ghostkeeper@users.noreply.github.com>
 2022-01-27 16:03:58 +01:00
Ghostkeeper
7a1c3e1bd5
Use customised TableView for Keep/Discard Changes dialogue 
Had to make some more modifications to get it to work again this time, due to the way the width of the table scales with the dialogue. But it's nice now.

Contributes to issue CURA-8686.
 2022-01-26 16:30:50 +01:00
j.delarago
05d542c8d0 Bump UM version for CheckBox 2022-01-26 09:53:17 +01:00
casper
b45707af54 Update ask open project or models dialog to QtControls 2 
CURA-8684
 2022-01-24 21:58:23 +01:00
casper
4c0ee058e4 Update discard keep or discard changes dialog to QtControls 2 
CURA-8684
 2022-01-24 18:21:52 +01:00
casper
9e5fd998f4 Update open files dialog to QtControls 2 
CURA-8684
 2022-01-24 14:11:02 +01:00
j.delarago
5788ea8d00 The visibility settings in the preferences is defined in Uranium rather than Cura. The CheckBox has been moved to Uranium so that all parts of the project have access to this default styled component. 2022-01-24 14:03:47 +01:00
j.delarago
670872f8d1 Specify width and height in Cura.Checkbox 
Update Dialogs to use Cura.CheckBox instead of QtQuick. This will make it easier to update the QtQuick checkbox version.
 2022-01-20 17:31:00 +01:00
Ghostkeeper
1cc3aecd8c
Use correct scrollbar and clip contents 
We've not been clipping this for so long, but the text really does overlap with the label and the buttons if we don't (and the text is sufficiently large).

Contributes to issue CURA-8686.
 2022-01-18 17:56:31 +01:00
Ghostkeeper
c605b45b7c
Use styled scroll bar, and no ScrollView 
Make sure the text aligns next to the scrollbar instead of behind it, too.

Contributes to issue CURA-8686.
 2022-01-18 17:51:37 +01:00
Ghostkeeper
e0a6cb3383
Merge branch 'master' into replace_controls_1_for_controls_2 
Conflicts:
	resources/qml/Actions.qml -> Translation fixes on master, while the QML elements were changed here for Controls2.
 2022-01-18 17:17:10 +01:00
Jaime van Kessel
58a3aef8d4 Remove styles 2022-01-04 10:36:55 +01:00
Ghostkeeper
05bbebf2f7
Remove traces of Shapely 
It's been replaced by Pyclipper. We were only importing Shapely here, not actually using it.

Contributes to issue CURA-8592.
 2021-12-31 14:06:31 +01:00
Jaime van Kessel
54b52b6d4d Convert AboutDialog to controls 2 2021-11-11 15:53:24 +01:00
Jaime van Kessel
0cc46b514c Convert workspace summary dialog to Controls 2 2021-11-11 15:51:42 +01:00
jelle Spijker
f730959f78 fixed discard or keep combobox on Mac 
Use the new controls ComboBox
 2021-08-30 16:15:02 +02:00
Ghostkeeper
adf3f51a4e
Use buttons from QtQuick.Controls 2 
This is to make it look more consistent with the open dialog, which needed Controls 2 in order to make the drop-downs work on MacOS.

As discussed in the CCB.
 2021-06-15 16:28:20 +02:00
Kostas Karmas
dadda742ec Add pywin32 to the requirements 
Allows the keyring library to use the Windows Credential Manager as a backend.

CURA-7180
 2021-03-29 16:31:31 +02:00
Jelle Spijker
0070866afc
Removed unused dependencies from about dialog 
CURA-7180 keyring storage
 2021-03-16 11:47:00 +01:00
Jelle Spijker
392ee68557
Updated about dialog with new dependencies 
CURA-7180 keyring storage
 2021-03-15 16:18:16 +01:00
Ghostkeeper
d8fba53952
Document addToRecent property 
Contributes to issue CURA-7996.
 2021-02-09 10:07:23 +01:00
Kostas Karmas
f8a9e7f2d2 Pass the "add to recent" as an input var to dialogs that open projects 
This way it is clear before to the dialog whether it should add the file to the recent files list,
before the dialog opens.

CURA-7996
 2021-02-08 11:55:28 +01:00
Kostas Karmas
ee22be74b9 Properly check whether the file should be added to recent 
When importing only the models of a project file, Cura wasn't checking whether the file should
be added to the recent files list. This commit fixes that.

CURA-7996
 2021-02-05 12:14:01 +01:00
Remco Burema
06666bddca
Fix recent files hint when file opens via dialoges. 2021-01-29 14:49:32 +01:00