Index: /extensions/PiwigoLib/PiwigoLib/DTO/Helper/PwgEnumHelper.cs
===================================================================
--- /extensions/PiwigoLib/PiwigoLib/DTO/Helper/PwgEnumHelper.cs	(revision 13519)
+++ /extensions/PiwigoLib/PiwigoLib/DTO/Helper/PwgEnumHelper.cs	(revision 13520)
@@ -2,8 +2,9 @@
 using System.Reflection;
 using System.Xml.Serialization;
+using System.Collections.Generic;
 
 namespace Com.Piwigo.Lib.DTO.Helper
 {
-    internal static class PwgEnumHelper<T>
+    public static class PwgEnumHelper<T>
     {
         static PwgEnumHelper()
@@ -42,4 +43,16 @@
             throw new ArgumentException(String.Format("PwgEnumHelper<{0}>.enumValueOf({1}): The String is not a description or value of the specified enum.", typeof(T).Name, value));
         }
+
+        public static List<KeyValuePair<T, String>> buildChoiceList()
+        {
+            List<KeyValuePair<T, String>> lst = new List<KeyValuePair<T, String>>();
+
+            foreach (T item in Enum.GetValues(typeof(T)))
+	        {
+                lst.Add(new KeyValuePair<T, String>(item, StringValueOf(item)));
+	        }
+  
+            return lst;
+        }
     }
 }
Index: /extensions/PiwigoLib/PiwigoUpload/DTO/LocalPwgImage.cs
===================================================================
--- /extensions/PiwigoLib/PiwigoUpload/DTO/LocalPwgImage.cs	(revision 13519)
+++ /extensions/PiwigoLib/PiwigoUpload/DTO/LocalPwgImage.cs	(revision 13520)
@@ -65,6 +65,6 @@
         }
 
-        private PwgConfidentLevelEnum? _confidentialLevel;
-        public PwgConfidentLevelEnum? ConfidentialLevel
+        private PwgConfidentLevelEnum _confidentialLevel;
+        public PwgConfidentLevelEnum ConfidentialLevel
         {
             set { _confidentialLevel = value; OnPropertyChanged("ConfidentialLevel"); }
Index: /extensions/PiwigoLib/PiwigoUpload/DTO/ModelManager.cs
===================================================================
--- /extensions/PiwigoLib/PiwigoUpload/DTO/ModelManager.cs	(revision 13519)
+++ /extensions/PiwigoLib/PiwigoUpload/DTO/ModelManager.cs	(revision 13520)
@@ -72,4 +72,6 @@
             }
 
+            public System.Windows.Forms.TreeNode SelectedNode { get; set; }
+
             private LocalAlbum _AlbumEdited;
             public LocalAlbum AlbumEdited { 
@@ -148,4 +150,31 @@
                 } 
             }
+
+            private PwgUploadOption _uploadOption;
+            public PwgUploadOption UploadOption
+            { 
+                get {
+                    return _uploadOption;
+                }
+                set {
+                    _uploadOption = value;
+                    OnPropertyChanged("UploadOption"); 
+                } 
+            }
+
+            private List<KeyValuePair<PwgConfidentLevelEnum, String>> _lstConfidentLevel;
+            public List<KeyValuePair<PwgConfidentLevelEnum, String>> LstConfidentLevel
+            {
+                get
+                {
+                    return _lstConfidentLevel;
+                }
+                set
+                {
+                    _lstConfidentLevel = value;
+                    OnPropertyChanged("LstConfidentLevel"); 
+                }
+            }
+
 
             public ModelManagerBase()
@@ -157,4 +186,7 @@
                 AlbumEdited = new LocalAlbum();
                 ImageEdited = new LocalImage();
+                UploadOption = new PwgUploadOption();
+
+                LstConfidentLevel = Com.Piwigo.Lib.DTO.Helper.PwgEnumHelper<PwgConfidentLevelEnum>.buildChoiceList();
             }
 
@@ -178,4 +210,5 @@
                     PropertyChanged(this, new PropertyChangedEventArgs(info));
             }
+
         }
     }
Index: /extensions/PiwigoLib/PiwigoUpload/Helper/MainAppHelper.cs
===================================================================
--- /extensions/PiwigoLib/PiwigoUpload/Helper/MainAppHelper.cs	(revision 13519)
+++ /extensions/PiwigoLib/PiwigoUpload/Helper/MainAppHelper.cs	(revision 13520)
@@ -40,16 +40,20 @@
         internal static void BuildAlbumTree(System.Windows.Forms.TreeView aTree, LocalAlbumList lstAlbum)
         {
-            if (aTree.Nodes.Count > 0)
+            System.Windows.Forms.TreeNode root = aTree.Nodes[0];
+            if (root.Nodes.Count > 0)
             {
-                aTree.Nodes.Clear(); 
+                root.Nodes.Clear();
             }
+            //System.Windows.Forms.TreeNode root = new System.Windows.Forms.TreeNode("Albums", 0, 0);
+            //aTree.Nodes.Add(root);
+            //ModelManager.Instance.SelectedNode = root;
+            //aTree.SelectedNode = root;
 
-            System.Windows.Forms.TreeNode root = new System.Windows.Forms.TreeNode("Albums", 0, 0);
-            aTree.Nodes.Add(root);
-            
             foreach (LocalAlbum Alb in lstAlbum)
 	        {
                 root.Nodes.Add(buildAlbumToNode(Alb));
 	        }
+
+            aTree.ExpandAll();
         }
 
Index: /extensions/PiwigoLib/PiwigoUpload/MainForm.Designer.cs
===================================================================
--- /extensions/PiwigoLib/PiwigoUpload/MainForm.Designer.cs	(revision 13519)
+++ /extensions/PiwigoLib/PiwigoUpload/MainForm.Designer.cs	(revision 13520)
@@ -38,13 +38,12 @@
             this.AlbumsTV = new System.Windows.Forms.TreeView();
             this.imageListTV = new System.Windows.Forms.ImageList(this.components);
-            this.cbxLstCatTo = new System.Windows.Forms.ComboBox();
-            this.modelManagerBaseBindingSource = new System.Windows.Forms.BindingSource(this.components);
             this.lstCatBindingSource = new System.Windows.Forms.BindingSource(this.components);
-            this.label4 = new System.Windows.Forms.Label();
-            this.button2 = new System.Windows.Forms.Button();
             this.tbPassword = new System.Windows.Forms.TextBox();
             this.tbServer = new System.Windows.Forms.TextBox();
             this.tbUser = new System.Windows.Forms.TextBox();
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+            this.button2 = new System.Windows.Forms.Button();
+            this.label4 = new System.Windows.Forms.Label();
+            this.cbxLstCatTo = new System.Windows.Forms.ComboBox();
             this.tabControl1 = new System.Windows.Forms.TabControl();
             this.tabPageAlbum = new System.Windows.Forms.TabPage();
@@ -54,16 +53,36 @@
             this.label7 = new System.Windows.Forms.Label();
             this.txtAlbComment = new System.Windows.Forms.TextBox();
+            this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
             this.btnAlbumEditCancel = new System.Windows.Forms.Button();
             this.btnAlbumEditOk = new System.Windows.Forms.Button();
+            this.btnAlbDelete = new System.Windows.Forms.Button();
+            this.btnAlbumAjout = new System.Windows.Forms.Button();
             this.tabPageImg = new System.Windows.Forms.TabPage();
-            this.picshowImg = new System.Windows.Forms.PictureBox();
             this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
+            this.txtImgAuthor = new System.Windows.Forms.TextBox();
+            this.label9 = new System.Windows.Forms.Label();
             this.txtImgName = new System.Windows.Forms.TextBox();
             this.label6 = new System.Windows.Forms.Label();
             this.label8 = new System.Windows.Forms.Label();
-            this.button3 = new System.Windows.Forms.Button();
-            this.button4 = new System.Windows.Forms.Button();
             this.txtImgComment = new System.Windows.Forms.TextBox();
-            ((System.ComponentModel.ISupportInitialize)(this.modelManagerBaseBindingSource)).BeginInit();
+            this.label10 = new System.Windows.Forms.Label();
+            this.cbImgLevelEnum = new System.Windows.Forms.ComboBox();
+            this.lstConfidentLevelBindingSource = new System.Windows.Forms.BindingSource(this.components);
+            this.modelManagerBaseBindingSource = new System.Windows.Forms.BindingSource(this.components);
+            this.flowLayoutPanel2 = new System.Windows.Forms.FlowLayoutPanel();
+            this.btnImgEditCancel = new System.Windows.Forms.Button();
+            this.btnImgEditOk = new System.Windows.Forms.Button();
+            this.btnImgDelete = new System.Windows.Forms.Button();
+            this.btnImgAdd = new System.Windows.Forms.Button();
+            this.tabPageRoot = new System.Windows.Forms.TabPage();
+            this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel();
+            this.txtOptionAuthor = new System.Windows.Forms.TextBox();
+            this.label11 = new System.Windows.Forms.Label();
+            this.label12 = new System.Windows.Forms.Label();
+            this.cbOptionLevel = new System.Windows.Forms.ComboBox();
+            this.picshowImg = new System.Windows.Forms.PictureBox();
+            this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
+            this.TreeViewCMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
+            this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
             ((System.ComponentModel.ISupportInitialize)(this.lstCatBindingSource)).BeginInit();
             this.tableLayoutPanel1.SuspendLayout();
@@ -71,7 +90,14 @@
             this.tabPageAlbum.SuspendLayout();
             this.tableLayoutPanel2.SuspendLayout();
+            this.flowLayoutPanel1.SuspendLayout();
             this.tabPageImg.SuspendLayout();
+            this.tableLayoutPanel3.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.lstConfidentLevelBindingSource)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.modelManagerBaseBindingSource)).BeginInit();
+            this.flowLayoutPanel2.SuspendLayout();
+            this.tabPageRoot.SuspendLayout();
+            this.tableLayoutPanel4.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.picshowImg)).BeginInit();
-            this.tableLayoutPanel3.SuspendLayout();
+            this.TreeViewCMenu.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -102,9 +128,11 @@
             // AlbumsTV
             // 
-            this.tableLayoutPanel1.SetColumnSpan(this.AlbumsTV, 4);
+            this.AlbumsTV.AllowDrop = true;
+            this.tableLayoutPanel1.SetColumnSpan(this.AlbumsTV, 2);
             resources.ApplyResources(this.AlbumsTV, "AlbumsTV");
             this.AlbumsTV.HideSelection = false;
             this.AlbumsTV.ImageList = this.imageListTV;
-            this.AlbumsTV.MinimumSize = new System.Drawing.Size(150, 150);
+            this.AlbumsTV.MaximumSize = new System.Drawing.Size(300, 350);
+            this.AlbumsTV.MinimumSize = new System.Drawing.Size(150, 4);
             this.AlbumsTV.Name = "AlbumsTV";
             this.AlbumsTV.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
@@ -112,4 +140,7 @@
             this.tableLayoutPanel1.SetRowSpan(this.AlbumsTV, 2);
             this.AlbumsTV.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.AlbumsTV_AfterSelect);
+            this.AlbumsTV.DragDrop += new System.Windows.Forms.DragEventHandler(this.AlbumsTV_DragDrop);
+            this.AlbumsTV.DragEnter += new System.Windows.Forms.DragEventHandler(this.AlbumsTV_DragEnter);
+            this.AlbumsTV.MouseDown += new System.Windows.Forms.MouseEventHandler(this.AlbumsTV_MouseDown);
             // 
             // imageListTV
@@ -121,28 +152,47 @@
             this.imageListTV.Images.SetKeyName(2, "image.png");
             // 
-            // cbxLstCatTo
-            // 
-            resources.ApplyResources(this.cbxLstCatTo, "cbxLstCatTo");
-            this.tableLayoutPanel1.SetColumnSpan(this.cbxLstCatTo, 2);
-            this.cbxLstCatTo.DataBindings.Add(new System.Windows.Forms.Binding("SelectedValue", this.modelManagerBaseBindingSource, "PwgAlbumIdSelected", true));
-            this.cbxLstCatTo.DataSource = this.lstCatBindingSource;
-            this.cbxLstCatTo.DisplayMember = "ShowedValue";
-            this.cbxLstCatTo.FormattingEnabled = true;
-            this.cbxLstCatTo.Name = "cbxLstCatTo";
-            this.cbxLstCatTo.ValueMember = "Id";
-            // 
-            // modelManagerBaseBindingSource
-            // 
-            this.modelManagerBaseBindingSource.DataSource = typeof(Com.Piwigo.Uploader.DTO.ModelManager.ModelManagerBase);
-            // 
-            // lstCatBindingSource
-            // 
-            this.lstCatBindingSource.DataMember = "lstCat";
-            this.lstCatBindingSource.DataSource = this.modelManagerBaseBindingSource;
-            // 
-            // label4
-            // 
-            resources.ApplyResources(this.label4, "label4");
-            this.label4.Name = "label4";
+            // tbPassword
+            // 
+            this.tbPassword.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::Com.Piwigo.Uploader.Properties.Settings.Default, "pwdData", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
+            resources.ApplyResources(this.tbPassword, "tbPassword");
+            this.tbPassword.MinimumSize = new System.Drawing.Size(100, 20);
+            this.tbPassword.Name = "tbPassword";
+            this.tbPassword.Text = global::Com.Piwigo.Uploader.Properties.Settings.Default.pwdData;
+            // 
+            // tbServer
+            // 
+            resources.ApplyResources(this.tbServer, "tbServer");
+            this.tableLayoutPanel1.SetColumnSpan(this.tbServer, 3);
+            this.tbServer.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::Com.Piwigo.Uploader.Properties.Settings.Default, "serverUrlData", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
+            this.tbServer.MaximumSize = new System.Drawing.Size(600, 20);
+            this.tbServer.MinimumSize = new System.Drawing.Size(100, 20);
+            this.tbServer.Name = "tbServer";
+            this.tbServer.Text = global::Com.Piwigo.Uploader.Properties.Settings.Default.serverUrlData;
+            // 
+            // tbUser
+            // 
+            this.tbUser.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::Com.Piwigo.Uploader.Properties.Settings.Default, "userData", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
+            resources.ApplyResources(this.tbUser, "tbUser");
+            this.tbUser.MinimumSize = new System.Drawing.Size(100, 20);
+            this.tbUser.Name = "tbUser";
+            this.tbUser.Text = global::Com.Piwigo.Uploader.Properties.Settings.Default.userData;
+            // 
+            // tableLayoutPanel1
+            // 
+            resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1");
+            this.tableLayoutPanel1.Controls.Add(this.button2, 3, 4);
+            this.tableLayoutPanel1.Controls.Add(this.label1, 0, 1);
+            this.tableLayoutPanel1.Controls.Add(this.label4, 0, 4);
+            this.tableLayoutPanel1.Controls.Add(this.tbServer, 1, 0);
+            this.tableLayoutPanel1.Controls.Add(this.tbUser, 1, 1);
+            this.tableLayoutPanel1.Controls.Add(this.label2, 2, 1);
+            this.tableLayoutPanel1.Controls.Add(this.AlbumsTV, 0, 2);
+            this.tableLayoutPanel1.Controls.Add(this.tbPassword, 3, 1);
+            this.tableLayoutPanel1.Controls.Add(this.button1, 4, 1);
+            this.tableLayoutPanel1.Controls.Add(this.label3, 0, 0);
+            this.tableLayoutPanel1.Controls.Add(this.cbxLstCatTo, 1, 4);
+            this.tableLayoutPanel1.Controls.Add(this.tabControl1, 2, 2);
+            this.tableLayoutPanel1.Controls.Add(this.picshowImg, 3, 2);
+            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
             // 
             // button2
@@ -155,53 +205,28 @@
             this.button2.Click += new System.EventHandler(this.Telecharger_Click);
             // 
-            // tbPassword
-            // 
-            this.tbPassword.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::Com.Piwigo.Uploader.Properties.Settings.Default, "pwdData", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
-            resources.ApplyResources(this.tbPassword, "tbPassword");
-            this.tbPassword.MinimumSize = new System.Drawing.Size(100, 20);
-            this.tbPassword.Name = "tbPassword";
-            this.tbPassword.Text = global::Com.Piwigo.Uploader.Properties.Settings.Default.pwdData;
-            // 
-            // tbServer
-            // 
-            this.tableLayoutPanel1.SetColumnSpan(this.tbServer, 3);
-            this.tbServer.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::Com.Piwigo.Uploader.Properties.Settings.Default, "serverUrlData", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
-            resources.ApplyResources(this.tbServer, "tbServer");
-            this.tbServer.MinimumSize = new System.Drawing.Size(100, 20);
-            this.tbServer.Name = "tbServer";
-            this.tbServer.Text = global::Com.Piwigo.Uploader.Properties.Settings.Default.serverUrlData;
-            // 
-            // tbUser
-            // 
-            this.tbUser.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::Com.Piwigo.Uploader.Properties.Settings.Default, "userData", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
-            resources.ApplyResources(this.tbUser, "tbUser");
-            this.tbUser.MinimumSize = new System.Drawing.Size(100, 20);
-            this.tbUser.Name = "tbUser";
-            this.tbUser.Text = global::Com.Piwigo.Uploader.Properties.Settings.Default.userData;
-            // 
-            // tableLayoutPanel1
-            // 
-            resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1");
-            this.tableLayoutPanel1.Controls.Add(this.button2, 3, 5);
-            this.tableLayoutPanel1.Controls.Add(this.label1, 0, 1);
-            this.tableLayoutPanel1.Controls.Add(this.label4, 0, 5);
-            this.tableLayoutPanel1.Controls.Add(this.tbServer, 1, 0);
-            this.tableLayoutPanel1.Controls.Add(this.tbUser, 1, 1);
-            this.tableLayoutPanel1.Controls.Add(this.label2, 2, 1);
-            this.tableLayoutPanel1.Controls.Add(this.AlbumsTV, 0, 3);
-            this.tableLayoutPanel1.Controls.Add(this.tbPassword, 3, 1);
-            this.tableLayoutPanel1.Controls.Add(this.button1, 3, 2);
-            this.tableLayoutPanel1.Controls.Add(this.label3, 0, 0);
-            this.tableLayoutPanel1.Controls.Add(this.cbxLstCatTo, 1, 5);
-            this.tableLayoutPanel1.Controls.Add(this.tabControl1, 4, 3);
-            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
+            // label4
+            // 
+            resources.ApplyResources(this.label4, "label4");
+            this.label4.Name = "label4";
+            // 
+            // cbxLstCatTo
+            // 
+            this.tableLayoutPanel1.SetColumnSpan(this.cbxLstCatTo, 2);
+            this.cbxLstCatTo.DataSource = this.lstCatBindingSource;
+            this.cbxLstCatTo.DisplayMember = "ShowedValue";
+            resources.ApplyResources(this.cbxLstCatTo, "cbxLstCatTo");
+            this.cbxLstCatTo.FormattingEnabled = true;
+            this.cbxLstCatTo.Name = "cbxLstCatTo";
+            this.cbxLstCatTo.ValueMember = "Id";
             // 
             // tabControl1
             // 
+            this.tableLayoutPanel1.SetColumnSpan(this.tabControl1, 2);
             this.tabControl1.Controls.Add(this.tabPageAlbum);
             this.tabControl1.Controls.Add(this.tabPageImg);
+            this.tabControl1.Controls.Add(this.tabPageRoot);
             resources.ApplyResources(this.tabControl1, "tabControl1");
             this.tabControl1.ImageList = this.imageListTV;
-            this.tabControl1.MinimumSize = new System.Drawing.Size(300, 300);
+            this.tabControl1.MaximumSize = new System.Drawing.Size(400, 0);
             this.tabControl1.Name = "tabControl1";
             this.tableLayoutPanel1.SetRowSpan(this.tabControl1, 2);
@@ -222,6 +247,5 @@
             this.tableLayoutPanel2.Controls.Add(this.label7, 0, 2);
             this.tableLayoutPanel2.Controls.Add(this.txtAlbComment, 1, 2);
-            this.tableLayoutPanel2.Controls.Add(this.btnAlbumEditCancel, 0, 3);
-            this.tableLayoutPanel2.Controls.Add(this.btnAlbumEditOk, 1, 4);
+            this.tableLayoutPanel2.Controls.Add(this.flowLayoutPanel1, 0, 4);
             this.tableLayoutPanel2.Name = "tableLayoutPanel2";
             // 
@@ -248,5 +272,16 @@
             resources.ApplyResources(this.txtAlbComment, "txtAlbComment");
             this.tableLayoutPanel2.SetColumnSpan(this.txtAlbComment, 2);
+            this.txtAlbComment.MinimumSize = new System.Drawing.Size(300, 100);
             this.txtAlbComment.Name = "txtAlbComment";
+            // 
+            // flowLayoutPanel1
+            // 
+            this.tableLayoutPanel2.SetColumnSpan(this.flowLayoutPanel1, 2);
+            this.flowLayoutPanel1.Controls.Add(this.btnAlbumEditCancel);
+            this.flowLayoutPanel1.Controls.Add(this.btnAlbumEditOk);
+            this.flowLayoutPanel1.Controls.Add(this.btnAlbDelete);
+            this.flowLayoutPanel1.Controls.Add(this.btnAlbumAjout);
+            resources.ApplyResources(this.flowLayoutPanel1, "flowLayoutPanel1");
+            this.flowLayoutPanel1.Name = "flowLayoutPanel1";
             // 
             // btnAlbumEditCancel
