Changeset 7557


Ignore:
Timestamp:
03/06/12 00:22:49 (7 years ago)
Author:
ascheibe
Message:

#1648

  • improved client registration dialog
  • fixed namespaces
Location:
branches/ClientUserManagement/HeuristicLab.Clients.Access.Views/3.3
Files:
2 added
11 edited

Legend:

Unmodified
Added
Removed
  • branches/ClientUserManagement/HeuristicLab.Clients.Access.Views/3.3/ClientViews/AdminClientView.Designer.cs

    r7555 r7557  
    1 namespace HeuristicLab.Clients.Access {
     1namespace HeuristicLab.Clients.Access.Views {
    22  partial class AdminClientView {
    33    /// <summary>
  • branches/ClientUserManagement/HeuristicLab.Clients.Access.Views/3.3/ClientViews/AdminClientView.cs

    r7555 r7557  
    2222using HeuristicLab.MainForm;
    2323
    24 namespace HeuristicLab.Clients.Access {
     24namespace HeuristicLab.Clients.Access.Views {
    2525  [View("Extended Client View")]
    2626  [Content(typeof(Client), false)]
  • branches/ClientUserManagement/HeuristicLab.Clients.Access.Views/3.3/ClientViews/ClientInformationDialog.Designer.cs

    r7555 r7557  
    1 namespace HeuristicLab.Clients.Access {
     1namespace HeuristicLab.Clients.Access.Views {
    22  partial class ClientInformationDialog {
    33    /// <summary>
     
    2424    /// </summary>
    2525    private void InitializeComponent() {
    26       this.clientView = new HeuristicLab.Clients.Access.ClientView();
     26      this.clientView = new HeuristicLab.Clients.Access.Views.ClientView();
    2727      this.SuspendLayout();
    2828      //
  • branches/ClientUserManagement/HeuristicLab.Clients.Access.Views/3.3/ClientViews/ClientInformationDialog.cs

    r7555 r7557  
    2222using System.Windows.Forms;
    2323
    24 namespace HeuristicLab.Clients.Access {
     24namespace HeuristicLab.Clients.Access.Views {
    2525  public partial class ClientInformationDialog : Form {
    2626    public ClientInformationDialog() {
  • branches/ClientUserManagement/HeuristicLab.Clients.Access.Views/3.3/ClientViews/ClientRegistrationDialog.Designer.cs

    r7555 r7557  
    1 namespace HeuristicLab.Clients.Access {
     1namespace HeuristicLab.Clients.Access.Views {
    22  partial class ClientRegistrationDialog {
    33    /// <summary>
     
    2626      this.btnCollectInformation = new System.Windows.Forms.Button();
    2727      this.richTextBox1 = new System.Windows.Forms.RichTextBox();
    28       this.clientView = new HeuristicLab.Clients.Access.ClientView();
    2928      this.progressBar = new System.Windows.Forms.ProgressBar();
    3029      this.btnRegisterClient = new System.Windows.Forms.Button();
    3130      this.btnCancel = new System.Windows.Forms.Button();
     31      this.clientView = new HeuristicLab.Clients.Access.Views.ClientView();
    3232      this.SuspendLayout();
    3333      //
    3434      // btnCollectInformation
    3535      //
    36       this.btnCollectInformation.Location = new System.Drawing.Point(12, 114);
     36      this.btnCollectInformation.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
     37      this.btnCollectInformation.Location = new System.Drawing.Point(12, 220);
    3738      this.btnCollectInformation.Name = "btnCollectInformation";
    3839      this.btnCollectInformation.Size = new System.Drawing.Size(111, 23);
    3940      this.btnCollectInformation.TabIndex = 1;
    40       this.btnCollectInformation.Text = "Collect information";
     41      this.btnCollectInformation.Text = "Collect Information";
    4142      this.btnCollectInformation.UseVisualStyleBackColor = true;
    4243      this.btnCollectInformation.Click += new System.EventHandler(this.btnCollectInformation_Click);
     
    4445      // richTextBox1
    4546      //
    46       this.richTextBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    47                   | System.Windows.Forms.AnchorStyles.Right)));
     47      this.richTextBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     48            | System.Windows.Forms.AnchorStyles.Left)
     49            | System.Windows.Forms.AnchorStyles.Right)));
     50      this.richTextBox1.BackColor = System.Drawing.SystemColors.Control;
     51      this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None;
    4852      this.richTextBox1.Location = new System.Drawing.Point(12, 12);
    4953      this.richTextBox1.Name = "richTextBox1";
    50       this.richTextBox1.Size = new System.Drawing.Size(638, 96);
     54      this.richTextBox1.Size = new System.Drawing.Size(769, 202);
    5155      this.richTextBox1.TabIndex = 2;
    5256      this.richTextBox1.Text = "";
    53       //
    54       // clientView
    55       //
    56       this.clientView.Caption = "Client View";
    57       this.clientView.Content = null;
    58       this.clientView.Location = new System.Drawing.Point(12, 143);
    59       this.clientView.Name = "clientView";
    60       this.clientView.ReadOnly = false;
    61       this.clientView.Size = new System.Drawing.Size(638, 340);
    62       this.clientView.TabIndex = 3;
     57      this.richTextBox1.LinkClicked += new System.Windows.Forms.LinkClickedEventHandler(this.richTextBox1_LinkClicked);
    6358      //
    6459      // progressBar
    6560      //
    66       this.progressBar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    67                   | System.Windows.Forms.AnchorStyles.Right)));
    68       this.progressBar.Location = new System.Drawing.Point(130, 114);
     61      this.progressBar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
     62            | System.Windows.Forms.AnchorStyles.Right)));
     63      this.progressBar.Location = new System.Drawing.Point(129, 220);
    6964      this.progressBar.Name = "progressBar";
    70       this.progressBar.Size = new System.Drawing.Size(520, 23);
     65      this.progressBar.Size = new System.Drawing.Size(651, 23);
    7166      this.progressBar.Style = System.Windows.Forms.ProgressBarStyle.Continuous;
    7267      this.progressBar.TabIndex = 4;
     
    7570      // btnRegisterClient
    7671      //
     72      this.btnRegisterClient.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
    7773      this.btnRegisterClient.Enabled = false;
    78       this.btnRegisterClient.Location = new System.Drawing.Point(12, 516);
     74      this.btnRegisterClient.Location = new System.Drawing.Point(12, 595);
    7975      this.btnRegisterClient.Name = "btnRegisterClient";
    8076      this.btnRegisterClient.Size = new System.Drawing.Size(88, 23);
     
    8682      // btnCancel
    8783      //
     84      this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
    8885      this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
    89       this.btnCancel.Location = new System.Drawing.Point(574, 516);
     86      this.btnCancel.Location = new System.Drawing.Point(705, 595);
    9087      this.btnCancel.Name = "btnCancel";
    9188      this.btnCancel.Size = new System.Drawing.Size(75, 23);
     
    9491      this.btnCancel.UseVisualStyleBackColor = true;
    9592      //
     93      // clientView
     94      //
     95      this.clientView.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
     96            | System.Windows.Forms.AnchorStyles.Right)));
     97      this.clientView.Caption = "Client View";
     98      this.clientView.Content = null;
     99      this.clientView.Location = new System.Drawing.Point(11, 249);
     100      this.clientView.Name = "clientView";
     101      this.clientView.ReadOnly = false;
     102      this.clientView.Size = new System.Drawing.Size(769, 340);
     103      this.clientView.TabIndex = 3;
     104      //
    96105      // ClientRegistrationDialog
    97106      //
     
    99108      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    100109      this.CancelButton = this.btnCancel;
    101       this.ClientSize = new System.Drawing.Size(662, 552);
     110      this.ClientSize = new System.Drawing.Size(793, 631);
    102111      this.Controls.Add(this.btnCancel);
    103112      this.Controls.Add(this.btnRegisterClient);
  • branches/ClientUserManagement/HeuristicLab.Clients.Access.Views/3.3/ClientViews/ClientRegistrationDialog.cs

    r7555 r7557  
    2121
    2222using System;
     23using System.IO;
     24using System.Reflection;
    2325using System.Threading.Tasks;
    2426using System.Windows.Forms;
    2527
    26 namespace HeuristicLab.Clients.Access {
     28namespace HeuristicLab.Clients.Access.Views {
    2729  public partial class ClientRegistrationDialog : Form {
    2830    public ClientRegistrationDialog() {
    2931      InitializeComponent();
     32
     33      try {
     34        using (Stream stream = Assembly.GetExecutingAssembly().GetManifestResourceStream(typeof(ClientRegistrationDialog), "Documents.ClientRegistrationInfo.rtf"))
     35          richTextBox1.LoadFile(stream, RichTextBoxStreamType.RichText);
     36      }
     37      catch (Exception) { }
    3038    }
    3139
     
    99107      }
    100108    }
     109
     110    private void richTextBox1_LinkClicked(object sender, LinkClickedEventArgs e) {
     111      System.Diagnostics.Process.Start(e.LinkText);
     112    }
    101113  }
    102114}
  • branches/ClientUserManagement/HeuristicLab.Clients.Access.Views/3.3/ClientViews/ClientView.Designer.cs

    r7555 r7557  
    1 namespace HeuristicLab.Clients.Access {
     1namespace HeuristicLab.Clients.Access.Views {
    22  partial class ClientView {
    33    /// <summary>
  • branches/ClientUserManagement/HeuristicLab.Clients.Access.Views/3.3/ClientViews/ClientView.cs

    r7555 r7557  
    2323using HeuristicLab.MainForm;
    2424
    25 namespace HeuristicLab.Clients.Access {
     25namespace HeuristicLab.Clients.Access.Views {
    2626  [View("Client View")]
    2727  [Content(typeof(Client), true)]
  • branches/ClientUserManagement/HeuristicLab.Clients.Access.Views/3.3/HeuristicLab.Clients.Access.Views-3.3.csproj

    r7555 r7557  
    165165  </ItemGroup>
    166166  <ItemGroup>
     167    <EmbeddedResource Include="ClientViews\ClientRegistrationDialog.resx">
     168      <DependentUpon>ClientRegistrationDialog.cs</DependentUpon>
     169    </EmbeddedResource>
     170    <EmbeddedResource Include="Documents\ClientRegistrationInfo.rtf" />
    167171    <None Include="HeuristicLab.snk" />
    168172    <None Include="Plugin.cs.frame" />
  • branches/ClientUserManagement/HeuristicLab.Clients.Access.Views/3.3/MenuItems/ClientInfoMenuItem.cs

    r7555 r7557  
    2323using HeuristicLab.Optimizer;
    2424
    25 namespace HeuristicLab.Clients.Access {
     25namespace HeuristicLab.Clients.Access.Views {
    2626  public class ClientInfoMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItem, IOptimizerUserInterfaceItemProvider {
    2727    public override string Name {
  • branches/ClientUserManagement/HeuristicLab.Clients.Access.Views/3.3/Plugin.cs.frame

    r7555 r7557  
    2222using HeuristicLab.PluginInfrastructure;
    2323
    24 namespace HeuristicLab.Clients.Access {
     24namespace HeuristicLab.Clients.Access.Views {
    2525  /// <summary>
    2626  /// Plugin class for HeuristicLab.Clients.Access.Views plugin.
Note: See TracChangeset for help on using the changeset viewer.