From b5aaa27353525142abbf04e8d9330e29f4ef2623 Mon Sep 17 00:00:00 2001 From: Nils <> Date: Tue, 7 Apr 2020 17:33:22 +0200 Subject: [PATCH] mostly copyright date --- engine/watcher.py | 2 +- qtgui/designer/mainwindow.py | 35 ++++++++++- qtgui/designer/mainwindow.ui | 103 ++++++++++++++++++++++++++++++--- qtgui/helper.py | 2 +- qtgui/opensessioncontroller.py | 5 +- qtgui/projectname.py | 2 +- 6 files changed, 133 insertions(+), 16 deletions(-) diff --git a/engine/watcher.py b/engine/watcher.py index eb283cc..3bc7c27 100644 --- a/engine/watcher.py +++ b/engine/watcher.py @@ -1,7 +1,7 @@ #! /usr/bi n/env python3 # -*- coding: utf-8 -*- """ -Copyright 2019, Nils Hilbricht, Germany ( https://www.hilbricht.net ) +Copyright 2020, Nils Hilbricht, Germany ( https://www.hilbricht.net ) This file is part of the Laborejo Software Suite ( https://www.laborejo.org ), more specifically its template base application. diff --git a/qtgui/designer/mainwindow.py b/qtgui/designer/mainwindow.py index a17561c..b9bbf23 100644 --- a/qtgui/designer/mainwindow.py +++ b/qtgui/designer/mainwindow.py @@ -170,7 +170,6 @@ class Ui_MainWindow(object): self.verticalLayout_5.setSpacing(0) self.verticalLayout_5.setObjectName("verticalLayout_5") self.loadedSessionsLauncher = QtWidgets.QTreeWidget(self.session_programs) - self.loadedSessionsLauncher.setDragDropMode(QtWidgets.QAbstractItemView.DragDrop) self.loadedSessionsLauncher.setSelectionMode(QtWidgets.QAbstractItemView.NoSelection) self.loadedSessionsLauncher.setIconSize(QtCore.QSize(64, 64)) self.loadedSessionsLauncher.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel) @@ -190,7 +189,6 @@ class Ui_MainWindow(object): sizePolicy.setVerticalStretch(3) sizePolicy.setHeightForWidth(self.loadedSessionClients.sizePolicy().hasHeightForWidth()) self.loadedSessionClients.setSizePolicy(sizePolicy) - self.loadedSessionClients.setDragDropMode(QtWidgets.QAbstractItemView.DropOnly) self.loadedSessionClients.setAlternatingRowColors(True) self.loadedSessionClients.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel) self.loadedSessionClients.setHorizontalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel) @@ -222,6 +220,24 @@ class Ui_MainWindow(object): self.tabbyCat.addTab(self.tab_detailed, "") self.tab_information = QtWidgets.QWidget() self.tab_information.setObjectName("tab_information") + self.verticalLayout_11 = QtWidgets.QVBoxLayout(self.tab_information) + self.verticalLayout_11.setObjectName("verticalLayout_11") + self.informationTreeWidget = QtWidgets.QTreeWidget(self.tab_information) + self.informationTreeWidget.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers) + self.informationTreeWidget.setAlternatingRowColors(True) + self.informationTreeWidget.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel) + self.informationTreeWidget.setItemsExpandable(False) + self.informationTreeWidget.setObjectName("informationTreeWidget") + self.informationTreeWidget.headerItem().setTextAlignment(0, QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + item_0 = QtWidgets.QTreeWidgetItem(self.informationTreeWidget) + item_0 = QtWidgets.QTreeWidgetItem(self.informationTreeWidget) + item_0 = QtWidgets.QTreeWidgetItem(self.informationTreeWidget) + item_0 = QtWidgets.QTreeWidgetItem(self.informationTreeWidget) + item_0 = QtWidgets.QTreeWidgetItem(self.informationTreeWidget) + self.informationTreeWidget.header().setVisible(False) + self.informationTreeWidget.header().setDefaultSectionSize(150) + self.informationTreeWidget.header().setMinimumSectionSize(50) + self.verticalLayout_11.addWidget(self.informationTreeWidget) self.tabbyCat.addTab(self.tab_information, "") self.verticalLayout.addWidget(self.tabbyCat) MainWindow.setCentralWidget(self.centralwidget) @@ -299,7 +315,7 @@ class Ui_MainWindow(object): self.retranslateUi(MainWindow) self.tabbyCat.setCurrentIndex(0) self.quickStackedWidget.setCurrentIndex(1) - self.detailedStackedWidget.setCurrentIndex(0) + self.detailedStackedWidget.setCurrentIndex(1) QtCore.QMetaObject.connectSlotsByName(MainWindow) def retranslateUi(self, MainWindow): @@ -319,6 +335,19 @@ class Ui_MainWindow(object): self.session_loaded.setTitle(_translate("MainWindow", "In current session")) self.loadedSessionDescriptionGroupBox.setTitle(_translate("MainWindow", "Session Notes")) self.tabbyCat.setTabText(self.tabbyCat.indexOf(self.tab_detailed), _translate("MainWindow", "Full View")) + __sortingEnabled = self.informationTreeWidget.isSortingEnabled() + self.informationTreeWidget.setSortingEnabled(False) + self.informationTreeWidget.topLevelItem(0).setText(0, _translate("MainWindow", "JACK")) + self.informationTreeWidget.topLevelItem(0).setText(1, _translate("MainWindow", "version and running")) + self.informationTreeWidget.topLevelItem(1).setText(0, _translate("MainWindow", "NSM Server Mode")) + self.informationTreeWidget.topLevelItem(1).setText(1, _translate("MainWindow", "Self-started, connected to, environment var")) + self.informationTreeWidget.topLevelItem(2).setText(0, _translate("MainWindow", "NSM Url")) + self.informationTreeWidget.topLevelItem(2).setText(1, _translate("MainWindow", "osc.upd ip port")) + self.informationTreeWidget.topLevelItem(3).setText(0, _translate("MainWindow", "Session Root")) + self.informationTreeWidget.topLevelItem(3).setText(1, _translate("MainWindow", "/home/usr/NSM Sessions")) + self.informationTreeWidget.topLevelItem(4).setText(0, _translate("MainWindow", "Program Database")) + self.informationTreeWidget.topLevelItem(4).setText(1, _translate("MainWindow", "Last Updated")) + self.informationTreeWidget.setSortingEnabled(__sortingEnabled) self.tabbyCat.setTabText(self.tabbyCat.indexOf(self.tab_information), _translate("MainWindow", "Information")) self.menuControl.setTitle(_translate("MainWindow", "Control")) self.menuSession.setTitle(_translate("MainWindow", "SessionName")) diff --git a/qtgui/designer/mainwindow.ui b/qtgui/designer/mainwindow.ui index 1cd30f1..bc2cbc7 100644 --- a/qtgui/designer/mainwindow.ui +++ b/qtgui/designer/mainwindow.ui @@ -220,7 +220,7 @@ - 0 + 1 @@ -356,9 +356,6 @@ - - QAbstractItemView::DragDrop - QAbstractItemView::NoSelection @@ -411,9 +408,6 @@ 3 - - QAbstractItemView::DropOnly - true @@ -483,6 +477,101 @@ Information + + + + + QAbstractItemView::NoEditTriggers + + + true + + + QAbstractItemView::ScrollPerPixel + + + false + + + false + + + 50 + + + 150 + + + + + + + AlignTrailing|AlignVCenter + + + + + + + + + + JACK + + + AlignTrailing|AlignVCenter + + + version and running + + + + + NSM Server Mode + + + AlignTrailing|AlignVCenter + + + Self-started, connected to, environment var + + + + + NSM Url + + + AlignTrailing|AlignVCenter + + + osc.upd ip port + + + + + Session Root + + + AlignTrailing|AlignVCenter + + + /home/usr/NSM Sessions + + + + + Program Database + + + AlignTrailing|AlignVCenter + + + Last Updated + + + + + diff --git a/qtgui/helper.py b/qtgui/helper.py index 29a1dd8..b3f54ab 100644 --- a/qtgui/helper.py +++ b/qtgui/helper.py @@ -1,7 +1,7 @@ #! /usr/bin/env python3 # -*- coding: utf-8 -*- """ -Copyright 2017, Nils Hilbricht, Germany ( https://www.hilbricht.net ) +Copyright 2020, Nils Hilbricht, Germany ( https://www.hilbricht.net ) This file is part of Laborejo ( https://www.laborejo.org ) diff --git a/qtgui/opensessioncontroller.py b/qtgui/opensessioncontroller.py index 9e7c7e1..cc0888b 100644 --- a/qtgui/opensessioncontroller.py +++ b/qtgui/opensessioncontroller.py @@ -368,7 +368,7 @@ class LauncherProgram(QtWidgets.QTreeWidgetItem): 'startupnotify': 'false', 'terminal': 'false', 'type': 'Application', - 'version': '1.4.1', + 'version': '1.0', #desktop spec version, not progra, 'x-nsm-capable': 'true'} """ @@ -413,11 +413,10 @@ class LauncherTable(object): self.launcherWidget = self.mainWindow.ui.loadedSessionsLauncher self.launcherWidget.setIconSize(iconSize) - self.columns = ("name", "comment", "version", "argodejoFullPath") #basically an enum + self.columns = ("name", "comment", "argodejoFullPath") #basically an enum self.headerLables = [ QtCore.QCoreApplication.translate("Launcher", "Name"), QtCore.QCoreApplication.translate("Launcher", "Description"), - QtCore.QCoreApplication.translate("Launcher", "Version"), QtCore.QCoreApplication.translate("Launcher", "Path"), ] self.launcherWidget.setHeaderLabels(self.headerLables) diff --git a/qtgui/projectname.py b/qtgui/projectname.py index c2dd82a..1464f62 100644 --- a/qtgui/projectname.py +++ b/qtgui/projectname.py @@ -1,7 +1,7 @@ #! /usr/bin/env python3 # -*- coding: utf-8 -*- """ -Copyright 2019, Nils Hilbricht, Germany ( https://www.hilbricht.net ) +Copyright 2020, Nils Hilbricht, Germany ( https://www.hilbricht.net ) This file is part of the Laborejo Software Suite ( https://www.laborejo.org ), more specifically its template base application.