@@ -254,5 +289,5 @@
             resources.ApplyResources(this.btnAlbumEditCancel, "btnAlbumEditCancel");
             this.btnAlbumEditCancel.CausesValidation = false;
-            this.btnAlbumEditCancel.Image = global::Com.Piwigo.Uploader.Properties.Resources.no;
+            this.btnAlbumEditCancel.Image = global::Com.Piwigo.Uploader.Properties.Resources.cancel;
             this.btnAlbumEditCancel.Name = "btnAlbumEditCancel";
             this.btnAlbumEditCancel.UseVisualStyleBackColor = true;
@@ -267,4 +302,20 @@
             this.btnAlbumEditOk.Click += new System.EventHandler(this.btnAlbumEditOk_Click);
             // 
+            // btnAlbDelete
+            // 
+            resources.ApplyResources(this.btnAlbDelete, "btnAlbDelete");
+            this.btnAlbDelete.Image = global::Com.Piwigo.Uploader.Properties.Resources.cnrdelete_all;
+            this.btnAlbDelete.Name = "btnAlbDelete";
+            this.btnAlbDelete.UseVisualStyleBackColor = true;
+            this.btnAlbDelete.Click += new System.EventHandler(this.btnAlbDelete_Click);
+            // 
+            // btnAlbumAjout
+            // 
+            resources.ApplyResources(this.btnAlbumAjout, "btnAlbumAjout");
+            this.btnAlbumAjout.Image = global::Com.Piwigo.Uploader.Properties.Resources.folder_new;
+            this.btnAlbumAjout.Name = "btnAlbumAjout";
+            this.btnAlbumAjout.UseVisualStyleBackColor = true;
+            this.btnAlbumAjout.Click += new System.EventHandler(this.btnAlbumAjout_Click);
+            // 
             // tabPageImg
             // 
@@ -274,64 +325,192 @@
             this.tabPageImg.UseVisualStyleBackColor = true;
             // 
+            // tableLayoutPanel3
+            // 
+            resources.ApplyResources(this.tableLayoutPanel3, "tableLayoutPanel3");
+            this.tableLayoutPanel3.Controls.Add(this.txtImgAuthor, 0, 3);
+            this.tableLayoutPanel3.Controls.Add(this.label9, 0, 2);
+            this.tableLayoutPanel3.Controls.Add(this.txtImgName, 0, 1);
+            this.tableLayoutPanel3.Controls.Add(this.label6, 0, 0);
+            this.tableLayoutPanel3.Controls.Add(this.label8, 0, 4);
+            this.tableLayoutPanel3.Controls.Add(this.txtImgComment, 0, 5);
+            this.tableLayoutPanel3.Controls.Add(this.label10, 0, 6);
+            this.tableLayoutPanel3.Controls.Add(this.cbImgLevelEnum, 0, 7);
+            this.tableLayoutPanel3.Controls.Add(this.flowLayoutPanel2, 0, 8);
+            this.tableLayoutPanel3.Name = "tableLayoutPanel3";
+            // 
+            // txtImgAuthor
+            // 
+            this.tableLayoutPanel3.SetColumnSpan(this.txtImgAuthor, 2);
+            resources.ApplyResources(this.txtImgAuthor, "txtImgAuthor");
+            this.txtImgAuthor.MaximumSize = new System.Drawing.Size(300, 100);
+            this.txtImgAuthor.Name = "txtImgAuthor";
+            // 
+            // label9
+            // 
+            resources.ApplyResources(this.label9, "label9");
+            this.label9.Name = "label9";
+            // 
+            // txtImgName
+            // 
+            this.tableLayoutPanel3.SetColumnSpan(this.txtImgName, 2);
+            resources.ApplyResources(this.txtImgName, "txtImgName");
+            this.txtImgName.MaximumSize = new System.Drawing.Size(300, 100);
+            this.txtImgName.Name = "txtImgName";
+            // 
+            // label6
+            // 
+            resources.ApplyResources(this.label6, "label6");
+            this.label6.Name = "label6";
+            // 
+            // label8
+            // 
+            resources.ApplyResources(this.label8, "label8");
+            this.label8.Name = "label8";
+            // 
+            // txtImgComment
+            // 
+            this.txtImgComment.AcceptsReturn = true;
+            this.txtImgComment.AcceptsTab = true;
+            resources.ApplyResources(this.txtImgComment, "txtImgComment");
+            this.tableLayoutPanel3.SetColumnSpan(this.txtImgComment, 2);
+            this.txtImgComment.MinimumSize = new System.Drawing.Size(200, 80);
+            this.txtImgComment.Name = "txtImgComment";
+            // 
+            // label10
+            // 
+            resources.ApplyResources(this.label10, "label10");
+            this.label10.Name = "label10";
+            // 
+            // cbImgLevelEnum
+            // 
+            this.tableLayoutPanel3.SetColumnSpan(this.cbImgLevelEnum, 2);
+            this.cbImgLevelEnum.DataSource = this.lstConfidentLevelBindingSource;
+            this.cbImgLevelEnum.DisplayMember = "Value";
+            resources.ApplyResources(this.cbImgLevelEnum, "cbImgLevelEnum");
+            this.cbImgLevelEnum.FormattingEnabled = true;
+            this.cbImgLevelEnum.MaximumSize = new System.Drawing.Size(300, 0);
+            this.cbImgLevelEnum.Name = "cbImgLevelEnum";
+            this.cbImgLevelEnum.ValueMember = "Key";
+            // 
+            // lstConfidentLevelBindingSource
+            // 
+            this.lstConfidentLevelBindingSource.DataMember = "LstConfidentLevel";
+            this.lstConfidentLevelBindingSource.DataSource = this.modelManagerBaseBindingSource;
+            // 
+            // modelManagerBaseBindingSource
+            // 
+            this.modelManagerBaseBindingSource.DataSource = typeof(Com.Piwigo.Uploader.DTO.ModelManager.ModelManagerBase);
+            // 
+            // flowLayoutPanel2
+            // 
+            this.tableLayoutPanel3.SetColumnSpan(this.flowLayoutPanel2, 2);
+            this.flowLayoutPanel2.Controls.Add(this.btnImgEditCancel);
+            this.flowLayoutPanel2.Controls.Add(this.btnImgEditOk);
+            this.flowLayoutPanel2.Controls.Add(this.btnImgDelete);
+            this.flowLayoutPanel2.Controls.Add(this.btnImgAdd);
+            resources.ApplyResources(this.flowLayoutPanel2, "flowLayoutPanel2");
+            this.flowLayoutPanel2.Name = "flowLayoutPanel2";
+            this.tableLayoutPanel3.SetRowSpan(this.flowLayoutPanel2, 2);
+            // 
+            // btnImgEditCancel
+            // 
+            resources.ApplyResources(this.btnImgEditCancel, "btnImgEditCancel");
+            this.btnImgEditCancel.CausesValidation = false;
+            this.btnImgEditCancel.Image = global::Com.Piwigo.Uploader.Properties.Resources.cancel;
+            this.btnImgEditCancel.Name = "btnImgEditCancel";
+            this.btnImgEditCancel.UseVisualStyleBackColor = true;
+            this.btnImgEditCancel.Click += new System.EventHandler(this.btnImgEditCancel_Click);
+            // 
+            // btnImgEditOk
+            // 
+            resources.ApplyResources(this.btnImgEditOk, "btnImgEditOk");
+            this.btnImgEditOk.Image = global::Com.Piwigo.Uploader.Properties.Resources.ok;
+            this.btnImgEditOk.Name = "btnImgEditOk";
+            this.btnImgEditOk.UseVisualStyleBackColor = true;
+            this.btnImgEditOk.Click += new System.EventHandler(this.btnImgEditOk_Click);
+            // 
+            // btnImgDelete
+            // 
+            resources.ApplyResources(this.btnImgDelete, "btnImgDelete");
+            this.btnImgDelete.Image = global::Com.Piwigo.Uploader.Properties.Resources.cnrdelete_all;
+            this.btnImgDelete.Name = "btnImgDelete";
+            this.btnImgDelete.UseVisualStyleBackColor = true;
+            this.btnImgDelete.Click += new System.EventHandler(this.btnImgDelete_Click);
+            // 
+            // btnImgAdd
+            // 
+            resources.ApplyResources(this.btnImgAdd, "btnImgAdd");
+            this.btnImgAdd.Image = global::Com.Piwigo.Uploader.Properties.Resources.folder_new;
+            this.btnImgAdd.Name = "btnImgAdd";
+            this.btnImgAdd.UseVisualStyleBackColor = true;
+            this.btnImgAdd.Click += new System.EventHandler(this.btnImgAdd_Click);
+            // 
+            // tabPageRoot
+            // 
+            this.tabPageRoot.Controls.Add(this.tableLayoutPanel4);
+            resources.ApplyResources(this.tabPageRoot, "tabPageRoot");
+            this.tabPageRoot.Name = "tabPageRoot";
+            this.tabPageRoot.UseVisualStyleBackColor = true;
+            // 
+            // tableLayoutPanel4
+            // 
+            resources.ApplyResources(this.tableLayoutPanel4, "tableLayoutPanel4");
+            this.tableLayoutPanel4.Controls.Add(this.txtOptionAuthor, 0, 1);
+            this.tableLayoutPanel4.Controls.Add(this.label11, 0, 0);
+            this.tableLayoutPanel4.Controls.Add(this.label12, 0, 2);
+            this.tableLayoutPanel4.Controls.Add(this.cbOptionLevel, 0, 3);
+            this.tableLayoutPanel4.Name = "tableLayoutPanel4";
+            // 
+            // txtOptionAuthor
+            // 
+            this.tableLayoutPanel4.SetColumnSpan(this.txtOptionAuthor, 2);
+            resources.ApplyResources(this.txtOptionAuthor, "txtOptionAuthor");
+            this.txtOptionAuthor.MaximumSize = new System.Drawing.Size(300, 100);
+            this.txtOptionAuthor.Name = "txtOptionAuthor";
+            // 
+            // label11
+            // 
+            resources.ApplyResources(this.label11, "label11");
+            this.label11.Name = "label11";
+            // 
+            // label12
+            // 
+            resources.ApplyResources(this.label12, "label12");
+            this.label12.Name = "label12";
+            // 
+            // cbOptionLevel
+            // 
+            this.tableLayoutPanel4.SetColumnSpan(this.cbOptionLevel, 2);
+            this.cbOptionLevel.DataSource = this.lstConfidentLevelBindingSource;
+            this.cbOptionLevel.DisplayMember = "Value";
+            resources.ApplyResources(this.cbOptionLevel, "cbOptionLevel");
+            this.cbOptionLevel.FormattingEnabled = true;
+            this.cbOptionLevel.MaximumSize = new System.Drawing.Size(300, 0);
+            this.cbOptionLevel.Name = "cbOptionLevel";
+            this.cbOptionLevel.ValueMember = "Key";
+            // 
             // picshowImg
             // 
             resources.ApplyResources(this.picshowImg, "picshowImg");
-            this.tableLayoutPanel3.SetColumnSpan(this.picshowImg, 2);
             this.picshowImg.ErrorImage = global::Com.Piwigo.Uploader.Properties.Resources.file_broken;
             this.picshowImg.InitialImage = global::Com.Piwigo.Uploader.Properties.Resources.image;
             this.picshowImg.MinimumSize = new System.Drawing.Size(300, 300);
             this.picshowImg.Name = "picshowImg";
+            this.tableLayoutPanel1.SetRowSpan(this.picshowImg, 3);
             this.picshowImg.TabStop = false;
             // 
-            // tableLayoutPanel3
-            // 
-            resources.ApplyResources(this.tableLayoutPanel3, "tableLayoutPanel3");
-            this.tableLayoutPanel3.Controls.Add(this.txtImgName, 0, 1);
-            this.tableLayoutPanel3.Controls.Add(this.label6, 0, 0);
-            this.tableLayoutPanel3.Controls.Add(this.label8, 0, 2);
-            this.tableLayoutPanel3.Controls.Add(this.txtImgComment, 0, 3);
-            this.tableLayoutPanel3.Controls.Add(this.button3, 0, 5);
-            this.tableLayoutPanel3.Controls.Add(this.button4, 1, 5);
-            this.tableLayoutPanel3.Controls.Add(this.picshowImg, 0, 4);
-            this.tableLayoutPanel3.Name = "tableLayoutPanel3";
-            // 
-            // txtImgName
-            // 
-            this.tableLayoutPanel3.SetColumnSpan(this.txtImgName, 2);
-            resources.ApplyResources(this.txtImgName, "txtImgName");
-            this.txtImgName.Name = "txtImgName";
-            // 
-            // label6
-            // 
-            resources.ApplyResources(this.label6, "label6");
-            this.label6.Name = "label6";
-            // 
-            // label8
-            // 
-            resources.ApplyResources(this.label8, "label8");
-            this.label8.Name = "label8";
-            // 
-            // button3
-            // 
-            resources.ApplyResources(this.button3, "button3");
-            this.button3.CausesValidation = false;
-            this.button3.Image = global::Com.Piwigo.Uploader.Properties.Resources.no;
-            this.button3.Name = "button3";
-            this.button3.UseVisualStyleBackColor = true;
-            // 
-            // button4
-            // 
-            resources.ApplyResources(this.button4, "button4");
-            this.button4.Image = global::Com.Piwigo.Uploader.Properties.Resources.ok;
-            this.button4.Name = "button4";
-            this.button4.UseVisualStyleBackColor = true;
-            // 
-            // txtImgComment
-            // 
-            this.txtImgComment.AcceptsReturn = true;
-            this.txtImgComment.AcceptsTab = true;
-            this.tableLayoutPanel3.SetColumnSpan(this.txtImgComment, 2);
-            resources.ApplyResources(this.txtImgComment, "txtImgComment");
-            this.txtImgComment.Name = "txtImgComment";
+            // TreeViewCMenu
+            // 
+            this.TreeViewCMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolStripMenuItem1});
+            this.TreeViewCMenu.Name = "TreeViewCMenu";
+            resources.ApplyResources(this.TreeViewCMenu, "TreeViewCMenu");
+            this.TreeViewCMenu.Click += new System.EventHandler(this.TreeViewCMenu_Click);
+            // 
+            // toolStripMenuItem1
+            // 
+            this.toolStripMenuItem1.Image = global::Com.Piwigo.Uploader.Properties.Resources.agt_update_product;
+            resources.ApplyResources(this.toolStripMenuItem1, "toolStripMenuItem1");
+            this.toolStripMenuItem1.Name = "toolStripMenuItem1";
             // 
             // MainForm
@@ -343,5 +522,4 @@
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing);
             this.Load += new System.EventHandler(this.MainForm_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.modelManagerBaseBindingSource)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.lstCatBindingSource)).EndInit();
             this.tableLayoutPanel1.ResumeLayout(false);
@@ -351,8 +529,18 @@
             this.tableLayoutPanel2.ResumeLayout(false);
             this.tableLayoutPanel2.PerformLayout();
+            this.flowLayoutPanel1.ResumeLayout(false);
+            this.flowLayoutPanel1.PerformLayout();
             this.tabPageImg.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.picshowImg)).EndInit();
             this.tableLayoutPanel3.ResumeLayout(false);
             this.tableLayoutPanel3.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.lstConfidentLevelBindingSource)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.modelManagerBaseBindingSource)).EndInit();
+            this.flowLayoutPanel2.ResumeLayout(false);
+            this.flowLayoutPanel2.PerformLayout();
+            this.tabPageRoot.ResumeLayout(false);
+            this.tableLayoutPanel4.ResumeLayout(false);
+            this.tableLayoutPanel4.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.picshowImg)).EndInit();
+            this.TreeViewCMenu.ResumeLayout(false);
             this.ResumeLayout(false);
             this.PerformLayout();
@@ -371,9 +559,5 @@
         private System.Windows.Forms.TreeView AlbumsTV;
         private System.Windows.Forms.ImageList imageListTV;
-        private System.Windows.Forms.ComboBox cbxLstCatTo;
-        private System.Windows.Forms.Label label4;
-        private System.Windows.Forms.Button button2;
         private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
-        private System.Windows.Forms.BindingSource modelManagerBaseBindingSource;
         private System.Windows.Forms.TabControl tabControl1;
         private System.Windows.Forms.TabPage tabPageAlbum;
@@ -385,6 +569,4 @@
         private System.Windows.Forms.Label label5;
         private System.Windows.Forms.Label label7;
-        private System.Windows.Forms.Button btnAlbumEditCancel;
-        private System.Windows.Forms.Button btnAlbumEditOk;
         private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3;
         private System.Windows.Forms.TextBox txtImgName;
@@ -392,7 +574,33 @@
         private System.Windows.Forms.Label label8;
         private System.Windows.Forms.TextBox txtImgComment;
-        private System.Windows.Forms.Button button3;
-        private System.Windows.Forms.Button button4;
+        private System.Windows.Forms.Button btnImgEditCancel;
+        private System.Windows.Forms.Button btnImgEditOk;
         private System.Windows.Forms.PictureBox picshowImg;
+        private System.Windows.Forms.TextBox txtImgAuthor;
+        private System.Windows.Forms.Label label9;
+        private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
+        private System.Windows.Forms.Button btnAlbumEditCancel;
+        private System.Windows.Forms.Button btnAlbumEditOk;
+        private System.Windows.Forms.Button btnAlbDelete;
+        private System.Windows.Forms.Button btnAlbumAjout;
+        private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog1;
+        private System.Windows.Forms.ContextMenuStrip TreeViewCMenu;
+        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1;
+        private System.Windows.Forms.TabPage tabPageRoot;
+        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel4;
+        private System.Windows.Forms.Label label10;
+        private System.Windows.Forms.ComboBox cbImgLevelEnum;
+        private System.Windows.Forms.BindingSource lstConfidentLevelBindingSource;
+        private System.Windows.Forms.BindingSource modelManagerBaseBindingSource;
+        private System.Windows.Forms.TextBox txtOptionAuthor;
+        private System.Windows.Forms.Label label11;
+        private System.Windows.Forms.Label label12;
+        private System.Windows.Forms.ComboBox cbOptionLevel;
+        private System.Windows.Forms.Button button2;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.ComboBox cbxLstCatTo;
+        private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel2;
+        private System.Windows.Forms.Button btnImgDelete;
+        private System.Windows.Forms.Button btnImgAdd;
     }
 }
Index: /extensions/PiwigoLib/PiwigoUpload/MainForm.cs
===================================================================
--- /extensions/PiwigoLib/PiwigoUpload/MainForm.cs	(revision 13519)
+++ /extensions/PiwigoLib/PiwigoUpload/MainForm.cs	(revision 13520)
@@ -18,9 +18,16 @@
             InitializeComponent();
             modelManagerBaseBindingSource.DataSource = ModelManager.Instance;
-            
+
+            txtOptionAuthor.DataBindings.Add("Text", ModelManager.Instance.UploadOption, "Author", false, DataSourceUpdateMode.OnPropertyChanged);
+            cbOptionLevel.DataBindings.Add("SelectedValue", ModelManager.Instance.UploadOption, "ConfidentialLevel", false, DataSourceUpdateMode.OnPropertyChanged);
+
             txtAlbName.DataBindings.Add("Text", ModelManager.Instance.AlbumEdited, "Name", false, DataSourceUpdateMode.OnPropertyChanged);
             txtAlbComment.DataBindings.Add("Text", ModelManager.Instance.AlbumEdited, "MessageInfo", false, DataSourceUpdateMode.OnPropertyChanged);
             
             picshowImg.DataBindings.Add("ImageLocation", ModelManager.Instance.ImageEdited, "LocalFile", false, DataSourceUpdateMode.Never);
+            txtImgName.DataBindings.Add("Text", ModelManager.Instance.ImageEdited, "Name", false, DataSourceUpdateMode.OnPropertyChanged);
+            txtImgComment.DataBindings.Add("Text", ModelManager.Instance.ImageEdited, "AuthorComment", false, DataSourceUpdateMode.OnPropertyChanged);
+            txtImgAuthor.DataBindings.Add("Text", ModelManager.Instance.ImageEdited, "Author", false, DataSourceUpdateMode.OnPropertyChanged);
+            cbImgLevelEnum.DataBindings.Add("SelectedValue", ModelManager.Instance.ImageEdited, "ConfidentialLevel", false, DataSourceUpdateMode.OnPropertyChanged);
         }
 
@@ -112,11 +119,9 @@
         }
 
