[Ecell-cvs] SF.net SVN: ecell:[3883] ecell3/trunk/ecell/frontend/session-monitor

[<mor...@us...>]

Revision: 3883
          http://ecell.svn.sourceforge.net/ecell/?rev=3883&view=rev
Author:   moriyoshi
Date:     2011-01-04 13:20:25 +0000 (Tue, 04 Jan 2011)

Log Message:
-----------
Fix a critical bug in LoggerWindow that logger data cannot be saved.

Modified Paths:
--------------
    ecell3/trunk/ecell/frontend/session-monitor/ecell/ui/osogo/LoggerWindow.py
    ecell3/trunk/ecell/frontend/session-monitor/glade/LoggerWindow.glade

Modified: ecell3/trunk/ecell/frontend/session-monitor/ecell/ui/osogo/LoggerWindow.py
===================================================================
--- ecell3/trunk/ecell/frontend/session-monitor/ecell/ui/osogo/LoggerWindow.py	2010-12-28 08:40:14 UTC (rev 3882)
+++ ecell3/trunk/ecell/frontend/session-monitor/ecell/ui/osogo/LoggerWindow.py	2011-01-04 13:20:25 UTC (rev 3883)
@@ -273,7 +273,7 @@
 
 		# [1-3] Now binary type is not supported by Logger.
 		# If binary type is selected, exit this method.
-		aType = self["datatype_combo"].get_text()
+		aType = self["datatype_combo"].get_active_text()
 
 		if aType == 'ecd':
 			pass
@@ -545,7 +545,7 @@
 	def getDataFileType (self ):
 		""" returns Data Type of file choosen by the user
 		"""
-		return self["datatype_combo"].get_text()
+		return self["datatype_combo"].get_active_text()
 
 	# ==============================================================================
 	def setDataFileType (self, aDataType ):

Modified: ecell3/trunk/ecell/frontend/session-monitor/glade/LoggerWindow.glade
===================================================================
--- ecell3/trunk/ecell/frontend/session-monitor/glade/LoggerWindow.glade	2010-12-28 08:40:14 UTC (rev 3882)
+++ ecell3/trunk/ecell/frontend/session-monitor/glade/LoggerWindow.glade	2011-01-04 13:20:25 UTC (rev 3883)
@@ -117,100 +117,14 @@
 				  </child>
 
 				  <child>
-				    <widget class="GtkCombo" id="datatype_combo">
+				    <widget class="GtkComboBox" id="datatype_combo">
 				      <property name="visible">True</property>
-				      <property name="value_in_list">False</property>
-				      <property name="allow_empty">False</property>
-				      <property name="case_sensitive">False</property>
+				      <property name="active">0</property>
 				      <property name="enable_arrow_keys">True</property>
 				      <property name="enable_arrows_always">False</property>
 
-				      <child>
-					<widget class="GtkEntry" id="datatype_combo_entry">
-					  <property name="visible">True</property>
-					  <property name="can_focus">True</property>
-					  <property name="editable">False</property>
-					  <property name="visibility">True</property>
-					  <property name="max_length">0</property>
-					  <property name="text" translatable="yes"></property>
-					  <property name="has_frame">True</property>
-					  <property name="invisible_char" translatable="yes">*</property>
-					  <property name="activates_default">False</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkList" id="convertwidget3">
-					  <property name="visible">True</property>
-					  <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-
-					  <child>
-					    <widget class="GtkListItem" id="convertwidget4">
-					      <property name="visible">True</property>
-
-					      <child>
-						<widget class="GtkLabel" id="convertwidget5">
-						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">ecd</property>
-						  <property name="use_underline">False</property>
-						  <property name="use_markup">False</property>
-						  <property name="justify">GTK_JUSTIFY_LEFT</property>
-						  <property name="wrap">False</property>
-						  <property name="selectable">False</property>
-						  <property name="xalign">0</property>
-						  <property name="yalign">0.5</property>
-						  <property name="xpad">0</property>
-						  <property name="ypad">0</property>
-						</widget>
-					      </child>
-					    </widget>
-					  </child>
-
-					  <child>
-					    <widget class="GtkListItem" id="convertwidget6">
-					      <property name="visible">True</property>
-
-					      <child>
-						<widget class="GtkLabel" id="convertwidget7">
-						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">binary</property>
-						  <property name="use_underline">False</property>
-						  <property name="use_markup">False</property>
-						  <property name="justify">GTK_JUSTIFY_LEFT</property>
-						  <property name="wrap">False</property>
-						  <property name="selectable">False</property>
-						  <property name="xalign">0</property>
-						  <property name="yalign">0.5</property>
-						  <property name="xpad">0</property>
-						  <property name="ypad">0</property>
-						</widget>
-					      </child>
-					    </widget>
-					  </child>
-
-					  <child>
-					    <widget class="GtkListItem" id="convertwidget8">
-					      <property name="visible">True</property>
-
-					      <child>
-						<widget class="GtkLabel" id="convertwidget9">
-						  <property name="visible">True</property>
-						  <property name="label" translatable="yes"></property>
-						  <property name="use_underline">False</property>
-						  <property name="use_markup">False</property>
-						  <property name="justify">GTK_JUSTIFY_LEFT</property>
-						  <property name="wrap">False</property>
-						  <property name="selectable">False</property>
-						  <property name="xalign">0</property>
-						  <property name="yalign">0.5</property>
-						  <property name="xpad">0</property>
-						  <property name="ypad">0</property>
-						</widget>
-					      </child>
-					    </widget>
-					  </child>
-					</widget>
-				      </child>
+				      <property name="items">ecd
+binary</property>
 				    </widget>
 				    <packing>
 				      <property name="padding">0</property>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.