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

291 Commits

Author SHA1 Message Date
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
Kostas Karmas
adc8072991 Hide queue in Monitor page if printer does not support it 
CURA-7784
 2020-10-30 12:44:59 +01:00
Kostas Karmas
f576e07c11 Add "preparing" status in monitor page 
CURA-7745
 2020-10-20 09:49:11 +02:00
Jaime van Kessel
3ad5219f5d
Simplify the printer state display 
CURA-7745
 2020-10-12 11:06:49 +02:00
Jaime van Kessel
77290451e1
Remove a bunch of unneeded properties from the labels 
CURA-7745
 2020-10-08 18:00:53 +02:00
Jaime van Kessel
ec5796400b
Remove hardcoded narrow_margins 
CURA-7745
 2020-10-08 17:55:11 +02:00
Jaime van Kessel
3e67d20890
Remove monitor_text_primary 
It's so close to the text one that it really doesn't make sense to keep it.
Boyscouting the code a bit here

CURA-7745
 2020-10-08 17:31:19 +02:00
Jaime van Kessel
910d8ec472
Fix reference error 
CURA-7745
 2020-10-08 17:22:24 +02:00
Jaime van Kessel
99f42c179f
Remove hardcoded value for num extruders 
CURA-7745
 2020-10-08 17:18:24 +02:00
Ghostkeeper
55dbb1ea0c
Temporarily remove warning message for cloud cameras 
It's incorrect; the camera is possible with development firmware, but not implemented yet in Cura.

Removed this in lieu of the actual fix in CURA-7637, which takes too much time to fix for the 4.7 release.
 2020-08-11 13:29:53 +02:00
Remco Burema
b394be3583
Remove superfluous theme entry. 
It was messing with the dark side. Theme. I mean theme.
part of CURA-7627
 2020-08-05 08:16:10 +02:00
Nino van Hooff
214e41f983 Use a more specific link for the network troubleshooting guide 
CURA-7434
 2020-04-14 16:55:36 +02:00
Ghostkeeper
3dbbd17e32
Round coordinates 
This would have worked out of the box if this plug-in actually used the theme rather than hard-coding its sizes here. However that is too big of a change for me to make in 5 minutes, so it'll have to wait. Also fixed some missing screen scale factors.

Done as a 5 minute fix to try to amend #7125.
 2020-02-25 15:00:41 +01:00
ChrisTerBeke
9a3ff527ac Bring back the printer selection dialog for networked printers 2019-10-25 12:25:41 +02:00
Ghostkeeper
867283ffc3
Code style 2019-10-24 13:23:44 +02:00
Lipu Fei
96a9bcccbb Merge remote-tracking branch 'origin/master' into feature_intent 2019-10-01 09:41:05 +02:00
ChrisTerBeke
99832c3a68
Use printer type name instead of id 2019-09-27 21:09:53 +02:00
Remco Burema
7a1850a87b Actually fix QML nullptr warnings for real. 2019-09-27 12:53:32 +02:00
Ian Paschal
72ba6153c2 Boyscout some stuff 
CS-158
 2019-09-11 14:50:54 +02:00
Ian Paschal
3b5cf115f1 Reduce progress bar length 
CS-158
 2019-09-11 14:50:42 +02:00
Ian Paschal
07a5213ea6 Reduce text size to 12pt from 14pt 
CS-158
 2019-09-11 14:50:15 +02:00
Ghostkeeper
9122d0cca4
Remove misleading text that says you could enter hostnames 
We don't resolve the hostnames ever. You can only enter IP addresses.
 2019-08-21 09:56:32 +02:00
ChrisTerBeke
60758093f1
Determine skeleton loading properly 2019-08-15 21:29:20 +02:00
ChrisTerBeke
75f52c5a24
Bring back skeleton loading for monitor stage 2019-08-15 21:25:56 +02:00
ChrisTerBeke
9e6e9a4beb
Enable force override print job in local network, fix override button not enabled on older firmwares 2019-08-15 20:16:55 +02:00
ChrisTerBeke
de3f82610a
Add tooltips for firmware update back, fix print job override state 2019-08-15 19:42:25 +02:00
ChrisTerBeke
e977cdd431
Add legacy 'Connect over Network' button back 2019-08-12 01:19:41 +02:00
Ian Paschal
9a29c77228 Remove debug property 
Contributes to CS-251
 2019-08-08 15:23:29 +02:00
