Merge branch 'release/2.2.0.0'

AEMManager/AemActions.cs

@@ -53,6 +53,11 @@ public static void AddOpenMenuItems(Menu.MenuItemCollection pParent, AemInstance
       item.Click += new EventHandler(OpenFelixConsole);
       menuItems.Add(item);
 
+      item = new MenuItem();
+      item.Text = "Open Folder";
+      item.Click += new EventHandler(OpenFolder);
+      menuItems.Add(item);
+
       if (pInstance.AemInstanceType == AemInstanceType.AEM54) {
         item = new MenuItem();
         item.Text = "Open Servlet Engine Admin";
@@ -119,6 +124,20 @@ private static void OpenFelixConsole(object sender, EventArgs e) {
       OpenUrl(instance.UrlWithContextPath + "/system/console", instance);
     }
 
+    private static void OpenFolder(object sender, EventArgs e) {
+      AemInstance instance = Program.GetActionInstance(sender);
+      if (instance == null) {
+        return;
+      }
+
+      string folder = instance.PathWithoutFilename;
+      if (!Directory.Exists(folder)) {
+        return;
+      }
+      mLog.Info("Open Folder: " + folder);
+      System.Diagnostics.Process.Start(folder);
+    }
+
     private static void OpenServletEngineAdmin(object sender, EventArgs e) {
       AemInstance instance = Program.GetActionInstance(sender);
       if (instance == null) {

AEMManager/Properties/AssemblyInfo.cs

@@ -29,8 +29,8 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.1.2.0")]
-[assembly: AssemblyFileVersion("2.1.2.0")]
+[assembly: AssemblyVersion("2.2.0.0")]
+[assembly: AssemblyFileVersion("2.2.0.0")]
 
 // Configure log4net using the .config file
 [assembly: log4net.Config.XmlConfiguratorAttribute(Watch = true)]

AEMManager/util/SystemUtil.cs

@@ -16,33 +16,71 @@ static class SystemUtil {
     public static void SaveWindowPos(Form pfrm) {
       RegistryKey key = RegistryUtil.GetUserKey(pfrm);
 
-      if (pfrm.WindowState != FormWindowState.Minimized) {
-        key.SetValue("WindowPos_WindowState", (int)pfrm.WindowState);
+      if (pfrm.MaximizeBox) {
+        if (pfrm.WindowState != FormWindowState.Minimized) {
+          key.SetValue("WindowPos_WindowState", (int)pfrm.WindowState);
+        }
+        pfrm.WindowState = FormWindowState.Normal;
       }
-      pfrm.WindowState = FormWindowState.Normal;
-      key.SetValue("WindowPos_WindowWidth", pfrm.Size.Width);
-      key.SetValue("WindowPos_WindowHeight", pfrm.Size.Height);
+
       key.SetValue("WindowPos_WindowX", pfrm.Location.X);
       key.SetValue("WindowPos_WindowY", pfrm.Location.Y);
 
+      if (pfrm.FormBorderStyle == FormBorderStyle.Sizable || pfrm.FormBorderStyle == FormBorderStyle.SizableToolWindow) {
+        key.SetValue("WindowPos_WindowWidth", pfrm.Size.Width);
+        key.SetValue("WindowPos_WindowHeight", pfrm.Size.Height);
+      }
+
       key.Close();
     }
 
     /// <summary>
     /// Restores the last saved position/state of given form from the registry.
     /// </summary>
     /// <param name="pfrm">Form instance</param>
-    public static void RestoreWindowPos(Form pfrm) {
+    public static void RestoreWindowPos(Form pfrm, int left = 0, int top = 0, int width = 0, int height = 0, FormWindowState windowState = FormWindowState.Normal) {
       RegistryKey key = RegistryUtil.GetUserKey(pfrm);
       try {
-        pfrm.Size = new Size((int)key.GetValue("WindowPos_WindowWidth"), (int)key.GetValue("WindowPos_WindowHeight"));
-        pfrm.Location = new Point((int)key.GetValue("WindowPos_WindowX"), (int)key.GetValue("WindowPos_WindowY"));
-        pfrm.WindowState = (FormWindowState)key.GetValue("WindowPos_WindowState");
+        pfrm.Location = new Point((int)key.GetValue("WindowPos_WindowX", left), (int)key.GetValue("WindowPos_WindowY", top));
+        if (pfrm.FormBorderStyle == FormBorderStyle.Sizable || pfrm.FormBorderStyle == FormBorderStyle.SizableToolWindow) {
+          pfrm.Size = new Size((int)key.GetValue("WindowPos_WindowWidth", width), (int)key.GetValue("WindowPos_WindowHeight", height));
+        }
+        if (pfrm.MaximizeBox) {
+          pfrm.WindowState = (FormWindowState)key.GetValue("WindowPos_WindowState", windowState);
+        }
+      }
+      catch (Exception) {
+        if (left > 0 && top > 0) {
+          pfrm.Location = new Point(left, top);
+        }
+        if (pfrm.FormBorderStyle == FormBorderStyle.Sizable || pfrm.FormBorderStyle == FormBorderStyle.SizableToolWindow) {
+          if (width > 0 && height > 0) {
+            pfrm.Size = new Size(width, height);
+          }
+        }
+        if (pfrm.MaximizeBox) {
+          pfrm.WindowState = windowState;
+        }
       }
-      catch (Exception) { }
       finally {
         key.Close();
       }
+
+      if (pfrm.FormBorderStyle == FormBorderStyle.Sizable || pfrm.FormBorderStyle == FormBorderStyle.SizableToolWindow) {
+        if (pfrm.Width > SystemInformation.VirtualScreen.Width) {
+          pfrm.Width = SystemInformation.VirtualScreen.Width - 20;
+        }
+        if (pfrm.Height > SystemInformation.VirtualScreen.Height) {
+          pfrm.Height = SystemInformation.VirtualScreen.Height - 20;
+        }
+      }
+      if (pfrm.Left + pfrm.Width > SystemInformation.VirtualScreen.Width) {
+        pfrm.Left = SystemInformation.VirtualScreen.Width - pfrm.Width - 10;
+      }
+      if (pfrm.Top + pfrm.Height > SystemInformation.VirtualScreen.Height) {
+        pfrm.Top = SystemInformation.VirtualScreen.Height - pfrm.Height - 10;
+      }
+
     }
 
   }

AEMManagerSetup/Product.wxs

@@ -2,7 +2,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 	<Product Id="*" Name="AEM Manager" Language="1033" UpgradeCode="58391141-13e1-403c-9fa6-3759099bdb29"
            Manufacturer="wcm.io"
-           Version="2.1.2.0">
+           Version="2.2.0.0">
 		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
 
 		<MajorUpgrade DowngradeErrorMessage="A newer version of AEM Manager is already installed." />

resources/icons/README.md

@@ -0,0 +1,6 @@
+AEM Manager Icons
+=================
+
+Icons are defined via the AI file `cubes.ai'.
+
+They are exported as PNG and converted to ICO files via https://iconverticons.com/online/