Merge branch 'develop' of ariadne.geophysik.rub.de:/data/git/pylot into develop

Conflicts:
	pylot/RELEASE-VERSION

icons_rc.py

@@ -7,7 +7,7 @@
 #
 # WARNING! All changes made in this file will be lost!
 
-from PyQt4 import QtCore
+from PySide import QtCore
 
 qt_resource_data = "\
 \x00\x00\x9e\x04\

pylot/RELEASE-VERSION

@@ -1 +0,0 @@
-6405-dirty

pylot/core/util/widgets.py

@@ -1804,8 +1804,11 @@ class AutoPickParaBox(QtGui.QWidget):
             self.parameter.setParamKV(param, value)
         return self.parameter
 
-    def params_to_gui(self):
+    def params_to_gui(self, tuneMode=False):
         for param in self.parameter.get_all_para_names():
+            if param == 'eventID':
+                if tuneMode:
+                    continue
             box = self.boxes[param]
             value = self.parameter[param]
             #self.parameter.checkValue(param, value)
@@ -1847,7 +1850,7 @@ class AutoPickParaBox(QtGui.QWidget):
         if fname[0]:
             try:
                 self.parameter.from_file(fname[0])
-                self.params_to_gui()
+                self.params_to_gui(tuneMode=True)
             except Exception as e:
                 self._warn('Could not open file {}:\n{}'.format(fname[0], e))
                 return
@@ -1866,7 +1869,7 @@ class AutoPickParaBox(QtGui.QWidget):
     def restoreDefaults(self):
         try:
             self.parameter.reset_defaults()
-            self.params_to_gui()
+            self.params_to_gui(tuneMode=True)
         except Exception as e:
             self._warn('Could not restore defaults:\n{}'.format(e))
             return