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

Update Twitter icon

Browse source
This commit is contained in:
Jaex 2021-01-14 02:30:44 +03:00
parent 876157f201
commit a74b669780
8 changed files with 532 additions and 575 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
ShareX/Forms/MainForm.Designer.cs generated
View file

@ -287,10 +287,8 @@ private void InitializeComponent()
this.timerTraySingleClick = new System.Windows.Forms.Timer(this.components);
this.pNews = new System.Windows.Forms.Panel();
this.btnCloseNews = new System.Windows.Forms.Button();
this.ucNews = new ShareX.NewsListControl();
this.pThumbnailView = new System.Windows.Forms.Panel();
this.lblThumbnailViewTip = new System.Windows.Forms.Label();
this.ucTaskThumbnailView = new ShareX.TaskThumbnailView();
this.ttMain = new System.Windows.Forms.ToolTip(this.components);
this.pToolbars = new System.Windows.Forms.Panel();
this.tsSocialButtons = new ShareX.HelpersLib.ToolStripBorderRight();
@ -299,6 +297,8 @@ private void InitializeComponent()
this.tsbPatreon = new System.Windows.Forms.ToolStripButton();
this.tsbBitcoin = new System.Windows.Forms.ToolStripButton();
this.tsbGitHub = new System.Windows.Forms.ToolStripButton();
this.ucNews = new ShareX.NewsListControl();
this.ucTaskThumbnailView = new ShareX.TaskThumbnailView();
((System.ComponentModel.ISupportInitialize)(this.scMain)).BeginInit();
this.scMain.Panel1.SuspendLayout();
this.scMain.Panel2.SuspendLayout();
@ -812,7 +812,7 @@ private void InitializeComponent()
//
// tsmiTweetMessage
//
this.tsmiTweetMessage.Image = global::ShareX.Properties.Resources.Twitter;
this.tsmiTweetMessage.Image = global::ShareX.Properties.Resources.Twitter_16x16;
this.tsmiTweetMessage.Name = "tsmiTweetMessage";
resources.ApplyResources(this.tsmiTweetMessage, "tsmiTweetMessage");
this.tsmiTweetMessage.Click += new System.EventHandler(this.tsmiTweetMessage_Click);
@ -2007,7 +2007,7 @@ private void InitializeComponent()
//
// tsmiTrayTweetMessage
//
this.tsmiTrayTweetMessage.Image = global::ShareX.Properties.Resources.Twitter;
this.tsmiTrayTweetMessage.Image = global::ShareX.Properties.Resources.Twitter_16x16;
this.tsmiTrayTweetMessage.Name = "tsmiTrayTweetMessage";
resources.ApplyResources(this.tsmiTrayTweetMessage, "tsmiTrayTweetMessage");
this.tsmiTrayTweetMessage.Click += new System.EventHandler(this.tsmiTweetMessage_Click);
@ -2282,12 +2282,6 @@ private void InitializeComponent()
this.btnCloseNews.UseVisualStyleBackColor = true;
this.btnCloseNews.Click += new System.EventHandler(this.btnCloseNews_Click);
//
// ucNews
//
this.ucNews.BackColor = System.Drawing.SystemColors.Window;
resources.ApplyResources(this.ucNews, "ucNews");
this.ucNews.Name = "ucNews";
//
// pThumbnailView
//
this.pThumbnailView.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(47)))), ((int)(((byte)(56)))));
@ -2305,18 +2299,6 @@ private void InitializeComponent()
this.lblThumbnailViewTip.UseMnemonic = false;
this.lblThumbnailViewTip.MouseUp += new System.Windows.Forms.MouseEventHandler(this.LblThumbnailViewTip_MouseUp);
//
// ucTaskThumbnailView
//
resources.ApplyResources(this.ucTaskThumbnailView, "ucTaskThumbnailView");
this.ucTaskThumbnailView.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(47)))), ((int)(((byte)(56)))));
this.ucTaskThumbnailView.Name = "ucTaskThumbnailView";
this.ucTaskThumbnailView.ThumbnailSize = new System.Drawing.Size(200, 150);
this.ucTaskThumbnailView.TitleLocation = ShareX.ThumbnailTitleLocation.Top;
this.ucTaskThumbnailView.TitleVisible = true;
this.ucTaskThumbnailView.ContextMenuRequested += new ShareX.TaskThumbnailView.TaskViewMouseEventHandler(this.UcTaskView_ContextMenuRequested);
this.ucTaskThumbnailView.SelectedPanelChanged += new System.EventHandler(this.ucTaskThumbnailView_SelectedPanelChanged);
this.ucTaskThumbnailView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.lvUploads_KeyDown);
//
// ttMain
//
this.ttMain.AutoPopDelay = 5000;
@ -2393,6 +2375,24 @@ private void InitializeComponent()
this.tsbGitHub.Padding = new System.Windows.Forms.Padding(1);
this.tsbGitHub.Click += new System.EventHandler(this.TsbGitHub_Click);
//
// ucNews
//
this.ucNews.BackColor = System.Drawing.SystemColors.Window;
resources.ApplyResources(this.ucNews, "ucNews");
this.ucNews.Name = "ucNews";
//
// ucTaskThumbnailView
//
resources.ApplyResources(this.ucTaskThumbnailView, "ucTaskThumbnailView");
this.ucTaskThumbnailView.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(47)))), ((int)(((byte)(56)))));
this.ucTaskThumbnailView.Name = "ucTaskThumbnailView";
this.ucTaskThumbnailView.ThumbnailSize = new System.Drawing.Size(200, 150);
this.ucTaskThumbnailView.TitleLocation = ShareX.ThumbnailTitleLocation.Top;
this.ucTaskThumbnailView.TitleVisible = true;
this.ucTaskThumbnailView.ContextMenuRequested += new ShareX.TaskThumbnailView.TaskViewMouseEventHandler(this.UcTaskView_ContextMenuRequested);
this.ucTaskThumbnailView.SelectedPanelChanged += new System.EventHandler(this.ucTaskThumbnailView_SelectedPanelChanged);
this.ucTaskThumbnailView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.lvUploads_KeyDown);
//
// MainForm
//
this.AllowDrop = true;

