[GRASS-SVN] r51877 - in grass/trunk/gui: icons icons/flags wxpython/gui_core
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed May 30 01:00:16 PDT 2012
Author: lucadelu
Date: 2012-05-30 01:00:15 -0700 (Wed, 30 May 2012)
New Revision: 51877
Added:
grass/trunk/gui/icons/flags/
grass/trunk/gui/icons/flags/README
grass/trunk/gui/icons/flags/af.png
grass/trunk/gui/icons/flags/am.png
grass/trunk/gui/icons/flags/ar.png
grass/trunk/gui/icons/flags/bg.png
grass/trunk/gui/icons/flags/cs.png
grass/trunk/gui/icons/flags/da.png
grass/trunk/gui/icons/flags/de.png
grass/trunk/gui/icons/flags/el.png
grass/trunk/gui/icons/flags/es.png
grass/trunk/gui/icons/flags/et.png
grass/trunk/gui/icons/flags/fa.png
grass/trunk/gui/icons/flags/fi.png
grass/trunk/gui/icons/flags/fr.png
grass/trunk/gui/icons/flags/he.png
grass/trunk/gui/icons/flags/hr.png
grass/trunk/gui/icons/flags/hu.png
grass/trunk/gui/icons/flags/id.png
grass/trunk/gui/icons/flags/is.png
grass/trunk/gui/icons/flags/it.png
grass/trunk/gui/icons/flags/ja.png
grass/trunk/gui/icons/flags/ka.png
grass/trunk/gui/icons/flags/ko.png
grass/trunk/gui/icons/flags/lo.png
grass/trunk/gui/icons/flags/lt.png
grass/trunk/gui/icons/flags/lv.png
grass/trunk/gui/icons/flags/ml.png
grass/trunk/gui/icons/flags/mn.png
grass/trunk/gui/icons/flags/mr.png
grass/trunk/gui/icons/flags/nl.png
grass/trunk/gui/icons/flags/no.png
grass/trunk/gui/icons/flags/pl.png
grass/trunk/gui/icons/flags/pt.png
grass/trunk/gui/icons/flags/pt_br.png
grass/trunk/gui/icons/flags/ro.png
grass/trunk/gui/icons/flags/ru.png
grass/trunk/gui/icons/flags/sk.png
grass/trunk/gui/icons/flags/sl.png
grass/trunk/gui/icons/flags/sq.png
grass/trunk/gui/icons/flags/sr.png
grass/trunk/gui/icons/flags/sv.png
grass/trunk/gui/icons/flags/ta.png
grass/trunk/gui/icons/flags/th.png
grass/trunk/gui/icons/flags/tr.png
grass/trunk/gui/icons/flags/uk.png
grass/trunk/gui/icons/flags/vi.png
grass/trunk/gui/icons/flags/xh.png
grass/trunk/gui/icons/flags/zh.png
grass/trunk/gui/icons/flags/zh_tw.png
Modified:
grass/trunk/gui/icons/Makefile
grass/trunk/gui/wxpython/gui_core/ghelp.py
Log:
add nations flags for the about gui
Modified: grass/trunk/gui/icons/Makefile
===================================================================
--- grass/trunk/gui/icons/Makefile 2012-05-30 07:58:36 UTC (rev 51876)
+++ grass/trunk/gui/icons/Makefile 2012-05-30 08:00:15 UTC (rev 51877)
@@ -4,13 +4,15 @@
SRCICO := $(wildcard *.ico *.png)
SRCICONS := $(wildcard grass/*.png)
-ETCICONS := $(patsubst %,$(ETC)/gui/icons/%,$(SRCICONS) $(SRCICO))
+SRCFLAGS := $(wildcard flags/*.png)
+ETCICONS := $(patsubst %,$(ETC)/gui/icons/%,$(SRCICONS) $(SRCICO) $(SRCFLAGS))
HTMLICONS := $(patsubst grass/%,$(HTMLDIR)/icons/%,$(SRCICONS))
ETCDIRS = \
$(ETC)/gui \
$(ETC)/gui/icons \
- $(ETC)/gui/icons/grass
+ $(ETC)/gui/icons/grass \
+ $(ETC)/gui/icons/flags
HTMLDIRS = \
$(HTMLDIR)/icons
Added: grass/trunk/gui/icons/flags/README
===================================================================
--- grass/trunk/gui/icons/flags/README (rev 0)
+++ grass/trunk/gui/icons/flags/README 2012-05-30 08:00:15 UTC (rev 51877)
@@ -0,0 +1 @@
+Icons derived from Quantum GIS 1.8
Added: grass/trunk/gui/icons/flags/af.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/af.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass/trunk/gui/icons/flags/am.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/am.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: grass/trunk/gui/icons/flags/ar.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/ar.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass/trunk/gui/icons/flags/bg.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/bg.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass/trunk/gui/icons/flags/cs.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/cs.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass/trunk/gui/icons/flags/da.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/da.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass/trunk/gui/icons/flags/de.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/de.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass/trunk/gui/icons/flags/el.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/el.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass/trunk/gui/icons/flags/es.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/es.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass/trunk/gui/icons/flags/et.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/et.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass/trunk/gui/icons/flags/fa.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/fa.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass/trunk/gui/icons/flags/fi.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/fi.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass/trunk/gui/icons/flags/fr.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/fr.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass/trunk/gui/icons/flags/he.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/he.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass/trunk/gui/icons/flags/hr.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/hr.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass/trunk/gui/icons/flags/hu.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/hu.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass/trunk/gui/icons/flags/id.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/id.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass/trunk/gui/icons/flags/is.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/is.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass/trunk/gui/icons/flags/it.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/it.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass/trunk/gui/icons/flags/ja.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/ja.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass/trunk/gui/icons/flags/ka.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/ka.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass/trunk/gui/icons/flags/ko.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/ko.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass/trunk/gui/icons/flags/lo.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/lo.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass/trunk/gui/icons/flags/lt.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/lt.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass/trunk/gui/icons/flags/lv.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/lv.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass/trunk/gui/icons/flags/ml.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/ml.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: grass/trunk/gui/icons/flags/mn.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/mn.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass/trunk/gui/icons/flags/mr.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/mr.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: grass/trunk/gui/icons/flags/nl.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/nl.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass/trunk/gui/icons/flags/no.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/no.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass/trunk/gui/icons/flags/pl.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/pl.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass/trunk/gui/icons/flags/pt.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/pt.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass/trunk/gui/icons/flags/pt_br.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/pt_br.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass/trunk/gui/icons/flags/ro.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/ro.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass/trunk/gui/icons/flags/ru.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/ru.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass/trunk/gui/icons/flags/sk.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/sk.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass/trunk/gui/icons/flags/sl.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/sl.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass/trunk/gui/icons/flags/sq.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/sq.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass/trunk/gui/icons/flags/sr.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/sr.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass/trunk/gui/icons/flags/sv.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/sv.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass/trunk/gui/icons/flags/ta.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/ta.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass/trunk/gui/icons/flags/th.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/th.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass/trunk/gui/icons/flags/tr.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/tr.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass/trunk/gui/icons/flags/uk.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/uk.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass/trunk/gui/icons/flags/vi.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/vi.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass/trunk/gui/icons/flags/xh.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/xh.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass/trunk/gui/icons/flags/zh.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/zh.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass/trunk/gui/icons/flags/zh_tw.png
===================================================================
(Binary files differ)
Property changes on: grass/trunk/gui/icons/flags/zh_tw.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Modified: grass/trunk/gui/wxpython/gui_core/ghelp.py
===================================================================
--- grass/trunk/gui/wxpython/gui_core/ghelp.py 2012-05-30 07:58:36 UTC (rev 51876)
+++ grass/trunk/gui/wxpython/gui_core/ghelp.py 2012-05-30 08:00:15 UTC (rev 51877)
@@ -700,7 +700,7 @@
translatorswin.sizer.Add(item = translatorstxt, proportion = 1,
flag = wx.EXPAND | wx.ALL, border = 3)
else:
- translatorsBox = wx.FlexGridSizer(cols = 3, vgap = 5, hgap = 5)
+ translatorsBox = wx.FlexGridSizer(cols = 4, vgap = 5, hgap = 5)
languages = translators.keys()
languages.sort()
tname = wx.StaticText(parent = translatorswin, id = wx.ID_ANY,
@@ -715,6 +715,10 @@
label = _('Language'))
tlang.SetFont(wx.Font(10, wx.DEFAULT, wx.NORMAL, wx.BOLD, 0, ""))
translatorsBox.Add(item = tlang)
+ tnat = wx.StaticText(parent = translatorswin, id = wx.ID_ANY,
+ label = _('Nation'))
+ tnat.SetFont(wx.Font(10, wx.DEFAULT, wx.NORMAL, wx.BOLD, 0, ""))
+ translatorsBox.Add(item = tnat)
for lang in languages:
for translator in translators[lang]:
name, email = translator
@@ -723,7 +727,17 @@
translatorsBox.Add(item = wx.StaticText(parent = translatorswin, id = wx.ID_ANY,
label = email))
translatorsBox.Add(item = wx.StaticText(parent = translatorswin, id = wx.ID_ANY,
- label = lang))
+ label = lang))
+ flag = os.path.join(os.getenv("GISBASE"), "etc", "gui",
+ "icons", "flags", "%s.png" % lang.lower())
+ if os.path.exists(flag):
+ flagBitmap = wx.StaticBitmap(parent = translatorswin, id = wx.ID_ANY,
+ bitmap = wx.Bitmap(name = flag,
+ type = wx.BITMAP_TYPE_PNG))
+ translatorsBox.Add(item = flagBitmap)
+ else:
+ translatorsBox.Add(item = wx.StaticText(parent = translatorswin,
+ id = wx.ID_ANY, label = lang))
translatorswin.sizer.Add(item = translatorsBox, proportion = 1,
flag = wx.EXPAND | wx.ALL, border = 3)
@@ -799,7 +813,7 @@
#panel.Collapse(True)
pageSizer = wx.BoxSizer(wx.VERTICAL)
for k,v in js.iteritems():
- if k != 'total':
+ if k != 'total' and k!= 'name':
box = self._langBox(win, k,v)
pageSizer.Add(item = box, proportion = 1,
flag = wx.EXPAND | wx.ALL, border = 3)
@@ -829,22 +843,22 @@
if not jsStats:
Debug.msg(5, _("File <%s> not found") % fname)
- self.statsSizer = wx.BoxSizer(wx.VERTICAL)
+ statsSizer = wx.BoxSizer(wx.VERTICAL)
statstext = wx.StaticText(self.statswin, id = wx.ID_ANY,
label = _('%s file missing') % fname)
- sizer.Add(item = statstext, proportion = 1,
+ statsSizer.Add(item = statstext, proportion = 1,
flag = wx.EXPAND | wx.ALL, border = 3)
else:
languages = jsStats['langs'].keys()
languages.sort()
- self.statsSizer = wx.BoxSizer(wx.VERTICAL)
+ statsSizer = wx.BoxSizer(wx.VERTICAL)
for lang in languages:
v = jsStats['langs'][lang]
panel = self._langPanel(lang, v)
- self.statsSizer.Add(panel)
+ statsSizer.Add(panel)
- self.statswin.SetSizer(self.statsSizer)
+ self.statswin.SetSizer(statsSizer)
self.statswin.SetupScrolling(scroll_x = False, scroll_y = True)
self.statswin.Layout()
self.statswin.Fit()
More information about the grass-commit
mailing list