Commit 086d90fe authored by Zolnierczuk, Piotr's avatar Zolnierczuk, Piotr
Browse files

qt6 ready

parent 66bd011a

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -4,10 +4,10 @@ PROJNAME=pysen 


PYUIC:=$(shell command -v pyuic5 2> /dev/null)

ifeq ($(strip $(PYUIC)),)

PYUIC:=$(shell command -v pyuic4 2> /dev/null)

PYUIC:=$(shell command -v pyuic6 2> /dev/null)

endif

ifeq ($(strip $(PYUIC)),)

$(error pyuic5 or pyuic4 are missing, check PyQt installation)

$(error pyuic5 or pyuic6 are missing, check PyQt installation)

endif



PROJVER=$(shell $(PYTHON) -c "from pysen.revision import __version__; print(__version__)")

pysen/ui/FileMonMainWindow.py

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow): 
        self.menubar.setNativeMenuBar(False)



        # File menu actions

        self.actionExit.triggered.connect(QtWidgets.qApp.quit)

        self.actionExit.triggered.connect(QtWidgets.QApplication.quit)

        self.actionFontSelection.triggered.connect(self.font_choice)



        # Help menu actions

pysen/ui/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ endif 
UISRC=NSEMainWindow.ui \

      FileMonMainWindow.ui \

	  QTauMainWindow.ui \

	  SimpleEchoSimulator.ui \

	  EchoSimWidget.ui



PYSRC=${UISRC:%.ui=ui_%.py}

pysen/ui/NSEMainWindow.py

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow): 
        super().__init__(parent)

        self.kernel_manager = None

        self.initUI()

        QtWidgets.qApp.setWindowIcon(self.icon)

        QtWidgets.QApplication.setWindowIcon(self.icon)





    def initUI(self):
@@ -73,7 +73,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow): 


    def file_exit(self):

        "file/exit action"

        QtWidgets.qApp.quit()

        QtWidgets.QApplication.quit()



    def help_about(self):

        "help/about action"

pysen/ui/QTauMainWindow.py

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow): 
        #



        # File menu actions

        self.actionExit.triggered.connect(QtWidgets.qApp.quit)

        self.actionExit.triggered.connect(QtWidgets.QApplication.quit)

        #

        self.actionTauScaleLog.toggled.connect(self._update_canvas)

        self.actionQScaleLog.toggled.connect(self._update_canvas)