mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added GTK to process path, fixed a bug and minor edits

Browse source
This commit is contained in:
Xpl0itR 2019-06-06 23:23:58 +01:00
parent 8ca2f16686
commit 910f9a1abc
No known key found for this signature in database
GPG key ID: 91798184109676AD
9 changed files with 29 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Ryujinx/ApplicationLibrary.cs
View file

@ -94,7 +94,7 @@ namespace Ryujinx
byte[] IconData = Read(AssetOffset + IconOffset, (int)IconSize);
return new Gdk.Pixbuf(IconData, 50, 50);
return new Gdk.Pixbuf(IconData, 75, 75);
}
else { return RyujinxROMIcon; }
}

55
Ryujinx/ControlSettings.cs
View file

@ -1,55 +0,0 @@
using Gtk;
using System;
using System.IO;
using System.Reflection;
namespace Ryujinx
{
public class ControlSettings
{
public static void ControlSettingsMenu()
{
Window CSWin = new Window(WindowType.Toplevel);
CSWin.Title = "Control Settings";
CSWin.Icon = new Gdk.Pixbuf("./ryujinxIcon.png");
CSWin.Resizable = false;
CSWin.WindowPosition = WindowPosition.Center;
CSWin.SetDefaultSize(854, 360);
VBox box = new VBox(false, 2);
//settings stuff will replace this block
Label myLabel = new Label { Text = "Control Settings" };
box.PackStart(myLabel, true, true, 3);
HBox ButtonBox = new HBox(true, 3);
Alignment BoxAlign = new Alignment(1, 0, 0, 0);
Button Save = new Button("Save");
Save.Pressed += (o, args) => Save_Pressed(o, args, CSWin);
ButtonBox.Add(Save);
Button Cancel = new Button("Cancel");
Cancel.Pressed += (o, args) => Cancel_Pressed(o, args, CSWin);
ButtonBox.Add(Cancel);
BoxAlign.SetPadding(0, 5, 0, 7);
BoxAlign.Add(ButtonBox);
box.PackStart(BoxAlign, false, false, 3);
CSWin.Add(box);
CSWin.ShowAll();
}
static void Save_Pressed(object o, EventArgs args, Window window)
{
//save settings stuff will go here
window.Destroy();
}
static void Cancel_Pressed(object o, EventArgs args, Window window)
{
window.Destroy();
}
}
}

32
Ryujinx/GeneralSettings.cs
View file

@ -29,8 +29,8 @@ namespace Ryujinx
[GUI] CheckButton CustThemeToggle;
[GUI] Entry CustThemeDir;
[GUI] TextView GameDirsBox;
[GUI] Button SaveButton;
[GUI] Button CancelButton;
[GUI] ToggleButton SaveToggle;
[GUI] ToggleButton CloseToggle;
public static void ConfigureSettings(Configuration Instance) { SwitchConfig = Instance; }
@ -42,8 +42,8 @@ namespace Ryujinx
builder.Autoconnect(this);
SaveButton.Activated += SaveButton_Activated;
CancelButton.Activated += CancelButton_Activated;
SaveToggle.Toggled += SaveToggle_Activated;
CloseToggle.Toggled += CloseToggle_Activated;
CustThemeToggle.Clicked += CustThemeToggle_Activated;
if (SwitchConfig.LoggingEnableError) { ErrorLogToggle.Click(); }
@ -69,23 +69,19 @@ namespace Ryujinx
}
//Events
private void SaveButton_Activated(object obj, EventArgs args)
{
//Saving code is about to make this a BIG boi
File.WriteAllText("./GameDirs.dat", GameDirsBox.Buffer.Text);
Destroy();
}
private void CancelButton_Activated(object obj, EventArgs args)
{
Destroy();
}
private void CustThemeToggle_Activated(object obj, EventArgs args)
{
if (CustThemeToggle.Active == false) { CustThemeDir.Sensitive = false; } else { CustThemeDir.Sensitive = true; }
}
private void CloseToggle_Activated(object obj, EventArgs args)
{
Destroy();
}
private void SaveToggle_Activated(object obj, EventArgs args)
{
File.WriteAllText("./GameDirs.dat", GameDirsBox.Buffer.Text);
}
}
}

8
Ryujinx/GeneralSettings.glade
View file

@ -404,8 +404,8 @@
</packing>
</child>
<child>
<object class="GtkButton" id="SaveButton">
<property name="label" translatable="yes">Save</property>
<object class="GtkToggleButton" id="SaveToggle">
<property name="label" translatable="yes">Toggle to Save</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@ -417,8 +417,8 @@
</packing>
</child>
<child>
<object class="GtkButton" id="CancelButton">
<property name="label" translatable="yes">Cancel</property>
<object class="GtkToggleButton" id="CloseToggle">
<property name="label" translatable="yes">Toggle to Close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>

9
Ryujinx/MainMenu.cs
View file

@ -16,6 +16,7 @@ namespace Ryujinx
//UI Controls
[GUI] MenuItem NFC;
[GUI] MenuItem ControlSettingsMenu;
[GUI] TreeView GameTable;
public MainMenu(HLE.Switch _device, Application _gtkapp) : this(new Builder("Ryujinx.MainMenu.glade"), _device, _gtkapp) { }
@ -40,7 +41,8 @@ namespace Ryujinx
DeleteEvent += Window_Close;
//disable some buttons
NFC.Sensitive = false;
NFC.Sensitive = false;
ControlSettingsMenu.Sensitive = false;
//Games grid thing
GameTable.AppendColumn("Icon", new CellRendererPixbuf(), "pixbuf", 0);
@ -203,11 +205,6 @@ namespace Ryujinx
GSWin.Show();
}
private void Control_Settings_Pressed(object o, EventArgs args)
{
ControlSettings.ControlSettingsMenu();
}
private void NFC_Pressed(object o, EventArgs args)
{
FileChooserDialog fc = new FileChooserDialog("Choose the file to open", this, FileChooserAction.Open, "Cancel", ResponseType.Cancel, "Open", ResponseType.Accept);

1
Ryujinx/MainMenu.glade
View file

@ -94,7 +94,6 @@
<property name="can_focus">False</property>
<property name="label" translatable="yes">Control Settings</property>
<property name="use_underline">True</property>
<signal name="activate" handler="Control_Settings_Pressed" swapped="no"/>
</object>
</child>
</object>

3
Ryujinx/Program.cs
View file

@ -8,7 +8,6 @@ using Ryujinx.Profiler;
using System;
using System.IO;
using System.Linq;
using System.Reflection;
namespace Ryujinx
{
@ -24,6 +23,8 @@ namespace Ryujinx
{
Console.Title = "Ryujinx Console";
Environment.SetEnvironmentVariable("Path", $"{new DirectoryInfo(AppDomain.CurrentDomain.BaseDirectory).Parent}\\bin;{Environment.GetEnvironmentVariable("Path", EnvironmentVariableTarget.Machine)}");
IGalRenderer renderer = new OglRenderer();
IAalOutput audioOut = InitializeAudioEngine();

5
Ryujinx/Theme.css
View file

@ -67,6 +67,11 @@ button {
color: #F4F6F7;
}
filechooser #pathbarbox {
background-color: #272b2e;
border-bottom: 1px solid #595c5f;
}
scrollbar {
-GtkScrollbar-has-backward-stepper: false;
-GtkScrollbar-has-forward-stepper: false;

BIN
Ryujinx/ryujinxROMIcon.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB