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

357 Commits

Author SHA1 Message Date
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
Simon Edwards
bec7b6546d
Merge pull request #5726 from Ultimaker/CL-1331_use_API_for_UM3NetworkPrinting 
CL-1331 Extending the Cura API for the Network Printing Plugin
 2019-05-15 11:11:49 +02:00
Ian Paschal
5774813704 Use class properties 
Contributes to CL-1331
 2019-05-15 10:09:50 +02:00
Ian Paschal
b3276777b7 Expose machines API to QML 
Contributes to CL-1331
 2019-05-09 16:19:59 +02:00
Simon Edwards
d70acc793f Hide the Override button if it is not an option 
CL-1259
 2019-05-09 13:23:29 +02:00
Lipu Fei
1d4ab98ddc Fix binding loop 
CURA-6483
 2019-05-02 08:25:29 +02:00
Lipu Fei
71e32d94f7 Resolve merge conflicts 
CURA-6483
 2019-05-02 07:45:43 +02:00
Lipu Fei
3578482ea5 Fix connect via network dialog 
CURA-6483

 - Do not add printers that have already been discovered
 - Add IP address validation check
 2019-04-30 15:26:04 +02:00
Diego Prado Gesto
7249bd3c50 Remove two lines entered by mistake 
Keep it the same as in the base branch.
 2019-04-30 11:33:19 +02:00
Diego Prado Gesto
f62d19aa60 Fix rendering issues in macOS when connecting to secondary screen 
It used to happen before, but just adding native rendering fixes the issue.
 2019-04-30 11:24:01 +02:00
Ian Paschal
213a8fa6f3 Don't use compatible machien families for pills 
Contriutes to CL-1055
 2019-04-23 14:40:03 +02:00
Ian Paschal
2a7df3cedd Fix untranslated string 
Contributes to CL-1302
 2019-04-08 13:45:09 +02:00
Ghostkeeper
df32f3e263
Move Cura.ProgressBar to Uranium 
It is not specific to 3D printing.

Contributes to issue CURA-6057.
 2019-04-03 11:51:57 +02:00
Lipu Fei
4e5d08f320 Fix merge conflicts with master 2019-03-21 14:59:53 +01:00
Ghostkeeper
731cbc9e95
Make 'All jobs are printed.' translatable 2019-03-18 15:16:50 +01:00
Ian Paschal
ec203da1cd Make sure to show printers even if queue is empty 
Contributes to CL-1281
 2019-03-11 13:54:49 +01:00
Remco Burema
5f335b4401 Merge branch 'WIP_onboarding' of https://github.com/Ultimaker/Cura into WIP_onboarding 2019-03-06 14:07:44 +01:00
Remco Burema
113c37f555 Start work on 'AddPrinterByIp' for WelcomePages. [CURA-6057] 2019-03-01 13:17:15 +01:00
Simon Edwards
4590fae9b2 Hide the "View print history" button when connecting via cloud 
CL-1247
 2019-02-28 17:08:28 +01:00
Ian Paschal
a5761cb56b Use new property names for cloud connection detection 2019-02-20 14:08:13 +01:00
Ian Paschal
7b3420653e Actually, just hide manage queue on cloud 
Contributes to CL-1247
 2019-02-19 12:27:41 +01:00
Ian Paschal
b6b7f8cfce Disable queue link when connected to cloud 
Contributes to CL-1247
 2019-02-19 12:23:48 +01:00
Ian Paschal
e23dd2dd6b Grey-out buttons when using cloud connection 
Contributes to CL-1247
(includes some boyscoutin')
 2019-02-19 12:23:33 +01:00
Simon Edwards
dc9d3ba2a3
Merge pull request #5293 from Ultimaker/CL-1165_missing_cloud_info 
CL-1165 Improve cloud connection or not checking
 2019-02-13 14:23:05 +01:00
Ian Paschal
3c2791fefe Improve cloud connection or not checking 
Contributes to CL-1165
 2019-02-12 12:12:59 +01:00
Ian Paschal
d495e80959 Merge remote-tracking branch 'origin/4.0' into CL-1154_monitor_empty_states 2019-01-28 16:54:21 +01:00
Simon Edwards
72b98285b1
Merge pull request #5216 from Ultimaker/CL-1188_hide_print_job_on_unavailable_printer 
CL-1188 hide print job on unavailable printer
 2019-01-28 11:08:21 +01:00
Ian Paschal
ee5c6ed3fb Unconnected empty state (DRAFT) 
Contributes to CL-1154
 2019-01-24 16:54:09 +01:00
Ian Paschal
f6b69f05a9 Add empty state for print job queue 
Contributes to CL-1154
 2019-01-24 15:14:16 +01:00
Ian Paschal
3d92bd0133 Prevent endless skeleton loading on Cloud 
Contributes to CL-1154

For you @christerbeke
 2019-01-24 14:46:00 +01:00
Ian Paschal
e7151390f7 Label printers without connection to "unreachable" 
Contributes to CL-1188
 2019-01-24 10:24:55 +01:00
Ian Paschal
673734ee12 Show print job context menu if state == "error" 
Contributes to CL-1175
 2019-01-24 09:52:56 +01:00
Ian Paschal
5d2a914180 Always show context menu for print jobs 
Contributes to CL-1175
 2019-01-23 15:54:11 +01:00
Ian Paschal
4438f0d9a3 Add dark mode to new context menu 
Contributes to CL-1212
 2019-01-23 15:34:28 +01:00
Ian Paschal
e19323d38b Fix mising theme key 2019-01-23 14:47:59 +01:00