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

300 Commits

Author SHA1 Message Date
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
Simon Edwards
1163d8f442
Merge pull request #5271 from Ultimaker/CL-1222_cloud_flow_pop_up 
CL-1222 Cloud flow pop up
 2019-02-08 13:26:03 +01:00
Ian Paschal
348689eace Add cloud flow graphics 
Contributes to CL-1222
 2019-02-06 11:58:51 +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
Ian Paschal
1097f16011 Add theme (and dark mode) 
Contributes to CL-1165
 2019-01-23 12:08:20 +01:00
Ian Paschal
32072e3bfe Merge remote-tracking branch 'origin/4.0' into CL-1165_missing_cloud_info 2019-01-23 12:05:06 +01:00
Ian Paschal
283de789c2 Remove comment 
Contributes to CL-1212
 2019-01-22 12:00:50 +01:00
Ian Paschal
76240bb458 Remove unused comment 
Contributes to CL-1212
 2019-01-22 11:13:27 +01:00
Ian Paschal
e212bbfb01 Add some translations which were forgotten 2019-01-21 17:13:34 +01:00
Ian Paschal
bc9831abd1 Add color theming to monitor tab 
Contributes to CL-1212
 2019-01-21 17:10:41 +01:00
Ian Paschal
406ef20802 Revert "Add theme colors" 
This reverts commit 2e5eb611442b992ca0da60dc22a9e16538c48fa9.
 2019-01-21 14:05:24 +01:00
Ian Paschal
2e5eb61144 Add theme colors 
Contributes to CL-1212
 2019-01-21 13:07:16 +01:00