commit-gnue
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

r6139 - in trunk/gnue-forms: po src src/uidrivers/curses src/uidrivers/c


From: reinhard
Subject: r6139 - in trunk/gnue-forms: po src src/uidrivers/curses src/uidrivers/curses/widgets
Date: Wed, 4 Aug 2004 18:01:50 -0500 (CDT)

Author: reinhard
Date: 2004-08-04 18:01:47 -0500 (Wed, 04 Aug 2004)
New Revision: 6139

Modified:
   trunk/gnue-forms/po/de.po
   trunk/gnue-forms/po/es_ES.po
   trunk/gnue-forms/po/es_MX.po
   trunk/gnue-forms/po/fr.po
   trunk/gnue-forms/po/hu.po
   trunk/gnue-forms/po/lt.po
   trunk/gnue-forms/po/ro.po
   trunk/gnue-forms/po/ru.po
   trunk/gnue-forms/src/GFKeyMapper.py
   trunk/gnue-forms/src/uidrivers/curses/UIdriver.py
   trunk/gnue-forms/src/uidrivers/curses/widgets/box.py
   trunk/gnue-forms/src/uidrivers/curses/widgets/form.py
   trunk/gnue-forms/src/uidrivers/curses/widgets/page.py
Log:
Implemented box widget and function key bar.


Modified: trunk/gnue-forms/po/de.po
===================================================================
--- trunk/gnue-forms/po/de.po   2004-08-04 21:51:41 UTC (rev 6138)
+++ trunk/gnue-forms/po/de.po   2004-08-04 23:01:47 UTC (rev 6139)
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNUe-Forms 0.5\n"
-"POT-Creation-Date: Wed Aug  4 09:14:13 2004\n"
+"POT-Creation-Date: Thu Aug  5 00:46:33 2004\n"
 "PO-Revision-Date: $Date: $\n"
 "Last-Translator: Johannes Vetter <address@hidden>\n"
 "MIME-Version: 1.0\n"
@@ -142,7 +142,10 @@
 "Database commit error:\n"
 "%s\n"
 "%s "
-msgstr "Fehler beim Commit:\n%s\n%s"
+msgstr ""
+"Fehler beim Commit:\n"
+"%s\n"
+"%s"
 
 #: GFForm.py:593
 msgid ""
@@ -295,12 +298,12 @@
 msgstr "Datens�tze k�nnen erzeugt und ge�ndert werden"
 
 #: GFParser.py:243 GFParser.py:482 GFParser.py:702
-#: uidrivers/curses/widgets/form.py:154
+#: uidrivers/curses/widgets/form.py:157
 msgid "Yes"
 msgstr "Ja"
 
 #: GFParser.py:244 GFParser.py:483 GFParser.py:703
-#: uidrivers/curses/widgets/form.py:155
+#: uidrivers/curses/widgets/form.py:158
 msgid "No"
 msgstr "Nein"
 
@@ -873,11 +876,45 @@
 msgid "Close"
 msgstr "&Schlie�en"
 
-#: uidrivers/curses/UIdriver.py:191
+#: uidrivers/curses/UIdriver.py:209
 msgid "processing..."
 msgstr "bitte warten..."
 
-#: uidrivers/curses/widgets/form.py:156
+#: uidrivers/curses/UIdriver.py:262
+msgid "Save"
+msgstr "Speichern"
+
+#: uidrivers/curses/UIdriver.py:263
+msgid "Revert"
+msgstr "Verwerfen"
+
+#: uidrivers/curses/UIdriver.py:264
+msgid "Insert"
+msgstr "Einf�gen"
+
+#: uidrivers/curses/UIdriver.py:265
+msgid "Delete"
+msgstr "L�schen"
+
+#: uidrivers/curses/UIdriver.py:266
+msgid "Query"
+msgstr "Suchen"
+
+#: uidrivers/curses/UIdriver.py:267
+msgid "Execute"
+msgstr "Ausf�hren"
+
+#: uidrivers/curses/UIdriver.py:268 uidrivers/qt/UILoginHandler.py:120
+#: uidrivers/win32/UILoginHandler.py:145 uidrivers/wx/ErrorHandler.py:132
+#: uidrivers/wx/UILoginHandler.py:125
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: uidrivers/curses/UIdriver.py:269
+msgid "Exit"
+msgstr "Beenden"
+
+#: uidrivers/curses/widgets/form.py:159
 msgid "Ok"
 msgstr "Ok"
 
@@ -891,7 +928,10 @@
 "Unable to start GNUe Forms:\n"
 "\n"
 "%s"
-msgstr "GNUe Forms kann nicht gestartet werden:\n\n%s"
+msgstr ""
+"GNUe Forms kann nicht gestartet werden:\n"
+"\n"
+"%s"
 
 #: uidrivers/gtk2/ErrorHandler.py:83
 msgid ""
@@ -900,7 +940,10 @@
 "Type %(type)s\n"
 "Value %(value)s"
 msgstr ""
-"Ein Fehler is in GNUe Forms aufgetreten:\n\nType %(types)\nWert %(value)s"
+"Ein Fehler is in GNUe Forms aufgetreten:\n"
+"\n"
+"Type %(types)\n"
+"Wert %(value)s"
 
 #: uidrivers/gtk2/UILoginHandler.py:44 uidrivers/qt/UILoginHandler.py:68
 #: uidrivers/qt/UILoginHandler.py:69 uidrivers/win32/UILoginHandler.py:103
