Changed from using the Properties Resource manager to using manually managed image resources
This commit is contained in:
Kenneth Skovhede
@@ -73,18 +73,14 @@
|
||||
</Reference>
|
||||
<Reference Include="gdk-sharp">
|
||||
<HintPath>..\..\..\thirdparty\appindicator-sharp\gdk-sharp.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="gtk-sharp">
|
||||
<HintPath>..\..\..\thirdparty\appindicator-sharp\gtk-sharp.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="MonoMac">
|
||||
<HintPath>..\..\..\thirdparty\MonoMac\MonoMac.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="IBrowserWindow.cs" />
|
||||
@@ -152,6 +148,26 @@
|
||||
</None>
|
||||
<None Include="OSX app help\Info.plist" />
|
||||
<None Include="OSX app help\MainMenu.xib" />
|
||||
<EmbeddedResource Include="Resources\CloseMenuIcon.png" />
|
||||
<EmbeddedResource Include="Resources\SettingsMenuIcon.png" />
|
||||
<EmbeddedResource Include="Resources\StatusMenuIcon.png" />
|
||||
<EmbeddedResource Include="Resources\WizardMenuIcon.png" />
|
||||
<EmbeddedResource Include="Resources\Clock05.png" />
|
||||
<EmbeddedResource Include="Resources\Clock15.png" />
|
||||
<EmbeddedResource Include="Resources\Clock30.png" />
|
||||
<EmbeddedResource Include="Resources\Clock60.png" />
|
||||
<EmbeddedResource Include="Resources\Delay.png" />
|
||||
<EmbeddedResource Include="Resources\Throttle.png" />
|
||||
<EmbeddedResource Include="Resources\Stop.png" />
|
||||
<EmbeddedResource Include="Resources\TrayNormal.ico" />
|
||||
<EmbeddedResource Include="Resources\TrayNormalError.ico" />
|
||||
<EmbeddedResource Include="Resources\TrayNormalPause.ico" />
|
||||
<EmbeddedResource Include="Resources\TrayNormalWarning.ico" />
|
||||
<EmbeddedResource Include="Resources\TrayWorking.ico" />
|
||||
<EmbeddedResource Include="Resources\TrayWorkingPause.ico" />
|
||||
<EmbeddedResource Include="Resources\Pause.png" />
|
||||
<EmbeddedResource Include="Resources\Play.png" />
|
||||
<Compile Include="ImageLoader.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\Library\Backend\CloudFiles\Duplicati.Library.Backend.CloudFiles.csproj">
|
||||
@@ -166,10 +182,6 @@
|
||||
<Project>{F61679A9-E5DE-468A-B5A4-05F92D0143D2}</Project>
|
||||
<Name>Duplicati.Library.Backend.FTP</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\Library\Backend\GoogleDocs\Duplicati.Library.Backend.GoogleDocs.csproj">
|
||||
<Project>{42C91180-11EB-4590-82EA-80FE9D4DEBEC}</Project>
|
||||
<Name>Duplicati.Library.Backend.GoogleDocs</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\Library\Backend\S3\Duplicati.Library.Backend.S3.csproj">
|
||||
<Project>{C03F6DFD-805A-4BE0-9338-64870ADDB4A2}</Project>
|
||||
<Name>Duplicati.Library.Backend.S3</Name>
|
||||
@@ -222,6 +234,10 @@
|
||||
<Project>{E2AF781D-D1E1-4512-BF2C-D6DA8D0F797F}</Project>
|
||||
<Name>Duplicati.CommandLine.Decrypter</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\Library\Backend\GoogleDocs\Duplicati.Library.Backend.GoogleDocs.csproj">
|
||||
<Project>{42C91180-11EB-4590-82EA-80FE9D4DEBEC}</Project>
|
||||
<Name>Duplicati.Library.Backend.GoogleDocs</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<BootstrapperPackage Include=".NETFramework,Version=v4.0">
|
||||
@@ -245,63 +261,6 @@
|
||||
<Install>true</Install>
|
||||
</BootstrapperPackage>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Resources\CloseMenuIcon.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Resources\SettingsMenuIcon.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Resources\StatusMenuIcon.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Resources\WizardMenuIcon.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Resources\Clock05.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Resources\Clock15.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Resources\Clock30.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Resources\Clock60.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Resources\Delay.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Resources\Throttle.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Resources\Stop.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Resources\TrayNormal.ico" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Resources\TrayNormalError.ico" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Resources\TrayNormalPause.ico" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Resources\TrayNormalWarning.ico" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Resources\TrayWorking.ico" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Resources\TrayWorkingPause.ico" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Resources\Pause.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Resources\Play.png" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<ItemGroup>
|
||||
<Content Include="OSX Icons\normal.png">
|
||||
|
||||
@@ -55,16 +55,16 @@ namespace Duplicati.GUI.TrayIcon
|
||||
_icons[icon] = null;
|
||||
break;
|
||||
case MenuIcons.Pause:
|
||||
_icons[icon] = ImageToGtk(Properties.Resources.Pause);
|
||||
_icons[icon] = ImageToGtk(ImageLoader.Pause);
|
||||
break;
|
||||
case MenuIcons.Quit:
|
||||
_icons[icon] = ImageToGtk(Properties.Resources.CloseMenuIcon);
|
||||
_icons[icon] = ImageToGtk(ImageLoader.CloseMenuIcon);
|
||||
break;
|
||||
case MenuIcons.Resume:
|
||||
_icons[icon] = ImageToGtk(Properties.Resources.Play);
|
||||
_icons[icon] = ImageToGtk(ImageLoader.Play);
|
||||
break;
|
||||
case MenuIcons.Status:
|
||||
_icons[icon] = ImageToGtk(Properties.Resources.StatusMenuIcon);
|
||||
_icons[icon] = ImageToGtk(ImageLoader.StatusMenuIcon);
|
||||
break;
|
||||
default:
|
||||
_icons[icon] = null;
|
||||
@@ -221,23 +221,23 @@ namespace Duplicati.GUI.TrayIcon
|
||||
switch(icon)
|
||||
{
|
||||
case TrayIcons.Paused:
|
||||
_images[icon] = ImageToPixbuf(Properties.Resources.TrayNormalPause.ToBitmap());
|
||||
_images[icon] = ImageToPixbuf(ImageLoader.TrayNormalPause.ToBitmap());
|
||||
break;
|
||||
case TrayIcons.Running:
|
||||
_images[icon] = ImageToPixbuf(Properties.Resources.TrayWorking.ToBitmap());
|
||||
_images[icon] = ImageToPixbuf(ImageLoader.TrayWorking.ToBitmap());
|
||||
break;
|
||||
case TrayIcons.IdleError:
|
||||
_images[icon] = ImageToPixbuf(Properties.Resources.TrayNormalError.ToBitmap());
|
||||
_images[icon] = ImageToPixbuf(ImageLoader.TrayNormalError.ToBitmap());
|
||||
break;
|
||||
case TrayIcons.RunningError:
|
||||
_images[icon] = ImageToPixbuf(Properties.Resources.TrayWorking.ToBitmap());
|
||||
_images[icon] = ImageToPixbuf(ImageLoader.TrayWorking.ToBitmap());
|
||||
break;
|
||||
case TrayIcons.PausedError:
|
||||
_images[icon] = ImageToPixbuf(Properties.Resources.TrayNormalPause.ToBitmap());
|
||||
_images[icon] = ImageToPixbuf(ImageLoader.TrayNormalPause.ToBitmap());
|
||||
break;
|
||||
case TrayIcons.Idle:
|
||||
default:
|
||||
_images[icon] = ImageToPixbuf(Properties.Resources.TrayNormal.ToBitmap());
|
||||
_images[icon] = ImageToPixbuf(ImageLoader.TrayNormal.ToBitmap());
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,79 @@
|
||||
// Copyright (C) 2014, Kenneth Skovhede
|
||||
|
||||
// http://www.hexad.dk, opensource@hexad.dk
|
||||
//
|
||||
// This library is free software; you can redistribute it and/or modify
|
||||
// it under the terms of the GNU Lesser General Public License as
|
||||
// published by the Free Software Foundation; either version 2.1 of the
|
||||
// License, or (at your option) any later version.
|
||||
//
|
||||
// This library is distributed in the hope that it will be useful, but
|
||||
// WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
// Lesser General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU Lesser General Public
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
using System;
|
||||
using System.Drawing;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace Duplicati.GUI.TrayIcon
|
||||
{
|
||||
public static class ImageLoaderMac
|
||||
{
|
||||
public static Icon LoadFromStream(System.IO.Stream s)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public static class ImageLoader
|
||||
{
|
||||
private static readonly string PREFIX = System.Reflection.Assembly.GetExecutingAssembly().GetName().Name + ".";
|
||||
private static readonly Dictionary<string, Bitmap> BITMAPS = new Dictionary<string, Bitmap>();
|
||||
private static readonly Dictionary<string, Icon> ICONS = new Dictionary<string, Icon>();
|
||||
private static readonly object LOCK = new object();
|
||||
|
||||
private static Bitmap LoadImage(string filename)
|
||||
{
|
||||
Bitmap bmp;
|
||||
if (BITMAPS.TryGetValue(filename, out bmp))
|
||||
return bmp;
|
||||
|
||||
lock(LOCK)
|
||||
if (!BITMAPS.TryGetValue(filename, out bmp))
|
||||
return BITMAPS[filename] = (Bitmap)Image.FromStream(System.Reflection.Assembly.GetExecutingAssembly().GetManifestResourceStream(PREFIX + filename));
|
||||
|
||||
return BITMAPS[filename];
|
||||
}
|
||||
|
||||
private static Icon LoadIcon(string filename)
|
||||
{
|
||||
Icon ico;
|
||||
if (ICONS.TryGetValue(filename, out ico))
|
||||
return ico;
|
||||
|
||||
lock(LOCK)
|
||||
if (!ICONS.TryGetValue(filename, out ico))
|
||||
return ICONS[filename] = new Icon(System.Reflection.Assembly.GetExecutingAssembly().GetManifestResourceStream(PREFIX + filename));
|
||||
|
||||
return ICONS[filename];
|
||||
}
|
||||
|
||||
public static Icon TrayNormal { get { return LoadIcon("Resources.TrayNormal.ico"); } }
|
||||
public static Icon TrayNormalError { get { return LoadIcon("Resources.TrayNormalError.ico"); } }
|
||||
public static Icon TrayNormalPause { get { return LoadIcon("Resources.TrayNormalPause.ico"); } }
|
||||
public static Icon TrayNormalWarning { get { return LoadIcon("Resources.TrayNormalWarning.ico"); } }
|
||||
public static Icon TrayWorking { get { return LoadIcon("Resources.TrayWorking.ico"); } }
|
||||
public static Icon TrayWorkingPause { get { return LoadIcon("Resources.TrayWorkingPause.ico"); } }
|
||||
|
||||
public static Bitmap Pause { get { return LoadImage("Resources.Pause.png"); } }
|
||||
public static Bitmap Play { get { return LoadImage("Resources.Play.png"); } }
|
||||
public static Bitmap CloseMenuIcon { get { return LoadImage("Resources.CloseMenuIcon.png"); } }
|
||||
public static Bitmap StatusMenuIcon { get { return LoadImage("Resources.StatusMenuIcon.png"); } }
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
+49
-196
@@ -1,196 +1,49 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
// Runtime Version:4.0.30319.239
|
||||
//
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace Duplicati.GUI.TrayIcon.Properties {
|
||||
using System;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// A strongly-typed resource class, for looking up localized strings, etc.
|
||||
/// </summary>
|
||||
// This class was auto-generated by the StronglyTypedResourceBuilder
|
||||
// class via a tool like ResGen or Visual Studio.
|
||||
// To add or remove a member, edit your .ResX file then rerun ResGen
|
||||
// with the /str option, or rebuild your VS project.
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
||||
internal class Resources {
|
||||
|
||||
private static global::System.Resources.ResourceManager resourceMan;
|
||||
|
||||
private static global::System.Globalization.CultureInfo resourceCulture;
|
||||
|
||||
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
|
||||
internal Resources() {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Returns the cached ResourceManager instance used by this class.
|
||||
/// </summary>
|
||||
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
|
||||
internal static global::System.Resources.ResourceManager ResourceManager {
|
||||
get {
|
||||
if (object.ReferenceEquals(resourceMan, null)) {
|
||||
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Duplicati.GUI.TrayIcon.Properties.Resources", typeof(Resources).Assembly);
|
||||
resourceMan = temp;
|
||||
}
|
||||
return resourceMan;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Overrides the current thread's CurrentUICulture property for all
|
||||
/// resource lookups using this strongly typed resource class.
|
||||
/// </summary>
|
||||
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
|
||||
internal static global::System.Globalization.CultureInfo Culture {
|
||||
get {
|
||||
return resourceCulture;
|
||||
}
|
||||
set {
|
||||
resourceCulture = value;
|
||||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap Clock05 {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("Clock05", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap Clock15 {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("Clock15", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap Clock30 {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("Clock30", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap Clock60 {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("Clock60", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap CloseMenuIcon {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("CloseMenuIcon", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap Delay {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("Delay", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap Pause {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("Pause", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap Play {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("Play", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap SettingsMenuIcon {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("SettingsMenuIcon", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap StatusMenuIcon {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("StatusMenuIcon", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap Stop {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("Stop", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap Throttle {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("Throttle", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Icon TrayNormal {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("TrayNormal", resourceCulture);
|
||||
return ((System.Drawing.Icon)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Icon TrayNormalError {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("TrayNormalError", resourceCulture);
|
||||
return ((System.Drawing.Icon)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Icon TrayNormalPause {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("TrayNormalPause", resourceCulture);
|
||||
return ((System.Drawing.Icon)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Icon TrayNormalWarning {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("TrayNormalWarning", resourceCulture);
|
||||
return ((System.Drawing.Icon)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Icon TrayWorking {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("TrayWorking", resourceCulture);
|
||||
return ((System.Drawing.Icon)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Icon TrayWorkingPause {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("TrayWorkingPause", resourceCulture);
|
||||
return ((System.Drawing.Icon)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap WizardMenuIcon {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("WizardMenuIcon", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// ------------------------------------------------------------------------------
|
||||
// <autogenerated>
|
||||
// This code was generated by a tool.
|
||||
// Mono Runtime Version: 4.0.30319.17020
|
||||
//
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
// </autogenerated>
|
||||
// ------------------------------------------------------------------------------
|
||||
|
||||
namespace Duplicati.GUI.TrayIcon.Properties {
|
||||
using System;
|
||||
|
||||
|
||||
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
|
||||
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
||||
internal class Resources {
|
||||
|
||||
private static System.Resources.ResourceManager resourceMan;
|
||||
|
||||
private static System.Globalization.CultureInfo resourceCulture;
|
||||
|
||||
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
|
||||
internal Resources() {
|
||||
}
|
||||
|
||||
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
|
||||
internal static System.Resources.ResourceManager ResourceManager {
|
||||
get {
|
||||
if (object.Equals(null, resourceMan)) {
|
||||
System.Resources.ResourceManager temp = new System.Resources.ResourceManager("Duplicati.GUI.TrayIcon.Properties.Resources", typeof(Resources).Assembly);
|
||||
resourceMan = temp;
|
||||
}
|
||||
return resourceMan;
|
||||
}
|
||||
}
|
||||
|
||||
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
|
||||
internal static System.Globalization.CultureInfo Culture {
|
||||
get {
|
||||
return resourceCulture;
|
||||
}
|
||||
set {
|
||||
resourceCulture = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -118,61 +118,4 @@
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<data name="Clock05" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Clock05.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Clock15" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Clock15.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Clock30" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Clock30.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Clock60" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Clock60.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="CloseMenuIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\CloseMenuIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Delay" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Delay.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Pause" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Pause.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Play" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Play.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="SettingsMenuIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\SettingsMenuIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="StatusMenuIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\StatusMenuIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Stop" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Stop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Throttle" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Throttle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="TrayNormal" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\TrayNormal.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="TrayNormalError" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\TrayNormalError.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="TrayNormalPause" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\TrayNormalPause.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="TrayNormalWarning" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\TrayNormalWarning.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="TrayWorking" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\TrayWorking.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="TrayWorkingPause" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\TrayWorkingPause.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="WizardMenuIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\WizardMenuIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
</root>
|
||||
@@ -64,13 +64,13 @@ namespace Duplicati.GUI.TrayIcon.Windows
|
||||
switch(icon)
|
||||
{
|
||||
case MenuIcons.Pause:
|
||||
return Properties.Resources.Pause;
|
||||
return ImageLoader.Pause;
|
||||
case MenuIcons.Quit:
|
||||
return Properties.Resources.CloseMenuIcon;
|
||||
return ImageLoader.CloseMenuIcon;
|
||||
case MenuIcons.Resume:
|
||||
return Properties.Resources.Play;
|
||||
return ImageLoader.Play;
|
||||
case MenuIcons.Status:
|
||||
return Properties.Resources.StatusMenuIcon;
|
||||
return ImageLoader.StatusMenuIcon;
|
||||
case MenuIcons.None:
|
||||
default:
|
||||
return null;
|
||||
@@ -167,23 +167,23 @@ namespace Duplicati.GUI.TrayIcon.Windows
|
||||
switch (value)
|
||||
{
|
||||
case TrayIcons.IdleError:
|
||||
m_trayIcon.Icon = Properties.Resources.TrayNormalError;
|
||||
m_trayIcon.Icon = ImageLoader.TrayNormalError;
|
||||
break;
|
||||
case TrayIcons.Paused:
|
||||
m_trayIcon.Icon = Properties.Resources.TrayNormalPause;
|
||||
m_trayIcon.Icon = ImageLoader.TrayNormalPause;
|
||||
break;
|
||||
case TrayIcons.PausedError:
|
||||
m_trayIcon.Icon = Properties.Resources.TrayNormalPause;
|
||||
m_trayIcon.Icon = ImageLoader.TrayNormalPause;
|
||||
break;
|
||||
case TrayIcons.Running:
|
||||
m_trayIcon.Icon = Properties.Resources.TrayWorking;
|
||||
m_trayIcon.Icon = ImageLoader.TrayWorking;
|
||||
break;
|
||||
case TrayIcons.RunningError:
|
||||
m_trayIcon.Icon = Properties.Resources.TrayWorking;
|
||||
m_trayIcon.Icon = ImageLoader.TrayWorking;
|
||||
break;
|
||||
case TrayIcons.Idle:
|
||||
default:
|
||||
m_trayIcon.Icon = Properties.Resources.TrayNormal;
|
||||
m_trayIcon.Icon = ImageLoader.TrayNormal;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user