dahjah/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2026-06-07 07:35:02 -06:00
Code Issues Packages Projects Releases Wiki Activity

Qt: trophy manager - fix trophy sorting by ID + handle some warnings

Browse Source
This commit is contained in:
Megamouse 2018-05-18 09:58:04 +02:00 committed by Ivan
parent 9269d8a370
commit 6b3eebc907
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rpcs3/rpcs3qt/save_manager_dialog.cpp
View File

@ -334,7 +334,9 @@ void save_manager_dialog::ShowContextMenu(const QPoint &pos)
menu->exec(globalPos); menu->exec(globalPos);
} }
void save_manager_dialog::closeEvent(QCloseEvent * event) void save_manager_dialog::closeEvent(QCloseEvent *event)
{ {
m_gui_settings->SetValue(gui::sd_geometry, saveGeometry()); m_gui_settings->SetValue(gui::sd_geometry, saveGeometry());
QDialog::closeEvent(event);
} }

16
rpcs3/rpcs3qt/trophy_manager_dialog.cpp
View File

@ -283,7 +283,7 @@ trophy_manager_dialog::trophy_manager_dialog(std::shared_ptr<gui_settings> gui_s
{ {
m_icon_height = val; m_icon_height = val;
trophy_slider_label->setText(tr("Trophy Icon Size: %0x%1").arg(val).arg(val)); trophy_slider_label->setText(tr("Trophy Icon Size: %0x%1").arg(val).arg(val));
ResizeTrophyIcons(val); ResizeTrophyIcons();
if (m_save_icon_height) if (m_save_icon_height)
{ {
m_save_icon_height = false; m_save_icon_height = false;
@ -309,7 +309,7 @@ trophy_manager_dialog::trophy_manager_dialog(std::shared_ptr<gui_settings> gui_s
m_game_icon_size_index = val; m_game_icon_size_index = val;
m_game_icon_size = gui_settings::SizeFromSlider(val);; m_game_icon_size = gui_settings::SizeFromSlider(val);;
game_slider_label->setText(tr("Game Icon Size: %0x%1").arg(m_game_icon_size.width()).arg(m_game_icon_size.height())); game_slider_label->setText(tr("Game Icon Size: %0x%1").arg(m_game_icon_size.width()).arg(m_game_icon_size.height()));
ResizeGameIcons(val); ResizeGameIcons();
if (m_save_game_icon_size) if (m_save_game_icon_size)
{ {
m_save_game_icon_size = false; m_save_game_icon_size = false;
@ -469,7 +469,7 @@ bool trophy_manager_dialog::LoadTrophyFolderToDB(const std::string& trop_name)
return true; return true;
} }
void trophy_manager_dialog::ResizeGameIcons(int val) void trophy_manager_dialog::ResizeGameIcons()
{ {
if (m_game_combo->count() <= 0) if (m_game_combo->count() <= 0)
return; return;
@ -485,7 +485,7 @@ void trophy_manager_dialog::ResizeGameIcons(int val)
ReadjustGameTable(); ReadjustGameTable();
} }
void trophy_manager_dialog::ResizeTrophyIcons(int size) void trophy_manager_dialog::ResizeTrophyIcons()
{ {
if (m_game_combo->count() <= 0) if (m_game_combo->count() <= 0)
return; return;
@ -495,7 +495,7 @@ void trophy_manager_dialog::ResizeTrophyIcons(int size)
for (int i = 0; i < m_trophy_table->rowCount(); ++i) for (int i = 0; i < m_trophy_table->rowCount(); ++i)
{ {
int trophy_id = m_trophy_table->item(i, TrophyColumns::Id)->text().toInt(); int trophy_id = m_trophy_table->item(i, TrophyColumns::Id)->text().toInt();
QPixmap scaled = m_trophies_db[db_pos]->trophy_images[trophy_id].scaledToHeight(size, Qt::SmoothTransformation); QPixmap scaled = m_trophies_db[db_pos]->trophy_images[trophy_id].scaledToHeight(m_icon_height, Qt::SmoothTransformation);
m_trophy_table->item(i, TrophyColumns::Icon)->setData(Qt::DecorationRole, scaled); m_trophy_table->item(i, TrophyColumns::Icon)->setData(Qt::DecorationRole, scaled);
} }
@ -663,7 +663,7 @@ void trophy_manager_dialog::PopulateUI()
m_trophy_table->setItem(i, TrophyColumns::Description, new custom_table_widget_item(qstr(details.description))); m_trophy_table->setItem(i, TrophyColumns::Description, new custom_table_widget_item(qstr(details.description)));
m_trophy_table->setItem(i, TrophyColumns::Type, type_item); m_trophy_table->setItem(i, TrophyColumns::Type, type_item);
m_trophy_table->setItem(i, TrophyColumns::IsUnlocked, new custom_table_widget_item(unlockstate)); m_trophy_table->setItem(i, TrophyColumns::IsUnlocked, new custom_table_widget_item(unlockstate));
m_trophy_table->setItem(i, TrophyColumns::Id, new custom_table_widget_item(QString::number(trophy_id))); m_trophy_table->setItem(i, TrophyColumns::Id, new custom_table_widget_item(QString::number(trophy_id), Qt::UserRole, trophy_id));
++i; ++i;
} }
@ -703,11 +703,13 @@ void trophy_manager_dialog::ReadjustTrophyTable()
m_trophy_table->resizeColumnToContents(TrophyColumns::Count - 1); m_trophy_table->resizeColumnToContents(TrophyColumns::Count - 1);
} }
void trophy_manager_dialog::closeEvent(QCloseEvent * event) void trophy_manager_dialog::closeEvent(QCloseEvent *event)
{ {
// Save gui settings // Save gui settings
m_gui_settings->SetValue(gui::tr_geometry, saveGeometry()); m_gui_settings->SetValue(gui::tr_geometry, saveGeometry());
m_gui_settings->SetValue(gui::tr_splitterState, m_splitter->saveState()); m_gui_settings->SetValue(gui::tr_splitterState, m_splitter->saveState());
m_gui_settings->SetValue(gui::tr_games_state, m_game_table->horizontalHeader()->saveState()); m_gui_settings->SetValue(gui::tr_games_state, m_game_table->horizontalHeader()->saveState());
m_gui_settings->SetValue(gui::tr_trophy_state, m_trophy_table->horizontalHeader()->saveState()); m_gui_settings->SetValue(gui::tr_trophy_state, m_trophy_table->horizontalHeader()->saveState());
QWidget::closeEvent(event);
} }

8
rpcs3/rpcs3qt/trophy_manager_dialog.h
View File

@ -54,11 +54,13 @@ class trophy_manager_dialog : public QWidget
public: public:
explicit trophy_manager_dialog(std::shared_ptr<gui_settings> gui_settings); explicit trophy_manager_dialog(std::shared_ptr<gui_settings> gui_settings);
private Q_SLOTS: private Q_SLOTS:
void ResizeGameIcons(int val); void ResizeGameIcons();
void ResizeTrophyIcons(int val); void ResizeTrophyIcons();
void ApplyFilter(); void ApplyFilter();
void ShowContextMenu(const QPoint& pos); void ShowContextMenu(const QPoint& pos);
private: private:
/** Loads a trophy folder. /** Loads a trophy folder.
Returns true if successful. Does not attempt to install if failure occurs, like sceNpTrophy. Returns true if successful. Does not attempt to install if failure occurs, like sceNpTrophy.
@ -73,7 +75,7 @@ private:
void ReadjustGameTable(); void ReadjustGameTable();
void ReadjustTrophyTable(); void ReadjustTrophyTable();
void closeEvent(QCloseEvent* event) override; void closeEvent(QCloseEvent *event) override;
std::shared_ptr<gui_settings> m_gui_settings; std::shared_ptr<gui_settings> m_gui_settings;