GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-23 22:29:41 +08:00
Code Issues Packages Projects Releases Wiki Activity
27,108 Commits 286 Branches 260 Tags
Commit Graph

86 Commits

Author SHA1 Message Date
luz paz
d68f375e38 Fix various typos 
Found via `codespell -q 3 -S *.po,*.pot -L childs,initialy,lod,ned,te,slicable,sur,tutoriels,wont`
 2021-09-07 11:33:54 -04: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
Diego Prado Gesto
77ede1ae6b Unify the fonts to only have 8 instead of 13. 
Contributes to CURA-6025.
 2018-12-12 17:50:21 +01:00
Diego Prado Gesto
1d33fe081f Clean up the code 
Remove all the references to the sidebar and use the term print_setup instead.

Contributes to CURA-5941.
 2018-12-07 12:07:41 +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
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
Ghostkeeper
ac4ee8c428
Fix context of pause, resume and abort labels 
More in line with what we have in the rest of our code base.

Discovered during work on CL-1053 and CURA-5729.
 2018-09-18 11:25:35 +02:00
fieldOfView
07e1a21aeb Remove prepare items from Monitor stage 2018-03-29 14:46:11 +02:00
Diego Prado Gesto
79daf3706b CURA-5158 Create a custom signal that is emitted when global container 
changes and output devices change.
 2018-03-28 11:07:48 +02:00
Ghostkeeper
ee9de1f11b
Merge branch '3.2' 
Lots of conflicts due to rounding vs. flooring of text element positions for weirdness with the font aliasing.
 2018-02-14 10:53:51 +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
b52bf6decf resolve conflict 2018-02-09 13:01:56 +01:00
Mark
8fca183a5e Fix rounding errors for garbled text 
CURA-4941
 2018-02-09 11:30:56 +01:00
Jaime van Kessel
faa4af634a Show pause text even if there is nothing to pause 
CL-541
 2018-01-04 09:58:15 +01:00
ChrisTerBeke
182e7de07d
Merge branch 'master' into network_rewrite 2018-01-03 14:17:48 +01:00
Ghostkeeper
9b41cc05af
Further fix for MonitorButton 
Forgot this one here.

Contributes to issue CURA-4741.
 2017-12-28 15:46:06 +01:00
Ghostkeeper
5f240229f9
Fix reference to addAdditionalComponents and updateAdditionalComponents 
Nobody ever tested this, I think...

Contributes to issue CURA-4741.
 2017-12-28 15:45:03 +01:00
ChrisTerBeke
2986a17c1d Fix for showing printer connect button on component load, use newer CuraApplication as target 2017-12-08 16:02:22 +01:00
ChrisTerBeke
c4d7a33c31 Monitor view component loader should have width and height from parent 2017-12-08 14:56:03 +01:00
ChrisTerBeke
8cd9439497 ignore octoprint plugin 2017-12-08 14:33:21 +01:00
Jaime van Kessel
1c1c195b93 When an printer gets added / removed, this is now correctly shown 
CL-541
 2017-11-30 15:01:28 +01:00
Jaime van Kessel
dea13899b3 Cluster can now "target" one of it's printers for display 
CL-541
 2017-11-30 13:07:01 +01:00
Jaime van Kessel
5d3779da26 Update cluster view components 
CL-541
 2017-11-27 15:54:44 +01:00
Jaime van Kessel
57de028608 re-implemented abort & pause for legacy um3 
CL-541
 2017-11-24 11:26:30 +01:00
Jaime van Kessel
c523a6ddf6 Progress is now shown for LegacyPrinter while printing 
CL-541
 2017-11-24 09:22:50 +01:00
Aleksei S
87a7bf72a8 Monitor view, "connect" button position 
CURA-4509
 2017-11-01 15:57:30 +01:00
