Skip to content

Commit 0f3a4e5

Browse files
c-morleyc-morley
committed
qtdragon/hd/vert/lathe -add a popup window option for panels
press the arrow button to pop a window of a panel the user descibes in the INI file
1 parent b3d96b2 commit 0f3a4e5

4 files changed

Lines changed: 184 additions & 0 deletions

File tree

‎share/qtvcp/screens/qtdragon/qtdragon_handler.py‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -481,6 +481,38 @@ def init_widgets(self):
481481
if self.w.stackedWidget_mainTab.count() == 11:
482482
self.w.btn_user.hide()
483483

484+
# see if a popup window panels is required
485+
self.Btn = None
486+
if not INFO.ZIPPED_TABS is None:
487+
for name, loc, cmd in INFO.ZIPPED_TABS:
488+
if loc =='WINDOW':
489+
490+
# add panel to a dialog window
491+
self.w['popup'] = d = QtWidgets.QDialog(self.w)
492+
temp = self.w[name.replace(' ','_')]
493+
# set to apropriate size for panel
494+
d.setMinimumSize(600,400)
495+
d.setWindowTitle(name)
496+
d.setWindowFlags(d.windowFlags() | QtCore.Qt.WindowStaysOnTopHint)
497+
d.finished.connect(self.onClosePopup)
498+
d._lastgeometry = None
499+
500+
layout = QtWidgets.QGridLayout(d)
501+
layout.setContentsMargins(0,0,0,0)
502+
layout.addWidget(temp, 0, 0)
503+
504+
# add launch button to screen
505+
self.btn = QtWidgets.QPushButton(self.w)
506+
self.btn.setEnabled(True)
507+
self.btn.setMinimumSize(64, 40)
508+
self.btn.setIconSize(QtCore.QSize(38, 38))
509+
self.btn.setIcon(QtGui.QIcon(':/qt-project.org/styles/commonstyle/images/up-32.png'))
510+
self.btn.clicked.connect(self.togglePopup)
511+
self.w.layout_buttonbar.insertWidget(len(self.w.layout_buttonbar) - 4, self.btn)
512+
513+
# only one allowed
514+
break
515+
484516
def init_probe(self):
485517
probe = INFO.get_error_safe_setting('PROBE', 'USE_PROBE', 'none').lower()
486518
if probe == 'versaprobe':
@@ -2149,6 +2181,20 @@ def midiAction(self, button, num):
21492181
button.pressed.emit()
21502182
button.setProperty('ini_mdi_command_action', False)
21512183

2184+
# show/hide a popup window panel (if defined in the INI)
2185+
def togglePopup(self):
2186+
if self.w['popup'].isVisible():
2187+
self.w['popup']._lastgeometry = self.w['popup'].geometry()
2188+
self.w['popup'].hide()
2189+
else:
2190+
self.w['popup'].show()
2191+
if not self.w['popup']._lastgeometry is None:
2192+
self.w['popup'].setGeometry(self.w['popup']._lastgeometry)
2193+
2194+
2195+
def onClosePopup(self, *args):
2196+
self.w['popup']._lastgeometry = self.w['popup'].geometry()
2197+
21522198
#####################
21532199
# KEY BINDING CALLS #
21542200
#####################

‎share/qtvcp/screens/qtdragon_hd/qtdragon_hd_handler.py‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -469,6 +469,38 @@ def init_widgets(self):
469469
if self.w.stackedWidget_mainTab.count() == 10:
470470
self.w.btn_user.hide()
471471

