diff --git a/bin/GuiConfigs/Darker Style by TheMitoSan.qss b/bin/GuiConfigs/Darker Style by TheMitoSan.qss index 7c5362d74b..9a8cf97f99 100644 --- a/bin/GuiConfigs/Darker Style by TheMitoSan.qss +++ b/bin/GuiConfigs/Darker Style by TheMitoSan.qss @@ -244,9 +244,6 @@ QToolButton::hover { QLabel#gamelist_icon_background_color { color: transparent; } -QLabel#gamelist_toolbar_icon_color { - color: #828790; -} /* Set Windows Taskbar Thumbnail colors */ QLabel#thumbnail_icon_color { diff --git a/bin/GuiConfigs/Kuroi (Dark) by Ani.qss b/bin/GuiConfigs/Kuroi (Dark) by Ani.qss index bfb2b3a788..c78636133a 100644 --- a/bin/GuiConfigs/Kuroi (Dark) by Ani.qss +++ b/bin/GuiConfigs/Kuroi (Dark) by Ani.qss @@ -243,9 +243,6 @@ QToolButton::hover { QLabel#gamelist_icon_background_color { color: transparent; } -QLabel#gamelist_toolbar_icon_color { - color: #828790; -} /* Set Windows Taskbar Thumbnail colors */ QLabel#thumbnail_icon_color { diff --git a/bin/GuiConfigs/ModernBlue Theme by TheMitoSan.qss b/bin/GuiConfigs/ModernBlue Theme by TheMitoSan.qss index d1f5eaa222..5e5267599f 100644 --- a/bin/GuiConfigs/ModernBlue Theme by TheMitoSan.qss +++ b/bin/GuiConfigs/ModernBlue Theme by TheMitoSan.qss @@ -241,9 +241,6 @@ QToolButton::hover { QLabel#gamelist_icon_background_color { color: transparent; } -QLabel#gamelist_toolbar_icon_color { - color: #828790; -} /* Set Windows Taskbar Thumbnail colors */ QLabel#thumbnail_icon_color { diff --git a/rpcs3/Icons/data_blue.png b/rpcs3/Icons/data_blue.png deleted file mode 100644 index 8c45e3cd1b..0000000000 Binary files a/rpcs3/Icons/data_blue.png and /dev/null differ diff --git a/rpcs3/Icons/data_gray.png b/rpcs3/Icons/data_gray.png deleted file mode 100644 index 7ebfc5dbd4..0000000000 Binary files a/rpcs3/Icons/data_gray.png and /dev/null differ diff --git a/rpcs3/Icons/disc_blue.png b/rpcs3/Icons/disc_blue.png deleted file mode 100644 index 52320ea510..0000000000 Binary files a/rpcs3/Icons/disc_blue.png and /dev/null differ diff --git a/rpcs3/Icons/disc_gray.png b/rpcs3/Icons/disc_gray.png deleted file mode 100644 index 9a235c9eed..0000000000 Binary files a/rpcs3/Icons/disc_gray.png and /dev/null differ diff --git a/rpcs3/Icons/grid_blue.png b/rpcs3/Icons/grid_blue.png deleted file mode 100644 index b199281e11..0000000000 Binary files a/rpcs3/Icons/grid_blue.png and /dev/null differ diff --git a/rpcs3/Icons/grid_gray.png b/rpcs3/Icons/grid_gray.png deleted file mode 100644 index a731086700..0000000000 Binary files a/rpcs3/Icons/grid_gray.png and /dev/null differ diff --git a/rpcs3/Icons/hdd_blue.png b/rpcs3/Icons/hdd_blue.png deleted file mode 100644 index f9fad861a0..0000000000 Binary files a/rpcs3/Icons/hdd_blue.png and /dev/null differ diff --git a/rpcs3/Icons/hdd_gray.png b/rpcs3/Icons/hdd_gray.png deleted file mode 100644 index 29661a2e78..0000000000 Binary files a/rpcs3/Icons/hdd_gray.png and /dev/null differ diff --git a/rpcs3/Icons/home_blue.png b/rpcs3/Icons/home_blue.png deleted file mode 100644 index e5178bca42..0000000000 Binary files a/rpcs3/Icons/home_blue.png and /dev/null differ diff --git a/rpcs3/Icons/home_gray.png b/rpcs3/Icons/home_gray.png deleted file mode 100644 index 1c5e8c4f15..0000000000 Binary files a/rpcs3/Icons/home_gray.png and /dev/null differ diff --git a/rpcs3/Icons/list_blue.png b/rpcs3/Icons/list_blue.png deleted file mode 100644 index 0a0e1b3093..0000000000 Binary files a/rpcs3/Icons/list_blue.png and /dev/null differ diff --git a/rpcs3/Icons/list_gray.png b/rpcs3/Icons/list_gray.png deleted file mode 100644 index 3275cc6f63..0000000000 Binary files a/rpcs3/Icons/list_gray.png and /dev/null differ diff --git a/rpcs3/Icons/media_blue.png b/rpcs3/Icons/media_blue.png deleted file mode 100644 index 15663268c9..0000000000 Binary files a/rpcs3/Icons/media_blue.png and /dev/null differ diff --git a/rpcs3/Icons/media_gray.png b/rpcs3/Icons/media_gray.png deleted file mode 100644 index bbbd510578..0000000000 Binary files a/rpcs3/Icons/media_gray.png and /dev/null differ diff --git a/rpcs3/Icons/other_blue.png b/rpcs3/Icons/other_blue.png deleted file mode 100644 index cd1e1f6cd7..0000000000 Binary files a/rpcs3/Icons/other_blue.png and /dev/null differ diff --git a/rpcs3/Icons/other_gray.png b/rpcs3/Icons/other_gray.png deleted file mode 100644 index 58b9a1e1a3..0000000000 Binary files a/rpcs3/Icons/other_gray.png and /dev/null differ diff --git a/rpcs3/Icons/unknown_blue.png b/rpcs3/Icons/unknown_blue.png deleted file mode 100644 index 743330d8fa..0000000000 Binary files a/rpcs3/Icons/unknown_blue.png and /dev/null differ diff --git a/rpcs3/Icons/unknown_gray.png b/rpcs3/Icons/unknown_gray.png deleted file mode 100644 index 470d4f191e..0000000000 Binary files a/rpcs3/Icons/unknown_gray.png and /dev/null differ diff --git a/rpcs3/resources.qrc b/rpcs3/resources.qrc index 553ef477a3..bfc06c2dd9 100644 --- a/rpcs3/resources.qrc +++ b/rpcs3/resources.qrc @@ -5,22 +5,6 @@ Icons/restart.png Icons/stop.png rpcs3.ico - Icons/data_blue.png - Icons/data_gray.png - Icons/disc_blue.png - Icons/disc_gray.png - Icons/grid_blue.png - Icons/grid_gray.png - Icons/hdd_blue.png - Icons/hdd_gray.png - Icons/home_blue.png - Icons/home_gray.png - Icons/list_blue.png - Icons/list_gray.png - Icons/media_blue.png - Icons/media_gray.png - Icons/unknown_blue.png - Icons/unknown_gray.png Icons/controller.png Icons/insignia.png Icons/configure.png @@ -37,8 +21,6 @@ Icons/sort.png Icons/fullscreen_invert.png Json/tooltips.json - Icons/other_blue.png - Icons/other_gray.png Icons/pause_blue.png Icons/play_blue.png Icons/restart_blue.png diff --git a/rpcs3/rpcs3_app.cpp b/rpcs3/rpcs3_app.cpp index 1894c6b52e..865875f128 100644 --- a/rpcs3/rpcs3_app.cpp +++ b/rpcs3/rpcs3_app.cpp @@ -313,13 +313,6 @@ void rpcs3_app::OnChangeStyleSheetRequest(const QString& sheetFilePath) "QLabel#thumbnail_icon_color { color: " + rgba(gui::mw_thumb_icon_color) + " }" ); - // gamelist toolbar stylesheet - QString style_gamelist_toolbar = QString - ( - "QLineEdit#tb_searchbar { background: transparent; }" - "QLabel#gamelist_toolbar_icon_color { color: " + rgba(gui::gl_tool_icon_color) + " }" - ); - // gamelist icon color stylesheet QString style_gamelist_icons = QString ( @@ -359,7 +352,7 @@ void rpcs3_app::OnChangeStyleSheetRequest(const QString& sheetFilePath) "QLabel#gamegrid_font { font-weight: 600; font-size: 8pt; font-family: Lucida Grande; color: rgba(51, 51, 51, 255); }" ); - setStyleSheet(style_toolbar + style_toolbar_icons + style_thumbnail_icons + style_gamelist_toolbar + style_gamelist_icons + style_log + style_rest); + setStyleSheet(style_toolbar + style_toolbar_icons + style_thumbnail_icons + style_gamelist_icons + style_log + style_rest); } else if (file.open(QIODevice::ReadOnly | QIODevice::Text)) { diff --git a/rpcs3/rpcs3qt/game_list_frame.cpp b/rpcs3/rpcs3qt/game_list_frame.cpp index b55998970d..4db94f396f 100644 --- a/rpcs3/rpcs3qt/game_list_frame.cpp +++ b/rpcs3/rpcs3qt/game_list_frame.cpp @@ -30,7 +30,6 @@ game_list_frame::game_list_frame(std::shared_ptr guiSettings, std: m_icon_size_index = xgui_settings->GetValue(gui::gl_iconSize).toInt(); m_Margin_Factor = xgui_settings->GetValue(gui::gl_marginFactor).toReal(); m_Text_Factor = xgui_settings->GetValue(gui::gl_textFactor).toReal(); - m_showToolBar = xgui_settings->GetValue(gui::gl_toolBarVisible).toBool(); m_Icon_Color = xgui_settings->GetValue(gui::gl_iconColor).value(); m_colSortOrder = xgui_settings->GetValue(gui::gl_sortAsc).toBool() ? Qt::AscendingOrder : Qt::DescendingOrder; m_sortColumn = xgui_settings->GetValue(gui::gl_sortCol).toInt(); @@ -41,95 +40,11 @@ game_list_frame::game_list_frame(std::shared_ptr guiSettings, std: xgui_settings->SetValue(gui::gl_iconColor, m_Icon_Color); xgui_settings->SetValue(gui::gl_marginFactor, m_Margin_Factor); xgui_settings->SetValue(gui::gl_textFactor, m_Text_Factor); - xgui_settings->SetValue(gui::gl_toolBarVisible, m_showToolBar); m_Game_Dock = new QMainWindow(this); m_Game_Dock->setWindowFlags(Qt::Widget); - - // Set up toolbar - m_Tool_Bar = new QToolBar(m_Game_Dock); - m_Tool_Bar->setMovable(false); - m_Tool_Bar->setVisible(m_showToolBar); - m_Tool_Bar->setContextMenuPolicy(Qt::PreventContextMenu); - - // ToolBar Actions - m_catActHDD = { new QAction(""), QIcon(":/Icons/hdd_blue.png"), QIcon(":/Icons/hdd_gray.png"), xgui_settings->GetValue(gui::cat_hdd_game).toBool() }; - m_catActHDD.action->setToolTip(tr("Show HDD Categories")); - - m_catActDisc = { new QAction(""), QIcon(":/Icons/disc_blue.png"), QIcon(":/Icons/disc_gray.png"), xgui_settings->GetValue(gui::cat_disc_game).toBool() }; - m_catActDisc.action->setToolTip(tr("Show Disc Categories")); - - m_catActHome = { new QAction(""), QIcon(":/Icons/home_blue.png"), QIcon(":/Icons/home_gray.png"), xgui_settings->GetValue(gui::cat_home).toBool() }; - m_catActHome.action->setToolTip(tr("Show Home Categories")); - - m_catActAudioVideo = { new QAction(""), QIcon(":/Icons/media_blue.png"), QIcon(":/Icons/media_gray.png"), xgui_settings->GetValue(gui::cat_audio_video).toBool() }; - m_catActAudioVideo.action->setToolTip(tr("Show Audio/Video Categories")); - - m_catActGameData = { new QAction(""), QIcon(":/Icons/data_blue.png"), QIcon(":/Icons/data_gray.png"), xgui_settings->GetValue(gui::cat_game_data).toBool() }; - m_catActGameData.action->setToolTip(tr("Show GameData Categories")); - - m_catActUnknown = { new QAction(""), QIcon(":/Icons/unknown_blue.png"), QIcon(":/Icons/unknown_gray.png"), xgui_settings->GetValue(gui::cat_unknown).toBool() }; - m_catActUnknown.action->setToolTip(tr("Show Unknown Categories")); - - m_catActOther = { new QAction(""), QIcon(":/Icons/other_blue.png"), QIcon(":/Icons/other_gray.png"), xgui_settings->GetValue(gui::cat_other).toBool() }; - m_catActOther.action->setToolTip(tr("Show Other Categories")); - - m_categoryButtons = { &m_catActHDD , &m_catActDisc, &m_catActHome, &m_catActAudioVideo, &m_catActGameData, &m_catActUnknown, &m_catActOther }; - - m_categoryActs = new QActionGroup(m_Tool_Bar); - m_categoryActs->addAction(m_catActHDD.action); - m_categoryActs->addAction(m_catActDisc.action); - m_categoryActs->addAction(m_catActHome.action); - m_categoryActs->addAction(m_catActAudioVideo.action); - m_categoryActs->addAction(m_catActGameData.action); - m_categoryActs->addAction(m_catActUnknown.action); - m_categoryActs->addAction(m_catActOther.action); - m_categoryActs->setEnabled(m_isListLayout); - - m_modeActList = { new QAction(""), QIcon(":/Icons/list_blue.png"), QIcon(":/Icons/list_gray.png") }; - m_modeActList.action->setToolTip(tr("Enable List Mode")); - - m_modeActGrid = { new QAction(""), QIcon(":/Icons/grid_blue.png"), QIcon(":/Icons/grid_gray.png") }; - m_modeActGrid.action->setToolTip(tr("Enable Grid Mode")); - - m_modeActs = new QActionGroup(m_Tool_Bar); - m_modeActs->addAction(m_modeActList.action); - m_modeActs->addAction(m_modeActGrid.action); - - // Search Bar - m_Search_Bar = new QLineEdit(m_Tool_Bar); - m_Search_Bar->setObjectName("tb_searchbar"); // used in default stylesheet - m_Search_Bar->setPlaceholderText(tr("Search games ...")); - m_Search_Bar->setMinimumWidth(m_Tool_Bar->height() * 5); - m_Search_Bar->setFrame(false); - - // Icon Size Slider - m_Slider_Size = new QSlider(Qt::Horizontal , m_Tool_Bar); - m_Slider_Size->setRange(0, gui::gl_max_slider_pos); - m_Slider_Size->setSliderPosition(m_icon_size_index); - m_Slider_Size->setFixedWidth(m_Tool_Bar->height() * 3); - - m_Tool_Bar->addWidget(m_Search_Bar); - m_Tool_Bar->addWidget(new QLabel(" ")); - m_Tool_Bar->addSeparator(); - m_Tool_Bar->addWidget(new QLabel(" ")); - m_Tool_Bar->addActions(m_categoryActs->actions()); - m_Tool_Bar->addWidget(new QLabel(" ")); - m_Tool_Bar->addSeparator(); - m_Tool_Bar->addWidget(new QLabel(tr(" View Mode "))); - m_Tool_Bar->addAction(m_modeActList.action); - m_Tool_Bar->addAction(m_modeActGrid.action); - m_Tool_Bar->addWidget(new QLabel(tr(" "))); - m_Tool_Bar->addSeparator(); - m_Tool_Bar->addWidget(new QLabel(tr(" Tiny "))); // Can this be any easier? - m_Tool_Bar->addWidget(m_Slider_Size); - m_Tool_Bar->addWidget(new QLabel(tr(" Large "))); - - m_Game_Dock->addToolBar(m_Tool_Bar); setWidget(m_Game_Dock); - RepaintToolBarIcons(); - bool showText = m_icon_size_index < gui::gl_max_slider_pos; m_Icon_Size = sizeFromSlider(m_icon_size_index); m_xgrid = new game_list_grid(m_Icon_Size, m_Icon_Color, m_Margin_Factor, m_Text_Factor, showText); @@ -242,33 +157,6 @@ game_list_frame::game_list_frame(std::shared_ptr guiSettings, std: QMessageBox::warning(this, tr("Warning!"), tr("Failed to retrieve the online compatibility database!\nFalling back to local database.\n\n") + tr(qPrintable(error))); }); - connect(m_Search_Bar, &QLineEdit::textChanged, this, &game_list_frame::SetSearchText); - - connect(m_Slider_Size, &QSlider::valueChanged, this, &game_list_frame::RequestIconSizeActSet); - connect(m_Slider_Size, &QSlider::sliderReleased, this, [&] - { - xgui_settings->SetValue(gui::gl_iconSize, m_Slider_Size->value()); - }); - connect(m_Slider_Size, &QSlider::actionTriggered, [&](int action) - { - if (action != QAbstractSlider::SliderNoAction && action != QAbstractSlider::SliderMove) - { // we only want to save on mouseclicks or slider release (the other connect handles this) - Q_EMIT RequestSaveSliderPos(true); // actionTriggered happens before the value was changed - } - }); - - connect(m_modeActs, &QActionGroup::triggered, [=](QAction* act) - { - Q_EMIT RequestListModeActSet(act == m_modeActList.action); - m_modeActList.action->setIcon(m_isListLayout ? m_modeActList.colored : m_modeActList.gray); - m_modeActGrid.action->setIcon(m_isListLayout ? m_modeActGrid.gray : m_modeActGrid.colored); - }); - - connect(m_categoryActs, &QActionGroup::triggered, [=](QAction* act) - { - Q_EMIT RequestCategoryActSet(m_categoryActs->actions().indexOf(act)); - }); - for (int col = 0; col < m_columnActs.count(); ++col) { m_columnActs[col]->setCheckable(true); @@ -885,11 +773,6 @@ void game_list_frame::ResizeIcons(const int& sliderPos) m_icon_size_index = sliderPos; m_Icon_Size = sizeFromSlider(sliderPos); - if (m_Slider_Size->value() != sliderPos) - { - m_Slider_Size->setSliderPosition(sliderPos); - } - RepaintIcons(); } @@ -915,11 +798,6 @@ void game_list_frame::RepaintIcons(const bool& fromSettings) Refresh(); } -int game_list_frame::GetSliderValue() -{ - return m_Slider_Size->value(); -} - void game_list_frame::SetListMode(const bool& isList) { m_oldLayoutIsList = m_isListLayout; @@ -927,80 +805,17 @@ void game_list_frame::SetListMode(const bool& isList) xgui_settings->SetValue(gui::gl_listMode, isList); - m_categoryActs->setEnabled(isList); - m_modeActList.action->setIcon(m_isListLayout ? m_modeActList.colored : m_modeActList.gray); - m_modeActGrid.action->setIcon(m_isListLayout ? m_modeActGrid.gray : m_modeActGrid.colored); - Refresh(true); m_Central_Widget->setCurrentWidget(m_isListLayout ? m_gameList : m_xgrid); } -void game_list_frame::SetToolBarVisible(const bool& showToolBar) -{ - m_showToolBar = showToolBar; - m_Tool_Bar->setVisible(showToolBar); - xgui_settings->SetValue(gui::gl_toolBarVisible, showToolBar); -} - -bool game_list_frame::GetToolBarVisible() -{ - return m_showToolBar; -} - -void game_list_frame::SetCategoryActIcon(const int& id, const bool& active) -{ - m_categoryButtons.at(id)->action->setIcon(active ? m_categoryButtons.at(id)->colored : m_categoryButtons.at(id)->gray); - m_categoryButtons.at(id)->isActive = active; -} - void game_list_frame::SetSearchText(const QString& text) { - m_searchText = text; + m_search_text = text; Refresh(); } -void game_list_frame::RepaintToolBarIcons() -{ - QColor newColor; - - if (xgui_settings->GetValue(gui::m_enableUIColors).toBool()) - { - newColor = xgui_settings->GetValue(gui::gl_toolIconColor).value(); - } - else - { - newColor = gui::get_Label_Color("gamelist_toolbar_icon_color"); - } - - auto icon = [&newColor](const QString& path, bool mask = false) - { - return gui_settings::colorizedIcon(QIcon(path), gui::gl_tool_icon_color, newColor, mask); - }; - - m_catActHDD.colored = icon(":/Icons/hdd_blue.png", true); - m_catActDisc.colored = icon(":/Icons/disc_blue.png", true); - m_catActHome.colored = icon(":/Icons/home_blue.png"); - m_catActAudioVideo.colored = icon(":/Icons/media_blue.png", true); - m_catActGameData.colored = icon(":/Icons/data_blue.png", true); - m_catActUnknown.colored = icon(":/Icons/unknown_blue.png", true); - m_catActOther.colored = icon(":/Icons/other_blue.png"); - - for (const auto& butt : m_categoryButtons) - { - butt->action->setIcon(butt->isActive ? butt->colored : butt->gray); - } - - m_modeActList.colored = icon(":/Icons/list_blue.png"); - m_modeActList.action->setIcon(m_isListLayout ? m_modeActList.colored : m_modeActList.gray); - - m_modeActGrid.colored = icon(":/Icons/grid_blue.png"); - m_modeActGrid.action->setIcon(m_isListLayout ? m_modeActGrid.gray : m_modeActGrid.colored); - - m_Slider_Size->setStyleSheet(m_Slider_Size->styleSheet().append("QSlider::handle:horizontal{ background: rgba(%1, %2, %3, %4); }") - .arg(newColor.red()).arg(newColor.green()).arg(newColor.blue()).arg(newColor.alpha())); -} - void game_list_frame::closeEvent(QCloseEvent *event) { QDockWidget::closeEvent(event); @@ -1027,8 +842,7 @@ bool game_list_frame::eventFilter(QObject *object, QEvent *event) { QPoint numSteps = wheelEvent->angleDelta() / 8 / 15; // http://doc.qt.io/qt-5/qwheelevent.html#pixelDelta const int value = numSteps.y(); - Q_EMIT RequestSaveSliderPos(true); - m_Slider_Size->setValue(m_Slider_Size->value() + value); + Q_EMIT RequestIconSizeChange(value); return true; } } @@ -1040,14 +854,12 @@ bool game_list_frame::eventFilter(QObject *object, QEvent *event) { if (keyEvent->key() == Qt::Key_Plus) { - Q_EMIT RequestSaveSliderPos(true); - m_Slider_Size->setValue(m_Slider_Size->value() + 1); + Q_EMIT RequestIconSizeChange(1); return true; } else if (keyEvent->key() == Qt::Key_Minus) { - Q_EMIT RequestSaveSliderPos(true); - m_Slider_Size->setValue(m_Slider_Size->value() - 1); + Q_EMIT RequestIconSizeChange(-1); return true; } } @@ -1227,9 +1039,9 @@ void game_list_frame::PopulateGameGrid(int maxCols, const QSize& image_size, con */ bool game_list_frame::SearchMatchesApp(const std::string& name, const std::string& serial) { - if (!m_searchText.isEmpty()) + if (!m_search_text.isEmpty()) { - QString searchText = m_searchText.toLower(); + QString searchText = m_search_text.toLower(); return qstr(name).toLower().contains(searchText) || qstr(serial).toLower().contains(searchText); } return true; diff --git a/rpcs3/rpcs3qt/game_list_frame.h b/rpcs3/rpcs3qt/game_list_frame.h index f3b28d9586..01733b8d75 100644 --- a/rpcs3/rpcs3qt/game_list_frame.h +++ b/rpcs3/rpcs3qt/game_list_frame.h @@ -170,14 +170,6 @@ struct GUI_GameInfo bool hasCustomConfig; }; -struct Tool_Bar_Button -{ - QAction* action; - QIcon colored; - QIcon gray; - bool isActive; -}; - class game_list_frame : public QDockWidget { Q_OBJECT @@ -192,9 +184,6 @@ public: /** Adds/removes categories that should be shown on gamelist. Public so that main frame menu actions can apply them */ void ToggleCategoryFilter(const QStringList& categories, bool show); - /** Returns the tool bar visibility. Public so that main frame can check the menu action accordingly */ - bool GetToolBarVisible(); - /** Loads from settings. Public so that main frame can easily reset these settings if needed. */ void LoadSettings(); @@ -207,15 +196,9 @@ public: /** Repaint Gamelist Icons with new background color */ void RepaintIcons(const bool& fromSettings = false); - /** Return current icon size slider value */ - int GetSliderValue(); - public Q_SLOTS: void SetListMode(const bool& isList); - void SetToolBarVisible(const bool& showToolBar); - void SetCategoryActIcon(const int& id, const bool& active); void SetSearchText(const QString& text); - void RepaintToolBarIcons(); private Q_SLOTS: void RemoveCustomConfiguration(int row); @@ -228,10 +211,7 @@ Q_SIGNALS: void GameListFrameClosed(); void RequestIconPathSet(const std::string& path); void RequestAddRecentGame(const q_string_pair& entry); - void RequestIconSizeActSet(const int& idx); - void RequestListModeActSet(const bool& isList); - void RequestCategoryActSet(const int& id); - void RequestSaveSliderPos(const bool& save); + void RequestIconSizeChange(const int& val); protected: /** Override inherited method from Qt to allow signalling when close happened.*/ void closeEvent(QCloseEvent* event) override; @@ -266,20 +246,8 @@ private: // Categories QStringList m_categoryFilters; - Tool_Bar_Button m_catActHDD; - Tool_Bar_Button m_catActDisc; - Tool_Bar_Button m_catActHome; - Tool_Bar_Button m_catActGameData; - Tool_Bar_Button m_catActAudioVideo; - Tool_Bar_Button m_catActUnknown; - Tool_Bar_Button m_catActOther; - QList m_categoryButtons; - QActionGroup* m_categoryActs; // List Mode - Tool_Bar_Button m_modeActList; - Tool_Bar_Button m_modeActGrid; - QActionGroup* m_modeActs; bool m_isListLayout = true; bool m_oldLayoutIsList = true; @@ -288,16 +256,10 @@ private: std::shared_ptr xemu_settings; std::vector m_game_data; - // Toolbar - QToolBar* m_Tool_Bar; - bool m_showToolBar = true; + // Search + QString m_search_text; - // Search Bar - QLineEdit* m_Search_Bar; - QString m_searchText; - - // Icon Size Slider - QSlider* m_Slider_Size; + // Icon Size int m_icon_size_index; // Icons diff --git a/rpcs3/rpcs3qt/gui_settings.h b/rpcs3/rpcs3qt/gui_settings.h index 0a099e44d1..2fdb319258 100644 --- a/rpcs3/rpcs3qt/gui_settings.h +++ b/rpcs3/rpcs3qt/gui_settings.h @@ -121,7 +121,6 @@ namespace gui const QString savedata = "SaveData"; const QColor gl_icon_color = QColor(209, 209, 209, 255); - const QColor gl_tool_icon_color = QColor( 0, 100, 231, 255); const QColor mw_tool_icon_color = QColor( 64, 64, 64, 255); const QColor mw_tool_bar_color = QColor(227, 227, 227, 255); const QColor mw_thumb_icon_color = QColor( 0, 100, 231, 255); @@ -158,16 +157,14 @@ namespace gui const gui_save cat_unknown = gui_save(game_list, "categoryVisibleUnknown", true ); const gui_save cat_other = gui_save(game_list, "categoryVisibleOther", true ); - const gui_save gl_sortAsc = gui_save(game_list, "sortAsc", true ); - const gui_save gl_sortCol = gui_save(game_list, "sortCol", 1 ); - const gui_save gl_state = gui_save(game_list, "state", QByteArray() ); - const gui_save gl_iconSize = gui_save(game_list, "iconSize", get_Index(gl_icon_size_small)); - const gui_save gl_iconColor = gui_save(game_list, "iconColor", gl_icon_color); - const gui_save gl_listMode = gui_save(game_list, "listMode", true ); - const gui_save gl_textFactor = gui_save(game_list, "textFactor", (qreal) 2.0 ); - const gui_save gl_marginFactor = gui_save(game_list, "marginFactor", (qreal) 0.09 ); - const gui_save gl_toolBarVisible = gui_save(game_list, "toolBarVisible", false); - const gui_save gl_toolIconColor = gui_save(game_list, "toolIconColor", gl_tool_icon_color); + const gui_save gl_sortAsc = gui_save(game_list, "sortAsc", true ); + const gui_save gl_sortCol = gui_save(game_list, "sortCol", 1 ); + const gui_save gl_state = gui_save(game_list, "state", QByteArray() ); + const gui_save gl_iconSize = gui_save(game_list, "iconSize", get_Index(gl_icon_size_small)); + const gui_save gl_iconColor = gui_save(game_list, "iconColor", gl_icon_color); + const gui_save gl_listMode = gui_save(game_list, "listMode", true ); + const gui_save gl_textFactor = gui_save(game_list, "textFactor", (qreal) 2.0 ); + const gui_save gl_marginFactor = gui_save(game_list, "marginFactor", (qreal) 0.09 ); const gui_save fs_emulator_dir_list = gui_save(fs, "emulator_dir_list", QStringList()); const gui_save fs_dev_hdd0_list = gui_save(fs, "dev_hdd0_list", QStringList()); diff --git a/rpcs3/rpcs3qt/main_window.cpp b/rpcs3/rpcs3qt/main_window.cpp index 50b3641116..6aa17c09b2 100644 --- a/rpcs3/rpcs3qt/main_window.cpp +++ b/rpcs3/rpcs3qt/main_window.cpp @@ -986,7 +986,6 @@ void main_window::RepaintGui() if (m_gameListFrame) { m_gameListFrame->RepaintIcons(true); - m_gameListFrame->RepaintToolBarIcons(); } if (m_logFrame) @@ -1210,11 +1209,6 @@ void main_window::CreateConnects() guiSettings->SetValue(gui::mw_toolBarVisible, checked); }); - connect(ui->showGameToolBarAct, &QAction::triggered, [=](bool checked) - { - m_gameListFrame->SetToolBarVisible(checked); - }); - connect(ui->refreshGameListAct, &QAction::triggered, [=] { m_gameListFrame->Refresh(true); @@ -1235,7 +1229,6 @@ void main_window::CreateConnects() else if (act == ui->showCatOtherAct) categories += category::others, id = Category::Others; else LOG_WARNING(GENERAL, "categoryVisibleActGroup: category action not found"); - m_gameListFrame->SetCategoryActIcon(m_categoryVisibleActGroup->actions().indexOf(act), checked); m_gameListFrame->ToggleCategoryFilter(categories, checked); guiSettings->SetCategoryVisibility(id, checked); }); @@ -1250,20 +1243,16 @@ void main_window::CreateConnects() auto resizeIcons = [=](const int& index) { - int val = ui->sizeSlider->value(); - if (val != index) + if (ui->sizeSlider->value() != index) { ui->sizeSlider->setSliderPosition(index); } - if (val != m_gameListFrame->GetSliderValue()) + if (m_save_slider_pos) { - if (m_save_slider_pos) - { - m_save_slider_pos = false; - guiSettings->SetValue(gui::gl_iconSize, index); - } - m_gameListFrame->ResizeIcons(index); + m_save_slider_pos = false; + guiSettings->SetValue(gui::gl_iconSize, index); } + m_gameListFrame->ResizeIcons(index); }; connect(m_iconSizeActGroup, &QActionGroup::triggered, [=](QAction* act) @@ -1283,28 +1272,14 @@ void main_window::CreateConnects() resizeIcons(index); }); - connect (m_gameListFrame, &game_list_frame::RequestIconSizeActSet, [=](const int& idx) + connect (m_gameListFrame, &game_list_frame::RequestIconSizeChange, [=](const int& val) { + const int idx = ui->sizeSlider->value() + val; + m_save_slider_pos = true; SetIconSizeActions(idx); resizeIcons(idx); }); - connect(m_gameListFrame, &game_list_frame::RequestSaveSliderPos, [=](const bool& save) - { - Q_UNUSED(save); - m_save_slider_pos = true; - }); - - connect(m_gameListFrame, &game_list_frame::RequestListModeActSet, [=](const bool& isList) - { - isList ? ui->setlistModeListAct->trigger() : ui->setlistModeGridAct->trigger(); - }); - - connect(m_gameListFrame, &game_list_frame::RequestCategoryActSet, [=](const int& id) - { - m_categoryVisibleActGroup->actions().at(id)->trigger(); - }); - connect(m_listModeActGroup, &QActionGroup::triggered, [=](QAction* act) { bool isList = act == ui->setlistModeListAct; @@ -1335,9 +1310,9 @@ void main_window::CreateConnects() connect(ui->toolbar_config, &QAction::triggered, [=]() { openSettings(0); }); connect(ui->toolbar_list, &QAction::triggered, [=]() { ui->setlistModeListAct->trigger(); }); connect(ui->toolbar_grid, &QAction::triggered, [=]() { ui->setlistModeGridAct->trigger(); }); + connect(ui->sizeSlider, &QSlider::valueChanged, resizeIcons); connect(ui->sizeSlider, &QSlider::sliderReleased, this, [&] { guiSettings->SetValue(gui::gl_iconSize, ui->sizeSlider->value()); }); - connect(ui->sizeSlider, &QSlider::actionTriggered, [&](int action) { if (action != QAbstractSlider::SliderNoAction && action != QAbstractSlider::SliderMove) @@ -1452,12 +1427,10 @@ void main_window::ConfigureGuiFromSettings(bool configure_all) ui->showGameListAct->setChecked(guiSettings->GetValue(gui::mw_gamelist).toBool()); ui->showDebuggerAct->setChecked(guiSettings->GetValue(gui::mw_debugger).toBool()); ui->showToolBarAct->setChecked(guiSettings->GetValue(gui::mw_toolBarVisible).toBool()); - ui->showGameToolBarAct->setChecked(guiSettings->GetValue(gui::gl_toolBarVisible).toBool()); m_debuggerFrame->setVisible(ui->showDebuggerAct->isChecked()); m_logFrame->setVisible(ui->showLogAct->isChecked()); m_gameListFrame->setVisible(ui->showGameListAct->isChecked()); - m_gameListFrame->SetToolBarVisible(ui->showGameToolBarAct->isChecked()); ui->toolBar->setVisible(ui->showToolBarAct->isChecked()); RepaintToolbar(); diff --git a/rpcs3/rpcs3qt/main_window.ui b/rpcs3/rpcs3qt/main_window.ui index f79e063cca..ab8ab6ac7d 100644 --- a/rpcs3/rpcs3qt/main_window.ui +++ b/rpcs3/rpcs3qt/main_window.ui @@ -141,7 +141,7 @@ 0 0 1058 - 26 + 38 @@ -260,7 +260,6 @@ - diff --git a/rpcs3/rpcs3qt/settings_dialog.cpp b/rpcs3/rpcs3qt/settings_dialog.cpp index 9ef9e56507..4253dd7cf9 100644 --- a/rpcs3/rpcs3qt/settings_dialog.cpp +++ b/rpcs3/rpcs3qt/settings_dialog.cpp @@ -765,7 +765,6 @@ settings_dialog::settings_dialog(std::shared_ptr guiSettings, std: { addColoredIcon(ui->pb_gl_icon_color, xgui_settings->GetValue(gui::gl_iconColor).value()); addColoredIcon(ui->pb_tool_bar_color, xgui_settings->GetValue(gui::mw_toolBarColor).value()); - addColoredIcon(ui->pb_gl_tool_icon_color, xgui_settings->GetValue(gui::gl_toolIconColor).value(), QIcon(":/Icons/home_blue.png"), gui::gl_tool_icon_color); addColoredIcon(ui->pb_tool_icon_color, xgui_settings->GetValue(gui::mw_toolIconColor).value(), QIcon(":/Icons/stop.png"), gui::mw_tool_icon_color); }; AddColoredIcons(); @@ -775,7 +774,6 @@ settings_dialog::settings_dialog(std::shared_ptr guiSettings, std: bool enableUIColors = xgui_settings->GetValue(gui::m_enableUIColors).toBool(); ui->cb_custom_colors->setChecked(enableUIColors); ui->pb_gl_icon_color->setEnabled(enableUIColors); - ui->pb_gl_tool_icon_color->setEnabled(enableUIColors); ui->pb_tool_bar_color->setEnabled(enableUIColors); ui->pb_tool_icon_color->setEnabled(enableUIColors); @@ -834,7 +832,6 @@ settings_dialog::settings_dialog(std::shared_ptr guiSettings, std: { xgui_settings->SetValue(gui::m_enableUIColors, val); ui->pb_gl_icon_color->setEnabled(val); - ui->pb_gl_tool_icon_color->setEnabled(val); ui->pb_tool_bar_color->setEnabled(val); ui->pb_tool_icon_color->setEnabled(val); Q_EMIT GuiRepaintRequest(); @@ -866,11 +863,6 @@ settings_dialog::settings_dialog(std::shared_ptr guiSettings, std: colorDialog(gui::gl_iconColor, tr("Choose gamelist icon color"), ui->pb_gl_icon_color); }); - connect(ui->pb_gl_tool_icon_color, &QAbstractButton::clicked, [=]() - { - colorDialog(gui::gl_toolIconColor, tr("Choose gamelist tool icon color"), ui->pb_gl_tool_icon_color); - }); - connect(ui->pb_tool_bar_color, &QAbstractButton::clicked, [=]() { colorDialog(gui::mw_toolBarColor, tr("Choose tool bar color"), ui->pb_tool_bar_color); diff --git a/rpcs3/rpcs3qt/settings_dialog.ui b/rpcs3/rpcs3qt/settings_dialog.ui index 23baf39ae8..693f5c8ca7 100644 --- a/rpcs3/rpcs3qt/settings_dialog.ui +++ b/rpcs3/rpcs3qt/settings_dialog.ui @@ -1508,13 +1508,6 @@ - - - - Gamelist tool icons - - -