fieldOfView
6fa4dd0a97 Fix qml binding loops 2017-10-30 12:26:02 +01:00
fieldOfView
6a0ba43508 Make sure monitor buttons do not extend sidebar 2017-10-29 10:07:42 +01:00
Mark
9a193ad5c5 Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
Jaime van Kessel
8683275d4f Added canAbort & canPause feature to PrinterOutputDevice 2017-09-04 15:16:55 +02:00
Ghostkeeper
cdf43ea6a4
Forgotten sidebar margins 
The buttons need the sidebar margins too.

Contributes to issue CURA-4148.
 2017-08-23 17:58:05 +02:00
Ghostkeeper
6a4329c1a0
Align progress bar and save button better 
So that they don't overlap with the now larger fonts and such.

Contributes to issue CURA-4149.
 2017-08-14 10:36:39 +02:00
Jaime van Kessel
f82aecb7ca Refactoring; no longer use "Printer" to identify CuraApplication 2017-03-30 20:19:05 +02:00
fieldOfView
9229027001 Refactor properties that start with 'get' to avoid confusion between slots & properties 
Case in point: LayerViewProxy.getLayerViewType was decorated as a property but was used/intended as a slot.
 2017-02-17 13:35:01 +01:00
fieldOfView
a823980d17 Replace "transparent" Rectangles by Items 2017-01-25 15:21:37 +01:00
fieldOfView
bf3d3d46e2 Fix Rectangles that always show as white regardless of the theme 2017-01-25 15:12:57 +01:00
fieldOfView
a291131aca Fix qml warning when no printer is connected 2016-10-13 21:18:17 +02:00
Ghostkeeper
8644fb7113
Never animate progress bars if they are invisible 
This is now the responsibility of the theme rather than the interface element, since the theme defines the animation itself. This makes it that the interface element doesn't need to worry about things like its style or animation.

Contributes to issue CURA-2497.
 2016-10-06 11:54:21 +02:00
Ghostkeeper
06a0a0b95e
Progress bar never indeterminate if invisible 
Because if the progress bar is indeterminate, it triggers redraws for every frame to create the animation of the progress bar bouncing, regardless of whether it is visible or not. So now we make it indeterminate regardless of what state it is in.

Contributes to issue CURA-2497.
 2016-10-05 13:35:12 +02:00
Ghostkeeper
8a5026bdb1
Revert "Early cop-out if there is no printer connected" 
This reverts commit 99f53cb8322e07f1ff94195e44ecbcde0b82e841. That commit caused the progress bar to be indeterminate if the progress bar was not visible, which is semantically correct but in reality causes QML to redraw the screen constantly for the animation of the indeterminate progress bar. This was taking up CPU. Now the CPU is only taken up during the pausing and resuming states when the progress bar is visible and indeterminate, but then it is actually required.

Contributes to issue CURA-2497.
 2016-10-05 13:28:53 +02:00
Ghostkeeper
99f53cb832
Early cop-out if there is no printer connected 
This indeterminate state is never visible, since showProgress is false then, but it might prevent some error message behind the scenes.

Contributes to issue CURA-2060.
 2016-09-28 09:36:06 +02:00
Ghostkeeper
f4d13713a2
Replace progress bar with actual ProgressBar element 
QML has this progress bar that has more functionality than the progress bar we're using. We need an indeterminate state for the pausing and resuming states, so instead of implementing that myself, I'm using the QML ProgressBar element.

Contributes to issue CURA-2060.
 2016-09-27 14:03:49 +02:00
Ghostkeeper
3b2c173cd6
Keep showing progress while pausing/resuming 
I've chosen the blue 'progress' colour to be displayed while pausing and resuming.

Contributes to issue CURA-2060.
 2016-09-27 14:03:49 +02:00
Ghostkeeper
22f0a2dabf
Add TODOs for text to be added after string freeze 
We currently have a string freeze, so we can't add these cases here.

Contributes to issue CURA-2060.
 2016-09-27 14:03:49 +02:00
fieldOfView
e43dbcd0b7 Code style 
CURA-2235
 2016-09-14 09:37:53 +02:00
fieldOfView
b14bc477bf Update status text for consistency 2016-09-12 18:46:09 +02:00