[GRASS-SVN] r63527 - in grass/branches/releasebranch_7_0: . general/g.gui gui/wxpython/animation gui/wxpython/dbmgr gui/wxpython/gcp gui/wxpython/gmodeler gui/wxpython/iclass gui/wxpython/mapswipe gui/wxpython/psmap gui/wxpython/rlisetup gui/wxpython/timeline

svn_grass at osgeo.org svn_grass at osgeo.org
Sat Dec 13 07:17:13 PST 2014


Author: martinl
Date: 2014-12-13 07:17:13 -0800 (Sat, 13 Dec 2014)
New Revision: 63527

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/general/g.gui/main.c
   grass/branches/releasebranch_7_0/gui/wxpython/animation/g.gui.animation.py
   grass/branches/releasebranch_7_0/gui/wxpython/dbmgr/g.gui.dbmgr.py
   grass/branches/releasebranch_7_0/gui/wxpython/gcp/g.gui.gcp.py
   grass/branches/releasebranch_7_0/gui/wxpython/gmodeler/g.gui.gmodeler.py
   grass/branches/releasebranch_7_0/gui/wxpython/iclass/g.gui.iclass.py
   grass/branches/releasebranch_7_0/gui/wxpython/mapswipe/g.gui.mapswipe.py
   grass/branches/releasebranch_7_0/gui/wxpython/psmap/g.gui.psmap.py
   grass/branches/releasebranch_7_0/gui/wxpython/rlisetup/g.gui.rlisetup.py
   grass/branches/releasebranch_7_0/gui/wxpython/timeline/g.gui.timeline.py
Log:
keep topic_gui (the main page requires this topic)
     (merge r63526 from trunk)



Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
   - /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62831,62838,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62933,62935,62940,62942,62944-62946,62949,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,63076,63079,63081,63083,63085,63087,
 63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63276,63279,63281,63283,63287,63290,63292,63302,63315,63319,63330,63332,63339,63342,63345,63362,63367,63391,63393,63408-63409,63416-63417,63425,63427,63429,63431,63433,63451,63453,63457,63459,63473,63482,63497,63505,63508,63510,63515,63524
   + /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62831,62838,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62933,62935,62940,62942,62944-62946,62949,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,63076,63079,63081,63083,63085,63087,
 63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63276,63279,63281,63283,63287,63290,63292,63302,63315,63319,63330,63332,63339,63342,63345,63362,63367,63391,63393,63408-63409,63416-63417,63425,63427,63429,63431,63433,63451,63453,63457,63459,63473,63482,63497,63505,63508,63510,63515,63524,63526

Modified: grass/branches/releasebranch_7_0/general/g.gui/main.c
===================================================================
--- grass/branches/releasebranch_7_0/general/g.gui/main.c	2014-12-13 15:14:00 UTC (rev 63526)
+++ grass/branches/releasebranch_7_0/general/g.gui/main.c	2014-12-13 15:17:13 UTC (rev 63527)
@@ -35,8 +35,9 @@
 
     module = G_define_module();
     G_add_keyword(_("general"));
+    G_add_keyword(_("GUI"));
     G_add_keyword(_("user interface"));
-    G_add_keyword(_("GUI"));
+        
     module->label =
 	_("Launches a GRASS graphical user interface (GUI) session.");
     module->description = _("And updates default user interface settings.");

Modified: grass/branches/releasebranch_7_0/gui/wxpython/animation/g.gui.animation.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/animation/g.gui.animation.py	2014-12-13 15:14:00 UTC (rev 63526)
+++ grass/branches/releasebranch_7_0/gui/wxpython/animation/g.gui.animation.py	2014-12-13 15:17:13 UTC (rev 63527)
@@ -22,7 +22,6 @@
 #%module
 #% description: Tool for animating a series of raster and vector maps or a space time raster or vector dataset.
 #% keywords: general
-#% keywords: user interface
 #% keywords: GUI
 #% keywords: display
 #% keywords: animation

Modified: grass/branches/releasebranch_7_0/gui/wxpython/dbmgr/g.gui.dbmgr.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/dbmgr/g.gui.dbmgr.py	2014-12-13 15:14:00 UTC (rev 63526)
+++ grass/branches/releasebranch_7_0/gui/wxpython/dbmgr/g.gui.dbmgr.py	2014-12-13 15:17:13 UTC (rev 63527)
@@ -21,7 +21,6 @@
 #%module
 #% description: Launches graphical attribute table manager.
 #% keywords: general
-#% keywords: user interface
 #% keywords: GUI
 #% keywords: attribute table
 #% keywords: database

