[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnue] r9374 - in trunk/gnue-forms: defaults defaults/default samples/fu
|
From: |
reinhard |
|
Subject: |
[gnue] r9374 - in trunk/gnue-forms: defaults defaults/default samples/function src src/uidrivers/gtk2/widgets src/uidrivers/gtk2/widgets/form src/uidrivers/qt3/widgets src/uidrivers/wx/widgets src/uidrivers/wx/widgets/form src/uidrivers/wx26/widgets |
|
Date: |
Mon, 12 Feb 2007 13:07:23 -0600 (CST) |
Author: reinhard
Date: 2007-02-12 13:07:21 -0600 (Mon, 12 Feb 2007)
New Revision: 9374
Added:
trunk/gnue-forms/defaults/default/
trunk/gnue-forms/defaults/default/de.gfd
Modified:
trunk/gnue-forms/defaults/default.gfd
trunk/gnue-forms/samples/function/menu.gfd
trunk/gnue-forms/samples/function/parameters.gfd
trunk/gnue-forms/src/GFForm.py
trunk/gnue-forms/src/GFInstance.py
trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py
trunk/gnue-forms/src/uidrivers/gtk2/widgets/menu.py
trunk/gnue-forms/src/uidrivers/gtk2/widgets/toolbar.py
trunk/gnue-forms/src/uidrivers/qt3/widgets/form.py
trunk/gnue-forms/src/uidrivers/qt3/widgets/menu.py
trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py
trunk/gnue-forms/src/uidrivers/wx/widgets/menu.py
trunk/gnue-forms/src/uidrivers/wx/widgets/toolbar.py
trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py
trunk/gnue-forms/src/uidrivers/wx26/widgets/menu.py
trunk/gnue-forms/src/uidrivers/wx26/widgets/toolbar.py
Log:
Support for translations of the default form. Further work necessary for
translations of normal forms.
issue153 in-progress
Added: trunk/gnue-forms/defaults/default/de.gfd
===================================================================
--- trunk/gnue-forms/defaults/default/de.gfd 2007-02-12 18:07:35 UTC (rev
9373)
+++ trunk/gnue-forms/defaults/default/de.gfd 2007-02-12 19:07:21 UTC (rev
9374)
@@ -0,0 +1,56 @@
+<?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"/>
+ <action name="act__paste__" label="Einfügen" description="Text aus der
Zwischenablage hier einfügen"/>
+ <action name="act__select_all__" label="Alles markieren" description="Den
gesamten Inhalt des Feldes markieren"/>
+
+ <!-- Focus management -->
+ <action name="act__next_block__" label="Nächster Block" description="Zum
nächsten Block springen"/>
+ <action name="act__previous_block__" label="Vorheriger Block"
description="Zum vorherigen Block springen"/>
+ <action name="act__next_page__" label="Nächste Seite" description="Zur
nächsten Formularseite springen"/>
+ <action name="act__previous_page__" label="Vorherige Seite" description="Zur
vorhergehenden Formularseite springen"/>
+
+ <!-- Record navigation -->
+ <action name="act__first_record__" label="Erster Datensatz" description="Zum
ersten Datensatz im aktuellen Block springen"/>
+ <action name="act__prev_record__" label="Vorheriger Datensatz"
description="Zum vorherigen Datensatz im aktuellen Block springen"/>
+ <action name="act__next_record__" label="Nächster Datensatz"
description="Zum nächsten Datensatz im aktuellen Block springen"/>
+ <action name="act__last_record__" label="Letzter Datensatz" description="Zum
letzten Datensatz im aktuellen Block springen"/>
+ <action name="act__ask_record__" label="Bestimmter Datensatz"
description="Zu einem über die Nummer bestimmten Datensatz springen"/>
+
+ <!-- Record insertion and deletion -->
+ <action name="act__new_record__" label="Neuer Datensatz" description="Einen
neuen Datensatz im aktuellen Block einfügen"/>
+ <action name="act__delete_record__" label="Datensatz löschen"
description="Den aktuellen Datensatz zum Löschen markieren"/>
+ <action name="act__undelete_record__" label="Datensatz nicht löschen"
description="Löschmarkierung für den aktuellen Datensatz rückgängig machen"/>
+
+ <!-- Queries -->
+ <action name="act__init_query__" label="Filtermodus einschalten"
description="Filtermodus einschalten, um Filterkriterien einzugeben"/>
+ <action name="act__copy_query__" label="Filter wiederholen"
description="Filtermodus einschalten und zuletzt verwendete Filterkriterien
wiederholen"/>
+ <action name="act__cancel_query__" label="Filtermodus abbrechen"
description="Filtermodus ausschalten, ohne Filter anzuwenden"/>
+ <action name="act__execute_query__" label="Filter anwenden"
description="Eingegebene Filterkriterien anwenden"/>
+
+ <!-- Transactions -->
+ <action name="act__commit__" label="Speichern" description="Alle Änderungen
speichern"/>
+ <action name="act__rollback__" label="Verwerfen" description="Alle
Änderungen verwerfen"/>
+
+ <!-- Other stuff -->
+ <action name="act__show_about__" label="Info" description="Info über diese
Maske anzeigen"/>
+ <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>
+ <menu name="__help_menu__">
+ <menu name="__help__" label="Hilfe"/>
+ </menu>
+
+ <logic/>
+ <layout><page/></layout>
+</form>
Modified: trunk/gnue-forms/defaults/default.gfd
===================================================================
--- trunk/gnue-forms/defaults/default.gfd 2007-02-12 18:07:35 UTC (rev
9373)
+++ trunk/gnue-forms/defaults/default.gfd 2007-02-12 19:07:21 UTC (rev
9374)
@@ -154,7 +154,7 @@
</trigger>
- <menu name="__main__" label="Main Menu">
+ <menu name="__main_menu__" label="Main Menu">
<menu name="__file__" label="File">
<menuitem name="__commit__" action="act__commit__" hotkey="F6"/>
<menuitem name="__rollback__" action="act__rollback__" hotkey="F11"/>
@@ -209,13 +209,13 @@
hotkey="F9"/>
</menu>
</menu>
- <menu name="__help__">
+ <menu name="__help_menu__">
<menu name="__help__" label="Help">
<menuitem name="__show_about__" action="act__show_about__"/>
</menu>
</menu>
- <toolbar name="__main__">
+ <toolbar name="__main_toolbar__">
<toolbutton name="__commit__" action="act__commit__"/>
<toolbutton name="__sep1__"/>
<toolbutton name="__new_record__" action="act__new_record__"/>
Modified: trunk/gnue-forms/samples/function/menu.gfd
===================================================================
--- trunk/gnue-forms/samples/function/menu.gfd 2007-02-12 18:07:35 UTC (rev
9373)
+++ trunk/gnue-forms/samples/function/menu.gfd 2007-02-12 19:07:21 UTC (rev
9374)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<form title="Menu Test">
- <menu name="__extra__">
+ <menu name="__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"/>
Modified: trunk/gnue-forms/samples/function/parameters.gfd
===================================================================
--- trunk/gnue-forms/samples/function/parameters.gfd 2007-02-12 18:07:35 UTC
(rev 9373)
+++ trunk/gnue-forms/samples/function/parameters.gfd 2007-02-12 19:07:21 UTC
(rev 9374)
@@ -4,7 +4,7 @@
<parameter name="one" datatype="text" default="one"/>
<parameter name="two" datatype="number" default="2"/>
- <trigger type="ON-STARTUP">
+ <trigger type="ON-ACTIVATION">
blk.one = one.value
blk.two = two.value
</trigger>
Modified: trunk/gnue-forms/src/GFForm.py
===================================================================
--- trunk/gnue-forms/src/GFForm.py 2007-02-12 18:07:35 UTC (rev 9373)
+++ trunk/gnue-forms/src/GFForm.py 2007-02-12 19:07:21 UTC (rev 9374)
@@ -285,12 +285,12 @@
# FIXME: for now, only merge standard menu if there is a menu defined
# in the form. Do all of this unconditionally after menu handling is
# finished.
- if self.findChildNamed('__extra__', 'GFMenu'):
+ if self.findChildNamed('__extra_menu__', 'GFMenu'):
self.merge(default_form)
# Merge extras and help menus into the main menu
- main_menu = self.findChildNamed('__main__', 'GFMenu')
- main_menu.merge(self.findChildNamed('__extra__', 'GFMenu'))
- main_menu.merge(self.findChildNamed('__help__', 'GFMenu'))
+ main_menu = self.findChildNamed('__main_menu__', 'GFMenu')
+ main_menu.merge(self.findChildNamed('__extra_menu__', 'GFMenu'))
+ main_menu.merge(self.findChildNamed('__help_menu__', 'GFMenu'))
self.phaseInit()
Modified: trunk/gnue-forms/src/GFInstance.py
===================================================================
--- trunk/gnue-forms/src/GFInstance.py 2007-02-12 18:07:35 UTC (rev 9373)
+++ trunk/gnue-forms/src/GFInstance.py 2007-02-12 19:07:21 UTC (rev 9374)
@@ -168,17 +168,38 @@
parentContainer=self._parentContainer,
moduleName=moduleName)
- assert gDebug(4, "Loading default menu and toolbar")
- filename = os.path.join(paths.data,
- 'share/gnue/forms/defaults/default.gfd')
- filehandle = FileUtils.openResource(filename)
- self.__default_form = loadFile(filehandle, self, initialize=0,
- url=filename)
- filehandle.close()
+ assert gDebug(4, "Loading default form")
+ # Find out about the languages to load.
+ lang = i18n.getlanguage()
+ filenames = ["default.gfd"]
+ if lang != "C":
+ filenames.append(os.path.join("default", lang[:2] + ".gfd"))
+ if len(lang) > 2:
+ filenames.append(os.path.join("default", lang + ".gfd"))
+ dirnames = [os.path.join(paths.data,
"share","gnue","forms","defaults")]
+ dirnames.append(paths.config)
+ if os.environ.has_key("HOME"):
+ dirnames.append(os.path.join(os.environ["HOME"], ".gnue"))
+
+ self.__default_form = GFForm.GFForm()
+ for dirname in dirnames:
+ for filename in filenames:
+ self.__merge_form(self.__default_form,
+ os.path.join(dirname, filename))
+
assert gLeave(4)
+ # -------------------------------------------------------------------------
+ def __merge_form(self, form, filename):
+ if os.path.isfile(filename):
+ filehandle = FileUtils.openResource(filename)
+ new_form = loadFile(filehandle, self, initialize=0, url=filename)
+ form.merge(new_form, overwrite=True)
+ filehandle.close()
+
+
# -------------------------------------------------------------------------
# Deprecated functions
# -------------------------------------------------------------------------
@@ -189,7 +210,9 @@
"""
assert gDebug(1, "DEPRECATED: GFInstance.addFormFromBuffer()")
- self.__load_buffer(buffer)
+ form = self.__load_buffer(buffer)
+ self.__loaded_forms.append(form)
+ self._main_form = form
# -------------------------------------------------------------------------
@@ -199,7 +222,9 @@
"""
assert gDebug(1, "DEPRECATED: GFInstance.addFormFromFile()")
- self.__load_file(fileName)
+ form = self.__load_file(fileName)
+ self.__loaded_forms.append(form)
+ self._main_form = form
# -------------------------------------------------------------------------
@@ -244,6 +269,7 @@
"""
form = self.__load_buffer(buffer)
+ self.__loaded_forms.append(form)
self.__run(form, parameters)
return form
@@ -258,6 +284,7 @@
"""
form = self.__load_file(filename)
+ self.__loaded_forms.append(form)
self.__run(form, parameters)
return form
@@ -287,11 +314,13 @@
'formheight': 20}
filehandle = getAppserverResource(filename, param,
self.connections)
+ form = self.__load(filehandle, filename)
+ filehandle.close()
else:
filehandle = FileUtils.openResource(filename)
+ form = self.__load(filehandle, filename)
+ filehandle.close()
- form = self.__load(filehandle, filename)
- filehandle.close()
return form
except IOError:
@@ -304,10 +333,7 @@
# Load the file bypassing the initialization We bypass the
# initialization because <dialog>s are really <form>s and they don't
# like being children of another form
- form = loadFile(filehandle, self, initialize=0, url=url)
- self.__loaded_forms.append(form)
- self._main_form = form
- return form
+ return loadFile(filehandle, self, initialize=0, url=url)
# -------------------------------------------------------------------------
Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py 2007-02-12
18:07:35 UTC (rev 9373)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py 2007-02-12
19:07:21 UTC (rev 9374)
@@ -143,7 +143,7 @@
# Add Statusbar, Toolbar and Menubar as requested and/or allowed
if self._form.style != 'dialog':
- if not self._form.findChildNamed('__main__', 'GFMenu'):
+ if not self._form.findChildNamed('__main_menu__', 'GFMenu'):
if not self._form._features ['GUI:MENUBAR:SUPPRESS']:
MenuBar (self._uiDriver, self, self._form)
Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/menu.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/menu.py 2007-02-12 18:07:35 UTC
(rev 9373)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/menu.py 2007-02-12 19:07:21 UTC
(rev 9374)
@@ -46,7 +46,7 @@
label = self._gfObject.label or ""
- if self._gfObject.name == '__main__' \
+ if self._gfObject.name == '__main_menu__' \
and not self._form._features['GUI:MENUBAR:SUPPRESS']:
# Menu bar of the form
handle_box = gtk.HandleBox()
Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/toolbar.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/toolbar.py 2007-02-12
18:07:35 UTC (rev 9373)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/toolbar.py 2007-02-12
19:07:21 UTC (rev 9374)
@@ -46,7 +46,7 @@
widget = None
- if self._gfObject.name == '__main__' \
+ if self._gfObject.name == '__main_toolbar__' \
and not self._form._features['GUI:TOOLBAR:SUPPRESS']:
handlebox = gtk.HandleBox()
Modified: trunk/gnue-forms/src/uidrivers/qt3/widgets/form.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt3/widgets/form.py 2007-02-12 18:07:35 UTC
(rev 9373)
+++ trunk/gnue-forms/src/uidrivers/qt3/widgets/form.py 2007-02-12 19:07:21 UTC
(rev 9374)
@@ -106,7 +106,7 @@
self.__status_bar = self.main_window.statusBar()
self.__setup_status_bar()
- if not self._form.findChildNamed('__main__', 'GFMenu'):
+ if not self._form.findChildNamed('__main_menu__', 'GFMenu'):
if not self._form._features['GUI:MENUBAR:SUPPRESS']:
MenuBar(self._uiDriver, self.main_window, self._form)
Modified: trunk/gnue-forms/src/uidrivers/qt3/widgets/menu.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt3/widgets/menu.py 2007-02-12 18:07:35 UTC
(rev 9373)
+++ trunk/gnue-forms/src/uidrivers/qt3/widgets/menu.py 2007-02-12 19:07:21 UTC
(rev 9374)
@@ -43,7 +43,7 @@
Create a menu widget
"""
- if self._gfObject.name == '__main__' \
+ if self._gfObject.name == '__main_menu__' \
and not self._form._features['GUI:MENUBAR:SUPPRESS']:
widget = self._uiForm.main_window.menuBar()
Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py 2007-02-12
18:07:35 UTC (rev 9373)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py 2007-02-12
19:07:21 UTC (rev 9374)
@@ -127,7 +127,7 @@
self._container = newWidget
if self._form.style != 'dialog':
- if not self._form.findChildNamed('__main__', 'GFMenu'):
+ if not self._form.findChildNamed('__main_menu__', 'GFMenu'):
# Add the menu
if not self._form._features['GUI:MENUBAR:SUPPRESS']:
MenuBar(self._uiDriver, self.containerFrame, self._form)
Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/menu.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/menu.py 2007-02-12 18:07:35 UTC
(rev 9373)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/menu.py 2007-02-12 19:07:21 UTC
(rev 9374)
@@ -44,7 +44,7 @@
Creates a new Menu widget.
"""
- if self._gfObject.name == '__main__' \
+ if self._gfObject.name == '__main_menu__' \
and not self._form._features['GUI:MENUBAR:SUPPRESS']:
# Menu bar of the form
widget = wx.MenuBar()
Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/toolbar.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/toolbar.py 2007-02-12
18:07:35 UTC (rev 9373)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/toolbar.py 2007-02-12
19:07:21 UTC (rev 9374)
@@ -46,7 +46,7 @@
widget = None
- if self._gfObject.name == '__main__' \
+ if self._gfObject.name == '__main_toolbar__' \
and not self._form._features['GUI:TOOLBAR:SUPPRESS']:
# Toolbar of the form
Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py 2007-02-12 18:07:35 UTC
(rev 9373)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py 2007-02-12 19:07:21 UTC
(rev 9374)
@@ -161,7 +161,7 @@
self.__status_bar.SetFieldsCount(5)
self.__status_bar.SetStatusWidths([-1, 50, 50, 75, 75])
- if not self._form.findChildNamed('__main__', 'GFMenu'):
+ if not self._form.findChildNamed('__main_menu__', 'GFMenu'):
if not self._form._features.get('GUI:MENUBAR:SUPPRESS'):
MenuBar(self._uiDriver, self.main_window, self._form)
Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/menu.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/menu.py 2007-02-12 18:07:35 UTC
(rev 9373)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/menu.py 2007-02-12 19:07:21 UTC
(rev 9374)
@@ -44,7 +44,7 @@
Creates a new Menu widget.
"""
- if self._gfObject.name == '__main__' \
+ if self._gfObject.name == '__main_menu__' \
and not self._form._features['GUI:MENUBAR:SUPPRESS']:
# Menu bar of the form
widget = wx.MenuBar()
Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/toolbar.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/toolbar.py 2007-02-12
18:07:35 UTC (rev 9373)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/toolbar.py 2007-02-12
19:07:21 UTC (rev 9374)
@@ -46,7 +46,7 @@
widget = None
- if self._gfObject.name == '__main__' \
+ if self._gfObject.name == '__main_toolbar__' \
and not self._form._features['GUI:TOOLBAR:SUPPRESS']:
# Make sure to disable the color-remapping in windows
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnue] r9374 - in trunk/gnue-forms: defaults defaults/default samples/function src src/uidrivers/gtk2/widgets src/uidrivers/gtk2/widgets/form src/uidrivers/qt3/widgets src/uidrivers/wx/widgets src/uidrivers/wx/widgets/form src/uidrivers/wx26/widgets,
reinhard <=