Преглед изворни кода

add nations flags for the about gui

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@51877 15284696-431f-4ddb-bdfa-cd5b030d7da7
Luca Delucchi пре 13 година
родитељ
комит
fa5a6ac247
51 измењених фајлова са 27 додато и 10 уклоњено
  1. 4 2
      gui/icons/Makefile
  2. 1 0
      gui/icons/flags/README
  3. BIN
      gui/icons/flags/af.png
  4. BIN
      gui/icons/flags/am.png
  5. BIN
      gui/icons/flags/ar.png
  6. BIN
      gui/icons/flags/bg.png
  7. BIN
      gui/icons/flags/cs.png
  8. BIN
      gui/icons/flags/da.png
  9. BIN
      gui/icons/flags/de.png
  10. BIN
      gui/icons/flags/el.png
  11. BIN
      gui/icons/flags/es.png
  12. BIN
      gui/icons/flags/et.png
  13. BIN
      gui/icons/flags/fa.png
  14. BIN
      gui/icons/flags/fi.png
  15. BIN
      gui/icons/flags/fr.png
  16. BIN
      gui/icons/flags/he.png
  17. BIN
      gui/icons/flags/hr.png
  18. BIN
      gui/icons/flags/hu.png
  19. BIN
      gui/icons/flags/id.png
  20. BIN
      gui/icons/flags/is.png
  21. BIN
      gui/icons/flags/it.png
  22. BIN
      gui/icons/flags/ja.png
  23. BIN
      gui/icons/flags/ka.png
  24. BIN
      gui/icons/flags/ko.png
  25. BIN
      gui/icons/flags/lo.png
  26. BIN
      gui/icons/flags/lt.png
  27. BIN
      gui/icons/flags/lv.png
  28. BIN
      gui/icons/flags/ml.png
  29. BIN
      gui/icons/flags/mn.png
  30. BIN
      gui/icons/flags/mr.png
  31. BIN
      gui/icons/flags/nl.png
  32. BIN
      gui/icons/flags/no.png
  33. BIN
      gui/icons/flags/pl.png
  34. BIN
      gui/icons/flags/pt.png
  35. BIN
      gui/icons/flags/pt_br.png
  36. BIN
      gui/icons/flags/ro.png
  37. BIN
      gui/icons/flags/ru.png
  38. BIN
      gui/icons/flags/sk.png
  39. BIN
      gui/icons/flags/sl.png
  40. BIN
      gui/icons/flags/sq.png
  41. BIN
      gui/icons/flags/sr.png
  42. BIN
      gui/icons/flags/sv.png
  43. BIN
      gui/icons/flags/ta.png
  44. BIN
      gui/icons/flags/th.png
  45. BIN
      gui/icons/flags/tr.png
  46. BIN
      gui/icons/flags/uk.png
  47. BIN
      gui/icons/flags/vi.png
  48. BIN
      gui/icons/flags/xh.png
  49. BIN
      gui/icons/flags/zh.png
  50. BIN
      gui/icons/flags/zh_tw.png
  51. 22 8
      gui/wxpython/gui_core/ghelp.py

+ 4 - 2
gui/icons/Makefile

@@ -4,13 +4,15 @@ include $(MODULE_TOPDIR)/include/Make/Dir.make
 
 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

+ 1 - 0
gui/icons/flags/README

@@ -0,0 +1 @@
+Icons derived from Quantum GIS 1.8

BIN
gui/icons/flags/af.png


BIN
gui/icons/flags/am.png


BIN
gui/icons/flags/ar.png


BIN
gui/icons/flags/bg.png


BIN
gui/icons/flags/cs.png


BIN
gui/icons/flags/da.png


BIN
gui/icons/flags/de.png


BIN
gui/icons/flags/el.png


BIN
gui/icons/flags/es.png


BIN
gui/icons/flags/et.png


BIN
gui/icons/flags/fa.png


BIN
gui/icons/flags/fi.png


BIN
gui/icons/flags/fr.png


BIN
gui/icons/flags/he.png


BIN
gui/icons/flags/hr.png


BIN
gui/icons/flags/hu.png


BIN
gui/icons/flags/id.png


BIN
gui/icons/flags/is.png


BIN
gui/icons/flags/it.png


BIN
gui/icons/flags/ja.png


BIN
gui/icons/flags/ka.png


BIN
gui/icons/flags/ko.png


BIN
gui/icons/flags/lo.png


BIN
gui/icons/flags/lt.png


BIN
gui/icons/flags/lv.png


BIN
gui/icons/flags/ml.png


BIN
gui/icons/flags/mn.png


BIN
gui/icons/flags/mr.png


BIN
gui/icons/flags/nl.png


BIN
gui/icons/flags/no.png


BIN
gui/icons/flags/pl.png


BIN
gui/icons/flags/pt.png


BIN
gui/icons/flags/pt_br.png


BIN
gui/icons/flags/ro.png


BIN
gui/icons/flags/ru.png


BIN
gui/icons/flags/sk.png


BIN
gui/icons/flags/sl.png


BIN
gui/icons/flags/sq.png


BIN
gui/icons/flags/sr.png


BIN
gui/icons/flags/sv.png


BIN
gui/icons/flags/ta.png


BIN
gui/icons/flags/th.png


BIN
gui/icons/flags/tr.png


BIN
gui/icons/flags/uk.png


BIN
gui/icons/flags/vi.png


BIN
gui/icons/flags/xh.png


BIN
gui/icons/flags/zh.png


BIN
gui/icons/flags/zh_tw.png


+ 22 - 8
gui/wxpython/gui_core/ghelp.py

@@ -700,7 +700,7 @@ class AboutWindow(wx.Frame):
             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 @@ class AboutWindow(wx.Frame):
                                 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 @@ class AboutWindow(wx.Frame):
                     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 @@ class AboutWindow(wx.Frame):
             #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 @@ class AboutWindow(wx.Frame):
 
         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()