Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ eggs/
.eggs/
lib/
lib64/
lib64
parts/
sdist/
var/
Expand Down Expand Up @@ -86,3 +87,6 @@ vcredist_x64.exe
# vim tags file
tags

# venv files
bin/
pyvenv.cfg
4 changes: 2 additions & 2 deletions oPB/controller/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ def __init__(self, cmd_line):
self.logger.debug("Show main window")
if ConfigHandler.cfg.posX == 0 and ConfigHandler.cfg.posY == 0:
screen = QDesktopWidget().screenGeometry(self.ui)
hpos = (screen.width() - ConfigHandler.cfg.width) / 2
vpos = (screen.height() - ConfigHandler.cfg.height) / 2
hpos = int((screen.width() - ConfigHandler.cfg.width) / 2)
vpos = int((screen.height() - ConfigHandler.cfg.height) / 2)
self.ui.move(hpos, vpos)
else:
self.ui.setGeometry(ConfigHandler.cfg.posX, ConfigHandler.cfg.posY, ConfigHandler.cfg.width, ConfigHandler.cfg.height)
Expand Down
4 changes: 2 additions & 2 deletions oPB/core/confighandler.py
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ def dev_dir(self):

@dev_dir.setter
def dev_dir(self, value):
if value[-2] != ":":
if value != "" and value[-2] != ":":
if value[-1:] == "/" or value[-1:] == '\\':
value = value[:-1]
self.set("package", "dev_dir", value)
Expand All @@ -460,7 +460,7 @@ def local_share_base(self):

@local_share_base.setter
def local_share_base(self, value):
if value[-2] != ":":
if value != "" and value[-2] != ":":
if value[-1:] == "/" or value[-1:] == '\\':
value = value[:-1]
self.set("package", "local_share_base", value)
Expand Down
6 changes: 3 additions & 3 deletions oPB/gui/helpviewer.py
Original file line number Diff line number Diff line change
Expand Up @@ -348,11 +348,11 @@ def __init__(self, qthelp_file, parent = None):

# set splitter width
w = self._splitterUpper.geometry().width()
self._splitterUpper.setSizes([w*(1/4), w*(3/4)])
self._splitterUpper.setSizes([int(w*(1/4)), int(w*(3/4))])
w = self._splitterLower.geometry().width()
self._splitterLower.setSizes([w*(1/5), w*(4/5)])
self._splitterLower.setSizes([int(w*(1/5)), int(w*(4/5))])
h = self._splitterMain.geometry().height()
self._splitterMain.setSizes([h*(1/9), h*(7/9), h*(1/9)])
self._splitterMain.setSizes([int(h*(1/9)), int(h*(7/9)), int(h*(1/9))])

self._helpContent.linkActivated.connect(self._wv.setUrl)
self._helpIndex.linkActivated.connect(self._wv.setUrl)
Expand Down
8 changes: 4 additions & 4 deletions oPB/gui/splash.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ def add_progressbar(self):
"""Add separate progress bar to splash screen"""

self._progressBar = QProgressBar(self._splash)
self._progressBar.setGeometry(self._splash.width() / 10, 8 * self._splash.height() / 10,
8 * self._splash.width() / 10, self._splash.height() / 10)
self._progressBar.setGeometry(int(self._splash.width() / 10), int(8 * self._splash.height() / 10),
int(8 * self._splash.width() / 10), int(self._splash.height() / 10))
self._progressBar.hide()

def setProgress(self, val):
Expand Down Expand Up @@ -161,8 +161,8 @@ def show_(self, msg = ""):

mysize = self._splash.geometry()

hpos = parentUi.x() + ((parentUi.width() - mysize.width()) / 2)
vpos = parentUi.y() + ((parentUi.height() - mysize.height()) / 2)
hpos = int(parentUi.x() + ((parentUi.width() - mysize.width()) / 2))
vpos = int(parentUi.y() + ((parentUi.height() - mysize.height()) / 2))

self._splash.move(hpos, vpos)
self._splash.show()
Expand Down
4 changes: 2 additions & 2 deletions oPB/gui/startup.py
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,6 @@ def show_me(self):
def set_position(self):
parentUi = self._parentUi.geometry()
mysize = self.geometry()
hpos = parentUi.x() + ((parentUi.width() - mysize.width()) / 2)
vpos = parentUi.y() + ((parentUi.height() - mysize.height()) / 2)
hpos = int(parentUi.x() + ((parentUi.width() - mysize.width()) / 2))
vpos = int(parentUi.y() + ((parentUi.height() - mysize.height()) / 2))
self.move(hpos, vpos)
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
pycryptodome>=3.4.6
PyQt5>=5.9.0
PyQtWebEngine>=5.15.3
pyqt5-tools>=5.8.2.1.0
spur>=0.3.20
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ def read(*paths):
data_files=data,
install_requires=["pyqt5>=5.6",
"spur",
"pycryptodome"
"pycryptodome",
"PyQtWebEngine"
],
entry_points={
'gui_scripts': [
Expand Down