CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-06-28 03:00:22 +12:00
Code Issues Packages Projects Releases Wiki Activity

Updated actions toolbar icons

Browse source
This commit is contained in:
Jaex 2017-01-22 15:08:30 +03:00
parent 8c73f63afc
commit 436bbe3703
11 changed files with 112 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
ShareX/Properties/Resources.Designer.cs generated
View file

@ -182,6 +182,16 @@ public class Resources {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Bitmap application_home {
get {
object obj = ResourceManager.GetObject("application_home", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
@ -416,6 +426,26 @@ public class Resources {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Bitmap camcorder__arrow {
get {
object obj = ResourceManager.GetObject("camcorder__arrow", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Bitmap camcorder__exclamation {
get {
object obj = ResourceManager.GetObject("camcorder__exclamation", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
@ -553,6 +583,16 @@ public class Resources {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Bitmap clipboard_task {
get {
object obj = ResourceManager.GetObject("clipboard_task", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized string similar to Supported variables: {0} and other variables such as {1} etc..
/// </summary>
@ -573,6 +613,16 @@ public class Resources {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Bitmap clock__arrow {
get {
object obj = ResourceManager.GetObject("clock__arrow", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
@ -888,6 +938,16 @@ public class Resources {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Bitmap film__arrow {
get {
object obj = ResourceManager.GetObject("film__arrow", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
@ -1214,6 +1274,16 @@ public class Resources {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Bitmap layer__arrow {
get {
object obj = ResourceManager.GetObject("layer__arrow", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
@ -2115,7 +2185,7 @@ public class Resources {
/// </summary>
public static System.Drawing.Bitmap ui_toolbar__arrow {
get {
object obj = ResourceManager.GetObject("ui-toolbar--arrow", resourceCulture);
object obj = ResourceManager.GetObject("ui_toolbar__arrow", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}

23
ShareX/Properties/Resources.resx
View file

@ -873,7 +873,28 @@ Tray icon tasks:
<data name="ScreenColorPicker_UpdateControls_Start_screen_color_picker" xml:space="preserve">
<value>Start screen color picker</value>
</data>
<data name="ui-toolbar--arrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
<data name="ui_toolbar__arrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ui-toolbar--arrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="application_home" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\application-home.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="camcorder__arrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\camcorder--arrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="camcorder__exclamation" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\camcorder--exclamation.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="clipboard_task" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\clipboard-task.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="clock__arrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\clock--arrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="film__arrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\film--arrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="layer__arrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layer--arrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

BIN
ShareX/Resources/application-home.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 556 B

BIN
ShareX/Resources/camcorder--arrow.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 693 B

BIN
ShareX/Resources/camcorder--exclamation.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 756 B

BIN
ShareX/Resources/clipboard-task.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 605 B

BIN
ShareX/Resources/clock--arrow.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 758 B

BIN
ShareX/Resources/film--arrow.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 720 B

BIN
ShareX/Resources/layer--arrow.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 581 B

7
ShareX/ShareX.csproj
View file

@ -1333,6 +1333,13 @@
<None Include="Resources\drive-upload.png" />
<None Include="Resources\ui-splitter.png" />
<None Include="Resources\ui-toolbar--arrow.png" />
<None Include="Resources\layer--arrow.png" />
<None Include="Resources\clock--arrow.png" />
<None Include="Resources\camcorder--arrow.png" />
<None Include="Resources\film--arrow.png" />
<None Include="Resources\camcorder--exclamation.png" />
<None Include="Resources\application-home.png" />
<None Include="Resources\clipboard-task.png" />
<Content Include="ShareX_Icon.ico" />
<None Include="Resources\globe--pencil.png" />
<None Include="Resources\camcorder--pencil.png" />

24
ShareX/TaskHelpers.cs
View file

@ -1271,10 +1271,10 @@ public static Image GetHotkeyTypeIcon(HotkeyType hotkeyType)
case HotkeyType.FileUpload: return Resources.folder_open_document;
case HotkeyType.FolderUpload: return Resources.folder;
case HotkeyType.ClipboardUpload: return Resources.clipboard;
case HotkeyType.ClipboardUploadWithContentViewer: return Resources.clipboard; // TODO: Find better icon
case HotkeyType.ClipboardUploadWithContentViewer: return Resources.clipboard_task;
case HotkeyType.UploadURL: return Resources.drive;
case HotkeyType.DragDropUpload: return Resources.inbox;
case HotkeyType.StopUploads: return Resources.cross_button; // TODO: Find better icon
case HotkeyType.StopUploads: return Resources.cross_button;
// Screen capture
case HotkeyType.PrintScreen: return Resources.layer_fullscreen;
case HotkeyType.ActiveWindow: return Resources.application_blue;
@ -1282,23 +1282,23 @@ public static Image GetHotkeyTypeIcon(HotkeyType hotkeyType)
case HotkeyType.RectangleRegion: return Resources.layer_shape;
case HotkeyType.RectangleLight: return Resources.Rectangle;
case HotkeyType.RectangleTransparent: return Resources.layer_transparent;
case HotkeyType.CustomRegion: return Resources.layer_shape; // TODO: Find better icon
case HotkeyType.CustomRegion: return Resources.layer__arrow;
case HotkeyType.LastRegion: return Resources.layers;
case HotkeyType.ScrollingCapture: return Resources.ui_scroll_pane_image;
case HotkeyType.CaptureWebpage: return Resources.document_globe;
case HotkeyType.TextCapture: return Resources.edit_drop_cap;
case HotkeyType.AutoCapture: return Resources.clock;
case HotkeyType.StartAutoCapture: return Resources.clock; // TODO: Find better icon
case HotkeyType.StartAutoCapture: return Resources.clock__arrow;
// Screen record
case HotkeyType.ScreenRecorder: return Resources.camcorder_image;
case HotkeyType.ScreenRecorderActiveWindow: return Resources.camcorder_image; // TODO: Find better icon
case HotkeyType.ScreenRecorderCustomRegion: return Resources.camcorder_image; // TODO: Find better icon
case HotkeyType.StartScreenRecorder: return Resources.camcorder_image; // TODO: Find better icon
case HotkeyType.ScreenRecorderActiveWindow: return Resources.camcorder__arrow;
case HotkeyType.ScreenRecorderCustomRegion: return Resources.camcorder__arrow;
case HotkeyType.StartScreenRecorder: return Resources.camcorder__arrow;
case HotkeyType.ScreenRecorderGIF: return Resources.film;
case HotkeyType.ScreenRecorderGIFActiveWindow: return Resources.film; // TODO: Find better icon
case HotkeyType.ScreenRecorderGIFCustomRegion: return Resources.film; // TODO: Find better icon
case HotkeyType.StartScreenRecorderGIF: return Resources.film; // TODO: Find better icon
case HotkeyType.AbortScreenRecording: return Resources.cross_button; // TODO: Find better icon
case HotkeyType.ScreenRecorderGIFActiveWindow: return Resources.film__arrow;
case HotkeyType.ScreenRecorderGIFCustomRegion: return Resources.film__arrow;
case HotkeyType.StartScreenRecorderGIF: return Resources.film__arrow;
case HotkeyType.AbortScreenRecording: return Resources.camcorder__exclamation;
// Tools
case HotkeyType.ColorPicker: return Resources.color;
case HotkeyType.ScreenColorPicker: return Resources.pipette;
@ -1316,7 +1316,7 @@ public static Image GetHotkeyTypeIcon(HotkeyType hotkeyType)
case HotkeyType.MonitorTest: return Resources.monitor;
// Other
case HotkeyType.DisableHotkeys: return Resources.keyboard__minus;
case HotkeyType.OpenMainWindow: return Resources.tick_button; // TODO: Find better icon
case HotkeyType.OpenMainWindow: return Resources.application_home;
case HotkeyType.OpenScreenshotsFolder: return Resources.folder_open_image;
case HotkeyType.OpenHistory: return Resources.application_blog;
case HotkeyType.OpenImageHistory: return Resources.application_icon_large;