From 37e6dd6a75f206d46e7a16d952dfd8de8e318832 Mon Sep 17 00:00:00 2001
From: NaruX <akira@narux.de>
Date: Wed, 27 Jun 2018 08:55:49 +0200
Subject: [PATCH] Voreinstellungen vom Programmfenster werden wieder ?bernommen

---
 revpipycontrol.e4p               |  4 ++--
 revpipycontrol/revpiprogram.py   | 12 ++++++------
 revpipycontrol/revpipycontrol.py |  2 +-
 setup.py                         |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/revpipycontrol.e4p b/revpipycontrol.e4p
index 9f0264c..f7fd027 100644
--- a/revpipycontrol.e4p
+++ b/revpipycontrol.e4p
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Project SYSTEM "Project-5.1.dtd">
 <!-- eric project file for project revpipycontrol -->
-<!-- Saved: 2018-04-07, 14:53:30 -->
+<!-- Saved: 2018-05-25, 08:26:59 -->
 <!-- Copyright (C) 2018 Sven Sager, akira@narux.de -->
 <Project version="5.1">
   <Language>en_US</Language>
@@ -9,7 +9,7 @@
   <ProgLanguage mixed="0">Python3</ProgLanguage>
   <ProjectType>Console</ProjectType>
   <Description></Description>
-  <Version>0.6.1</Version>
+  <Version>0.6.2</Version>
   <Author>Sven Sager</Author>
   <Email>akira@narux.de</Email>
   <Eol index="1"/>
diff --git a/revpipycontrol/revpiprogram.py b/revpipycontrol/revpiprogram.py
index 5c19f3e..7d3a1ee 100644
--- a/revpipycontrol/revpiprogram.py
+++ b/revpipycontrol/revpiprogram.py
@@ -82,7 +82,7 @@ class RevPiProgram(tkinter.Frame):
         self.xmlstate = "normal" if xmlmode >= 3 else "disabled"
 
         # Letzte Einstellungen übernehmen
-        self.opt = _loaddefaults()
+        self.opt = _loaddefaults(revpi)
 
         # Fenster bauen
         self._createwidgets()
@@ -339,7 +339,7 @@ class RevPiProgram(tkinter.Frame):
                 )
                 # Einstellungen speichern
                 self.opt["getpictoryrsc_dir"] = os.path.dirname(fh.name)
-                self._savedefaults(self.revpi, self.opt)
+                _savedefaults(self.revpi, self.opt)
             finally:
                 fh.close()
 
@@ -370,7 +370,7 @@ class RevPiProgram(tkinter.Frame):
                 )
                 # Einstellungen speichern
                 self.opt["getprocimg_dir"] = os.path.dirname(fh.name)
-                self._savedefaults(self.revpi, self.opt)
+                _savedefaults(self.revpi, self.opt)
             finally:
                 fh.close()
 
@@ -418,7 +418,7 @@ class RevPiProgram(tkinter.Frame):
 
                 # Einstellungen speichern
                 self.opt["setpictoryrsc_dir"] = os.path.dirname(fh.name)
-                self._savedefaults(self.revpi, self.opt)
+                _savedefaults(self.revpi, self.opt)
             elif ec == -1:
                 tkmsg.showerror(
                     _("Error"),
@@ -576,7 +576,7 @@ class RevPiProgram(tkinter.Frame):
                 )
 
                 # Einstellungen speichern
-                self._savedefaults(self.revpi, self.opt)
+                _savedefaults(self.revpi, self.opt)
             finally:
                 fh.close()
 
@@ -752,7 +752,7 @@ class RevPiProgram(tkinter.Frame):
 
             self.opt["typeup"] = self.var_typeup.get()
             self.opt["picup"] = self.var_picup.get()
-            self._savedefaults(self.revpi, self.opt)
+            _savedefaults(self.revpi, self.opt)
 
         elif ec == -1:
             tkmsg.showerror(
diff --git a/revpipycontrol/revpipycontrol.py b/revpipycontrol/revpipycontrol.py
index ace204d..3c424eb 100755
--- a/revpipycontrol/revpipycontrol.py
+++ b/revpipycontrol/revpipycontrol.py
@@ -25,7 +25,7 @@ from xmlrpc.client import ServerProxy
 # Übersetzung laden
 _ = gettrans()
 
-pycontrolversion = "0.6.1"
+pycontrolversion = "0.6.2"
 
 
 class RevPiPyControl(tkinter.Frame):
diff --git a/setup.py b/setup.py
index 8a3062b..742dc68 100644
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ globsetup = {
     "author_email": "akira@narux.de",
     "url": "https://revpimodio.org/revpipyplc/",
     "license": "LGPLv3",
-    "version": "0.6.1",
+    "version": "0.6.2",
 
     "name": "revpipycontrol",