diff options
| author | Rahul P | 2020-08-08 20:28:53 +0530 |
|---|---|---|
| committer | GitHub | 2020-08-08 20:28:53 +0530 |
| commit | a61c3edf10706ca0231b4441f84f801f0c9d4773 (patch) | |
| tree | 6e494305c973ccb05951b76891ed50478953044f | |
| parent | 8255c72075ab3541e8b6cfa7facb4e016157a905 (diff) | |
| parent | 64b9e0a32ce4eb90f362d6a6fa5e5ab19fa1e61f (diff) | |
| download | eSim-a61c3edf10706ca0231b4441f84f801f0c9d4773.tar.gz eSim-a61c3edf10706ca0231b4441f84f801f0c9d4773.tar.bz2 eSim-a61c3edf10706ca0231b4441f84f801f0c9d4773.zip | |
Merge pull request #157 from rahulp13/master
sync splash and app view; revert removal of system tray
| -rw-r--r-- | src/frontEnd/Application.py | 14 | ||||
| -rw-r--r-- | src/frontEnd/Workspace.py | 4 |
2 files changed, 8 insertions, 10 deletions
diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py index 506f2fd8..44616ab7 100644 --- 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 @@ class Application(QtWidgets.QMainWindow): 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 @@ class MainView(QtWidgets.QWidget): # 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 index 58f56ce5..0a80d357 100644 --- a/src/frontEnd/Workspace.py +++ b/src/frontEnd/Workspace.py @@ -106,9 +106,9 @@ class Workspace(QtWidgets.QWidget): 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 @@ class Workspace(QtWidgets.QWidget): parent, children ) - var_appView.show() time.sleep(1.5) var_appView.splash.close() + var_appView.show() def browseLocation(self): print("Function : Browse Location") |