937
ShareX/Forms/MainForm.resx
View file

File diff suppressed because it is too large Load diff

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

@ -2737,9 +2737,9 @@ public class Resources {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Bitmap Twitter {
public static System.Drawing.Bitmap Twitter_16x16 {
get {
object obj = ResourceManager.GetObject("Twitter", resourceCulture);
object obj = ResourceManager.GetObject("Twitter-16x16", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@ -2749,7 +2749,7 @@ public class Resources {
/// </summary>
public static System.Drawing.Bitmap Twitter_32x32 {
get {
object obj = ResourceManager.GetObject("Twitter_32x32", resourceCulture);
object obj = ResourceManager.GetObject("Twitter-32x32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}

114
ShareX/Properties/Resources.resx
View file

@ -124,9 +124,6 @@
<data name="kr" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\kr.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="jp" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\jp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="AutoCaptureForm_UpdateStatus_Timeleft___0_s___1____Total___2_" xml:space="preserve">
<value>Timeleft: {0}s ({1}%) Total: {2}</value>
</data>
@ -232,6 +229,9 @@
<data name="control" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\control.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="heart" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\heart.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="AboutForm_AboutForm_Changelog" xml:space="preserve">
<value>Changelog</value>
</data>
@ -264,11 +264,6 @@ Would you like to restart ShareX?</value>
<data name="AboutForm_AboutForm_Language_id_ID" xml:space="preserve">
<value>Indonesian</value>
</data>
<data name="ActionsToolbar_Tip" xml:space="preserve">
<value>Hold left down to drag
Right click to open menu
Middle click to close</value>
</data>
<data name="application_browser" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\application-browser.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -290,9 +285,6 @@ Middle click to close</value>
<data name="MainForm_UpdateMainFormTip_Currently_configured_hotkeys_" xml:space="preserve">
<value>Currently configured hotkeys:</value>
</data>
<data name="TaskSettingsForm_UpdateUploaderMenuNames_URL_shortener___0_" xml:space="preserve">
<value>URL shortener: {0}</value>
</data>
<data name="TaskManager_CreateListViewItem_History" xml:space="preserve">
<value>History</value>
</data>
@ -308,9 +300,6 @@ Middle click to close</value>
<data name="ScreenRecordForm_StartRecording_FFmpeg_video_and_audio_source_both_can_t_be__None__" xml:space="preserve">
<value>FFmpeg video and audio source can't both be "None".</value>
</data>
<data name="crown" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\crown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="QuickTaskMenuEditorForm_Reset_all_quick_tasks_to_defaults_Confirmation" xml:space="preserve">
<value>Reset all quick tasks to defaults?</value>
</data>
@ -344,9 +333,6 @@ Middle click to close</value>
<data name="monitor" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\monitor.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="FileExistForm_txtNewName_TextChanged_Use_new_name__" xml:space="preserve">
<value>Use new name: </value>
</data>
<data name="clipboard_block" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\clipboard-block.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -411,6 +397,9 @@ Press 'No' to cancel the current upload and disable screenshot auto uploading.</
<data name="UploadManager_UploadURL_URL_to_download_from_and_upload" xml:space="preserve">
<value>URL to download and upload</value>
</data>
<data name="ClipboardContentViewer_ClipboardContentViewer_Load_Clipboard_content__Text__Length___0__" xml:space="preserve">
<value>Clipboard content: Text (Length: {0})</value>
</data>
<data name="TaskSettingsForm_txtNameFormatPatternActiveWindow_TextChanged_Preview_" xml:space="preserve">
<value>Preview:</value>
</data>
@ -426,8 +415,8 @@ Press 'No' to cancel the current upload and disable screenshot auto uploading.</
<data name="AutoCaptureForm_UpdateRegion_X___0___Y___1___Width___2___Height___3_" xml:space="preserve">
<value>X: {0}, Y: {1}, Width: {2}, Height: {3}</value>
</data>
<data name="heart" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\heart.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="ApplicationSettingsForm_btnResetSettings_Click_WouldYouLikeToResetShareXSettings" xml:space="preserve">
<value>Would you like to reset ShareX settings?</value>
</data>
<data name="BeforeUploadForm_BeforeUploadForm__0__is_about_to_be_uploaded_to__1___You_may_choose_a_different_destination_" xml:space="preserve">
<value>{0} is about to be uploaded to {1}. You may choose a different destination.</value>
@ -436,6 +425,9 @@ Press 'No' to cancel the current upload and disable screenshot auto uploading.</
<value>Drop
here</value>
</data>
<data name="ApplicationSettingsForm_cbStartWithWindows_DisabledByPolicy_Text" xml:space="preserve">
<value>Startup has been disabled by your organization</value>
</data>
<data name="cross_button" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\cross-button.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -491,8 +483,8 @@ Are you sure you want to continue?</value>
<data name="Patreon_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Patreon-32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="camera" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\camera.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="FileExistForm_txtNewName_TextChanged_Use_new_name__" xml:space="preserve">
<value>Use new name: </value>
</data>
<data name="wrench_screwdriver" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\wrench-screwdriver.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -519,8 +511,8 @@ Are you sure you want to continue?</value>
<data name="ApplicationSettingsForm_cbStartWithWindows_EnabledByPolicy_Text" xml:space="preserve">
<value>Startup has been enabled by your organization</value>
</data>
<data name="clock_select" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\clock-select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="ApplicationSettingsForm_btnBrowsePersonalFolderPath_Click_Choose_ShareX_personal_folder_path" xml:space="preserve">
<value>Choose ShareX personal folder path</value>
</data>
<data name="WorkerTask_GetInvalidConfigResult__0__configuration_is_invalid_or_missing__Please_check__Destination_settings__window_to_configure_it_" xml:space="preserve">
<value>{0} configuration is invalid or missing. Please check "Destination settings" window to configure it.</value>
@ -549,8 +541,8 @@ Are you sure you want to continue?</value>
<data name="globe_pencil" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\globe--pencil.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ir" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ir.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="crown" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\crown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ui_scroll_pane_image" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ui-scroll-pane-image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -584,12 +576,12 @@ You can later disable it from "After capture tasks" menu.</value>
<data name="AboutForm_AboutForm_Project_page" xml:space="preserve">
<value>Project page</value>
</data>
<data name="hu" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\hu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="UploadManager_IsUploadConfirmed_Don_t_show_this_message_again_" xml:space="preserve">
<value>Don't show this message again.</value>
</data>
<data name="image-resize" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\image-resize.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="IntegrationHelpers_EditWithShareX" xml:space="preserve">
<value>Edit with ShareX</value>
</data>
@ -603,8 +595,8 @@ You can later disable it from "After capture tasks" menu.</value>
<data name="disk_rename" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\disk-rename.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="cross" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\cross.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="control_record_yellow" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\control-record-yellow.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="image_export" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\image-export.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -633,21 +625,18 @@ You can later disable it from "After capture tasks" menu.</value>
<data name="AutoCaptureForm_Execute_Start" xml:space="preserve">
<value>Start</value>
</data>
<data name="uac" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\uac.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="folder" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\folder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ChromeForm_btnRegister_Click_Chrome_support_enabled_" xml:space="preserve">
<value>Chrome support enabled.</value>
</data>
<data name="ir" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ir.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="cn" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\cn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Twitter" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Twitter.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="TaskManager_task_UploadCompleted_ShareX___Task_completed" xml:space="preserve">
<value>Task completed</value>
</data>
@ -669,8 +658,8 @@ You can later disable it from "After capture tasks" menu.</value>
<data name="AboutForm_AboutForm_Language_ja_JP" xml:space="preserve">
<value>Japanese</value>
</data>
<data name="hu" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\hu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="image-resize" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\image-resize.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="film" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\film.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -755,8 +744,11 @@ Would you like to restart ShareX?</value>
<data name="folder_stand" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\folder-stand.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ApplicationSettingsForm_btnBrowsePersonalFolderPath_Click_Choose_ShareX_personal_folder_path" xml:space="preserve">
<value>Choose ShareX personal folder path</value>
<data name="application-search-result" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\application-search-result.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="TaskSettingsForm_UpdateUploaderMenuNames_URL_shortener___0_" xml:space="preserve">
<value>URL shortener: {0}</value>
</data>
<data name="pt" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\pt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -845,9 +837,6 @@ Would you like to restart ShareX?</value>
<data name="ClipboardContentViewer_ClipboardContentViewer_Load_Clipboard_content__Image__Size___0_x_1__" xml:space="preserve">
<value>Clipboard content: Image (Size: {0}x{1})</value>
</data>
<data name="control_record_yellow" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\control-record-yellow.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="SwitchToListView" xml:space="preserve">
<value>Switch to list view</value>
</data>
@ -876,6 +865,9 @@ Please select a different hotkey or quit the conflicting application and reopen
<data name="IntegrationHelpers_UploadWithShareX" xml:space="preserve">
<value>Upload with ShareX</value>
</data>
<data name="clock_select" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\clock-select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="inbox" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\inbox.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -902,8 +894,8 @@ Please run ShareX as administrator to change personal folder path.</value>
<value>Waiting...</value>
<comment>Text must be equal to or lower than 54 characters because of tray icon text length limit.</comment>
</data>
<data name="ApplicationSettingsForm_cbStartWithWindows_DisabledByPolicy_Text" xml:space="preserve">
<value>Startup has been disabled by your organization</value>
<data name="uac" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\uac.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="AboutForm_AboutForm_Contributors" xml:space="preserve">
<value>Contributors</value>
@ -926,16 +918,18 @@ Please run ShareX as administrator to change personal folder path.</value>
<data name="images_stack" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\images-stack.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ApplicationSettingsForm_btnResetSettings_Click_WouldYouLikeToResetShareXSettings" xml:space="preserve">
<value>Would you like to reset ShareX settings?</value>
</data>
<data name="layout_select_sidebar" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layout-select-sidebar.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="FailedToSaveSettings" xml:space="preserve">
<value>Failed to save settings</value>
</data>
<data name="Twitter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<data name="ScreenRecordForm_StartRecording_does_not_exist" xml:space="preserve">
<value>{0} does not exist.
Would you like to automatically download it?</value>
</data>
<data name="Twitter-32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Twitter-32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="HotkeyManager_ShowFailedHotkeys_hotkey" xml:space="preserve">
@ -950,6 +944,9 @@ Please run ShareX as administrator to change personal folder path.</value>
<data name="color" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\color.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="camera" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\camera.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="image_saturation" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\image-saturation.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -1022,8 +1019,10 @@ Please run ShareX as administrator to change personal folder path.</value>
<data name="tick_button" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\tick-button.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ClipboardContentViewer_ClipboardContentViewer_Load_Clipboard_content__Text__Length___0__" xml:space="preserve">
<value>Clipboard content: Text (Length: {0})</value>
<data name="ActionsToolbar_Tip" xml:space="preserve">
<value>Hold left down to drag
Right click to open menu
Middle click to close</value>
</data>
<data name="navigation_000_button" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\navigation-000-button.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -1044,6 +1043,9 @@ Please run ShareX as administrator to change personal folder path.</value>
<value>Click to stop recording.</value>
<comment>Text must be equal to or lower than 54 characters because of tray icon text length limit.</comment>
</data>
<data name="cross" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\cross.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="HotkeyManager_ShowFailedHotkeys_Hotkey_registration_failed" xml:space="preserve">
<value>Hotkey registration failed</value>
</data>
@ -1087,10 +1089,8 @@ Please run ShareX as administrator to change personal folder path.</value>
<data name="image_resize_actual" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\image-resize-actual.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ScreenRecordForm_StartRecording_does_not_exist" xml:space="preserve">
<value>{0} does not exist.
Would you like to automatically download it?</value>
<data name="jp" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\jp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="arrow_090" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\arrow-090.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -1098,7 +1098,7 @@ Would you like to automatically download it?</value>
<data name="TaskCompletedSound" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\TaskCompletedSound.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="application-search-result" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\application-search-result.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="Twitter-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Twitter-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

BIN
ShareX/Resources/Twitter-16x16.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 497 B

BIN
ShareX/Resources/Twitter.ico
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.1 KiB

4
ShareX/ShareX.csproj
View file

@ -1772,7 +1772,6 @@
<None Include="Resources\ruler-triangle.png" />
<None Include="Resources\barcode-2d.png" />
<None Include="Resources\GitHub.png" />
<None Include="Resources\Twitter.ico" />
<None Include="Resources\folder.png" />
<None Include="Resources\clipboard.png" />
<None Include="Resources\drive.png" />
@ -1947,6 +1946,9 @@
<ItemGroup>
<None Include="Resources\application-search-result.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\Twitter-16x16.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>

2
ShareX/TaskHelpers.cs
View file

@ -1597,7 +1597,7 @@ public static void OpenCustomUploaderSettingsWindow()
case HotkeyType.ImageThumbnailer: return Resources.image_resize_actual;
case HotkeyType.VideoConverter: return Resources.camcorder_pencil;
case HotkeyType.VideoThumbnailer: return Resources.images_stack;
case HotkeyType.TweetMessage: return Resources.Twitter;
case HotkeyType.TweetMessage: return Resources.Twitter_16x16;
case HotkeyType.MonitorTest: return Resources.monitor;
// Other
case HotkeyType.DisableHotkeys: return Resources.keyboard__minus;