[GRASS-SVN] r36848 - grass/branches/develbranch_6/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-04-21 12:28:58 -0400 (Tue, 21 Apr 2009)
New Revision: 36848

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/preferences.py
Log:
wxGUI: Add encoding suggestions to GUI (trac #556)
       (merge from relbr64, r36847)


Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/preferences.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/preferences.py	2009-04-21 16:23:51 UTC (rev 36847)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/preferences.py	2009-04-21 16:28:58 UTC (rev 36848)
@@ -1247,7 +1247,7 @@
         flexSizer = wx.FlexGridSizer (cols=2, hgap=5, vgap=5)
         flexSizer.AddGrowableCol(0)
         
-        label = wx.StaticText(parent=panel, id=wx.ID_ANY, label="Color")
+        label = wx.StaticText(parent=panel, id=wx.ID_ANY, label=_("Color:"))
         hlColor = csel.ColourSelect(parent=panel, id=wx.ID_ANY,
                                     colour=self.settings.Get(group='atm', key='highlight', subkey='color'),
                                     size=(35, 35))
@@ -1257,7 +1257,7 @@
         flexSizer.Add(label, proportion=0, flag=wx.ALIGN_CENTER_VERTICAL)
         flexSizer.Add(hlColor, proportion=0, flag=wx.ALIGN_RIGHT | wx.FIXED_MINSIZE)
 
-        label = wx.StaticText(parent=panel, id=wx.ID_ANY, label=_("Line width (in pixels)"))
+        label = wx.StaticText(parent=panel, id=wx.ID_ANY, label=_("Line width (in pixels):"))
         hlWidth = wx.SpinCtrl(parent=panel, id=wx.ID_ANY, size=(50, -1),
                               initial=self.settings.Get(group='atm', key='highlight',subkey='width'),
                               min=1, max=1e6)
@@ -1285,7 +1285,7 @@
 
         flexSizer = wx.FlexGridSizer (cols=2, hgap=5, vgap=5)
         flexSizer.AddGrowableCol(0)
-        label = wx.StaticText(parent=panel, id=wx.ID_ANY, label=_("Left mouse double click"))
+        label = wx.StaticText(parent=panel, id=wx.ID_ANY, label=_("Left mouse double click:"))
         leftDbClick = wx.Choice(parent=panel, id=wx.ID_ANY,
                                 choices=self.settings.Get(group='atm', key='leftDbClick', subkey='choices', internal=True),
                                 name="GetSelection")
@@ -1296,7 +1296,8 @@
         flexSizer.Add(leftDbClick, proportion=0, flag=wx.ALIGN_RIGHT | wx.FIXED_MINSIZE)
 
         # encoding
-        label = wx.StaticText(parent=panel, id=wx.ID_ANY, label=_("Encoding"))
+        label = wx.StaticText(parent=panel, id=wx.ID_ANY,
+                              label=_("Encoding (e.g. utf-8, ascii, iso8859-1, koi8-r):"))
         encoding = wx.TextCtrl(parent=panel, id=wx.ID_ANY,
                                value=self.settings.Get(group='atm', key='encoding', subkey='value'),
                                name="GetValue", size=(200, -1))
@@ -1335,7 +1336,7 @@
         flexSizer.AddGrowableCol(0)
 
         label = wx.StaticText(parent=panel, id=wx.ID_ANY,
-                              label=_("Key column"))
+                              label=_("Key column:"))
         keyColumn = wx.TextCtrl(parent=panel, id=wx.ID_ANY,
                                 size=(250, -1))
         keyColumn.SetValue(self.settings.Get(group='atm', key='keycolumn', subkey='value'))