diff options
Diffstat (limited to '')
| -rw-r--r-- | src/yuzu/main.cpp | 5 | ||||
| -rw-r--r-- | src/yuzu/main.ui | 14 |
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() { | |||
| 863 | statusBar()->addPermanentWidget(label); | 863 | statusBar()->addPermanentWidget(label); |
| 864 | } | 864 | } |
| 865 | 865 | ||
| 866 | statusBar()->addPermanentWidget(multiplayer_state->GetStatusText(), 0); | 866 | // TODO (flTobi): Add the widget when multiplayer is fully implemented |
| 867 | statusBar()->addPermanentWidget(multiplayer_state->GetStatusIcon(), 0); | 867 | // statusBar()->addPermanentWidget(multiplayer_state->GetStatusText(), 0); |
| 868 | // statusBar()->addPermanentWidget(multiplayer_state->GetStatusIcon(), 0); | ||
| 868 | 869 | ||
| 869 | tas_label = new QLabel(); | 870 | tas_label = new QLabel(); |
| 870 | tas_label->setObjectName(QStringLiteral("TASlabel")); | 871 | 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 @@ | |||
| 120 | <addaction name="menu_Reset_Window_Size"/> | 120 | <addaction name="menu_Reset_Window_Size"/> |
| 121 | <addaction name="menu_View_Debugging"/> | 121 | <addaction name="menu_View_Debugging"/> |
| 122 | </widget> | 122 | </widget> |
| 123 | <widget class="QMenu" name="menu_Multiplayer"> | ||
| 124 | <property name="enabled"> | ||
| 125 | <bool>true</bool> | ||
| 126 | </property> | ||
| 127 | <property name="title"> | ||
| 128 | <string>Multiplayer</string> | ||
| 129 | </property> | ||
| 130 | <addaction name="action_View_Lobby"/> | ||
| 131 | <addaction name="action_Start_Room"/> | ||
| 132 | <addaction name="action_Connect_To_Room"/> | ||
| 133 | <addaction name="separator"/> | ||
| 134 | <addaction name="action_Show_Room"/> | ||
| 135 | <addaction name="action_Leave_Room"/> | ||
| 136 | </widget> | ||
| 137 | <widget class="QMenu" name="menu_Tools"> | 123 | <widget class="QMenu" name="menu_Tools"> |
| 138 | <property name="title"> | 124 | <property name="title"> |
| 139 | <string>&Tools</string> | 125 | <string>&Tools</string> |