mirror of
				https://github.com/f4exb/sdrangel.git
				synced 2025-10-30 12:30:20 -04:00 
			
		
		
		
	Multi device support: GUIs enhancements
This commit is contained in:
		
							parent
							
								
									7aaed679c7
								
							
						
					
					
						commit
						3c0e66c90e
					
				| @ -6,8 +6,8 @@ | ||||
|    <rect> | ||||
|     <x>0</x> | ||||
|     <y>0</y> | ||||
|     <width>320</width> | ||||
|     <height>262</height> | ||||
|     <width>280</width> | ||||
|     <height>220</height> | ||||
|    </rect> | ||||
|   </property> | ||||
|   <property name="sizePolicy"> | ||||
| @ -16,6 +16,12 @@ | ||||
|     <verstretch>0</verstretch> | ||||
|    </sizepolicy> | ||||
|   </property> | ||||
|   <property name="minimumSize"> | ||||
|    <size> | ||||
|     <width>280</width> | ||||
|     <height>220</height> | ||||
|    </size> | ||||
|   </property> | ||||
|   <property name="font"> | ||||
|    <font> | ||||
|     <family>Sans Serif</family> | ||||
| @ -596,6 +602,23 @@ | ||||
|      </item> | ||||
|     </layout> | ||||
|    </item> | ||||
|    <item> | ||||
|     <layout class="QHBoxLayout" name="paddingLayout"> | ||||
|      <item> | ||||
|       <spacer name="verticalPaddingSpacer"> | ||||
|        <property name="orientation"> | ||||
|         <enum>Qt::Vertical</enum> | ||||
|        </property> | ||||
|        <property name="sizeHint" stdset="0"> | ||||
|         <size> | ||||
|          <width>20</width> | ||||
|          <height>40</height> | ||||
|         </size> | ||||
|        </property> | ||||
|       </spacer> | ||||
|      </item> | ||||
|     </layout> | ||||
|    </item> | ||||
|   </layout> | ||||
|  </widget> | ||||
|  <customwidgets> | ||||
|  | ||||
| @ -7,7 +7,7 @@ | ||||
|     <x>0</x> | ||||
|     <y>0</y> | ||||
|     <width>259</width> | ||||
|     <height>207</height> | ||||
|     <height>210</height> | ||||
|    </rect> | ||||
|   </property> | ||||
|   <property name="sizePolicy"> | ||||
| @ -16,6 +16,12 @@ | ||||
|     <verstretch>0</verstretch> | ||||
|    </sizepolicy> | ||||
|   </property> | ||||
|   <property name="minimumSize"> | ||||
|    <size> | ||||
|     <width>0</width> | ||||
|     <height>210</height> | ||||
|    </size> | ||||
|   </property> | ||||
|   <property name="font"> | ||||
|    <font> | ||||
|     <family>Sans Serif</family> | ||||
| @ -653,6 +659,23 @@ | ||||
|      </item> | ||||
|     </layout> | ||||
|    </item> | ||||
|    <item> | ||||
|     <layout class="QHBoxLayout" name="padLayout"> | ||||
|      <item> | ||||
|       <spacer name="verticalPadSpacer"> | ||||
|        <property name="orientation"> | ||||
|         <enum>Qt::Vertical</enum> | ||||
|        </property> | ||||
|        <property name="sizeHint" stdset="0"> | ||||
|         <size> | ||||
|          <width>20</width> | ||||
|          <height>40</height> | ||||
|         </size> | ||||
|        </property> | ||||
|       </spacer> | ||||
|      </item> | ||||
|     </layout> | ||||
|    </item> | ||||
|    <item> | ||||
|     <widget class="Line" name="line_vga2"> | ||||
|      <property name="orientation"> | ||||
|  | ||||
| @ -6,8 +6,8 @@ | ||||
|    <rect> | ||||
|     <x>0</x> | ||||
|     <y>0</y> | ||||
|     <width>318</width> | ||||
|     <height>400</height> | ||||
|     <width>270</width> | ||||
|     <height>335</height> | ||||
|    </rect> | ||||
|   </property> | ||||
|   <property name="sizePolicy"> | ||||
| @ -16,6 +16,12 @@ | ||||
|     <verstretch>0</verstretch> | ||||
|    </sizepolicy> | ||||
|   </property> | ||||
|   <property name="minimumSize"> | ||||
|    <size> | ||||
|     <width>270</width> | ||||
|     <height>335</height> | ||||
|    </size> | ||||
|   </property> | ||||
|   <property name="font"> | ||||
|    <font> | ||||
|     <family>Sans Serif</family> | ||||
| @ -432,6 +438,23 @@ | ||||
|      </item> | ||||
|     </layout> | ||||
|    </item> | ||||
|    <item> | ||||
|     <layout class="QHBoxLayout" name="padLayout"> | ||||
|      <item> | ||||
|       <spacer name="verticalPadSpacer"> | ||||
|        <property name="orientation"> | ||||
|         <enum>Qt::Vertical</enum> | ||||
|        </property> | ||||
|        <property name="sizeHint" stdset="0"> | ||||
|         <size> | ||||
|          <width>20</width> | ||||
|          <height>40</height> | ||||
|         </size> | ||||
|        </property> | ||||
|       </spacer> | ||||
|      </item> | ||||
|     </layout> | ||||
|    </item> | ||||
|   </layout> | ||||
|  </widget> | ||||
|  <customwidgets> | ||||
|  | ||||
| @ -6,8 +6,8 @@ | ||||
|    <rect> | ||||
|     <x>0</x> | ||||
|     <y>0</y> | ||||
|     <width>305</width> | ||||
|     <height>191</height> | ||||
|     <width>260</width> | ||||
|     <height>180</height> | ||||
|    </rect> | ||||
|   </property> | ||||
|   <property name="sizePolicy"> | ||||
| @ -16,6 +16,12 @@ | ||||
|     <verstretch>0</verstretch> | ||||
|    </sizepolicy> | ||||
|   </property> | ||||
|   <property name="minimumSize"> | ||||
|    <size> | ||||
|     <width>260</width> | ||||
|     <height>180</height> | ||||
|    </size> | ||||
|   </property> | ||||
|   <property name="font"> | ||||
|    <font> | ||||
|     <family>Sans Serif</family> | ||||
| @ -339,6 +345,23 @@ | ||||
|      </item> | ||||
|     </layout> | ||||
|    </item> | ||||
|    <item> | ||||
|     <layout class="QHBoxLayout" name="padLayout"> | ||||
|      <item> | ||||
|       <spacer name="verticalPadSpacer"> | ||||
|        <property name="orientation"> | ||||
|         <enum>Qt::Vertical</enum> | ||||
|        </property> | ||||
|        <property name="sizeHint" stdset="0"> | ||||
|         <size> | ||||
|          <width>20</width> | ||||
|          <height>40</height> | ||||
|         </size> | ||||
|        </property> | ||||
|       </spacer> | ||||
|      </item> | ||||
|     </layout> | ||||
|    </item> | ||||
|   </layout> | ||||
|  </widget> | ||||
|  <customwidgets> | ||||
|  | ||||
| @ -6,8 +6,8 @@ | ||||
|    <rect> | ||||
|     <x>0</x> | ||||
|     <y>0</y> | ||||
|     <width>289</width> | ||||
|     <height>227</height> | ||||
|     <width>246</width> | ||||
|     <height>190</height> | ||||
|    </rect> | ||||
|   </property> | ||||
|   <property name="sizePolicy"> | ||||
| @ -16,6 +16,12 @@ | ||||
|     <verstretch>0</verstretch> | ||||
|    </sizepolicy> | ||||
|   </property> | ||||
|   <property name="minimumSize"> | ||||
|    <size> | ||||
|     <width>246</width> | ||||
|     <height>190</height> | ||||
|    </size> | ||||
|   </property> | ||||
|   <property name="font"> | ||||
|    <font> | ||||
|     <family>Sans Serif</family> | ||||
| @ -408,13 +414,6 @@ | ||||
|      </item> | ||||
|     </layout> | ||||
|    </item> | ||||
|    <item> | ||||
|     <widget class="Line" name="line_rate2"> | ||||
|      <property name="orientation"> | ||||
|       <enum>Qt::Horizontal</enum> | ||||
|      </property> | ||||
|     </widget> | ||||
|    </item> | ||||
|    <item> | ||||
|     <layout class="QHBoxLayout" name="horizontalLayout_nav"> | ||||
|      <item> | ||||
| @ -435,6 +434,30 @@ | ||||
|      </item> | ||||
|     </layout> | ||||
|    </item> | ||||
|    <item> | ||||
|     <layout class="QHBoxLayout" name="padLayout"> | ||||
|      <item> | ||||
|       <spacer name="verticaPadlSpacer"> | ||||
|        <property name="orientation"> | ||||
|         <enum>Qt::Vertical</enum> | ||||
|        </property> | ||||
|        <property name="sizeHint" stdset="0"> | ||||
|         <size> | ||||
|          <width>20</width> | ||||
|          <height>40</height> | ||||
|         </size> | ||||
|        </property> | ||||
|       </spacer> | ||||
|      </item> | ||||
|     </layout> | ||||
|    </item> | ||||
|    <item> | ||||
|     <widget class="Line" name="line_rate2"> | ||||
|      <property name="orientation"> | ||||
|       <enum>Qt::Horizontal</enum> | ||||
|      </property> | ||||
|     </widget> | ||||
|    </item> | ||||
|    <item> | ||||
|     <widget class="Line" name="line_nav"> | ||||
|      <property name="orientation"> | ||||
|  | ||||
| @ -7,7 +7,7 @@ | ||||
|     <x>0</x> | ||||
|     <y>0</y> | ||||
|     <width>260</width> | ||||
|     <height>299</height> | ||||
|     <height>210</height> | ||||
|    </rect> | ||||
|   </property> | ||||
|   <property name="sizePolicy"> | ||||
| @ -19,7 +19,7 @@ | ||||
|   <property name="minimumSize"> | ||||
|    <size> | ||||
|     <width>260</width> | ||||
|     <height>0</height> | ||||
|     <height>210</height> | ||||
|    </size> | ||||
|   </property> | ||||
|   <property name="font"> | ||||
| @ -41,58 +41,58 @@ | ||||
|    <item> | ||||
|     <layout class="QHBoxLayout" name="horizontalLayout_freq"> | ||||
|      <item> | ||||
|        <layout class="QVBoxLayout" name="deviceUILayout"> | ||||
|         <item> | ||||
|           <layout class="QHBoxLayout" name="deviceButtonsLayout"> | ||||
|              <item> | ||||
|               <widget class="ButtonSwitch" name="startStop"> | ||||
|                <property name="toolTip"> | ||||
|                 <string>start/stop acquisition</string> | ||||
|                </property> | ||||
|                <property name="text"> | ||||
|                 <string/> | ||||
|                </property> | ||||
|                <property name="icon"> | ||||
|                 <iconset resource="../../../sdrbase/resources/res.qrc"> | ||||
|                  <normaloff>:/play.png</normaloff> | ||||
|                  <normalon>:/stop.png</normalon>:/play.png</iconset> | ||||
|                </property> | ||||
|               </widget> | ||||
|              </item> | ||||
|              <item> | ||||
|               <widget class="ButtonSwitch" name="record"> | ||||
|                <property name="toolTip"> | ||||
|                 <string>Toggle record I/Q samples from device</string> | ||||
|                </property> | ||||
|                <property name="text"> | ||||
|                 <string/> | ||||
|                </property> | ||||
|                <property name="icon"> | ||||
|                 <iconset resource="../../../sdrbase/resources/res.qrc"> | ||||
|                  <normaloff>:/record_off.png</normaloff>:/record_off.png</iconset> | ||||
|                </property> | ||||
|               </widget> | ||||
|              </item>              | ||||
|           </layout> | ||||
|         </item> | ||||
|         <item> | ||||
|          <layout class="QHBoxLayout" name="deviceRateLayout"> | ||||
|              <item> | ||||
|               <widget class="QLabel" name="deviceRateText"> | ||||
|                <property name="toolTip"> | ||||
|                 <string>I/Q sample rate kS/s</string> | ||||
|                </property> | ||||
|                <property name="text"> | ||||
|                 <string>00000k</string> | ||||
|                </property> | ||||
|                <property name="alignment"> | ||||
|                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> | ||||
|                </property> | ||||
|               </widget> | ||||
|              </item>          | ||||
|          </layout> | ||||
|         </item> | ||||
|        </layout> | ||||
|       <layout class="QVBoxLayout" name="deviceUILayout"> | ||||
|        <item> | ||||
|         <layout class="QHBoxLayout" name="deviceButtonsLayout"> | ||||
|          <item> | ||||
|           <widget class="ButtonSwitch" name="startStop"> | ||||
|            <property name="toolTip"> | ||||
|             <string>start/stop acquisition</string> | ||||
|            </property> | ||||
|            <property name="text"> | ||||
|             <string/> | ||||
|            </property> | ||||
|            <property name="icon"> | ||||
|             <iconset resource="../../../sdrbase/resources/res.qrc"> | ||||
|              <normaloff>:/play.png</normaloff> | ||||
|              <normalon>:/stop.png</normalon>:/play.png</iconset> | ||||
|            </property> | ||||
|           </widget> | ||||
|          </item> | ||||
|          <item> | ||||
|           <widget class="ButtonSwitch" name="record"> | ||||
|            <property name="toolTip"> | ||||
|             <string>Toggle record I/Q samples from device</string> | ||||
|            </property> | ||||
|            <property name="text"> | ||||
|             <string/> | ||||
|            </property> | ||||
|            <property name="icon"> | ||||
|             <iconset resource="../../../sdrbase/resources/res.qrc"> | ||||
|              <normaloff>:/record_off.png</normaloff>:/record_off.png</iconset> | ||||
|            </property> | ||||
|           </widget> | ||||
|          </item> | ||||
|         </layout> | ||||
|        </item> | ||||
|        <item> | ||||
|         <layout class="QHBoxLayout" name="deviceRateLayout"> | ||||
|          <item> | ||||
|           <widget class="QLabel" name="deviceRateText"> | ||||
|            <property name="toolTip"> | ||||
|             <string>I/Q sample rate kS/s</string> | ||||
|            </property> | ||||
|            <property name="text"> | ||||
|             <string>00000k</string> | ||||
|            </property> | ||||
|            <property name="alignment"> | ||||
|             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> | ||||
|            </property> | ||||
|           </widget> | ||||
|          </item> | ||||
|         </layout> | ||||
|        </item> | ||||
|       </layout> | ||||
|      </item> | ||||
|      <item> | ||||
|       <spacer name="freqLeftSpacer"> | ||||
| @ -567,6 +567,23 @@ | ||||
|      </item> | ||||
|     </layout> | ||||
|    </item> | ||||
|    <item> | ||||
|     <layout class="QHBoxLayout" name="padLayout"> | ||||
|      <item> | ||||
|       <spacer name="verticaPadlSpacer"> | ||||
|        <property name="orientation"> | ||||
|         <enum>Qt::Vertical</enum> | ||||
|        </property> | ||||
|        <property name="sizeHint" stdset="0"> | ||||
|         <size> | ||||
|          <width>20</width> | ||||
|          <height>40</height> | ||||
|         </size> | ||||
|        </property> | ||||
|       </spacer> | ||||
|      </item> | ||||
|     </layout> | ||||
|    </item> | ||||
|   </layout> | ||||
|  </widget> | ||||
|  <customwidgets> | ||||
|  | ||||
| @ -6,8 +6,8 @@ | ||||
|    <rect> | ||||
|     <x>0</x> | ||||
|     <y>0</y> | ||||
|     <width>298</width> | ||||
|     <height>189</height> | ||||
|     <width>300</width> | ||||
|     <height>190</height> | ||||
|    </rect> | ||||
|   </property> | ||||
|   <property name="sizePolicy"> | ||||
| @ -16,6 +16,12 @@ | ||||
|     <verstretch>0</verstretch> | ||||
|    </sizepolicy> | ||||
|   </property> | ||||
|   <property name="minimumSize"> | ||||
|    <size> | ||||
|     <width>300</width> | ||||
|     <height>190</height> | ||||
|    </size> | ||||
|   </property> | ||||
|   <property name="font"> | ||||
|    <font> | ||||
|     <family>Sans Serif</family> | ||||
| @ -456,13 +462,6 @@ | ||||
|      </item> | ||||
|     </layout> | ||||
|    </item> | ||||
|    <item> | ||||
|     <widget class="Line" name="line_2"> | ||||
|      <property name="orientation"> | ||||
|       <enum>Qt::Horizontal</enum> | ||||
|      </property> | ||||
|     </widget> | ||||
|    </item> | ||||
|    <item> | ||||
|     <layout class="QHBoxLayout" name="horizontalLayout_direct"> | ||||
|      <item> | ||||
| @ -490,6 +489,30 @@ | ||||
|      </item> | ||||
|     </layout> | ||||
|    </item> | ||||
|    <item> | ||||
|     <widget class="Line" name="line_2"> | ||||
|      <property name="orientation"> | ||||
|       <enum>Qt::Horizontal</enum> | ||||
|      </property> | ||||
|     </widget> | ||||
|    </item> | ||||
|    <item> | ||||
|     <layout class="QHBoxLayout" name="fillerLayout"> | ||||
|      <item> | ||||
|       <spacer name="filerVerticalSpacer"> | ||||
|        <property name="orientation"> | ||||
|         <enum>Qt::Vertical</enum> | ||||
|        </property> | ||||
|        <property name="sizeHint" stdset="0"> | ||||
|         <size> | ||||
|          <width>20</width> | ||||
|          <height>40</height> | ||||
|         </size> | ||||
|        </property> | ||||
|       </spacer> | ||||
|      </item> | ||||
|     </layout> | ||||
|    </item> | ||||
|   </layout> | ||||
|  </widget> | ||||
|  <customwidgets> | ||||
|  | ||||
| @ -7,13 +7,13 @@ | ||||
|     <x>0</x> | ||||
|     <y>0</y> | ||||
|     <width>350</width> | ||||
|     <height>366</height> | ||||
|     <height>261</height> | ||||
|    </rect> | ||||
|   </property> | ||||
|   <property name="minimumSize"> | ||||
|    <size> | ||||
|     <width>350</width> | ||||
|     <height>0</height> | ||||
|     <height>261</height> | ||||
|    </size> | ||||
|   </property> | ||||
|   <property name="font"> | ||||
| @ -35,58 +35,58 @@ | ||||
|    <item> | ||||
|     <layout class="QHBoxLayout" name="horizontalLayout_freq"> | ||||
|      <item> | ||||
|        <layout class="QVBoxLayout" name="deviceUILayout"> | ||||
|       <layout class="QVBoxLayout" name="deviceUILayout"> | ||||
|        <item> | ||||
|         <layout class="QHBoxLayout" name="deviceButtonsLayout"> | ||||
|          <item> | ||||
|            <layout class="QHBoxLayout" name="deviceButtonsLayout"> | ||||
|              <item> | ||||
|               <widget class="ButtonSwitch" name="startStop"> | ||||
|                <property name="toolTip"> | ||||
|                 <string>start/stop acquisition</string> | ||||
|                </property> | ||||
|                <property name="text"> | ||||
|                 <string/> | ||||
|                </property> | ||||
|                <property name="icon"> | ||||
|                 <iconset resource="../../../sdrbase/resources/res.qrc"> | ||||
|                  <normaloff>:/play.png</normaloff> | ||||
|                  <normalon>:/stop.png</normalon>:/play.png</iconset> | ||||
|                </property> | ||||
|               </widget> | ||||
|              </item> | ||||
|              <item> | ||||
|               <widget class="ButtonSwitch" name="record"> | ||||
|                <property name="toolTip"> | ||||
|                 <string>Toggle record I/Q samples from device</string> | ||||
|                </property> | ||||
|                <property name="text"> | ||||
|                 <string/> | ||||
|                </property> | ||||
|                <property name="icon"> | ||||
|                 <iconset resource="../../../sdrbase/resources/res.qrc"> | ||||
|                  <normaloff>:/record_off.png</normaloff>:/record_off.png</iconset> | ||||
|                </property> | ||||
|               </widget> | ||||
|              </item>              | ||||
|            </layout> | ||||
|           <widget class="ButtonSwitch" name="startStop"> | ||||
|            <property name="toolTip"> | ||||
|             <string>start/stop acquisition</string> | ||||
|            </property> | ||||
|            <property name="text"> | ||||
|             <string/> | ||||
|            </property> | ||||
|            <property name="icon"> | ||||
|             <iconset resource="../../../sdrbase/resources/res.qrc"> | ||||
|              <normaloff>:/play.png</normaloff> | ||||
|              <normalon>:/stop.png</normalon>:/play.png</iconset> | ||||
|            </property> | ||||
|           </widget> | ||||
|          </item> | ||||
|          <item> | ||||
|             <layout class="QHBoxLayout" name="deviceRateLayout"> | ||||
|              <item> | ||||
|               <widget class="QLabel" name="deviceRateText"> | ||||
|                <property name="toolTip"> | ||||
|                 <string>I/Q sample rate kS/s</string> | ||||
|                </property> | ||||
|                <property name="text"> | ||||
|                 <string>00000k</string> | ||||
|                </property> | ||||
|                <property name="alignment"> | ||||
|                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> | ||||
|                </property> | ||||
|               </widget> | ||||
|              </item> | ||||
|             </layout>          | ||||
|           <widget class="ButtonSwitch" name="record"> | ||||
|            <property name="toolTip"> | ||||
|             <string>Toggle record I/Q samples from device</string> | ||||
|            </property> | ||||
|            <property name="text"> | ||||
|             <string/> | ||||
|            </property> | ||||
|            <property name="icon"> | ||||
|             <iconset resource="../../../sdrbase/resources/res.qrc"> | ||||
|              <normaloff>:/record_off.png</normaloff>:/record_off.png</iconset> | ||||
|            </property> | ||||
|           </widget> | ||||
|          </item> | ||||
|        </layout> | ||||
|         </layout> | ||||
|        </item> | ||||
|        <item> | ||||
|         <layout class="QHBoxLayout" name="deviceRateLayout"> | ||||
|          <item> | ||||
|           <widget class="QLabel" name="deviceRateText"> | ||||
|            <property name="toolTip"> | ||||
|             <string>I/Q sample rate kS/s</string> | ||||
|            </property> | ||||
|            <property name="text"> | ||||
|             <string>00000k</string> | ||||
|            </property> | ||||
|            <property name="alignment"> | ||||
|             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> | ||||
|            </property> | ||||
|           </widget> | ||||
|          </item> | ||||
|         </layout> | ||||
|        </item> | ||||
|       </layout> | ||||
|      </item> | ||||
|      <item> | ||||
|       <spacer name="freqLeftSpacer"> | ||||
| @ -985,6 +985,23 @@ | ||||
|      </item> | ||||
|     </layout> | ||||
|    </item> | ||||
|    <item> | ||||
|     <layout class="QHBoxLayout" name="padLayout"> | ||||
|      <item> | ||||
|       <spacer name="verticalPadSpacer"> | ||||
|        <property name="orientation"> | ||||
|         <enum>Qt::Vertical</enum> | ||||
|        </property> | ||||
|        <property name="sizeHint" stdset="0"> | ||||
|         <size> | ||||
|          <width>20</width> | ||||
|          <height>40</height> | ||||
|         </size> | ||||
|        </property> | ||||
|       </spacer> | ||||
|      </item> | ||||
|     </layout> | ||||
|    </item> | ||||
|   </layout> | ||||
|  </widget> | ||||
|  <customwidgets> | ||||
|  | ||||
| @ -74,26 +74,31 @@ MainWindow::MainWindow(QWidget* parent) : | ||||
| 	setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea); | ||||
| 
 | ||||