-        private void modelManagerBindingSource_CurrentChanged(object sender, EventArgs e)
-        {
-
-        }
 
         private void AlbumsTV_AfterSelect(object sender, TreeViewEventArgs e)
         {
+
+            ModelManager.Instance.SelectedNode = AlbumsTV.SelectedNode;
             if (e.Node.Tag is LocalAlbum)
             {
@@ -126,4 +131,14 @@
                 ModelManager.Instance.AlbumEdited.LocalDir = alb.LocalDir;
                 ModelManager.Instance.AlbumEdited.MessageInfo = alb.MessageInfo;
+
+                ModelManager.Instance.ImageEdited.Name = String.Empty;
+                ModelManager.Instance.ImageEdited.Id = null;
+                ModelManager.Instance.ImageEdited.Author = String.Empty;
+                ModelManager.Instance.ImageEdited.AuthorComment = String.Empty;
+                ModelManager.Instance.ImageEdited.ConfidentialLevel = 0;
+                ModelManager.Instance.ImageEdited.LocalFile = String.Empty; ;
+                ModelManager.Instance.ImageEdited.LstTags = null;
+                ModelManager.Instance.ImageEdited.UpperCatId = 0;
+
                 tabControl1.SelectedTab = tabPageAlbum;
                 tabControl1.Enabled = true;
@@ -141,4 +156,17 @@
                 ModelManager.Instance.ImageEdited.UpperCatId = img.UpperCatId;
 
+                if ((e.Node.Parent != null)
+                    && (e.Node.Parent.Tag is LocalAlbum))
+                {
+                    LocalAlbum alb = (LocalAlbum)e.Node.Parent.Tag;
+                    if (ModelManager.Instance.AlbumEdited.LocalDir != alb.LocalDir)
+                    {
+                        ModelManager.Instance.AlbumEdited.Name = alb.Name;
+                        ModelManager.Instance.AlbumEdited.Id = alb.Id;
+                        ModelManager.Instance.AlbumEdited.LocalDir = alb.LocalDir;
+                        ModelManager.Instance.AlbumEdited.MessageInfo = alb.MessageInfo;
+                    }
+                }
+
                 tabControl1.SelectedTab = tabPageImg;
                 tabControl1.Enabled = true;
@@ -152,15 +180,51 @@
         }
 
-        private void selectedPwgAlbumListBindingSource_CurrentChanged(object sender, EventArgs e)
-        {
-
-        }
-
-        private void bindingSource1_CurrentChanged(object sender, EventArgs e)
-        {
-
-        }
-
-        private void btnAlbumEditOk_Click(object sender, EventArgs e)
+        private void btnAlbumEditCancel_Click(object sender, EventArgs e)
+        {
+            if (AlbumsTV.SelectedNode.Tag is LocalImage)
+            {
+                LocalImage img = (LocalImage)AlbumsTV.SelectedNode.Tag;
+                if (ModelManager.Instance.ImageEdited.LocalFile == img.LocalFile)
+                {
+                    ModelManager.Instance.ImageEdited.Name = img.Name;
+                    ModelManager.Instance.ImageEdited.Id = img.Id;
+                    ModelManager.Instance.ImageEdited.Author = img.Author;
+                    ModelManager.Instance.ImageEdited.AuthorComment = img.AuthorComment;
+                    ModelManager.Instance.ImageEdited.ConfidentialLevel = img.ConfidentialLevel;
+                    ModelManager.Instance.ImageEdited.LocalFile = img.LocalFile;
+                    ModelManager.Instance.ImageEdited.LstTags = img.LstTags;
+                    ModelManager.Instance.ImageEdited.UpperCatId = img.UpperCatId;
+                }
+            }
+            else
+            {
+                tabControl1.Enabled = false;
+            }
+        }
+
+        private void btnImgEditCancel_Click(object sender, EventArgs e)
+        {
+            if (AlbumsTV.SelectedNode.Tag is LocalImage)
+            {
+                LocalImage img = (LocalImage)AlbumsTV.SelectedNode.Tag;
+                if (ModelManager.Instance.ImageEdited.LocalFile == img.LocalFile)
+                {
+                    img.Name              = ModelManager.Instance.ImageEdited.Name              ;
+                    img.Id                = ModelManager.Instance.ImageEdited.Id                ;
+                    img.Author            = ModelManager.Instance.ImageEdited.Author            ;
+                    img.AuthorComment     = ModelManager.Instance.ImageEdited.AuthorComment     ;
+                    img.ConfidentialLevel = ModelManager.Instance.ImageEdited.ConfidentialLevel ;
+                    img.LocalFile         = ModelManager.Instance.ImageEdited.LocalFile         ;
+                    img.LstTags           = ModelManager.Instance.ImageEdited.LstTags           ;
+                    img.UpperCatId        = ModelManager.Instance.ImageEdited.UpperCatId        ;
+                }
+            }
+            else
+            {
+                tabControl1.Enabled = false;
+            }
+        }
+
+        private void btnImgEditOk_Click(object sender, EventArgs e)
         {
             if (AlbumsTV.SelectedNode.Tag is LocalAlbum)
@@ -179,7 +243,66 @@
                 tabControl1.Enabled = false;
             }
-        }
-
-        private void btnAlbumEditCancel_Click(object sender, EventArgs e)
+
+        }
+
+        private void AlbumsTV_DragEnter(object sender, DragEventArgs e)
+        {
+            if (e.Data.GetDataPresent(DataFormats.FileDrop))
+            {
+                e.Effect = DragDropEffects.Copy;
+            }
+            else
+            {
+                e.Effect = DragDropEffects.None;
+            }
+
+        }
+
+        private void AlbumsTV_DragDrop(object sender, DragEventArgs e)
+        {
+            if (e.Data.GetDataPresent(DataFormats.FileDrop))
+            {
+                string[] filePaths = (string[])(e.Data.GetData(DataFormats.FileDrop));
+                foreach (string fileLoc in filePaths)
+                {
+                    if (File.Exists(fileLoc)
+                        || Directory.Exists(fileLoc) )
+                    {
+                        ModelManager.Instance.directoryName = fileLoc;
+                        ServiceFactory.GetByType<LoadFromDirectory>().runService();
+                    } 
+                }
+                MainAppHelper.BuildAlbumTree(AlbumsTV, ModelManager.Instance.lstAlbumLocaux);
+            }
+        }
+
+        private void btnAlbumAjout_Click(object sender, EventArgs e)
+        {
+            String rootPath = String.Empty;
+            if (AlbumsTV.SelectedNode.Tag is LocalImage)
+            {
+                LocalImage img = (LocalImage)AlbumsTV.SelectedNode.Tag;
+            }
+            else if (AlbumsTV.SelectedNode.Tag is LocalAlbum)
+            {
+                LocalAlbum alb = (LocalAlbum)AlbumsTV.SelectedNode.Tag;
+            }
+
+            folderBrowserDialog1.RootFolder = Environment.SpecialFolder.MyComputer; 
+            folderBrowserDialog1.SelectedPath = rootPath;
+
+            folderBrowserDialog1.ShowNewFolderButton = false;
+
+            if (folderBrowserDialog1.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+            {
+                ModelManager.Instance.directoryName = folderBrowserDialog1.SelectedPath;
+                ServiceFactory.GetByType<LoadFromDirectory>().runService();
+
+                MainAppHelper.BuildAlbumTree(AlbumsTV, ModelManager.Instance.lstAlbumLocaux);
+            }
+            
+        }
+
+        private void btnAlbumEditOk_Click(object sender, EventArgs e)
         {
             if (AlbumsTV.SelectedNode.Tag is LocalAlbum)
@@ -188,13 +311,62 @@
                 if (ModelManager.Instance.AlbumEdited.LocalDir == alb.LocalDir)
                 {
-                    ModelManager.Instance.AlbumEdited.Name = alb.Name;
-                    ModelManager.Instance.AlbumEdited.MessageInfo = alb.MessageInfo;
-                }
-            }
-            else
-            {
-                tabControl1.Enabled = false;
-            }
-        }        
+                    alb.Name = ModelManager.Instance.AlbumEdited.Name;
+                    alb.MessageInfo = ModelManager.Instance.AlbumEdited.MessageInfo;
+
+                    AlbumsTV.SelectedNode.Text = alb.Name;
+                }
+            }
+            else
+            {
+                tabControl1.Enabled = false;
+            }
+        }
+
+        private void btnAlbDelete_Click(object sender, EventArgs e)
+        {
+            if (AlbumsTV.SelectedNode.Tag is LocalAlbum)
+            {
+                LocalAlbum alb = (LocalAlbum)AlbumsTV.SelectedNode.Tag;
+                if (ModelManager.Instance.AlbumEdited.LocalDir == alb.LocalDir)
+                {
+                    LocalDataHelper.DeleteInTree(alb);
+                    TreeNode node = AlbumsTV.SelectedNode;
+                    AlbumsTV.SelectedNode = AlbumsTV.SelectedNode.NextVisibleNode;
+                    node.Tag = null;
+                    node.Remove();
+                }
+            }
+            else
+            {
+                tabControl1.Enabled = false;
+            }
+
+        }
+
+        private void AlbumsTV_MouseDown(object sender, MouseEventArgs e)
+        {
+            if (e.Button == System.Windows.Forms.MouseButtons.Right)
+            {
+                TreeViewCMenu.Show(AlbumsTV.PointToScreen(e.Location));
+            }
+        }
+
+        private void TreeViewCMenu_Click(object sender, EventArgs e)
+        {
+            //ContextMenuStrip cms = (ContextMenuStrip)sender;
+            //cms.
+            MainAppHelper.BuildAlbumTree(AlbumsTV, ModelManager.Instance.lstAlbumLocaux);
+        }
+
+        private void btnImgDelete_Click(object sender, EventArgs e)
+        {
+
+        }
+
+        private void btnImgAdd_Click(object sender, EventArgs e)
+        {
+
+        }
+
     }
-}
+} 
Index: /extensions/PiwigoLib/PiwigoUpload/MainForm.resx
===================================================================
--- /extensions/PiwigoLib/PiwigoUpload/MainForm.resx	(revision 13519)
+++ /extensions/PiwigoLib/PiwigoUpload/MainForm.resx	(revision 13520)
@@ -120,9 +120,9 @@
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="button1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Right</value>
+    <value>Left</value>
   </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="button1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>456, 55</value>
+    <value>642, 29</value>
   </data>
   <data name="button1.Size" type="System.Drawing.Size, System.Drawing">
@@ -191,5 +191,5 @@
   </data>
   <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>191, 29</value>
+    <value>309, 29</value>
   </data>
   <data name="label2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
@@ -197,5 +197,5 @@
   </data>
   <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>79, 20</value>
+    <value>53, 20</value>
   </data>
   <data name="label2.TabIndex" type="System.Int32, mscorlib">
@@ -263,8 +263,8 @@
   </data>
   <data name="tableLayoutPanel1.ColumnCount" type="System.Int32, mscorlib">
-    <value>6</value>
-  </data>
-  <data name="button2.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Bottom, Right</value>
+    <value>5</value>
+  </data>
+  <data name="button2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Right</value>
   </data>
   <data name="button2.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
@@ -272,5 +272,5 @@
   </data>
   <data name="button2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>456, 444</value>
+    <value>536, 411</value>
   </data>
   <data name="button2.Size" type="System.Drawing.Size, System.Drawing">
@@ -301,6 +301,9 @@
     <value>True</value>
   </data>
+  <data name="label4.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
   <data name="label4.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 451</value>
+    <value>3, 422</value>
   </data>
   <data name="label4.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
@@ -331,6 +334,6 @@
     <value>2</value>
   </data>
-  <data name="tbServer.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
+  <data name="tbServer.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Bottom, Left, Right</value>
   </data>
   <data name="tbServer.Location" type="System.Drawing.Point, System.Drawing">
@@ -338,5 +341,5 @@
   </data>
   <data name="tbServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>509, 20</value>
+    <value>589, 20</value>
   </data>
   <data name="tbServer.TabIndex" type="System.Int32, mscorlib">
@@ -362,5 +365,5 @@
   </data>
   <data name="tbUser.Size" type="System.Drawing.Size, System.Drawing">
-    <value>138, 20</value>
+    <value>256, 20</value>
   </data>
   <data name="tbUser.TabIndex" type="System.Int32, mscorlib">
@@ -383,5 +386,5 @@
   </data>
   <data name="tbPassword.Location" type="System.Drawing.Point, System.Drawing">
-    <value>276, 29</value>
+    <value>368, 29</value>
   </data>
   <data name="tbPassword.PasswordChar" type="System.Char, mscorlib" xml:space="preserve">
@@ -389,5 +392,5 @@
   </data>
   <data name="tbPassword.Size" type="System.Drawing.Size, System.Drawing">
-    <value>280, 20</value>
+    <value>268, 20</value>
   </data>
   <data name="tbPassword.TabIndex" type="System.Int32, mscorlib">
@@ -406,15 +409,12 @@
     <value>7</value>
   </data>
-  <metadata name="modelManagerBaseBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>278, 15</value>
-  </metadata>
   <metadata name="lstCatBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>128, 14</value>
   </metadata>
-  <data name="cbxLstCatTo.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Bottom, Left</value>
+  <data name="cbxLstCatTo.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Left</value>
   </data>
   <data name="cbxLstCatTo.Location" type="System.Drawing.Point, System.Drawing">
-    <value>47, 443</value>
+    <value>47, 411</value>
   </data>
   <data name="cbxLstCatTo.Size" type="System.Drawing.Size, System.Drawing">
@@ -436,4 +436,316 @@
     <value>10</value>
   </data>
+  <data name="tableLayoutPanel2.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
+    <value>GrowAndShrink</value>
+  </data>
+  <data name="tableLayoutPanel2.ColumnCount" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name="txtAlbName.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="txtAlbName.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 16</value>
+  </data>
+  <data name="txtAlbName.Size" type="System.Drawing.Size, System.Drawing">
+    <value>307, 20</value>
+  </data>
+  <data name="txtAlbName.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;txtAlbName.Name" xml:space="preserve">
+    <value>txtAlbName</value>
+  </data>
+  <data name="&gt;&gt;txtAlbName.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;txtAlbName.Parent" xml:space="preserve">
+    <value>tableLayoutPanel2</value>
+  </data>
+  <data name="&gt;&gt;txtAlbName.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="label5.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label5.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 0</value>
+  </data>
+  <data name="label5.Size" type="System.Drawing.Size, System.Drawing">
+    <value>35, 13</value>
+  </data>
+  <data name="label5.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name="label5.Text" xml:space="preserve">
+    <value>Name</value>
+  </data>
+  <data name="&gt;&gt;label5.Name" xml:space="preserve">
+    <value>label5</value>
+  </data>
+  <data name="&gt;&gt;label5.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label5.Parent" xml:space="preserve">
+    <value>tableLayoutPanel2</value>
+  </data>
+  <data name="&gt;&gt;label5.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="label7.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label7.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 39</value>
+  </data>
+  <data name="label7.Size" type="System.Drawing.Size, System.Drawing">
+    <value>51, 13</value>
+  </data>
+  <data name="label7.TabIndex" type="System.Int32, mscorlib">
+    <value>3</value>
+  </data>
+  <data name="label7.Text" xml:space="preserve">
+    <value>Comment</value>
+  </data>
+  <data name="&gt;&gt;label7.Name" xml:space="preserve">
+    <value>label7</value>
+  </data>
+  <data name="&gt;&gt;label7.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label7.Parent" xml:space="preserve">
+    <value>tableLayoutPanel2</value>
+  </data>
+  <data name="&gt;&gt;label7.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="txtAlbComment.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Bottom, Left, Right</value>
+  </data>
+  <data name="txtAlbComment.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 55</value>
+  </data>
+  <data name="txtAlbComment.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>3, 3, 10, 3</value>
+  </data>
+  <data name="txtAlbComment.Multiline" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="txtAlbComment.ScrollBars" type="System.Windows.Forms.ScrollBars, System.Windows.Forms">
+    <value>Vertical</value>
+  </data>
+  <data name="txtAlbComment.Size" type="System.Drawing.Size, System.Drawing">
+    <value>300, 100</value>
+  </data>
+  <data name="txtAlbComment.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;txtAlbComment.Name" xml:space="preserve">
+    <value>txtAlbComment</value>
+  </data>
+  <data name="&gt;&gt;txtAlbComment.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;txtAlbComment.Parent" xml:space="preserve">
+    <value>tableLayoutPanel2</value>
+  </data>
+  <data name="&gt;&gt;txtAlbComment.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="btnAlbumEditCancel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Left</value>
+  </data>
+  <data name="btnAlbumEditCancel.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="btnAlbumEditCancel.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
+    <value>GrowAndShrink</value>
+  </data>
+  <data name="btnAlbumEditCancel.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
+    <value>None</value>
+  </data>
+  <data name="btnAlbumEditCancel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="btnAlbumEditCancel.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 3</value>
+  </data>
+  <data name="btnAlbumEditCancel.Size" type="System.Drawing.Size, System.Drawing">
+    <value>30, 30</value>
+  </data>
+  <data name="btnAlbumEditCancel.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="btnAlbumEditCancel.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms">
+    <value>ImageAboveText</value>
+  </data>
+  <data name="&gt;&gt;btnAlbumEditCancel.Name" xml:space="preserve">
+    <value>btnAlbumEditCancel</value>
+  </data>
+  <data name="&gt;&gt;btnAlbumEditCancel.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;btnAlbumEditCancel.Parent" xml:space="preserve">
+    <value>flowLayoutPanel1</value>
+  </data>
+  <data name="&gt;&gt;btnAlbumEditCancel.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="btnAlbumEditOk.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Right</value>
+  </data>
+  <data name="btnAlbumEditOk.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="btnAlbumEditOk.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
+    <value>GrowAndShrink</value>
+  </data>
+  <data name="btnAlbumEditOk.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
+    <value>None</value>
+  </data>
+  <data name="btnAlbumEditOk.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="btnAlbumEditOk.Location" type="System.Drawing.Point, System.Drawing">
+    <value>39, 3</value>
+  </data>
+  <data name="btnAlbumEditOk.Size" type="System.Drawing.Size, System.Drawing">
+    <value>30, 30</value>
+  </data>
+  <data name="btnAlbumEditOk.TabIndex" type="System.Int32, mscorlib">
+    <value>5</value>
+  </data>
+  <data name="btnAlbumEditOk.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms">
+    <value>ImageAboveText</value>
+  </data>
+  <data name="&gt;&gt;btnAlbumEditOk.Name" xml:space="preserve">
+    <value>btnAlbumEditOk</value>
+  </data>
+  <data name="&gt;&gt;btnAlbumEditOk.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;btnAlbumEditOk.Parent" xml:space="preserve">
+    <value>flowLayoutPanel1</value>
+  </data>
+  <data name="&gt;&gt;btnAlbumEditOk.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="btnAlbDelete.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Right</value>
+  </data>
+  <data name="btnAlbDelete.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="btnAlbDelete.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
+    <value>GrowAndShrink</value>
+  </data>
+  <data name="btnAlbDelete.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
+    <value>None</value>
+  </data>
+  <data name="btnAlbDelete.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="btnAlbDelete.Location" type="System.Drawing.Point, System.Drawing">
+    <value>75, 3</value>
+  </data>
+  <data name="btnAlbDelete.Size" type="System.Drawing.Size, System.Drawing">
+    <value>30, 30</value>
+  </data>
+  <data name="btnAlbDelete.TabIndex" type="System.Int32, mscorlib">
+    <value>6</value>
+  </data>
+  <data name="btnAlbDelete.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms">
+    <value>ImageAboveText</value>
+  </data>
+  <data name="&gt;&gt;btnAlbDelete.Name" xml:space="preserve">
+    <value>btnAlbDelete</value>
+  </data>
+  <data name="&gt;&gt;btnAlbDelete.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;btnAlbDelete.Parent" xml:space="preserve">
+    <value>flowLayoutPanel1</value>
+  </data>
+  <data name="&gt;&gt;btnAlbDelete.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="btnAlbumAjout.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Right</value>
+  </data>
+  <data name="btnAlbumAjout.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="btnAlbumAjout.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
+    <value>GrowAndShrink</value>
+  </data>
+  <data name="btnAlbumAjout.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
+    <value>None</value>
+  </data>
+  <data name="btnAlbumAjout.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="btnAlbumAjout.Location" type="System.Drawing.Point, System.Drawing">
+    <value>111, 3</value>
+  </data>
+  <data name="btnAlbumAjout.Size" type="System.Drawing.Size, System.Drawing">
+    <value>30, 30</value>
+  </data>
+  <data name="btnAlbumAjout.TabIndex" type="System.Int32, mscorlib">
+    <value>7</value>
+  </data>
+  <data name="btnAlbumAjout.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms">
+    <value>ImageAboveText</value>
+  </data>
+  <data name="&gt;&gt;btnAlbumAjout.Name" xml:space="preserve">
+    <value>btnAlbumAjout</value>
+  </data>
+  <data name="&gt;&gt;btnAlbumAjout.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;btnAlbumAjout.Parent" xml:space="preserve">
+    <value>flowLayoutPanel1</value>
+  </data>
+  <data name="&gt;&gt;btnAlbumAjout.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="flowLayoutPanel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="flowLayoutPanel1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 161</value>
+  </data>
+  <data name="flowLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>307, 147</value>
+  </data>
+  <data name="flowLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
+    <value>4</value>
+  </data>
+  <data name="&gt;&gt;flowLayoutPanel1.Name" xml:space="preserve">
+    <value>flowLayoutPanel1</value>
+  </data>
+  <data name="&gt;&gt;flowLayoutPanel1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;flowLayoutPanel1.Parent" xml:space="preserve">
+    <value>tableLayoutPanel2</value>
+  </data>
+  <data name="&gt;&gt;flowLayoutPanel1.ZOrder" xml:space="preserve">
+    <value>4</value>
+  </data>
+  <data name="tableLayoutPanel2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="tableLayoutPanel2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 3</value>
+  </data>
+  <data name="tableLayoutPanel2.RowCount" type="System.Int32, mscorlib">
+    <value>5</value>
+  </data>
+  <data name="tableLayoutPanel2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>313, 311</value>
+  </data>
+  <data name="tableLayoutPanel2.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
   <data name="&gt;&gt;tableLayoutPanel2.Name" xml:space="preserve">
     <value>tableLayoutPanel2</value>
