mirror of https://github.com/PCSX2/pcsx2.git
Qt: De-duplicate AppIcon
This commit is contained in:
parent
07ed213b1f
commit
8fe9282bd9
|
@ -287,7 +287,7 @@ Plugins = ../lib/plugins
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
echo "Copy desktop/icon..."
|
echo "Copy desktop/icon..."
|
||||||
cp "$PCSX2DIR/pcsx2/Resources/AppIcon64.png" "$OUTDIR/PCSX2.png"
|
cp "$PCSX2DIR/bin/resources/icons/AppIconLarge.png" "$OUTDIR/PCSX2.png"
|
||||||
cp "$SCRIPTDIR/pcsx2-qt.desktop" "$OUTDIR/PCSX2.desktop"
|
cp "$SCRIPTDIR/pcsx2-qt.desktop" "$OUTDIR/PCSX2.desktop"
|
||||||
cp "$SCRIPTDIR/AppRun-qt" "$OUTDIR/AppRun"
|
cp "$SCRIPTDIR/AppRun-qt" "$OUTDIR/AppRun"
|
||||||
|
|
||||||
|
|
|
@ -183,7 +183,6 @@ void MainWindow::setupAdditionalUi()
|
||||||
{
|
{
|
||||||
const bool show_advanced_settings = QtHost::ShouldShowAdvancedSettings();
|
const bool show_advanced_settings = QtHost::ShouldShowAdvancedSettings();
|
||||||
|
|
||||||
setWindowIcon(QIcon(QStringLiteral("%1/icons/AppIconLarge.png").arg(QtHost::GetResourcesBasePath())));
|
|
||||||
makeIconsMasks(menuBar());
|
makeIconsMasks(menuBar());
|
||||||
|
|
||||||
m_ui.menuDebug->menuAction()->setVisible(show_advanced_settings);
|
m_ui.menuDebug->menuAction()->setVisible(show_advanced_settings);
|
||||||
|
|
|
@ -16,6 +16,11 @@
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
<string>PCSX2</string>
|
<string>PCSX2</string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="windowIcon">
|
||||||
|
<iconset>
|
||||||
|
<normalon>:/icons/AppIcon64.png</normalon>
|
||||||
|
</iconset>
|
||||||
|
</property>
|
||||||
<widget class="QStackedWidget" name="mainContainer"/>
|
<widget class="QStackedWidget" name="mainContainer"/>
|
||||||
<widget class="QMenuBar" name="menuBar">
|
<widget class="QMenuBar" name="menuBar">
|
||||||
<property name="geometry">
|
<property name="geometry">
|
||||||
|
@ -126,10 +131,10 @@
|
||||||
<property name="title">
|
<property name="title">
|
||||||
<string>Switch Renderer</string>
|
<string>Switch Renderer</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="icon">
|
<property name="icon">
|
||||||
<iconset theme="brush-line">
|
<iconset theme="brush-line">
|
||||||
<normaloff>.</normaloff>.</iconset>
|
<normaloff>.</normaloff>.</iconset>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
<addaction name="menuDebugSwitchRenderer"/>
|
<addaction name="menuDebugSwitchRenderer"/>
|
||||||
<addaction name="separator"/>
|
<addaction name="separator"/>
|
||||||
|
@ -484,12 +489,12 @@
|
||||||
</property>
|
</property>
|
||||||
</action>
|
</action>
|
||||||
<action name="actionAbout">
|
<action name="actionAbout">
|
||||||
<property name="text">
|
|
||||||
<string>&About PCSX2...</string>
|
|
||||||
</property>
|
|
||||||
<property name="icon">
|
<property name="icon">
|
||||||
<iconset resource="resources/resources.qrc">
|
<iconset resource="resources/resources.qrc">
|
||||||
<normaloff>:/icons/AppIcon.png</normaloff>:/icons/AppIcon.png</iconset>
|
<normaloff>:/icons/AppIcon64.png</normaloff>:/icons/AppIcon64.png</iconset>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>&About PCSX2...</string>
|
||||||
</property>
|
</property>
|
||||||
</action>
|
</action>
|
||||||
<action name="actionChangeDisc">
|
<action name="actionChangeDisc">
|
||||||
|
|
|
@ -169,10 +169,10 @@ void SetupWizardDialog::confirmCancel()
|
||||||
|
|
||||||
void SetupWizardDialog::setupUi()
|
void SetupWizardDialog::setupUi()
|
||||||
{
|
{
|
||||||
setWindowIcon(QIcon(QStringLiteral("%1/icons/AppIconLarge.png").arg(QtHost::GetResourcesBasePath())));
|
|
||||||
|
|
||||||
m_ui.setupUi(this);
|
m_ui.setupUi(this);
|
||||||
|
|
||||||
|
m_ui.logo->setPixmap(QPixmap(QStringLiteral("%1/icons/AppIconLarge.png").arg(QtHost::GetResourcesBasePath())));
|
||||||
|
|
||||||
m_ui.pages->setCurrentIndex(0);
|
m_ui.pages->setCurrentIndex(0);
|
||||||
|
|
||||||
m_page_labels[Page_Language] = m_ui.labelLanguage;
|
m_page_labels[Page_Language] = m_ui.labelLanguage;
|
||||||
|
|
|
@ -13,6 +13,11 @@
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
<string>PCSX2 Setup Wizard</string>
|
<string>PCSX2 Setup Wizard</string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="windowIcon">
|
||||||
|
<iconset>
|
||||||
|
<normalon>:/icons/AppIcon64.png</normalon>
|
||||||
|
</iconset>
|
||||||
|
</property>
|
||||||
<layout class="QGridLayout" name="gridLayout">
|
<layout class="QGridLayout" name="gridLayout">
|
||||||
<property name="horizontalSpacing">
|
<property name="horizontalSpacing">
|
||||||
<number>10</number>
|
<number>10</number>
|
||||||
|
@ -20,7 +25,7 @@
|
||||||
<item row="0" column="0">
|
<item row="0" column="0">
|
||||||
<layout class="QVBoxLayout" name="verticalLayout_2">
|
<layout class="QVBoxLayout" name="verticalLayout_2">
|
||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="label">
|
<widget class="QLabel" name="logo">
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
||||||
<horstretch>0</horstretch>
|
<horstretch>0</horstretch>
|
||||||
|
@ -33,12 +38,15 @@
|
||||||
<height>128</height>
|
<height>128</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="maximumSize">
|
||||||
|
<size>
|
||||||
|
<width>128</width>
|
||||||
|
<height>128</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string/>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<property name="pixmap">
|
|
||||||
<pixmap resource="resources/resources.qrc">:/icons/AppIcon.png</pixmap>
|
|
||||||
</property>
|
|
||||||
<property name="scaledContents">
|
<property name="scaledContents">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
</property>
|
</property>
|
||||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 5.9 KiB |
Before Width: | Height: | Size: 5.9 KiB After Width: | Height: | Size: 5.9 KiB |
|
@ -1,6 +1,6 @@
|
||||||
<RCC>
|
<RCC>
|
||||||
<qresource>
|
<qresource>
|
||||||
<file>icons/AppIcon.png</file>
|
<file>icons/AppIcon64.png</file>
|
||||||
<file>icons/applications-system-24.png</file>
|
<file>icons/applications-system-24.png</file>
|
||||||
<file>icons/black/index.theme</file>
|
<file>icons/black/index.theme</file>
|
||||||
<file>icons/black/svg/arrow-left-right-line.svg</file>
|
<file>icons/black/svg/arrow-left-right-line.svg</file>
|
||||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 2.6 KiB |
Binary file not shown.
Before Width: | Height: | Size: 5.2 KiB |
Loading…
Reference in New Issue