[moserial] Fix deprecated objects for use with GTK v3.2.0
- From: Michael J. Chudobiak <mjc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [moserial] Fix deprecated objects for use with GTK v3.2.0
- Date: Sat, 16 Jan 2021 13:35:25 +0000 (UTC)
commit 74cc9cd17cf530151193139a8fca27464e0a8975
Author: Mictronics <github mictronics de>
Date: Sat Apr 25 16:10:24 2020 +0200
Fix deprecated objects for use with GTK v3.2.0
data/ui/mainwindow.ui | 65 ++++++++---------
data/ui/preferences.ui | 41 +++++------
data/ui/receive_chooser.ui | 8 ++-
data/ui/receive_progress.ui | 10 ++-
data/ui/record_dialog.ui | 8 ++-
data/ui/send_chooser_dialog.ui | 8 ++-
data/ui/send_progress_dialog.ui | 10 ++-
data/ui/settings_dialog.ui | 143 +++++++++++++++-----------------------
data/ui/xmodem_filename_dialog.ui | 9 ++-
9 files changed, 144 insertions(+), 158 deletions(-)
---
diff --git a/data/ui/mainwindow.ui b/data/ui/mainwindow.ui
index 63eaf50..703276f 100644
--- a/data/ui/mainwindow.ui
+++ b/data/ui/mainwindow.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
<interface>
- <requires lib="gtk+" version="2.16"/>
+ <requires lib="gtk+" version="3.20"/>
<object class="GtkAccelGroup" id="accelgroup1"/>
<object class="GtkWindow" id="window">
<property name="can_focus">False</property>
@@ -9,9 +10,13 @@
<property name="default_height">477</property>
<property name="icon_name">moserial</property>
<child>
- <object class="GtkVBox" id="vbox1">
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkBox" id="vbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkMenuBar" id="menubar">
<property name="visible">True</property>
@@ -20,7 +25,6 @@
<object class="GtkMenuItem" id="menuitem1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_File</property>
<property name="use_underline">True</property>
<child type="submenu">
@@ -32,7 +36,6 @@
<property name="label">Open Settings</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">False</property>
<property name="always_show_image">True</property>
</object>
@@ -41,7 +44,6 @@
<object class="GtkMenuItem" id="menubar_open_recent">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Open _Recent</property>
<property name="use_underline">True</property>
</object>
@@ -57,7 +59,6 @@
<property name="label">Save Settings</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">False</property>
<property name="always_show_image">True</property>
</object>
@@ -67,7 +68,6 @@
<property name="label">Save Settings As</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">False</property>
<property name="always_show_image">True</property>
</object>
@@ -83,7 +83,6 @@
<property name="label">gtk-quit</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
@@ -98,7 +97,6 @@
<object class="GtkMenuItem" id="menubar_edit">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_Edit</property>
<property name="use_underline">True</property>
<child type="submenu">
@@ -110,7 +108,6 @@
<property name="label">gtk-cut</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
@@ -122,7 +119,6 @@
<property name="label">gtk-copy</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
@@ -134,7 +130,6 @@
<property name="label">gtk-paste</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
@@ -152,12 +147,11 @@
<property name="label">gtk-clear</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
<property name="always_show_image">True</property>
- <accelerator key="l" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+ <accelerator key="l" signal="activate" modifiers="GDK_CONTROL_MASK"/>
</object>
</child>
</object>
@@ -168,7 +162,6 @@
<object class="GtkMenuItem" id="menuitem4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_Help</property>
<property name="use_underline">True</property>
<child type="submenu">
@@ -180,7 +173,6 @@
<property name="label">gtk-about</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
@@ -192,7 +184,6 @@
<property name="label">gtk-help</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
@@ -221,7 +212,6 @@
<object class="GtkToggleToolButton" id="toolbar_connect">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="is_important">True</property>
<property name="label" translatable="yes">Connect</property>
<property name="use_underline">True</property>
@@ -246,7 +236,6 @@
<object class="GtkToggleToolButton" id="toolbar_logging">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="is_important">True</property>
<property name="label" translatable="yes">Record</property>
<property name="use_underline">True</property>
@@ -261,7 +250,6 @@
<object class="GtkToolButton" id="toolbar_send">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="is_important">True</property>
<property name="label" translatable="yes">Send File</property>
<property name="use_underline">True</property>
@@ -276,7 +264,6 @@
<object class="GtkToolButton" id="toolbar_receive">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="is_important">True</property>
<property name="label" translatable="yes">Receive File</property>
<property name="use_underline">True</property>
@@ -301,7 +288,6 @@
<object class="GtkToolButton" id="toolbar_settings">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="is_important">True</property>
<property name="label" translatable="yes">Port Setup</property>
<property name="use_underline">True</property>
@@ -316,7 +302,6 @@
<object class="GtkToolButton" id="toolbar_preferences">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="is_important">True</property>
<property name="label" translatable="yes">Preferences</property>
<property name="use_underline">True</property>
@@ -334,13 +319,13 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
<object class="GtkToolButton" id="toolbar_help">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="is_important">True</property>
<property name="label" translatable="yes">Help</property>
<property name="use_underline">True</property>
@@ -359,9 +344,10 @@
</packing>
</child>
<child>
- <object class="GtkVPaned" id="vpaned">
+ <object class="GtkPaned" id="vpaned">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="orientation">vertical</property>
<property name="position">50</property>
<child>
<object class="GtkNotebook" id="incoming_notebook">
@@ -511,16 +497,17 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="vbox4">
+ <object class="GtkBox" id="vbox4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">4</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="label14">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Outgoing</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="style" value="italic"/>
</attributes>
@@ -532,7 +519,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox2">
+ <object class="GtkBox" id="hbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -554,7 +541,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -600,7 +586,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox5">
+ <object class="GtkBox" id="hbox5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -640,16 +626,25 @@
<object class="GtkWindow" id="window1">
<property name="can_focus">False</property>
<child>
- <object class="GtkTable" id="table3">
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkGrid" id="table3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">4</property>
+ <property name="orientation">vertical</property>
+ <property name="row_homogeneous">True</property>
+ <property name="column_homogeneous">True</property>
<child>
<object class="GtkLabel" id="disconnect_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Disconnect</property>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
</child>
<child>
<object class="GtkLabel" id="connect_label">
@@ -658,8 +653,8 @@
<property name="label" translatable="yes">Connect</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
</packing>
</child>
<child>
@@ -669,8 +664,8 @@
<property name="label" translatable="yes">Record</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
</packing>
</child>
<child>
@@ -680,8 +675,8 @@
<property name="label" translatable="yes">Stop Recording</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
</packing>
</child>
</object>
diff --git a/data/ui/preferences.ui b/data/ui/preferences.ui
index af916de..292f630 100644
--- a/data/ui/preferences.ui
+++ b/data/ui/preferences.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
<interface>
- <requires lib="gtk+" version="2.16"/>
+ <requires lib="gtk+" version="3.20"/>
<object class="GtkDialog" id="preferences_dialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>
@@ -8,6 +9,9 @@
<property name="window_position">center-on-parent</property>
<property name="icon_name">gtk-preferences</property>
<property name="type_hint">dialog</property>
+ <child>
+ <placeholder/>
+ </child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox16">
<property name="visible">True</property>
@@ -25,7 +29,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -40,7 +43,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -58,21 +60,23 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="vbox5">
+ <object class="GtkBox" id="vbox5">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">18</property>
<child>
- <object class="GtkVBox" id="vbox6">
+ <object class="GtkBox" id="vbox6">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label9">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Font</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -84,9 +88,10 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="vbox7">
+ <object class="GtkBox" id="vbox7">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="preferences_use_system_font">
@@ -94,7 +99,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -106,7 +110,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox10">
+ <object class="GtkBox" id="hbox10">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">12</property>
@@ -128,7 +132,7 @@
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
+ <property name="font">Sans 12</property>
</object>
<packing>
<property name="expand">True</property>
@@ -144,7 +148,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox9">
+ <object class="GtkBox" id="hbox9">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
@@ -165,7 +169,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -190,7 +193,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -215,7 +217,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -245,16 +246,17 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="vbox8">
+ <object class="GtkBox" id="vbox8">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label10">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Recording</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -266,9 +268,10 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="vbox9">
+ <object class="GtkBox" id="vbox9">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="preferences_record_launch">
@@ -276,7 +279,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -295,7 +297,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox8">
+ <object class="GtkBox" id="hbox8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -304,7 +306,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
diff --git a/data/ui/receive_chooser.ui b/data/ui/receive_chooser.ui
index cb95f25..58b4bb2 100644
--- a/data/ui/receive_chooser.ui
+++ b/data/ui/receive_chooser.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
<interface>
- <requires lib="gtk+" version="2.16"/>
+ <requires lib="gtk+" version="3.20"/>
<object class="GtkFileChooserDialog" id="receive_chooser_dialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>
@@ -9,6 +10,9 @@
<property name="type_hint">dialog</property>
<property name="action">select-folder</property>
<property name="local_only">False</property>
+ <child>
+ <placeholder/>
+ </child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox10">
<property name="visible">True</property>
@@ -35,7 +39,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox4">
+ <object class="GtkBox" id="hbox4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
diff --git a/data/ui/receive_progress.ui b/data/ui/receive_progress.ui
index 94cb18c..6c0c3cb 100644
--- a/data/ui/receive_progress.ui
+++ b/data/ui/receive_progress.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
<interface>
- <requires lib="gtk+" version="2.16"/>
+ <requires lib="gtk+" version="3.20"/>
<object class="GtkDialog" id="receive_progress_dialog">
<property name="width_request">640</property>
<property name="can_focus">False</property>
@@ -9,6 +10,9 @@
<property name="modal">True</property>
<property name="window_position">center-on-parent</property>
<property name="type_hint">dialog</property>
+ <child>
+ <placeholder/>
+ </child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox6">
<property name="visible">True</property>
@@ -26,7 +30,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -44,9 +47,10 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="vbox2">
+ <object class="GtkBox" id="vbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="receive_statusbox">
<property name="visible">True</property>
diff --git a/data/ui/record_dialog.ui b/data/ui/record_dialog.ui
index 0a5bb8a..1444535 100644
--- a/data/ui/record_dialog.ui
+++ b/data/ui/record_dialog.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
<interface>
- <requires lib="gtk+" version="2.16"/>
+ <requires lib="gtk+" version="3.20"/>
<object class="GtkFileChooserDialog" id="record_dialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>
@@ -8,6 +9,9 @@
<property name="window_position">center-on-parent</property>
<property name="type_hint">dialog</property>
<property name="action">save</property>
+ <child>
+ <placeholder/>
+ </child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox9">
<property name="visible">True</property>
@@ -34,7 +38,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox1">
+ <object class="GtkBox" id="hbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
diff --git a/data/ui/send_chooser_dialog.ui b/data/ui/send_chooser_dialog.ui
index fd94bad..f19ef67 100644
--- a/data/ui/send_chooser_dialog.ui
+++ b/data/ui/send_chooser_dialog.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
<interface>
- <requires lib="gtk+" version="2.16"/>
+ <requires lib="gtk+" version="3.20"/>
<object class="GtkFileChooserDialog" id="send_chooser_dialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>
@@ -8,6 +9,9 @@
<property name="window_position">center-on-parent</property>
<property name="type_hint">dialog</property>
<property name="local_only">False</property>
+ <child>
+ <placeholder/>
+ </child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox13">
<property name="visible">True</property>
@@ -34,7 +38,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox7">
+ <object class="GtkBox" id="hbox7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
diff --git a/data/ui/send_progress_dialog.ui b/data/ui/send_progress_dialog.ui
index 1ee4056..15ee559 100644
--- a/data/ui/send_progress_dialog.ui
+++ b/data/ui/send_progress_dialog.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
<interface>
- <requires lib="gtk+" version="2.16"/>
+ <requires lib="gtk+" version="3.20"/>
<object class="GtkDialog" id="send_progress_dialog">
<property name="width_request">640</property>
<property name="can_focus">False</property>
@@ -9,6 +10,9 @@
<property name="modal">True</property>
<property name="window_position">center-on-parent</property>
<property name="type_hint">dialog</property>
+ <child>
+ <placeholder/>
+ </child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox4">
<property name="visible">True</property>
@@ -26,7 +30,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -44,9 +47,10 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="vbox3">
+ <object class="GtkBox" id="vbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="send_statusbox">
<property name="visible">True</property>
diff --git a/data/ui/settings_dialog.ui b/data/ui/settings_dialog.ui
index 6d511db..31ce0af 100644
--- a/data/ui/settings_dialog.ui
+++ b/data/ui/settings_dialog.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
<interface>
- <requires lib="gtk+" version="2.16"/>
+ <requires lib="gtk+" version="3.20"/>
<object class="GtkDialog" id="settings_dialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>
@@ -8,6 +9,9 @@
<property name="window_position">center-on-parent</property>
<property name="icon_name">gtk-properties</property>
<property name="type_hint">dialog</property>
+ <child>
+ <placeholder/>
+ </child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox3">
<property name="visible">True</property>
@@ -25,7 +29,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -40,7 +43,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -58,16 +60,17 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="vbox11">
+ <object class="GtkBox" id="vbox11">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label24">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Port Settings</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -79,11 +82,12 @@
</packing>
</child>
<child>
- <object class="GtkTable" id="table1">
+ <object class="GtkGrid" id="table1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">8</property>
- <property name="n_columns">2</property>
+ <property name="row_spacing">2</property>
+ <property name="column_spacing">5</property>
+ <property name="row_homogeneous">True</property>
<child>
<object class="GtkComboBox" id="settings_open_for">
<property name="visible">True</property>
@@ -91,15 +95,11 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- <property name="y_options"></property>
- <property name="y_padding">2</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox3">
+ <object class="GtkBox" id="hbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -108,7 +108,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -125,7 +124,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -139,9 +137,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
</packing>
</child>
<child>
@@ -151,11 +147,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="y_options"></property>
- <property name="y_padding">2</property>
</packing>
</child>
<child>
@@ -165,11 +157,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="y_options"></property>
- <property name="y_padding">2</property>
</packing>
</child>
<child>
@@ -179,11 +167,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options"></property>
- <property name="y_padding">2</property>
</packing>
</child>
<child>
@@ -193,11 +177,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
- <property name="y_padding">2</property>
</packing>
</child>
<child>
@@ -207,130 +187,117 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
- <property name="y_padding">2</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label8">
+ <object class="GtkCheckButton" id="settings_local_echo">
+ <property name="label" translatable="yes">Echo received data</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Access Mode</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
</object>
<packing>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- <property name="x_padding">4</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">7</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label7">
+ <object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="label" translatable="yes">Device</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Handshake</property>
</object>
<packing>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_padding">4</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label5">
+ <object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="label" translatable="yes">Baud Rate</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Parity</property>
</object>
<packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_padding">4</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label4">
+ <object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="label" translatable="yes">Data Bits</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Stop Bits</property>
</object>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_padding">4</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label3">
+ <object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="label" translatable="yes">Stop Bits</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Data Bits</property>
</object>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_padding">4</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label2">
+ <object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="label" translatable="yes">Parity</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Baud Rate</property>
</object>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_padding">4</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label1">
+ <object class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="label" translatable="yes">Handshake</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Device</property>
</object>
<packing>
- <property name="x_padding">4</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label26">
+ <object class="GtkLabel" id="label8">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="label" translatable="yes">Access Mode</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Local Echo</property>
</object>
<packing>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
- <property name="x_padding">4</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">6</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="settings_local_echo">
- <property name="label" translatable="yes">Echo received data</property>
+ <object class="GtkLabel" id="label26">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Local Echo</property>
+ <property name="xalign">1</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="left_attach">0</property>
<property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
- <property name="x_padding">2</property>
- <property name="y_padding">2</property>
</packing>
</child>
</object>
diff --git a/data/ui/xmodem_filename_dialog.ui b/data/ui/xmodem_filename_dialog.ui
index 4192c9d..28421b2 100644
--- a/data/ui/xmodem_filename_dialog.ui
+++ b/data/ui/xmodem_filename_dialog.ui
@@ -1,12 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
<interface>
- <requires lib="gtk+" version="2.16"/>
+ <requires lib="gtk+" version="3.20"/>
<object class="GtkDialog" id="xmodem_filename_dialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="modal">True</property>
<property name="window_position">center-on-parent</property>
<property name="type_hint">dialog</property>
+ <child>
+ <placeholder/>
+ </child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox11">
<property name="visible">True</property>
@@ -24,7 +28,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -45,7 +48,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox6">
+ <object class="GtkBox" id="hbox6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
