Changeset 62248

Timestamp:

Oct 13, 2014, 6:39:11 PM (10 years ago)

Author:

wenzeslaus

Message:

g.list and g.remove: make guisections consistent and put related things together

• group print options together (move from optional)
• group pattern flags together (move from optional)
• remove raster (contained just one flag)
• move names group to be first (not perfect, names and ignore have different usages, related in implementation, not for user)

Location:

grass/trunk/general

Files:

• g.list/main.c (modified) (2 diffs)
• g.remove/main.c (modified) (4 diffs)

grass/trunk/general/g.list/main.c

@@ -115 +115 @@
     opt.separator = G_define_standard_option(G_OPT_F_SEP);
     opt.separator->answer = "newline";
+    opt.separator->guisection = _("Print");
 
     opt.region = G_define_standard_option(G_OPT_M_REGION);
@@ -125 +126 @@
     opt.output->label = _("Name for output file");
     opt.output->description = _("If not given or '-' then standard output");
+    opt.output->guisection = _("Print");
 
     flag.regex = G_define_flag();

grass/trunk/general/g.remove/main.c

@@ -81 +81 @@
     opt.type->guidependency = "pattern,exclude,names,ignore";
 
-    opt.pattern = G_define_option();
-    opt.pattern->key = "pattern";
-    opt.pattern->type = TYPE_STRING;
-    opt.pattern->description = _("File name search pattern");
-    opt.pattern->guisection = _("Pattern");
-
-    opt.exclude = G_define_option();
-    opt.exclude->key = "exclude";
-    opt.exclude->type = TYPE_STRING;
-    opt.exclude->description = _("File name exclusion pattern (default: none)");
-    opt.exclude->guisection = _("Pattern");
-
     opt.names = G_define_option();
     opt.names->key = "names";
@@ -110 +98 @@
     opt.ignore->guisection = _("Names");
 
+    opt.pattern = G_define_option();
+    opt.pattern->key = "pattern";
+    opt.pattern->type = TYPE_STRING;
+    opt.pattern->description = _("File name search pattern");
+    opt.pattern->guisection = _("Pattern");
+
+    opt.exclude = G_define_option();
+    opt.exclude->key = "exclude";
+    opt.exclude->type = TYPE_STRING;
+    opt.exclude->description = _("File name exclusion pattern (default: none)");
+    opt.exclude->guisection = _("Pattern");
+
     flag.regex = G_define_flag();
     flag.regex->key = 'r';
     flag.regex->description =
         _("Use basic regular expressions instead of wildcards");
+    flag.regex->guisection = _("Pattern");
 
     flag.extended = G_define_flag();
@@ -119 +120 @@
     flag.extended->description =
         _("Use extended regular expressions instead of wildcards");
+    flag.extended->guisection = _("Pattern");
 
     flag.force = G_define_flag();
@@ -128 +130 @@
     flag.basemap->key = 'b';
     flag.basemap->description = _("Remove base raster maps");
-    flag.basemap->guisection = _("Raster");
-    
+
     G_option_exclusive(flag.regex, flag.extended, NULL);
     G_option_exclusive(opt.pattern, opt.names, NULL);