@@ -449,5 +761,5 @@
   </data>
   <data name="tableLayoutPanel2.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
-    <value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="txtAlbName" Row="1" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="label5" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="label7" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="txtAlbComment" Row="2" RowSpan="1" Column="1" ColumnSpan="2" /&gt;&lt;Control Name="btnAlbumEditCancel" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="btnAlbumEditOk" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,AutoSize,0" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0" /&gt;&lt;/TableLayoutSettings&gt;</value>
+    <value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="txtAlbName" Row="1" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="label5" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="label7" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="txtAlbComment" Row="2" RowSpan="1" Column="1" ColumnSpan="2" /&gt;&lt;Control Name="flowLayoutPanel1" Row="4" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,AutoSize,0" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,20" /&gt;&lt;/TableLayoutSettings&gt;</value>
   </data>
   <data name="tabPageAlbum.ImageKey" xml:space="preserve">
@@ -461,5 +773,5 @@
   </data>
   <data name="tabPageAlbum.Size" type="System.Drawing.Size, System.Drawing">
-    <value>292, 350</value>
+    <value>319, 317</value>
   </data>
   <data name="tabPageAlbum.TabIndex" type="System.Int32, mscorlib">
@@ -481,4 +793,439 @@
     <value>0</value>
   </data>
+  <data name="tableLayoutPanel3.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
+    <value>GrowAndShrink</value>
+  </data>
+  <data name="tableLayoutPanel3.ColumnCount" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name="txtImgAuthor.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="txtImgAuthor.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 55</value>
+  </data>
+  <data name="txtImgAuthor.Size" type="System.Drawing.Size, System.Drawing">
+    <value>300, 20</value>
+  </data>
+  <data name="txtImgAuthor.TabIndex" type="System.Int32, mscorlib">
+    <value>6</value>
+  </data>
+  <data name="&gt;&gt;txtImgAuthor.Name" xml:space="preserve">
+    <value>txtImgAuthor</value>
+  </data>
+  <data name="&gt;&gt;txtImgAuthor.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;txtImgAuthor.Parent" xml:space="preserve">
+    <value>tableLayoutPanel3</value>
+  </data>
+  <data name="&gt;&gt;txtImgAuthor.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="label9.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label9.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="label9.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 39</value>
+  </data>
+  <data name="label9.Size" type="System.Drawing.Size, System.Drawing">
+    <value>38, 13</value>
+  </data>
+  <data name="label9.TabIndex" type="System.Int32, mscorlib">
+    <value>5</value>
+  </data>
+  <data name="label9.Text" xml:space="preserve">
+    <value>Author</value>
+  </data>
+  <data name="&gt;&gt;label9.Name" xml:space="preserve">
+    <value>label9</value>
+  </data>
+  <data name="&gt;&gt;label9.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label9.Parent" xml:space="preserve">
+    <value>tableLayoutPanel3</value>
+  </data>
+  <data name="&gt;&gt;label9.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="txtImgName.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="txtImgName.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 16</value>
+  </data>
+  <data name="txtImgName.Size" type="System.Drawing.Size, System.Drawing">
+    <value>300, 20</value>
+  </data>
+  <data name="txtImgName.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;txtImgName.Name" xml:space="preserve">
+    <value>txtImgName</value>
+  </data>
+  <data name="&gt;&gt;txtImgName.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;txtImgName.Parent" xml:space="preserve">
+    <value>tableLayoutPanel3</value>
+  </data>
+  <data name="&gt;&gt;txtImgName.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="label6.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label6.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="label6.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 0</value>
+  </data>
+  <data name="label6.Size" type="System.Drawing.Size, System.Drawing">
+    <value>35, 13</value>
+  </data>
+  <data name="label6.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name="label6.Text" xml:space="preserve">
+    <value>Name</value>
+  </data>
+  <data name="&gt;&gt;label6.Name" xml:space="preserve">
+    <value>label6</value>
+  </data>
+  <data name="&gt;&gt;label6.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label6.Parent" xml:space="preserve">
+    <value>tableLayoutPanel3</value>
+  </data>
+  <data name="&gt;&gt;label6.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="label8.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label8.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="label8.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 78</value>
+  </data>
+  <data name="label8.Size" type="System.Drawing.Size, System.Drawing">
+    <value>51, 13</value>
+  </data>
+  <data name="label8.TabIndex" type="System.Int32, mscorlib">
+    <value>3</value>
+  </data>
+  <data name="label8.Text" xml:space="preserve">
+    <value>Comment</value>
+  </data>
+  <data name="&gt;&gt;label8.Name" xml:space="preserve">
+    <value>label8</value>
+  </data>
+  <data name="&gt;&gt;label8.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label8.Parent" xml:space="preserve">
+    <value>tableLayoutPanel3</value>
+  </data>
+  <data name="&gt;&gt;label8.ZOrder" xml:space="preserve">
+    <value>4</value>
+  </data>
+  <data name="txtImgComment.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Bottom, Left, Right</value>
+  </data>
+  <data name="txtImgComment.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 94</value>
+  </data>
+  <data name="txtImgComment.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>3, 3, 10, 3</value>
+  </data>
+  <data name="txtImgComment.Multiline" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="txtImgComment.ScrollBars" type="System.Windows.Forms.ScrollBars, System.Windows.Forms">
+    <value>Vertical</value>
+  </data>
+  <data name="txtImgComment.Size" type="System.Drawing.Size, System.Drawing">
+    <value>300, 80</value>
+  </data>
+  <data name="txtImgComment.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;txtImgComment.Name" xml:space="preserve">
+    <value>txtImgComment</value>
+  </data>
+  <data name="&gt;&gt;txtImgComment.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;txtImgComment.Parent" xml:space="preserve">
+    <value>tableLayoutPanel3</value>
+  </data>
+  <data name="&gt;&gt;txtImgComment.ZOrder" xml:space="preserve">
+    <value>5</value>
+  </data>
+  <data name="label10.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label10.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="label10.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 177</value>
+  </data>
+  <data name="label10.Size" type="System.Drawing.Size, System.Drawing">
+    <value>51, 13</value>
+  </data>
+  <data name="label10.TabIndex" type="System.Int32, mscorlib">
+    <value>7</value>
+  </data>
+  <data name="label10.Text" xml:space="preserve">
+    <value>Level</value>
+  </data>
+  <data name="label10.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
+    <value>MiddleLeft</value>
+  </data>
+  <data name="&gt;&gt;label10.Name" xml:space="preserve">
+    <value>label10</value>
+  </data>
+  <data name="&gt;&gt;label10.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label10.Parent" xml:space="preserve">
+    <value>tableLayoutPanel3</value>
+  </data>
+  <data name="&gt;&gt;label10.ZOrder" xml:space="preserve">
+    <value>6</value>
+  </data>
+  <metadata name="lstConfidentLevelBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>262, 54</value>
+  </metadata>
+  <metadata name="modelManagerBaseBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 54</value>
+  </metadata>
+  <data name="cbImgLevelEnum.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="cbImgLevelEnum.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 193</value>
+  </data>
+  <data name="cbImgLevelEnum.Size" type="System.Drawing.Size, System.Drawing">
+    <value>300, 21</value>
+  </data>
+  <data name="cbImgLevelEnum.TabIndex" type="System.Int32, mscorlib">
+    <value>8</value>
+  </data>
+  <data name="&gt;&gt;cbImgLevelEnum.Name" xml:space="preserve">
+    <value>cbImgLevelEnum</value>
+  </data>
+  <data name="&gt;&gt;cbImgLevelEnum.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;cbImgLevelEnum.Parent" xml:space="preserve">
+    <value>tableLayoutPanel3</value>
+  </data>
+  <data name="&gt;&gt;cbImgLevelEnum.ZOrder" xml:space="preserve">
+    <value>7</value>
+  </data>
+  <data name="btnImgEditCancel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Left</value>
+  </data>
+  <data name="btnImgEditCancel.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="btnImgEditCancel.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
+    <value>GrowAndShrink</value>
+  </data>
+  <data name="btnImgEditCancel.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
+    <value>None</value>
+  </data>
+  <data name="btnImgEditCancel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="btnImgEditCancel.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 3</value>
+  </data>
+  <data name="btnImgEditCancel.Size" type="System.Drawing.Size, System.Drawing">
+    <value>30, 30</value>
+  </data>
+  <data name="btnImgEditCancel.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="btnImgEditCancel.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms">
+    <value>ImageAboveText</value>
+  </data>
+  <data name="&gt;&gt;btnImgEditCancel.Name" xml:space="preserve">
+    <value>btnImgEditCancel</value>
+  </data>
+  <data name="&gt;&gt;btnImgEditCancel.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;btnImgEditCancel.Parent" xml:space="preserve">
+    <value>flowLayoutPanel2</value>
+  </data>
+  <data name="&gt;&gt;btnImgEditCancel.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="btnImgEditOk.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Right</value>
+  </data>
+  <data name="btnImgEditOk.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="btnImgEditOk.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
+    <value>GrowAndShrink</value>
+  </data>
+  <data name="btnImgEditOk.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
+    <value>None</value>
+  </data>
+  <data name="btnImgEditOk.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="btnImgEditOk.Location" type="System.Drawing.Point, System.Drawing">
+    <value>39, 3</value>
+  </data>
+  <data name="btnImgEditOk.Size" type="System.Drawing.Size, System.Drawing">
+    <value>30, 30</value>
+  </data>
+  <data name="btnImgEditOk.TabIndex" type="System.Int32, mscorlib">
+    <value>4</value>
+  </data>
+  <data name="btnImgEditOk.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms">
+    <value>ImageAboveText</value>
+  </data>
+  <data name="&gt;&gt;btnImgEditOk.Name" xml:space="preserve">
+    <value>btnImgEditOk</value>
+  </data>
+  <data name="&gt;&gt;btnImgEditOk.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;btnImgEditOk.Parent" xml:space="preserve">
+    <value>flowLayoutPanel2</value>
+  </data>
+  <data name="&gt;&gt;btnImgEditOk.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="btnImgDelete.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Right</value>
+  </data>
+  <data name="btnImgDelete.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="btnImgDelete.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
+    <value>GrowAndShrink</value>
+  </data>
+  <data name="btnImgDelete.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
+    <value>None</value>
+  </data>
+  <data name="btnImgDelete.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="btnImgDelete.Location" type="System.Drawing.Point, System.Drawing">
+    <value>75, 3</value>
+  </data>
+  <data name="btnImgDelete.Size" type="System.Drawing.Size, System.Drawing">
+    <value>30, 30</value>
+  </data>
+  <data name="btnImgDelete.TabIndex" type="System.Int32, mscorlib">
+    <value>8</value>
+  </data>
+  <data name="btnImgDelete.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms">
+    <value>ImageAboveText</value>
+  </data>
+  <data name="&gt;&gt;btnImgDelete.Name" xml:space="preserve">
+    <value>btnImgDelete</value>
+  </data>
+  <data name="&gt;&gt;btnImgDelete.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;btnImgDelete.Parent" xml:space="preserve">
+    <value>flowLayoutPanel2</value>
+  </data>
+  <data name="&gt;&gt;btnImgDelete.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="btnImgAdd.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Right</value>
+  </data>
+  <data name="btnImgAdd.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="btnImgAdd.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
+    <value>GrowAndShrink</value>
+  </data>
+  <data name="btnImgAdd.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
+    <value>None</value>
+  </data>
+  <data name="btnImgAdd.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="btnImgAdd.Location" type="System.Drawing.Point, System.Drawing">
+    <value>111, 3</value>
+  </data>
+  <data name="btnImgAdd.Size" type="System.Drawing.Size, System.Drawing">
+    <value>30, 30</value>
+  </data>
+  <data name="btnImgAdd.TabIndex" type="System.Int32, mscorlib">
+    <value>9</value>
+  </data>
+  <data name="btnImgAdd.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms">
+    <value>ImageAboveText</value>
+  </data>
+  <data name="&gt;&gt;btnImgAdd.Name" xml:space="preserve">
+    <value>btnImgAdd</value>
+  </data>
+  <data name="&gt;&gt;btnImgAdd.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;btnImgAdd.Parent" xml:space="preserve">
+    <value>flowLayoutPanel2</value>
+  </data>
+  <data name="&gt;&gt;btnImgAdd.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="flowLayoutPanel2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="flowLayoutPanel2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 220</value>
+  </data>
+  <data name="flowLayoutPanel2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>307, 88</value>
+  </data>
+  <data name="flowLayoutPanel2.TabIndex" type="System.Int32, mscorlib">
+    <value>9</value>
+  </data>
+  <data name="&gt;&gt;flowLayoutPanel2.Name" xml:space="preserve">
+    <value>flowLayoutPanel2</value>
+  </data>
+  <data name="&gt;&gt;flowLayoutPanel2.Type" xml:space="preserve">
+    <value>System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;flowLayoutPanel2.Parent" xml:space="preserve">
+    <value>tableLayoutPanel3</value>
+  </data>
+  <data name="&gt;&gt;flowLayoutPanel2.ZOrder" xml:space="preserve">
+    <value>8</value>
+  </data>
+  <data name="tableLayoutPanel3.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="tableLayoutPanel3.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 3</value>
+  </data>
+  <data name="tableLayoutPanel3.RowCount" type="System.Int32, mscorlib">
+    <value>10</value>
+  </data>
+  <data name="tableLayoutPanel3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>313, 0</value>
+  </data>
+  <data name="tableLayoutPanel3.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
   <data name="&gt;&gt;tableLayoutPanel3.Name" xml:space="preserve">
     <value>tableLayoutPanel3</value>
@@ -494,5 +1241,5 @@
   </data>
   <data name="tableLayoutPanel3.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
-    <value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="txtImgName" Row="1" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="label6" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="label8" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="txtImgComment" Row="3" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="button3" Row="5" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="button4" Row="5" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="picshowImg" Row="4" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,AutoSize,0,Absolute,20" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,20" /&gt;&lt;/TableLayoutSettings&gt;</value>
+    <value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="txtImgAuthor" Row="3" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="label9" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="txtImgName" Row="1" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="label6" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="label8" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="txtImgComment" Row="5" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="label10" Row="6" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="cbImgLevelEnum" Row="7" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="flowLayoutPanel2" Row="8" RowSpan="2" Column="0" ColumnSpan="2" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,AutoSize,0" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,20" /&gt;&lt;/TableLayoutSettings&gt;</value>
   </data>
   <data name="tabPageImg.ImageKey" xml:space="preserve">
@@ -506,5 +1253,5 @@
   </data>
   <data name="tabPageImg.Size" type="System.Drawing.Size, System.Drawing">
-    <value>292, 317</value>
+    <value>319, 0</value>
   </data>
   <data name="tabPageImg.TabIndex" type="System.Int32, mscorlib">
@@ -525,4 +1272,181 @@
   <data name="&gt;&gt;tabPageImg.ZOrder" xml:space="preserve">
     <value>1</value>
+  </data>
+  <data name="tableLayoutPanel4.ColumnCount" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name="txtOptionAuthor.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="txtOptionAuthor.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 16</value>
+  </data>
+  <data name="txtOptionAuthor.Size" type="System.Drawing.Size, System.Drawing">
+    <value>300, 20</value>
+  </data>
+  <data name="txtOptionAuthor.TabIndex" type="System.Int32, mscorlib">
+    <value>10</value>
+  </data>
+  <data name="&gt;&gt;txtOptionAuthor.Name" xml:space="preserve">
+    <value>txtOptionAuthor</value>
+  </data>
+  <data name="&gt;&gt;txtOptionAuthor.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;txtOptionAuthor.Parent" xml:space="preserve">
+    <value>tableLayoutPanel4</value>
+  </data>
+  <data name="&gt;&gt;txtOptionAuthor.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="label11.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label11.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="label11.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 0</value>
+  </data>
+  <data name="label11.Size" type="System.Drawing.Size, System.Drawing">
+    <value>38, 13</value>
+  </data>
+  <data name="label11.TabIndex" type="System.Int32, mscorlib">
+    <value>9</value>
+  </data>
+  <data name="label11.Text" xml:space="preserve">
+    <value>Author</value>
+  </data>
+  <data name="&gt;&gt;label11.Name" xml:space="preserve">
+    <value>label11</value>
+  </data>
+  <data name="&gt;&gt;label11.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label11.Parent" xml:space="preserve">
+    <value>tableLayoutPanel4</value>
+  </data>
+  <data name="&gt;&gt;label11.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="label12.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label12.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="label12.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="label12.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 39</value>
+  </data>
+  <data name="label12.Size" type="System.Drawing.Size, System.Drawing">
+    <value>150, 13</value>
+  </data>
+  <data name="label12.TabIndex" type="System.Int32, mscorlib">
+    <value>11</value>
+  </data>
+  <data name="label12.Text" xml:space="preserve">
+    <value>Level</value>
+  </data>
+  <data name="label12.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
+    <value>MiddleLeft</value>
+  </data>
+  <data name="&gt;&gt;label12.Name" xml:space="preserve">
+    <value>label12</value>
+  </data>
+  <data name="&gt;&gt;label12.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label12.Parent" xml:space="preserve">
+    <value>tableLayoutPanel4</value>
+  </data>
+  <data name="&gt;&gt;label12.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="cbOptionLevel.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="cbOptionLevel.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 55</value>
+  </data>
+  <data name="cbOptionLevel.Size" type="System.Drawing.Size, System.Drawing">
+    <value>300, 21</value>
+  </data>
+  <data name="cbOptionLevel.TabIndex" type="System.Int32, mscorlib">
+    <value>12</value>
+  </data>
+  <data name="&gt;&gt;cbOptionLevel.Name" xml:space="preserve">
+    <value>cbOptionLevel</value>
+  </data>
+  <data name="&gt;&gt;cbOptionLevel.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;cbOptionLevel.Parent" xml:space="preserve">
+    <value>tableLayoutPanel4</value>
+  </data>
+  <data name="&gt;&gt;cbOptionLevel.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="tableLayoutPanel4.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="tableLayoutPanel4.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 3</value>
+  </data>
+  <data name="tableLayoutPanel4.RowCount" type="System.Int32, mscorlib">
+    <value>5</value>
+  </data>
+  <data name="tableLayoutPanel4.Size" type="System.Drawing.Size, System.Drawing">
+    <value>313, 0</value>
+  </data>
+  <data name="tableLayoutPanel4.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;tableLayoutPanel4.Name" xml:space="preserve">
+    <value>tableLayoutPanel4</value>
+  </data>
+  <data name="&gt;&gt;tableLayoutPanel4.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;tableLayoutPanel4.Parent" xml:space="preserve">
+    <value>tabPageRoot</value>
+  </data>
+  <data name="&gt;&gt;tableLayoutPanel4.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="tableLayoutPanel4.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
+    <value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="txtOptionAuthor" Row="1" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="label11" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="label12" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="cbOptionLevel" Row="3" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,50,Percent,50" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,20,Absolute,20" /&gt;&lt;/TableLayoutSettings&gt;</value>
+  </data>
+  <data name="tabPageRoot.ImageIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="tabPageRoot.Location" type="System.Drawing.Point, System.Drawing">
+    <value>4, 29</value>
+  </data>
+  <data name="tabPageRoot.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>3, 3, 3, 3</value>
+  </data>
+  <data name="tabPageRoot.Size" type="System.Drawing.Size, System.Drawing">
+    <value>319, 0</value>
+  </data>
+  <data name="tabPageRoot.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name="tabPageRoot.Text" xml:space="preserve">
+    <value>Root / Option</value>
+  </data>
+  <data name="&gt;&gt;tabPageRoot.Name" xml:space="preserve">
+    <value>tabPageRoot</value>
+  </data>
+  <data name="&gt;&gt;tabPageRoot.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;tabPageRoot.Parent" xml:space="preserve">
+    <value>tabControl1</value>
+  </data>
+  <data name="&gt;&gt;tabPageRoot.ZOrder" xml:space="preserve">
+    <value>2</value>
   </data>
   <data name="tabControl1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
@@ -536,5 +1460,5 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
-        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACY
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABg
         HgAAAk1TRnQBSQFMAgEBAwEAAXwBAQF8AQEBFgEAARYBAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFY
         AwABFgMAAQEBAAEgBQABQAEeHgADBAEGAxMBGgMeASsDJAE1AyQBNgMjATMDGwEmAw0BERQAAwcBCQML
