setup: put remembered servers before default ones
This commit is contained in:
parent
a382d76153
commit
8738f0eb42
|
@ -395,8 +395,7 @@ namespace SparkleShare {
|
||||||
case PageType.Syncing: {
|
case PageType.Syncing: {
|
||||||
|
|
||||||
Header = String.Format (_("Adding project ‘{0}’…"), Controller.SyncingFolder);
|
Header = String.Format (_("Adding project ‘{0}’…"), Controller.SyncingFolder);
|
||||||
Description = _("This may take a while.") + Environment.NewLine +
|
Description = Description = _("This may either take a short or a long time depending on the project's size.");
|
||||||
_("Are you sure it’s not coffee o'clock?");
|
|
||||||
|
|
||||||
this.progress_bar.Fraction = Controller.ProgressBarPercentage;
|
this.progress_bar.Fraction = Controller.ProgressBarPercentage;
|
||||||
|
|
||||||
|
|
|
@ -502,10 +502,8 @@ namespace SparkleShare {
|
||||||
}
|
}
|
||||||
|
|
||||||
case PageType.Syncing: {
|
case PageType.Syncing: {
|
||||||
|
|
||||||
Header = "Adding project ‘" + Controller.SyncingFolder + "’…";
|
Header = "Adding project ‘" + Controller.SyncingFolder + "’…";
|
||||||
Description = "This may take a while.\n" +
|
Description = "This may either take a short or a long time depending on the project's size.";
|
||||||
"Are you sure it’s not coffee o'clock?";
|
|
||||||
|
|
||||||
ProgressIndicator = new NSProgressIndicator () {
|
ProgressIndicator = new NSProgressIndicator () {
|
||||||
Frame = new RectangleF (190, Frame.Height - 200, 640 - 150 - 80, 20),
|
Frame = new RectangleF (190, Frame.Height - 200, 640 - 150 - 80, 20),
|
||||||
|
|
|
@ -135,12 +135,15 @@ namespace SparkleShare {
|
||||||
SyncingFolder = "";
|
SyncingFolder = "";
|
||||||
|
|
||||||
string local_plugins_path = SparklePlugin.LocalPluginsPath;
|
string local_plugins_path = SparklePlugin.LocalPluginsPath;
|
||||||
|
int local_plugins_count = 0;
|
||||||
|
|
||||||
// Import all of the plugins
|
// Import all of the plugins
|
||||||
if (Directory.Exists (local_plugins_path))
|
if (Directory.Exists (local_plugins_path))
|
||||||
// Local plugins go first...
|
// 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));
|
Plugins.Add (new SparklePlugin (xml_file_path));
|
||||||
|
local_plugins_count++;
|
||||||
|
}
|
||||||
|
|
||||||
// ...system plugins after that...
|
// ...system plugins after that...
|
||||||
if (Directory.Exists (Program.Controller.PluginsPath)) {
|
if (Directory.Exists (Program.Controller.PluginsPath)) {
|
||||||
|
@ -150,7 +153,7 @@ namespace SparkleShare {
|
||||||
Plugins.Insert (0, new SparklePlugin (xml_file_path));
|
Plugins.Insert (0, new SparklePlugin (xml_file_path));
|
||||||
|
|
||||||
} else if (xml_file_path.EndsWith ("ssnet.xml")) {
|
} 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 {
|
} else {
|
||||||
Plugins.Add (new SparklePlugin (xml_file_path));
|
Plugins.Add (new SparklePlugin (xml_file_path));
|
||||||
|
|
|
@ -439,9 +439,7 @@ namespace SparkleShare {
|
||||||
|
|
||||||
case PageType.Syncing: {
|
case PageType.Syncing: {
|
||||||
Header = "Adding project ‘" + Controller.SyncingFolder + "’…";
|
Header = "Adding project ‘" + Controller.SyncingFolder + "’…";
|
||||||
Description = "This may take a while.\n" +
|
Description = "This may either take a short or a long time depending on the project's size."
|
||||||
"Are you sure it’s not coffee o'clock?";
|
|
||||||
|
|
||||||
|
|
||||||
Button finish_button = new Button () {
|
Button finish_button = new Button () {
|
||||||
Content = "Finish",
|
Content = "Finish",
|
||||||
|
|
Loading…
Reference in a new issue