472+
# see if a popup window panels is required
473+
self.Btn = None
474+
if not INFO.ZIPPED_TABS is None:
475+
for name, loc, cmd in INFO.ZIPPED_TABS:
476+
if loc =='WINDOW':
477+
478+
# add panel to a dialog window
479+
self.w['popup'] = d = QtWidgets.QDialog(self.w)
480+
temp = self.w[name.replace(' ','_')]
481+
# set to apropriate size for panel
482+
d.setMinimumSize(600,400)
483+
d.setWindowTitle(name)
484+
d.setWindowFlags(d.windowFlags() | QtCore.Qt.WindowStaysOnTopHint)
485+
d.finished.connect(self.onClosePopup)
486+
d._lastgeometry = None
487+
488+
layout = QtWidgets.QGridLayout(d)
489+
layout.setContentsMargins(0,0,0,0)
490+
layout.addWidget(temp, 0, 0)
491+
492+
# add launch button to screen
493+
self.btn = QtWidgets.QPushButton(self.w)
494+
self.btn.setEnabled(True)
495+
self.btn.setMinimumSize(64, 40)
496+
self.btn.setIconSize(QtCore.QSize(38, 38))
497+
self.btn.setIcon(QtGui.QIcon(':/qt-project.org/styles/commonstyle/images/up-32.png'))
498+
self.btn.clicked.connect(self.togglePopup)
499+
self.w.layout_buttonbar.insertWidget(len(self.w.layout_buttonbar) - 1, self.btn)
500+
501+
# only one allowed
502+
break
503+
472504
def init_probe(self):
473505
probe = INFO.get_error_safe_setting('PROBE', 'USE_PROBE', 'none').lower()
474506
if probe == 'versaprobe':
@@ -2112,6 +2144,20 @@ def midiAction(self, button, num):
21122144
button.pressed.emit()
21132145
button.setProperty('ini_mdi_command_action', False)
21142146

2147+
# show/hide a popup window panel (if defined in the INI)
2148+
def togglePopup(self):
2149+
if self.w['popup'].isVisible():
2150+
self.w['popup']._lastgeometry = self.w['popup'].geometry()
2151+
self.w['popup'].hide()
2152+
else:
2153+
self.w['popup'].show()
2154+
if not self.w['popup']._lastgeometry is None:
2155+
self.w['popup'].setGeometry(self.w['popup']._lastgeometry)
2156+
2157+
2158+
def onClosePopup(self, *args):
2159+
self.w['popup']._lastgeometry = self.w['popup'].geometry()
2160+
21152161
#####################
21162162
# KEY BINDING CALLS #
21172163
#####################

‎share/qtvcp/screens/qtdragon_hd_vert/qtdragon_hd_vert_handler.py‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -469,6 +469,38 @@ def init_widgets(self):
469469
if self.w.stackedWidget_mainTab.count() == 10:
470470
self.w.btn_user.hide()
471471

472+
# see if a popup window panels is required
473+
self.Btn = None
474+
if not INFO.ZIPPED_TABS is None:
475+
for name, loc, cmd in INFO.ZIPPED_TABS:
476+
if loc =='WINDOW':
477+
478+
# add panel to a dialog window
479+
self.w['popup'] = d = QtWidgets.QDialog(self.w)
480+
temp = self.w[name.replace(' ','_')]
481+
# set to apropriate size for panel
482+
d.setMinimumSize(600,400)
483+
d.setWindowTitle(name)
484+
d.setWindowFlags(d.windowFlags() | QtCore.Qt.WindowStaysOnTopHint)
485+
d.finished.connect(self.onClosePopup)
486+
d._lastgeometry = None
487+
488+
layout = QtWidgets.QGridLayout(d)
489+
layout.setContentsMargins(0,0,0,0)
490+
layout.addWidget(temp, 0, 0)
491+
492+
# add launch button to screen
493+
self.btn = QtWidgets.QPushButton(self.w)
494+
self.btn.setEnabled(True)
495+
self.btn.setMinimumSize(64, 40)
496+
self.btn.setIconSize(QtCore.QSize(38, 38))
497+
self.btn.setIcon(QtGui.QIcon(':/qt-project.org/styles/commonstyle/images/up-32.png'))
498+
self.btn.clicked.connect(self.togglePopup)
499+
self.w.layout_buttonbar.insertWidget(len(self.w.layout_buttonbar) - 1, self.btn)
500+
501+
# only one allowed
502+
break
503+
472504
def init_probe(self):
473505
probe = INFO.get_error_safe_setting('PROBE', 'USE_PROBE', 'none').lower()
474506
if probe == 'versaprobe':
@@ -2112,6 +2144,20 @@ def midiAction(self, button, num):
21122144
button.pressed.emit()
21132145
button.setProperty('ini_mdi_command_action', False)
21142146

