From 043cc2c3d96a6270ac4d664911ffaa54f06db925 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 22 Jul 2012 16:10:47 -0500
Subject: Fix a number of problems and streamline instrument parts

---
 clients/tde/src/part/scope/layout.ui | 255 ++++++++++++++++-------------------
 1 file changed, 117 insertions(+), 138 deletions(-)

(limited to 'clients/tde/src/part/scope/layout.ui')

diff --git a/clients/tde/src/part/scope/layout.ui b/clients/tde/src/part/scope/layout.ui
index a104177..dfde26b 100644
--- a/clients/tde/src/part/scope/layout.ui
+++ b/clients/tde/src/part/scope/layout.ui
@@ -16,163 +16,142 @@
 			<property name="name">
 				<cstring>unnamed</cstring>
 			</property>
-			<widget class="TQTabWidget" row="0" column="0">
+			<widget class="TQGroupBox" row="0" column="0">
 				<property name="name">
-					<cstring>TabWidget2</cstring>
+					<cstring>groupOscilloscope</cstring>
 				</property>
-				<property name="enabled">
-					<bool>true</bool>
+				<property name="title">
+					<string>Oscilloscope</string>
 				</property>
-				<widget class="TQWidget">
+				<grid>
 					<property name="name">
-						<cstring>tab</cstring>
+						<cstring>unnamed</cstring>
 					</property>
-					<attribute name="title">
-						<string>Oscilloscope</string>
-					</attribute>
-					<grid>
+					<widget class="TQGroupBox" row="0" column="0" rowspan="10">
 						<property name="name">
-							<cstring>unnamed</cstring>
+							<cstring>groupOscilloscopeView</cstring>
 						</property>
-						<widget class="TQGroupBox" row="0" column="0">
+						<property name="title">
+							<string>Trace Viewer</string>
+						</property>
+						<property name="sizePolicy">
+							<sizepolicy>
+								<hsizetype>7</hsizetype>
+								<vsizetype>7</vsizetype>
+								<horstretch>1</horstretch>
+								<verstretch>1</verstretch>
+							</sizepolicy>
+						</property>
+						<grid>
 							<property name="name">
-								<cstring>groupOscilloscope</cstring>
-							</property>
-							<property name="title">
-								<string>Oscilloscope</string>
+								<cstring>unnamed</cstring>
 							</property>
-							<grid>
+							<widget class="TQSplitter" row="0" column="0" colspan="1">
 								<property name="name">
-									<cstring>unnamed</cstring>
+									<cstring>splitter1</cstring>
 								</property>
-								<widget class="TQGroupBox" row="0" column="0" rowspan="10">
-									<property name="name">
-										<cstring>groupOscilloscopeView</cstring>
-									</property>
-									<property name="title">
-										<string>Trace Viewer</string>
-									</property>
-									<property name="sizePolicy">
-										<sizepolicy>
-											<hsizetype>7</hsizetype>
-											<vsizetype>7</vsizetype>
-											<horstretch>1</horstretch>
-											<verstretch>1</verstretch>
-										</sizepolicy>
-									</property>
-									<grid>
-										<property name="name">
-											<cstring>unnamed</cstring>
-										</property>
-										<widget class="TQSplitter" row="0" column="0" colspan="1">
-											<property name="name">
-												<cstring>splitter1</cstring>
-											</property>
-											<property name="orientation">
-												<enum>Vertical</enum>
-											</property>
-											<widget class="TraceWidget" row="0" column="0" colspan="1">
-												<property name="name">
-													<cstring>traceWidget</cstring>
-												</property>
-												<property name="minimumSize">
-													<size>
-														<width>0</width>
-														<height>0</height>
-													</size>
-												</property>
-											</widget>
-											<widget class="TraceWidget" row="1" column="0" colspan="1">
-												<property name="name">
-													<cstring>traceZoomWidget</cstring>
-												</property>
-												<property name="minimumSize">
-													<size>
-														<width>0</width>
-														<height>0</height>
-													</size>
-												</property>
-											</widget>
-										</widget>
-									</grid>
-								</widget>
-								<widget class="TQGroupBox" row="0" column="1">
+								<property name="orientation">
+									<enum>Vertical</enum>
+								</property>
+								<widget class="TraceWidget" row="0" column="0" colspan="1">
 									<property name="name">
-										<cstring>groupOscilloscopeCaptureControls</cstring>
+										<cstring>traceWidget</cstring>
 									</property>
-									<property name="title">
-										<string>Capture Controls</string>
+									<property name="minimumSize">
+										<size>
+											<width>0</width>
+											<height>0</height>
+										</size>
 									</property>
