[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnue] r10266 - in trunk/gnue-forms: . defaults defaults/default samples
|
From: |
reinhard |
|
Subject: |
[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 |
|
Date: |
Fri, 3 Dec 2010 11:29:45 -0600 (CST) |
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 access
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üller <address@hidden>
properties:
branch-nick: forms
+ timestamp: 2010-12-03 14:31:18.551000118 +0100
committer: Reinhard Müller <address@hidden>
properties:
branch-nick: forms
Name: bzr:file-ids
- src/GFObjects/GFBlock.py
address@hidden:trunk%2Fgnue-forms:src%2FGFObjects%2FGFBlock.py
src/GFObjects/GFField.py
address@hidden:trunk%2Fgnue-forms:src%2FGFObjects%2FGFField.py
+ defaults/default.gfd
address@hidden:trunk%2Fgnue-forms:defaults%2Fdefault.gfd
defaults/default/de.gfd
address@hidden:trunk%2Fgnue-forms:defaults%2Fdefault%2Fde.gfd
defaults/default/el.gfd
address@hidden:trunk%2Fgnue-forms:defaults%2Fdefault%2Fel.gfd
defaults/default/es.gfd
address@hidden:trunk%2Fgnue-forms:defaults%2Fdefault%2Fes.gfd
defaults/default/fr.gfd
address@hidden:trunk%2Fgnue-forms:defaults%2Fdefault%2Ffr.gfd
defaults/default/hu.gfd
address@hidden:trunk%2Fgnue-forms:defaults%2Fdefault%2Fhu.gfd
samples/function/menu.gfd
address@hidden:trunk%2Fgnue-forms:samples%2Ffunction%2Fmenu.gfd
samples/oldkeys.gfd address@hidden:trunk%2Fgnue-forms:samples%2Foldkeys.gfd
src/GFForm.py address@hidden:trunk%2Fgnue-forms:src%2FGFForm.py
src/uidrivers/curses/widgets/menu.py
address@hidden:trunk%2Fgnue-forms:src%2Fuidrivers%2Fcurses%2Fwidgets%2Fmenu.py
src/uidrivers/qt3/widgets/menu.py
address@hidden:trunk%2Fgnue-forms:src%2Fuidrivers%2Fqt3%2Fwidgets%2Fmenu.py
src/uidrivers/qt3/widgets/toolbar.py
address@hidden:trunk%2Fgnue-forms:src%2Fuidrivers%2Fqt3%2Fwidgets%2Ftoolbar.py
src/uidrivers/wx/widgets/menu.py
address@hidden:trunk%2Fgnue-forms:src%2Fuidrivers%2Fwx%2Fwidgets%2Fmenu.py
src/uidrivers/wx/widgets/menuitem.py
address@hidden:trunk%2Fgnue-forms:src%2Fuidrivers%2Fwx%2Fwidgets%2Fmenuitem.py
src/uidrivers/wx/widgets/toolbar.py
address@hidden:trunk%2Fgnue-forms:src%2Fuidrivers%2Fwx%2Fwidgets%2Ftoolbar.py
src/uidrivers/wx/widgets/toolbutton.py
address@hidden:trunk%2Fgnue-forms:src%2Fuidrivers%2Fwx%2Fwidgets%2Ftoolbutton.py
Name: bzr:revision-id:v4
- 3116 address@hidden
3117 address@hidden
3118 address@hidden
3119 address@hidden
3120 address@hidden
3121 address@hidden
3122 address@hidden
3123 address@hidden
3124 address@hidden
3125 address@hidden
3126 address@hidden
3127 address@hidden
3128 address@hidden
3129 address@hidden
3130 address@hidden
3131 address@hidden
3132 address@hidden
3133 address@hidden
3134 address@hidden
3135 address@hidden
3136 address@hidden
3137 address@hidden
3138 address@hidden
3139 address@hidden
3140 address@hidden
3141 address@hidden
3142 address@hidden
3143 address@hidden
3144 address@hidden
3145 address@hidden
3146 address@hidden
3147 address@hidden
3148 address@hidden
3149 address@hidden
3150 address@hidden
3151 address@hidden
3152 address@hidden
3153 address@hidden
3154 address@hidden
3155 address@hidden
3156 address@hidden
3157 address@hidden
3158 address@hidden
3159 address@hidden
3160 address@hidden
3161 address@hidden
3162 address@hidden
3163 address@hidden
3164 address@hidden
3165 address@hidden
3166 address@hidden
3167 address@hidden
3168 address@hidden
3169 address@hidden
3170 address@hidden
3171 address@hidden
3172 address@hidden
+ 3116 address@hidden
3117 address@hidden
3118 address@hidden
3119 address@hidden
3120 address@hidden
3121 address@hidden
3122 address@hidden
3123 address@hidden
3124 address@hidden
3125 address@hidden
3126 address@hidden
3127 address@hidden
3128 address@hidden
3129 address@hidden
3130 address@hidden
3131 address@hidden
3132 address@hidden
3133 address@hidden
3134 address@hidden
3135 address@hidden
3136 address@hidden
3137 address@hidden
3138 address@hidden
3139 address@hidden
3140 address@hidden
3141 address@hidden
3142 address@hidden
3143 address@hidden
3144 address@hidden
3145 address@hidden
3146 address@hidden
3147 address@hidden
3148 address@hidden
3149 address@hidden
3150 address@hidden
3151 address@hidden
3152 address@hidden
3153 address@hidden
3154 address@hidden
3155 address@hidden
3156 address@hidden
3157 address@hidden
3158 address@hidden
3159 address@hidden
3160 address@hidden
3161 address@hidden
3162 address@hidden
3163 address@hidden
3164 address@hidden
3165 address@hidden
3166 address@hidden
3167 address@hidden
3168 address@hidden
3169 address@hidden
3170 address@hidden
3171 address@hidden
3172 address@hidden
3173 address@hidden
Name: bzr:text-parents
- src/GFObjects/GFBlock.py address@hidden
src/GFObjects/GFField.py address@hidden
+ defaults/default.gfd address@hidden
defaults/default/de.gfd
svn-v3-single1-dHJ1bmsvZ251ZS1mb3Jtcw..:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:9490
defaults/default/el.gfd address@hidden
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..:3a364389-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 address@hidden
src/uidrivers/curses/widgets/menu.py
svn-v3-single1-dHJ1bmsvZ251ZS1mb3Jtcw..: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-dHJ1bmsvZ251ZS1mb3Jtcw..: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-dHJ1bmsvZ251ZS1mb3Jtcw..: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-dHJ1bmsvZ251ZS1mb3Jtcw..:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:10106
Modified: trunk/gnue-forms/defaults/default/de.gfd
===================================================================
--- 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="1.0"?>
<form>
-
<!-- Clipboard and selection -->
<action name="act__cut__" label="Ausschneiden" description="Markierten Text
ausschneiden"/>
<action name="act__copy__" label="Kopieren" description="Markierten Text in
die Zwischenablage kopieren"/>
@@ -41,13 +40,13 @@
<action name="act__printout__" label="Drucken" description="Aktuellen Inhalt
der Maske ausdrucken"/>
<action name="act__close__" label="Schließen" description="Maske schließen"/>
- <menu name="__main_menu__">
- <menu name="__file__" label="Datei"/>
- <menu name="__edit__" label="Bearbeiten"/>
- <menu name="__navigation__" label="Navigation"/>
- <menu name="__filter__" label="Filter"/>
+ <menu name="mnu__main_menu__">
+ <menu name="mnu__file__" label="Datei"/>
+ <menu name="mnu__edit__" label="Bearbeiten"/>
+ <menu name="mnu__navigation__" label="Navigation"/>
+ <menu name="mnu__filter__" label="Filter"/>
</menu>
- <menu name="__help_menu__">
- <menu name="__help__" label="Hilfe"/>
+ <menu name="mnu__help_menu__">
+ <menu name="mnu__help__" label="Hilfe"/>
</menu>
</form>
Modified: trunk/gnue-forms/defaults/default/el.gfd
===================================================================
--- 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="1.0"?>
-<!--
- 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="act__cut__" label="C&ut"
- description="Αποκοπή επιλεγμένου κειμένου">
- form.cut()
- </action>
- <action name="act__copy__" label="&Copy"
- description="Αντιγραφή στο πρόχειρο">
- form.copy()
- </action>
- <action name="act__paste__" label="&Paste"
- description="Επικόλληση από το πρόχειρο">
- form.paste()
- </action>
- <action name="act__select_all__" label="Select &All"
- description="Επιλογή όλων">
- form.select_all()
- </action>
+ <action name="act__cut__" label="Αποκοπή" description="Αποκοπή επιλεγμένου
κειμένου"/>
+ <action name="act__copy__" label="Αντιγραφή" description="Αντιγραφή στο
πρόχειρο"/>
+ <action name="act__paste__" label="Επικόληση" description="Επικόλληση από το
πρόχειρο"/>
+ <action name="act__select_all__" label="Επιλογή όλων" description="Επιλογή
όλων"/>
<!-- Focus management -->
- <action name="act__next_block__" label="Next &Block"
- description="Επόμενο block">
- form.next_block()
- </action>
- <action name="act__previous_block__" label="Previous Bl&ock"
- description="Προηγούμενο block">
- form.previous_block()
- </action>
- <action name="act__next_page__" label="Next P&age"
- description="Επόμενη σελίδα">
- form.next_page()
- </action>
- <action name="act__previous_page__" label="Pre&vious Page"
- description="Προηγούμενη σελίδα">
- form.previous_page()
- </action>
+ <action name="act__next_block__" label="Επόμενο block" description="Επόμενο
block"/>
+ <action name="act__previous_block__" label="Προηγούμενο block"
description="Προηγούμενο block"/>
+ <action name="act__next_page__" label="Επόμενη σελίδα" description="Επόμενη
σελίδα"/>
+ <action name="act__previous_page__" label="Προηγούμενη σελίδα"
description="Προηγούμενη σελίδα"/>
<!-- Record navigation -->
- <action name="act__first_record__" icon="firstrecord" label="&First
Record"
- description="Πλοήγηση στο τρέχον block στην πρώτη εγγραφή">
- form.first_record()
- </action>
- <action name="act__prev_record__" icon="prevrecord" label="Previous
R&ecord"
- description="Πλοήγηση στο τρέχον block στην προηγούμενη εγγραφή">
- form.prev_record()
- </action>
- <action name="act__next_record__" icon="nextrecord" label="Next &Record"
- description="Πλοήγηση στο τρέχον block στην επόμενη εγγραφή">
- form.next_record()
- </action>
- <action name="act__last_record__" icon="lastrecord" label="&Last Record"
- description="Πλοήγηση στο τρέχον block στην τελευταία εγγραφή">
- form.last_record()
- </action>
- <action name="act__ask_record__" icon="jumpprompt" label="&Jump to
Record"
- description="Ερώτηση για αριθμό εγγραφής και μετάβαση σε αυτήν">
- form.ask_record()
- </action>
+ <action name="act__first_record__" label="Πρώτη εγγραφή"
description="Πλοήγηση στο τρέχον block στην πρώτη εγγραφή"/>
+ <action name="act__prev_record__" label="Προηγούμενη εγγραφή"
description="Πλοήγηση στο τρέχον block στην προηγούμενη εγγραφή"/>
+ <action name="act__next_record__" label="Επόμενη εγγραφή"
description="Πλοήγηση στο τρέχον block στην επόμενη εγγραφή"/>
+ <action name="act__last_record__" label="Τελευταία εγγραφή"
description="Πλοήγηση στο τρέχον block στην τελευταία εγγραφή"/>
+ <action name="act__ask_record__" label="Εύρεση εγγραφής"
description="Ερώτηση για αριθμό εγγραφής και μετάβαση σε αυτήν"/>
<!-- Record insertion and deletion -->
- <action name="act__new_record__" icon="newrecord" label="&New Record"
- description="Εισαγωγή νέας εγγραφής στο τρέχον block">
- form.new_record()
- </action>
- <action name="act__delete_record__" icon="deleterecord"
- label="&Delete Record"
- description="Επιλογή εγγραφής για διαγραφή">
- form.delete_record()
- </action>
- <action name="act__undelete_record__" label="&Undelete Record"
- description="Αποεπιλογή εγγραφής για διαγραφή">
- form.undelete_record()
- </action>
+ <action name="act__new_record__" label="Νὲα εγγραφή" description="Εισαγωγή
νέας εγγραφής στο τρέχον block"/>
+ <action name="act__delete_record__" label="Διαγραφή εγγραφής"
description="Επιλογή εγγραφής για διαγραφή"/>
+ <action name="act__undelete_record__" description="Αποεπιλογή εγγραφής για
διαγραφή"/>
<!-- Filter -->
- <action name="act__init_filter__" icon="init_filter" label="Define Filter"
- description="Ορισμός κριτηρίων για φίλτρα">
- form.init_filter()
- </action>
- <action name="act__change_filter__" label="Change Filter"
- description="Αλλαγή φίλτρων">
- form.change_filter()
- </action>
- <action name="act__discard_filter__" label="Discard Filter Changes"
- description="Ακύρωση αλλαγών στα κριτήρια φίλτρων και μετάβαση στην
προηγούμενη κατάσταση">
- form.discard_filter()
- </action>
- <action name="act__apply_filter__" icon="apply_filter" label="Apply Filter"
- description="Εφαρμογή φίλτρων">
- form.apply_filter()
- </action>
+ <action name="act__init_filter__" label="Ορισμός φίλτρου"
description="Ορισμός κριτηρίων για φίλτρα"/>
+ <action name="act__change_filter__" label="Αλλαγή φίλτρου"
description="Αλλαγή φίλτρων"/>
+ <action name="act__discard_filter__" label="Ακύρωση αλλαγών φίλτρου"
description="Ακύρωση αλλαγών στα κριτήρια φίλτρων και μετάβαση στην προηγούμενη
κατάσταση"/>
+ <action name="act__apply_filter__" label="Εφαρμογή φίλτρου"
description="Εφαρμογή φίλτρων"/>
<!-- Transactions -->
- <action name="act__commit__" icon="commit" label="&Save changes"
- description="Αποθήκευση όλων των αλλαγών στην βάση δεδομένων">
- form.commit()
- </action>
- <action name="act__rollback__" icon="rollback" label="Disca&rd changes"
- description="Ακύρωση όλων των αλλαγών και εκαθάριση της φόρμας">
- form.rollback()
- </action>
+ <action name="act__commit__" label="Σώσιμο" description="Αποθήκευση όλων των
αλλαγών στην βάση δεδομένων"/>
+ <action name="act__rollback__" label="Ακύρωση αλλαγών" description="Ακύρωση
όλων των αλλαγών και εκαθάριση της φόρμας"/>
<!-- Other stuff -->
- <action name="act__show_about__" label="About"
- description="Πληροφορίες γι αυτήν την φόρμα">
- form.show_about()
- </action>
- <action name="act__printout__" icon="printout" label="&Print Form"
- description="Εκτύπωση της φόρμας">
- form.printout()
- </action>
- <action name="act__close__" icon="exit" label="&Close Window"
- description="Κλείσιμο παραθύρου">
- form.close()
- </action>
+ <action name="act__show_about__" label="Σχετικά" description="Πληροφορίες γι
αυτήν την φόρμα"/>
+ <action name="act__printout__" label="Εκτύπωση" description="Εκτύπωση της
φόρμας"/>
+ <action name="act__close__" label="Κλείσιμο" description="Κλείσιμο
παραθύρου"/>
- <trigger name="trg__update_status__" type="ON-STATUSCHANGE">
- current_block = form.get_focus_block()
- if current_block is not None:
- record_status = current_block.get_record_status()
- possible_operations = current_block.get_possible_operations()
- else:
- record_status = None
- possible_operations = []
-
- 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 = (operation in possible_operations)
-
- if form.in_filter_mode():
- form.act__init_filter__.enabled = False
- form.act__change_filter__.enabled = False
- form.act__discard_filter__.enabled = True
- form.act__apply_filter__.enabled = True
- form.act__commit__.enabled = False
- form.act__rollback__.enabled = False
- else:
- form.act__init_filter__.enabled = True
- form.act__change_filter__.enabled = True
- form.act__discard_filter__.enabled = False
- form.act__apply_filter__.enabled = False
- form.act__commit__.enabled = not form.is_saved()
- form.act__rollback__.enabled = True
- </trigger>
-
-
- <menu name="__main_menu__" label="Main Menu">
- <menu name="__file__" label="&Αρχείο">
- <menuitem name="__commit__" action="act__commit__" hotkey="ALT+ENTER"
label="Σώσιμο"/>
- <menuitem name="__rollback__" action="act__rollback__" hotkey="ALT+BACK"
label="Ακύρωση αλλαγών"/>
- <menuitem name="__sep0__"/>
- <menuitem name="__printout__" action="act__printout__"
- hotkey="CTRL+P" label="Εκτύπωση"/>
- <menuitem name="__sep1__"/>
- <menuitem name="__close__" action="act__close__" hotkey="CTRL+Q"
label="Κλείσιμο"/>
- </menu>
- <menu name="__edit__" label="&Επεξεργασία">
- <menuitem name="__cut__" action="act__cut__" hotkey="CTRL+X"
label="Αποκοπή"/>
- <menuitem name="__copy__" action="act__copy__" hotkey="CTRL+C"
label="Αντιγραφή"/>
- <menuitem name="__paste__" action="act__paste__" hotkey="CTRL+V"
label="Επικόληση"/>
- <menuitem name="__select_all__" action="act__select_all__"
- hotkey="CTRL+A" label="Επιλογή όλων"/>
- <menuitem name="__sep0__"/>
- <menuitem name="__new_record__" action="act__new_record__"
- hotkey="ALT+INS" label="Νὲα εγγραφή"/>
- <menuitem name="__sep1__"/>
- <menuitem name="__delete_record__" action="act__delete_record__"
- action_off="act__undelete_record__" hotkey="ALT+DEL" label="Διαγραφή
εγγραφής"/>
- </menu>
- <menu name="__navigation__" label="&Πλοήγηση" >
- <menuitem name="__previous_block__" action="act__previous_block__"
- hotkey="CTRL+PGUP" label="Προηγούμενο block"/>
- <menuitem name="__next_block__" action="act__next_block__"
- hotkey="CTRL+PGDN" label="Επόμενο block"/>
- <menuitem name="__previous_page__" action="act__previous_page__"
- hotkey="ALT+PGUP" label="Προηγούμενη σελίδα"/>
- <menuitem name="__next_page__" action="act__next_page__"
- hotkey="ALT+PGDN" label="Επόμενη σελίδα"/>
- <menuitem name="__sep0__"/>
- <menuitem name="__first_record__" action="act__first_record__"
- hotkey="ALT+HOME" label="Πρώτη εγγραφή"/>
- <menuitem name="__prev_record__" action="act__prev_record__"
- hotkey="ALT+LEFT" label="Προηγούμενη εγγραφή"/>
- <menuitem name="__next_record__" action="act__next_record__"
- hotkey="ALT+RIGHT" label="Επόμενη εγγραφή"/>
- <menuitem name="__last_record__" action="act__last_record__"
- hotkey="ALT+END" label="Τελευταία εγγραφή"/>
- <menuitem name="__ask_record__" action="act__ask_record__"
- hotkey="F3" label="Εύρεση εγγραφής"/>
- </menu>
- <menu name="__filter__" label="Φ&ίλτρο">
- <menuitem name="__init_filter__" action="act__init_filter__"
- hotkey="F8" label="Ορισμός φίλτρου"/>
- <menuitem name="__change_filter__" action="act__change_filter__"
- hotkey="SHIFT+F8" label="Αλλαγή φίλτρου"/>
- <menuitem name="__discard_filter__" action="act__discard_filter__"
- hotkey="SHIFT+F9" label="Ακύρωση αλλαγών φίλτρου"/>
- <menuitem name="__apply_filter__" action="act__apply_filter__"
- hotkey="F9" label="Εφαρμογή φίλτρου"/>
- </menu>
+ <menu name="mnu__main_menu__" label="Main Menu">
+ <menu name="mnu__file__" label="&Αρχείο"/>
+ <menu name="mnu__edit__" label="&Επεξεργασία"/>
+ <menu name="mnu__navigation__" label="&Πλοήγηση"/>
+ <menu name="mnu__filter__" label="Φ&ίλτρο"/>
</menu>
- <menu name="__help_menu__">
- <menu name="__help__" label="&Βοήθεια">
- <menuitem name="__show_about__" action="act__show_about__"
label="Σχετικά"/>
- </menu>
+ <menu name="mnu__help_menu__">
+ <menu name="mnu__help__" label="&Βοήθεια"/>
</menu>
-
- <toolbar name="__main_toolbar__">
- <toolbutton name="__commit__" action="act__commit__"/>
- <toolbutton name="__sep1__"/>
- <toolbutton name="__new_record__" action="act__new_record__"/>
- <toolbutton name="__delete_record__" action="act__delete_record__"
- action_off="act__undelete_record__"/>
- <toolbutton name="__sep2__"/>
- <toolbutton name="__first_record__" action="act__first_record__"/>
- <toolbutton name="__prev_record__" action="act__prev_record__"/>
- <toolbutton name="__next_record__" action="act__next_record__"/>
- <toolbutton name="__last_record__" action="act__last_record__"/>
- <toolbutton name="__ask_record__" action="act__ask_record__"/>
- <toolbutton name="__sep3__"/>
- <toolbutton name="__init_filter__" action="act__init_filter__"
- action_off="act__discard_filter__"/>
- <toolbutton name="__apply_filter__" action="act__apply_filter__"/>
- <toolbutton name="__sep4__"/>
- <toolbutton name="__printout__" action="act__printout__"/>
- <toolbutton name="__sep5__"/>
- <toolbutton name="__rollback__" action="act__rollback__"/>
- <toolbutton name="__sep6__"/>
- <toolbutton name="__close__" action="act__close__"/>
- </toolbar>
-
</form>
Modified: trunk/gnue-forms/defaults/default/es.gfd
===================================================================
--- 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="1.0"?>
-<!--
- 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ón al español: Gustavo A. Corradi address@hidden 2009-02.16
-
--->
-
<form>
<!-- Clipboard and selection -->
- <action name="act__cut__" label="C&ortar"
- description="Corta el texto seleccionado">
- form.cut()
- </action>
- <action name="act__copy__" label="&Copiar"
- description="Copia el texto seleccionado al portapapeles">
- form.copy()
- </action>
- <action name="act__paste__" label="&Pegar"
- description="Pega el contenido del portapapeles en la posición actual">
- form.paste()
- </action>
- <action name="act__select_all__" label="Seleccionar &todo"
- description="Selecciona todo el campo">
- form.select_all()
- </action>
+ <action name="act__cut__" label="C&ortar" description="Corta el texto
seleccionado"/>
+ <action name="act__copy__" label="&Copiar" description="Copia el texto
seleccionado al portapapeles"/>
+ <action name="act__paste__" label="&Pegar" description="Pega el
contenido del portapapeles en la posición actual"/>
+ <action name="act__select_all__" label="Seleccionar &todo"
description="Selecciona todo el campo"/>
<!-- Focus management -->
- <action name="act__next_block__" label="&Bloque siguiente"
- description="Salta al siguiente bloque">
- form.next_block()
- </action>
- <action name="act__previous_block__" label="Bl&oque anterior"
- description="Salta al bloque anterior">
- form.previous_block()
- </action>
- <action name="act__next_page__" label="Págin&a siguiente"
- description="Salta a la siguiente página">
- form.next_page()
- </action>
- <action name="act__previous_page__" label="Página a&nterior"
- description="Salta a la página anterior">
- form.previous_page()
- </action>
+ <action name="act__next_block__" label="&Bloque siguiente"
description="Salta al siguiente bloque"/>
+ <action name="act__previous_block__" label="Bl&oque anterior"
description="Salta al bloque anterior"/>
+ <action name="act__next_page__" label="Págin&a siguiente"
description="Salta a la siguiente página"/>
+ <action name="act__previous_page__" label="Página a&nterior"
description="Salta a la página anterior"/>
<!-- Record navigation -->
- <action name="act__first_record__" icon="firstrecord" label="&Primer
registro"
- description="Mueve el bloque actual al primer registro">
- form.first_record()
- </action>
- <action name="act__prev_record__" icon="prevrecord" label="R&egistro
anterior"
- description="Mueve el bloque actual al registro anterior">
- form.prev_record()
- </action>
- <action name="act__next_record__" icon="nextrecord" label="&Registro
siguiente"
- description="Mueve el bloque actual al siguiente registro">
- form.next_record()
- </action>
- <action name="act__last_record__" icon="lastrecord" label="&Ultimo
registro"
- description="Mueve el bloque actual al último registro">
- form.last_record()
- </action>
- <action name="act__ask_record__" icon="jumpprompt" label="&Salta al
registro"
- description="Pregunta por el numero de registro para cargarlo">
- form.ask_record()
- </action>
+ <action name="act__first_record__" label="&Primer registro"
description="Mueve el bloque actual al primer registro"/>
+ <action name="act__prev_record__" label="R&egistro anterior"
description="Mueve el bloque actual al registro anterior"/>
+ <action name="act__next_record__" label="&Registro siguiente"
description="Mueve el bloque actual al siguiente registro"/>
+ <action name="act__last_record__" label="&Ultimo registro"
description="Mueve el bloque actual al último registro"/>
+ <action name="act__ask_record__" label="&Salta al registro"
description="Pregunta por el numero de registro para cargarlo"/>
<!-- Record insertion and deletion -->
- <action name="act__new_record__" icon="newrecord" label="&Nuevo registro"
- description="Inserta un nuevo registro en el bloque actual">
- form.new_record()
- </action>
- <action name="act__delete_record__" icon="deleterecord"
- label="&Borrar Registro"
- description="Marca el registro actual como eliminado">
- form.delete_record()
- </action>
- <action name="act__undelete_record__" label="&Recuperar registro"
- description="Quita la marca de borrado del registro actual">
- form.undelete_record()
- </action>
+ <action name="act__new_record__" label="&Nuevo registro"
description="Inserta un nuevo registro en el bloque actual"/>
+ <action name="act__delete_record__" label="&Borrar Registro"
description="Marca el registro actual como eliminado"/>
+ <action name="act__undelete_record__" label="&Recuperar registro"
description="Quita la marca de borrado del registro actual"/>
<!-- Filter -->
- <action name="act__init_filter__" icon="init_filter" label="&Definir
filtro"
- description="Define un nuevo criterio de filtrado">
- form.init_filter()
- </action>
- <action name="act__change_filter__" label="&Modificar filtro"
- description="Modifica el criterio de filtrado">
- form.change_filter()
- </action>
- <action name="act__discard_filter__" label="De&scarta modificación del
filtro"
- description="Descarta los cambios del filtro y lo restaura a su estado
anterior">
- form.discard_filter()
- </action>
- <action name="act__apply_filter__" icon="apply_filter" label="&Aplicar
filtro"
- description="Aplica el filtro">
- form.apply_filter()
- </action>
+ <action name="act__init_filter__" label="&Definir filtro"
description="Define un nuevo criterio de filtrado"/>
+ <action name="act__change_filter__" label="&Modificar filtro"
description="Modifica el criterio de filtrado"/>
+ <action name="act__discard_filter__" label="De&scarta modificación del
filtro" description="Descarta los cambios del filtro y lo restaura a su estado
anterior"/>
+ <action name="act__apply_filter__" label="&Aplicar filtro"
description="Aplica el filtro"/>
<!-- Transactions -->
- <action name="act__commit__" icon="commit" label="&Salvar cambios"
- description="Salva los cambios a la base de datos">
- form.commit()
- </action>
- <action name="act__rollback__" icon="rollback" label="&Descartar cambios"
- description="Descarta todos los cambios y restablece el formulario">
- form.rollback()
- </action>
+ <action name="act__commit__" label="&Salvar cambios" description="Salva
los cambios a la base de datos"/>
+ <action name="act__rollback__" label="&Descartar cambios"
description="Descarta todos los cambios y restablece el formulario"/>
<!-- Other stuff -->
- <action name="act__show_about__" label="A&cerca"
- description="Muestra información acerca de este formulario">
- form.show_about()
- </action>
- <action name="act__printout__" icon="printout" label="&Imprimir
formulario"
- description="Imprime el contenido de este formulario">
- form.printout()
- </action>
- <action name="act__close__" icon="exit" label="&Cerrar ventana"
- description="Cierra esta ventana">
- form.close()
- </action>
+ <action name="act__show_about__" label="A&cerca" description="Muestra
información acerca de este formulario"/>
+ <action name="act__printout__" label="&Imprimir formulario"
description="Imprime el contenido de este formulario"/>
+ <action name="act__close__" label="&Cerrar ventana" description="Cierra
esta ventana"/>
- <trigger name="trg__update_status__" type="ON-STATUSCHANGE">
- current_block = form.get_focus_block()
- if current_block is not None:
- record_status = current_block.get_record_status()
- possible_operations = current_block.get_possible_operations()
- else:
- record_status = None
- possible_operations = []
-
- 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 = (operation in possible_operations)
-
- if form.in_filter_mode():
- form.act__init_filter__.enabled = False
- form.act__change_filter__.enabled = False
- form.act__discard_filter__.enabled = True
- form.act__apply_filter__.enabled = True
- form.act__commit__.enabled = False
- form.act__rollback__.enabled = False
- else:
- form.act__init_filter__.enabled = True
- form.act__change_filter__.enabled = True
- form.act__discard_filter__.enabled = False
- form.act__apply_filter__.enabled = False
- form.act__commit__.enabled = not form.is_saved()
- form.act__rollback__.enabled = True
- </trigger>
-
-
- <menu name="__main_menu__" label="Menu principal">
- <menu name="__file__" label="&Archivo">
- <menuitem name="__commit__" action="act__commit__" hotkey="ALT+ENTER"/>
- <menuitem name="__rollback__" action="act__rollback__"
hotkey="ALT+BACK"/>
- <menuitem name="__sep0__"/>
- <menuitem name="__printout__" action="act__printout__"
- hotkey="CTRL+P"/>
- <menuitem name="__sep1__"/>
- <menuitem name="__close__" action="act__close__" hotkey="CTRL+Q"/>
- </menu>
- <menu name="__edit__" label="&Edición">
- <menuitem name="__cut__" action="act__cut__" hotkey="CTRL+X"/>
- <menuitem name="__copy__" action="act__copy__" hotkey="CTRL+C"/>
- <menuitem name="__paste__" action="act__paste__" hotkey="CTRL+V"/>
- <menuitem name="__select_all__" action="act__select_all__"
- hotkey="CTRL+A"/>
- <menuitem name="__sep0__"/>
- <menuitem name="__new_record__" action="act__new_record__"
- hotkey="ALT+INS"/>
- <menuitem name="__sep1__"/>
- <menuitem name="__delete_record__" action="act__delete_record__"
- action_off="act__undelete_record__" hotkey="ALT+DEL"/>
- </menu>
- <menu name="__navigation__" label="&Navegación">
- <menuitem name="__previous_block__" action="act__previous_block__"
- hotkey="PGUP"/>
- <menuitem name="__next_block__" action="act__next_block__"
- hotkey="PGDN"/>
- <menuitem name="__previous_page__" action="act__previous_page__"
- hotkey="ALT+PGUP"/>
- <menuitem name="__next_page__" action="act__next_page__"
- hotkey="ALT+PGDN"/>
- <menuitem name="__sep0__"/>
- <menuitem name="__first_record__" action="act__first_record__"
- hotkey="ALT+HOME"/>
- <menuitem name="__prev_record__" action="act__prev_record__"
- hotkey="ALT+LEFT"/>
- <menuitem name="__next_record__" action="act__next_record__"
- hotkey="ALT+RIGHT"/>
- <menuitem name="__last_record__" action="act__last_record__"
- hotkey="ALT+END"/>
- <menuitem name="__ask_record__" action="act__ask_record__"
- hotkey="F3"/>
- </menu>
- <menu name="__filter__" label="&Filtros">
- <menuitem name="__init_filter__" action="act__init_filter__"
- hotkey="F8"/>
- <menuitem name="__change_filter__" action="act__change_filter__"
- hotkey="SHIFT+F8"/>
- <menuitem name="__discard_filter__" action="act__discard_filter__"
- hotkey="SHIFT+F9"/>
- <menuitem name="__apply_filter__" action="act__apply_filter__"
- hotkey="F9"/>
- </menu>
+ <menu name="mnu__main_menu__" label="Menu principal">
+ <menu name="mnu__file__" label="&Archivo"/>
+ <menu name="mnu__edit__" label="&Edición"/>
+ <menu name="mnu__navigation__" label="&Navegación"/>
+ <menu name="mnu__filter__" label="&Filtros"/>
</menu>
- <menu name="__help_menu__">
- <menu name="__help__" label="Ay&uda">
- <menuitem name="__show_about__" action="act__show_about__"/>
- </menu>
+ <menu name="mnu__help_menu__">
+ <menu name="mnu__help__" label="Ay&uda"/>
</menu>
-
- <toolbar name="__main_toolbar__">
- <toolbutton name="__commit__" action="act__commit__"/>
- <toolbutton name="__sep1__"/>
- <toolbutton name="__new_record__" action="act__new_record__"/>
- <toolbutton name="__delete_record__" action="act__delete_record__"
- action_off="act__undelete_record__"/>
- <toolbutton name="__sep2__"/>
- <toolbutton name="__first_record__" action="act__first_record__"/>
- <toolbutton name="__prev_record__" action="act__prev_record__"/>
- <toolbutton name="__next_record__" action="act__next_record__"/>
- <toolbutton name="__last_record__" action="act__last_record__"/>
- <toolbutton name="__ask_record__" action="act__ask_record__"/>
- <toolbutton name="__sep3__"/>
- <toolbutton name="__init_filter__" action="act__init_filter__"
- action_off="act__discard_filter__"/>
- <toolbutton name="__apply_filter__" action="act__apply_filter__"/>
- <toolbutton name="__sep4__"/>
- <toolbutton name="__printout__" action="act__printout__"/>
- <toolbutton name="__sep5__"/>
- <toolbutton name="__rollback__" action="act__rollback__"/>
- <toolbutton name="__sep6__"/>
- <toolbutton name="__close__" action="act__close__"/>
- </toolbar>
</form>
Modified: trunk/gnue-forms/defaults/default/fr.gfd
===================================================================
--- 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 @@
<form>
<!-- Clipboard and selection -->
- <action name="act__cut__" label="Co&uper" description="Couper le
texte sélectioné" />
- <action name="act__copy__" label="&Copier" description="Copier le
texte sélectionné vers le presse-papier" />
- <action name="act__paste__" label="Co&ller" description="Coller le
contenu du presse-papier à la position courante" />
- <action name="act__select_all__" label="Tout sélectionner"
description="Sélectionner tout le champ" />
+ <action name="act__cut__" label="Co&uper" description="Couper le texte
sélectioné"/>
+ <action name="act__copy__" label="&Copier" description="Copier le texte
sélectionné vers le presse-papier"/>
+ <action name="act__paste__" label="Co&ller" description="Coller le
contenu du presse-papier à la position courante"/>
+ <action name="act__select_all__" label="Tout sélectionner"
description="Sélectionner tout le champ"/>
<!-- Focus management -->
- <action name="act__next_block__" label="Bloc suivant" description="Aller
au bloc suivant" />
- <action name="act__previous_block__" label="Bloc précédent"
description="Aller au bloc précédent" />
- <action name="act__next_page__" label="Page suivante" description="Aller
à la page suivante" />
- <action name="act__previous_page__" label="Page précédente"
description="Aller à la page précédente" />
+ <action name="act__next_block__" label="Bloc suivant" description="Aller au
bloc suivant"/>
+ <action name="act__previous_block__" label="Bloc précédent"
description="Aller au bloc précédent"/>
+ <action name="act__next_page__" label="Page suivante" description="Aller à
la page suivante"/>
+ <action name="act__previous_page__" label="Page précédente"
description="Aller à la page précédente"/>
<!-- Record navigation -->
- <action name="act__first_record__" icon="firstrecord" label="Premier
enregistrement"
- description="Déplacer le bloc courant vers le premier enregistrement" />
- <action name="act__prev_record__" icon="prevrecord" label="Enregistrement
préc."
- description="Déplacer le bloc courant vers l'enreistrement précédent" />
- <action name="act__next_record__" icon="nextrecord" label="Enregistrement
suiv."
- description="Déplacer le bloc courant vers l'enregistrement suivant" />
- <action name="act__last_record__" icon="lastrecord" label="Dernier
enregistrement"
- description="Déplacer le bloc courant vers le dernier enregistrement" />
- <action name="act__ask_record__" icon="jumpprompt" label="Aller à
l'enregistrement"
- description="Saisir un n° d'enregistrement et se déplacer vers cet
enregistrement" />
+ <action name="act__first_record__" label="Premier enregistrement"
description="Déplacer le bloc courant vers le premier enregistrement"/>
+ <action name="act__prev_record__" label="Enregistrement préc."
description="Déplacer le bloc courant vers l'enreistrement précédent"/>
+ <action name="act__next_record__" label="Enregistrement suiv."
description="Déplacer le bloc courant vers l'enregistrement suivant"/>
+ <action name="act__last_record__" label="Dernier enregistrement"
description="Déplacer le bloc courant vers le dernier enregistrement"/>
+ <action name="act__ask_record__" label="Aller à l'enregistrement"
description="Saisir un n° d'enregistrement et se déplacer vers cet
enregistrement"/>
<!-- Record insertion and deletion -->
- <action name="act__new_record__" icon="newrecord" label="Nouvel
enregistrement"
- description="Insérer un nouvel enregistrement dans le bloc courant" />
- <action name="act__delete_record__" icon="deleterecord" label="Supprimer
l'enregistrement"
- description="Marquer l'enregistrement actuel pour suppression" />
- <action name="act__undelete_record__" label="Restaurer l'enregistrement"
- description="Annuler la suppression de l'enregistrement" />
+ <action name="act__new_record__" label="Nouvel enregistrement"
description="Insérer un nouvel enregistrement dans le bloc courant"/>
+ <action name="act__delete_record__" label="Supprimer l'enregistrement"
description="Marquer l'enregistrement actuel pour suppression"/>
+ <action name="act__undelete_record__" label="Restaurer l'enregistrement"
description="Annuler la suppression de l'enregistrement"/>
<!-- Filter -->
- <action name="act__init_filter__" icon="init_filter" label="Définir un
filtre"
- description="Définir un nouveau critère de filtrage" />
- <action name="act__change_filter__" label="Modifier le filtre"
- description="Modifier le critère de filtrage" />
- <action name="act__discard_filter__" label="Annuler les modifications du
filtre"
- description="Annule les modification du critère de filtrage et rétabli le
filtrage précédent" />
- <action name="act__apply_filter__" icon="apply_filter" label="Appliquer le
filtre"
- description="Applique le critère de filtrage" />
+ <action name="act__init_filter__" label="Définir un filtre"
description="Définir un nouveau critère de filtrage"/>
+ <action name="act__change_filter__" label="Modifier le filtre"
description="Modifier le critère de filtrage"/>
+ <action name="act__discard_filter__" label="Annuler les modifications du
filtre" description="Annule les modification du critère de filtrage et rétabli
le filtrage précédent"/>
+ <action name="act__apply_filter__" label="Appliquer le filtre"
description="Applique le critère de filtrage"/>
<!-- Transactions -->
- <action name="act__commit__" icon="commit" label="Enregistrer les
modifications"
- description="Enregistrer tous les changements dans la base de données" />
- <action name="act__rollback__" icon="rollback" label="Annuler les
modifications"
- description="Annuler les modifications et ré-initialiser le formulaire" />
+ <action name="act__commit__" label="Enregistrer les modifications"
description="Enregistrer tous les changements dans la base de données"/>
+ <action name="act__rollback__" label="Annuler les modifications"
description="Annuler les modifications et ré-initialiser le formulaire"/>
<!-- Other stuff -->
- <action name="act__show_about__" label="A propos" description="Affiche
les informations du formulaire" />
- <action name="act__printout__" icon="printout" label="Imprimer le formulaire"
- description="Imprime le contenu du formulaire" />
- <action name="act__close__" icon="exit" label="Fermer la fenêtre"
description="Ferme cette fenêtre" />
+ <action name="act__show_about__" label="A propos" description="Affiche les
informations du formulaire"/>
+ <action name="act__printout__" label="Imprimer le formulaire"
description="Imprime le contenu du formulaire"/>
+ <action name="act__close__" label="Fermer la fenêtre" description="Ferme
cette fenêtre"/>
-
- <menu name="__main_menu__" label="Menu Principal">
- <menu name="__file__" label="&Fichier" />
- <menu name="__edit__" label="&Edition" />
- <menu name="__filter__" label="F&iltre" />
+ <menu name="mnu__main_menu__" label="Menu Principal">
+ <menu name="mnu__file__" label="&Fichier" />
+ <menu name="mnu__edit__" label="&Edition" />
+ <menu name="mnu__filter__" label="F&iltre" />
</menu>
- <menu name="__help_menu__">
- <menu name="__help__" label="Aide" />
+ <menu name="mnu__help_menu__">
+ <menu name="mnu__help__" label="Aide" />
</menu>
</form>
Modified: trunk/gnue-forms/defaults/default/hu.gfd
===================================================================
--- 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="1.0"?>
-<!--
- 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="act__cut__" label="&Kivágás" description="A kijelölt
szöveg kivágása és vágólapra helyezése." />
- <action name="act__copy__" label="&Másolás" description="A kijelölt
szöveg másolása a vágólapra." />
- <action name="act__paste__" label="&Beillesztés" description="Vágólap
tartalmának beillesztése az adott pozíciótól." />
- <action name="act__select_all__" label="Mind&ent kijelöl"
description="Teljes mezőtartalom kijelölése." />
+ <action name="act__cut__" label="&Kivágás" description="A kijelölt
szöveg kivágása és vágólapra helyezése."/>
+ <action name="act__copy__" label="&Másolás" description="A kijelölt
szöveg másolása a vágólapra."/>
+ <action name="act__paste__" label="&Beillesztés" description="Vágólap
tartalmának beillesztése az adott pozíciótól."/>
+ <action name="act__select_all__" label="Mind&ent kijelöl"
description="Teljes mezőtartalom kijelölése."/>
<!-- Focus management -->
- <action name="act__next_block__" label="Következő &blokk"
description="Ugrás a következő blokkra." />
- <action name="act__previous_block__" label="Előző bl&okk"
description="Ugrás az előző blokkra." />
- <action name="act__next_page__" label="Következő l&ap"
description="Ugrás a következő lapra." />
- <action name="act__previous_page__" label="Előző la&p"
description="Ugrás az előző lapra." />
+ <action name="act__next_block__" label="Következő &blokk"
description="Ugrás a következő blokkra."/>
+ <action name="act__previous_block__" label="Előző bl&okk"
description="Ugrás az előző blokkra."/>
+ <action name="act__next_page__" label="Következő l&ap"
description="Ugrás a következő lapra."/>
+ <action name="act__previous_page__" label="Előző la&p"
description="Ugrás az előző lapra."/>
<!-- Record navigation -->
- <action name="act__first_record__" label="E&lső rekord"
description="Ugrás az aktuális blokk első rekordjára." />
- <action name="act__prev_record__" label="Előző rek&ord"
description="Ugrás az aktuális blokk előző rekordjára." />
- <action name="act__next_record__" label="Következő &rekord"
description="Ugrás az aktuális blokk következő rekordjára." />
- <action name="act__last_record__" label="&Utolsó rekord"
description="Ugrás az aktuális blokk utolsó rekordjára." />
- <action name="act__ask_record__" label="U&grás egy rekordra..."
description="A rekord sorszámának bekérése, majd ugrás a megfelelő rekordra." />
+ <action name="act__first_record__" label="E&lső rekord"
description="Ugrás az aktuális blokk első rekordjára."/>
+ <action name="act__prev_record__" label="Előző rek&ord"
description="Ugrás az aktuális blokk előző rekordjára."/>
+ <action name="act__next_record__" label="Következő &rekord"
description="Ugrás az aktuális blokk következő rekordjára."/>
+ <action name="act__last_record__" label="&Utolsó rekord"
description="Ugrás az aktuális blokk utolsó rekordjára."/>
+ <action name="act__ask_record__" label="U&grás egy rekordra..."
description="A rekord sorszámának bekérése, majd ugrás a megfelelő rekordra."/>
<!-- Record insertion and deletion -->
- <action name="act__new_record__" label="Ú&j rekord" description="Új
rekord beszúrása az aktuális blokkba." />
- <action name="act__delete_record__" label="Rekord &törlése"
description="Rekord kijelölése törlésre." />
- <action name="act__undelete_record__" label="&Rekord törlésének
visszavonása" description="Törlésre kijelölt rekord kijelölésének
megszüntetése." />
+ <action name="act__new_record__" label="Ú&j rekord" description="Új
rekord beszúrása az aktuális blokkba."/>
+ <action name="act__delete_record__" label="Rekord &törlése"
description="Rekord kijelölése törlésre."/>
+ <action name="act__undelete_record__" label="&Rekord törlésének
visszavonása" description="Törlésre kijelölt rekord kijelölésének
megszüntetése."/>
<!-- Queries -->
- <action name="act__init_filter__" label="Váltás lekérdezés módba."
description="Váltás lekérdezés módba." />
- <action name="act__change_filter__" label="Előző lekérdezés megismétlése"
description="Váltás lekérdezés módba a legutóbbi szűrő felhasználásával." />
- <action name="act__discard_filter__" label="Lekérdezés mód megszakítása"
description="Visszatérés lekérdezés módból a szűrés végrehajtása nélkül." />
- <action name="act__apply_filter__" label="Lekérdezés végrehajtása"
description="Szűrés alkalmazása." />
+ <action name="act__init_filter__" label="Váltás lekérdezés módba."
description="Váltás lekérdezés módba."/>
+ <action name="act__change_filter__" label="Előző lekérdezés megismétlése"
description="Váltás lekérdezés módba a legutóbbi szűrő felhasználásával."/>
+ <action name="act__discard_filter__" label="Lekérdezés mód megszakítása"
description="Visszatérés lekérdezés módból a szűrés végrehajtása nélkül."/>
+ <action name="act__apply_filter__" label="Lekérdezés végrehajtása"
description="Szűrés alkalmazása."/>
<!-- Transactions -->
- <action name="act__commit__" label="Változások m&entése"
description="Összes változás mentése az adatbázisba." />
- <action name="act__rollback__" label="Változások el&vetése"
description="Változások elvetése és a képernyő törlése." />
+ <action name="act__commit__" label="Változások m&entése"
description="Összes változás mentése az adatbázisba."/>
+ <action name="act__rollback__" label="Változások el&vetése"
description="Változások elvetése és a képernyő törlése."/>
<!-- Other stuff -->
- <action name="act__show_about__" label="&Névjegy" description="Adatok az
aktuális képernyőről." />
- <action name="act__printout__" label="Képernyő &nyomtatása"
description="Kinyomtatja a képernyőn lévő adatokat." />
- <action name="act__close__" label="Ablak &bezárása" description="Bezárja
ezt az ablakot." />
+ <action name="act__show_about__" label="&Névjegy" description="Adatok az
aktuális képernyőről."/>
+ <action name="act__printout__" label="Képernyő &nyomtatása"
description="Kinyomtatja a képernyőn lévő adatokat."/>
+ <action name="act__close__" label="Ablak &bezárása" description="Bezárja
ezt az ablakot."/>
- <menu name="__main_menu__" label="Főmenü">
- <menu name="__file__" label="&Fájl" />
- <menu name="__edit__" label="S&zerkesztés" />
- <menu name="__navigation__" label="&Navigálás" />
- <menu name="__filter__" label="Szű&rés" />
+ <menu name="mnu__main_menu__" label="Főmenü">
+ <menu name="mnu__file__" label="&Fájl"/>
+ <menu name="mnu__edit__" label="S&zerkesztés"/>
+ <menu name="mnu__navigation__" label="&Navigálás"/>
+ <menu name="mnu__filter__" label="Szű&rés"/>
</menu>
- <menu name="__help_menu__">
- <menu name="__help__" label="&Súgó" />
+ <menu name="mnu__help_menu__">
+ <menu name="mnu__help__" label="&Súgó"/>
</menu>
</form>
Modified: trunk/gnue-forms/defaults/default.gfd
===================================================================
--- trunk/gnue-forms/defaults/default.gfd 2010-12-03 17:29:41 UTC (rev
10265)
+++ trunk/gnue-forms/defaults/default.gfd 2010-12-03 17:29:44 UTC (rev
10266)
@@ -178,90 +178,90 @@
</trigger>
- <menu name="__main_menu__" label="Main Menu">
- <menu name="__file__" label="&File">
- <menuitem name="__commit__" action="act__commit__" hotkey="ALT+ENTER"/>
- <menuitem name="__rollback__" action="act__rollback__"
hotkey="ALT+BACK"/>
- <menuitem name="__sep0__"/>
- <menuitem name="__printout__" action="act__printout__"
+ <menu name="mnu__main_menu__" label="Main Menu">
+ <menu name="mnu__file__" label="&File">
+ <menuitem name="mnu__commit__" action="act__commit__"
hotkey="ALT+ENTER"/>
+ <menuitem name="mnu__rollback__" action="act__rollback__"
hotkey="ALT+BACK"/>
+ <menuitem name="mnu__sep0__"/>
+ <menuitem name="mnu__printout__" action="act__printout__"
hotkey="CTRL+P"/>
- <menuitem name="__sep1__"/>
- <menuitem name="__close__" action="act__close__" hotkey="CTRL+Q"/>
+ <menuitem name="mnu__sep1__"/>
+ <menuitem name="mnu__close__" action="act__close__" hotkey="CTRL+Q"/>
</menu>
- <menu name="__edit__" label="&Edit">
- <menuitem name="__cut__" action="act__cut__" hotkey="CTRL+X"/>
- <menuitem name="__copy__" action="act__copy__" hotkey="CTRL+C"/>
- <menuitem name="__paste__" action="act__paste__" hotkey="CTRL+V"/>
- <menuitem name="__select_all__" action="act__select_all__"
+ <menu name="mnu__edit__" label="&Edit">
+ <menuitem name="mnu__cut__" action="act__cut__" hotkey="CTRL+X"/>
+ <menuitem name="mnu__copy__" action="act__copy__" hotkey="CTRL+C"/>
+ <menuitem name="mnu__paste__" action="act__paste__" hotkey="CTRL+V"/>
+ <menuitem name="mnu__select_all__" action="act__select_all__"
hotkey="CTRL+A"/>
- <menuitem name="__sep0__"/>
- <menuitem name="__new_record__" action="act__new_record__"
+ <menuitem name="mnu__sep0__"/>
+ <menuitem name="mnu__new_record__" action="act__new_record__"
hotkey="ALT+INS"/>
- <menuitem name="__sep1__"/>
- <menuitem name="__delete_record__" action="act__delete_record__"
+ <menuitem name="mnu__sep1__"/>
+ <menuitem name="mnu__delete_record__" action="act__delete_record__"
action_off="act__undelete_record__" hotkey="ALT+DEL"/>
</menu>
- <menu name="__navigation__" label="&Navigation">
- <menuitem name="__previous_block__" action="act__previous_block__"
+ <menu name="mnu__navigation__" label="&Navigation">
+ <menuitem name="mnu__previous_block__" action="act__previous_block__"
hotkey="CTRL+PGUP"/>
- <menuitem name="__next_block__" action="act__next_block__"
+ <menuitem name="mnu__next_block__" action="act__next_block__"
hotkey="CTRL+PGDN"/>
- <menuitem name="__previous_page__" action="act__previous_page__"
+ <menuitem name="mnu__previous_page__" action="act__previous_page__"
hotkey="ALT+PGUP"/>
- <menuitem name="__next_page__" action="act__next_page__"
+ <menuitem name="mnu__next_page__" action="act__next_page__"
hotkey="ALT+PGDN"/>
- <menuitem name="__sep0__"/>
- <menuitem name="__first_record__" action="act__first_record__"
+ <menuitem name="mnu__sep0__"/>
+ <menuitem name="mnu__first_record__" action="act__first_record__"
hotkey="ALT+HOME"/>
- <menuitem name="__prev_record__" action="act__prev_record__"
+ <menuitem name="mnu__prev_record__" action="act__prev_record__"
hotkey="ALT+LEFT"/>
- <menuitem name="__next_record__" action="act__next_record__"
+ <menuitem name="mnu__next_record__" action="act__next_record__"
hotkey="ALT+RIGHT"/>
- <menuitem name="__last_record__" action="act__last_record__"
+ <menuitem name="mnu__last_record__" action="act__last_record__"
hotkey="ALT+END"/>
- <menuitem name="__ask_record__" action="act__ask_record__"
+ <menuitem name="mnu__ask_record__" action="act__ask_record__"
hotkey="CTRL+J"/>
</menu>
- <menu name="__filter__" label="F&ilter">
- <menuitem name="__init_filter__" action="act__init_filter__"
+ <menu name="mnu__filter__" label="F&ilter">
+ <menuitem name="mnu__init_filter__" action="act__init_filter__"
hotkey="F11"/>
- <menuitem name="__change_filter__" action="act__change_filter__"
+ <menuitem name="mnu__change_filter__" action="act__change_filter__"
hotkey="SHIFT+F11"/>
- <menuitem name="__discard_filter__" action="act__discard_filter__"
+ <menuitem name="mnu__discard_filter__" action="act__discard_filter__"
hotkey="SHIFT+F12"/>
- <menuitem name="__apply_filter__" action="act__apply_filter__"
+ <menuitem name="mnu__apply_filter__" action="act__apply_filter__"
hotkey="F12"/>
</menu>
</menu>
- <menu name="__help_menu__">
- <menu name="__help__" label="&Help">
- <menuitem name="__show_about__" action="act__show_about__"/>
+ <menu name="mnu__help_menu__">
+ <menu name="mnu__help__" label="&Help">
+ <menuitem name="mnu__show_about__" action="act__show_about__"/>
</menu>
</menu>
- <toolbar name="__main_toolbar__">
- <toolbutton name="__commit__" action="act__commit__"/>
- <toolbutton name="__sep1__"/>
- <toolbutton name="__new_record__" action="act__new_record__"/>
- <toolbutton name="__delete_record__" action="act__delete_record__"
+ <toolbar name="tlb__main_toolbar__">
+ <toolbutton name="tlb__commit__" action="act__commit__"/>
+ <toolbutton name="tlb__sep1__"/>
+ <toolbutton name="tlb__new_record__" action="act__new_record__"/>
+ <toolbutton name="tlb__delete_record__" action="act__delete_record__"
action_off="act__undelete_record__"/>
- <toolbutton name="__sep2__"/>
- <toolbutton name="__first_record__" action="act__first_record__"/>
- <toolbutton name="__prev_record__" action="act__prev_record__"/>
- <toolbutton name="__next_record__" action="act__next_record__"/>
- <toolbutton name="__last_record__" action="act__last_record__"/>
- <toolbutton name="__ask_record__" action="act__ask_record__"/>
- <toolbutton name="__sep3__"/>
- <toolbutton name="__init_filter__" action="act__init_filter__"
+ <toolbutton name="tlb__sep2__"/>
+ <toolbutton name="tlb__first_record__" action="act__first_record__"/>
+ <toolbutton name="tlb__prev_record__" action="act__prev_record__"/>
+ <toolbutton name="tlb__next_record__" action="act__next_record__"/>
+ <toolbutton name="tlb__last_record__" action="act__last_record__"/>
+ <toolbutton name="tlb__ask_record__" action="act__ask_record__"/>
+ <toolbutton name="tlb__sep3__"/>
+ <toolbutton name="tlb__init_filter__" action="act__init_filter__"
action_off="act__discard_filter__"/>
- <toolbutton name="__apply_filter__" action="act__apply_filter__"/>
- <toolbutton name="__sep4__"/>
- <toolbutton name="__printout__" action="act__printout__"/>
- <toolbutton name="__sep5__"/>
- <toolbutton name="__rollback__" action="act__rollback__"/>
- <toolbutton name="__sep6__"/>
+ <toolbutton name="tlb__apply_filter__" action="act__apply_filter__"/>
+ <toolbutton name="tlb__sep4__"/>
+ <toolbutton name="tlb__printout__" action="act__printout__"/>
+ <toolbutton name="tlb__sep5__"/>
+ <toolbutton name="tlb__rollback__" action="act__rollback__"/>
+ <toolbutton name="tlb__sep6__"/>
</toolbar>
- <toolbar name="__close_toolbar__">
- <toolbutton name="__close__" action="act__close__"/>
+ <toolbar name="tlb__close_toolbar__">
+ <toolbutton name="tlb__close__" action="act__close__"/>
</toolbar>
</form>
Modified: trunk/gnue-forms/samples/function/menu.gfd
===================================================================
--- trunk/gnue-forms/samples/function/menu.gfd 2010-12-03 17:29:41 UTC (rev
10265)
+++ trunk/gnue-forms/samples/function/menu.gfd 2010-12-03 17:29:44 UTC (rev
10266)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<form title="Menu Test">
- <menu name="__extra_menu__">
+ <menu name="mnu__extra_menu__">
<menu name="mnu_extras" label="Extras">
<menuitem name="mnu_1" action="act_1"/>
<menuitem name="mnu_2" action="act_2" hotkey="SHIFT+F5"/>
@@ -11,7 +11,7 @@
</menu>
</menu>
- <toolbar name="__main_toolbar__">
+ <toolbar name="tlb__main_toolbar__">
<toolbutton name="tlb_1" action="act_1"/>
</toolbar>
Modified: trunk/gnue-forms/samples/oldkeys.gfd
===================================================================
--- trunk/gnue-forms/samples/oldkeys.gfd 2010-12-03 17:29:41 UTC (rev
10265)
+++ trunk/gnue-forms/samples/oldkeys.gfd 2010-12-03 17:29:44 UTC (rev
10266)
@@ -4,22 +4,22 @@
that of gnue-forms 0.5 -->
<form>
- <menu name="__main_menu__">
- <menu name="__file__">
- <menuitem name="__commit__" hotkey="F6"/>
- <menuitem name="__rollback__" hotkey="F11"/>
+ <menu name="mnu__main_menu__">
+ <menu name="mnu__file__">
+ <menuitem name="mnu__commit__" hotkey="F6"/>
+ <menuitem name="mnu__rollback__" hotkey="F11"/>
</menu>
- <menu name="__edit__">
- <menuitem name="__new_record__" hotkey="F12"/>
- <menuitem name="__delete_record__" hotkey="F5"/>
+ <menu name="mnu__edit__">
+ <menuitem name="mnu__new_record__" hotkey="F12"/>
+ <menuitem name="mnu__delete_record__" hotkey="F5"/>
</menu>
- <menu name="__navigation__">
- <menuitem name="__previous_page__" hotkey="CTRL+PGUP"/>
- <menuitem name="__next_page__" hotkey="CTRL+PGDN"/>
- <menuitem name="__first_record__" hotkey="CTRL+UP"/>
- <menuitem name="__prev_record__" hotkey="UP"/>
- <menuitem name="__next_record__" hotkey="DOWN"/>
- <menuitem name="__last_record__" hotkey="CTRL+DOWN"/>
+ <menu name="mnu__navigation__">
+ <menuitem name="mnu__previous_page__" hotkey="CTRL+PGUP"/>
+ <menuitem name="mnu__next_page__" hotkey="CTRL+PGDN"/>
+ <menuitem name="mnu__first_record__" hotkey="CTRL+UP"/>
+ <menuitem name="mnu__prev_record__" hotkey="UP"/>
+ <menuitem name="mnu__next_record__" hotkey="DOWN"/>
+ <menuitem name="mnu__last_record__" hotkey="CTRL+DOWN"/>
</menu>
</menu>
</form>
Modified: trunk/gnue-forms/src/GFForm.py
===================================================================
--- 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)
# Merge extras and help menus into the main menu.
- main_menu = self.findChildNamed('__main_menu__', 'GFMenu')
- extra_menu = self.findChildNamed('__extra_menu__', 'GFMenu')
- help_menu = self.findChildNamed('__help_menu__', 'GFMenu')
+ main_menu = self.findChildNamed('mnu__main_menu__', 'GFMenu')
+ extra_menu = self.findChildNamed('mnu__extra_menu__', 'GFMenu')
+ help_menu = 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)
# Merge extra and exit buttons into the main toolbar.
- main_toolbar = self.findChildNamed('__main_toolbar__', 'GFToolbar')
- extra_toolbar = self.findChildNamed('__extra_toolbar__', 'GFToolbar')
- close_toolbar = self.findChildNamed('__close_toolbar__', 'GFToolbar')
+ main_toolbar = self.findChildNamed('tlb__main_toolbar__', 'GFToolbar')
+ extra_toolbar = self.findChildNamed('tlb__extra_toolbar__',
'GFToolbar')
+ close_toolbar = self.findChildNamed('tlb__close_toolbar__',
'GFToolbar')
if extra_toolbar:
main_toolbar.merge(extra_toolbar)
extra_toolbar.setParent(None)
Modified: trunk/gnue-forms/src/uidrivers/curses/widgets/menu.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/curses/widgets/menu.py 2010-12-03
17:29:41 UTC (rev 10265)
+++ trunk/gnue-forms/src/uidrivers/curses/widgets/menu.py 2010-12-03
17:29:44 UTC (rev 10266)
@@ -47,7 +47,7 @@
"""
self.hotkey = None
- if self._gfObject.name == '__main_menu__' \
+ if self._gfObject.name == '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
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt3/widgets/menu.py 2010-12-03 17:29:41 UTC
(rev 10265)
+++ trunk/gnue-forms/src/uidrivers/qt3/widgets/menu.py 2010-12-03 17:29:44 UTC
(rev 10266)
@@ -43,7 +43,7 @@
Create a menu widget
"""
- if self._gfObject.name == '__main_menu__' \
+ if self._gfObject.name == '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
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt3/widgets/toolbar.py 2010-12-03
17:29:41 UTC (rev 10265)
+++ trunk/gnue-forms/src/uidrivers/qt3/widgets/toolbar.py 2010-12-03
17:29:44 UTC (rev 10266)
@@ -46,7 +46,7 @@
widget = None
- if self._gfObject.name == '__main_toolbar__' \
+ if self._gfObject.name == 'tlb__main_toolbar__' \
and not self._form._features['GUI:TOOLBAR:SUPPRESS']:
# Toolbar of the form
Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/menu.py
===================================================================
--- 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.
"""
- if self._gfObject.name == '__main_menu__' \
+ if self._gfObject.name == 'mnu__main_menu__' \
and not self._form._features['GUI:MENUBAR:SUPPRESS']:
# Menu bar of the form
widget = 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 current
# language automatically then.
- if self._gfObject.name == '__help__' and 'wxMac' in
wx.PlatformInfo:
+ if self._gfObject.name == 'mnu__help__' and 'wxMac' in
wx.PlatformInfo:
lb = '&Help'
else:
lb = self._gfObject.label
Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/menuitem.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/menuitem.py 2010-12-03
17:29:41 UTC (rev 10265)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/menuitem.py 2010-12-03
17:29:44 UTC (rev 10266)
@@ -88,7 +88,7 @@
widget = None
event.container.AppendSeparator()
- self.__widget = widget
+ self.widget = widget
return widget
@@ -106,14 +106,14 @@
# -------------------------------------------------------------------------
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)
# -------------------------------------------------------------------------
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)
# -------------------------------------------------------------------------
@@ -121,8 +121,8 @@
# -------------------------------------------------------------------------
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)
# =============================================================================
Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/toolbar.py
===================================================================
--- 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 @@
widget = None
- if self._gfObject.name == '__main_toolbar__' \
+ if self._gfObject.name == 'tlb__main_toolbar__' \
and not self._form._features['GUI:TOOLBAR:SUPPRESS']:
# Make sure to disable the color-remapping in windows
Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/toolbutton.py
===================================================================
--- 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 = None
- self.__widget = widget
+ self.widget = widget
return widget
@@ -92,18 +92,18 @@
# -------------------------------------------------------------------------
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(), True)
# -------------------------------------------------------------------------
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(), False)
# -------------------------------------------------------------------------
@@ -111,10 +111,10 @@
# -------------------------------------------------------------------------
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(), value)
# =============================================================================
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [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,
reinhard <=