mirror of
https://github.com/Lime3DS/Lime3DS.git
synced 2024-11-01 16:05:07 +01:00
lime3ds-gui: Fix Hybrid Screen layout menu option
This commit is contained in:
parent
fc936c8879
commit
9665f95306
@ -188,6 +188,7 @@ filter_mode =
|
|||||||
# 3: Side by Side
|
# 3: Side by Side
|
||||||
# 4: Separate Windows
|
# 4: Separate Windows
|
||||||
# 5: Hybrid Screen
|
# 5: Hybrid Screen
|
||||||
|
# 6: Custom Layout
|
||||||
layout_option =
|
layout_option =
|
||||||
|
|
||||||
# Toggle custom layout (using the settings below) on or off.
|
# Toggle custom layout (using the settings below) on or off.
|
||||||
|
@ -25,7 +25,7 @@ ConfigureLayout::ConfigureLayout(QWidget* parent)
|
|||||||
connect(ui->layout_combobox,
|
connect(ui->layout_combobox,
|
||||||
static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this,
|
static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this,
|
||||||
[this](int currentIndex) {
|
[this](int currentIndex) {
|
||||||
ui->custom_layout_group->setEnabled(ui->layout_combobox->currentIndex() == 5);
|
ui->custom_layout_group->setEnabled(ui->layout_combobox->currentIndex() == 6);
|
||||||
});
|
});
|
||||||
|
|
||||||
connect(ui->bg_button, &QPushButton::clicked, this, [this] {
|
connect(ui->bg_button, &QPushButton::clicked, this, [this] {
|
||||||
|
@ -75,6 +75,11 @@
|
|||||||
<string>Separate Windows</string>
|
<string>Separate Windows</string>
|
||||||
</property>
|
</property>
|
||||||
</item>
|
</item>
|
||||||
|
<item>
|
||||||
|
<property name="text">
|
||||||
|
<string>Hybrid Screen</string>
|
||||||
|
</property>
|
||||||
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Custom Layout</string>
|
<string>Custom Layout</string>
|
||||||
|
@ -465,9 +465,9 @@ void GMainWindow::InitializeWidgets() {
|
|||||||
actionGroup_ScreenLayouts->addAction(ui->action_Screen_Layout_Default);
|
actionGroup_ScreenLayouts->addAction(ui->action_Screen_Layout_Default);
|
||||||
actionGroup_ScreenLayouts->addAction(ui->action_Screen_Layout_Single_Screen);
|
actionGroup_ScreenLayouts->addAction(ui->action_Screen_Layout_Single_Screen);
|
||||||
actionGroup_ScreenLayouts->addAction(ui->action_Screen_Layout_Large_Screen);
|
actionGroup_ScreenLayouts->addAction(ui->action_Screen_Layout_Large_Screen);
|
||||||
actionGroup_ScreenLayouts->addAction(ui->action_Screen_Layout_Hybrid_Screen);
|
|
||||||
actionGroup_ScreenLayouts->addAction(ui->action_Screen_Layout_Side_by_Side);
|
actionGroup_ScreenLayouts->addAction(ui->action_Screen_Layout_Side_by_Side);
|
||||||
actionGroup_ScreenLayouts->addAction(ui->action_Screen_Layout_Separate_Windows);
|
actionGroup_ScreenLayouts->addAction(ui->action_Screen_Layout_Separate_Windows);
|
||||||
|
actionGroup_ScreenLayouts->addAction(ui->action_Screen_Layout_Hybrid_Screen);
|
||||||
actionGroup_ScreenLayouts->addAction(ui->action_Screen_Layout_Custom_Layout);
|
actionGroup_ScreenLayouts->addAction(ui->action_Screen_Layout_Custom_Layout);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -135,9 +135,9 @@
|
|||||||
<addaction name="action_Screen_Layout_Default"/>
|
<addaction name="action_Screen_Layout_Default"/>
|
||||||
<addaction name="action_Screen_Layout_Single_Screen"/>
|
<addaction name="action_Screen_Layout_Single_Screen"/>
|
||||||
<addaction name="action_Screen_Layout_Large_Screen"/>
|
<addaction name="action_Screen_Layout_Large_Screen"/>
|
||||||
<addaction name="action_Screen_Layout_Hybrid_Screen"/>
|
|
||||||
<addaction name="action_Screen_Layout_Side_by_Side"/>
|
<addaction name="action_Screen_Layout_Side_by_Side"/>
|
||||||
<addaction name="action_Screen_Layout_Separate_Windows"/>
|
<addaction name="action_Screen_Layout_Separate_Windows"/>
|
||||||
|
<addaction name="action_Screen_Layout_Hybrid_Screen"/>
|
||||||
<addaction name="action_Screen_Layout_Custom_Layout"/>
|
<addaction name="action_Screen_Layout_Custom_Layout"/>
|
||||||
<addaction name="separator"/>
|
<addaction name="separator"/>
|
||||||
<addaction name="action_Screen_Layout_Upright_Screens"/>
|
<addaction name="action_Screen_Layout_Upright_Screens"/>
|
||||||
@ -521,14 +521,6 @@
|
|||||||
<string>Large Screen</string>
|
<string>Large Screen</string>
|
||||||
</property>
|
</property>
|
||||||
</action>
|
</action>
|
||||||
<action name="action_Screen_Layout_Hybrid_Screen">
|
|
||||||
<property name="checkable">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Hybrid Screen</string>
|
|
||||||
</property>
|
|
||||||
</action>
|
|
||||||
<action name="action_Screen_Layout_Side_by_Side">
|
<action name="action_Screen_Layout_Side_by_Side">
|
||||||
<property name="checkable">
|
<property name="checkable">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
@ -545,6 +537,14 @@
|
|||||||
<string>Separate Windows</string>
|
<string>Separate Windows</string>
|
||||||
</property>
|
</property>
|
||||||
</action>
|
</action>
|
||||||
|
<action name="action_Screen_Layout_Hybrid_Screen">
|
||||||
|
<property name="checkable">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>Hybrid Screen</string>
|
||||||
|
</property>
|
||||||
|
</action>
|
||||||
<action name="action_Screen_Layout_Custom_Layout">
|
<action name="action_Screen_Layout_Custom_Layout">
|
||||||
<property name="checkable">
|
<property name="checkable">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
|
Loading…
Reference in New Issue
Block a user