From 9b1b624b57ddbe7b881a191060860b0b224077a7 Mon Sep 17 00:00:00 2001
From: frank038 <42263206+frank038@users.noreply.github.com>
Date: Sat, 10 Sep 2022 15:46:44 +0200
Subject: [PATCH] Add files via upload

---
 pyeditor/pyeditor.py | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/pyeditor/pyeditor.py b/pyeditor/pyeditor.py
index 6103d1e..3e723b3 100644
--- a/pyeditor/pyeditor.py
+++ b/pyeditor/pyeditor.py
@@ -297,15 +297,7 @@ def __init__(self):
                 use_mimetype = 0
         # check from the mimetype of the file
         if use_mimetype:
-            file_type = QMimeDatabase().mimeTypeForFile(afilename, QMimeDatabase.MatchDefault).name()
-            if file_type == "text/x-python3" or file_type == "text/x-python":
-                self.isargument = 1
-            elif file_type == "application/x-shellscript":
-                self.isargument = 2
-            elif file_type == "application/javascript":
-                self.isargument = 3
-            elif file_type == "text/plain":
-                self.isargument = 4
+            self.isargument = self.set_mimetype(afilename)
         # 
         pop_tab = ftab(afilename, self.isargument, self)
         self.frmtab.addTab(pop_tab, os.path.basename(afilename) or "Unknown")
@@ -318,6 +310,21 @@ def __init__(self):
         #
         self.show()
         
+    def get_mimetype(self, afile):
+        file_type = QMimeDatabase().mimeTypeForFile(afile, QMimeDatabase.MatchDefault).name()
+        return file_type
+        
+    def set_mimetype(self, afile):
+        file_type = self.get_mimetype(afile)
+        if file_type == "text/x-python3" or file_type == "text/x-python":
+            return 1
+        elif file_type == "application/x-shellscript":
+            return 2
+        elif file_type == "application/javascript":
+            return 3
+        elif file_type == "text/plain":
+            return 4
+        
     def on_tab_changed(self, idx):
         # self.sender().tabText(idx)
         self.setWindowTitle("pyeditor - {}".format(self.frmtab.tabText(idx)))
@@ -342,7 +349,8 @@ def on_new(self):
             return
         #
         fileName = ""
-        pop_tab = ftab(fileName, self.isargument, self)
+        # pop_tab = ftab(fileName, self.isargument, self)
+        pop_tab = ftab(fileName, 4, self)
         self.frmtab.addTab(pop_tab, os.path.basename(fileName) or "Unknown")
         self.frmtab.setTabToolTip(0, fileName or "Unknown")
         self.frmtab.setCurrentIndex(self.frmtab.count()-1)
@@ -366,7 +374,8 @@ def on_open_f(self, fileName):
                 MyDialog("Info", "Not a file.", self)
                 return
             #
-            pop_tab = ftab(fileName, self.isargument, self)
+            file_type = self.set_mimetype(fileName)
+            pop_tab = ftab(fileName, file_type, self)
             self.frmtab.addTab(pop_tab, os.path.basename(fileName) or "Unknown")
             self.frmtab.setTabToolTip(0, fileName or "Unknown")
             self.frmtab.setCurrentIndex(self.frmtab.count()-1)
@@ -390,7 +399,7 @@ def closeEvent(self, event):
                 break
         #
         if isModified:
-            ret = retDialogBox("Question", "This document has been modified. \nDo you want to proceed anyway?", self)
+            ret = retDialogBox("Question", "A document has been modified. \nDo you want to proceed anyway?", self)
             if ret.getValue() == 0:
                 event.ignore()
                 return