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

lil clean up

Browse source
This commit is contained in:
Xpl0itR 2019-09-23 15:33:57 +01:00 • committed by unknown
commit 45bf88c5a2
No known key found for this signature in database
GPG key ID: 91798184109676AD
3 changed files with 19 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Ryujinx/Program.cs
View file

@ -30,10 +30,7 @@ namespace Ryujinx
gtkApplication.AddWindow(mainWindow); gtkApplication.AddWindow(mainWindow);
mainWindow.Show(); mainWindow.Show();
string ryuFsProd = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "RyuFS", "system", "prod.keys"); if (!File.Exists(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "RyuFs", "system", "prod.keys")))
string homeProd = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".switch", "prod.keys");
if (!File.Exists(ryuFsProd) && !File.Exists(homeProd))
{ {
Logger.PrintWarning(LogClass.Application, "Key file was not found"); Logger.PrintWarning(LogClass.Application, "Key file was not found");
MainWindow.CreateErrorDialog($"Key file was not found. Please refer to `KEYS.md` for more info"); MainWindow.CreateErrorDialog($"Key file was not found. Please refer to `KEYS.md` for more info");

63
Ryujinx/Ui/MainWindow.cs
View file

@ -34,10 +34,7 @@ namespace Ryujinx.UI
private static ListStore _tableStore; private static ListStore _tableStore;
private static bool _gameLoaded = false; private static bool _gameLoaded = false;
private static bool _ending = false;
private static bool _ending = false;
private static bool _firstLoadComplete = false;
private static TreeViewColumn favColumn; private static TreeViewColumn favColumn;
private static TreeViewColumn appColumn; private static TreeViewColumn appColumn;
@ -78,9 +75,7 @@ namespace Ryujinx.UI
[GUI] CheckMenuItem _fileExtToggle; [GUI] CheckMenuItem _fileExtToggle;
[GUI] CheckMenuItem _fileSizeToggle; [GUI] CheckMenuItem _fileSizeToggle;
[GUI] CheckMenuItem _pathToggle; [GUI] CheckMenuItem _pathToggle;
[GUI] Box _box;
[GUI] TreeView _gameTable; [GUI] TreeView _gameTable;
[GUI] GLArea _glScreen;
#pragma warning restore 649 #pragma warning restore 649
public MainWindow(string[] args, Application gtkApplication) : this(new Builder("Ryujinx.Ui.MainWindow.glade"), args, gtkApplication) { } public MainWindow(string[] args, Application gtkApplication) : this(new Builder("Ryujinx.Ui.MainWindow.glade"), args, gtkApplication) { }
@ -139,32 +134,10 @@ namespace Ryujinx.UI
if (SwitchSettings.SwitchConfig.GuiColumns[8]) { _fileSizeToggle.Active = true; } if (SwitchSettings.SwitchConfig.GuiColumns[8]) { _fileSizeToggle.Active = true; }
if (SwitchSettings.SwitchConfig.GuiColumns[9]) { _pathToggle.Active = true; } if (SwitchSettings.SwitchConfig.GuiColumns[9]) { _pathToggle.Active = true; }
if (args.Length == 1) _gameTable.Model = _tableStore = new ListStore(typeof(bool), typeof(Gdk.Pixbuf), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string));
{
// Temporary code section start, remove this section when game is rendered to the GLArea in the GUI
_box.Remove(_glScreen);
UpdateColumns(); UpdateColumns();
UpdateGameTable();
_gameTable.Model = _tableStore = new ListStore(typeof(bool), typeof(Gdk.Pixbuf), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string));
UpdateGameTable();
_firstLoadComplete = true;
// Temporary code section end
}
else
{
_box.Remove(_glScreen);
UpdateColumns();
_gameTable.Model = _tableStore = new ListStore(typeof(bool), typeof(Gdk.Pixbuf), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string));
UpdateGameTable();
_firstLoadComplete = true;
}
} }
public static void CreateErrorDialog(string errorMessage) public static void CreateErrorDialog(string errorMessage)
@ -252,11 +225,11 @@ namespace Ryujinx.UI
foreach (ApplicationLibrary.ApplicationData AppData in ApplicationLibrary.ApplicationLibraryData) foreach (ApplicationLibrary.ApplicationData AppData in ApplicationLibrary.ApplicationLibraryData)
{ {
_tableStore.AppendValues(AppData.Fav, new Gdk.Pixbuf(AppData.Icon, 75, 75), $"{AppData.TitleName}\n{AppData.TitleId.ToUpper()}", AppData.Developer, AppData.Version, AppData.TimePlayed, AppData.LastPlayed, AppData.FileExt, AppData.FileSize, AppData.Path); _tableStore.AppendValues(AppData.Fav, new Gdk.Pixbuf(AppData.Icon, 75, 75), $"{AppData.TitleName}\n{AppData.TitleId.ToUpper()}", AppData.Developer, AppData.Version, AppData.TimePlayed, AppData.LastPlayed, AppData.FileExt, AppData.FileSize, AppData.Path);
_tableStore.SetSortFunc(5, TimePlayedSort);
_tableStore.SetSortFunc(6, LastPlayedSort);
_tableStore.SetSortFunc(8, FileSizeSort);
} }
_tableStore.SetSortFunc(5, TimePlayedSort);
_tableStore.SetSortFunc(6, LastPlayedSort);
_tableStore.SetSortFunc(8, FileSizeSort);
} }
internal void LoadApplication(string path) internal void LoadApplication(string path)
@ -631,7 +604,7 @@ namespace Ryujinx.UI
Configuration.SaveConfig(SwitchSettings.SwitchConfig, System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Config.json")); Configuration.SaveConfig(SwitchSettings.SwitchConfig, System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Config.json"));
if (_firstLoadComplete) UpdateColumns(); UpdateColumns();
} }
private void Icon_Toggled(object o, EventArgs args) private void Icon_Toggled(object o, EventArgs args)
@ -640,7 +613,7 @@ namespace Ryujinx.UI
Configuration.SaveConfig(SwitchSettings.SwitchConfig, System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Config.json")); Configuration.SaveConfig(SwitchSettings.SwitchConfig, System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Config.json"));
if(_firstLoadComplete) UpdateColumns(); UpdateColumns();
} }
private void Title_Toggled(object o, EventArgs args) private void Title_Toggled(object o, EventArgs args)
@ -649,7 +622,7 @@ namespace Ryujinx.UI
Configuration.SaveConfig(SwitchSettings.SwitchConfig, System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Config.json")); Configuration.SaveConfig(SwitchSettings.SwitchConfig, System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Config.json"));
if (_firstLoadComplete) UpdateColumns(); UpdateColumns();
} }
private void Developer_Toggled(object o, EventArgs args) private void Developer_Toggled(object o, EventArgs args)
@ -658,7 +631,7 @@ namespace Ryujinx.UI
Configuration.SaveConfig(SwitchSettings.SwitchConfig, System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Config.json")); Configuration.SaveConfig(SwitchSettings.SwitchConfig, System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Config.json"));
if (_firstLoadComplete) UpdateColumns(); UpdateColumns();
} }
private void Version_Toggled(object o, EventArgs args) private void Version_Toggled(object o, EventArgs args)
@ -667,7 +640,7 @@ namespace Ryujinx.UI
Configuration.SaveConfig(SwitchSettings.SwitchConfig, System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Config.json")); Configuration.SaveConfig(SwitchSettings.SwitchConfig, System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Config.json"));
if (_firstLoadComplete) UpdateColumns(); UpdateColumns();
} }
private void TimePlayed_Toggled(object o, EventArgs args) private void TimePlayed_Toggled(object o, EventArgs args)
@ -676,7 +649,7 @@ namespace Ryujinx.UI
Configuration.SaveConfig(SwitchSettings.SwitchConfig, System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Config.json")); Configuration.SaveConfig(SwitchSettings.SwitchConfig, System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Config.json"));
if (_firstLoadComplete) UpdateColumns(); UpdateColumns();
} }
private void LastPlayed_Toggled(object o, EventArgs args) private void LastPlayed_Toggled(object o, EventArgs args)
@ -685,7 +658,7 @@ namespace Ryujinx.UI
Configuration.SaveConfig(SwitchSettings.SwitchConfig, System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Config.json")); Configuration.SaveConfig(SwitchSettings.SwitchConfig, System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Config.json"));
if (_firstLoadComplete) UpdateColumns(); UpdateColumns();
} }
private void FileExt_Toggled(object o, EventArgs args) private void FileExt_Toggled(object o, EventArgs args)
@ -694,7 +667,7 @@ namespace Ryujinx.UI
Configuration.SaveConfig(SwitchSettings.SwitchConfig, System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Config.json")); Configuration.SaveConfig(SwitchSettings.SwitchConfig, System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Config.json"));
if (_firstLoadComplete) UpdateColumns(); UpdateColumns();
} }
private void FileSize_Toggled(object o, EventArgs args) private void FileSize_Toggled(object o, EventArgs args)
@ -703,7 +676,7 @@ namespace Ryujinx.UI
Configuration.SaveConfig(SwitchSettings.SwitchConfig, System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Config.json")); Configuration.SaveConfig(SwitchSettings.SwitchConfig, System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Config.json"));
if (_firstLoadComplete) UpdateColumns(); UpdateColumns();
} }
private void Path_Toggled(object o, EventArgs args) private void Path_Toggled(object o, EventArgs args)
@ -712,7 +685,7 @@ namespace Ryujinx.UI
Configuration.SaveConfig(SwitchSettings.SwitchConfig, System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Config.json")); Configuration.SaveConfig(SwitchSettings.SwitchConfig, System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Config.json"));
if (_firstLoadComplete) UpdateColumns(); UpdateColumns();
} }
private static int TimePlayedSort(ITreeModel model, TreeIter a, TreeIter b) private static int TimePlayedSort(ITreeModel model, TreeIter a, TreeIter b)

14
Ryujinx/Ui/MainWindow.glade
View file

@ -336,20 +336,6 @@
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkGLArea" id="_glScreen">
<property name="width_request">1280</property>
<property name="height_request">720</property>
<property name="visible">True</property>
<property name="app_paintable">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object> </object>
</child> </child>
</object> </object>