@@ -543,139 +1467,135 @@
         AVgDHQEqAwgBCwwAAx8BLQFIAkcBgwMlATcDAAEBCAADXwHjAfsC+QH/AfsC+QH/AfsC+QH/AfsC+QH/
         AfsC+QH/AfsC+QH/AfsC+QH/AfsC+QH/AfsC+QH/AfsC+QH/AfsC+QH/AfsC+QH/AfsC+QH/A18B4wQA
-        AzoBYQNYAbsDQAFwAwsBD7wAAwgBCwMqAUADQQFyAlIBUQGhA1sBywNiAekBbwFpAVgB+gHtAcoBpQH/
-        AdMBrAGOAf8BuAGSAU4B/wNcAd8DUQGcAzUBVgMcAScDDQERAx4BKwJSAVABpAJRAU8BnAMjATMIAANf
-        AeMB+wL5Af8BFAE6ATUB/wFKApoB/wFCAZIBlgH/ASYBUAFKAf8BIwFDATYB/wETASkBIwH/ARoBKgEj
-        Af8BigGnAZ8B/wE8AY8BgwH/AQcBJwEgAf8BFAElASEB/wH7AvkB/wOvAf8DOAFeAkcBRgGAA1YBsQNK
+        AzoBYQNYAbsDQAFwAwsBD7wAAwgBCwMqAUADQQFyAlIBUQGhA1sBywNiAekBVgFPAU0B+gHtAcoBpQH/
+        AdMBrAGOAf8BuAGSAT0B/wNcAd8DUQGcAzUBVgMcAScDDQERAx4BKwJSAVABpAJRAU8BnAMjATMIAANf
+        AeMB+wL5Af8BAwEpASQB/wE5ApoB/wExAZIBlgH/ARUBPwE5Af8BEgEyASUB/wECARgBEgH/AQkBGQES
+        Af8BigGnAZ8B/wErAY8BgwH/AQABFgEPAf8BAwEUARAB/wH7AvkB/wOvAf8DOAFeAkcBRgGAA1YBsQNK
         AY0DQAFxAwwBEAQAA18B4wNfAeMDXwHjA18B4wNfAeMDXwHjA18B4wNfAeMDXwHjA18B4wNfAeMDXwHj
         A18B4wNfAeMDXwHjA18B4wNfAeMDXwHjA18B4wNfAeMDXwHjA18B41wAAxMBGgM+AWsCWQFXAcIB7wG7
         AYUB/wH5AdsBswH/AfsB5QHCAf8B/AHXAagB/wH1AcgBlgH/AfUByQGcAf8B4QGvAYYB/wHIAZsBgwH/
         AcgBsAGoAf8B2gHYAdcB/wNgAesDUwGoA04BlwJYAVYBvANUAa4DTgGUAycBOwMFAQcDXwHjAfsC+QH/
