diff --git a/README.md b/README.md index b7931f98b..8fc162c47 100644 --- a/README.md +++ b/README.md @@ -13,18 +13,18 @@ ShareX incorporates the following methods to allow screen capture. * Active monitor: Captures the monitor area where the mouse cursor currently resides. * Window menu: Has a list of open windows so you can select which window to take screenshot of. * Monitor menu: Has a list of monitors so you can select which monitor to take screenshot from. -* Rectangle: Allows you to take screenshot from a single rectangle or multiple rectangular areas drawn by the mouse by dragging it from one corner of a rectangle to the diagonally opposite other corner of the rectangle. -* Rectangle (Objects): Allows you to take screenshot of a rectangle area or when you hovers window or an object it will automatically select rectangular area so you does not need to drag the area using the mouse. -* Rectangle (Annotate): This rectangle capture similar to Light version but also allows to perform drawing in the capture area. -* Rectangle (Light): Basic version of rectangle capture designed for slow computers. -* Rectangle (Transparent): Allows you to do rectangle capture from non frozen screen. -* Rounded rectangle, Ellipse, Triangle, Diamond: Works similar to rectangle capture with the only difference being the shape. +* Region: Allows you to take screenshot from a single rectangle or multiple rectangular areas drawn by the mouse by dragging it from one corner of a rectangle to the diagonally opposite other corner of the rectangle. +* Region (Windows & controls): Allows you to take screenshot of a rectangle area or when you hovers window or an object it will automatically select rectangular area so you does not need to drag the area using the mouse. +* Region (Annotate): This rectangle capture similar to Light version but also allows to perform drawing in the capture area. +* Region (Light): Basic version of rectangle capture designed for slow computers. +* Region (Transparent): Allows you to do rectangle capture from non frozen screen. * Polygon: Allows you to click points on screen to make polygon shape to capture areas inside it. * Freehand: Allows you to draw areas similar to drawing with pencil and the inside area will be captured. -* Last Region: Will repeat the screen capture of previous region. +* Last region: Will repeat the screen capture of previous region. * Custom region: You can configure custom region to be captured with hotkey from task settings. For example, you can configure second monitor region to be captured with hotkey. -* Screen recording (FFmpeg): You can record a selected area on your screen or the entire screen. [FFmpeg](https://www.ffmpeg.org) allows you to record screen including sound and compress in real time using [x264](https://en.wikipedia.org/wiki/x264), [VP8 (WebM)](https://en.wikipedia.org/wiki/VP8), [Xvid](https://en.wikipedia.org/wiki/Xvid) etc. +* Screen recording: You can record a selected area on your screen or the entire screen. [FFmpeg](https://www.ffmpeg.org) allows you to record screen including sound and compress in real time using [x264](https://en.wikipedia.org/wiki/x264), [VP8 (WebM)](https://en.wikipedia.org/wiki/VP8), [Xvid](https://en.wikipedia.org/wiki/Xvid) etc. * Screen recording (GIF): You can record a selected area on your screen as an animated GIF. +* Scrolling capture * Webpage capture * Auto capture: Allows you to automatically capture a screen area with specific time interval. @@ -54,8 +54,8 @@ ShareX has multiple ways to upload files. * Upload from clipboard: ShareX will automatically detect clipboard format and select tasks accordingly. It will first check if clipboard data format is an image, text or file. If the data format is text then it can check whether it is a URL or plaintext. If it is a URL then it can automatically shorten the URL or upload URL contents by downloading the file from the URL and uploading the content. It can also check whether it is a folder so it can index the contents of the folder. These settings are customizable through “Task settings” and are disabled by default due to privacy reasons. * Upload from URL: Downloads file from URL and uploads it to a selected host. * Drag and drop upload (drop area or main window): You can drag and drop files to ShareX main window or to the drag & drop box in order to upload them. -* Shell context menu: In Windows you can right click file and select “Upload with ShareX” to upload that file. -* Send to (via Windows Explorer): Also when you right click file ShareX will be in “Send to” submenu. +* Upload from Windows shell context menu: In Windows you can right click file and select “Upload with ShareX” to upload that file. +* Upload from Windows send to menu: Also when you right click file ShareX will be in “Send to” submenu. * Watch folder: You can configure to watch specific folders so if new file appear in these folders that file will be automatically uploaded. #### After upload tasks @@ -82,8 +82,8 @@ ShareX supports the following destinations. * [Picasa](https://picasaweb.google.com) * [Twitter](https://twitter.com) * [Chevereto](https://chevereto.com) -* [Hızlı Resim](http://hizliresim.com) * [vgy.me](http://vgy.me) +* [SomeImage](https://someimage.com) * Custom image uploader * File uploader @@ -97,6 +97,7 @@ ShareX supports the following destinations. * [GitHub Gist](https://gist.github.com) * [uPaste](http://upaste.me) * [Hastebin](http://hastebin.com) +* [OneTimeSecret](https://onetimesecret.com) * Custom text uploader * File uploader @@ -123,7 +124,7 @@ ShareX supports the following destinations. * [Imgrush](https://imgrush.com) * [VideoBin](http://videobin.org) * [MaxFile](https://maxfile.ro) -* [DropFile](https://dropfile.to) +* [Dropfile](https://dropfile.to) * [Up1](https://up1.ca) * Shared folder * [Email](https://en.wikipedia.org/wiki/Email) @@ -140,6 +141,11 @@ ShareX supports the following destinations. * [yourls.org](http://yourls.org) * [nl.cm](http://nl.cm) * [adf.ly](https://adf.ly) +* [coinurl.com](https://coinurl.com) +* [qr.net](http://qr.net) +* [vurl.com](http://vurl.com) +* [2.gp](http://2.gp) +* [Polr](https://github.com/Cydrobolt/polr) * Custom URL shortener #### URL sharing services @@ -166,11 +172,14 @@ Additional tools to make certain tasks more efficient. * Image editor: Based on [Greenshot](http://getgreenshot.org) image editor. It offers functions such as ability to add annotations, highlighting or obfuscations to the screenshot. It allows to draw basic shapes (rectangles, ellipses, lines, arrows and freehand) and add text to a screenshot. * Image effects: Allows to apply over 37 different image effects with their own settings to image. Edited images can be saved in PNG or other formats. * Hash check: Allows you to check/compare file hash values. +* IRC client * DNS changer: Allows you to quickly change computer DNS settings with popular DNS servers such as [Google DNS](https://developers.google.com/speed/public-dns/). * QR code: Open QR code window which you can enter text to get QR code of it. You can copy QR code image to your clipboard or save as file. * Ruler: Allows you to get X, Y, width, height, distance and angle information on screen. * Automate: Allows you to write simple script to automate mouse and keyboard commands. * Index folder: Allows you to share the index of a folder contents by uploading the index of the selected folder as text, html or xml. +* Image combiner +* Video thumbnailer * FTP client: Opens a basic FTP client you interface for the currently configured FTP account. * Tweet message: Allows you to post message to Twitter. * Monitor test: Allows you to render different colors on the screen which provides you the opportunity to test for bleeding and dead pixels on LCD monitors. diff --git a/ShareX.HelpersLib/Helpers/ShortcutHelpers.cs b/ShareX.HelpersLib/Helpers/ShortcutHelpers.cs index 4a1f8ae6c..f0bd7ddcb 100644 --- a/ShareX.HelpersLib/Helpers/ShortcutHelpers.cs +++ b/ShareX.HelpersLib/Helpers/ShortcutHelpers.cs @@ -26,7 +26,6 @@ using IWshRuntimeLibrary; using System; using System.IO; -using System.Windows.Forms; using File = System.IO.File; namespace ShareX.HelpersLib diff --git a/ShareX.HelpersLib/Properties/Resources.fr.resx b/ShareX.HelpersLib/Properties/Resources.fr.resx index 2ae78fdd8..bca423e07 100644 --- a/ShareX.HelpersLib/Properties/Resources.fr.resx +++ b/ShareX.HelpersLib/Properties/Resources.fr.resx @@ -140,7 +140,7 @@ Voulez-vous la télécharger et l'installer? Capture automatique - Incrémentation du numéro automatique + Incrémentation automatique du numéro. Ajouter un 0 au début avec {n} Automatique @@ -230,7 +230,7 @@ Voulez-vous la télécharger et l'installer? Copier l'URL dans le presse-papier - Jour actuel + Journée en cours Heure actuelle @@ -254,16 +254,16 @@ Voulez-vous la télécharger et l'installer? Seconde actuelle - Nom de la semaine actuelle (en anglais) + Nom de la semaine en cours (en anglais) - Nom de la semaine actuelle (dans la langue locale) + Nom de la semaine en cours (dans la langue locale) - Année actuelle + Année en cours - Année actuelle (2 chiffres) + Année en cours (2 chiffres) Logiciel de mise en ligne de fichiers personnalisé @@ -463,10 +463,10 @@ Taille du fichier: {2:n0} / {3:n0} Ko QR code - Caractère alphanumérique aléatoire + Caractère alphanumérique aléatoire. Recommencer à l'aide de {n} - Nombre aléatoire de 0 à 9 + Nombre aléatoire de 0 à 9. Recommencer à l'aide de {n} URL de redirection @@ -762,4 +762,64 @@ Taille du fichier: {2:n0} / {3:n0} Ko Activer/Désactiver les raccourcis clavier + + Caractère hexadécimal aléatoire. Recommencer à l'aide de {n} + + + Image + + + Client IRC + + + Aléatoire + + + GUID aléatoire + + + Outils + + + Ordinateur + + + Outils + + + Outils + + + Capture d'écran + + + Cible + + + Date et heure + + + Incrémentation + + + Combineur d'image + + + Générateur de miniatures de vidéo + + + Capture avec défilement + + + Incrémentation hexadécimal automatique . Ajouter un 0 au début avec {n} + + + Incrémentation automatique en base {n} (1 < n < 63) + + + Incrémentation alphanumérique automatique sensible à la casse. Ajouter un 0 au début avec {n} + + + Incrémentation alphanumérique automatique insensible à la casse. Ajouter un 0 au début avec {n} + \ No newline at end of file diff --git a/ShareX.HelpersLib/Properties/Resources.pt-BR.resx b/ShareX.HelpersLib/Properties/Resources.pt-BR.resx index b93f601a4..4ca3a576c 100644 --- a/ShareX.HelpersLib/Properties/Resources.pt-BR.resx +++ b/ShareX.HelpersLib/Properties/Resources.pt-BR.resx @@ -667,7 +667,7 @@ Velocidade do download: {1:0.0} KB/s Tamanho do arquivo: {2:n0} / {3:n0} KB - Char randômico alfanumérico + Caractere aleatório alfanumérico Horário UNIX @@ -694,7 +694,7 @@ Tamanho do arquivo: {2:n0} / {3:n0} KB Mês atual (inglês) - Auto incrementar número + Auto incrementar número. Acrescentar 0 à esquerda usando {n} Milissegundo atual @@ -762,4 +762,64 @@ Tamanho do arquivo: {2:n0} / {3:n0} KB Paleta de tons de cinza quantizer 256 cores + + Mesclar imagens + + + Ferramentas + + + Cliente IRC + + + Ferramentas + + + Captura rolante + + + Gravar tela + + + Miniaturizador de vídeo + + + Ferramentas + + + Computador + + + Data e hora + + + Imagem + + + Aleatório + + + Destino + + + GUID Aleatório + + + Incremental + + + Auto incrementar caracteres alfanuméricos maiúsculos e minúsculos. Acrescentar 0 à esquerda usando {n} + + + Auto incrementar caracteres alfanuméricos maiúsculos e minúsculos. Acrescentar 0 à esquerda usando {n} + + + Auto incrementar por base {n} usando caracteres alfanuméricos (1 < n < 63) + + + Auto incrementar usando caracteres hexadecimais. Acrescentar 0 à esquerda usando {n} + + + Caractere hexadecimal aleatório. Repetir usando {n} + \ No newline at end of file diff --git a/ShareX.HelpersLib/Properties/Resources.tr.resx b/ShareX.HelpersLib/Properties/Resources.tr.resx index cea198e8e..c5fc311ec 100644 --- a/ShareX.HelpersLib/Properties/Resources.tr.resx +++ b/ShareX.HelpersLib/Properties/Resources.tr.resx @@ -798,4 +798,28 @@ Dosya boyutu: {2:n0} / {3:n0} KB Hedef + + Resim birleştirici + + + IRC istemcisi + + + Kaydırarak yakalama + + + Video küçük resim yapıcı + + + Araçlar + + + Araçlar + + + Ekran yakalama + + + Araçlar + \ No newline at end of file diff --git a/ShareX.HelpersLib/UpdateChecker/DownloaderForm.cs b/ShareX.HelpersLib/UpdateChecker/DownloaderForm.cs index 63bbcf870..afb7fe648 100644 --- a/ShareX.HelpersLib/UpdateChecker/DownloaderForm.cs +++ b/ShareX.HelpersLib/UpdateChecker/DownloaderForm.cs @@ -27,7 +27,6 @@ using System; using System.Diagnostics; using System.Drawing; -using System.Drawing.Drawing2D; using System.Globalization; using System.IO; using System.Net; diff --git a/ShareX.HelpersLib/UpdateChecker/UpdateMessageBox.cs b/ShareX.HelpersLib/UpdateChecker/UpdateMessageBox.cs index 1a3efb644..b223c5269 100644 --- a/ShareX.HelpersLib/UpdateChecker/UpdateMessageBox.cs +++ b/ShareX.HelpersLib/UpdateChecker/UpdateMessageBox.cs @@ -24,8 +24,6 @@ #endregion License Information (GPL v3) using ShareX.HelpersLib.Properties; -using System.Drawing; -using System.Drawing.Drawing2D; using System.Windows.Forms; namespace ShareX.HelpersLib diff --git a/ShareX.HelpersLib/UpdateChecker/UpdateMessageBox.fr.resx b/ShareX.HelpersLib/UpdateChecker/UpdateMessageBox.fr.resx index 7bb74e710..36bc2c6c2 100644 --- a/ShareX.HelpersLib/UpdateChecker/UpdateMessageBox.fr.resx +++ b/ShareX.HelpersLib/UpdateChecker/UpdateMessageBox.fr.resx @@ -126,4 +126,7 @@ Ne pas demander à nouveau jusqu'au prochain démarrage de ShareX + + Voir le changelog + \ No newline at end of file diff --git a/ShareX.HelpersLib/UpdateChecker/UpdateMessageBox.pt-BR.resx b/ShareX.HelpersLib/UpdateChecker/UpdateMessageBox.pt-BR.resx index ec51bcca6..3b9695b61 100644 --- a/ShareX.HelpersLib/UpdateChecker/UpdateMessageBox.pt-BR.resx +++ b/ShareX.HelpersLib/UpdateChecker/UpdateMessageBox.pt-BR.resx @@ -126,4 +126,7 @@ Não perguntar de novo até a próxima inicialização do programa + + Ver log de mudanças + \ No newline at end of file diff --git a/ShareX.IndexerLib/HtmlHelper.cs b/ShareX.IndexerLib/HtmlHelper.cs index 449870acc..df1a65a30 100644 --- a/ShareX.IndexerLib/HtmlHelper.cs +++ b/ShareX.IndexerLib/HtmlHelper.cs @@ -24,9 +24,6 @@ #endregion License Information (GPL v3) using ShareX.HelpersLib; -using ShareX.IndexerLib.Properties; -using System.IO; -using System.Text; namespace ShareX.IndexerLib { diff --git a/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.Designer.cs b/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.Designer.cs index 2f648b15c..65531a841 100644 --- a/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.Designer.cs +++ b/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.Designer.cs @@ -34,6 +34,7 @@ private void InitializeComponent() this.lblMaximumScrollCount = new System.Windows.Forms.Label(); this.tcScrollingCapture = new System.Windows.Forms.TabControl(); this.tpCapture = new System.Windows.Forms.TabPage(); + this.lblNote = new System.Windows.Forms.Label(); this.cbStartSelectionAutomatically = new System.Windows.Forms.CheckBox(); this.cbAutoCombine = new System.Windows.Forms.CheckBox(); this.lblSelectedRectangle = new System.Windows.Forms.Label(); @@ -73,6 +74,7 @@ private void InitializeComponent() this.pOutput = new System.Windows.Forms.Panel(); this.lblProcessing = new System.Windows.Forms.Label(); this.pbOutput = new System.Windows.Forms.PictureBox(); + this.chkAutoUpload = new System.Windows.Forms.CheckBox(); ((System.ComponentModel.ISupportInitialize)(this.nudScrollDelay)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nudMaximumScrollCount)).BeginInit(); this.tcScrollingCapture.SuspendLayout(); @@ -153,6 +155,8 @@ private void InitializeComponent() // // tpCapture // + this.tpCapture.Controls.Add(this.chkAutoUpload); + this.tpCapture.Controls.Add(this.lblNote); this.tpCapture.Controls.Add(this.cbStartSelectionAutomatically); this.tpCapture.Controls.Add(this.cbAutoCombine); this.tpCapture.Controls.Add(this.lblSelectedRectangle); @@ -176,6 +180,11 @@ private void InitializeComponent() this.tpCapture.Name = "tpCapture"; this.tpCapture.UseVisualStyleBackColor = true; // + // lblNote + // + resources.ApplyResources(this.lblNote, "lblNote"); + this.lblNote.Name = "lblNote"; + // // cbStartSelectionAutomatically // resources.ApplyResources(this.cbStartSelectionAutomatically, "cbStartSelectionAutomatically"); @@ -298,7 +307,7 @@ private void InitializeComponent() // resources.ApplyResources(this.nudIgnoreLast, "nudIgnoreLast"); this.nudIgnoreLast.Maximum = new decimal(new int[] { - 5, + 0, 0, 0, 0}); @@ -478,6 +487,13 @@ private void InitializeComponent() this.pbOutput.Name = "pbOutput"; this.pbOutput.TabStop = false; // + // chkAutoUpload + // + resources.ApplyResources(this.chkAutoUpload, "chkAutoUpload"); + this.chkAutoUpload.Name = "chkAutoUpload"; + this.chkAutoUpload.UseVisualStyleBackColor = true; + this.chkAutoUpload.CheckedChanged += new System.EventHandler(this.chkAutoUpload_CheckedChanged); + // // ScrollingCaptureForm // resources.ApplyResources(this, "$this"); @@ -562,5 +578,7 @@ private void InitializeComponent() private Label lblIgnoreLast; private GroupBox gbImages; private TextBox txtImagesCount; + private Label lblNote; + private CheckBox chkAutoUpload; } } \ No newline at end of file diff --git a/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.cs b/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.cs index 8c976cf02..1e5c94087 100644 --- a/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.cs +++ b/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.cs @@ -66,6 +66,7 @@ public ScrollingCaptureForm(ScrollingCaptureOptions options, bool forceSelection cbAutoDetectScrollEnd.Checked = Options.AutoDetectScrollEnd; cbRemoveDuplicates.Checked = Options.RemoveDuplicates; cbAutoCombine.Checked = Options.AfterCaptureAutomaticallyCombine; + chkAutoUpload.Checked = Options.AutoUpload; if (forceSelection || Options.StartSelectionAutomatically) { @@ -231,7 +232,7 @@ private void StopCapture() { captureTimer.Stop(); btnCapture.Text = Resources.ScrollingCaptureForm_StopCapture_Start_capture; - this.ShowActivate(); + if (!Options.AutoUpload) this.ShowActivate(); tcScrollingCapture.SelectedTab = tpOutput; StartingProcess(); if (Options.RemoveDuplicates) RemoveDuplicates(); @@ -246,8 +247,12 @@ private void StopCapture() GuessCombineAdjustments(); } CombineAndPreviewImages(); + EndingProcess(); isCapturing = false; + + if (Options.AutoUpload) StartProcess(); + if (Options.AutoClose) Close(); } private void Clean() @@ -511,10 +516,7 @@ private void btnGuessCombineAdjustments_Click(object sender, EventArgs e) private void btnProcess_Click(object sender, EventArgs e) { - if (Result != null) - { - OnProcessRequested((Image)Result.Clone()); - } + StartProcess(); } private void StartingProcess() @@ -525,6 +527,14 @@ private void StartingProcess() Application.DoEvents(); } + private void StartProcess() + { + if (Result != null) + { + OnProcessRequested((Image)Result.Clone()); + } + } + private void EndingProcess() { lblProcessing.Visible = false; @@ -658,6 +668,11 @@ private void GuessEdges() nudTrimBottom.Value = result.Bottom; } + private void chkAutoUpload_CheckedChanged(object sender, EventArgs e) + { + Options.AutoUpload = chkAutoUpload.Checked; + } + private Padding GuessEdges(Image img1, Image img2) { Padding result = new Padding(); diff --git a/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.fr.resx b/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.fr.resx new file mode 100644 index 000000000..c765a9be2 --- /dev/null +++ b/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.fr.resx @@ -0,0 +1,219 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Capture + + + Images + + + Gauche: + + + Droite: + + + Bas: + + + Haut: + + + Démarrer la capture + + + Supprimer les images en double + + + Supprimer les dernières: + + + Traitement en cours ... + + + Ajuster les combinaisons + + + Détecter automatiquement la fin du défilement + + + Résultat + + + Nombre d'images: + + + Ajuster les contours: + + + Vertical: + + + Réinitialiser les options + + + Mettre en ligne/enregistrer en fonction des paramètres "Après la capture" + + + Nombre maximal de défilement: + + + ShareX - Capture avec défilement + + + Méthode de défilement: + + + Commencer la capture avec défilement immédiatement après la sélection de la région à capturer + + + Démarrer automatiquement la sélection de la région à capture avant d'ouvrir cette fenêtre + + + Sélectionner la fenêtre à faire défiler... + + + (Optionnel) Sélectionner une région personnalisée dans la fenêtre... + + + Essayer de défiler tout en haut avant la capture + + + Départ différé: + + + Délai entre défilement: + + + Merci de noter que même si ShareX fait de son mieux pour rendre la capture de défilement précise, il n'est pas possible de capturer correctement tous les contenus avec défilement. Les principales raisons qui peuvent causer des problèmes pendant la combinaison sont des mouvements sur l'écran lors de la capture. Ex: si une page web a des GIF animés ou des objets statiques sur l'écran pendant le défilement (par exemple un menu statique ou des boutons qui ne changent pas leur position alors que le reste de la page Web défile). + + + Deviner automatiquement les décalages et combiner après la capture + + + Deviner les ajustement des combinaisons & combiner + + + Deviner les valeurs des contours à ajuster + + + Dernière image: + + \ No newline at end of file diff --git a/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.nl-NL.resx b/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.nl-NL.resx index c1cbff3ef..06885ed1c 100644 --- a/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.nl-NL.resx +++ b/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.nl-NL.resx @@ -213,4 +213,7 @@ Start regio opname automatisch voor het openen van dit scherm + + Gelieve op te merken dat desondanks het feit dat ShareX probeert een accurate opname inclusief scrollen te maken, het nog steeds kan gebeuren dat niet alles correct opgenomen wordt. De voornaamste reden hiervoor is bewegende elementen op het scherm (zoals een geanimeerde gif, of een menu dat niet meescrollt), die ervoor zorgen dat niet alles meegenomen wordt tijdens het combineren. + \ No newline at end of file diff --git a/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.pt-BR.resx b/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.pt-BR.resx new file mode 100644 index 000000000..2d5b6ecfe --- /dev/null +++ b/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.pt-BR.resx @@ -0,0 +1,219 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ShareX - Captura rolante + + + Iniciar captura + + + Adivinhar ajustes de combinação & combinar + + + Adivinhar valores das bordas para apará-las + + + Resetar opções de saída + + + Selecionar janela ou conteúdo para rolar... + + + (Opcional) Selecionar região personalizada na janela... + + + Enviar/salvar depenendo das configurações pós-captura + + + Saída + + + Captura + + + Superior: + + + Inferior: + + + Esquerda: + + + Direita: + + + Atraso inicial: + + + Método de rolagem: + + + Atraso de rolagem: + + + Por favor note que enquanto o ShareX se esforça para renderizar uma captura rolante precisa, ainda não é possível capturar corretamente todo conteúdo rolante. As principais razões que podem causar problemas enquanto as imagens são mescladas são movimentos na tela enquanto estiver capturando (por exemplo, se uma página da web possui um GIF animado ou objetos estáticos (que não mudam de posição) na tela enquanto estiver rolando). + + + Processando... + + + Número máximo de rolagens: + + + Número de imagens: + + + Remover última: + + + Vertical: + + + Última vertical: + + + Aparar bordas + + + Imagens + + + Mesclar ajustes + + + Adivinhar offsets automaticamente e mesclá-los após a captura + + + Detectar automaticamente o fim da rolagem + + + Remover imagens iguais + + + Tentar rolar para o topo antes de capturar + + + Iniciar captura rolante imediatamente após a seleção da região de captura + + + Iniciar seleção da região de captura automaticamente antes de abrir esta janela + + \ No newline at end of file diff --git a/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.resx b/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.resx index a19330bf2..5d93525a6 100644 --- a/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.resx +++ b/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.resx @@ -117,6 +117,10 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NoControl + 16, 16 @@ -141,7 +145,7 @@ tpCapture - 12 + 14 True @@ -165,16 +169,19 @@ tpCapture - 14 + 16 False + + NoControl + - 16, 312 + 16, 336 - 344, 32 + 344, 48 18 @@ -192,7 +199,7 @@ tpCapture - 16 + 18 17, 17 @@ -206,7 +213,6 @@ 9 - Center @@ -220,7 +226,7 @@ tpCapture - 18 + 20 160, 140 @@ -244,7 +250,7 @@ tpCapture - 17 + 19 True @@ -271,7 +277,7 @@ tpCapture - 15 + 17 True @@ -298,7 +304,64 @@ tpCapture - 13 + 15 + + + True + + + NoControl + + + 16, 312 + + + 370, 17 + + + 20 + + + Automatically upload/save depending on after capture settings and close + + + chkAutoUpload + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCapture + + + 0 + + + Top, Bottom, Left, Right + + + 16, 400 + + + 944, 216 + + + 19 + + + Please note that whilst ShareX attempts its best effort to render an accurate scrolling capture it is still not possible for every scrolling content to be captured correctly. Main reasons which can cause issues while combining are movements on screen while capturing e.g. if a web page has animated GIF or having static objects on screen while scrolling e.g. having static menu or buttons on web page which does not change its position but the rest of the web page scrolls. + + + lblNote + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCapture + + + 1 True @@ -325,7 +388,7 @@ tpCapture - 0 + 2 True @@ -352,7 +415,7 @@ tpCapture - 1 + 3 True @@ -376,11 +439,14 @@ tpCapture - 2 + 4 False + + NoControl + 16, 40 @@ -403,7 +469,7 @@ tpCapture - 3 + 5 True @@ -430,7 +496,7 @@ tpCapture - 4 + 6 160, 92 @@ -454,7 +520,7 @@ tpCapture - 5 + 7 True @@ -481,7 +547,7 @@ tpCapture - 6 + 8 True @@ -508,7 +574,7 @@ tpCapture - 7 + 9 True @@ -535,7 +601,7 @@ tpCapture - 8 + 10 True @@ -562,7 +628,7 @@ tpCapture - 9 + 11 True @@ -589,7 +655,7 @@ tpCapture - 10 + 12 160, 68 @@ -610,7 +676,7 @@ tpCapture - 11 + 13 4, 22 @@ -639,6 +705,225 @@ 0 + + gbImages + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpOutput + + + 0 + + + btnResetCombine + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpOutput + + + 1 + + + btnGuessCombineAdjustments + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpOutput + + + 2 + + + btnStartTask + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpOutput + + + 3 + + + btnGuessEdges + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpOutput + + + 4 + + + gbCombineAdjustments + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpOutput + + + 5 + + + gbTrimEdges + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpOutput + + + 6 + + + pOutput + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpOutput + + + 7 + + + 4, 22 + + + 3, 3, 3, 3 + + + 976, 635 + + + 1 + + + Output + + + tpOutput + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcScrollingCapture + + + 1 + + + Fill + + + 0, 0 + + + 984, 661 + + + 0 + + + tcScrollingCapture + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + txtImagesCount + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbImages + + + 0 + + + lblImageCount + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbImages + + + 1 + + + nudIgnoreLast + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbImages + + + 2 + + + lblIgnoreLast + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbImages + + + 3 + + + 8, 8 + + + 184, 120 + + + 0 + + + Images + + + gbImages + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpOutput + + + 0 + 120, 16 @@ -741,35 +1026,11 @@ 3 - - 8, 8 - - - 184, 120 - - - 0 - - - Images - - - gbImages - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpOutput - - - 0 - False - 560, 96 + 560, 8 3, 0, 0, 0 @@ -802,7 +1063,7 @@ False - 560, 40 + 560, 56 3, 0, 0, 0 @@ -835,13 +1096,13 @@ False - 560, 64 + 560, 80 3, 0, 0, 0 - 376, 23 + 376, 48 5 @@ -868,7 +1129,7 @@ False - 560, 16 + 560, 32 3, 0, 0, 0 @@ -897,6 +1158,78 @@ 4 + + lblCombineLastVertical + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbCombineAdjustments + + + 0 + + + lblCombineVertical + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbCombineAdjustments + + + 1 + + + nudCombineVertical + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbCombineAdjustments + + + 2 + + + nudCombineLastVertical + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbCombineAdjustments + + + 3 + + + 368, 8 + + + 184, 120 + + + 2 + + + Combine adjustments + + + gbCombineAdjustments + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpOutput + + + 5 + True @@ -999,29 +1332,125 @@ 3 - - 368, 8 + + lblTrimBottom - - 184, 120 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + gbTrimEdges + + + 0 + + + lblTrimRight + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbTrimEdges + + + 1 + + + lblTrimTop + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbTrimEdges + + 2 - - Combine adjustments + + lblTrimLeft - - gbCombineAdjustments + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + gbTrimEdges + + + 3 + + + nudTrimLeft + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbTrimEdges + + + 4 + + + nudTrimBottom + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbTrimEdges + + + 5 + + + nudTrimTop + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbTrimEdges + + + 6 + + + nudTrimRight + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbTrimEdges + + + 7 + + + 200, 8 + + + 160, 120 + + + 1 + + + Trim edges + + + gbTrimEdges + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tpOutput - - 5 + + 6 True @@ -1227,36 +1656,57 @@ 7 - - 200, 8 - - - 160, 120 - - - 1 - - - Trim edges - - - gbTrimEdges - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpOutput - - - 6 - Top, Bottom, Left, Right True + + lblProcessing + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pOutput + + + 0 + + + pbOutput + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pOutput + + + 1 + + + 8, 136 + + + 961, 490 + + + 7 + + + pOutput + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpOutput + + + 7 + True @@ -1314,78 +1764,6 @@ 1 - - 8, 136 - - - 961, 490 - - - 7 - - - pOutput - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpOutput - - - 7 - - - 4, 22 - - - 3, 3, 3, 3 - - - 976, 635 - - - 1 - - - Output - - - tpOutput - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcScrollingCapture - - - 1 - - - Fill - - - 0, 0 - - - 984, 661 - - - 0 - - - tcScrollingCapture - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 0 - True diff --git a/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.tr.resx b/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.tr.resx new file mode 100644 index 000000000..556a98b8c --- /dev/null +++ b/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.tr.resx @@ -0,0 +1,219 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Sol: + + + Sağ: + + + Alt: + + + Üst: + + + Yükle/kaydet yakalama sonrası ayarlarına göre + + + ShareX - Kaydırarak yakalama + + + Yakalamayı başlat + + + Resimler + + + Dikey: + + + Son dikey: + + + Resim sayısı: + + + Çıktı + + + Yakala + + + Başlangıç gecikmesi: + + + Kaydırma gecikmesi: + + + Kaydırma yöntemi: + + + İşleniyor... + + + En fazla kaydırma sayısı: + + + Sonuncuları sil: + + + Kenarları kırp + + + Birleştirme ayarları + + + Birleştirme ayarlarını tahmin et ve birleştir + + + Kenar kırpma değerlerini tahmin et + + + Çıktı ayarlarını sıfırla + + + Pencere veya kontrol seçin kaydırmak için... + + + (Opsiyonel) Özel alan seçin pencere içinde... + + + Kaydırma sonuna geldiğini otomatik tespit et + + + Aynı olan resimleri sil + + + Yakaladıktan sonra birleştirme ayarlarını tespit et ve birleştir + + + Yakalama başlamadan önce sayfayı yukarıya kaydırmayı dene + + + Alan seçtikten sonra kaydırarak yakalamayı başlat + + + Bu pencere açılmadan önce alan seçimini başlat + + + Lütfen dikkat, ShareX düzgün bir şekilde kaydırarak yakalama için elinden geleni yapsada her durumda kusursuz kaydırarak yakalama yapmak mümkün değildir. Ana nedenlerinden biri kaydırma esnasında ekranda hareket olmasıdır, mesela web sayfası yakalarken ekranda hareketli bir GIF resmi varsa birleştirme esnasında sorun yaratcaktır. Bir diğer nedende ekranda olan sabit objelerdir, mesela web sayfası kaydırırken ekranda hareket etmiyen bir menu veya tuş olması nereden birleştirilceğini hesaplamada zorluk çıkarıcaktır. + + \ No newline at end of file diff --git a/ShareX.ScreenCaptureLib/Properties/Resources.fr.resx b/ShareX.ScreenCaptureLib/Properties/Resources.fr.resx index 586dff9ce..89e97e3cc 100644 --- a/ShareX.ScreenCaptureLib/Properties/Resources.fr.resx +++ b/ShareX.ScreenCaptureLib/Properties/Resources.fr.resx @@ -287,4 +287,10 @@ Distance: {6:0.00} px / Angle: {7:0.00}° [Relâcher clic gauche] [Inser] Terminer la sélection de la région + + Arrêter la capture + + + Démarrer la capture + \ No newline at end of file diff --git a/ShareX.ScreenCaptureLib/Properties/Resources.pt-BR.resx b/ShareX.ScreenCaptureLib/Properties/Resources.pt-BR.resx index 9ffeb99f9..c3cf8e98b 100644 --- a/ShareX.ScreenCaptureLib/Properties/Resources.pt-BR.resx +++ b/ShareX.ScreenCaptureLib/Properties/Resources.pt-BR.resx @@ -288,4 +288,10 @@ Distância: {6:0.00} px / Ângulo: {7:0.00}° [Numpad + or -] Mudar o raio do canto do retângulo arrendondado + + Parar captura + + + Iniciar captura + \ No newline at end of file diff --git a/ShareX.ScreenCaptureLib/Properties/Resources.tr.resx b/ShareX.ScreenCaptureLib/Properties/Resources.tr.resx index df03585dc..f575e77e9 100644 --- a/ShareX.ScreenCaptureLib/Properties/Resources.tr.resx +++ b/ShareX.ScreenCaptureLib/Properties/Resources.tr.resx @@ -287,4 +287,10 @@ Mesafe: {6:0.00} px / Açı: {7:0.00}° [Sağ tık bırak] [Insert] Alan seçimini bitir + + Yakalamayı durdur + + + Yakalamayı başlat + \ No newline at end of file diff --git a/ShareX.ScreenCaptureLib/Screencast/FFmpegOptionsForm.pt-BR.resx b/ShareX.ScreenCaptureLib/Screencast/FFmpegOptionsForm.pt-BR.resx index 0001ff492..7cb59c7fe 100644 --- a/ShareX.ScreenCaptureLib/Screencast/FFmpegOptionsForm.pt-BR.resx +++ b/ShareX.ScreenCaptureLib/Screencast/FFmpegOptionsForm.pt-BR.resx @@ -224,7 +224,7 @@ Da mesma forma, para qualidade de encoding constante, você irá simplesmente ec Usar local personalizado - Padrão é sierra2_41. + Padrão é sierra2_4a. Padrão é cheio. diff --git a/ShareX.ScreenCaptureLib/ScrollingCaptureOptions.cs b/ShareX.ScreenCaptureLib/ScrollingCaptureOptions.cs index 926a1d57f..cb3fba2d3 100644 --- a/ShareX.ScreenCaptureLib/ScrollingCaptureOptions.cs +++ b/ShareX.ScreenCaptureLib/ScrollingCaptureOptions.cs @@ -24,10 +24,6 @@ #endregion License Information (GPL v3) using ShareX.ScreenCaptureLib; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; namespace ShareX { @@ -43,6 +39,8 @@ public class ScrollingCaptureOptions public bool AutoDetectScrollEnd { get; set; } = true; public bool RemoveDuplicates { get; set; } = true; public bool AfterCaptureAutomaticallyCombine { get; set; } = true; + public bool AutoUpload { get; set; } = false; + public bool AutoClose { get; set; } = false; public int TrimLeftEdge { get; set; } = 0; public int TrimTopEdge { get; set; } = 0; diff --git a/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj b/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj index d28a3ff7d..dd8902a2c 100644 --- a/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj +++ b/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj @@ -139,9 +139,18 @@ + + ScrollingCaptureForm.cs + + + ScrollingCaptureForm.cs + ScrollingCaptureForm.cs + + ScrollingCaptureForm.cs + Designer diff --git a/ShareX.ScreenCaptureLib/SimpleWindowInfo.cs b/ShareX.ScreenCaptureLib/SimpleWindowInfo.cs index 558e92b08..1823d00c9 100644 --- a/ShareX.ScreenCaptureLib/SimpleWindowInfo.cs +++ b/ShareX.ScreenCaptureLib/SimpleWindowInfo.cs @@ -24,10 +24,7 @@ #endregion License Information (GPL v3) using System; -using System.Collections.Generic; using System.Drawing; -using System.Linq; -using System.Text; namespace ShareX.ScreenCaptureLib { diff --git a/ShareX.Setup/Program.cs b/ShareX.Setup/Program.cs index f65480c95..8268d313a 100644 --- a/ShareX.Setup/Program.cs +++ b/ShareX.Setup/Program.cs @@ -24,8 +24,6 @@ #endregion License Information (GPL v3) using System; -using System.Collections; -using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Linq; diff --git a/ShareX.UploadersLib/Enums.cs b/ShareX.UploadersLib/Enums.cs index e9bb73119..d22fbf490 100644 --- a/ShareX.UploadersLib/Enums.cs +++ b/ShareX.UploadersLib/Enums.cs @@ -126,6 +126,8 @@ public enum FileDestination VideoBin, [Description("MaxFile")] MaxFile, + [Description("Pomf.cat")] + PomfCat, [Description("Dropfile")] Dropfile, [Description("Up1")] diff --git a/ShareX.UploadersLib/FileUploaders/PomfCat.cs b/ShareX.UploadersLib/FileUploaders/PomfCat.cs new file mode 100644 index 000000000..5a37be29e --- /dev/null +++ b/ShareX.UploadersLib/FileUploaders/PomfCat.cs @@ -0,0 +1,36 @@ +#region License Information (GPL v3) + +/* + ShareX - A program that allows you to take screenshots and share any file type + Copyright (c) 2007-2015 ShareX Team + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + + This program 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 General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + Optionally you can also view the license at . +*/ + +#endregion License Information (GPL v3) + +namespace ShareX.UploadersLib.FileUploaders +{ + public sealed class PomfCat : Pomf + { + public PomfCat() + { + UploadURL = "https://pomf.cat/upload.php"; + ResultURL = "https://a.pomf.cat"; + } + } +} \ No newline at end of file diff --git a/ShareX.UploadersLib/HelperClasses/TCPClient.cs b/ShareX.UploadersLib/HelperClasses/TCPClient.cs index cd708119f..b27751fb8 100644 --- a/ShareX.UploadersLib/HelperClasses/TCPClient.cs +++ b/ShareX.UploadersLib/HelperClasses/TCPClient.cs @@ -23,7 +23,6 @@ #endregion License Information (GPL v3) -using ShareX.HelpersLib; using System; using System.Collections.Generic; using System.Drawing; diff --git a/ShareX.UploadersLib/ShareX.UploadersLib.csproj b/ShareX.UploadersLib/ShareX.UploadersLib.csproj index 003e96f67..e9e11aaf3 100644 --- a/ShareX.UploadersLib/ShareX.UploadersLib.csproj +++ b/ShareX.UploadersLib/ShareX.UploadersLib.csproj @@ -138,6 +138,7 @@ + diff --git a/ShareX/ApplicationConfig.cs b/ShareX/ApplicationConfig.cs index fa2d037f2..b90e3f911 100644 --- a/ShareX/ApplicationConfig.cs +++ b/ShareX/ApplicationConfig.cs @@ -43,6 +43,7 @@ public class ApplicationConfig : SettingsBase public int NameParserAutoIncrementNumber = 0; public RecentItem[] RecentLinks = null; public bool DisableHotkeys = false; + public bool ShowSteamButtons = true; public ApplicationConfig() { diff --git a/ShareX/CompanionCube.cs b/ShareX/CompanionCube.cs index da45b4040..40c73a7b3 100644 --- a/ShareX/CompanionCube.cs +++ b/ShareX/CompanionCube.cs @@ -23,11 +23,7 @@ #endregion License Information (GPL v3) -using System; -using System.Collections.Generic; using System.Drawing; -using System.Linq; -using System.Text; namespace ShareX { diff --git a/ShareX/CompanionCubeManager.cs b/ShareX/CompanionCubeManager.cs index 5b655ae24..0afb7e4d0 100644 --- a/ShareX/CompanionCubeManager.cs +++ b/ShareX/CompanionCubeManager.cs @@ -25,13 +25,11 @@ using ShareX.HelpersLib; using ShareX.Properties; -using ShareX.ScreenCaptureLib; using System; using System.Collections.Generic; using System.Diagnostics; using System.Drawing; using System.Linq; -using System.Text; using System.Windows.Forms; namespace ShareX diff --git a/ShareX/Forms/ActionsForm.fr.resx b/ShareX/Forms/ActionsForm.fr.resx index e788b6376..cd5806763 100644 --- a/ShareX/Forms/ActionsForm.fr.resx +++ b/ShareX/Forms/ActionsForm.fr.resx @@ -141,4 +141,7 @@ Chemin du fichier: + + Fenêtre cachée + \ No newline at end of file diff --git a/ShareX/Forms/ActionsForm.pt-BR.resx b/ShareX/Forms/ActionsForm.pt-BR.resx index a070f58d6..ab9f2b30d 100644 --- a/ShareX/Forms/ActionsForm.pt-BR.resx +++ b/ShareX/Forms/ActionsForm.pt-BR.resx @@ -141,4 +141,7 @@ Extensão do arquivo de saída (vazio = usar a mesma do nome do arquivo) + + Janela oculta + \ No newline at end of file diff --git a/ShareX/Forms/ActionsForm.tr.resx b/ShareX/Forms/ActionsForm.tr.resx index c495800dc..50b247f44 100644 --- a/ShareX/Forms/ActionsForm.tr.resx +++ b/ShareX/Forms/ActionsForm.tr.resx @@ -1,3 +1,4 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Ajouter... + + + pixels + + + Supprimer + + + Monter + + + Descendre + + + Espace entre les images: + + + Orientation de la combinaison : + + + ShareX - Combineur d'image + + + Chemin vers l'image + + + Combiner les images et enregistrer/mettre en ligne en fonction des paramètres "Après la capture" + + \ No newline at end of file diff --git a/ShareX/Forms/ImageCombinerForm.pt-BR.resx b/ShareX/Forms/ImageCombinerForm.pt-BR.resx new file mode 100644 index 000000000..0c73b9c20 --- /dev/null +++ b/ShareX/Forms/ImageCombinerForm.pt-BR.resx @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ShareX - Mesclar imagens + + + Adicionar... + + + Mesclar imagens e salvar/enviar dependendo das configurações pós-captura + + + Mover para baixo + + + Mover para cima + + + Remover + + + Local do arquivo de imagem + + + Orientação da mesclagem: + + + Espaço entre imagens: + + + pixels + + \ No newline at end of file diff --git a/ShareX/Forms/ImageCombinerForm.tr.resx b/ShareX/Forms/ImageCombinerForm.tr.resx new file mode 100644 index 000000000..ec3d8ce67 --- /dev/null +++ b/ShareX/Forms/ImageCombinerForm.tr.resx @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ShareX - Resim birleştirici + + + Ekle... + + + Resimleri birleştir ve kaydet/yükle yakalama sonrası ayarlarına göre + + + Aşağı taşı + + + Yukarı taşı + + + Kaldır + + + Resim dosya yolu + + + Birleştirme yönü: + + + Resimler arasındaki boşluk: + + + piksel olarak + + \ No newline at end of file diff --git a/ShareX/Forms/MainForm.Designer.cs b/ShareX/Forms/MainForm.Designer.cs index 32cf7d6e7..fa042e36a 100644 --- a/ShareX/Forms/MainForm.Designer.cs +++ b/ShareX/Forms/MainForm.Designer.cs @@ -200,6 +200,7 @@ private void InitializeComponent() this.tsmiTrayRuler = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayAutomate = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayIndexFolder = new System.Windows.Forms.ToolStripMenuItem(); + this.tsmiTrayImageCombiner = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayVideoThumbnailer = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayFTPClient = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayTweetMessage = new System.Windows.Forms.ToolStripMenuItem(); @@ -230,7 +231,8 @@ private void InitializeComponent() this.tsmiTrayShow = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayExit = new System.Windows.Forms.ToolStripMenuItem(); this.timerTraySingleClick = new System.Windows.Forms.Timer(this.components); - this.tsmiTrayImageCombiner = new System.Windows.Forms.ToolStripMenuItem(); + this.btnOpenSteam = new ShareX.HelpersLib.GreenlightButton(); + this.btnHideSteam = new ShareX.HelpersLib.GreenlightButton(); ((System.ComponentModel.ISupportInitialize)(this.scMain)).BeginInit(); this.scMain.Panel1.SuspendLayout(); this.scMain.Panel2.SuspendLayout(); @@ -1567,6 +1569,13 @@ private void InitializeComponent() resources.ApplyResources(this.tsmiTrayIndexFolder, "tsmiTrayIndexFolder"); this.tsmiTrayIndexFolder.Click += new System.EventHandler(this.tsmiIndexFolder_Click); // + // tsmiTrayImageCombiner + // + this.tsmiTrayImageCombiner.Image = global::ShareX.Properties.Resources.document_break; + this.tsmiTrayImageCombiner.Name = "tsmiTrayImageCombiner"; + resources.ApplyResources(this.tsmiTrayImageCombiner, "tsmiTrayImageCombiner"); + this.tsmiTrayImageCombiner.Click += new System.EventHandler(this.tsmiImageCombiner_Click); + // // tsmiTrayVideoThumbnailer // this.tsmiTrayVideoThumbnailer.Image = global::ShareX.Properties.Resources.images_stack; @@ -1766,12 +1775,19 @@ private void InitializeComponent() // this.timerTraySingleClick.Tick += new System.EventHandler(this.timerTraySingleClick_Tick); // - // tsmiTrayImageCombiner + // btnOpenSteam // - this.tsmiTrayImageCombiner.Image = global::ShareX.Properties.Resources.document_break; - this.tsmiTrayImageCombiner.Name = "tsmiTrayImageCombiner"; - resources.ApplyResources(this.tsmiTrayImageCombiner, "tsmiTrayImageCombiner"); - this.tsmiTrayImageCombiner.Click += new System.EventHandler(this.tsmiImageCombiner_Click); + resources.ApplyResources(this.btnOpenSteam, "btnOpenSteam"); + this.btnOpenSteam.ForeColor = System.Drawing.Color.White; + this.btnOpenSteam.Name = "btnOpenSteam"; + this.btnOpenSteam.MouseClick += new System.Windows.Forms.MouseEventHandler(this.btnOpenSteam_MouseClick); + // + // btnHideSteam + // + resources.ApplyResources(this.btnHideSteam, "btnHideSteam"); + this.btnHideSteam.ForeColor = System.Drawing.Color.White; + this.btnHideSteam.Name = "btnHideSteam"; + this.btnHideSteam.MouseClick += new System.Windows.Forms.MouseEventHandler(this.btnHideSteam_MouseClick); // // MainForm // @@ -1779,6 +1795,8 @@ private void InitializeComponent() resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.White; + this.Controls.Add(this.btnHideSteam); + this.Controls.Add(this.btnOpenSteam); this.Controls.Add(this.scMain); this.Controls.Add(this.tsMain); this.DoubleBuffered = true; @@ -2007,5 +2025,7 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem tsmiTrayScrollingCapture; private System.Windows.Forms.ToolStripMenuItem tsmiImageCombiner; private System.Windows.Forms.ToolStripMenuItem tsmiTrayImageCombiner; + private HelpersLib.GreenlightButton btnOpenSteam; + private HelpersLib.GreenlightButton btnHideSteam; } } \ No newline at end of file diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs index 110692299..de04645a7 100644 --- a/ShareX/Forms/MainForm.cs +++ b/ShareX/Forms/MainForm.cs @@ -588,6 +588,10 @@ private void LoadSettings() UpdateToggleHotkeyButton(); TaskbarManager.Enabled = Program.Settings.TaskbarProgressEnabled; + +#if !STEAM + btnOpenSteam.Visible = btnHideSteam.Visible = Program.Settings.ShowSteamButtons; +#endif } private void RegisterMenuClosing() @@ -1295,6 +1299,17 @@ private void lvUploads_KeyDown(object sender, KeyEventArgs e) e.Handled = true; } + private void btnOpenSteam_MouseClick(object sender, MouseEventArgs e) + { + URLHelpers.OpenURL(Links.URL_STEAM); + } + + private void btnHideSteam_MouseClick(object sender, MouseEventArgs e) + { + Program.Settings.ShowSteamButtons = false; + btnOpenSteam.Visible = btnHideSteam.Visible = false; + } + #region Tray events private void timerTraySingleClick_Tick(object sender, EventArgs e) diff --git a/ShareX/Forms/MainForm.fr.resx b/ShareX/Forms/MainForm.fr.resx index 857304596..8c5afa16f 100644 --- a/ShareX/Forms/MainForm.fr.resx +++ b/ShareX/Forms/MainForm.fr.resx @@ -636,4 +636,16 @@ Client IRC... + + Combineur d'image... + + + Combineur d'image... + + + Capture avec défilement... + + + Capture avec défilement... + \ No newline at end of file diff --git a/ShareX/Forms/MainForm.nl-NL.resx b/ShareX/Forms/MainForm.nl-NL.resx index 5dfeac903..e42bc708e 100644 --- a/ShareX/Forms/MainForm.nl-NL.resx +++ b/ShareX/Forms/MainForm.nl-NL.resx @@ -648,4 +648,10 @@ Scrollopname... + + Verberg + + + ShareX is nu beschikbaar op Steam! + \ No newline at end of file diff --git a/ShareX/Forms/MainForm.pt-BR.resx b/ShareX/Forms/MainForm.pt-BR.resx index 4c6914565..1c45e12d9 100644 --- a/ShareX/Forms/MainForm.pt-BR.resx +++ b/ShareX/Forms/MainForm.pt-BR.resx @@ -198,9 +198,6 @@ Enviar - - ShareX - Captura automática... @@ -639,4 +636,22 @@ Cliente IRC... + + Esconder + + + ShareX está disponível na Steam! + + + Mesclar imagens... + + + Captura rolante... + + + Mesclar imagens... + + + Captura rolante... + \ No newline at end of file diff --git a/ShareX/Forms/MainForm.resx b/ShareX/Forms/MainForm.resx index 74e9364ce..14044427f 100644 --- a/ShareX/Forms/MainForm.resx +++ b/ShareX/Forms/MainForm.resx @@ -313,7 +313,7 @@ $this - 2 + 4 17, 17 @@ -841,7 +841,7 @@ $this - 3 + 5 286, 17 @@ -1545,6 +1545,72 @@ 405, 17 + + Bottom, Right + + + Arial, 12pt + + + 405, 360 + + + 320, 40 + + + 0 + + + ShareX is now available on Steam! + + + False + + + btnOpenSteam + + + ShareX.HelpersLib.GreenlightButton, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 3 + + + Bottom, Right + + + Arial, 12pt + + + 728, 360 + + + 96, 40 + + + 1 + + + Hide + + + False + + + btnHideSteam + + + ShareX.HelpersLib.GreenlightButton, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 2 + True @@ -2535,6 +2601,12 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tsmiTrayImageCombiner + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + tsmiTrayVideoThumbnailer @@ -2715,12 +2787,6 @@ System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tsmiTrayImageCombiner - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - MainForm diff --git a/ShareX/Forms/MainForm.tr.resx b/ShareX/Forms/MainForm.tr.resx index ac1c571db..9b00ad530 100644 --- a/ShareX/Forms/MainForm.tr.resx +++ b/ShareX/Forms/MainForm.tr.resx @@ -529,7 +529,7 @@ Monitör testi... - Yaklama sonrası + Yakalama sonrası Yükleme sonrası @@ -636,4 +636,22 @@ IRC istemcisi... + + Sakla + + + ShareX artık Steam de mevcut! + + + Resim birleştirici... + + + Resim birleştirici... + + + Kaydırarak yakalama + + + Kaydırarak yakalama... + \ No newline at end of file diff --git a/ShareX/ImageCombinerOptions.cs b/ShareX/ImageCombinerOptions.cs index 04cddb22c..ae8d9ec77 100644 --- a/ShareX/ImageCombinerOptions.cs +++ b/ShareX/ImageCombinerOptions.cs @@ -23,10 +23,6 @@ #endregion License Information (GPL v3) -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Windows.Forms; namespace ShareX diff --git a/ShareX/IntegrationHelpers.cs b/ShareX/IntegrationHelpers.cs index c1403bcd3..c824793ec 100644 --- a/ShareX/IntegrationHelpers.cs +++ b/ShareX/IntegrationHelpers.cs @@ -26,10 +26,7 @@ using ShareX.HelpersLib; using ShareX.Properties; using System; -using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Text; using System.Windows.Forms; namespace ShareX @@ -78,21 +75,29 @@ public static void CreateSendToMenuButton(bool create) public static bool CheckSteamShowInApp() { - string path = Helpers.GetAbsolutePath("Steam"); - return File.Exists(path); + return File.Exists(Program.SteamInAppPath); } - public static void SteamShowInApp(bool inapp) + public static void SteamShowInApp(bool showInApp) { - string path = Helpers.GetAbsolutePath("Steam"); + string path = Program.SteamInAppPath; - if (inapp) + try { - File.Create(path).Dispose(); + if (showInApp) + { + File.Create(path).Dispose(); + } + else if (File.Exists(path)) + { + File.Delete(path); + } } - else if (File.Exists(path)) + catch (Exception e) { - File.Delete(path); + DebugHelper.WriteException(e); + MessageBox.Show(e.ToString(), "ShareX - " + Resources.TaskManager_task_UploadCompleted_Error, MessageBoxButtons.OK, MessageBoxIcon.Error); + return; } MessageBox.Show(Resources.ApplicationSettingsForm_cbSteamShowInApp_CheckedChanged_For_settings_to_take_effect_ShareX_needs_to_be_reopened_from_Steam_, diff --git a/ShareX/Program.cs b/ShareX/Program.cs index 62b159d63..7ffc0a8b9 100644 --- a/ShareX/Program.cs +++ b/ShareX/Program.cs @@ -242,6 +242,8 @@ public static string ScreenshotsFolder public static string ChromeHostPath => Helpers.GetAbsolutePath("ShareX_Chrome.exe"); + public static string SteamInAppPath => Helpers.GetAbsolutePath("Steam"); + #endregion Paths private static bool restarting; diff --git a/ShareX/Properties/Resources.fr.resx b/ShareX/Properties/Resources.fr.resx index 22461746a..c5e679f0c 100644 --- a/ShareX/Properties/Resources.fr.resx +++ b/ShareX/Properties/Resources.fr.resx @@ -470,4 +470,7 @@ Appuyez sur Oui pour ouvrir l'image du presse-papier. Sinon, appuyez sur Non pou Personnalisé + + Changelog + \ No newline at end of file diff --git a/ShareX/Properties/Resources.pt-BR.resx b/ShareX/Properties/Resources.pt-BR.resx index 7acbf20e8..d03e9ad83 100644 --- a/ShareX/Properties/Resources.pt-BR.resx +++ b/ShareX/Properties/Resources.pt-BR.resx @@ -470,4 +470,7 @@ Tem certeza de que quer continuar? Suporte ao Chrome desabilitado. + + Notas de atualização + \ No newline at end of file diff --git a/ShareX/ScreenRecordManager.cs b/ShareX/ScreenRecordManager.cs index 5e681012a..20016daae 100644 --- a/ShareX/ScreenRecordManager.cs +++ b/ShareX/ScreenRecordManager.cs @@ -29,7 +29,6 @@ using System; using System.Drawing; using System.IO; -using System.Threading; using System.Windows.Forms; namespace ShareX diff --git a/ShareX/ShareX.csproj b/ShareX/ShareX.csproj index 3592c084a..0c9c90826 100644 --- a/ShareX/ShareX.csproj +++ b/ShareX/ShareX.csproj @@ -654,9 +654,18 @@ HotkeySettingsForm.cs + + ImageCombinerForm.cs + + + ImageCombinerForm.cs + ImageCombinerForm.cs + + ImageCombinerForm.cs + MainForm.cs diff --git a/ShareX/TaskHelpers.cs b/ShareX/TaskHelpers.cs index b92a1f615..e6360d2d8 100644 --- a/ShareX/TaskHelpers.cs +++ b/ShareX/TaskHelpers.cs @@ -453,6 +453,7 @@ public static void OpenScrollingCapture(TaskSettings taskSettings = null, bool f { if (taskSettings == null) taskSettings = TaskSettings.GetDefaultTaskSettings(); + taskSettings.CaptureSettingsReference.ScrollingCaptureOptions.AutoClose = taskSettings.AdvancedSettings.AutoCloseScrollingCaptureWindow; ScrollingCaptureForm scrollingCaptureForm = new ScrollingCaptureForm(taskSettings.CaptureSettingsReference.ScrollingCaptureOptions, forceSelection); scrollingCaptureForm.ProcessRequested += image => UploadManager.RunImageTask(image, taskSettings); scrollingCaptureForm.Show(); diff --git a/ShareX/TaskSettings.cs b/ShareX/TaskSettings.cs index ec2bb8496..aeaa30ed9 100644 --- a/ShareX/TaskSettings.cs +++ b/ShareX/TaskSettings.cs @@ -417,6 +417,9 @@ public class TaskSettingsAdvanced Editor(typeof(DirectoryNameEditor), typeof(UITypeEditor))] public string CapturePath { get; set; } + [Category("Scrolling capture"), DefaultValue(false), Description("Automatically close scrolling capture window after completing the task.")] + public bool AutoCloseScrollingCaptureWindow { get; set; } + [Category("Upload"), Description("Files with these file extensions will be uploaded using image uploader."), Editor("System.Windows.Forms.Design.StringCollectionEditor,System.Design, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof(UITypeEditor))] public List ImageExtensions { get; set; } diff --git a/ShareX/WorkerTask.cs b/ShareX/WorkerTask.cs index 9eaa7806c..54c2bf67c 100644 --- a/ShareX/WorkerTask.cs +++ b/ShareX/WorkerTask.cs @@ -1072,6 +1072,9 @@ public UploadResult UploadFile(Stream stream, string fileName) case FileDestination.MaxFile: fileUploader = new MaxFile(); break; + case FileDestination.PomfCat: + fileUploader = new PomfCat(); + break; case FileDestination.Dropfile: fileUploader = new Dropfile(); break;