Remove EmuState

Source/Core/Core/ConfigManager.cpp

@@ -228,7 +228,6 @@ void SConfig::SaveGameListSettings(IniFile& ini)
   gamelist->Set("ColumnID", m_showIDColumn);
   gamelist->Set("ColumnRegion", m_showRegionColumn);
   gamelist->Set("ColumnSize", m_showSizeColumn);
-  gamelist->Set("ColumnState", m_showStateColumn);
 }
 
 void SConfig::SaveCoreSettings(IniFile& ini)
@@ -517,7 +516,6 @@ void SConfig::LoadGameListSettings(IniFile& ini)
   gamelist->Get("ColumnID", &m_showIDColumn, false);
   gamelist->Get("ColumnRegion", &m_showRegionColumn, true);
   gamelist->Get("ColumnSize", &m_showSizeColumn, true);
-  gamelist->Get("ColumnState", &m_showStateColumn, true);
 }
 
 void SConfig::LoadCoreSettings(IniFile& ini)

Source/Core/Core/ConfigManager.h

@@ -276,7 +276,6 @@ struct SConfig
   bool m_showIDColumn;
   bool m_showRegionColumn;
   bool m_showSizeColumn;
-  bool m_showStateColumn;
 
   std::string m_WirelessMac;
   bool m_PauseMovie;

Source/Core/DolphinQt2/Config/GameConfigWidget.cpp

@@ -127,27 +127,14 @@ void GameConfigWidget::CreateWidgets()
   settings_layout->addWidget(core_box);
   settings_layout->addWidget(stereoscopy_box);
 
-  m_state_combo = new QComboBox;
-
-  for (const auto& item :
-       {tr("Not Set"), tr("Broken"), tr("Intro"), tr("In Game"), tr("Playable"), tr("Perfect")})
-    m_state_combo->addItem(item);
-
-  m_state_comment_edit = new QLineEdit;
-
   auto* layout = new QGridLayout;
 
-  auto* emulation_state = new QLabel(tr("Emulation State:"));
-
   layout->addWidget(settings_box, 0, 0, 1, -1);
-  layout->addWidget(emulation_state, 1, 0);
-  layout->addWidget(m_state_combo, 1, 1);
-  layout->addWidget(m_state_comment_edit, 1, 2, 1, -1);
 
   auto* button_layout = new QHBoxLayout;
   button_layout->setMargin(0);
 
-  layout->addLayout(button_layout, 2, 0, 1, -1);
+  layout->addLayout(button_layout, 1, 0, 1, -1);
 
   button_layout->addWidget(m_refresh_config);
   button_layout->addWidget(m_edit_user_config);
@@ -157,9 +144,6 @@ void GameConfigWidget::CreateWidgets()
                           m_enable_fast_disc, m_use_dsp_hle, m_use_monoscopic_shadows})
     item->setTristate(true);
 
-  emulation_state->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-  m_state_combo->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-
   setLayout(layout);
 }
 
@@ -170,11 +154,6 @@ void GameConfigWidget::ConnectWidgets()
   connect(m_edit_user_config, &QPushButton::pressed, this, &GameConfigWidget::EditUserConfig);
   connect(m_view_default_config, &QPushButton::pressed, this, &GameConfigWidget::ViewDefaultConfig);
 
-  // Settings
-  connect(m_state_combo, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
-          this, &GameConfigWidget::SaveSettings);
-  connect(m_state_comment_edit, &QLineEdit::editingFinished, this, &GameConfigWidget::SaveSettings);
-
   for (QCheckBox* box : {m_enable_dual_core, m_enable_mmu, m_enable_fprf, m_sync_gpu,
                          m_enable_fast_disc, m_use_dsp_hle, m_use_monoscopic_shadows})
     connect(box, &QCheckBox::toggled, this, &GameConfigWidget::SaveSettings);
