linux statusicon: Use app id variable for icon lookup
This commit is contained in:
parent
b944e9d0af
commit
eda316eb3c
|
@ -51,13 +51,13 @@ namespace SparkleShare {
|
||||||
if (use_appindicator) {
|
if (use_appindicator) {
|
||||||
#if HAVE_APP_INDICATOR
|
#if HAVE_APP_INDICATOR
|
||||||
indicator = new Indicator ("sparkleshare", "sparkleshare", (int) IndicatorCategory.ApplicationStatus) {
|
indicator = new Indicator ("sparkleshare", "sparkleshare", (int) IndicatorCategory.ApplicationStatus) {
|
||||||
IconName = "org.sparkleshare.SparkleShare-symbolic",
|
IconName = UserInterface.APP_ID + "-symbolic",
|
||||||
Status = (int) IndicatorStatus.Active
|
Status = (int) IndicatorStatus.Active
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
this.status_icon = new Gtk.StatusIcon { IconName = "org.sparkleshare.SparkleShare" };
|
this.status_icon = new Gtk.StatusIcon { IconName = UserInterface.APP_ID };
|
||||||
this.status_icon.Activate += ShowMenu; // Primary mouse button click
|
this.status_icon.Activate += ShowMenu; // Primary mouse button click
|
||||||
this.status_icon.PopupMenu += ShowMenu; // Secondary mouse button click
|
this.status_icon.PopupMenu += ShowMenu; // Secondary mouse button click
|
||||||
}
|
}
|
||||||
|
@ -127,7 +127,7 @@ namespace SparkleShare {
|
||||||
this.state_item = new MenuItem (Controller.StateText) { Sensitive = false };
|
this.state_item = new MenuItem (Controller.StateText) { Sensitive = false };
|
||||||
|
|
||||||
ImageMenuItem folder_item = new SparkleMenuItem ("SparkleShare");
|
ImageMenuItem folder_item = new SparkleMenuItem ("SparkleShare");
|
||||||
folder_item.Image = new Image (UserInterfaceHelpers.GetIcon ("org.sparkleshare.SparkleShare", 16));
|
folder_item.Image = new Image (UserInterfaceHelpers.GetIcon (UserInterface.APP_ID, 16));
|
||||||
folder_item.Submenu = new Menu ();
|
folder_item.Submenu = new Menu ();
|
||||||
|
|
||||||
this.menu.Add (this.state_item);
|
this.menu.Add (this.state_item);
|
||||||
|
|
|
@ -38,7 +38,7 @@ namespace SparkleShare
|
||||||
public string SecondaryTextColor;
|
public string SecondaryTextColor;
|
||||||
public string SecondaryTextColorSelected;
|
public string SecondaryTextColorSelected;
|
||||||
|
|
||||||
public readonly string APP_ID = "org.sparkleshare.SparkleShare.Nightly";
|
public static readonly string APP_ID = "org.sparkleshare.SparkleShare.Nightly";
|
||||||
Application application;
|
Application application;
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue