GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-29 15:25:02 +08:00
Code Issues Packages Projects Releases Wiki Activity
31,753 Commits 288 Branches 260 Tags
Commit Graph

93 Commits

Author SHA1 Message Date
j.delarago
2ffcfafc77 Some place RegularExpressionValidator can't be found in QtQuick 2.10 but can be in 2.15 so all files using RegularExpressionValidator have been bumped to latest QtQuick 
CURA-8640
 2022-04-05 16:10:39 +02:00
j.delarago
2f96f7b410 RegularExpressionValidator requires newer version of QtQuick 
CURA-8640
 2022-04-04 10:45:00 +02:00
c.lamboo
3c9e2a1b08 Update RegExpValidator to RegularExpressionValidator 
Due to Qt6 API change

CURA-8640
 2022-03-30 15:10:37 +02:00
casper
0e2848796c Increase text field width to prevent inner text from shifting 
CURA-9010
 2022-03-09 09:46:57 +01:00
Jaime van Kessel
a9a0d4280a Fix Jobspecs text alignment 
CURA-9010
 2022-03-08 14:27:00 +01:00
j.delarago
1eb887010a Swap TextField for Cura.TextField so it has the same styling as the rest of text fields. 
CURA-9010
 2022-03-07 15:00:51 +01:00
Jaime van Kessel
6ea7622a55 Fix reference to property that didn't exist 
CURA-8685
 2022-02-15 15:57:50 +01:00
Jaime van Kessel
b45b3faa3c Replace textField in JobSpecs 
CURA-8685
 2022-02-15 15:32:29 +01:00
Jaime van Kessel
f71502fe38 Replace button with reusable simple button 2021-11-10 16:46:24 +01:00
Jaime van Kessel
83be495414 Replace usage of controls label with our custom label 
This prevents copy pasting a bunch of parameters that we set by default
 2021-11-10 16:37:26 +01:00
Ghostkeeper
0a75c772ed
Unrevert new icon set for all of Cura's interface 
We created a new set of icons for Cura. These icons had to be reverted though because they weren't working out in the interface for the last release yet.
This unreverts them, basically adding them back hoping that we'll get them fixed in time for the next release.

Contributes to issue CURA-8342.

Revert "Revert "Fix merge conflict""

This reverts commit bb20e3307f43edc1ff53cb154d2351ddfe39e158.

Revert "Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons""

This reverts commit 70e4e9640e561e18a12870f30c905203ce8ccee7.

Revert "Revert "Fix typo in icon name""

This reverts commit 38ce22ba7c3f40b971bc6e1e0a8e776ca9d51512.

Revert "Revert "Add list for deprecated icons""

This reverts commit 119a957e7f978dbf1ddbcb3b0005bf38e8fed943.

Revert "Revert "Add Function icon""

This reverts commit 760726cf0bb953bb1b0fc277b448f419d4bd2544.

Revert "Revert "Switch out inherit icon""

This reverts commit 26afff609381e2004d194c280f504b6226859bd3.

Revert "Revert "Merge branch 'CURA-8205_Introduce_new_icons_in_Cura' of github.com:Ultimaker/Cura""

This reverts commit 6483db3d47ee052c1a966cdee3af7190577a5769.

Revert "Fix incorrect icons"

This reverts commit 02a4ade2a50a943ff36fd4895bdc9261cf2133eb.
 2021-06-28 17:16:56 +02:00
Jaime van Kessel
70e4e9640e
Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons" 
This reverts commit 6120d8a054b8c04bf90b8b3d3cb219d691bece2f, reversing
changes made to 95652556fef90f70adbf25bfa9bd3b8af7220d4a.
 2021-05-27 16:06:20 +02:00
jelle Spijker
2bd6f28f3a
Update Icons 
Subdivided the new icons in 3 size categories. As requested by UX
Used the company naming scheme for uniformity and easy recognition.

Known issues:
- Top/Bottom category wasn't taken into account by UX at the time. Since
 this is a recent addition. Both the Walls and Top/Bottom will be updated.
- Cloud/Network connection icons 12px don't render correctly. Due to the
 theme-ing.
- Extruder Icons do not render correctly.

CURA-8010_new_icons
 2021-04-26 19:42:17 +02:00
Konstantinos Karmas
504f6dbe70
Revert "Cura 7813 qml modules version bump" 2021-03-30 09:48:28 +02:00
Konstantinos Karmas
180732788b
Merge pull request #9472 from Ultimaker/CURA-7813_QML_warnings 
Cura 7813 qml modules version bump
 2021-03-30 09:42:59 +02:00
Kostas Karmas
7827b36ab7 Fix QML warnings due to depricated on<signal> calls in Connections 
As of 5.12, the signals used in connections should not be declared as on<signal>, but as
function on<signal>(arguments).
 2021-03-30 09:02:48 +02:00