@@ -910,8 +953,7 @@
 
 #: uidrivers/gtk2/UILoginHandler.py:62
 msgid "Login required for %(newline)s\"%(description)s\""
-msgstr ""
-"Anmeldung erforderlich f�r %(newline)s\"%(description)s\""
+msgstr "Anmeldung erforderlich f�r %(newline)s\"%(description)s\""
 
 #: uidrivers/gtk2/UIdriver.py:40
 msgid "Import error: You need pygtk 2.2 to use the gtk2 user interface driver."
@@ -984,11 +1026,6 @@
 msgid "Login"
 msgstr "Anmelden"
 
-#: uidrivers/qt/UILoginHandler.py:120 uidrivers/win32/UILoginHandler.py:145
-#: uidrivers/wx/ErrorHandler.py:132 uidrivers/wx/UILoginHandler.py:125
-msgid "Cancel"
-msgstr "Abbrechen"
-
 #: uidrivers/qt/UIdriver.py:39
 msgid "The GNUe-Forms QT3 driver requires PyQT."
 msgstr "Der GNUe-Forms QT3 Treiber ben�tigt PyQT."

Modified: trunk/gnue-forms/po/es_ES.po
===================================================================
--- trunk/gnue-forms/po/es_ES.po        2004-08-04 21:51:41 UTC (rev 6138)
+++ trunk/gnue-forms/po/es_ES.po        2004-08-04 23:01:47 UTC (rev 6139)
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNUe-Forms-0.5.5\n"
-"POT-Creation-Date: Wed Aug  4 09:14:13 2004\n"
+"POT-Creation-Date: Thu Aug  5 00:46:33 2004\n"
 "PO-Revision-Date: 2004-06-09\n"
 "Last-Translator: Jose Esteban <address@hidden>\n"
 "Language-Team: es_ES\n"
@@ -296,12 +296,12 @@
 msgstr "Permitir edici�n"
 
 #: GFParser.py:243 GFParser.py:482 GFParser.py:702
-#: uidrivers/curses/widgets/form.py:154
+#: uidrivers/curses/widgets/form.py:157
 msgid "Yes"
 msgstr "S�"
 
 #: GFParser.py:244 GFParser.py:483 GFParser.py:703
-#: uidrivers/curses/widgets/form.py:155
+#: uidrivers/curses/widgets/form.py:158
 msgid "No"
 msgstr "No"
 
@@ -872,11 +872,49 @@
 msgid "Close"
 msgstr "Cerrar"
 
-#: uidrivers/curses/UIdriver.py:191
+#: uidrivers/curses/UIdriver.py:209
 msgid "processing..."
 msgstr ""
 
-#: uidrivers/curses/widgets/form.py:156
+#: uidrivers/curses/UIdriver.py:262
+msgid "Save"
+msgstr ""
+
+#: uidrivers/curses/UIdriver.py:263
+#, fuzzy
+msgid "Revert"
+msgstr "Deshace cambios"
+
+#: uidrivers/curses/UIdriver.py:264
+msgid "Insert"
+msgstr ""
+
+#: uidrivers/curses/UIdriver.py:265
+#, fuzzy
+msgid "Delete"
+msgstr "Permitir borrado"
+
+#: uidrivers/curses/UIdriver.py:266
+#, fuzzy
+msgid "Query"
+msgstr "Permitir interrogaci�n"
+
+#: uidrivers/curses/UIdriver.py:267
+msgid "Execute"
+msgstr ""
+
+#: uidrivers/curses/UIdriver.py:268 uidrivers/qt/UILoginHandler.py:120
+#: uidrivers/win32/UILoginHandler.py:145 uidrivers/wx/ErrorHandler.py:132
+#: uidrivers/wx/UILoginHandler.py:125
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: uidrivers/curses/UIdriver.py:269
+#, fuzzy
+msgid "Exit"
+msgstr "&Edita"
+
+#: uidrivers/curses/widgets/form.py:159
 msgid "Ok"
 msgstr ""
 
@@ -991,11 +1029,6 @@
 msgid "Login"
 msgstr "Login"
 
-#: uidrivers/qt/UILoginHandler.py:120 uidrivers/win32/UILoginHandler.py:145
-#: uidrivers/wx/ErrorHandler.py:132 uidrivers/wx/UILoginHandler.py:125
-msgid "Cancel"
-msgstr "Cancelar"
-
 #: uidrivers/qt/UIdriver.py:39
 msgid "The GNUe-Forms QT3 driver requires PyQT."
 msgstr "El modo QT de GNUe-Forms requiere PyQT"

Modified: trunk/gnue-forms/po/es_MX.po
===================================================================
--- trunk/gnue-forms/po/es_MX.po        2004-08-04 21:51:41 UTC (rev 6138)
+++ trunk/gnue-forms/po/es_MX.po        2004-08-04 23:01:47 UTC (rev 6139)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: Wed Aug  4 09:14:13 2004\n"
+"POT-Creation-Date: Thu Aug  5 00:46:33 2004\n"
 "PO-Revision-Date: 2002-07-05 13:48+0200\n"
 "Last-Translator: Enrique Sanchez <address@hidden>\n"
 "Language-Team: Espa~ol/Mexico\n"
