Fix icon names
This commit is contained in:
parent
cba043e5f0
commit
e6f3846fd4
|
@ -19,10 +19,11 @@ using System;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Timers;
|
using System.Timers;
|
||||||
|
|
||||||
using AppIndicator;
|
|
||||||
using Gtk;
|
using Gtk;
|
||||||
using Mono.Unix;
|
using Mono.Unix;
|
||||||
|
|
||||||
|
using AppIndicator;
|
||||||
|
|
||||||
namespace SparkleShare {
|
namespace SparkleShare {
|
||||||
|
|
||||||
// The statusicon that stays in the
|
// The statusicon that stays in the
|
||||||
|
@ -36,9 +37,10 @@ namespace SparkleShare {
|
||||||
private int FrameNumber;
|
private int FrameNumber;
|
||||||
private string StateText;
|
private string StateText;
|
||||||
private Menu Menu;
|
private Menu Menu;
|
||||||
|
|
||||||
private StatusIcon status_icon;
|
private StatusIcon status_icon;
|
||||||
private ApplicationIndicator indicator;
|
private ApplicationIndicator indicator;
|
||||||
private Menu menu;
|
|
||||||
// Short alias for the translations
|
// Short alias for the translations
|
||||||
public static string _ (string s)
|
public static string _ (string s)
|
||||||
{
|
{
|
||||||
|
@ -53,9 +55,10 @@ private Menu menu;
|
||||||
|
|
||||||
if (UseIndicator) {
|
if (UseIndicator) {
|
||||||
this.indicator = new ApplicationIndicator ("sparkleshare",
|
this.indicator = new ApplicationIndicator ("sparkleshare",
|
||||||
"folder", Category.ApplicationStatus);
|
"process-syncing-sparkleshare-i", Category.ApplicationStatus) {
|
||||||
|
|
||||||
indicator.Status = Status.Attention;
|
Status = Status.Attention
|
||||||
|
};
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
this.status_icon = new StatusIcon ();
|
this.status_icon = new StatusIcon ();
|
||||||
|
@ -135,11 +138,17 @@ private Menu menu;
|
||||||
else
|
else
|
||||||
FrameNumber = 0;
|
FrameNumber = 0;
|
||||||
|
|
||||||
|
string icon_name = "process-syncing-sparkleshare-";
|
||||||
|
|
||||||
|
for (int i = 0; i <= FrameNumber; i++)
|
||||||
|
icon_name += "i";
|
||||||
|
|
||||||
Application.Invoke (delegate {
|
Application.Invoke (delegate {
|
||||||
if (UseIndicator) {
|
if (UseIndicator) {
|
||||||
this.indicator.IconName = "folder-videos";
|
this.indicator.IconName = icon_name;
|
||||||
|
Console.WriteLine (icon_name);
|
||||||
} else {
|
} else {
|
||||||
this.status_icon.Pixbuf = AnimationFrames [FrameNumber];
|
this.status_icon.Pixbuf = SparkleUIHelpers.GetIcon (icon_name, 24);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
@ -176,7 +185,6 @@ private Menu menu;
|
||||||
|
|
||||||
// Creates a menu item for each repository with a link to their logs
|
// Creates a menu item for each repository with a link to their logs
|
||||||
foreach (string folder_name in SparkleShare.Controller.Folders) {
|
foreach (string folder_name in SparkleShare.Controller.Folders) {
|
||||||
|
|
||||||
Gdk.Pixbuf folder_icon;
|
Gdk.Pixbuf folder_icon;
|
||||||
|
|
||||||
if (SparkleShare.Controller.UnsyncedFolders.Contains (folder_name)) {
|
if (SparkleShare.Controller.UnsyncedFolders.Contains (folder_name)) {
|
||||||
|
@ -309,7 +317,6 @@ private Menu menu;
|
||||||
|
|
||||||
Menu.Add (status_menu_item);
|
Menu.Add (status_menu_item);
|
||||||
Menu.ReorderChild (status_menu_item, 0);
|
Menu.ReorderChild (status_menu_item, 0);
|
||||||
|
|
||||||
Menu.ShowAll ();
|
Menu.ShowAll ();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -345,18 +352,19 @@ private Menu menu;
|
||||||
|
|
||||||
Application.Invoke (delegate {
|
Application.Invoke (delegate {
|
||||||
if (UseIndicator) {
|
if (UseIndicator) {
|
||||||
this.indicator.IconName = "folder-pictures";
|
this.indicator.IconName = "process-syncing-sparkleshare-i";
|
||||||
} else {
|
} else {
|
||||||
this.status_icon.Pixbuf = AnimationFrames [0];
|
this.status_icon.Pixbuf = AnimationFrames [0];
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
if (error) {
|
if (error) {
|
||||||
StateText = _("Not everything is synced");
|
StateText = _("Not everything is synced");
|
||||||
|
|
||||||
Application.Invoke (delegate {
|
Application.Invoke (delegate {
|
||||||
if (UseIndicator) {
|
if (UseIndicator) {
|
||||||
this.indicator.IconName = "folder-music";
|
this.indicator.IconName = "sparkleshare-syncing-error";
|
||||||
} else {
|
} else {
|
||||||
this.status_icon.Pixbuf = SparkleUIHelpers.GetIcon ("sparkleshare-syncing-error", 24);
|
this.status_icon.Pixbuf = SparkleUIHelpers.GetIcon ("sparkleshare-syncing-error", 24);
|
||||||
}
|
}
|
||||||
|
@ -365,7 +373,7 @@ private Menu menu;
|
||||||
StateText = _("Up to date") + " (" + SparkleShare.Controller.FolderSize + ")";
|
StateText = _("Up to date") + " (" + SparkleShare.Controller.FolderSize + ")";
|
||||||
Application.Invoke (delegate {
|
Application.Invoke (delegate {
|
||||||
if (UseIndicator) {
|
if (UseIndicator) {
|
||||||
this.indicator.IconName = "folder-pictures";
|
this.indicator.IconName = "process-syncing-sparkleshare-i";
|
||||||
} else {
|
} else {
|
||||||
this.status_icon.Pixbuf = AnimationFrames [0];
|
this.status_icon.Pixbuf = AnimationFrames [0];
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,7 +8,12 @@ system_theme_icons = \
|
||||||
apps,folder-sparkleshare-24.png \
|
apps,folder-sparkleshare-24.png \
|
||||||
apps,folder-sparkleshare-256.png \
|
apps,folder-sparkleshare-256.png \
|
||||||
apps,folder-sparkleshare-32.png \
|
apps,folder-sparkleshare-32.png \
|
||||||
apps,folder-sparkleshare-48.png
|
apps,folder-sparkleshare-48.png \
|
||||||
|
status,process-syncing-sparkleshare-i-24.png \
|
||||||
|
status,process-syncing-sparkleshare-ii-24.png \
|
||||||
|
status,process-syncing-sparkleshare-iii-24.png \
|
||||||
|
status,process-syncing-sparkleshare-iiii-24.png \
|
||||||
|
status,process-syncing-sparkleshare-iiiii-24.png
|
||||||
|
|
||||||
app_theme_icons = \
|
app_theme_icons = \
|
||||||
animations,process-syncing-sparkleshare-24.png \
|
animations,process-syncing-sparkleshare-24.png \
|
||||||
|
|
BIN
data/icons/process-syncing-sparkleshare-i-24.png
Normal file
BIN
data/icons/process-syncing-sparkleshare-i-24.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 994 B |
BIN
data/icons/process-syncing-sparkleshare-ii-24.png
Normal file
BIN
data/icons/process-syncing-sparkleshare-ii-24.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1,002 B |
BIN
data/icons/process-syncing-sparkleshare-iii-24.png
Normal file
BIN
data/icons/process-syncing-sparkleshare-iii-24.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 990 B |
BIN
data/icons/process-syncing-sparkleshare-iiii-24.png
Normal file
BIN
data/icons/process-syncing-sparkleshare-iiii-24.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 989 B |
BIN
data/icons/process-syncing-sparkleshare-iiiii-24.png
Normal file
BIN
data/icons/process-syncing-sparkleshare-iiiii-24.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 993 B |
Loading…
Reference in a new issue