From 55ae756b8fe04e99bb468d2032a753b3f4604253 Mon Sep 17 00:00:00 2001 From: rahulp13 Date: Sat, 8 Aug 2020 00:40:59 +0530 Subject: [PATCH 1/4] revert removing system tray --- src/frontEnd/Application.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py index 43109f7d3..2fb243e34 100644 --- a/src/frontEnd/Application.py +++ b/src/frontEnd/Application.py @@ -75,9 +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): """ From 39ab45e26d1c059302d154c24d01a847d69af273 Mon Sep 17 00:00:00 2001 From: rahulp13 Date: Sat, 8 Aug 2020 00:46:19 +0530 Subject: [PATCH 2/4] synced splash view and app view --- src/frontEnd/Workspace.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/frontEnd/Workspace.py b/src/frontEnd/Workspace.py index 58f56ce59..0a80d357c 100644 --- 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") From ab1b6cb26e03ae50e53457b598eb4948967c9ece Mon Sep 17 00:00:00 2001 From: rahulp13 Date: Sat, 8 Aug 2020 13:51:08 +0530 Subject: [PATCH 3/4] added explicit integer type conversion --- src/frontEnd/Application.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py index 2fb243e34..1f687e70a 100644 --- a/src/frontEnd/Application.py +++ b/src/frontEnd/Application.py @@ -802,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) From 38461753c416be9a4fca821a6e01c0e22c57760a Mon Sep 17 00:00:00 2001 From: rahulp13 Date: Sat, 8 Aug 2020 20:08:53 +0530 Subject: [PATCH 4/4] resolved pep8 issue --- src/configuration/Appconfig.py | 2 +- src/frontEnd/Application.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/configuration/Appconfig.py b/src/configuration/Appconfig.py index 96514f85d..d0b4fd183 100644 --- a/src/configuration/Appconfig.py +++ b/src/configuration/Appconfig.py @@ -100,7 +100,7 @@ class Appconfig(QtWidgets.QWidget): def __init__(self): super(Appconfig, self).__init__() - + # Application Details self._APPLICATION = 'eSim' self._VERSION = '2.1' diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py index 1f687e70a..44616ab7b 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: