Free cookie consent management tool by TermsFeed Policy Generator

Changeset 854 for trunk/sources


Ignore:
Timestamp:
11/29/08 01:11:21 (16 years ago)
Author:
swagner
Message:

Reviewed and fixed all application and user settings (#405).

Location:
trunk/sources
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.PluginInfrastructure.GUI/ManagerForm.cs

    r602 r854  
    3737    private Dictionary<PluginTag, PluginAction> actions = new Dictionary<PluginTag, PluginAction>();
    3838    private List<PluginDescription> allAvailablePlugins = new List<PluginDescription>();
    39     private string pluginDir = Application.StartupPath + "/" + HeuristicLab.PluginInfrastructure.GUI.Properties.Settings.Default.PluginDir;
     39    private string pluginDir = Application.StartupPath + "/" + HeuristicLab.PluginInfrastructure.Properties.Settings.Default.PluginDir;
    4040    private string cacheDir = Application.StartupPath + "/" + HeuristicLab.PluginInfrastructure.GUI.Properties.Settings.Default.CacheDir;
    4141    private string backupDir = Application.StartupPath + "/" + HeuristicLab.PluginInfrastructure.GUI.Properties.Settings.Default.BackupDir;

  • trunk/sources/HeuristicLab.PluginInfrastructure.GUI/PluginNameTransform.cs

    r10 r854  
    3333  class PluginNameTransform : INameTransform{
    3434
    35     private string pluginDir = Application.StartupPath + "\\" + HeuristicLab.PluginInfrastructure.GUI.Properties.Settings.Default.PluginDir + "\\";   
     35    private string pluginDir = Application.StartupPath + "\\" + HeuristicLab.PluginInfrastructure.Properties.Settings.Default.PluginDir + "\\";   
    3636    #region INameTransform Members
    3737

  • trunk/sources/HeuristicLab.PluginInfrastructure.GUI/Properties/Settings.Designer.cs

    r2 r854  
    1 #region License Information
    2 /* HeuristicLab
    3  * Copyright (C) 2002-2008 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    4  *
    5  * This file is part of HeuristicLab.
    6  *
    7  * HeuristicLab is free software: you can redistribute it and/or modify
    8  * it under the terms of the GNU General Public License as published by
    9  * the Free Software Foundation, either version 3 of the License, or
    10  * (at your option) any later version.
    11  *
    12  * HeuristicLab is distributed in the hope that it will be useful,
    13  * but WITHOUT ANY WARRANTY; without even the implied warranty of
    14  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    15  * GNU General Public License for more details.
    16  *
    17  * You should have received a copy of the GNU General Public License
    18  * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
    19  */
    20 #endregion
    21 
    22 //------------------------------------------------------------------------------
     1//------------------------------------------------------------------------------
    232// <auto-generated>
    243//     This code was generated by a tool.
    25 //     Runtime Version:2.0.50727.1433
     4//     Runtime Version:2.0.50727.3053
    265//
    276//     Changes to this file may cause incorrect behavior and will be lost if
    … …  
    5938        }
    6039       
    61         [global::System.Configuration.UserScopedSettingAttribute()]
     40        [global::System.Configuration.ApplicationScopedSettingAttribute()]
    6241        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    6342        [global::System.Configuration.DefaultSettingValueAttribute("plugins\\cache")]
    … …  
    6645                return ((string)(this["CacheDir"]));
    6746            }
    68             set {
    69                 this["CacheDir"] = value;
    70             }
    7147        }
    7248       
    73         [global::System.Configuration.UserScopedSettingAttribute()]
    74         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    75         [global::System.Configuration.DefaultSettingValueAttribute("plugins")]
    76         public string PluginDir {
    77             get {
    78                 return ((string)(this["PluginDir"]));
    79             }
    80             set {
    81                 this["PluginDir"] = value;
    82             }
    83         }
    84        
    85         [global::System.Configuration.UserScopedSettingAttribute()]
     49        [global::System.Configuration.ApplicationScopedSettingAttribute()]
    8650        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    8751        [global::System.Configuration.DefaultSettingValueAttribute("plugins\\backup")]
    … …  
    9054                return ((string)(this["BackupDir"]));
    9155            }
    92             set {
    93                 this["BackupDir"] = value;
    94             }
    9556        }
    9657       
    97         [global::System.Configuration.UserScopedSettingAttribute()]
     58        [global::System.Configuration.ApplicationScopedSettingAttribute()]
    9859        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    9960        [global::System.Configuration.DefaultSettingValueAttribute("plugins\\temp")]
    … …  
    10263                return ((string)(this["TempDir"]));
    10364            }
    104             set {
    105                 this["TempDir"] = value;
    106             }
    10765        }
    10866    }

  • trunk/sources/HeuristicLab.PluginInfrastructure.GUI/Properties/Settings.settings

    r2 r854  
    99&lt;/ArrayOfString&gt;</Value>
    1010    </Setting>
    11     <Setting Name="CacheDir" Type="System.String" Scope="User">
     11    <Setting Name="CacheDir" Type="System.String" Scope="Application">
    1212      <Value Profile="(Default)">plugins\cache</Value>
    1313    </Setting>
    14     <Setting Name="PluginDir" Type="System.String" Scope="User">
    15       <Value Profile="(Default)">plugins</Value>
    16     </Setting>
    17     <Setting Name="BackupDir" Type="System.String" Scope="User">
     14    <Setting Name="BackupDir" Type="System.String" Scope="Application">
    1815      <Value Profile="(Default)">plugins\backup</Value>
    1916    </Setting>
    20     <Setting Name="TempDir" Type="System.String" Scope="User">
     17    <Setting Name="TempDir" Type="System.String" Scope="Application">
    2118      <Value Profile="(Default)">plugins\temp</Value>
    2219    </Setting>

  • trunk/sources/HeuristicLab.PluginInfrastructure.GUI/app.config

    r2 r854  
    44        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
    55            <section name="HeuristicLab.PluginInfrastructure.GUI.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
     6        </sectionGroup>
     7        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
     8            <section name="HeuristicLab.PluginInfrastructure.GUI.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
    69        </sectionGroup>
    710    </configSections>
    … …  
    1619                </value>
    1720            </setting>
     21        </HeuristicLab.PluginInfrastructure.GUI.Properties.Settings>
     22    </userSettings>
     23    <applicationSettings>
     24        <HeuristicLab.PluginInfrastructure.GUI.Properties.Settings>
    1825            <setting name="CacheDir" serializeAs="String">
    1926                <value>plugins\cache</value>
    20             </setting>
    21             <setting name="PluginDir" serializeAs="String">
    22                 <value>plugins</value>
    2327            </setting>
    2428            <setting name="BackupDir" serializeAs="String">
    … …  
    2933            </setting>
    3034        </HeuristicLab.PluginInfrastructure.GUI.Properties.Settings>
    31     </userSettings>
     35    </applicationSettings>
    3236</configuration>

  • trunk/sources/HeuristicLab.PluginInfrastructure/HeuristicLab.PluginInfrastructure.csproj

    r852 r854  
    33    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    44    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    5     <ProductVersion>9.0.30729</ProductVersion>
     5    <ProductVersion>9.0.21022</ProductVersion>
    66    <SchemaVersion>2.0</SchemaVersion>
    77    <ProjectGuid>{94186A6A-5176-4402-AE83-886557B53CCA}</ProjectGuid>
    … …  
    9898    <None Include="Properties\AssemblyInfo.frame" />
    9999    <None Include="Properties\Settings.settings">
    100       <Generator>SettingsSingleFileGenerator</Generator>
     100      <Generator>PublicSettingsSingleFileGenerator</Generator>
    101101      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
    102102    </None>

  • trunk/sources/HeuristicLab.PluginInfrastructure/Properties/Settings.Designer.cs

    r2 r854  
    1 #region License Information
    2 /* HeuristicLab
    3  * Copyright (C) 2002-2008 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    4  *
    5  * This file is part of HeuristicLab.
    6  *
    7  * HeuristicLab is free software: you can redistribute it and/or modify
    8  * it under the terms of the GNU General Public License as published by
    9  * the Free Software Foundation, either version 3 of the License, or
    10  * (at your option) any later version.
    11  *
    12  * HeuristicLab is distributed in the hope that it will be useful,
    13  * but WITHOUT ANY WARRANTY; without even the implied warranty of
    14  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    15  * GNU General Public License for more details.
    16  *
    17  * You should have received a copy of the GNU General Public License
    18  * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
    19  */
    20 #endregion
    21 
    22 //------------------------------------------------------------------------------
     1//------------------------------------------------------------------------------
    232// <auto-generated>
    243//     This code was generated by a tool.
    25 //     Runtime Version:2.0.50727.1433
     4//     Runtime Version:2.0.50727.3053
    265//
    276//     Changes to this file may cause incorrect behavior and will be lost if
    … …  
    3514    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    3615    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]
    37     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
     16    public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
    3817       
    3918        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
    … …  
    4524        }
    4625       
    47         [global::System.Configuration.UserScopedSettingAttribute()]
     26        [global::System.Configuration.ApplicationScopedSettingAttribute()]
    4827        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    4928        [global::System.Configuration.DefaultSettingValueAttribute("plugins")]
    … …  
    5231                return ((string)(this["PluginDir"]));
    5332            }
    54             set {
    55                 this["PluginDir"] = value;
    56             }
    5733        }
    5834    }

  • trunk/sources/HeuristicLab.PluginInfrastructure/Properties/Settings.settings

    r2 r854  
    33  <Profiles />
    44  <Settings>
    5     <Setting Name="PluginDir" Type="System.String" Scope="User">
     5    <Setting Name="PluginDir" Type="System.String" Scope="Application">
    66      <Value Profile="(Default)">plugins</Value>
    77    </Setting>

  • trunk/sources/HeuristicLab.PluginInfrastructure/app.config

    r2 r854  
    22<configuration>
    33    <configSections>
    4         <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
    5             <section name="HeuristicLab.PluginInfrastructure.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
     4        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
     5            <section name="HeuristicLab.PluginInfrastructure.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
    66        </sectionGroup>
    77    </configSections>
    8     <userSettings>
     8    <applicationSettings>
    99        <HeuristicLab.PluginInfrastructure.Properties.Settings>
    1010            <setting name="PluginDir" serializeAs="String">
    … …  
    1212            </setting>
    1313        </HeuristicLab.PluginInfrastructure.Properties.Settings>
    14     </userSettings>
     14    </applicationSettings>
    1515</configuration>

  • trunk/sources/HeuristicLab/MergeConfigs.cmd

    r852 r854  
     1ConfigMerger "%SolutionDir%\HeuristicLab.PluginInfrastructure\%Outdir%\HeuristicLab.PluginInfrastructure.dll.config" "HeuristicLab.exe.config"
     2ConfigMerger "%SolutionDir%\HeuristicLab.PluginInfrastructure.GUI\%Outdir%\HeuristicLab.PluginInfrastructure.GUI.dll.config" "HeuristicLab.exe.config"
    13ConfigMerger "%SolutionDir%\HeuristicLab.Settings\%Outdir%\HeuristicLab.Settings-3.2.dll.config" "HeuristicLab.exe.config"

  • trunk/sources/HeuristicLab/Properties/Settings.Designer.cs

    r2 r854  
    1 #region License Information
    2 /* HeuristicLab
    3  * Copyright (C) 2002-2008 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    4  *
    5  * This file is part of HeuristicLab.
    6  *
    7  * HeuristicLab is free software: you can redistribute it and/or modify
    8  * it under the terms of the GNU General Public License as published by
    9  * the Free Software Foundation, either version 3 of the License, or
    10  * (at your option) any later version.
    11  *
    12  * HeuristicLab is distributed in the hope that it will be useful,
    13  * but WITHOUT ANY WARRANTY; without even the implied warranty of
    14  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    15  * GNU General Public License for more details.
    16  *
    17  * You should have received a copy of the GNU General Public License
    18  * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
    19  */
    20 #endregion
    21 
    22 //------------------------------------------------------------------------------
     1//------------------------------------------------------------------------------
    232// <auto-generated>
    243//     This code was generated by a tool.
    25 //     Runtime Version:2.0.50727.1433
     4//     Runtime Version:2.0.50727.3053
    265//
    276//     Changes to this file may cause incorrect behavior and will be lost if
    … …  
    4524        }
    4625       
    47         [global::System.Configuration.UserScopedSettingAttribute()]
     26        [global::System.Configuration.ApplicationScopedSettingAttribute()]
    4827        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    49         [global::System.Configuration.DefaultSettingValueAttribute("")]
     28        [global::System.Configuration.DefaultSettingValueAttribute("unknown")]
    5029        public string User {
    5130            get {
    5231                return ((string)(this["User"]));
    5332            }
    54             set {
    55                 this["User"] = value;
    56             }
    5733        }
    5834       
    59         [global::System.Configuration.UserScopedSettingAttribute()]
     35        [global::System.Configuration.ApplicationScopedSettingAttribute()]
    6036        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    61         [global::System.Configuration.DefaultSettingValueAttribute("")]
     37        [global::System.Configuration.DefaultSettingValueAttribute("unknown")]
    6238        public string Organization {
    6339            get {
    6440                return ((string)(this["Organization"]));
    6541            }
    66             set {
    67                 this["Organization"] = value;
    68             }
    6942        }
    7043    }

  • trunk/sources/HeuristicLab/Properties/Settings.settings

    r2 r854  
    33  <Profiles />
    44  <Settings>
    5     <Setting Name="User" Type="System.String" Scope="User">
    6       <Value Profile="(Default)" />
     5    <Setting Name="User" Type="System.String" Scope="Application">
     6      <Value Profile="(Default)">unknown</Value>
    77    </Setting>
    8     <Setting Name="Organization" Type="System.String" Scope="User">
    9       <Value Profile="(Default)" />
     8    <Setting Name="Organization" Type="System.String" Scope="Application">
     9      <Value Profile="(Default)">unknown</Value>
    1010    </Setting>
    1111  </Settings>

  • trunk/sources/HeuristicLab/app.config

    r498 r854  
    22<configuration>
    33    <configSections>
    4         <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
    5             <section name="HeuristicLab.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
     4        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
     5            <section name="HeuristicLab.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
    66        </sectionGroup>
    77    </configSections>
    8     <userSettings>
    9         <HeuristicLab.Properties.Settings>
    10             <setting name="User" serializeAs="String">
    11                 <value />
    12             </setting>
    13             <setting name="Organization" serializeAs="String">
    14                 <value />
    15             </setting>
    16         </HeuristicLab.Properties.Settings>
    17     </userSettings>
    188  <system.data>
    199    <DbProviderFactories>
    … …  
    2313    </DbProviderFactories>
    2414  </system.data>
     15  <applicationSettings>
     16    <HeuristicLab.Properties.Settings>
     17      <setting name="User" serializeAs="String">
     18        <value>unknown</value>
     19      </setting>
     20      <setting name="Organization" serializeAs="String">
     21        <value>unknown</value>
     22      </setting>
     23    </HeuristicLab.Properties.Settings>
     24  </applicationSettings>
    2525</configuration>
Note: See TracChangeset for help on using the changeset viewer.