qtvcp -change the logic of window title setting

folow this override order:
qtvcp default
handlerfile option
INI option

Author: c-morley

src/emc/usr_intf/qtvcp/qtvcp.py

@@ -295,9 +295,7 @@ def __init__(self):
 
         # title
         if INIPATH:
-            if (INITITLE == ""):
-                INITITLE='QTvcp-Screen-%s'% opts.component
-            title = INITITLE
+            title ='QTvcp-Screen-%s'% opts.component
         else:
             title = 'QTvcp-Panel-%s'% opts.component
         window.setWindowTitle(title)
@@ -407,6 +405,8 @@ def __init__(self):
             # if there is a valid INI based icon path, override the default icon.
             if INIICON !='' and os.path.exists(os.path.join(PATH.CONFIGPATH, INIICON)):
                 window.setWindowIcon(QtGui.QIcon(os.path.join(PATH.CONFIGPATH, INIICON)))
+            if (INITITLE !=''):
+                window.setWindowTitle(INITITLE)
 
         # catch control c and terminate signals
         signal.signal(signal.SIGTERM, self.shutdown)