Skip to content

Commit

Permalink
integrate changes from simulator branch but disable simulator for now
Browse files Browse the repository at this point in the history 
The simulator is not yet ready for usage but the changes on the
architecture are valueable for the master branch.
Therefore, I merged the branch with the following addition:
 * Close the Simulator Tab whenever the program starts
  • Loading branch information
@jopohl
jopohl committed Jan 30, 2018
1 parent 34ad31e commit fd933ed
Show file tree
Hide file tree
Showing 132 changed files with 11,212 additions and 60,428 deletions.
19 changes: 19 additions & 0 deletions data/ui/main.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,25 @@ image: url(:/icons/icons/splitter_handle_vertical.svg);
</property>
</layout>
</widget>
<widget class="QWidget" name="tab_simulator">
<attribute name="title">
<string>Simulator</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_7">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
</layout>
</widget>
</widget>
</widget>
</item>
Expand Down
253 changes: 253 additions & 0 deletions data/ui/modulation_settings_widget.ui
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,253 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ModulationSettings</class>
<widget class="QWidget" name="ModulationSettings">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>821</width>
<height>635</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QGroupBox" name="groupBoxSniffSettings">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="styleSheet">
<string notr="true">QGroupBox
{
border: none;
}

QGroupBox::title {
subcontrol-origin: margin;
}
QGroupBox::indicator:unchecked {
image: url(:/icons/icons/collapse.svg)
}
QGroupBox::indicator:checked {
image: url(:/icons/icons/uncollapse.svg)
}</string>
</property>
<property name="title">
<string>Modulation settings</string>
</property>
<property name="flat">
<bool>true</bool>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<property name="topMargin">
<number>15</number>
</property>
<item row="0" column="0">
<widget class="QFrame" name="frame">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="lineWidth">
<number>0</number>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QLabel" name="labelModulationProfile">
<property name="text">
<string>Choose profile:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="comboBoxModulationProfiles"/>
</item>
<item>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="3">
<widget class="QLabel" name="labelBitLength">
<property name="text">
<string>Bit Length:</string>
</property>
</widget>
</item>
<item row="1" column="7">
<widget class="QLabel" name="labelParamOneValue">
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="labelCarrierFrequencyValue">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="labelModulationType">
<property name="text">
<string>Modulation type:</string>
</property>
</widget>
</item>
<item row="0" column="4">
<widget class="QLabel" name="labelBitLengthValue">
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
<item row="1" column="6">
<widget class="QLabel" name="labelParamOne">
<property name="text">
<string>Param for 1:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="labelModulationTypeValue">
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
<item row="0" column="2" rowspan="2">
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="labelCarrierFrequency">
<property name="text">
<string>Carrier Frequency:</string>
</property>
</widget>
</item>
<item row="0" column="5" rowspan="2">
<widget class="Line" name="line_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</widget>
</item>
<item row="0" column="6">
<widget class="QLabel" name="labelParamZero">
<property name="text">
<string>Param for 0:</string>
</property>
</widget>
</item>
<item row="0" column="7">
<widget class="QLabel" name="labelParamZeroValue">
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QLabel" name="labelSampleRate">
<property name="text">
<string>Sample Rate:</string>
</property>
</widget>
</item>
<item row="1" column="4">
<widget class="QLabel" name="labelSampleRateValue">
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QPushButton" name="btnConfigurationDialog">
<property name="text">
<string>Open modulation configuration dialog...</string>
</property>
<property name="icon">
<iconset theme="configure"/>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<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>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<tabstops>
<tabstop>groupBoxSniffSettings</tabstop>
<tabstop>comboBoxModulationProfiles</tabstop>
<tabstop>btnConfigurationDialog</tabstop>
</tabstops>
<resources>
<include location="urh.qrc"/>
</resources>
<connections>
<connection>
<sender>groupBoxSniffSettings</sender>
<signal>toggled(bool)</signal>
<receiver>frame</receiver>
<slot>setVisible(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>33</x>
<y>10</y>
</hint>
<hint type="destinationlabel">
<x>18</x>
<y>53</y>
</hint>
</hints>
</connection>
</connections>
</ui>
Loading

0 comments on commit fd933ed

Please sign in to comment.