-        AScBEQEKAf8DAAH/AQQCAAH/ASMBCQERAf8BRQFIAYUB/wEiARkBHwH/AQgBAAEDAf8CAAEGAf8BOQEi
-        AUYB/wERAQMBDAH/AS8BHwE0Af8B+wL5Af8DrAH/AeQB5wHpAf8CqAGfAf0DYQHuAl4BXQHQAlkBVgG+
-        AkkBSAGIAyABLgNfAeMB7wLuAf8B7wLuAf8B7wLuAf8B7wLuAf8B7wLuAf8B7wLuAf8B7wLuAf8B7wLu
-        Af8B7wLuAf8B7wLuAf8B7wLuAf8B7wLuAf8B7wLuAf8B7wLuAf8B7wLuAf8B7wLuAf8B7wLuAf8B7wLu
-        Af8B7wLuAf8B7wLuAf8DXwHjXAADDAEQAlkBVwG/AfQBtQFKAf8B2wGXATEB/wHTAYkBHgH/Ad0BmwE2
-        Af8B4gGmAUUB/wHeAaMBQwH/AfIB3gHNAf8B6wG/AZoB/wHjAagBSAH/AdQBrwGYAf8B7wHyAfUB/wLz
-        AfIB/wHzAfUB+QH/AcUBwAG3Af8BrgGLATsB/wNhAe4DYQHiA1sByAM6AWEDXwHjAfsC+QL/AfEBvgH/
-        AZMBkgGmAf8BMgE3AYAB/wEoASIBIAH/AQABCgESAf8DAAH/AwAB/wFBATkBMAH/ASUBIAFFAf8BKgEr
-        AYkB/wESARcBPQH/AfsC+QH/A6oB/wHVAdcB2QH/Ab8BrwGcAf8B5wHIAacB/wHcAbQBiQH/AdwBtAGJ
-        Af8B2gGuAYAB/wNOAZgDXwHjAe8C7gH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8BAAEM
-        AQAB/wEAAQIBAAH/AwAB/wEAAQsBAAH/AwAB/wMAAf8DAAH/AQACBAH/AQABDwEAAf8DAAH/Ae8C7gH/
-        A18B41wAAzEBTgHhAY4BGwH/AcUBQwEHAf8BywGFASIB/wHeAaYBSAH/AeQBqQFGAf8B4QGdATEB/wHg
-        AaIBPgH/AfAB1wHCAf8B0wGYAT4B/wHLAYIBHgH/AeEBqwGBAf8B8wHrAeIB/wHtAe4B7wH/Ad8B4gHk
-        Af8BrwGpAaIB/wGxAYoBOgH/AdsBrgGBAf8B3QG2AYwB/wHeAbgBjQH/A1IBqQNfAeMB+wL5Av8B1wGd
-        Av8B4AGjAf8BQgFDAZUB/wFGAYcBuwH/AYgBNwE1Av8B2QGVAv8B9gG8Av8B+wG5Av8B1gGZAf8BtgGa
-        AUgB/wEeARYBDAH/AfsC+QH/A6wB/wHWAdgB2wH/Ab4BrQGbAf8B6AHJAacB/wHeAbUBhwH/Ad0BtAGH
-        Af8B3QG1AYgB/wNQAZsDXwHjAe8C7gH/AQABIQESAf8BKAGDAUoB/wEUAYgBTgH/ASkBkgGPAf8BMQGW
-        AZMB/wEiAY4BigH/ARUBhgGCAf8BDAFNAT8B/wEFATUBJAH/AQABFwEEAf8BAAEfARMB/wEIASYBEwH/
-        AZwBzwHNAf8BEgFCATEB/wEkAYUBUQH/ARgBNAE5Af8BEwE3ASsB/wEAARQBAAH/Ae8C7gH/A18B41wA
-        A2AB1AGvASMBAAH/AcMBRAELAf8B1QGQAScB/wHrAcIBmwH/AfUB2QG9Af8B6QGzAYAB/wHhAZ4BNQH/
-        Ad0BmwE0Af8BzQGAARYB/wG7ATkBAAH/AcABRQEQAf8B7gHKAaoB/wHvAfQB9wH/AeEB5AHmAf8BswGv
-        AaQB/wG2AZEBQQH/Ad0BrwGCAf8B3wG1AYYB/wHgAbgBiwH/A1EBoANfAeMB+wL5Af8B+AG7AYcC/wHK
-        AYcB/wH2AcABkQH/ARkBJQFPAf8B4AGgAUMC/wHjAaIC/wHCAY0B/wH9Ab4BjAL/Ac0BlQL/AeABnwL/
-        Ad4BmAH/AfsC+QH/A60B/wHWAdkB2wH/Ab4BrgGbAf8B6QHLAakB/wHhAbgBiwH/AeABuAGKAf8B4AG4
-        AYoB/wNQAZsDXwHjAe8C7gH/ARoCAAH/AwAB/wEtAhQB/wGEAUkBTwH/Aa8BnQGhAf8BhQE+AUwB/wFR
-        AT0BQgH/AZABTQGGAf8BlQGLAY0B/wGqAZEBpgH/AS0BGAEmAf8BnwGEAZEB/wGDAYABUQH/AToBJQE7
-        Af8BJgEhASIB/wMAAf8BmQFRAYsB/wMAAf8B7wLuAf8DXwHjXAABvwE9AQAB/wGsAR4BAAH/AcYBRQED
-        Af8B1wGTASsB/wHdAaMBQQH/Ad8BpQFFAf8B5wG5AZIB/wH3AeUB1QH/AeABqwFOAf8B0AGKAR4B/wHB
-        AUABAQH/AawBHwEAAf8B0gGWAT4B/wHwAfcB+wH/Ad8B4QHlAf8BuwG0AbEB/wHEAagBhgH/AeQBuQGK
-        Af8B4gG5AYoB/wHiAbsBjQH/A1EBoANfAeMB+wL5Af8B8AGyAUsB/wHwAbABSgL/AboBSwL/Ab0BTQL/
-        Ab0BgQH/AfEBrwFKAf8B8gGzAU8B/wHvAbQBUAH/AfIBtAFQAf8B8wG0AVEB/wH2AbIBTAH/AfsC+QH/
-        A64B/wHWAdoB3gH/Ab4BsQGfAf8B6wHPAa0B/wHjAbsBjAH/AeMBuwGOAf8B4gG7AY0B/wNQAZsDXwHj
-        Ae8C7gH/Ad0BugGWAf8BsQGdAYoB/wESAQ4BAAH/AwAB/wMAAf8DAAH/AwAB/wEtASwBQwH/ARABLQE3
-        Af8BAAECAQAB/wMAAf8DAAH/AQ8BCAEbAf8BPAEpAU4B/wEFAQgBDQH/AScBHwE5Af8BIAEqAT4B/wIA
-        ARQB/wHvAu4B/wNfAeNcAAGtASABAAH/AdEBnQFJAf8B3gGuAYYB/wHKAU4BEAH/AdQBkQEsAf8BzwGB
-        AREB/wHdAaUBSQX/AeIBtQGRAf8ByQFPAQ4B/wHLAYIBGwH/AbIBJwEAAf8BvgFIARcB/wHpAfMB+gH/
-        AdsB3gHfAf8BxgG/AbIB/wHZAcMBpwH/Ae0BywGkAf8B5AG8AY0B/wHlAb8BkAH/A1EBoANfAeMB+wL5
-        Af8B6gGkAT0B/wHqAaQBPwH/AekBowE+Af8B8AGoAUAB/wHqAaQBPwH/AeoBpAFBAf8B6gGmAT8B/wHs
-        AakBQwH/AewBpwFEAf8B7QGrAUMB/wHsAaUBPQH/AfsC+QH/A68B/wHZAdgB1QH/AckBtQGcAf8B8QHb
-        AcMB/wHoAcUBnAH/AeUBvgGPAf8B5QG/AZEB/wNQAZsDXwHjAe8C7gH/AfEBxQGaAv8B4gG8Av8B+AHI
-        Af8CmQGxAf8BhgGPAbIB/wFIAUQBSgH/ARwBFAETAf8DAAH/ARgBNgE7Af8DAAH/AwAB/wMAAf8BLAEv
-        AYYB/wEhARkBPwH/AU4BSQGYAf8BRgE9AYwB/wE1ASoBQwH/AwAB/wHvAu4B/wNfAeNcAAGoARUBAAH/
-        AdYBpAGAAf8B8wHkAdcB/wHZAaIBSwH/AcgBSwEMAf8BxgFFAQMB/wHSAY4BKwH/Ac8BiQElAf8B0gGU
-        ATQB/wHKAYABFgH/AcMBQgEDAf8BvAE6AQAB/wG5AT8BDQH/AfAB/AH+Af8BxwHGAcUB/wHOAb8BqwH/
-        AfEB1wG3Af8B7gHUAbQB/wHqAckBoAH/AekBwgGTAf8DUQGgA18B4wH7AvkB/wHgAZcBNgH/AeEBlwE0
-        Af8B3wGXATYB/wHfAZcBNQH/Ad8BlwE3Af8B3wGZATgB/wHgAZgBNwH/AeEBmQE5Af8B4gGaATgB/wHk
-        AZ0BOgH/AeABlQE0Af8B+wL5Af8DsQH/AcIBugGuAf8B8wHgAcgB/wHuAdMBsQH/Ae4B1AG1Af8B6gHI
-        AZ4B/wHoAcEBkgH/A1ABmwNfAeMB7wLuAf8B/AHCAYcB/wH6Ac4BoAL/AdgBogL/AdgBogH/AU8BiQGr
-        Af8BSwE/AYkB/wKjAb0B/wGJAZIBqQH/ARQCAAH/ATcBHwEMAf8BiwE4AR0C/wHYAaYB/wHfAbgBiwH/
-        AUQBNQExAf8BJgEoAToB/wEKAQ8BLgH/AQ8BGwE2Af8DAAH/Ae8C7gH/A18B41wAAawBGAEAAf8BsgEm
-        AQAB/wHEAUYBCQH/AcoBgwEeAf8BzwGMASwB/wHsAdMBwQH/AfgB7QHkAf8BywGDAR0B/wHCAUEBAQH/
-        Ac8BjAEsAf8BvwE9AQAB/wGrARgBAAH/Ab0BRQETAf8B8wP/AcQBwgG+Af8B0AG/AasB/wH1AdwBvgH/
-        AfAB1gG3Af8B8AHXAbgB/wHsAcgBnAH/A1EBoANfAeMB+wL5Af8B+wL5Af8B+wL5Af8B+wL5Af8B+wL5
-        Af8B+wL5Af8B+wL5Af8B+wL5Af8B+wL5Af8B+wL5Af8B+wL5Af8B+wL5Af8B+wL4Af8DrAH/AcwBwgG2
-        Af8B9QHkAdAB/wHwAdYBtwH/AfAB2AG6Af8B7wHWAbYB/wHqAcYBmAH/A1ABmwNfAeMB7wLuAv8BuQFL
-        Af8B/gHIAZYB/wH7AcUBlAL/AdoBmAH/AeIBtgGPAf8BKgExAYoB/wFPAUgBkAH/ATkBSgGiAf8BuQFJ
-        ASkD/wHEAv8B8QG3Av8B3gGoAv8B5AGnAv8B8QGsAv8B1gGVAf8BrAGIAS0B/wE8ASoBDgH/AwAB/wHv
-        Au4B/wNfAeNcAAJbAVgBxgGjAQkBAAH/AckBhAEiAf8BzgGMAS8B/wHMAYgBKAH/Ae4B1wHGAf8B+AHw
-        AeoB/wHaAasBhwH/AdQBngFHAf8BzgGRATUB/wHgAbsBoAH/AcoBigExAf8B2gGvAZAB/wHvAfYB/AH/
-        AcUBwwHAAf8B1QHFAbAB/wH4AeIBxQH/AfIB2gG7Af8B8gHdAcMB/wHyAdUBsQH/A1EBoANfAeMDXwHj
-        A18B4wNfAeMDXwHjA18B4wO0Af8DtAH/A7QB/wO0Af8DtAH/A7MB/wOpAf8DmAH/A6AB/wHMAcMBtwH/
-        AfgB6QHVAf8B8gHbAb0B/wHyAdsBvgH/AfIB3QHCAf8B8AHSAawB/wNQAZsDXwHjAe8C7gH/Af4BrwE9
-        Af8B+QHAAYwB/wH5Ab8BjAH/AfkBvQGJAv8B1QGMAf8ByAGlAZAB/wEsAUEBpAH/AQwBAAEVAv8BwAFQ
-        Av8BywGUAf8B+wG+AYsB/wH9Ab8BiwH/Af0BwQGMAf8B/gHCAY4C/wHNAZcC/wHkAaYC/wHvAa8C/wHO
-        AYEB/wHvAu4B/wNfAeNcAAMtAUYBbQJRAfcBygGJAS0B/wHcAbEBlAH/AeIBvQGiAf8B3wG3AZgB/wHY
-        AaUBUQH/AdkBqAGEAf8B3QGzAZMB/wHZAaoBiAH/AdYBpQGCAf8B1QGjAYAB/wL7AfoB/wHtAfAB8gH/
-        AcYBwwHBAf8B1wHHAbQB/wH9AegBzQH/AfUB4AHCAf8B9AHgAcUB/wH0Ad8BwgH/A1EBoBgAAzMBUgP1
-        Af8D/QH/A/wB/wP9Af8D/QH/A/0B/wPmAf8B4QHiAeUB/wHKAcEBtgH/AfoB7AHZAf8B9wHhAcQB/wH0
-        Ad8BwgH/AfQB4AHFAf8B8wHcAb0B/wNQAZsDXwHjAe8C7gH/AfcBowEvAf8B9QG3AYMB/wH2AbYBgAH/
-        AfMBuAGAAf8B9QG2AYEC/wHJAYEB/wHAAZwBTwH/AdABnwFNAv8ByAGLAf8B9QG3AYEB/wH0AbgBgwH/
-        AfYBugGEAf8B9gG6AYUB/wH1AbsBhwH/AfgBvAGFAf8B+QG5AYYB/wH6Ab0BiAL/AbEBPQH/Ae8C7gH/
-        A18B41wAAwMBBANEAXoCWQFCAfUB6QHQAb0B/wH6AfUB8wH/Ae0B1wHGAf8B6wHSAcAB/wHtAdYBxQH/
-        AekBzAG2Af8B0QGZAUYB/wG7AT0BBwH/Ae8B3QHPAf8B/AH+Av8B7AHvAfAB/wHHAcUBwQH/AdUBxwG0
-        Av8B7QHTAf8B+QHlAcoB/wH2AeQByQH/AfcB5QHLAf8DUQGgGAADMwFSA/YB/wP+Af8D/QH/A/0B/wP+
-        Af8D/gH/A+gB/wHjAeQB5wH/AcsBwgG2Af8B/AHwAd4B/wH8AeoB0AH/AfwB6gHQAf8B9wHmAc0B/wH3
-        AeYBzQH/A1ABmwNfAeMB7wLuAf8B8AGaASIB/wHwAa8BSAH/AfABrgFIAf8B7gGuAUcB/wHwAbABSQH/
-        Ae4BrgFJAv8BuwFJAv8BuwFMAf8B7gGuAUoB/wHwAa8BSQH/AfABsQFLAf8B8AGwAUwB/wHwAbIBTAH/
-        AfEBsQFOAf8B8gGzAVAB/wHyAbQBTgH/AfYBtgGBAf8B9gGiASwB/wHvAu4B/wNfAeNkAAM+AWsCXAFa
-        Ac0BbQFkAVEB+gHnAc8BvAH/AfQB3AHJAf8B5gHGAa8B/wHZAasBjAH/AcwBkQE8Af8B5wHJAbUF/wP7
-        Af8B7AHwAfEB/wHJAcQBwAH/AdgBygG3Av8B7wHXAf8B/QHsAdAB/wH5AekB0AH/AfkB6AHQAf8DUQGg
-        GAADMwFSA/cF/wP+Af8D/gH/A/4B/wP+Af8D6AH/AeMB5AHpAf8BywHCAbgB/wH9AfIB4QH/Af4B7QHT
-        Af8B/gHuAdUB/wH7AesB0wH/AfgB6QHRAf8DUAGbA18B4wHvAu4B/wHsAZABFgH/AesBpwFDAf8B6wGn
-        AT4B/wHsAaYBQAH/AesBpgE/Af8B7AGmAT8B/wHoAaUBPwH/AeoBpQFBAf8B7AGoAUAB/wHpAacBQgH/
-        AesBpwFBAf8B7QGoAUIB/wHsAaoBRQH/Ae4BrAFDAf8B7QGtAUQB/wHwAa4BRgH/AfABsAFIAf8B8AGY
-        AR8B/wHvAu4B/wNfAeNoAAMUARsCPwE+AWwDTAGSA1MBqANdAfAB4AG9AaQB/wH4AfMB7wn/A/sB/wHs
-        Ae4B8AH/AckBxQHDAf8B2AHLAboC/wHzAdsC/wHvAdUB/wH+Ae4B1wH/AfsB6wHVAf8DUQGgGAADMwFS
-        A/gF/wP+Af8D/gH/A/4B/wP+Af8D6gH/AecB6AHqAf8BzwHEAboB/wH+AfMB4wL/Ae8B2AL/AfAB2gH/
-        Af4B7wHZAf8B+gHrAdYB/wNQAZsDXwHjAe8C7gH/AeQBhAEQAf8B5gGfATsB/wHnAZ4BOgH/AeUBngE6
-        Af8B5QGeAToB/wHlAZ4BOgH/AeUBngE8Af8B5QGeATsB/wHlAZ0BOwH/AeUBnwE8Af8B5wGfATwB/wHm
-        AaABPgH/AecBoQE+Af8B5wGiAT4B/wHoAaMBQAH/AekBpAE/Af8B7AGmAUIB/wHqAY0BFQH/Ae8C7gH/
-        A18B43QAAw0BEQNgAdYI/wP+Bf8D+wH/Ae4B7wHxAf8ByAHEAcAB/wHYAcsBugL/AfYB4AL/AfAB3AL/
-        AfEB3AH/AfwB7gHbAf8DUQGgGAADMwFSA/gF/wP+Af8D/gH/A/4B/wP+Af8C8QHyAf8B5gHnAeoB/wHN
-        AcEBtgH/Af4B8wHjAv8B8gHeAv8B8gHfAv8B8gHfAf8B+gHuAdwB/wNQAZsDXwHjAe8C7gH/AdwBTgEJ
-        Af8B4gGZATgB/wHgAZgBOAH/AeABmAE2Af8B4QGYATUB/wHfAZgBOAH/Ad8BmAE3Af8B3wGYATcB/wHf
-        AZgBOAH/AeEBmQE6Af8B4AGZAToB/wHgAZgBNwH/AeEBmQE5Af8B4gGbATgB/wHkAZwBOgH/AeQBnQE7
-        Af8B5gGfAT4B/wHjAYMBEQH/Ae8C7gH/A18B43QAAxwBJwNhAdoE/wP+Af8D/gH/A/4B/wP9Af8B9wH5
-        AfwB/wHaAdUB0wH/AeYB1wHGAv8B9wHkAv8B9AHhAv8B9AHjAf8B/QHyAeAB/wNRAaAYAAMzAVID+QX/
-        A/4B/wP+Af8D/gH/A/4B/wP9Af8B8QHzAfcB/wHhAdMBwwH/Af4B8QHgAv8B9AHeAv8B9QHjAv8B9QHl
-        Af8B+wHxAeAB/wNQAZsDXwHjAe8C7gH/Ac4BIwEAAf8B1QFHAQAB/wHVAUYBAAH/AdMBRAEAAf8B0wFE
-        AQAB/wHUAUQBAAH/AdIBRAEAAf8B0gFEAQAB/wHSAUQBAAH/AdQBRgEAAf8B0wFGAQAB/wHTAUUBAgH/
-        AdQBRwEBAf8B1gFIAQEB/wHVAUkBAwH/AdkBSwEEAf8B2AFNAQcB/wHUAS4BAAH/Ae8C7gH/A18B43QA
-        Ax0BKQNeAd0I/wP+Cf8B/gP/AfYB8gHuAf8B9AHlAdQC/wH1AeAC/wH4AeUC/wH2AegB/wH9AfQB5gH/
-        A1EBoBgAAzMBUwP7Cf8D/hH/Ae8B4wHXAf8B9wHkAccC/wH0Ad0C/wHzAeIC/wH2AecB/wH7AfMB5QH/
-        A1ABmwNfAeMB7wLuAf8B7wLuAf8B7wLuAf8B7wLuAf8B7wLuAf8B7wLuAf8B7wLuAf8B7wLuAf8B7wLu
-        Af8B7wLuAf8B7wLuAf8B7wLuAf8B7wLuAf8B7wLuAf8B7wLuAf8B7wLuAf8B7wLuAf8B7wLuAf8B7wLu
-        Af8B7wLuAf8DXwHjdAADEAEVA1wBzxr/Af4B/wH7AfQB7QH/AfoB7AHaAf8B/gHzAd8C/wH6AekB/wH9
-        AfcB6wH/A1EBoBgAAyEBMANfAegD/hn/Av4B/QH/AfkB7gHjAf8B+AHpAdQB/wH+AfAB3AL/AfgB6QH/
-        AfsB9AHoAf8DUAGbA18B4wNfAeMDXwHjA18B4wNfAeMDXwHjA18B4wNfAeMDXwHjA18B4wNfAeMDXwHj
-        A18B4wNfAeMDXwHjA18B4wNfAeMDXwHjA18B4wNfAeMDXwHjA18B43cAAQEDHAEnAzEBTgM4AV4DQAFw
-        A0wBkgNYAbsDYQHcA2QB7ANtAfgB/AH6AfgB/wH8AfQB6AH/Af0B8gHgAv8B+QHrAf8DUQGgHAADDwEU
-        AyEBMAMqAUADMwFSA0IBdQNRAZ8DWwHGA18B2wNfAegDYgH2AfsB+AH2Af8B+gHvAeUB/wH8AfAB3wH/
-        Af0B9wHrAf8DUAGa2wABAQMCAQMDBQEHAwkEDAEQAxIBGQMaASQDJgE4AzcBWgNIAYQDVgG0A0MBdzgA
-        AwMBBAMLAQ8DEwEaAyQBNQM3AVsDSQGHA1YBtANBAXKwAAFCAU0BPgcAAT4DAAEoAwABWAMAARYDAAEB
-        AQABAQUAAQgBARYAA/8BAAHgAR8BHAEAAQQBfwL/AcADAAHAAQcBDAEAAQQBPwL/AcADAAGAAQABDAIA
-        ARAGAAGACwABgAsAAYALAAGACwABgAsAAYALAAGACwABgAsAAYALAAGAAQABAwHwCAABgAEAAQMB8AgA
-        AeABAAEDAfAIAAHwAQABAwHwCAAB/gEAAQMB8AgAAf4BAAEDAfAIAAH+AQABAwHwCAAB/gEAAQMB8AgA
-        Af4BAAEDAfgBAAEPAv8BwAMAAf8BwAEDAf8B8AEPAv8BwAMACw==
+        ARYCAAH/AwAB/wMAAf8BEgIAAf8BNAE3AYUB/wERAQgBDgH/AwAB/wMAAf8BKAERATUB/wMAAf8BHgEO
+        ASMB/wH7AvkB/wOsAf8B5AHnAekB/wKoAZ8B/QNhAe4CXgFdAdACWQFWAb4CSQFIAYgDIAEuA18B4wHv
+        Au4B/wHvAu4B/wHvAu4B/wHvAu4B/wHvAu4B/wHvAu4B/wHvAu4B/wHvAu4B/wHvAu4B/wHvAu4B/wHv
+        Au4B/wHvAu4B/wHvAu4B/wHvAu4B/wHvAu4B/wHvAu4B/wHvAu4B/wHvAu4B/wHvAu4B/wHvAu4B/wNf
+        AeNcAAMMARACWQFXAb8B9AG1ATkB/wHbAZcBIAH/AdMBiQENAf8B3QGbASUB/wHiAaYBNAH/Ad4BowEy
+        Af8B8gHeAc0B/wHrAb8BmgH/AeMBqAE3Af8B1AGvAZgB/wHvAfIB9QH/AvMB8gH/AfMB9QH5Af8BxQHA
+        AbcB/wGuAYsBKgH/A2EB7gNhAeIDWwHIAzoBYQNfAeMB+wL5Av8B8QG+Af8BkwGSAaYB/wEhASYBgAH/
+        ARcBEQEPAf8CAAEBAf8DAAH/AwAB/wEwASgBHwH/ARQBDwE0Af8BGQEaAYkB/wEBAQYBLAH/AfsC+QH/
+        A6oB/wHVAdcB2QH/Ab8BrwGcAf8B5wHIAacB/wHcAbQBiQH/AdwBtAGJAf8B2gGuAYAB/wNOAZgDXwHj
+        Ae8C7gH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMA
+        Af8DAAH/AwAB/wMAAf8DAAH/Ae8C7gH/A18B41wAAzEBTgHhAY4BCgH/AcUBMgEAAf8BywGFAREB/wHe
+        AaYBNwH/AeQBqQE1Af8B4QGdASAB/wHgAaIBLQH/AfAB1wHCAf8B0wGYAS0B/wHLAYIBDQH/AeEBqwGB
+        Af8B8wHrAeIB/wHtAe4B7wH/Ad8B4gHkAf8BrwGpAaIB/wGxAYoBKQH/AdsBrgGBAf8B3QG2AYwB/wHe
+        AbgBjQH/A1IBqQNfAeMB+wL5Av8B1wGdAv8B4AGjAf8BMQEyAZUB/wE1AYcBuwH/AYgBJgEkAv8B2QGV
+        Av8B9gG8Av8B+wG5Av8B1gGZAf8BtgGaATcB/wENAQUBAAH/AfsC+QH/A6wB/wHWAdgB2wH/Ab4BrQGb
+        Af8B6AHJAacB/wHeAbUBhwH/Ad0BtAGHAf8B3QG1AYgB/wNQAZsDXwHjAe8C7gH/AQABEAEBAf8BFwGD
+        ATkB/wEDAYgBPQH/ARgBkgGPAf8BIAGWAZMB/wERAY4BigH/AQQBhgGCAf8BAAE8AS4B/wEAASQBEwH/
+        AQABBgEAAf8BAAEOAQIB/wEAARUBAgH/AZwBzwHNAf8BAQExASAB/wETAYUBQAH/AQcBIwEoAf8BAgEm
+        ARoB/wEAAQMBAAH/Ae8C7gH/A18B41wAA2AB1AGvARIBAAH/AcMBMwEAAf8B1QGQARYB/wHrAcIBmwH/
+        AfUB2QG9Af8B6QGzAYAB/wHhAZ4BJAH/Ad0BmwEjAf8BzQGAAQUB/wG7ASgBAAH/AcABNAEAAf8B7gHK
+        AaoB/wHvAfQB9wH/AeEB5AHmAf8BswGvAaQB/wG2AZEBMAH/Ad0BrwGCAf8B3wG1AYYB/wHgAbgBiwH/
+        A1EBoANfAeMB+wL5Af8B+AG7AYcC/wHKAYcB/wH2AcABkQH/AQgBFAE+Af8B4AGgATIC/wHjAaIC/wHC
+        AY0B/wH9Ab4BjAL/Ac0BlQL/AeABnwL/Ad4BmAH/AfsC+QH/A60B/wHWAdkB2wH/Ab4BrgGbAf8B6QHL
+        AakB/wHhAbgBiwH/AeABuAGKAf8B4AG4AYoB/wNQAZsDXwHjAe8C7gH/AQkCAAH/AwAB/wEcAgMB/wGE
+        ATgBPgH/Aa8BnQGhAf8BhQEtATsB/wFAASwBMQH/AZABPAGGAf8BlQGLAY0B/wGqAZEBpgH/ARwBBwEV
+        Af8BnwGEAZEB/wGDAYABQAH/ASkBFAEqAf8BFQEQAREB/wMAAf8BmQFAAYsB/wMAAf8B7wLuAf8DXwHj
+        XAABvwEsAQAB/wGsAQ0BAAH/AcYBNAEAAf8B1wGTARoB/wHdAaMBMAH/Ad8BpQE0Af8B5wG5AZIB/wH3
+        AeUB1QH/AeABqwE9Af8B0AGKAQ0B/wHBAS8BAAH/AawBDgEAAf8B0gGWAS0B/wHwAfcB+wH/Ad8B4QHl
+        Af8BuwG0AbEB/wHEAagBhgH/AeQBuQGKAf8B4gG5AYoB/wHiAbsBjQH/A1EBoANfAeMB+wL5Af8B8AGy
+        AToB/wHwAbABOQL/AboBOgL/Ab0BPAL/Ab0BgQH/AfEBrwE5Af8B8gGzAT4B/wHvAbQBPwH/AfIBtAE/
+        Af8B8wG0AUAB/wH2AbIBOwH/AfsC+QH/A64B/wHWAdoB3gH/Ab4BsQGfAf8B6wHPAa0B/wHjAbsBjAH/
+        AeMBuwGOAf8B4gG7AY0B/wNQAZsDXwHjAe8C7gH/Ad0BugGWAf8BsQGdAYoB/wEBAgAB/wMAAf8DAAH/
+        AwAB/wMAAf8BHAEbATIB/wEAARwBJgH/AwAB/wMAAf8DAAH/AgABCgH/ASsBGAE9Af8DAAH/ARYBDgEo
+        Af8BDwEZAS0B/wIAAQMB/wHvAu4B/wNfAeNcAAGtAQ8BAAH/AdEBnQE4Af8B3gGuAYYB/wHKAT0BAAH/
+        AdQBkQEbAf8BzwGBAQAB/wHdAaUBOAX/AeIBtQGRAf8ByQE+AQAB/wHLAYIBCgH/AbIBFgEAAf8BvgE3
+        AQYB/wHpAfMB+gH/AdsB3gHfAf8BxgG/AbIB/wHZAcMBpwH/Ae0BywGkAf8B5AG8AY0B/wHlAb8BkAH/
+        A1EBoANfAeMB+wL5Af8B6gGkASwB/wHqAaQBLgH/AekBowEtAf8B8AGoAS8B/wHqAaQBLgH/AeoBpAEw
+        Af8B6gGmAS4B/wHsAakBMgH/AewBpwEzAf8B7QGrATIB/wHsAaUBLAH/AfsC+QH/A68B/wHZAdgB1QH/
+        AckBtQGcAf8B8QHbAcMB/wHoAcUBnAH/AeUBvgGPAf8B5QG/AZEB/wNQAZsDXwHjAe8C7gH/AfEBxQGa
+        Av8B4gG8Av8B+AHIAf8CmQGxAf8BhgGPAbIB/wE3ATMBOQH/AQsBAwECAf8DAAH/AQcBJQEqAf8DAAH/
+        AwAB/wMAAf8BGwEeAYYB/wEQAQgBLgH/AT0BOAGYAf8BNQEsAYwB/wEkARkBMgH/AwAB/wHvAu4B/wNf
+        AeNcAAGoAQQBAAH/AdYBpAGAAf8B8wHkAdcB/wHZAaIBOgH/AcgBOgEAAf8BxgE0AQAB/wHSAY4BGgH/
+        Ac8BiQEUAf8B0gGUASMB/wHKAYABBQH/AcMBMQEAAf8BvAEpAQAB/wG5AS4BAAH/AfAB/AH+Af8BxwHG
+        AcUB/wHOAb8BqwH/AfEB1wG3Af8B7gHUAbQB/wHqAckBoAH/AekBwgGTAf8DUQGgA18B4wH7AvkB/wHg
+        AZcBJQH/AeEBlwEjAf8B3wGXASUB/wHfAZcBJAH/Ad8BlwEmAf8B3wGZAScB/wHgAZgBJgH/AeEBmQEo
+        Af8B4gGaAScB/wHkAZ0BKQH/AeABlQEjAf8B+wL5Af8DsQH/AcIBugGuAf8B8wHgAcgB/wHuAdMBsQH/
+        Ae4B1AG1Af8B6gHIAZ4B/wHoAcEBkgH/A1ABmwNfAeMB7wLuAf8B/AHCAYcB/wH6Ac4BoAL/AdgBogL/
+        AdgBogH/AT4BiQGrAf8BOgEuAYkB/wKjAb0B/wGJAZIBqQH/AQMCAAH/ASYBDgEAAf8BiwEnAQwC/wHY
+        AaYB/wHfAbgBiwH/ATMBJAEgAf8BFQEXASkB/wIAAR0B/wEAAQoBJQH/AwAB/wHvAu4B/wNfAeNcAAGs
+        AQcBAAH/AbIBFQEAAf8BxAE1AQAB/wHKAYMBDQH/Ac8BjAEbAf8B7AHTAcEB/wH4Ae0B5AH/AcsBgwEM
+        Af8BwgEwAQAB/wHPAYwBGwH/Ab8BLAEAAf8BqwEHAQAB/wG9ATQBAgH/AfMD/wHEAcIBvgH/AdABvwGr
+        Af8B9QHcAb4B/wHwAdYBtwH/AfAB1wG4Af8B7AHIAZwB/wNRAaADXwHjAfsC+QH/AfsC+QH/AfsC+QH/
+        AfsC+QH/AfsC+QH/AfsC+QH/AfsC+QH/AfsC+QH/AfsC+QH/AfsC+QH/AfsC+QH/AfsC+QH/AfsC+AH/
+        A6wB/wHMAcIBtgH/AfUB5AHQAf8B8AHWAbcB/wHwAdgBugH/Ae8B1gG2Af8B6gHGAZgB/wNQAZsDXwHj
+        Ae8C7gL/AbkBOgH/Af4ByAGWAf8B+wHFAZQC/wHaAZgB/wHiAbYBjwH/ARkBIAGKAf8BPgE3AZAB/wEo
+        ATkBogH/AbkBOAEYA/8BxAL/AfEBtwL/Ad4BqAL/AeQBpwL/AfEBrAL/AdYBlQH/AawBiAEcAf8BKwEZ
+        AQAB/wMAAf8B7wLuAf8DXwHjXAACWwFYAcYBowIAAf8ByQGEAREB/wHOAYwBHgH/AcwBiAEXAf8B7gHX
+        AcYB/wH4AfAB6gH/AdoBqwGHAf8B1AGeATYB/wHOAZEBJAH/AeABuwGgAf8BygGKASAB/wHaAa8BkAH/
+        Ae8B9gH8Af8BxQHDAcAB/wHVAcUBsAH/AfgB4gHFAf8B8gHaAbsB/wHyAd0BwwH/AfIB1QGxAf8DUQGg
+        A18B4wNfAeMDXwHjA18B4wNfAeMDXwHjA7QB/wO0Af8DtAH/A7QB/wO0Af8DswH/A6kB/wOYAf8DoAH/
+        AcwBwwG3Af8B+AHpAdUB/wHyAdsBvQH/AfIB2wG+Af8B8gHdAcIB/wHwAdIBrAH/A1ABmwNfAeMB7wLu
+        Af8B/gGvASwB/wH5AcABjAH/AfkBvwGMAf8B+QG9AYkC/wHVAYwB/wHIAaUBkAH/ARsBMAGkAf8CAAEE
+        Av8BwAE/Av8BywGUAf8B+wG+AYsB/wH9Ab8BiwH/Af0BwQGMAf8B/gHCAY4C/wHNAZcC/wHkAaYC/wHv
+        Aa8C/wHOAYEB/wHvAu4B/wNfAeNcAAMtAUYBbQJRAfcBygGJARwB/wHcAbEBlAH/AeIBvQGiAf8B3wG3
+        AZgB/wHYAaUBQAH/AdkBqAGEAf8B3QGzAZMB/wHZAaoBiAH/AdYBpQGCAf8B1QGjAYAB/wL7AfoB/wHt
+        AfAB8gH/AcYBwwHBAf8B1wHHAbQB/wH9AegBzQH/AfUB4AHCAf8B9AHgAcUB/wH0Ad8BwgH/A1EBoBgA
+        AzMBUgP1Af8D/QH/A/wB/wP9Af8D/QH/A/0B/wPmAf8B4QHiAeUB/wHKAcEBtgH/AfoB7AHZAf8B9wHh
+        AcQB/wH0Ad8BwgH/AfQB4AHFAf8B8wHcAb0B/wNQAZsDXwHjAe8C7gH/AfcBowEeAf8B9QG3AYMB/wH2
+        AbYBgAH/AfMBuAGAAf8B9QG2AYEC/wHJAYEB/wHAAZwBPgH/AdABnwE8Av8ByAGLAf8B9QG3AYEB/wH0
+        AbgBgwH/AfYBugGEAf8B9gG6AYUB/wH1AbsBhwH/AfgBvAGFAf8B+QG5AYYB/wH6Ab0BiAL/AbEBLAH/
+        Ae8C7gH/A18B41wAAwMBBANEAXoCWQFCAfUB6QHQAb0B/wH6AfUB8wH/Ae0B1wHGAf8B6wHSAcAB/wHt
+        AdYBxQH/AekBzAG2Af8B0QGZATUB/wG7ASwBAAH/Ae8B3QHPAf8B/AH+Av8B7AHvAfAB/wHHAcUBwQH/
+        AdUBxwG0Av8B7QHTAf8B+QHlAcoB/wH2AeQByQH/AfcB5QHLAf8DUQGgGAADMwFSA/YB/wP+Af8D/QH/
+        A/0B/wP+Af8D/gH/A+gB/wHjAeQB5wH/AcsBwgG2Af8B/AHwAd4B/wH8AeoB0AH/AfwB6gHQAf8B9wHm
+        Ac0B/wH3AeYBzQH/A1ABmwNfAeMB7wLuAf8B8AGaAREB/wHwAa8BNwH/AfABrgE3Af8B7gGuATYB/wHw
+        AbABOAH/Ae4BrgE4Av8BuwE4Av8BuwE7Af8B7gGuATkB/wHwAa8BOAH/AfABsQE6Af8B8AGwATsB/wHw
+        AbIBOwH/AfEBsQE9Af8B8gGzAT8B/wHyAbQBPQH/AfYBtgGBAf8B9gGiARsB/wHvAu4B/wNfAeNkAAM+
+        AWsCXAFaAc0BUwJNAfoB5wHPAbwB/wH0AdwByQH/AeYBxgGvAf8B2QGrAYwB/wHMAZEBKwH/AecByQG1
+        Bf8D+wH/AewB8AHxAf8ByQHEAcAB/wHYAcoBtwL/Ae8B1wH/Af0B7AHQAf8B+QHpAdAB/wH5AegB0AH/
+        A1EBoBgAAzMBUgP3Bf8D/gH/A/4B/wP+Af8D/gH/A+gB/wHjAeQB6QH/AcsBwgG4Af8B/QHyAeEB/wH+
+        Ae0B0wH/Af4B7gHVAf8B+wHrAdMB/wH4AekB0QH/A1ABmwNfAeMB7wLuAf8B7AGQAQUB/wHrAacBMgH/
+        AesBpwEtAf8B7AGmAS8B/wHrAaYBLgH/AewBpgEuAf8B6AGlAS4B/wHqAaUBMAH/AewBqAEvAf8B6QGn
+        ATEB/wHrAacBMAH/Ae0BqAExAf8B7AGqATQB/wHuAawBMgH/Ae0BrQEzAf8B8AGuATUB/wHwAbABNwH/
+        AfABmAEOAf8B7wLuAf8DXwHjaAADFAEbAj8BPgFsA0wBkgNTAagDXQHwAeABvQGkAf8B+AHzAe8J/wP7
+        Af8B7AHuAfAB/wHJAcUBwwH/AdgBywG6Av8B8wHbAv8B7wHVAf8B/gHuAdcB/wH7AesB1QH/A1EBoBgA
+        AzMBUgP4Bf8D/gH/A/4B/wP+Af8D/gH/A+oB/wHnAegB6gH/Ac8BxAG6Af8B/gHzAeMC/wHvAdgC/wHw
+        AdoB/wH+Ae8B2QH/AfoB6wHWAf8DUAGbA18B4wHvAu4B/wHkAYQBAAH/AeYBnwEqAf8B5wGeASkB/wHl
+        AZ4BKQH/AeUBngEpAf8B5QGeASkB/wHlAZ4BKwH/AeUBngEqAf8B5QGdASoB/wHlAZ8BKwH/AecBnwEr
+        Af8B5gGgAS0B/wHnAaEBLQH/AecBogEtAf8B6AGjAS8B/wHpAaQBLgH/AewBpgExAf8B6gGNAQQB/wHv
+        Au4B/wNfAeN0AAMNAREDYAHWCP8D/gX/A/sB/wHuAe8B8QH/AcgBxAHAAf8B2AHLAboC/wH2AeAC/wHw
+        AdwC/wHxAdwB/wH8Ae4B2wH/A1EBoBgAAzMBUgP4Bf8D/gH/A/4B/wP+Af8D/gH/AvEB8gH/AeYB5wHq
+        Af8BzQHBAbYB/wH+AfMB4wL/AfIB3gL/AfIB3wL/AfIB3wH/AfoB7gHcAf8DUAGbA18B4wHvAu4B/wHc
+        AT0BAAH/AeIBmQEnAf8B4AGYAScB/wHgAZgBJQH/AeEBmAEkAf8B3wGYAScB/wHfAZgBJgH/Ad8BmAEm
+        Af8B3wGYAScB/wHhAZkBKQH/AeABmQEpAf8B4AGYASYB/wHhAZkBKAH/AeIBmwEnAf8B5AGcASkB/wHk
+        AZ0BKgH/AeYBnwEtAf8B4wGDAQAB/wHvAu4B/wNfAeN0AAMcAScDYQHaBP8D/gH/A/4B/wP+Af8D/QH/
+        AfcB+QH8Af8B2gHVAdMB/wHmAdcBxgL/AfcB5AL/AfQB4QL/AfQB4wH/Af0B8gHgAf8DUQGgGAADMwFS
+        A/kF/wP+Af8D/gH/A/4B/wP+Af8D/QH/AfEB8wH3Af8B4QHTAcMB/wH+AfEB4AL/AfQB3gL/AfUB4wL/
+        AfUB5QH/AfsB8QHgAf8DUAGbA18B4wHvAu4B/wHOARIBAAH/AdUBNgEAAf8B1QE1AQAB/wHTATMBAAH/
+        AdMBMwEAAf8B1AEzAQAB/wHSATMBAAH/AdIBMwEAAf8B0gEzAQAB/wHUATUBAAH/AdMBNQEAAf8B0wE0
+        AQAB/wHUATYBAAH/AdYBNwEAAf8B1QE4AQAB/wHZAToBAAH/AdgBPAEAAf8B1AEdAQAB/wHvAu4B/wNf
+        AeN0AAMdASkDXgHdCP8D/gn/Af4D/wH2AfIB7gH/AfQB5QHUAv8B9QHgAv8B+AHlAv8B9gHoAf8B/QH0
+        AeYB/wNRAaAYAAMzAVMD+wn/A/4R/wHvAeMB1wH/AfcB5AHHAv8B9AHdAv8B8wHiAv8B9gHnAf8B+wHz
+        AeUB/wNQAZsDXwHjAe8C7gH/Ae8C7gH/Ae8C7gH/Ae8C7gH/Ae8C7gH/Ae8C7gH/Ae8C7gH/Ae8C7gH/
+        Ae8C7gH/Ae8C7gH/Ae8C7gH/Ae8C7gH/Ae8C7gH/Ae8C7gH/Ae8C7gH/Ae8C7gH/Ae8C7gH/Ae8C7gH/
+        Ae8C7gH/Ae8C7gH/A18B43QAAxABFQNcAc8a/wH+Af8B+wH0Ae0B/wH6AewB2gH/Af4B8wHfAv8B+gHp
+        Af8B/QH3AesB/wNRAaAYAAMhATADXwHoA/4Z/wL+Af0B/wH5Ae4B4wH/AfgB6QHUAf8B/gHwAdwC/wH4
+        AekB/wH7AfQB6AH/A1ABmwNfAeMDXwHjA18B4wNfAeMDXwHjA18B4wNfAeMDXwHjA18B4wNfAeMDXwHj
+        A18B4wNfAeMDXwHjA18B4wNfAeMDXwHjA18B4wNfAeMDXwHjA18B4wNfAeN3AAEBAxwBJwMxAU4DOAFe
+        A0ABcANMAZIDWAG7A2EB3ANkAewDXAH4AfwB+gH4Af8B/AH0AegB/wH9AfIB4AL/AfkB6wH/A1EBoBwA
+        Aw8BFAMhATADKgFAAzMBUgNCAXUDUQGfA1sBxgNfAdsDXwHoA2IB9gH7AfgB9gH/AfoB7wHlAf8B/AHw
+        Ad8B/wH9AfcB6wH/A1ABmtsAAQEDAgEDAwUBBwMJBAwBEAMSARkDGgEkAyYBOAM3AVoDSAGEA1YBtAND
+        AXc4AAMDAQQDCwEPAxMBGgMkATUDNwFbA0kBhwNWAbQDQQFysAABQgFNAT4HAAE+AwABKAMAAVgDAAEW
+        AwABAQEAAQEFAAEIAQEWAAP/AQAB4AEfARwBAAEEAX8C/wHAAwABwAEHAQwBAAEEAT8C/wHAAwABgAEA
+        AQwCAAEQBgABgAsAAYALAAGACwABgAsAAYALAAGACwABgAsAAYALAAGACwABgAEAAQMB8AgAAYABAAED
+        AfAIAAHgAQABAwHwCAAB8AEAAQMB8AgAAf4BAAEDAfAIAAH+AQABAwHwCAAB/gEAAQMB8AgAAf4BAAED
+        AfAIAAH+AQABAwH4AQABDwL/AcADAAH/AcABAwH/AfABDwL/AcADAAs=
 </value>
   </data>
   <data name="tabControl1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>562, 81</value>
