summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorFearlessTobi <thm.frey@gmail.com>2022-07-06 04:19:18 +0200
committerFearlessTobi <thm.frey@gmail.com>2022-07-25 21:59:30 +0200
commit1b36542be23ad6c09864d862ad7b61d5db3185c6 (patch)
tree493ccb27544c22442ab47a57b424c4a4761cc9f7 /src
parentyuzu: Add ui files for multiplayer rooms (diff)
downloadyuzu-1b36542be23ad6c09864d862ad7b61d5db3185c6.tar
yuzu-1b36542be23ad6c09864d862ad7b61d5db3185c6.tar.gz
yuzu-1b36542be23ad6c09864d862ad7b61d5db3185c6.tar.bz2
yuzu-1b36542be23ad6c09864d862ad7b61d5db3185c6.tar.lz
yuzu-1b36542be23ad6c09864d862ad7b61d5db3185c6.tar.xz
yuzu-1b36542be23ad6c09864d862ad7b61d5db3185c6.tar.zst
yuzu-1b36542be23ad6c09864d862ad7b61d5db3185c6.zip
Diffstat (limited to 'src')
-rw-r--r--src/yuzu/main.cpp5
-rw-r--r--src/yuzu/main.ui14
2 files changed, 3 insertions, 16 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 5d8132673..f1cc910c0 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -863,8 +863,9 @@ void GMainWindow::InitializeWidgets() {
statusBar()->addPermanentWidget(label);
}
- statusBar()->addPermanentWidget(multiplayer_state->GetStatusText(), 0);
- statusBar()->addPermanentWidget(multiplayer_state->GetStatusIcon(), 0);
+ // TODO (flTobi): Add the widget when multiplayer is fully implemented
+ // statusBar()->addPermanentWidget(multiplayer_state->GetStatusText(), 0);
+ // statusBar()->addPermanentWidget(multiplayer_state->GetStatusIcon(), 0);
tas_label = new QLabel();
tas_label->setObjectName(QStringLiteral("TASlabel"));
diff --git a/src/yuzu/main.ui b/src/yuzu/main.ui
index 60a8deab1..cdf31b417 100644
--- a/src/yuzu/main.ui
+++ b/src/yuzu/main.ui
@@ -120,20 +120,6 @@
<addaction name="menu_Reset_Window_Size"/>
<addaction name="menu_View_Debugging"/>
</widget>
- <widget class="QMenu" name="menu_Multiplayer">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="title">
- <string>Multiplayer</string>
- </property>
- <addaction name="action_View_Lobby"/>
- <addaction name="action_Start_Room"/>
- <addaction name="action_Connect_To_Room"/>
- <addaction name="separator"/>
- <addaction name="action_Show_Room"/>
- <addaction name="action_Leave_Room"/>
- </widget>
<widget class="QMenu" name="menu_Tools">
<property name="title">
<string>&amp;Tools</string>