lss
/
Agordejo
1
0
Fork 0
Code Releases Activity
Browse Source

mostly copyright date

master
Nils 4 years ago
parent
1978fe7de4
commit
b5aaa27353
6 changed files with 133 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      engine/watcher.py
  2. 35
      qtgui/designer/mainwindow.py
  3. 103
      qtgui/designer/mainwindow.ui
  4. 2
      qtgui/helper.py
  5. 5
      qtgui/opensessioncontroller.py
  6. 2
      qtgui/projectname.py

2
engine/watcher.py
View File

@ -1,7 +1,7 @@
#! /usr/bi n/env python3 #! /usr/bi n/env python3
# -*- coding: utf-8 -*- # -*- 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 ), This file is part of the Laborejo Software Suite ( https://www.laborejo.org ),
more specifically its template base application. more specifically its template base application.

35
qtgui/designer/mainwindow.py
View File

@ -170,7 +170,6 @@ class Ui_MainWindow(object):
self.verticalLayout_5.setSpacing(0) self.verticalLayout_5.setSpacing(0)
self.verticalLayout_5.setObjectName("verticalLayout_5") self.verticalLayout_5.setObjectName("verticalLayout_5")
self.loadedSessionsLauncher = QtWidgets.QTreeWidget(self.session_programs) self.loadedSessionsLauncher = QtWidgets.QTreeWidget(self.session_programs)
self.loadedSessionsLauncher.setDragDropMode(QtWidgets.QAbstractItemView.DragDrop)
self.loadedSessionsLauncher.setSelectionMode(QtWidgets.QAbstractItemView.NoSelection) self.loadedSessionsLauncher.setSelectionMode(QtWidgets.QAbstractItemView.NoSelection)
self.loadedSessionsLauncher.setIconSize(QtCore.QSize(64, 64)) self.loadedSessionsLauncher.setIconSize(QtCore.QSize(64, 64))
self.loadedSessionsLauncher.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel) self.loadedSessionsLauncher.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
@ -190,7 +189,6 @@ class Ui_MainWindow(object):
sizePolicy.setVerticalStretch(3) sizePolicy.setVerticalStretch(3)
sizePolicy.setHeightForWidth(self.loadedSessionClients.sizePolicy().hasHeightForWidth()) sizePolicy.setHeightForWidth(self.loadedSessionClients.sizePolicy().hasHeightForWidth())
self.loadedSessionClients.setSizePolicy(sizePolicy) self.loadedSessionClients.setSizePolicy(sizePolicy)
self.loadedSessionClients.setDragDropMode(QtWidgets.QAbstractItemView.DropOnly)
self.loadedSessionClients.setAlternatingRowColors(True) self.loadedSessionClients.setAlternatingRowColors(True)
self.loadedSessionClients.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel) self.loadedSessionClients.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
self.loadedSessionClients.setHorizontalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel) self.loadedSessionClients.setHorizontalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
@ -222,6 +220,24 @@ class Ui_MainWindow(object):
self.tabbyCat.addTab(self.tab_detailed, "") self.tabbyCat.addTab(self.tab_detailed, "")
self.tab_information = QtWidgets.QWidget() self.tab_information = QtWidgets.QWidget()
self.tab_information.setObjectName("tab_information") 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.tabbyCat.addTab(self.tab_information, "")
self.verticalLayout.addWidget(self.tabbyCat) self.verticalLayout.addWidget(self.tabbyCat)
MainWindow.setCentralWidget(self.centralwidget) MainWindow.setCentralWidget(self.centralwidget)
@ -299,7 +315,7 @@ class Ui_MainWindow(object):
self.retranslateUi(MainWindow) self.retranslateUi(MainWindow)
self.tabbyCat.setCurrentIndex(0) self.tabbyCat.setCurrentIndex(0)
self.quickStackedWidget.setCurrentIndex(1) self.quickStackedWidget.setCurrentIndex(1)
self.detailedStackedWidget.setCurrentIndex(0) self.detailedStackedWidget.setCurrentIndex(1)
QtCore.QMetaObject.connectSlotsByName(MainWindow) QtCore.QMetaObject.connectSlotsByName(MainWindow)
def retranslateUi(self, MainWindow): def retranslateUi(self, MainWindow):
@ -319,6 +335,19 @@ class Ui_MainWindow(object):
self.session_loaded.setTitle(_translate("MainWindow", "In current session")) self.session_loaded.setTitle(_translate("MainWindow", "In current session"))
self.loadedSessionDescriptionGroupBox.setTitle(_translate("MainWindow", "Session Notes")) self.loadedSessionDescriptionGroupBox.setTitle(_translate("MainWindow", "Session Notes"))
self.tabbyCat.setTabText(self.tabbyCat.indexOf(self.tab_detailed), _translate("MainWindow", "Full View")) 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.tabbyCat.setTabText(self.tabbyCat.indexOf(self.tab_information), _translate("MainWindow", "Information"))
self.menuControl.setTitle(_translate("MainWindow", "Control")) self.menuControl.setTitle(_translate("MainWindow", "Control"))
self.menuSession.setTitle(_translate("MainWindow", "SessionName")) self.menuSession.setTitle(_translate("MainWindow", "SessionName"))

103
qtgui/designer/mainwindow.ui
View File

