rewrite advanced config to better view

This commit is contained in:
arcan1s 2014-08-29 01:59:14 +04:00
parent 81105fb12d
commit 0240dee6ea
3 changed files with 88 additions and 253 deletions

View File

@ -40,67 +40,12 @@ class AdvancedWindow(QWidget):
self.parent = parent self.parent = parent
QObject.connect(self.ui.checkBox_netdev, SIGNAL("stateChanged(int)"), self.setNetdevEnabled) QObject.connect(self.ui.checkBox_netdev, SIGNAL("stateChanged(int)"), self.setNetdevEnabled)
QObject.connect(self.ui.pushButton_hddDevice, SIGNAL("clicked()"), self.addHddDevice)
QObject.connect(self.ui.pushButton_hddSpeedDevice, SIGNAL("clicked()"), self.addHddSpeedDevice)
QObject.connect(self.ui.pushButton_mount, SIGNAL("clicked()"), self.addMount)
QObject.connect(self.ui.pushButton_tempDevice, SIGNAL("clicked()"), self.addTempDevice)
QObject.connect(self.ui.listWidget_hddDevice, SIGNAL("itemActivated(QListWidgetItem*)"), self.ui.listWidget_hddDevice.openPersistentEditor) QObject.connect(self.ui.listWidget_hddDevice, SIGNAL("itemActivated(QListWidgetItem*)"), self.ui.listWidget_hddDevice.openPersistentEditor)
QObject.connect(self.ui.listWidget_hddSpeedDevice, SIGNAL("itemActivated(QListWidgetItem*)"), self.ui.listWidget_hddSpeedDevice.openPersistentEditor) QObject.connect(self.ui.listWidget_hddSpeedDevice, SIGNAL("itemActivated(QListWidgetItem*)"), self.ui.listWidget_hddSpeedDevice.openPersistentEditor)
QObject.connect(self.ui.listWidget_mount, SIGNAL("itemActivated(QListWidgetItem*)"), self.ui.listWidget_mount.openPersistentEditor) QObject.connect(self.ui.listWidget_mount, SIGNAL("itemActivated(QListWidgetItem*)"), self.ui.listWidget_mount.openPersistentEditor)
QObject.connect(self.ui.listWidget_tempDevice, SIGNAL("itemActivated(QListWidgetItem*)"), self.ui.listWidget_tempDevice.openPersistentEditor) QObject.connect(self.ui.listWidget_tempDevice, SIGNAL("itemActivated(QListWidgetItem*)"), self.ui.listWidget_tempDevice.openPersistentEditor)
def keyPressEvent(self, event):
"""delete events"""
if self.debug: qDebug("[PTM] [advanced.py] [keyPressEvent]")
if self.debug: qDebug("[PTM] [advanced.py] [keyPressEvent] : Run function with event '%s'" %(event.key()))
if (event.key() == Qt.Key_Delete):
if (self.ui.listWidget_hddDevice.hasFocus() and
(self.ui.listWidget_hddDevice.currentRow() > -1)):
self.ui.listWidget_hddDevice.takeItem(self.ui.listWidget_hddDevice.currentRow())
elif (self.ui.listWidget_hddSpeedDevice.hasFocus() and
(self.ui.listWidget_hddSpeedDevice.currentRow() > -1)):
self.ui.listWidget_hddSpeedDevice.takeItem(self.ui.listWidget_hddSpeedDevice.currentRow())
elif (self.ui.listWidget_mount.hasFocus() and
(self.ui.listWidget_mount.currentRow() > -1)):
self.ui.listWidget_mount.takeItem(self.ui.listWidget_mount.currentRow())
elif (self.ui.listWidget_tempDevice.hasFocus() and
(self.ui.listWidget_tempDevice.currentRow() > -1)):
self.ui.listWidget_tempDevice.takeItem(self.ui.listWidget_tempDevice.currentRow())
def addHddDevice(self):
"""function to add mount points"""
if self.debug: qDebug("[PTM] [advanced.py] [addHddDevice]")
if self.debug: qDebug("[PTM] [advanced.py] [addHddDevice] : Device '%s'" %(self.ui.comboBox_hddDevice.currentText()))
self.ui.listWidget_hddDevice.clearSelection()
self.ui.listWidget_hddDevice.addItem(self.ui.comboBox_hddDevice.currentText())
def addHddSpeedDevice(self):
"""function to add disk device"""
if self.debug: qDebug("[PTM] [advanced.py] [addHddSpeedDevice]")
if self.debug: qDebug("[PTM] [advanced.py] [addHddSpeedDevice] : Device '%s'" %(self.ui.comboBox_hddSpeedDevice.currentText()))
self.ui.listWidget_hddSpeedDevice.clearSelection()
self.ui.listWidget_hddSpeedDevice.addItem(self.ui.comboBox_hddSpeedDevice.currentText())
def addMount(self):
"""function to add mount points"""
if self.debug: qDebug("[PTM] [advanced.py] [addMount]")
if self.debug: qDebug("[PTM] [advanced.py] [addMount] : Device '%s'" %(self.ui.comboBox_mount.currentText()))
self.ui.listWidget_mount.clearSelection()
self.ui.listWidget_mount.addItem(self.ui.comboBox_mount.currentText())
def addTempDevice(self):
"""function to add temperature device"""
if self.debug: qDebug("[PTM] [advanced.py] [addTempDevice]")
if self.debug: qDebug("[PTM] [advanced.py] [addTempDevice] : Device '%s'" %(self.ui.comboBox_tempDevice.currentText()))
self.ui.listWidget_tempDevice.clearSelection()
self.ui.listWidget_tempDevice.addItem(self.ui.comboBox_tempDevice.currentText())
def setNetdevEnabled(self): def setNetdevEnabled(self):
"""function to set enabled netdev""" """function to set enabled netdev"""
if self.debug: qDebug("[PTM] [advanced.py] [setNetdevEnabled]") if self.debug: qDebug("[PTM] [advanced.py] [setNetdevEnabled]")