@@ -302,12 +302,12 @@
 msgstr ""
 
 #: GFParser.py:243 GFParser.py:482 GFParser.py:702
-#: uidrivers/curses/widgets/form.py:154
+#: uidrivers/curses/widgets/form.py:157
 msgid "Yes"
 msgstr ""
 
 #: GFParser.py:244 GFParser.py:483 GFParser.py:703
-#: uidrivers/curses/widgets/form.py:155
+#: uidrivers/curses/widgets/form.py:158
 #, fuzzy
 msgid "No"
 msgstr "nov"
@@ -924,11 +924,49 @@
 msgid "Close"
 msgstr "&Cerrar"
 
-#: uidrivers/curses/UIdriver.py:191
+#: uidrivers/curses/UIdriver.py:209
 msgid "processing..."
 msgstr ""
 
-#: uidrivers/curses/widgets/form.py:156
+#: uidrivers/curses/UIdriver.py:262
+#, fuzzy
+msgid "Save"
+msgstr "&Guarda"
+
+#: uidrivers/curses/UIdriver.py:263
+#, fuzzy
+msgid "Revert"
+msgstr "Guardar Cambios"
+
+#: uidrivers/curses/UIdriver.py:264
+msgid "Insert"
+msgstr ""
+
+#: uidrivers/curses/UIdriver.py:265
+#, fuzzy
+msgid "Delete"
+msgstr "&Elimina"
+
+#: uidrivers/curses/UIdriver.py:266
+msgid "Query"
+msgstr ""
+
+#: uidrivers/curses/UIdriver.py:267
+msgid "Execute"
+msgstr ""
+
+#: uidrivers/curses/UIdriver.py:268 uidrivers/qt/UILoginHandler.py:120
+#: uidrivers/win32/UILoginHandler.py:145 uidrivers/wx/ErrorHandler.py:132
+#: uidrivers/wx/UILoginHandler.py:125
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: uidrivers/curses/UIdriver.py:269
+#, fuzzy
+msgid "Exit"
+msgstr "S&alir"
+
+#: uidrivers/curses/widgets/form.py:159
 msgid "Ok"
 msgstr ""
 
@@ -1042,11 +1080,6 @@
 msgid "Login"
 msgstr "Login"
 
-#: uidrivers/qt/UILoginHandler.py:120 uidrivers/win32/UILoginHandler.py:145
-#: uidrivers/wx/ErrorHandler.py:132 uidrivers/wx/UILoginHandler.py:125
-msgid "Cancel"
-msgstr "Cancelar"
-
 #: uidrivers/qt/UIdriver.py:39
 msgid "The GNUe-Forms QT3 driver requires PyQT."
 msgstr ""
@@ -1879,9 +1912,6 @@
 #~ msgid "Clear Form (F11)"
 #~ msgstr "Limpiar Forma (F11)"
 
-#~ msgid "E&xit"
-#~ msgstr "S&alir"
-
 #~ msgid "Cut"
 #~ msgstr "Cortar"
 
@@ -2171,9 +2201,6 @@
 #~ msgid "Open &Recent"
 #~ msgstr "Abre R&eciente"
 
-#~ msgid "&Save"
-#~ msgstr "&Guarda"
-
 #~ msgid "Save the current object"
 #~ msgstr "Guarda el objeto actual"
 
@@ -2229,9 +2256,6 @@
 #~ msgid "Paste the current object on the clipboard with special attributes"
 #~ msgstr "Pega el objeto actual desde el clipboard con atributos especiales"
 
-#~ msgid "&Delete"
-#~ msgstr "&Elimina"
-
 #~ msgid "Delete the current object"
 #~ msgstr "Elimina el objeto actual"
 

Modified: trunk/gnue-forms/po/fr.po
===================================================================
--- trunk/gnue-forms/po/fr.po   2004-08-04 21:51:41 UTC (rev 6138)
+++ trunk/gnue-forms/po/fr.po   2004-08-04 23:01:47 UTC (rev 6139)
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: Wed Aug  4 09:14:13 2004\n"
+"POT-Creation-Date: Thu Aug  5 00:46:33 2004\n"
 "PO-Revision-Date: 2004-04-10 19:29+0200\n"
 "Last-Translator: Laurent Savaete <address@hidden>\n"
 "Language-Team: Francais <address@hidden>\n"
@@ -306,12 +306,12 @@
 msgstr ""
 
 #: GFParser.py:243 GFParser.py:482 GFParser.py:702
-#: uidrivers/curses/widgets/form.py:154
+#: uidrivers/curses/widgets/form.py:157
 msgid "Yes"
 msgstr ""
 
 #: GFParser.py:244 GFParser.py:483 GFParser.py:703
-#: uidrivers/curses/widgets/form.py:155
+#: uidrivers/curses/widgets/form.py:158
 msgid "No"
 msgstr ""
 
@@ -893,11 +893,48 @@
 msgid "Close"
 msgstr "Fermer"
 
-#: uidrivers/curses/UIdriver.py:191
+#: uidrivers/curses/UIdriver.py:209
 msgid "processing..."
 msgstr ""
 
