Free cookie consent management tool by TermsFeed Policy Generator

Changeset 13884


Ignore:
Timestamp:
06/08/16 15:29:05 (8 years ago)
Author:
mkommend
Message:

#2567: Merged r13567 and r13586 into stable.

Location:
stable
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • stable

  • stable/HeuristicLab.Optimizer

  • stable/HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj

    r13285 r13884  
    224224  </ItemGroup>
    225225  <ItemGroup>
    226     <None Include="app.config" />
     226    <None Include="app.config">
     227      <SubType>Designer</SubType>
     228    </None>
    227229    <EmbeddedResource Include="Documents\FirstSteps.rtf" />
    228230    <None Include="HeuristicLab.snk" />

  • stable/HeuristicLab.Optimizer/3.3/OptimizerDockingMainForm.cs

    r12009 r13884  
    8080        startPage.Show();
    8181      }
    82 
    83       WindowState = Properties.Settings.Default.ShowMaximized ? FormWindowState.Maximized : FormWindowState.Normal;
    8482    }
    8583
    … …  
    9391    protected override void OnClosed(EventArgs e) {
    9492      base.OnClosed(e);
    95       Properties.Settings.Default.ShowMaximized = WindowState == FormWindowState.Maximized;
    9693      Properties.Settings.Default.CollapseClipboard = clipboard.Collapsed;
    9794      OperatorsSidebar operatorsSidebar = MainFormManager.MainForm.Views.OfType<OperatorsSidebar>().FirstOrDefault();

  • stable/HeuristicLab.Optimizer/3.3/OptimizerMultipleDocumentMainForm.cs

    r12009 r13884  
    8080        startPage.Show();
    8181      }
    82 
    83       WindowState = Properties.Settings.Default.ShowMaximized ? FormWindowState.Maximized : FormWindowState.Normal;
    8482    }
    8583
    … …  
    9391    protected override void OnClosed(EventArgs e) {
    9492      base.OnClosed(e);
    95       Properties.Settings.Default.ShowMaximized = WindowState == FormWindowState.Maximized;
    9693      Properties.Settings.Default.CollapseClipboard = clipboard.Collapsed;
    9794      OperatorsSidebar operatorsSidebar = MainFormManager.MainForm.Views.OfType<OperatorsSidebar>().FirstOrDefault();

  • stable/HeuristicLab.Optimizer/3.3/OptimizerSingleDocumentMainForm.cs

    r12009 r13884  
    8080        startPage.Show();
    8181      }
    82 
    83       WindowState = Properties.Settings.Default.ShowMaximized ? FormWindowState.Maximized : FormWindowState.Normal;
    8482    }
    8583
    … …  
    9391    protected override void OnClosed(EventArgs e) {
    9492      base.OnClosed(e);
    95       Properties.Settings.Default.ShowMaximized = WindowState == FormWindowState.Maximized;
    9693      Properties.Settings.Default.CollapseClipboard = clipboard.Collapsed;
    9794      OperatorsSidebar operatorsSidebar = MainFormManager.MainForm.Views.OfType<OperatorsSidebar>().FirstOrDefault();

  • stable/HeuristicLab.Optimizer/3.3/Plugin.cs.frame

    r13316 r13884  
    2020#endregion
    2121
     22using System.Drawing;
    2223using System.Linq;
    2324using System.Windows.Forms;
    … …  
    6162
    6263      if (mainForm != null) {
     64        if (CheckSavedMainFormSettings()) {
     65          mainForm.Location = Settings.Default.MainFormLocation;
     66          mainForm.Size = Settings.Default.MainFormSize;
     67          mainForm.WindowState = Settings.Default.MainFormWindowState;
     68        }
     69
     70        mainForm.FormClosing += (sender, eventArgs) => {
     71          if (mainForm.WindowState != FormWindowState.Minimized)
     72            Settings.Default.MainFormWindowState = mainForm.WindowState;
     73          if (mainForm.WindowState != FormWindowState.Normal) {
     74            Settings.Default.MainFormLocation = mainForm.RestoreBounds.Location;
     75            Settings.Default.MainFormSize = mainForm.RestoreBounds.Size;
     76          } else if (mainForm.WindowState == FormWindowState.Normal) {
     77            Settings.Default.MainFormLocation = mainForm.Location;
     78            Settings.Default.MainFormSize = mainForm.Size;
     79          }
     80        };
     81
     82
    6383        ClientInformation.InitializeAsync();
    6484        UserInformation.InitializeAsync();
    … …  
    7292      }
    7393    }
     94
     95    private bool CheckSavedMainFormSettings() {
     96      var formArea = new Rectangle(Settings.Default.MainFormLocation, Settings.Default.MainFormSize);
     97      var screenArea = Screen.FromRectangle(formArea).WorkingArea;
     98      var overlappingArea = Rectangle.Intersect(formArea, screenArea);
     99      bool offLimits = overlappingArea.IsEmpty || overlappingArea.Width * overlappingArea.Height < formArea.Width * formArea.Height * 0.25;
     100      return !formArea.IsEmpty && !offLimits;
     101    }
    74102  }
    75103}

  • stable/HeuristicLab.Optimizer/3.3/Properties/Settings.Designer.cs

    r11920 r13884  
    22// <auto-generated>
    33//     This code was generated by a tool.
    4 //     Runtime Version:4.0.30319.34014
     4//     Runtime Version:4.0.30319.42000
    55//
    66//     Changes to this file may cause incorrect behavior and will be lost if
    … …  
    1313   
    1414    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    15     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
     15    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
    1616    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
    1717       
    … …  
    6363        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    6464        [global::System.Configuration.DefaultSettingValueAttribute("True")]
    65         public bool ShowMaximized {
    66             get {
    67                 return ((bool)(this["ShowMaximized"]));
    68             }
    69             set {
    70                 this["ShowMaximized"] = value;
    71             }
    72         }
    73        
    74         [global::System.Configuration.UserScopedSettingAttribute()]
    75         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    76         [global::System.Configuration.DefaultSettingValueAttribute("True")]
    7765        public bool CollapseClipboard {
    7866            get {
    … …  
    10795            }
    10896        }
     97       
     98        [global::System.Configuration.UserScopedSettingAttribute()]
     99        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     100        [global::System.Configuration.DefaultSettingValueAttribute("0, 0")]
     101        public global::System.Drawing.Point MainFormLocation {
     102            get {
     103                return ((global::System.Drawing.Point)(this["MainFormLocation"]));
     104            }
     105            set {
     106                this["MainFormLocation"] = value;
     107            }
     108        }
     109       
     110        [global::System.Configuration.UserScopedSettingAttribute()]
     111        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     112        [global::System.Configuration.DefaultSettingValueAttribute("0, 0")]
     113        public global::System.Drawing.Size MainFormSize {
     114            get {
     115                return ((global::System.Drawing.Size)(this["MainFormSize"]));
     116            }
     117            set {
     118                this["MainFormSize"] = value;
     119            }
     120        }
     121       
     122        [global::System.Configuration.UserScopedSettingAttribute()]
     123        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     124        [global::System.Configuration.DefaultSettingValueAttribute("Normal")]
     125        public global::System.Windows.Forms.FormWindowState MainFormWindowState {
     126            get {
     127                return ((global::System.Windows.Forms.FormWindowState)(this["MainFormWindowState"]));
     128            }
     129            set {
     130                this["MainFormWindowState"] = value;
     131            }
     132        }
    109133    }
    110134}

  • stable/HeuristicLab.Optimizer/3.3/Properties/Settings.settings

    r6827 r13884  
    1212      <Value Profile="(Default)">True</Value>
    1313    </Setting>
    14     <Setting Name="ShowMaximized" Type="System.Boolean" Scope="User">
    15       <Value Profile="(Default)">True</Value>
    16     </Setting>
    1714    <Setting Name="CollapseClipboard" Type="System.Boolean" Scope="User">
    1815      <Value Profile="(Default)">True</Value>
    … …  
    2421      <Value Profile="(Default)">DockingMainForm</Value>
    2522    </Setting>
     23    <Setting Name="MainFormLocation" Type="System.Drawing.Point" Scope="User">
     24      <Value Profile="(Default)">0, 0</Value>
     25    </Setting>
     26    <Setting Name="MainFormSize" Type="System.Drawing.Size" Scope="User">
     27      <Value Profile="(Default)">0, 0</Value>
     28    </Setting>
     29    <Setting Name="MainFormWindowState" Type="System.Windows.Forms.FormWindowState" Scope="User">
     30      <Value Profile="(Default)">Normal</Value>
     31    </Setting>
    2632  </Settings>
    2733</SettingsFile>

  • stable/HeuristicLab.Optimizer/3.3/app.config

    r11920 r13884  
    1717                <value>True</value>
    1818            </setting>
    19             <setting name="ShowMaximized" serializeAs="String">
    20                 <value>True</value>
    21             </setting>
    2219            <setting name="CollapseClipboard" serializeAs="String">
    2320                <value>True</value>
    … …  
    2926                <value>DockingMainForm</value>
    3027            </setting>
     28            <setting name="MainFormLocation" serializeAs="String">
     29                <value>0, 0</value>
     30            </setting>
     31            <setting name="MainFormSize" serializeAs="String">
     32                <value>0, 0</value>
     33            </setting>
     34            <setting name="MainFormWindowState" serializeAs="String">
     35                <value>Normal</value>
     36            </setting>
    3137        </HeuristicLab.Optimizer.Properties.Settings>
    3238    </userSettings>

  • stable/HeuristicLab.PluginInfrastructure/3.3/Properties/Settings.Designer.cs

    r11920 r13884  
    22// <auto-generated>
    33//     This code was generated by a tool.
    4 //     Runtime Version:4.0.30319.34014
     4//     Runtime Version:4.0.30319.42000
    55//
    66//     Changes to this file may cause incorrect behavior and will be lost if
    … …  
    1313   
    1414    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    15     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
     15    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
    1616    public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
    1717       
    … …  
    8383            }
    8484        }
     85       
     86        [global::System.Configuration.UserScopedSettingAttribute()]
     87        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     88        [global::System.Configuration.DefaultSettingValueAttribute("0, 0")]
     89        public global::System.Drawing.Point StarterFormLocation {
     90            get {
     91                return ((global::System.Drawing.Point)(this["StarterFormLocation"]));
     92            }
     93            set {
     94                this["StarterFormLocation"] = value;
     95            }
     96        }
     97       
     98        [global::System.Configuration.UserScopedSettingAttribute()]
     99        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     100        [global::System.Configuration.DefaultSettingValueAttribute("0, 0")]
     101        public global::System.Drawing.Size StarterFormSize {
     102            get {
     103                return ((global::System.Drawing.Size)(this["StarterFormSize"]));
     104            }
     105            set {
     106                this["StarterFormSize"] = value;
     107            }
     108        }
     109       
     110        [global::System.Configuration.UserScopedSettingAttribute()]
     111        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     112        [global::System.Configuration.DefaultSettingValueAttribute("Normal")]
     113        public global::System.Windows.Forms.FormWindowState StarterFormWindowState {
     114            get {
     115                return ((global::System.Windows.Forms.FormWindowState)(this["StarterFormWindowState"]));
     116            }
     117            set {
     118                this["StarterFormWindowState"] = value;
     119            }
     120        }
    85121    }
    86122}

  • stable/HeuristicLab.PluginInfrastructure/3.3/Properties/Settings.settings

    r4495 r13884  
    1818      <Value Profile="(Default)">http://services.heuristiclab.com/Deployment-3.3/AdminService.svc</Value>
    1919    </Setting>
     20    <Setting Name="StarterFormLocation" Type="System.Drawing.Point" Scope="User">
     21      <Value Profile="(Default)">0, 0</Value>
     22    </Setting>
     23    <Setting Name="StarterFormSize" Type="System.Drawing.Size" Scope="User">
     24      <Value Profile="(Default)">0, 0</Value>
     25    </Setting>
     26    <Setting Name="StarterFormWindowState" Type="System.Windows.Forms.FormWindowState" Scope="User">
     27      <Value Profile="(Default)">Normal</Value>
     28    </Setting>
    2029  </Settings>
    2130</SettingsFile>

  • stable/HeuristicLab.PluginInfrastructure/3.3/Starter/StarterForm.cs

    r12009 r13884  
    2222using System;
    2323using System.Collections.Generic;
     24using System.Drawing;
    2425using System.IO;
    2526using System.Linq;
    … …  
    2930using HeuristicLab.PluginInfrastructure.Advanced;
    3031using HeuristicLab.PluginInfrastructure.Manager;
     32using HeuristicLab.PluginInfrastructure.Properties;
    3133
    3234namespace HeuristicLab.PluginInfrastructure.Starter {
    … …  
    6769      splashScreen.Show(this, "Loading HeuristicLab...");
    6870
     71      if (CheckSavedStarterFormSettings()) {
     72        Location = Settings.Default.StarterFormLocation;
     73        Size = Settings.Default.StarterFormSize;
     74        WindowState = Settings.Default.StarterFormWindowState;
     75      }
     76
    6977      pluginManager.DiscoverAndCheckPlugins();
    7078      UpdateApplicationsList();
    … …  
    96104      splashScreen.Close();
    97105      abortRequested = true;
     106
     107      if (WindowState != FormWindowState.Minimized)
     108        Settings.Default.StarterFormWindowState = WindowState;
     109      if (WindowState != FormWindowState.Normal) {
     110        Settings.Default.StarterFormLocation = RestoreBounds.Location;
     111        Settings.Default.StarterFormSize = RestoreBounds.Size;
     112      } else if (WindowState == FormWindowState.Normal) {
     113        Settings.Default.StarterFormLocation = Location;
     114        Settings.Default.StarterFormSize = Size;
     115      }
     116
     117      Settings.Default.Save();
    98118    }
    99119
    … …  
    177197
    178198    #region Helpers
     199    private bool CheckSavedStarterFormSettings() {
     200      var formArea = new Rectangle(Settings.Default.StarterFormLocation, Settings.Default.StarterFormSize);
     201      var screenArea = Screen.FromRectangle(formArea).WorkingArea;
     202      var overlappingArea = Rectangle.Intersect(formArea, screenArea);
     203      bool offLimits = overlappingArea.IsEmpty || overlappingArea.Width * overlappingArea.Height < formArea.Width * formArea.Height * 0.25;
     204      return !formArea.IsEmpty && !offLimits;
     205    }
     206
    179207    private void UpdateApplicationsList() {
    180208      if (InvokeRequired) Invoke((Action)UpdateApplicationsList);

  • stable/HeuristicLab.PluginInfrastructure/3.3/app.config

    r11920 r13884  
    2323      <setting name="UpdateLocationAdministrationAddress" serializeAs="String">
    2424        <value>http://services.heuristiclab.com/Deployment-3.3/AdminService.svc</value>
     25      </setting>
     26      <setting name="StarterFormLocation" serializeAs="String">
     27        <value>0, 0</value>
     28      </setting>
     29      <setting name="StarterFormSize" serializeAs="String">
     30        <value>0, 0</value>
     31      </setting>
     32      <setting name="StarterFormWindowState" serializeAs="String">
     33        <value>Normal</value>
    2534      </setting>
    2635    </HeuristicLab.PluginInfrastructure.Properties.Settings>
Note: See TracChangeset for help on using the changeset viewer.