-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #27 from floripasat/dev
Updating the "Uplink" tab in the preferences dialog
- Loading branch information
Showing
4 changed files
with
70 additions
and
240 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7356,7 +7356,7 @@ Gabriel Mariano Marcelino <[email protected]></property> | |
| <property name="visible">True</property> | ||
| <property name="can_focus">True</property> | ||
| <property name="hexpand">True</property> | ||
| <property name="text" translatable="yes">437.9e6</property> | ||
| <property name="text" translatable="yes">436.1e6</property> | ||
| </object> | ||
| <packing> | ||
| <property name="left_attach">1</property> | ||
|
|
@@ -7440,241 +7440,85 @@ Gabriel Mariano Marcelino <[email protected]></property> | |
| </packing> | ||
| </child> | ||
| <child> | ||
| <object class="GtkBox" id="box31"> | ||
| <object class="GtkGrid"> | ||
| <property name="visible">True</property> | ||
| <property name="can_focus">False</property> | ||
| <property name="margin_left">10</property> | ||
| <property name="margin_right">10</property> | ||
| <property name="margin_top">10</property> | ||
| <property name="margin_bottom">10</property> | ||
| <property name="orientation">vertical</property> | ||
| <property name="spacing">10</property> | ||
| <child> | ||
| <object class="GtkLabel" id="label126"> | ||
| <property name="visible">True</property> | ||
| <property name="can_focus">False</property> | ||
| <property name="halign">start</property> | ||
| <property name="label" translatable="yes">Packets</property> | ||
| <attributes> | ||
| <attribute name="weight" value="heavy"/> | ||
| </attributes> | ||
| </object> | ||
| <packing> | ||
| <property name="expand">False</property> | ||
| <property name="fill">True</property> | ||
| <property name="position">0</property> | ||
| </packing> | ||
| </child> | ||
| <child> | ||
| <object class="GtkBox" id="box50"> | ||
| <property name="visible">True</property> | ||
| <property name="can_focus">False</property> | ||
| <property name="margin_left">20</property> | ||
| <property name="spacing">5</property> | ||
| <child> | ||
| <object class="GtkLabel" id="label116"> | ||
| <property name="visible">True</property> | ||
| <property name="can_focus">False</property> | ||
| <property name="halign">start</property> | ||
| <property name="label" translatable="yes">Quantity:</property> | ||
| </object> | ||
| <packing> | ||
| <property name="expand">False</property> | ||
| <property name="fill">True</property> | ||
| <property name="position">0</property> | ||
| </packing> | ||
| </child> | ||
| <child> | ||
| <object class="GtkEntry" id="entry_config_uplink_burst"> | ||
| <property name="visible">True</property> | ||
| <property name="can_focus">True</property> | ||
| <property name="hexpand">True</property> | ||
| <property name="text" translatable="yes">1</property> | ||
| </object> | ||
| <packing> | ||
| <property name="expand">False</property> | ||
| <property name="fill">True</property> | ||
| <property name="position">1</property> | ||
| </packing> | ||
| </child> | ||
| </object> | ||
| <packing> | ||
| <property name="expand">False</property> | ||
| <property name="fill">True</property> | ||
| <property name="position">1</property> | ||
| </packing> | ||
| </child> | ||
| <property name="row_spacing">10</property> | ||
| <property name="column_spacing">10</property> | ||
| <child> | ||
| <object class="GtkLabel" id="label120"> | ||
| <object class="GtkLabel" id="label116"> | ||
| <property name="visible">True</property> | ||
| <property name="can_focus">False</property> | ||
| <property name="halign">start</property> | ||
| <property name="label" translatable="yes">Telemetry</property> | ||
| <attributes> | ||
| <attribute name="weight" value="heavy"/> | ||
| </attributes> | ||
| <property name="label" translatable="yes">Packets per transmission:</property> | ||
| </object> | ||
| <packing> | ||
| <property name="expand">False</property> | ||
| <property name="fill">True</property> | ||
| <property name="position">2</property> | ||
| <property name="left_attach">0</property> | ||
| <property name="top_attach">0</property> | ||
| </packing> | ||
| </child> | ||
| <child> | ||
| <object class="GtkBox" id="box49"> | ||
| <object class="GtkEntry" id="entry_config_uplink_burst"> | ||
| <property name="visible">True</property> | ||
| <property name="can_focus">False</property> | ||
| <property name="margin_left">20</property> | ||
| <property name="spacing">5</property> | ||
| <child> | ||
| <object class="GtkLabel" id="label114"> | ||
| <property name="visible">True</property> | ||
| <property name="can_focus">False</property> | ||
| <property name="halign">start</property> | ||
| <property name="label" translatable="yes">Frequency [Hz]:</property> | ||
| </object> | ||
| <packing> | ||
| <property name="expand">False</property> | ||
| <property name="fill">True</property> | ||
| <property name="position">0</property> | ||
| </packing> | ||
| </child> | ||
| <child> | ||
| <object class="GtkEntry" id="entry_config_uplink_telemetry_frequency"> | ||
| <property name="visible">True</property> | ||
| <property name="can_focus">True</property> | ||
| <property name="hexpand">True</property> | ||
| <property name="text" translatable="yes">437.9318e6</property> | ||
| </object> | ||
| <packing> | ||
| <property name="expand">False</property> | ||
| <property name="fill">True</property> | ||
| <property name="position">1</property> | ||
| </packing> | ||
| </child> | ||
| <property name="can_focus">True</property> | ||
| <property name="hexpand">True</property> | ||
| <property name="text" translatable="yes">1</property> | ||
| </object> | ||
| <packing> | ||
| <property name="expand">False</property> | ||
| <property name="fill">True</property> | ||
| <property name="position">3</property> | ||
| <property name="left_attach">1</property> | ||
| <property name="top_attach">0</property> | ||
| </packing> | ||
| </child> | ||
| <child> | ||
| <object class="GtkLabel" id="label122"> | ||
| <object class="GtkLabel" id="label114"> | ||
| <property name="visible">True</property> | ||
| <property name="can_focus">False</property> | ||
| <property name="halign">start</property> | ||
| <property name="label" translatable="yes">Beacon</property> | ||
| <attributes> | ||
| <attribute name="weight" value="heavy"/> | ||
| </attributes> | ||
| <property name="label" translatable="yes">Frequency [Hz]:</property> | ||
| </object> | ||
| <packing> | ||
| <property name="expand">False</property> | ||
| <property name="fill">True</property> | ||
| <property name="position">4</property> | ||
| <property name="left_attach">0</property> | ||
| <property name="top_attach">1</property> | ||
| </packing> | ||
| </child> | ||
| <child> | ||
| <object class="GtkBox" id="box48"> | ||
| <object class="GtkEntry" id="entry_config_uplink_frequency"> | ||
| <property name="visible">True</property> | ||
| <property name="can_focus">False</property> | ||
| <property name="margin_left">20</property> | ||
| <property name="spacing">5</property> | ||
| <child> | ||
| <object class="GtkLabel" id="label124"> | ||
| <property name="visible">True</property> | ||
| <property name="can_focus">False</property> | ||
| <property name="halign">start</property> | ||
| <property name="label" translatable="yes">Frequency [Hz]:</property> | ||
| </object> | ||
| <packing> | ||
| <property name="expand">False</property> | ||
| <property name="fill">True</property> | ||
| <property name="position">0</property> | ||
| </packing> | ||
| </child> | ||
| <child> | ||
| <object class="GtkEntry" id="entry_config_uplink_beacon_frequency"> | ||
| <property name="visible">True</property> | ||
| <property name="can_focus">True</property> | ||
| <property name="hexpand">True</property> | ||
| <property name="text" translatable="yes">145.911e6</property> | ||
| </object> | ||
| <packing> | ||
| <property name="expand">False</property> | ||
| <property name="fill">True</property> | ||
| <property name="position">1</property> | ||
| </packing> | ||
| </child> | ||
| <property name="can_focus">True</property> | ||
| <property name="hexpand">True</property> | ||
| <property name="text" translatable="yes">436.1e6</property> | ||
| </object> | ||
| <packing> | ||
| <property name="expand">False</property> | ||
| <property name="fill">True</property> | ||
| <property name="position">5</property> | ||
| <property name="left_attach">1</property> | ||
| <property name="top_attach">1</property> | ||
| </packing> | ||
| </child> | ||
| <child> | ||
| <object class="GtkLabel" id="label132"> | ||
| <object class="GtkLabel" id="label124"> | ||
| <property name="visible">True</property> | ||
| <property name="can_focus">False</property> | ||
| <property name="halign">start</property> | ||
| <property name="label" translatable="yes">Shutdown Command</property> | ||
| <attributes> | ||
| <attribute name="weight" value="heavy"/> | ||
| </attributes> | ||
| <property name="label" translatable="yes">Baudrate [bps]:</property> | ||
| </object> | ||
| <packing> | ||
| <property name="expand">False</property> | ||
| <property name="fill">True</property> | ||
| <property name="position">6</property> | ||
| <property name="left_attach">0</property> | ||
| <property name="top_attach">2</property> | ||
| </packing> | ||
| </child> | ||
| <child> | ||
| <object class="GtkBox" id="box30"> | ||
| <object class="GtkEntry" id="entry_config_uplink_baudrate"> | ||
| <property name="visible">True</property> | ||
| <property name="can_focus">False</property> | ||
| <property name="margin_left">20</property> | ||
| <property name="orientation">vertical</property> | ||
| <property name="spacing">10</property> | ||
| <child> | ||
| <object class="GtkRadioButton" id="radiobutton_config_uplink_type_telemetry"> | ||
| <property name="label" translatable="yes">Through telemetry</property> | ||
| <property name="visible">True</property> | ||
| <property name="can_focus">True</property> | ||
| <property name="receives_default">False</property> | ||
| <property name="xalign">0</property> | ||
| <property name="active">True</property> | ||
| <property name="draw_indicator">True</property> | ||
| </object> | ||
| <packing> | ||
| <property name="expand">False</property> | ||
| <property name="fill">True</property> | ||
| <property name="position">0</property> | ||
| </packing> | ||
| </child> | ||
| <child> | ||
| <object class="GtkRadioButton" id="radiobutton_config_uplink_type_beacon"> | ||
| <property name="label" translatable="yes">Through beacon</property> | ||
| <property name="visible">True</property> | ||
| <property name="can_focus">True</property> | ||
| <property name="receives_default">False</property> | ||
| <property name="xalign">0</property> | ||
| <property name="active">True</property> | ||
| <property name="draw_indicator">True</property> | ||
| <property name="group">radiobutton_config_uplink_type_telemetry</property> | ||
| </object> | ||
| <packing> | ||
| <property name="expand">False</property> | ||
| <property name="fill">True</property> | ||
| <property name="position">1</property> | ||
| </packing> | ||
| </child> | ||
| <property name="can_focus">True</property> | ||
| <property name="hexpand">True</property> | ||
| <property name="text" translatable="yes">2400</property> | ||
| </object> | ||
| <packing> | ||
| <property name="expand">False</property> | ||
| <property name="fill">True</property> | ||
| <property name="position">7</property> | ||
| <property name="left_attach">1</property> | ||
| <property name="top_attach">2</property> | ||
| </packing> | ||
| </child> | ||
| </object> | ||
|
|
||
Oops, something went wrong.