-#: uidrivers/curses/widgets/form.py:156
+#: uidrivers/curses/UIdriver.py:262
+msgid "Save"
+msgstr ""
+
+#: uidrivers/curses/UIdriver.py:263
+#, fuzzy
+msgid "Revert"
+msgstr "Annuler les changements"
+
+#: uidrivers/curses/UIdriver.py:264
+msgid "Insert"
+msgstr ""
+
+#: uidrivers/curses/UIdriver.py:265
+#, fuzzy
+msgid "Delete"
+msgstr "D�faut"
+
+#: uidrivers/curses/UIdriver.py:266
+msgid "Query"
+msgstr ""
+
+#: uidrivers/curses/UIdriver.py:267
+msgid "Execute"
+msgstr ""
+
+#: uidrivers/curses/UIdriver.py:268 uidrivers/qt/UILoginHandler.py:120
+#: uidrivers/win32/UILoginHandler.py:145 uidrivers/wx/ErrorHandler.py:132
+#: uidrivers/wx/UILoginHandler.py:125
+msgid "Cancel"
+msgstr "Annuler"
+
+#: uidrivers/curses/UIdriver.py:269
+#, fuzzy
+msgid "Exit"
+msgstr "&Edition"
+
+#: uidrivers/curses/widgets/form.py:159
 msgid "Ok"
 msgstr ""
 
@@ -1009,11 +1046,6 @@
 msgid "Login"
 msgstr "Connexion"
 
-#: uidrivers/qt/UILoginHandler.py:120 uidrivers/win32/UILoginHandler.py:145
-#: uidrivers/wx/ErrorHandler.py:132 uidrivers/wx/UILoginHandler.py:125
-msgid "Cancel"
-msgstr "Annuler"
-
 #: uidrivers/qt/UIdriver.py:39
 msgid "The GNUe-Forms QT3 driver requires PyQT."
 msgstr "Le pilote QT3 pour GNUe Forms n�cessite PyQT."

Modified: trunk/gnue-forms/po/hu.po
===================================================================
--- trunk/gnue-forms/po/hu.po   2004-08-04 21:51:41 UTC (rev 6138)
+++ trunk/gnue-forms/po/hu.po   2004-08-04 23:01:47 UTC (rev 6139)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: GNUe\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: Wed Aug  4 09:14:13 2004\n"
+"POT-Creation-Date: Thu Aug  5 00:46:33 2004\n"
 "PO-Revision-Date: 2004-06-09 22:41+0200\n"
 "Last-Translator: Kmetyk� G�bor <address@hidden>\n"
 "Language-Team: Kmetyk� G�bor <address@hidden>\n"
@@ -302,12 +302,12 @@
 msgstr "Szerkeszt�s enged�lyez�se"
 
 #: GFParser.py:243 GFParser.py:482 GFParser.py:702
-#: uidrivers/curses/widgets/form.py:154
+#: uidrivers/curses/widgets/form.py:157
 msgid "Yes"
 msgstr "Igen"
 
 #: GFParser.py:244 GFParser.py:483 GFParser.py:703
-#: uidrivers/curses/widgets/form.py:155
+#: uidrivers/curses/widgets/form.py:158
 msgid "No"
 msgstr "Nem"
 
@@ -916,11 +916,49 @@
 msgid "Close"
 msgstr "Bez�r"
 
-#: uidrivers/curses/UIdriver.py:191
+#: uidrivers/curses/UIdriver.py:209
 msgid "processing..."
 msgstr ""
 
-#: uidrivers/curses/widgets/form.py:156
+#: uidrivers/curses/UIdriver.py:262
+msgid "Save"
+msgstr ""
+
+#: uidrivers/curses/UIdriver.py:263
+#, fuzzy
+msgid "Revert"
+msgstr "M�dos�t�sok visszavon�sa"
+
+#: uidrivers/curses/UIdriver.py:264
+msgid "Insert"
+msgstr ""
+
+#: uidrivers/curses/UIdriver.py:265
+#, fuzzy
+msgid "Delete"
+msgstr "T�rl�sek enged�lyezve"
+
+#: uidrivers/curses/UIdriver.py:266
+#, fuzzy
+msgid "Query"
+msgstr "Lek�rdez�s enged�lyezve"
+
+#: uidrivers/curses/UIdriver.py:267
+msgid "Execute"
+msgstr ""
+
+#: uidrivers/curses/UIdriver.py:268 uidrivers/qt/UILoginHandler.py:120
+#: uidrivers/win32/UILoginHandler.py:145 uidrivers/wx/ErrorHandler.py:132
+#: uidrivers/wx/UILoginHandler.py:125
+msgid "Cancel"
+msgstr "M�gse"
+
+#: uidrivers/curses/UIdriver.py:269
+#, fuzzy
+msgid "Exit"
+msgstr "&Szerkeszt�s"
+
+#: uidrivers/curses/widgets/form.py:159
 msgid "Ok"
 msgstr ""
 
@@ -1034,11 +1072,6 @@
 msgid "Login"
 msgstr "Bejelentkez�s"
 
-#: uidrivers/qt/UILoginHandler.py:120 uidrivers/win32/UILoginHandler.py:145
-#: uidrivers/wx/ErrorHandler.py:132 uidrivers/wx/UILoginHandler.py:125
-msgid "Cancel"
-msgstr "M�gse"
-
 #: uidrivers/qt/UIdriver.py:39
 msgid "The GNUe-Forms QT3 driver requires PyQT."
 msgstr "A GNUe-Forms QT3 meghajt�hoz sz�ks�ges a PyQT."