| 	// work around broken Qt dock widget ordering
 | ||||
| 	removeDockWidget(ui->inputDock); | ||||
| 	removeDockWidget(ui->inputSelectDock); | ||||
|     removeDockWidget(ui->inputViewDock); | ||||
| 	removeDockWidget(ui->spectraDisplayDock); | ||||
| 	removeDockWidget(ui->presetDock); | ||||
| 	removeDockWidget(ui->channelDock); | ||||
| 	addDockWidget(Qt::LeftDockWidgetArea, ui->inputDock); | ||||
| 	addDockWidget(Qt::LeftDockWidgetArea, ui->inputSelectDock); | ||||
|     addDockWidget(Qt::LeftDockWidgetArea, ui->inputViewDock); | ||||
| 	addDockWidget(Qt::LeftDockWidgetArea, ui->spectraDisplayDock); | ||||
| 	addDockWidget(Qt::LeftDockWidgetArea, ui->presetDock); | ||||
| 	addDockWidget(Qt::RightDockWidgetArea, ui->channelDock); | ||||
| 
 | ||||
| 	ui->inputDock->show(); | ||||
| 	ui->inputSelectDock->show(); | ||||
|     ui->inputSelectDock->show(); | ||||
| 	ui->spectraDisplayDock->show(); | ||||
| 	ui->presetDock->show(); | ||||
| 	ui->channelDock->show(); | ||||
| 
 | ||||