@@ -237,10 +216,6 @@ void GameConfigWidget::SaveCheckBox(QCheckBox* checkbox, const std::string& sect
 
 void GameConfigWidget::LoadSettings()
 {
-  // Load state information
-  m_state_combo->setCurrentIndex(m_game.GetEmuState());
-  m_state_comment_edit->setText(QString::fromStdString(m_game.GetIssues()));
-
   // Load game-specific settings
 
   // Core
@@ -293,18 +268,6 @@ void GameConfigWidget::LoadSettings()
 
 void GameConfigWidget::SaveSettings()
 {
-  // Save state information
-  QString comment = m_state_comment_edit->text();
-  int state = m_state_combo->currentIndex();
-
-  if (comment != QString::fromStdString(m_game.GetIssues()))
-    m_gameini_local.GetOrCreateSection("EmuState")->Set("EmulationIssues", comment.toStdString());
-
-  if (state != m_game.GetEmuState())
-    m_gameini_local.GetOrCreateSection("EmuState")->Set("EmulationStateId", state);
-
-  // Save game-specific settings
-
   // Core
   SaveCheckBox(m_enable_dual_core, "Core", "CPUThread");
   SaveCheckBox(m_enable_mmu, "Core", "MMU");

Source/Core/DolphinQt2/Config/GameConfigWidget.h

@@ -43,8 +43,6 @@ class GameConfigWidget : public QWidget
   void LoadCheckBox(QCheckBox* checkbox, const std::string& section, const std::string& key);
   void SaveCheckBox(QCheckBox* checkbox, const std::string& section, const std::string& key);
 
-  QComboBox* m_state_combo;
-  QLineEdit* m_state_comment_edit;
   QPushButton* m_refresh_config;
   QPushButton* m_edit_user_config;
   QPushButton* m_view_default_config;

Source/Core/DolphinQt2/GameList/GameList.cpp

@@ -93,7 +93,6 @@ void GameList::MakeListView()
   m_list->setColumnHidden(GameListModel::COL_ID, !SConfig::GetInstance().m_showIDColumn);
   m_list->setColumnHidden(GameListModel::COL_COUNTRY, !SConfig::GetInstance().m_showRegionColumn);
   m_list->setColumnHidden(GameListModel::COL_SIZE, !SConfig::GetInstance().m_showSizeColumn);
-  m_list->setColumnHidden(GameListModel::COL_RATING, !SConfig::GetInstance().m_showStateColumn);
   m_list->setColumnHidden(GameListModel::COL_FILE_NAME,
                           !SConfig::GetInstance().m_showFileNameColumn);
 
@@ -116,7 +115,6 @@ void GameList::MakeListView()
   hor_header->setSectionResizeMode(GameListModel::COL_ID, QHeaderView::ResizeToContents);
   hor_header->setSectionResizeMode(GameListModel::COL_COUNTRY, QHeaderView::ResizeToContents);
   hor_header->setSectionResizeMode(GameListModel::COL_SIZE, QHeaderView::ResizeToContents);
-  hor_header->setSectionResizeMode(GameListModel::COL_RATING, QHeaderView::ResizeToContents);
   hor_header->setSectionResizeMode(GameListModel::COL_FILE_NAME, QHeaderView::Interactive);
 
   m_list->verticalHeader()->hide();
@@ -494,7 +492,6 @@ void GameList::OnColumnVisibilityToggled(const QString& row, bool visible)
       {tr("Platform"), GameListModel::COL_PLATFORM},
       {tr("Size"), GameListModel::COL_SIZE},
       {tr("Title"), GameListModel::COL_TITLE},
-      {tr("State"), GameListModel::COL_RATING},
       {tr("File Name"), GameListModel::COL_FILE_NAME}};
 
   m_list->setColumnHidden(rowname_to_col_index[row], !visible);

Source/Core/DolphinQt2/GameList/GameListModel.cpp

@@ -55,12 +55,6 @@ QVariant GameListModel::data(const QModelIndex& index, int role) const
     if (role == Qt::InitialSortOrderRole)
       return static_cast<int>(game.GetCountry());
     break;
-  case COL_RATING:
-    if (role == Qt::DecorationRole)
-      return Resources::GetRating(game.GetEmuState());
-    if (role == Qt::InitialSortOrderRole)
-      return game.GetEmuState();
-    break;
   case COL_BANNER:
     if (role == Qt::DecorationRole)
     {
@@ -128,8 +122,6 @@ QVariant GameListModel::headerData(int section, Qt::Orientation orientation, int
     return tr("File Name");
   case COL_SIZE:
     return tr("Size");
-  case COL_RATING:
-    return tr("State");
   }
   return QVariant();
 }

Source/Core/DolphinQt2/GameList/GameListModel.h

@@ -48,7 +48,6 @@ class GameListModel final : public QAbstractTableModel
     COL_ID,
     COL_COUNTRY,
     COL_SIZE,
-    COL_RATING,
     COL_FILE_NAME,
     NUM_COLS
   };

Source/Core/DolphinQt2/MenuBar.cpp

@@ -471,8 +471,7 @@ void MenuBar::AddListColumnsMenu(QMenu* view_menu)
       {tr("File Name"), &SConfig::GetInstance().m_showFileNameColumn},
       {tr("Game ID"), &SConfig::GetInstance().m_showIDColumn},
       {tr("Region"), &SConfig::GetInstance().m_showRegionColumn},
-      {tr("File Size"), &SConfig::GetInstance().m_showSizeColumn},
-      {tr("State"), &SConfig::GetInstance().m_showStateColumn}};
+      {tr("File Size"), &SConfig::GetInstance().m_showSizeColumn}};
 
   QActionGroup* column_group = new QActionGroup(this);
   QMenu* cols_menu = view_menu->addMenu(tr("List Columns"));