Modified: trunk/gnue-forms/po/lt.po
===================================================================
--- trunk/gnue-forms/po/lt.po   2004-08-04 21:51:41 UTC (rev 6138)
+++ trunk/gnue-forms/po/lt.po   2004-08-04 23:01:47 UTC (rev 6139)
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: Wed Aug  4 09:14:13 2004\n"
+"POT-Creation-Date: Thu Aug  5 00:46:33 2004\n"
 "PO-Revision-Date: 2002-07-05 13:48+0200\n"
 "Last-Translator: Art�ras Kriukovas <address@hidden>\n"
 "Language-Team: Lithuania\n"
@@ -293,12 +293,12 @@
 msgstr ""
 
 #: GFParser.py:243 GFParser.py:482 GFParser.py:702
-#: uidrivers/curses/widgets/form.py:154
+#: uidrivers/curses/widgets/form.py:157
 msgid "Yes"
 msgstr ""
 
 #: GFParser.py:244 GFParser.py:483 GFParser.py:703
-#: uidrivers/curses/widgets/form.py:155
+#: uidrivers/curses/widgets/form.py:158
 msgid "No"
 msgstr ""
 
@@ -916,11 +916,49 @@
 msgid "Close"
 msgstr "&U�daryti"
 
-#: uidrivers/curses/UIdriver.py:191
+#: uidrivers/curses/UIdriver.py:209
 msgid "processing..."
 msgstr ""
 
-#: uidrivers/curses/widgets/form.py:156
+#: uidrivers/curses/UIdriver.py:262
+#, fuzzy
+msgid "Save"
+msgstr "&I�saugoti"
+
+#: uidrivers/curses/UIdriver.py:263
+#, fuzzy
+msgid "Revert"
+msgstr "I�saugoti pakeitimus"
+
+#: uidrivers/curses/UIdriver.py:264
+msgid "Insert"
+msgstr ""
+
+#: uidrivers/curses/UIdriver.py:265
+#, fuzzy
+msgid "Delete"
+msgstr "I�tri&nti"
+
+#: uidrivers/curses/UIdriver.py:266
+msgid "Query"
+msgstr ""
+
+#: uidrivers/curses/UIdriver.py:267
+msgid "Execute"
+msgstr ""
+
+#: uidrivers/curses/UIdriver.py:268 uidrivers/qt/UILoginHandler.py:120
+#: uidrivers/win32/UILoginHandler.py:145 uidrivers/wx/ErrorHandler.py:132
+#: uidrivers/wx/UILoginHandler.py:125
+msgid "Cancel"
+msgstr "Atsisakyti"
+
+#: uidrivers/curses/UIdriver.py:269
+#, fuzzy
+msgid "Exit"
+msgstr "I&�eiti"
+
+#: uidrivers/curses/widgets/form.py:159
 msgid "Ok"
 msgstr ""
 
@@ -1035,11 +1073,6 @@
 msgid "Login"
 msgstr "Prisijungti"
 
-#: uidrivers/qt/UILoginHandler.py:120 uidrivers/win32/UILoginHandler.py:145
-#: uidrivers/wx/ErrorHandler.py:132 uidrivers/wx/UILoginHandler.py:125
-msgid "Cancel"
-msgstr "Atsisakyti"
-
 #: uidrivers/qt/UIdriver.py:39
 msgid "The GNUe-Forms QT3 driver requires PyQT."
 msgstr ""
@@ -1614,9 +1647,6 @@
 #~ msgid "Clear Form (F11)"
 #~ msgstr "I�valyti form�  (F11)"
 
-#~ msgid "E&xit"
-#~ msgstr "I&�eiti"
-
 #~ msgid "Cut"
 #~ msgstr "I�kirpti"
 
@@ -1891,9 +1921,6 @@
 #~ msgid "Open &Recent"
 #~ msgstr "Atidaryti n&esen�"
 
-#~ msgid "&Save"
-#~ msgstr "&I�saugoti"
-
 #~ msgid "Save the current object"
 #~ msgstr "I�saugo dabartin� objekt�"
 
@@ -1952,9 +1979,6 @@
 #~ msgid "Paste the current object on the clipboard with special attributes"
 #~ msgstr "�terpia objekt� su specialiais atributais"
 
-#~ msgid "&Delete"
-#~ msgstr "I�tri&nti"
-
 #~ msgid "Delete the current object"
 #~ msgstr "I�strina pa�ym�t� objekt�"
 

Modified: trunk/gnue-forms/po/ro.po
===================================================================
--- trunk/gnue-forms/po/ro.po   2004-08-04 21:51:41 UTC (rev 6138)
+++ trunk/gnue-forms/po/ro.po   2004-08-04 23:01:47 UTC (rev 6139)
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNUe Forms\n"
-"POT-Creation-Date: Wed Aug  4 09:14:13 2004\n"
+"POT-Creation-Date: Thu Aug  5 00:46:33 2004\n"
 "PO-Revision-Date: 2004-04-7 17:02+0200\n"
 "Last-Translator: Florin Boariu <address@hidden>\n"
 "Language-Team: Romanian\n"
