Skip to content

Commit

Permalink
GSDumpGUI: Update textboxes after using the File Dialog.
Browse files Browse the repository at this point in the history 
Also, minor style changes.
  • Loading branch information
@KrossX @lightningterror
KrossX authored and lightningterror committed Aug 7, 2019
1 parent c14c23a commit 62c1fc6
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 36 deletions.
6 changes: 3 additions & 3 deletions tools/GSDumpGUI/Core/Program.cs
View file
Expand Up @@ -48,7 +48,7 @@ static class Program

static private TreeNode CurrentNode;
static public IntPtr hMainIcon;
static public bool prog_running;
static public bool isProgRunning;

[STAThread]
static void Main(String[] args)
Expand Down Expand Up @@ -118,14 +118,14 @@ static void Main(String[] args)
Server.OnClientAfterConnect += new TCPLibrary.Core.Server.ConnectedHandler(Server_OnClientAfterConnect);
Server.OnClientAfterDisconnected += new TCPLibrary.Core.Server.DisconnectedHandler(Server_OnClientAfterDisconnected);
Server.Enabled = true;
prog_running = true;
isProgRunning = true;

Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
frmMain = new GSDumpGUI();
Application.Run(frmMain);

prog_running = false;
isProgRunning = false;
Server.Enabled = false;
}
}
Expand Down
71 changes: 38 additions & 33 deletions tools/GSDumpGUI/Forms/frmMain.cs
View file
Expand Up @@ -94,12 +94,12 @@ public Int32 SelectedRad
private readonly GsDumps _availableGsDumps;
private readonly GsDlls _availableGsDlls;

private List<FileSystemWatcher> dll_watcher;
private List<FileSystemWatcher> dump_watcher;
private List<FileSystemWatcher> _dllWatcher;
private List<FileSystemWatcher> _dumpWatcher;

private ConcurrentQueue<int> watcher_events;
private ConcurrentQueue<int> _watcherEvents;

private string gsdx_path_old, dump_path_old;
private string _gsdxPathOld, _dumpPathOld;

public GSDumpGUI()
{
Expand All @@ -116,6 +116,12 @@ public GSDumpGUI()

_availableGsDumps.OnIndexUpdatedEvent += UpdatePreviewImage;

if (String.IsNullOrEmpty(Settings.GSDXDir))
Settings.GSDXDir = AppDomain.CurrentDomain.BaseDirectory;

if (String.IsNullOrEmpty(Settings.DumpDir))
Settings.DumpDir = AppDomain.CurrentDomain.BaseDirectory;

txtGSDXDirectory.Text = Settings.GSDXDir;
txtDumpsDirectory.Text = Settings.DumpDir;

Expand All @@ -126,46 +132,43 @@ public GSDumpGUI()

NoImage = CreateDefaultImage();

dll_watcher = new List<FileSystemWatcher>();
dump_watcher = new List<FileSystemWatcher>();
watcher_events = new ConcurrentQueue<int>();
_dllWatcher = new List<FileSystemWatcher>();
_dumpWatcher = new List<FileSystemWatcher>();
_watcherEvents = new ConcurrentQueue<int>();

Thread wt = new Thread(changes_watchdog_thread);
wt.Start();
Thread watcherThread = new Thread(ChangesWatchdogThread);
watcherThread.Start();
}

private void changes_watchdog_thread()
private void ChangesWatchdogThread()
{
while (Program.prog_running)
while (Program.isProgRunning)
{
bool dll_reload = false;
bool dump_reload = false;
bool dllReload = false;
bool dumpReload = false;

int evt;
while (watcher_events.TryDequeue(out evt))
while (_watcherEvents.TryDequeue(out evt))
{
if (evt == 1) dll_reload = true;
else if (evt == 2) dump_reload = true;
if (evt == 1) dllReload = true;
else if (evt == 2) dumpReload = true;
}

if (dll_reload) this.Invoke((MethodInvoker)delegate { ReloadGsdxDlls(); });
if (dump_reload) this.Invoke((MethodInvoker)delegate { ReloadGsdxDumps(); });
if (dllReload) this.Invoke((MethodInvoker)delegate { ReloadGsdxDlls(); });
if (dumpReload) this.Invoke((MethodInvoker)delegate { ReloadGsdxDumps(); });

Thread.Sleep(1000);
}
}


private void OnDllDirChange(object source, FileSystemEventArgs e)
{
watcher_events.Enqueue(1);
//ReloadGsdxDlls();
_watcherEvents.Enqueue(1);
}

