From f7c0c90478cfd4b9bd27dc7afd215ca9da3c20ab Mon Sep 17 00:00:00 2001 From: Konstantinos Vaggelakos Date: Wed, 5 Oct 2011 02:04:44 +0200 Subject: [PATCH] Made the ssh-agent close when quitting the application. Also made the nameEntry and emailENtry field react when you type --- SparkleShare/Windows/SparkleSetup.Designer.cs | 472 +++++++++--------- SparkleShare/Windows/SparkleSetup.cs | 19 +- 2 files changed, 246 insertions(+), 245 deletions(-) diff --git a/SparkleShare/Windows/SparkleSetup.Designer.cs b/SparkleShare/Windows/SparkleSetup.Designer.cs index 0e1c8a84..08750441 100644 --- a/SparkleShare/Windows/SparkleSetup.Designer.cs +++ b/SparkleShare/Windows/SparkleSetup.Designer.cs @@ -23,173 +23,175 @@ namespace SparkleShare { /// the contents of this method with the code editor. /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager (typeof (SparkleSetup)); - this.pictureBox = new System.Windows.Forms.PictureBox (); - this.panel_info = new System.Windows.Forms.Panel (); - this.label_info = new System.Windows.Forms.Label (); - this.tabControl = new SparkleShare.controls.TablessControl (); - this.setupPage = new System.Windows.Forms.TabPage (); - this.groupBox1 = new System.Windows.Forms.GroupBox (); - this.EmailEntry = new System.Windows.Forms.TextBox (); - this.NameEntry = new System.Windows.Forms.TextBox (); - this.label13 = new System.Windows.Forms.Label (); - this.label12 = new System.Windows.Forms.Label (); - this.label11 = new System.Windows.Forms.Label (); - this.label10 = new System.Windows.Forms.Label (); - this.buttonNext = new System.Windows.Forms.Button (); - this.addPage = new System.Windows.Forms.TabPage (); - this.panel_folder_selection = new System.Windows.Forms.Panel (); - this.groupbox_folder_selection = new System.Windows.Forms.GroupBox (); - this.label5 = new System.Windows.Forms.Label (); - this.FolderEntry = new SparkleShare.controls.ExampleTextBox (); - this.panel_server_selection = new System.Windows.Forms.Panel (); - this.groupbox_server_selection = new System.Windows.Forms.GroupBox (); - this.ServerEntry = new SparkleShare.controls.ExampleTextBox (); - this.radio_button_gnome = new System.Windows.Forms.RadioButton (); - this.radio_button_gitorious = new System.Windows.Forms.RadioButton (); - this.radio_button_github = new System.Windows.Forms.RadioButton (); - this.radio_button_own_server = new System.Windows.Forms.RadioButton (); - this.buttonSync = new System.Windows.Forms.Button (); - this.buttonCancel = new System.Windows.Forms.Button (); - this.label4 = new System.Windows.Forms.Label (); - this.syncingPage = new System.Windows.Forms.TabPage (); - this.syncingProgressBar = new System.Windows.Forms.ProgressBar (); - this.buttonFinish = new System.Windows.Forms.Button (); - this.label7 = new System.Windows.Forms.Label (); - this.label6 = new System.Windows.Forms.Label (); - this.errorPage = new System.Windows.Forms.TabPage (); - this.buttonTryAgain = new System.Windows.Forms.Button (); - this.label3 = new System.Windows.Forms.Label (); - this.label2 = new System.Windows.Forms.Label (); - this.label1 = new System.Windows.Forms.Label (); - this.finishedPage = new System.Windows.Forms.TabPage (); - this.label9 = new System.Windows.Forms.Label (); - this.label8 = new System.Windows.Forms.Label (); - this.buttonFinished = new System.Windows.Forms.Button (); - this.buttonOpenFolder = new System.Windows.Forms.Button (); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit (); - this.panel_info.SuspendLayout (); - this.tabControl.SuspendLayout (); - this.setupPage.SuspendLayout (); - this.groupBox1.SuspendLayout (); - this.addPage.SuspendLayout (); - this.panel_folder_selection.SuspendLayout (); - this.groupbox_folder_selection.SuspendLayout (); - this.panel_server_selection.SuspendLayout (); - this.groupbox_server_selection.SuspendLayout (); - this.syncingPage.SuspendLayout (); - this.errorPage.SuspendLayout (); - this.finishedPage.SuspendLayout (); - this.SuspendLayout (); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SparkleSetup)); + this.pictureBox = new System.Windows.Forms.PictureBox(); + this.panel_info = new System.Windows.Forms.Panel(); + this.label_info = new System.Windows.Forms.Label(); + this.tabControl = new SparkleShare.controls.TablessControl(); + this.setupPage = new System.Windows.Forms.TabPage(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.EmailEntry = new System.Windows.Forms.TextBox(); + this.NameEntry = new System.Windows.Forms.TextBox(); + this.label13 = new System.Windows.Forms.Label(); + this.label12 = new System.Windows.Forms.Label(); + this.label11 = new System.Windows.Forms.Label(); + this.label10 = new System.Windows.Forms.Label(); + this.buttonNext = new System.Windows.Forms.Button(); + this.addPage = new System.Windows.Forms.TabPage(); + this.panel_folder_selection = new System.Windows.Forms.Panel(); + this.groupbox_folder_selection = new System.Windows.Forms.GroupBox(); + this.label5 = new System.Windows.Forms.Label(); + this.FolderEntry = new SparkleShare.controls.ExampleTextBox(); + this.panel_server_selection = new System.Windows.Forms.Panel(); + this.groupbox_server_selection = new System.Windows.Forms.GroupBox(); + this.ServerEntry = new SparkleShare.controls.ExampleTextBox(); + this.radio_button_gnome = new System.Windows.Forms.RadioButton(); + this.radio_button_gitorious = new System.Windows.Forms.RadioButton(); + this.radio_button_github = new System.Windows.Forms.RadioButton(); + this.radio_button_own_server = new System.Windows.Forms.RadioButton(); + this.buttonSync = new System.Windows.Forms.Button(); + this.buttonCancel = new System.Windows.Forms.Button(); + this.label4 = new System.Windows.Forms.Label(); + this.syncingPage = new System.Windows.Forms.TabPage(); + this.syncingProgressBar = new System.Windows.Forms.ProgressBar(); + this.buttonFinish = new System.Windows.Forms.Button(); + this.label7 = new System.Windows.Forms.Label(); + this.label6 = new System.Windows.Forms.Label(); + this.errorPage = new System.Windows.Forms.TabPage(); + this.buttonTryAgain = new System.Windows.Forms.Button(); + this.label3 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.finishedPage = new System.Windows.Forms.TabPage(); + this.label9 = new System.Windows.Forms.Label(); + this.label8 = new System.Windows.Forms.Label(); + this.buttonFinished = new System.Windows.Forms.Button(); + this.buttonOpenFolder = new System.Windows.Forms.Button(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit(); + this.panel_info.SuspendLayout(); + this.tabControl.SuspendLayout(); + this.setupPage.SuspendLayout(); + this.groupBox1.SuspendLayout(); + this.addPage.SuspendLayout(); + this.panel_folder_selection.SuspendLayout(); + this.groupbox_folder_selection.SuspendLayout(); + this.panel_server_selection.SuspendLayout(); + this.groupbox_server_selection.SuspendLayout(); + this.syncingPage.SuspendLayout(); + this.errorPage.SuspendLayout(); + this.finishedPage.SuspendLayout(); + this.SuspendLayout(); // // pictureBox // this.pictureBox.Dock = System.Windows.Forms.DockStyle.Left; - this.pictureBox.Location = new System.Drawing.Point (0, 0); + this.pictureBox.Location = new System.Drawing.Point(0, 0); this.pictureBox.Name = "pictureBox"; - this.pictureBox.Size = new System.Drawing.Size (150, 396); + this.pictureBox.Size = new System.Drawing.Size(150, 396); this.pictureBox.TabIndex = 1; this.pictureBox.TabStop = false; // // panel_info // this.panel_info.BackColor = System.Drawing.Color.White; - this.panel_info.Controls.Add (this.label_info); - this.panel_info.Location = new System.Drawing.Point (0, 0); + this.panel_info.Controls.Add(this.label_info); + this.panel_info.Location = new System.Drawing.Point(0, 0); this.panel_info.Name = "panel_info"; - this.panel_info.Size = new System.Drawing.Size (150, 396); + this.panel_info.Size = new System.Drawing.Size(150, 396); this.panel_info.TabIndex = 7; this.panel_info.Visible = false; // // label_info // - this.label_info.Location = new System.Drawing.Point (12, 105); + this.label_info.Location = new System.Drawing.Point(12, 105); this.label_info.Name = "label_info"; - this.label_info.Size = new System.Drawing.Size (112, 253); + this.label_info.Size = new System.Drawing.Size(112, 253); this.label_info.TabIndex = 1; this.label_info.Text = "Informative text"; // // tabControl // - this.tabControl.Controls.Add (this.setupPage); - this.tabControl.Controls.Add (this.addPage); - this.tabControl.Controls.Add (this.syncingPage); - this.tabControl.Controls.Add (this.errorPage); - this.tabControl.Controls.Add (this.finishedPage); + this.tabControl.Controls.Add(this.setupPage); + this.tabControl.Controls.Add(this.addPage); + this.tabControl.Controls.Add(this.syncingPage); + this.tabControl.Controls.Add(this.errorPage); + this.tabControl.Controls.Add(this.finishedPage); this.tabControl.Dock = System.Windows.Forms.DockStyle.Right; - this.tabControl.Location = new System.Drawing.Point (150, 0); + this.tabControl.Location = new System.Drawing.Point(150, 0); this.tabControl.Name = "tabControl"; this.tabControl.SelectedIndex = 0; - this.tabControl.Size = new System.Drawing.Size (514, 396); + this.tabControl.Size = new System.Drawing.Size(514, 396); this.tabControl.TabIndex = 0; this.tabControl.TabStop = false; // // setupPage // - this.setupPage.Controls.Add (this.groupBox1); - this.setupPage.Controls.Add (this.label11); - this.setupPage.Controls.Add (this.label10); - this.setupPage.Controls.Add (this.buttonNext); - this.setupPage.Location = new System.Drawing.Point (4, 22); + this.setupPage.Controls.Add(this.groupBox1); + this.setupPage.Controls.Add(this.label11); + this.setupPage.Controls.Add(this.label10); + this.setupPage.Controls.Add(this.buttonNext); + this.setupPage.Location = new System.Drawing.Point(4, 22); this.setupPage.Name = "setupPage"; - this.setupPage.Padding = new System.Windows.Forms.Padding (3); - this.setupPage.Size = new System.Drawing.Size (506, 370); + this.setupPage.Padding = new System.Windows.Forms.Padding(3); + this.setupPage.Size = new System.Drawing.Size(506, 370); this.setupPage.TabIndex = 0; this.setupPage.Text = "Setup"; this.setupPage.UseVisualStyleBackColor = true; // // groupBox1 // - this.groupBox1.Controls.Add (this.EmailEntry); - this.groupBox1.Controls.Add (this.NameEntry); - this.groupBox1.Controls.Add (this.label13); - this.groupBox1.Controls.Add (this.label12); - this.groupBox1.Location = new System.Drawing.Point (14, 119); + this.groupBox1.Controls.Add(this.EmailEntry); + this.groupBox1.Controls.Add(this.NameEntry); + this.groupBox1.Controls.Add(this.label13); + this.groupBox1.Controls.Add(this.label12); + this.groupBox1.Location = new System.Drawing.Point(14, 119); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size (429, 102); + this.groupBox1.Size = new System.Drawing.Size(429, 102); this.groupBox1.TabIndex = 7; this.groupBox1.TabStop = false; this.groupBox1.Text = "Information about you"; // // EmailEntry // - this.EmailEntry.Location = new System.Drawing.Point (150, 54); + this.EmailEntry.Location = new System.Drawing.Point(150, 54); this.EmailEntry.Name = "EmailEntry"; - this.EmailEntry.Size = new System.Drawing.Size (275, 20); + this.EmailEntry.Size = new System.Drawing.Size(275, 20); this.EmailEntry.TabIndex = 10; + this.EmailEntry.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.CheckSetupPage); // // NameEntry // - this.NameEntry.Location = new System.Drawing.Point (150, 28); + this.NameEntry.Location = new System.Drawing.Point(150, 28); this.NameEntry.Name = "NameEntry"; - this.NameEntry.Size = new System.Drawing.Size (275, 20); + this.NameEntry.Size = new System.Drawing.Size(275, 20); this.NameEntry.TabIndex = 9; + this.NameEntry.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.CheckSetupPage); // // label13 // this.label13.AutoSize = true; - this.label13.Font = new System.Drawing.Font ("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label13.Location = new System.Drawing.Point (15, 57); + this.label13.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label13.Location = new System.Drawing.Point(15, 57); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size (41, 13); + this.label13.Size = new System.Drawing.Size(41, 13); this.label13.TabIndex = 8; this.label13.Text = "Email:"; // // label12 // this.label12.AutoSize = true; - this.label12.Font = new System.Drawing.Font ("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label12.Location = new System.Drawing.Point (15, 31); + this.label12.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label12.Location = new System.Drawing.Point(15, 31); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size (65, 13); + this.label12.Size = new System.Drawing.Size(65, 13); this.label12.TabIndex = 7; this.label12.Text = "Full name:"; // // label11 // - this.label11.Location = new System.Drawing.Point (11, 44); + this.label11.Location = new System.Drawing.Point(11, 44); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size (307, 62); + this.label11.Size = new System.Drawing.Size(307, 62); this.label11.TabIndex = 2; this.label11.Text = "Before we can create a SparkleShare folder on this computer, we need a few bits o" + "f information from you.\r\n"; @@ -197,55 +199,55 @@ namespace SparkleShare { // label10 // this.label10.AutoSize = true; - this.label10.Font = new System.Drawing.Font ("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold); - this.label10.Location = new System.Drawing.Point (8, 18); + this.label10.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold); + this.label10.Location = new System.Drawing.Point(8, 18); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size (222, 20); + this.label10.Size = new System.Drawing.Size(222, 20); this.label10.TabIndex = 1; this.label10.Text = "Welcome to SparkleShare!"; // // buttonNext // this.buttonNext.Enabled = false; - this.buttonNext.Location = new System.Drawing.Point (431, 350); + this.buttonNext.Location = new System.Drawing.Point(431, 350); this.buttonNext.Name = "buttonNext"; - this.buttonNext.Size = new System.Drawing.Size (75, 23); + this.buttonNext.Size = new System.Drawing.Size(75, 23); this.buttonNext.TabIndex = 0; this.buttonNext.Text = "Next"; this.buttonNext.UseVisualStyleBackColor = true; - this.buttonNext.Click += new System.EventHandler (this.buttonNext_Click); + this.buttonNext.Click += new System.EventHandler(this.buttonNext_Click); // // addPage // - this.addPage.Controls.Add (this.panel_folder_selection); - this.addPage.Controls.Add (this.panel_server_selection); - this.addPage.Controls.Add (this.buttonSync); - this.addPage.Controls.Add (this.buttonCancel); - this.addPage.Controls.Add (this.label4); - this.addPage.Location = new System.Drawing.Point (4, 22); + this.addPage.Controls.Add(this.panel_folder_selection); + this.addPage.Controls.Add(this.panel_server_selection); + this.addPage.Controls.Add(this.buttonSync); + this.addPage.Controls.Add(this.buttonCancel); + this.addPage.Controls.Add(this.label4); + this.addPage.Location = new System.Drawing.Point(4, 22); this.addPage.Name = "addPage"; - this.addPage.Padding = new System.Windows.Forms.Padding (3); - this.addPage.Size = new System.Drawing.Size (506, 370); + this.addPage.Padding = new System.Windows.Forms.Padding(3); + this.addPage.Size = new System.Drawing.Size(506, 370); this.addPage.TabIndex = 1; this.addPage.Text = "Add"; this.addPage.UseVisualStyleBackColor = true; // // panel_folder_selection // - this.panel_folder_selection.Controls.Add (this.groupbox_folder_selection); - this.panel_folder_selection.Location = new System.Drawing.Point (2, 213); + this.panel_folder_selection.Controls.Add(this.groupbox_folder_selection); + this.panel_folder_selection.Location = new System.Drawing.Point(2, 213); this.panel_folder_selection.Name = "panel_folder_selection"; - this.panel_folder_selection.Size = new System.Drawing.Size (512, 123); + this.panel_folder_selection.Size = new System.Drawing.Size(512, 123); this.panel_folder_selection.TabIndex = 13; - this.panel_folder_selection.MouseLeave += new System.EventHandler (this.panel_folder_selection_MouseLeave); + this.panel_folder_selection.MouseLeave += new System.EventHandler(this.panel_folder_selection_MouseLeave); // // groupbox_folder_selection // - this.groupbox_folder_selection.Controls.Add (this.label5); - this.groupbox_folder_selection.Controls.Add (this.FolderEntry); - this.groupbox_folder_selection.Location = new System.Drawing.Point (10, 20); + this.groupbox_folder_selection.Controls.Add(this.label5); + this.groupbox_folder_selection.Controls.Add(this.FolderEntry); + this.groupbox_folder_selection.Location = new System.Drawing.Point(10, 20); this.groupbox_folder_selection.Name = "groupbox_folder_selection"; - this.groupbox_folder_selection.Size = new System.Drawing.Size (470, 88); + this.groupbox_folder_selection.Size = new System.Drawing.Size(470, 88); this.groupbox_folder_selection.TabIndex = 11; this.groupbox_folder_selection.TabStop = false; this.groupbox_folder_selection.Text = "Folder selection"; @@ -253,9 +255,9 @@ namespace SparkleShare { // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point (6, 43); + this.label5.Location = new System.Drawing.Point(6, 43); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size (121, 13); + this.label5.Size = new System.Drawing.Size(121, 13); this.label5.TabIndex = 9; this.label5.Text = "Folder name (on server):"; // @@ -263,31 +265,31 @@ namespace SparkleShare { // this.FolderEntry.ExampleText = "/path/to/folder"; this.FolderEntry.ForeColor = System.Drawing.SystemColors.InactiveCaptionText; - this.FolderEntry.Location = new System.Drawing.Point (133, 40); + this.FolderEntry.Location = new System.Drawing.Point(133, 40); this.FolderEntry.Name = "FolderEntry"; - this.FolderEntry.Size = new System.Drawing.Size (318, 20); + this.FolderEntry.Size = new System.Drawing.Size(318, 20); this.FolderEntry.TabIndex = 8; - this.FolderEntry.MouseEnter += new System.EventHandler (this.FolderEntry_MouseEnter); + this.FolderEntry.MouseEnter += new System.EventHandler(this.FolderEntry_MouseEnter); // // panel_server_selection // - this.panel_server_selection.Controls.Add (this.groupbox_server_selection); - this.panel_server_selection.Location = new System.Drawing.Point (0, 53); + this.panel_server_selection.Controls.Add(this.groupbox_server_selection); + this.panel_server_selection.Location = new System.Drawing.Point(0, 53); this.panel_server_selection.Name = "panel_server_selection"; - this.panel_server_selection.Size = new System.Drawing.Size (512, 154); + this.panel_server_selection.Size = new System.Drawing.Size(512, 154); this.panel_server_selection.TabIndex = 12; - this.panel_server_selection.MouseLeave += new System.EventHandler (this.panel_server_selection_MouseLeave); + this.panel_server_selection.MouseLeave += new System.EventHandler(this.panel_server_selection_MouseLeave); // // groupbox_server_selection // - this.groupbox_server_selection.Controls.Add (this.ServerEntry); - this.groupbox_server_selection.Controls.Add (this.radio_button_gnome); - this.groupbox_server_selection.Controls.Add (this.radio_button_gitorious); - this.groupbox_server_selection.Controls.Add (this.radio_button_github); - this.groupbox_server_selection.Controls.Add (this.radio_button_own_server); - this.groupbox_server_selection.Location = new System.Drawing.Point (15, 9); + this.groupbox_server_selection.Controls.Add(this.ServerEntry); + this.groupbox_server_selection.Controls.Add(this.radio_button_gnome); + this.groupbox_server_selection.Controls.Add(this.radio_button_gitorious); + this.groupbox_server_selection.Controls.Add(this.radio_button_github); + this.groupbox_server_selection.Controls.Add(this.radio_button_own_server); + this.groupbox_server_selection.Location = new System.Drawing.Point(15, 9); this.groupbox_server_selection.Name = "groupbox_server_selection"; - this.groupbox_server_selection.Size = new System.Drawing.Size (470, 123); + this.groupbox_server_selection.Size = new System.Drawing.Size(470, 123); this.groupbox_server_selection.TabIndex = 11; this.groupbox_server_selection.TabStop = false; this.groupbox_server_selection.Text = "Server selection"; @@ -296,172 +298,172 @@ namespace SparkleShare { // this.ServerEntry.ExampleText = "address-to-server/ip-to-server"; this.ServerEntry.ForeColor = System.Drawing.SystemColors.InactiveCaptionText; - this.ServerEntry.Location = new System.Drawing.Point (139, 21); + this.ServerEntry.Location = new System.Drawing.Point(139, 21); this.ServerEntry.Name = "ServerEntry"; - this.ServerEntry.Size = new System.Drawing.Size (312, 20); + this.ServerEntry.Size = new System.Drawing.Size(312, 20); this.ServerEntry.TabIndex = 10; // // radio_button_gnome // this.radio_button_gnome.AutoSize = true; - this.radio_button_gnome.Location = new System.Drawing.Point (6, 91); + this.radio_button_gnome.Location = new System.Drawing.Point(6, 91); this.radio_button_gnome.Name = "radio_button_gnome"; - this.radio_button_gnome.Size = new System.Drawing.Size (165, 17); + this.radio_button_gnome.Size = new System.Drawing.Size(165, 17); this.radio_button_gnome.TabIndex = 9; this.radio_button_gnome.Text = "The GNOME Project account"; this.radio_button_gnome.UseVisualStyleBackColor = true; - this.radio_button_gnome.MouseEnter += new System.EventHandler (this.radio_button_gnome_MouseEnter); + this.radio_button_gnome.MouseEnter += new System.EventHandler(this.radio_button_gnome_MouseEnter); // // radio_button_gitorious // this.radio_button_gitorious.AutoSize = true; - this.radio_button_gitorious.Location = new System.Drawing.Point (6, 68); + this.radio_button_gitorious.Location = new System.Drawing.Point(6, 68); this.radio_button_gitorious.Name = "radio_button_gitorious"; - this.radio_button_gitorious.Size = new System.Drawing.Size (108, 17); + this.radio_button_gitorious.Size = new System.Drawing.Size(108, 17); this.radio_button_gitorious.TabIndex = 8; this.radio_button_gitorious.Text = "Gitorious account"; this.radio_button_gitorious.UseVisualStyleBackColor = true; - this.radio_button_gitorious.MouseEnter += new System.EventHandler (this.radio_button_gitorious_MouseEnter); + this.radio_button_gitorious.MouseEnter += new System.EventHandler(this.radio_button_gitorious_MouseEnter); // // radio_button_github // this.radio_button_github.AutoSize = true; - this.radio_button_github.Location = new System.Drawing.Point (6, 45); + this.radio_button_github.Location = new System.Drawing.Point(6, 45); this.radio_button_github.Name = "radio_button_github"; - this.radio_button_github.Size = new System.Drawing.Size (98, 17); + this.radio_button_github.Size = new System.Drawing.Size(98, 17); this.radio_button_github.TabIndex = 7; this.radio_button_github.Text = "Github account"; this.radio_button_github.UseVisualStyleBackColor = true; - this.radio_button_github.MouseEnter += new System.EventHandler (this.radio_button_github_MouseEnter); + this.radio_button_github.MouseEnter += new System.EventHandler(this.radio_button_github_MouseEnter); // // radio_button_own_server // this.radio_button_own_server.AutoSize = true; this.radio_button_own_server.Checked = true; - this.radio_button_own_server.Location = new System.Drawing.Point (6, 22); + this.radio_button_own_server.Location = new System.Drawing.Point(6, 22); this.radio_button_own_server.Name = "radio_button_own_server"; - this.radio_button_own_server.Size = new System.Drawing.Size (115, 17); + this.radio_button_own_server.Size = new System.Drawing.Size(115, 17); this.radio_button_own_server.TabIndex = 6; this.radio_button_own_server.TabStop = true; this.radio_button_own_server.Text = "On my own Server:"; this.radio_button_own_server.UseVisualStyleBackColor = true; - this.radio_button_own_server.MouseEnter += new System.EventHandler (this.radio_button_own_server_MouseEnter); + this.radio_button_own_server.MouseEnter += new System.EventHandler(this.radio_button_own_server_MouseEnter); // // buttonSync // - this.buttonSync.Location = new System.Drawing.Point (431, 355); + this.buttonSync.Location = new System.Drawing.Point(431, 355); this.buttonSync.Name = "buttonSync"; - this.buttonSync.Size = new System.Drawing.Size (75, 23); + this.buttonSync.Size = new System.Drawing.Size(75, 23); this.buttonSync.TabIndex = 9; this.buttonSync.Text = "Sync"; this.buttonSync.UseVisualStyleBackColor = true; - this.buttonSync.Click += new System.EventHandler (this.buttonSync_Click); + this.buttonSync.Click += new System.EventHandler(this.buttonSync_Click); // // buttonCancel // - this.buttonCancel.Location = new System.Drawing.Point (350, 355); + this.buttonCancel.Location = new System.Drawing.Point(350, 355); this.buttonCancel.Name = "buttonCancel"; - this.buttonCancel.Size = new System.Drawing.Size (75, 23); + this.buttonCancel.Size = new System.Drawing.Size(75, 23); this.buttonCancel.TabIndex = 8; this.buttonCancel.Text = "Cancel"; this.buttonCancel.UseVisualStyleBackColor = true; - this.buttonCancel.Click += new System.EventHandler (this.buttonCancel_Click); + this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click); // // label4 // this.label4.AutoSize = true; - this.label4.Font = new System.Drawing.Font ("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label4.Location = new System.Drawing.Point (8, 18); + this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label4.Location = new System.Drawing.Point(8, 18); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size (240, 20); + this.label4.Size = new System.Drawing.Size(240, 20); this.label4.TabIndex = 0; this.label4.Text = "Where is your remote folder?"; // // syncingPage // - this.syncingPage.Controls.Add (this.syncingProgressBar); - this.syncingPage.Controls.Add (this.buttonFinish); - this.syncingPage.Controls.Add (this.label7); - this.syncingPage.Controls.Add (this.label6); - this.syncingPage.Location = new System.Drawing.Point (4, 22); + this.syncingPage.Controls.Add(this.syncingProgressBar); + this.syncingPage.Controls.Add(this.buttonFinish); + this.syncingPage.Controls.Add(this.label7); + this.syncingPage.Controls.Add(this.label6); + this.syncingPage.Location = new System.Drawing.Point(4, 22); this.syncingPage.Name = "syncingPage"; - this.syncingPage.Size = new System.Drawing.Size (506, 370); + this.syncingPage.Size = new System.Drawing.Size(506, 370); this.syncingPage.TabIndex = 2; this.syncingPage.Text = "Syncing"; this.syncingPage.UseVisualStyleBackColor = true; // // syncingProgressBar // - this.syncingProgressBar.Location = new System.Drawing.Point (14, 109); + this.syncingProgressBar.Location = new System.Drawing.Point(14, 109); this.syncingProgressBar.Name = "syncingProgressBar"; - this.syncingProgressBar.Size = new System.Drawing.Size (492, 23); + this.syncingProgressBar.Size = new System.Drawing.Size(492, 23); this.syncingProgressBar.TabIndex = 3; // // buttonFinish // this.buttonFinish.Enabled = false; - this.buttonFinish.Location = new System.Drawing.Point (431, 350); + this.buttonFinish.Location = new System.Drawing.Point(431, 350); this.buttonFinish.Name = "buttonFinish"; - this.buttonFinish.Size = new System.Drawing.Size (75, 23); + this.buttonFinish.Size = new System.Drawing.Size(75, 23); this.buttonFinish.TabIndex = 2; this.buttonFinish.Text = "Finish"; this.buttonFinish.UseVisualStyleBackColor = true; - this.buttonFinish.Click += new System.EventHandler (this.buttonFinish_Click); + this.buttonFinish.Click += new System.EventHandler(this.buttonFinish_Click); // // label7 // - this.label7.Location = new System.Drawing.Point (11, 44); + this.label7.Location = new System.Drawing.Point(11, 44); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size (307, 62); + this.label7.Size = new System.Drawing.Size(307, 62); this.label7.TabIndex = 1; this.label7.Text = "This may take a while.\r\nAre you sure it’s not coffee o\'clock?\r\n"; // // label6 // this.label6.AutoSize = true; - this.label6.Font = new System.Drawing.Font ("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold); - this.label6.Location = new System.Drawing.Point (8, 18); + this.label6.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold); + this.label6.Location = new System.Drawing.Point(8, 18); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size (123, 20); + this.label6.Size = new System.Drawing.Size(123, 20); this.label6.TabIndex = 0; this.label6.Text = "Syncing folder"; // // errorPage // - this.errorPage.Controls.Add (this.buttonTryAgain); - this.errorPage.Controls.Add (this.label3); - this.errorPage.Controls.Add (this.label2); - this.errorPage.Controls.Add (this.label1); - this.errorPage.Location = new System.Drawing.Point (4, 22); + this.errorPage.Controls.Add(this.buttonTryAgain); + this.errorPage.Controls.Add(this.label3); + this.errorPage.Controls.Add(this.label2); + this.errorPage.Controls.Add(this.label1); + this.errorPage.Location = new System.Drawing.Point(4, 22); this.errorPage.Name = "errorPage"; - this.errorPage.Size = new System.Drawing.Size (506, 370); + this.errorPage.Size = new System.Drawing.Size(506, 370); this.errorPage.TabIndex = 3; this.errorPage.Text = "Error"; this.errorPage.UseVisualStyleBackColor = true; // // buttonTryAgain // - this.buttonTryAgain.Location = new System.Drawing.Point (431, 350); + this.buttonTryAgain.Location = new System.Drawing.Point(431, 350); this.buttonTryAgain.Name = "buttonTryAgain"; - this.buttonTryAgain.Size = new System.Drawing.Size (75, 23); + this.buttonTryAgain.Size = new System.Drawing.Size(75, 23); this.buttonTryAgain.TabIndex = 3; this.buttonTryAgain.Text = "Try Again"; this.buttonTryAgain.UseVisualStyleBackColor = true; - this.buttonTryAgain.Click += new System.EventHandler (this.buttonTryAgain_Click); + this.buttonTryAgain.Click += new System.EventHandler(this.buttonTryAgain_Click); // // label3 // - this.label3.Location = new System.Drawing.Point (11, 106); + this.label3.Location = new System.Drawing.Point(11, 106); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size (307, 129); + this.label3.Size = new System.Drawing.Size(307, 129); this.label3.TabIndex = 2; - this.label3.Text = resources.GetString ("label3.Text"); + this.label3.Text = resources.GetString("label3.Text"); // // label2 // - this.label2.Location = new System.Drawing.Point (11, 44); + this.label2.Location = new System.Drawing.Point(11, 44); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size (307, 62); + this.label2.Size = new System.Drawing.Size(307, 62); this.label2.TabIndex = 1; this.label2.Text = "We don\'t know exactly what the problem is, but we can try to help you pinpoint it" + "."; @@ -469,96 +471,96 @@ namespace SparkleShare { // label1 // this.label1.AutoSize = true; - this.label1.Font = new System.Drawing.Font ("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold); - this.label1.Location = new System.Drawing.Point (8, 18); + this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold); + this.label1.Location = new System.Drawing.Point(8, 18); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size (191, 20); + this.label1.Size = new System.Drawing.Size(191, 20); this.label1.TabIndex = 0; this.label1.Text = "Something went wrong"; // // finishedPage // - this.finishedPage.Controls.Add (this.label9); - this.finishedPage.Controls.Add (this.label8); - this.finishedPage.Controls.Add (this.buttonFinished); - this.finishedPage.Controls.Add (this.buttonOpenFolder); - this.finishedPage.Location = new System.Drawing.Point (4, 22); + this.finishedPage.Controls.Add(this.label9); + this.finishedPage.Controls.Add(this.label8); + this.finishedPage.Controls.Add(this.buttonFinished); + this.finishedPage.Controls.Add(this.buttonOpenFolder); + this.finishedPage.Location = new System.Drawing.Point(4, 22); this.finishedPage.Name = "finishedPage"; - this.finishedPage.Size = new System.Drawing.Size (506, 370); + this.finishedPage.Size = new System.Drawing.Size(506, 370); this.finishedPage.TabIndex = 4; this.finishedPage.Text = "Finished"; this.finishedPage.UseVisualStyleBackColor = true; // // label9 // - this.label9.Location = new System.Drawing.Point (11, 44); + this.label9.Location = new System.Drawing.Point(11, 44); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size (307, 62); + this.label9.Size = new System.Drawing.Size(307, 62); this.label9.TabIndex = 3; this.label9.Text = "Access the synced files from your SparkleShare folder."; // // label8 // this.label8.AutoSize = true; - this.label8.Font = new System.Drawing.Font ("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold); - this.label8.Location = new System.Drawing.Point (8, 18); + this.label8.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold); + this.label8.Location = new System.Drawing.Point(8, 18); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size (228, 20); + this.label8.Size = new System.Drawing.Size(228, 20); this.label8.TabIndex = 2; this.label8.Text = "Folder synced successfully!"; // // buttonFinished // - this.buttonFinished.Location = new System.Drawing.Point (431, 350); + this.buttonFinished.Location = new System.Drawing.Point(431, 350); this.buttonFinished.Name = "buttonFinished"; - this.buttonFinished.Size = new System.Drawing.Size (75, 23); + this.buttonFinished.Size = new System.Drawing.Size(75, 23); this.buttonFinished.TabIndex = 1; this.buttonFinished.Text = "Finish"; this.buttonFinished.UseVisualStyleBackColor = true; - this.buttonFinished.Click += new System.EventHandler (this.buttonFinished_Click); + this.buttonFinished.Click += new System.EventHandler(this.buttonFinished_Click); // // buttonOpenFolder // - this.buttonOpenFolder.Location = new System.Drawing.Point (350, 350); + this.buttonOpenFolder.Location = new System.Drawing.Point(350, 350); this.buttonOpenFolder.Name = "buttonOpenFolder"; - this.buttonOpenFolder.Size = new System.Drawing.Size (75, 23); + this.buttonOpenFolder.Size = new System.Drawing.Size(75, 23); this.buttonOpenFolder.TabIndex = 0; this.buttonOpenFolder.Text = "Open Folder"; this.buttonOpenFolder.UseVisualStyleBackColor = true; - this.buttonOpenFolder.Click += new System.EventHandler (this.buttonOpenFolder_Click); + this.buttonOpenFolder.Click += new System.EventHandler(this.buttonOpenFolder_Click); // // SparkleSetup // - this.ClientSize = new System.Drawing.Size (664, 396); - this.Controls.Add (this.panel_info); - this.Controls.Add (this.tabControl); - this.Controls.Add (this.pictureBox); + this.ClientSize = new System.Drawing.Size(664, 396); + this.Controls.Add(this.panel_info); + this.Controls.Add(this.tabControl); + this.Controls.Add(this.pictureBox); this.Name = "SparkleSetup"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "SparkleShare Setup"; - this.FormClosing += new System.Windows.Forms.FormClosingEventHandler (this.SparkleSetup_FormClosing); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit (); - this.panel_info.ResumeLayout (false); - this.tabControl.ResumeLayout (false); - this.setupPage.ResumeLayout (false); - this.setupPage.PerformLayout (); - this.groupBox1.ResumeLayout (false); - this.groupBox1.PerformLayout (); - this.addPage.ResumeLayout (false); - this.addPage.PerformLayout (); - this.panel_folder_selection.ResumeLayout (false); - this.groupbox_folder_selection.ResumeLayout (false); - this.groupbox_folder_selection.PerformLayout (); - this.panel_server_selection.ResumeLayout (false); - this.groupbox_server_selection.ResumeLayout (false); - this.groupbox_server_selection.PerformLayout (); - this.syncingPage.ResumeLayout (false); - this.syncingPage.PerformLayout (); - this.errorPage.ResumeLayout (false); - this.errorPage.PerformLayout (); - this.finishedPage.ResumeLayout (false); - this.finishedPage.PerformLayout (); - this.ResumeLayout (false); + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.SparkleSetup_FormClosing); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit(); + this.panel_info.ResumeLayout(false); + this.tabControl.ResumeLayout(false); + this.setupPage.ResumeLayout(false); + this.setupPage.PerformLayout(); + this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); + this.addPage.ResumeLayout(false); + this.addPage.PerformLayout(); + this.panel_folder_selection.ResumeLayout(false); + this.groupbox_folder_selection.ResumeLayout(false); + this.groupbox_folder_selection.PerformLayout(); + this.panel_server_selection.ResumeLayout(false); + this.groupbox_server_selection.ResumeLayout(false); + this.groupbox_server_selection.PerformLayout(); + this.syncingPage.ResumeLayout(false); + this.syncingPage.PerformLayout(); + this.errorPage.ResumeLayout(false); + this.errorPage.PerformLayout(); + this.finishedPage.ResumeLayout(false); + this.finishedPage.PerformLayout(); + this.ResumeLayout(false); } diff --git a/SparkleShare/Windows/SparkleSetup.cs b/SparkleShare/Windows/SparkleSetup.cs index 34f6c33c..dd0fbbc6 100644 --- a/SparkleShare/Windows/SparkleSetup.cs +++ b/SparkleShare/Windows/SparkleSetup.cs @@ -178,53 +178,52 @@ namespace SparkleShare { // entries filled in by the user if (!String.IsNullOrEmpty(NameEntry.Text) && Program.Controller.IsValidEmail (EmailEntry.Text)) { - buttonNext.Enabled = true; } else { buttonNext.Enabled = false; } } - private void showInfo (string text) { + private void ShowInfo (string text) { pictureBox.Visible = false; panel_info.Visible = true; label_info.Text = text; } - private void hideInfo () { + private void HideInfo () { pictureBox.Visible = true; panel_info.Visible = false; } private void radio_button_own_server_MouseEnter (object sender, EventArgs e) { - showInfo ("To use your own server you need to ..."); + ShowInfo ("To use your own server you need to ..."); } private void radio_button_github_MouseEnter (object sender, EventArgs e) { - showInfo (_("Free hosting for Free and Open Source Software projects.") + + ShowInfo (_("Free hosting for Free and Open Source Software projects.") + _("Also has paid accounts for extra private space and bandwidth.")); } private void radio_button_gitorious_MouseEnter (object sender, EventArgs e) { - showInfo (_("Completely Free as in Freedom infrastructure.") + + ShowInfo (_("Completely Free as in Freedom infrastructure.") + _("Free accounts for Free and Open Source projects.")); } private void radio_button_gnome_MouseEnter (object sender, EventArgs e) { - showInfo (_("GNOME is an easy to understand interface to your computer.") + + ShowInfo (_("GNOME is an easy to understand interface to your computer.") + _("Select this option if you're a developer or designer working on GNOME.")); } private void panel_server_selection_MouseLeave (object sender, EventArgs e) { - hideInfo (); + HideInfo (); } private void FolderEntry_MouseEnter (object sender, EventArgs e) { - showInfo ("This is the path to your git project ..."); + ShowInfo ("This is the path to your git project ..."); } private void panel_folder_selection_MouseLeave (object sender, EventArgs e) { - hideInfo (); + HideInfo (); } } }