diff options
| author | 2017-04-13 01:10:19 -0400 | |
|---|---|---|
| committer | 2017-06-02 18:28:14 -0400 | |
| commit | b6bab59000cbcdb34aed3f8633c5aae391db6dcb (patch) | |
| tree | 62ee71c8b38011342574b0d68f2e75b5303643ea /src | |
| parent | Made some changes from review comments: (diff) | |
| download | yuzu-b6bab59000cbcdb34aed3f8633c5aae391db6dcb.tar.gz yuzu-b6bab59000cbcdb34aed3f8633c5aae391db6dcb.tar.xz yuzu-b6bab59000cbcdb34aed3f8633c5aae391db6dcb.zip | |
Added message to status bar to show core errors ignored by the user.
Diffstat (limited to 'src')
| -rw-r--r-- | src/citra_qt/main.cpp | 11 | ||||
| -rw-r--r-- | src/citra_qt/main.h | 1 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index cc38cfc0e..6121d4728 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp | |||
| @@ -93,6 +93,14 @@ void GMainWindow::InitializeWidgets() { | |||
| 93 | ui.horizontalLayout->addWidget(game_list); | 93 | ui.horizontalLayout->addWidget(game_list); |
| 94 | 94 | ||
| 95 | // Create status bar | 95 | // Create status bar |
| 96 | message_label = new QLabel(); | ||
| 97 | // Configured separately for left alignment | ||
| 98 | message_label->setVisible(false); | ||
| 99 | message_label->setFrameStyle(QFrame::NoFrame); | ||
| 100 | message_label->setContentsMargins(4, 0, 4, 0); | ||
| 101 | message_label->setAlignment(Qt::AlignLeft); | ||
| 102 | statusBar()->addPermanentWidget(message_label, 1); | ||
| 103 | |||
| 96 | emu_speed_label = new QLabel(); | 104 | emu_speed_label = new QLabel(); |
| 97 | emu_speed_label->setToolTip(tr("Current emulation speed. Values higher or lower than 100% " | 105 | emu_speed_label->setToolTip(tr("Current emulation speed. Values higher or lower than 100% " |
| 98 | "indicate emulation is running faster or slower than a 3DS.")); | 106 | "indicate emulation is running faster or slower than a 3DS.")); |
| @@ -108,7 +116,7 @@ void GMainWindow::InitializeWidgets() { | |||
| 108 | label->setVisible(false); | 116 | label->setVisible(false); |
| 109 | label->setFrameStyle(QFrame::NoFrame); | 117 | label->setFrameStyle(QFrame::NoFrame); |
| 110 | label->setContentsMargins(4, 0, 4, 0); | 118 | label->setContentsMargins(4, 0, 4, 0); |
| 111 | statusBar()->addPermanentWidget(label); | 119 | statusBar()->addPermanentWidget(label, 0); |
| 112 | } | 120 | } |
| 113 | statusBar()->setVisible(true); | 121 | statusBar()->setVisible(true); |
| 114 | setStyleSheet("QStatusBar::item{border: none;}"); | 122 | setStyleSheet("QStatusBar::item{border: none;}"); |
| @@ -437,6 +445,7 @@ void GMainWindow::ShutdownGame() { | |||
| 437 | 445 | ||
| 438 | // Disable status bar updates | 446 | // Disable status bar updates |
| 439 | status_bar_update_timer.stop(); | 447 | status_bar_update_timer.stop(); |
| 448 | message_label->setVisible(false); | ||
| 440 | emu_speed_label->setVisible(false); | 449 | emu_speed_label->setVisible(false); |
| 441 | game_fps_label->setVisible(false); | 450 | game_fps_label->setVisible(false); |
| 442 | emu_frametime_label->setVisible(false); | 451 | emu_frametime_label->setVisible(false); |
diff --git a/src/citra_qt/main.h b/src/citra_qt/main.h index 1ce0607e2..3ecbc001e 100644 --- a/src/citra_qt/main.h +++ b/src/citra_qt/main.h | |||
| @@ -136,6 +136,7 @@ private: | |||
| 136 | GameList* game_list; | 136 | GameList* game_list; |
| 137 | 137 | ||
| 138 | // Status bar elements | 138 | // Status bar elements |
| 139 | QLabel* message_label = nullptr; | ||
| 139 | QLabel* emu_speed_label = nullptr; | 140 | QLabel* emu_speed_label = nullptr; |
| 140 | QLabel* game_fps_label = nullptr; | 141 | QLabel* game_fps_label = nullptr; |
| 141 | QLabel* emu_frametime_label = nullptr; | 142 | QLabel* emu_frametime_label = nullptr; |