Code cleanup
This commit is contained in:
parent
cbac9e3d8d
commit
2cf5d9f8e6
|
@ -167,7 +167,7 @@ namespace SparkleShare {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private void ShowStepTwo ()
|
public void ShowStepTwo ()
|
||||||
{
|
{
|
||||||
|
|
||||||
Title = _("Add Remote Folder");
|
Title = _("Add Remote Folder");
|
||||||
|
@ -199,35 +199,41 @@ namespace SparkleShare {
|
||||||
|
|
||||||
HBox layout_server = new HBox (true, 0);
|
HBox layout_server = new HBox (true, 0);
|
||||||
|
|
||||||
ServerEntry = new Entry ("ssh://gitorious.org/sparkleshare");
|
ServerEntry = new Entry ("ssh://server.org/");
|
||||||
|
|
||||||
RadioButton radio_button = new RadioButton ("<b>" + _("On my own server:") + "</b>") {
|
|
||||||
Xalign = 0
|
|
||||||
};
|
|
||||||
|
|
||||||
|
RadioButton radio_button = new RadioButton ("<b>" + _("On my own server:") + "</b>");
|
||||||
layout_server.Add (radio_button);
|
layout_server.Add (radio_button);
|
||||||
layout_server.Add (ServerEntry);
|
layout_server.Add (ServerEntry);
|
||||||
|
|
||||||
|
string github_text = "<b>" + "Github" + "</b>\n" +
|
||||||
|
"<span fgcolor='#777' size='small'>" +
|
||||||
|
_("Github provides free hosting for Open Source projects, ") +
|
||||||
|
_("but also has paid accounts for extra space and bandwidth.") +
|
||||||
|
"</span>";
|
||||||
|
|
||||||
RadioButton radio_button_github = new RadioButton (radio_button, "<b>" + _("Github") + "</b>\n" +
|
RadioButton radio_button_github = new RadioButton (radio_button, github_text);
|
||||||
"<span fgcolor='#777'><small>Github provides free hosting for Open Source projects, " +
|
|
||||||
"but also has paid accounts for extra space and bandwidth.</small></span>") {
|
|
||||||
Xalign = 0
|
|
||||||
};
|
|
||||||
|
|
||||||
(radio_button_github.Child as Label).UseMarkup = true;
|
(radio_button_github.Child as Label).UseMarkup = true;
|
||||||
(radio_button_github.Child as Label).Wrap = true;
|
(radio_button_github.Child as Label).Wrap = true;
|
||||||
|
|
||||||
RadioButton radio_button_gnome = new RadioButton (radio_button, "<b>" + _("The GNOME Project") + "</b>\n" +
|
string gnome_text = "<b>" + _("The GNOME Project") + "</b>\n" +
|
||||||
"<span fgcolor='#777'><small>GNOME is an easy to understand interface to your computer. Select this option if you’re a developer or designer working on GNOME.</small></span>") {
|
"<span fgcolor='#777' size='small'>" +
|
||||||
Xalign = 0
|
_("GNOME is an easy to understand interface to your computer.") +
|
||||||
};
|
_("Select this option if you’re a developer or designer working on GNOME.") +
|
||||||
|
"</span>";
|
||||||
|
|
||||||
|
RadioButton radio_button_gnome = new RadioButton (radio_button, gnome_text);
|
||||||
|
|
||||||
(radio_button_gnome.Child as Label).UseMarkup = true;
|
(radio_button_gnome.Child as Label).UseMarkup = true;
|
||||||
(radio_button_gnome.Child as Label).Wrap = true;
|
(radio_button_gnome.Child as Label).Wrap = true;
|
||||||
|
|
||||||
RadioButton radio_button_gitorious = new RadioButton (radio_button, "<b>" + _("Gitorious") + "</b>\n" +
|
string gitorious_text = "<b>" + _("Gitorious") + "</b>\n" +
|
||||||
"<span fgcolor='#777'><small>Gitorious provides a completely Free and Open Source infrastructure for hosting Open Source projects.</small></span>") {
|
"<span fgcolor='#777' size='small'>" +
|
||||||
|
_("Gitorious provides a completely Free and Open Source infrastructure ") +
|
||||||
|
_("for hosting Open Source projects.") +
|
||||||
|
"</span>";
|
||||||
|
|
||||||
|
RadioButton radio_button_gitorious = new RadioButton (radio_button, gitorious_text) {
|
||||||
Xalign = 0
|
Xalign = 0
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -495,6 +501,7 @@ namespace SparkleShare {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Checks to see if an email address is valid
|
// Checks to see if an email address is valid
|
||||||
private bool IsValidEmail(string email)
|
private bool IsValidEmail(string email)
|
||||||
{
|
{
|
||||||
|
@ -504,6 +511,7 @@ namespace SparkleShare {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Checks if a url is a valid git url
|
// Checks if a url is a valid git url
|
||||||
private static bool IsGitUrl (string url)
|
private static bool IsGitUrl (string url)
|
||||||
{
|
{
|
||||||
|
@ -528,6 +536,7 @@ namespace SparkleShare {
|
||||||
return url;
|
return url;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -97,7 +97,7 @@ namespace SparkleShare {
|
||||||
|
|
||||||
// Fetch remote changes every minute
|
// Fetch remote changes every minute
|
||||||
FetchTimer = new Timer () {
|
FetchTimer = new Timer () {
|
||||||
Interval = 30000
|
Interval = 5000
|
||||||
};
|
};
|
||||||
|
|
||||||
FetchTimer.Elapsed += delegate {
|
FetchTimer.Elapsed += delegate {
|
||||||
|
|
|
@ -172,8 +172,9 @@ namespace SparkleShare {
|
||||||
|
|
||||||
add_item.Activated += delegate {
|
add_item.Activated += delegate {
|
||||||
|
|
||||||
// SparkleDialog dialog = new SparkleDialog ("");
|
SparkleIntro intro = new SparkleIntro ();
|
||||||
// dialog.ShowAll ();
|
intro.ShowStepTwo ();
|
||||||
|
intro.ShowAll ();
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -74,7 +74,7 @@ namespace SparkleShare {
|
||||||
if (!HideUI) {
|
if (!HideUI) {
|
||||||
|
|
||||||
// Show the intro screen if there are no folders
|
// Show the intro screen if there are no folders
|
||||||
if (Repositories.Count != 0) { //TODO: CHANGE THIS BACK LATER
|
if (Repositories.Count == 0) {
|
||||||
|
|
||||||
SparkleIntro intro = new SparkleIntro ();
|
SparkleIntro intro = new SparkleIntro ();
|
||||||
intro.ShowAll ();
|
intro.ShowAll ();
|
||||||
|
|
|
@ -4,7 +4,6 @@ hicolordir = $(DESTDIR)$(datadir)/icons/hicolor
|
||||||
|
|
||||||
theme_icons = \
|
theme_icons = \
|
||||||
animations,process-syncing-sparkleshare-24.png \
|
animations,process-syncing-sparkleshare-24.png \
|
||||||
animations,process-working-48.png \
|
|
||||||
places,folder-16.png \
|
places,folder-16.png \
|
||||||
places,folder-22.png \
|
places,folder-22.png \
|
||||||
places,folder-24.png \
|
places,folder-24.png \
|
||||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 20 KiB |
Loading…
Reference in a new issue