Modified: grass/branches/releasebranch_7_0/gui/wxpython/gcp/g.gui.gcp.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/gcp/g.gui.gcp.py	2014-12-13 15:14:00 UTC (rev 63526)
+++ grass/branches/releasebranch_7_0/gui/wxpython/gcp/g.gui.gcp.py	2014-12-13 15:17:13 UTC (rev 63527)
@@ -22,7 +22,6 @@
 #%module
 #% description: Georectifies a map and allows to manage Ground Control Points.
 #% keywords: general
-#% keywords: user interface
 #% keywords: GUI
 #% keywords: georectification
 #% keywords: GCP

Modified: grass/branches/releasebranch_7_0/gui/wxpython/gmodeler/g.gui.gmodeler.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/gmodeler/g.gui.gmodeler.py	2014-12-13 15:14:00 UTC (rev 63526)
+++ grass/branches/releasebranch_7_0/gui/wxpython/gmodeler/g.gui.gmodeler.py	2014-12-13 15:17:13 UTC (rev 63527)
@@ -22,7 +22,6 @@
 #% label: Graphical Modeler.
 #% description: Allows to interactively create, edit and manage models.
 #% keywords: general
-#% keywords: user interface
 #% keywords: GUI
 #% keywords: graphical modeler
 #% keywords: workflow

Modified: grass/branches/releasebranch_7_0/gui/wxpython/iclass/g.gui.iclass.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/iclass/g.gui.iclass.py	2014-12-13 15:14:00 UTC (rev 63526)
+++ grass/branches/releasebranch_7_0/gui/wxpython/iclass/g.gui.iclass.py	2014-12-13 15:17:13 UTC (rev 63527)
@@ -23,7 +23,6 @@
 #% label: Tool for supervised classification of imagery data.
 #% description: Generates spectral signatures for an image by allowing the user to outline regions of interest.
 #% keywords: general
-#% keywords: user interface
 #% keywords: GUI
 #% keywords: classification
 #% keywords: supervised classification

Modified: grass/branches/releasebranch_7_0/gui/wxpython/mapswipe/g.gui.mapswipe.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/mapswipe/g.gui.mapswipe.py	2014-12-13 15:14:00 UTC (rev 63526)
+++ grass/branches/releasebranch_7_0/gui/wxpython/mapswipe/g.gui.mapswipe.py	2014-12-13 15:17:13 UTC (rev 63527)
@@ -22,7 +22,6 @@
 #%module
 #% description: Interactively compares two maps by swiping a visibility bar.
 #% keywords: general
-#% keywords: user interface
 #% keywords: GUI
 #% keywords: display
 #%end

Modified: grass/branches/releasebranch_7_0/gui/wxpython/psmap/g.gui.psmap.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/psmap/g.gui.psmap.py	2014-12-13 15:14:00 UTC (rev 63526)
+++ grass/branches/releasebranch_7_0/gui/wxpython/psmap/g.gui.psmap.py	2014-12-13 15:17:13 UTC (rev 63527)
@@ -21,7 +21,6 @@
 #%module
 #% description: Tool for creating hardcopy map outputs.
 #% keywords: general
-#% keywords: user interface
 #% keywords: GUI
 #% keywords: printing
 #%end

Modified: grass/branches/releasebranch_7_0/gui/wxpython/rlisetup/g.gui.rlisetup.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/rlisetup/g.gui.rlisetup.py	2014-12-13 15:14:00 UTC (rev 63526)
+++ grass/branches/releasebranch_7_0/gui/wxpython/rlisetup/g.gui.rlisetup.py	2014-12-13 15:17:13 UTC (rev 63527)
@@ -21,7 +21,6 @@
 #%module
 #% description: Configuration tool for r.li modules.
 #% keywords: general
-#% keywords: user interface
 #% keywords: GUI
 #% keywords: raster
 #% keywords: landscape structure analysis

Modified: grass/branches/releasebranch_7_0/gui/wxpython/timeline/g.gui.timeline.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/timeline/g.gui.timeline.py	2014-12-13 15:14:00 UTC (rev 63526)
+++ grass/branches/releasebranch_7_0/gui/wxpython/timeline/g.gui.timeline.py	2014-12-13 15:17:13 UTC (rev 63527)
@@ -22,7 +22,6 @@
 #%module
 #% description: Allows to compare temporal datasets by displaying their temporal extents in a plot.
 #% keywords: general
-#% keywords: user interface
 #% keywords: GUI
 #% keywords: temporal
 #%end



More information about the grass-commit mailing list