mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-09-29 15:31:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Dagimon mega level

Browse Source 
ani fixes

add color options for toolbar and game icons
This commit is contained in:
Megamouse 2017-07-06 11:48:06 +02:00 committed by Ivan
parent 457c2d364f
commit 1a4e1919fc
16 changed files with 196 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpcs3/rpcs3qt/about_dialog.cpp
View File

@ -23,5 +23,5 @@ about_dialog::about_dialog(QWidget* parent) : QDialog(parent), ui(new Ui::about_
connect(ui->patreon, &QAbstractButton::clicked, [] { QDesktopServices::openUrl(QUrl("https://www.patreon.com/Nekotekina")); });
connect(ui->close, &QAbstractButton::clicked, this, &QWidget::close);
setFixedSize(sizeHint());
layout()->setSizeConstraint(QLayout::SetFixedSize);
}

4
rpcs3/rpcs3qt/about_dialog.ui
View File

@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>632</width>
<width>609</width>
<height>474</height>
</rect>
</property>
@ -138,7 +138,7 @@
<string notr="true"/>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;RPCS3 is an open-source Sony PlayStation 3 emulator and debugger.&lt;br/&gt;It is written in C++ for Windows and Linux funded with &lt;a href=&quot;https://www.patreon.com/Nekotekina&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Patreon&lt;/span&gt;&lt;/a&gt;.&lt;br/&gt;Our lead developers and contributors are always working hard to ensure this project can be the best that it can be.&lt;br/&gt;There are still plenty of implementations to be made and optimizations to be done.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;RPCS3 is an open-source Sony PlayStation 3 emulator and debugger.&lt;br/&gt;It is written in C++ for Windows and Linux funded with &lt;a href=&quot;https://www.patreon.com/Nekotekina&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Patreon&lt;/span&gt;&lt;/a&gt;.&lt;br/&gt;Our developers and contributors are always working hard to ensure this project can be the best that it can be.&lt;br/&gt;There are still plenty of implementations to be made and optimizations to be done.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>

19
rpcs3/rpcs3qt/game_list_frame.cpp
View File