| 	ui->menu_Window->addAction(ui->inputDock->toggleViewAction()); | ||||
| 	ui->menu_Window->addAction(ui->inputSelectDock->toggleViewAction()); | ||||
|     ui->menu_Window->addAction(ui->inputViewDock->toggleViewAction()); | ||||
| 	ui->menu_Window->addAction(ui->spectraDisplayDock->toggleViewAction()); | ||||
| 	ui->menu_Window->addAction(ui->presetDock->toggleViewAction()); | ||||
| 	ui->menu_Window->addAction(ui->channelDock->toggleViewAction()); | ||||
| 
 | ||||
| 	//ui->tabInputsVoew->setStyleSheet("background-color: rgb(46,46,46)");
 | ||||
| 	ui->tabInputsView->setStyleSheet("QWidget { background: rgb(46,46,46); } "); | ||||
| 
 | ||||
| 	connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleMessages()), Qt::QueuedConnection); | ||||
| 
 | ||||
| @ -237,6 +242,11 @@ void MainWindow::removeLastDevice() | ||||
|     lastDeviceEngine->stop(); | ||||
|     m_dspEngine->removeLastDeviceEngine(); | ||||
| 
 | ||||
|     if (ui->tabInputsView->count() == ui->tabInputsSelect->count()) | ||||
|     { | ||||
|         ui->tabInputsView->removeTab(ui->tabInputsView->count() - 1); | ||||
|     } | ||||
| 
 | ||||
