From 413a921e5d95d8678425003fac46ddc5f853e4e5 Mon Sep 17 00:00:00 2001 From: Marcel Paffrath Date: Wed, 3 May 2017 11:28:43 +0200 Subject: [PATCH] small fixes --- QtPyLoT.py | 11 +++++++---- icons_rc.py | 2 +- pylot/RELEASE-VERSION | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/QtPyLoT.py b/QtPyLoT.py index 1f1e09fa..b1f0de42 100755 --- a/QtPyLoT.py +++ b/QtPyLoT.py @@ -1328,12 +1328,14 @@ class MainWindow(QMainWindow): self.array_layout.addWidget(self.metadata_widget) def init_array_map(self, index=1): + self.tabs.setCurrentIndex(1) + self.array_layout.removeWidget(self.metadata_widget) + self.array_layout.removeWidget(self.array_map) if not self.array_map: self.get_metadata() if not self.metadata: return self.array_map = map_projection(self) - self.array_layout.removeWidget(self.metadata_widget) self.array_layout.addWidget(self.array_map) self.tabs.setCurrentIndex(index) self.refresh_array_map() @@ -1599,11 +1601,12 @@ class MainWindow(QMainWindow): qmb = QMessageBox(icon=QMessageBox.Question, text='Save changes in current project?') qmb.setStandardButtons(QMessageBox.Yes | QMessageBox.No | QMessageBox.Cancel) qmb.setDefaultButton(QMessageBox.Yes) - if qmb.exec_() == 16384: + answer = qmb.exec_() + if answer == 16384: self.saveProject() - elif qmb.exec_() == 65536: + elif answer == 65536: pass - elif qmb.exec_() == 4194304: + elif answer == 4194304: return dlg = QFileDialog() fnm = dlg.getOpenFileName(self, 'Open project file...', filter='Pylot project (*.plp)') diff --git a/icons_rc.py b/icons_rc.py index b18a85f2..001cf4ce 100644 --- a/icons_rc.py +++ b/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\ diff --git a/pylot/RELEASE-VERSION b/pylot/RELEASE-VERSION index de9694a8..84ed74ce 100644 --- a/pylot/RELEASE-VERSION +++ b/pylot/RELEASE-VERSION @@ -1 +1 @@ -686c-dirty +fce0c-dirty