[gnue] r10266 - in trunk/gnue-forms: . defaults defaults/default samples samples/function src src/uidrivers/curses/widgets src/uidrivers/qt3/widgets src/uidrivers/wx/widgets
[email protected] Fri, 3 Dec 2010 11:29:45 -0600 (CST)
| Newsgroups | gmane.comp.cms.gnue.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: reinhard Date: 2010-12-03 11:29:44 -0600 (Fri, 03 Dec 2010) New Revision: 10266 Modified: trunk/gnue-forms/ trunk/gnue-forms/defaults/default.gfd trunk/gnue-forms/defaults/default/de.gfd trunk/gnue-forms/defaults/default/el.gfd trunk/gnue-forms/defaults/default/es.gfd trunk/gnue-forms/defaults/default/fr.gfd trunk/gnue-forms/defaults/default/hu.gfd trunk/gnue-forms/samples/function/menu.gfd trunk/gnue-forms/samples/oldkeys.gfd trunk/gnue-forms/src/GFForm.py trunk/gnue-forms/src/uidrivers/curses/widgets/menu.py trunk/gnue-forms/src/uidrivers/qt3/widgets/menu.py trunk/gnue-forms/src/uidrivers/qt3/widgets/toolbar.py trunk/gnue-forms/src/uidrivers/wx/widgets/menu.py trunk/gnue-forms/src/uidrivers/wx/widgets/menuitem.py trunk/gnue-forms/src/uidrivers/wx/widgets/toolbar.py trunk/gnue-forms/src/uidrivers/wx/widgets/toolbutton.py Log: Changed names of default menu and toolbar objects, so form triggers can a= ccess them (for example, to hide them in an ON-STARTUP trigger). Property changes on: trunk/gnue-forms ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2010-12-03 12:54:17.599999905 +0100 committer: Reinhard M=C3=BCller <[email protected]> properties:=20 branch-nick: forms + timestamp: 2010-12-03 14:31:18.551000118 +0100 committer: Reinhard M=C3=BCller <[email protected]> properties:=20 branch-nick: forms Name: bzr:file-ids - src/GFObjects/GFBlock.py 1459@3a364389-8fce-0310-8f11-cc363fde16c7:t= runk%2Fgnue-forms:src%2FGFObjects%2FGFBlock.py src/GFObjects/GFField.py 1459@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%= 2Fgnue-forms:src%2FGFObjects%2FGFField.py + defaults/default.gfd 9272@3a364389-8fce-0310-8f11-cc363fde16c7:trunk= %2Fgnue-forms:defaults%2Fdefault.gfd defaults/default/de.gfd 9374@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2= Fgnue-forms:defaults%2Fdefault%2Fde.gfd defaults/default/el.gfd 10095@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%= 2Fgnue-forms:defaults%2Fdefault%2Fel.gfd defaults/default/es.gfd 9906@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2= Fgnue-forms:defaults%2Fdefault%2Fes.gfd defaults/default/fr.gfd 9695@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2= Fgnue-forms:defaults%2Fdefault%2Ffr.gfd defaults/default/hu.gfd 9407@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2= Fgnue-forms:defaults%2Fdefault%2Fhu.gfd samples/function/menu.gfd 9344@3a364389-8fce-0310-8f11-cc363fde16c7:trunk= %2Fgnue-forms:samples%2Ffunction%2Fmenu.gfd samples/oldkeys.gfd 9423@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnu= e-forms:samples%2Foldkeys.gfd src/GFForm.py 6@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:s= rc%2FGFForm.py src/uidrivers/curses/widgets/menu.py 9378@3a364389-8fce-0310-8f11-cc363fd= e16c7:trunk%2Fgnue-forms:src%2Fuidrivers%2Fcurses%2Fwidgets%2Fmenu.py src/uidrivers/qt3/widgets/menu.py 9345@3a364389-8fce-0310-8f11-cc363fde16= c7:trunk%2Fgnue-forms:src%2Fuidrivers%2Fqt3%2Fwidgets%2Fmenu.py src/uidrivers/qt3/widgets/toolbar.py 9485@3a364389-8fce-0310-8f11-cc363fd= e16c7:trunk%2Fgnue-forms:src%2Fuidrivers%2Fqt3%2Fwidgets%2Ftoolbar.py src/uidrivers/wx/widgets/menu.py 10053@3a364389-8fce-0310-8f11-cc363fde16= c7:trunk%2Fgnue-forms:src%2Fuidrivers%2Fwx%2Fwidgets%2Fmenu.py src/uidrivers/wx/widgets/menuitem.py 10053@3a364389-8fce-0310-8f11-cc363f= de16c7:trunk%2Fgnue-forms:src%2Fuidrivers%2Fwx%2Fwidgets%2Fmenuitem.py src/uidrivers/wx/widgets/toolbar.py 10053@3a364389-8fce-0310-8f11-cc363fd= e16c7:trunk%2Fgnue-forms:src%2Fuidrivers%2Fwx%2Fwidgets%2Ftoolbar.py src/uidrivers/wx/widgets/toolbutton.py 10053@3a364389-8fce-0310-8f11-cc36= 3fde16c7:trunk%2Fgnue-forms:src%2Fuidrivers%2Fwx%2Fwidgets%2Ftoolbutton.p= y Name: bzr:revision-id:v4 - 3116 [email protected] 3117 [email protected] 3118 [email protected] 3119 [email protected] 3120 [email protected] 3121 [email protected] 3122 [email protected] 3123 [email protected] 3124 [email protected] 3125 [email protected] 3126 [email protected] 3127 [email protected] 3128 [email protected] 3129 [email protected] 3130 [email protected] 3131 [email protected] 3132 [email protected] 3133 [email protected] 3134 [email protected] 3135 [email protected] 3136 [email protected] 3137 [email protected] 3138 [email protected] 3139 [email protected] 3140 [email protected] 3141 [email protected] 3142 [email protected] 3143 [email protected] 3144 [email protected] 3145 [email protected] 3146 [email protected] 3147 [email protected] 3148 [email protected] 3149 [email protected] 3150 [email protected] 3151 [email protected] 3152 [email protected] 3153 [email protected] 3154 [email protected] 3155 [email protected] 3156 [email protected] 3157 [email protected] 3158 [email protected] 3159 [email protected] 3160 [email protected] 3161 [email protected] 3162 [email protected] 3163 [email protected] 3164 [email protected] 3165 [email protected] 3166 [email protected] 3167 [email protected] 3168 [email protected] 3169 [email protected] 3170 [email protected] 3171 [email protected] 3172 [email protected] + 3116 [email protected] 3117 [email protected] 3118 [email protected] 3119 [email protected] 3120 [email protected] 3121 [email protected] 3122 [email protected] 3123 [email protected] 3124 [email protected] 3125 [email protected] 3126 [email protected] 3127 [email protected] 3128 [email protected] 3129 [email protected] 3130 [email protected] 3131 [email protected] 3132 [email protected] 3133 [email protected] 3134 [email protected] 3135 [email protected] 3136 [email protected] 3137 [email protected] 3138 [email protected] 3139 [email protected] 3140 [email protected] 3141 [email protected] 3142 [email protected] 3143 [email protected] 3144 [email protected] 3145 [email protected] 3146 [email protected] 3147 [email protected] 3148 [email protected] 3149 [email protected] 3150 [email protected] 3151 [email protected] 3152 [email protected] 3153 [email protected] 3154 [email protected] 3155 [email protected] 3156 [email protected] 3157 [email protected] 3158 [email protected] 3159 [email protected] 3160 [email protected] 3161 [email protected] 3162 [email protected] 3163 [email protected] 3164 [email protected] 3165 [email protected] 3166 [email protected] 3167 [email protected] 3168 [email protected] 3169 [email protected] 3170 [email protected] 3171 [email protected] 3172 [email protected] 3173 [email protected] Name: bzr:text-parents - src/GFObjects/GFBlock.py [email protected]= -eeesm6a88ihyja18 src/GFObjects/GFField.py [email protected]= 2nnl7ljp8ywo + defaults/default.gfd [email protected]= xjbctt6vc2usd defaults/default/de.gfd svn-v3-single1-dHJ1bmsvZ251ZS1mb3Jtcw..:3a364389-= 8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:9490 defaults/default/el.gfd [email protected]= kqbervc91ac defaults/default/es.gfd svn-v3-single1-dHJ1bmsvZ251ZS1mb3Jtcw..:3a364389-= 8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:9956 defaults/default/fr.gfd svn-v3-single1-dHJ1bmsvZ251ZS1mb3Jtcw..:3a364389-= 8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:9956 defaults/default/hu.gfd svn-v3-single1-dHJ1bmsvZ251ZS1mb3Jtcw..:3a364389-= 8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:9956 samples/function/menu.gfd svn-v3-single1-dHJ1bmsvZ251ZS1mb3Jtcw..:3a36438= 9-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:9436 samples/oldkeys.gfd svn-v3-single1-dHJ1bmsvZ251ZS1mb3Jtcw..:3a364389-8fce= -0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:9423 src/GFForm.py [email protected]= 7 src/uidrivers/curses/widgets/menu.py svn-v3-single1-dHJ1bmsvZ251ZS1mb3Jtc= w..:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:9956 src/uidrivers/qt3/widgets/menu.py svn-v3-single1-dHJ1bmsvZ251ZS1mb3Jtcw..= :3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:9956 src/uidrivers/qt3/widgets/toolbar.py svn-v3-single1-dHJ1bmsvZ251ZS1mb3Jtc= w..:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:9956 src/uidrivers/wx/widgets/menu.py svn-v3-single1-dHJ1bmsvZ251ZS1mb3Jtcw..:= 3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:10053 src/uidrivers/wx/widgets/menuitem.py svn-v3-single1-dHJ1bmsvZ251ZS1mb3Jtc= w..:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:10106 src/uidrivers/wx/widgets/toolbar.py svn-v3-single1-dHJ1bmsvZ251ZS1mb3Jtcw= ..:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:10053 src/uidrivers/wx/widgets/toolbutton.py svn-v3-single1-dHJ1bmsvZ251ZS1mb3J= tcw..:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:10106 Modified: trunk/gnue-forms/defaults/default/de.gfd =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/gnue-forms/defaults/default/de.gfd 2010-12-03 17:29:41 UTC (rev= 10265) +++ trunk/gnue-forms/defaults/default/de.gfd 2010-12-03 17:29:44 UTC (rev= 10266) @@ -1,7 +1,6 @@ <?xml version=3D"1.0"?> =20 <form> - <!-- Clipboard and selection --> <action name=3D"act__cut__" label=3D"Ausschneiden" description=3D"Mark= ierten Text ausschneiden"/> <action name=3D"act__copy__" label=3D"Kopieren" description=3D"Markier= ten Text in die Zwischenablage kopieren"/> @@ -41,13 +40,13 @@ <action name=3D"act__printout__" label=3D"Drucken" description=3D"Aktu= ellen Inhalt der Maske ausdrucken"/> <action name=3D"act__close__" label=3D"Schlie=C3=9Fen" description=3D"= Maske schlie=C3=9Fen"/> =20 - <menu name=3D"__main_menu__"> - <menu name=3D"__file__" label=3D"Datei"/> - <menu name=3D"__edit__" label=3D"Bearbeiten"/> - <menu name=3D"__navigation__" label=3D"Navigation"/> - <menu name=3D"__filter__" label=3D"Filter"/> + <menu name=3D"mnu__main_menu__"> + <menu name=3D"mnu__file__" label=3D"Datei"/> + <menu name=3D"mnu__edit__" label=3D"Bearbeiten"/> + <menu name=3D"mnu__navigation__" label=3D"Navigation"/> + <menu name=3D"mnu__filter__" label=3D"Filter"/> </menu> - <menu name=3D"__help_menu__"> - <menu name=3D"__help__" label=3D"Hilfe"/> + <menu name=3D"mnu__help_menu__"> + <menu name=3D"mnu__help__" label=3D"Hilfe"/> </menu> </form> Modified: trunk/gnue-forms/defaults/default/el.gfd =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/gnue-forms/defaults/default/el.gfd 2010-12-03 17:29:41 UTC (rev= 10265) +++ trunk/gnue-forms/defaults/default/el.gfd 2010-12-03 17:29:44 UTC (rev= 10266) @@ -1,266 +1,52 @@ <?xml version=3D"1.0"?> =20 -<!-- - GNU Enterprise default menu definition - - Copyright 2001-2007 Free Software Foundation - - This file is part of GNU Enterprise - - GNU Enterprise is free software; you can redistribute it - and/or modify it under the terms of the GNU General Public - License as published by the Free Software Foundation; either - version 3, or (at your option) any later version. - - GNU Enterprise is distributed in the hope that it will be - useful, but WITHOUT ANY WARRANTY; without even the implied - warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with program; see the file COPYING. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - - Suite 330, Boston, MA 02111-1307, USA. - - $Id: default.gfd 10022 2009-10-30 09:03:01Z reinhard $ ---> - <form> <!-- Clipboard and selection --> - <action name=3D"act__cut__" label=3D"C&ut" - description=3D"=CE=91=CF=80=CE=BF=CE=BA=CE=BF=CF=80=CE=AE =CE=B5=CF=80= =CE=B9=CE=BB=CE=B5=CE=B3=CE=BC=CE=AD=CE=BD=CE=BF=CF=85 =CE=BA=CE=B5=CE=B9= =CE=BC=CE=AD=CE=BD=CE=BF=CF=85"> - form.cut() - </action> - <action name=3D"act__copy__" label=3D"&Copy" - description=3D"=CE=91=CE=BD=CF=84=CE=B9=CE=B3=CF=81=CE=B1=CF=86=CE=AE= =CF=83=CF=84=CE=BF =CF=80=CF=81=CF=8C=CF=87=CE=B5=CE=B9=CF=81=CE=BF"> - form.copy() - </action> - <action name=3D"act__paste__" label=3D"&Paste" - description=3D"=CE=95=CF=80=CE=B9=CE=BA=CF=8C=CE=BB=CE=BB=CE=B7=CF=83= =CE=B7 =CE=B1=CF=80=CF=8C =CF=84=CE=BF =CF=80=CF=81=CF=8C=CF=87=CE=B5=CE=B9= =CF=81=CE=BF"> - form.paste() - </action> - <action name=3D"act__select_all__" label=3D"Select &All" - description=3D"=CE=95=CF=80=CE=B9=CE=BB=CE=BF=CE=B3=CE=AE =CF=8C=CE=BB= =CF=89=CE=BD"> - form.select_all() - </action> + <action name=3D"act__cut__" label=3D"=CE=91=CF=80=CE=BF=CE=BA=CE=BF=CF= =80=CE=AE" description=3D"=CE=91=CF=80=CE=BF=CE=BA=CE=BF=CF=80=CE=AE =CE=B5= =CF=80=CE=B9=CE=BB=CE=B5=CE=B3=CE=BC=CE=AD=CE=BD=CE=BF=CF=85 =CE=BA=CE=B5= =CE=B9=CE=BC=CE=AD=CE=BD=CE=BF=CF=85"/> + <action name=3D"act__copy__" label=3D"=CE=91=CE=BD=CF=84=CE=B9=CE=B3=CF= =81=CE=B1=CF=86=CE=AE" description=3D"=CE=91=CE=BD=CF=84=CE=B9=CE=B3=CF=81= =CE=B1=CF=86=CE=AE =CF=83=CF=84=CE=BF =CF=80=CF=81=CF=8C=CF=87=CE=B5=CE=B9= =CF=81=CE=BF"/> + <action name=3D"act__paste__" label=3D"=CE=95=CF=80=CE=B9=CE=BA=CF=8C=CE= =BB=CE=B7=CF=83=CE=B7" description=3D"=CE=95=CF=80=CE=B9=CE=BA=CF=8C=CE=BB= =CE=BB=CE=B7=CF=83=CE=B7 =CE=B1=CF=80=CF=8C =CF=84=CE=BF =CF=80=CF=81=CF=8C= =CF=87=CE=B5=CE=B9=CF=81=CE=BF"/> + <action name=3D"act__select_all__" label=3D"=CE=95=CF=80=CE=B9=CE=BB=CE= =BF=CE=B3=CE=AE =CF=8C=CE=BB=CF=89=CE=BD" description=3D"=CE=95=CF=80=CE=B9= =CE=BB=CE=BF=CE=B3=CE=AE =CF=8C=CE=BB=CF=89=CE=BD"/> =20 <!-- Focus management --> - <action name=3D"act__next_block__" label=3D"Next &Block" - description=3D"=CE=95=CF=80=CF=8C=CE=BC=CE=B5=CE=BD=CE=BF block"> - form.next_block() - </action> - <action name=3D"act__previous_block__" label=3D"Previous Bl&ock" - description=3D"=CE=A0=CF=81=CE=BF=CE=B7=CE=B3=CE=BF=CF=8D=CE=BC=CE=B5= =CE=BD=CE=BF block"> - form.previous_block() - </action> - <action name=3D"act__next_page__" label=3D"Next P&age" - description=3D"=CE=95=CF=80=CF=8C=CE=BC=CE=B5=CE=BD=CE=B7 =CF=83=CE=B5= =CE=BB=CE=AF=CE=B4=CE=B1"> - form.next_page() - </action> - <action name=3D"act__previous_page__" label=3D"Pre&vious Page" - description=3D"=CE=A0=CF=81=CE=BF=CE=B7=CE=B3=CE=BF=CF=8D=CE=BC=CE=B5= =CE=BD=CE=B7 =CF=83=CE=B5=CE=BB=CE=AF=CE=B4=CE=B1"> - form.previous_page() - </action> + <action name=3D"act__next_block__" label=3D"=CE=95=CF=80=CF=8C=CE=BC=CE= =B5=CE=BD=CE=BF block" description=3D"=CE=95=CF=80=CF=8C=CE=BC=CE=B5=CE=BD= =CE=BF block"/> + <action name=3D"act__previous_block__" label=3D"=CE=A0=CF=81=CE=BF=CE=B7= =CE=B3=CE=BF=CF=8D=CE=BC=CE=B5=CE=BD=CE=BF block" description=3D"=CE=A0=CF= =81=CE=BF=CE=B7=CE=B3=CE=BF=CF=8D=CE=BC=CE=B5=CE=BD=CE=BF block"/> + <action name=3D"act__next_page__" label=3D"=CE=95=CF=80=CF=8C=CE=BC=CE= =B5=CE=BD=CE=B7 =CF=83=CE=B5=CE=BB=CE=AF=CE=B4=CE=B1" description=3D"=CE=95= =CF=80=CF=8C=CE=BC=CE=B5=CE=BD=CE=B7 =CF=83=CE=B5=CE=BB=CE=AF=CE=B4=CE=B1= "/> + <action name=3D"act__previous_page__" label=3D"=CE=A0=CF=81=CE=BF=CE=B7= =CE=B3=CE=BF=CF=8D=CE=BC=CE=B5=CE=BD=CE=B7 =CF=83=CE=B5=CE=BB=CE=AF=CE=B4= =CE=B1" description=3D"=CE=A0=CF=81=CE=BF=CE=B7=CE=B3=CE=BF=CF=8D=CE=BC=CE= =B5=CE=BD=CE=B7 =CF=83=CE=B5=CE=BB=CE=AF=CE=B4=CE=B1"/> =20 <!-- Record navigation --> - <action name=3D"act__first_record__" icon=3D"firstrecord" label=3D"&am= p;First Record" - description=3D"=CE=A0=CE=BB=CE=BF=CE=AE=CE=B3=CE=B7=CF=83=CE=B7 =CF=83= =CF=84=CE=BF =CF=84=CF=81=CE=AD=CF=87=CE=BF=CE=BD block =CF=83=CF=84=CE=B7= =CE=BD =CF=80=CF=81=CF=8E=CF=84=CE=B7 =CE=B5=CE=B3=CE=B3=CF=81=CE=B1=CF=86= =CE=AE"> - form.first_record() - </action> - <action name=3D"act__prev_record__" icon=3D"prevrecord" label=3D"Previ= ous R&ecord" - description=3D"=CE=A0=CE=BB=CE=BF=CE=AE=CE=B3=CE=B7=CF=83=CE=B7 =CF=83= =CF=84=CE=BF =CF=84=CF=81=CE=AD=CF=87=CE=BF=CE=BD block =CF=83=CF=84=CE=B7= =CE=BD =CF=80=CF=81=CE=BF=CE=B7=CE=B3=CE=BF=CF=8D=CE=BC=CE=B5=CE=BD=CE=B7= =CE=B5=CE=B3=CE=B3=CF=81=CE=B1=CF=86=CE=AE"> - form.prev_record() - </action> - <action name=3D"act__next_record__" icon=3D"nextrecord" label=3D"Next = &Record" - description=3D"=CE=A0=CE=BB=CE=BF=CE=AE=CE=B3=CE=B7=CF=83=CE=B7 =CF=83= =CF=84=CE=BF =CF=84=CF=81=CE=AD=CF=87=CE=BF=CE=BD block =CF=83=CF=84=CE=B7= =CE=BD =CE=B5=CF=80=CF=8C=CE=BC=CE=B5=CE=BD=CE=B7 =CE=B5=CE=B3=CE=B3=CF=81= =CE=B1=CF=86=CE=AE"> - form.next_record() - </action> - <action name=3D"act__last_record__" icon=3D"lastrecord" label=3D"&= Last Record" - description=3D"=CE=A0=CE=BB=CE=BF=CE=AE=CE=B3=CE=B7=CF=83=CE=B7 =CF=83= =CF=84=CE=BF =CF=84=CF=81=CE=AD=CF=87=CE=BF=CE=BD block =CF=83=CF=84=CE=B7= =CE=BD =CF=84=CE=B5=CE=BB=CE=B5=CF=85=CF=84=CE=B1=CE=AF=CE=B1 =CE=B5=CE=B3= =CE=B3=CF=81=CE=B1=CF=86=CE=AE"> - form.last_record() - </action> - <action name=3D"act__ask_record__" icon=3D"jumpprompt" label=3D"&J= ump to Record" - description=3D"=CE=95=CF=81=CF=8E=CF=84=CE=B7=CF=83=CE=B7 =CE=B3=CE=B9= =CE=B1 =CE=B1=CF=81=CE=B9=CE=B8=CE=BC=CF=8C =CE=B5=CE=B3=CE=B3=CF=81=CE=B1= =CF=86=CE=AE=CF=82 =CE=BA=CE=B1=CE=B9 =CE=BC=CE=B5=CF=84=CE=AC=CE=B2=CE=B1= =CF=83=CE=B7 =CF=83=CE=B5 =CE=B1=CF=85=CF=84=CE=AE=CE=BD"> - form.ask_record() - </action> + <action name=3D"act__first_record__" label=3D"=CE=A0=CF=81=CF=8E=CF=84= =CE=B7 =CE=B5=CE=B3=CE=B3=CF=81=CE=B1=CF=86=CE=AE" description=3D"=CE=A0=CE= =BB=CE=BF=CE=AE=CE=B3=CE=B7=CF=83=CE=B7 =CF=83=CF=84=CE=BF =CF=84=CF=81=CE= =AD=CF=87=CE=BF=CE=BD block =CF=83=CF=84=CE=B7=CE=BD =CF=80=CF=81=CF=8E=CF= =84=CE=B7 =CE=B5=CE=B3=CE=B3=CF=81=CE=B1=CF=86=CE=AE"/> + <action name=3D"act__prev_record__" label=3D"=CE=A0=CF=81=CE=BF=CE=B7=CE= =B3=CE=BF=CF=8D=CE=BC=CE=B5=CE=BD=CE=B7 =CE=B5=CE=B3=CE=B3=CF=81=CE=B1=CF= =86=CE=AE" description=3D"=CE=A0=CE=BB=CE=BF=CE=AE=CE=B3=CE=B7=CF=83=CE=B7= =CF=83=CF=84=CE=BF =CF=84=CF=81=CE=AD=CF=87=CE=BF=CE=BD block =CF=83=CF=84= =CE=B7=CE=BD =CF=80=CF=81=CE=BF=CE=B7=CE=B3=CE=BF=CF=8D=CE=BC=CE=B5=CE=BD= =CE=B7 =CE=B5=CE=B3=CE=B3=CF=81=CE=B1=CF=86=CE=AE"/> + <action name=3D"act__next_record__" label=3D"=CE=95=CF=80=CF=8C=CE=BC=CE= =B5=CE=BD=CE=B7 =CE=B5=CE=B3=CE=B3=CF=81=CE=B1=CF=86=CE=AE" description=3D= "=CE=A0=CE=BB=CE=BF=CE=AE=CE=B3=CE=B7=CF=83=CE=B7 =CF=83=CF=84=CE=BF =CF=84= =CF=81=CE=AD=CF=87=CE=BF=CE=BD block =CF=83=CF=84=CE=B7=CE=BD =CE=B5=CF=80= =CF=8C=CE=BC=CE=B5=CE=BD=CE=B7 =CE=B5=CE=B3=CE=B3=CF=81=CE=B1=CF=86=CE=AE= "/> + <action name=3D"act__last_record__" label=3D"=CE=A4=CE=B5=CE=BB=CE=B5=CF= =85=CF=84=CE=B1=CE=AF=CE=B1 =CE=B5=CE=B3=CE=B3=CF=81=CE=B1=CF=86=CE=AE" d= escription=3D"=CE=A0=CE=BB=CE=BF=CE=AE=CE=B3=CE=B7=CF=83=CE=B7 =CF=83=CF=84= =CE=BF =CF=84=CF=81=CE=AD=CF=87=CE=BF=CE=BD block =CF=83=CF=84=CE=B7=CE=BD= =CF=84=CE=B5=CE=BB=CE=B5=CF=85=CF=84=CE=B1=CE=AF=CE=B1 =CE=B5=CE=B3=CE=B3= =CF=81=CE=B1=CF=86=CE=AE"/> + <action name=3D"act__ask_record__" label=3D"=CE=95=CF=8D=CF=81=CE=B5=CF= =83=CE=B7 =CE=B5=CE=B3=CE=B3=CF=81=CE=B1=CF=86=CE=AE=CF=82" description=3D= "=CE=95=CF=81=CF=8E=CF=84=CE=B7=CF=83=CE=B7 =CE=B3=CE=B9=CE=B1 =CE=B1=CF=81= =CE=B9=CE=B8=CE=BC=CF=8C =CE=B5=CE=B3=CE=B3=CF=81=CE=B1=CF=86=CE=AE=CF=82= =CE=BA=CE=B1=CE=B9 =CE=BC=CE=B5=CF=84=CE=AC=CE=B2=CE=B1=CF=83=CE=B7 =CF=83= =CE=B5 =CE=B1=CF=85=CF=84=CE=AE=CE=BD"/> =20 <!-- Record insertion and deletion --> - <action name=3D"act__new_record__" icon=3D"newrecord" label=3D"&Ne= w Record" - description=3D"=CE=95=CE=B9=CF=83=CE=B1=CE=B3=CF=89=CE=B3=CE=AE =CE=BD= =CE=AD=CE=B1=CF=82 =CE=B5=CE=B3=CE=B3=CF=81=CE=B1=CF=86=CE=AE=CF=82 =CF=83= =CF=84=CE=BF =CF=84=CF=81=CE=AD=CF=87=CE=BF=CE=BD block"> - form.new_record() - </action> - <action name=3D"act__delete_record__" icon=3D"deleterecord" - label=3D"&Delete Record" - description=3D"=CE=95=CF=80=CE=B9=CE=BB=CE=BF=CE=B3=CE=AE =CE=B5=CE=B3= =CE=B3=CF=81=CE=B1=CF=86=CE=AE=CF=82 =CE=B3=CE=B9=CE=B1 =CE=B4=CE=B9=CE=B1= =CE=B3=CF=81=CE=B1=CF=86=CE=AE"> - form.delete_record() - </action> - <action name=3D"act__undelete_record__" label=3D"&Undelete Record" - description=3D"=CE=91=CF=80=CE=BF=CE=B5=CF=80=CE=B9=CE=BB=CE=BF=CE=B3= =CE=AE =CE=B5=CE=B3=CE=B3=CF=81=CE=B1=CF=86=CE=AE=CF=82 =CE=B3=CE=B9=CE=B1= =CE=B4=CE=B9=CE=B1=CE=B3=CF=81=CE=B1=CF=86=CE=AE"> - form.undelete_record() - </action> + <action name=3D"act__new_record__" label=3D"=CE=9D=E1=BD=B2=CE=B1 =CE=B5= =CE=B3=CE=B3=CF=81=CE=B1=CF=86=CE=AE" description=3D"=CE=95=CE=B9=CF=83=CE= =B1=CE=B3=CF=89=CE=B3=CE=AE =CE=BD=CE=AD=CE=B1=CF=82 =CE=B5=CE=B3=CE=B3=CF= =81=CE=B1=CF=86=CE=AE=CF=82 =CF=83=CF=84=CE=BF =CF=84=CF=81=CE=AD=CF=87=CE= =BF=CE=BD block"/> + <action name=3D"act__delete_record__" label=3D"=CE=94=CE=B9=CE=B1=CE=B3= =CF=81=CE=B1=CF=86=CE=AE =CE=B5=CE=B3=CE=B3=CF=81=CE=B1=CF=86=CE=AE=CF=82= " description=3D"=CE=95=CF=80=CE=B9=CE=BB=CE=BF=CE=B3=CE=AE =CE=B5=CE=B3=CE= =B3=CF=81=CE=B1=CF=86=CE=AE=CF=82 =CE=B3=CE=B9=CE=B1 =CE=B4=CE=B9=CE=B1=CE= =B3=CF=81=CE=B1=CF=86=CE=AE"/> + <action name=3D"act__undelete_record__" description=3D"=CE=91=CF=80=CE= =BF=CE=B5=CF=80=CE=B9=CE=BB=CE=BF=CE=B3=CE=AE =CE=B5=CE=B3=CE=B3=CF=81=CE= =B1=CF=86=CE=AE=CF=82 =CE=B3=CE=B9=CE=B1 =CE=B4=CE=B9=CE=B1=CE=B3=CF=81=CE= =B1=CF=86=CE=AE"/> =20 <!-- Filter --> - <action name=3D"act__init_filter__" icon=3D"init_filter" label=3D"Defi= ne Filter" - description=3D"=CE=9F=CF=81=CE=B9=CF=83=CE=BC=CF=8C=CF=82 =CE=BA=CF=81= =CE=B9=CF=84=CE=B7=CF=81=CE=AF=CF=89=CE=BD =CE=B3=CE=B9=CE=B1 =CF=86=CE=AF= =CE=BB=CF=84=CF=81=CE=B1"> - form.init_filter() - </action> - <action name=3D"act__change_filter__" label=3D"Change Filter" - description=3D"=CE=91=CE=BB=CE=BB=CE=B1=CE=B3=CE=AE =CF=86=CE=AF=CE=BB= =CF=84=CF=81=CF=89=CE=BD"> - form.change_filter() - </action> - <action name=3D"act__discard_filter__" label=3D"Discard Filter Changes= " - description=3D"=CE=91=CE=BA=CF=8D=CF=81=CF=89=CF=83=CE=B7 =CE=B1=CE=BB= =CE=BB=CE=B1=CE=B3=CF=8E=CE=BD =CF=83=CF=84=CE=B1 =CE=BA=CF=81=CE=B9=CF=84= =CE=AE=CF=81=CE=B9=CE=B1 =CF=86=CE=AF=CE=BB=CF=84=CF=81=CF=89=CE=BD =CE=BA= =CE=B1=CE=B9 =CE=BC=CE=B5=CF=84=CE=AC=CE=B2=CE=B1=CF=83=CE=B7 =CF=83=CF=84= =CE=B7=CE=BD =CF=80=CF=81=CE=BF=CE=B7=CE=B3=CE=BF=CF=8D=CE=BC=CE=B5=CE=BD= =CE=B7 =CE=BA=CE=B1=CF=84=CE=AC=CF=83=CF=84=CE=B1=CF=83=CE=B7"> - form.discard_filter() - </action> - <action name=3D"act__apply_filter__" icon=3D"apply_filter" label=3D"Ap= ply Filter" - description=3D"=CE=95=CF=86=CE=B1=CF=81=CE=BC=CE=BF=CE=B3=CE=AE =CF=86= =CE=AF=CE=BB=CF=84=CF=81=CF=89=CE=BD"> - form.apply_filter() - </action> + <action name=3D"act__init_filter__" label=3D"=CE=9F=CF=81=CE=B9=CF=83=CE= =BC=CF=8C=CF=82 =CF=86=CE=AF=CE=BB=CF=84=CF=81=CE=BF=CF=85" description=3D= "=CE=9F=CF=81=CE=B9=CF=83=CE=BC=CF=8C=CF=82 =CE=BA=CF=81=CE=B9=CF=84=CE=B7= =CF=81=CE=AF=CF=89=CE=BD =CE=B3=CE=B9=CE=B1 =CF=86=CE=AF=CE=BB=CF=84=CF=81= =CE=B1"/> + <action name=3D"act__change_filter__" label=3D"=CE=91=CE=BB=CE=BB=CE=B1= =CE=B3=CE=AE =CF=86=CE=AF=CE=BB=CF=84=CF=81=CE=BF=CF=85" description=3D"=CE= =91=CE=BB=CE=BB=CE=B1=CE=B3=CE=AE =CF=86=CE=AF=CE=BB=CF=84=CF=81=CF=89=CE= =BD"/> + <action name=3D"act__discard_filter__" label=3D"=CE=91=CE=BA=CF=8D=CF=81= =CF=89=CF=83=CE=B7 =CE=B1=CE=BB=CE=BB=CE=B1=CE=B3=CF=8E=CE=BD =CF=86=CE=AF= =CE=BB=CF=84=CF=81=CE=BF=CF=85" description=3D"=CE=91=CE=BA=CF=8D=CF=81=CF= =89=CF=83=CE=B7 =CE=B1=CE=BB=CE=BB=CE=B1=CE=B3=CF=8E=CE=BD =CF=83=CF=84=CE= =B1 =CE=BA=CF=81=CE=B9=CF=84=CE=AE=CF=81=CE=B9=CE=B1 =CF=86=CE=AF=CE=BB=CF= =84=CF=81=CF=89=CE=BD =CE=BA=CE=B1=CE=B9 =CE=BC=CE=B5=CF=84=CE=AC=CE=B2=CE= =B1=CF=83=CE=B7 =CF=83=CF=84=CE=B7=CE=BD =CF=80=CF=81=CE=BF=CE=B7=CE=B3=CE= =BF=CF=8D=CE=BC=CE=B5=CE=BD=CE=B7 =CE=BA=CE=B1=CF=84=CE=AC=CF=83=CF=84=CE= =B1=CF=83=CE=B7"/> + <action name=3D"act__apply_filter__" label=3D"=CE=95=CF=86=CE=B1=CF=81= =CE=BC=CE=BF=CE=B3=CE=AE =CF=86=CE=AF=CE=BB=CF=84=CF=81=CE=BF=CF=85" desc= ription=3D"=CE=95=CF=86=CE=B1=CF=81=CE=BC=CE=BF=CE=B3=CE=AE =CF=86=CE=AF=CE= =BB=CF=84=CF=81=CF=89=CE=BD"/> =20 <!-- Transactions --> - <action name=3D"act__commit__" icon=3D"commit" label=3D"&Save chan= ges" - description=3D"=CE=91=CF=80=CE=BF=CE=B8=CE=AE=CE=BA=CE=B5=CF=85=CF=83= =CE=B7 =CF=8C=CE=BB=CF=89=CE=BD =CF=84=CF=89=CE=BD =CE=B1=CE=BB=CE=BB=CE=B1= =CE=B3=CF=8E=CE=BD =CF=83=CF=84=CE=B7=CE=BD =CE=B2=CE=AC=CF=83=CE=B7 =CE=B4= =CE=B5=CE=B4=CE=BF=CE=BC=CE=AD=CE=BD=CF=89=CE=BD"> - form.commit() - </action> - <action name=3D"act__rollback__" icon=3D"rollback" label=3D"Disca&= rd changes" - description=3D"=CE=91=CE=BA=CF=8D=CF=81=CF=89=CF=83=CE=B7 =CF=8C=CE=BB= =CF=89=CE=BD =CF=84=CF=89=CE=BD =CE=B1=CE=BB=CE=BB=CE=B1=CE=B3=CF=8E=CE=BD= =CE=BA=CE=B1=CE=B9 =CE=B5=CE=BA=CE=B1=CE=B8=CE=AC=CF=81=CE=B9=CF=83=CE=B7= =CF=84=CE=B7=CF=82 =CF=86=CF=8C=CF=81=CE=BC=CE=B1=CF=82"> - form.rollback() - </action> + <action name=3D"act__commit__" label=3D"=CE=A3=CF=8E=CF=83=CE=B9=CE=BC= =CE=BF" description=3D"=CE=91=CF=80=CE=BF=CE=B8=CE=AE=CE=BA=CE=B5=CF=85=CF= =83=CE=B7 =CF=8C=CE=BB=CF=89=CE=BD =CF=84=CF=89=CE=BD =CE=B1=CE=BB=CE=BB=CE= =B1=CE=B3=CF=8E=CE=BD =CF=83=CF=84=CE=B7=CE=BD =CE=B2=CE=AC=CF=83=CE=B7 =CE= =B4=CE=B5=CE=B4=CE=BF=CE=BC=CE=AD=CE=BD=CF=89=CE=BD"/> + <action name=3D"act__rollback__" label=3D"=CE=91=CE=BA=CF=8D=CF=81=CF=89= =CF=83=CE=B7 =CE=B1=CE=BB=CE=BB=CE=B1=CE=B3=CF=8E=CE=BD" description=3D"=CE= =91=CE=BA=CF=8D=CF=81=CF=89=CF=83=CE=B7 =CF=8C=CE=BB=CF=89=CE=BD =CF=84=CF= =89=CE=BD =CE=B1=CE=BB=CE=BB=CE=B1=CE=B3=CF=8E=CE=BD =CE=BA=CE=B1=CE=B9 =CE= =B5=CE=BA=CE=B1=CE=B8=CE=AC=CF=81=CE=B9=CF=83=CE=B7 =CF=84=CE=B7=CF=82 =CF= =86=CF=8C=CF=81=CE=BC=CE=B1=CF=82"/> =20 <!-- Other stuff --> - <action name=3D"act__show_about__" label=3D"About" - description=3D"=CE=A0=CE=BB=CE=B7=CF=81=CE=BF=CF=86=CE=BF=CF=81=CE=AF= =CE=B5=CF=82 =CE=B3=CE=B9 =CE=B1=CF=85=CF=84=CE=AE=CE=BD =CF=84=CE=B7=CE=BD= =CF=86=CF=8C=CF=81=CE=BC=CE=B1"> - form.show_about() - </action> - <action name=3D"act__printout__" icon=3D"printout" label=3D"&Print= Form" - description=3D"=CE=95=CE=BA=CF=84=CF=8D=CF=80=CF=89=CF=83=CE=B7 =CF=84= =CE=B7=CF=82 =CF=86=CF=8C=CF=81=CE=BC=CE=B1=CF=82"> - form.printout() - </action> - <action name=3D"act__close__" icon=3D"exit" label=3D"&Close Window= " - description=3D"=CE=9A=CE=BB=CE=B5=CE=AF=CF=83=CE=B9=CE=BC=CE=BF =CF=80= =CE=B1=CF=81=CE=B1=CE=B8=CF=8D=CF=81=CE=BF=CF=85"> - form.close() - </action> + <action name=3D"act__show_about__" label=3D"=CE=A3=CF=87=CE=B5=CF=84=CE= =B9=CE=BA=CE=AC" description=3D"=CE=A0=CE=BB=CE=B7=CF=81=CE=BF=CF=86=CE=BF= =CF=81=CE=AF=CE=B5=CF=82 =CE=B3=CE=B9 =CE=B1=CF=85=CF=84=CE=AE=CE=BD =CF=84= =CE=B7=CE=BD =CF=86=CF=8C=CF=81=CE=BC=CE=B1"/> + <action name=3D"act__printout__" label=3D"=CE=95=CE=BA=CF=84=CF=8D=CF=80= =CF=89=CF=83=CE=B7" description=3D"=CE=95=CE=BA=CF=84=CF=8D=CF=80=CF=89=CF= =83=CE=B7 =CF=84=CE=B7=CF=82 =CF=86=CF=8C=CF=81=CE=BC=CE=B1=CF=82"/> + <action name=3D"act__close__" label=3D"=CE=9A=CE=BB=CE=B5=CE=AF=CF=83=CE= =B9=CE=BC=CE=BF" description=3D"=CE=9A=CE=BB=CE=B5=CE=AF=CF=83=CE=B9=CE=BC= =CE=BF =CF=80=CE=B1=CF=81=CE=B1=CE=B8=CF=8D=CF=81=CE=BF=CF=85"/> =20 - <trigger name=3D"trg__update_status__" type=3D"ON-STATUSCHANGE"> - current_block =3D form.get_focus_block() - if current_block is not None: - record_status =3D current_block.get_record_status() - possible_operations =3D current_block.get_possible_operations() - else: - record_status =3D None - possible_operations =3D [] - - for operation, action in ( - ('first_record', form.act__first_record__), - ('prev_record', form.act__prev_record__), - ('next_record', form.act__next_record__), - ('last_record', form.act__last_record__), - ('goto_record', form.act__ask_record__), - ('new_record', form.act__new_record__), - ('delete_record', form.act__delete_record__), - ('undelete_record', form.act__undelete_record__)): - action.enabled =3D (operation in possible_operations) - - if form.in_filter_mode(): - form.act__init_filter__.enabled =3D False - form.act__change_filter__.enabled =3D False - form.act__discard_filter__.enabled =3D True - form.act__apply_filter__.enabled =3D True - form.act__commit__.enabled =3D False - form.act__rollback__.enabled =3D False - else: - form.act__init_filter__.enabled =3D True - form.act__change_filter__.enabled =3D True - form.act__discard_filter__.enabled =3D False - form.act__apply_filter__.enabled =3D False - form.act__commit__.enabled =3D not form.is_saved() - form.act__rollback__.enabled =3D True - </trigger> - - - <menu name=3D"__main_menu__" label=3D"Main Menu"> - <menu name=3D"__file__" label=3D"&=CE=91=CF=81=CF=87=CE=B5=CE=AF= =CE=BF"> - <menuitem name=3D"__commit__" action=3D"act__commit__" hotkey=3D"A= LT+ENTER" label=3D"=CE=A3=CF=8E=CF=83=CE=B9=CE=BC=CE=BF"/> - <menuitem name=3D"__rollback__" action=3D"act__rollback__" hotkey=3D= "ALT+BACK" label=3D"=CE=91=CE=BA=CF=8D=CF=81=CF=89=CF=83=CE=B7 =CE=B1=CE=BB= =CE=BB=CE=B1=CE=B3=CF=8E=CE=BD"/> - <menuitem name=3D"__sep0__"/> - <menuitem name=3D"__printout__" action=3D"act__printout__" - hotkey=3D"CTRL+P" label=3D"=CE=95=CE=BA=CF=84=CF=8D=CF=80=CF=89=CF= =83=CE=B7"/> - <menuitem name=3D"__sep1__"/> - <menuitem name=3D"__close__" action=3D"act__close__" hotkey=3D"CTR= L+Q" label=3D"=CE=9A=CE=BB=CE=B5=CE=AF=CF=83=CE=B9=CE=BC=CE=BF"/> - </menu> - <menu name=3D"__edit__" label=3D"&=CE=95=CF=80=CE=B5=CE=BE=CE=B5= =CF=81=CE=B3=CE=B1=CF=83=CE=AF=CE=B1"> - <menuitem name=3D"__cut__" action=3D"act__cut__" hotkey=3D"CTRL+X"= label=3D"=CE=91=CF=80=CE=BF=CE=BA=CE=BF=CF=80=CE=AE"/> - <menuitem name=3D"__copy__" action=3D"act__copy__" hotkey=3D"CTRL+= C" label=3D"=CE=91=CE=BD=CF=84=CE=B9=CE=B3=CF=81=CE=B1=CF=86=CE=AE"/> - <menuitem name=3D"__paste__" action=3D"act__paste__" hotkey=3D"CTR= L+V" label=3D"=CE=95=CF=80=CE=B9=CE=BA=CF=8C=CE=BB=CE=B7=CF=83=CE=B7"/> - <menuitem name=3D"__select_all__" action=3D"act__select_all__" - hotkey=3D"CTRL+A" label=3D"=CE=95=CF=80=CE=B9=CE=BB=CE=BF=CE=B3=CE= =AE =CF=8C=CE=BB=CF=89=CE=BD"/> - <menuitem name=3D"__sep0__"/> - <menuitem name=3D"__new_record__" action=3D"act__new_record__" - hotkey=3D"ALT+INS" label=3D"=CE=9D=E1=BD=B2=CE=B1 =CE=B5=CE=B3=CE= =B3=CF=81=CE=B1=CF=86=CE=AE"/> - <menuitem name=3D"__sep1__"/> - <menuitem name=3D"__delete_record__" action=3D"act__delete_record_= _" - action_off=3D"act__undelete_record__" hotkey=3D"ALT+DEL" label=3D= "=CE=94=CE=B9=CE=B1=CE=B3=CF=81=CE=B1=CF=86=CE=AE =CE=B5=CE=B3=CE=B3=CF=81= =CE=B1=CF=86=CE=AE=CF=82"/> - </menu> - <menu name=3D"__navigation__" label=3D"&=CE=A0=CE=BB=CE=BF=CE=AE= =CE=B3=CE=B7=CF=83=CE=B7" > - <menuitem name=3D"__previous_block__" action=3D"act__previous_bloc= k__" - hotkey=3D"CTRL+PGUP" label=3D"=CE=A0=CF=81=CE=BF=CE=B7=CE=B3=CE=BF= =CF=8D=CE=BC=CE=B5=CE=BD=CE=BF block"/> - <menuitem name=3D"__next_block__" action=3D"act__next_block__" - hotkey=3D"CTRL+PGDN" label=3D"=CE=95=CF=80=CF=8C=CE=BC=CE=B5=CE=BD= =CE=BF block"/> - <menuitem name=3D"__previous_page__" action=3D"act__previous_page_= _" - hotkey=3D"ALT+PGUP" label=3D"=CE=A0=CF=81=CE=BF=CE=B7=CE=B3=CE=BF= =CF=8D=CE=BC=CE=B5=CE=BD=CE=B7 =CF=83=CE=B5=CE=BB=CE=AF=CE=B4=CE=B1"/> - <menuitem name=3D"__next_page__" action=3D"act__next_page__" - hotkey=3D"ALT+PGDN" label=3D"=CE=95=CF=80=CF=8C=CE=BC=CE=B5=CE=BD= =CE=B7 =CF=83=CE=B5=CE=BB=CE=AF=CE=B4=CE=B1"/> - <menuitem name=3D"__sep0__"/> - <menuitem name=3D"__first_record__" action=3D"act__first_record__" - hotkey=3D"ALT+HOME" label=3D"=CE=A0=CF=81=CF=8E=CF=84=CE=B7 =CE=B5= =CE=B3=CE=B3=CF=81=CE=B1=CF=86=CE=AE"/> - <menuitem name=3D"__prev_record__" action=3D"act__prev_record__" - hotkey=3D"ALT+LEFT" label=3D"=CE=A0=CF=81=CE=BF=CE=B7=CE=B3=CE=BF= =CF=8D=CE=BC=CE=B5=CE=BD=CE=B7 =CE=B5=CE=B3=CE=B3=CF=81=CE=B1=CF=86=CE=AE= "/> - <menuitem name=3D"__next_record__" action=3D"act__next_record__" - hotkey=3D"ALT+RIGHT" label=3D"=CE=95=CF=80=CF=8C=CE=BC=CE=B5=CE=BD= =CE=B7 =CE=B5=CE=B3=CE=B3=CF=81=CE=B1=CF=86=CE=AE"/> - <menuitem name=3D"__last_record__" action=3D"act__last_record__" - hotkey=3D"ALT+END" label=3D"=CE=A4=CE=B5=CE=BB=CE=B5=CF=85=CF=84= =CE=B1=CE=AF=CE=B1 =CE=B5=CE=B3=CE=B3=CF=81=CE=B1=CF=86=CE=AE"/> - <menuitem name=3D"__ask_record__" action=3D"act__ask_record__" - hotkey=3D"F3" label=3D"=CE=95=CF=8D=CF=81=CE=B5=CF=83=CE=B7 =CE=B5= =CE=B3=CE=B3=CF=81=CE=B1=CF=86=CE=AE=CF=82"/> - </menu> - <menu name=3D"__filter__" label=3D"=CE=A6&=CE=AF=CE=BB=CF=84=CF=81= =CE=BF"> - <menuitem name=3D"__init_filter__" action=3D"act__init_filter__" - hotkey=3D"F8" label=3D"=CE=9F=CF=81=CE=B9=CF=83=CE=BC=CF=8C=CF=82= =CF=86=CE=AF=CE=BB=CF=84=CF=81=CE=BF=CF=85"/> - <menuitem name=3D"__change_filter__" action=3D"act__change_filter_= _" - hotkey=3D"SHIFT+F8" label=3D"=CE=91=CE=BB=CE=BB=CE=B1=CE=B3=CE=AE= =CF=86=CE=AF=CE=BB=CF=84=CF=81=CE=BF=CF=85"/> - <menuitem name=3D"__discard_filter__" action=3D"act__discard_filte= r__" - hotkey=3D"SHIFT+F9" label=3D"=CE=91=CE=BA=CF=8D=CF=81=CF=89=CF=83= =CE=B7 =CE=B1=CE=BB=CE=BB=CE=B1=CE=B3=CF=8E=CE=BD =CF=86=CE=AF=CE=BB=CF=84= =CF=81=CE=BF=CF=85"/> - <menuitem name=3D"__apply_filter__" action=3D"act__apply_filter__" - hotkey=3D"F9" label=3D"=CE=95=CF=86=CE=B1=CF=81=CE=BC=CE=BF=CE=B3= =CE=AE =CF=86=CE=AF=CE=BB=CF=84=CF=81=CE=BF=CF=85"/> - </menu> + <menu name=3D"mnu__main_menu__" label=3D"Main Menu"> + <menu name=3D"mnu__file__" label=3D"&=CE=91=CF=81=CF=87=CE=B5=CE= =AF=CE=BF"/> + <menu name=3D"mnu__edit__" label=3D"&=CE=95=CF=80=CE=B5=CE=BE=CE= =B5=CF=81=CE=B3=CE=B1=CF=83=CE=AF=CE=B1"/> + <menu name=3D"mnu__navigation__" label=3D"&=CE=A0=CE=BB=CE=BF=CE= =AE=CE=B3=CE=B7=CF=83=CE=B7"/> + <menu name=3D"mnu__filter__" label=3D"=CE=A6&=CE=AF=CE=BB=CF=84=CF= =81=CE=BF"/> </menu> - <menu name=3D"__help_menu__"> - <menu name=3D"__help__" label=3D"&=CE=92=CE=BF=CE=AE=CE=B8=CE=B5= =CE=B9=CE=B1"> - <menuitem name=3D"__show_about__" action=3D"act__show_about__" lab= el=3D"=CE=A3=CF=87=CE=B5=CF=84=CE=B9=CE=BA=CE=AC"/> - </menu> + <menu name=3D"mnu__help_menu__"> + <menu name=3D"mnu__help__" label=3D"&=CE=92=CE=BF=CE=AE=CE=B8=CE= =B5=CE=B9=CE=B1"/> </menu> - - <toolbar name=3D"__main_toolbar__"> - <toolbutton name=3D"__commit__" action=3D"act__commit__"/> - <toolbutton name=3D"__sep1__"/> - <toolbutton name=3D"__new_record__" action=3D"act__new_record__"/> - <toolbutton name=3D"__delete_record__" action=3D"act__delete_record_= _" - action_off=3D"act__undelete_record__"/> - <toolbutton name=3D"__sep2__"/> - <toolbutton name=3D"__first_record__" action=3D"act__first_record__"= /> - <toolbutton name=3D"__prev_record__" action=3D"act__prev_record__"/> - <toolbutton name=3D"__next_record__" action=3D"act__next_record__"/> - <toolbutton name=3D"__last_record__" action=3D"act__last_record__"/> - <toolbutton name=3D"__ask_record__" action=3D"act__ask_record__"/> - <toolbutton name=3D"__sep3__"/> - <toolbutton name=3D"__init_filter__" action=3D"act__init_filter__" - action_off=3D"act__discard_filter__"/> - <toolbutton name=3D"__apply_filter__" action=3D"act__apply_filter__"= /> - <toolbutton name=3D"__sep4__"/> - <toolbutton name=3D"__printout__" action=3D"act__printout__"/> - <toolbutton name=3D"__sep5__"/> - <toolbutton name=3D"__rollback__" action=3D"act__rollback__"/> - <toolbutton name=3D"__sep6__"/> - <toolbutton name=3D"__close__" action=3D"act__close__"/> - </toolbar> - =20 </form> Modified: trunk/gnue-forms/defaults/default/es.gfd =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/gnue-forms/defaults/default/es.gfd 2010-12-03 17:29:41 UTC (rev= 10265) +++ trunk/gnue-forms/defaults/default/es.gfd 2010-12-03 17:29:44 UTC (rev= 10266) @@ -1,266 +1,52 @@ <?xml version=3D"1.0"?> =20 -<!-- - GNU Enterprise default menu definition - - Copyright 2001-2007 Free Software Foundation - - This file is part of GNU Enterprise - - GNU Enterprise is free software; you can redistribute it - and/or modify it under the terms of the GNU General Public - License as published by the Free Software Foundation; either - version 3, or (at your option) any later version. - - GNU Enterprise is distributed in the hope that it will be - useful, but WITHOUT ANY WARRANTY; without even the implied - warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with program; see the file COPYING. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - - Suite 330, Boston, MA 02111-1307, USA. - - Versi=C3=B3n al espa=C3=B1ol: Gustavo A. Corradi [email protected] 200= 9-02.16 =20 - ---> - <form> <!-- Clipboard and selection --> - <action name=3D"act__cut__" label=3D"C&ortar" - description=3D"Corta el texto seleccionado"> - form.cut() - </action> - <action name=3D"act__copy__" label=3D"&Copiar" - description=3D"Copia el texto seleccionado al portapapeles"> - form.copy() - </action> - <action name=3D"act__paste__" label=3D"&Pegar" - description=3D"Pega el contenido del portapapeles en la posici=C3=B3= n actual"> - form.paste() - </action> - <action name=3D"act__select_all__" label=3D"Seleccionar &todo" - description=3D"Selecciona todo el campo"> - form.select_all() - </action> + <action name=3D"act__cut__" label=3D"C&ortar" description=3D"Corta= el texto seleccionado"/> + <action name=3D"act__copy__" label=3D"&Copiar" description=3D"Copi= a el texto seleccionado al portapapeles"/> + <action name=3D"act__paste__" label=3D"&Pegar" description=3D"Pega= el contenido del portapapeles en la posici=C3=B3n actual"/> + <action name=3D"act__select_all__" label=3D"Seleccionar &todo" des= cription=3D"Selecciona todo el campo"/> =20 <!-- Focus management --> - <action name=3D"act__next_block__" label=3D"&Bloque siguiente" - description=3D"Salta al siguiente bloque"> - form.next_block() - </action> - <action name=3D"act__previous_block__" label=3D"Bl&oque anterior" - description=3D"Salta al bloque anterior"> - form.previous_block() - </action> - <action name=3D"act__next_page__" label=3D"P=C3=A1gin&a siguiente" - description=3D"Salta a la siguiente p=C3=A1gina"> - form.next_page() - </action> - <action name=3D"act__previous_page__" label=3D"P=C3=A1gina a&nteri= or" - description=3D"Salta a la p=C3=A1gina anterior"> - form.previous_page() - </action> + <action name=3D"act__next_block__" label=3D"&Bloque siguiente" des= cription=3D"Salta al siguiente bloque"/> + <action name=3D"act__previous_block__" label=3D"Bl&oque anterior" = description=3D"Salta al bloque anterior"/> + <action name=3D"act__next_page__" label=3D"P=C3=A1gin&a siguiente"= description=3D"Salta a la siguiente p=C3=A1gina"/> + <action name=3D"act__previous_page__" label=3D"P=C3=A1gina a&nteri= or" description=3D"Salta a la p=C3=A1gina anterior"/> =20 <!-- Record navigation --> - <action name=3D"act__first_record__" icon=3D"firstrecord" label=3D"&am= p;Primer registro" - description=3D"Mueve el bloque actual al primer registro"> - form.first_record() - </action> - <action name=3D"act__prev_record__" icon=3D"prevrecord" label=3D"R&= ;egistro anterior" - description=3D"Mueve el bloque actual al registro anterior"> - form.prev_record() - </action> - <action name=3D"act__next_record__" icon=3D"nextrecord" label=3D"&= Registro siguiente" - description=3D"Mueve el bloque actual al siguiente registro"> - form.next_record() - </action> - <action name=3D"act__last_record__" icon=3D"lastrecord" label=3D"&= Ultimo registro" - description=3D"Mueve el bloque actual al =C3=BAltimo registro"> - form.last_record() - </action> - <action name=3D"act__ask_record__" icon=3D"jumpprompt" label=3D"&S= alta al registro" - description=3D"Pregunta por el numero de registro para cargarlo"> - form.ask_record() - </action> + <action name=3D"act__first_record__" label=3D"&Primer registro" de= scription=3D"Mueve el bloque actual al primer registro"/> + <action name=3D"act__prev_record__" label=3D"R&egistro anterior" d= escription=3D"Mueve el bloque actual al registro anterior"/> + <action name=3D"act__next_record__" label=3D"&Registro siguiente" = description=3D"Mueve el bloque actual al siguiente registro"/> + <action name=3D"act__last_record__" label=3D"&Ultimo registro" des= cription=3D"Mueve el bloque actual al =C3=BAltimo registro"/> + <action name=3D"act__ask_record__" label=3D"&Salta al registro" de= scription=3D"Pregunta por el numero de registro para cargarlo"/> =20 <!-- Record insertion and deletion --> - <action name=3D"act__new_record__" icon=3D"newrecord" label=3D"&Nu= evo registro" - description=3D"Inserta un nuevo registro en el bloque actual"> - form.new_record() - </action> - <action name=3D"act__delete_record__" icon=3D"deleterecord" - label=3D"&Borrar Registro" - description=3D"Marca el registro actual como eliminado"> - form.delete_record() - </action> - <action name=3D"act__undelete_record__" label=3D"&Recuperar regist= ro" - description=3D"Quita la marca de borrado del registro actual"> - form.undelete_record() - </action> + <action name=3D"act__new_record__" label=3D"&Nuevo registro" descr= iption=3D"Inserta un nuevo registro en el bloque actual"/> + <action name=3D"act__delete_record__" label=3D"&Borrar Registro" d= escription=3D"Marca el registro actual como eliminado"/> + <action name=3D"act__undelete_record__" label=3D"&Recuperar regist= ro" description=3D"Quita la marca de borrado del registro actual"/> =20 <!-- Filter --> - <action name=3D"act__init_filter__" icon=3D"init_filter" label=3D"&= ;Definir filtro" - description=3D"Define un nuevo criterio de filtrado"> - form.init_filter() - </action> - <action name=3D"act__change_filter__" label=3D"&Modificar filtro" - description=3D"Modifica el criterio de filtrado"> - form.change_filter() - </action> - <action name=3D"act__discard_filter__" label=3D"De&scarta modifica= ci=C3=B3n del filtro" - description=3D"Descarta los cambios del filtro y lo restaura a su es= tado anterior"> - form.discard_filter() - </action> - <action name=3D"act__apply_filter__" icon=3D"apply_filter" label=3D"&a= mp;Aplicar filtro" - description=3D"Aplica el filtro"> - form.apply_filter() - </action> + <action name=3D"act__init_filter__" label=3D"&Definir filtro" desc= ription=3D"Define un nuevo criterio de filtrado"/> + <action name=3D"act__change_filter__" label=3D"&Modificar filtro" = description=3D"Modifica el criterio de filtrado"/> + <action name=3D"act__discard_filter__" label=3D"De&scarta modifica= ci=C3=B3n del filtro" description=3D"Descarta los cambios del filtro y lo= restaura a su estado anterior"/> + <action name=3D"act__apply_filter__" label=3D"&Aplicar filtro" des= cription=3D"Aplica el filtro"/> =20 <!-- Transactions --> - <action name=3D"act__commit__" icon=3D"commit" label=3D"&Salvar ca= mbios" - description=3D"Salva los cambios a la base de datos"> - form.commit() - </action> - <action name=3D"act__rollback__" icon=3D"rollback" label=3D"&Desca= rtar cambios" - description=3D"Descarta todos los cambios y restablece el formulario= "> - form.rollback() - </action> + <action name=3D"act__commit__" label=3D"&Salvar cambios" descripti= on=3D"Salva los cambios a la base de datos"/> + <action name=3D"act__rollback__" label=3D"&Descartar cambios" desc= ription=3D"Descarta todos los cambios y restablece el formulario"/> =20 <!-- Other stuff --> - <action name=3D"act__show_about__" label=3D"A&cerca" - description=3D"Muestra informaci=C3=B3n acerca de este formulario"> - form.show_about() - </action> - <action name=3D"act__printout__" icon=3D"printout" label=3D"&Impri= mir formulario" - description=3D"Imprime el contenido de este formulario"> - form.printout() - </action> - <action name=3D"act__close__" icon=3D"exit" label=3D"&Cerrar venta= na" - description=3D"Cierra esta ventana"> - form.close() - </action> + <action name=3D"act__show_about__" label=3D"A&cerca" description=3D= "Muestra informaci=C3=B3n acerca de este formulario"/> + <action name=3D"act__printout__" label=3D"&Imprimir formulario" de= scription=3D"Imprime el contenido de este formulario"/> + <action name=3D"act__close__" label=3D"&Cerrar ventana" descriptio= n=3D"Cierra esta ventana"/> =20 - <trigger name=3D"trg__update_status__" type=3D"ON-STATUSCHANGE"> - current_block =3D form.get_focus_block() - if current_block is not None: - record_status =3D current_block.get_record_status() - possible_operations =3D current_block.get_possible_operations() - else: - record_status =3D None - possible_operations =3D [] - - for operation, action in ( - ('first_record', form.act__first_record__), - ('prev_record', form.act__prev_record__), - ('next_record', form.act__next_record__), - ('last_record', form.act__last_record__), - ('goto_record', form.act__ask_record__), - ('new_record', form.act__new_record__), - ('delete_record', form.act__delete_record__), - ('undelete_record', form.act__undelete_record__)): - action.enabled =3D (operation in possible_operations) - - if form.in_filter_mode(): - form.act__init_filter__.enabled =3D False - form.act__change_filter__.enabled =3D False - form.act__discard_filter__.enabled =3D True - form.act__apply_filter__.enabled =3D True - form.act__commit__.enabled =3D False - form.act__rollback__.enabled =3D False - else: - form.act__init_filter__.enabled =3D True - form.act__change_filter__.enabled =3D True - form.act__discard_filter__.enabled =3D False - form.act__apply_filter__.enabled =3D False - form.act__commit__.enabled =3D not form.is_saved() - form.act__rollback__.enabled =3D True - </trigger> - - - <menu name=3D"__main_menu__" label=3D"Menu principal"> - <menu name=3D"__file__" label=3D"&Archivo"> - <menuitem name=3D"__commit__" action=3D"act__commit__" hotkey=3D"A= LT+ENTER"/> - <menuitem name=3D"__rollback__" action=3D"act__rollback__" hotkey=3D= "ALT+BACK"/> - <menuitem name=3D"__sep0__"/> - <menuitem name=3D"__printout__" action=3D"act__printout__" - hotkey=3D"CTRL+P"/> - <menuitem name=3D"__sep1__"/> - <menuitem name=3D"__close__" action=3D"act__close__" hotkey=3D"CTR= L+Q"/> - </menu> - <menu name=3D"__edit__" label=3D"&Edici=C3=B3n"> - <menuitem name=3D"__cut__" action=3D"act__cut__" hotkey=3D"CTRL+X"= /> - <menuitem name=3D"__copy__" action=3D"act__copy__" hotkey=3D"CTRL+= C"/> - <menuitem name=3D"__paste__" action=3D"act__paste__" hotkey=3D"CTR= L+V"/> - <menuitem name=3D"__select_all__" action=3D"act__select_all__" - hotkey=3D"CTRL+A"/> - <menuitem name=3D"__sep0__"/> - <menuitem name=3D"__new_record__" action=3D"act__new_record__" - hotkey=3D"ALT+INS"/> - <menuitem name=3D"__sep1__"/> - <menuitem name=3D"__delete_record__" action=3D"act__delete_record_= _" - action_off=3D"act__undelete_record__" hotkey=3D"ALT+DEL"/> - </menu> - <menu name=3D"__navigation__" label=3D"&Navegaci=C3=B3n"> - <menuitem name=3D"__previous_block__" action=3D"act__previous_bloc= k__" - hotkey=3D"PGUP"/> - <menuitem name=3D"__next_block__" action=3D"act__next_block__" - hotkey=3D"PGDN"/> - <menuitem name=3D"__previous_page__" action=3D"act__previous_page_= _" - hotkey=3D"ALT+PGUP"/> - <menuitem name=3D"__next_page__" action=3D"act__next_page__" - hotkey=3D"ALT+PGDN"/> - <menuitem name=3D"__sep0__"/> - <menuitem name=3D"__first_record__" action=3D"act__first_record__" - hotkey=3D"ALT+HOME"/> - <menuitem name=3D"__prev_record__" action=3D"act__prev_record__" - hotkey=3D"ALT+LEFT"/> - <menuitem name=3D"__next_record__" action=3D"act__next_record__" - hotkey=3D"ALT+RIGHT"/> - <menuitem name=3D"__last_record__" action=3D"act__last_record__" - hotkey=3D"ALT+END"/> - <menuitem name=3D"__ask_record__" action=3D"act__ask_record__" - hotkey=3D"F3"/> - </menu> - <menu name=3D"__filter__" label=3D"&Filtros"> - <menuitem name=3D"__init_filter__" action=3D"act__init_filter__" - hotkey=3D"F8"/> - <menuitem name=3D"__change_filter__" action=3D"act__change_filter_= _" - hotkey=3D"SHIFT+F8"/> - <menuitem name=3D"__discard_filter__" action=3D"act__discard_filte= r__" - hotkey=3D"SHIFT+F9"/> - <menuitem name=3D"__apply_filter__" action=3D"act__apply_filter__" - hotkey=3D"F9"/> - </menu> + <menu name=3D"mnu__main_menu__" label=3D"Menu principal"> + <menu name=3D"mnu__file__" label=3D"&Archivo"/> + <menu name=3D"mnu__edit__" label=3D"&Edici=C3=B3n"/> + <menu name=3D"mnu__navigation__" label=3D"&Navegaci=C3=B3n"/> + <menu name=3D"mnu__filter__" label=3D"&Filtros"/> </menu> - <menu name=3D"__help_menu__"> - <menu name=3D"__help__" label=3D"Ay&uda"> - <menuitem name=3D"__show_about__" action=3D"act__show_about__"/> - </menu> + <menu name=3D"mnu__help_menu__"> + <menu name=3D"mnu__help__" label=3D"Ay&uda"/> </menu> - - <toolbar name=3D"__main_toolbar__"> - <toolbutton name=3D"__commit__" action=3D"act__commit__"/> - <toolbutton name=3D"__sep1__"/> - <toolbutton name=3D"__new_record__" action=3D"act__new_record__"/> - <toolbutton name=3D"__delete_record__" action=3D"act__delete_record_= _" - action_off=3D"act__undelete_record__"/> - <toolbutton name=3D"__sep2__"/> - <toolbutton name=3D"__first_record__" action=3D"act__first_record__"= /> - <toolbutton name=3D"__prev_record__" action=3D"act__prev_record__"/> - <toolbutton name=3D"__next_record__" action=3D"act__next_record__"/> - <toolbutton name=3D"__last_record__" action=3D"act__last_record__"/> - <toolbutton name=3D"__ask_record__" action=3D"act__ask_record__"/> - <toolbutton name=3D"__sep3__"/> - <toolbutton name=3D"__init_filter__" action=3D"act__init_filter__" - action_off=3D"act__discard_filter__"/> - <toolbutton name=3D"__apply_filter__" action=3D"act__apply_filter__"= /> - <toolbutton name=3D"__sep4__"/> - <toolbutton name=3D"__printout__" action=3D"act__printout__"/> - <toolbutton name=3D"__sep5__"/> - <toolbutton name=3D"__rollback__" action=3D"act__rollback__"/> - <toolbutton name=3D"__sep6__"/> - <toolbutton name=3D"__close__" action=3D"act__close__"/> - </toolbar> </form> Modified: trunk/gnue-forms/defaults/default/fr.gfd =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/gnue-forms/defaults/default/fr.gfd 2010-12-03 17:29:41 UTC (rev= 10265) +++ trunk/gnue-forms/defaults/default/fr.gfd 2010-12-03 17:29:44 UTC (rev= 10266) @@ -28,66 +28,50 @@ =20 <form> <!-- Clipboard and selection --> - <action name=3D"act__cut__" label=3D"Co&uper" description=3D"Co= uper le texte s=C3=A9lection=C3=A9" /> - <action name=3D"act__copy__" label=3D"&Copier" description=3D"Co= pier le texte s=C3=A9lectionn=C3=A9 vers le presse-papier" /> - <action name=3D"act__paste__" label=3D"Co&ller" description=3D"Co= ller le contenu du presse-papier =C3=A0 la position courante" /> - <action name=3D"act__select_all__" label=3D"Tout s=C3=A9lectionner" d= escription=3D"S=C3=A9lectionner tout le champ" /> + <action name=3D"act__cut__" label=3D"Co&uper" description=3D"Coupe= r le texte s=C3=A9lection=C3=A9"/> + <action name=3D"act__copy__" label=3D"&Copier" description=3D"Copi= er le texte s=C3=A9lectionn=C3=A9 vers le presse-papier"/> + <action name=3D"act__paste__" label=3D"Co&ller" description=3D"Col= ler le contenu du presse-papier =C3=A0 la position courante"/> + <action name=3D"act__select_all__" label=3D"Tout s=C3=A9lectionner" de= scription=3D"S=C3=A9lectionner tout le champ"/> =20 <!-- Focus management --> - <action name=3D"act__next_block__" label=3D"Bloc suivant" descripti= on=3D"Aller au bloc suivant" /> - <action name=3D"act__previous_block__" label=3D"Bloc pr=C3=A9c=C3=A9de= nt" description=3D"Aller au bloc pr=C3=A9c=C3=A9dent" /> - <action name=3D"act__next_page__" label=3D"Page suivante" descripti= on=3D"Aller =C3=A0 la page suivante" /> - <action name=3D"act__previous_page__" label=3D"Page pr=C3=A9c=C3=A9den= te" description=3D"Aller =C3=A0 la page pr=C3=A9c=C3=A9dente" /> + <action name=3D"act__next_block__" label=3D"Bloc suivant" description=3D= "Aller au bloc suivant"/> + <action name=3D"act__previous_block__" label=3D"Bloc pr=C3=A9c=C3=A9de= nt" description=3D"Aller au bloc pr=C3=A9c=C3=A9dent"/> + <action name=3D"act__next_page__" label=3D"Page suivante" description=3D= "Aller =C3=A0 la page suivante"/> + <action name=3D"act__previous_page__" label=3D"Page pr=C3=A9c=C3=A9den= te" description=3D"Aller =C3=A0 la page pr=C3=A9c=C3=A9dente"/> =20 <!-- Record navigation --> - <action name=3D"act__first_record__" icon=3D"firstrecord" label=3D"Pre= mier enregistrement"=20 - description=3D"D=C3=A9placer le bloc courant vers le premier enregistre= ment" /> - <action name=3D"act__prev_record__" icon=3D"prevrecord" label=3D"Enreg= istrement pr=C3=A9c." - description=3D"D=C3=A9placer le bloc courant vers l'enreistrement pr= =C3=A9c=C3=A9dent" /> - <action name=3D"act__next_record__" icon=3D"nextrecord" label=3D"Enreg= istrement suiv." - description=3D"D=C3=A9placer le bloc courant vers l'enregistrement s= uivant" /> - <action name=3D"act__last_record__" icon=3D"lastrecord" label=3D"Derni= er enregistrement" - description=3D"D=C3=A9placer le bloc courant vers le dernier enregis= trement" /> - <action name=3D"act__ask_record__" icon=3D"jumpprompt" label=3D"Aller = =C3=A0 l'enregistrement" - description=3D"Saisir un n=C2=B0 d'enregistrement et se d=C3=A9place= r vers cet enregistrement" /> + <action name=3D"act__first_record__" label=3D"Premier enregistrement" = description=3D"D=C3=A9placer le bloc courant vers le premier enregistreme= nt"/> + <action name=3D"act__prev_record__" label=3D"Enregistrement pr=C3=A9c.= " description=3D"D=C3=A9placer le bloc courant vers l'enreistrement pr=C3= =A9c=C3=A9dent"/> + <action name=3D"act__next_record__" label=3D"Enregistrement suiv." des= cription=3D"D=C3=A9placer le bloc courant vers l'enregistrement suivant"/= > + <action name=3D"act__last_record__" label=3D"Dernier enregistrement" d= escription=3D"D=C3=A9placer le bloc courant vers le dernier enregistremen= t"/> + <action name=3D"act__ask_record__" label=3D"Aller =C3=A0 l'enregistrem= ent" description=3D"Saisir un n=C2=B0 d'enregistrement et se d=C3=A9place= r vers cet enregistrement"/> =20 <!-- Record insertion and deletion --> - <action name=3D"act__new_record__" icon=3D"newrecord" label=3D"Nouvel = enregistrement" - description=3D"Ins=C3=A9rer un nouvel enregistrement dans le bloc co= urant" /> - <action name=3D"act__delete_record__" icon=3D"deleterecord" label=3D"S= upprimer l'enregistrement" - description=3D"Marquer l'enregistrement actuel pour suppression" /> - <action name=3D"act__undelete_record__" label=3D"Restaurer l'enregistr= ement" - description=3D"Annuler la suppression de l'enregistrement" /> + <action name=3D"act__new_record__" label=3D"Nouvel enregistrement" des= cription=3D"Ins=C3=A9rer un nouvel enregistrement dans le bloc courant"/> + <action name=3D"act__delete_record__" label=3D"Supprimer l'enregistrem= ent" description=3D"Marquer l'enregistrement actuel pour suppression"/> + <action name=3D"act__undelete_record__" label=3D"Restaurer l'enregistr= ement" description=3D"Annuler la suppression de l'enregistrement"/> =20 <!-- Filter --> - <action name=3D"act__init_filter__" icon=3D"init_filter" label=3D"D=C3= =A9finir un filtre" - description=3D"D=C3=A9finir un nouveau crit=C3=A8re de filtrage" /> - <action name=3D"act__change_filter__" label=3D"Modifier le filtre" - description=3D"Modifier le crit=C3=A8re de filtrage" /> - <action name=3D"act__discard_filter__" label=3D"Annuler les modificati= ons du filtre" - description=3D"Annule les modification du crit=C3=A8re de filtrage e= t r=C3=A9tabli le filtrage pr=C3=A9c=C3=A9dent" /> - <action name=3D"act__apply_filter__" icon=3D"apply_filter" label=3D"Ap= pliquer le filtre" - description=3D"Applique le crit=C3=A8re de filtrage" /> + <action name=3D"act__init_filter__" label=3D"D=C3=A9finir un filtre" d= escription=3D"D=C3=A9finir un nouveau crit=C3=A8re de filtrage"/> + <action name=3D"act__change_filter__" label=3D"Modifier le filtre" des= cription=3D"Modifier le crit=C3=A8re de filtrage"/> + <action name=3D"act__discard_filter__" label=3D"Annuler les modificati= ons du filtre" description=3D"Annule les modification du crit=C3=A8re de = filtrage et r=C3=A9tabli le filtrage pr=C3=A9c=C3=A9dent"/> + <action name=3D"act__apply_filter__" label=3D"Appliquer le filtre" des= cription=3D"Applique le crit=C3=A8re de filtrage"/> =20 <!-- Transactions --> - <action name=3D"act__commit__" icon=3D"commit" label=3D"Enregistrer le= s modifications" - description=3D"Enregistrer tous les changements dans la base de donn= =C3=A9es" /> - <action name=3D"act__rollback__" icon=3D"rollback" label=3D"Annuler le= s modifications" - description=3D"Annuler les modifications et r=C3=A9-initialiser le f= ormulaire" /> + <action name=3D"act__commit__" label=3D"Enregistrer les modifications"= description=3D"Enregistrer tous les changements dans la base de donn=C3=A9= es"/> + <action name=3D"act__rollback__" label=3D"Annuler les modifications" d= escription=3D"Annuler les modifications et r=C3=A9-initialiser le formula= ire"/> =20 <!-- Other stuff --> - <action name=3D"act__show_about__" label=3D"A propos" description=3D= "Affiche les informations du formulaire" /> - <action name=3D"act__printout__" icon=3D"printout" label=3D"Imprimer l= e formulaire" - description=3D"Imprime le contenu du formulaire" /> - <action name=3D"act__close__" icon=3D"exit" label=3D"Fermer la fen=C3=AA= tre" description=3D"Ferme cette fen=C3=AAtre" /> + <action name=3D"act__show_about__" label=3D"A propos" description=3D"A= ffiche les informations du formulaire"/> + <action name=3D"act__printout__" label=3D"Imprimer le formulaire" desc= ription=3D"Imprime le contenu du formulaire"/> + <action name=3D"act__close__" label=3D"Fermer la fen=C3=AAtre" descrip= tion=3D"Ferme cette fen=C3=AAtre"/> =20 - - <menu name=3D"__main_menu__" label=3D"Menu Principal"> - <menu name=3D"__file__" label=3D"&Fichier" /> - <menu name=3D"__edit__" label=3D"&Edition" /> - <menu name=3D"__filter__" label=3D"F&iltre" /> + <menu name=3D"mnu__main_menu__" label=3D"Menu Principal"> + <menu name=3D"mnu__file__" label=3D"&Fichier" /> + <menu name=3D"mnu__edit__" label=3D"&Edition" /> + <menu name=3D"mnu__filter__" label=3D"F&iltre" /> </menu> - <menu name=3D"__help_menu__"> - <menu name=3D"__help__" label=3D"Aide" /> + <menu name=3D"mnu__help_menu__"> + <menu name=3D"mnu__help__" label=3D"Aide" /> </menu> </form> Modified: trunk/gnue-forms/defaults/default/hu.gfd =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/gnue-forms/defaults/default/hu.gfd 2010-12-03 17:29:41 UTC (rev= 10265) +++ trunk/gnue-forms/defaults/default/hu.gfd 2010-12-03 17:29:44 UTC (rev= 10266) @@ -1,78 +1,52 @@ <?xml version=3D"1.0"?> =20 -<!-- - GNU Enterprise default menu definition - Hungarian version - - Copyright 2001-2007 Free Software Foundation - - This file is part of GNU Enterprise - - GNU Enterprise is free software; you can redistribute it - and/or modify it under the terms of the GNU General Public - License as published by the Free Software Foundation; either - version 3, or (at your option) any later version. - - GNU Enterprise is distributed in the hope that it will be - useful, but WITHOUT ANY WARRANTY; without even the implied - warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with program; see the file COPYING. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - - Suite 330, Boston, MA 02111-1307, USA. - - $Id$ ---> - <form> - <!-- Clipboard and selection --> - <action name=3D"act__cut__" label=3D"&Kiv=C3=A1g=C3=A1s" descripti= on=3D"A kijel=C3=B6lt sz=C3=B6veg kiv=C3=A1g=C3=A1sa =C3=A9s v=C3=A1g=C3=B3= lapra helyez=C3=A9se." /> - <action name=3D"act__copy__" label=3D"&M=C3=A1sol=C3=A1s" descript= ion=3D"A kijel=C3=B6lt sz=C3=B6veg m=C3=A1sol=C3=A1sa a v=C3=A1g=C3=B3lap= ra." /> - <action name=3D"act__paste__" label=3D"&Beilleszt=C3=A9s" descript= ion=3D"V=C3=A1g=C3=B3lap tartalm=C3=A1nak beilleszt=C3=A9se az adott poz=C3= =ADci=C3=B3t=C3=B3l." /> - <action name=3D"act__select_all__" label=3D"Mind&ent kijel=C3=B6l"= description=3D"Teljes mez=C5=91tartalom kijel=C3=B6l=C3=A9se." /> + <action name=3D"act__cut__" label=3D"&Kiv=C3=A1g=C3=A1s" descripti= on=3D"A kijel=C3=B6lt sz=C3=B6veg kiv=C3=A1g=C3=A1sa =C3=A9s v=C3=A1g=C3=B3= lapra helyez=C3=A9se."/> + <action name=3D"act__copy__" label=3D"&M=C3=A1sol=C3=A1s" descript= ion=3D"A kijel=C3=B6lt sz=C3=B6veg m=C3=A1sol=C3=A1sa a v=C3=A1g=C3=B3lap= ra."/> + <action name=3D"act__paste__" label=3D"&Beilleszt=C3=A9s" descript= ion=3D"V=C3=A1g=C3=B3lap tartalm=C3=A1nak beilleszt=C3=A9se az adott poz=C3= =ADci=C3=B3t=C3=B3l."/> + <action name=3D"act__select_all__" label=3D"Mind&ent kijel=C3=B6l"= description=3D"Teljes mez=C5=91tartalom kijel=C3=B6l=C3=A9se."/> =20 <!-- Focus management --> - <action name=3D"act__next_block__" label=3D"K=C3=B6vetkez=C5=91 &b= lokk" description=3D"Ugr=C3=A1s a k=C3=B6vetkez=C5=91 blokkra." /> - <action name=3D"act__previous_block__" label=3D"El=C5=91z=C5=91 bl&= ;okk" description=3D"Ugr=C3=A1s az el=C5=91z=C5=91 blokkra." /> - <action name=3D"act__next_page__" label=3D"K=C3=B6vetkez=C5=91 l&a= p" description=3D"Ugr=C3=A1s a k=C3=B6vetkez=C5=91 lapra." /> - <action name=3D"act__previous_page__" label=3D"El=C5=91z=C5=91 la&= p" description=3D"Ugr=C3=A1s az el=C5=91z=C5=91 lapra." /> + <action name=3D"act__next_block__" label=3D"K=C3=B6vetkez=C5=91 &b= lokk" description=3D"Ugr=C3=A1s a k=C3=B6vetkez=C5=91 blokkra."/> + <action name=3D"act__previous_block__" label=3D"El=C5=91z=C5=91 bl&= ;okk" description=3D"Ugr=C3=A1s az el=C5=91z=C5=91 blokkra."/> + <action name=3D"act__next_page__" label=3D"K=C3=B6vetkez=C5=91 l&a= p" description=3D"Ugr=C3=A1s a k=C3=B6vetkez=C5=91 lapra."/> + <action name=3D"act__previous_page__" label=3D"El=C5=91z=C5=91 la&= p" description=3D"Ugr=C3=A1s az el=C5=91z=C5=91 lapra."/> =20 <!-- Record navigation --> - <action name=3D"act__first_record__" label=3D"E&ls=C5=91 rekord" d= escription=3D"Ugr=C3=A1s az aktu=C3=A1lis blokk els=C5=91 rekordj=C3=A1ra= ." /> - <action name=3D"act__prev_record__" label=3D"El=C5=91z=C5=91 rek&o= rd" description=3D"Ugr=C3=A1s az aktu=C3=A1lis blokk el=C5=91z=C5=91 reko= rdj=C3=A1ra." /> - <action name=3D"act__next_record__" label=3D"K=C3=B6vetkez=C5=91 &= rekord" description=3D"Ugr=C3=A1s az aktu=C3=A1lis blokk k=C3=B6vetkez=C5= =91 rekordj=C3=A1ra." /> - <action name=3D"act__last_record__" label=3D"&Utols=C3=B3 rekord" = description=3D"Ugr=C3=A1s az aktu=C3=A1lis blokk utols=C3=B3 rekordj=C3=A1= ra." /> - <action name=3D"act__ask_record__" label=3D"U&gr=C3=A1s egy rekord= ra..." description=3D"A rekord sorsz=C3=A1m=C3=A1nak bek=C3=A9r=C3=A9se, = majd ugr=C3=A1s a megfelel=C5=91 rekordra." /> + <action name=3D"act__first_record__" label=3D"E&ls=C5=91 rekord" d= escription=3D"Ugr=C3=A1s az aktu=C3=A1lis blokk els=C5=91 rekordj=C3=A1ra= ."/> + <action name=3D"act__prev_record__" label=3D"El=C5=91z=C5=91 rek&o= rd" description=3D"Ugr=C3=A1s az aktu=C3=A1lis blokk el=C5=91z=C5=91 reko= rdj=C3=A1ra."/> + <action name=3D"act__next_record__" label=3D"K=C3=B6vetkez=C5=91 &= rekord" description=3D"Ugr=C3=A1s az aktu=C3=A1lis blokk k=C3=B6vetkez=C5= =91 rekordj=C3=A1ra."/> + <action name=3D"act__last_record__" label=3D"&Utols=C3=B3 rekord" = description=3D"Ugr=C3=A1s az aktu=C3=A1lis blokk utols=C3=B3 rekordj=C3=A1= ra."/> + <action name=3D"act__ask_record__" label=3D"U&gr=C3=A1s egy rekord= ra..." description=3D"A rekord sorsz=C3=A1m=C3=A1nak bek=C3=A9r=C3=A9se, = majd ugr=C3=A1s a megfelel=C5=91 rekordra."/> =20 <!-- Record insertion and deletion --> - <action name=3D"act__new_record__" label=3D"=C3=9A&j rekord" descr= iption=3D"=C3=9Aj rekord besz=C3=BAr=C3=A1sa az aktu=C3=A1lis blokkba." /= > - <action name=3D"act__delete_record__" label=3D"Rekord &t=C3=B6rl=C3= =A9se" description=3D"Rekord kijel=C3=B6l=C3=A9se t=C3=B6rl=C3=A9sre." /> - <action name=3D"act__undelete_record__" label=3D"&Rekord t=C3=B6rl= =C3=A9s=C3=A9nek visszavon=C3=A1sa" description=3D"T=C3=B6rl=C3=A9sre kij= el=C3=B6lt rekord kijel=C3=B6l=C3=A9s=C3=A9nek megsz=C3=BCntet=C3=A9se." = /> + <action name=3D"act__new_record__" label=3D"=C3=9A&j rekord" descr= iption=3D"=C3=9Aj rekord besz=C3=BAr=C3=A1sa az aktu=C3=A1lis blokkba."/> + <action name=3D"act__delete_record__" label=3D"Rekord &t=C3=B6rl=C3= =A9se" description=3D"Rekord kijel=C3=B6l=C3=A9se t=C3=B6rl=C3=A9sre."/> + <action name=3D"act__undelete_record__" label=3D"&Rekord t=C3=B6rl= =C3=A9s=C3=A9nek visszavon=C3=A1sa" description=3D"T=C3=B6rl=C3=A9sre kij= el=C3=B6lt rekord kijel=C3=B6l=C3=A9s=C3=A9nek megsz=C3=BCntet=C3=A9se."/= > =20 <!-- Queries --> - <action name=3D"act__init_filter__" label=3D"V=C3=A1lt=C3=A1s lek=C3=A9= rdez=C3=A9s m=C3=B3dba." description=3D"V=C3=A1lt=C3=A1s lek=C3=A9rdez=C3= =A9s m=C3=B3dba." /> - <action name=3D"act__change_filter__" label=3D"El=C5=91z=C5=91 lek=C3=A9= rdez=C3=A9s megism=C3=A9tl=C3=A9se" description=3D"V=C3=A1lt=C3=A1s lek=C3= =A9rdez=C3=A9s m=C3=B3dba a legut=C3=B3bbi sz=C5=B1r=C5=91 felhaszn=C3=A1= l=C3=A1s=C3=A1val." /> - <action name=3D"act__discard_filter__" label=3D"Lek=C3=A9rdez=C3=A9s m= =C3=B3d megszak=C3=ADt=C3=A1sa" description=3D"Visszat=C3=A9r=C3=A9s lek=C3= =A9rdez=C3=A9s m=C3=B3db=C3=B3l a sz=C5=B1r=C3=A9s v=C3=A9grehajt=C3=A1sa= n=C3=A9lk=C3=BCl." /> - <action name=3D"act__apply_filter__" label=3D"Lek=C3=A9rdez=C3=A9s v=C3= =A9grehajt=C3=A1sa" description=3D"Sz=C5=B1r=C3=A9s alkalmaz=C3=A1sa." /> + <action name=3D"act__init_filter__" label=3D"V=C3=A1lt=C3=A1s lek=C3=A9= rdez=C3=A9s m=C3=B3dba." description=3D"V=C3=A1lt=C3=A1s lek=C3=A9rdez=C3= =A9s m=C3=B3dba."/> + <action name=3D"act__change_filter__" label=3D"El=C5=91z=C5=91 lek=C3=A9= rdez=C3=A9s megism=C3=A9tl=C3=A9se" description=3D"V=C3=A1lt=C3=A1s lek=C3= =A9rdez=C3=A9s m=C3=B3dba a legut=C3=B3bbi sz=C5=B1r=C5=91 felhaszn=C3=A1= l=C3=A1s=C3=A1val."/> + <action name=3D"act__discard_filter__" label=3D"Lek=C3=A9rdez=C3=A9s m= =C3=B3d megszak=C3=ADt=C3=A1sa" description=3D"Visszat=C3=A9r=C3=A9s lek=C3= =A9rdez=C3=A9s m=C3=B3db=C3=B3l a sz=C5=B1r=C3=A9s v=C3=A9grehajt=C3=A1sa= n=C3=A9lk=C3=BCl."/> + <action name=3D"act__apply_filter__" label=3D"Lek=C3=A9rdez=C3=A9s v=C3= =A9grehajt=C3=A1sa" description=3D"Sz=C5=B1r=C3=A9s alkalmaz=C3=A1sa."/> =20 <!-- Transactions --> - <action name=3D"act__commit__" label=3D"V=C3=A1ltoz=C3=A1sok m&ent= =C3=A9se" description=3D"=C3=96sszes v=C3=A1ltoz=C3=A1s ment=C3=A9se az a= datb=C3=A1zisba." /> - <action name=3D"act__rollback__" label=3D"V=C3=A1ltoz=C3=A1sok el&= vet=C3=A9se" description=3D"V=C3=A1ltoz=C3=A1sok elvet=C3=A9se =C3=A9s a = k=C3=A9perny=C5=91 t=C3=B6rl=C3=A9se." /> + <action name=3D"act__commit__" label=3D"V=C3=A1ltoz=C3=A1sok m&ent= =C3=A9se" description=3D"=C3=96sszes v=C3=A1ltoz=C3=A1s ment=C3=A9se az a= datb=C3=A1zisba."/> + <action name=3D"act__rollback__" label=3D"V=C3=A1ltoz=C3=A1sok el&= vet=C3=A9se" description=3D"V=C3=A1ltoz=C3=A1sok elvet=C3=A9se =C3=A9s a = k=C3=A9perny=C5=91 t=C3=B6rl=C3=A9se."/> =20 <!-- Other stuff --> - <action name=3D"act__show_about__" label=3D"&N=C3=A9vjegy" descrip= tion=3D"Adatok az aktu=C3=A1lis k=C3=A9perny=C5=91r=C5=91l." /> - <action name=3D"act__printout__" label=3D"K=C3=A9perny=C5=91 &nyom= tat=C3=A1sa" description=3D"Kinyomtatja a k=C3=A9perny=C5=91n l=C3=A9v=C5= =91 adatokat." /> - <action name=3D"act__close__" label=3D"Ablak &bez=C3=A1r=C3=A1sa" = description=3D"Bez=C3=A1rja ezt az ablakot." /> + <action name=3D"act__show_about__" label=3D"&N=C3=A9vjegy" descrip= tion=3D"Adatok az aktu=C3=A1lis k=C3=A9perny=C5=91r=C5=91l."/> + <action name=3D"act__printout__" label=3D"K=C3=A9perny=C5=91 &nyom= tat=C3=A1sa" description=3D"Kinyomtatja a k=C3=A9perny=C5=91n l=C3=A9v=C5= =91 adatokat."/> + <action name=3D"act__close__" label=3D"Ablak &bez=C3=A1r=C3=A1sa" = description=3D"Bez=C3=A1rja ezt az ablakot."/> =20 - <menu name=3D"__main_menu__" label=3D"F=C5=91men=C3=BC"> - <menu name=3D"__file__" label=3D"&F=C3=A1jl" /> - <menu name=3D"__edit__" label=3D"S&zerkeszt=C3=A9s" /> - <menu name=3D"__navigation__" label=3D"&Navig=C3=A1l=C3=A1s" /> - <menu name=3D"__filter__" label=3D"Sz=C5=B1&r=C3=A9s" /> + <menu name=3D"mnu__main_menu__" label=3D"F=C5=91men=C3=BC"> + <menu name=3D"mnu__file__" label=3D"&F=C3=A1jl"/> + <menu name=3D"mnu__edit__" label=3D"S&zerkeszt=C3=A9s"/> + <menu name=3D"mnu__navigation__" label=3D"&Navig=C3=A1l=C3=A1s"/= > + <menu name=3D"mnu__filter__" label=3D"Sz=C5=B1&r=C3=A9s"/> </menu> - <menu name=3D"__help_menu__"> - <menu name=3D"__help__" label=3D"&S=C3=BAg=C3=B3" /> + <menu name=3D"mnu__help_menu__"> + <menu name=3D"mnu__help__" label=3D"&S=C3=BAg=C3=B3"/> </menu> </form> Modified: trunk/gnue-forms/defaults/default.gfd =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/gnue-forms/defaults/default.gfd 2010-12-03 17:29:41 UTC (rev 10= 265) +++ trunk/gnue-forms/defaults/default.gfd 2010-12-03 17:29:44 UTC (rev 10= 266) @@ -178,90 +178,90 @@ </trigger> =20 =20 - <menu name=3D"__main_menu__" label=3D"Main Menu"> - <menu name=3D"__file__" label=3D"&File"> - <menuitem name=3D"__commit__" action=3D"act__commit__" hotkey=3D"A= LT+ENTER"/> - <menuitem name=3D"__rollback__" action=3D"act__rollback__" hotkey=3D= "ALT+BACK"/> - <menuitem name=3D"__sep0__"/> - <menuitem name=3D"__printout__" action=3D"act__printout__" + <menu name=3D"mnu__main_menu__" label=3D"Main Menu"> + <menu name=3D"mnu__file__" label=3D"&File"> + <menuitem name=3D"mnu__commit__" action=3D"act__commit__" hotkey=3D= "ALT+ENTER"/> + <menuitem name=3D"mnu__rollback__" action=3D"act__rollback__" hotk= ey=3D"ALT+BACK"/> + <menuitem name=3D"mnu__sep0__"/> + <menuitem name=3D"mnu__printout__" action=3D"act__printout__" hotkey=3D"CTRL+P"/> - <menuitem name=3D"__sep1__"/> - <menuitem name=3D"__close__" action=3D"act__close__" hotkey=3D"CTR= L+Q"/> + <menuitem name=3D"mnu__sep1__"/> + <menuitem name=3D"mnu__close__" action=3D"act__close__" hotkey=3D"= CTRL+Q"/> </menu> - <menu name=3D"__edit__" label=3D"&Edit"> - <menuitem name=3D"__cut__" action=3D"act__cut__" hotkey=3D"CTRL+X"= /> - <menuitem name=3D"__copy__" action=3D"act__copy__" hotkey=3D"CTRL+= C"/> - <menuitem name=3D"__paste__" action=3D"act__paste__" hotkey=3D"CTR= L+V"/> - <menuitem name=3D"__select_all__" action=3D"act__select_all__" + <menu name=3D"mnu__edit__" label=3D"&Edit"> + <menuitem name=3D"mnu__cut__" action=3D"act__cut__" hotkey=3D"CTRL= +X"/> + <menuitem name=3D"mnu__copy__" action=3D"act__copy__" hotkey=3D"CT= RL+C"/> + <menuitem name=3D"mnu__paste__" action=3D"act__paste__" hotkey=3D"= CTRL+V"/> + <menuitem name=3D"mnu__select_all__" action=3D"act__select_all__" hotkey=3D"CTRL+A"/> - <menuitem name=3D"__sep0__"/> - <menuitem name=3D"__new_record__" action=3D"act__new_record__" + <menuitem name=3D"mnu__sep0__"/> + <menuitem name=3D"mnu__new_record__" action=3D"act__new_record__" hotkey=3D"ALT+INS"/> - <menuitem name=3D"__sep1__"/> - <menuitem name=3D"__delete_record__" action=3D"act__delete_record_= _" + <menuitem name=3D"mnu__sep1__"/> + <menuitem name=3D"mnu__delete_record__" action=3D"act__delete_reco= rd__" action_off=3D"act__undelete_record__" hotkey=3D"ALT+DEL"/> </menu> - <menu name=3D"__navigation__" label=3D"&Navigation"> - <menuitem name=3D"__previous_block__" action=3D"act__previous_bloc= k__" + <menu name=3D"mnu__navigation__" label=3D"&Navigation"> + <menuitem name=3D"mnu__previous_block__" action=3D"act__previous_b= lock__" hotkey=3D"CTRL+PGUP"/> - <menuitem name=3D"__next_block__" action=3D"act__next_block__" + <menuitem name=3D"mnu__next_block__" action=3D"act__next_block__" hotkey=3D"CTRL+PGDN"/> - <menuitem name=3D"__previous_page__" action=3D"act__previous_page_= _" + <menuitem name=3D"mnu__previous_page__" action=3D"act__previous_pa= ge__" hotkey=3D"ALT+PGUP"/> - <menuitem name=3D"__next_page__" action=3D"act__next_page__" + <menuitem name=3D"mnu__next_page__" action=3D"act__next_page__" hotkey=3D"ALT+PGDN"/> - <menuitem name=3D"__sep0__"/> - <menuitem name=3D"__first_record__" action=3D"act__first_record__" + <menuitem name=3D"mnu__sep0__"/> + <menuitem name=3D"mnu__first_record__" action=3D"act__first_record= __" hotkey=3D"ALT+HOME"/> - <menuitem name=3D"__prev_record__" action=3D"act__prev_record__" + <menuitem name=3D"mnu__prev_record__" action=3D"act__prev_record__= " hotkey=3D"ALT+LEFT"/> - <menuitem name=3D"__next_record__" action=3D"act__next_record__" + <menuitem name=3D"mnu__next_record__" action=3D"act__next_record__= " hotkey=3D"ALT+RIGHT"/> - <menuitem name=3D"__last_record__" action=3D"act__last_record__" + <menuitem name=3D"mnu__last_record__" action=3D"act__last_record__= " hotkey=3D"ALT+END"/> - <menuitem name=3D"__ask_record__" action=3D"act__ask_record__" + <menuitem name=3D"mnu__ask_record__" action=3D"act__ask_record__" hotkey=3D"CTRL+J"/> </menu> - <menu name=3D"__filter__" label=3D"F&ilter"> - <menuitem name=3D"__init_filter__" action=3D"act__init_filter__" + <menu name=3D"mnu__filter__" label=3D"F&ilter"> + <menuitem name=3D"mnu__init_filter__" action=3D"act__init_filter__= " hotkey=3D"F11"/> - <menuitem name=3D"__change_filter__" action=3D"act__change_filter_= _" + <menuitem name=3D"mnu__change_filter__" action=3D"act__change_filt= er__" hotkey=3D"SHIFT+F11"/> - <menuitem name=3D"__discard_filter__" action=3D"act__discard_filte= r__" + <menuitem name=3D"mnu__discard_filter__" action=3D"act__discard_fi= lter__" hotkey=3D"SHIFT+F12"/> - <menuitem name=3D"__apply_filter__" action=3D"act__apply_filter__" + <menuitem name=3D"mnu__apply_filter__" action=3D"act__apply_filter= __" hotkey=3D"F12"/> </menu> </menu> - <menu name=3D"__help_menu__"> - <menu name=3D"__help__" label=3D"&Help"> - <menuitem name=3D"__show_about__" action=3D"act__show_about__"/> + <menu name=3D"mnu__help_menu__"> + <menu name=3D"mnu__help__" label=3D"&Help"> + <menuitem name=3D"mnu__show_about__" action=3D"act__show_about__"/= > </menu> </menu> =20 - <toolbar name=3D"__main_toolbar__"> - <toolbutton name=3D"__commit__" action=3D"act__commit__"/> - <toolbutton name=3D"__sep1__"/> - <toolbutton name=3D"__new_record__" action=3D"act__new_record__"/> - <toolbutton name=3D"__delete_record__" action=3D"act__delete_record_= _" + <toolbar name=3D"tlb__main_toolbar__"> + <toolbutton name=3D"tlb__commit__" action=3D"act__commit__"/> + <toolbutton name=3D"tlb__sep1__"/> + <toolbutton name=3D"tlb__new_record__" action=3D"act__new_record__"/= > + <toolbutton name=3D"tlb__delete_record__" action=3D"act__delete_reco= rd__" action_off=3D"act__undelete_record__"/> - <toolbutton name=3D"__sep2__"/> - <toolbutton name=3D"__first_record__" action=3D"act__first_record__"= /> - <toolbutton name=3D"__prev_record__" action=3D"act__prev_record__"/> - <toolbutton name=3D"__next_record__" action=3D"act__next_record__"/> - <toolbutton name=3D"__last_record__" action=3D"act__last_record__"/> - <toolbutton name=3D"__ask_record__" action=3D"act__ask_record__"/> - <toolbutton name=3D"__sep3__"/> - <toolbutton name=3D"__init_filter__" action=3D"act__init_filter__" + <toolbutton name=3D"tlb__sep2__"/> + <toolbutton name=3D"tlb__first_record__" action=3D"act__first_record= __"/> + <toolbutton name=3D"tlb__prev_record__" action=3D"act__prev_record__= "/> + <toolbutton name=3D"tlb__next_record__" action=3D"act__next_record__= "/> + <toolbutton name=3D"tlb__last_record__" action=3D"act__last_record__= "/> + <toolbutton name=3D"tlb__ask_record__" action=3D"act__ask_record__"/= > + <toolbutton name=3D"tlb__sep3__"/> + <toolbutton name=3D"tlb__init_filter__" action=3D"act__init_filter__= " action_off=3D"act__discard_filter__"/> - <toolbutton name=3D"__apply_filter__" action=3D"act__apply_filter__"= /> - <toolbutton name=3D"__sep4__"/> - <toolbutton name=3D"__printout__" action=3D"act__printout__"/> - <toolbutton name=3D"__sep5__"/> - <toolbutton name=3D"__rollback__" action=3D"act__rollback__"/> - <toolbutton name=3D"__sep6__"/> + <toolbutton name=3D"tlb__apply_filter__" action=3D"act__apply_filter= __"/> + <toolbutton name=3D"tlb__sep4__"/> + <toolbutton name=3D"tlb__printout__" action=3D"act__printout__"/> + <toolbutton name=3D"tlb__sep5__"/> + <toolbutton name=3D"tlb__rollback__" action=3D"act__rollback__"/> + <toolbutton name=3D"tlb__sep6__"/> </toolbar> - <toolbar name=3D"__close_toolbar__"> - <toolbutton name=3D"__close__" action=3D"act__close__"/> + <toolbar name=3D"tlb__close_toolbar__"> + <toolbutton name=3D"tlb__close__" action=3D"act__close__"/> </toolbar> </form> Modified: trunk/gnue-forms/samples/function/menu.gfd =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/gnue-forms/samples/function/menu.gfd 2010-12-03 17:29:41 UTC (r= ev 10265) +++ trunk/gnue-forms/samples/function/menu.gfd 2010-12-03 17:29:44 UTC (r= ev 10266) @@ -1,7 +1,7 @@ <?xml version=3D"1.0"?> =20 <form title=3D"Menu Test"> - <menu name=3D"__extra_menu__"> + <menu name=3D"mnu__extra_menu__"> <menu name=3D"mnu_extras" label=3D"Extras"> <menuitem name=3D"mnu_1" action=3D"act_1"/> <menuitem name=3D"mnu_2" action=3D"act_2" hotkey=3D"SHIFT+F5"/> @@ -11,7 +11,7 @@ </menu> </menu> =20 - <toolbar name=3D"__main_toolbar__"> + <toolbar name=3D"tlb__main_toolbar__"> <toolbutton name=3D"tlb_1" action=3D"act_1"/> </toolbar> =20 Modified: trunk/gnue-forms/samples/oldkeys.gfd =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/gnue-forms/samples/oldkeys.gfd 2010-12-03 17:29:41 UTC (rev 102= 65) +++ trunk/gnue-forms/samples/oldkeys.gfd 2010-12-03 17:29:44 UTC (rev 102= 66) @@ -4,22 +4,22 @@ that of gnue-forms 0.5 --> =20 <form> - <menu name=3D"__main_menu__"> - <menu name=3D"__file__"> - <menuitem name=3D"__commit__" hotkey=3D"F6"/> - <menuitem name=3D"__rollback__" hotkey=3D"F11"/> + <menu name=3D"mnu__main_menu__"> + <menu name=3D"mnu__file__"> + <menuitem name=3D"mnu__commit__" hotkey=3D"F6"/> + <menuitem name=3D"mnu__rollback__" hotkey=3D"F11"/> </menu> - <menu name=3D"__edit__"> - <menuitem name=3D"__new_record__" hotkey=3D"F12"/> - <menuitem name=3D"__delete_record__" hotkey=3D"F5"/> + <menu name=3D"mnu__edit__"> + <menuitem name=3D"mnu__new_record__" hotkey=3D"F12"/> + <menuitem name=3D"mnu__delete_record__" hotkey=3D"F5"/> </menu> - <menu name=3D"__navigation__"> - <menuitem name=3D"__previous_page__" hotkey=3D"CTRL+PGUP"/> - <menuitem name=3D"__next_page__" hotkey=3D"CTRL+PGDN"/> - <menuitem name=3D"__first_record__" hotkey=3D"CTRL+UP"/> - <menuitem name=3D"__prev_record__" hotkey=3D"UP"/> - <menuitem name=3D"__next_record__" hotkey=3D"DOWN"/> - <menuitem name=3D"__last_record__" hotkey=3D"CTRL+DOWN"/> + <menu name=3D"mnu__navigation__"> + <menuitem name=3D"mnu__previous_page__" hotkey=3D"CTRL+PGUP"/> + <menuitem name=3D"mnu__next_page__" hotkey=3D"CTRL+PGDN"/> + <menuitem name=3D"mnu__first_record__" hotkey=3D"CTRL+UP"/> + <menuitem name=3D"mnu__prev_record__" hotkey=3D"UP"/> + <menuitem name=3D"mnu__next_record__" hotkey=3D"DOWN"/> + <menuitem name=3D"mnu__last_record__" hotkey=3D"CTRL+DOWN"/> </menu> </menu> </form> Modified: trunk/gnue-forms/src/GFForm.py =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/gnue-forms/src/GFForm.py 2010-12-03 17:29:41 UTC (rev 10265) +++ trunk/gnue-forms/src/GFForm.py 2010-12-03 17:29:44 UTC (rev 10266) @@ -324,9 +324,9 @@ self.merge(default_form) =20 # Merge extras and help menus into the main menu. - main_menu =3D self.findChildNamed('__main_menu__', 'GFMenu') - extra_menu =3D self.findChildNamed('__extra_menu__', 'GFMenu') - help_menu =3D self.findChildNamed('__help_menu__', 'GFMenu') + main_menu =3D self.findChildNamed('mnu__main_menu__', 'GFMenu') + extra_menu =3D self.findChildNamed('mnu__extra_menu__', 'GFMenu'= ) + help_menu =3D self.findChildNamed('mnu__help_menu__', 'GFMenu') if extra_menu: main_menu.merge(extra_menu) extra_menu.setParent(None) @@ -337,9 +337,9 @@ self._children.remove(help_menu) =20 # Merge extra and exit buttons into the main toolbar. - main_toolbar =3D self.findChildNamed('__main_toolbar__', 'GFTool= bar') - extra_toolbar =3D self.findChildNamed('__extra_toolbar__', 'GFTo= olbar') - close_toolbar =3D self.findChildNamed('__close_toolbar__', 'GFTo= olbar') + main_toolbar =3D self.findChildNamed('tlb__main_toolbar__', 'GFT= oolbar') + extra_toolbar =3D self.findChildNamed('tlb__extra_toolbar__', 'G= FToolbar') + close_toolbar =3D self.findChildNamed('tlb__close_toolbar__', 'G= FToolbar') if extra_toolbar: main_toolbar.merge(extra_toolbar) extra_toolbar.setParent(None) Modified: trunk/gnue-forms/src/uidrivers/curses/widgets/menu.py =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/gnue-forms/src/uidrivers/curses/widgets/menu.py 2010-12-03 17:2= 9:41 UTC (rev 10265) +++ trunk/gnue-forms/src/uidrivers/curses/widgets/menu.py 2010-12-03 17:2= 9:44 UTC (rev 10266) @@ -47,7 +47,7 @@ """ =20 self.hotkey =3D None - if self._gfObject.name =3D=3D '__main_menu__' \ + if self._gfObject.name =3D=3D 'main__main_menu__' \ and not self._form._features['GUI:MENUBAR:SUPPRESS']: # Menu bar of the form self._uiForm.register_main_menu(self) Modified: trunk/gnue-forms/src/uidrivers/qt3/widgets/menu.py =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/gnue-forms/src/uidrivers/qt3/widgets/menu.py 2010-12-03 17:29:4= 1 UTC (rev 10265) +++ trunk/gnue-forms/src/uidrivers/qt3/widgets/menu.py 2010-12-03 17:29:4= 4 UTC (rev 10266) @@ -43,7 +43,7 @@ Create a menu widget """ =20 - if self._gfObject.name =3D=3D '__main_menu__' \ + if self._gfObject.name =3D=3D 'mnu__main_menu__' \ and not self._form._features['GUI:MENUBAR:SUPPRESS']: # Only access the menu bar for main forms if isinstance(self._uiForm.main_window, qt.QMainWindow): Modified: trunk/gnue-forms/src/uidrivers/qt3/widgets/toolbar.py =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/gnue-forms/src/uidrivers/qt3/widgets/toolbar.py 2010-12-03 17:2= 9:41 UTC (rev 10265) +++ trunk/gnue-forms/src/uidrivers/qt3/widgets/toolbar.py 2010-12-03 17:2= 9:44 UTC (rev 10266) @@ -46,7 +46,7 @@ =20 widget =3D None =20 - if self._gfObject.name =3D=3D '__main_toolbar__' \ + if self._gfObject.name =3D=3D 'tlb__main_toolbar__' \ and not self._form._features['GUI:TOOLBAR:SUPPRESS']: =20 # Toolbar of the form Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/menu.py =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/gnue-forms/src/uidrivers/wx/widgets/menu.py 2010-12-03 17:29:41= UTC (rev 10265) +++ trunk/gnue-forms/src/uidrivers/wx/widgets/menu.py 2010-12-03 17:29:44= UTC (rev 10266) @@ -44,7 +44,7 @@ Creates a new Menu widget. """ =20 - if self._gfObject.name =3D=3D '__main_menu__' \ + if self._gfObject.name =3D=3D 'mnu__main_menu__' \ and not self._form._features['GUI:MENUBAR:SUPPRESS']: # Menu bar of the form widget =3D wx.MenuBar() @@ -63,7 +63,7 @@ # to the menubar. To avoid having two 'Help' menus we have = to name # the help-menu '&Help'. This will be translated to the cur= rent # language automatically then. - if self._gfObject.name =3D=3D '__help__' and 'wxMac' in wx.P= latformInfo: + if self._gfObject.name =3D=3D 'mnu__help__' and 'wxMac' in w= x.PlatformInfo: lb =3D '&Help' else: lb =3D self._gfObject.label Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/menuitem.py =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/gnue-forms/src/uidrivers/wx/widgets/menuitem.py 2010-12-03 17:2= 9:41 UTC (rev 10265) +++ trunk/gnue-forms/src/uidrivers/wx/widgets/menuitem.py 2010-12-03 17:2= 9:44 UTC (rev 10266) @@ -88,7 +88,7 @@ widget =3D None event.container.AppendSeparator() =20 - self.__widget =3D widget + self.widget =3D widget =20 return widget =20 @@ -106,14 +106,14 @@ # ------------------------------------------------------------------= ------- =20 def _ui_switch_on_(self): - if self.__widget is not None and self.__widget.IsCheckable(): - self.__widget.Check(True) + if self.widget is not None and self.widget.IsCheckable(): + self.widget.Check(True) =20 # ------------------------------------------------------------------= ------- =20 def _ui_switch_off_(self): - if self.__widget is not None and self.__widget.IsCheckable(): - self.__widget.Check(False) + if self.widget is not None and self.widget.IsCheckable(): + self.widget.Check(False) =20 =20 # ------------------------------------------------------------------= ------- @@ -121,8 +121,8 @@ # ------------------------------------------------------------------= ------- =20 def _ui_set_enabled_(self, value): - if self.__widget is not None: - self.__widget.Enable(value) + if self.widget is not None: + self.widget.Enable(value) =20 =20 # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/toolbar.py =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/gnue-forms/src/uidrivers/wx/widgets/toolbar.py 2010-12-03 17:29= :41 UTC (rev 10265) +++ trunk/gnue-forms/src/uidrivers/wx/widgets/toolbar.py 2010-12-03 17:29= :44 UTC (rev 10266) @@ -46,7 +46,7 @@ =20 widget =3D None =20 - if self._gfObject.name =3D=3D '__main_toolbar__' \ + if self._gfObject.name =3D=3D 'tlb__main_toolbar__' \ and not self._form._features['GUI:TOOLBAR:SUPPRESS']: =20 # Make sure to disable the color-remapping in windows Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/toolbutton.py =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/gnue-forms/src/uidrivers/wx/widgets/toolbutton.py 2010-12-03 17= :29:41 UTC (rev 10265) +++ trunk/gnue-forms/src/uidrivers/wx/widgets/toolbutton.py 2010-12-03 17= :29:44 UTC (rev 10266) @@ -74,7 +74,7 @@ # TOOLBAR:SUPPRESS was set widget =3D None =20 - self.__widget =3D widget + self.widget =3D widget =20 return widget =20 @@ -92,18 +92,18 @@ # ------------------------------------------------------------------= ------- =20 def _ui_switch_on_(self): - if self.__widget is not None: + if self.widget is not None: # FIXME: why doesn't the next line work? - # self.__widget.SetToggle(True) - self.__widget.GetToolBar().ToggleTool(self.__widget.GetId(),= True) + # self.widget.SetToggle(True) + self.widget.GetToolBar().ToggleTool(self.widget.GetId(), Tru= e) =20 # ------------------------------------------------------------------= ------- =20 def _ui_switch_off_(self): - if self.__widget is not None: + if self.widget is not None: # FIXME: why doesn't the next line work? - # self.__widget.SetToggle(False) - self.__widget.GetToolBar().ToggleTool(self.__widget.GetId(),= False) + # self.widget.SetToggle(False) + self.widget.GetToolBar().ToggleTool(self.widget.GetId(), Fal= se) =20 =20 # ------------------------------------------------------------------= ------- @@ -111,10 +111,10 @@ # ------------------------------------------------------------------= ------- =20 def _ui_set_enabled_(self, value): - if self.__widget is not None: + if self.widget is not None: # FIXME: why doesn't the next line work? - # self.__widget.Enable(value) - self.__widget.GetToolBar().EnableTool(self.__widget.GetId(),= value) + # self.widget.Enable(value) + self.widget.GetToolBar().EnableTool(self.widget.GetId(), val= ue) =20 =20 # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D