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

update style and remove status icon event

Browse source
This commit is contained in:
Hylke Bons 2012-10-20 18:35:57 +01:00
parent b91477ef2e
commit e1d8f073dd
5 changed files with 12 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
SparkleShare/Common/HTML/event-log.html
View file

@ -83,7 +83,7 @@
dl {
padding : 6px 0 0 0;
margin: 0 0 12px 0;
margin: 6px 0 9px 0;
table-layout: fixed;
}
@ -119,11 +119,11 @@
}
.event-entry {
padding: 24px 14px 14px 64px;
margin: 0 32px 0 32px;
border-bottom: 1px #ddd solid;
padding: 0 14px 0 64px;
margin: 28px 32px 28px 32px;
background-repeat: no-repeat;
background-position: 36px 24px;
min-height: 48px;
}
.event-user-name {

7
SparkleShare/Linux/SparkleStatusIcon.cs
View file

@ -129,13 +129,6 @@ namespace SparkleShare {
});
};
Controller.UpdateRecentEventsItemEvent += delegate (bool item_enabled) {
Application.Invoke (delegate {
this.recent_events_item.Sensitive = item_enabled;
this.recent_events_item.ShowAll ();
});
};
Controller.UpdateMenuEvent += delegate (IconState state) {
Application.Invoke (delegate {
CreateMenu ();

9
SparkleShare/Mac/SparkleStatusIcon.cs
View file

@ -161,15 +161,6 @@ namespace SparkleShare {
});
}
};
Controller.UpdateRecentEventsItemEvent += delegate (bool events_item_enabled) {
using (var a = new NSAutoreleasePool ())
{
InvokeOnMainThread (delegate {
this.recent_events_item.Enabled = events_item_enabled;
});
}
};
}

14
SparkleShare/SparkleStatusIconController.cs
View file

@ -45,9 +45,6 @@ namespace SparkleShare {
public event UpdateQuitItemEventHandler UpdateQuitItemEvent = delegate { };
public delegate void UpdateQuitItemEventHandler (bool quit_item_enabled);
public event UpdateRecentEventsItemEventHandler UpdateRecentEventsItemEvent = delegate { };
public delegate void UpdateRecentEventsItemEventHandler (bool recent_events_item_enabled);
public IconState CurrentState = IconState.Idle;
public string StateText = "Welcome to SparkleShare!";
@ -95,7 +92,7 @@ namespace SparkleShare {
public bool RecentEventsItemEnabled {
get {
return (Program.Controller.RepositoriesLoaded && Program.Controller.Folders.Count > 0);
return (Program.Controller.Folders.Count > 0);
}
}
@ -117,7 +114,6 @@ namespace SparkleShare {
UpdateFolders ();
UpdateStatusItemEvent (StateText);
UpdateRecentEventsItemEvent (RecentEventsItemEnabled);
UpdateMenuEvent (CurrentState);
};
@ -208,7 +204,13 @@ namespace SparkleShare {
public void RecentEventsClicked ()
{
new Thread (() => Program.Controller.ShowEventLogWindow ()).Start ();
new Thread (() => {
while (!Program.Controller.RepositoriesLoaded)
Thread.Sleep (100);
Program.Controller.ShowEventLogWindow ();
}).Start ();
}

7
SparkleShare/Windows/SparkleStatusIcon.cs
View file

@ -109,13 +109,6 @@ namespace SparkleShare {
this.exit_item.UpdateLayout ();
});
};
Controller.UpdateRecentEventsItemEvent += delegate (bool item_enabled) {
Dispatcher.BeginInvoke ((Action) delegate {
this.log_item.IsEnabled = item_enabled;
this.log_item.UpdateLayout ();
});
};
}