Merge pull request #157 from rahulp13/master

sync splash and app view; revert removal of system tray
FOSSEE · Aug 8, 2020 · a61c3ed · a61c3ed
2 parents 8255c72 + 64b9e0a
commit a61c3ed
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py
@@ -18,7 +18,7 @@
 
 import os
 
-if os.name == 'nt': # noqa
+if os.name == 'nt':     # noqa
     from frontEnd import pathmagic  # noqa:F401
     init_path = ''
 else:
@@ -75,11 +75,9 @@ def __init__(self, *args):
         self.showMaximized()
         self.setWindowIcon(QtGui.QIcon(init_path + 'images/logo.png'))
 
-        # self.systemTrayIcon = QtWidgets.QSystemTrayIcon(self)
-        # self.systemTrayIcon.setIcon(
-        #     QtGui.QIcon(init_path + 'images/logo.png')
-        # )
-        # self.systemTrayIcon.setVisible(True)
+        self.systemTrayIcon = QtWidgets.QSystemTrayIcon(self)
+        self.systemTrayIcon.setIcon(QtGui.QIcon(init_path + 'images/logo.png'))
+        self.systemTrayIcon.setVisible(True)
 
     def initToolBar(self):
         """
@@ -804,8 +802,8 @@ def __init__(self, *args):
 
         # Adding to main Layout
         self.mainLayout.addWidget(self.leftSplit)
-        self.leftSplit.setSizes([self.width() // 4.5, self.height()])
-        self.middleSplit.setSizes([self.width(), self.height() // 2])
+        self.leftSplit.setSizes([int(self.width() / 4.5), self.height()])
+        self.middleSplit.setSizes([self.width(), int(self.height() / 2)])
         self.setLayout(self.mainLayout)
 
 

diff --git a/src/frontEnd/Workspace.py b/src/frontEnd/Workspace.py
@@ -106,9 +106,9 @@ def defaultWorkspace(self):
                 parent, children
             )
 
-        var_appView.show()
         time.sleep(1.5)
         var_appView.splash.close()
+        var_appView.show()
 
     def close(self, *args, **kwargs):
         self.window_open_close = 1
@@ -166,9 +166,9 @@ def createWorkspace(self):
                 parent, children
             )
 
-        var_appView.show()
         time.sleep(1.5)
         var_appView.splash.close()
+        var_appView.show()
 
     def browseLocation(self):
         print("Function : Browse Location")