From 6306f55cbcc78692dd19fe582be7a442cce31943 Mon Sep 17 00:00:00 2001 From: Brian Date: Sun, 22 Dec 2013 16:07:36 -0700 Subject: [PATCH] Reorganizing files. Moving around the resx files and the texture files. Still have some warnings to clean up, and two exceptions dealing the location of the resources (only an issue in this build, never had a problem in older builds until I setup this github version). --- code/build/About.cs | 20 +++ code/build/About.designer.cs | 99 +++++++++++ code/build/FileWatcher.csproj | 121 +++++++------ .../{ => Properties}/FileGroupSettings.resx | 0 code/build/{ => Properties}/FileGroupTab.resx | 0 code/build/{ => Properties}/Form1.resx | 0 code/build/{ => Properties}/NewFileGroup.resx | 0 code/build/{ => Properties}/Preferences.resx | 0 code/build/Properties/Resources.resx | 164 +++++++++++++----- .../build/{ => Properties}/ScriptManager.resx | 0 .../{About.resx => Resources/Form1.resx} | 55 +++++- .../build/Resources}/arrow_fat_down.gif | Bin .../build/Resources}/arrow_fat_up.gif | Bin .../build/Resources}/arrow_mini_down.gif | Bin .../build/Resources}/arrow_mini_up.gif | Bin {data => code/build/Resources}/block.gif | Bin {data => code/build/Resources}/cross.gif | Bin {data => code/build/Resources}/drop_box.gif | Bin {data => code/build/Resources}/folder.gif | Bin {data => code/build/Resources}/play.png | Bin {data => code/build/Resources}/plus.gif | Bin {data => code/build/Resources}/save.gif | Bin {data => code/build/Resources}/script.gif | Bin {data => code/build/Resources}/settings.png | Bin .../stock_3d-texture-and-shading_128x128.ico | Bin .../stock_3d-texture-and-shading_128x128.png | Bin .../stock_3d-texture-and-shading_16x16.ico | Bin .../stock_3d-texture-and-shading_16x16.png | Bin .../stock_3d-texture-and-shading_256x256.ico | Bin .../stock_3d-texture-and-shading_256x256.png | Bin .../stock_3d-texture-and-shading_32x32.ico | Bin .../stock_3d-texture-and-shading_32x32.png | Bin .../stock_3d-texture-and-shading_48x48.png | Bin .../stock_3d-texture-spherical_128x128.ico | Bin .../stock_3d-texture-spherical_128x128.png | Bin .../stock_3d-texture-spherical_16x16.ico | Bin .../stock_3d-texture-spherical_16x16.png | Bin .../stock_3d-texture-spherical_256x256.ico | Bin .../stock_3d-texture-spherical_256x256.png | Bin .../stock_3d-texture-spherical_32x32.ico | Bin .../stock_3d-texture-spherical_32x32.png | Bin .../stock_3d-texture-spherical_48x48.png | Bin {data => code/build/Resources}/stop.png | Bin {data => code/build/Resources}/trash.gif | Bin {data => code/build/Resources}/warning.gif | Bin code/src/Form1.cs | 1 - 46 files changed, 351 insertions(+), 109 deletions(-) create mode 100644 code/build/About.cs create mode 100644 code/build/About.designer.cs rename code/build/{ => Properties}/FileGroupSettings.resx (100%) rename code/build/{ => Properties}/FileGroupTab.resx (100%) rename code/build/{ => Properties}/Form1.resx (100%) rename code/build/{ => Properties}/NewFileGroup.resx (100%) rename code/build/{ => Properties}/Preferences.resx (100%) rename code/build/{ => Properties}/ScriptManager.resx (100%) rename code/build/{About.resx => Resources/Form1.resx} (80%) rename {data => code/build/Resources}/arrow_fat_down.gif (100%) rename {data => code/build/Resources}/arrow_fat_up.gif (100%) rename {data => code/build/Resources}/arrow_mini_down.gif (100%) rename {data => code/build/Resources}/arrow_mini_up.gif (100%) rename {data => code/build/Resources}/block.gif (100%) rename {data => code/build/Resources}/cross.gif (100%) rename {data => code/build/Resources}/drop_box.gif (100%) rename {data => code/build/Resources}/folder.gif (100%) rename {data => code/build/Resources}/play.png (100%) rename {data => code/build/Resources}/plus.gif (100%) rename {data => code/build/Resources}/save.gif (100%) rename {data => code/build/Resources}/script.gif (100%) rename {data => code/build/Resources}/settings.png (100%) rename {data => code/build/Resources}/stock_3d-texture-and-shading_128x128.ico (100%) rename {data => code/build/Resources}/stock_3d-texture-and-shading_128x128.png (100%) rename {data => code/build/Resources}/stock_3d-texture-and-shading_16x16.ico (100%) rename {data => code/build/Resources}/stock_3d-texture-and-shading_16x16.png (100%) rename {data => code/build/Resources}/stock_3d-texture-and-shading_256x256.ico (100%) rename {data => code/build/Resources}/stock_3d-texture-and-shading_256x256.png (100%) rename {data => code/build/Resources}/stock_3d-texture-and-shading_32x32.ico (100%) rename {data => code/build/Resources}/stock_3d-texture-and-shading_32x32.png (100%) rename {data => code/build/Resources}/stock_3d-texture-and-shading_48x48.png (100%) rename {data => code/build/Resources}/stock_3d-texture-spherical_128x128.ico (100%) rename {data => code/build/Resources}/stock_3d-texture-spherical_128x128.png (100%) rename {data => code/build/Resources}/stock_3d-texture-spherical_16x16.ico (100%) rename {data => code/build/Resources}/stock_3d-texture-spherical_16x16.png (100%) rename {data => code/build/Resources}/stock_3d-texture-spherical_256x256.ico (100%) rename {data => code/build/Resources}/stock_3d-texture-spherical_256x256.png (100%) rename {data => code/build/Resources}/stock_3d-texture-spherical_32x32.ico (100%) rename {data => code/build/Resources}/stock_3d-texture-spherical_32x32.png (100%) rename {data => code/build/Resources}/stock_3d-texture-spherical_48x48.png (100%) rename {data => code/build/Resources}/stop.png (100%) rename {data => code/build/Resources}/trash.gif (100%) rename {data => code/build/Resources}/warning.gif (100%) diff --git a/code/build/About.cs b/code/build/About.cs new file mode 100644 index 0000000..422311f --- /dev/null +++ b/code/build/About.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace FileWatcher +{ + public partial class About : Form + { + public About() + { + InitializeComponent(); + } + } +} diff --git a/code/build/About.designer.cs b/code/build/About.designer.cs new file mode 100644 index 0000000..5d43b90 --- /dev/null +++ b/code/build/About.designer.cs @@ -0,0 +1,99 @@ +namespace FileWatcher +{ + partial class About + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(About)); + this.button1 = new System.Windows.Forms.Button(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.richTextBox1 = new System.Windows.Forms.RichTextBox(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.SuspendLayout(); + // + // button1 + // + this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.button1.Location = new System.Drawing.Point(379, 151); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(75, 23); + this.button1.TabIndex = 1; + this.button1.Text = "Ok"; + this.button1.UseVisualStyleBackColor = true; + // + // pictureBox1 + // + this.pictureBox1.Image = global::FileWatcher.Properties.Resources.stock_3d_texture_and_shading_128x128; + this.pictureBox1.Location = new System.Drawing.Point(12, 12); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(131, 135); + this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.pictureBox1.TabIndex = 0; + this.pictureBox1.TabStop = false; + // + // richTextBox1 + // + this.richTextBox1.BackColor = System.Drawing.SystemColors.ActiveCaption; + this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.richTextBox1.Location = new System.Drawing.Point(149, 12); + this.richTextBox1.Name = "richTextBox1"; + this.richTextBox1.Size = new System.Drawing.Size(305, 133); + this.richTextBox1.TabIndex = 2; + this.richTextBox1.Text = resources.GetString("richTextBox1.Text"); + // + // About + // + this.AcceptButton = this.button1; + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.CancelButton = this.button1; + this.ClientSize = new System.Drawing.Size(466, 186); + this.Controls.Add(this.richTextBox1); + this.Controls.Add(this.button1); + this.Controls.Add(this.pictureBox1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "About"; + this.ShowIcon = false; + this.ShowInTaskbar = false; + this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide; + this.Text = "About"; + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.PictureBox pictureBox1; + private System.Windows.Forms.Button button1; + private System.Windows.Forms.RichTextBox richTextBox1; + } +} \ No newline at end of file diff --git a/code/build/FileWatcher.csproj b/code/build/FileWatcher.csproj index 8d31717..fd3c571 100644 --- a/code/build/FileWatcher.csproj +++ b/code/build/FileWatcher.csproj @@ -80,31 +80,25 @@ - - Form - - - ..\src\About.cs - Form - ..\src\FileGroupSettings.cs + FileGroupSettings.cs UserControl - ..\src\FileGroupTab.cs + FileGroupTab.cs Form - ..\src\Form1.cs + Form1.cs @@ -112,16 +106,22 @@ Form - ..\src\NewFileGroup.cs + NewFileGroup.cs Form - ..\src\Preferences.cs + Preferences.cs + + Form + + + About.cs + True @@ -135,47 +135,42 @@ Form - ..\src\ScriptManager.cs + ScriptManager.cs Component - - ..\src\About.cs + + ..\..\src\FileGroupSettings.cs - - ..\src\FileGroupSettings.cs + + + ..\..\src\FileGroupTab.cs - - ..\src\FileGroupTab.cs + + ..\..\src\Form1.cs - - ..\src\Form1.cs - - - ..\src\NewFileGroup.cs - - - ..\src\Preferences.cs + + + ..\..\src\Preferences.cs ResXFileCodeGenerator Designer - ..\src\Resources.Designer.cs + Resources1.Designer.cs - - ..\src\ScriptManager.cs + + ..\..\src\ScriptManager.cs SettingsSingleFileGenerator - ..\src\Settings.Designer.cs True - ..\src\Settings.settings + Settings.settings True @@ -183,36 +178,40 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/build/FileGroupSettings.resx b/code/build/Properties/FileGroupSettings.resx similarity index 100% rename from code/build/FileGroupSettings.resx rename to code/build/Properties/FileGroupSettings.resx diff --git a/code/build/FileGroupTab.resx b/code/build/Properties/FileGroupTab.resx similarity index 100% rename from code/build/FileGroupTab.resx rename to code/build/Properties/FileGroupTab.resx diff --git a/code/build/Form1.resx b/code/build/Properties/Form1.resx similarity index 100% rename from code/build/Form1.resx rename to code/build/Properties/Form1.resx diff --git a/code/build/NewFileGroup.resx b/code/build/Properties/NewFileGroup.resx similarity index 100% rename from code/build/NewFileGroup.resx rename to code/build/Properties/NewFileGroup.resx diff --git a/code/build/Preferences.resx b/code/build/Properties/Preferences.resx similarity index 100% rename from code/build/Preferences.resx rename to code/build/Properties/Preferences.resx diff --git a/code/build/Properties/Resources.resx b/code/build/Properties/Resources.resx index 5f49419..aa935e6 100644 --- a/code/build/Properties/Resources.resx +++ b/code/build/Properties/Resources.resx @@ -118,52 +118,136 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\..\..\data\plus.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\..\..\data\folder.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\..\..\data\block.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\..\..\data\arrow_fat_down.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\..\..\data\save.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\..\..\data\cross.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\..\..\data\drop_box.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\..\..\data\warning.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\..\..\data\stock_3d-texture-and-shading_256x256.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\..\..\data\stock_3d-texture-and-shading_128x128.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\..\..\data\settings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\..\..\data\script.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\..\..\data\trash.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\arrow_fat_down.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\..\..\data\arrow_fat_up.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\arrow_fat_up.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\arrow_mini_down.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\arrow_mini_up.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\block.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\cross.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\drop_box.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\folder.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\..\..\data\play.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\play.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\plus.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\save.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\script.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\settings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\stock_3d-texture-and-shading_128x128.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\stock_3d-texture-and-shading_128x128.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\stock_3d-texture-and-shading_128x128.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\stock_3d-texture-and-shading_16x16.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\stock_3d-texture-and-shading_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\stock_3d-texture-and-shading_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\stock_3d-texture-and-shading_256x256.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\stock_3d-texture-and-shading_256x256.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\stock_3d-texture-and-shading_256x256.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\stock_3d-texture-and-shading_32x32.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\stock_3d-texture-and-shading_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\stock_3d-texture-and-shading_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\stock_3d-texture-and-shading_48x48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\stock_3d-texture-and-shading_48x48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\stock_3d-texture-spherical_128x128.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\stock_3d-texture-spherical_128x128.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\stock_3d-texture-spherical_128x128.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\stock_3d-texture-spherical_16x16.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\stock_3d-texture-spherical_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\stock_3d-texture-spherical_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\stock_3d-texture-spherical_256x256.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\stock_3d-texture-spherical_256x256.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\stock_3d-texture-spherical_256x256.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\stock_3d-texture-spherical_32x32.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\stock_3d-texture-spherical_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\stock_3d-texture-spherical_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\stock_3d-texture-spherical_48x48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\stock_3d-texture-spherical_48x48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\..\..\data\stop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\stop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\trash.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\warning.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/code/build/ScriptManager.resx b/code/build/Properties/ScriptManager.resx similarity index 100% rename from code/build/ScriptManager.resx rename to code/build/Properties/ScriptManager.resx diff --git a/code/build/About.resx b/code/build/Resources/Form1.resx similarity index 80% rename from code/build/About.resx rename to code/build/Resources/Form1.resx index a433657..33f751c 100644 --- a/code/build/About.resx +++ b/code/build/Resources/Form1.resx @@ -117,14 +117,55 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - This tool used to be a TextureConverter, so icons are no longer relevant, and they may be changed at some point. - -FileWatcher is a file monitor that runs python scripts when file changes happen. It's not fully fleshed out, and since time is precious, some features are incomplete or may not work as expected. - -This program was compiled with IronPython 2.7, so it is only gauranteed to be compatible with Python 2.7. IronPython 2.7 also requires at least .NET 4.0. Unfortunately IronPython is a port of Python for .NET, so it's missing certain features and has certain bugs. I'll try to figure out a better solution, but until then we have to deal with what we've got; for now, we have to use IronPython's version of the Python Standard Library, instead of 2.7.3. - + + 17, 17 + + + 291, 17 + + + 606, 56 + + + 501, 56 + + + 786, 17 + + + 17, 56 + + + + AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAAJ0EAACdBAAAAAAAAAAA + AAD///8A////AP///wD///8AAAAAAQAAAAMAAAAGAAAACAAAAAgAAAAHAAAABAAAAAL///8A////AP// + /wD///8A////AP///wD///8AAAAAAwAAAAsAAAAXAAAAJAAAADAAAAAyAAAALAAAAB8AAAASAAAABwAA + AAH///8A////AP///wD///8AAAAAAQAAAAcDAwIjRT4ylXZrXMGhmYrisa6h45CKfspdVUuhAgIBNAAA + ABMAAAAD////AP///wD///8A////AP///wAuKRxGj4V12L+xnf/PxK//5+HS/+rm1v/d1cL/1Mq5/5KG + dtQzLCBFAAAAAf///wD///8A////AP///wAwKhw/cWNI8q2chf/Rxrb/0sm1/+DZyf/h28r/2tK//97X + yf+6qpP/k4Ns8kc/MUD///8A////AP///wAWFREHeXBe1p+Rev+nk3j/w7ah/9jPwP/Hu6L/yr6l/+jj + 2f/Jvaj/vKyV/7utmP+WjX3ZDQsHB////wD///8APjcne4F0Wv+qnIf/vrGd/72umP/LwK3/5+LY/+fi + 2P/Jvaj/yb2p/8S3pP/Guqr/l4hv/1FKOnz///8A////AFVOOqt9b1T/lIRr/8K2pf/Iu6r/1cy//97X + zP/f2M3/2dDD/9LIuf/Iu6r/oZB2/5iJcP9lW0ms////AP///wBVTDfQjoNs/6abhf+zp5P/5d/Y/93U + yv/Huqj/x7qp/+zo4v/h29L/uq2a/8rCtf+WiXL/bmRR0v///wD///8AVEw30IyAav+9tqj/t62c/+fj + 3f/d1s3/xLmo/8W6qf/t6uX/4tzV/7yyof/V0Mb/mo14/2phTtL///8A////AEdALKmFe2T/wryw/+Dc + 1f/IwLP/19HG/+/t6f/z8e7/0szB/9bQxv/p5uH/urKk/5aMd/9vaFi0////AP///wBCPS5/oZqJ/9PP + xv/Iwrf/087E/9rWzf/l4tz/5+Pe/9vWz//W0cj/0czD/+He1/+mn47/Ukw+gv///wD///8AEQ8MB4F8 + bNvEwLX/zcm//97b1f/l497/xsC1/8bAtf/x7+z/2NTM/8/Lwv/Lx73/hYBw2wkHAwf///8A////AP// + /wArJhc+p6KV+drY0f/d29X/zcnA/+7s6f/s6uf/zcm//+vq5v/Y1c7/qaWY+S0oGT7///8A////AP// + /wD///8A////AE5LP0vGw7zu19TO/+De2f/i4Nv/4uDb/97c1v/e3Nf/xsS97kdEN0n///8A////AP// + /wD///8A////AP///wD///8AFhQRB3ZzZ4+xrqbRwL627cC+tu2pppzNfXpukggGAgf///8A////AP// + /wD///8A8A8AAOADAADAAwAA4AMAAMADAACAAQAAgAEAAIABAACAAQAAgAEAAIABAACAAQAAgAEAAMAD + AADgBwAA8A8AAA== + + + + 157, 56 + + + 95 + AAABAAIAICAAAAEAIACoEAAAJgAAABAQAAABACAAaAQAAM4QAAAoAAAAIAAAAEAAAAABACAAAAAAAAAQ diff --git a/data/arrow_fat_down.gif b/code/build/Resources/arrow_fat_down.gif similarity index 100% rename from data/arrow_fat_down.gif rename to code/build/Resources/arrow_fat_down.gif diff --git a/data/arrow_fat_up.gif b/code/build/Resources/arrow_fat_up.gif similarity index 100% rename from data/arrow_fat_up.gif rename to code/build/Resources/arrow_fat_up.gif diff --git a/data/arrow_mini_down.gif b/code/build/Resources/arrow_mini_down.gif similarity index 100% rename from data/arrow_mini_down.gif rename to code/build/Resources/arrow_mini_down.gif diff --git a/data/arrow_mini_up.gif b/code/build/Resources/arrow_mini_up.gif similarity index 100% rename from data/arrow_mini_up.gif rename to code/build/Resources/arrow_mini_up.gif diff --git a/data/block.gif b/code/build/Resources/block.gif similarity index 100% rename from data/block.gif rename to code/build/Resources/block.gif diff --git a/data/cross.gif b/code/build/Resources/cross.gif similarity index 100% rename from data/cross.gif rename to code/build/Resources/cross.gif diff --git a/data/drop_box.gif b/code/build/Resources/drop_box.gif similarity index 100% rename from data/drop_box.gif rename to code/build/Resources/drop_box.gif diff --git a/data/folder.gif b/code/build/Resources/folder.gif similarity index 100% rename from data/folder.gif rename to code/build/Resources/folder.gif diff --git a/data/play.png b/code/build/Resources/play.png similarity index 100% rename from data/play.png rename to code/build/Resources/play.png diff --git a/data/plus.gif b/code/build/Resources/plus.gif similarity index 100% rename from data/plus.gif rename to code/build/Resources/plus.gif diff --git a/data/save.gif b/code/build/Resources/save.gif similarity index 100% rename from data/save.gif rename to code/build/Resources/save.gif diff --git a/data/script.gif b/code/build/Resources/script.gif similarity index 100% rename from data/script.gif rename to code/build/Resources/script.gif diff --git a/data/settings.png b/code/build/Resources/settings.png similarity index 100% rename from data/settings.png rename to code/build/Resources/settings.png diff --git a/data/stock_3d-texture-and-shading_128x128.ico b/code/build/Resources/stock_3d-texture-and-shading_128x128.ico similarity index 100% rename from data/stock_3d-texture-and-shading_128x128.ico rename to code/build/Resources/stock_3d-texture-and-shading_128x128.ico diff --git a/data/stock_3d-texture-and-shading_128x128.png b/code/build/Resources/stock_3d-texture-and-shading_128x128.png similarity index 100% rename from data/stock_3d-texture-and-shading_128x128.png rename to code/build/Resources/stock_3d-texture-and-shading_128x128.png diff --git a/data/stock_3d-texture-and-shading_16x16.ico b/code/build/Resources/stock_3d-texture-and-shading_16x16.ico similarity index 100% rename from data/stock_3d-texture-and-shading_16x16.ico rename to code/build/Resources/stock_3d-texture-and-shading_16x16.ico diff --git a/data/stock_3d-texture-and-shading_16x16.png b/code/build/Resources/stock_3d-texture-and-shading_16x16.png similarity index 100% rename from data/stock_3d-texture-and-shading_16x16.png rename to code/build/Resources/stock_3d-texture-and-shading_16x16.png diff --git a/data/stock_3d-texture-and-shading_256x256.ico b/code/build/Resources/stock_3d-texture-and-shading_256x256.ico similarity index 100% rename from data/stock_3d-texture-and-shading_256x256.ico rename to code/build/Resources/stock_3d-texture-and-shading_256x256.ico diff --git a/data/stock_3d-texture-and-shading_256x256.png b/code/build/Resources/stock_3d-texture-and-shading_256x256.png similarity index 100% rename from data/stock_3d-texture-and-shading_256x256.png rename to code/build/Resources/stock_3d-texture-and-shading_256x256.png diff --git a/data/stock_3d-texture-and-shading_32x32.ico b/code/build/Resources/stock_3d-texture-and-shading_32x32.ico similarity index 100% rename from data/stock_3d-texture-and-shading_32x32.ico rename to code/build/Resources/stock_3d-texture-and-shading_32x32.ico diff --git a/data/stock_3d-texture-and-shading_32x32.png b/code/build/Resources/stock_3d-texture-and-shading_32x32.png similarity index 100% rename from data/stock_3d-texture-and-shading_32x32.png rename to code/build/Resources/stock_3d-texture-and-shading_32x32.png diff --git a/data/stock_3d-texture-and-shading_48x48.png b/code/build/Resources/stock_3d-texture-and-shading_48x48.png similarity index 100% rename from data/stock_3d-texture-and-shading_48x48.png rename to code/build/Resources/stock_3d-texture-and-shading_48x48.png diff --git a/data/stock_3d-texture-spherical_128x128.ico b/code/build/Resources/stock_3d-texture-spherical_128x128.ico similarity index 100% rename from data/stock_3d-texture-spherical_128x128.ico rename to code/build/Resources/stock_3d-texture-spherical_128x128.ico diff --git a/data/stock_3d-texture-spherical_128x128.png b/code/build/Resources/stock_3d-texture-spherical_128x128.png similarity index 100% rename from data/stock_3d-texture-spherical_128x128.png rename to code/build/Resources/stock_3d-texture-spherical_128x128.png diff --git a/data/stock_3d-texture-spherical_16x16.ico b/code/build/Resources/stock_3d-texture-spherical_16x16.ico similarity index 100% rename from data/stock_3d-texture-spherical_16x16.ico rename to code/build/Resources/stock_3d-texture-spherical_16x16.ico diff --git a/data/stock_3d-texture-spherical_16x16.png b/code/build/Resources/stock_3d-texture-spherical_16x16.png similarity index 100% rename from data/stock_3d-texture-spherical_16x16.png rename to code/build/Resources/stock_3d-texture-spherical_16x16.png diff --git a/data/stock_3d-texture-spherical_256x256.ico b/code/build/Resources/stock_3d-texture-spherical_256x256.ico similarity index 100% rename from data/stock_3d-texture-spherical_256x256.ico rename to code/build/Resources/stock_3d-texture-spherical_256x256.ico diff --git a/data/stock_3d-texture-spherical_256x256.png b/code/build/Resources/stock_3d-texture-spherical_256x256.png similarity index 100% rename from data/stock_3d-texture-spherical_256x256.png rename to code/build/Resources/stock_3d-texture-spherical_256x256.png diff --git a/data/stock_3d-texture-spherical_32x32.ico b/code/build/Resources/stock_3d-texture-spherical_32x32.ico similarity index 100% rename from data/stock_3d-texture-spherical_32x32.ico rename to code/build/Resources/stock_3d-texture-spherical_32x32.ico diff --git a/data/stock_3d-texture-spherical_32x32.png b/code/build/Resources/stock_3d-texture-spherical_32x32.png similarity index 100% rename from data/stock_3d-texture-spherical_32x32.png rename to code/build/Resources/stock_3d-texture-spherical_32x32.png diff --git a/data/stock_3d-texture-spherical_48x48.png b/code/build/Resources/stock_3d-texture-spherical_48x48.png similarity index 100% rename from data/stock_3d-texture-spherical_48x48.png rename to code/build/Resources/stock_3d-texture-spherical_48x48.png diff --git a/data/stop.png b/code/build/Resources/stop.png similarity index 100% rename from data/stop.png rename to code/build/Resources/stop.png diff --git a/data/trash.gif b/code/build/Resources/trash.gif similarity index 100% rename from data/trash.gif rename to code/build/Resources/trash.gif diff --git a/data/warning.gif b/code/build/Resources/warning.gif similarity index 100% rename from data/warning.gif rename to code/build/Resources/warning.gif diff --git a/code/src/Form1.cs b/code/src/Form1.cs index c5e661a..5c5abbd 100644 --- a/code/src/Form1.cs +++ b/code/src/Form1.cs @@ -29,7 +29,6 @@ namespace FileWatcher public TabPage m_TabPageReference = null; private ScriptEngine pyEngine = null; - private ScriptRuntime pyRuntime = null; private ScriptScope pyScope = null; private EventRaisingStreamWriter m_LogStream = null;