@@ -301,12 +301,12 @@
 msgstr ""
 
 #: GFParser.py:243 GFParser.py:482 GFParser.py:702
-#: uidrivers/curses/widgets/form.py:154
+#: uidrivers/curses/widgets/form.py:157
 msgid "Yes"
 msgstr ""
 
 #: GFParser.py:244 GFParser.py:483 GFParser.py:703
-#: uidrivers/curses/widgets/form.py:155
+#: uidrivers/curses/widgets/form.py:158
 msgid "No"
 msgstr ""
 
@@ -887,11 +887,48 @@
 msgid "Close"
 msgstr "Inchide"
 
-#: uidrivers/curses/UIdriver.py:191
+#: uidrivers/curses/UIdriver.py:209
 msgid "processing..."
 msgstr ""
 
-#: uidrivers/curses/widgets/form.py:156
+#: uidrivers/curses/UIdriver.py:262
+msgid "Save"
+msgstr ""
+
+#: uidrivers/curses/UIdriver.py:263
+#, fuzzy
+msgid "Revert"
+msgstr "Reverseaza schimbarile"
+
+#: uidrivers/curses/UIdriver.py:264
+msgid "Insert"
+msgstr ""
+
+#: uidrivers/curses/UIdriver.py:265
+#, fuzzy
+msgid "Delete"
+msgstr "Standard"
+
+#: uidrivers/curses/UIdriver.py:266
+msgid "Query"
+msgstr ""
+
+#: uidrivers/curses/UIdriver.py:267
+msgid "Execute"
+msgstr ""
+
+#: uidrivers/curses/UIdriver.py:268 uidrivers/qt/UILoginHandler.py:120
+#: uidrivers/win32/UILoginHandler.py:145 uidrivers/wx/ErrorHandler.py:132
+#: uidrivers/wx/UILoginHandler.py:125
+msgid "Cancel"
+msgstr "Alta data..."
+
+#: uidrivers/curses/UIdriver.py:269
+#, fuzzy
+msgid "Exit"
+msgstr "&Editare"
+
+#: uidrivers/curses/widgets/form.py:159
 msgid "Ok"
 msgstr ""
 
@@ -1003,11 +1040,6 @@
 msgid "Login"
 msgstr "Login"
 
-#: uidrivers/qt/UILoginHandler.py:120 uidrivers/win32/UILoginHandler.py:145
-#: uidrivers/wx/ErrorHandler.py:132 uidrivers/wx/UILoginHandler.py:125
-msgid "Cancel"
-msgstr "Alta data..."
-
 #: uidrivers/qt/UIdriver.py:39
 msgid "The GNUe-Forms QT3 driver requires PyQT."
 msgstr "Driver-ul GNUe-Forms pentru Qt3 cere PyQt."

Modified: trunk/gnue-forms/po/ru.po
===================================================================
--- trunk/gnue-forms/po/ru.po   2004-08-04 21:51:41 UTC (rev 6138)
+++ trunk/gnue-forms/po/ru.po   2004-08-04 23:01:47 UTC (rev 6139)
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: Wed Aug  4 09:14:13 2004\n"
+"POT-Creation-Date: Thu Aug  5 00:46:33 2004\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Dmitry Sorokin <address@hidden>\n"
 "Language-Team: Dmitry Sorokin <address@hidden>\n"
@@ -273,12 +273,12 @@
 msgstr ""
 
 #: GFParser.py:243 GFParser.py:482 GFParser.py:702
-#: uidrivers/curses/widgets/form.py:154
+#: uidrivers/curses/widgets/form.py:157
 msgid "Yes"
 msgstr ""
 
 #: GFParser.py:244 GFParser.py:483 GFParser.py:703
-#: uidrivers/curses/widgets/form.py:155
+#: uidrivers/curses/widgets/form.py:158
 #, fuzzy
 msgid "No"
 msgstr "���"
@@ -887,11 +887,47 @@
 msgid "Close"
 msgstr ""
 
-#: uidrivers/curses/UIdriver.py:191
+#: uidrivers/curses/UIdriver.py:209
 msgid "processing..."
 msgstr ""
 
-#: uidrivers/curses/widgets/form.py:156
+#: uidrivers/curses/UIdriver.py:262
+msgid "Save"
+msgstr ""
+
+#: uidrivers/curses/UIdriver.py:263
+#, fuzzy
+msgid "Revert"
+msgstr "��������� ���������"
+
+#: uidrivers/curses/UIdriver.py:264
+msgid "Insert"
+msgstr ""
+
+#: uidrivers/curses/UIdriver.py:265
+msgid "Delete"
+msgstr ""
+
+#: uidrivers/curses/UIdriver.py:266
+msgid "Query"
+msgstr ""
+
+#: uidrivers/curses/UIdriver.py:267
+msgid "Execute"
+msgstr ""
+
+#: uidrivers/curses/UIdriver.py:268 uidrivers/qt/UILoginHandler.py:120
+#: uidrivers/win32/UILoginHandler.py:145 uidrivers/wx/ErrorHandler.py:132
+#: uidrivers/wx/UILoginHandler.py:125
+msgid "Cancel"
+msgstr "������"
+
+#: uidrivers/curses/UIdriver.py:269
+#, fuzzy
+msgid "Exit"
+msgstr "�����"
+
+#: uidrivers/curses/widgets/form.py:159
 msgid "Ok"
 msgstr ""
 
