Changeset 3752


Ignore:
Timestamp:
05/10/10 18:15:09 (12 years ago)
Author:
gkronber
Message:

Cleaned up unnecessary .resx files in plugin infrastructure. #989

Location:
trunk/sources/HeuristicLab.PluginInfrastructure
Files:
1 added
15 deleted
15 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/ConfirmationDialog.cs

    r3090 r3752  
    3030namespace HeuristicLab.PluginInfrastructure.Advanced {
    3131  internal partial class ConfirmationDialog : Form {
    32     public ConfirmationDialog() {
     32    public ConfirmationDialog() : base() {
    3333      InitializeComponent();
    3434      icon.Image = System.Drawing.SystemIcons.Exclamation.ToBitmap();
  • trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/InstallationManagerForm.cs

    r3627 r3752  
    3737    private string pluginDir;
    3838
    39     public InstallationManagerForm(PluginManager pluginManager) {
     39    public InstallationManagerForm(PluginManager pluginManager) : base() {
    4040      InitializeComponent();
    4141      FileVersionInfo pluginInfrastructureVersion = FileVersionInfo.GetVersionInfo(GetType().Assembly.Location);
     
    143143    #region button events
    144144    private void connectionSettingsToolStripMenuItem_Click(object sender, EventArgs e) {
    145       new ConnectionSetupView().ShowDialog();
     145      new ConnectionSetupView().ShowDialog(this);
    146146    }
    147147    private void tabControl_SelectedIndexChanged(object sender, EventArgs e) {
     
    158158        }
    159159      }
    160       return (new ConfirmationDialog("Confirm Delete", "Do you want to delete following files?", strBuilder.ToString())).ShowDialog() == DialogResult.OK;
     160      return (new ConfirmationDialog("Confirm Delete", "Do you want to delete following files?", strBuilder.ToString())).ShowDialog(this) == DialogResult.OK;
    161161    }
    162162
     
    166166        strBuilder.AppendLine(plugin.ToString());
    167167      }
    168       return (new ConfirmationDialog("Confirm Update", "Do you want to update following plugins?", strBuilder.ToString())).ShowDialog() == DialogResult.OK;
     168      return (new ConfirmationDialog("Confirm Update", "Do you want to update following plugins?", strBuilder.ToString())).ShowDialog(this) == DialogResult.OK;
    169169    }
    170170
     
    173173        if (!string.IsNullOrEmpty(plugin.LicenseText)) {
    174174          var licenseConfirmationBox = new LicenseConfirmationDialog(plugin);
    175           if (licenseConfirmationBox.ShowDialog() != DialogResult.OK)
     175          if (licenseConfirmationBox.ShowDialog(this) != DialogResult.OK)
    176176            return false;
    177177        }
  • trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/InstalledPluginsView.cs

    r3721 r3752  
    208208        var plugin = (PluginDescription)localPluginsListView.SelectedItems[0].Tag;
    209209        PluginView pluginView = new PluginView(plugin);
    210         pluginView.Show();
     210        pluginView.Show(this);
    211211      }
    212212    }
  • trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/LicenseConfirmationDialog.Designer.cs

    r3749 r3752  
    4545    private void InitializeComponent() {
    4646      this.components = new System.ComponentModel.Container();
    47       System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LicenseConfirmationDialog));
    4847      this.richTextBox = new System.Windows.Forms.RichTextBox();
    4948      this.acceptButton = new System.Windows.Forms.Button();
  • trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/LicenseConfirmationDialog.cs

    r3627 r3752  
    3030namespace HeuristicLab.PluginInfrastructure.Advanced {
    3131  internal partial class LicenseConfirmationDialog : Form {
    32     public LicenseConfirmationDialog() {
     32    public LicenseConfirmationDialog() : base() {
    3333      InitializeComponent();
    3434    }
    3535
    36     public LicenseConfirmationDialog(IPluginDescription plugin) {
     36    public LicenseConfirmationDialog(IPluginDescription plugin) : base() {
    3737      InitializeComponent();
    3838      richTextBox.Text = plugin.LicenseText;
  • trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/LicenseView.cs

    r3474 r3752  
    3232  internal partial class LicenseView : Form {
    3333
    34     public LicenseView() {
     34    public LicenseView() : base() {
    3535      InitializeComponent();
    3636      Name = "License";
    3737    }
    3838
    39     public LicenseView(IPluginDescription plugin) {
     39    public LicenseView(IPluginDescription plugin) : base() {
    4040      InitializeComponent();
    4141      Name = "License of: " + plugin;
  • trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/PluginView.Designer.cs

    r3749 r3752  
    4545    private void InitializeComponent() {
    4646      this.components = new System.ComponentModel.Container();
    47       System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PluginView));
    4847      this.nameLabel = new System.Windows.Forms.Label();
    4948      this.nameTextBox = new System.Windows.Forms.TextBox();
     
    316315      this.Controls.Add(this.nameTextBox);
    317316      this.Controls.Add(this.nameLabel);
    318       this.Icon = HeuristicLab.PluginInfrastructure.Resources.HeuristicLab;
     317      this.Icon = global::HeuristicLab.PluginInfrastructure.Resources.HeuristicLab;
    319318      this.Name = "PluginView";
     319      this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
    320320      this.dependenciesGroupBox.ResumeLayout(false);
    321321      this.filesGroupBox.ResumeLayout(false);
  • trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/PluginView.cs

    r3721 r3752  
    4040    private IPluginDescription plugin;
    4141
    42     public PluginView() {
     42    public PluginView() : base() {
    4343      InitializeComponent();
    4444      PopulateImageList();
    4545    }
    4646
    47     public PluginView(IPluginDescription plugin) {
     47    public PluginView(IPluginDescription plugin) : base() {
    4848      InitializeComponent();
    4949      PopulateImageList();
     
    114114        var dep = (PluginDescription)dependenciesListView.SelectedItems[0].Tag;
    115115        PluginView view = new PluginView(dep);
    116         view.Show();
     116        view.Show(this);
    117117      }
    118118    }
     
    120120    private void showLicenseButton_Click(object sender, EventArgs e) {
    121121      LicenseView view = new LicenseView(plugin);
    122       view.Show();
     122      view.Show(this);
    123123    }
    124124  }
  • trunk/sources/HeuristicLab.PluginInfrastructure/HeuristicLab.PluginInfrastructure.csproj

    r3749 r3752  
    216216    <Compile Include="Main.cs" />
    217217    <Compile Include="Properties\AssemblyInfo.cs" />
    218     <EmbeddedResource Include="Advanced\InstallationManagerForm.resx">
    219       <DependentUpon>InstallationManagerForm.cs</DependentUpon>
    220     </EmbeddedResource>
    221     <EmbeddedResource Include="Starter\SplashScreen.resx">
    222       <DependentUpon>SplashScreen.cs</DependentUpon>
    223     </EmbeddedResource>
    224     <EmbeddedResource Include="Starter\StarterForm.resx">
    225       <DependentUpon>StarterForm.cs</DependentUpon>
    226     </EmbeddedResource>
    227218    <None Include="app.config" />
    228219    <None Include="HeuristicLab.snk" />
     
    271262    <Content Include="Resources\HeuristicLab.ico" />
    272263    <Content Include="Resources\Logo_white.gif" />
     264    <None Include="Resources\VS2008ImageLibrary_Actions_Delete.png" />
    273265    <Content Include="Resources\VS2008ImageLibrary_Actions_PublishToWebHS.png" />
    274266    <Content Include="Resources\VS2008ImageLibrary_Actions_RepeatHS.png" />
    275267    <Content Include="Resources\VS2008ImageLibrary_CommonElements_Actions_Add.png" />
    276268    <Content Include="Resources\VS2008ImageLibrary_Objects_Plugin.png" />
    277     <EmbeddedResource Include="Advanced\AvailablePluginsView.resx">
    278       <DependentUpon>AvailablePluginsView.cs</DependentUpon>
    279     </EmbeddedResource>
    280     <EmbeddedResource Include="Advanced\BasicUpdateView.resx">
    281       <DependentUpon>BasicUpdateView.cs</DependentUpon>
    282     </EmbeddedResource>
    283     <EmbeddedResource Include="Advanced\ConfirmationDialog.resx">
    284       <DependentUpon>ConfirmationDialog.cs</DependentUpon>
    285     </EmbeddedResource>
    286     <EmbeddedResource Include="Advanced\ConnectionSetupView.resx">
    287       <DependentUpon>ConnectionSetupView.cs</DependentUpon>
    288     </EmbeddedResource>
    289269    <EmbeddedResource Include="Advanced\DeploymentService\servdev.cer" />
    290     <EmbeddedResource Include="Advanced\EditProductsView.resx">
    291       <DependentUpon>EditProductsView.cs</DependentUpon>
    292     </EmbeddedResource>
    293     <EmbeddedResource Include="Advanced\InstalledPluginsView.resx">
    294       <DependentUpon>InstalledPluginsView.cs</DependentUpon>
    295     </EmbeddedResource>
    296     <EmbeddedResource Include="Advanced\LicenseConfirmationDialog.resx">
    297       <DependentUpon>LicenseConfirmationDialog.cs</DependentUpon>
    298     </EmbeddedResource>
    299     <EmbeddedResource Include="Advanced\LicenseView.resx">
    300       <DependentUpon>LicenseView.cs</DependentUpon>
    301     </EmbeddedResource>
    302270    <EmbeddedResource Include="Advanced\PluginView.resx">
    303271      <DependentUpon>PluginView.cs</DependentUpon>
    304     </EmbeddedResource>
    305     <EmbeddedResource Include="Advanced\UploadPluginsView.resx">
    306       <DependentUpon>UploadPluginsView.cs</DependentUpon>
    307272    </EmbeddedResource>
    308273    <EmbeddedResource Include="Resources.resx">
     
    310275      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
    311276      <SubType>Designer</SubType>
    312     </EmbeddedResource>
    313     <EmbeddedResource Include="Starter\AboutDialog.resx">
    314       <DependentUpon>AboutDialog.cs</DependentUpon>
    315277    </EmbeddedResource>
    316278    <None Include="Resources\VS2008ImageLibrary_CommonElements_Actions_Remove.png" />
  • trunk/sources/HeuristicLab.PluginInfrastructure/Properties/AssemblyInfo.frame

    r3573 r3752  
    3737[assembly: AssemblyTrademark("")]
    3838[assembly: AssemblyCulture("")]
    39 [assembly: System.Resources.NeutralResourcesLanguage("en")]
    4039[assembly: CLSCompliant(true)]
    4140
  • trunk/sources/HeuristicLab.PluginInfrastructure/Resources.Designer.cs

    r3749 r3752  
    8282        }
    8383       
    84         /// <summary>
    85         ///   Looks up a localized string similar to .
    86         /// </summary>
    87         internal static string Bla {
    88             get {
    89                 return ResourceManager.GetString("Bla", resourceCulture);
     84        internal static System.Drawing.Bitmap Delete {
     85            get {
     86                object obj = ResourceManager.GetObject("Delete", resourceCulture);
     87                return ((System.Drawing.Bitmap)(obj));
    9088            }
    9189        }
  • trunk/sources/HeuristicLab.PluginInfrastructure/Resources.resx

    r3749 r3752  
    128128    <value>Resources\vs2008imagelibrary_objects_assembly.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
    129129  </data>
    130   <data name="Bla" xml:space="preserve">
    131     <value />
     130  <data name="Delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
     131    <value>Resources\VS2008ImageLibrary_Actions_Delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
    132132  </data>
    133133  <data name="Document" type="System.Resources.ResXFileRef, System.Windows.Forms">
  • trunk/sources/HeuristicLab.PluginInfrastructure/Starter/AboutDialog.cs

    r3742 r3752  
    103103      if(pluginListView.SelectedItems.Count > 0) {
    104104        PluginView view = new PluginView((IPluginDescription)pluginListView.SelectedItems[0].Tag);
    105         view.Show();
     105        view.Show(this);
    106106      }
    107107    }
  • trunk/sources/HeuristicLab.PluginInfrastructure/Starter/SplashScreen.Designer.cs

    r3749 r3752  
    4848    /// </summary>
    4949    private void InitializeComponent() {
    50       this.components = new System.ComponentModel.Container();
    51       System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SplashScreen));
    5250      this.panel = new System.Windows.Forms.Panel();
    5351      this.closeButton = new System.Windows.Forms.Button();
    54       this.imageList = new System.Windows.Forms.ImageList(this.components);
    5552      this.companyLabel = new System.Windows.Forms.Label();
    5653      this.userNameLabel = new System.Windows.Forms.Label();
     
    9491      this.closeButton.ForeColor = System.Drawing.Color.White;
    9592      this.closeButton.ImageIndex = 0;
    96       this.closeButton.ImageList = this.imageList;
    9793      this.closeButton.Location = new System.Drawing.Point(604, 3);
    9894      this.closeButton.Name = "closeButton";
     
    10197      this.closeButton.UseVisualStyleBackColor = true;
    10298      this.closeButton.Click += new System.EventHandler(this.closeButton_Click);
    103       //
    104       // imageList
    105       //
    106       this.imageList.Images.Add(HeuristicLab.PluginInfrastructure.Resources.Remove);
    10799      //
    108100      // companyLabel
     
    214206      ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
    215207      this.ResumeLayout(false);
     208
    216209    }
    217210
     
    227220    private System.Windows.Forms.Label copyrightLabel;
    228221    private System.Windows.Forms.Label infoLabel;
    229     private System.Windows.Forms.ImageList imageList;
    230222    private System.Windows.Forms.Button closeButton;
    231223  }
  • trunk/sources/HeuristicLab.PluginInfrastructure/Starter/SplashScreen.cs

    r3697 r3752  
    4646      this.manager = manager;
    4747
     48      closeButton.Image = HeuristicLab.PluginInfrastructure.Resources.Delete;
    4849      manager.ApplicationStarted += new EventHandler<PluginInfrastructureEventArgs>(manager_ApplicationStarted);
    4950      manager.ApplicationStarting += new EventHandler<PluginInfrastructureEventArgs>(manager_ApplicationStarting);
Note: See TracChangeset for help on using the changeset viewer.