[commit-gajim] r10411 - in trunk: data/glade src - Commits

12 Sep 2008

Author: bct
Date: 2008-09-12 07:25:10 +0200 (Fri, 12 Sep 2008)
New Revision: 10411
Modified:
   trunk/data/glade/esession_info_window.glade
   trunk/src/dialogs.py
Log:
add verified/not verified title text to the body of the esession dialog
Modified: trunk/data/glade/esession_info_window.glade
===================================================================

--- trunk/data/glade/esession_info_window.glade	2008-09-11 20:03:07 UTC (rev 10410)
+++ trunk/data/glade/esession_info_window.glade	2008-09-12 05:25:10 UTC (rev 10411)
@@ -27,42 +27,41 @@
       <property name="homogeneous">False</property>
       <property name="spacing">2</property>
-      <child>
-	<widget class="GtkHBox" id="hbox4">
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">4</property>
-
      <child>
-	    <widget class="GtkVBox" id="vbox2">
+	    <widget class="GtkHBox" id="title-hbox">
          <property name="visible">True</property>
          <property name="homogeneous">False</property>
          <property name="spacing">0</property>
<child>
-		<widget class="GtkImage" id="security_image">
-		  <property name="width_request">32</property>
-		  <property name="height_request">32</property>
-		  <property name="visible">True</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
+				<widget class="GtkImage" id="security_image">
+				  <property name="width_request">32</property>
+				  <property name="height_request">32</property>
+				  <property name="visible">True</property>
+				  <property name="xalign">0.5</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				</widget>
+				<packing>
+				  <property name="expand">False</property>
+				</packing>
          </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">True</property>
-	    </packing>
+			<child>
+          <widget class="GtkLabel" id="verification_status_label">
+            <property name="visible">True</property>
+            <property name="xalign">0</property>
+			 </widget>
+			</child>
+		  </widget>
      </child>
+		 <child>
+	<widget class="GtkHBox" id="hbox4">
+	  <property name="visible">True</property>
+	  <property name="homogeneous">False</property>
+	  <property name="spacing">4</property>
+
      <child>
        <widget class="GtkLabel" id="info_display">
          <property name="visible">True</property>
Modified: trunk/src/dialogs.py
===================================================================
--- trunk/src/dialogs.py	2008-09-11 20:03:07 UTC (rev 10410)
+++ trunk/src/dialogs.py	2008-09-12 05:25:10 UTC (rev 10411)
@@ -3827,8 +3827,15 @@
    		if self.session.control:
    			self.session.control._show_lock_image(True, 'E2E', True,
    				self.session.is_loggable(), True)
-			self.window.set_title(_('''Contact's identity verified'''))
-			self.xml.get_widget('dialog-action_area1').set_no_show_all(True) 
+
+			verification_status = _('''Contact's identity verified''')
+			self.window.set_title(verification_status)
+			self.xml.get_widget('verification_status_label').set_markup(
+				'<b><span size="x-large">' +
+				verification_status +
+				'</span></b>')
+
+			self.xml.get_widget('dialog-action_area1').set_no_show_all(True)
    		self.button_label.set_text(_('Verify again...'))
    	else:
    		if self.session.control:
@@ -3836,7 +3843,14 @@
    				self.session.is_loggable(), False)
    		labeltext += '\n\n' + _('''To be certain that <b>only</b> the expected person can read your messages or send you messages, you need to verify their identity by clicking the button below.''')
    		security_image = 'security-low-big.png'
-			self.window.set_title(_('''Contact's identity NOT verified'''))
+
+			verification_status = _('''Contact's identity NOT verified''')
+			self.window.set_title(verification_status)
+			self.xml.get_widget('verification_status_label').set_markup(
+				'<b><span size="x-large">' +
+				verification_status +
+				'</span></b>')
+
    		self.button_label.set_text(_('Verify...'))
path = os.path.join(dir, security_image)

    