@@ -998,11 +1034,6 @@
 msgid "Login"
 msgstr ""
 
-#: uidrivers/qt/UILoginHandler.py:120 uidrivers/win32/UILoginHandler.py:145
-#: uidrivers/wx/ErrorHandler.py:132 uidrivers/wx/UILoginHandler.py:125
-msgid "Cancel"
-msgstr "������"
-
 #: uidrivers/qt/UIdriver.py:39
 msgid "The GNUe-Forms QT3 driver requires PyQT."
 msgstr ""
@@ -1183,9 +1214,6 @@
 #~ msgid "Clear Form (F11)"
 #~ msgstr "�������� ����� (F11)"
 
-#~ msgid "E&xit"
-#~ msgstr "�����"
-
 #~ msgid "Paste text"
 #~ msgstr "�������� �����"
 

Modified: trunk/gnue-forms/src/GFKeyMapper.py
===================================================================
--- trunk/gnue-forms/src/GFKeyMapper.py 2004-08-04 21:51:41 UTC (rev 6138)
+++ trunk/gnue-forms/src/GFKeyMapper.py 2004-08-04 23:01:47 UTC (rev 6139)
@@ -288,7 +288,7 @@
     if getattr(vk,key) == keyvalue:
       return key
   if keyvalue >= 0 and keyvalue <= 255:
-    return chr (keyvalue)
+    return string.upper (chr (keyvalue))
   return None
 
 

Modified: trunk/gnue-forms/src/uidrivers/curses/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/curses/UIdriver.py   2004-08-04 21:51:41 UTC 
(rev 6138)
+++ trunk/gnue-forms/src/uidrivers/curses/UIdriver.py   2004-08-04 23:01:47 UTC 
(rev 6139)
@@ -22,6 +22,7 @@
 # $Id$
 
 import curses
+import string
 
 from gnue.common import events
 from gnue.common.apps import i18n
@@ -49,6 +50,7 @@
     curses.raw ()
     curses.start_color ()
 
+    # Define colors
     curses.init_pair (1, curses.COLOR_WHITE, curses.COLOR_BLUE)
     curses.init_pair (2, curses.COLOR_BLACK, curses.COLOR_WHITE)
     curses.init_pair (3, curses.COLOR_BLACK, curses.COLOR_CYAN)
@@ -71,13 +73,29 @@
     self.attr ['fkeys']       = curses.color_pair (4)
     self.attr ['infomsg']     = curses.color_pair (8) + curses.A_BOLD
     self.attr ['warnmsg']     = curses.color_pair (9) + curses.A_BOLD
-    self.attr ['errormsg']    = curses.color_pair (9) + curses.A_BOLD + 
curses.A_BLINK
-
+    self.attr ['errormsg']    = curses.color_pair (9) + curses.A_BOLD \
+                                                      + curses.A_BLINK
     self.__exiting = False
 
-    # This should go into the base driver:
     KeyMapper.setUIKeyMap (self._keymap)
 
+    # Find out all functions mapped to function keys
+                                        # Both hold [eventname, enabled] pairs:
+    self.__events_fkey = {}             #  by curses keycode
+    self.__events_name = {}             #  by event name
+    for fkey in range (curses.KEY_F1, curses.KEY_F20):
+      if self.__shiftkeys.has_key (fkey):
+        (key, shift, ctrl, meta) = self.__shiftkeys [fkey]
+      else:
+        (key, shift, ctrl, meta) = (fkey, False, False, False)
+      name = KeyMapper.getEvent (key, shift, ctrl, meta)
+      if name:
+        event = [name, False]
+        self.__events_fkey [fkey] = event
+        self.__events_name [name] = event
+        self.registerEventListeners ({'can'    + name: self.__canEvent,
+                                      'cannot' + name: self.__cannotEvent})
+
   # ---------------------------------------------------------------------------
   # Activate the given form
   # ---------------------------------------------------------------------------
@@ -223,3 +241,46 @@
 
     (y, x) = self.__screen.getmaxyx ()
     return (x, y)
+
+  # ---------------------------------------------------------------------------
+  # Helper method for forms to get active function keys
+  # ---------------------------------------------------------------------------
+
+  # Remember what events are enabled/disabled
+  def __canEvent (self, event):
+    name = event.__event__ [3:]
+    if self.__events_name.has_key (name):
+      self.__events_name [name] [1] = True
+
+  def __cannotEvent (self, event):
+    name = event.__event__ [6:]
+    if self.__events_name.has_key (name):
+      self.__events_name [name] [1] = False
+
+  # Texts to display in function key bar
+  __functionText = {
+    'COMMIT':        u_("Save"),
+    'ROLLBACK':      u_("Revert"),
+    'NEWRECORD':     u_("Insert"),
+    'MARKFORDELETE': u_("Delete"),
+    'ENTERQUERY':    u_("Query"),
+    'EXECQUERY':     u_("Execute"),
+    'CANCELQUERY':   u_("Cancel"),
+    'EXIT':          u_("Exit"),
+  }
+
+  # Now the real function
+  def getFunctionKeyLine (self):
+
+    keys = []
+    for fkey in range (curses.KEY_F1, curses.KEY_F20):
+      if self.__events_fkey.has_key (fkey):
+        (name, active) = self.__events_fkey [fkey]
+        if active and self.__functionText.has_key (name):
+          keys.append (KeyMapper.getEventKeystrokeRepr (name) + "=" + \
+                       self.__functionText [name])
+    if not self.__events_name.has_key ('EXIT'):
+      name = "EXIT"                     # Always show shortcut for Exit
+      keys.append (KeyMapper.getEventKeystrokeRepr (name) + "=" + \
+                   self.__functionText [name])
+    return string.join (keys, ' ')