Source/Core/DolphinQt2/Resources.cpp

@@ -18,7 +18,6 @@
 
 QList<QPixmap> Resources::m_platforms;
 QList<QPixmap> Resources::m_countries;
-QList<QPixmap> Resources::m_ratings;
 QList<QPixmap> Resources::m_misc;
 
 QIcon Resources::GetIcon(const QString& name, const QString& dir)
@@ -73,11 +72,6 @@ QPixmap Resources::GetScaledPixmap(const std::string& name)
   return GetPixmap(QString::fromStdString(name), GetResourcesDir());
 }
 
-QPixmap Resources::GetScaledThemePixmap(const std::string& name)
-{
-  return GetPixmap(QString::fromStdString(name), GetCurrentThemeDir());
-}
-
 void Resources::Init()
 {
   for (const std::string& platform :
@@ -97,16 +91,6 @@ void Resources::Init()
   m_misc.append(GetScaledPixmap("nobanner"));
   m_misc.append(GetScaledPixmap("dolphin_logo"));
   m_misc.append(GetScaledPixmap("Dolphin"));
-
-  QObject::connect(&Settings::Instance(), &Settings::ThemeChanged, Resources::InitThemeIcons);
-  InitThemeIcons();
-}
-
-void Resources::InitThemeIcons()
-{
-  m_ratings = {GetScaledThemePixmap("rating0"), GetScaledThemePixmap("rating1"),
-               GetScaledThemePixmap("rating2"), GetScaledThemePixmap("rating3"),
-               GetScaledThemePixmap("rating4"), GetScaledThemePixmap("rating5")};
 }
 
 QPixmap Resources::GetPlatform(int platform)
@@ -119,11 +103,6 @@ QPixmap Resources::GetCountry(int country)
   return m_countries[country];
 }
 
-QPixmap Resources::GetRating(int rating)
-{
-  return m_ratings[rating];
-}
-
 QPixmap Resources::GetMisc(int id)
 {
   return m_misc[id];

Source/Core/DolphinQt2/Resources.h

@@ -15,7 +15,6 @@ class Resources final
 
   static QPixmap GetPlatform(int platform);
   static QPixmap GetCountry(int country);
-  static QPixmap GetRating(int rating);
 
   static QPixmap GetMisc(int id);
 
@@ -31,16 +30,13 @@ class Resources final
   static QIcon GetAppIcon();
 
   static QPixmap GetScaledPixmap(const std::string& name);
-  static QPixmap GetScaledThemePixmap(const std::string& name);
 
 private:
   Resources() {}
-  static void InitThemeIcons();
   static QIcon GetIcon(const QString& name, const QString& dir);
   static QPixmap GetPixmap(const QString& name, const QString& dir);
 
   static QList<QPixmap> m_platforms;
   static QList<QPixmap> m_countries;
-  static QList<QPixmap> m_ratings;
   static QList<QPixmap> m_misc;
 };

Source/Core/DolphinWX/FrameTools.cpp

@@ -204,7 +204,7 @@ void CFrame::BindMenuBarEvents()
   Bind(wxEVT_MENU, &CFrame::OnToggleWindow, this, IDM_LOG_WINDOW, IDM_VIDEO_WINDOW);
   Bind(wxEVT_MENU, &CFrame::GameListChanged, this, IDM_LIST_WAD, IDM_LIST_DRIVES);
   Bind(wxEVT_MENU, &CFrame::GameListChanged, this, IDM_PURGE_GAME_LIST_CACHE);
-  Bind(wxEVT_MENU, &CFrame::OnChangeColumnsVisible, this, IDM_SHOW_SYSTEM, IDM_SHOW_STATE);
+  Bind(wxEVT_MENU, &CFrame::OnChangeColumnsVisible, this, IDM_SHOW_SYSTEM, IDM_SHOW_SIZE);
 
   // Help menu
   Bind(wxEVT_MENU, &CFrame::OnHelp, this, IDM_HELP_WEBSITE);
@@ -1918,9 +1918,6 @@ void CFrame::OnChangeColumnsVisible(wxCommandEvent& event)
   case IDM_SHOW_SIZE:
     SConfig::GetInstance().m_showSizeColumn = !SConfig::GetInstance().m_showSizeColumn;
     break;
-  case IDM_SHOW_STATE:
-    SConfig::GetInstance().m_showStateColumn = !SConfig::GetInstance().m_showStateColumn;
-    break;
   default:
     return;
   }