Skip to content

Commit 62a90c8

Browse files
committed
qtdragon/hd/vert/lathe - utilities tab's tabs can be detached
There is a button to detach the current tab and you can resize/place it. Should make it easier to see some of the data
1 parent d62f937 commit 62a90c8

8 files changed

Lines changed: 30 additions & 8 deletions

File tree

share/qtvcp/screens/qtdragon/qtdragon.ui

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7862,7 +7862,7 @@ LOG</string>
78627862
<number>0</number>
78637863
</property>
78647864
<item>
7865-
<widget class="QTabWidget" name="tabWidget_utilities">
7865+
<widget class="DetachTabWidget" name="tabWidget_utilities">
78667866
<property name="currentIndex">
78677867
<number>0</number>
78687868
</property>
@@ -18274,6 +18274,11 @@ SCROLL</string>
1827418274
<extends>QWidget</extends>
1827518275
<header>qtvcp.widgets.virtualkeyboard</header>
1827618276
</customwidget>
18277+
<customwidget>
18278+
<class>DetachTabWidget</class>
18279+
<extends>QTabWidget</extends>
18280+
<header>qtvcp.widgets.detach_tabs</header>
18281+
</customwidget>
1827718282
<customwidget>
1827818283
<class>QWebView</class>
1827918284
<extends>QWidget</extends>

share/qtvcp/screens/qtdragon/qtdragon_handler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1205,7 +1205,7 @@ def chk_use_virtual_changed(self, state):
12051205
# show ngcgui info tab (in the stackedWidget) if ngcgui utilites
12061206
# tab is selected
12071207
def tab_utilities_changed(self, num):
1208-
if num == 2:
1208+
if 'ngc' in self.w.tabWidget_utilities.tabText(num).lower():
12091209
self.w.stackedWidget.setCurrentIndex(PAGE_NGCGUI)
12101210
else:
12111211
self.w.stackedWidget.setCurrentIndex(PAGE_GCODE)

share/qtvcp/screens/qtdragon_hd/qtdragon_hd.ui

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6269,7 +6269,7 @@ LOG</string>
62696269
<number>3</number>
62706270
</property>
62716271
<item>
6272-
<widget class="QTabWidget" name="tabWidget_utilities">
6272+
<widget class="DetachTabWidget" name="tabWidget_utilities">
62736273
<property name="sizePolicy">
62746274
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
62756275
<horstretch>0</horstretch>
@@ -17400,6 +17400,11 @@ ANGULAR</string>
1740017400
<extends>QWidget</extends>
1740117401
<header>qtvcp.widgets.round_gauge</header>
1740217402
</customwidget>
17403+
<customwidget>
17404+
<class>DetachTabWidget</class>
17405+
<extends>QTabWidget</extends>
17406+
<header>qtvcp.widgets.detach_tabs</header>
17407+
</customwidget>
1740317408
</customwidgets>
1740417409
<resources>
1740517410
<include location="qtdragon_hd.qrc"/>

share/qtvcp/screens/qtdragon_hd/qtdragon_hd_handler.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1874,7 +1874,8 @@ def adjust_stacked_widgets(self,requestedIndex):
18741874
# show ngcgui info tab if utilities tab is selected
18751875
# but only if the utilities tab has ngcgui selected
18761876
if main_index == TAB_UTILS:
1877-
if self.w.tabWidget_utilities.currentIndex() == 2:
1877+
num = self.w.tabWidget_utilities.currentIndex()
1878+
if 'ngc' in self.w.tabWidget_utilities.tabText(num).lower():
18781879
self.w.stackedWidget.setCurrentIndex(PAGE_NGCGUI)
18791880
else:
18801881
self.w.stackedWidget.setCurrentIndex(PAGE_GCODE)

share/qtvcp/screens/qtdragon_hd_vert/qtdragon_hd_vert.ui

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6075,7 +6075,7 @@ LOG</string>
60756075
<number>0</number>
60766076
</property>
60776077
<item>
6078-
<widget class="QTabWidget" name="tabWidget_utilities">
6078+
<widget class="DetachTabWidget" name="tabWidget_utilities">
60796079
<property name="enabled">
60806080
<bool>true</bool>
60816081
</property>
@@ -18087,6 +18087,11 @@ SCROLL</string>
1808718087
<extends>QWidget</extends>
1808818088
<header>qtvcp.widgets.round_gauge</header>
1808918089
</customwidget>
18090+
<customwidget>
18091+
<class>DetachTabWidget</class>
18092+
<extends>QTabWidget</extends>
18093+
<header>qtvcp.widgets.detach_tabs</header>
18094+
</customwidget>
1809018095
</customwidgets>
1809118096
<resources>
1809218097
<include location="../qtdragon/qtdragon.qrc"/>

share/qtvcp/screens/qtdragon_hd_vert/qtdragon_hd_vert_handler.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1874,7 +1874,8 @@ def adjust_stacked_widgets(self,requestedIndex):
18741874
# show ngcgui info tab if utilities tab is selected
18751875
# but only if the utilities tab has ngcgui selected
18761876
if main_index == TAB_UTILS:
1877-
if self.w.tabWidget_utilities.currentIndex() == 2:
1877+
num = self.w.tabWidget_utilities.currentIndex()
1878+
if 'ngc' in self.w.tabWidget_utilities.tabText(num).lower():
18781879
self.w.stackedWidget.setCurrentIndex(PAGE_NGCGUI)
18791880
else:
18801881
self.w.stackedWidget.setCurrentIndex(PAGE_GCODE)

share/qtvcp/screens/qtdragon_lathe/qtdragon_lathe.ui

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7994,7 +7994,7 @@ LOG</string>
79947994
<number>0</number>
79957995
</property>
79967996
<item>
7997-
<widget class="QTabWidget" name="tabWidget_utilities">
7997+
<widget class="DetachTabWidget" name="tabWidget_utilities">
79987998
<property name="currentIndex">
79997999
<number>0</number>
80008000
</property>
@@ -18443,6 +18443,11 @@ SCROLL</string>
1844318443
<extends>QWidget</extends>
1844418444
<header>qtvcp.widgets.bar</header>
1844518445
</customwidget>
18446+
<customwidget>
18447+
<class>DetachTabWidget</class>
18448+
<extends>QTabWidget</extends>
18449+
<header>qtvcp.widgets.detach_tabs</header>
18450+
</customwidget>
1844618451
<customwidget>
1844718452
<class>QWebView</class>
1844818453
<extends>QWidget</extends>

share/qtvcp/screens/qtdragon_lathe/qtdragon_lathe_handler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1855,7 +1855,7 @@ def adjust_stacked_widgets(self,requestedIndex,mode_change=False):
18551855
# show ngcgui info tab if utilities tab is selected
18561856
# but only if the utilities tab has ngcgui selected
18571857
if main_index == TAB_UTILITIES:
1858-
if self.w.tabWidget_utilities.currentIndex() == 2:
1858+
if 'ngc' in self.w.tabWidget_utilities.tabText(num).lower():
18591859
self.w.stackedWidget.setCurrentIndex(PAGE_NGCGUI)
18601860
else:
18611861
self.w.stackedWidget.setCurrentIndex(PAGE_GCODE)

0 commit comments

Comments
 (0)