beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

setup: put remembered servers before default ones

Browse source
This commit is contained in:
Hylke Bons 2012-04-23 21:55:21 +02:00
parent a382d76153
commit 8738f0eb42
4 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
SparkleShare/Linux/SparkleSetup.cs
View file

@ -395,8 +395,7 @@ namespace SparkleShare {
case PageType.Syncing: {
Header = String.Format (_("Adding project ‘{0}’…"), Controller.SyncingFolder);
Description = _("This may take a while.") + Environment.NewLine +
_("Are you sure it’s not coffee o'clock?");
Description = Description = _("This may either take a short or a long time depending on the project's size.");
this.progress_bar.Fraction = Controller.ProgressBarPercentage;

6
SparkleShare/Mac/SparkleSetup.cs
View file

@ -502,11 +502,9 @@ namespace SparkleShare {
}
case PageType.Syncing: {
Header = "Adding project ‘" + Controller.SyncingFolder + "’…";
Description = "This may take a while.\n" +
"Are you sure it’s not coffee o'clock?";
Description = "This may either take a short or a long time depending on the project's size.";
ProgressIndicator = new NSProgressIndicator () {
Frame = new RectangleF (190, Frame.Height - 200, 640 - 150 - 80, 20),
Style = NSProgressIndicatorStyle.Bar,

7
SparkleShare/SparkleSetupController.cs
View file

@ -135,12 +135,15 @@ namespace SparkleShare {
SyncingFolder = "";
string local_plugins_path = SparklePlugin.LocalPluginsPath;
int local_plugins_count = 0;
// Import all of the plugins
if (Directory.Exists (local_plugins_path))
// Local plugins go first...
foreach (string xml_file_path in Directory.GetFiles (local_plugins_path, "*.xml"))
foreach (string xml_file_path in Directory.GetFiles (local_plugins_path, "*.xml")) {
Plugins.Add (new SparklePlugin (xml_file_path));
local_plugins_count++;
}
// ...system plugins after that...
if (Directory.Exists (Program.Controller.PluginsPath)) {
@ -150,7 +153,7 @@ namespace SparkleShare {
Plugins.Insert (0, new SparklePlugin (xml_file_path));
} else if (xml_file_path.EndsWith ("ssnet.xml")) {
Plugins.Insert (1, new SparklePlugin (xml_file_path));
Plugins.Insert ((local_plugins_count + 1), new SparklePlugin (xml_file_path));
} else {
Plugins.Add (new SparklePlugin (xml_file_path));

4
SparkleShare/Windows/SparkleSetup.cs
View file

@ -439,9 +439,7 @@ namespace SparkleShare {
case PageType.Syncing: {
Header = "Adding project ‘" + Controller.SyncingFolder + "’…";
Description = "This may take a while.\n" +
"Are you sure it’s not coffee o'clock?";
Description = "This may either take a short or a long time depending on the project's size."
Button finish_button = new Button () {
Content = "Finish",