summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner2017-02-18 01:11:57 -0800
committerGravatar Yuri Kunde Schlesner2017-02-18 01:11:57 -0800
commite823c908ea77c93dc2e5b6882f9cc9dba513841b (patch)
tree6d397183fcd38fb80f6dd346e3f1bb3ce346aa15 /src
parentMerge pull request #2577 from yuriks/qt-cleanup (diff)
downloadyuzu-e823c908ea77c93dc2e5b6882f9cc9dba513841b.tar.gz
yuzu-e823c908ea77c93dc2e5b6882f9cc9dba513841b.tar.xz
yuzu-e823c908ea77c93dc2e5b6882f9cc9dba513841b.zip
Qt: Fix action name to match conventions
Diffstat (limited to 'src')
-rw-r--r--src/citra_qt/main.cpp6
-rw-r--r--src/citra_qt/main.ui6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index 717552468..20eb1f8ca 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -215,8 +215,8 @@ void GMainWindow::RestoreUIState() {
215 ui.action_Single_Window_Mode->setChecked(UISettings::values.single_window_mode); 215 ui.action_Single_Window_Mode->setChecked(UISettings::values.single_window_mode);
216 ToggleWindowMode(); 216 ToggleWindowMode();
217 217
218 ui.actionDisplay_widget_title_bars->setChecked(UISettings::values.display_titlebar); 218 ui.action_Display_Dock_Widget_Headers->setChecked(UISettings::values.display_titlebar);
219 OnDisplayTitleBars(ui.actionDisplay_widget_title_bars->isChecked()); 219 OnDisplayTitleBars(ui.action_Display_Dock_Widget_Headers->isChecked());
220} 220}
221 221
222void GMainWindow::ConnectWidgetEvents() { 222void GMainWindow::ConnectWidgetEvents() {
@@ -612,7 +612,7 @@ void GMainWindow::closeEvent(QCloseEvent* event) {
612 UISettings::values.microprofile_visible = microProfileDialog->isVisible(); 612 UISettings::values.microprofile_visible = microProfileDialog->isVisible();
613#endif 613#endif
614 UISettings::values.single_window_mode = ui.action_Single_Window_Mode->isChecked(); 614 UISettings::values.single_window_mode = ui.action_Single_Window_Mode->isChecked();
615 UISettings::values.display_titlebar = ui.actionDisplay_widget_title_bars->isChecked(); 615 UISettings::values.display_titlebar = ui.action_Display_Dock_Widget_Headers->isChecked();
616 UISettings::values.first_start = false; 616 UISettings::values.first_start = false;
617 617
618 game_list->SaveInterfaceLayout(); 618 game_list->SaveInterfaceLayout();
diff --git a/src/citra_qt/main.ui b/src/citra_qt/main.ui
index adfa3689e..dfc424175 100644
--- a/src/citra_qt/main.ui
+++ b/src/citra_qt/main.ui
@@ -80,7 +80,7 @@
80 <string>&amp;View</string> 80 <string>&amp;View</string>
81 </property> 81 </property>
82 <addaction name="action_Single_Window_Mode"/> 82 <addaction name="action_Single_Window_Mode"/>
83 <addaction name="actionDisplay_widget_title_bars"/> 83 <addaction name="action_Display_Dock_Widget_Headers"/>
84 </widget> 84 </widget>
85 <widget class="QMenu" name="menu_Help"> 85 <widget class="QMenu" name="menu_Help">
86 <property name="title"> 86 <property name="title">
@@ -151,7 +151,7 @@
151 <string>Configure...</string> 151 <string>Configure...</string>
152 </property> 152 </property>
153 </action> 153 </action>
154 <action name="actionDisplay_widget_title_bars"> 154 <action name="action_Display_Dock_Widget_Headers">
155 <property name="checkable"> 155 <property name="checkable">
156 <bool>true</bool> 156 <bool>true</bool>
157 </property> 157 </property>
@@ -187,7 +187,7 @@
187 </hints> 187 </hints>
188 </connection> 188 </connection>
189 <connection> 189 <connection>
190 <sender>actionDisplay_widget_title_bars</sender> 190 <sender>action_Display_Dock_Widget_Headers</sender>
191 <signal>triggered(bool)</signal> 191 <signal>triggered(bool)</signal>
192 <receiver>MainWindow</receiver> 192 <receiver>MainWindow</receiver>
193 <slot>OnDisplayTitleBars(bool)</slot> 193 <slot>OnDisplayTitleBars(bool)</slot>