Changeset 1643
- Timestamp:
- 08/30/09 14:41:28 (14 years ago)
- Files:
-
- trunk/libffado/support/mixer-qt4/ffado/mixer/saffire_dice.py (modified) (3 diffs)
- trunk/libffado/support/mixer-qt4/ffado/widgets (added)
- trunk/libffado/support/mixer-qt4/ffado/widgets/crossbarrouter.py (added)
- trunk/libffado/support/mixer-qt4/ffado/widgets/matrixmixer.py (moved) (moved from trunk/libffado/support/mixer-qt4/ffado/matrixmixer.py)
- trunk/libffado/support/mixer-qt4/ffado/widgets/__init__.py (added)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/libffado/support/mixer-qt4/ffado/mixer/saffire_dice.py
r1640 r1643 22 22 import dbus 23 23 24 from ffado.matrixmixer import * 24 from ffado.widgets.matrixmixer import MatrixMixer 25 from ffado.widgets.crossbarrouter import * 25 26 26 27 class Saffire_Dice(QtGui.QWidget): … … 29 30 self.layout = QtGui.QGridLayout(self) 30 31 self.setLayout(self.layout) 31 self.mixerwidget = QtGui.QScrollArea(self) 32 self.mixerwidget.setWidgetResizable(True) 33 self.layout.addWidget(self.mixerwidget) 32 self.tabs = QtGui.QTabWidget(self) 33 self.layout.addWidget(self.tabs) 34 #self.mixerwidget = QtGui.QScrollArea(self) 35 #self.mixerwidget.setWidgetResizable(True) 36 #self.layout.addWidget(self.mixerwidget) 34 37 35 38 def buildMixer(self): … … 37 40 #print self.hw.getText("/Generic/Nickname") 38 41 self.matrix = MatrixMixer(self.hw.servername, self.hw.basepath+"/EAP/MatrixMixer", self) 39 self.mixerwidget.setWidget(self.matrix) 42 #self.mixerwidget.setWidget(self.matrix) 43 scrollarea = QtGui.QScrollArea(self.tabs) 44 scrollarea.setWidgetResizable(True) 45 scrollarea.setWidget(self.matrix) 46 self.tabs.addTab(scrollarea, "Matrix") 47 48 self.router = CrossbarRouter(self.hw.servername, self.hw.basepath+"/EAP/Router", self) 49 scrollarea = QtGui.QScrollArea(self.tabs) 50 scrollarea.setWidgetResizable(True) 51 scrollarea.setWidget(self.router) 52 self.tabs.addTab(scrollarea, "Routing") 40 53 41 54 #def getDisplayTitle(self):