pyvguicom 1.2.0__tar.gz → 1.3.3__tar.gz

{pyvguicom-1.2.0 → pyvguicom-1.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyvguicom
-Version: 1.2.0
+Version: 1.3.3
 Summary: High power secure server GUI utility helpers.
 Home-page: https://github.com/pglen/pyguicom.git
 Author: Peter Glen

pyvguicom-1.3.3/pyvguicom/comline.py

@@ -0,0 +1,372 @@
+#!/usr/bin/env python
+
+import os, sys, string, time,  traceback, getopt
+import random, glob, warnings
+
+VERSION = 1.0
+
+#warnings.simplefilter("ignore")
+#warnings.simplefilter("default")
+#warnings.simplefilter("always")
+
+# ------------------------------------------------------------------------
+
+glargs = "" ; glhead = "";  glfoot = ""
+
+glprog = os.path.basename(sys.argv[0])
+gloptarr = []
+glsoptarr = []
+
+def pversion(ver):
+
+    print(os.path.basename(sys.argv[0]) + ":", "Version", ver)
+
+    #if sys.stdout.isatty():
+    #    sys.exit(0)
+
+def setargs(args):
+    global glargs
+    glargs = args
+
+def setfoot(args):
+    global glfoot
+    glfoot = args
+
+def sethead(args):
+    global glhead
+    glhead = args
+
+def setprog(args):
+    global glprog
+    glprog = args
+
+# ------------------------------------------------------------------------
+
+def dupoptcheck(optarr):
+        optdup = {}
+        for bb in range(len(optarr)):
+            kkk = optarr[bb][0][0]
+            try:
+                optdup[kkk] += 1
+            except KeyError:
+                optdup[kkk] = 1
+            except:
+                print(sys.exc_info())
+        #print(optdup)
+        found = False
+        for cc in optdup.keys():
+            if optdup[cc] > 1:
+                #print("found dup", cc)
+                found = cc
+        return found
+
+def phelp():
+
+    if glhead:
+        print("head", glhead)
+    print( "Usage: " + os.path.basename(sys.argv[0]), "[options]", glargs)
+    print( "options:")
+
+    for aa in optarr:
+        pad = " " * (9 - len(aa[1]))
+        print("        ", "-" + aa[0][0], " ", aa[1], pad, " - ", aa[4])
+
+    print()
+    if glfoot:
+        print("s", glfoot)
+
+    if sys.stdout.isatty():
+        sys.exit(0)
+
+# ------------------------------------------------------------------------
+# option [:],  var_name, initial_val, function, helpstr
+# Add colon ':' to option with argument.
+
+optarr = [\
+ ["d:",  "pgdebug",  0,      None,       "Debug level 0-10" ], \
+ ["p:",  "port",     6666,   None,       "Listen on port"],    \
+ ["v",   "verbose",  0,      None,       "Verbose. . More info on screen."],           \
+ ["q",   "quiet",    0,      None,       "Quiet. Less info on screen."],             \
+ ["V",   "version",  None,   pversion,   "Print Version."],     \
+ ["h",   "help",     None,   phelp,      "Show Help. (this screen)"]          \
+]
+
+# ------------------------------------------------------------------------
+# Handle command line. Interpret optarray and decorate the class
+# This allows a lot of sub utils to have a common set of options.
+
+class Config:
+
+    #warnings.warn("Config Class obsolete, use ConfigLong", DeprecationWarning)
+
+    def __init__(self, optarr):
+
+
+        ddd = dupoptcheck(optarr)
+        if ddd:
+            raise ValueError("Duplicate options on comline.", ddd)
+
+        global glsoptarr
+        glsoptarr = optarr
+
+        self.optarr = optarr
+        self.verbose = False
+        self.debug = False
+        self.sess_key = ""
+
+    def comline(self, argv):
+        #warnings.warn("Config Class obsolete, use ConfigLong")
+
+        optletters = ""
+        for aa in self.optarr:
+            optletters += aa[0]
+        #print( optletters    )
+        # Create defaults:
+        err = 0
+        for bb in range(len(self.optarr)):
+            if self.optarr[bb][1]:
+                # Coerse type
+                if type(self.optarr[bb][2]) == type(0):
+                    self.__dict__[self.optarr[bb][1]] = int(self.optarr[bb][2])
+                if type(self.optarr[bb][2]) == type(.0):
+                    self.__dict__[self.optarr[bb][1]] = float(self.optarr[bb][2])
+                if type(self.optarr[bb][2]) == type(""):
+                    self.__dict__[self.optarr[bb][1]] = str(self.optarr[bb][2])
+        try:
+            opts, args = getopt.getopt(argv, optletters)
+        except getopt.GetoptError as err:
+            print( "Invalid option(s) on command line:", err)
+            raise
+            return ()
+        except:
+            print(sys.exc_info())
+
+        #print( "opts", opts, "args", args)
+        for aa in opts:
+            for bb in range(len(self.optarr)):
+                if aa[0][1] == self.optarr[bb][0][0]:
+                    #print( "match", aa, self.optarr[bb])
+                    if len(self.optarr[bb][0]) > 1:
+                        #print( "arg", self.optarr[bb][1], aa[1])
+                        if self.optarr[bb][2] != None:
+                            if type(self.optarr[bb][2]) == type(0):
+                                self.__dict__[self.optarr[bb][1]] = int(aa[1])
+                            if type(self.optarr[bb][2]) == type(.0):
+                                self.__dict__[self.optarr[bb][1]] = float(aa[1])
+                            if type(self.optarr[bb][2]) == type(""):
+                                self.__dict__[self.optarr[bb][1]] = str(aa[1])
+                    else:
+                        #print( "set", self.optarr[bb][1], self.optarr[bb][2])
+                        if self.optarr[bb][2] != None:
+                            self.__dict__[self.optarr[bb][1]] = 1
+                        #print( "call", self.optarr[bb][3])
+                        if self.optarr[bb][3] != None:
+                            self.optarr[bb][3]()
+        return args
+
+# ------------------------------------------------------------------------
+# Long form help
+
+def phelplong():
+
+    if glhead:
+        print(glhead)
+
+    print( "Usage:", glprog, glargs)
+    print( "  options:")
+    try:
+        for aa in gloptarr:
+            longop = aa[1].replace("=", "")
+            if "=" in aa[1]:
+                arg = aa[2]
+            else:
+                arg = " "
+
+            pad  = " " * (8 - len(longop))
+            pad2 = " " * (8 - len(arg))
+
+            print("   ", "-" + aa[0][0], " ",
+                            "--" + longop, pad, arg, pad2,"- ", aa[5])
+        if glfoot:
+            print(glfoot)
+    except:
+        pass
+
+     # Sat 11.May.2024 only exit if real stdout
+    if sys.stdout.isatty():
+        sys.exit(0)
+
+# ------------------------------------------------------------------------
+# Handle command line. Interpret optarray and decorate the class;
+# Uses UNIX getopt for compatibility;
+#
+# Option parameters:
+#
+# option, long_option,  var_name,   initial_value, function
+#
+# Option with parameters:   add trailing colon (:)
+# Long opt with parameters: add training equal sign (=)
+#
+# Example:
+#
+#optarrlong = [\
+#    ["d:",    "debug=",      "pgdebug",  0,              None],      \
+#    ["p:",    "port",        "port",     9999,           None],      \
+#    ["v",     "verbose",     "verbose",  0,              None],      \
+#    ["t",     "test",        "test",     "x",            None],      \
+#    ["V",     "version",     None,       None,           pversion],  \
+#    ["h",     "help",        None,       None,           phelp],     \
+#    ["i:",    "input=",      "input",      "-",          None],      \
+#    ]
+
+# option [:], long_option[=],  var_name,   initial_value, function, helpstr
+optarrlong = [\
+ ["d:",  "debug=",  "pgdebug",  0,      None,       "Debug level. 0=none 10=noisy. Default: 0" ],
+ ["p:",  "port=",   "port",     6666,   None,       "Listen on port. Default: 6666"],
+ ["v",   "verbose", "verbose",  0,      None,       "Verbose. Show more info."],
+ ["q",   "quiet",   "quiet",    0,      None,       "Quiet. Show less info."],
+ ["V",   "version", "version",  None,   pversion,   "Print Version string."],
+ ["h",   "help",    "help",     None,   phelplong,  "Show Help. (this screen)"]
+]
+
+class ConfigLong:
+
+    def __init__(self, optarr):
+
+        ddd = dupoptcheck(optarr)
+        if ddd:
+            raise ValueError("Duplicate options on comline.", ddd)
+
+        global gloptarr
+        gloptarr = optarr
+        self._optarr = optarr
+        self.err = None
+
+        # Create defaults:
+        for bb in range(len(self._optarr)):
+            if self._optarr[bb][2]:
+                #print("init", self._optarr[bb][2],
+                #            self._optarr[bb][3], type(self._optarr[bb][3]))
+                # Coerse type
+                if  self._optarr[bb][3] == None:
+                    self.__dict__[self._optarr[bb][2]] = None
+                elif type(self._optarr[bb][3]) == type(0):
+                    self.__dict__[self._optarr[bb][2]] = int(self._optarr[bb][3])
+                elif type(self._optarr[bb][3]) == type(0.):
+                    self.__dict__[self._optarr[bb][2]] = float(self._optarr[bb][3])
+                elif type(self._optarr[bb][3]) == type(""):
+                    self.__dict__[self._optarr[bb][2]] = str(self._optarr[bb][3])
+                else:
+                    print("Can only have int and str type; not", type(self._optarr[bb][3]))
+                    raise ValueError("Can only None, int, float and string type - not %s" \
+                                             % (type(self._optarr[bb][3])))
+
+    def printvars(self):
+        print("Variables -----")
+        for aa in dir(self):
+            try:
+                if aa[:2] == "__" :
+                    continue
+                if  aa != "_optarr" and  aa != "comline" and \
+                            aa != "printvars" :
+                    ff = getattr(self, aa)
+                    if type(ff) == type(self.printvars):
+                        fff = "function"
+                    else:
+                        fff = type(ff)
+                    print(aa, ff, fff)
+            except:
+                pass
+        print("End Variables -----")
+
+    def comline(self, argv, pgdebug = 0):
+
+        ''' Parse what is comong from the command line '''
+
+        optletters = "";  longopt = []
+        for aa in self._optarr:
+            if aa[0] in optletters:
+                print ("Warning: duplicate option", "'" + aa[0] + "'")
+            #if len(aa[0]) > 1 and aa[0][1] != ':':
+            optletters += aa[0]
+            longopt.append(aa[1])
+
+        #print("optleters", optletters, "longopt", longopt)
+
+        try:
+            opts, args = getopt.getopt(argv, optletters, longopt)
+        #except getopt.GetoptError, err:
+        except getopt.GetoptError as err:
+            print("Invalid option(s) on command line: %s" % err)
+            raise
+
+        if pgdebug:
+            print ("opts", opts, "args", args)
+        for aa in opts:
+            for bb in range(len(self._optarr)):
+                ddd = None
+                if aa[0][1] == "-":
+                    ddd = "--" + self._optarr[bb][0]
+                    eee = "--" + self._optarr[bb][1]
+                elif aa[0][0] == "-":
+                    ddd = "-" + self._optarr[bb][0]
+                    eee = "-" + self._optarr[bb][1]
+                else:
+                    ddd = self._optarr[bb]
+
+                if ddd[-1:] == "=":
+                    ddd = ddd[:-1]
+                    eee = eee[:-1]
+                if ddd[-1:] == ":":
+                    ddd = ddd[:-1]
+                    eee = eee[:-1]
+
+                if pgdebug:
+                        print ("aa",  aa, "bb", bb, "one opt =", self._optarr[bb][:-1], ddd, eee)
+                if aa[0] == ddd or aa[0] == eee:
+                    #print ("match", aa, ddd)
+                    if len(self._optarr[bb][0]) > 1:
+                        if pgdebug:
+                            print ("arg", self._optarr[bb][2], self._optarr[bb][3], aa)
+                        if self._optarr[bb][3] != None:
+                            if type(self._optarr[bb][3]) == type(0):
+                                if aa[1][:2] == "0x" or aa[1][:2] == "0X":
+                                    self.__dict__[self._optarr[bb][2]] = int(aa[1][2:], 16)
+                                else:
+                                    self.__dict__[self._optarr[bb][2]] = int(aa[1])
+                                    pass
+
+                            elif type(self._optarr[bb][2]) == type(""):
+                                self.__dict__[self._optarr[bb][2]] = str(aa[1])
+                    else:
+                        if pgdebug:
+                            print ("set 1",
+                                self._optarr[bb][1], "set 2", self._optarr[bb][2],
+                                    "set 3", self._optarr[bb][3])
+                        if self._optarr[bb][3] != None:
+                            self.__dict__[self._optarr[bb][2]] += 1
+                        #print ("call", self.optarr[bb][3])
+                        if self._optarr[bb][4] != None:
+                            self._optarr[bb][4]()
+        return args
+
+# ------------------------------------------------------------------------
+# Print an exception as the system would print it
+
+def print_exception(xstr):
+    cumm = xstr + " "
+    a,b,c = sys.exc_info()
+    if a != None:
+        cumm += str(a) + " " + str(b) + "\n"
+        try:
+            #cumm += str(traceback.format_tb(c, 10))
+            ttt = traceback.extract_tb(c)
+            for aa in ttt:
+                cumm += "File: " + os.path.basename(aa[0]) + \
+                        " Line: " + str(aa[1]) + "\n" +  \
+                    "   Context: " + aa[2] + " -> " + aa[3] + "\n"
+        except:
+            print ("Could not print trace stack. ", sys.exc_info())
+    print (cumm)
+
+# EOF

{pyvguicom-1.2.0 → pyvguicom-1.3.3}/pyvguicom/pgentry.py

@@ -160,6 +160,39 @@ def textviewpair(arr, vbox, labtext, labname, tip, defval=None, expand=False):
     vbox.pack_start(hbox2, True, True, 0)
     return lab2
 
+def gridhexa(gridxx, left, top, entry1, entry2, butt = None, butt2 = None):
+
+    lab1 = Gtk.Label.new_with_mnemonic(entry1[0] + "  ")
+    lab1.set_alignment(1, 0)
+    lab1.set_tooltip_text(entry1[2])
+    gridxx.attach(lab1, left, top, 1, 1)
+
+    headx = Entryx();
+    lab1.set_mnemonic_widget(headx)
+    headx.set_width_chars(20)
+    if entry1[3] != None:
+        headx.set_text(entry1[3])
+    gridxx.attach(headx, left+1, top, 1, 1)
+
+    if butt:
+        gridxx.attach(butt, left+2, top, 1, 1)
+
+    lab2 = Gtk.Label.new_with_mnemonic("  " + entry2[0] + "  ")
+    lab2.set_alignment(1, 0)
+    lab2.set_tooltip_text(entry2[2])
+    gridxx.attach(lab2, left+3, top, 1, 1)
+
+    headx2 = Entryx();
+    lab2.set_mnemonic_widget(headx2)
+
+    headx2.set_width_chars(20)
+    if entry2[3] != None:
+        headx2.set_text(entry2[3])
+    gridxx.attach(headx2, left+4, top, 1, 1)
+    if butt2:
+        gridxx.attach(butt2, left+5, top, 1, 1)
+    return headx, headx2
+
 def gridquad(gridx, left, top, entry1, entry2, butt = None):
     lab1 = Gtk.Label.new_with_mnemonic(entry1[0] + "  ")
     lab1.set_alignment(1, 0)

{pyvguicom-1.2.0 → pyvguicom-1.3.3}/pyvguicom/pggui.py

@@ -24,7 +24,7 @@ import pgsimp
 
 IDXERR = "Index is larger than the available number of controls."
 
-VERSION = "1.2.0"
+VERSION = "1.3.3"
 
 gui_testmode = 0
 

{pyvguicom-1.2.0 → pyvguicom-1.3.3}/pyvguicom/pgsimp.py

@@ -106,14 +106,16 @@ class   SimpleTree(Gtk.TreeView):
     def setActcallb(self, callb):
         self.actcallb = callb
 
-    def append(self, args):
+    def append(self, args, parent = None):
         #print("append", args)
-        piter = self.treestore.append(None, args)
+        piter = self.treestore.append(parent, args)
+        return piter
 
     # TreeStore
     def insert(self, parent, pos, args):
         print("insert", parent, pos, args)
         piter = self.treestore.insert(parent, pos, args)
+        return piter
 
     def sel_first(self):
         #print("sel first ...")

{pyvguicom-1.2.0 → pyvguicom-1.3.3}/pyvguicom/pgtests.py

@@ -41,10 +41,27 @@ def randascii(lenx):
             strx += " "
     return strx
 
+desig = (   "St", "RD", "Valley", "Terrace", "Ave", "Hw",
+            "Rd", "Lane", "Alley", "Bvld", "Boulevard",
+            "Crest", "Ridge", "Hill", )
+
+def simaddr(lenx):
+
+    strx =  randnumstr(random.randint(2, 5)) + ". "
+    strx += randupper(1)
+    strx += randlower(random.randint(4, lenx // 2)) + " "
+
+    strx += randupper(1)
+    strx += randlower(random.randint(4, lenx // 2)) + " "
+    strx += desig[random.randint(0, len(desig)-1)]  + "."
+
+    return strx
+
+
 def simname(lenx):
     strx = ""
     lenz = len(alllett)-1
-    spidx = random.randint(0, lenx - 4)
+    spidx = random.randint(3, lenx - 4)
     ridx = random.randint(0, len(string.ascii_uppercase)-1)
     strx += string.ascii_uppercase[ridx]
     for aa in range(spidx):
@@ -80,6 +97,33 @@ def randate():
 # ------------------------------------------------------------------------
 # Get random str
 
+def randnumstr(lenx):
+
+    strx = ""
+    for aa in range(lenx):
+        ridx = random.randint(0, len(string.digits)-1)
+        rr = string.digits[ridx]
+        strx += str(rr)
+
+    return strx
+
+def randphone():
+
+    strx = "1+ " + randnumstr(2)
+    strx += " (" + randnumstr(3) + ") "
+    strx += randnumstr(3) + " "
+    strx += randnumstr(4)
+
+    return strx
+
+def randemail():
+
+    strx =   randlower(random.randint(3, 9))  + "@"
+    strx +=  randlower(random.randint(4, 12)) + "."
+    strx +=  randlower(random.randint(2, 3))
+
+    return strx
+
 def randstr(lenx):
 
     strx = ""
@@ -121,13 +165,33 @@ def randlett(lenx):
 
     return strx
 
+def randlower(lenx):
+
+    strx = ""
+    for aa in range(lenx):
+        ridx = random.randint(0, len(string.ascii_lowercase)-1)
+        rr = string.ascii_lowercase[ridx]
+        strx += str(rr)
+
+    return strx
+
+def randupper(lenx):
+
+    strx = ""
+    for aa in range(lenx):
+        ridx = random.randint(0, len(string.ascii_uppercase)-1)
+        rr = string.ascii_uppercase[ridx]
+        strx += str(rr)
+
+    return strx
+
+
 # ------------------------------------------------------------------------
 # Random colors
 
 def randcol():
     return random.randint(0, 255)
 
-
 def randcolstr(start = 0, endd = 255):
     rr =  random.randint(start, endd)
     gg =  random.randint(start, endd)

{pyvguicom-1.2.0 → pyvguicom-1.3.3}/pyvguicom/pgutils.py

@@ -608,60 +608,6 @@ def  readfile(strx, sep = None):
 
     return text
 
-# ------------------------------------------------------------------------
-# Handle command line. Interpret optarray and decorate the class
-# This allows a lot of sub utils to have a common set of options.
-
-class Config:
-
-    def __init__(self, optarr):
-        self.optarr = optarr
-        self.verbose = False
-        self.debug = False
-
-    def comline(self, argv):
-        optletters = ""
-        for aa in self.optarr:
-            optletters += aa[0]
-        #print( optletters    )
-        # Create defaults:
-        err = 0
-        for bb in range(len(self.optarr)):
-            if self.optarr[bb][1]:
-                # Coerse type
-                if type(self.optarr[bb][2]) == type(0):
-                    self.__dict__[self.optarr[bb][1]] = int(self.optarr[bb][2])
-                if type(self.optarr[bb][2]) == type(""):
-                    self.__dict__[self.optarr[bb][1]] = str(self.optarr[bb][2])
-        try:
-            opts, args = getopt.getopt(argv, optletters)
-        #except getopt.GetoptError, err:
-        except:
-            print( "Invalid option(s) on command line:", err)
-            #support.put_exception("comline")
-            return ()
-
-        #print( "opts", opts, "args", args)
-        for aa in opts:
-            for bb in range(len(self.optarr)):
-                if aa[0][1] == self.optarr[bb][0][0]:
-                    #print( "match", aa, self.optarr[bb])
-                    if len(self.optarr[bb][0]) > 1:
-                        #print( "arg", self.optarr[bb][1], aa[1])
-                        if self.optarr[bb][2] != None:
-                            if type(self.optarr[bb][2]) == type(0):
-                                self.__dict__[self.optarr[bb][1]] = int(aa[1])
-                            if type(self.optarr[bb][2]) == type(""):
-                                self.__dict__[self.optarr[bb][1]] = str(aa[1])
-                    else:
-                        #print( "set", self.optarr[bb][1], self.optarr[bb][2])
-                        if self.optarr[bb][2] != None:
-                            self.__dict__[self.optarr[bb][1]] = 1
-                        #print( "call", self.optarr[bb][3])
-                        if self.optarr[bb][3] != None:
-                            self.optarr[bb][3]()
-        return args
-
 def  about(progname, verstr = "1.0.0", imgfile = "icon.png"):
 
     ''' Show About dialog: '''
@@ -879,6 +825,15 @@ def print_exception(xstr):
             print("Could not print trace stack. ", sys.exc_info())
     print( cumm)
 
+# -----------------------------------------------------------------------
+# Allow the system to breed, no wait
+
+def  ubreed():
+
+    while True:
+        if not Gtk.main_iteration_do(False):
+            break
+
 # -----------------------------------------------------------------------
 # Sleep just a little, but allow the system to breed
 

pyvguicom-1.3.3/pyvguicom/testcline.py

@@ -0,0 +1,62 @@
+#!/usr/bin/env python
+
+from __future__ import print_function
+
+import os, sys, string, time,  traceback, getopt
+import random, glob, warnings
+
+import comline
+
+version = "0.00"
+
+# ------------------------------------------------------------------------
+
+def phelp():
+
+    comline.phelplong()
+    sys.exit(0)
+
+    #print()
+    #print( "Usage: " + os.path.basename(sys.argv[0]) + " [options]")
+    #print()
+    #print( "Options:    -d level  - Debug level 0-10")
+    #print( "            -p        - Port to use (default: 9999)")
+    #print( "            -v        - Verbose")
+    #print( "            -V        - Version")
+    #print( "            -q        - Quiet")
+    #print( "            -h        - Help")
+    #print()
+    #sys.exit(0)
+    #
+# ------------------------------------------------------------------------
+def pversion(ver = "1.0"):
+
+    comline.pversion(ver)
+    #print( os.path.basename(sys.argv[0]), "Version", version)
+    #sys.exit(0)
+
+    # option, var_name, initial_val, function, help
+optarr = [\
+    ["d:",  "debug=",   "pgdebug",  0,      None,     "Debug level. 0=none 10=noisy. Default: 0" ],
+    ["p:",  "port=",    "port",     9999,   None,     "Listen on port. Default: 9999"],
+    ["v",   "verbose",  "verbose",  0,      None,     "Verbose. Show more info."],
+    ["q",   "quiet",    "quiet",    0,      None,     "Quiet. Show less info."],
+    ["V",   "version",  None,       None,   pversion, "Print Version string."],
+    ["h",   "help",     None,       None,   phelp,    "Show Help. (this screen)"],
+    ]
+
+comline.setprog("Custom name")
+comline.setargs("[options]")
+comline.sethead("Header line.")
+comline.setfoot("Footer line.")
+conf = comline.ConfigLong(optarr)
+
+if __name__ == '__main__':
+
+    args = conf.comline(sys.argv[1:])
+    pversion()
+    print()
+    phelp()
+    sys.exit(0)
+
+# EOF

{pyvguicom-1.2.0 → pyvguicom-1.3.3}/pyvguicom/testentry.py

@@ -33,20 +33,50 @@ class pgtestwin(testwin):
 
         testwin.__init__(self)
 
+        vbox  = Gtk.VBox()
+
+        hbox3x = Gtk.HBox()
+        hbox3x.pack_start(Gtk.Label(label="  "), 1, 1, 2)
+        vbox.pack_start(hbox3x, 0, 0, 2)
+
+        gridx2 = Gtk.Grid()
+        gridx2.set_column_spacing(6)
+        gridx2.set_row_spacing(6)
+
+        rowcnt = 0
+        butt1 = Gtk.Button.new_with_mnemonic("Butt1 Here")
+        butt2 = Gtk.Button.new_with_mnemonic("Butt2 Here")
+        tp1 =("Next Search: ", "name", "Enter full name (TAB to advance)", None)
+        tp2 = ("Search: ", "dob", "Date of birth, YYYY/MM/DD", None)
+        lab1, lab2 = pgentry.gridhexa(gridx2, 0, rowcnt, tp1, tp2, butt1, butt2)
+        rowcnt += 1
+
+        buttx1 = Gtk.Button.new_with_mnemonic("Butt1 again Here")
+        buttx2 = Gtk.Button.new_with_mnemonic("Butt2 longer Here")
+        tp1x =("ID Search: ", "name", "Enter full name (TAB to advance)", None)
+        tp2x = ("Anteffect Search: ", "dob", "Date of birth, YYYY/MM/DD", None)
+        lab1, lab2 = pgentry.gridhexa(gridx2, 0, rowcnt, tp1x, tp2x, buttx1, buttx2)
+        rowcnt += 1
+
+        hbox2x = Gtk.HBox()
+        hbox2x.pack_start(gridx2, 1, 1, 2)
+        vbox.pack_start(hbox2x, 0, 0, 2)
+
+        hbox3x = Gtk.HBox()
+        hbox3x.pack_start(Gtk.Label(label="  "), 1, 1, 2)
+        vbox.pack_start(hbox3x, 0, 0, 2)
 
         gridx = Gtk.Grid()
         gridx.set_column_spacing(6)
         gridx.set_row_spacing(6)
 
-        vbox  = Gtk.VBox()
-
         rowcnt = 0
         self.dat_dict = {}
         sumx = Gtk.HBox()
         buttx2 = Gtk.Button.new_with_mnemonic("Sele_ct Date")
         tp1 =("Full Nam_e: ", "name", "Enter full name (TAB to advance)", None)
         tp2 = ("Date o_f birth: ", "dob", "Date of birth, YYYY/MM/DD", None)
-        lab1, lab2 = pgentry.gridquad(gridx, rowcnt, 0, tp1, tp2, buttx2)
+        lab1, lab2 = pgentry.gridquad(gridx, 0, rowcnt, tp1, tp2, buttx2)
         #buttx2.connect("clicked", self.pressed_dob, lab2)
         self.dat_dict['name'] = lab1
         self.dat_dict['dob'] = lab2

{pyvguicom-1.2.0 → pyvguicom-1.3.3}/pyvguicom/testsimple.py

@@ -69,18 +69,23 @@ tw = pgtestwin()
 
 #print("test")
 
-def fillrand():
+def fillrand(size = 10):
     aaa = []
-    for aa in range(10):
+    for aa in range(size):
         aaa.append( (pgtests.randstr(12), pgtests.randstr(12),
                         pgtests.randstr(12), pgtests.randstr(12)) )
     return aaa
 
-aaa = fillrand()
 tw.treeview.clear()
+
+aaa = fillrand(6)
 for aa in aaa:
     try:
-        tw.treeview.append(aa)
+        to = tw.treeview.append(aa)
+        bbb = fillrand(5)
+        for bb in bbb:
+            to2 = tw.treeview.append(bb, to)
+
     except:
         print(sys.exc_info())
 

{pyvguicom-1.2.0 → pyvguicom-1.3.3}/pyvguicom/testtests.py

@@ -37,7 +37,7 @@ def test_rand2(arg2, arg3):
     arg3.set_text(rrr)
 
 def test_rand3(arg2, arg3):
-    rrr = pgtests.simname(12)
+    rrr = pgtests.simname(random.randint(9, 18))
     print(rrr)
     arg3.set_text(rrr)
 
@@ -46,6 +46,26 @@ def test_rand4(arg2, arg3):
     print(rrr)
     arg3.set_text(rrr)
 
+def test_rand5(arg2, arg3):
+    rrr = pgtests.randnumstr(8)
+    print(rrr)
+    arg3.set_text(rrr)
+
+def test_rand6(arg2, arg3):
+    rrr = pgtests.randphone()
+    print(rrr)
+    arg3.set_text(rrr)
+
+def test_rand7(arg2, arg3):
+    rrr = pgtests.randemail()
+    print(rrr)
+    arg3.set_text(rrr)
+
+def test_rand8(arg2, arg3):
+    rrr = pgtests.simaddr(12)
+    print(rrr)
+    arg3.set_text(rrr)
+
 if __name__ == "__main__":
 
     w = Gtk.Window()
@@ -83,6 +103,18 @@ if __name__ == "__main__":
     butt.connect("clicked", test_rand4, lab1)
     vbox.pack_start(butt, 0, 0, 2)
 
+    butt = Gtk.Button.new_with_mnemonic("Test randnumstr")
+    butt.connect("clicked", test_rand5, lab1)
+    vbox.pack_start(butt, 0, 0, 2)
+
+    butt = Gtk.Button.new_with_mnemonic("Test randemail")
+    butt.connect("clicked", test_rand7, lab1)
+    vbox.pack_start(butt, 0, 0, 2)
+
+    butt = Gtk.Button.new_with_mnemonic("Test simaddr")
+    butt.connect("clicked", test_rand8, lab1)
+    vbox.pack_start(butt, 0, 0, 2)
+
     butt = Gtk.Button.new_with_mnemonic("E_xit")
     butt.connect("clicked", Gtk.main_quit)
     vbox.pack_start(butt, 0, 0, 2)

{pyvguicom-1.2.0 → pyvguicom-1.3.3}/pyvguicom.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyvguicom
-Version: 1.2.0
+Version: 1.3.3
 Summary: High power secure server GUI utility helpers.
 Home-page: https://github.com/pglen/pyguicom.git
 Author: Peter Glen

{pyvguicom-1.2.0 → pyvguicom-1.3.3}/pyvguicom.egg-info/SOURCES.txt

@@ -2,6 +2,7 @@ README.md
 setup.py
 pyvguicom/__init__.py
 pyvguicom/browsewin.py
+pyvguicom/comline.py
 pyvguicom/custwidg.py
 pyvguicom/htmledit.py
 pyvguicom/pgbox.py
@@ -16,6 +17,7 @@ pyvguicom/pgutils.py
 pyvguicom/pgwkit.py
 pyvguicom/plug.py
 pyvguicom/testbutt.py
+pyvguicom/testcline.py
 pyvguicom/testcust.py
 pyvguicom/testentry.py
 pyvguicom/testgui.py