moserial r15 - in trunk: . data/glade src
- From: mjc svn gnome org
- To: svn-commits-list gnome org
- Subject: moserial r15 - in trunk: . data/glade src
- Date: Fri, 13 Mar 2009 14:40:01 +0000 (UTC)
Author: mjc
Date: Fri Mar 13 14:40:01 2009
New Revision: 15
URL: http://svn.gnome.org/viewvc/moserial?rev=15&view=rev
Log:
2009-03-13 Michael J. Chudobiak <mjc svn gnome org>
[ moserial 1.0.6 released ]
* data/glade/moserial.glade:
* data/glade/moserial.ui:
Re-added missing disconnect and stop-recording button labels
* src/Main.vala:
* src/MainWindow.vala:
* src/SerialConnection.vala:
Fixed some nuisance compiler warnings, by renaming variables
that conflicted with inherited field names.
Modified:
trunk/ChangeLog
trunk/NEWS
trunk/data/glade/moserial.glade
trunk/data/glade/moserial.ui
trunk/src/Main.vala
trunk/src/MainWindow.vala
trunk/src/SerialConnection.vala
Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS (original)
+++ trunk/NEWS Fri Mar 13 14:40:01 2009
@@ -1,3 +1,9 @@
+Version 1.0.6
+-------------
+
+ * Re-added missing disconnect and stop-recording button labels
+ * Fixed some nuisance compiler warnings
+
Version 1.0.5
-------------
Modified: trunk/data/glade/moserial.glade
==============================================================================
--- trunk/data/glade/moserial.glade (original)
+++ trunk/data/glade/moserial.glade Fri Mar 13 14:40:01 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 Mon Mar 9 08:25:01 2009 -->
+<!--Generated with glade3 3.4.5 on Fri Mar 13 10:33:57 2009 -->
<glade-interface>
<widget class="GtkWindow" id="window">
<property name="title" translatable="yes">moserial</property>
@@ -590,166 +590,90 @@
<property name="n_rows">8</property>
<property name="n_columns">2</property>
<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>
<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_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="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_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>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="settings_baud_rate">
- <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>
- </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="x_padding">4</property>
</packing>
</child>
<child>
- <widget class="GtkComboBoxEntry" id="settings_device">
+ <widget class="GtkLabel" id="label4">
<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">Stop Bits</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">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_padding">4</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label8">
+ <widget class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Access Mode</property>
+ <property name="label" translatable="yes">Parity</property>
</widget>
<packing>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="x_padding">4</property>
</packing>
</child>
@@ -766,90 +690,166 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label5">
+ <widget class="GtkLabel" id="label8">
<property name="visible">True</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Parity</property>
+ <property name="label" translatable="yes">Access Mode</property>
</widget>
<packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</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="label4">
+ <widget class="GtkComboBoxEntry" id="settings_device">
<property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Stop Bits</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">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="y_options">GTK_EXPAND</property>
+ <property name="y_padding">2</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label3">
+ <widget class="GtkComboBox" id="settings_baud_rate">
<property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Data 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="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="GtkComboBox" id="settings_data_bits">
+ <property name="visible">True</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="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="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="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="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>
@@ -1042,6 +1042,50 @@
</widget>
</child>
</widget>
+ <widget class="GtkWindow" id="window1">
+ <child>
+ <widget class="GtkTable" id="table3">
+ <property name="visible">True</property>
+ <property name="n_rows">4</property>
+ <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>
+ <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="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="disconnect_label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Disconnect</property>
+ </widget>
+ </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>
Modified: trunk/data/glade/moserial.ui
==============================================================================
--- trunk/data/glade/moserial.ui (original)
+++ trunk/data/glade/moserial.ui Fri Mar 13 14:40:01 2009
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!--Generated with glade3 3.4.5 on Mon Mar 9 08:25:01 2009 -->
+<!--Generated with glade3 3.4.5 on Fri Mar 13 10:33:57 2009 -->
<interface>
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">5000</property>
@@ -85,71 +85,32 @@
</columns>
<data>
<row>
- <col id="0">Read and Write</col>
- </row>
- <row>
- <col id="0">Read Only</col>
- </row>
- <row>
- <col id="0">Write Only</col>
- </row>
- </data>
- </object>
- <object class="GtkListStore" id="model4">
- <columns>
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0">None</col>
- </row>
- <row>
- <col id="0">Odd</col>
- </row>
- <row>
- <col id="0">Even</col>
+ <col id="0">/dev/ttyS0</col>
</row>
<row>
- <col id="0">Mark</col>
+ <col id="0">/dev/ttyS1</col>
</row>
<row>
- <col id="0">Space</col>
- </row>
- </data>
- </object>
- <object class="GtkListStore" id="model5">
- <columns>
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0">1</col>
+ <col id="0">/dev/ttyS2</col>
</row>
<row>
- <col id="0">2</col>
+ <col id="0">/dev/ttyS3</col>
</row>
- </data>
- </object>
- <object class="GtkListStore" id="model6">
- <columns>
- <column type="gchararray"/>
- </columns>
- <data>
<row>
- <col id="0">5</col>
+ <col id="0">/dev/ttyUSB0</col>
</row>
<row>
- <col id="0">6</col>
+ <col id="0">/dev/ttyUSB1</col>
</row>
<row>
- <col id="0">7</col>
+ <col id="0">/dev/ttyUSB2</col>
</row>
<row>
- <col id="0">8</col>
+ <col id="0">/dev/ttyUSB3</col>
</row>
</data>
</object>
- <object class="GtkListStore" id="model7">
+ <object class="GtkListStore" id="model4">
<columns>
<column type="gchararray"/>
</columns>
@@ -198,34 +159,73 @@
</row>
</data>
</object>
- <object class="GtkListStore" id="model8">
+ <object class="GtkListStore" id="model5">
<columns>
<column type="gchararray"/>
</columns>
<data>
<row>
- <col id="0">/dev/ttyS0</col>
+ <col id="0">5</col>
</row>
<row>
- <col id="0">/dev/ttyS1</col>
+ <col id="0">6</col>
</row>
<row>
- <col id="0">/dev/ttyS2</col>
+ <col id="0">7</col>
</row>
<row>
- <col id="0">/dev/ttyS3</col>
+ <col id="0">8</col>
</row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="model6">
+ <columns>
+ <column type="gchararray"/>
+ </columns>
+ <data>
<row>
- <col id="0">/dev/ttyUSB0</col>
+ <col id="0">1</col>
</row>
<row>
- <col id="0">/dev/ttyUSB1</col>
+ <col id="0">2</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="model7">
+ <columns>
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0">None</col>
</row>
<row>
- <col id="0">/dev/ttyUSB2</col>
+ <col id="0">Odd</col>
</row>
<row>
- <col id="0">/dev/ttyUSB3</col>
+ <col id="0">Even</col>
+ </row>
+ <row>
+ <col id="0">Mark</col>
+ </row>
+ <row>
+ <col id="0">Space</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="model8">
+ <columns>
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0">Read and Write</col>
+ </row>
+ <row>
+ <col id="0">Read Only</col>
+ </row>
+ <row>
+ <col id="0">Write Only</col>
</row>
</data>
</object>
@@ -786,61 +786,140 @@
<property name="n_rows">8</property>
<property name="n_columns">2</property>
<child>
- <object class="GtkComboBox" id="settings_open_for">
+ <object class="GtkCheckButton" id="settings_local_echo">
<property name="visible">True</property>
- <property name="model">model3</property>
- <child>
- <object class="GtkCellRendererText" id="renderer3"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
+ <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">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="y_options">GTK_EXPAND</property>
- <property name="y_padding">2</property>
+ <property name="x_padding">4</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">model3</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="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">5</property>
- <property name="bottom_attach">6</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">model4</property>
<child>
@@ -853,14 +932,14 @@
<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="GtkComboBox" id="settings_stop_bits">
+ <object class="GtkComboBox" id="settings_data_bits">
<property name="visible">True</property>
<property name="model">model5</property>
<child>
@@ -873,14 +952,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_data_bits">
+ <object class="GtkComboBox" id="settings_stop_bits">
<property name="visible">True</property>
<property name="model">model6</property>
<child>
@@ -893,14 +972,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_baud_rate">
+ <object class="GtkComboBox" id="settings_parity">
<property name="visible">True</property>
<property name="model">model7</property>
<child>
@@ -913,142 +992,63 @@
<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="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">model8</property>
<child>
- <object class="GtkCellRendererText" id="renderer8"/>
- <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>
- </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="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="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">
+ <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">model8</property>
+ <child>
+ <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="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>
@@ -1098,9 +1098,9 @@
</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_local_echo</action-widget>
<action-widget response="0">settings_cancel_button</action-widget>
<action-widget response="0">settings_ok_button</action-widget>
</action-widgets>
@@ -1250,6 +1250,50 @@
<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">4</property>
+ <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>
+ <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="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="disconnect_label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Disconnect</property>
+ </object>
+ </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>
Modified: trunk/src/Main.vala
==============================================================================
--- trunk/src/Main.vala (original)
+++ trunk/src/Main.vala Fri Mar 13 14:40:01 2009
@@ -18,7 +18,7 @@
msg.run ();
}
mainWindow = new moserial.MainWindow(builder, profileFilename);
- mainWindow.show();
+ mainWindow.showWindow();
}
public static int main (string[] args) {
Gtk.init (ref args);
Modified: trunk/src/MainWindow.vala
==============================================================================
--- trunk/src/MainWindow.vala (original)
+++ trunk/src/MainWindow.vala Fri Mar 13 14:40:01 2009
@@ -16,7 +16,7 @@
};
public Builder builder {get; construct; }
- private Gtk.Window window;
+ private Gtk.Window gtkWindow;
private SettingsDialog settingsDialog;
private ToolButton settingsButton;
private ToggleToolButton recordButton;
@@ -76,19 +76,19 @@
}
construct {
//setup window
- window = (Gtk.Window)builder.get_object("window");
- window.destroy += quitSave;
- window.delete_event += deleteSaveSize;
+ gtkWindow = (Gtk.Window)builder.get_object("window");
+ gtkWindow.destroy += quitSave;
+ gtkWindow.delete_event += deleteSaveSize;
//load defaults
profile=new Profile();
- profile.load(null, window);
+ profile.load(null, gtkWindow);
currentSettings=Settings.loadFromProfile(profile);
int width = profile.getWindowWidth();
int height = profile.getWindowHeight();
int panedPosition = profile.getWindowPanedPosition();
if ((width>0) && (height>0))
- window.resize (width, height);
+ gtkWindow.resize (width, height);
//setup paned
paned = (Paned)builder.get_object("vpaned");
@@ -178,7 +178,7 @@
//setup connectbutton
connectButton = (ToggleToolButton)builder.get_object("toolbar_connect");
- connectButton.clicked += this.connect;
+ connectButton.clicked += this.doConnect;
disconnectLabel = (Label)builder.get_object("disconnect_label");
connectLabel = (Label)builder.get_object("connect_label");
@@ -314,7 +314,7 @@
}
}
catch (HexParseError e) {
- var errorDialog = new MessageDialog (window, DialogFlags.DESTROY_WITH_PARENT, MessageType.ERROR, ButtonsType.CLOSE, e.message);
+ var errorDialog = new MessageDialog (gtkWindow, DialogFlags.DESTROY_WITH_PARENT, MessageType.ERROR, ButtonsType.CLOSE, e.message);
errorDialog.run();
errorDialog.destroy();
}
@@ -439,7 +439,7 @@
stopRecording(dialog);
} catch (GLib.Error e) {
warning(_("Error: Could not open %s\n"), filename);
- var errorDialog = new MessageDialog (window, DialogFlags.DESTROY_WITH_PARENT, MessageType.ERROR, ButtonsType.CLOSE, "%s: %s\n%s".printf(_("Error: Could not open file"), filename, e.message));
+ var errorDialog = new MessageDialog (gtkWindow, DialogFlags.DESTROY_WITH_PARENT, MessageType.ERROR, ButtonsType.CLOSE, "%s: %s\n%s".printf(_("Error: Could not open file"), filename, e.message));
errorDialog.run();
errorDialog.destroy();
stopRecording(dialog);
@@ -451,8 +451,8 @@
return false;
}
- public void show() {
- window.show_all();
+ public void showWindow() {
+ gtkWindow.show_all();
}
private void updateSettings(SettingsDialog d, Settings newSettings) {
@@ -513,10 +513,10 @@
}
private bool startConnection() {
- if (!(serialConnection.connect(currentSettings))) {
+ if (!(serialConnection.doConnect(currentSettings))) {
connectButton.set_active(false);
warning(_("Error: Could not open %s\n"), currentSettings.device);
- var dialog = new MessageDialog (window, DialogFlags.DESTROY_WITH_PARENT, MessageType.ERROR, ButtonsType.CLOSE, "%s: %s".printf(_("Error: Could not open device"), currentSettings.device));
+ var dialog = new MessageDialog (gtkWindow, DialogFlags.DESTROY_WITH_PARENT, MessageType.ERROR, ButtonsType.CLOSE, "%s: %s".printf(_("Error: Could not open device"), currentSettings.device));
dialog.run();
dialog.destroy();
return false;
@@ -534,12 +534,12 @@
return true;
}
- private void connect(ToggleToolButton button) {
+ private void doConnect(ToggleToolButton button) {
if (button.get_active()) {
startConnection();
} else {
settingsButton.set_sensitive(true);
- serialConnection.disconnect();
+ serialConnection.doDisconnect();
serialConnection.newData -= this.updateIncoming;
bytecountbar.pop(bytecountbarContext);
bytecountbar.push(bytecountbarContext, serialConnection.getBytecountbarString());
@@ -647,7 +647,7 @@
string license_trans = license[0] + "\n" + license[1] + "\n" + license[2];
AboutDialog.set_url_hook (url_hook);
- show_about_dialog (window,
+ show_about_dialog (gtkWindow,
"version", Config.VERSION,
"copyright", "Copyright  2009\nMichael J. Chudobiak\n<mjc svn gnome org>",
"comments", _("A serial terminal for the GNOME desktop, optimized for logging and file capture."),
@@ -685,7 +685,7 @@
int height = 0;
int pos = paned.get_position();
- window.get_size (out width, out height);
+ gtkWindow.get_size (out width, out height);
profile.saveWindowSize(width, height);
profile.saveWindowPanedPosition(pos);
}
@@ -696,7 +696,7 @@
currentPaths.saveToProfile(profile);
if (profileFilename != null) {
if (profileChanged) {
- var dialog = new MessageDialog (window, DialogFlags.DESTROY_WITH_PARENT, MessageType.QUESTION, ButtonsType.YES_NO, _("You have changed your setting or preferences. Do you want to save these changes to the loaded profile?"));
+ var dialog = new MessageDialog (gtkWindow, DialogFlags.DESTROY_WITH_PARENT, MessageType.QUESTION, ButtonsType.YES_NO, _("You have changed your setting or preferences. Do you want to save these changes to the loaded profile?"));
int response = dialog.run();
if(response == Gtk.ResponseType.YES)
saveProfile();
@@ -707,7 +707,7 @@
saveProfile();
}
}
- profile.save(null, window);
+ profile.save(null, gtkWindow);
Gtk.main_quit ();
}
private void saveProfile () {
@@ -718,11 +718,11 @@
saveProfileAs();
if(profileFilename==null)
return;
- profile.save(profileFilename, window);
+ profile.save(profileFilename, gtkWindow);
profileChanged=false;
}
private void saveProfileAs () {
- var dialog = new FileChooserDialog (null, window, Gtk.FileChooserAction.SAVE);
+ var dialog = new FileChooserDialog (null, gtkWindow, Gtk.FileChooserAction.SAVE);
dialog.add_buttons(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, Gtk.STOCK_SAVE, Gtk.ResponseType.ACCEPT, null);
dialog.set_do_overwrite_confirmation(true);
dialog.set_local_only(false);
@@ -735,7 +735,7 @@
saveProfile();
}
private void loadProfileOnStartup(string profileFilename) {
- if (profile.load(profileFilename, window)) {
+ if (profile.load(profileFilename, gtkWindow)) {
ensureDisconnected();
currentSettings = Settings.loadFromProfile(profile);
currentPreferences = Preferences.loadFromProfile(profile);
@@ -743,19 +743,19 @@
updatePreferences(null, currentPreferences);
statusbar.pop(statusbarContext);
statusbar.push(statusbarContext, currentSettings.getStatusbarString(false));
- window.set_title("moserial - %s".printf(GLib.Path.get_basename(profileFilename)));
+ gtkWindow.set_title("moserial - %s".printf(GLib.Path.get_basename(profileFilename)));
profileChanged=false;
this.profileFilename=profileFilename;
}
}
private void loadProfile() {
- var dialog = new FileChooserDialog (null, window, Gtk.FileChooserAction.OPEN);
+ var dialog = new FileChooserDialog (null, gtkWindow, Gtk.FileChooserAction.OPEN);
dialog.add_buttons(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, Gtk.STOCK_OPEN, Gtk.ResponseType.ACCEPT, null);
dialog.set_local_only(false);
int response = dialog.run();
if(response == Gtk.ResponseType.ACCEPT) {
profileFilename=dialog.get_filename();
- if (profile.load(profileFilename, window)) {
+ if (profile.load(profileFilename, gtkWindow)) {
ensureDisconnected();
currentSettings = Settings.loadFromProfile(profile);
currentPreferences = Preferences.loadFromProfile(profile);
@@ -763,7 +763,7 @@
updatePreferences(null, currentPreferences);
statusbar.pop(statusbarContext);
statusbar.push(statusbarContext, currentSettings.getStatusbarString(false));
- window.set_title("moserial - %s".printf(GLib.Path.get_basename(profileFilename)));
+ gtkWindow.set_title("moserial - %s".printf(GLib.Path.get_basename(profileFilename)));
profileChanged=false;
}
}
@@ -771,31 +771,31 @@
}
private void copy() {
- if(window.get_focus()==(Gtk.Widget)outgoingAsciiTextView || window.get_focus()==(Gtk.Widget)incomingAsciiTextView || window.get_focus()==(Gtk.Widget)outgoingHexTextView || window.get_focus()==(Gtk.Widget)incomingHexTextView) {
- TextView tv = (TextView)window.get_focus();
+ if(gtkWindow.get_focus()==(Gtk.Widget)outgoingAsciiTextView || gtkWindow.get_focus()==(Gtk.Widget)incomingAsciiTextView || gtkWindow.get_focus()==(Gtk.Widget)outgoingHexTextView || gtkWindow.get_focus()==(Gtk.Widget)incomingHexTextView) {
+ TextView tv = (TextView)gtkWindow.get_focus();
tv.buffer.copy_clipboard(Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD));
}
- else if(window.get_focus()==(Gtk.Widget)entry) {
+ else if(gtkWindow.get_focus()==(Gtk.Widget)entry) {
entry.copy_clipboard();
}
}
private void cut() {
- if(window.get_focus()==(Gtk.Widget)entry) {
+ if(gtkWindow.get_focus()==(Gtk.Widget)entry) {
entry.cut_clipboard();
}
}
private void editMenu(Action a) {
- if(window.get_focus()==(Gtk.Widget)outgoingAsciiTextView || window.get_focus()==(Gtk.Widget)incomingAsciiTextView || window.get_focus()==(Gtk.Widget)outgoingHexTextView || window.get_focus()==(Gtk.Widget)incomingHexTextView) {
+ if(gtkWindow.get_focus()==(Gtk.Widget)outgoingAsciiTextView || gtkWindow.get_focus()==(Gtk.Widget)incomingAsciiTextView || gtkWindow.get_focus()==(Gtk.Widget)outgoingHexTextView || gtkWindow.get_focus()==(Gtk.Widget)incomingHexTextView) {
cutMenuItem.set_sensitive(false);
- TextView tv = (TextView)window.get_focus();
+ TextView tv = (TextView)gtkWindow.get_focus();
if(tv.buffer.has_selection)
copyMenuItem.set_sensitive(true);
else
copyMenuItem.set_sensitive(false);
}
- else if(window.get_focus()==(Gtk.Widget)entry){
+ else if(gtkWindow.get_focus()==(Gtk.Widget)entry){
int s=0;
int e=0;
if(entry.get_selection_bounds(s, e)) {
Modified: trunk/src/SerialConnection.vala
==============================================================================
--- trunk/src/SerialConnection.vala (original)
+++ trunk/src/SerialConnection.vala Fri Mar 13 14:40:01 2009
@@ -19,7 +19,7 @@
public enum LineEnd{ CRLF, CR, LF, TAB, NONE }
uint? sourceId;
bool localEcho;
- public bool connect (Settings settings) {
+ public bool doConnect (Settings settings) {
if (settings.accessMode==Settings.AccessMode.READWRITE)
flags=POSIX.File.AccessMode.RDWR;
@@ -101,7 +101,7 @@
return s;
}
- public void disconnect () {
+ public void doDisconnect () {
if(connected) {
GLib.Source.remove(sourceId);
sourceId = null;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