private void OnDumpDirChange(object source, FileSystemEventArgs e)
{
watcher_events.Enqueue(2);
//ReloadGsdxDumps();
_watcherEvents.Enqueue(2);
}

private static void BindListControl<TModel, TElement>(ListControl lb, TModel model, Func<TModel, BindingList<TElement>> collectionAccessor, Expression<Func<TElement, string>> displayTextAccessor, Expression<Func<TModel, int>> selectedIndexAccessor)
Expand Down Expand Up @@ -204,13 +207,13 @@ private void ReloadGsdxDlls()

string[] paths = { "", "\\plugins", "\\dll", "\\dlls" };

foreach (FileSystemWatcher w in dll_watcher)
foreach (FileSystemWatcher w in _dllWatcher)
{
w.EnableRaisingEvents = false;
w.Dispose();
}

dll_watcher.Clear();
_dllWatcher.Clear();

for (int i = 0; i < 4; i++)
{
Expand All @@ -222,7 +225,7 @@ private void ReloadGsdxDlls()
w.Deleted += OnDllDirChange;
w.Renamed += OnDllDirChange;
w.EnableRaisingEvents = true;
dll_watcher.Add(w);
_dllWatcher.Add(w);
}
catch { }
}
Expand All @@ -243,13 +246,13 @@ private void ReloadGsdxDumps()

string[] paths = { "", "\\dumps", "\\gsdumps" };

foreach (FileSystemWatcher w in dump_watcher)
foreach (FileSystemWatcher w in _dumpWatcher)
{
w.EnableRaisingEvents = false;
w.Dispose();
}

dump_watcher.Clear();
_dumpWatcher.Clear();

for (int i = 0; i < 3; i++)
{
Expand All @@ -261,7 +264,7 @@ private void ReloadGsdxDumps()
w.Deleted += OnDumpDirChange;
w.Renamed += OnDumpDirChange;
w.EnableRaisingEvents = true;
dump_watcher.Add(w);
_dumpWatcher.Add(w);
}
catch { }
}
Expand Down Expand Up @@ -291,6 +294,7 @@ private void cmdBrowseGSDX_Click(object sender, EventArgs e)
string newpath = Path.GetDirectoryName(ofd.FileName);
if (!Settings.GSDXDir.ToLower().Equals(newpath.ToLower()))
{
txtGSDXDirectory.Text = newpath;
Settings.GSDXDir = newpath;
Settings.Save();
ReloadGsdxDlls();
Expand All @@ -313,6 +317,7 @@ private void cmdBrowseDumps_Click(object sender, EventArgs e)
string newpath = Path.GetDirectoryName(ofd.FileName);
if (!Settings.DumpDir.ToLower().Equals(newpath.ToLower()))
{
txtDumpsDirectory.Text = newpath;
Settings.DumpDir = newpath;
Settings.Save();
ReloadGsdxDumps();
Expand Down Expand Up @@ -506,20 +511,20 @@ private void rda_CheckedChanged(object sender, EventArgs e)

private void txtGSDXDirectory_Enter(object sender, EventArgs e)
{
gsdx_path_old = txtGSDXDirectory.Text;
_gsdxPathOld = txtGSDXDirectory.Text;
}

private void txtDumpsDirectory_Enter(object sender, EventArgs e)
{
dump_path_old = txtDumpsDirectory.Text;
_dumpPathOld = txtDumpsDirectory.Text;
}

private void txtGSDXDirectory_Leave(object sender, EventArgs e)
{
string newpath = txtGSDXDirectory.Text;

if (!String.IsNullOrEmpty(newpath) &&
!gsdx_path_old.ToLower().Equals(newpath.ToLower()) &&
!_gsdxPathOld.ToLower().Equals(newpath.ToLower()) &&
Directory.Exists(newpath))
{
Settings.GSDXDir = newpath;
Expand All @@ -534,7 +539,7 @@ private void txtDumpsDirectory_Leave(object sender, EventArgs e)
string newpath = txtDumpsDirectory.Text;

if (!String.IsNullOrEmpty(newpath) &&
!dump_path_old.ToLower().Equals(newpath.ToLower()) &&
!_dumpPathOld.ToLower().Equals(newpath.ToLower()) &&
Directory.Exists(newpath))
{
Settings.DumpDir = newpath;
Expand Down

0 comments on commit 62c1fc6

Please sign in to comment.