From 7b2273618cb9497ad033de1316e4cfc584ae1da5 Mon Sep 17 00:00:00 2001 From: lars Date: Thu, 30 Jun 2011 23:30:47 +0200 Subject: [PATCH 01/21] Added saving of last used server. --- SparkleShare/SparkleController.cs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/SparkleShare/SparkleController.cs b/SparkleShare/SparkleController.cs index 2efea66c..8f0a3bb6 100644 --- a/SparkleShare/SparkleController.cs +++ b/SparkleShare/SparkleController.cs @@ -803,6 +803,17 @@ namespace SparkleShare { } } + // Looks up the user's email from the global configuration + public string PrevServer + { + get { + return SparkleConfig.DefaultConfig.PrevServer; + } + + set { + SparkleConfig.DefaultConfig.PrevServer = value; + } + } // Generates and installs an RSA keypair to identify this system public void GenerateKeyPair () From 27504373efec5c66eedb868367e3346262626010 Mon Sep 17 00:00:00 2001 From: lars Date: Thu, 30 Jun 2011 23:31:55 +0200 Subject: [PATCH 02/21] Added saving of last used server. --- SparkleLib/SparkleConfig.cs | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/SparkleLib/SparkleConfig.cs b/SparkleLib/SparkleConfig.cs index 90b882dd..936ed26b 100644 --- a/SparkleLib/SparkleConfig.cs +++ b/SparkleLib/SparkleConfig.cs @@ -82,6 +82,8 @@ namespace SparkleLib { " " + n + " " + user_name + "" + n + " Unknown" + n + + " " + n + + " " + n + " " + n + ""); writer.Close (); @@ -119,6 +121,20 @@ namespace SparkleLib { } } + public string PrevServer { + get { + XmlNode node = SelectSingleNode ("/sparkleshare/user/previous-server/text()"); + return node.Value; + } + + set { + XmlNode node = SelectSingleNode ("/sparkleshare/user/previous-server/text()"); + node.InnerText = value; + + Save (); + } + } + public List Folders { get { From 72a13772d648f84d6859f5c0cb7de938c77441c2 Mon Sep 17 00:00:00 2001 From: Lars Falk-Petersen Date: Fri, 1 Jul 2011 01:41:50 +0200 Subject: [PATCH 03/21] Added PrevServer to config. --- SparkleShare/SparkleController.cs | 32 +++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/SparkleShare/SparkleController.cs b/SparkleShare/SparkleController.cs index 8f0a3bb6..f5ce85f4 100644 --- a/SparkleShare/SparkleController.cs +++ b/SparkleShare/SparkleController.cs @@ -803,19 +803,43 @@ namespace SparkleShare { } } - // Looks up the user's email from the global configuration + // Looks up the last server used public string PrevServer { get { - return SparkleConfig.DefaultConfig.PrevServer; + if ("False" != SparkleConfig.DefaultConfig.PrevServer) + return SparkleConfig.DefaultConfig.PrevServer; + else + return ""; } set { - SparkleConfig.DefaultConfig.PrevServer = value; + if ("" != value ) + SparkleConfig.DefaultConfig.PrevServer = value; + else + SparkleConfig.DefaultConfig.PrevServer = "False"; } } - // Generates and installs an RSA keypair to identify this system + // Looks up the last folder used + public string PrevFolder + { + get { + if ("False" != SparkleConfig.DefaultConfig.PrevFolder) + return SparkleConfig.DefaultConfig.PrevFolder; + else + return ""; + } + + set { + if ("" != value ) + SparkleConfig.DefaultConfig.PrevFolder = value; + else + SparkleConfig.DefaultConfig.PrevFolder = "False"; + } + } + + // Generates and installs an RSA keypair to identify this system public void GenerateKeyPair () { string keys_path = SparklePaths.SparkleConfigPath; From dc3d65562aaa1175df375f6b4dfcebbf072c9957 Mon Sep 17 00:00:00 2001 From: Lars Falk-Petersen Date: Fri, 1 Jul 2011 01:43:55 +0200 Subject: [PATCH 04/21] Added PrevFolder to config. --- SparkleLib/SparkleConfig.cs | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/SparkleLib/SparkleConfig.cs b/SparkleLib/SparkleConfig.cs index 936ed26b..6f3e40c0 100644 --- a/SparkleLib/SparkleConfig.cs +++ b/SparkleLib/SparkleConfig.cs @@ -82,8 +82,8 @@ namespace SparkleLib { " " + n + " " + user_name + "" + n + " Unknown" + n + - " " + n + - " " + n + + " False" + n + + " False" + n + " " + n + ""); writer.Close (); @@ -135,6 +135,19 @@ namespace SparkleLib { } } + public string PrevFolder { + get { + XmlNode node = SelectSingleNode ("/sparkleshare/user/previous-folder/text()"); + return node.Value; + } + + set { + XmlNode node = SelectSingleNode ("/sparkleshare/user/previous-folder/text()"); + node.InnerText = value; + + Save (); + } + } public List Folders { get { From cc2b154dba283361a478ec9fe9d8742f202c0641 Mon Sep 17 00:00:00 2001 From: Lars Falk-Petersen Date: Fri, 1 Jul 2011 01:47:19 +0200 Subject: [PATCH 05/21] Added PrevServer to intro screen. --- SparkleShare/SparkleIntro.cs | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/SparkleShare/SparkleIntro.cs b/SparkleShare/SparkleIntro.cs index 7a0478f1..790c42f5 100644 --- a/SparkleShare/SparkleIntro.cs +++ b/SparkleShare/SparkleIntro.cs @@ -170,9 +170,13 @@ namespace SparkleShare { HBox layout_server = new HBox (true, 0); - ServerEntry = new SparkleEntry () { - ExampleText = _("address-to-server.com") - }; + ServerEntry = new SparkleEntry () { }; + + if (0 < SparkleShare.Controller.PrevServer.Length) { + ServerEntry.Text = SparkleShare.Controller.PrevServer.Trim(); + ServerEntry.ExampleTextActive = false; + } else + ServerEntry.ExampleText = _("address-to-server.com"); ServerEntry.Changed += CheckServerForm; @@ -250,9 +254,13 @@ namespace SparkleShare { HBox layout_folder = new HBox (true, 0); - FolderEntry = new SparkleEntry () { - ExampleText = _("Folder") - }; + FolderEntry = new SparkleEntry () { }; + + if (0 < SparkleShare.Controller.PrevFolder.Length) { + FolderEntry.Text = SparkleShare.Controller.PrevFolder.Trim(); + FolderEntry.ExampleTextActive = false; + } else + FolderEntry.ExampleText = _("Folder"); FolderEntry.Changed += CheckServerForm; @@ -273,6 +281,9 @@ namespace SparkleShare { string server = ServerEntry.Text; string canonical_name = System.IO.Path.GetFileNameWithoutExtension (folder_name); + SparkleShare.Controller.PrevServer = ServerEntry.Text; + SparkleShare.Controller.PrevFolder = FolderEntry.Text; + if (radio_button_gitorious.Active) server = "gitorious.org"; From b9645cc4ae05ae71580f25e24a156f52691487ea Mon Sep 17 00:00:00 2001 From: Lars Falk-Petersen Date: Fri, 1 Jul 2011 02:10:13 +0200 Subject: [PATCH 06/21] Problems with missing options in earlier config. --- SparkleLib/SparkleConfig.cs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/SparkleLib/SparkleConfig.cs b/SparkleLib/SparkleConfig.cs index 6f3e40c0..2d64ffac 100644 --- a/SparkleLib/SparkleConfig.cs +++ b/SparkleLib/SparkleConfig.cs @@ -124,7 +124,10 @@ namespace SparkleLib { public string PrevServer { get { XmlNode node = SelectSingleNode ("/sparkleshare/user/previous-server/text()"); - return node.Value; + if(null != node) + return node.Value; + else + return ""; } set { @@ -138,7 +141,10 @@ namespace SparkleLib { public string PrevFolder { get { XmlNode node = SelectSingleNode ("/sparkleshare/user/previous-folder/text()"); - return node.Value; + if(null != node) + return node.Value; + else + return ""; } set { From 877eb1143556876e669239d286303c71bbdfa7c8 Mon Sep 17 00:00:00 2001 From: Lars Falk-Petersen Date: Fri, 1 Jul 2011 02:11:07 +0200 Subject: [PATCH 07/21] Formatting. --- SparkleShare/SparkleController.cs | 34 +++++++++++++++---------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/SparkleShare/SparkleController.cs b/SparkleShare/SparkleController.cs index f5ce85f4..fc23261c 100644 --- a/SparkleShare/SparkleController.cs +++ b/SparkleShare/SparkleController.cs @@ -807,17 +807,17 @@ namespace SparkleShare { public string PrevServer { get { - if ("False" != SparkleConfig.DefaultConfig.PrevServer) - return SparkleConfig.DefaultConfig.PrevServer; - else - return ""; + if ("False" != SparkleConfig.DefaultConfig.PrevServer) + return SparkleConfig.DefaultConfig.PrevServer; + else + return ""; } set { - if ("" != value ) - SparkleConfig.DefaultConfig.PrevServer = value; - else - SparkleConfig.DefaultConfig.PrevServer = "False"; + if ("" != value ) + SparkleConfig.DefaultConfig.PrevServer = value; + else + SparkleConfig.DefaultConfig.PrevServer = "False"; } } @@ -825,21 +825,21 @@ namespace SparkleShare { public string PrevFolder { get { - if ("False" != SparkleConfig.DefaultConfig.PrevFolder) - return SparkleConfig.DefaultConfig.PrevFolder; - else - return ""; + if ("False" != SparkleConfig.DefaultConfig.PrevFolder) + return SparkleConfig.DefaultConfig.PrevFolder; + else + return ""; } set { - if ("" != value ) - SparkleConfig.DefaultConfig.PrevFolder = value; - else - SparkleConfig.DefaultConfig.PrevFolder = "False"; + if ("" != value ) + SparkleConfig.DefaultConfig.PrevFolder = value; + else + SparkleConfig.DefaultConfig.PrevFolder = "False"; } } - // Generates and installs an RSA keypair to identify this system + // Generates and installs an RSA keypair to identify this system public void GenerateKeyPair () { string keys_path = SparklePaths.SparkleConfigPath; From 046199428bd845ca427c7607aeed1be3b433c63e Mon Sep 17 00:00:00 2001 From: Lars Falk-Petersen Date: Fri, 1 Jul 2011 09:58:51 +0200 Subject: [PATCH 08/21] If options don't exist in config, create them! --- SparkleLib/SparkleConfig.cs | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/SparkleLib/SparkleConfig.cs b/SparkleLib/SparkleConfig.cs index 2d64ffac..a20eca97 100644 --- a/SparkleLib/SparkleConfig.cs +++ b/SparkleLib/SparkleConfig.cs @@ -132,6 +132,13 @@ namespace SparkleLib { set { XmlNode node = SelectSingleNode ("/sparkleshare/user/previous-server/text()"); + if (null == node) { + XmlNode parentNode = SelectSingleNode ("/sparkleshare/user"); + node = CreateNode (XmlNodeType.Element, "previous-server", null); + node.InnerText="False"; + + parentNode.AppendChild(node); + } node.InnerText = value; Save (); @@ -149,6 +156,13 @@ namespace SparkleLib { set { XmlNode node = SelectSingleNode ("/sparkleshare/user/previous-folder/text()"); + if (null == node) { + XmlNode parentNode = SelectSingleNode ("/sparkleshare/user"); + node = CreateNode (XmlNodeType.Element, "previous-folder", null); + node.InnerText="False"; + + parentNode.AppendChild(node); + } node.InnerText = value; Save (); From aede98cba8a4cc89ff8e3e8f5260c9fbbf551293 Mon Sep 17 00:00:00 2001 From: Lars Falk-Petersen Date: Sat, 2 Jul 2011 12:16:55 +0200 Subject: [PATCH 09/21] Removed new configvariables. Added "global" strings to keep servername untill we're done. --- SparkleShare/SparkleIntro.cs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/SparkleShare/SparkleIntro.cs b/SparkleShare/SparkleIntro.cs index 790c42f5..e3074f54 100644 --- a/SparkleShare/SparkleIntro.cs +++ b/SparkleShare/SparkleIntro.cs @@ -33,6 +33,8 @@ namespace SparkleShare { private Entry EmailEntry; private SparkleEntry ServerEntry; private SparkleEntry FolderEntry; + private String strServerEntry = ""; + private String strFolderEntry = ""; private Button NextButton; private Button SyncButton; private bool ServerFormOnly; @@ -172,11 +174,11 @@ namespace SparkleShare { ServerEntry = new SparkleEntry () { }; - if (0 < SparkleShare.Controller.PrevServer.Length) { - ServerEntry.Text = SparkleShare.Controller.PrevServer.Trim(); + if (0 < strServerEntry.Trim().Length) { + ServerEntry.Text = strServerEntry; ServerEntry.ExampleTextActive = false; } else - ServerEntry.ExampleText = _("address-to-server.com"); + ServerEntry.ExampleText = _("user@address-to-server.com"); ServerEntry.Changed += CheckServerForm; @@ -256,8 +258,8 @@ namespace SparkleShare { FolderEntry = new SparkleEntry () { }; - if (0 < SparkleShare.Controller.PrevFolder.Length) { - FolderEntry.Text = SparkleShare.Controller.PrevFolder.Trim(); + if (0 < strFolderEntry.Trim().Length) { + FolderEntry.Text = strFolderEntry; FolderEntry.ExampleTextActive = false; } else FolderEntry.ExampleText = _("Folder"); From 8ab8c847fc7a61269aabdf507109bf88be19e243 Mon Sep 17 00:00:00 2001 From: Lars Falk-Petersen Date: Sat, 2 Jul 2011 12:37:04 +0200 Subject: [PATCH 10/21] Removed PrevServer, PrevFolder --- SparkleLib/SparkleConfig.cs | 48 ------------------------------------- 1 file changed, 48 deletions(-) diff --git a/SparkleLib/SparkleConfig.cs b/SparkleLib/SparkleConfig.cs index a20eca97..75183642 100644 --- a/SparkleLib/SparkleConfig.cs +++ b/SparkleLib/SparkleConfig.cs @@ -121,54 +121,6 @@ namespace SparkleLib { } } - public string PrevServer { - get { - XmlNode node = SelectSingleNode ("/sparkleshare/user/previous-server/text()"); - if(null != node) - return node.Value; - else - return ""; - } - - set { - XmlNode node = SelectSingleNode ("/sparkleshare/user/previous-server/text()"); - if (null == node) { - XmlNode parentNode = SelectSingleNode ("/sparkleshare/user"); - node = CreateNode (XmlNodeType.Element, "previous-server", null); - node.InnerText="False"; - - parentNode.AppendChild(node); - } - node.InnerText = value; - - Save (); - } - } - - public string PrevFolder { - get { - XmlNode node = SelectSingleNode ("/sparkleshare/user/previous-folder/text()"); - if(null != node) - return node.Value; - else - return ""; - } - - set { - XmlNode node = SelectSingleNode ("/sparkleshare/user/previous-folder/text()"); - if (null == node) { - XmlNode parentNode = SelectSingleNode ("/sparkleshare/user"); - node = CreateNode (XmlNodeType.Element, "previous-folder", null); - node.InnerText="False"; - - parentNode.AppendChild(node); - } - node.InnerText = value; - - Save (); - } - } - public List Folders { get { List folders = new List (); From af7e8541d80639dd3c5beda706d748bf0d583900 Mon Sep 17 00:00:00 2001 From: Lars Falk-Petersen Date: Sat, 2 Jul 2011 12:39:21 +0200 Subject: [PATCH 11/21] Changed prevserver to temporary storage. --- SparkleShare/SparkleIntro.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SparkleShare/SparkleIntro.cs b/SparkleShare/SparkleIntro.cs index e3074f54..51680077 100644 --- a/SparkleShare/SparkleIntro.cs +++ b/SparkleShare/SparkleIntro.cs @@ -283,8 +283,8 @@ namespace SparkleShare { string server = ServerEntry.Text; string canonical_name = System.IO.Path.GetFileNameWithoutExtension (folder_name); - SparkleShare.Controller.PrevServer = ServerEntry.Text; - SparkleShare.Controller.PrevFolder = FolderEntry.Text; + strServerEntry = ServerEntry.Text; + strFolderEntry = FolderEntry.Text; if (radio_button_gitorious.Active) server = "gitorious.org"; From 21101c1be8eacdd6c628b38356d23a031ae3892e Mon Sep 17 00:00:00 2001 From: Lars Falk-Petersen Date: Sat, 2 Jul 2011 12:41:53 +0200 Subject: [PATCH 12/21] Commented out new code. Will be removed if I don't need it. --- SparkleShare/SparkleController.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SparkleShare/SparkleController.cs b/SparkleShare/SparkleController.cs index fc23261c..5ee81448 100644 --- a/SparkleShare/SparkleController.cs +++ b/SparkleShare/SparkleController.cs @@ -803,7 +803,7 @@ namespace SparkleShare { } } - // Looks up the last server used +/* // Looks up the last server used public string PrevServer { get { @@ -837,7 +837,7 @@ namespace SparkleShare { else SparkleConfig.DefaultConfig.PrevFolder = "False"; } - } + } */ // Generates and installs an RSA keypair to identify this system public void GenerateKeyPair () From 3fc7ff54cd3d9eaa4f1ce6a15d9d8816cde6e76d Mon Sep 17 00:00:00 2001 From: Lars Falk-Petersen Date: Sat, 2 Jul 2011 13:29:37 +0200 Subject: [PATCH 13/21] Added GetUrls --- SparkleLib/SparkleConfig.cs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/SparkleLib/SparkleConfig.cs b/SparkleLib/SparkleConfig.cs index 75183642..13913b91 100644 --- a/SparkleLib/SparkleConfig.cs +++ b/SparkleLib/SparkleConfig.cs @@ -82,8 +82,6 @@ namespace SparkleLib { " " + n + " " + user_name + "" + n + " Unknown" + n + - " False" + n + - " False" + n + " " + n + ""); writer.Close (); @@ -209,6 +207,17 @@ namespace SparkleLib { { return this.GetFolderValue(name, "url"); } + + public List GetUrls () + { + List Urls = new List (); + + foreach (string folder_name in SparkleLib.SparkleConfig.DefaultConfig.Folders) { + Urls.Add(GetUrlForFolder(folder_name)); + } + + return Urls; + } public string GetAnnouncementsForFolder (string name) { From a248d54cec9e7b7320e2de80f9cd9754324b2e7b Mon Sep 17 00:00:00 2001 From: Lars Falk-Petersen Date: Sat, 2 Jul 2011 13:30:20 +0200 Subject: [PATCH 14/21] Getting ready to list up previously used servers and folders --- SparkleShare/SparkleIntro.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/SparkleShare/SparkleIntro.cs b/SparkleShare/SparkleIntro.cs index 51680077..c4a480c1 100644 --- a/SparkleShare/SparkleIntro.cs +++ b/SparkleShare/SparkleIntro.cs @@ -20,6 +20,7 @@ using System.Diagnostics; using System.IO; using System.Text.RegularExpressions; using System.Timers; +using System.Collections.Generic; using Gtk; using Mono.Unix; @@ -173,6 +174,7 @@ namespace SparkleShare { HBox layout_server = new HBox (true, 0); ServerEntry = new SparkleEntry () { }; + //List Urls = SparkleLib.SparkleConfig.DefaultConfig.GetUrls(); if (0 < strServerEntry.Trim().Length) { ServerEntry.Text = strServerEntry; @@ -257,6 +259,10 @@ namespace SparkleShare { HBox layout_folder = new HBox (true, 0); FolderEntry = new SparkleEntry () { }; + /* retrieve folders + foreach (string folder_name in SparkleLib.SparkleConfig.DefaultConfig.Folders) { + string folder_path = folder_name; + } */ if (0 < strFolderEntry.Trim().Length) { FolderEntry.Text = strFolderEntry; From 70adad83b455a6d561ac93cef162ce058b83f14e Mon Sep 17 00:00:00 2001 From: Lars Falk-Petersen Date: Sat, 2 Jul 2011 14:46:08 +0200 Subject: [PATCH 15/21] Strip ssh:// and git:// from urls. --- SparkleLib/SparkleConfig.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SparkleLib/SparkleConfig.cs b/SparkleLib/SparkleConfig.cs index 13913b91..68640f9c 100644 --- a/SparkleLib/SparkleConfig.cs +++ b/SparkleLib/SparkleConfig.cs @@ -213,7 +213,7 @@ namespace SparkleLib { List Urls = new List (); foreach (string folder_name in SparkleLib.SparkleConfig.DefaultConfig.Folders) { - Urls.Add(GetUrlForFolder(folder_name)); + Urls.Add( GetUrlForFolder(folder_name).Replace("ssh://", "").Replace("git://", "").Split('/')[0] ); } return Urls; From 56c64d4cd79602ab5c2af9cc717704c9eb054177 Mon Sep 17 00:00:00 2001 From: Lars Falk-Petersen Date: Sat, 2 Jul 2011 14:46:43 +0200 Subject: [PATCH 16/21] Added autocomplete to servers and folders. --- SparkleShare/SparkleIntro.cs | 39 +++++++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/SparkleShare/SparkleIntro.cs b/SparkleShare/SparkleIntro.cs index c4a480c1..c9b33b90 100644 --- a/SparkleShare/SparkleIntro.cs +++ b/SparkleShare/SparkleIntro.cs @@ -174,7 +174,9 @@ namespace SparkleShare { HBox layout_server = new HBox (true, 0); ServerEntry = new SparkleEntry () { }; - //List Urls = SparkleLib.SparkleConfig.DefaultConfig.GetUrls(); + ServerEntry.Completion = new EntryCompletion(); + ServerEntry.Completion.Model = ServerEntryCompletion(); + ServerEntry.Completion.TextColumn = 0; if (0 < strServerEntry.Trim().Length) { ServerEntry.Text = strServerEntry; @@ -259,10 +261,9 @@ namespace SparkleShare { HBox layout_folder = new HBox (true, 0); FolderEntry = new SparkleEntry () { }; - /* retrieve folders - foreach (string folder_name in SparkleLib.SparkleConfig.DefaultConfig.Folders) { - string folder_path = folder_name; - } */ + FolderEntry.Completion = new EntryCompletion(); + FolderEntry.Completion.Model = FolderEntryCompletion(); + FolderEntry.Completion.TextColumn = 0; if (0 < strFolderEntry.Trim().Length) { FolderEntry.Text = strFolderEntry; @@ -677,6 +678,34 @@ namespace SparkleShare { } + TreeModel ServerEntryCompletion () + { + ListStore store = new ListStore (typeof (string)); + List Urls = SparkleLib.SparkleConfig.DefaultConfig.GetUrls(); + + store.AppendValues ("user@localhost"); + store.AppendValues ("user@example.com"); + foreach (string url in Urls) { + store.AppendValues (url); + } + + return store; + } + + + TreeModel FolderEntryCompletion () + { + ListStore store = new ListStore (typeof (string)); + + store.AppendValues ("~/test.git"); + foreach (string folder in SparkleLib.SparkleConfig.DefaultConfig.Folders) { + store.AppendValues (folder); + } + + return store; + } + + // Checks to see if an email address is valid private bool IsValidEmail (string email) { From f28b6e85125996c0cee38ad4be1e8b0ff51796e9 Mon Sep 17 00:00:00 2001 From: Lars Falk-Petersen Date: Sat, 2 Jul 2011 14:55:56 +0200 Subject: [PATCH 17/21] Formatting and removing of comments. --- SparkleLib/SparkleConfig.cs | 1 + SparkleShare/SparkleController.cs | 35 ------------------------------- 2 files changed, 1 insertion(+), 35 deletions(-) diff --git a/SparkleLib/SparkleConfig.cs b/SparkleLib/SparkleConfig.cs index 68640f9c..2500f114 100644 --- a/SparkleLib/SparkleConfig.cs +++ b/SparkleLib/SparkleConfig.cs @@ -118,6 +118,7 @@ namespace SparkleLib { Save (); } } + public List Folders { get { diff --git a/SparkleShare/SparkleController.cs b/SparkleShare/SparkleController.cs index 5ee81448..049d174e 100644 --- a/SparkleShare/SparkleController.cs +++ b/SparkleShare/SparkleController.cs @@ -802,42 +802,7 @@ namespace SparkleShare { SparkleConfig.DefaultConfig.UserEmail = value; } } - -/* // Looks up the last server used - public string PrevServer - { - get { - if ("False" != SparkleConfig.DefaultConfig.PrevServer) - return SparkleConfig.DefaultConfig.PrevServer; - else - return ""; - } - - set { - if ("" != value ) - SparkleConfig.DefaultConfig.PrevServer = value; - else - SparkleConfig.DefaultConfig.PrevServer = "False"; - } - } - // Looks up the last folder used - public string PrevFolder - { - get { - if ("False" != SparkleConfig.DefaultConfig.PrevFolder) - return SparkleConfig.DefaultConfig.PrevFolder; - else - return ""; - } - - set { - if ("" != value ) - SparkleConfig.DefaultConfig.PrevFolder = value; - else - SparkleConfig.DefaultConfig.PrevFolder = "False"; - } - } */ // Generates and installs an RSA keypair to identify this system public void GenerateKeyPair () From b102609899ab1110d86d4163e4ee3219ebf212d4 Mon Sep 17 00:00:00 2001 From: Lars Falk-Petersen Date: Sat, 2 Jul 2011 14:56:42 +0200 Subject: [PATCH 18/21] Formatting and removing of comments. --- SparkleLib/SparkleConfig.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SparkleLib/SparkleConfig.cs b/SparkleLib/SparkleConfig.cs index 2500f114..348cb7ed 100644 --- a/SparkleLib/SparkleConfig.cs +++ b/SparkleLib/SparkleConfig.cs @@ -118,7 +118,7 @@ namespace SparkleLib { Save (); } } - + public List Folders { get { From a7f153ce4b56aadc1265bb52bc2b2af93bdc9cfb Mon Sep 17 00:00:00 2001 From: Lars Falk-Petersen Date: Sat, 2 Jul 2011 14:58:13 +0200 Subject: [PATCH 19/21] Formatting and removing of comments. --- SparkleShare/SparkleController.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/SparkleShare/SparkleController.cs b/SparkleShare/SparkleController.cs index 049d174e..0d25fd3b 100644 --- a/SparkleShare/SparkleController.cs +++ b/SparkleShare/SparkleController.cs @@ -803,7 +803,6 @@ namespace SparkleShare { } } - // Generates and installs an RSA keypair to identify this system public void GenerateKeyPair () { From b4c796577e1de1646371107a3f1914823e5112bd Mon Sep 17 00:00:00 2001 From: Lars Falk-Petersen Date: Sat, 2 Jul 2011 14:58:38 +0200 Subject: [PATCH 20/21] Formatting and removing of comments. --- SparkleShare/SparkleController.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/SparkleShare/SparkleController.cs b/SparkleShare/SparkleController.cs index 0d25fd3b..049d174e 100644 --- a/SparkleShare/SparkleController.cs +++ b/SparkleShare/SparkleController.cs @@ -803,6 +803,7 @@ namespace SparkleShare { } } + // Generates and installs an RSA keypair to identify this system public void GenerateKeyPair () { From 9180a4c668ba35d4a2f16be84b546f6a86f073fb Mon Sep 17 00:00:00 2001 From: Lars Falk-Petersen Date: Sat, 2 Jul 2011 15:02:51 +0200 Subject: [PATCH 21/21] Reverted to original --- SparkleShare/SparkleController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SparkleShare/SparkleController.cs b/SparkleShare/SparkleController.cs index 049d174e..2efea66c 100644 --- a/SparkleShare/SparkleController.cs +++ b/SparkleShare/SparkleController.cs @@ -802,7 +802,7 @@ namespace SparkleShare { SparkleConfig.DefaultConfig.UserEmail = value; } } - + // Generates and installs an RSA keypair to identify this system public void GenerateKeyPair ()