Free cookie consent management tool by TermsFeed Policy Generator

Changeset 3777


Ignore:
Timestamp:
05/11/10 19:06:02 (14 years ago)
Author:
swagner
Message:

Updated HeuristicLab logos and adapted SplashScreen (#989)

Location:
trunk/sources
Files:
1 deleted
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab 3.3.sln

    r3746 r3777  
    66    ConfigMerger.exe = ConfigMerger.exe
    77    ..\documentation\License\gpl-3.0.txt = ..\documentation\License\gpl-3.0.txt
    8     HeuristicLab 3.3.vsmdi = HeuristicLab 3.3.vsmdi
    9     HeuristicLab 3.31.vsmdi = HeuristicLab 3.31.vsmdi
    108    LocalTestRun.testrunconfig = LocalTestRun.testrunconfig
    119    PreBuildEvent.cmd = PreBuildEvent.cmd
    … …  
    248246EndProject
    249247Global
    250   GlobalSection(TestCaseManagementSettings) = postSolution
    251     CategoryFile = HeuristicLab 3.31.vsmdi
    252   EndGlobalSection
    253248  GlobalSection(SolutionConfigurationPlatforms) = preSolution
    254249    Debug|Any CPU = Debug|Any CPU

  • trunk/sources/HeuristicLab.PluginInfrastructure/Resources.Designer.cs

    r3761 r3777  
    22// <auto-generated>
    33//     This code was generated by a tool.
    4 //     Runtime Version:2.0.50727.4927
     4//     Runtime Version:2.0.50727.4200
    55//
    66//     Changes to this file may cause incorrect behavior and will be lost if
    … …  
    8282        }
    8383       
    84         internal static System.Drawing.Bitmap Delete {
    85             get {
    86                 object obj = ResourceManager.GetObject("Delete", resourceCulture);
    87                 return ((System.Drawing.Bitmap)(obj));
    88             }
    89         }
    90        
    9184        internal static System.Drawing.Bitmap Document {
    9285            get {

  • trunk/sources/HeuristicLab.PluginInfrastructure/Resources.resx

    r3761 r3777  
    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="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>
    132   </data>
    133130  <data name="Document" type="System.Resources.ResXFileRef, System.Windows.Forms">
    134131    <value>Resources\VS2008ImageLibrary_Objects_Document.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

  • trunk/sources/HeuristicLab.PluginInfrastructure/Starter/AboutDialog.Designer.cs

    r3761 r3777  
    125125      this.pictureBox.Location = new System.Drawing.Point(12, 12);
    126126      this.pictureBox.Name = "pictureBox";
    127       this.pictureBox.Size = new System.Drawing.Size(165, 183);
    128       this.pictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
     127      this.pictureBox.Size = new System.Drawing.Size(160, 180);
     128      this.pictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
    129129      this.pictureBox.TabIndex = 2;
    130130      this.pictureBox.TabStop = false;

  • trunk/sources/HeuristicLab.PluginInfrastructure/Starter/SplashScreen.Designer.cs

    r3761 r3777  
    4848    /// </summary>
    4949    private void InitializeComponent() {
    50       this.panel = new System.Windows.Forms.Panel();
    51       this.closeButton = new System.Windows.Forms.Button();
    52       this.companyLabel = new System.Windows.Forms.Label();
    53       this.userNameLabel = new System.Windows.Forms.Label();
    54       this.licensedToLabel = new System.Windows.Forms.Label();
    55       this.titleLabel = new System.Windows.Forms.Label();
    5650      this.versionLabel = new System.Windows.Forms.Label();
    5751      this.infoLabel = new System.Windows.Forms.Label();
    5852      this.copyrightLabel = new System.Windows.Forms.Label();
    5953      this.pictureBox = new System.Windows.Forms.PictureBox();
    60       this.panel.SuspendLayout();
    6154      ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
    6255      this.SuspendLayout();
    6356      //
    64       // panel
    65       //
    66       this.panel.BackColor = System.Drawing.SystemColors.Window;
    67       this.panel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
    68       this.panel.Controls.Add(this.closeButton);
    69       this.panel.Controls.Add(this.companyLabel);
    70       this.panel.Controls.Add(this.userNameLabel);
    71       this.panel.Controls.Add(this.licensedToLabel);
    72       this.panel.Controls.Add(this.titleLabel);
    73       this.panel.Controls.Add(this.versionLabel);
    74       this.panel.Controls.Add(this.infoLabel);
    75       this.panel.Controls.Add(this.copyrightLabel);
    76       this.panel.Controls.Add(this.pictureBox);
    77       this.panel.Dock = System.Windows.Forms.DockStyle.Fill;
    78       this.panel.Location = new System.Drawing.Point(0, 0);
    79       this.panel.Name = "panel";
    80       this.panel.Size = new System.Drawing.Size(625, 161);
    81       this.panel.TabIndex = 0;
    82       //
    83       // closeButton
    84       //
    85       this.closeButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
    86       this.closeButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
    87       this.closeButton.FlatAppearance.BorderColor = System.Drawing.Color.White;
    88       this.closeButton.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Gray;
    89       this.closeButton.FlatAppearance.MouseOverBackColor = System.Drawing.Color.White;
    90       this.closeButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
    91       this.closeButton.ForeColor = System.Drawing.Color.White;
    92       this.closeButton.ImageIndex = 0;
    93       this.closeButton.Location = new System.Drawing.Point(604, 3);
    94       this.closeButton.Name = "closeButton";
    95       this.closeButton.Size = new System.Drawing.Size(16, 16);
    96       this.closeButton.TabIndex = 7;
    97       this.closeButton.UseVisualStyleBackColor = true;
    98       this.closeButton.Click += new System.EventHandler(this.closeButton_Click);
    99       //
    100       // companyLabel
    101       //
    102       this.companyLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    103                   | System.Windows.Forms.AnchorStyles.Right)));
    104       this.companyLabel.Location = new System.Drawing.Point(248, 88);
    105       this.companyLabel.Name = "companyLabel";
    106       this.companyLabel.Size = new System.Drawing.Size(364, 16);
    107       this.companyLabel.TabIndex = 5;
    108       this.companyLabel.Text = "Company";
    109       this.companyLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
    110       //
    111       // userNameLabel
    112       //
    113       this.userNameLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    114                   | System.Windows.Forms.AnchorStyles.Right)));
    115       this.userNameLabel.BackColor = System.Drawing.SystemColors.Window;
    116       this.userNameLabel.Location = new System.Drawing.Point(248, 72);
    117       this.userNameLabel.Name = "userNameLabel";
    118       this.userNameLabel.Size = new System.Drawing.Size(364, 16);
    119       this.userNameLabel.TabIndex = 4;
    120       this.userNameLabel.Text = "User";
    121       this.userNameLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
    122       //
    123       // licensedToLabel
    124       //
    125       this.licensedToLabel.Location = new System.Drawing.Point(170, 72);
    126       this.licensedToLabel.Name = "licensedToLabel";
    127       this.licensedToLabel.Size = new System.Drawing.Size(72, 16);
    128       this.licensedToLabel.TabIndex = 3;
    129       this.licensedToLabel.Text = "Licensed to:";
    130       this.licensedToLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
    131       //
    132       // titleLabel
    133       //
    134       this.titleLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    135                   | System.Windows.Forms.AnchorStyles.Right)));
    136       this.titleLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
    137       this.titleLabel.Location = new System.Drawing.Point(170, 8);
    138       this.titleLabel.Name = "titleLabel";
    139       this.titleLabel.Size = new System.Drawing.Size(442, 16);
    140       this.titleLabel.TabIndex = 0;
    141       this.titleLabel.Text = "Title";
    142       this.titleLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
    143       //
    14457      // versionLabel
    14558      //
    146       this.versionLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    147                   | System.Windows.Forms.AnchorStyles.Right)));
    148       this.versionLabel.Location = new System.Drawing.Point(170, 24);
     59      this.versionLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
     60      this.versionLabel.Location = new System.Drawing.Point(500, 156);
    14961      this.versionLabel.Name = "versionLabel";
    150       this.versionLabel.Size = new System.Drawing.Size(442, 16);
     62      this.versionLabel.Size = new System.Drawing.Size(186, 16);
    15163      this.versionLabel.TabIndex = 1;
    15264      this.versionLabel.Text = "Version ";
    153       this.versionLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
     65      this.versionLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
    15466      //
    15567      // infoLabel
    15668      //
    157       this.infoLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
     69      this.infoLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    15870                  | System.Windows.Forms.AnchorStyles.Right)));
    15971      this.infoLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
    160       this.infoLabel.ForeColor = System.Drawing.SystemColors.GradientActiveCaption;
    161       this.infoLabel.Location = new System.Drawing.Point(170, 104);
     72      this.infoLabel.ForeColor = System.Drawing.Color.DarkOrange;
     73      this.infoLabel.Location = new System.Drawing.Point(0, 123);
    16274      this.infoLabel.Name = "infoLabel";
    163       this.infoLabel.Size = new System.Drawing.Size(442, 47);
     75      this.infoLabel.Size = new System.Drawing.Size(698, 30);
    16476      this.infoLabel.TabIndex = 6;
    16577      this.infoLabel.Text = "Startup Information";
    166       this.infoLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
     78      this.infoLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
    16779      //
    16880      // copyrightLabel
    16981      //
    170       this.copyrightLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    171                   | System.Windows.Forms.AnchorStyles.Right)));
    172       this.copyrightLabel.Location = new System.Drawing.Point(170, 56);
     82      this.copyrightLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
     83      this.copyrightLabel.Location = new System.Drawing.Point(12, 156);
    17384      this.copyrightLabel.Name = "copyrightLabel";
    174       this.copyrightLabel.Size = new System.Drawing.Size(442, 16);
     85      this.copyrightLabel.Size = new System.Drawing.Size(186, 16);
    17586      this.copyrightLabel.TabIndex = 2;
    17687      this.copyrightLabel.Text = "Copyright";
    … …  
    17990      // pictureBox
    18091      //
    181       this.pictureBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    182                   | System.Windows.Forms.AnchorStyles.Left)));
    183       this.pictureBox.Image = global::HeuristicLab.PluginInfrastructure.Resources.HeuristicLabLogo;
    184       this.pictureBox.Location = new System.Drawing.Point(-1, -1);
     92      this.pictureBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     93                  | System.Windows.Forms.AnchorStyles.Right)));
     94      this.pictureBox.Image = global::HeuristicLab.PluginInfrastructure.Resources.HeuristicLabBanner;
     95      this.pictureBox.Location = new System.Drawing.Point(0, 0);
    18596      this.pictureBox.Name = "pictureBox";
    186       this.pictureBox.Size = new System.Drawing.Size(165, 161);
    187       this.pictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
     97      this.pictureBox.Size = new System.Drawing.Size(698, 120);
     98      this.pictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
    18899      this.pictureBox.TabIndex = 0;
    189100      this.pictureBox.TabStop = false;
    … …  
    193104      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    194105      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    195       this.ClientSize = new System.Drawing.Size(625, 161);
     106      this.BackColor = System.Drawing.Color.White;
     107      this.ClientSize = new System.Drawing.Size(698, 175);
    196108      this.ControlBox = false;
    197       this.Controls.Add(this.panel);
    198       this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
     109      this.Controls.Add(this.infoLabel);
     110      this.Controls.Add(this.pictureBox);
     111      this.Controls.Add(this.versionLabel);
     112      this.Controls.Add(this.copyrightLabel);
     113      this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
    199114      this.MaximizeBox = false;
    200115      this.MinimizeBox = false;
    … …  
    203118      this.ShowInTaskbar = false;
    204119      this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
    205       this.panel.ResumeLayout(false);
    206120      ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
    207121      this.ResumeLayout(false);
    … …  
    211125    #endregion
    212126
    213     private System.Windows.Forms.Panel panel;
    214127    private System.Windows.Forms.PictureBox pictureBox;
    215     private System.Windows.Forms.Label companyLabel;
    216     private System.Windows.Forms.Label userNameLabel;
    217     private System.Windows.Forms.Label licensedToLabel;
    218     private System.Windows.Forms.Label titleLabel;
    219128    private System.Windows.Forms.Label versionLabel;
    220129    private System.Windows.Forms.Label copyrightLabel;
    221130    private System.Windows.Forms.Label infoLabel;
    222     private System.Windows.Forms.Button closeButton;
    223131  }
    224132}

  • trunk/sources/HeuristicLab.PluginInfrastructure/Starter/SplashScreen.cs

    r3752 r3777  
    2929using HeuristicLab.PluginInfrastructure;
    3030using HeuristicLab.PluginInfrastructure.Manager;
     31using System.Diagnostics;
    3132
    3233namespace HeuristicLab.PluginInfrastructure.Starter {
    … …  
    3637    private int initialInterval;
    3738    private PluginManager manager;
    38     private bool fadeOutForced;
     39
    3940    internal SplashScreen() {
    4041      InitializeComponent();
    … …  
    4647      this.manager = manager;
    4748
    48       closeButton.Image = HeuristicLab.PluginInfrastructure.Resources.Delete;
    4949      manager.ApplicationStarted += new EventHandler<PluginInfrastructureEventArgs>(manager_ApplicationStarted);
    5050      manager.ApplicationStarting += new EventHandler<PluginInfrastructureEventArgs>(manager_ApplicationStarting);
    … …  
    5454      manager.PluginUnloaded += new EventHandler<PluginInfrastructureEventArgs>(manager_PluginUnloaded);
    5555
    56       titleLabel.Text = Application.ProductName;
    57       versionLabel.Text = "Version " + Application.ProductVersion;
     56      FileVersionInfo pluginInfrastructureVersion = FileVersionInfo.GetVersionInfo(GetType().Assembly.Location);
     57      versionLabel.Text = "Version " + pluginInfrastructureVersion.FileVersion;
    5858      infoLabel.Text = "";
    5959
    6060      var attr = (AssemblyCopyrightAttribute)this.GetType().Assembly.GetCustomAttributes(typeof(AssemblyCopyrightAttribute), false).Single();
    6161      copyrightLabel.Text = "Copyright " + attr.Copyright;
    62 
    63       string user = HeuristicLab.PluginInfrastructure.Properties.Settings.Default.User;
    64       string company = HeuristicLab.PluginInfrastructure.Properties.Settings.Default.Organization;
    65 
    66       userNameLabel.Text = string.IsNullOrEmpty(user) ? "-" : user;
    67       companyLabel.Text = string.IsNullOrEmpty(company) ? "-" : company;
    6862
    6963      fadeTimer = new Timer();
    … …  
    10195        Opacity = 1;
    10296        infoLabel.Text = initialText;
    103         fadeOutForced = false;
    10497        ResetFadeTimer();
    10598        Show();
    … …  
    112105        Opacity = 1;
    113106        infoLabel.Text = initialText;
    114         fadeOutForced = false;
    115107        ResetFadeTimer();
    116108        Show(owner);
    … …  
    137129        Invoke((Action<string>)UpdateMessage, msg);
    138130      } else {
    139         // when the user forced a fade-out (by closing the splashscreen)
    140         // don't reset the fadeTimer
    141         if (!fadeOutForced) {
    142           ResetFadeTimer();
    143         }
     131        ResetFadeTimer();
    144132        SetInfoText(msg);
    145133        Application.DoEvents(); // force immediate update of splash screen control
    … …  
    165153      }
    166154    }
    167 
    168     // force fade out
    169     private void closeButton_Click(object sender, EventArgs e) {
    170       fadeOutForced = true;
    171       FadeOut();
    172     }
    173155  }
    174156}
Note: See TracChangeset for help on using the changeset viewer.