From c72036ed7bedbc304496f048e7baf2b130aeb7da Mon Sep 17 00:00:00 2001
From: oepen <oepen@96b47cad-a561-4643-ad3b-153ac7d7599c>
Date: Mon, 5 Jul 2010 20:06:23 +0000
Subject: [PATCH] Bugfix: Fixed invalid naming of pace-gui-globals Minor layout
 modifications

git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@196 96b47cad-a561-4643-ad3b-153ac7d7599c
---
 pace-gui/src/pace-gui.py                                  | 8 +++++---
 .../{pace-gui-globals.py.in => pace_gui_globals.py.in}    | 2 +-
 pace-gui/src/pinpad.glade                                 | 8 +++++---
 3 files changed, 11 insertions(+), 7 deletions(-)
 rename pace-gui/src/{pace-gui-globals.py.in => pace_gui_globals.py.in} (98%)

diff --git a/pace-gui/src/pace-gui.py b/pace-gui/src/pace-gui.py
index 4acad70..ff631e8 100644
--- a/pace-gui/src/pace-gui.py
+++ b/pace-gui/src/pace-gui.py
@@ -16,7 +16,7 @@ except:
     print >> sys.stderr, "Could not import pace module, please install pyPACE"
     sys.exit(1)
 
-from pinpad_globals import *
+from pace_gui_globals import *
 
 at_chat_strings = [
         "Altersverifikation", #"Age Verification",
@@ -154,8 +154,10 @@ class CertificateDescriptionWindow(MokoWindow):
         cvc = pace.d2i_CV_CERT(binCert) #FIXME
         effective_date = self.formatDate(pace.get_effective_date(cvc))
         expiration_date = self.formatDate(pace.get_expiration_date(cvc))
-        self.addRow(u"Gültig ab:", effective_date)
-        self.addRow(u"Gültig bis:", expiration_date)
+        validity_period = effective_date + " - " + expiration_date
+        #self.addRow(u"Gültig ab:", effective_date)
+        #self.addRow(u"Gültig bis:", expiration_date)
+        self.addRow(u"Gültigkeitszeitraum:", validity_period)
 
         #Display issuer Name and possibly URL and subject name and possibly URL
         issuerName = pace.get_issuer_name(desc)
diff --git a/pace-gui/src/pace-gui-globals.py.in b/pace-gui/src/pace_gui_globals.py.in
similarity index 98%
rename from pace-gui/src/pace-gui-globals.py.in
rename to pace-gui/src/pace_gui_globals.py.in
index 4c21876..e6fce35 100644
--- a/pace-gui/src/pace-gui-globals.py.in
+++ b/pace-gui/src/pace_gui_globals.py.in
@@ -3,7 +3,7 @@ version = "@VERSION@"
 image_dir = "@prefix@/share/pixmaps"
 glade_dir = "@prefix@/share/" + name
 
-STR_NO_CARD = "<span fgcolor=\"red\" font_weight=\"bold\" font=\"11\">Keine Karte gefunden</span>"
+STR_NO_CARD = "<span fgcolor=\"red\" font_weight=\"bold\" font=\"11\">Keine Karte\ngefunden</span>"
 STR_CARD_FOUND = "<span fgcolor=\"green\" font_weight=\"bold\" font=\"11\">Karte gefunden</span>"
 ePA_ATR = "3b:84:80:01:00:00:90:00:95"
 
diff --git a/pace-gui/src/pinpad.glade b/pace-gui/src/pinpad.glade
index 67cb10c..b70651c 100644
--- a/pace-gui/src/pinpad.glade
+++ b/pace-gui/src/pinpad.glade
@@ -5,6 +5,7 @@
   <object class="GtkWindow" id="MainWindow">
     <property name="visible">True</property>
     <property name="title" translatable="yes">Pinpad</property>
+    <property name="resizable">False</property>
     <property name="window_position">center</property>
     <property name="default_width">480</property>
     <property name="default_height">640</property>
@@ -14,7 +15,6 @@
     <child>
       <object class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
         <child>
           <object class="GtkLabel" id="lblInstruction">
             <property name="visible">True</property>
@@ -64,8 +64,9 @@
         <child>
           <object class="GtkLabel" id="lbl_cardStatus">
             <property name="visible">True</property>
-            <property name="label" translatable="yes">&lt;span fgcolor="red" font_weight="bold" font="11"&gt;Keine Karte gefunden&lt;/span&gt;</property>
+            <property name="label" translatable="yes">&lt;span fgcolor="red" font="12"&gt;Kein Ausweis&lt;/span&gt;</property>
             <property name="use_markup">True</property>
+            <property name="justify">center</property>
           </object>
           <packing>
             <property name="position">4</property>
@@ -243,6 +244,8 @@
             </child>
           </object>
           <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
             <property name="position">5</property>
           </packing>
         </child>
@@ -265,7 +268,6 @@
     <child>
       <object class="GtkVBox" id="vbox2">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
         <child>
           <object class="GtkLabel" id="lblCaption">
             <property name="visible">True</property>