Ian Paschal
1aed8a1fa5 Add manage printer link 
Contributes to CS-251
 2019-08-08 15:20:37 +02:00
ChrisTerBeke
0ba8bf13e1 Fix copyright year to 2019 2019-08-02 15:09:37 +02:00
ChrisTerBeke
c1b5cce064 Fix string formatting 2019-07-30 18:04:16 +02:00
ChrisTerBeke
7d69b1727d Simplify code 2019-07-29 14:56:21 +02:00
ChrisTerBeke
4b212d6c05 Merge more stuff, re-use models for local networking as well 2019-07-29 14:53:50 +02:00
ChrisTerBeke
96cf235d8c Get rid of any hardcoded references to machines 2019-07-25 14:56:46 +02:00
ChrisTerBeke
7300f95a42
Hide incorrect tooltip 
The preffered solution was to change the copywriting, but since we are after stringfreeze we cannot do this. This is the next best solution to prevent user confusion.
 2019-07-22 21:21:18 +02:00
ChrisTerBeke
f1df7b93c4 Fix printer and print job ordering, add back 'move to top' 2019-07-10 12:42:01 +02:00
ChrisTerBeke
b6a00b9f7f Hide 'move to top' opion from actions 2019-07-09 08:26:44 +02:00
ChrisTerBeke
1ab109ade0 Fix 'resume' action 2019-06-20 13:46:20 +02:00
ChrisTerBeke
93351ec9b9 Show context menu on printers with firmware 5.3 or later 2019-06-20 12:36:15 +02:00
ChrisTerBeke
eb8d353e11 Add basic support for print job actions via Cloud output device 2019-06-19 13:58:11 +02:00
Cherubim
cdafdc8d5c
Break up translation in two pieces 
As a rule of thumb, translated text should not contain any layout. This particular text has gone wrong in the translations because the translators didn't translate the second part (or their application messed it up). I'm breaking it up into two pieces as to force them to translate both.

Contributes to issue CURA-6547.
 2019-05-28 11:23:42 +02:00
Ghostkeeper
4e361a068c
Revert "Merge pull request #5726 from Ultimaker/CL-1331_use_API_for_UM3NetworkPrinting" 
This reverts commit bec7b6546d3f7de457418a2e15f08c1e6dfa3148, reversing
changes made to 7094b222b10076af3a13f11b03dd3416eae12156.

The changes there were not accepted. Please see pull request https://github.com/Ultimaker/Cura/pull/5726 for the discussion about this.

Conflicts:
	plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py -> Just in one TODO comment.
 2019-05-23 13:40:11 +02:00
Lipu Fei
3ca272ff72 Merge remote-tracking branch 'origin/4.1' 2019-05-22 07:44:26 +02:00
Remco Burema
083564a184
Merge pull request #5763 from Ultimaker/CL-1329_fix_monitor_progress_bar_bug 
CL-1329 fix monitor progress bar bug
 2019-05-21 17:27:53 +02:00
Ian Paschal
0dc49a66f1
Merge pull request #5762 from Ultimaker/CL-1259_hide_useless_override_button 
CL-1259 hide useless override button
 2019-05-20 15:47:26 +02:00
Ian Paschal
0c9f3a1842 Update MonitorConfigOverrideDialog.qml 
Contributes to CL-1259
 2019-05-20 15:47:19 +02:00
Ian Paschal
3b7b554f1a Update MonitorPrintJobProgressBar.qml 
Contributes to CL-1329
 2019-05-20 12:18:55 +02:00
Ian Paschal
c9588d173f Add monitor column to theme 
Contributes to CL-1329
 2019-05-20 12:18:38 +02:00
Ian Paschal
6dc43f9ed1 Hide override button if it can't be overridden 
Contributes to CL-1259
 2019-05-20 10:59:51 +02:00