View File

@ -65,20 +65,24 @@ class ConfigDefinition:
settings.set('temp_units', str(self.configpage['advanced'].ui.comboBox_tempUnits.currentText())) settings.set('temp_units', str(self.configpage['advanced'].ui.comboBox_tempUnits.currentText()))
item = QStringList() item = QStringList()
for i in range(self.configpage['advanced'].ui.listWidget_tempDevice.count()): for i in range(self.configpage['advanced'].ui.listWidget_tempDevice.count()):
item.append(self.configpage['advanced'].ui.listWidget_tempDevice.item(i).text()) if (self.configpage['advanced'].ui.listWidget_tempDevice.item(i).checkState() == Qt.Checked):
item.append(self.configpage['advanced'].ui.listWidget_tempDevice.item(i).text())
settings.set('temp_device', str(item.join(QString('@@')))) settings.set('temp_device', str(item.join(QString('@@'))))
item = QStringList() item = QStringList()
for i in range(self.configpage['advanced'].ui.listWidget_mount.count()): for i in range(self.configpage['advanced'].ui.listWidget_mount.count()):
item.append(self.configpage['advanced'].ui.listWidget_mount.item(i).text()) if (self.configpage['advanced'].ui.listWidget_mount.item(i).checkState() == Qt.Checked):
item.append(self.configpage['advanced'].ui.listWidget_mount.item(i).text())
settings.set('mount', str(item.join(QString('@@')))) settings.set('mount', str(item.join(QString('@@'))))
item = QStringList() item = QStringList()
for i in range(self.configpage['advanced'].ui.listWidget_hddDevice.count()):
item.append(self.configpage['advanced'].ui.listWidget_hddDevice.item(i).text())
settings.set('hdd', str(item.join(QString('@@'))))
item = QStringList()
for i in range(self.configpage['advanced'].ui.listWidget_hddSpeedDevice.count()): for i in range(self.configpage['advanced'].ui.listWidget_hddSpeedDevice.count()):
item.append(self.configpage['advanced'].ui.listWidget_hddSpeedDevice.item(i).text()) if (self.configpage['advanced'].ui.listWidget_hddSpeedDevice.item(i).checkState() == Qt.Checked):
item.append(self.configpage['advanced'].ui.listWidget_hddSpeedDevice.item(i).text())
settings.set('disk', str(item.join(QString('@@')))) settings.set('disk', str(item.join(QString('@@'))))
item = QStringList()
for i in range(self.configpage['advanced'].ui.listWidget_hddDevice.count()):
if (self.configpage['advanced'].ui.listWidget_hddDevice.item(i).checkState() == Qt.Checked):
item.append(self.configpage['advanced'].ui.listWidget_hddDevice.item(i).text())
settings.set('hdd', str(item.join(QString('@@'))))
settings.set('netdir', str(self.configpage['advanced'].ui.lineEdit_netdir.text())) settings.set('netdir', str(self.configpage['advanced'].ui.lineEdit_netdir.text()))
settings.set('netdevBool', self.configpage['advanced'].ui.checkBox_netdev.checkState()) settings.set('netdevBool', self.configpage['advanced'].ui.checkBox_netdev.checkState())
settings.set('custom_netdev', str(self.configpage['advanced'].ui.comboBox_netdev.currentText())) settings.set('custom_netdev', str(self.configpage['advanced'].ui.comboBox_netdev.currentText()))
@ -170,44 +174,56 @@ class ConfigDefinition:
self.configpage['advanced'].ui.lineEdit_uptimeFormat.setText(str(settings.get('custom_uptime', '$ds,$hs,$ms'))) self.configpage['advanced'].ui.lineEdit_uptimeFormat.setText(str(settings.get('custom_uptime', '$ds,$hs,$ms')))
index = self.configpage['advanced'].ui.comboBox_tempUnits.findText(str(settings.get('temp_units', "Celsius"))) index = self.configpage['advanced'].ui.comboBox_tempUnits.findText(str(settings.get('temp_units', "Celsius")))
self.configpage['advanced'].ui.comboBox_tempUnits.setCurrentIndex(index) self.configpage['advanced'].ui.comboBox_tempUnits.setCurrentIndex(index)
self.configpage['advanced'].ui.listWidget_tempDevice.clear()
commandOut = commands.getoutput("sensors") commandOut = commands.getoutput("sensors")
for item in commandOut.split("\n\n"): for item in commandOut.split("\n\n"):
for device in item.split("\n"): for device in item.split("\n"):
if (device.find('\xc2\xb0C') > -1): if (device.find('\xc2\xb0C') > -1):
try: try:
tempdev = 'lmsensors/' + item.split("\n")[0] + '/' + '_'.join(device.split(":")[0].split()) listItem = QListWidgetItem('lmsensors/' + item.split("\n")[0] + '/' + '_'.join(device.split(":")[0].split()))
self.configpage['advanced'].ui.comboBox_tempDevice.addItem(tempdev) listItem.setCheckState(0)
self.configpage['advanced'].ui.listWidget_tempDevice.addItem(listItem)
except: except:
pass pass
self.configpage['advanced'].ui.listWidget_tempDevice.clear()
for item in str(settings.get('temp_device', '')).split('@@'): for item in str(settings.get('temp_device', '')).split('@@'):
if (len(item) > 0): items = self.configpage['advanced'].ui.listWidget_tempDevice.findItems(item, Qt.MatchFixedString)
self.configpage['advanced'].ui.listWidget_tempDevice.addItem(item) for listItem in items:
listItem.setCheckState(2)
self.configpage['advanced'].ui.listWidget_mount.clear()
commandOut = commands.getoutput("mount") commandOut = commands.getoutput("mount")
for item in commandOut.split("\n"): for item in commandOut.split("\n"):
try: try:
mount = item.split(' on ')[1].split(' type ')[0] listItem = QListWidgetItem(item.split(' on ')[1].split(' type ')[0])
self.configpage['advanced'].ui.comboBox_mount.addItem(mount) listItem.setCheckState(0)
self.configpage['advanced'].ui.listWidget_mount.addItem(listItem)
except: except:
pass pass
self.configpage['advanced'].ui.listWidget_mount.clear()
for item in str(settings.get('mount', '/')).split('@@'): for item in str(settings.get('mount', '/')).split('@@'):
self.configpage['advanced'].ui.listWidget_mount.addItem(item) items = self.configpage['advanced'].ui.listWidget_mount.findItems(item, Qt.MatchFixedString)
for listItem in items:
listItem.setCheckState(2)
self.configpage['advanced'].ui.listWidget_hddSpeedDevice.clear()
for item in self.defaults['disk']:
listItem = QListWidgetItem(item)
listItem.setCheckState(0)
self.configpage['advanced'].ui.listWidget_hddSpeedDevice.addItem(listItem)
for item in str(settings.get('disk', 'disk/sda_(8:0)')).split('@@'):
items = self.configpage['advanced'].ui.listWidget_hddSpeedDevice.findItems(item, Qt.MatchFixedString)
for listItem in items:
listItem.setCheckState(2)
self.configpage['advanced'].ui.listWidget_hddDevice.clear()
commandOut = commands.getoutput("find /dev -name '[hms]d[a-z]'") commandOut = commands.getoutput("find /dev -name '[hms]d[a-z]'")
for item in commandOut.split("\n"): for item in commandOut.split("\n"):
try: try:
self.configpage['advanced'].ui.comboBox_hddDevice.addItem(item) listItem = QListWidgetItem(item)
listItem.setCheckState(0)
self.configpage['advanced'].ui.listWidget_hddDevice.addItem(listItem)
except: except:
pass pass
self.configpage['advanced'].ui.listWidget_hddDevice.clear()
for item in str(settings.get('hdd', '/dev/sda')).split('@@'): for item in str(settings.get('hdd', '/dev/sda')).split('@@'):
self.configpage['advanced'].ui.listWidget_hddDevice.addItem(item) items = self.configpage['advanced'].ui.listWidget_hddDevice.findItems(item, Qt.MatchFixedString)
self.configpage['advanced'].ui.comboBox_hddSpeedDevice.clear() for listItem in items:
for item in self.defaults['disk']: listItem.setCheckState(2)
self.configpage['advanced'].ui.comboBox_hddSpeedDevice.addItem(item)
self.configpage['advanced'].ui.listWidget_hddSpeedDevice.clear()
for item in str(settings.get('disk', 'disk/sda_(8:0)')).split('@@'):
self.configpage['advanced'].ui.listWidget_hddSpeedDevice.addItem(item)
self.configpage['advanced'].ui.lineEdit_netdir.setText(str(settings.get('netdir', '/sys/class/net'))) self.configpage['advanced'].ui.lineEdit_netdir.setText(str(settings.get('netdir', '/sys/class/net')))
self.configpage['advanced'].ui.checkBox_netdev.setCheckState(settings.get('netdevBool', 0).toInt()[0]) self.configpage['advanced'].ui.checkBox_netdev.setCheckState(settings.get('netdevBool', 0).toInt()[0])
for item in QDir.entryList(QDir(str(settings.get('netdir', '/sys/class/net'))), QDir.Dirs | QDir.NoDotAndDotDot): for item in QDir.entryList(QDir(str(settings.get('netdir', '/sys/class/net'))), QDir.Dirs | QDir.NoDotAndDotDot):