Modified: trunk/gnue-forms/src/uidrivers/curses/widgets/box.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/curses/widgets/box.py        2004-08-04 
21:51:41 UTC (rev 6138)
+++ trunk/gnue-forms/src/uidrivers/curses/widgets/box.py        2004-08-04 
23:01:47 UTC (rev 6139)
@@ -21,6 +21,8 @@
 #
 # $Id$
 
+import curses
+
 from _base import UIHelper
 
 # =============================================================================
@@ -28,9 +30,29 @@
 # =============================================================================
 
 class UIBox (UIHelper):
+
   def _init (self, index):
-    pass
 
+    attr = self._uiDriver.attr ['background']
+
+    w = self._gfObject ['Char:width']
+    h = self._gfObject ['Char:height']
+
+    for pos in range (self._x+1, self._x+w-1):
+      self._parent.putchar (pos, self._y    , curses.ACS_HLINE, attr)
+      self._parent.putchar (pos, self._y+h-1, curses.ACS_HLINE, attr)
+
+    for line in range (self._y+1, self._y+h-1):
+      self._parent.putchar (self._x    , line, curses.ACS_VLINE, attr)
+      self._parent.putchar (self._x+w-1, line, curses.ACS_VLINE, attr)
+
+    self._parent.putchar (self._x    , self._y    , curses.ACS_ULCORNER, attr)
+    self._parent.putchar (self._x+w-1, self._y    , curses.ACS_URCORNER, attr)
+    self._parent.putchar (self._x    , self._y+h-1, curses.ACS_LLCORNER, attr)
+    self._parent.putchar (self._x+w-1, self._y+h-1, curses.ACS_LRCORNER, attr)
+
+    self._parent.write (self._x+2, self._y, self._gfObject.label, attr)
+
 # =============================================================================
 # Configuration data
 # =============================================================================

Modified: trunk/gnue-forms/src/uidrivers/curses/widgets/form.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/curses/widgets/form.py       2004-08-04 
21:51:41 UTC (rev 6138)
+++ trunk/gnue-forms/src/uidrivers/curses/widgets/form.py       2004-08-04 
23:01:47 UTC (rev 6139)
@@ -22,7 +22,10 @@
 # $Id$
 
 import curses
+import string
 
+from gnue.forms.GFKeyMapper import KeyMapper
+
 from gnue.forms.uidrivers._base import UIdriver as BaseDriver
 from gnue.forms.uidrivers._base.widgets._base import UIWidget
 
@@ -237,9 +240,9 @@
     recstr = '%d/%d' % (self.__curRec, self.__maxRec)
     pagestr = '%d/%d' % (self.__curPage, self.__maxPage)
 
-    self.__window.addstr (y - 2, 0,      '%s'   % tip)
-    self.__window.addstr (y - 2, x - 24, '%-4s' % self.__status)
-    self.__window.addstr (y - 2, x - 19, '%-3s' % self.__insert)
+    self.__window.addstr (y - 2, 0,      '%s'   % o(tip))
+    self.__window.addstr (y - 2, x - 24, '%-4s' % o(self.__status))
+    self.__window.addstr (y - 2, x - 19, '%-3s' % o(self.__insert))
     self.__window.addstr (y - 2, x - 15, '%-9s' % recstr)
     self.__window.addstr (y - 2, x -  5, '%-5s' % pagestr)
 
@@ -250,7 +253,7 @@
 
     self.__window.bkgdset (' ', self._uiDriver.attr ['fkeys'])
 
-    self.__window.addstr (y-1, 0, 'F1=foo F2=bar')
+    self.__window.addstr (y-1, 0, o(self._uiDriver.getFunctionKeyLine ()))
     self.__window.clrtoeol ()
 
     self.__window.refresh (y - 2, 0, y - 2, 0, y, x)

Modified: trunk/gnue-forms/src/uidrivers/curses/widgets/page.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/curses/widgets/page.py       2004-08-04 
21:51:41 UTC (rev 6138)
+++ trunk/gnue-forms/src/uidrivers/curses/widgets/page.py       2004-08-04 
23:01:47 UTC (rev 6139)
@@ -60,6 +60,14 @@
     self.__window.addstr (y, x, o(text), attribute)
 
   # ---------------------------------------------------------------------------
+  # Write a special character to a given position
+  # ---------------------------------------------------------------------------
+
+  def putchar (self, x, y, char, attribute):
+
+    self.__window.addch (y, x, char, attribute)
+
+  # ---------------------------------------------------------------------------
   # Move the cursor to a given position
   # ---------------------------------------------------------------------------
 





reply via email to

[Prev in Thread] Current Thread [Next in Thread]