Ticket #298: ffado.1882.diff
File ffado.1882.diff, 12.9 kB (added by euan, 14 years ago) |
---|
-
support/mixer-qt4/ffado/mixer/audiofire.py
old new 51 51 return "AudioFire4" 52 52 if modelId == 0x0AF8: 53 53 return "AudioFire8" 54 if modelId == 0x0AF9: 55 return "AudioFirePre8" 54 56 if modelId == 0x0AF12: 55 57 return "AudioFire12" 56 58 return "Generic FireWorks" … … 249 251 250 252 label = QLabel( grpInput ) 251 253 grpInputLayout.addWidget( label ) 252 label.setText(" frienlyname%d" % (inpair+1))254 label.setText("Inp %d" % (inpair+1)) 253 255 label.setAlignment(Qt.AlignCenter) 254 256 255 257 btn = QPushButton( grpInput ) 256 258 grpInputLayout.addWidget( btn ) 257 259 btn.setText("Pad") 258 260 btn.setCheckable(True) 261 btn.setFixedSize(40, 25) 259 262 self.SelectorControls[btn] = ["/Mixer/IN%dNominal" % (inpair)] 260 263 261 264 spacer = QSpacerItem(1,1,QSizePolicy.Minimum,QSizePolicy.Expanding) -
support/mixer-qt4/ffado/mixer/audiofire_strip.ui
old new 1 <ui version="4.0" > 1 <?xml version="1.0" encoding="UTF-8"?> 2 <ui version="4.0"> 2 3 <comment>Copyright (C) 2005-2008 by Pieter Palmers 3 4 4 5 This file is part of FFADO … … 17 18 GNU General Public License for more details. 18 19 </comment> 19 20 <class>AfMonitorWidget</class> 20 <widget class="QWidget" name="AfMonitorWidget" 21 <property name="geometry" 21 <widget class="QWidget" name="AfMonitorWidget"> 22 <property name="geometry"> 22 23 <rect> 23 24 <x>0</x> 24 25 <y>0</y> 25 <width>1 52</width>26 <height>2 93</height>26 <width>112</width> 27 <height>261</height> 27 28 </rect> 28 29 </property> 29 <property name="windowTitle" 30 <property name="windowTitle"> 30 31 <string>Form1</string> 31 32 </property> 32 <layout class="QVBoxLayout" 33 <layout class="QVBoxLayout"> 33 34 <item> 34 <layout class="QVBoxLayout" 35 <layout class="QVBoxLayout"> 35 36 <item> 36 <widget class="QLabel" name="lblName" > 37 <property name="text" > 37 <widget class="QLabel" name="lblName"> 38 <property name="font"> 39 <font> 40 <pointsize>8</pointsize> 41 </font> 42 </property> 43 <property name="text"> 38 44 <string>Name</string> 39 45 </property> 40 <property name="alignment" 46 <property name="alignment"> 41 47 <set>Qt::AlignCenter</set> 42 48 </property> 43 <property name="wordWrap" 49 <property name="wordWrap"> 44 50 <bool>false</bool> 45 51 </property> 46 52 </widget> 47 53 </item> 48 54 <item> 49 <layout class="QHBoxLayout" 55 <layout class="QHBoxLayout"> 50 56 <item> 51 <layout class="QVBoxLayout" 57 <layout class="QVBoxLayout"> 52 58 <item> 53 <widget class="QDial" name="rotPan0" 54 <property name="sizePolicy" 55 <sizepolicy vsizetype="Preferred" hsizetype="Preferred">59 <widget class="QDial" name="rotPan0"> 60 <property name="sizePolicy"> 61 <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> 56 62 <horstretch>0</horstretch> 57 63 <verstretch>0</verstretch> 58 64 </sizepolicy> 59 65 </property> 60 <property name="maximum" > 66 <property name="minimumSize"> 67 <size> 68 <width>40</width> 69 <height>40</height> 70 </size> 71 </property> 72 <property name="maximumSize"> 73 <size> 74 <width>50</width> 75 <height>40</height> 76 </size> 77 </property> 78 <property name="font"> 79 <font> 80 <pointsize>8</pointsize> 81 </font> 82 </property> 83 <property name="maximum"> 61 84 <number>255</number> 62 85 </property> 63 86 </widget> 64 87 </item> 65 88 <item> 66 <widget class="QPushButton" name="btnSolo0" > 67 <property name="text" > 89 <widget class="QPushButton" name="btnSolo0"> 90 <property name="minimumSize"> 91 <size> 92 <width>40</width> 93 <height>20</height> 94 </size> 95 </property> 96 <property name="maximumSize"> 97 <size> 98 <width>40</width> 99 <height>20</height> 100 </size> 101 </property> 102 <property name="font"> 103 <font> 104 <pointsize>8</pointsize> 105 </font> 106 </property> 107 <property name="text"> 68 108 <string>Solo</string> 69 109 </property> 70 <property name="checkable" 110 <property name="checkable"> 71 111 <bool>true</bool> 72 112 </property> 73 113 </widget> 74 114 </item> 75 115 <item> 76 <widget class="QPushButton" name="btnMute0" > 77 <property name="text" > 116 <widget class="QPushButton" name="btnMute0"> 117 <property name="minimumSize"> 118 <size> 119 <width>40</width> 120 <height>20</height> 121 </size> 122 </property> 123 <property name="maximumSize"> 124 <size> 125 <width>40</width> 126 <height>20</height> 127 </size> 128 </property> 129 <property name="font"> 130 <font> 131 <pointsize>8</pointsize> 132 </font> 133 </property> 134 <property name="text"> 78 135 <string>&Mute</string> 79 136 </property> 80 <property name="shortcut" 137 <property name="shortcut"> 81 138 <string>Alt+M</string> 82 139 </property> 83 <property name="checkable" 140 <property name="checkable"> 84 141 <bool>true</bool> 85 142 </property> 86 143 </widget> 87 144 </item> 88 145 <item> 89 <widget class="QSlider" name="sldGain0" 90 <property name="sizePolicy" 91 <sizepolicy vsizetype="Expanding" hsizetype="Expanding">146 <widget class="QSlider" name="sldGain0"> 147 <property name="sizePolicy"> 148 <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> 92 149 <horstretch>0</horstretch> 93 150 <verstretch>0</verstretch> 94 151 </sizepolicy> 95 152 </property> 96 <property name="minimum" > 153 <property name="minimumSize"> 154 <size> 155 <width>40</width> 156 <height>120</height> 157 </size> 158 </property> 159 <property name="maximumSize"> 160 <size> 161 <width>50</width> 162 <height>65534</height> 163 </size> 164 </property> 165 <property name="font"> 166 <font> 167 <pointsize>8</pointsize> 168 </font> 169 </property> 170 <property name="minimum"> 97 171 <number>0</number> 98 172 </property> 99 <property name="maximum" 173 <property name="maximum"> 100 174 <number>16777216</number> 101 175 </property> 102 <property name="singleStep" 176 <property name="singleStep"> 103 177 <number>1048576</number> 104 178 </property> 105 <property name="pageStep" 179 <property name="pageStep"> 106 180 <number>262144</number> 107 181 </property> 108 <property name="orientation" 182 <property name="orientation"> 109 183 <enum>Qt::Vertical</enum> 110 184 </property> 111 <property name="tickInterval" 185 <property name="tickInterval"> 112 186 <number>1048576</number> 113 187 </property> 114 188 </widget> … … 116 190 </layout> 117 191 </item> 118 192 <item> 119 <layout class="QVBoxLayout" 193 <layout class="QVBoxLayout"> 120 194 <item> 121 <widget class="QDial" name="rotPan1" 122 <property name="sizePolicy" 123 <sizepolicy vsizetype="Preferred" hsizetype="Preferred">195 <widget class="QDial" name="rotPan1"> 196 <property name="sizePolicy"> 197 <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> 124 198 <horstretch>0</horstretch> 125 199 <verstretch>0</verstretch> 126 200 </sizepolicy> 127 201 </property> 128 <property name="maximum" > 202 <property name="minimumSize"> 203 <size> 204 <width>40</width> 205 <height>40</height> 206 </size> 207 </property> 208 <property name="maximumSize"> 209 <size> 210 <width>50</width> 211 <height>40</height> 212 </size> 213 </property> 214 <property name="font"> 215 <font> 216 <pointsize>8</pointsize> 217 </font> 218 </property> 219 <property name="maximum"> 129 220 <number>255</number> 130 221 </property> 131 222 </widget> 132 223 </item> 133 224 <item> 134 <widget class="QPushButton" name="btnSolo1" > 135 <property name="text" > 225 <widget class="QPushButton" name="btnSolo1"> 226 <property name="minimumSize"> 227 <size> 228 <width>40</width> 229 <height>20</height> 230 </size> 231 </property> 232 <property name="maximumSize"> 233 <size> 234 <width>40</width> 235 <height>20</height> 236 </size> 237 </property> 238 <property name="font"> 239 <font> 240 <pointsize>8</pointsize> 241 </font> 242 </property> 243 <property name="text"> 136 244 <string>Solo</string> 137 245 </property> 138 <property name="checkable" 246 <property name="checkable"> 139 247 <bool>true</bool> 140 248 </property> 141 249 </widget> 142 250 </item> 143 251 <item> 144 <widget class="QPushButton" name="btnMute1" > 145 <property name="text" > 252 <widget class="QPushButton" name="btnMute1"> 253 <property name="minimumSize"> 254 <size> 255 <width>40</width> 256 <height>20</height> 257 </size> 258 </property> 259 <property name="maximumSize"> 260 <size> 261 <width>40</width> 262 <height>20</height> 263 </size> 264 </property> 265 <property name="font"> 266 <font> 267 <pointsize>8</pointsize> 268 </font> 269 </property> 270 <property name="text"> 146 271 <string>Mute</string> 147 272 </property> 148 <property name="checkable" 273 <property name="checkable"> 149 274 <bool>true</bool> 150 275 </property> 151 276 </widget> 152 277 </item> 153 278 <item> 154 <widget class="QSlider" name="sldGain1" 155 <property name="sizePolicy" 156 <sizepolicy vsizetype="Expanding" hsizetype="Expanding">279 <widget class="QSlider" name="sldGain1"> 280 <property name="sizePolicy"> 281 <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> 157 282 <horstretch>0</horstretch> 158 283 <verstretch>0</verstretch> 159 284 </sizepolicy> 160 285 </property> 161 <property name="minimum" > 286 <property name="minimumSize"> 287 <size> 288 <width>40</width> 289 <height>120</height> 290 </size> 291 </property> 292 <property name="maximumSize"> 293 <size> 294 <width>50</width> 295 <height>65534</height> 296 </size> 297 </property> 298 <property name="font"> 299 <font> 300 <pointsize>8</pointsize> 301 </font> 302 </property> 303 <property name="minimum"> 162 304 <number>0</number> 163 305 </property> 164 <property name="maximum" 306 <property name="maximum"> 165 307 <number>16777216</number> 166 308 </property> 167 <property name="singleStep" 309 <property name="singleStep"> 168 310 <number>1048576</number> 169 311 </property> 170 <property name="pageStep" 312 <property name="pageStep"> 171 313 <number>262144</number> 172 314 </property> 173 <property name="orientation" 315 <property name="orientation"> 174 316 <enum>Qt::Vertical</enum> 175 317 </property> 176 <property name="tickInterval" 318 <property name="tickInterval"> 177 319 <number>1048576</number> 178 320 </property> 179 321 </widget> … … 186 328 </item> 187 329 </layout> 188 330 </widget> 189 <layoutdefault spacing="6" margin="11" 331 <layoutdefault spacing="6" margin="11"/> 190 332 <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> 191 333 <resources/> 192 334 <connections/>