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

don't scatter syncing state string changes all over the place

Browse source
This commit is contained in:
Hylke Bons 2010-06-12 17:21:03 +01:00
parent 232d5c0bb1
commit 44bc52b03b
1 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
SparkleShare/SparkleStatusIcon.cs
View file

@ -27,7 +27,7 @@ namespace SparkleShare {
public class SparkleStatusIcon : StatusIcon { public class SparkleStatusIcon : StatusIcon {
private Timer Timer; private Timer Timer;
private string StateText; private int SyncingState;
// Short alias for the translations // Short alias for the translations
public static string _ (string s) { public static string _ (string s) {
@ -45,7 +45,12 @@ namespace SparkleShare {
Timer = new Timer (); Timer = new Timer ();
Activate += ShowMenu; Activate += ShowMenu;
StateText = _("Everything is up to date");
// 0 = Everything up to date
// 1 = Syncing in progress
// -1 = Error syncing
SyncingState = 0;
SetIdleState (); SetIdleState ();
} }
@ -54,6 +59,19 @@ namespace SparkleShare {
Menu Menu = new Menu (); Menu Menu = new Menu ();
string StateText = "";
switch (SyncingState) {
case -1:
StateText = _("Error syncing");
break;
case 0:
StateText = _("Everything is up to date");
break;
case 1:
StateText = _("Syncing…");
break;
}
MenuItem StatusMenuItem = new MenuItem (StateText); MenuItem StatusMenuItem = new MenuItem (StateText);
StatusMenuItem.Sensitive = false; StatusMenuItem.Sensitive = false;
@ -146,15 +164,15 @@ namespace SparkleShare {
public void SetIdleState () { public void SetIdleState () {
Timer.Stop (); Timer.Stop ();
Pixbuf = SparkleHelpers.GetIcon ("folder-sparkleshare", 24); Pixbuf = SparkleHelpers.GetIcon ("folder-sparkleshare", 24);
StateText = _("Everything is up to date"); SyncingState = 0;
} }
// Changes the status icon to the suncing antimation // Changes the status icon to the syncing animation
// TODO: There are UI freezes when switching back and forth // TODO: There are UI freezes when switching back and forth
// bewteen syncing and idle state // bewteen syncing and idle state
public void SetSyncingState () { public void SetSyncingState () {
StateText = _("Syncing…"); SyncingState = 1;
int CycleDuration = 250; int CycleDuration = 250;
int CurrentStep = 0; int CurrentStep = 0;
@ -195,7 +213,7 @@ namespace SparkleShare {
// Changes the status icon to the error icon // Changes the status icon to the error icon
public void SetErrorState () { public void SetErrorState () {
IconName = "folder-sync-error"; IconName = "folder-sync-error";
StateText = _("Error syncing"); SyncingState = -1;
} }
public void SetPosition (Menu menu, out int x, out int y, public void SetPosition (Menu menu, out int x, out int y,