jelle Spijker
9da321ffb9
Update Layouts, Control.Styles and Dialogs 
CURA-7813
 2021-03-29 18:04:47 +02:00
jelle Spijker
2986d50745
Update QtQuick and QtQuick.Controls 
CURA-7813
 2021-03-29 17:55:19 +02:00
Lipu Fei
4f91389941 Fix QML warnings 2020-01-07 11:37:37 +01:00
fieldOfView
528814c9e6 Make jobname less sensitive to being touched 2019-10-29 09:33:30 +01:00
Diego Prado Gesto
ad65fd6381 Modify style of the ObjectSelector 
I got input from our designer to do it. When it's closed the panel is not intrusive, but when opened it shows a background color to make it readable.
 2019-03-05 10:33:27 +01:00
Ghostkeeper
707c3a26a8
Make job specs not bold 
As per the design.

Contributes to issue CURA-6025.
 2019-01-03 11:06:43 +01:00
Diego Prado Gesto
26be65e405 Fix some other merge conflicts 
Contributes to CURA-6008.
 2018-12-07 13:29:16 +01:00
Diego Prado Gesto
b0c3a4e17a Align the additional components to the right of the job specs 
The model checker now shows centered
 2018-12-06 09:25:31 +01:00
Diego Prado Gesto
218fa3aded Align the print info to the left 2018-12-05 14:22:04 +01:00
Diego Prado Gesto
a2587aca59 Merge branch 'ui_rework_4_0' into place_print_info_back 2018-12-05 14:05:38 +01:00
Diego Prado Gesto
5b57e6bf30 Code style in JobSpecs 2018-12-05 13:24:34 +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
Ghostkeeper
a3fe9839ba
Change all uses of 'small' and 'very small' fonts to default 
These two fonts are exactly the same, but I want to use the 'small' font to be something a bit smaller. I'm 'removing' the superfluous font but will be re-using it immediately to look a bit smaller.

Contributes to issue CURA-5876.
 2018-11-26 17:33:37 +01: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
Diego Prado Gesto
4a0808378b Allow whitespaces in the job name. 
Fixes #4530.
 2018-10-16 13:23:35 +02:00
Ghostkeeper
eac70dc06d
Change default print job name to 'Untitled' 
This is more common for documents that don't yet have a title in many applications.
 2018-08-27 09:41:19 +02:00
Ghostkeeper
5e4ccf004d
Make default job name translateable 
Contributes to issue CURA-5367.
 2018-07-13 09:59:32 +02:00
Lipu Fei
bbd019f9e5 Fix job name UI binding 
CURA-5367

UI should always refer to PrintInformation for the job name.
 2018-06-05 08:58:09 +02:00
Lipu Fei
bb313c45a9 Set job name to "unnamed" if user types in nothing 
CURA-5367
 2018-05-31 16:25:58 +02:00
Lipu Fei
3b0b6d300b Only set user-specified job name when the editting is finished 
CURA-5280
 2018-05-28 17:35:22 +02:00
Lipu Fei
689b88a024 Do not change prefix for user-specified job names 
CURA-5280
 2018-05-28 09:53:49 +02:00
Aleksei S
b1c9b04a7a Fix: filenames cut by first dot, remove only file extension because file might have dot in name 
CURA-5323
 2018-05-02 17:17:45 +02:00
Ruben D
c8222b73c7
Merge branch 'feature_model_check' 2018-03-22 01:56:46 +01:00
Jack Ha
d8d226c0d6 CURA-4557 it's now a small button next to the job spec when one of the warping materials is selected 2018-03-21 16:55:58 +01:00
Lipu Fei
f97e615634 Fix file name update 
CURA-5122
 2018-03-20 11:30:06 +01: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
461da709ff Checked all divisions (again..) and multiplications on rounding errors 
CURA-4941
 2018-02-10 12:45:36 +01:00
alekseisasin
db51054984
Merge pull request #2700 from fieldOfView/feature_cleanup_save_monitor_area 
Cleanup save/monitor button area
 2017-11-01 15:53:20 +01:00
fieldOfView
fc7d1210cf Fix qml binding loop 2017-10-30 12:31:46 +01:00
Mark
334283e893 Found some more margins that wouldnt be fixed numbers and made the code more consistent 2017-10-27 14:12:35 +02: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
d4a8dbdee7 Change Text to Label and cast all sizes to int 
CURA-4437
 2017-10-11 12:48:42 +02:00
Mark
9a193ad5c5 Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
Diego Prado Gesto
c3d6023418 Fixed an issue that doesn't generate the jobname again once the user removes the models. - CURA-4276 2017-09-08 16:22:45 +02:00