-  </data>
-  <data name="tabControl1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>3, 3, 30, 3</value>
+    <value>309, 55</value>
   </data>
   <data name="tabControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>300, 350</value>
+    <value>327, 350</value>
   </data>
   <data name="tabControl1.TabIndex" type="System.Int32, mscorlib">
@@ -694,6 +1614,36 @@
     <value>11</value>
   </data>
+  <data name="picshowImg.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="picshowImg.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="picshowImg.Location" type="System.Drawing.Point, System.Drawing">
+    <value>642, 55</value>
+  </data>
+  <data name="picshowImg.Size" type="System.Drawing.Size, System.Drawing">
+    <value>379, 380</value>
+  </data>
+  <data name="picshowImg.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
+    <value>Zoom</value>
+  </data>
+  <data name="picshowImg.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;picshowImg.Name" xml:space="preserve">
+    <value>picshowImg</value>
+  </data>
+  <data name="&gt;&gt;picshowImg.Type" xml:space="preserve">
+    <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;picshowImg.Parent" xml:space="preserve">
+    <value>tableLayoutPanel1</value>
+  </data>
+  <data name="&gt;&gt;picshowImg.ZOrder" xml:space="preserve">
+    <value>12</value>
+  </data>
   <data name="tableLayoutPanel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
+    <value>Top</value>
   </data>
   <data name="tableLayoutPanel1.Location" type="System.Drawing.Point, System.Drawing">
@@ -701,8 +1651,8 @@
   </data>
   <data name="tableLayoutPanel1.RowCount" type="System.Int32, mscorlib">
-    <value>6</value>
+    <value>5</value>
   </data>
   <data name="tableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>864, 467</value>
+    <value>944, 438</value>
   </data>
   <data name="tableLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
@@ -719,8 +1669,8 @@
   </data>
   <data name="&gt;&gt;tableLayoutPanel1.ZOrder" xml:space="preserve">
-    <value>0</value>
+    <value>1</value>
   </data>
   <data name="tableLayoutPanel1.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
-    <value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="button2" Row="5" RowSpan="1" Column="3" ColumnSpan="1" /&gt;&lt;Control Name="label1" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="label4" Row="5" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="tbServer" Row="0" RowSpan="1" Column="1" ColumnSpan="3" /&gt;&lt;Control Name="tbUser" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="label2" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="AlbumsTV" Row="3" RowSpan="2" Column="0" ColumnSpan="4" /&gt;&lt;Control Name="tbPassword" Row="1" RowSpan="1" Column="3" ColumnSpan="1" /&gt;&lt;Control Name="button1" Row="2" RowSpan="1" Column="3" ColumnSpan="1" /&gt;&lt;Control Name="label3" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="cbxLstCatTo" Row="5" RowSpan="1" Column="1" ColumnSpan="2" /&gt;&lt;Control Name="tabControl1" Row="3" RowSpan="2" Column="4" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,20" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,30" /&gt;&lt;/TableLayoutSettings&gt;</value>
+    <value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="button2" Row="4" RowSpan="1" Column="3" ColumnSpan="1" /&gt;&lt;Control Name="label1" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="label4" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="tbServer" Row="0" RowSpan="1" Column="1" ColumnSpan="3" /&gt;&lt;Control Name="tbUser" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="label2" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="AlbumsTV" Row="2" RowSpan="2" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="tbPassword" Row="1" RowSpan="1" Column="3" ColumnSpan="1" /&gt;&lt;Control Name="button1" Row="1" RowSpan="1" Column="4" ColumnSpan="1" /&gt;&lt;Control Name="label3" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="cbxLstCatTo" Row="4" RowSpan="1" Column="1" ColumnSpan="2" /&gt;&lt;Control Name="tabControl1" Row="2" RowSpan="2" Column="2" ColumnSpan="2" /&gt;&lt;Control Name="picshowImg" Row="2" RowSpan="3" Column="3" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,30,Absolute,20,Absolute,20" /&gt;&lt;/TableLayoutSettings&gt;</value>
   </data>
   <data name="AlbumsTV.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
@@ -731,5 +1681,5 @@
   </data>
   <data name="AlbumsTV.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 81</value>
+    <value>3, 55</value>
   </data>
   <data name="AlbumsTV.Nodes" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -752,5 +1702,5 @@
   </data>
   <data name="AlbumsTV.Size" type="System.Drawing.Size, System.Drawing">
-    <value>553, 350</value>
+    <value>300, 350</value>
   </data>
   <data name="AlbumsTV.TabIndex" type="System.Int32, mscorlib">
@@ -769,636 +1719,30 @@
     <value>6</value>
   </data>
-  <metadata name="modelManagerBaseBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>278, 15</value>
+  <metadata name="folderBrowserDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>517, 15</value>
   </metadata>
-  <metadata name="lstCatBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>128, 14</value>
+  <metadata name="TreeViewCMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>686, 15</value>
   </metadata>
-  <data name="tableLayoutPanel2.ColumnCount" type="System.Int32, mscorlib">
-    <value>2</value>
-  </data>
-  <data name="&gt;&gt;txtAlbName.Name" xml:space="preserve">
-    <value>txtAlbName</value>
-  </data>
-  <data name="&gt;&gt;txtAlbName.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;txtAlbName.Parent" xml:space="preserve">
-    <value>tableLayoutPanel2</value>
-  </data>
-  <data name="&gt;&gt;txtAlbName.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;label5.Name" xml:space="preserve">
-    <value>label5</value>
-  </data>
-  <data name="&gt;&gt;label5.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label5.Parent" xml:space="preserve">
-    <value>tableLayoutPanel2</value>
-  </data>
-  <data name="&gt;&gt;label5.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="&gt;&gt;label7.Name" xml:space="preserve">
-    <value>label7</value>
-  </data>
-  <data name="&gt;&gt;label7.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label7.Parent" xml:space="preserve">
-    <value>tableLayoutPanel2</value>
-  </data>
-  <data name="&gt;&gt;label7.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="&gt;&gt;txtAlbComment.Name" xml:space="preserve">
-    <value>txtAlbComment</value>
-  </data>
-  <data name="&gt;&gt;txtAlbComment.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;txtAlbComment.Parent" xml:space="preserve">
-    <value>tableLayoutPanel2</value>
-  </data>
-  <data name="&gt;&gt;txtAlbComment.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="&gt;&gt;btnAlbumEditCancel.Name" xml:space="preserve">
-    <value>btnAlbumEditCancel</value>
-  </data>
-  <data name="&gt;&gt;btnAlbumEditCancel.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;btnAlbumEditCancel.Parent" xml:space="preserve">
-    <value>tableLayoutPanel2</value>
-  </data>
-  <data name="&gt;&gt;btnAlbumEditCancel.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
-  <data name="&gt;&gt;btnAlbumEditOk.Name" xml:space="preserve">
-    <value>btnAlbumEditOk</value>
-  </data>
-  <data name="&gt;&gt;btnAlbumEditOk.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;btnAlbumEditOk.Parent" xml:space="preserve">
-    <value>tableLayoutPanel2</value>
-  </data>
-  <data name="&gt;&gt;btnAlbumEditOk.ZOrder" xml:space="preserve">
-    <value>5</value>
-  </data>
-  <data name="tableLayoutPanel2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
-  </data>
-  <data name="tableLayoutPanel2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 3</value>
-  </data>
-  <data name="tableLayoutPanel2.RowCount" type="System.Int32, mscorlib">
-    <value>5</value>
-  </data>
-  <data name="tableLayoutPanel2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>286, 344</value>
-  </data>
-  <data name="tableLayoutPanel2.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;tableLayoutPanel2.Name" xml:space="preserve">
-    <value>tableLayoutPanel2</value>
-  </data>
-  <data name="&gt;&gt;tableLayoutPanel2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;tableLayoutPanel2.Parent" xml:space="preserve">
-    <value>tabPageAlbum</value>
-  </data>
-  <data name="&gt;&gt;tableLayoutPanel2.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="tableLayoutPanel2.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
-    <value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="txtAlbName" Row="1" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="label5" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="label7" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="txtAlbComment" Row="2" RowSpan="1" Column="1" ColumnSpan="2" /&gt;&lt;Control Name="btnAlbumEditCancel" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="btnAlbumEditOk" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,AutoSize,0" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0" /&gt;&lt;/TableLayoutSettings&gt;</value>
-  </data>
-  <data name="txtAlbName.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
-  </data>
-  <data name="txtAlbName.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 16</value>
-  </data>
-  <data name="txtAlbName.Size" type="System.Drawing.Size, System.Drawing">
-    <value>280, 20</value>
-  </data>
-  <data name="txtAlbName.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
-  </data>
-  <data name="&gt;&gt;txtAlbName.Name" xml:space="preserve">
-    <value>txtAlbName</value>
-  </data>
-  <data name="&gt;&gt;txtAlbName.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;txtAlbName.Parent" xml:space="preserve">
-    <value>tableLayoutPanel2</value>
-  </data>
-  <data name="&gt;&gt;txtAlbName.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="label5.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label5.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 0</value>
-  </data>
-  <data name="label5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>35, 13</value>
-  </data>
-  <data name="label5.TabIndex" type="System.Int32, mscorlib">
-    <value>2</value>
-  </data>
-  <data name="label5.Text" xml:space="preserve">
-    <value>Name</value>
-  </data>
-  <data name="&gt;&gt;label5.Name" xml:space="preserve">
-    <value>label5</value>
-  </data>
-  <data name="&gt;&gt;label5.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label5.Parent" xml:space="preserve">
-    <value>tableLayoutPanel2</value>
-  </data>
-  <data name="&gt;&gt;label5.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="label7.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label7.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 39</value>
-  </data>
-  <data name="label7.Size" type="System.Drawing.Size, System.Drawing">
-    <value>51, 13</value>
-  </data>
-  <data name="label7.TabIndex" type="System.Int32, mscorlib">
-    <value>3</value>
-  </data>
-  <data name="label7.Text" xml:space="preserve">
-    <value>Comment</value>
-  </data>
-  <data name="&gt;&gt;label7.Name" xml:space="preserve">
-    <value>label7</value>
-  </data>
-  <data name="&gt;&gt;label7.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label7.Parent" xml:space="preserve">
-    <value>tableLayoutPanel2</value>
-  </data>
-  <data name="&gt;&gt;label7.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="txtAlbComment.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Top, Bottom, Left, Right</value>
-  </data>
-  <data name="txtAlbComment.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 55</value>
-  </data>
-  <data name="txtAlbComment.Multiline" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="txtAlbComment.ScrollBars" type="System.Windows.Forms.ScrollBars, System.Windows.Forms">
-    <value>Vertical</value>
-  </data>
-  <data name="txtAlbComment.Size" type="System.Drawing.Size, System.Drawing">
-    <value>280, 103</value>
-  </data>
-  <data name="txtAlbComment.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;txtAlbComment.Name" xml:space="preserve">
-    <value>txtAlbComment</value>
-  </data>
-  <data name="&gt;&gt;txtAlbComment.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;txtAlbComment.Parent" xml:space="preserve">
-    <value>tableLayoutPanel2</value>
-  </data>
-  <data name="&gt;&gt;txtAlbComment.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="btnAlbumEditCancel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Bottom, Left</value>
-  </data>
-  <data name="btnAlbumEditCancel.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="btnAlbumEditCancel.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
-    <value>GrowAndShrink</value>
-  </data>
-  <data name="btnAlbumEditCancel.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
-    <value>None</value>
-  </data>
-  <data name="btnAlbumEditCancel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 311</value>
-  </data>
-  <data name="btnAlbumEditCancel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>30, 30</value>
-  </data>
-  <data name="btnAlbumEditCancel.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
-  </data>
-  <data name="btnAlbumEditCancel.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms">
-    <value>ImageAboveText</value>
-  </data>
-  <data name="&gt;&gt;btnAlbumEditCancel.Name" xml:space="preserve">
-    <value>btnAlbumEditCancel</value>
-  </data>
-  <data name="&gt;&gt;btnAlbumEditCancel.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;btnAlbumEditCancel.Parent" xml:space="preserve">
-    <value>tableLayoutPanel2</value>
-  </data>
-  <data name="&gt;&gt;btnAlbumEditCancel.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
-  <data name="btnAlbumEditOk.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Bottom, Right</value>
-  </data>
-  <data name="btnAlbumEditOk.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="btnAlbumEditOk.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
-    <value>GrowAndShrink</value>
-  </data>
-  <data name="btnAlbumEditOk.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
-    <value>None</value>
-  </data>
-  <data name="btnAlbumEditOk.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="btnAlbumEditOk.Location" type="System.Drawing.Point, System.Drawing">
-    <value>253, 311</value>
-  </data>
-  <data name="btnAlbumEditOk.Size" type="System.Drawing.Size, System.Drawing">
-    <value>30, 30</value>
-  </data>
-  <data name="btnAlbumEditOk.TabIndex" type="System.Int32, mscorlib">
-    <value>4</value>
-  </data>
-  <data name="btnAlbumEditOk.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms">
-    <value>ImageAboveText</value>
-  </data>
-  <data name="&gt;&gt;btnAlbumEditOk.Name" xml:space="preserve">
-    <value>btnAlbumEditOk</value>
-  </data>
-  <data name="&gt;&gt;btnAlbumEditOk.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;btnAlbumEditOk.Parent" xml:space="preserve">
-    <value>tableLayoutPanel2</value>
-  </data>
-  <data name="&gt;&gt;btnAlbumEditOk.ZOrder" xml:space="preserve">
-    <value>5</value>
-  </data>
-  <data name="picshowImg.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Top, Bottom, Left, Right</value>
-  </data>
-  <data name="picshowImg.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="picshowImg.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 144</value>
-  </data>
-  <data name="picshowImg.Size" type="System.Drawing.Size, System.Drawing">
-    <value>300, 300</value>
-  </data>
-  <data name="picshowImg.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
-    <value>Zoom</value>
-  </data>
-  <data name="picshowImg.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;picshowImg.Name" xml:space="preserve">
-    <value>picshowImg</value>
-  </data>
-  <data name="&gt;&gt;picshowImg.Type" xml:space="preserve">
-    <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;picshowImg.Parent" xml:space="preserve">
-    <value>tableLayoutPanel3</value>
-  </data>
-  <data name="&gt;&gt;picshowImg.ZOrder" xml:space="preserve">
-    <value>6</value>
-  </data>
-  <data name="tableLayoutPanel3.ColumnCount" type="System.Int32, mscorlib">
-    <value>2</value>
-  </data>
-  <data name="&gt;&gt;txtImgName.Name" xml:space="preserve">
-    <value>txtImgName</value>
-  </data>
-  <data name="&gt;&gt;txtImgName.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;txtImgName.Parent" xml:space="preserve">
-    <value>tableLayoutPanel3</value>
-  </data>
-  <data name="&gt;&gt;txtImgName.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;label6.Name" xml:space="preserve">
-    <value>label6</value>
-  </data>
-  <data name="&gt;&gt;label6.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label6.Parent" xml:space="preserve">
-    <value>tableLayoutPanel3</value>
-  </data>
-  <data name="&gt;&gt;label6.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="&gt;&gt;label8.Name" xml:space="preserve">
-    <value>label8</value>
-  </data>
-  <data name="&gt;&gt;label8.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label8.Parent" xml:space="preserve">
-    <value>tableLayoutPanel3</value>
-  </data>
-  <data name="&gt;&gt;label8.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="&gt;&gt;txtImgComment.Name" xml:space="preserve">
-    <value>txtImgComment</value>
-  </data>
-  <data name="&gt;&gt;txtImgComment.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;txtImgComment.Parent" xml:space="preserve">
-    <value>tableLayoutPanel3</value>
-  </data>
-  <data name="&gt;&gt;txtImgComment.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="&gt;&gt;button3.Name" xml:space="preserve">
-    <value>button3</value>
-  </data>
-  <data name="&gt;&gt;button3.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;button3.Parent" xml:space="preserve">
-    <value>tableLayoutPanel3</value>
-  </data>
-  <data name="&gt;&gt;button3.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
-  <data name="&gt;&gt;button4.Name" xml:space="preserve">
-    <value>button4</value>
-  </data>
-  <data name="&gt;&gt;button4.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;button4.Parent" xml:space="preserve">
-    <value>tableLayoutPanel3</value>
-  </data>
-  <data name="&gt;&gt;button4.ZOrder" xml:space="preserve">
-    <value>5</value>
-  </data>
-  <data name="&gt;&gt;picshowImg.Name" xml:space="preserve">
-    <value>picshowImg</value>
-  </data>
-  <data name="&gt;&gt;picshowImg.Type" xml:space="preserve">
-    <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;picshowImg.Parent" xml:space="preserve">
-    <value>tableLayoutPanel3</value>
-  </data>
-  <data name="&gt;&gt;picshowImg.ZOrder" xml:space="preserve">
-    <value>6</value>
-  </data>
-  <data name="tableLayoutPanel3.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
-  </data>
-  <data name="tableLayoutPanel3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 3</value>
-  </data>
-  <data name="tableLayoutPanel3.RowCount" type="System.Int32, mscorlib">
-    <value>6</value>
-  </data>
-  <data name="tableLayoutPanel3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>286, 311</value>
-  </data>
-  <data name="tableLayoutPanel3.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
-  </data>
-  <data name="&gt;&gt;tableLayoutPanel3.Name" xml:space="preserve">
-    <value>tableLayoutPanel3</value>
-  </data>
-  <data name="&gt;&gt;tableLayoutPanel3.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;tableLayoutPanel3.Parent" xml:space="preserve">
-    <value>tabPageImg</value>
-  </data>
-  <data name="&gt;&gt;tableLayoutPanel3.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="tableLayoutPanel3.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
-    <value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="txtImgName" Row="1" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="label6" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="label8" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="txtImgComment" Row="3" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="button3" Row="5" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="button4" Row="5" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="picshowImg" Row="4" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,AutoSize,0,Absolute,20" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,20" /&gt;&lt;/TableLayoutSettings&gt;</value>
-  </data>
-  <data name="txtImgName.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
-  </data>
-  <data name="txtImgName.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 16</value>
-  </data>
-  <data name="txtImgName.Size" type="System.Drawing.Size, System.Drawing">
-    <value>300, 20</value>
-  </data>
-  <data name="txtImgName.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
-  </data>
-  <data name="&gt;&gt;txtImgName.Name" xml:space="preserve">
-    <value>txtImgName</value>
-  </data>
-  <data name="&gt;&gt;txtImgName.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;txtImgName.Parent" xml:space="preserve">
-    <value>tableLayoutPanel3</value>
-  </data>
-  <data name="&gt;&gt;txtImgName.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="label6.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label6.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="label6.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 0</value>
-  </data>
-  <data name="label6.Size" type="System.Drawing.Size, System.Drawing">
-    <value>35, 13</value>
-  </data>
-  <data name="label6.TabIndex" type="System.Int32, mscorlib">
-    <value>2</value>
-  </data>
-  <data name="label6.Text" xml:space="preserve">
-    <value>Name</value>
-  </data>
-  <data name="&gt;&gt;label6.Name" xml:space="preserve">
-    <value>label6</value>
-  </data>
-  <data name="&gt;&gt;label6.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label6.Parent" xml:space="preserve">
-    <value>tableLayoutPanel3</value>
-  </data>
-  <data name="&gt;&gt;label6.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="label8.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label8.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="label8.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 39</value>
-  </data>
-  <data name="label8.Size" type="System.Drawing.Size, System.Drawing">
-    <value>51, 13</value>
-  </data>
-  <data name="label8.TabIndex" type="System.Int32, mscorlib">
-    <value>3</value>
-  </data>
-  <data name="label8.Text" xml:space="preserve">
-    <value>Comment</value>
-  </data>
-  <data name="&gt;&gt;label8.Name" xml:space="preserve">
-    <value>label8</value>
-  </data>
-  <data name="&gt;&gt;label8.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label8.Parent" xml:space="preserve">
-    <value>tableLayoutPanel3</value>
-  </data>
-  <data name="&gt;&gt;label8.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="button3.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Bottom, Left</value>
-  </data>
-  <data name="button3.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="button3.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
-    <value>GrowAndShrink</value>
-  </data>
-  <data name="button3.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
-    <value>None</value>
-  </data>
-  <data name="button3.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="button3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 450</value>
-  </data>
-  <data name="button3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>30, 14</value>
-  </data>
-  <data name="button3.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
-  </data>
-  <data name="button3.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms">
-    <value>ImageAboveText</value>
-  </data>
-  <data name="&gt;&gt;button3.Name" xml:space="preserve">
-    <value>button3</value>
-  </data>
-  <data name="&gt;&gt;button3.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;button3.Parent" xml:space="preserve">
-    <value>tableLayoutPanel3</value>
-  </data>
-  <data name="&gt;&gt;button3.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
-  <data name="button4.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Bottom, Right</value>
-  </data>
-  <data name="button4.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="button4.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
-    <value>GrowAndShrink</value>
-  </data>
-  <data name="button4.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
-    <value>None</value>
-  </data>
-  <data name="button4.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="button4.Location" type="System.Drawing.Point, System.Drawing">
-    <value>273, 450</value>
-  </data>
-  <data name="button4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>30, 14</value>
-  </data>
-  <data name="button4.TabIndex" type="System.Int32, mscorlib">
-    <value>4</value>
-  </data>
-  <data name="button4.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms">
-    <value>ImageAboveText</value>
-  </data>
-  <data name="&gt;&gt;button4.Name" xml:space="preserve">
-    <value>button4</value>
-  </data>
-  <data name="&gt;&gt;button4.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;button4.Parent" xml:space="preserve">
-    <value>tableLayoutPanel3</value>
-  </data>
-  <data name="&gt;&gt;button4.ZOrder" xml:space="preserve">
-    <value>5</value>
-  </data>
-  <data name="txtImgComment.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
-  </data>
-  <data name="txtImgComment.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 55</value>
-  </data>
-  <data name="txtImgComment.Multiline" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="txtImgComment.ScrollBars" type="System.Windows.Forms.ScrollBars, System.Windows.Forms">
-    <value>Vertical</value>
-  </data>
-  <data name="txtImgComment.Size" type="System.Drawing.Size, System.Drawing">
-    <value>300, 83</value>
-  </data>
-  <data name="txtImgComment.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;txtImgComment.Name" xml:space="preserve">
-    <value>txtImgComment</value>
-  </data>
-  <data name="&gt;&gt;txtImgComment.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;txtImgComment.Parent" xml:space="preserve">
-    <value>tableLayoutPanel3</value>
-  </data>
-  <data name="&gt;&gt;txtImgComment.ZOrder" xml:space="preserve">
-    <value>3</value>
+  <data name="toolStripMenuItem1.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
+    <value>MiddleLeft</value>
+  </data>
+  <data name="toolStripMenuItem1.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+    <value>Ctrl+R</value>
+  </data>
+  <data name="toolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>257, 22</value>
+  </data>
+  <data name="toolStripMenuItem1.Text" xml:space="preserve">
+    <value>TreeViewMenuItemRefresh</value>
+  </data>
+  <data name="TreeViewCMenu.Size" type="System.Drawing.Size, System.Drawing">
+    <value>258, 26</value>
+  </data>
+  <data name="&gt;&gt;TreeViewCMenu.Name" xml:space="preserve">
+    <value>TreeViewCMenu</value>
+  </data>
+  <data name="&gt;&gt;TreeViewCMenu.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -1409,5 +1753,5 @@
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>864, 467</value>
+    <value>944, 438</value>
   </data>
   <data name="$this.Text" xml:space="preserve">