2147+
# show/hide a popup window panel (if defined in the INI)
2148+
def togglePopup(self):
2149+
if self.w['popup'].isVisible():
2150+
self.w['popup']._lastgeometry = self.w['popup'].geometry()
2151+
self.w['popup'].hide()
2152+
else:
2153+
self.w['popup'].show()
2154+
if not self.w['popup']._lastgeometry is None:
2155+
self.w['popup'].setGeometry(self.w['popup']._lastgeometry)
2156+
2157+
2158+
def onClosePopup(self, *args):
2159+
self.w['popup']._lastgeometry = self.w['popup'].geometry()
2160+
21152161
#####################
21162162
# KEY BINDING CALLS #
21172163
#####################

‎share/qtvcp/screens/qtdragon_lathe/qtdragon_lathe_handler.py‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -467,6 +467,38 @@ def init_widgets(self):
467467
if self.w.stackedWidget_mainTab.count() == 11:
468468
self.w.btn_user.hide()
469469

470+
# see if a popup window panels is required
471+
self.Btn = None
472+
if not INFO.ZIPPED_TABS is None:
473+
for name, loc, cmd in INFO.ZIPPED_TABS:
474+
if loc =='WINDOW':
475+
476+
# add panel to a dialog window
477+
self.w['popup'] = d = QtWidgets.QDialog(self.w)
478+
temp = self.w[name.replace(' ','_')]
479+
# set to apropriate size for panel
480+
d.setMinimumSize(600,400)
481+
d.setWindowTitle(name)
482+
d.setWindowFlags(d.windowFlags() | QtCore.Qt.WindowStaysOnTopHint)
483+
d.finished.connect(self.onClosePopup)
484+
d._lastgeometry = None
485+
486+
layout = QtWidgets.QGridLayout(d)
487+
layout.setContentsMargins(0,0,0,0)
488+
layout.addWidget(temp, 0, 0)
489+
490+
# add launch button to screen
491+
self.btn = QtWidgets.QPushButton(self.w)
492+
self.btn.setEnabled(True)
493+
self.btn.setMinimumSize(64, 40)
494+
self.btn.setIconSize(QtCore.QSize(38, 38))
495+
self.btn.setIcon(QtGui.QIcon(':/qt-project.org/styles/commonstyle/images/up-32.png'))
496+
self.btn.clicked.connect(self.togglePopup)
497+
self.w.layout_buttonbar.insertWidget(len(self.w.layout_buttonbar) - 4, self.btn)
498+
499+
# only one allowed
500+
break
501+
470502
def init_probe(self):
471503
probe = INFO.get_error_safe_setting('PROBE', 'USE_PROBE', 'none').lower()
472504
if probe == 'versaprobe':
@@ -2129,6 +2161,20 @@ def midiAction(self, button, num):
21292161
button.pressed.emit()
21302162
button.setProperty('ini_mdi_command_action', False)
21312163

2164+
# show/hide a popup window panel (if defined in the INI)
2165+
def togglePopup(self):
2166+
if self.w['popup'].isVisible():
2167+
self.w['popup']._lastgeometry = self.w['popup'].geometry()
2168+
self.w['popup'].hide()
2169+
else:
2170+
self.w['popup'].show()
2171+
if not self.w['popup']._lastgeometry is None:
2172+
self.w['popup'].setGeometry(self.w['popup']._lastgeometry)
2173+
2174+
2175+
def onClosePopup(self, *args):
2176+
self.w['popup']._lastgeometry = self.w['popup'].geometry()
2177+
21322178
#####################
21332179
# KEY BINDING CALLS #
21342180
#####################

0 commit comments

Comments
 (0)