diff --git a/SparkleShare/SparkleSetup.cs b/SparkleShare/SparkleSetup.cs index 069dbdef..6df1cbd1 100755 --- a/SparkleShare/SparkleSetup.cs +++ b/SparkleShare/SparkleSetup.cs @@ -166,13 +166,6 @@ namespace SparkleShare { PathEntry = new SparkleEntry (); AddressEntry = new SparkleEntry (); - Controller.SelectListPluginEvent += delegate (int index) { - Application.Invoke (delegate { - TreeSelection selection = tree.Selection; - TreePath path = new TreePath (index.ToString ()); - selection.SelectPath (path); - }); - }; // Select the first plugin by default TreeSelection default_selection = tree.Selection; @@ -182,14 +175,20 @@ namespace SparkleShare { Controller.ChangeAddressFieldEvent += delegate (string text, string example_text, FieldState state) { - + Console.WriteLine ("> " + text); Application.Invoke (delegate { AddressEntry.Text = text; AddressEntry.Sensitive = (state == FieldState.Enabled); - AddressEntry.ExampleText = example_text; - if (!string.IsNullOrEmpty (text)) + if (string.IsNullOrEmpty (example_text)) + AddressEntry.ExampleText = null; + else + AddressEntry.ExampleText = example_text; + + if (string.IsNullOrEmpty (text)) AddressEntry.ExampleTextActive = true; + else + AddressEntry.ExampleTextActive = false; }); }; @@ -199,10 +198,16 @@ namespace SparkleShare { Application.Invoke (delegate { PathEntry.Text = text; PathEntry.Sensitive = (state == FieldState.Enabled); - PathEntry.ExampleText = example_text; - if (!string.IsNullOrEmpty (text)) + if (string.IsNullOrEmpty (example_text)) + PathEntry.ExampleText = null; + else + PathEntry.ExampleText = example_text; + + if (string.IsNullOrEmpty (text)) PathEntry.ExampleTextActive = true; + else + PathEntry.ExampleTextActive = false; }); }; @@ -235,7 +240,7 @@ namespace SparkleShare { } if (!string.IsNullOrEmpty (address) && - address.Equals (Controller.PreviousServer)) { + address.Equals (Controller.PreviousAddress)) { tree.SetCursor (path, service_column, false); SparklePlugin plugin = (SparklePlugin) model.GetValue (iter, 2); diff --git a/SparkleShare/SparkleSetupController.cs b/SparkleShare/SparkleSetupController.cs index d9dfea81..317a7c27 100755 --- a/SparkleShare/SparkleSetupController.cs +++ b/SparkleShare/SparkleSetupController.cs @@ -282,24 +282,6 @@ namespace SparkleShare { if (ChangePathFieldEvent != null) ChangePathFieldEvent ("", "", FieldState.Enabled); } - - // TODO: previous server/folder doesn't work yet - - /* - if (!string.IsNullOrEmpty (PreviousServer) && SelectedPlugin.Address == null) { - if (ChangeAddressFieldEvent != null) { - ChangeAddressFieldEvent (this.previous_server, - SelectedPlugin.AddressExample, FieldState.Enabled); - } - } - - if (!string.IsNullOrEmpty (PreviousFolder) && SelectedPlugin.Path == null) { - if (ChangePathFieldEvent != null) { - ChangeAddressFieldEvent (this.previous_folder, - SelectedPlugin.PathExample, FieldState.Enabled); - } - } - */ } } diff --git a/data/icons/sparkleshare-android-36.png b/data/icons/sparkleshare-android-36.png new file mode 100644 index 00000000..84bf2bb9 Binary files /dev/null and b/data/icons/sparkleshare-android-36.png differ diff --git a/data/icons/sparkleshare-android-48.png b/data/icons/sparkleshare-android-48.png new file mode 100644 index 00000000..e858d598 Binary files /dev/null and b/data/icons/sparkleshare-android-48.png differ diff --git a/data/icons/sparkleshare-android-72.png b/data/icons/sparkleshare-android-72.png new file mode 100644 index 00000000..49d147ef Binary files /dev/null and b/data/icons/sparkleshare-android-72.png differ diff --git a/data/src/sparkleshare-android.svg b/data/src/sparkleshare-android.svg new file mode 100644 index 00000000..b4652309 --- /dev/null +++ b/data/src/sparkleshare-android.svg @@ -0,0 +1,3195 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Hylke Bons, Lapo Calamandrei + + + + + + folder + directory + share + dir + + + Derived from Jakub Steiner's design + + + + Hylke Bons, Lapo Calamandrei + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/po/POTFILES.in b/po/POTFILES.in index 0d8059da..6613bdfa 100755 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -7,7 +7,6 @@ data/plugins/github.xml.in data/plugins/gitorious.xml.in data/plugins/gnome.xml.in data/plugins/own-server.xml.in -data/plugins/redhat.xml.in SparkleShare/Mac/SparkleStatusIcon.cs SparkleShare/Mac/SparkleUI.cs SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in