View File

@ -42,8 +42,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>666</width> <width>677</width>
<height>848</height> <height>752</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_8"> <layout class="QVBoxLayout" name="verticalLayout_8">
@ -214,53 +214,22 @@ $m - uptime minutes without zero</string>
<item> <item>
<layout class="QVBoxLayout" name="layout_tempDevice"> <layout class="QVBoxLayout" name="layout_tempDevice">
<item> <item>
<layout class="QHBoxLayout" name="layout_tempDeviceSelect"> <widget class="QLabel" name="label_tempDevice">
<item> <property name="minimumSize">
<widget class="QLabel" name="label_tempDevice"> <size>
<property name="minimumSize"> <width>200</width>
<size> <height>0</height>
<width>200</width> </size>
<height>0</height> </property>
</size> <property name="text">
</property> <string>Temperature devices</string>
<property name="text"> </property>
<string>Temperature devices</string> </widget>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="comboBox_tempDevice">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="editable">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_tempDevice">
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Add</string>
</property>
</widget>
</item>
</layout>
</item> </item>
<item> <item>
<widget class="QListWidget" name="listWidget_tempDevice"> <widget class="QListWidget" name="listWidget_tempDevice">
<property name="toolTip"> <property name="toolTip">
<string>Editable <string>Editable</string>
del - remove item</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -269,47 +238,17 @@ del - remove item</string>
<item> <item>
<layout class="QVBoxLayout" name="layout_mount"> <layout class="QVBoxLayout" name="layout_mount">
<item> <item>
<layout class="QHBoxLayout" name="layout_mountSelect"> <widget class="QLabel" name="label_mount">
<item> <property name="minimumSize">
<widget class="QLabel" name="label_mount"> <size>
<property name="minimumSize"> <width>200</width>
<size> <height>0</height>
<width>200</width> </size>
<height>0</height> </property>
</size> <property name="text">
</property> <string>Mount points</string>
<property name="text"> </property>
<string>Mount points</string> </widget>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="comboBox_mount">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="editable">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_mount">
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Add</string>
</property>
</widget>
</item>
</layout>
</item> </item>
<item> <item>
<widget class="QListWidget" name="listWidget_mount"> <widget class="QListWidget" name="listWidget_mount">
@ -324,44 +263,17 @@ del - remove item</string>
<item> <item>
<layout class="QVBoxLayout" name="layout_hddSpeedDevice"> <layout class="QVBoxLayout" name="layout_hddSpeedDevice">
<item> <item>
<layout class="QHBoxLayout" name="layout_hddSpeedDeviceSelect"> <widget class="QLabel" name="label_hddSpeedDevice">
<item> <property name="minimumSize">
<widget class="QLabel" name="label_hddSpeedDevice"> <size>
<property name="minimumSize"> <width>200</width>
<size> <height>0</height>
<width>200</width> </size>
<height>0</height> </property>
</size> <property name="text">
</property> <string>HDD devices (speed)</string>
<property name="text"> </property>
<string>HDD devices (speed)</string> </widget>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="comboBox_hddSpeedDevice">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_hddSpeedDevice">
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Add</string>
</property>
</widget>
</item>
</layout>
</item> </item>
<item> <item>
<widget class="QListWidget" name="listWidget_hddSpeedDevice"> <widget class="QListWidget" name="listWidget_hddSpeedDevice">
@ -376,47 +288,17 @@ del - remove item</string>
<item> <item>
<layout class="QVBoxLayout" name="layout_hddDevice"> <layout class="QVBoxLayout" name="layout_hddDevice">
<item> <item>
<layout class="QHBoxLayout" name="layout_hddDeviceSelect"> <widget class="QLabel" name="label_hddDevice">
<item> <property name="minimumSize">
<widget class="QLabel" name="label_hddDevice"> <size>
<property name="minimumSize"> <width>200</width>
<size> <height>0</height>
<width>200</width> </size>
<height>0</height> </property>
</size> <property name="text">
</property> <string>HDD devices (temp)</string>
<property name="text"> </property>
<string>HDD devices (temp)</string> </widget>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="comboBox_hddDevice">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="editable">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_hddDevice">
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Add</string>
</property>
</widget>
</item>
</layout>
</item> </item>
<item> <item>
<widget class="QListWidget" name="listWidget_hddDevice"> <widget class="QListWidget" name="listWidget_hddDevice">
@ -628,17 +510,9 @@ del - remove item</string>
<tabstop>lineEdit_timeFormat</tabstop> <tabstop>lineEdit_timeFormat</tabstop>
<tabstop>lineEdit_uptimeFormat</tabstop> <tabstop>lineEdit_uptimeFormat</tabstop>
<tabstop>comboBox_tempUnits</tabstop> <tabstop>comboBox_tempUnits</tabstop>
<tabstop>comboBox_tempDevice</tabstop>
<tabstop>pushButton_tempDevice</tabstop>
<tabstop>listWidget_tempDevice</tabstop> <tabstop>listWidget_tempDevice</tabstop>
<tabstop>comboBox_mount</tabstop>
<tabstop>pushButton_mount</tabstop>
<tabstop>listWidget_mount</tabstop> <tabstop>listWidget_mount</tabstop>
<tabstop>comboBox_hddSpeedDevice</tabstop>
<tabstop>pushButton_hddSpeedDevice</tabstop>
<tabstop>listWidget_hddSpeedDevice</tabstop> <tabstop>listWidget_hddSpeedDevice</tabstop>
<tabstop>comboBox_hddDevice</tabstop>
<tabstop>pushButton_hddDevice</tabstop>
<tabstop>listWidget_hddDevice</tabstop> <tabstop>listWidget_hddDevice</tabstop>
<tabstop>lineEdit_netdir</tabstop> <tabstop>lineEdit_netdir</tabstop>
<tabstop>checkBox_netdev</tabstop> <tabstop>checkBox_netdev</tabstop>