@ -220,7 +220,7 @@
<item> <item>
<widget class="QStackedWidget" name="detailedStackedWidget"> <widget class="QStackedWidget" name="detailedStackedWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>1</number>
</property> </property>
<widget class="QWidget" name="stack_no_session"> <widget class="QWidget" name="stack_no_session">
<layout class="QHBoxLayout" name="l_2"> <layout class="QHBoxLayout" name="l_2">
@ -356,9 +356,6 @@
</property> </property>
<item> <item>
<widget class="QTreeWidget" name="loadedSessionsLauncher"> <widget class="QTreeWidget" name="loadedSessionsLauncher">
<property name="dragDropMode">
<enum>QAbstractItemView::DragDrop</enum>
</property>
<property name="selectionMode"> <property name="selectionMode">
<enum>QAbstractItemView::NoSelection</enum> <enum>QAbstractItemView::NoSelection</enum>
</property> </property>
@ -411,9 +408,6 @@
<verstretch>3</verstretch> <verstretch>3</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="dragDropMode">
<enum>QAbstractItemView::DropOnly</enum>
</property>
<property name="alternatingRowColors"> <property name="alternatingRowColors">
<bool>true</bool> <bool>true</bool>
</property> </property>
@ -483,6 +477,101 @@
<attribute name="title"> <attribute name="title">
<string>Information</string> <string>Information</string>
</attribute> </attribute>
<layout class="QVBoxLayout" name="verticalLayout_11">
<item>
<widget class="QTreeWidget" name="informationTreeWidget">
<property name="editTriggers">
<set>QAbstractItemView::NoEditTriggers</set>
</property>
<property name="alternatingRowColors">
<bool>true</bool>
</property>
<property name="verticalScrollMode">
<enum>QAbstractItemView::ScrollPerPixel</enum>
</property>
<property name="itemsExpandable">
<bool>false</bool>
</property>
<attribute name="headerVisible">
<bool>false</bool>
</attribute>
<attribute name="headerMinimumSectionSize">
<number>50</number>
</attribute>
<attribute name="headerDefaultSectionSize">
<number>150</number>
</attribute>
<column>
<property name="text">
<string/>
</property>
<property name="textAlignment">
<set>AlignTrailing|AlignVCenter</set>
</property>
</column>
<column>
<property name="text">
<string/>
</property>
</column>
<item>
<property name="text">
<string>JACK</string>
</property>
<property name="textAlignment">
<set>AlignTrailing|AlignVCenter</set>
</property>
<property name="text">
<string>version and running</string>
</property>
</item>
<item>
<property name="text">
<string>NSM Server Mode</string>
</property>
<property name="textAlignment">
<set>AlignTrailing|AlignVCenter</set>
</property>
<property name="text">
<string>Self-started, connected to, environment var</string>
</property>
</item>
<item>
<property name="text">
<string>NSM Url</string>
</property>
<property name="textAlignment">
<set>AlignTrailing|AlignVCenter</set>
</property>
<property name="text">
<string>osc.upd ip port</string>
</property>
</item>
<item>
<property name="text">
<string>Session Root</string>
</property>
<property name="textAlignment">
<set>AlignTrailing|AlignVCenter</set>
</property>
<property name="text">
<string>/home/usr/NSM Sessions</string>
</property>
</item>
<item>
<property name="text">
<string>Program Database</string>
</property>
<property name="textAlignment">
<set>AlignTrailing|AlignVCenter</set>
</property>
<property name="text">
<string>Last Updated</string>
</property>
</item>
</widget>
</item>
</layout>
</widget> </widget>
</widget> </widget>
</item> </item>

2
qtgui/helper.py
View File

@ -1,7 +1,7 @@
#! /usr/bin/env python3 #! /usr/bin/env python3
# -*- coding: utf-8 -*- # -*- 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 ) This file is part of Laborejo ( https://www.laborejo.org )

5
qtgui/opensessioncontroller.py
View File

@ -368,7 +368,7 @@ class LauncherProgram(QtWidgets.QTreeWidgetItem):
'startupnotify': 'false', 'startupnotify': 'false',
'terminal': 'false', 'terminal': 'false',
'type': 'Application', 'type': 'Application',
'version': '1.4.1', 'version': '1.0', #desktop spec version, not progra,
'x-nsm-capable': 'true'} 'x-nsm-capable': 'true'}
""" """
@ -413,11 +413,10 @@ class LauncherTable(object):
self.launcherWidget = self.mainWindow.ui.loadedSessionsLauncher self.launcherWidget = self.mainWindow.ui.loadedSessionsLauncher
self.launcherWidget.setIconSize(iconSize) self.launcherWidget.setIconSize(iconSize)
self.columns = ("name", "comment", "version", "argodejoFullPath") #basically an enum self.columns = ("name", "comment", "argodejoFullPath") #basically an enum
self.headerLables = [ self.headerLables = [
QtCore.QCoreApplication.translate("Launcher", "Name"), QtCore.QCoreApplication.translate("Launcher", "Name"),
QtCore.QCoreApplication.translate("Launcher", "Description"), QtCore.QCoreApplication.translate("Launcher", "Description"),
QtCore.QCoreApplication.translate("Launcher", "Version"),
QtCore.QCoreApplication.translate("Launcher", "Path"), QtCore.QCoreApplication.translate("Launcher", "Path"),
] ]
self.launcherWidget.setHeaderLabels(self.headerLables) self.launcherWidget.setHeaderLabels(self.headerLables)

2
qtgui/projectname.py
View File

@ -1,7 +1,7 @@
#! /usr/bin/env python3 #! /usr/bin/env python3
# -*- coding: utf-8 -*- # -*- 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 ), This file is part of the Laborejo Software Suite ( https://www.laborejo.org ),
more specifically its template base application. more specifically its template base application.

Write Preview
Loading…
Cancel
Save