moserial r7 - in trunk: . data/glade doc/C/figures src
- From: mjc svn gnome org
- To: svn-commits-list gnome org
- Subject: moserial r7 - in trunk: . data/glade doc/C/figures src
- Date: Mon, 9 Mar 2009 12:45:15 +0000 (UTC)
Author: mjc
Date: Mon Mar 9 12:45:15 2009
New Revision: 7
URL: http://svn.gnome.org/viewvc/moserial?rev=7&view=rev
Log:
2009-03-09 Michael J. Chudobiak <mjc svn gnome org>
* NEWS:
* data/glade/moserial.glade:
* data/glade/moserial.ui:
* src/PreferencesDialog.vala:
* src/SettingsDialog.vala:
Make Settings and Preferences dialogs HIG compliant by changing
stock buttons and ordering from Apply/Discard to Cancel/OK.
Modified:
trunk/ChangeLog
trunk/NEWS
trunk/data/glade/moserial.glade
trunk/data/glade/moserial.ui
trunk/doc/C/figures/port-setup.png
trunk/doc/C/figures/preferences.png
trunk/src/PreferencesDialog.vala
trunk/src/SettingsDialog.vala
Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS (original)
+++ trunk/NEWS Mon Mar 9 12:45:15 2009
@@ -0,0 +1,7 @@
+Version 1.0.4
+-------------
+
+ * First release from gnome repos.
+ * HIG fixes in the Settings and Preferences dialogs.
+
+ Updated translations: Swedish (sv)
Modified: trunk/data/glade/moserial.glade
==============================================================================
--- trunk/data/glade/moserial.glade (original)
+++ trunk/data/glade/moserial.glade Mon Mar 9 12:45:15 2009
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Fri Mar 6 09:30:42 2009 -->
+<!--Generated with glade3 3.4.5 on Mon Mar 9 08:25:01 2009 -->
<glade-interface>
<widget class="GtkWindow" id="window">
<property name="title" translatable="yes">moserial</property>
@@ -590,266 +590,266 @@
<property name="n_rows">8</property>
<property name="n_columns">2</property>
<child>
- <widget class="GtkCheckButton" id="settings_local_echo">
+ <widget class="GtkComboBox" id="settings_open_for">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Normally disabled</property>
- <property name="label" translatable="yes">Echo received data</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
+ <property name="items" translatable="yes">Read and Write
+Read Only
+Write Only</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
- <property name="x_padding">2</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
+ <property name="y_options">GTK_EXPAND</property>
<property name="y_padding">2</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label26">
+ <widget class="GtkHBox" id="hbox3">
<property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Local Echo</property>
+ <child>
+ <widget class="GtkCheckButton" id="settings_hardware_handshake">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Hardware</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="padding">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkCheckButton" id="settings_software_handshake">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Software</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="padding">2</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</widget>
<packing>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
- <property name="x_padding">4</property>
+ <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>
- <widget class="GtkLabel" id="label1">
+ <widget class="GtkComboBox" id="settings_parity">
<property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Device</property>
+ <property name="items" translatable="yes">None
+Odd
+Even
+Mark
+Space</property>
</widget>
<packing>
- <property name="x_padding">4</property>
+ <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">GTK_EXPAND</property>
+ <property name="y_padding">2</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label2">
+ <widget class="GtkComboBox" id="settings_stop_bits">
<property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Baud Rate</property>
+ <property name="items" translatable="yes">1
+2</property>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_padding">4</property>
+ <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">GTK_EXPAND</property>
+ <property name="y_padding">2</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label3">
+ <widget class="GtkComboBox" id="settings_data_bits">
<property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Data Bits</property>
+ <property name="items" translatable="yes">5
+6
+7
+8</property>
</widget>
<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="x_padding">4</property>
+ <property name="y_options">GTK_EXPAND</property>
+ <property name="y_padding">2</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label4">
+ <widget class="GtkComboBox" id="settings_baud_rate">
<property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Stop Bits</property>
+ <property name="items" translatable="yes">300
+600
+1200
+2400
+4800
+9600
+19200
+38400
+57600
+115200
+230400
+460800
+576000
+927600</property>
</widget>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_padding">4</property>
+ <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">GTK_EXPAND</property>
+ <property name="y_padding">2</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label5">
+ <widget class="GtkComboBoxEntry" id="settings_device">
<property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Parity</property>
+ <property name="items" translatable="yes">/dev/ttyS0
+/dev/ttyS1
+/dev/ttyS2
+/dev/ttyS3
+/dev/ttyUSB0
+/dev/ttyUSB1
+/dev/ttyUSB2
+/dev/ttyUSB3</property>
+ <child internal-child="entry">
+ <widget class="GtkEntry" id="comboboxentry-entry1">
+ </widget>
+ </child>
</widget>
<packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_padding">4</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options">GTK_EXPAND</property>
+ <property name="y_padding">2</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label7">
+ <widget class="GtkLabel" id="label8">
<property name="visible">True</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Handshake</property>
+ <property name="label" translatable="yes">Access Mode</property>
</widget>
<packing>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
<property name="x_padding">4</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label8">
+ <widget class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Access Mode</property>
+ <property name="label" translatable="yes">Handshake</property>
</widget>
<packing>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
<property name="x_padding">4</property>
</packing>
</child>
<child>
- <widget class="GtkComboBoxEntry" id="settings_device">
+ <widget class="GtkLabel" id="label5">
<property name="visible">True</property>
- <property name="items" translatable="yes">/dev/ttyS0
-/dev/ttyS1
-/dev/ttyS2
-/dev/ttyS3
-/dev/ttyUSB0
-/dev/ttyUSB1
-/dev/ttyUSB2
-/dev/ttyUSB3</property>
- <child internal-child="entry">
- <widget class="GtkEntry" id="comboboxentry-entry1">
- </widget>
- </child>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">Parity</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options">GTK_EXPAND</property>
- <property name="y_padding">2</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_padding">4</property>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="settings_baud_rate">
+ <widget class="GtkLabel" id="label4">
<property name="visible">True</property>
- <property name="items" translatable="yes">300
-600
-1200
-2400
-4800
-9600
-19200
-38400
-57600
-115200
-230400
-460800
-576000
-927600</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">Stop Bits</property>
</widget>
<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">GTK_EXPAND</property>
- <property name="y_padding">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_padding">4</property>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="settings_data_bits">
+ <widget class="GtkLabel" id="label3">
<property name="visible">True</property>
- <property name="items" translatable="yes">5
-6
-7
-8</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">Data Bits</property>
</widget>
<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">GTK_EXPAND</property>
- <property name="y_padding">2</property>
+ <property name="x_padding">4</property>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="settings_stop_bits">
+ <widget class="GtkLabel" id="label2">
<property name="visible">True</property>
- <property name="items" translatable="yes">1
-2</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">Baud Rate</property>
</widget>
<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">GTK_EXPAND</property>
- <property name="y_padding">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_padding">4</property>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="settings_parity">
+ <widget class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="items" translatable="yes">None
-Odd
-Even
-Mark
-Space</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">Device</property>
</widget>
<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">GTK_EXPAND</property>
- <property name="y_padding">2</property>
+ <property name="x_padding">4</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox3">
+ <widget class="GtkLabel" id="label26">
<property name="visible">True</property>
- <child>
- <widget class="GtkCheckButton" id="settings_hardware_handshake">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Hardware</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="padding">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="settings_software_handshake">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Software</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="padding">2</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">Local Echo</property>
</widget>
<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>
+ <property name="top_attach">7</property>
+ <property name="bottom_attach">8</property>
+ <property name="x_padding">4</property>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="settings_open_for">
+ <widget class="GtkCheckButton" id="settings_local_echo">
<property name="visible">True</property>
- <property name="items" translatable="yes">Read and Write
-Read Only
-Write Only</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip" translatable="yes">Normally disabled</property>
+ <property name="label" translatable="yes">Echo received data</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
</widget>
<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">GTK_EXPAND</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>
@@ -870,21 +870,21 @@
<property name="visible">True</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
- <widget class="GtkButton" id="settings_apply_button">
+ <widget class="GtkButton" id="settings_cancel_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="label" translatable="yes">gtk-apply</property>
+ <property name="label" translatable="yes">gtk-cancel</property>
<property name="use_stock">True</property>
<property name="response_id">0</property>
</widget>
</child>
<child>
- <widget class="GtkButton" id="settings_discard_button">
+ <widget class="GtkButton" id="settings_ok_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="label" translatable="yes">gtk-discard</property>
+ <property name="label" translatable="yes">gtk-ok</property>
<property name="use_stock">True</property>
<property name="response_id">0</property>
</widget>
@@ -1042,147 +1042,6 @@
</widget>
</child>
</widget>
- <widget class="GtkWindow" id="window1">
- <child>
- <widget class="GtkTable" id="table3">
- <property name="visible">True</property>
- <property name="n_rows">6</property>
- <property name="n_columns">6</property>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <widget class="GtkLabel" id="disconnect_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Disconnect</property>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="connect_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Connect</property>
- </widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="record_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Record</property>
- </widget>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="stop_recording_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Stop Recording</property>
- </widget>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
<widget class="GtkFileChooserDialog" id="record_dialog">
<property name="border_width">5</property>
<property name="title" translatable="yes">Record Incoming and/or Outgoing Data</property>
@@ -1252,8 +1111,8 @@
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="has_separator">False</property>
- <property name="local_only">False</property>
<property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
+ <property name="local_only">False</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox10">
<property name="visible">True</property>
@@ -1711,21 +1570,21 @@
<property name="visible">True</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
- <widget class="GtkButton" id="preferences_apply">
+ <widget class="GtkButton" id="preferences_cancel">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="label" translatable="yes">gtk-apply</property>
+ <property name="label" translatable="yes">gtk-cancel</property>
<property name="use_stock">True</property>
<property name="response_id">0</property>
</widget>
</child>
<child>
- <widget class="GtkButton" id="preferences_discard">
+ <widget class="GtkButton" id="preferences_ok">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="label" translatable="yes">gtk-discard</property>
+ <property name="label" translatable="yes">gtk-ok</property>
<property name="use_stock">True</property>
<property name="response_id">0</property>
</widget>
Modified: trunk/data/glade/moserial.ui
==============================================================================
--- trunk/data/glade/moserial.ui (original)
+++ trunk/data/glade/moserial.ui Mon Mar 9 12:45:15 2009
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!--Generated with glade3 3.4.5 on Fri Mar 6 09:30:42 2009 -->
+<!--Generated with glade3 3.4.5 on Mon Mar 9 08:25:01 2009 -->
<interface>
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">5000</property>
@@ -85,32 +85,71 @@
</columns>
<data>
<row>
- <col id="0">/dev/ttyS0</col>
+ <col id="0">Read and Write</col>
</row>
<row>
- <col id="0">/dev/ttyS1</col>
+ <col id="0">Read Only</col>
</row>
<row>
- <col id="0">/dev/ttyS2</col>
+ <col id="0">Write Only</col>
</row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="model4">
+ <columns>
+ <column type="gchararray"/>
+ </columns>
+ <data>
<row>
- <col id="0">/dev/ttyS3</col>
+ <col id="0">None</col>
</row>
<row>
- <col id="0">/dev/ttyUSB0</col>
+ <col id="0">Odd</col>
</row>
<row>
- <col id="0">/dev/ttyUSB1</col>
+ <col id="0">Even</col>
</row>
<row>
- <col id="0">/dev/ttyUSB2</col>
+ <col id="0">Mark</col>
</row>
<row>
- <col id="0">/dev/ttyUSB3</col>
+ <col id="0">Space</col>
</row>
</data>
</object>
- <object class="GtkListStore" id="model4">
+ <object class="GtkListStore" id="model5">
+ <columns>
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0">1</col>
+ </row>
+ <row>
+ <col id="0">2</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="model6">
+ <columns>
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0">5</col>
+ </row>
+ <row>
+ <col id="0">6</col>
+ </row>
+ <row>
+ <col id="0">7</col>
+ </row>
+ <row>
+ <col id="0">8</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="model7">
<columns>
<column type="gchararray"/>
</columns>
@@ -159,73 +198,34 @@
</row>
</data>
</object>
- <object class="GtkListStore" id="model5">
- <columns>
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0">5</col>
- </row>
- <row>
- <col id="0">6</col>
- </row>
- <row>
- <col id="0">7</col>
- </row>
- <row>
- <col id="0">8</col>
- </row>
- </data>
- </object>
- <object class="GtkListStore" id="model6">
- <columns>
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0">1</col>
- </row>
- <row>
- <col id="0">2</col>
- </row>
- </data>
- </object>
- <object class="GtkListStore" id="model7">
+ <object class="GtkListStore" id="model8">
<columns>
<column type="gchararray"/>
</columns>
<data>
<row>
- <col id="0">None</col>
+ <col id="0">/dev/ttyS0</col>
</row>
<row>
- <col id="0">Odd</col>
+ <col id="0">/dev/ttyS1</col>
</row>
<row>
- <col id="0">Even</col>
+ <col id="0">/dev/ttyS2</col>
</row>
<row>
- <col id="0">Mark</col>
+ <col id="0">/dev/ttyS3</col>
</row>
<row>
- <col id="0">Space</col>
+ <col id="0">/dev/ttyUSB0</col>
</row>
- </data>
- </object>
- <object class="GtkListStore" id="model8">
- <columns>
- <column type="gchararray"/>
- </columns>
- <data>
<row>
- <col id="0">Read and Write</col>
+ <col id="0">/dev/ttyUSB1</col>
</row>
<row>
- <col id="0">Read Only</col>
+ <col id="0">/dev/ttyUSB2</col>
</row>
<row>
- <col id="0">Write Only</col>
+ <col id="0">/dev/ttyUSB3</col>
</row>
</data>
</object>
@@ -786,140 +786,61 @@
<property name="n_rows">8</property>
<property name="n_columns">2</property>
<child>
- <object class="GtkCheckButton" id="settings_local_echo">
+ <object class="GtkComboBox" id="settings_open_for">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip-text" translatable="yes">Normally disabled</property>
- <property name="label" translatable="yes">Echo received data</property>
- <property name="draw_indicator">True</property>
+ <property name="model">model3</property>
+ <child>
+ <object class="GtkCellRendererText" id="renderer3"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</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>
- <child>
- <object class="GtkLabel" id="label26">
- <property name="visible">True</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>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Device</property>
- </object>
- <packing>
- <property name="x_padding">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label2">
- <property name="visible">True</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>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label3">
- <property name="visible">True</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>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label4">
- <property name="visible">True</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>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label5">
- <property name="visible">True</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>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label7">
- <property name="visible">True</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>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label8">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Access Mode</property>
- </object>
- <packing>
<property name="top_attach">6</property>
<property name="bottom_attach">7</property>
- <property name="x_padding">4</property>
+ <property name="y_options">GTK_EXPAND</property>
+ <property name="y_padding">2</property>
</packing>
</child>
<child>
- <object class="GtkComboBoxEntry" id="settings_device">
+ <object class="GtkHBox" id="hbox3">
<property name="visible">True</property>
- <child internal-child="entry">
- <object class="GtkEntry" id="comboboxentry-entry1">
+ <child>
+ <object class="GtkCheckButton" id="settings_hardware_handshake">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Hardware</property>
+ <property name="draw_indicator">True</property>
</object>
+ <packing>
+ <property name="padding">2</property>
+ </packing>
</child>
- <property name="model">model3</property>
<child>
- <object class="GtkCellRendererText" id="renderer3"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
+ <object class="GtkCheckButton" id="settings_software_handshake">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Software</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="padding">2</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="y_options">GTK_EXPAND</property>
- <property name="y_padding">2</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
</packing>
</child>
<child>
- <object class="GtkComboBox" id="settings_baud_rate">
+ <object class="GtkComboBox" id="settings_parity">
<property name="visible">True</property>
<property name="model">model4</property>
<child>
@@ -932,14 +853,14 @@
<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="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="y_options">GTK_EXPAND</property>
<property name="y_padding">2</property>
</packing>
</child>
<child>
- <object class="GtkComboBox" id="settings_data_bits">
+ <object class="GtkComboBox" id="settings_stop_bits">
<property name="visible">True</property>
<property name="model">model5</property>
<child>
@@ -952,14 +873,14 @@
<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="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="y_options">GTK_EXPAND</property>
<property name="y_padding">2</property>
</packing>
</child>
<child>
- <object class="GtkComboBox" id="settings_stop_bits">
+ <object class="GtkComboBox" id="settings_data_bits">
<property name="visible">True</property>
<property name="model">model6</property>
<child>
@@ -972,14 +893,14 @@
<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="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="y_options">GTK_EXPAND</property>
<property name="y_padding">2</property>
</packing>
</child>
<child>
- <object class="GtkComboBox" id="settings_parity">
+ <object class="GtkComboBox" id="settings_baud_rate">
<property name="visible">True</property>
<property name="model">model7</property>
<child>
@@ -992,63 +913,142 @@
<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="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="y_options">GTK_EXPAND</property>
<property name="y_padding">2</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox3">
+ <object class="GtkComboBoxEntry" id="settings_device">
<property name="visible">True</property>
- <child>
- <object class="GtkCheckButton" id="settings_hardware_handshake">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Hardware</property>
- <property name="draw_indicator">True</property>
+ <child internal-child="entry">
+ <object class="GtkEntry" id="comboboxentry-entry1">
</object>
- <packing>
- <property name="padding">2</property>
- </packing>
</child>
+ <property name="model">model8</property>
<child>
- <object class="GtkCheckButton" id="settings_software_handshake">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Software</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="padding">2</property>
- <property name="position">1</property>
- </packing>
+ <object class="GtkCellRendererText" id="renderer8"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
</child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
+ <property name="y_options">GTK_EXPAND</property>
+ <property name="y_padding">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label8">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">Access Mode</property>
+ </object>
+ <packing>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
+ <property name="x_padding">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label7">
+ <property name="visible">True</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>
</packing>
</child>
<child>
- <object class="GtkComboBox" id="settings_open_for">
+ <object class="GtkLabel" id="label5">
<property name="visible">True</property>
- <property name="model">model8</property>
- <child>
- <object class="GtkCellRendererText" id="renderer8"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
+ <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>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</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>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</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>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</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>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">Device</property>
+ </object>
+ <packing>
+ <property name="x_padding">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label26">
+ <property name="visible">True</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>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="settings_local_echo">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip-text" translatable="yes">Normally disabled</property>
+ <property name="label" translatable="yes">Echo received data</property>
+ <property name="draw_indicator">True</property>
</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">GTK_EXPAND</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>
@@ -1069,20 +1069,20 @@
<property name="visible">True</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
- <object class="GtkButton" id="settings_apply_button">
+ <object class="GtkButton" id="settings_cancel_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="label" translatable="yes">gtk-apply</property>
+ <property name="label" translatable="yes">gtk-cancel</property>
<property name="use_stock">True</property>
</object>
</child>
<child>
- <object class="GtkButton" id="settings_discard_button">
+ <object class="GtkButton" id="settings_ok_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="label" translatable="yes">gtk-discard</property>
+ <property name="label" translatable="yes">gtk-ok</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -1098,11 +1098,11 @@
</object>
</child>
<action-widgets>
- <action-widget response="0">settings_local_echo</action-widget>
<action-widget response="0">settings_hardware_handshake</action-widget>
<action-widget response="0">settings_software_handshake</action-widget>
- <action-widget response="0">settings_apply_button</action-widget>
- <action-widget response="0">settings_discard_button</action-widget>
+ <action-widget response="0">settings_local_echo</action-widget>
+ <action-widget response="0">settings_cancel_button</action-widget>
+ <action-widget response="0">settings_ok_button</action-widget>
</action-widgets>
</object>
<object class="GtkDialog" id="send_progress_dialog">
@@ -1250,147 +1250,6 @@
<action-widget response="0">receive_progress_cancel</action-widget>
</action-widgets>
</object>
- <object class="GtkWindow" id="window1">
- <child>
- <object class="GtkTable" id="table3">
- <property name="visible">True</property>
- <property name="n_rows">6</property>
- <property name="n_columns">6</property>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <object class="GtkLabel" id="disconnect_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Disconnect</property>
- </object>
- </child>
- <child>
- <object class="GtkLabel" id="connect_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Connect</property>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="record_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Record</property>
- </object>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="stop_recording_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Stop Recording</property>
- </object>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
<object class="GtkFileChooserDialog" id="record_dialog">
<property name="border_width">5</property>
<property name="title" translatable="yes">Record Incoming and/or Outgoing Data</property>
@@ -1464,8 +1323,8 @@
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="has_separator">False</property>
- <property name="local_only">False</property>
<property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
+ <property name="local_only">False</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox10">
<property name="visible">True</property>
@@ -1925,20 +1784,20 @@
<property name="visible">True</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
- <object class="GtkButton" id="preferences_apply">
+ <object class="GtkButton" id="preferences_cancel">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="label" translatable="yes">gtk-apply</property>
+ <property name="label" translatable="yes">gtk-cancel</property>
<property name="use_stock">True</property>
</object>
</child>
<child>
- <object class="GtkButton" id="preferences_discard">
+ <object class="GtkButton" id="preferences_ok">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="label" translatable="yes">gtk-discard</property>
+ <property name="label" translatable="yes">gtk-ok</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -1961,8 +1820,8 @@
<action-widget response="0">preferences_highlight_color_button</action-widget>
<action-widget response="0">preferences_record_launch</action-widget>
<action-widget response="0">preferences_record_enable_timeout</action-widget>
- <action-widget response="0">preferences_apply</action-widget>
- <action-widget response="0">preferences_discard</action-widget>
+ <action-widget response="0">preferences_cancel</action-widget>
+ <action-widget response="0">preferences_ok</action-widget>
</action-widgets>
</object>
</interface>
Modified: trunk/doc/C/figures/port-setup.png
==============================================================================
Binary files. No diff available.
Modified: trunk/doc/C/figures/preferences.png
==============================================================================
Binary files. No diff available.
Modified: trunk/src/PreferencesDialog.vala
==============================================================================
--- trunk/src/PreferencesDialog.vala (original)
+++ trunk/src/PreferencesDialog.vala Mon Mar 9 12:45:15 2009
@@ -3,8 +3,8 @@
{
public Builder builder {get; construct;}
private Dialog dialog;
- private Button discardButton;
- private Button applyButton;
+ private Button cancelButton;
+ private Button okButton;
private CheckButton systemFont;
private FontButton fontButton;
private ColorButton fontColorButton;
@@ -19,8 +19,8 @@
}
construct {
dialog = (Dialog)builder.get_object("preferences_dialog");
- applyButton = (Button)builder.get_object("preferences_apply");
- discardButton = (Button)builder.get_object("preferences_discard");
+ okButton = (Button)builder.get_object("preferences_ok");
+ cancelButton = (Button)builder.get_object("preferences_cancel");
systemFont = (CheckButton)builder.get_object("preferences_use_system_font");
fontButton = (FontButton)builder.get_object("preferences_font_button");
fontColorButton = (ColorButton)builder.get_object("preferences_font_color_button");
@@ -31,11 +31,11 @@
timeout = (SpinButton)builder.get_object("preferences_record_timeout");
systemFont.toggled += this.systemFontToggled;
enableTimeout.toggled += this.enableTimeoutToggled;
- applyButton.clicked += apply;
- discardButton.clicked += discard;
+ okButton.clicked += ok;
+ cancelButton.clicked += cancel;
dialog.delete_event += hide;
}
- public void apply(Button button) {
+ public void ok(Button button) {
hide(button);
bool pSystemFont;
string pFont;
@@ -104,7 +104,7 @@
timeout.set_value(preferences.timeout);
dialog.show_all();
}
- public void discard(Widget w) {
+ public void cancel(Widget w) {
//currentPreferences=null;
hide(w);
}
Modified: trunk/src/SettingsDialog.vala
==============================================================================
--- trunk/src/SettingsDialog.vala (original)
+++ trunk/src/SettingsDialog.vala Mon Mar 9 12:45:15 2009
@@ -9,8 +9,8 @@
public Builder builder {get; construct;}
private Settings currentSettings;
private Dialog dialog;
- private Button discardButton;
- private Button applyButton;
+ private Button cancelButton;
+ private Button okButton;
private Settings settings;
private ComboBoxEntry deviceCombo;
private ComboBox baudRateCombo;
@@ -28,8 +28,8 @@
construct {
dialog = (Dialog)builder.get_object("settings_dialog");
- discardButton = (Button)builder.get_object("settings_discard_button");
- applyButton = (Button)builder.get_object("settings_apply_button");
+ cancelButton = (Button)builder.get_object("settings_cancel_button");
+ okButton = (Button)builder.get_object("settings_ok_button");
deviceCombo = (ComboBoxEntry)builder.get_object("settings_device");
baudRateCombo = (ComboBox)builder.get_object("settings_baud_rate");
@@ -41,8 +41,8 @@
accessModeCombo = (ComboBox)builder.get_object("settings_open_for");
localEcho = (CheckButton)builder.get_object("settings_local_echo");
dialog.delete_event += hide;
- discardButton.clicked += this.discard;
- applyButton.clicked += this.apply;
+ cancelButton.clicked += this.cancel;
+ okButton.clicked += this.ok;
populateDevices();
@@ -149,12 +149,12 @@
return true;
}
- public void discard(Widget w) {
+ public void cancel(Widget w) {
currentSettings=null;
hide(w);
}
- public void apply(Widget w) {
+ public void ok(Widget w) {
string device;
int baudRate;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
