From 0b02a5f12bbb13fdd8f390d3cccacc4ed7ddd843 Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Thu, 23 Jun 2016 16:38:04 +0200
Subject: [PATCH 1/2] Machine actions are now when selected (instead of active)
 machine change

CURA-1385
---
 cura/MachineManagerModel.py                | 8 ++++++--
 resources/qml/Preferences/MachinesPage.qml | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/cura/MachineManagerModel.py b/cura/MachineManagerModel.py
index 70953ee712..3466cd6428 100644
--- a/cura/MachineManagerModel.py
+++ b/cura/MachineManagerModel.py
@@ -286,7 +286,6 @@ class MachineManagerModel(QObject):
         self.setActiveQuality(new_container_id)
         self.updateQualityContainerFromUserContainer()
 
-
     @pyqtSlot(str, result=str)
     def duplicateContainer(self, container_id):
         if not self._active_container_stack:
@@ -357,7 +356,6 @@ class MachineManagerModel(QObject):
                 self.setActiveQuality(containers[0].getId())
                 self.activeQualityChanged.emit()
 
-
     @pyqtSlot()
     def updateQualityContainerFromUserContainer(self):
         if not self._active_container_stack:
@@ -496,6 +494,12 @@ class MachineManagerModel(QObject):
 
         return False
 
+    @pyqtSlot(str, result = str)
+    def getDefinitionByMachineId(self, machine_id):
+        containers = UM.Settings.ContainerRegistry.getInstance().findContainerStacks(id=machine_id)
+        if containers:
+            return containers[0].getBottom().getId()
+
     def _updateVariantContainer(self, definition):
         if not definition.getMetaDataEntry("has_variants"):
             return self._empty_variant_container
diff --git a/resources/qml/Preferences/MachinesPage.qml b/resources/qml/Preferences/MachinesPage.qml
index 8a0a7dc096..5d96361306 100644
--- a/resources/qml/Preferences/MachinesPage.qml
+++ b/resources/qml/Preferences/MachinesPage.qml
@@ -46,7 +46,7 @@ UM.ManagementPage
             Repeater
             {
                 id: machineActionRepeater
-                model: Cura.MachineActionManager.getSupportedActions(Cura.MachineManager.activeDefinitionId)
+                model: Cura.MachineActionManager.getSupportedActions(Cura.MachineManager.getDefinitionByMachineId(base.currentItem.id))
 
                 Button
                 {

From e8743abe68da4403b361e3c9f91bd7a2f917eba5 Mon Sep 17 00:00:00 2001
From: fieldOfView <aldo@fieldofview.com>
Date: Thu, 23 Jun 2016 18:44:06 +0200
Subject: [PATCH 2/2] Set a sensible minimum width for the window

---
 cura/CuraApplication.py          | 4 ++++
 resources/qml/Cura.qml           | 5 +++++
 resources/themes/cura/theme.json | 1 +
 3 files changed, 10 insertions(+)

diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py
index 08c8513933..54f287d841 100644
--- a/cura/CuraApplication.py
+++ b/cura/CuraApplication.py
@@ -809,3 +809,7 @@ class CuraApplication(QtApplication):
 
     def _addProfileWriter(self, profile_writer):
         pass
+
+    @pyqtSlot("QSize")
+    def setMinimumWindowSize(self, size):
+        self.getMainWindow().setMinimumSize(size)
diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index a27c232e5e..ef26218332 100644
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -17,6 +17,11 @@ UM.MainWindow
     title: catalog.i18nc("@title:window","Cura");
     viewportRect: Qt.rect(0, 0, (base.width - sidebar.width) / base.width, 1.0)
 
+    Component.onCompleted:
+    {
+        Printer.setMinimumWindowSize(UM.Theme.getSize("window_minimum_size"))
+    }
+
     Item
     {
         id: backgroundItem;
diff --git a/resources/themes/cura/theme.json b/resources/themes/cura/theme.json
index acd60e2646..595d0b95c2 100644
--- a/resources/themes/cura/theme.json
+++ b/resources/themes/cura/theme.json
@@ -157,6 +157,7 @@
     },
 
     "sizes": {
+        "window_minimum_size": [70, 54],
         "window_margin": [1.0, 1.0],
         "default_margin": [1.0, 1.0],
         "default_lining": [0.08, 0.08],