From 097c7f0491a94b48c0d380ef42a55b25e636a783 Mon Sep 17 00:00:00 2001
From: Neucrack <CZD666666@gmail.com>
Date: Tue, 13 Nov 2018 11:33:50 +0800
Subject: [PATCH] optimization for linux

---
 COMTool/Main.py       | 16 +++++++++++-----
 COMTool/autoUpdate.py |  8 ++++++--
 COMTool/helpAbout.py  |  2 +-
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/COMTool/Main.py b/COMTool/Main.py
index 0cc6af6..738d7f3 100644
--- a/COMTool/Main.py
+++ b/COMTool/Main.py
@@ -1,6 +1,11 @@
 import sys,os
-import parameters,helpAbout,autoUpdate
-from Combobox import ComboBox
+try:
+    import parameters,helpAbout,autoUpdate
+    from Combobox import ComboBox
+except ImportError:
+    from COMTool import parameters,helpAbout,autoUpdate
+    from COMTool.Combobox import ComboBox
+
 # from COMTool.wave import Wave
 from PyQt5.QtCore import pyqtSignal,Qt
 from PyQt5.QtWidgets import (QApplication, QWidget,QToolTip,QPushButton,QMessageBox,QDesktopWidget,QMainWindow,
@@ -270,6 +275,7 @@ def initWindow(self):
         if sys.platform == "win32":
             ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID("comtool")
         self.show()
+        print("config file path:",os.getcwd()+"comtool.settings.config")
         return
 
     def initEvent(self):
@@ -640,7 +646,7 @@ def programExitSaveParameters(self):
         else:
             paramObj.dtr = 0
         paramObj.encodingIndex = self.encodingCombobox.currentIndex()
-        f = open("settings.config","wb")
+        f = open("comtool.settings.config","wb")
         f.truncate()
         pickle.dump(paramObj, f)
         pickle.dump(paramObj.sendHistoryList,f)
@@ -650,12 +656,12 @@ def programExitSaveParameters(self):
     def programStartGetSavedParameters(self):
         paramObj = parameters.ParametersToSave()
         try:
-            f = open("settings.config", "rb")
+            f = open("comtool.settings.config", "rb")
             paramObj = pickle.load( f)
             paramObj.sendHistoryList = pickle.load(f)
             f.close()
         except Exception as e:
-            f = open("settings.config", "wb")
+            f = open("comtool.settings.config", "wb")
             f.close()
         self.serailBaudrateCombobox.setCurrentIndex(paramObj.baudRate)
         self.serailBytesCombobox.setCurrentIndex(paramObj.dataBytes)
diff --git a/COMTool/autoUpdate.py b/COMTool/autoUpdate.py
index af83ffb..c025b5b 100644
--- a/COMTool/autoUpdate.py
+++ b/COMTool/autoUpdate.py
@@ -1,7 +1,11 @@
 import webbrowser
 import urllib.request
 from bs4 import BeautifulSoup
-import helpAbout,parameters
+try:
+    import helpAbout,parameters
+except ImportError:
+    from COMTool import helpAbout,parameters
+
 
 class AutoUpdate:
     updateUrl = "https://github.com/Neutree/COMTool/releases"
@@ -13,7 +17,7 @@ def detectNewVersion(self):
             for v in soup.select('.label-latest .css-truncate-target'):
                 versionStr = v.get_text()
                 version = list(map(int, versionStr[1:].split(".")))
-                print("The latest is %s, now:V%d.%d" %(versionStr,helpAbout.versionMajor,helpAbout.versionMinor))
+                print("The latest is %s, now:V%d.%d.%d" %(versionStr,helpAbout.versionMajor,helpAbout.versionMinor, helpAbout.versionDev))
                 if version[0]*10+version[1] > helpAbout.versionMajor*10+helpAbout.versionMinor:
                     return True
                 return False
diff --git a/COMTool/helpAbout.py b/COMTool/helpAbout.py
index ee6aa43..35af09d 100644
--- a/COMTool/helpAbout.py
+++ b/COMTool/helpAbout.py
@@ -7,7 +7,7 @@
 
 versionMajor = 1
 versionMinor = 7
-versionDev   = 3
+versionDev   = 6
 date = "2018.11.13"
 
 def strAbout():