@ -33,6 +33,7 @@ game_list_frame::game_list_frame(std::shared_ptr<gui_settings> settings, const R
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<QColor>();
m_oldLayoutIsList = m_isListLayout;
@ -49,6 +50,7 @@ game_list_frame::game_list_frame(std::shared_ptr<gui_settings> settings, const R
}
// Save factors for first setup
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);
@ -149,7 +151,7 @@ game_list_frame::game_list_frame(std::shared_ptr<gui_settings> settings, const R
setWidget(m_Game_Dock);
bool showText = (m_Icon_Size_Str != GUI::gl_icon_key_small && m_Icon_Size_Str != GUI::gl_icon_key_tiny);
m_xgrid = new game_list_grid(m_Icon_Size, m_Margin_Factor, m_Text_Factor, showText);
m_xgrid = new game_list_grid(m_Icon_Size, m_Icon_Color, m_Margin_Factor, m_Text_Factor, showText);
gameList = new QTableWidget();
gameList->setShowGrid(false);
@ -168,7 +170,6 @@ game_list_frame::game_list_frame(std::shared_ptr<gui_settings> settings, const R
gameList->horizontalHeader()->setDefaultSectionSize(150);
gameList->setContextMenuPolicy(Qt::CustomContextMenu);
gameList->setAlternatingRowColors(true);
gameList->setStyleSheet("alternate-background-color: rgb(242, 242, 242);");
gameList->setColumnCount(10);
gameList->setHorizontalHeaderItem(0, new QTableWidgetItem(tr("Icon")));
@ -293,6 +294,8 @@ void game_list_frame::LoadSettings()
m_sortColumn = xgui_settings->GetValue(GUI::gl_sortCol).toInt();
m_Icon_Color = xgui_settings->GetValue(GUI::gl_iconColor).value<QColor>();
m_categoryFilters = xgui_settings->GetGameListCategoryFilters();
Refresh(true);
@ -420,7 +423,7 @@ void game_list_frame::Refresh(bool fromDrive)
if (!game.icon_path.empty() && img.load(qstr(game.icon_path)))
{
QImage scaled = QImage(m_Icon_Size, QImage::Format_ARGB32);
scaled.fill(QColor(209, 209, 209, 255));
scaled.fill(m_Icon_Color);
QPainter painter(&scaled);
painter.drawImage(QPoint(0,0), img.scaled(m_Icon_Size, Qt::KeepAspectRatio, Qt::TransformationMode::SmoothTransformation));
painter.end();
@ -471,7 +474,7 @@ void game_list_frame::Refresh(bool fromDrive)
m_games_per_row = 0;
}
PopulateGameGrid(m_games_per_row, m_Icon_Size);
PopulateGameGrid(m_games_per_row, m_Icon_Size, m_Icon_Color);
connect(m_xgrid, &QTableWidget::doubleClicked, this, &game_list_frame::doubleClickedSlot);
connect(m_xgrid, &QTableWidget::customContextMenuRequested, this, &game_list_frame::ShowContextMenu);
m_Central_Widget->addWidget(m_xgrid);
@ -715,7 +718,7 @@ void game_list_frame::ResizeIcons(const QString& sizeStr, const QSize& size, con
for (size_t i = 0; i < m_game_data.size(); i++)
{
QImage scaled = QImage(m_Icon_Size, QImage::Format_ARGB32);
scaled.fill(QColor(209, 209, 209, 255));
scaled.fill(m_Icon_Color);
QPainter painter(&scaled);
painter.drawImage(QPoint(0, 0), m_game_data[i].icon.scaled(m_Icon_Size, Qt::KeepAspectRatio, Qt::TransformationMode::SmoothTransformation));
painter.end();
@ -828,7 +831,7 @@ int game_list_frame::PopulateGameList()
return result;
}
void game_list_frame::PopulateGameGrid(uint maxCols, const QSize& image_size)
void game_list_frame::PopulateGameGrid(uint maxCols, const QSize& image_size, const QColor& image_color)
{
uint r = 0;
uint c = 0;
@ -841,11 +844,11 @@ void game_list_frame::PopulateGameGrid(uint maxCols, const QSize& image_size)
if (m_Icon_Size_Str == GUI::gl_icon_key_medium)
{
m_xgrid = new game_list_grid(image_size, m_Margin_Factor, m_Text_Factor * 2, showText);
m_xgrid = new game_list_grid(image_size, image_color, m_Margin_Factor, m_Text_Factor * 2, showText);
}
else
{
m_xgrid = new game_list_grid(image_size, m_Margin_Factor, m_Text_Factor, showText);
m_xgrid = new game_list_grid(image_size, image_color, m_Margin_Factor, m_Text_Factor, showText);
}
// Get number of things that'll be in grid and precompute grid size.

3
rpcs3/rpcs3qt/game_list_frame.h
View File

@ -216,7 +216,7 @@ protected:
void closeEvent(QCloseEvent* event);
void resizeEvent(QResizeEvent *event);
private:
void PopulateGameGrid(uint maxCols, const QSize& image_size);
void PopulateGameGrid(uint maxCols, const QSize& image_size, const QColor& image_color);
void FilterData();
int PopulateGameList();
@ -278,6 +278,7 @@ private:
std::vector<GUI_GameInfo> m_game_data;
QSize m_Icon_Size;
QString m_Icon_Size_Str;
QColor m_Icon_Color;
qreal m_Margin_Factor;
qreal m_Text_Factor;
QStringList m_categoryFilters;

6
rpcs3/rpcs3qt/game_list_grid.cpp
View File

@ -3,8 +3,8 @@
#include <QHeaderView>
game_list_grid::game_list_grid(const QSize& icon_size, const qreal& margin_factor, const qreal& text_factor, const bool& showText)
: QTableWidget(), m_icon_size(icon_size), m_margin_factor(margin_factor), m_text_factor(text_factor), m_text_enabled(showText)
game_list_grid::game_list_grid(const QSize& icon_size, const QColor& icon_color, const qreal& margin_factor, const qreal& text_factor, const bool& showText)
: QTableWidget(), m_icon_size(icon_size), m_icon_color(icon_color), m_margin_factor(margin_factor), m_text_factor(text_factor), m_text_enabled(showText)
{
QSize item_size;
if (m_text_enabled)
@ -71,7 +71,7 @@ void game_list_grid::addItem(const QPixmap& img, const QString& name, const int&
// create background for image
QImage bg_img = QImage(img.size(), QImage::Format_ARGB32);
bg_img.fill(QColor(209, 209, 209, 255));
bg_img.fill(m_icon_color);
// place raw image inside expanded image
QPainter painter(&exp_img);

3
rpcs3/rpcs3qt/game_list_grid.h
View File

@ -14,12 +14,13 @@ class game_list_grid : public QTableWidget
Q_OBJECT
QSize m_icon_size;
QColor m_icon_color;
qreal m_margin_factor;
qreal m_text_factor;
bool m_text_enabled = true;
public:
explicit game_list_grid(const QSize& icon_size, const qreal& margin_factor, const qreal& text_factor, const bool& showText);
explicit game_list_grid(const QSize& icon_size, const QColor& icon_color, const qreal& margin_factor, const qreal& text_factor, const bool& showText);
~game_list_grid();
void enableText(const bool& enabled);

10
rpcs3/rpcs3qt/gui_settings.cpp
View File

@ -179,6 +179,11 @@ void gui_settings::SetGamelistColVisibility(int col, bool val)
SetValue(GUI_SAVE(GUI::game_list, "Col" + QString::number(col) + "visible", show), val);
}
void gui_settings::SetCustomColor(int col, const QColor& val)
{
SetValue(GUI_SAVE(GUI::meta, "CustomColor" + QString::number(col), QColor(0, 0, 0, 0)), val);
}
void gui_settings::SaveCurrentConfig(const QString& friendlyName)
{
SetValue(GUI::m_currentConfig, friendlyName);
@ -197,6 +202,11 @@ bool gui_settings::GetGamelistColVisibility(int col)
return GetValue(GUI_SAVE(GUI::game_list, "Col" + QString::number(col) + "visible", show)).toBool();
}
QColor gui_settings::GetCustomColor(int col)
{
return GetValue(GUI_SAVE(GUI::meta, "CustomColor" + QString::number(col), QColor(255, 255, 255, 255))).value<QColor>();
}
QStringList gui_settings::GetConfigEntries()
{
QStringList nameFilter;

6
rpcs3/rpcs3qt/gui_settings.h
View File

@ -6,6 +6,7 @@
#include <QDir>
#include <QVariant>
#include <QSize>
#include <QColor>
typedef struct GUI_SAVE
{
@ -69,6 +70,7 @@ namespace GUI
const GUI_SAVE mw_logger = GUI_SAVE( main_window, "loggerVisible", true );
const GUI_SAVE mw_gamelist = GUI_SAVE( main_window, "gamelistVisible", true );
const GUI_SAVE mw_toolBarVisible = GUI_SAVE( main_window, "toolBarVisible", true );
const GUI_SAVE mw_toolBarColor = GUI_SAVE( main_window, "toolBarColor", QColor(227, 227, 227, 255));
const GUI_SAVE mw_geometry = GUI_SAVE( main_window, "geometry", QByteArray() );
const GUI_SAVE mw_windowState = GUI_SAVE( main_window, "windowState", QByteArray() );
const GUI_SAVE mw_mwState = GUI_SAVE( main_window, "wwState", QByteArray() );
@ -85,6 +87,7 @@ namespace GUI
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", gl_icon_key_small );
const GUI_SAVE gl_iconColor = GUI_SAVE( game_list, "iconColor", QColor(209, 209, 209, 255));
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 );
@ -129,6 +132,7 @@ public:
logs::level GetLogLevel();
bool GetGamelistColVisibility(int col);
QColor GetCustomColor(int col);
QStringList GetConfigEntries();
QString GetCurrentStylesheetPath();
QStringList GetStylesheetEntries();
@ -145,6 +149,8 @@ public Q_SLOTS:
void SetGamelistColVisibility(int col, bool val);
void SetCustomColor(int col, const QColor& val);
void SaveCurrentConfig(const QString& friendlyName);
private:

7
rpcs3/rpcs3qt/main_window.cpp
View File

@ -972,6 +972,10 @@ void main_window::CreateConnects()
connect(&dlg, &settings_dialog::GuiSettingsSaveRequest, this, &main_window::SaveWindowState);
connect(&dlg, &settings_dialog::GuiSettingsSyncRequest, [=]() {ConfigureGuiFromSettings(true); });
connect(&dlg, &settings_dialog::GuiStylesheetRequest, this, &main_window::RequestGlobalStylesheetChange);
connect(&dlg, &settings_dialog::accepted, [this](){
gameListFrame->LoadSettings();
QColor tbc = guiSettings->GetValue(GUI::mw_toolBarColor).value<QColor>();
ui->toolBar->setStyleSheet(QString("background-color: rgba(%1, %2, %3, %4);").arg(tbc.red()).arg(tbc.green()).arg(tbc.blue()).arg(tbc.alpha())); });
dlg.exec();
};
connect(ui->confCPUAct, &QAction::triggered, [=]() { openSettings(0); });
@ -1233,6 +1237,9 @@ void main_window::ConfigureGuiFromSettings(bool configureAll)
gameListFrame->SetToolBarVisible(ui->showGameToolBarAct->isChecked());
ui->toolBar->setVisible(ui->showToolBarAct->isChecked());
QColor tbc = guiSettings->GetValue(GUI::mw_toolBarColor).value<QColor>();
ui->toolBar->setStyleSheet(QString("background-color: rgba(%1, %2, %3, %4);").arg(tbc.red()).arg(tbc.green()).arg(tbc.blue()).arg(tbc.alpha()));
ui->showCatHDDGameAct->setChecked(guiSettings->GetCategoryVisibility(Category::Non_Disc_Game));
ui->showCatDiscGameAct->setChecked(guiSettings->GetCategoryVisibility(Category::Disc_Game));
ui->showCatHomeAct->setChecked(guiSettings->GetCategoryVisibility(Category::Home));

19
rpcs3/rpcs3qt/main_window.ui
View File

@ -300,17 +300,16 @@ selection-background-color: rgb(85, 170, 255);</string>
<bool>false</bool>
</attribute>
<addaction name="toolbar_disc"/>
<addaction name="toolbar_refresh"/>
<addaction name="toolbar_fullscreen"/>
<addaction name="toolbar_snap"/>
<addaction name="separator"/>
<addaction name="toolbar_stop"/>
<addaction name="toolbar_start"/>
<addaction name="separator"/>
<addaction name="toolbar_snap"/>
<addaction name="toolbar_fullscreen"/>
<addaction name="separator"/>
<addaction name="toolbar_controls"/>
<addaction name="toolbar_config"/>
<addaction name="separator"/>
<addaction name="toolbar_refresh"/>
<addaction name="toolbar_list"/>
<addaction name="toolbar_grid"/>
<addaction name="toolbar_sort"/>
@ -844,6 +843,12 @@ selection-background-color: rgb(85, 170, 255);</string>
<property name="toolTip">
<string>Capture frame</string>
</property>
<property name="visible">
<bool>false</bool>
</property>
<property name="iconVisibleInMenu">
<bool>true</bool>
</property>
</action>
<action name="toolbar_fullscreen">
<property name="icon">
@ -895,6 +900,12 @@ selection-background-color: rgb(85, 170, 255);</string>
<property name="toolTip">
<string>Sort options</string>
</property>
<property name="visible">
<bool>false</bool>
</property>
<property name="iconVisibleInMenu">
<bool>true</bool>
</property>
</action>
<action name="toolbar_refresh">
<property name="icon">

3
rpcs3/rpcs3qt/pad_settings_dialog.cpp
View File

@ -67,7 +67,8 @@ pad_settings_dialog::pad_settings_dialog(QWidget *parent) : QDialog(parent), ui(
g_kbpad_config.load();
UpdateLabel();
setFixedSize(sizeHint());
ui->l_controller->setMaximumSize(ui->gb_description->sizeHint().width(), ui->l_controller->maximumHeight() * ui->gb_description->sizeHint().width() / ui->l_controller->maximumWidth());
layout()->setSizeConstraint(QLayout::SetFixedSize);
}
pad_settings_dialog::~pad_settings_dialog()

26
rpcs3/rpcs3qt/pad_settings_dialog.ui
View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>1044</width>
<height>670</height>
<width>892</width>
<height>554</height>
</rect>
</property>
<property name="windowTitle">
@ -569,7 +569,7 @@
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
<height>0</height>
</size>
</property>
</spacer>
@ -927,8 +927,20 @@
</size>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_19">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label">
<widget class="QLabel" name="l_controller">
<property name="maximumSize">
<size>
<width>430</width>
@ -1058,13 +1070,13 @@
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QGroupBox" name="groupBox_41">
<widget class="QGroupBox" name="gb_description">
<property name="title">
<string>Description</string>
</property>
@ -1657,7 +1669,7 @@
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
<height>0</height>
</size>
</property>
</spacer>

20
rpcs3/rpcs3qt/settings_dialog.cpp
View File

@ -7,6 +7,7 @@
#include <QUrl>
#include <QJsonObject>
#include <QJsonDocument>
#include <QColorDialog>
#include "settings_dialog.h"
#include "emu_settings.h"
@ -661,12 +662,29 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> xSettings, const
connect(ui->pb_apply_stylesheet, &QAbstractButton::clicked, this, &settings_dialog::OnApplyStylesheet);
connect(ui->pb_open_folder, &QAbstractButton::clicked, [=]() {QDesktopServices::openUrl(xgui_settings->GetSettingsDir()); });
connect(ui->cb_show_welcome, &QCheckBox::clicked, [=](bool val) {xgui_settings->SetValue(GUI::ib_show_welcome, val); });
auto colorDialog = [&](const GUI_SAVE& color, const QString& title){
QColorDialog dlg(xgui_settings->GetValue(color).value<QColor>(), this);
dlg.setWindowTitle(title);
dlg.setOptions(QColorDialog::ShowAlphaChannel);
for (int i = 0; i < dlg.customCount(); i++)
{
dlg.setCustomColor(i, xgui_settings->GetCustomColor(i));
}
dlg.exec();
for (int i = 0; i < dlg.customCount(); i++)
{
xgui_settings->SetCustomColor(i, dlg.customColor(i));
}
xgui_settings->SetValue(color, dlg.selectedColor());
};
connect(ui->pb_icon_color, &QAbstractButton::clicked, [=]() { colorDialog(GUI::gl_iconColor, "Choose icon color"); });
connect(ui->pb_tool_bar_color, &QAbstractButton::clicked, [=]() { colorDialog(GUI::mw_toolBarColor, "Choose tool bar color"); });
AddConfigs();
AddStylesheets();
}
setFixedSize(sizeHint());
layout()->setSizeConstraint(QLayout::SetFixedSize);
}
void settings_dialog::AddConfigs()

65
rpcs3/rpcs3qt/settings_dialog.ui
View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>604</width>
<height>682</height>
<width>550</width>
<height>604</height>
</rect>
</property>
<property name="sizePolicy">
@ -30,7 +30,7 @@
<bool>true</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -298,6 +298,9 @@
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
@ -566,6 +569,9 @@
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
@ -667,6 +673,9 @@
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
@ -791,6 +800,9 @@
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
@ -890,6 +902,9 @@
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
@ -956,6 +971,9 @@
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
@ -1117,13 +1135,46 @@
</layout>
</item>
<item>
<spacer name="verticalSpacer_10">
<layout class="QHBoxLayout" name="horizontalLayout_19">
<item>
<widget class="QWidget" name="widget_6" native="true"/>
</item>
<item>
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>UI Colors (missing in stylesheets)</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_13">
<item>
<widget class="QPushButton" name="pb_icon_color">
<property name="text">
<string>Gamelist icons</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pb_tool_bar_color">
<property name="text">
<string>Mainwindow tool bar</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer_4">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<width>20</width>
<height>0</height>
</size>
</property>
@ -1155,8 +1206,6 @@
</widget>
</item>
</layout>
<zorder>groupBox_62</zorder>
<zorder>verticalSpacer_10</zorder>
</widget>
</widget>
</item>
@ -1198,7 +1247,7 @@
</resources>
<connections/>
<buttongroups>
<buttongroup name="spuBG"/>
<buttongroup name="ppuBG"/>
<buttongroup name="spuBG"/>
</buttongroups>
</ui>

2
rpcs3/rpcs3qt/welcome_dialog.cpp
View File

@ -33,5 +33,5 @@ welcome_dialog::welcome_dialog(QWidget* parent) : QDialog(parent), ui(new Ui::we
connect(ui->okay, &QPushButton::pressed, this, &QDialog::accept);
setFixedSize(sizeHint());
layout()->setSizeConstraint(QLayout::SetFixedSize);
}

65
rpcs3/rpcs3qt/welcome_dialog.ui
View File

@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>634</width>
<width>611</width>
<height>272</height>
</rect>
</property>
@ -143,7 +143,7 @@
</font>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;RPCS3 is an open-source Sony PlayStation 3 emulator and debugger.&lt;br/&gt;It is written in C++ for Windows and Linux and funded with &lt;a href=&quot;https://www.patreon.com/Nekotekina&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Patreon&lt;/span&gt;&lt;/a&gt;.&lt;br/&gt;Our lead developers and contributors are always working hard to ensure this project can be the best that it can be.&lt;br/&gt;There are still plenty of implementations to be made and optimizations to be done.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;RPCS3 is an open-source Sony PlayStation 3 emulator and debugger.&lt;br/&gt;It is written in C++ for Windows and Linux and funded with &lt;a href=&quot;https://www.patreon.com/Nekotekina&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Patreon&lt;/span&gt;&lt;/a&gt;.&lt;br/&gt;Our developers and contributors are always working hard to ensure this project can be the best that it can be.&lt;br/&gt;There are still plenty of implementations to be made and optimizations to be done.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
@ -182,7 +182,7 @@
<number>11</number>
</property>
<item>
<widget class="QLabel" name="label_4">
<widget class="QLabel" name="label_5">
<property name="font">
<font>
<kerning>true</kerning>
@ -198,7 +198,7 @@
<enum>Qt::RichText</enum>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
<set>Qt::AlignHCenter|Qt::AlignTop</set>
</property>
<property name="wordWrap">
<bool>true</bool>
@ -208,7 +208,7 @@
</property>
</widget>
</item>
<item>
<item alignment="Qt::AlignHCenter">
<widget class="QLabel" name="label_6">
<property name="font">
<font>
@ -222,7 +222,7 @@
<string notr="true"/>
</property>
<property name="text">
<string>&lt;br&gt;RPCS3 does not condone piracy. You must dump your own games.&lt;br&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;span style=&quot; font-weight:600; color:#ff0000;&quot;&gt;RPCS3 does not condone piracy. You must dump your own games.&lt;/span&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@ -253,26 +253,6 @@
</property>
</widget>
</item>
<item alignment="Qt::AlignLeft">
<widget class="QCheckBox" name="i_have_read">
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string>I have read the Quickstart guide</string>
</property>
</widget>
</item>
<item alignment="Qt::AlignLeft">
<widget class="QCheckBox" name="do_not_show">
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string>Do not show again</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
@ -286,6 +266,39 @@
</property>
</spacer>
</item>
<item alignment="Qt::AlignLeft">
<widget class="QCheckBox" name="i_have_read">
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string>I have read the Quickstart guide</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item alignment="Qt::AlignLeft">
<widget class="QCheckBox" name="do_not_show">
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string>Do not show again</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>