tidus4400/rjx-mirror
1
0
Fork 0
forked from Mirror/Ryujinx
Code Pull requests Activity

Fix Linux Icon (#1927)

Browse source
This commit is contained in:
pineappleEA 2021-01-18 22:33:58 +02:00 committed by GitHub
parent a1f77a5b6a
commit 4da6742861
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Ryujinx/Ui/Applet/ErrorAppletDialog.cs
View file

@ -1,4 +1,5 @@
using Gtk; using Gtk;
using System.Reflection;
namespace Ryujinx.Ui.Applet namespace Ryujinx.Ui.Applet
{ {
@ -6,6 +7,8 @@ namespace Ryujinx.Ui.Applet
{ {
public ErrorAppletDialog(Window parentWindow, DialogFlags dialogFlags, MessageType messageType, string[] buttons) : base(parentWindow, dialogFlags, messageType, ButtonsType.None, null) public ErrorAppletDialog(Window parentWindow, DialogFlags dialogFlags, MessageType messageType, string[] buttons) : base(parentWindow, dialogFlags, messageType, ButtonsType.None, null)
{ {
Icon = new Gdk.Pixbuf(Assembly.GetExecutingAssembly(), "Ryujinx.Ui.Resources.Logo_Ryujinx.png");
int responseId = 0; int responseId = 0;
if (buttons != null) if (buttons != null)

2
Ryujinx/Ui/MainWindow.cs
View file

@ -22,6 +22,7 @@ using Ryujinx.Ui.Windows;
using System; using System;
using System.Diagnostics; using System.Diagnostics;
using System.IO; using System.IO;
using System.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -110,6 +111,7 @@ namespace Ryujinx.Ui
DefaultWidth = monitorWidth < 1280 ? monitorWidth : 1280; DefaultWidth = monitorWidth < 1280 ? monitorWidth : 1280;
DefaultHeight = monitorHeight < 760 ? monitorHeight : 760; DefaultHeight = monitorHeight < 760 ? monitorHeight : 760;
Icon = new Gdk.Pixbuf(Assembly.GetExecutingAssembly(), "Ryujinx.Ui.Resources.Logo_Ryujinx.png");
Title = $"Ryujinx {Program.Version}"; Title = $"Ryujinx {Program.Version}";
// Hide emulation context status bar. // Hide emulation context status bar.

4
Ryujinx/Ui/Widgets/GameTableContextMenu.cs
View file

@ -20,6 +20,7 @@ using System.Buffers;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
using System.Reflection;
using System.Threading; using System.Threading;
using static LibHac.Fs.ApplicationSaveDataManagement; using static LibHac.Fs.ApplicationSaveDataManagement;
@ -85,6 +86,7 @@ namespace Ryujinx.Ui.Widgets
using MessageDialog messageDialog = new MessageDialog(null, DialogFlags.Modal, MessageType.Question, ButtonsType.YesNo, null) using MessageDialog messageDialog = new MessageDialog(null, DialogFlags.Modal, MessageType.Question, ButtonsType.YesNo, null)
{ {
Title = "Ryujinx", Title = "Ryujinx",
Icon = new Gdk.Pixbuf(Assembly.GetExecutingAssembly(), "Ryujinx.Ui.Resources.Logo_Ryujinx.png"),
Text = $"There is no savedata for {titleName} [{titleId:x16}]", Text = $"There is no savedata for {titleName} [{titleId:x16}]",
SecondaryText = "Would you like to create savedata for this game?", SecondaryText = "Would you like to create savedata for this game?",
WindowPosition = WindowPosition.Center WindowPosition = WindowPosition.Center
@ -194,6 +196,7 @@ namespace Ryujinx.Ui.Widgets
_dialog = new MessageDialog(null, DialogFlags.DestroyWithParent, MessageType.Info, ButtonsType.Cancel, null) _dialog = new MessageDialog(null, DialogFlags.DestroyWithParent, MessageType.Info, ButtonsType.Cancel, null)
{ {
Title = "Ryujinx - NCA Section Extractor", Title = "Ryujinx - NCA Section Extractor",
Icon = new Gdk.Pixbuf(Assembly.GetExecutingAssembly(), "Ryujinx.Ui.Resources.Logo_Ryujinx.png"),
SecondaryText = $"Extracting {ncaSectionType} section from {System.IO.Path.GetFileName(_titleFilePath)}...", SecondaryText = $"Extracting {ncaSectionType} section from {System.IO.Path.GetFileName(_titleFilePath)}...",
WindowPosition = WindowPosition.Center WindowPosition = WindowPosition.Center
}; };
@ -310,6 +313,7 @@ namespace Ryujinx.Ui.Widgets
MessageDialog dialog = new MessageDialog(null, DialogFlags.DestroyWithParent, MessageType.Info, ButtonsType.Ok, null) MessageDialog dialog = new MessageDialog(null, DialogFlags.DestroyWithParent, MessageType.Info, ButtonsType.Ok, null)
{ {
Title = "Ryujinx - NCA Section Extractor", Title = "Ryujinx - NCA Section Extractor",
Icon = new Gdk.Pixbuf(Assembly.GetExecutingAssembly(), "Ryujinx.Ui.Resources.Logo_Ryujinx.png"),
SecondaryText = "Extraction has completed successfully.", SecondaryText = "Extraction has completed successfully.",
WindowPosition = WindowPosition.Center WindowPosition = WindowPosition.Center
}; };

2
Ryujinx/Ui/Widgets/GtkDialog.cs
View file

@ -1,4 +1,5 @@
using Gtk; using Gtk;
using System.Reflection;
using Ryujinx.Common.Logging; using Ryujinx.Common.Logging;
namespace Ryujinx.Ui.Widgets namespace Ryujinx.Ui.Widgets
@ -11,6 +12,7 @@ namespace Ryujinx.Ui.Widgets
: base(null, DialogFlags.Modal, messageType, buttonsType, null) : base(null, DialogFlags.Modal, messageType, buttonsType, null)
{ {
Title = title; Title = title;
Icon = new Gdk.Pixbuf(Assembly.GetExecutingAssembly(), "Ryujinx.Ui.Resources.Logo_Ryujinx.png");
Text = mainText; Text = mainText;
SecondaryText = secondaryText; SecondaryText = secondaryText;
WindowPosition = WindowPosition.Center; WindowPosition = WindowPosition.Center;

2
Ryujinx/Ui/Widgets/ProfileDialog.cs
View file

@ -1,5 +1,6 @@
using Gtk; using Gtk;
using System; using System;
using System.Reflection;
using GUI = Gtk.Builder.ObjectAttribute; using GUI = Gtk.Builder.ObjectAttribute;
@ -19,6 +20,7 @@ namespace Ryujinx.Ui.Widgets
private ProfileDialog(Builder builder) : base(builder.GetObject("_profileDialog").Handle) private ProfileDialog(Builder builder) : base(builder.GetObject("_profileDialog").Handle)
{ {
builder.Autoconnect(this); builder.Autoconnect(this);
Icon = new Gdk.Pixbuf(Assembly.GetExecutingAssembly(), "Ryujinx.Ui.Resources.Logo_Ryujinx.png");
} }
private void OkToggle_Activated(object sender, EventArgs args) private void OkToggle_Activated(object sender, EventArgs args)

2
Ryujinx/Ui/Windows/AboutWindow.cs
View file

@ -3,6 +3,7 @@ using Ryujinx.Common.Utilities;
using Ryujinx.Ui.Helper; using Ryujinx.Ui.Helper;
using System.Net.Http; using System.Net.Http;
using System.Net.NetworkInformation; using System.Net.NetworkInformation;
using System.Reflection;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace Ryujinx.Ui.Windows namespace Ryujinx.Ui.Windows
@ -11,6 +12,7 @@ namespace Ryujinx.Ui.Windows
{ {
public AboutWindow() : base($"Ryujinx {Program.Version} - About") public AboutWindow() : base($"Ryujinx {Program.Version} - About")
{ {
Icon = new Gdk.Pixbuf(Assembly.GetExecutingAssembly(), "Ryujinx.Ui.Resources.Logo_Ryujinx.png");
InitializeComponent(); InitializeComponent();
_ = DownloadPatronsJson(); _ = DownloadPatronsJson();

2
Ryujinx/Ui/Windows/ControllerWindow.cs
View file

@ -94,6 +94,8 @@ namespace Ryujinx.Ui.Windows
private ControllerWindow(Builder builder, PlayerIndex controllerId) : base(builder.GetObject("_controllerWin").Handle) private ControllerWindow(Builder builder, PlayerIndex controllerId) : base(builder.GetObject("_controllerWin").Handle)
{ {
Icon = new Gdk.Pixbuf(Assembly.GetExecutingAssembly(), "Ryujinx.Ui.Resources.Logo_Ryujinx.png");
builder.Autoconnect(this); builder.Autoconnect(this);
_playerIndex = controllerId; _playerIndex = controllerId;

3
Ryujinx/Ui/Windows/SettingsWindow.cs
View file

@ -11,6 +11,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
using System.Reflection;
using System.Threading.Tasks; using System.Threading.Tasks;
using GUI = Gtk.Builder.ObjectAttribute; using GUI = Gtk.Builder.ObjectAttribute;
@ -91,6 +92,8 @@ namespace Ryujinx.Ui.Windows
private SettingsWindow(MainWindow parent, Builder builder, VirtualFileSystem virtualFileSystem, HLE.FileSystem.Content.ContentManager contentManager) : base(builder.GetObject("_settingsWin").Handle) private SettingsWindow(MainWindow parent, Builder builder, VirtualFileSystem virtualFileSystem, HLE.FileSystem.Content.ContentManager contentManager) : base(builder.GetObject("_settingsWin").Handle)
{ {
Icon = new Gdk.Pixbuf(Assembly.GetExecutingAssembly(), "Ryujinx.Ui.Resources.Logo_Ryujinx.png");
_parent = parent; _parent = parent;
builder.Autoconnect(this); builder.Autoconnect(this);