diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 4270f5f85b..94a3994ff4 100644 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -230,8 +230,6 @@ class CuraApplication(QtApplication): Preferences.getInstance().addPreference("cura/currency", "€") Preferences.getInstance().addPreference("cura/material_settings", "{}") - Preferences.getInstance().addPreference("general/auto_slice", True) - for key in [ "dialog_load_path", # dialog_save_path is in LocalFileOutputDevicePlugin "dialog_profile_path", @@ -1207,3 +1205,17 @@ class CuraApplication(QtApplication): def addNonSliceableExtension(self, extension): self._non_sliceable_extensions.append(extension) + + # Temporary test, lack of correct location + @pyqtSlot() + def slice(self): + Logger.log("d", "Slice...") + backend = self.getBackend() + # backend.enableSlicing() + backend.forceSlice() + + @pyqtSlot() + def sliceStop(self): + Logger.log("d", "Slice stop...") + backend = self.getBackend() + backend.stopSlicing() diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py index 4c644a653a..a6c544c943 100644 --- a/plugins/CuraEngineBackend/CuraEngineBackend.py +++ b/plugins/CuraEngineBackend/CuraEngineBackend.py @@ -68,12 +68,6 @@ class CuraEngineBackend(Backend): default_engine_location = os.path.abspath(default_engine_location) Preferences.getInstance().addPreference("backend/location", default_engine_location) - self._scene = Application.getInstance().getController().getScene() - self._scene.sceneChanged.connect(self._onSceneChanged) - - self._pause_slicing = False - self._block_slicing = False # continueSlicing does not have effect if True - # Workaround to disable layer view processing if layer view is not active. self._layer_view_active = False Application.getInstance().getController().activeViewChanged.connect(self._onActiveViewChanged) @@ -81,6 +75,9 @@ class CuraEngineBackend(Backend): self._stored_layer_data = [] self._stored_optimized_layer_data = [] + self._scene = Application.getInstance().getController().getScene() + self._scene.sceneChanged.connect(self._onSceneChanged) + # Triggers for when to (re)start slicing: self._global_container_stack = None Application.getInstance().globalContainerStackChanged.connect(self._onGlobalStackChanged) @@ -90,14 +87,6 @@ class CuraEngineBackend(Backend): cura.Settings.ExtruderManager.getInstance().activeExtruderChanged.connect(self._onActiveExtruderChanged) self._onActiveExtruderChanged() - # When you update a setting and other settings get changed through inheritance, many propertyChanged signals are fired. - # This timer will group them up, and only slice for the last setting changed signal. - # TODO: Properly group propertyChanged signals by whether they are triggered by the same user interaction. - self._change_timer = QTimer() - self._change_timer.setInterval(500) - self._change_timer.setSingleShot(True) - self._change_timer.timeout.connect(self.slice) - # Listeners for receiving messages from the back-end. self._message_handlers["cura.proto.Layer"] = self._onLayerMessage self._message_handlers["cura.proto.LayerOptimized"] = self._onOptimizedLayerMessage @@ -113,6 +102,7 @@ class CuraEngineBackend(Backend): self._enabled = True # Should we be slicing? Slicing might be paused when, for instance, the user is dragging the mesh around. self._always_restart = True # Always restart the engine when starting a new slice. Don't keep the process running. TODO: Fix engine statelessness. self._process_layers_job = None # The currently active job to process layers, or None if it is not processing layers. + self._need_slicing = False self._backend_log_max_lines = 20000 # Maximum number of lines to buffer self._error_message = None # Pop-up message that shows errors. @@ -126,9 +116,17 @@ class CuraEngineBackend(Backend): self._slice_start_time = None - ## Called when closing the application. + Preferences.getInstance().addPreference("general/auto_slice", True) + + self._use_timer = False + self._change_timer = None + self.determineAutoSlicing() + Preferences.getInstance().preferenceChanged.connect(self._onPreferencesChanged) + + ## Terminate the engine process. # # This function should terminate the engine process. + # Called when closing the application. def close(self): # Terminate CuraEngine if it is still running at this point self._terminate() @@ -152,22 +150,8 @@ class CuraEngineBackend(Backend): ## Emitted when the slicing process is aborted forcefully. slicingCancelled = Signal() - ## Perform a slice of the scene. - def slice(self): - Logger.log("d", "Starting slice job...") - if self._pause_slicing or self._block_slicing: - return - self._slice_start_time = time() - if not self._enabled or not self._global_container_stack: # We shouldn't be slicing. - # try again in a short time - self._change_timer.start() - return - - self.printDurationMessage.emit(0, [0]) - - self._stored_layer_data = [] - self._stored_optimized_layer_data = [] - + def stopSlicing(self): + self.backendStateChange.emit(BackendState.NotStarted) if self._slicing: # We were already slicing. Stop the old job. self._terminate() @@ -178,6 +162,29 @@ class CuraEngineBackend(Backend): if self._error_message: self._error_message.hide() + ## Perform a slice of the scene. + def slice(self): + Logger.log("d", "Starting slice job...") + self._slice_start_time = time() + # if not self._enabled or not self._global_container_stack: # We shouldn't be slicing. + # if self._use_timer: + # # try again in a short time + # self._change_timer.start() + # return + if not self._need_slicing: + Logger.log("d", "Do not need to slice") + return + + self.printDurationMessage.emit(0, [0]) + + self._stored_layer_data = [] + self._stored_optimized_layer_data = [] + + if self._process is None: + Logger.log("d", "Creating socket and start the engine...") + self._createSocket() + self.stopSlicing() + self.processingProgress.emit(0.0) self.backendStateChange.emit(BackendState.NotStarted) @@ -186,24 +193,16 @@ class CuraEngineBackend(Backend): self.slicingStarted.emit() slice_message = self._socket.createMessage("cura.proto.Slice") + Logger.log("d", "Really starting slice job") self._start_slice_job = StartSliceJob.StartSliceJob(slice_message) self._start_slice_job.start() self._start_slice_job.finished.connect(self._onStartSliceCompleted) - - def pauseSlicing(self): - if not self._pause_slicing: - self.close() - self._pause_slicing = True - self.backendStateChange.emit(BackendState.Disabled) - - def continueSlicing(self): - if self._pause_slicing and not self._block_slicing: - self._pause_slicing = False - self.backendStateChange.emit(BackendState.NotStarted) - ## Terminate the engine process. def _terminate(self): + # # Process is none, Try and re-create the socket???? + # self._createSocket() + # return self._slicing = False self._restart = True self._stored_layer_data = [] @@ -227,9 +226,9 @@ class CuraEngineBackend(Backend): except Exception as e: # terminating a process that is already terminating causes an exception, silently ignore this. Logger.log("d", "Exception occurred while trying to kill the engine %s", str(e)) - else: - # Process is none, but something did went wrong here. Try and re-create the socket - self._createSocket() + # else: + # # Process is none, but something did went wrong here. Try and re-create the socket + # self._createSocket() ## Event handler to call when the job to initiate the slicing process is # completed. @@ -305,6 +304,40 @@ class CuraEngineBackend(Backend): Logger.log("d", "Sending slice message took %s seconds", time() - self._slice_start_time ) + def forceSlice(self): + if self._use_timer: + self._change_timer.start() + else: + self.slice() + + ## Determine enable or disable slicing. + # It disables when + # - preference auto slice is off + # - decorator isBlockSlicing is found (used in g-code reader) + def determineAutoSlicing(self): + enable_timer = True + + if not Preferences.getInstance().getValue("general/auto_slice"): + enable_timer = False + for node in DepthFirstIterator(self._scene.getRoot()): + if node.callDecoration("isBlockSlicing"): + enable_timer = False + self.backendStateChange.emit(BackendState.Disabled) + gcode_list = node.callDecoration("getGCodeList") + if gcode_list is not None: + self._scene.gcode_list = gcode_list + + if self._enabled == enable_timer: + return + if enable_timer: + self._enabled = True + self.backendStateChange.emit(BackendState.NotStarted) + self.enableTimer() + else: + self._enabled = False + # self.close() + self.disableTimer() + ## Listener for when the scene has changed. # # This should start a slice if the scene is now ready to slice. @@ -317,22 +350,7 @@ class CuraEngineBackend(Backend): if source is self._scene.getRoot(): return - should_pause = self._pause_slicing - block_slicing = False - for node in DepthFirstIterator(self._scene.getRoot()): - if node.callDecoration("isBlockSlicing"): - should_pause = True - block_slicing = True - gcode_list = node.callDecoration("getGCodeList") - if gcode_list is not None: - self._scene.gcode_list = gcode_list - - self._block_slicing = block_slicing - - if should_pause or self._block_slicing: - self.pauseSlicing() - else: - self.continueSlicing() + self.determineAutoSlicing() if source.getMeshData() is None: return @@ -340,6 +358,8 @@ class CuraEngineBackend(Backend): if source.getMeshData().getVertices() is None: return + self.needSlicing() + self.stopSlicing() self._onChanged() ## Called when an error occurs in the socket connection towards the engine. @@ -358,12 +378,32 @@ class CuraEngineBackend(Backend): if error.getErrorCode() not in [Arcus.ErrorCode.BindFailedError, Arcus.ErrorCode.ConnectionResetError, Arcus.ErrorCode.Debug]: Logger.log("w", "A socket error caused the connection to be reset") + ## TODO: now copied from ProcessSlicedLayersJob. Find my a home. + def _clearLayerData(self): + ## Remove old layer data (if any) + for node in DepthFirstIterator(self._scene.getRoot()): + if node.callDecoration("getLayerData"): + node.getParent().removeChild(node) + break + # if self._abort_requested: + # if self._progress: + # self._progress.hide() + # return + + ## Convenient function: set need_slicing, emit state and clear layer data + def needSlicing(self): + self._need_slicing = True + self.processingProgress.emit(0.0) + self.backendStateChange.emit(BackendState.NotStarted) + self._clearLayerData() + ## A setting has changed, so check if we must reslice. # # \param instance The setting instance that has changed. # \param property The property of the setting instance that has changed. def _onSettingChanged(self, instance, property): if property == "value": # Only reslice if the value has changed. + self.needSlicing() self._onChanged() ## Called when a sliced layer data message is received from the engine. @@ -393,6 +433,7 @@ class CuraEngineBackend(Backend): self.processingProgress.emit(1.0) self._slicing = False + self._need_slicing = False Logger.log("d", "Slicing took %s seconds", time() - self._slice_start_time ) if self._layer_view_active and (self._process_layers_job is None or not self._process_layers_job.isRunning()): self._process_layers_job = ProcessSlicedLayersJob.ProcessSlicedLayersJob(self._stored_optimized_layer_data) @@ -429,13 +470,17 @@ class CuraEngineBackend(Backend): ## Manually triggers a reslice def forceSlice(self): - self._change_timer.start() + if self._use_timer: + self._change_timer.start() + else: + self.slice() ## Called when anything has changed to the stuff that needs to be sliced. # # This indicates that we should probably re-slice soon. def _onChanged(self, *args, **kwargs): - self._change_timer.start() + if self._use_timer: + self.forceSlice() ## Called when the back-end connects to the front-end. def _onBackendConnected(self): @@ -451,8 +496,8 @@ class CuraEngineBackend(Backend): # \param tool The tool that the user is using. def _onToolOperationStarted(self, tool): self._enabled = False # Do not reslice when a tool is doing it's 'thing' - self._terminate() # Do not continue slicing once a tool has started - + if self._use_timer: + self._terminate() # Do not continue slicing once a tool has started ## Called when the user stops using some tool. # @@ -460,6 +505,7 @@ class CuraEngineBackend(Backend): # # \param tool The tool that the user was using. def _onToolOperationStopped(self, tool): + self.needSlicing() self._enabled = True # Tool stop, start listening for changes again. ## Called when the user changes the active view mode. @@ -486,10 +532,11 @@ class CuraEngineBackend(Backend): if self._process: Logger.log("d", "Backend quit with return code %s. Resetting process and socket.", self._process.wait()) self._process = None - self._createSocket() ## Called when the global container stack changes def _onGlobalStackChanged(self): + self.needSlicing() + if self._global_container_stack: self._global_container_stack.propertyChanged.disconnect(self._onSettingChanged) self._global_container_stack.containersChanged.disconnect(self._onChanged) @@ -511,6 +558,8 @@ class CuraEngineBackend(Backend): self._onChanged() def _onActiveExtruderChanged(self): + self.needSlicing() + if self._global_container_stack: # Connect all extruders of the active machine. This might cause a few connects that have already happend, # but that shouldn't cause issues as only new / unique connections are added. @@ -527,3 +576,30 @@ class CuraEngineBackend(Backend): def _onProcessLayersFinished(self, job): self._process_layers_job = None + + def enableTimer(self): + self._enabled = True + self._use_timer = True + self._restart = True + # When you update a setting and other settings get changed through inheritance, many propertyChanged signals are fired. + # This timer will group them up, and only slice for the last setting changed signal. + # TODO: Properly group propertyChanged signals by whether they are triggered by the same user interaction. + self._change_timer = QTimer() + self._change_timer.setInterval(500) + self._change_timer.setSingleShot(True) + self._change_timer.timeout.connect(self.slice) + + ## Disable timer. + # This means that slicing will not be triggered automatically + def disableTimer(self): + self._enabled = False + if self._change_timer is not None: + self._change_timer.timeout.disconnect() + self._change_timer = None + self._use_timer = False + self._restart = False + + def _onPreferencesChanged(self, preference): + if preference != "general/auto_slice": + return + self.determineAutoSlicing() \ No newline at end of file diff --git a/plugins/PauseBackendPlugin/CMakeLists.txt b/plugins/PauseBackendPlugin/CMakeLists.txt deleted file mode 100644 index 83e1c61a7d..0000000000 --- a/plugins/PauseBackendPlugin/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -project(PauseBackendPlugin) -cmake_minimum_required(VERSION 2.8.12) - -install(FILES - __init__.py - PauseBackend.py - PauseBackend.qml - pause.svg - play.svg - LICENSE - README.md - DESTINATION lib/cura/plugins/PauseBackendPlugin -) diff --git a/plugins/PauseBackendPlugin/LICENSE b/plugins/PauseBackendPlugin/LICENSE deleted file mode 100644 index dbbe355815..0000000000 --- a/plugins/PauseBackendPlugin/LICENSE +++ /dev/null @@ -1,661 +0,0 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU Affero General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU Affero General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published - by the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU AGPL, see -. diff --git a/plugins/PauseBackendPlugin/PauseBackend.py b/plugins/PauseBackendPlugin/PauseBackend.py deleted file mode 100644 index 2871ee30af..0000000000 --- a/plugins/PauseBackendPlugin/PauseBackend.py +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright ;(c) 2016 Ultimaker B.V. -# Cura is released under the terms of the AGPLv3 or higher. - -from PyQt5.QtCore import QTimer - -from UM.Extension import Extension -from UM.Application import Application -from UM.PluginRegistry import PluginRegistry -from UM.Logger import Logger - -from UM.Backend.Backend import BackendState - -from PyQt5.QtQml import QQmlComponent, QQmlContext -from PyQt5.QtCore import QUrl, pyqtSlot, QObject - -import os.path - -class PauseBackend(QObject, Extension): - def __init__(self, parent = None): - super().__init__(parent = parent) - - self._additional_component = None - self._additional_components_view = None - - Application.getInstance().engineCreatedSignal.connect(self._createAdditionalComponentsView) - - def _createAdditionalComponentsView(self): - Logger.log("d", "Creating additional ui components for Pause Backend plugin.") - - path = QUrl.fromLocalFile(os.path.join(PluginRegistry.getInstance().getPluginPath("PauseBackendPlugin"), "PauseBackend.qml")) - self._additional_component = QQmlComponent(Application.getInstance()._engine, path) - - # We need access to engine (although technically we can't) - self._additional_components_context = QQmlContext(Application.getInstance()._engine.rootContext()) - self._additional_components_context.setContextProperty("manager", self) - - self._additional_components_view = self._additional_component.create(self._additional_components_context) - if not self._additional_components_view: - Logger.log("w", "Could not create additional components for Pause Backend plugin.") - return - - Application.getInstance().addAdditionalComponent("saveButton", self._additional_components_view.findChild(QObject, "pauseResumeButton")) - - @pyqtSlot() - def pauseBackend(self): - backend = Application.getInstance().getBackend() - backend.pauseSlicing() - - @pyqtSlot() - def resumeBackend(self): - backend = Application.getInstance().getBackend() - backend.continueSlicing() - backend.forceSlice() \ No newline at end of file diff --git a/plugins/PauseBackendPlugin/PauseBackend.qml b/plugins/PauseBackendPlugin/PauseBackend.qml deleted file mode 100644 index ac3c4fe477..0000000000 --- a/plugins/PauseBackendPlugin/PauseBackend.qml +++ /dev/null @@ -1,72 +0,0 @@ -import UM 1.2 as UM -import Cura 1.0 as Cura - -import QtQuick 2.2 -import QtQuick.Controls 1.1 -import QtQuick.Controls.Styles 1.1 -import QtQuick.Layouts 1.1 -import QtQuick.Window 2.1 - -Item -{ - id: base - - Button - { - id: pauseResumeButton - objectName: "pauseResumeButton" - - property bool paused: false - - height: UM.Theme.getSize("save_button_save_to_button").height - width: height - - tooltip: paused ? catalog.i18nc("@info:tooltip", "Resume automatic slicing") : catalog.i18nc("@info:tooltip", "Pause automatic slicing") - - style: ButtonStyle { - background: Rectangle { - border.width: UM.Theme.getSize("default_lining").width - border.color: !control.enabled ? UM.Theme.getColor("action_button_disabled_border") : - control.pressed ? UM.Theme.getColor("action_button_active_border") : - control.hovered ? UM.Theme.getColor("action_button_hovered_border") : UM.Theme.getColor("action_button_border") - color: !control.enabled ? UM.Theme.getColor("action_button_disabled") : - control.pressed ? UM.Theme.getColor("action_button_active") : - control.hovered ? UM.Theme.getColor("action_button_hovered") : UM.Theme.getColor("action_button") - Behavior on color { ColorAnimation { duration: 50; } } - anchors.left: parent.left - anchors.leftMargin: UM.Theme.getSize("save_button_text_margin").width / 2; - width: parent.height - height: parent.height - - UM.RecolorImage { - anchors.verticalCenter: parent.verticalCenter - anchors.horizontalCenter: parent.horizontalCenter - width: parent.width / 2 - height: parent.height / 2 - sourceSize.width: width - sourceSize.height: height - color: !control.enabled ? UM.Theme.getColor("action_button_disabled_text") : - control.pressed ? UM.Theme.getColor("action_button_active_text") : - control.hovered ? UM.Theme.getColor("action_button_hovered_text") : UM.Theme.getColor("action_button_text"); - source: pauseResumeButton.paused ? "play.svg" : "pause.svg" - } - } - label: Label{ } - } - - onClicked: - { - paused = !paused - if(paused) - { - manager.pauseBackend() - } - else - { - manager.resumeBackend() - } - } - } - - UM.I18nCatalog{id: catalog; name:"cura"} -} \ No newline at end of file diff --git a/plugins/PauseBackendPlugin/__init__.py b/plugins/PauseBackendPlugin/__init__.py deleted file mode 100644 index 2612086833..0000000000 --- a/plugins/PauseBackendPlugin/__init__.py +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2016 Aldo Hoeben / fieldOfView. -# Cura is released under the terms of the AGPLv3 or higher. - -from . import PauseBackend - -from UM.i18n import i18nCatalog -catalog = i18nCatalog("cura") - -def getMetaData(): - return { - "plugin": { - "name": catalog.i18nc("@label", "Auto Save"), - "author": "Ultimaker", - "version": "2.3", - "description": catalog.i18nc("@info:whatsthis", "Adds a button to pause automatic background slicing."), - "api": 3 - }, - } - -def register(app): - return { "extension": PauseBackend.PauseBackend() } diff --git a/plugins/PauseBackendPlugin/pause.svg b/plugins/PauseBackendPlugin/pause.svg deleted file mode 100644 index 7ca81f89c3..0000000000 --- a/plugins/PauseBackendPlugin/pause.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/plugins/PauseBackendPlugin/play.svg b/plugins/PauseBackendPlugin/play.svg deleted file mode 100644 index 9c56408a64..0000000000 --- a/plugins/PauseBackendPlugin/play.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/resources/qml/SaveButton.qml b/resources/qml/SaveButton.qml index 2b435aad1b..6f9eb4cb07 100644 --- a/resources/qml/SaveButton.qml +++ b/resources/qml/SaveButton.qml @@ -27,7 +27,8 @@ Item { switch(base.backendState) { case 1: - return catalog.i18nc("@label:PrintjobStatus", "Preparing to slice..."); + return ""; + //return catalog.i18nc("@label:PrintjobStatus", "Preparing to slice..."); case 2: return catalog.i18nc("@label:PrintjobStatus", "Slicing..."); case 3: @@ -102,11 +103,96 @@ Item { } } + // Prepare button, only shows if auto_slice is off + Button { + id: prepareButton + + tooltip: UM.OutputDeviceManager.activeDeviceDescription; + //enabled: (base.backendState == 3 || base.backendState == 5) && base.activity == true + enabled: (base.backendState == 1 || base.backendState == 2) && base.activity == true + visible: { + CuraApplication.log("pref: " + UM.Preferences.getValue("general/auto_slice")); + CuraApplication.log("backend state: " + base.backendState); + CuraApplication.log("activity: " + base.activity); + return !UM.Preferences.getValue("general/auto_slice") && (base.backendState == 1 || base.backendState == 2) && base.activity == true + } + height: UM.Theme.getSize("save_button_save_to_button").height + + anchors.top: parent.top + anchors.right: parent.right + anchors.rightMargin: UM.Theme.getSize("default_margin").width + + text: [1, 5].indexOf(UM.Backend.state) != -1 ? catalog.i18nc("@label:Printjob", "Prepare") : catalog.i18nc("@label:Printjob", "Cancel") + onClicked: + { + if ([1, 5].indexOf(UM.Backend.state) != -1) { + CuraApplication.log("Prepare...."); + CuraApplication.slice(); + } else { + CuraApplication.log("Cancel...."); + CuraApplication.sliceStop(); + } + } + + style: ButtonStyle { + background: Rectangle + { + border.width: UM.Theme.getSize("default_lining").width + border.color: + { + if(!control.enabled) + return UM.Theme.getColor("action_button_disabled_border"); + else if(control.pressed) + return UM.Theme.getColor("action_button_active_border"); + else if(control.hovered) + return UM.Theme.getColor("action_button_hovered_border"); + else + return UM.Theme.getColor("action_button_border"); + } + color: + { + if(!control.enabled) + return UM.Theme.getColor("action_button_disabled"); + else if(control.pressed) + return UM.Theme.getColor("action_button_active"); + else if(control.hovered) + return UM.Theme.getColor("action_button_hovered"); + else + return UM.Theme.getColor("action_button"); + } + + Behavior on color { ColorAnimation { duration: 50; } } + + implicitWidth: actualLabel.contentWidth + (UM.Theme.getSize("default_margin").width * 2) + + Label { + id: actualLabel + anchors.centerIn: parent + color: + { + if(!control.enabled) + return UM.Theme.getColor("action_button_disabled_text"); + else if(control.pressed) + return UM.Theme.getColor("action_button_active_text"); + else if(control.hovered) + return UM.Theme.getColor("action_button_hovered_text"); + else + return UM.Theme.getColor("action_button_text"); + } + font: UM.Theme.getFont("action_button") + text: control.text; + } + } + label: Item { } + } + } + Button { id: saveToButton tooltip: UM.OutputDeviceManager.activeDeviceDescription; enabled: (base.backendState == 3 || base.backendState == 5) && base.activity == true + visible: UM.Preferences.getValue("general/auto_slice") || ((base.backendState == 3 || base.backendState == 5) && base.activity == true) height: UM.Theme.getSize("save_button_save_to_button").height anchors.top: parent.top @@ -182,7 +268,7 @@ Item { width: UM.Theme.getSize("save_button_save_to_button").height height: UM.Theme.getSize("save_button_save_to_button").height enabled: (base.backendState == 3 || base.backendState == 5) && base.activity == true - visible: devicesModel.deviceCount > 1 + visible: (devicesModel.deviceCount > 1) && (base.backendState == 3 || base.backendState == 5) && base.activity == true style: ButtonStyle { diff --git a/resources/qml/Sidebar.qml b/resources/qml/Sidebar.qml index 148606679f..86570a8d85 100644 --- a/resources/qml/Sidebar.qml +++ b/resources/qml/Sidebar.qml @@ -15,7 +15,7 @@ Rectangle id: base; property int currentModeIndex; - property bool monitoringPrint: false + property bool monitoringPrint: false; // When adding more "tabs", one want to replace this bool with a ListModel property bool hideSettings: PrintInformation.preSliced Connections { @@ -31,6 +31,7 @@ Rectangle // Is there an output device for this printer? property bool printerConnected: Cura.MachineManager.printerOutputDevices.length != 0 property bool printerAcceptsCommands: printerConnected && Cura.MachineManager.printerOutputDevices[0].acceptsCommands + property int backendState: UM.Backend.state; color: UM.Theme.getColor("sidebar") UM.I18nCatalog { id: catalog; name:"cura"} @@ -529,6 +530,8 @@ Rectangle anchors.bottomMargin: UM.Theme.getSize("default_margin").height } + // SaveButton and MonitorButton are actually the bottom footer panels. + // "!monitoringPrint" currently means "show-settings-mode" SaveButton { id: saveButton @@ -553,6 +556,7 @@ Rectangle id: tooltip; } + // Setting mode: Recommended or Custom ListModel { id: modesListModel;