|     ui->tabInputsSelect->removeTab(ui->tabInputsSelect->count() - 1); | ||||
| 
 | ||||
|     delete m_deviceUIs.back(); | ||||
| @ -322,7 +332,7 @@ void MainWindow::loadPresetSettings(const Preset* preset) | ||||
| 		qPrintable(preset->getDescription())); | ||||
| 
 | ||||
| 	// Load into currently selected source tab
 | ||||
| 	int currentSourceTabIndex = ui->tabInputsSelect->currentIndex(); | ||||
| 	int currentSourceTabIndex = ui->tabInputsView->currentIndex(); | ||||
| 
 | ||||
| 	if (currentSourceTabIndex >= 0) | ||||
| 	{ | ||||
| @ -356,7 +366,7 @@ void MainWindow::savePresetSettings(Preset* preset) | ||||
| 	preset->clearChannels(); | ||||
| 
 | ||||
|     // Save from currently selected source tab
 | ||||
|     int currentSourceTabIndex = ui->tabInputsSelect->currentIndex(); | ||||
|     int currentSourceTabIndex = ui->tabInputsView->currentIndex(); | ||||
| 
 | ||||
|     if (currentSourceTabIndex >= 0) | ||||
|     { | ||||
|  | ||||
| @ -7,7 +7,7 @@ | ||||
|     <x>0</x> | ||||
|     <y>0</y> | ||||
|     <width>1012</width> | ||||
|     <height>635</height> | ||||
|     <height>767</height> | ||||
|    </rect> | ||||
|   </property> | ||||
|   <property name="font"> | ||||
| @ -398,14 +398,14 @@ | ||||
|     </layout> | ||||
|    </widget> | ||||
|   </widget> | ||||
|   <widget class="QDockWidget" name="inputDock"> | ||||
|   <widget class="QDockWidget" name="inputSelectDock"> | ||||
|    <property name="windowTitle"> | ||||
|     <string>Sample Source</string> | ||||
|     <string>Select Sample Source</string> | ||||
|    </property> | ||||
|    <attribute name="dockWidgetArea"> | ||||
|     <number>1</number> | ||||
|    </attribute> | ||||
|    <widget class="QWidget" name="intpuDockWidget"> | ||||
|    <widget class="QWidget" name="intputSelectDockWidget"> | ||||
|     <property name="sizePolicy"> | ||||
|      <sizepolicy hsizetype="Preferred" vsizetype="Maximum"> | ||||
|       <horstretch>0</horstretch> | ||||
| @ -432,422 +432,37 @@ | ||||
|        </property> | ||||
|       </widget> | ||||
|      </item> | ||||
|     </layout> | ||||
|    </widget> | ||||
|   </widget> | ||||
|   <widget class="QDockWidget" name="inputViewDock"> | ||||
|    <property name="windowTitle"> | ||||
|     <string>Sample Source</string> | ||||
|    </property> | ||||
|    <attribute name="dockWidgetArea"> | ||||
|     <number>1</number> | ||||
|    </attribute> | ||||
|    <widget class="QWidget" name="intputViewDockWidget"> | ||||
|     <property name="sizePolicy"> | ||||
|      <sizepolicy hsizetype="Preferred" vsizetype="Maximum"> | ||||
|       <horstretch>0</horstretch> | ||||
|       <verstretch>0</verstretch> | ||||
|      </sizepolicy> | ||||
|     </property> | ||||
|     <layout class="QVBoxLayout" name="inputViewDockLayout"> | ||||
|      <property name="spacing"> | ||||
|       <number>3</number> | ||||
|      </property> | ||||
|      <property name="margin"> | ||||
|       <number>2</number> | ||||
|      </property> | ||||
|      <item> | ||||
|       <widget class="QTabWidget" name="tabInputsView"> | ||||
|        <property name="palette"> | ||||
|         <palette> | ||||
|          <active> | ||||
|           <colorrole role="WindowText"> | ||||
|            <brush brushstyle="SolidPattern"> | ||||
|             <color alpha="255"> | ||||
|              <red>255</red> | ||||
|              <green>255</green> | ||||
|              <blue>255</blue> | ||||
|             </color> | ||||
|            </brush> | ||||
|           </colorrole> | ||||
|           <colorrole role="Button"> | ||||
|            <brush brushstyle="SolidPattern"> | ||||
|             <color alpha="255"> | ||||
|              <red>53</red> | ||||
|              <green>52</green> | ||||
|              <blue>50</blue> | ||||
|             </color> | ||||
|            </brush> | ||||
|           </colorrole> | ||||
|           <colorrole role="Light"> | ||||
|            <brush brushstyle="SolidPattern"> | ||||
|             <color alpha="255"> | ||||
|              <red>79</red> | ||||
|              <green>78</green> | ||||
|              <blue>75</blue> | ||||
|             </color> | ||||
|            </brush> | ||||
|           </colorrole> | ||||
|           <colorrole role="Midlight"> | ||||
|            <brush brushstyle="SolidPattern"> | ||||
|             <color alpha="255"> | ||||
|              <red>66</red> | ||||
|              <green>65</green> | ||||
|              <blue>62</blue> | ||||
|             </color> | ||||
|            </brush> | ||||
|           </colorrole> | ||||
|           <colorrole role="Dark"> | ||||
|            <brush brushstyle="SolidPattern"> | ||||
|             <color alpha="255"> | ||||
|              <red>26</red> | ||||
|              <green>26</green> | ||||
|              <blue>25</blue> | ||||
|             </color> | ||||
|            </brush> | ||||
|           </colorrole> | ||||
|           <colorrole role="Mid"> | ||||
|            <brush brushstyle="SolidPattern"> | ||||
|             <color alpha="255"> | ||||
|              <red>35</red> | ||||
|              <green>34</green> | ||||
|              <blue>33</blue> | ||||
|             </color> | ||||
|            </brush> | ||||
|           </colorrole> | ||||
|           <colorrole role="Text"> | ||||
|            <brush brushstyle="SolidPattern"> | ||||
|             <color alpha="255"> | ||||
|              <red>255</red> | ||||
|              <green>255</green> | ||||
|              <blue>255</blue> | ||||
|             </color> | ||||
|            </brush> | ||||
|           </colorrole> | ||||
|           <colorrole role="BrightText"> | ||||
|            <brush brushstyle="SolidPattern"> | ||||
|             <color alpha="255"> | ||||
|              <red>255</red> | ||||
|              <green>255</green> | ||||
|              <blue>255</blue> | ||||
|             </color> | ||||
|            </brush> | ||||
|           </colorrole> | ||||
|           <colorrole role="ButtonText"> | ||||
|            <brush brushstyle="SolidPattern"> | ||||
|             <color alpha="255"> | ||||
|              <red>255</red> | ||||
|              <green>255</green> | ||||
|              <blue>255</blue> | ||||
|             </color> | ||||
|            </brush> | ||||
|           </colorrole> | ||||
|           <colorrole role="Base"> | ||||
|            <brush brushstyle="SolidPattern"> | ||||
|             <color alpha="255"> | ||||
|              <red>0</red> | ||||
|              <green>0</green> | ||||
|              <blue>0</blue> | ||||
|             </color> | ||||
|            </brush> | ||||
|           </colorrole> | ||||
|           <colorrole role="Window"> | ||||
|            <brush brushstyle="SolidPattern"> | ||||
|             <color alpha="255"> | ||||
|              <red>53</red> | ||||
|              <green>52</green> | ||||
|              <blue>50</blue> | ||||
|             </color> | ||||
|            </brush> | ||||
|           </colorrole> | ||||
|           <colorrole role="Shadow"> | ||||
|            <brush brushstyle="SolidPattern"> | ||||
|             <color alpha="255"> | ||||
|              <red>0</red> | ||||
|              <green>0</green> | ||||
|              <blue>0</blue> | ||||
|             </color> | ||||
|            </brush> | ||||
|           </colorrole> | ||||
|           <colorrole role="AlternateBase"> | ||||
|            <brush brushstyle="SolidPattern"> | ||||
|             <color alpha="255"> | ||||
|              <red>26</red> | ||||
|              <green>26</green> | ||||
|              <blue>25</blue> | ||||
|             </color> | ||||
|            </brush> | ||||
|           </colorrole> | ||||
|           <colorrole role="ToolTipBase"> | ||||
|            <brush brushstyle="SolidPattern"> | ||||
|             <color alpha="255"> | ||||
|              <red>255</red> | ||||
|              <green>255</green> | ||||
|              <blue>220</blue> | ||||
|             </color> | ||||
|            </brush> | ||||
|           </colorrole> | ||||
|           <colorrole role="ToolTipText"> | ||||
|            <brush brushstyle="SolidPattern"> | ||||
|             <color alpha="255"> | ||||
|              <red>0</red> | ||||
|              <green>0</green> | ||||
|              <blue>0</blue> | ||||
|             </color> | ||||
|            </brush> | ||||
|           </colorrole> | ||||
|          </active> | ||||
|          <inactive> | ||||
|           <colorrole role="WindowText"> | ||||
|            <brush brushstyle="SolidPattern"> | ||||
|             <color alpha="255"> | ||||
|              <red>255</red> | ||||
|              <green>255</green> | ||||
|              <blue>255</blue> | ||||
|             </color> | ||||
|            </brush> | ||||
|           </colorrole> | ||||
|           <colorrole role="Button"> | ||||
|            <brush brushstyle="SolidPattern"> | ||||
|             <color alpha="255"> | ||||
|              <red>53</red> | ||||
|              <green>52</green> | ||||
|              <blue>50</blue> | ||||
|             </color> | ||||
|            </brush> | ||||
|           </colorrole> | ||||
|           <colorrole role="Light"> | ||||
|            <brush brushstyle="SolidPattern"> | ||||
|             <color alpha="255"> | ||||
|              <red>79</red> | ||||
|              <green>78</green> | ||||
|              <blue>75</blue> | ||||
|             </color> | ||||
|            </brush> | ||||
|           </colorrole> | ||||
|           <colorrole role="Midlight"> | ||||
|            <brush brushstyle="SolidPattern"> | ||||
|             <color alpha="255"> | ||||
|              <red>66</red> | ||||
|              <green>65</green> | ||||
|              <blue>62</blue> | ||||
|             </color> | ||||
|            </brush> | ||||
|           </colorrole> | ||||
|           <colorrole role="Dark"> | ||||
|            <brush brushstyle="SolidPattern"> | ||||
|             <color alpha="255"> | ||||
|              <red>26</red> | ||||
|              <green>26</green> | ||||
|              <blue>25</blue> | ||||
|             </color> | ||||
|            </brush> | ||||
|           </colorrole> | ||||
|           <colorrole role="Mid"> | ||||
|            <brush brushstyle="SolidPattern"> | ||||
|             <color alpha="255"> | ||||
|              <red>35</red> | ||||
|              <green>34</green> | ||||
|              <blue>33</blue> | ||||
|             </color> | ||||
|            </brush> | ||||
|           </colorrole> | ||||
|           <colorrole role="Text"> | ||||
|            <brush brushstyle="SolidPattern"> | ||||
|             <color alpha="255"> | ||||
|              <red>255</red> | ||||
|              <green>255</green> | ||||
|              <blue>255</blue> | ||||
|             </color> | ||||
|            </brush> | ||||
|           </colorrole> | ||||
|           <colorrole role="BrightText"> | ||||
|            <brush brushstyle="SolidPattern"> | ||||
|             <color alpha="255"> | ||||
|              <red>255</red> | ||||
|              <green>255</green> | ||||
|              <blue>255</blue> | ||||
|             </color> | ||||
|            </brush> | ||||
|           </colorrole> | ||||
|           <colorrole role="ButtonText"> | ||||
|            <brush brushstyle="SolidPattern"> | ||||
|             <color alpha="255"> | ||||
|              <red>255</red> | ||||
|              <green>255</green> | ||||
|              <blue>255</blue> | ||||
|             </color> | ||||
|            </brush> | ||||
|           </colorrole> | ||||
|           <colorrole role="Base"> | ||||
|            <brush brushstyle="SolidPattern"> | ||||
|             <color alpha="255"> | ||||
|              <red>0</red> | ||||
|              <green>0</green> | ||||
|              <blue>0</blue> | ||||
|             </color> | ||||
|            </brush> | ||||
|           </colorrole> | ||||
|           <colorrole role="Window"> | ||||
|            <brush brushstyle="SolidPattern"> | ||||
|             <color alpha="255"> | ||||
|              <red>53</red> | ||||
|              <green>52</green> | ||||
|              <blue>50</blue> | ||||
|             </color> | ||||
|            </brush> | ||||
|           </colorrole> | ||||
|           <colorrole role="Shadow"> | ||||
|            <brush brushstyle="SolidPattern"> | ||||
|             <color alpha="255"> | ||||
|              <red>0</red> | ||||
|              <green>0</green> | ||||
|              <blue>0</blue> | ||||
|             </color> | ||||
|            </brush> | ||||
|           </colorrole> | ||||
|           <colorrole role="AlternateBase"> | ||||
|            <brush brushstyle="SolidPattern"> | ||||
|             <color alpha="255"> | ||||
|              <red>26</red> | ||||
|              <green>26</green> | ||||
|              <blue>25</blue> | ||||
|             </color> | ||||
|            </brush> | ||||
|           </colorrole> | ||||
|           <colorrole role="ToolTipBase"> | ||||
|            <brush brushstyle="SolidPattern"> | ||||
|             <color alpha="255"> | ||||
|              <red>255</red> | ||||
|              <green>255</green> | ||||
|              <blue>220</blue> | ||||
|             </color> | ||||
|            </brush> | ||||
|           </colorrole> | ||||
|           <colorrole role="ToolTipText"> | ||||
|            <brush brushstyle="SolidPattern"> | ||||
|             <color alpha="255"> | ||||
|              <red>0</red> | ||||
|              <green>0</green> | ||||
|              <blue>0</blue> | ||||
|             </color> | ||||
|            </brush> | ||||
|           </colorrole> | ||||
|          </inactive> | ||||
|          <disabled> | ||||
|           <colorrole role="WindowText"> | ||||
|            <brush brushstyle="SolidPattern"> | ||||
|             <color alpha="255"> | ||||
|              <red>255</red> | ||||
|              <green>255</green> | ||||
|              <blue>255</blue> | ||||
|             </color> | ||||
|            </brush> | ||||
|           </colorrole> | ||||
|           <colorrole role="Button"> | ||||
|            <brush brushstyle="SolidPattern"> | ||||
|             <color alpha="255"> | ||||
|              <red>53</red> | ||||
|              <green>52</green> | ||||
|              <blue>50</blue> | ||||
|             </color> | ||||
|            </brush> | ||||
|           </colorrole> | ||||
|           <colorrole role="Light"> | ||||
|            <brush brushstyle="SolidPattern"> | ||||
|             <color alpha="255"> | ||||
|              <red>79</red> | ||||
|              <green>78</green> | ||||
|              <blue>75</blue> | ||||
|             </color> | ||||
|            </brush> | ||||
|           </colorrole> | ||||
|           <colorrole role="Midlight"> | ||||
|            <brush brushstyle="SolidPattern"> | ||||
|             <color alpha="255"> | ||||
|              <red>66</red> | ||||
|              <green>65</green> | ||||
|              <blue>62</blue> | ||||
|             </color> | ||||
|            </brush> | ||||
|           </colorrole> | ||||
|           <colorrole role="Dark"> | ||||
|            <brush brushstyle="SolidPattern"> | ||||
|             <color alpha="255"> | ||||
|              <red>26</red> | ||||
|              <green>26</green> | ||||
|              <blue>25</blue> | ||||
|             </color> | ||||
|            </brush> | ||||
|           </colorrole> | ||||
|           <colorrole role="Mid"> | ||||
|            <brush brushstyle="SolidPattern"> | ||||
|             <color alpha="255"> | ||||
|              <red>35</red> | ||||
|              <green>34</green> | ||||
|              <blue>33</blue> | ||||
|             </color> | ||||
|            </brush> | ||||
|           </colorrole> | ||||
|           <colorrole role="Text"> | ||||
|            <brush brushstyle="SolidPattern"> | ||||
|             <color alpha="255"> | ||||
|              <red>212</red> | ||||
|              <green>212</green> | ||||
|              <blue>205</blue> | ||||
|             </color> | ||||
|            </brush> | ||||
|           </colorrole> | ||||
|           <colorrole role="BrightText"> | ||||
|            <brush brushstyle="SolidPattern"> | ||||
|             <color alpha="255"> | ||||
|              <red>255</red> | ||||
|              <green>255</green> | ||||
|              <blue>255</blue> | ||||
|             </color> | ||||
|            </brush> | ||||
|           </colorrole> | ||||
|           <colorrole role="ButtonText"> | ||||
|            <brush brushstyle="SolidPattern"> | ||||
|             <color alpha="255"> | ||||
|              <red>212</red> | ||||
|              <green>212</green> | ||||
|              <blue>205</blue> | ||||
|             </color> | ||||
|            </brush> | ||||
|           </colorrole> | ||||
|           <colorrole role="Base"> | ||||
|            <brush brushstyle="SolidPattern"> | ||||
|             <color alpha="255"> | ||||
|              <red>53</red> | ||||
|              <green>52</green> | ||||
|              <blue>50</blue> | ||||
|             </color> | ||||
|            </brush> | ||||
|           </colorrole> | ||||
|           <colorrole role="Window"> | ||||
|            <brush brushstyle="SolidPattern"> | ||||
|             <color alpha="255"> | ||||
|              <red>53</red> | ||||
|              <green>52</green> | ||||
|              <blue>50</blue> | ||||
|             </color> | ||||
|            </brush> | ||||
|           </colorrole> | ||||
|           <colorrole role="Shadow"> | ||||
|            <brush brushstyle="SolidPattern"> | ||||
|             <color alpha="255"> | ||||
|              <red>0</red> | ||||
|              <green>0</green> | ||||
|              <blue>0</blue> | ||||
|             </color> | ||||
|            </brush> | ||||
|           </colorrole> | ||||
|           <colorrole role="AlternateBase"> | ||||
|            <brush brushstyle="SolidPattern"> | ||||
|             <color alpha="255"> | ||||
|              <red>53</red> | ||||
|              <green>52</green> | ||||
|              <blue>50</blue> | ||||
|             </color> | ||||
|            </brush> | ||||
|           </colorrole> | ||||
|           <colorrole role="ToolTipBase"> | ||||
|            <brush brushstyle="SolidPattern"> | ||||
|             <color alpha="255"> | ||||
|              <red>255</red> | ||||
|              <green>255</green> | ||||
|              <blue>220</blue> | ||||
|             </color> | ||||
|            </brush> | ||||
|           </colorrole> | ||||
|           <colorrole role="ToolTipText"> | ||||
|            <brush brushstyle="SolidPattern"> | ||||
|             <color alpha="255"> | ||||
|              <red>0</red> | ||||
|              <green>0</green> | ||||
|              <blue>0</blue> | ||||
|             </color> | ||||
|            </brush> | ||||
|           </colorrole> | ||||
|          </disabled> | ||||
|         </palette> | ||||
|        <property name="minimumSize"> | ||||
|         <size> | ||||
|          <width>0</width> | ||||
|          <height>200</height> | ||||
|         </size> | ||||
|        </property> | ||||
|       </widget> | ||||
|      </item> | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user