@@ -1420,4 +1764,16 @@
     <value>System.Windows.Forms.ImageList, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="&gt;&gt;lstCatBindingSource.Name" xml:space="preserve">
+    <value>lstCatBindingSource</value>
+  </data>
+  <data name="&gt;&gt;lstCatBindingSource.Type" xml:space="preserve">
+    <value>System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;lstConfidentLevelBindingSource.Name" xml:space="preserve">
+    <value>lstConfidentLevelBindingSource</value>
+  </data>
+  <data name="&gt;&gt;lstConfidentLevelBindingSource.Type" xml:space="preserve">
+    <value>System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;modelManagerBaseBindingSource.Name" xml:space="preserve">
     <value>modelManagerBaseBindingSource</value>
@@ -1426,9 +1782,15 @@
     <value>System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;lstCatBindingSource.Name" xml:space="preserve">
-    <value>lstCatBindingSource</value>
-  </data>
-  <data name="&gt;&gt;lstCatBindingSource.Type" xml:space="preserve">
-    <value>System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="&gt;&gt;folderBrowserDialog1.Name" xml:space="preserve">
+    <value>folderBrowserDialog1</value>
+  </data>
+  <data name="&gt;&gt;folderBrowserDialog1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.FolderBrowserDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;toolStripMenuItem1.Name" xml:space="preserve">
+    <value>toolStripMenuItem1</value>
+  </data>
+  <data name="&gt;&gt;toolStripMenuItem1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
Index: /extensions/PiwigoLib/PiwigoUpload/PiwigoUpload.csproj
===================================================================
--- /extensions/PiwigoLib/PiwigoUpload/PiwigoUpload.csproj	(revision 13519)
+++ /extensions/PiwigoLib/PiwigoUpload/PiwigoUpload.csproj	(revision 13520)
@@ -75,5 +75,7 @@
     <Compile Include="DTO\LocalPwgImage.cs" />
     <Compile Include="DTO\ModelManager.cs" />
+    <Compile Include="DTO\PwgUploadOption.cs" />
     <Compile Include="DTO\SelectedList.cs" />
+    <Compile Include="Helper\LocalDataHelper.cs" />
     <Compile Include="MainForm.cs">
       <SubType>Form</SubType>
@@ -131,4 +133,10 @@
     <Content Include="Pics\folder_images.png" />
     <Content Include="Pics\image.png" />
+    <Content Include="Resources\agt_update-product.png" />
+    <Content Include="Resources\cancel.png" />
+    <Content Include="Resources\cnrdelete-all.png" />
+    <Content Include="Resources\folder_new.png" />
+    <Content Include="Resources\folder_sent_mail.png" />
+    <Content Include="Resources\lin_agt_wrench.png" />
     <None Include="Resources\image.png" />
     <None Include="Resources\file_broken.png" />
Index: /extensions/PiwigoLib/PiwigoUpload/Properties/Resources.Designer.cs
===================================================================
--- /extensions/PiwigoLib/PiwigoUpload/Properties/Resources.Designer.cs	(revision 13519)
+++ /extensions/PiwigoLib/PiwigoUpload/Properties/Resources.Designer.cs	(revision 13520)
@@ -1,9 +1,9 @@
 ﻿//------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.237
+//     Ce code a été généré par un outil.
+//     Version du runtime :4.0.30319.239
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si
+//     le code est régénéré.
 // </auto-generated>
 //------------------------------------------------------------------------------
@@ -14,10 +14,10 @@
     
     /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    ///   Une classe de ressource fortement typée destinée, entre autres, à la consultation des chaînes localisées.
     /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
+    // Cette classe a été générée automatiquement par la classe StronglyTypedResourceBuilder
+    // à l'aide d'un outil, tel que ResGen ou Visual Studio.
+    // Pour ajouter ou supprimer un membre, modifiez votre fichier .ResX, puis réexécutez ResGen
+    // avec l'option /str ou régénérez votre projet VS.
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -34,5 +34,5 @@
         
         /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
+        ///   Retourne l'instance ResourceManager mise en cache utilisée par cette classe.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
@@ -48,6 +48,6 @@
         
         /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
+        ///   Remplace la propriété CurrentUICulture du thread actuel pour toutes
+        ///   les recherches de ressources à l'aide de cette classe de ressource fortement typée.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
@@ -61,4 +61,25 @@
         }
         
+        internal static System.Drawing.Bitmap agt_update_product {
+            get {
+                object obj = ResourceManager.GetObject("agt_update-product", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap cancel {
+            get {
+                object obj = ResourceManager.GetObject("cancel", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap cnrdelete_all {
+            get {
+                object obj = ResourceManager.GetObject("cnrdelete-all", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         internal static System.Drawing.Bitmap file_broken {
             get {
@@ -68,7 +89,28 @@
         }
         
+        internal static System.Drawing.Bitmap folder_new {
+            get {
+                object obj = ResourceManager.GetObject("folder_new", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap folder_sent_mail {
+            get {
+                object obj = ResourceManager.GetObject("folder_sent_mail", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         internal static System.Drawing.Bitmap image {
             get {
                 object obj = ResourceManager.GetObject("image", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap lin_agt_wrench {
+            get {
+                object obj = ResourceManager.GetObject("lin_agt_wrench", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
Index: /extensions/PiwigoLib/PiwigoUpload/Properties/Resources.resx
===================================================================
--- /extensions/PiwigoLib/PiwigoUpload/Properties/Resources.resx	(revision 13519)
+++ /extensions/PiwigoLib/PiwigoUpload/Properties/Resources.resx	(revision 13520)
@@ -119,9 +119,9 @@
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="no" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\no.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="ok" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\ok.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="no" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\no.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="file_broken" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -131,3 +131,21 @@
     <value>..\Resources\image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="agt_update-product" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\agt_update-product.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="cancel" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\cancel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="cnrdelete-all" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\cnrdelete-all.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="folder_new" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\folder_new.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="folder_sent_mail" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\folder_sent_mail.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="lin_agt_wrench" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\lin_agt_wrench.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
Index: /extensions/PiwigoLib/PiwigoUpload/Service/LoadFromDirectory.cs
===================================================================
--- /extensions/PiwigoLib/PiwigoUpload/Service/LoadFromDirectory.cs	(revision 13519)
+++ /extensions/PiwigoLib/PiwigoUpload/Service/LoadFromDirectory.cs	(revision 13520)
@@ -5,17 +5,38 @@
 using System.IO;
 using Com.Piwigo.Uploader.DTO;
+using Com.Piwigo.Lib.DTO;
 
 namespace Com.Piwigo.Uploader.Service
 {
+
     public class LoadFromDirectory : IService 
     {
-        string[] extensions = { ".jpeg", ".jpg" };
+        string[] extensions = { ".jpeg", ".jpg", ".JPEG", ".JPG" };
+
+        private LocalImage loadFile(String fileName)
+        {
+            LocalImage img = new LocalImage();
+            // loading image data in album
+            if (extensions.Contains<String>(Path.GetExtension(fileName)))
+            {
+                FileInfo fi = new FileInfo(fileName);
+                img.LocalFile = fi.FullName;
+                img.Name = fi.Name;
+                img.ConfidentialLevel = ModelManager.Instance.UploadOption.ConfidentialLevel;
+                img.Author = ModelManager.Instance.UploadOption.Author;
+                img.AuthorComment = "";
+           }
+            return img;
+        }
 
         private LocalAlbum loadDirectory(String dirName, Int32? rootAlbumId)
         {
-            DirectoryInfo dir = new DirectoryInfo(dirName); 
-            LocalAlbum album = new LocalAlbum (){ LocalDir=dir.FullName, Name=dir.Name};
+            DirectoryInfo dir = new DirectoryInfo(dirName);
+            LocalAlbum album = new LocalAlbum() { LocalDir = dir.FullName, Name = dir.Name };
+
+            Int32 parentAlbumId =  (rootAlbumId.HasValue ? rootAlbumId.Value : PwgAlbum.RootAlbumId);
+
             album.MessageInfo = "";
-            album.UpperCatId = rootAlbumId;
+            album.UpperCatId = parentAlbumId;
             
             // loading image data in album
@@ -24,11 +45,5 @@
                 .Where(s => extensions.Any(ext => ext == Path.GetExtension(s))))
             {
-                FileInfo fi = new  FileInfo(strfile);
-                LocalImage img = new LocalImage();
-                img.LocalFile = fi.FullName;
-                img.Name = fi.Name;
-                img.Author = "";
-                img.AuthorComment = "";
-                album.LocalImages.Add(img);
+                album.LocalImages.Add(loadFile(strfile));
             }
 
@@ -44,8 +59,66 @@
         public void runService()
         {
-            ModelManager.Instance.lstAlbumLocaux.Add(
-                loadDirectory(ModelManager.Instance.directoryName,
-                null)
-                );
+            if (File.Exists(ModelManager.Instance.directoryName))
+            {
+                if (extensions.Contains<String>(Path.GetExtension(ModelManager.Instance.directoryName)))
+                {
+                    FileInfo file = new FileInfo(ModelManager.Instance.directoryName);
+                    LocalAlbum album;
+                    album = ModelManager.Instance.lstAlbumLocaux.SingleOrDefault(a => a.Name == file.Directory.Name);
+
+                    if (album == null)
+                    {
+                        album = new LocalAlbum() { LocalDir = file.Directory.FullName, Name = file.Directory.Name };
+                        album.MessageInfo = "auto created for photo input.";
+                        album.UpperCatId = 0;
+                        album.LocalImages = new LocalImageList();
+                        album.SubAlbums = new LocalAlbumList();
+
+                        ModelManager.Instance.lstAlbumLocaux.Add(album);
+                    }
+
+                    if (album.LocalImages.Count(a => a.Name == file.Name) < 1)
+                    {
+                        album.LocalImages.Add(loadFile(file.FullName));
+                    }
+                }
+            }
+            else if (Directory.Exists(ModelManager.Instance.directoryName))
+            {
+                Int32 RootAlbumId = PwgAlbum.RootAlbumId;
+                LocalAlbum rootAlbum = null;
+
+                if (ModelManager.Instance.SelectedNode != null)
+                {
+                    if (ModelManager.Instance.SelectedNode.Tag != null)
+                    {
+                        if (ModelManager.Instance.SelectedNode.Tag is LocalAlbum)
+                        {
+                            rootAlbum = (LocalAlbum)ModelManager.Instance.SelectedNode.Tag;
+                            RootAlbumId = (rootAlbum.Id.HasValue ? rootAlbum.Id.Value : PwgAlbum.RootAlbumId);
+                        }
+                        else if (ModelManager.Instance.SelectedNode.Tag is PwgImage)
+                        {
+                            rootAlbum = (LocalAlbum)ModelManager.Instance.SelectedNode.Parent.Tag;
+                            RootAlbumId = (rootAlbum.Id.HasValue ? rootAlbum.Id.Value : PwgAlbum.RootAlbumId);
+                        }
+                    }
+                }
+
+                if (rootAlbum != null)
+                {
+                    rootAlbum.SubAlbums.Add(
+                        loadDirectory(ModelManager.Instance.directoryName,
+                        RootAlbumId)
+                        );
+                }
+                else
+                {
+                    ModelManager.Instance.lstAlbumLocaux.Add(
+                        loadDirectory(ModelManager.Instance.directoryName,
+                        PwgAlbum.RootAlbumId)
+                        );
+                }
+            }
         }
     }
Index: /extensions/PiwigoLib/PiwigoUpload/Service/UploadToPiwigo.cs
===================================================================
--- /extensions/PiwigoLib/PiwigoUpload/Service/UploadToPiwigo.cs	(revision 13519)
+++ /extensions/PiwigoLib/PiwigoUpload/Service/UploadToPiwigo.cs	(revision 13520)
@@ -55,5 +55,9 @@
             FileInfo fi = new FileInfo(aImg.LocalFile);
 
-            List<PwgTag> lstTag = new List<PwgTag>(aImg.LstTags);
+            List<PwgTag> lstTag = new List<PwgTag>();
+            if (aImg.LstTags != null)
+            {
+                lstTag.AddRange(aImg.LstTags);
+            }
 
             PwgServiceProvider.Instance.PwgImagesService.addImageByMultiPartForm(fi, null, aImg.UpperCatId, aImg.Name, aImg.Author, aImg.AuthorComment, aImg.ConfidentialLevel, lstTag);