-									<grid>
-										<widget class="TQPushButton" row="0" column="0" colspan="1">
-											<property name="name">
-												<cstring>runControlStartButton</cstring>
-											</property>
-											<property name="text">
-												<string>Run</string>
-											</property>
-										</widget>
-										<widget class="TQPushButton" row="0" column="1" colspan="1">
-											<property name="name">
-												<cstring>runControlStopButton</cstring>
-											</property>
-											<property name="text">
-												<string>Stop</string>
-											</property>
-										</widget>
-										<widget class="TQWidget" row="1" column="0" colspan="2">
-											<property name="name">
-												<cstring>traceControlLayoutWidget</cstring>
-											</property>
-										</widget>
-									</grid>
 								</widget>
-								<widget class="TQGroupBox" row="1" column="1">
+								<widget class="TraceWidget" row="1" column="0" colspan="1">
 									<property name="name">
-										<cstring>groupOscilloscopeAcquisitionControls</cstring>
+										<cstring>traceZoomWidget</cstring>
 									</property>
-									<property name="title">
-										<string>Acquisition Controls</string>
+									<property name="minimumSize">
+										<size>
+											<width>0</width>
+											<height>0</height>
+										</size>
 									</property>
-									<grid>
-										<widget class="TQPushButton" row="0" column="0" colspan="1">
-											<property name="name">
-												<cstring>acqStart</cstring>
-											</property>
-											<property name="text">
-												<string>Start Acquisition</string>
-											</property>
-										</widget>
-										<widget class="TQPushButton" row="0" column="1" colspan="1">
-											<property name="name">
-												<cstring>acqStop</cstring>
-											</property>
-											<property name="text">
-												<string>Stop Acquisition</string>
-											</property>
-										</widget>
-										<widget class="TQPushButton" row="1" column="0" colspan="1">
-											<property name="name">
-												<cstring>waveformSave</cstring>
-											</property>
-											<property name="text">
-												<string>Save Waveforms</string>
-											</property>
-										</widget>
-										<widget class="TQPushButton" row="1" column="1" colspan="1">
-											<property name="name">
-												<cstring>waveformRecall</cstring>
-											</property>
-											<property name="text">
-												<string>Recall Waveforms</string>
-											</property>
-										</widget>
-									</grid>
 								</widget>
-							</grid>
-						</widget>
-					</grid>
-				</widget>
+							</widget>
+						</grid>
+					</widget>
+					<widget class="TQGroupBox" row="0" column="1">
+						<property name="name">
+							<cstring>groupOscilloscopeCaptureControls</cstring>
+						</property>
+						<property name="title">
+							<string>Capture Controls</string>
+						</property>
+						<grid>
+							<widget class="TQPushButton" row="0" column="0" colspan="1">
+								<property name="name">
+									<cstring>runControlStartButton</cstring>
+								</property>
+								<property name="text">
+									<string>Run</string>
+								</property>
+							</widget>
+							<widget class="TQPushButton" row="0" column="1" colspan="1">
+								<property name="name">
+									<cstring>runControlStopButton</cstring>
+								</property>
+								<property name="text">
+									<string>Stop</string>
+								</property>
+							</widget>
+							<widget class="TQWidget" row="1" column="0" colspan="2">
+								<property name="name">
+									<cstring>traceControlLayoutWidget</cstring>
+								</property>
+							</widget>
+						</grid>
+					</widget>
+					<widget class="TQGroupBox" row="1" column="1">
+						<property name="name">
+							<cstring>groupOscilloscopeAcquisitionControls</cstring>
+						</property>
+						<property name="title">
+							<string>Acquisition Controls</string>
+						</property>
+						<grid>
+							<widget class="TQPushButton" row="0" column="0" colspan="1">
+								<property name="name">
+									<cstring>acqStart</cstring>
+								</property>
+								<property name="text">
+									<string>Start Acquisition</string>
+								</property>
+							</widget>
+							<widget class="TQPushButton" row="0" column="1" colspan="1">
+								<property name="name">
+									<cstring>acqStop</cstring>
+								</property>
+								<property name="text">
+									<string>Stop Acquisition</string>
+								</property>
+							</widget>
+							<widget class="TQPushButton" row="1" column="0" colspan="1">
+								<property name="name">
+									<cstring>waveformSave</cstring>
+								</property>
+								<property name="text">
+									<string>Save Waveforms</string>
+								</property>
+							</widget>
+							<widget class="TQPushButton" row="1" column="1" colspan="1">
+								<property name="name">
+									<cstring>waveformRecall</cstring>
+								</property>
+								<property name="text">
+									<string>Recall Waveforms</string>
+								</property>
+							</widget>
+						</grid>
+					</widget>
+				</grid>
 			</widget>
 		</grid>
 	</widget>
-- 
cgit v1.2.1