diff --git a/Eve-O-Preview/Eve-O-Preview.csproj b/Eve-O-Preview/Eve-O-Preview.csproj
index 2f6ff94..71ecbe9 100644
--- a/Eve-O-Preview/Eve-O-Preview.csproj
+++ b/Eve-O-Preview/Eve-O-Preview.csproj
@@ -102,25 +102,25 @@
-
+
Form
-
- PreviewHandler.cs
+
+ MainForm.cs
-
+
Form
-
+
PreviewOverlay.cs
-
+
Designer
- PreviewHandler.cs
+ MainForm.cs
-
+
PreviewOverlay.cs
@@ -128,7 +128,7 @@
Resources.Designer.cs
Designer
-
+
Designer
Preview.cs
@@ -151,10 +151,10 @@
Settings.settings
True
-
+
Form
-
+
Preview.cs
diff --git a/Eve-O-Preview/PreviewHandler.Designer.cs b/Eve-O-Preview/GUI/MainForm.Designer.cs
similarity index 97%
rename from Eve-O-Preview/PreviewHandler.Designer.cs
rename to Eve-O-Preview/GUI/MainForm.Designer.cs
index 5201d99..802defc 100644
--- a/Eve-O-Preview/PreviewHandler.Designer.cs
+++ b/Eve-O-Preview/GUI/MainForm.Designer.cs
@@ -8,7 +8,7 @@ using System.Diagnostics;
namespace EveOPreview
{
- partial class PreviewToyHandler
+ partial class MainForm
{
///
/// Required designer variable.
@@ -37,7 +37,7 @@ namespace EveOPreview
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PreviewToyHandler));
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
this.option_hide_active = new System.Windows.Forms.CheckBox();
this.option_hide_all_if_not_right_type = new System.Windows.Forms.CheckBox();
this.option_unique_layout = new System.Windows.Forms.CheckBox();
@@ -566,7 +566,7 @@ namespace EveOPreview
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Margin = new System.Windows.Forms.Padding(0);
this.MaximizeBox = false;
- this.Name = "PreviewToyHandler";
+ this.Name = "MainForm";
this.Text = "EVE Online previewer";
this.TopMost = true;
this.WindowState = System.Windows.Forms.FormWindowState.Minimized;
diff --git a/Eve-O-Preview/PreviewHandler.cs b/Eve-O-Preview/GUI/MainForm.cs
similarity index 88%
rename from Eve-O-Preview/PreviewHandler.cs
rename to Eve-O-Preview/GUI/MainForm.cs
index ce325e0..21af088 100644
--- a/Eve-O-Preview/PreviewHandler.cs
+++ b/Eve-O-Preview/GUI/MainForm.cs
@@ -1,23 +1,16 @@
using System;
using System.Collections.Generic;
-using System.ComponentModel;
using System.Drawing;
-using System.Drawing.Drawing2D;
-using System.Text;
using System.Windows.Forms;
using System.Runtime.InteropServices;
using System.Diagnostics;
-using System.Drawing.Text;
using System.Windows.Threading;
using System.Xml.Linq;
-using System.Linq;
-
using System.IO;
namespace EveOPreview
{
-
- public partial class PreviewToyHandler : Form
+ public partial class MainForm : Form
{
private const int WM_SIZE = 5;
private const int SIZE_RESTORED = 0;
@@ -31,11 +24,11 @@ namespace EveOPreview
public event EventHandler Restored;
- private Dictionary previews;
- private DispatcherTimer dispatcherTimer;
+ private readonly Dictionary _previews;
+ private DispatcherTimer _dispatcherTimer;
- private IntPtr active_client_handle = (IntPtr)0;
- private String active_client_title = "";
+ private IntPtr _activeClientHandle;
+ private String _activeClientTitle;
private Dictionary> unique_layouts;
private Dictionary flat_layout;
@@ -85,11 +78,14 @@ namespace EveOPreview
private Dictionary zoom_anchor_button_map;
- public PreviewToyHandler()
+ public MainForm()
{
is_initialized = false;
- previews = new Dictionary();
+ this._activeClientHandle = (IntPtr)0;
+ this._activeClientTitle = "";
+
+ _previews = new Dictionary();
xml_bad_to_ok_chars = new Dictionary();
xml_bad_to_ok_chars["<"] = "---lt---";
@@ -112,10 +108,10 @@ namespace EveOPreview
init_options();
// DispatcherTimer setup
- dispatcherTimer = new DispatcherTimer();
- dispatcherTimer.Tick += new EventHandler(dispatcherTimer_Tick);
- dispatcherTimer.Interval = new TimeSpan(0, 0, 1);
- dispatcherTimer.Start();
+ _dispatcherTimer = new DispatcherTimer();
+ _dispatcherTimer.Tick += new EventHandler(dispatcherTimer_Tick);
+ _dispatcherTimer.Interval = new TimeSpan(0, 0, 1);
+ _dispatcherTimer.Start();
is_initialized = true;
@@ -195,46 +191,46 @@ namespace EveOPreview
sync_size.Width = (int)Properties.Settings.Default.sync_resize_x;
sync_size.Height = (int)Properties.Settings.Default.sync_resize_y;
- if (!previews.ContainsKey(process.MainWindowHandle) && process.MainWindowTitle != "")
+ if (!_previews.ContainsKey(process.MainWindowHandle) && process.MainWindowTitle != "")
{
- previews[process.MainWindowHandle] = new Preview(process.MainWindowHandle, "...", this, sync_size);
- previews[process.MainWindowHandle].set_render_area_size(sync_size);
+ _previews[process.MainWindowHandle] = new Preview(process.MainWindowHandle, "...", this, sync_size);
+ _previews[process.MainWindowHandle].set_render_area_size(sync_size);
// apply more thumbnail specific options
- previews[process.MainWindowHandle].MakeTopMost(Properties.Settings.Default.always_on_top);
- set_thumbnail_frame_style(previews[process.MainWindowHandle], Properties.Settings.Default.show_thumb_frames);
+ _previews[process.MainWindowHandle].MakeTopMost(Properties.Settings.Default.always_on_top);
+ set_thumbnail_frame_style(_previews[process.MainWindowHandle], Properties.Settings.Default.show_thumb_frames);
// add a preview also
previews_check_listbox.BeginUpdate();
- previews_check_listbox.Items.Add(previews[process.MainWindowHandle]);
+ previews_check_listbox.Items.Add(_previews[process.MainWindowHandle]);
previews_check_listbox.EndUpdate();
refresh_client_window_locations(process);
}
- else if (previews.ContainsKey(process.MainWindowHandle) && process.MainWindowTitle != previews[process.MainWindowHandle].Text) //or update the preview titles
+ else if (_previews.ContainsKey(process.MainWindowHandle) && process.MainWindowTitle != _previews[process.MainWindowHandle].Text) //or update the preview titles
{
- previews[process.MainWindowHandle].SetLabel(process.MainWindowTitle);
- string key = previews[process.MainWindowHandle].Text;
+ _previews[process.MainWindowHandle].SetLabel(process.MainWindowTitle);
+ string key = _previews[process.MainWindowHandle].Text;
string value;
if (flat_layout_shortcuts.TryGetValue(key, out value))
{
- previews[process.MainWindowHandle].registerShortcut(value);
+ _previews[process.MainWindowHandle].registerShortcut(value);
}
refresh_client_window_locations(process);
}
if (process.MainWindowHandle == DwmApiNativeMethods.GetForegroundWindow())
{
- active_client_handle = process.MainWindowHandle;
- active_client_title = process.MainWindowTitle;
+ _activeClientHandle = process.MainWindowHandle;
+ _activeClientTitle = process.MainWindowTitle;
}
}
// clean up old previews
List to_be_pruned = new List();
- foreach (IntPtr processHandle in previews.Keys)
+ foreach (IntPtr processHandle in _previews.Keys)
{
if (!(processHandles.Contains(processHandle)))
{
@@ -245,12 +241,12 @@ namespace EveOPreview
foreach (IntPtr processHandle in to_be_pruned)
{
previews_check_listbox.BeginUpdate();
- previews_check_listbox.Items.Remove(previews[processHandle]);
+ previews_check_listbox.Items.Remove(_previews[processHandle]);
previews_check_listbox.EndUpdate();
- previews[processHandle].overlay.Close();
- previews[processHandle].Close();
- previews.Remove(processHandle);
+ _previews[processHandle].overlay.Close();
+ _previews[processHandle].Close();
+ _previews.Remove(processHandle);
}
previews_check_listbox.Update();
@@ -473,7 +469,7 @@ namespace EveOPreview
{
update_client_locations();
store_layout(); //todo: check if it actually changed ...
- foreach (KeyValuePair entry in previews)
+ foreach (KeyValuePair entry in _previews)
{
entry.Value.MakeTopMost(Properties.Settings.Default.always_on_top);
//makes the PreviewOverlay topmost
@@ -498,7 +494,7 @@ namespace EveOPreview
private bool window_is_preview_or_client(IntPtr window)
{
bool active_window_is_right_type = false;
- foreach (KeyValuePair entry in previews)
+ foreach (KeyValuePair entry in _previews)
{
if (entry.Key == window || entry.Value.Handle == window || this.Handle == window || entry.Value.overlay.Handle == window)
{
@@ -515,13 +511,13 @@ namespace EveOPreview
IntPtr active_window = DwmApiNativeMethods.GetForegroundWindow();
// hide, show, resize and move
- foreach (KeyValuePair entry in previews)
+ foreach (KeyValuePair entry in _previews)
{
if (!window_is_preview_or_client(active_window) && Properties.Settings.Default.hide_all)
{
entry.Value.Hide();
}
- else if (entry.Key == active_client_handle && Properties.Settings.Default.hide_active)
+ else if (entry.Key == _activeClientHandle && Properties.Settings.Default.hide_active)
{
entry.Value.Hide();
}
@@ -530,7 +526,7 @@ namespace EveOPreview
entry.Value.Show();
if (Properties.Settings.Default.unique_layout)
{
- handle_unique_layout(entry.Value, active_client_title);
+ handle_unique_layout(entry.Value, _activeClientTitle);
}
else
{
@@ -564,7 +560,7 @@ namespace EveOPreview
option_sync_size_x.Text = sync_size.Width.ToString();
option_sync_size_y.Text = sync_size.Height.ToString();
- foreach (KeyValuePair entry in previews)
+ foreach (KeyValuePair entry in _previews)
{
if (entry.Value.Handle != DwmApiNativeMethods.GetForegroundWindow())
{
@@ -583,14 +579,14 @@ namespace EveOPreview
if (Properties.Settings.Default.unique_layout)
{
Dictionary layout;
- if (unique_layouts.TryGetValue(active_client_title, out layout))
+ if (unique_layouts.TryGetValue(_activeClientTitle, out layout))
{
layout[preview_title] = position;
}
- else if (active_client_title == "")
+ else if (_activeClientTitle == "")
{
- unique_layouts[active_client_title] = new Dictionary();
- unique_layouts[active_client_title][preview_title] = position;
+ unique_layouts[_activeClientTitle] = new Dictionary();
+ unique_layouts[_activeClientTitle][preview_title] = position;
}
}
else
@@ -726,7 +722,7 @@ namespace EveOPreview
ignoring_size_sync.Start();
}
- foreach (var thumbnail in previews)
+ foreach (var thumbnail in _previews)
{
set_thumbnail_frame_style(thumbnail.Value, Properties.Settings.Default.show_thumb_frames);
}
diff --git a/Eve-O-Preview/PreviewHandler.resx b/Eve-O-Preview/GUI/MainForm.resx
similarity index 100%
rename from Eve-O-Preview/PreviewHandler.resx
rename to Eve-O-Preview/GUI/MainForm.resx
diff --git a/Eve-O-Preview/Preview.Designer.cs b/Eve-O-Preview/Preview/Preview.Designer.cs
similarity index 100%
rename from Eve-O-Preview/Preview.Designer.cs
rename to Eve-O-Preview/Preview/Preview.Designer.cs
diff --git a/Eve-O-Preview/Preview.cs b/Eve-O-Preview/Preview/Preview.cs
similarity index 90%
rename from Eve-O-Preview/Preview.cs
rename to Eve-O-Preview/Preview/Preview.cs
index 91d0556..53823b7 100644
--- a/Eve-O-Preview/Preview.cs
+++ b/Eve-O-Preview/Preview/Preview.cs
@@ -20,7 +20,7 @@ namespace EveOPreview
private DWM_THUMBNAIL_PROPERTIES m_ThumbnailProperties;
private bool has_been_set_up = false;
private bool thumbnail_has_been_set_up = false;
- private PreviewToyHandler spawner;
+ private MainForm spawner;
private Hotkey hotkey;
private bool hide = false;
@@ -44,7 +44,7 @@ namespace EveOPreview
this.TopMost = topmost && !(this.hide);
}
- public Preview(IntPtr sourceWindow, String title, PreviewToyHandler spawner, Size size)
+ public Preview(IntPtr sourceWindow, String title, MainForm spawner, Size size)
{
has_been_set_up = false;
@@ -138,34 +138,34 @@ namespace EveOPreview
Size = new Size((int)(hover_zoom_factor * (float)Size.Width), (int)(hover_zoom_factor * (float)Size.Height));
- switch ((PreviewToyHandler.zoom_anchor_t)Properties.Settings.Default.zoom_anchor)
+ switch ((MainForm.zoom_anchor_t)Properties.Settings.Default.zoom_anchor)
{
- case (PreviewToyHandler.zoom_anchor_t.NW):
+ case (MainForm.zoom_anchor_t.NW):
break;
- case (PreviewToyHandler.zoom_anchor_t.N):
+ case (MainForm.zoom_anchor_t.N):
Location = new Point(Location.X - Size.Width / 2 + old_size.Width / 2, Location.Y);
break;
- case (PreviewToyHandler.zoom_anchor_t.NE):
+ case (MainForm.zoom_anchor_t.NE):
Location = new Point(Location.X - Size.Width + old_size.Width, Location.Y);
break;
- case (PreviewToyHandler.zoom_anchor_t.W):
+ case (MainForm.zoom_anchor_t.W):
Location = new Point(Location.X, Location.Y - Size.Height / 2 + old_size.Height / 2);
break;
- case (PreviewToyHandler.zoom_anchor_t.C):
+ case (MainForm.zoom_anchor_t.C):
Location = new Point(Location.X - Size.Width / 2 + old_size.Width / 2, Location.Y - Size.Height / 2 + old_size.Height / 2);
break;
- case (PreviewToyHandler.zoom_anchor_t.E):
+ case (MainForm.zoom_anchor_t.E):
Location = new Point(Location.X - Size.Width + old_size.Width, Location.Y - Size.Height / 2 + old_size.Height / 2);
break;
- case (PreviewToyHandler.zoom_anchor_t.SW):
+ case (MainForm.zoom_anchor_t.SW):
Location = new Point(Location.X, Location.Y - Size.Height + old_size.Height);
break;
- case (PreviewToyHandler.zoom_anchor_t.S):
+ case (MainForm.zoom_anchor_t.S):
Location = new Point(Location.X - Size.Width / 2 + old_size.Width / 2, Location.Y - Size.Height + old_size.Height);
break;
- case (PreviewToyHandler.zoom_anchor_t.SE):
+ case (MainForm.zoom_anchor_t.SE):
Location = new Point(Location.X - Size.Width + old_size.Width, Location.Y - Size.Height + old_size.Height);
break;
}
diff --git a/Eve-O-Preview/Preview.resx b/Eve-O-Preview/Preview/Preview.resx
similarity index 100%
rename from Eve-O-Preview/Preview.resx
rename to Eve-O-Preview/Preview/Preview.resx
diff --git a/Eve-O-Preview/PreviewOverlay.Designer.cs b/Eve-O-Preview/Preview/PreviewOverlay.Designer.cs
similarity index 100%
rename from Eve-O-Preview/PreviewOverlay.Designer.cs
rename to Eve-O-Preview/Preview/PreviewOverlay.Designer.cs
diff --git a/Eve-O-Preview/PreviewOverlay.cs b/Eve-O-Preview/Preview/PreviewOverlay.cs
similarity index 100%
rename from Eve-O-Preview/PreviewOverlay.cs
rename to Eve-O-Preview/Preview/PreviewOverlay.cs
diff --git a/Eve-O-Preview/PreviewOverlay.resx b/Eve-O-Preview/Preview/PreviewOverlay.resx
similarity index 100%
rename from Eve-O-Preview/PreviewOverlay.resx
rename to Eve-O-Preview/Preview/PreviewOverlay.resx
diff --git a/Eve-O-Preview/Program.cs b/Eve-O-Preview/Program.cs
index 0a6d7ee..4373bcc 100644
--- a/Eve-O-Preview/Program.cs
+++ b/Eve-O-Preview/Program.cs
@@ -11,7 +11,7 @@ namespace EveOPreview
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(true);
- Application.Run(new PreviewToyHandler());
+ Application.Run(new MainForm());
}
}
}
\ No newline at end of file