- Add new project files
- Chnage Windows views to keep them in sync with controllers
This commit is contained in:
serras
parent
87ef4ed013
commit
a1c05e9ec5
|
|
@ -86,6 +86,9 @@
|
||||||
<Compile Include="..\SparkleRepoBase.cs">
|
<Compile Include="..\SparkleRepoBase.cs">
|
||||||
<Link>SparkleRepoBase.cs</Link>
|
<Link>SparkleRepoBase.cs</Link>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
<Compile Include="..\SparkleUser.cs">
|
||||||
|
<Link>SparkleUser.cs</Link>
|
||||||
|
</Compile>
|
||||||
<Compile Include="..\SparkleWatcher.cs">
|
<Compile Include="..\SparkleWatcher.cs">
|
||||||
<Link>SparkleWatcher.cs</Link>
|
<Link>SparkleWatcher.cs</Link>
|
||||||
<SubType>Component</SubType>
|
<SubType>Component</SubType>
|
||||||
|
|
|
||||||
|
|
@ -125,14 +125,12 @@ namespace SparkleShare {
|
||||||
|
|
||||||
// Creates a .desktop entry in autostart folder to
|
// Creates a .desktop entry in autostart folder to
|
||||||
// start SparkleShare automatically at login
|
// start SparkleShare automatically at login
|
||||||
public override void EnableSystemAutostart ()
|
public override void CreateStartupItem ()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Installs a launcher so the user can launch SparkleShare
|
public override void InstallProtocolHandler()
|
||||||
// from the Internet category if needed
|
|
||||||
public override void InstallLauncher ()
|
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -144,9 +144,16 @@ namespace SparkleShare {
|
||||||
|
|
||||||
private void AddHTML ()
|
private void AddHTML ()
|
||||||
{
|
{
|
||||||
Invoke ((Action)delegate {
|
try
|
||||||
_browserControl.Reload ();
|
{
|
||||||
});
|
Invoke((Action)delegate
|
||||||
|
{
|
||||||
|
_browserControl.Reload();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
catch (InvalidOperationException e)
|
||||||
|
{
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void SparkleEventLog_FormClosing (object sender, FormClosingEventArgs e)
|
private void SparkleEventLog_FormClosing (object sender, FormClosingEventArgs e)
|
||||||
|
|
|
||||||
232
SparkleShare/Windows/SparkleSetup.Designer.cs
generated
232
SparkleShare/Windows/SparkleSetup.Designer.cs
generated
|
|
@ -48,8 +48,10 @@ namespace SparkleShare {
|
||||||
this.buttonCancel = new System.Windows.Forms.Button();
|
this.buttonCancel = new System.Windows.Forms.Button();
|
||||||
this.syncingPage = new System.Windows.Forms.TabPage();
|
this.syncingPage = new System.Windows.Forms.TabPage();
|
||||||
this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
|
this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
|
||||||
|
this.flowLayoutPanel4 = new System.Windows.Forms.FlowLayoutPanel();
|
||||||
|
this.syncFinishButton = new System.Windows.Forms.Button();
|
||||||
|
this.syncCancelButton = new System.Windows.Forms.Button();
|
||||||
this.label6 = new System.Windows.Forms.Label();
|
this.label6 = new System.Windows.Forms.Label();
|
||||||
this.buttonFinish = new System.Windows.Forms.Button();
|
|
||||||
this.syncingProgressBar = new System.Windows.Forms.ProgressBar();
|
this.syncingProgressBar = new System.Windows.Forms.ProgressBar();
|
||||||
this.label16 = new System.Windows.Forms.Label();
|
this.label16 = new System.Windows.Forms.Label();
|
||||||
this.label15 = new System.Windows.Forms.Label();
|
this.label15 = new System.Windows.Forms.Label();
|
||||||
|
|
@ -66,6 +68,17 @@ namespace SparkleShare {
|
||||||
this.buttonFinished = new System.Windows.Forms.Button();
|
this.buttonFinished = new System.Windows.Forms.Button();
|
||||||
this.label9 = new System.Windows.Forms.Label();
|
this.label9 = new System.Windows.Forms.Label();
|
||||||
this.label8 = new System.Windows.Forms.Label();
|
this.label8 = new System.Windows.Forms.Label();
|
||||||
|
this.invitePage = new System.Windows.Forms.TabPage();
|
||||||
|
this.tableLayoutPanel6 = new System.Windows.Forms.TableLayoutPanel();
|
||||||
|
this.flowLayoutPanel3 = new System.Windows.Forms.FlowLayoutPanel();
|
||||||
|
this.InviteAddButton = new System.Windows.Forms.Button();
|
||||||
|
this.InviteCancelButton = new System.Windows.Forms.Button();
|
||||||
|
this.InviteFolderEntry = new System.Windows.Forms.TextBox();
|
||||||
|
this.InviteAddressEntry = new System.Windows.Forms.TextBox();
|
||||||
|
this.label19 = new System.Windows.Forms.Label();
|
||||||
|
this.label18 = new System.Windows.Forms.Label();
|
||||||
|
this.label17 = new System.Windows.Forms.Label();
|
||||||
|
this.label7 = new System.Windows.Forms.Label();
|
||||||
((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
|
((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
|
||||||
this.tabControl.SuspendLayout();
|
this.tabControl.SuspendLayout();
|
||||||
this.setupPage.SuspendLayout();
|
this.setupPage.SuspendLayout();
|
||||||
|
|
@ -75,11 +88,15 @@ namespace SparkleShare {
|
||||||
this.flowLayoutPanel1.SuspendLayout();
|
this.flowLayoutPanel1.SuspendLayout();
|
||||||
this.syncingPage.SuspendLayout();
|
this.syncingPage.SuspendLayout();
|
||||||
this.tableLayoutPanel3.SuspendLayout();
|
this.tableLayoutPanel3.SuspendLayout();
|
||||||
|
this.flowLayoutPanel4.SuspendLayout();
|
||||||
this.errorPage.SuspendLayout();
|
this.errorPage.SuspendLayout();
|
||||||
this.tableLayoutPanel4.SuspendLayout();
|
this.tableLayoutPanel4.SuspendLayout();
|
||||||
this.finishedPage.SuspendLayout();
|
this.finishedPage.SuspendLayout();
|
||||||
this.tableLayoutPanel5.SuspendLayout();
|
this.tableLayoutPanel5.SuspendLayout();
|
||||||
this.flowLayoutPanel2.SuspendLayout();
|
this.flowLayoutPanel2.SuspendLayout();
|
||||||
|
this.invitePage.SuspendLayout();
|
||||||
|
this.tableLayoutPanel6.SuspendLayout();
|
||||||
|
this.flowLayoutPanel3.SuspendLayout();
|
||||||
this.SuspendLayout();
|
this.SuspendLayout();
|
||||||
//
|
//
|
||||||
// pictureBox
|
// pictureBox
|
||||||
|
|
@ -98,6 +115,7 @@ namespace SparkleShare {
|
||||||
this.tabControl.Controls.Add(this.syncingPage);
|
this.tabControl.Controls.Add(this.syncingPage);
|
||||||
this.tabControl.Controls.Add(this.errorPage);
|
this.tabControl.Controls.Add(this.errorPage);
|
||||||
this.tabControl.Controls.Add(this.finishedPage);
|
this.tabControl.Controls.Add(this.finishedPage);
|
||||||
|
this.tabControl.Controls.Add(this.invitePage);
|
||||||
this.tabControl.Dock = System.Windows.Forms.DockStyle.Right;
|
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.Name = "tabControl";
|
||||||
|
|
@ -161,9 +179,9 @@ namespace SparkleShare {
|
||||||
this.buttonNext.Name = "buttonNext";
|
this.buttonNext.Name = "buttonNext";
|
||||||
this.buttonNext.Size = new System.Drawing.Size(75, 25);
|
this.buttonNext.Size = new System.Drawing.Size(75, 25);
|
||||||
this.buttonNext.TabIndex = 3;
|
this.buttonNext.TabIndex = 3;
|
||||||
this.buttonNext.Text = "Next";
|
this.buttonNext.Text = "Continue";
|
||||||
this.buttonNext.UseVisualStyleBackColor = true;
|
this.buttonNext.UseVisualStyleBackColor = true;
|
||||||
this.buttonNext.Click += new System.EventHandler(this.buttonNext_Click);
|
this.buttonNext.Click += new System.EventHandler(this.SetupNextClicked);
|
||||||
//
|
//
|
||||||
// NameEntry
|
// NameEntry
|
||||||
//
|
//
|
||||||
|
|
@ -206,8 +224,8 @@ namespace SparkleShare {
|
||||||
this.label11.Name = "label11";
|
this.label11.Name = "label11";
|
||||||
this.label11.Size = new System.Drawing.Size(484, 30);
|
this.label11.Size = new System.Drawing.Size(484, 30);
|
||||||
this.label11.TabIndex = 2;
|
this.label11.TabIndex = 2;
|
||||||
this.label11.Text = "Before we can create a SparkleShare folder on this computer, we need a few bits o" +
|
this.label11.Text = "Before we get started, what\'s your name and email?\r\nDon\'t worry, this information" +
|
||||||
"f information from you.";
|
" is only visible to your team members.";
|
||||||
//
|
//
|
||||||
// label12
|
// label12
|
||||||
//
|
//
|
||||||
|
|
@ -343,7 +361,7 @@ namespace SparkleShare {
|
||||||
this.buttonSync.TabIndex = 9;
|
this.buttonSync.TabIndex = 9;
|
||||||
this.buttonSync.Text = "Add";
|
this.buttonSync.Text = "Add";
|
||||||
this.buttonSync.UseVisualStyleBackColor = true;
|
this.buttonSync.UseVisualStyleBackColor = true;
|
||||||
this.buttonSync.Click += new System.EventHandler(this.buttonSync_Click);
|
this.buttonSync.Click += new System.EventHandler(this.AddButtonClicked);
|
||||||
//
|
//
|
||||||
// buttonCancel
|
// buttonCancel
|
||||||
//
|
//
|
||||||
|
|
@ -354,7 +372,7 @@ namespace SparkleShare {
|
||||||
this.buttonCancel.TabIndex = 8;
|
this.buttonCancel.TabIndex = 8;
|
||||||
this.buttonCancel.Text = "Cancel";
|
this.buttonCancel.Text = "Cancel";
|
||||||
this.buttonCancel.UseVisualStyleBackColor = true;
|
this.buttonCancel.UseVisualStyleBackColor = true;
|
||||||
this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
|
this.buttonCancel.Click += new System.EventHandler(this.CancelButtonClicked);
|
||||||
//
|
//
|
||||||
// syncingPage
|
// syncingPage
|
||||||
//
|
//
|
||||||
|
|
@ -370,8 +388,8 @@ namespace SparkleShare {
|
||||||
//
|
//
|
||||||
this.tableLayoutPanel3.ColumnCount = 1;
|
this.tableLayoutPanel3.ColumnCount = 1;
|
||||||
this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
|
this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
|
||||||
|
this.tableLayoutPanel3.Controls.Add(this.flowLayoutPanel4, 0, 6);
|
||||||
this.tableLayoutPanel3.Controls.Add(this.label6, 0, 0);
|
this.tableLayoutPanel3.Controls.Add(this.label6, 0, 0);
|
||||||
this.tableLayoutPanel3.Controls.Add(this.buttonFinish, 0, 6);
|
|
||||||
this.tableLayoutPanel3.Controls.Add(this.syncingProgressBar, 0, 4);
|
this.tableLayoutPanel3.Controls.Add(this.syncingProgressBar, 0, 4);
|
||||||
this.tableLayoutPanel3.Controls.Add(this.label16, 0, 2);
|
this.tableLayoutPanel3.Controls.Add(this.label16, 0, 2);
|
||||||
this.tableLayoutPanel3.Controls.Add(this.label15, 0, 1);
|
this.tableLayoutPanel3.Controls.Add(this.label15, 0, 1);
|
||||||
|
|
@ -390,6 +408,38 @@ namespace SparkleShare {
|
||||||
this.tableLayoutPanel3.Size = new System.Drawing.Size(506, 370);
|
this.tableLayoutPanel3.Size = new System.Drawing.Size(506, 370);
|
||||||
this.tableLayoutPanel3.TabIndex = 6;
|
this.tableLayoutPanel3.TabIndex = 6;
|
||||||
//
|
//
|
||||||
|
// flowLayoutPanel4
|
||||||
|
//
|
||||||
|
this.flowLayoutPanel4.Controls.Add(this.syncFinishButton);
|
||||||
|
this.flowLayoutPanel4.Controls.Add(this.syncCancelButton);
|
||||||
|
this.flowLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Right;
|
||||||
|
this.flowLayoutPanel4.Location = new System.Drawing.Point(334, 330);
|
||||||
|
this.flowLayoutPanel4.Margin = new System.Windows.Forms.Padding(0);
|
||||||
|
this.flowLayoutPanel4.Name = "flowLayoutPanel4";
|
||||||
|
this.flowLayoutPanel4.Size = new System.Drawing.Size(162, 30);
|
||||||
|
this.flowLayoutPanel4.TabIndex = 19;
|
||||||
|
//
|
||||||
|
// syncFinishButton
|
||||||
|
//
|
||||||
|
this.syncFinishButton.Enabled = false;
|
||||||
|
this.syncFinishButton.Location = new System.Drawing.Point(3, 3);
|
||||||
|
this.syncFinishButton.Name = "syncFinishButton";
|
||||||
|
this.syncFinishButton.Size = new System.Drawing.Size(75, 25);
|
||||||
|
this.syncFinishButton.TabIndex = 9;
|
||||||
|
this.syncFinishButton.Text = "Finish";
|
||||||
|
this.syncFinishButton.UseVisualStyleBackColor = true;
|
||||||
|
//
|
||||||
|
// syncCancelButton
|
||||||
|
//
|
||||||
|
this.syncCancelButton.Dock = System.Windows.Forms.DockStyle.Right;
|
||||||
|
this.syncCancelButton.Location = new System.Drawing.Point(84, 3);
|
||||||
|
this.syncCancelButton.Name = "syncCancelButton";
|
||||||
|
this.syncCancelButton.Size = new System.Drawing.Size(75, 25);
|
||||||
|
this.syncCancelButton.TabIndex = 8;
|
||||||
|
this.syncCancelButton.Text = "Cancel";
|
||||||
|
this.syncCancelButton.UseVisualStyleBackColor = true;
|
||||||
|
this.syncCancelButton.Click += new System.EventHandler(this.syncCancelClicked);
|
||||||
|
//
|
||||||
// label6
|
// label6
|
||||||
//
|
//
|
||||||
this.label6.AutoSize = true;
|
this.label6.AutoSize = true;
|
||||||
|
|
@ -401,18 +451,6 @@ namespace SparkleShare {
|
||||||
this.label6.TabIndex = 0;
|
this.label6.TabIndex = 0;
|
||||||
this.label6.Text = "Syncing…";
|
this.label6.Text = "Syncing…";
|
||||||
//
|
//
|
||||||
// buttonFinish
|
|
||||||
//
|
|
||||||
this.buttonFinish.Dock = System.Windows.Forms.DockStyle.Right;
|
|
||||||
this.buttonFinish.Enabled = false;
|
|
||||||
this.buttonFinish.Location = new System.Drawing.Point(418, 333);
|
|
||||||
this.buttonFinish.Name = "buttonFinish";
|
|
||||||
this.buttonFinish.Size = new System.Drawing.Size(75, 24);
|
|
||||||
this.buttonFinish.TabIndex = 2;
|
|
||||||
this.buttonFinish.Text = "Finish";
|
|
||||||
this.buttonFinish.UseVisualStyleBackColor = true;
|
|
||||||
this.buttonFinish.Click += new System.EventHandler(this.buttonFinish_Click);
|
|
||||||
//
|
|
||||||
// syncingProgressBar
|
// syncingProgressBar
|
||||||
//
|
//
|
||||||
this.syncingProgressBar.Location = new System.Drawing.Point(13, 115);
|
this.syncingProgressBar.Location = new System.Drawing.Point(13, 115);
|
||||||
|
|
@ -592,6 +630,140 @@ namespace SparkleShare {
|
||||||
this.label8.TabIndex = 2;
|
this.label8.TabIndex = 2;
|
||||||
this.label8.Text = "Project successfully added!";
|
this.label8.Text = "Project successfully added!";
|
||||||
//
|
//
|
||||||
|
// invitePage
|
||||||
|
//
|
||||||
|
this.invitePage.Controls.Add(this.tableLayoutPanel6);
|
||||||
|
this.invitePage.Location = new System.Drawing.Point(4, 22);
|
||||||
|
this.invitePage.Name = "invitePage";
|
||||||
|
this.invitePage.Padding = new System.Windows.Forms.Padding(3);
|
||||||
|
this.invitePage.Size = new System.Drawing.Size(506, 370);
|
||||||
|
this.invitePage.TabIndex = 5;
|
||||||
|
this.invitePage.Text = "Invite";
|
||||||
|
this.invitePage.UseVisualStyleBackColor = true;
|
||||||
|
//
|
||||||
|
// tableLayoutPanel6
|
||||||
|
//
|
||||||
|
this.tableLayoutPanel6.ColumnCount = 2;
|
||||||
|
this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
|
||||||
|
this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
|
||||||
|
this.tableLayoutPanel6.Controls.Add(this.flowLayoutPanel3, 1, 6);
|
||||||
|
this.tableLayoutPanel6.Controls.Add(this.InviteFolderEntry, 1, 4);
|
||||||
|
this.tableLayoutPanel6.Controls.Add(this.InviteAddressEntry, 1, 3);
|
||||||
|
this.tableLayoutPanel6.Controls.Add(this.label19, 0, 4);
|
||||||
|
this.tableLayoutPanel6.Controls.Add(this.label18, 0, 3);
|
||||||
|
this.tableLayoutPanel6.Controls.Add(this.label17, 0, 1);
|
||||||
|
this.tableLayoutPanel6.Controls.Add(this.label7, 0, 0);
|
||||||
|
this.tableLayoutPanel6.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||||
|
this.tableLayoutPanel6.Location = new System.Drawing.Point(3, 3);
|
||||||
|
this.tableLayoutPanel6.Name = "tableLayoutPanel6";
|
||||||
|
this.tableLayoutPanel6.RowCount = 7;
|
||||||
|
this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F));
|
||||||
|
this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
|
||||||
|
this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 30F));
|
||||||
|
this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F));
|
||||||
|
this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F));
|
||||||
|
this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 70F));
|
||||||
|
this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 32F));
|
||||||
|
this.tableLayoutPanel6.Size = new System.Drawing.Size(500, 364);
|
||||||
|
this.tableLayoutPanel6.TabIndex = 0;
|
||||||
|
//
|
||||||
|
// flowLayoutPanel3
|
||||||
|
//
|
||||||
|
this.flowLayoutPanel3.Controls.Add(this.InviteAddButton);
|
||||||
|
this.flowLayoutPanel3.Controls.Add(this.InviteCancelButton);
|
||||||
|
this.flowLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Right;
|
||||||
|
this.flowLayoutPanel3.Location = new System.Drawing.Point(338, 331);
|
||||||
|
this.flowLayoutPanel3.Margin = new System.Windows.Forms.Padding(0);
|
||||||
|
this.flowLayoutPanel3.Name = "flowLayoutPanel3";
|
||||||
|
this.flowLayoutPanel3.Size = new System.Drawing.Size(162, 33);
|
||||||
|
this.flowLayoutPanel3.TabIndex = 19;
|
||||||
|
//
|
||||||
|
// InviteAddButton
|
||||||
|
//
|
||||||
|
this.InviteAddButton.Enabled = false;
|
||||||
|
this.InviteAddButton.Location = new System.Drawing.Point(3, 3);
|
||||||
|
this.InviteAddButton.Name = "InviteAddButton";
|
||||||
|
this.InviteAddButton.Size = new System.Drawing.Size(75, 25);
|
||||||
|
this.InviteAddButton.TabIndex = 9;
|
||||||
|
this.InviteAddButton.Text = "Add";
|
||||||
|
this.InviteAddButton.UseVisualStyleBackColor = true;
|
||||||
|
this.InviteAddButton.Click += new System.EventHandler(this.InviteAddButtonClicked);
|
||||||
|
//
|
||||||
|
// InviteCancelButton
|
||||||
|
//
|
||||||
|
this.InviteCancelButton.Dock = System.Windows.Forms.DockStyle.Right;
|
||||||
|
this.InviteCancelButton.Location = new System.Drawing.Point(84, 3);
|
||||||
|
this.InviteCancelButton.Name = "InviteCancelButton";
|
||||||
|
this.InviteCancelButton.Size = new System.Drawing.Size(75, 25);
|
||||||
|
this.InviteCancelButton.TabIndex = 8;
|
||||||
|
this.InviteCancelButton.Text = "Cancel";
|
||||||
|
this.InviteCancelButton.UseVisualStyleBackColor = true;
|
||||||
|
this.InviteCancelButton.Click += new System.EventHandler(this.InviteCancelButtonClicked);
|
||||||
|
//
|
||||||
|
// InviteFolderEntry
|
||||||
|
//
|
||||||
|
this.InviteFolderEntry.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||||
|
this.InviteFolderEntry.Location = new System.Drawing.Point(93, 144);
|
||||||
|
this.InviteFolderEntry.Name = "InviteFolderEntry";
|
||||||
|
this.InviteFolderEntry.ReadOnly = true;
|
||||||
|
this.InviteFolderEntry.Size = new System.Drawing.Size(404, 20);
|
||||||
|
this.InviteFolderEntry.TabIndex = 11;
|
||||||
|
//
|
||||||
|
// InviteAddressEntry
|
||||||
|
//
|
||||||
|
this.InviteAddressEntry.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||||
|
this.InviteAddressEntry.Location = new System.Drawing.Point(93, 119);
|
||||||
|
this.InviteAddressEntry.Name = "InviteAddressEntry";
|
||||||
|
this.InviteAddressEntry.ReadOnly = true;
|
||||||
|
this.InviteAddressEntry.Size = new System.Drawing.Size(404, 20);
|
||||||
|
this.InviteAddressEntry.TabIndex = 10;
|
||||||
|
//
|
||||||
|
// label19
|
||||||
|
//
|
||||||
|
this.label19.AutoSize = true;
|
||||||
|
this.label19.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||||
|
this.label19.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||||
|
this.label19.Location = new System.Drawing.Point(3, 141);
|
||||||
|
this.label19.Name = "label19";
|
||||||
|
this.label19.Size = new System.Drawing.Size(84, 25);
|
||||||
|
this.label19.TabIndex = 9;
|
||||||
|
this.label19.Text = "Remote Path:";
|
||||||
|
this.label19.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
|
||||||
|
//
|
||||||
|
// label18
|
||||||
|
//
|
||||||
|
this.label18.AutoSize = true;
|
||||||
|
this.label18.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||||
|
this.label18.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||||
|
this.label18.Location = new System.Drawing.Point(3, 116);
|
||||||
|
this.label18.Name = "label18";
|
||||||
|
this.label18.Size = new System.Drawing.Size(84, 25);
|
||||||
|
this.label18.TabIndex = 8;
|
||||||
|
this.label18.Text = "Address:";
|
||||||
|
this.label18.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
|
||||||
|
//
|
||||||
|
// label17
|
||||||
|
//
|
||||||
|
this.tableLayoutPanel6.SetColumnSpan(this.label17, 2);
|
||||||
|
this.label17.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||||
|
this.label17.Location = new System.Drawing.Point(3, 25);
|
||||||
|
this.label17.Name = "label17";
|
||||||
|
this.label17.Size = new System.Drawing.Size(494, 20);
|
||||||
|
this.label17.TabIndex = 3;
|
||||||
|
this.label17.Text = "Do you want to add this project to SparkleShare?";
|
||||||
|
//
|
||||||
|
// label7
|
||||||
|
//
|
||||||
|
this.label7.AutoSize = true;
|
||||||
|
this.tableLayoutPanel6.SetColumnSpan(this.label7, 2);
|
||||||
|
this.label7.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||||
|
this.label7.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||||
|
this.label7.Location = new System.Drawing.Point(3, 0);
|
||||||
|
this.label7.Name = "label7";
|
||||||
|
this.label7.Size = new System.Drawing.Size(494, 25);
|
||||||
|
this.label7.TabIndex = 2;
|
||||||
|
this.label7.Text = "You\'ve received an invite!";
|
||||||
|
//
|
||||||
// SparkleSetup
|
// SparkleSetup
|
||||||
//
|
//
|
||||||
this.ClientSize = new System.Drawing.Size(664, 396);
|
this.ClientSize = new System.Drawing.Size(664, 396);
|
||||||
|
|
@ -615,6 +787,7 @@ namespace SparkleShare {
|
||||||
this.syncingPage.ResumeLayout(false);
|
this.syncingPage.ResumeLayout(false);
|
||||||
this.tableLayoutPanel3.ResumeLayout(false);
|
this.tableLayoutPanel3.ResumeLayout(false);
|
||||||
this.tableLayoutPanel3.PerformLayout();
|
this.tableLayoutPanel3.PerformLayout();
|
||||||
|
this.flowLayoutPanel4.ResumeLayout(false);
|
||||||
this.errorPage.ResumeLayout(false);
|
this.errorPage.ResumeLayout(false);
|
||||||
this.tableLayoutPanel4.ResumeLayout(false);
|
this.tableLayoutPanel4.ResumeLayout(false);
|
||||||
this.tableLayoutPanel4.PerformLayout();
|
this.tableLayoutPanel4.PerformLayout();
|
||||||
|
|
@ -622,6 +795,10 @@ namespace SparkleShare {
|
||||||
this.tableLayoutPanel5.ResumeLayout(false);
|
this.tableLayoutPanel5.ResumeLayout(false);
|
||||||
this.tableLayoutPanel5.PerformLayout();
|
this.tableLayoutPanel5.PerformLayout();
|
||||||
this.flowLayoutPanel2.ResumeLayout(false);
|
this.flowLayoutPanel2.ResumeLayout(false);
|
||||||
|
this.invitePage.ResumeLayout(false);
|
||||||
|
this.tableLayoutPanel6.ResumeLayout(false);
|
||||||
|
this.tableLayoutPanel6.PerformLayout();
|
||||||
|
this.flowLayoutPanel3.ResumeLayout(false);
|
||||||
this.ResumeLayout(false);
|
this.ResumeLayout(false);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -642,7 +819,6 @@ namespace SparkleShare {
|
||||||
private System.Windows.Forms.Button buttonCancel;
|
private System.Windows.Forms.Button buttonCancel;
|
||||||
private System.Windows.Forms.PictureBox pictureBox;
|
private System.Windows.Forms.PictureBox pictureBox;
|
||||||
private System.Windows.Forms.Label label6;
|
private System.Windows.Forms.Label label6;
|
||||||
private System.Windows.Forms.Button buttonFinish;
|
|
||||||
private System.Windows.Forms.ProgressBar syncingProgressBar;
|
private System.Windows.Forms.ProgressBar syncingProgressBar;
|
||||||
private System.Windows.Forms.Button buttonTryAgain;
|
private System.Windows.Forms.Button buttonTryAgain;
|
||||||
private System.Windows.Forms.Label label9;
|
private System.Windows.Forms.Label label9;
|
||||||
|
|
@ -670,6 +846,20 @@ namespace SparkleShare {
|
||||||
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel4;
|
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel4;
|
||||||
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel5;
|
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel5;
|
||||||
private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel2;
|
private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel2;
|
||||||
|
private System.Windows.Forms.TabPage invitePage;
|
||||||
|
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel6;
|
||||||
|
private System.Windows.Forms.Label label17;
|
||||||
|
private System.Windows.Forms.Label label7;
|
||||||
|
private System.Windows.Forms.Label label19;
|
||||||
|
private System.Windows.Forms.Label label18;
|
||||||
|
private System.Windows.Forms.TextBox InviteFolderEntry;
|
||||||
|
private System.Windows.Forms.TextBox InviteAddressEntry;
|
||||||
|
private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel3;
|
||||||
|
private System.Windows.Forms.Button InviteAddButton;
|
||||||
|
private System.Windows.Forms.Button InviteCancelButton;
|
||||||
|
private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel4;
|
||||||
|
private System.Windows.Forms.Button syncFinishButton;
|
||||||
|
private System.Windows.Forms.Button syncCancelButton;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -49,11 +49,32 @@ namespace SparkleShare {
|
||||||
pictureBox.Image = Icons.side_splash;
|
pictureBox.Image = Icons.side_splash;
|
||||||
this.Icon = Icons.sparkleshare;
|
this.Icon = Icons.sparkleshare;
|
||||||
|
|
||||||
|
Controller.HideWindowEvent += delegate
|
||||||
|
{
|
||||||
|
this.Hide();
|
||||||
|
};
|
||||||
|
|
||||||
|
Controller.ShowWindowEvent += delegate
|
||||||
|
{
|
||||||
|
this.Show();
|
||||||
|
};
|
||||||
|
|
||||||
Controller.ChangePageEvent += delegate (PageType type, string [] warnings) {
|
Controller.ChangePageEvent += delegate (PageType type, string [] warnings) {
|
||||||
tabControl.SafeInvoke ((Action)delegate {
|
tabControl.SafeInvoke ((Action)delegate {
|
||||||
switch (type) {
|
switch (type) {
|
||||||
|
case PageType.Setup:
|
||||||
|
tabControl.SelectedIndex = 0;
|
||||||
|
NameEntry.Text = Controller.GuessedUserName;
|
||||||
|
EmailEntry.Text = Controller.GuessedUserEmail;
|
||||||
|
Show();
|
||||||
|
Controller.CheckSetupPage(NameEntry.Text, EmailEntry.Text);
|
||||||
|
break;
|
||||||
|
|
||||||
case PageType.Add:
|
case PageType.Add:
|
||||||
tabControl.SelectedIndex = 1;
|
tabControl.SelectedIndex = 1;
|
||||||
|
|
||||||
|
// Add plugins to tree
|
||||||
|
// ===================
|
||||||
// Check whether the treeView is already created
|
// Check whether the treeView is already created
|
||||||
// If it is dispose it and start over
|
// If it is dispose it and start over
|
||||||
if (treeView != null) {
|
if (treeView != null) {
|
||||||
|
|
@ -67,7 +88,6 @@ namespace SparkleShare {
|
||||||
treeView.FullRowSelect = true;
|
treeView.FullRowSelect = true;
|
||||||
treeView.ImageIndex = 0;
|
treeView.ImageIndex = 0;
|
||||||
treeView.Indent = 35;
|
treeView.Indent = 35;
|
||||||
treeView.AfterSelect += new TreeViewEventHandler (CheckTreeNode);
|
|
||||||
treeView.HideSelection = false;
|
treeView.HideSelection = false;
|
||||||
treeView.ItemHeight = 40;
|
treeView.ItemHeight = 40;
|
||||||
|
|
||||||
|
|
@ -89,12 +109,31 @@ namespace SparkleShare {
|
||||||
panel_server_selection.Size.Height);
|
panel_server_selection.Size.Height);
|
||||||
|
|
||||||
panel_server_selection.Controls.Add (treeView);
|
panel_server_selection.Controls.Add (treeView);
|
||||||
treeView.SelectedNode = treeView.Nodes [0];
|
// Finished adding and populating tree
|
||||||
treeView.Select ();
|
|
||||||
CheckAddPage (null, null);
|
// Select first node
|
||||||
CheckTreeNode (null, null);
|
treeView.SelectedNode = treeView.Nodes[0];
|
||||||
|
treeView.Select();
|
||||||
|
Controller.SelectedPluginChanged(0);
|
||||||
|
|
||||||
|
treeView.AfterSelect += new TreeViewEventHandler(CheckTreeNode);
|
||||||
|
|
||||||
Show ();
|
Show ();
|
||||||
|
Controller.CheckAddPage(ServerEntry.Text, FolderEntry.Text, 1);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case PageType.Invite:
|
||||||
|
tabControl.SelectedIndex = 5;
|
||||||
|
InviteAddressEntry.Text = Controller.PendingInvite.Address;
|
||||||
|
InviteFolderEntry.Text = Controller.PendingInvite.RemotePath;
|
||||||
|
Show();
|
||||||
|
break;
|
||||||
|
|
||||||
|
case PageType.Syncing:
|
||||||
|
tabControl.SelectedIndex = 2;
|
||||||
|
Show();
|
||||||
|
break;
|
||||||
|
|
||||||
case PageType.Error:
|
case PageType.Error:
|
||||||
tabControl.SelectedIndex = 3;
|
tabControl.SelectedIndex = 3;
|
||||||
label3.Text = "First, have you tried turning it off and on again?\n\n" +
|
label3.Text = "First, have you tried turning it off and on again?\n\n" +
|
||||||
|
|
@ -102,126 +141,138 @@ namespace SparkleShare {
|
||||||
"The host needs to know who you are. Have you uploaded the key that sits in your SparkleShare folder?";
|
"The host needs to know who you are. Have you uploaded the key that sits in your SparkleShare folder?";
|
||||||
Show ();
|
Show ();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PageType.Finished:
|
case PageType.Finished:
|
||||||
tabControl.SelectedIndex = 4;
|
tabControl.SelectedIndex = 4;
|
||||||
Show ();
|
Show ();
|
||||||
break;
|
break;
|
||||||
case PageType.Setup:
|
|
||||||
tabControl.SelectedIndex = 0;
|
|
||||||
NameEntry.Text = Program.Controller.UserName;
|
|
||||||
Show ();
|
|
||||||
break;
|
|
||||||
case PageType.Syncing:
|
|
||||||
tabControl.SelectedIndex = 2;
|
|
||||||
Show ();
|
|
||||||
break;
|
|
||||||
case PageType.Tutorial:
|
case PageType.Tutorial:
|
||||||
if (Controller.TutorialPageNumber == 1)
|
// Do nothing in tutorial by now
|
||||||
Controller.TutorialSkipped ();
|
Controller.TutorialSkipped();;
|
||||||
else
|
|
||||||
Controller.ShowAddPage ();
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
throw new NotImplementedException ("unknown PageType");
|
throw new NotImplementedException ("unknown PageType");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Controller.UpdateSetupContinueButtonEvent += new SparkleSetupController.UpdateSetupContinueButtonEventHandler(UpdateSetupContinueButtonEvent);
|
||||||
|
|
||||||
|
Controller.ChangeAddressFieldEvent += new SparkleSetupController.ChangeAddressFieldEventHandler(ChangeAddressFieldEvent);
|
||||||
|
Controller.ChangePathFieldEvent += new SparkleSetupController.ChangePathFieldEventHandler(ChangePathFieldEvent);
|
||||||
|
Controller.UpdateAddProjectButtonEvent += new SparkleSetupController.UpdateAddProjectButtonEventHandler(UpdateAddProjectButtonEvent);
|
||||||
|
|
||||||
|
Controller.UpdateProgressBarEvent += new SparkleSetupController.UpdateProgressBarEventHandler(UpdateProgressBarEvent);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void SparkleSetup_FormClosing (object sender, FormClosingEventArgs e) {
|
private void SparkleSetup_FormClosing (object sender, FormClosingEventArgs e) {
|
||||||
if (e.CloseReason != CloseReason.ApplicationExitCall
|
if (e.CloseReason != CloseReason.ApplicationExitCall
|
||||||
&& e.CloseReason != CloseReason.TaskManagerClosing
|
&& e.CloseReason != CloseReason.TaskManagerClosing
|
||||||
&& e.CloseReason != CloseReason.WindowsShutDown) {
|
&& e.CloseReason != CloseReason.WindowsShutDown) {
|
||||||
e.Cancel = true;
|
e.Cancel = true;
|
||||||
this.Hide ();
|
this.Hide ();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void buttonCancel_Click (object sender, EventArgs e) {
|
#region Things for "Setup" page
|
||||||
this.Hide ();
|
private void SetupNextClicked(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
Controller.SetupPageCompleted(NameEntry.Text, EmailEntry.Text);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void buttonSync_Click (object sender, EventArgs e) {
|
private void CheckSetupPage(object sender, EventArgs e)
|
||||||
if (String.IsNullOrEmpty (Controller.Plugins [treeView.SelectedNode.Index].Address))
|
{
|
||||||
Controller.AddPageCompleted (ServerEntry.Text, FolderEntry.Text);
|
Controller.CheckSetupPage(NameEntry.Text, EmailEntry.Text);
|
||||||
else
|
|
||||||
Controller.AddPageCompleted (Controller.Plugins [treeView.SelectedNode.Index].Address,
|
|
||||||
FolderEntry.Text);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void CheckTreeNode (object sender, EventArgs e) {
|
void UpdateSetupContinueButtonEvent(bool button_enabled)
|
||||||
// If the "own server" choice is selected, the address field is empty
|
{
|
||||||
if (String.IsNullOrEmpty (Controller.Plugins [treeView.SelectedNode.Index].Address)) {
|
buttonNext.Enabled = button_enabled;
|
||||||
ServerEntry.Enabled = true;
|
}
|
||||||
ServerEntry.ExampleText = Controller.Plugins [treeView.SelectedNode.Index].AddressExample;
|
#endregion
|
||||||
} else {
|
|
||||||
ServerEntry.Enabled = false;
|
#region Things for "Add" page
|
||||||
ServerEntry.ExampleText = Controller.Plugins [treeView.SelectedNode.Index].Address;
|
void ChangeAddressFieldEvent(string text, string example_text, FieldState state)
|
||||||
ServerEntry.Enabled = false;
|
{
|
||||||
}
|
ServerEntry.Text = text;
|
||||||
//Clear any previous input data so that exampletext can show
|
ServerEntry.Enabled = state == FieldState.Enabled;
|
||||||
ServerEntry.Text = "";
|
ServerEntry.ExampleText = example_text;
|
||||||
FolderEntry.Text = "";
|
|
||||||
FolderEntry.ExampleText = Controller.Plugins [treeView.SelectedNode.Index].PathExample;
|
|
||||||
CheckAddPage (null, null);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void CheckAddPage (object sender, EventArgs e) {
|
void ChangePathFieldEvent(string text, string example_text, FieldState state)
|
||||||
// Enables or disables the 'Next' button depending on the
|
{
|
||||||
// entries filled in by the user
|
FolderEntry.Text = text;
|
||||||
buttonSync.Enabled = false;
|
FolderEntry.Enabled = state == FieldState.Enabled;
|
||||||
|
FolderEntry.ExampleText = example_text;
|
||||||
if (String.IsNullOrEmpty (Controller.Plugins [treeView.SelectedNode.Index].Address)) {
|
|
||||||
if (!String.IsNullOrEmpty (FolderEntry.Text)) {
|
|
||||||
if (!String.IsNullOrEmpty (ServerEntry.Text))
|
|
||||||
buttonSync.Enabled = true;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if (!String.IsNullOrEmpty (FolderEntry.Text))
|
|
||||||
buttonSync.Enabled = true;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void buttonFinish_Click (object sender, EventArgs e) {
|
private void CheckTreeNode(object sender, EventArgs e)
|
||||||
this.Hide ();
|
{
|
||||||
|
Controller.SelectedPluginChanged(treeView.SelectedNode.Index);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void buttonTryAgain_Click (object sender, EventArgs e) {
|
private void CancelButtonClicked (object sender, EventArgs e) {
|
||||||
Controller.ErrorPageCompleted ();
|
Controller.PageCancelled();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void AddButtonClicked(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
Controller.AddPageCompleted(ServerEntry.Text, FolderEntry.Text);
|
||||||
|
}
|
||||||
|
|
||||||
|
void UpdateAddProjectButtonEvent(bool button_enabled)
|
||||||
|
{
|
||||||
|
buttonSync.Enabled = button_enabled;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void CheckAddPage(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
Controller.CheckAddPage(ServerEntry.Text, FolderEntry.Text, treeView.SelectedNode.Index);
|
||||||
|
}
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region Things for "Invite" page
|
||||||
|
private void InviteAddButtonClicked(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
Controller.InvitePageCompleted();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void InviteCancelButtonClicked(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
Controller.PageCancelled();
|
||||||
|
}
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region Things for "Syncing" page
|
||||||
|
private void syncCancelClicked(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
Controller.SyncingCancelled();
|
||||||
|
}
|
||||||
|
|
||||||
|
void UpdateProgressBarEvent(double percentage)
|
||||||
|
{
|
||||||
|
syncingProgressBar.Value = (int)percentage;
|
||||||
|
}
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region Things for "Error" page
|
||||||
|
private void buttonTryAgain_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
Controller.ErrorPageCompleted();
|
||||||
|
}
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region Thigngs for "Finish" page
|
||||||
private void buttonFinished_Click (object sender, EventArgs e) {
|
private void buttonFinished_Click (object sender, EventArgs e) {
|
||||||
this.Hide ();
|
Controller.FinishPageCompleted();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void buttonOpenFolder_Click (object sender, EventArgs e) {
|
private void buttonOpenFolder_Click (object sender, EventArgs e) {
|
||||||
Program.Controller.OpenSparkleShareFolder (Controller.SyncingFolder);
|
Controller.OpenFolderClicked();
|
||||||
}
|
|
||||||
|
|
||||||
private void buttonNext_Click (object sender, EventArgs e) {
|
|
||||||
string full_name = NameEntry.Text;
|
|
||||||
string email = EmailEntry.Text;
|
|
||||||
|
|
||||||
Controller.SetupPageCompleted (full_name, email);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void CheckSetupPage (object sender, EventArgs e) {
|
|
||||||
// Enables or disables the 'Next' button depending on the
|
|
||||||
// entries filled in by the user
|
|
||||||
if (!String.IsNullOrEmpty (NameEntry.Text) &&
|
|
||||||
this.IsValidEmail (EmailEntry.Text)) {
|
|
||||||
buttonNext.Enabled = true;
|
|
||||||
} else {
|
|
||||||
buttonNext.Enabled = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Checks to see if an email address is valid
|
|
||||||
public bool IsValidEmail(string email)
|
|
||||||
{
|
|
||||||
Regex regex = new Regex(@"^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$", RegexOptions.IgnoreCase);
|
|
||||||
return regex.IsMatch(email);
|
|
||||||
}
|
}
|
||||||
|
#endregion
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -99,6 +99,9 @@
|
||||||
<Compile Include="..\SparklePlugin.cs">
|
<Compile Include="..\SparklePlugin.cs">
|
||||||
<Link>SparklePlugin.cs</Link>
|
<Link>SparklePlugin.cs</Link>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
<Compile Include="..\SparkleStatusIconController.cs">
|
||||||
|
<Link>SparkleStatusIconController.cs</Link>
|
||||||
|
</Compile>
|
||||||
<Compile Include="ApplicationSchemeHandler.cs" />
|
<Compile Include="ApplicationSchemeHandler.cs" />
|
||||||
<Compile Include="AssemblyInfo.cs" />
|
<Compile Include="AssemblyInfo.cs" />
|
||||||
<Compile Include="controls\ExampleTextBox.cs">
|
<Compile Include="controls\ExampleTextBox.cs">
|
||||||
|
|
|
||||||
|
|
@ -30,6 +30,8 @@ namespace SparkleShare {
|
||||||
// user's notification area
|
// user's notification area
|
||||||
public class SparkleStatusIcon : IDisposable {
|
public class SparkleStatusIcon : IDisposable {
|
||||||
|
|
||||||
|
public SparkleStatusIconController Controller = new SparkleStatusIconController();
|
||||||
|
|
||||||
private Timer Animation;
|
private Timer Animation;
|
||||||
private Bitmap [] AnimationFrames;
|
private Bitmap [] AnimationFrames;
|
||||||
private int FrameNumber;
|
private int FrameNumber;
|
||||||
|
|
@ -57,15 +59,6 @@ namespace SparkleShare {
|
||||||
|
|
||||||
CreateMenu ();
|
CreateMenu ();
|
||||||
SetNormalState ();
|
SetNormalState ();
|
||||||
|
|
||||||
/*Program.Controller.FolderSizeChanged += delegate {
|
|
||||||
status_icon.ContextMenuStrip.SafeInvoke ((Action)delegate {
|
|
||||||
if (!Animation.Enabled)
|
|
||||||
SetNormalState ();
|
|
||||||
|
|
||||||
UpdateMenu ();
|
|
||||||
});
|
|
||||||
};*/
|
|
||||||
|
|
||||||
Program.Controller.FolderListChanged += delegate {
|
Program.Controller.FolderListChanged += delegate {
|
||||||
status_icon.ContextMenuStrip.SafeInvoke ((Action)delegate {
|
status_icon.ContextMenuStrip.SafeInvoke ((Action)delegate {
|
||||||
|
|
@ -205,14 +198,7 @@ namespace SparkleShare {
|
||||||
sync_item.Enabled = false;
|
sync_item.Enabled = false;
|
||||||
|
|
||||||
sync_item.Click += delegate {
|
sync_item.Click += delegate {
|
||||||
|
Controller.AddHostedProjectClicked();
|
||||||
if (SparkleUI.Setup == null) {
|
|
||||||
SparkleUI.Setup = new SparkleSetup ();
|
|
||||||
SparkleUI.Setup.Controller.ShowAddPage ();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!SparkleUI.Setup.Visible)
|
|
||||||
SparkleUI.Setup.Controller.ShowAddPage ();
|
|
||||||
};
|
};
|
||||||
|
|
||||||
Menu.Items.Add (sync_item);
|
Menu.Items.Add (sync_item);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue