manuth/Ryujinx
1
0
Fork 0
mirror of https://git.naxdy.org/Mirror/Ryujinx.git synced 2025-01-12 13:49:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

naming convention fix

Browse source
This commit is contained in:
avikpl1911 2024-02-08 10:36:39 +05:30
parent 77a729f2db
commit d76aee3aec
3 changed files with 47 additions and 3392 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3347
src/Ryujinx/Ui/Windows/#SettingsWindow.glade#
View file

File diff suppressed because it is too large Load diff

80
src/Ryujinx/Ui/Windows/SettingsWindow.cs
View file

@ -31,8 +31,8 @@ namespace Ryujinx.Ui.Windows
private readonly MainWindow _parent; private readonly MainWindow _parent;
private readonly ListStore _gameDirsBoxStore; private readonly ListStore _gameDirsBoxStoreIncluded;
private readonly ListStore _gameDirsBoxStore1; private readonly ListStore _gameDirsBoxStoreExcluded;
private readonly ListStore _audioBackendStore; private readonly ListStore _audioBackendStore;
private readonly TimeZoneContentManager _timeZoneContentManager; private readonly TimeZoneContentManager _timeZoneContentManager;
private readonly HashSet<string> _validTzRegions; private readonly HashSet<string> _validTzRegions;
@ -104,8 +104,8 @@ namespace Ryujinx.Ui.Windows
[GUI] Entry _custThemePath; [GUI] Entry _custThemePath;
[GUI] ToggleButton _browseThemePath; [GUI] ToggleButton _browseThemePath;
[GUI] Label _custThemePathLabel; [GUI] Label _custThemePathLabel;
[GUI] TreeView _gameDirsBox; [GUI] TreeView _gameDirsBoxIncluded;
[GUI] TreeView _gameDirsBox1; [GUI] TreeView _gameDirsBoxExcluded;
[GUI] ToggleButton _include_exclude_dir; [GUI] ToggleButton _include_exclude_dir;
[GUI] Entry _addGameDirBox; [GUI] Entry _addGameDirBox;
[GUI] ComboBoxText _galThreading; [GUI] ComboBoxText _galThreading;
@ -387,23 +387,23 @@ namespace Ryujinx.Ui.Windows
_fsLogSpinAdjustment.Value = ConfigurationState.Instance.System.FsGlobalAccessLogMode; _fsLogSpinAdjustment.Value = ConfigurationState.Instance.System.FsGlobalAccessLogMode;
_systemTimeOffset = ConfigurationState.Instance.System.SystemTimeOffset; _systemTimeOffset = ConfigurationState.Instance.System.SystemTimeOffset;
_gameDirsBox.AppendColumn("", new CellRendererText(), "text", 0); _gameDirsBoxIncluded.AppendColumn("", new CellRendererText(), "text", 0);
_gameDirsBoxStore = new ListStore(typeof(string)); _gameDirsBoxStoreIncluded = new ListStore(typeof(string));
_gameDirsBox.Model = _gameDirsBoxStore; _gameDirsBoxIncluded.Model = _gameDirsBoxStoreIncluded;
foreach (string gameDir in ConfigurationState.Instance.Ui.GameDirs.Value) foreach (string gameDir in ConfigurationState.Instance.Ui.GameDirs.Value)
{ {
_gameDirsBoxStore.AppendValues(gameDir); _gameDirsBoxStoreIncluded.AppendValues(gameDir);
} }
_gameDirsBox1.AppendColumn("", new CellRendererText(), "text", 0); _gameDirsBoxExcluded.AppendColumn("", new CellRendererText(), "text", 0);
_gameDirsBoxStore1 = new ListStore(typeof(string)); _gameDirsBoxStoreExcluded = new ListStore(typeof(string));
_gameDirsBox1.Model = _gameDirsBoxStore1; _gameDirsBoxExcluded.Model = _gameDirsBoxStoreExcluded;
foreach (string gameDir1 in ConfigurationState.Instance.Ui.ExcludeGameDirs.Value) foreach (string gameDirExcluded in ConfigurationState.Instance.Ui.ExcludeGameDirs.Value)
{ {
_gameDirsBoxStore1.AppendValues(gameDir1); _gameDirsBoxStoreExcluded.AppendValues(gameDirExcluded);
} }
@ -584,13 +584,13 @@ namespace Ryujinx.Ui.Windows
{ {
List<string> gameDirs = new(); List<string> gameDirs = new();
_gameDirsBoxStore.GetIterFirst(out TreeIter treeIter); _gameDirsBoxStoreIncluded.GetIterFirst(out TreeIter treeIter);
for (int i = 0; i < _gameDirsBoxStore.IterNChildren(); i++) for (int i = 0; i < _gameDirsBoxStoreIncluded.IterNChildren(); i++)
{ {
gameDirs.Add((string)_gameDirsBoxStore.GetValue(treeIter, 0)); gameDirs.Add((string)_gameDirsBoxStoreIncluded.GetValue(treeIter, 0));
_gameDirsBoxStore.IterNext(ref treeIter); _gameDirsBoxStoreIncluded.IterNext(ref treeIter);
} }
ConfigurationState.Instance.Ui.GameDirs.Value = gameDirs; ConfigurationState.Instance.Ui.GameDirs.Value = gameDirs;
@ -605,13 +605,13 @@ namespace Ryujinx.Ui.Windows
List<string> ExcludegameDirs = new(); List<string> ExcludegameDirs = new();
_gameDirsBoxStore1.GetIterFirst(out TreeIter treeIter1); _gameDirsBoxStoreExcluded.GetIterFirst(out TreeIter treeIter1);
for (int j = 0; j < _gameDirsBoxStore1.IterNChildren(); j++) for (int j = 0; j < _gameDirsBoxStoreExcluded.IterNChildren(); j++)
{ {
ExcludegameDirs.Add((string)_gameDirsBoxStore1.GetValue(treeIter1, 0)); ExcludegameDirs.Add((string)_gameDirsBoxStoreExcluded.GetValue(treeIter1, 0));
_gameDirsBoxStore1.IterNext(ref treeIter1); _gameDirsBoxStoreExcluded.IterNext(ref treeIter1);
} }
ConfigurationState.Instance.Ui.ExcludeGameDirs.Value = ExcludegameDirs; ConfigurationState.Instance.Ui.ExcludeGameDirs.Value = ExcludegameDirs;
@ -776,7 +776,7 @@ namespace Ryujinx.Ui.Windows
Console.WriteLine("here"); Console.WriteLine("here");
_include_exclude_dir.Label = "exclude"; _include_exclude_dir.Label = "exclude";
_includeorexlude = IncludeorExclude.Exclude; _includeorexlude = IncludeorExclude.Exclude;
_gameDirsBox1.Selection.UnselectAll(); _gameDirsBoxExcluded.Selection.UnselectAll();
} }
private void onRowActivated1(object sender, ButtonReleaseEventArgs args) private void onRowActivated1(object sender, ButtonReleaseEventArgs args)
@ -784,7 +784,7 @@ namespace Ryujinx.Ui.Windows
Console.WriteLine("here"); Console.WriteLine("here");
_include_exclude_dir.Label = "include"; _include_exclude_dir.Label = "include";
_includeorexlude = IncludeorExclude.Include; _includeorexlude = IncludeorExclude.Include;
_gameDirsBox.Selection.UnselectAll(); _gameDirsBoxIncluded.Selection.UnselectAll();
} }
@ -794,7 +794,7 @@ namespace Ryujinx.Ui.Windows
{ {
if (Directory.Exists(_addGameDirBox.Buffer.Text)) if (Directory.Exists(_addGameDirBox.Buffer.Text))
{ {
_gameDirsBoxStore.AppendValues(_addGameDirBox.Buffer.Text); _gameDirsBoxStoreIncluded.AppendValues(_addGameDirBox.Buffer.Text);
_directoryChanged = true; _directoryChanged = true;
} }
else else
@ -809,20 +809,20 @@ namespace Ryujinx.Ui.Windows
_directoryChanged = false; _directoryChanged = false;
foreach (string directory in fileChooser.Filenames) foreach (string directory in fileChooser.Filenames)
{ {
if (_gameDirsBoxStore.GetIterFirst(out TreeIter treeIter)) if (_gameDirsBoxStoreIncluded.GetIterFirst(out TreeIter treeIter))
{ {
do do
{ {
if (directory.Equals((string)_gameDirsBoxStore.GetValue(treeIter, 0))) if (directory.Equals((string)_gameDirsBoxStoreIncluded.GetValue(treeIter, 0)))
{ {
break; break;
} }
} while (_gameDirsBoxStore.IterNext(ref treeIter)); } while (_gameDirsBoxStoreIncluded.IterNext(ref treeIter));
} }
if (!_directoryChanged) if (!_directoryChanged)
{ {
_gameDirsBoxStore.AppendValues(directory); _gameDirsBoxStoreIncluded.AppendValues(directory);
} }
} }
@ -842,16 +842,16 @@ namespace Ryujinx.Ui.Windows
if (_includeorexlude==IncludeorExclude.Exclude) if (_includeorexlude==IncludeorExclude.Exclude)
{ {
TreeSelection selection = _gameDirsBox.Selection; TreeSelection selection = _gameDirsBoxIncluded.Selection;
if (selection.GetSelected(out TreeIter treeIter)) if (selection.GetSelected(out TreeIter treeIter))
{ {
var model = _gameDirsBox.Model; var model = _gameDirsBoxIncluded.Model;
_gameDirsBoxStore1.AppendValues(model.GetValue(treeIter, 0)); _gameDirsBoxStoreExcluded.AppendValues(model.GetValue(treeIter, 0));
Console.WriteLine(model.GetValue(treeIter,0)); Console.WriteLine(model.GetValue(treeIter,0));
_directoryChanged = true; _directoryChanged = true;
_gameDirsBoxStore.Remove(ref treeIter); _gameDirsBoxStoreIncluded.Remove(ref treeIter);
} }
((ToggleButton)sender).SetStateFlags(StateFlags.Normal, true); ((ToggleButton)sender).SetStateFlags(StateFlags.Normal, true);
@ -859,16 +859,16 @@ namespace Ryujinx.Ui.Windows
} }
else if (_includeorexlude == IncludeorExclude.Include) else if (_includeorexlude == IncludeorExclude.Include)
{ {
TreeSelection selection = _gameDirsBox1.Selection; TreeSelection selection = _gameDirsBoxExcluded.Selection;
if (selection.GetSelected(out TreeIter treeIter1)) if (selection.GetSelected(out TreeIter treeIter1))
{ {
var model = _gameDirsBox1.Model; var model = _gameDirsBoxExcluded.Model;
_gameDirsBoxStore.AppendValues(model.GetValue(treeIter1, 0)); _gameDirsBoxStoreIncluded.AppendValues(model.GetValue(treeIter1, 0));
Console.WriteLine(model.GetValue(treeIter1, 0)); Console.WriteLine(model.GetValue(treeIter1, 0));
_directoryChanged = true; _directoryChanged = true;
_gameDirsBoxStore1.Remove(ref treeIter1); _gameDirsBoxStoreExcluded.Remove(ref treeIter1);
} }
((ToggleButton)sender).SetStateFlags(StateFlags.Normal, true); ((ToggleButton)sender).SetStateFlags(StateFlags.Normal, true);
@ -882,11 +882,11 @@ namespace Ryujinx.Ui.Windows
if (_includeorexlude == IncludeorExclude.Exclude) if (_includeorexlude == IncludeorExclude.Exclude)
{ {
TreeSelection selection = _gameDirsBox.Selection; TreeSelection selection = _gameDirsBoxIncluded.Selection;
if (selection.GetSelected(out TreeIter treeIter)) if (selection.GetSelected(out TreeIter treeIter))
{ {
_gameDirsBoxStore.Remove(ref treeIter); _gameDirsBoxStoreIncluded.Remove(ref treeIter);
_directoryChanged = true; _directoryChanged = true;
} }
@ -895,13 +895,13 @@ namespace Ryujinx.Ui.Windows
} }
else if (_includeorexlude == IncludeorExclude.Include) else if (_includeorexlude == IncludeorExclude.Include)
{ {
TreeSelection selection = _gameDirsBox1.Selection; TreeSelection selection = _gameDirsBoxExcluded.Selection;
if (selection.GetSelected(out TreeIter treeIter)) if (selection.GetSelected(out TreeIter treeIter))
{ {
_gameDirsBoxStore1.Remove(ref treeIter); _gameDirsBoxStoreExcluded.Remove(ref treeIter);
_directoryChanged = true; _directoryChanged = true;
} }

12
src/Ryujinx/Ui/Windows/SettingsWindow.glade
View file

@ -297,6 +297,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="halign">start</property> <property name="halign">start</property>
<property name="margin-start">9</property>
<property name="margin-bottom">5</property> <property name="margin-bottom">5</property>
<property name="label" translatable="yes">Included Game Directories</property> <property name="label" translatable="yes">Included Game Directories</property>
<attributes> <attributes>
@ -306,6 +307,7 @@
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="padding">1</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
@ -323,12 +325,12 @@
<property name="margin-bottom">10</property> <property name="margin-bottom">10</property>
<property name="shadow-type">in</property> <property name="shadow-type">in</property>
<child> <child>
<object class="GtkTreeView" id="_gameDirsBox"> <object class="GtkTreeView" id="_gameDirsBoxIncluded">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="headers-visible">False</property> <property name="headers-visible">False</property>
<property name="headers-clickable">False</property> <property name="headers-clickable">False</property>
<signal name="button-release-event" handler="onRowActivated" /> <signal name="button-release-event" handler="onRowActivated" swapped="no"/>
<child internal-child="selection"> <child internal-child="selection">
<object class="GtkTreeSelection"/> <object class="GtkTreeSelection"/>
</child> </child>
@ -368,11 +370,11 @@
<property name="margin-bottom">10</property> <property name="margin-bottom">10</property>
<property name="shadow-type">in</property> <property name="shadow-type">in</property>
<child> <child>
<object class="GtkTreeView" id="_gameDirsBox1"> <object class="GtkTreeView" id="_gameDirsBoxExcluded">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="headers-visible">False</property> <property name="headers-visible">False</property>
<signal name="button-release-event" handler="onRowActivated1" /> <signal name="button-release-event" handler="onRowActivated1" swapped="no"/>
<child internal-child="selection"> <child internal-child="selection">
<object class="GtkTreeSelection"/> <object class="GtkTreeSelection"/>
</child> </child>
@ -429,7 +431,7 @@
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes"> Add a game tyu directory to the list</property> <property name="tooltip-text" translatable="yes"> Add a game tyu directory to the list</property>
<signal name="toggled" handler="Include_exclude_Pressed" swapped="no"/> <signal name="toggled" handler="Include_exclude_Pressed" swapped="no"/>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>