[Thuban-commits] r2827 - in trunk/thuban: . Extensions/umn_mapserver po
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Fri Feb 1 11:00:34 CET 2008
Author: dpinte
Date: 2008-02-01 11:00:32 +0100 (Fri, 01 Feb 2008)
New Revision: 2827
Modified:
trunk/thuban/ChangeLog
trunk/thuban/Extensions/umn_mapserver/mf_handle.py
trunk/thuban/po/fr.po
Log:
2008-02-01 Didrik Pinte <dpinte at dipole-consulting.com>
* Extensions/umn_mapserver/mf_handle.py : bugfix due to the wx 2.6 update
* po/fr.po : translation improved
Modified: trunk/thuban/ChangeLog
===================================================================
--- trunk/thuban/ChangeLog 2008-01-31 15:41:56 UTC (rev 2826)
+++ trunk/thuban/ChangeLog 2008-02-01 10:00:32 UTC (rev 2827)
@@ -1,3 +1,9 @@
+2008-02-01 Didrik Pinte <dpinte at dipole-consulting.com>
+
+ * Extensions/umn_mapserver/mf_handle.py : bugfix due to the wx 2.6 update
+
+ * po/fr.po : translation improved
+
2008-01-31 Bernhard Reiter <bernhard at intevation.de>
File format dtd is now thuban-1.2.1.dtd. Fixed tests for this.
Modified: trunk/thuban/Extensions/umn_mapserver/mf_handle.py
===================================================================
--- trunk/thuban/Extensions/umn_mapserver/mf_handle.py 2008-01-31 15:41:56 UTC (rev 2826)
+++ trunk/thuban/Extensions/umn_mapserver/mf_handle.py 2008-02-01 10:00:32 UTC (rev 2827)
@@ -115,7 +115,7 @@
box_imagetype = wx.StaticBoxSizer(box_imagetypeStatic, wx.VERTICAL)
self.choice_imgtype = wx.Choice(self, 8060, (80, 50),
choices = umn_outputformats)
- EVT_CHOICE(self, 8060, self.EvtChoiceBox)
+ wx.EVT_CHOICE(self, 8060, self.EvtChoiceBox)
self.choice_imgtype.SetStringSelection(umn_imagetype)
box_imagetype.Add(self.choice_imgtype,0, wx.EXPAND, wx.ALL, 5)
@@ -147,7 +147,7 @@
# color change button, opens a new color dialog
button = wx.Button(self, ID_COLOR_CHANGE, _("Change Color"))
button.SetFocus()
- EVT_BUTTON(self, ID_COLOR_CHANGE, self.OnChangeColor)
+ wx.EVT_BUTTON(self, ID_COLOR_CHANGE, self.OnChangeColor)
box_color.Add(button, 1, wx.EXPAND|wx.ALL, 5)
# status
@@ -164,8 +164,8 @@
button = wx.Button(self, wx.ID_CANCEL, _("Cancel"))
box_buttons.Add(button, 0, wx.ALL, 5)
#button functions
- EVT_BUTTON(self, wx.ID_OK, self.OnOK)
- EVT_BUTTON(self, wx.ID_CANCEL, self.OnCancel)
+ wx.EVT_BUTTON(self, wx.ID_OK, self.OnOK)
+ wx.EVT_BUTTON(self, wx.ID_CANCEL, self.OnCancel)
#add all boxes to the box top
top = wx.BoxSizer(wx.VERTICAL)
@@ -280,8 +280,8 @@
button = wx.Button(self, wx.ID_CANCEL, _("Cancel"))
box_buttons.Add(button, 0, wx.ALL, 5)
#set the button funcitons
- EVT_BUTTON(self, wx.ID_OK, self.OnOK)
- EVT_BUTTON(self, wx.ID_CANCEL, self.OnCancel)
+ wx.EVT_BUTTON(self, wx.ID_OK, self.OnOK)
+ wx.EVT_BUTTON(self, wx.ID_CANCEL, self.OnCancel)
# compose the final dialog
top = wx.BoxSizer(wx.VERTICAL)
@@ -347,7 +347,7 @@
# metadata button
metadata_button = wx.Button(self, ID_METADATA_CHANGE, _("Edit Metadata"))
- EVT_BUTTON(self, ID_METADATA_CHANGE, self.OnChangeMetadata)
+ wx.EVT_BUTTON(self, ID_METADATA_CHANGE, self.OnChangeMetadata)
# Group
box_group = wx.BoxSizer(wx.HORIZONTAL)
@@ -370,8 +370,8 @@
button = wx.Button(self, wx.ID_CANCEL, _("Cancel"))
box_buttons.Add(button, 0, wx.ALL, 5)
#set the button funcitons
- EVT_BUTTON(self, wx.ID_OK, self.OnOK)
- EVT_BUTTON(self, wx.ID_CANCEL, self.OnCancel)
+ wx.EVT_BUTTON(self, wx.ID_OK, self.OnOK)
+ wx.EVT_BUTTON(self, wx.ID_CANCEL, self.OnCancel)
# compose the final dialog
top = wx.BoxSizer(wx.VERTICAL)
@@ -491,7 +491,7 @@
# color change button, opens a new color dialog
button = wx.Button(self, ID_COLOR_CHANGE, _("Change Color"))
button.SetFocus()
- EVT_BUTTON(self, ID_COLOR_CHANGE, self.OnChangeColor)
+ wx.EVT_BUTTON(self, ID_COLOR_CHANGE, self.OnChangeColor)
box_color.Add(button, 1, wx.EXPAND|wx.ALL, 5)
# status
@@ -518,7 +518,7 @@
# button for label
labelbutton = wx.Button(self, ID_LABEL_CHANGE, _("Change Label"))
- EVT_BUTTON(self, ID_LABEL_CHANGE, self.OnChangeLabel)
+ wx.EVT_BUTTON(self, ID_LABEL_CHANGE, self.OnChangeLabel)
#buttons
box_buttons = wx.BoxSizer(wx.HORIZONTAL)
@@ -527,8 +527,8 @@
button = wx.Button(self, wx.ID_CANCEL, _("Cancel"))
box_buttons.Add(button, 0, wx.ALL, 5)
#set the button funcitons
- EVT_BUTTON(self, wx.ID_OK, self.OnOK)
- EVT_BUTTON(self, wx.ID_CANCEL, self.OnCancel)
+ wx.EVT_BUTTON(self, wx.ID_OK, self.OnOK)
+ wx.EVT_BUTTON(self, wx.ID_CANCEL, self.OnCancel)
# compose the final layout
top = wx.BoxSizer(wx.VERTICAL)
@@ -639,7 +639,7 @@
# color change button, opens a new color dialog
button = wx.Button(self, ID_COLOR_CHANGE, _("Change Color"))
button.SetFocus()
- EVT_BUTTON(self, ID_COLOR_CHANGE, self.OnChangeColor)
+ wx.EVT_BUTTON(self, ID_COLOR_CHANGE, self.OnChangeColor)
box_color.Add(button, 1, wx.EXPAND|wx.ALL, 5)
#get the set type
@@ -751,8 +751,8 @@
button = wx.Button(self, wx.ID_CANCEL, _("Cancel"))
box_buttons.Add(button, 0, wx.ALL, 5)
#set the button funcitons
- EVT_BUTTON(self, wx.ID_OK, self.OnOK)
- EVT_BUTTON(self, wx.ID_CANCEL, self.OnCancel)
+ wx.EVT_BUTTON(self, wx.ID_OK, self.OnOK)
+ wx.EVT_BUTTON(self, wx.ID_CANCEL, self.OnCancel)
# compose the Dialog
top = wx.BoxSizer(wx.VERTICAL)
@@ -865,7 +865,7 @@
# color change button, opens a new color dialog
button = wx.Button(self, ID_COLOR_CHANGE, _("Change Color"))
button.SetFocus()
- EVT_BUTTON(self, ID_COLOR_CHANGE, self.OnChangeColor)
+ wx.EVT_BUTTON(self, ID_COLOR_CHANGE, self.OnChangeColor)
box_color.Add(button, 1, wx.EXPAND|wx.ALL, 5)
# show the two color chooser horizontal
colorHor = wx.BoxSizer(wx.HORIZONTAL)
@@ -885,7 +885,7 @@
# color change button, opens a new color dialog
button = wx.Button(self, ID_IMGCOLOR_CHANGE, _("Change ImageColor"))
button.SetFocus()
- EVT_BUTTON(self, ID_IMGCOLOR_CHANGE, self.OnChangeImageColor)
+ wx.EVT_BUTTON(self, ID_IMGCOLOR_CHANGE, self.OnChangeImageColor)
box_imgcolor.Add(button, 1, wx.EXPAND|wx.ALL, 5)
colorHor.Add(box_imgcolor,0, wx.EXPAND |wx.ALL, 5)
@@ -970,7 +970,7 @@
# button for label
labelbutton = wx.Button(self, ID_LABEL_CHANGE, _("Change Label"))
- EVT_BUTTON(self, ID_LABEL_CHANGE, self.OnChangeLabel)
+ wx.EVT_BUTTON(self, ID_LABEL_CHANGE, self.OnChangeLabel)
#buttons
box_buttons = wx.BoxSizer(wx.HORIZONTAL)
@@ -980,8 +980,8 @@
button.SetFocus()
box_buttons.Add(button, 0, wx.ALL, 5)
#set the button funcitons
- EVT_BUTTON(self, wx.ID_OK, self.OnOK)
- EVT_BUTTON(self, wx.ID_CANCEL, self.OnCancel)
+ wx.EVT_BUTTON(self, wx.ID_OK, self.OnOK)
+ wx.EVT_BUTTON(self, wx.ID_CANCEL, self.OnCancel)
# compose the dialog
top = wx.BoxSizer(wx.VERTICAL)
@@ -1090,8 +1090,8 @@
grid.PyGridTableBase.__init__(self)
self.colLabels = ['ID', 'Description']
- self.dataTypes = [wx.GRID_VALUE_STRING,
- wx.GRID_VALUE_STRING
+ self.dataTypes = [grid.GRID_VALUE_STRING,
+ grid.GRID_VALUE_STRING
]
if data:
@@ -1110,7 +1110,7 @@
try:
return not self.data[row][col]
except IndexError:
- return true
+ return True
# Get/Set values in the table. The Python version of these
# methods can handle any data-type, (as long as the Editor and
@@ -1133,7 +1133,7 @@
# tell the grid we've added a row
msg = grid.GridTableMessage(self, # The table
- wx.GRIDTABLE_NOTIFY_ROWS_APPENDED, # what we did to it
+ grid.GRIDTABLE_NOTIFY_ROWS_APPENDED, # what we did to it
1) # how many
self.GetView().ProcessTableMessage(msg)
@@ -1157,7 +1157,7 @@
def CanGetValueAs(self, row, col, typeName):
colType = self.dataTypes[col].split(':')[0]
if typeName == colType:
- return true
+ return True
else:
return False
@@ -1174,7 +1174,7 @@
# The second parameter means that the grid is to take ownership of the
# table and will destroy it when done. Otherwise you would need to keep
# a reference to it and call it's Destroy method later.
- self.SetTable(self.table, true)
+ self.SetTable(self.table, True)
self.SetRowLabelSize(0)
self.SetColMinimalWidth(0,180)
@@ -1182,7 +1182,7 @@
self.SetColMinimalWidth(1,250)
self.SetColSize(1,250)
self.SetMargins(0,0)
- EVT_GRID_CELL_LEFT_DCLICK(self, self.OnLeftDClick)
+ grid.EVT_GRID_CELL_LEFT_DCLICK(self, self.OnLeftDClick)
def get_table(self):
return self.table
@@ -1222,8 +1222,8 @@
button.SetFocus()
box_buttons.Add(button, 0, wx.ALL, 5)
#set the button funcitons
- EVT_BUTTON(self, wx.ID_OK, self.OnOK)
- EVT_BUTTON(self, wx.ID_CANCEL, self.OnCancel)
+ wx.EVT_BUTTON(self, wx.ID_OK, self.OnOK)
+ wx.EVT_BUTTON(self, wx.ID_CANCEL, self.OnCancel)
# compose the dialog
top = wx.BoxSizer(wx.VERTICAL)
Modified: trunk/thuban/po/fr.po
===================================================================
--- trunk/thuban/po/fr.po 2008-01-31 15:41:56 UTC (rev 2826)
+++ trunk/thuban/po/fr.po 2008-02-01 10:00:32 UTC (rev 2827)
@@ -10,7 +10,7 @@
"Project-Id-Version: Thuban 1.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-01-31 13:54+0000\n"
-"PO-Revision-Date: 2008-01-21 11:11+0100\n"
+"PO-Revision-Date: 2008-02-01 10:45+0100\n"
"Last-Translator: Didrik Pinte <dpinte at itae.be>\n"
"Language-Team: Thuban developers <thuban-devel at intevation.de>\n"
"MIME-Version: 1.0\n"
@@ -979,7 +979,7 @@
#: ../Thuban/UI/layerproperties.py:80 ../Thuban/UI/projdialog.py:203
msgid "Revert"
-msgstr "Revertir"
+msgstr "Restaurer"
#: ../Thuban/UI/legend.py:75
msgid "Top Layer"
@@ -1041,7 +1041,7 @@
#: ../Thuban/UI/mainwindow.py:468
msgid "Open Session"
-msgstr "Ouvrir Session"
+msgstr "Ouvrir une Session"
#: ../Thuban/UI/mainwindow.py:490
msgid "Save Session As"
@@ -1364,7 +1364,7 @@
#: ../Thuban/UI/mainwindow.py:1227
msgid "&Remove Layer"
-msgstr "&Eliminer une Couche"
+msgstr "&Eliminer la Couche"
#: ../Thuban/UI/mainwindow.py:1228
msgid "Remove selected layer"
@@ -1452,7 +1452,7 @@
#: ../Thuban/UI/mainwindow.py:1265
msgid "Put selected layer to the top"
-msgstr "Envoyer la couche selectionnée en haut"
+msgstr "Envoyer la couche sélectionnée en haut"
#: ../Thuban/UI/mainwindow.py:1267
msgid "&Bottom"
@@ -2138,9 +2138,8 @@
msgstr "Choisir une couche dans la base de données"
#: ../Extensions/ogr/ogrdialog.py:118
-#, fuzzy
msgid "Choose layer"
-msgstr "Montrer la Couche"
+msgstr "Afficher la couche"
#: ../Extensions/ogr/ogrdialog.py:134 ../Extensions/wms/properties.py:113
#, fuzzy
More information about the Thuban-commits
mailing list