Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-04-19 16:47:22 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adjust UI And Improve (#63)

Browse Source
This commit is contained in:
shugen002 2020-11-21 02:10:06 +08:00 committed by GitHub
parent 45a880d8f8
commit 16c4a2d5a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
forms/advanced-scene-switcher.ui
View File

@ -586,13 +586,6 @@
</item>
</layout>
</item>
<item>
<widget class="QPushButton" name="close">
<property name="text">
<string>Close</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="transitionsTab">
@ -1172,7 +1165,7 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="titleTab">
<widget class="QWidget" name="windowTitleTab">
<attribute name="title">
<string notr="true">Title</string>
</attribute>
@ -2624,7 +2617,7 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="IdleTab">
<widget class="QWidget" name="idleTab">
<attribute name="title">
<string notr="true">Idle</string>
</attribute>
@ -3176,6 +3169,13 @@
</widget>
</widget>
</item>
<item>
<widget class="QPushButton" name="close">
<property name="text">
<string>Close</string>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>

38
src/general.cpp
View File

@ -337,58 +337,56 @@ void AdvSceneSwitcher::on_importSettings_clicked()
close();
}
int findTabIndex(QTabBar *bar, int pos)
int findTabIndex(QTabWidget *tabWidget, int pos)
{
int at = -1;
QString tabName = "";
switch (pos) {
case 0:
tabName = "General";
tabName = "generalTab";
break;
case 1:
tabName = "Transition";
tabName = "transitionsTab";
break;
case 2:
tabName = "Pause";
tabName = "pauseScenesTab";
break;
case 3:
tabName = "Title";
tabName = "windowTitleTab";
break;
case 4:
tabName = "Executable";
tabName = "executableTab";
break;
case 5:
tabName = "Region";
tabName = "screenRegionTab";
break;
case 6:
tabName = "Media";
tabName = "mediaTab";
break;
case 7:
tabName = "File";
tabName = "fileTab";
break;
case 8:
tabName = "Random";
tabName = "randomTab";
break;
case 9:
tabName = "Time";
tabName = "timeTab";
break;
case 10:
tabName = "Idle";
tabName = "idleTab";
break;
case 11:
tabName = "Sequence";
tabName = "sceneSequenceTab";
break;
case 12:
tabName = "Audio";
tabName = "audioTab";
break;
}
for (int i = 0; i < bar->count(); ++i) {
if (bar->tabText(i).compare(tabName) == 0) {
at = i;
break;
}
QWidget *page = tabWidget->findChild<QWidget *>(tabName);
if (page) {
at = tabWidget->indexOf(page);
}
if (at == -1)
blog(LOG_INFO, "failed to find tab %s",
@ -401,7 +399,7 @@ void AdvSceneSwitcher::setTabOrder()
{
QTabBar *bar = ui->tabWidget->tabBar();
for (int i = 0; i < bar->count(); ++i) {
int curPos = findTabIndex(bar, switcher->tabOrder[i]);
int curPos = findTabIndex(ui->tabWidget, switcher->tabOrder[i]);
if (i != curPos && curPos != -1)
bar->moveTab(curPos, i);