diff -Nru hotshots-2.0.1/build/cmake/FindXfixes.cmake hotshots-2.1.0/build/cmake/FindXfixes.cmake --- hotshots-2.0.1/build/cmake/FindXfixes.cmake 1970-01-01 00:00:00.000000000 +0000 +++ hotshots-2.1.0/build/cmake/FindXfixes.cmake 2014-02-06 21:13:00.000000000 +0000 @@ -0,0 +1,49 @@ +# - Find XFIXES +# Find the XFIXES libraries +# +# This module defines the following variables: +# XFIXES_FOUND - true if XFIXES_INCLUDE_DIR & XFIXES_LIBRARY are found +# XFIXES_LIBRARIES - Set when XFIXES_LIBRARY is found +# XFIXES_INCLUDE_DIRS - Set when XFIXES_INCLUDE_DIR is found +# +# XFIXES_INCLUDE_DIR - where to find Xfixes.h, etc. +# XFIXES_LIBRARY - the XFIXES library +# + +#============================================================================= +# Copyright 2011 O.S. Systems Software Ltda. +# Copyright 2011 Otavio Salvador +# Copyright 2011 Marc-Andre Moreau +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +#============================================================================= + +find_path(XFIXES_INCLUDE_DIR NAMES X11/extensions/Xfixes.h + PATH_SUFFIXES X11/extensions + DOC "The Xfixes include directory" +) + +find_library(XFIXES_LIBRARY NAMES Xfixes + DOC "The Xfixes library" +) + +include(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(Xfixes DEFAULT_MSG XFIXES_LIBRARY XFIXES_INCLUDE_DIR) + +if(XFIXES_FOUND) + set( XFIXES_LIBRARIES ${XFIXES_LIBRARY} ) + set( XFIXES_INCLUDE_DIRS ${XFIXES_INCLUDE_DIR} ) +endif() + +mark_as_advanced(XFIXES_INCLUDE_DIR XFIXES_LIBRARY) + diff -Nru hotshots-2.0.1/build/CMakeLists.txt hotshots-2.1.0/build/CMakeLists.txt --- hotshots-2.0.1/build/CMakeLists.txt 2014-01-24 20:19:44.000000000 +0000 +++ hotshots-2.1.0/build/CMakeLists.txt 2014-02-15 16:15:26.000000000 +0000 @@ -18,7 +18,7 @@ PROJECT(HotShots) # note: change this BEFORE making a release !! -SET( MYAPP_VERSION "2.0.1" ) +SET( MYAPP_VERSION "2.1.0" ) set( PROGNAME hotshots ) IF( APPLE ) @@ -43,6 +43,7 @@ IF (UNIX) FIND_PACKAGE(Qxt COMPONENTS QxtGui REQUIRED) + FIND_PACKAGE(Xfixes REQUIRED) ENDIF(UNIX) # add some useful macros and variables @@ -167,7 +168,7 @@ # last thing we have to do is to tell CMake what libraries our executable needs, # luckily FIND_PACKAGE prepared QT_LIBRARIES variable for us: IF (UNIX) - TARGET_LINK_LIBRARIES( ${PROGNAME} ${QT_LIBRARIES} -lQxtGui -lX11 -ldl ) + TARGET_LINK_LIBRARIES( ${PROGNAME} ${QT_LIBRARIES} ${XFIXES_LIBRARIES} -lQxtGui -lX11 -ldl ) ELSEIF(MINGW) TARGET_LINK_LIBRARIES(${PROGNAME} ${QT_LIBRARIES} gdi32 ) ELSE (UNIX) diff -Nru hotshots-2.0.1/build/debian/changelog hotshots-2.1.0/build/debian/changelog --- hotshots-2.0.1/build/debian/changelog 2014-01-24 20:21:26.000000000 +0000 +++ hotshots-2.1.0/build/debian/changelog 2014-02-12 20:48:14.000000000 +0000 @@ -1,3 +1,17 @@ +hotshots (2.1.0) unstable; urgency=low + + * Features: + - Speed up launch time + - Add option for mouse cursor in snapshot + - Add User defined action on click/double-click tray icon + - Editor: add group alignment (vertical/horizontal) + - Editor: add rescale background image panel + - Change Windows grabbing code on windows platform + * Bugs + - Editor: correct invalid save/restore position for text item + + -- xbee Thu, 12 February 2014 9:00:00 +0100 + hotshots (2.0.1) unstable; urgency=low * Release 2.0.1 : Initial release of package diff -Nru hotshots-2.0.1/build/debian/control hotshots-2.1.0/build/debian/control --- hotshots-2.0.1/build/debian/control 2014-01-09 22:22:44.000000000 +0000 +++ hotshots-2.1.0/build/debian/control 2014-02-06 21:00:14.000000000 +0000 @@ -2,7 +2,7 @@ Section: x11 Priority: optional Maintainer: xbee -Build-Depends: cdbs, debhelper (>= 8), cmake, libqt4-dev, libx11-dev, libqxt-dev +Build-Depends: cdbs, debhelper (>= 8), cmake, libqt4-dev, libx11-dev, libqxt-dev, libxfixes-dev Package: hotshots Architecture: any diff -Nru hotshots-2.0.1/build/debian/copyright hotshots-2.1.0/build/debian/copyright --- hotshots-2.0.1/build/debian/copyright 2014-01-09 22:22:44.000000000 +0000 +++ hotshots-2.1.0/build/debian/copyright 2014-02-15 16:09:26.000000000 +0000 @@ -1,6 +1,6 @@ This work was packaged for Debian by: - xbee on Thu, 9 January 2014 9:00:00 +0100 + xbee on Thu, 15 January 2014 9:00:00 +0100 Upstream Author(s): diff -Nru hotshots-2.0.1/build/HotShots.pro hotshots-2.1.0/build/HotShots.pro --- hotshots-2.0.1/build/HotShots.pro 2013-12-08 09:56:56.000000000 +0000 +++ hotshots-2.1.0/build/HotShots.pro 2014-02-12 20:54:40.000000000 +0000 @@ -104,7 +104,8 @@ ../ui/DefaultUploaderSettings.ui \ ../ui/EditorWidget.ui \ ../ui/FtpUploaderSettings.ui \ - ../ui/MainWindow.ui + ../ui/MainWindow.ui \ + ../ui/RescaleDialog.ui \ TRANSLATIONS = ../lang/hotshots_fr.ts # french @@ -142,7 +143,7 @@ win32:LIBS += -lgdi32 macx:LIBS += -framework Carbon -unix:!macx:LIBS+= -lX11 +unix:!macx:LIBS+= -lX11 -lXfixes isEmpty(BUNDLE):unix:!macx:LIBS+= -lQxtGui diff -Nru hotshots-2.0.1/build/Info.plist hotshots-2.1.0/build/Info.plist --- hotshots-2.0.1/build/Info.plist 2014-01-24 20:25:06.000000000 +0000 +++ hotshots-2.1.0/build/Info.plist 2014-02-15 16:15:06.000000000 +0000 @@ -7,7 +7,7 @@ CFBundleExecutable HotShots CFBundleGetInfoString - HotShots 2.0.1, Copyright 2011-2014 Xbee, GNU General Public License + HotShots 2.1.0, Copyright 2011-2014 Xbee, GNU General Public License CFBundleIconFile hotshots CFBundleIdentifier @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.0.1 + 2.1.0 CFBundleSignature ???? CFBundleVersion - 2.0.0 + 2.1.0 CSResourcesFileMapped NSHumanReadableCopyright diff -Nru hotshots-2.0.1/Changelog.txt hotshots-2.1.0/Changelog.txt --- hotshots-2.0.1/Changelog.txt 2014-01-24 20:34:28.000000000 +0000 +++ hotshots-2.1.0/Changelog.txt 2014-02-15 16:10:02.000000000 +0000 @@ -1,3 +1,14 @@ +Version 2.1.0 +* Features: +- Speed up launch time +- Add option for mouse cursor in snapshot +- Add User defined action on click/double-click tray icon +- Editor: add group alignment (vertical/horizontal) +- Editor: add rescale background image panel +- Change Windows grabbing code on windows platform +* Bugs +- Editor: correct invalid save/restore position for text item + Version 2.0.1 * Features: - Enhanced shortcut editor diff -Nru hotshots-2.0.1/CREDITS.txt hotshots-2.1.0/CREDITS.txt --- hotshots-2.0.1/CREDITS.txt 2013-09-22 14:36:30.000000000 +0000 +++ hotshots-2.1.0/CREDITS.txt 2014-02-10 20:45:00.000000000 +0000 @@ -6,7 +6,7 @@ translations: - French: thanks to xbee (xbee at xbee.net) - Lithuanian: thanks to Algimantas Margevicius (Margevicius dot Algimantas at gmail dot com) -- Italian: thanks to Manfrommars (Manfrommars at libero dot it) +- Italian: thanks to Manfrommars (martianpostbox at gmail dot com) - Japanese: thanks to piyo. - Polish: thanks to Andrzej. diff -Nru hotshots-2.0.1/debian/changelog hotshots-2.1.0/debian/changelog --- hotshots-2.0.1/debian/changelog 2014-01-28 05:20:16.000000000 +0000 +++ hotshots-2.1.0/debian/changelog 2014-02-16 08:20:53.000000000 +0000 @@ -1,3 +1,15 @@ +hotshots (2.1.0-1dhor~precise) precise; urgency=low + + * Speed up launch time + * Add option for mouse cursor in snapshot + * Add User defined action on click/double-click tray icon + * Editor: add group alignment (vertical/horizontal) + * Editor: add rescale background image panel + * Change Windows grabbing code on windows platform + * Editor: correct invalid save/restore position for text item + + -- Dariusz Duma Sun, 16 Feb 2014 09:19:03 +0100 + hotshots (2.0.1-1dhor~precise) precise; urgency=low * Enhanced shortcut editor diff -Nru hotshots-2.0.1/debian/control hotshots-2.1.0/debian/control --- hotshots-2.0.1/debian/control 2014-01-28 04:57:41.000000000 +0000 +++ hotshots-2.1.0/debian/control 2014-02-16 08:24:52.000000000 +0000 @@ -2,7 +2,7 @@ Section: graphics Priority: extra Maintainer: Dariusz Duma -Build-Depends: debhelper (>= 8.0.0), qt4-qmake, libqt4-dev, libx11-dev, libqxt-dev +Build-Depends: debhelper (>= 8.0.0), qt4-qmake, libqt4-dev, libx11-dev, libqxt-dev, libxfixes-dev Standards-Version: 3.9.2 Homepage: #Vcs-Git: git://git.debian.org/collab-maint/hotshots.git diff -Nru hotshots-2.0.1/INSTALL.txt hotshots-2.1.0/INSTALL.txt --- hotshots-2.0.1/INSTALL.txt 2014-01-09 22:26:40.000000000 +0000 +++ hotshots-2.1.0/INSTALL.txt 2014-02-06 21:02:56.000000000 +0000 @@ -1,5 +1,5 @@ * Linux (test on ubuntu/kubuntu/Fedora/openSuse/CentOS/debian) -Installation of libqxt-dev required (libqxt-devel on fedora) +Installation of libqxt-dev,libxfixes-dev required (libqxt-devel, libxfixes-devel on fedora) #> dos2unix tounix.sh #> sh ./tounix.sh Binary files /tmp/0ShdhbevAJ/hotshots-2.0.1/lang/hotshots_cs.qm and /tmp/i0vBy4mDwk/hotshots-2.1.0/lang/hotshots_cs.qm differ diff -Nru hotshots-2.0.1/lang/hotshots_cs.ts hotshots-2.1.0/lang/hotshots_cs.ts --- hotshots-2.0.1/lang/hotshots_cs.ts 2013-12-07 20:34:16.000000000 +0000 +++ hotshots-2.1.0/lang/hotshots_cs.ts 2014-02-15 16:30:52.000000000 +0000 @@ -2,80 +2,80 @@ - + release of translation and translator name please - put your name here dear translator and the release of the translation file !! + put your name here dear translator and the release of the translation file!! Pavel Fric AboutDialog - + <a href="%1">Check for new release ...</a> <a href="%1">Ověřit dostupnost nového vydání...</a> - + About O programu - + Preferences Nastavení - - Infos + + Info Informace - + Log Zápis - + Qt version %1 Verze Qt %1 - + The %1 file can't be found, sorry ... Soubor %1 nelze najít ... - + detected language: %1 Zjištěný jazyk: %1 - + Automatic detection Automatické zjištění - + Default (no use of translation files) Výchozí (nepoužívají se překlady) - + The application need to restart in order to take into account new translation -, Do you want to restart application now ? - Program je potřeba spustit znovu, aby se mohly projevit změny. -Chcete program nyní spustit znovu? +, Do you want to restart application now? + Program je třeba spustit znovu kvůli tomu, aby se vzal v úvahu nový překlad +, Chcete program spustit nyní znovu? - - Do you want to reset all the preferences to default value ? + + Do you want to reset all the preferences to default value? If yes, the application will be relaunch - Chcete nastavení nastavit na výchozí hodnotu? -V případě že ano, program se spustí znovu + Chcete nastavit nastavení znovu na výchozí hodnotu? + Pokud je odpovědí ano, program bude spuštěn znovu - + Example: Příklad: @@ -232,211 +232,241 @@ + Add mouse cursor to snapshot + Přidat ukazovátko myši do snímku + + + + Snapshot Delay (s): + Zpoždění při dělání snímku obrazovky (s): + + + + Snapshot delay in seconds + Zpoždění při dělání snímku obrazovky v sekundách + + + + No delay + Žádné zpoždění + + + Scale snapshot Změnit velikost snímku obrazovky - + % % - + Max width * height Největší šířka * výška - + 800 800 - + 600 600 - - Hotkeys - Klávesové zkratky + + Shortcut/Menu + Zkratka/Nabídka - - Use system screen capture shortcuts - Použít systémové zkratky pro zachytávání obrazovky + + Action performed by double-clicking on system tray icon: + Činnost provedena dvojitým poklepáním na ikonu v oznamovací oblasti panelu: - + + Shortcut editor + Editor zkratek + + + Action Činnost - + Shortcut Zkratka - + Description Popis - + + Use system screen capture shortcuts (only available for screen grab functions) + Použít systémové zkratky pro zachytávání obrazovky (dostupné jen pro funkce na zachytávání obrazovky) + + + Warning! Duplicated shortcuts will not be checked. - + Varování! Kontrola na zdvojené klávesové zkratky nebude prováděna. - - "Ctrl", "Shift", "Alt" and "Meta" are recognized as valid modifiers - "Ctrl", "Shift", "Alt" a "Meta" jsou rozpoznány jako platné modifikátory + + System tray additional functions: + Dodatečné funkce v oznamovací oblasti panelu: - + Network Síť - + Default web service Výchozí internetové služby - + Copy uploaded file URL to clipboard Kopírovat adresu nahraného souboru do schránky - + as jako - + No format Žádný formát - + Instant Messaging (IM) format Formát okamžité výměny zpráv (IM) - + HTML format Formát HTML - + BBCode format Formát BBCode - + User format Uživatelský formát - + @url@ @url@ - + (*) @url@ is the uploaded URL (*) @url@ je nahraná adresa (URL) - + Use a proxy server to connect to Internet Použít proxy server pro připojení se k internetu - + use Proxy Použít Proxy - + Host Hostitel: - + Proxy hostname Název hostitelského počítače proxy - + Port Přípojka - + Proxy Authentification Autentizace proxy - + Username Uživatelské jméno - + Proxy username Uživatelské jméno proxy - + Password Heslo - + Proxy password Heslo pro Proxy - + Show/Hide password in interface Ukázat/Skrýt heslo v rozhraní - + Show password Ukázat heslo - + Proxy port Přípojka proxy - + Launch default Internet browser when done Až bude hotovo, spustit výchozí prohlížeč internetu - + Uploaders Nahrávače - + Infos Informace - + Supported formats (via Qt plugins) Podporované formáty (přes přídavné moduly Qt) - + Available translations Dostupné překlady - + Log Zápis @@ -464,13 +494,13 @@ CanardPCUploader - %1 transfert end without error - %1 přeneseno bez chyby + %1 transfert end without error. + %1 přenos skončil bez chyby. - %1 transfert end with error (%2) - %1 přeneseno s chybou (%2) + %1 transfert end with error! (%2) + %1 přenos skončil s chybou! (%2) @@ -494,117 +524,117 @@ EditorWidget - + Left-click to select item, Ctrl+Left Click then drag to select a group of items Klepnutí levým tlačítkem myši pro výběr položky, Ctrl+klepnutí levým tlačítkem myši, potom tažení pro výběr skupiny položek - - + + Left-click to set center Klepnutí levým tlačítkem myši pro nastavení středu - - - - - - - - + + + + + + + + Left-click then drag to create the shape Klepnutí levým tlačítkem myši pro vytvoření tvaru - - - + + + Creation: left-click to create a point, middle-click to delete the last one and right-click to create a new shape. Modification: select vertex, left-click then drag to move, middle-click to delete and right-click to add a new one Vytvoření: Klepnutí levým tlačítkem myši pro vytvoření bodu, klepnutí prostředním tlačítkem myši pro vytvoření nového tvaru. Upravení: Vybrat uzel, klepnutí levým tlačítkem myši, potom tažení pro jeho přesunutí, klepnutí prostředním tlačítkem myši pro smazání a klepnutí pravým tlačítkem myši pro přidání nového - + Left-click to set image center and drag if you want change the size Klepnutí levým tlačítkem myši pro nastavení středu obrázku a tažení, pokud chcete změnit velikost - + Left-click then drag to create the shape, select the area and press <Enter> to perform the operation Klepnutí levým tlačítkem myši, potom tažení pro vytvoření tvaru, výběr oblasti a stisk klávesy <Enter> pro provedení operace - - There is existing annotation items, what do you want to do ? - Jsou tu stávající položky vysvětlivek. Co chcete dělat? + + There is existing annotation items, what do you want to do? + Jsou tu položky s poznámkami. Co chcete dělat? - + clear annotation items ... Smazat položky vysvětlivek... - + update background image ... Aktualizovat obrázek pozadí... - + Loading HotShots file failed Nahrání souboru HotShots se nezdařilo - + Error loading HotShots file %1 Chyba při nahrávání souboru HotShots %1 - + Snapshot editor: Editor snímku obrazovky: - + Scale x%1 Měřítko x%1 - + Clear edit Smazat úpravy - + Clear all the exiting items ? (no possible undo) Smazat všechny stávající položky? (není možné vrátit zpět) - + Clear document Smazat dokument - - Create a new document ? + + Create a new document? Vytvořit nový dokument? - + Save HotShots File Uložit soubor HotShots - + HotShots files (*.hot) Soubory HotShots (*.hot) - + Saving HotShots file failed Uložení souboru HotShots se nezdařilo - + Error saving HotShots file %1 Chyba při ukládání souboru HotShots %1 @@ -669,438 +699,489 @@ Činnosti úprav - + Select item Vybrat položku - + Select Vybrat - + + Esc + Esc + + + Text item Položka textu - + Draw text Nakreslit text - + Line item Položka čáry - + Draw a simple line Nakreslit jednoduchou čáru - + Encircle item Položka kroužku - + Encircle Zakroužkovat - + Polyline item Položka lomené čáry - + Draw a polyline Nakreslit lomenou čáru - + Polygon item Položka mnohoúhelníku - + Draw a polygon Nakreslit mnohoúhelník - + Curve item Položka křivky - + Draw a curve Nakreslit křivku - + Crop item Položka ořezání - + Crop background image Oříznout obrázek pozadí - + Rectangle item Položka obdélníku - + Draw a rectangle Nakreslit obdélník - + Ellipse item Položka elipsy - + Draw an ellipse Nakreslit elipsu - + Arrow item Položka šipky - + Draw an arrow Nakreslit šipku - + Tag item Položka značky - + Draw a numbered tag Nakreslit očíslovanou značku - + Highlighter item Položka zvýraznění - + Highlight Zvýraznění - + Magnifier item Položka zvětšovacího skla - + Magnifier Zvětšovací sklo - + Image item Položka obrázku - + Add an image Přidat obrázek - + Blur item Položka rozmazání - - Obfuscate - Zatemnit + + Blur + Rozmazat - + Font size down Velikost písma dolů - + Decrease font size Zmenšit velikost písma - + Font size up Velikost písma nahoru - + Increase font size Zvětšit velikost písma - + aAbB... aAbB... - + Change font Změnit písmo - + Quit Ukončit - + Quit editor Ukončit editor - + Load Nahrát - + Open a file Otevřít soubor - - + + New document Nový dokument - + Import clipboard Zavést schránku - + Import image from clipboard Zavést obrázek ze schránky - + Save Uložit - + Save edition Uložit verzi - + Save as Uložit jako - + Save edition as Uložit verzi jako - - + + Copy to clipboard Kopírovat do schránky - + Export Vyvést - + Export image Vyvést obrázek - + Upload Nahrát - + Upload the image to the web Nahrát obrázek na internet - + Print Tisk - + Fit to view Přizpůsobit velikost - + Scale to fit window Přizpůsobit velikost oknu - - + + Reset scale Nastavit měřítko znovu - + Undo Zpět - + Undo the last action Vrátit poslední krok zpět - + Redo Znovu - + Redo the last undo action Udělat poslední krok znovu - + Add frame Přidat rámeček - + Add a post effect to background image Přidat další efekt do obrázku pozadí - + add shadow Přidat stín - + Enable/Disable item's shadow Povolit/Zakázat stín položky - + Item up Položka nahoru - + Push selected elements up Posunout vybrané prvky nahoru - + Item down Položka dolů - + Push selected elements down Posunout vybrané prvky dolů - + Duplicate items Zdvojit položky - + Duplicate selected element Zdvojit vybraný prvek - + Clear items Zdvojit položky - + Erase all elements Vymazat všechny prvky - + Delete items Smazat položky - + Delete selected elements Smazat vybrané prvky - - Del - Klávesa Delete - - - + No post effect Žádný další efekt - + Simple drop shadow Jednoduchý stín - + Drop shadow with borders Stín s okraji - + Progressive opacity Postupná neprůhlednost - + Torn edge Roztrhaný okraj - + Item to top Položka úplně nahoru - + Push selected elements to top Posunout vybrané prvky úplně nahoru - + Item to bottom Položka úplně dolů - + Push selected elements to bottom Posunout vybrané prvky úplně dolů + + + + Align group to left + Zarovnat skupinu vlevo + + + + + Align group to horizontal center + Zarovnat skupinu vodorovně na střed + + + + + Align group to vertical center + Zarovnat skupinu svisle na střed + + + + + Align group to right + Zarovnat skupinu vpravo + + + + + Align group to top + Zarovnat skupinu nahoru + + + + + Align group to bottom + Zarovnat skupinu dolů + + + + Set alignment + Nastavit zarovnání + + + + Set alignment to a group + Nastavit zarovnání ke skupině + + + + Rescale background image + Změnit velikost obrázku pozadí + FileParser @@ -1111,8 +1192,8 @@ - Saving failed for project %1 : %2 - Nepodařilo se uložit projekt %1 : %2 + Saving failed for project %1: %2 + Nepodařilo se uložit projekt %1: %2 @@ -1126,12 +1207,12 @@ - The file is not a "Hotshots" file !! + The file is not a "Hotshots" file! Soubor není souborem "Hotshots"! - Configuration has been automatically updated ! + Configuration has been automatically updated! Nastavení bylo automaticky aktualizováno! @@ -1144,19 +1225,19 @@ FreeImageHostingUploader - %1 transfert end without error - %1 přenos skončil bez chyby + %1 transfert end without error. + %1 přenos skončil bez chyby. - %1 transfert end with error (%2) - %1 přenos skončil s chybou (%2) + %1 transfert end with error! (%2) + %1 přenos skončil s chybou! (%2) FreehandGrabber - + Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit. Pomocí myši vyberte oblast. Udělejte snímek obrazovky, stiskněte klávesu Enter nebo dvakrát klepněte. Stiskněte klávesu Esc pro ukončení. @@ -1180,8 +1261,8 @@ - successful uploading onto %1. - Úspěšné nahrání do %1. + Uploaded successfully onto %1. + Úspěšně nahráno do %1. @@ -1195,13 +1276,13 @@ - %1 transfert end with error - %1 přenos skončil s chybou + %1 transfert end with error! + %1 přenos skončil s chybou! - %1 transfert end without error - %1 přenos skončil bez chyby + %1 transfert end without error. + %1 přenos skončil bez chyby. @@ -1273,7 +1354,7 @@ - Ftp port + FTP port Přípojka FTP @@ -1291,13 +1372,13 @@ ImageshackUploader - %1 transfert end without error - %1 přenos skončil bez chyby + %1 transfert end without error. + %1 přenos skončil bez chyby. - %1 transfert end with error (%2) - %1 přenos skončil s chybou (%2) + %1 transfert end with error! (%2) + %1 přenos skončil s chybou! (%2) @@ -1309,13 +1390,13 @@ ImgurUploader - %1 transfert end without error - %1 přenos skončil bez chyby + %1 transfert end without error. + %1 přenos skončil bez chyby. - %1 transfert end with error (%2) - %1 přenos skončil s chybou (%2) + %1 transfert end with error! (%2) + %1 přenos skončil s chybou! (%2) @@ -1326,118 +1407,118 @@ MainWindow - + Save Directory Ukládací adresář - + Register of %1 uploaders Seznam %1 nahrávačů - - Can't create storage location, check why ?! (%1) + + Can't create storage location, check why?! (%1) Nelze vytvořit umístění pro ukládání, zjistěte proč?! (%1) - + No post effect Žádný další efekt - + Simple drop shadow Jednoduchý stín - + Drop shadow with borders Stín s okraji - + Progressive opacity Postupná neprůhlednost - + Torn edge Roztrhaný okraj - + Main application Hlavní program - + Annotation editor Editor vysvětlivek - - + + Upload the image to the web Nahrát obrázek na internet - - No default uploading web service defined ! + + No default uploading web service defined! Pro nahrávání nebyla stanovena žádná výchozí internetová služba! - + Uploader %1 Nahrávač %1 - - The default uploader (%1) does not appear correctly configured, no value given for required parameters !! + + The default uploader (%1) does not appear correctly configured, no value given for required parameters!! Zdá se, že výchozí nahrávač (%1) není správně nastaven, pro požadované parametry není zadána žádná hodnota! - - Upload image %1 to %2 service ? - Nahrát obrázek %1 na službu %2 ? + + Upload image %1 to %2 service? + Nahrát obrázek %1 na službu %2? - + Print Document Vytisknout dokument - + Save File Uložit soubor - + Images (*.%1) Obrázky (*.%1) - + Save failed Uložení se nezdařilo - + Error saving file Chyba při ukládání souboru - + Systray Oznamovací oblast panelu - + The program will keep running in the system tray. To terminate the program, choose <b>Quit</b> in the context menu of the system tray entry. Program poběží dál v oznamovací oblasti panelu. Pro ukončení programu vyberte <b>Ukončit</b> v nabídce, která se objeví poklepnutí pravým tlačítkem myši na ikonu programu v oznamovací oblasti panelu. - + message from other instance. zpráva od jiné instance. @@ -1466,56 +1547,56 @@ Parametry - - Snapshot Delay (s): - Zpoždění při dělání snímku obrazovky (s): - - - + Output path: Výstupní cesta: - + Cap&ture mode: Režim &zachytávání: - - Snapshot delay in seconds - Zpoždění při dělání snímku obrazovky v sekundách - - - - No delay - Žádné zpoždění - - - + After snapshot: Po udělání snímku obrazovky: - + Do nothing Nedělat nic - + Auto save image Obrázek automaticky uložit - + Save image (ask user) Uložit obrázek (zeptat se uživatele) - + Launch editor Spustit editor + + Snapshot delay in seconds + Zpoždění při dělání snímku obrazovky v sekundách + + + + No delay + Žádné zpoždění + + + + Snapshot Delay (s): + Zpoždění při dělání snímku obrazovky (s): + + Quit Ukončit @@ -1551,88 +1632,88 @@ Ukázat rozhraní - + Copy To Clipboard Kopírovat do schránky - + Copy to clipboard Kopírovat do schránky - + Open editor Otevřít editor - + Open editor and add annotations Otevřít editor a přidat vysvětlivky - + Grab Screen Zachytit obrazovku - + Grab screen (current) Zachytit obrazovku (nynější) - + Grab all screens Zachytit všechny obrazovky - + Grab all screens (multi-monitors) Zachytit všechny obrazovky (více obrazovek) - + Grab Window Zachytit okno - + Grab window Zachytit okno - + Grab Region Zachytit oblast - + Grab region Zachytit oblast - + Help Nápověda - + Upload Nahrát - + Upload the image to the web Upload the image to the web + - Grab freehand region Grab freehand region - + Print Tisk @@ -1640,7 +1721,7 @@ QObject - + %1 found %1 nalezeno @@ -1661,18 +1742,18 @@ - Following options are known: - Jsou známy následující volby: + Following options are available: + Jsou dostupné následující volby: - --help - displays this help. - --help - zobrazí tuto nápovědu. + --help : displays this help. + --help : Zobrazí tuto nápovědu. - --reset-config - clear the saved preference parameters. - --reset-config - smazat uložené parametry nastavení. + --reset-config : clear the saved preference parameters. + --reset-config : Smazat uložené parametry nastavení. @@ -1681,33 +1762,38 @@ + --portable : use settings file location near the executable (for portable use). + --portable : Použít umístění souboru s nastavením při spustitelném souboru (pro přenositelné použití). + + + file : file to load in the editor, can be a .hot file or an image file. soubor: soubor k nahrání do editoru, může to být soubor .hot nebo obrázkový soubor. - - %1 is already running !! + + %1 is already running!! %1 již běží! - translations path %1 + Translations path %1 Cesta k překladům %1 - setting language to : %1 + Setting language to: %1 Nastavení jazyka na: %1 - successfully loaded data from %1 + Successfully loaded data from %1 Data z %1 byla úspěšně nahrána - failed to load data from %1 + Failed to load data from %1 Data z %1 se nepodařilo nahrát @@ -1737,12 +1823,50 @@ RegionGrabber - + Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit. Pomocí myši vyberte oblast. Udělejte snímek obrazovky, stiskněte klávesu Enter nebo dvakrát klepněte. Stiskněte klávesu Esc pro ukončení. + RescaleDialogClass + + + Rescale snapshot + Změnit velikost snímku obrazovky + + + + Original size: + Původní velikost: + + + + Target size: + Cílová velikost: + + + + Scale snapshot + Změnit velikost snímku obrazovky + + + + % + % + + + + Size + Velikost + + + + Keep aspect ratio + Zachovat poměr stran + + + WidgetBrush @@ -1855,12 +1979,12 @@ - Fill with translucent Background Color + Fill with transparent background color Vyplnit průsvitnou barvou pozadí - Fill with Background Color + Fill with background color Vyplnit barvou pozadí Binary files /tmp/0ShdhbevAJ/hotshots-2.0.1/lang/hotshots_de.qm and /tmp/i0vBy4mDwk/hotshots-2.1.0/lang/hotshots_de.qm differ diff -Nru hotshots-2.0.1/lang/hotshots_de.ts hotshots-2.1.0/lang/hotshots_de.ts --- hotshots-2.0.1/lang/hotshots_de.ts 2013-12-07 20:45:24.000000000 +0000 +++ hotshots-2.1.0/lang/hotshots_de.ts 2014-02-15 16:28:24.000000000 +0000 @@ -1,82 +1,79 @@ - - - + - + - + release of translation and translator name please - put your name here dear translator and the release of the translation file !! + put your name here dear translator and the release of the translation file!! Arno Lutz AboutDialog - + <a href="%1">Check for new release ...</a> <a href="%1">Auf neue Version prüfen ...</a> - + About About - + Preferences Einstellungen - - Infos - Infos + + Info + - + Log Protokoll - + Qt version %1 Qt Version %1 - + The %1 file can't be found, sorry ... Datei %1 konnte nicht gefunden werden... - + detected language: %1 Erkannte Sprache: %1 - + Automatic detection Automatische Erkennung - + Default (no use of translation files) Standard (keine Erkennung der Sprachdateien) - + The application need to restart in order to take into account new translation -, Do you want to restart application now ? - Das Programm muss neu gestartet werden um die geänderte Sprache zu übernehmen, wollen Sie das Programm neu starten? +, Do you want to restart application now? + - - Do you want to reset all the preferences to default value ? + + Do you want to reset all the preferences to default value? If yes, the application will be relaunch - Wollen Sie alle Einstellungen auf Default zurücksetzen? - Wenn ja, dann wird die ursprügliche Einstellung überschrieben + - + Example: Beispiel: @@ -233,211 +230,241 @@ + Add mouse cursor to snapshot + + + + + Snapshot Delay (s): + Aufnahmeverzögerung (s): + + + + Snapshot delay in seconds + Aufnahmeverzögerung in Sekunden + + + + No delay + keine Verzögerung + + + Scale snapshot Skaliere Schnappschuss - + % % - + Max width * height Max Höhe*Breite - + 800 800 - + 600 600 - - Hotkeys - Tastenkürzel + + Shortcut/Menu + - - Use system screen capture shortcuts - + + Action performed by double-clicking on system tray icon: + - + + Shortcut editor + + + + Action - + - + Shortcut - + - + Description - + + + + + Use system screen capture shortcuts (only available for screen grab functions) + - + Warning! Duplicated shortcuts will not be checked. - + - - "Ctrl", "Shift", "Alt" and "Meta" are recognized as valid modifiers - + + System tray additional functions: + - + Network Netzwerk - + Default web service Standard Webservice - + Copy uploaded file URL to clipboard Kopiere upload-URL in Zwischenablage - + as als - + No format ohne Format - + Instant Messaging (IM) format Instant Messaging Format (IM) - + HTML format HTML-Format - + BBCode format BBCode-Format - + User format Benutzer-Format - + @url@ @url@ - + (*) @url@ is the uploaded URL (*) @url@ Upload-URL - + Use a proxy server to connect to Internet verwende Proxy-Server für Interetverbindung - + use Proxy verwende Proxy - + Host Host - + Proxy hostname Proxy Hostname - + Port Port - + Proxy Authentification Proxy Authentisierung - + Username Benutzername - + Proxy username Benutzername - + Password Passwort - + Proxy password Passwort - + Show/Hide password in interface zeige/verstecke Passwort - + Show password zeige Passwort - + Proxy port Proxy Port - + Launch default Internet browser when done starte Browser wenn fertig - + Uploaders online-Dienste - + Infos Infos - + Supported formats (via Qt plugins) unterstützte Formate (via Qt plugins) - + Available translations verfügbare Sprachen - + Log Protokoll @@ -465,13 +492,13 @@ CanardPCUploader - %1 transfert end without error - %1 Übertragung ohne Fehler beendet + %1 transfert end without error. + - %1 transfert end with error (%2) - %1 Übertragung mit Fehler beendet (%2) + %1 transfert end with error! (%2) + @@ -495,117 +522,117 @@ EditorWidget - + Left-click to select item, Ctrl+Left Click then drag to select a group of items Linksklick um Element auszuwählen, Ctrl+Linksklick um gruppierte Elemente zu bewegen - - + + Left-click to set center Linksklick für mittig - - - - - - - - + + + + + + + + Left-click then drag to create the shape Linksklick und Form aufziehen - - - + + + Creation: left-click to create a point, middle-click to delete the last one and right-click to create a new shape. Modification: select vertex, left-click then drag to move, middle-click to delete and right-click to add a new one Erstellen: Linksklick für Punkt, Mittelklick um letzten zu löschen und Rechtsklick für neue Form. Abwandlung: markiere Punkt, bewege mit Linksklick, Mittelklick zum löschen und Rechtsklick für hinzufügen - + Left-click to set image center and drag if you want change the size Linksklick um Bild mittig zu setzen und ziehen für Größenänderung - + Left-click then drag to create the shape, select the area and press <Enter> to perform the operation Licksklick und Form aufziehen, markiere Bereich und drücke <Enter> um die Operation auszuführen - - There is existing annotation items, what do you want to do ? - Es sind Anmerkungen vorhanden, was wollen Sie tun? + + There is existing annotation items, what do you want to do? + - + clear annotation items ... lösche Anmerkungen... - + update background image ... Hintergrundbild erneuern... - + Loading HotShots file failed laden von HotShots-Datei fehlgeschlagen - + Error loading HotShots file %1 Fehler beim laden von HotShots-Datei %1 - + Snapshot editor: Schnappschuss-Editor: - + Scale x%1 Skaliere x%1 - + Clear edit lösche Eingabe - + Clear all the exiting items ? (no possible undo) - + - + Clear document leere Dokument - - Create a new document ? - Neues Dokument? + + Create a new document? + - + Save HotShots File Speichere HotShots-Datei - + HotShots files (*.hot) HotShots-Datei (*.hot) - + Saving HotShots file failed Speichern von HotShots-Datei fehlgeschlagen - + Error saving HotShots file %1 Fehler bei speichern der HotShots-Datei %1 @@ -637,470 +664,521 @@ ... - + Preview font - + Reset colors - + swap background and foreground colors - + Foreground and background colors - + Main actions - + Edition actions - + - + Select item - + - + Select markieren - + + Esc + + + + Text item - + - + Draw text Textwerkzeug - + Line item - + - + Draw a simple line einfache Linie - + Encircle item - + - + Encircle einkreisen - + Polyline item - + - + Draw a polyline Polylinie - + Polygon item - + - + Draw a polygon Polygon - + Curve item - + - + Draw a curve Bezierkurve - + Crop item - + - + Crop background image beschneiden - + Rectangle item - + - + Draw a rectangle Rechteck - + Ellipse item - + - + Draw an ellipse Ellipse - + Arrow item - + - + Draw an arrow Pfeil - + Tag item - + - + Draw a numbered tag Nummerierung - + Highlighter item - + - + Highlight Marker - + Magnifier item - + - + Magnifier Lupe - + Image item - + - + Add an image Bild einfügen - + Blur item - + - - Obfuscate - verpixeln + + Blur + - + Font size down - + - + Decrease font size Schrift kleiner - + Font size up - + - + Increase font size Schrift größer - + aAbB... aAbB... - + Change font wechsle Schrift - + Quit Beenden - + Quit editor Editor beenden - + Load - + - + Open a file Datei öffnen - - + + New document Neues Dokument - + Import clipboard - + - + Import image from clipboard Bild aus Zwischenablage importieren - + Save - + - + Save edition Bearbeitung speichern - + Save as - + - + Save edition as Bearbeitung speichern unter - - + + Copy to clipboard kopiere in Zwischenablage - + Export - + - + Export image Bild exportieren - + Upload Hochladen - + Upload the image to the web in Web hochladen - + Print Drucken - + Fit to view - + - + Scale to fit window Bild auf Fenster skalieren - - + + Reset scale Skalieren zurücksetzen - + Undo - + - + Undo the last action - + - + Redo - + - + Redo the last undo action - + - + Add frame - + - + Add a post effect to background image Bildeffekt - + add shadow - + - + Enable/Disable item's shadow Elementschatten ein/aus - + Item up - + - + Push selected elements up markierte Elemente eine Ebene höher - + Item down - + - + Push selected elements down markierte Elemente eine Ebene tiefer - + Duplicate items - + - + Duplicate selected element markierte Elemente duplizieren - + Clear items - + - + Erase all elements lösche alle Elemente - + Delete items - + - + Delete selected elements lösche markierte Elmente - - Del - löschen - - - + No post effect kein Bildeffekt - + Simple drop shadow einfacher Schatten - + Drop shadow with borders Schatten mit Rand - + Progressive opacity ansteigende Deckkraft - + Torn edge rissige Ecken - + Item to top - + - + Push selected elements to top - + - + Item to bottom - + - + Push selected elements to bottom - + + + + + + Align group to left + + + + + + Align group to horizontal center + + + + + + Align group to vertical center + + + + + + Align group to right + + + + + + Align group to top + + + + + + Align group to bottom + + + + + Set alignment + + + + + Set alignment to a group + + + + + Rescale background image + @@ -1112,8 +1190,8 @@ - Saving failed for project %1 : %2 - Speichern von Projekt %1 fehlgeschlagen: %2 + Saving failed for project %1: %2 + @@ -1127,13 +1205,13 @@ - The file is not a "Hotshots" file !! - Datei ist keine "HotShots"-Datei !! + The file is not a "Hotshots" file! + - Configuration has been automatically updated ! - Konfiguration wurde automatisch auf neuesten Stand gebracht! + Configuration has been automatically updated! + @@ -1145,19 +1223,19 @@ FreeImageHostingUploader - %1 transfert end without error - %1 Übertragung ohne Fehler beendet + %1 transfert end without error. + - %1 transfert end with error (%2) - %1 Übertragung mit Fehler (%2) + %1 transfert end with error! (%2) + FreehandGrabber - + Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit. Markieren eines Bereichs mir der Maus. Für einen Schnappschuss Enter drücken oder Doppelklick. Um abzubrechen Esc drücken. @@ -1181,8 +1259,8 @@ - successful uploading onto %1. - Übetragung zu %1 erfolgreich. + Uploaded successfully onto %1. + @@ -1196,13 +1274,13 @@ - %1 transfert end with error - %1 Übertragung mit Fehler beendet + %1 transfert end with error! + - %1 transfert end without error - %1 Übertragung ohne Fehler beendet + %1 transfert end without error. + @@ -1274,8 +1352,8 @@ - Ftp port - Port + FTP port + @@ -1292,13 +1370,13 @@ ImageshackUploader - %1 transfert end without error - %1 Übertragung ohne Fehler beendet + %1 transfert end without error. + - %1 transfert end with error (%2) - %1 Übertragung mit Fehler (%2) beendet + %1 transfert end with error! (%2) + @@ -1310,13 +1388,13 @@ ImgurUploader - %1 transfert end without error - %1 Übertragung ohne Fehler beendet + %1 transfert end without error. + - %1 transfert end with error (%2) - %1 Übertragung mit Fehler (%2) + %1 transfert end with error! (%2) + @@ -1327,118 +1405,118 @@ MainWindow - + Save Directory Verzeichnis zum speichern - + Register of %1 uploaders %1 Uploader registriert - - Can't create storage location, check why ?! (%1) - Speicherort kann nicht erstellt werden, prüfen?! (%1) + + Can't create storage location, check why?! (%1) + - + No post effect kein Bildeffekt - + Simple drop shadow einfacher Schatten - + Drop shadow with borders Schatten mit Rand - + Progressive opacity ansteigende Deckkraft - + Torn edge rissige Ecken - + Main application - + - + Annotation editor - + - - + + Upload the image to the web in Web hochladen - - No default uploading web service defined ! - Kein Upload-Dienst eingerichtet! + + No default uploading web service defined! + - + Uploader %1 Uploader %1 - - The default uploader (%1) does not appear correctly configured, no value given for required parameters !! - Upload-Dienst (%1) nicht vollständig eingerichtet, es fehlen Parameter!! + + The default uploader (%1) does not appear correctly configured, no value given for required parameters!! + - - Upload image %1 to %2 service ? - Upload Bild %1 zu %2-Dienst? + + Upload image %1 to %2 service? + - + Print Document Drucken - + Save File Speichern - + Images (*.%1) Bilder (*.%1) - + Save failed Speichern ist fehlgeschlagen - + Error saving file Fehler beim Speichern - + Systray Systemabschnitt der Kontrollleiste - + The program will keep running in the system tray. To terminate the program, choose <b>Quit</b> in the context menu of the system tray entry. Programm wird in Systemabschnitt der Kontrollleiste minimiert. Zum Beenden wähle <b>Beenden<b> im Kontextmenü des Eintrags im Systemabschnitt. - + message from other instance. Meldung von anderer Instanz. @@ -1467,56 +1545,56 @@ Einstellungen - - Snapshot Delay (s): - Aufnahmeverzögerung (s): - - - + Output path: Augabepfad: - + Cap&ture mode: &Erfassungsmodus: - - Snapshot delay in seconds - Aufnahmeverzögerung in Sekunden - - - - No delay - keine Verzögerung - - - + After snapshot: nach Aufnahme: - + Do nothing mache nichts - + Auto save image Auto-Speichern - + Save image (ask user) Speichern mit Rückfrage - + Launch editor Starte Editor + + Snapshot delay in seconds + Aufnahmeverzögerung in Sekunden + + + + No delay + keine Verzögerung + + + + Snapshot Delay (s): + Aufnahmeverzögerung (s): + + Quit Beenden @@ -1552,88 +1630,88 @@ Programmfenster anzeigen - + Copy To Clipboard kopiere in Zwischenablage - + Copy to clipboard kopiere in Zwischenablage - + Open editor - + - + Open editor and add annotations - + - + Grab Screen Erfasse Bildschirm - + Grab screen (current) Erfasse aktuellen Bildschirm - + Grab all screens Erfasse alle Bildschirme - + Grab all screens (multi-monitors) Erfasse alle Bildschirme (Multi-Monitorbetrieb) - + Grab Window Erfasse Fenster - + Grab window Erfasse Fenster - + Grab Region Erfasse Region - + Grab region Erfasse Region - + Help Hilfe - + Upload Hochladen - + Upload the image to the web in Web hochladen + - Grab freehand region Erfasse Freihand - + Print Drucken @@ -1641,14 +1719,14 @@ QObject - + %1 found %1 gefunden Screenshot management and annotation tool - + @@ -1662,18 +1740,18 @@ - Following options are known: - Folgende Optionen sind bekannt: + Following options are available: + - --help - displays this help. - --help - zeigt dies Hilfe. + --help : displays this help. + - --reset-config - clear the saved preference parameters. - --reset-config - lösche gespeicherte Einstellungen. + --reset-config : clear the saved preference parameters. + @@ -1682,34 +1760,39 @@ + --portable : use settings file location near the executable (for portable use). + + + + file : file to load in the editor, can be a .hot file or an image file. file : Datei in Editor laden, kann ein .hot file oder ein Bild sein. - - %1 is already running !! - %1 läuft schon!! + + %1 is already running!! + - translations path %1 - Pfad zu den Übersetzungen %1 + Translations path %1 + - setting language to : %1 - setze Sprache zu %1 + Setting language to: %1 + - successfully loaded data from %1 - Daten erfolgreich von %1 geladen + Successfully loaded data from %1 + - failed to load data from %1 - Daten von %1 konnten nicht geladen werden + Failed to load data from %1 + @@ -1727,23 +1810,61 @@ Choose foreground color - + Choose background color - + RegionGrabber - + Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit. Markiere einen Bereich mit der Maus. Für Erfassen Enter drücken oder Doppelklick. Esc bricht ab. + RescaleDialogClass + + + Rescale snapshot + + + + + Original size: + + + + + Target size: + + + + + Scale snapshot + Skaliere Schnappschuss + + + + % + % + + + + Size + + + + + Keep aspect ratio + + + + WidgetBrush @@ -1856,13 +1977,13 @@ - Fill with translucent Background Color - Füllung mit durscheinendem Hintergrund + Fill with transparent background color + - Fill with Background Color - Mit Hintergrundfarbe gefüllt + Fill with background color + - + \ No newline at end of file Binary files /tmp/0ShdhbevAJ/hotshots-2.0.1/lang/hotshots_el.qm and /tmp/i0vBy4mDwk/hotshots-2.1.0/lang/hotshots_el.qm differ diff -Nru hotshots-2.0.1/lang/hotshots_el.ts hotshots-2.1.0/lang/hotshots_el.ts --- hotshots-2.0.1/lang/hotshots_el.ts 2014-01-24 20:14:32.000000000 +0000 +++ hotshots-2.1.0/lang/hotshots_el.ts 2014-02-15 16:31:20.000000000 +0000 @@ -2,80 +2,80 @@ - + release of translation and translator name please - put your name here dear translator and the release of the translation file !! - Έκδοση 1.2.0. Μετάφραση geogeo.gr (www.geogeo.gr) + put your name here dear translator and the release of the translation file!! + Έκδοση 2.x. Μετάφραση geogeo.gr (www.geogeo.gr) AboutDialog - + <a href="%1">Check for new release ...</a> <a href="%1">Έλεγχος για νέα έκδοση...</a> - + About Περί... - + Preferences Προτιμήσεις - - Infos + + Info Πληροφορίες - + Log Μητρώο καταγραφής - + Qt version %1 Έκδοση Qt: %1 - + The %1 file can't be found, sorry ... Συγνώμη. Το αρχείο %1 δεν βρέθηκε. - + detected language: %1 Γλώσσα που εντοπίστηκε: %1 - + Automatic detection Αυτόματος εντοπισμός - + Default (no use of translation files) Προεπιλογή (χωρίς χρήση αρχείων γλώσσας) - + The application need to restart in order to take into account new translation -, Do you want to restart application now ? +, Do you want to restart application now? Η εφαρμογή πρέπει να κάνει επανεκκίνηση για να ισχύσει η νέα γλώσσα. Είστε βέβαιος ότι θέλετε να κάνετε επανεκκίνηση της εφαρμογή τώρα; - - Do you want to reset all the preferences to default value ? + + Do you want to reset all the preferences to default value? If yes, the application will be relaunch Θέλετε να επαναφέρετε όλες τις προτιμήσεις στις προεπιλεγμένες τιμές; Εάν ναι, η εφαρμογή θα κάνει επανεκκίνηση. - + Example: Παράδειγμα: @@ -232,211 +232,241 @@ + Add mouse cursor to snapshot + Προσθήκη δείκτη ποντικιού στο στιγμιότυπο + + + + Snapshot Delay (s): + Καθυστέρηση στιγμιοτύπου (s): + + + + Snapshot delay in seconds + Καθυστέρηση στιγμιοτύπου σε δευτερόλεπτα + + + + No delay + Χωρίς καθυστέρηση + + + Scale snapshot Κλίμακα στιγμιοτύπου - + % % - + Max width * height Μέγιστο πλάτος x ύψος - + 800 800 - + 600 600 - - Hotkeys - Συντομεύσεις + + Shortcut/Menu + Συντόμευση / Μενού - - Use system screen capture shortcuts - Χρήση συντομεύσεων του συστήματος για λήψη στιγμιοτύπων + + Action performed by double-clicking on system tray icon: + Δράση του διπλού κλικ στο εικονίδιο της περιοχής ειδοποιήσεων: - + + Shortcut editor + Επεξεργαστής συντόμευσης + + + Action Ενέργεια - + Shortcut Συντόμευση - + Description Περιγραφή - + + Use system screen capture shortcuts (only available for screen grab functions) + Χρήση συντομεύσεων του συστήματος για λήψη στιγμιοτύπων (διαθέσιμη μόνο για λειτουργίες αποτύπωσης οθόνης) + + + Warning! Duplicated shortcuts will not be checked. Προειδοποίηση! Οι διπλότυπες συντομεύσεις δεν θα ελεγχθούν. - - "Ctrl", "Shift", "Alt" and "Meta" are recognized as valid modifiers - Τα "Ctrl", "Shift", "Alt" and "Meta" αναγνωρίζονται ως έγκυροι τροποποιητές + + System tray additional functions: + Πρόσθετες λειτουργίες περιοχής ειδοποιήσεων: - + Network Δίκτυο - + Default web service Προεπιλεγμένη υπηρεσία διαδικτύου - + Copy uploaded file URL to clipboard Αντιγραφή διεύθυνσης ανεβασμένου αρχείου στο Πρόχειρο - + as ως - + No format Χωρίς μορφή - + Instant Messaging (IM) format Μορφή Instant Messaging (IM) - + HTML format Μορφή HTML - + BBCode format Μορφή BBCode - + User format Μορφή χρήστη - + @url@ @url@ - + (*) @url@ is the uploaded URL (*) @url@ είναι η διεύθυνση url μεταφόρτωσης - + Use a proxy server to connect to Internet Χρήση διακομιστή μεσολάβησης για τη σύνδεση με το Διαδίκτυο - + use Proxy Χρήση διακομιστή μεσολάβησης - + Host Κεντρικός υπολογιστής - + Proxy hostname Όνομα κεντρικού υπολογιστή διακομιστή μεσολάβησης - + Port Θύρα - + Proxy Authentification Έλεγχος ταυτότητας διακομιστή μεσολάβησης - + Username Όνομα χρήστη - + Proxy username Όνομα χρήστη διακομιστή μεσολάβησης - + Password Κωδικός πρόσβασης - + Proxy password Κωδικός πρόσβασης διακομιστή μεσολάβησης - + Show/Hide password in interface Εμφάνιση/Απόκρυψη κωδικού στη διεπαφή - + Show password Εμφάνιση κωδικού - + Proxy port Θύρα διακομιστή μεσολάβησης - + Launch default Internet browser when done Εκκίνηση προεπιλεγμένου προγράμματος περιήγησης στο διαδίκτυο όταν ολοκληρωθεί - + Uploaders Εφαρμογές μεταφόρτωσης - + Infos Πληροφορίες - + Supported formats (via Qt plugins) Υποστηριζόμενες μορφές (μέσω πρόσθετων Qt) - + Available translations Διαθέσιμες μεταφράσεις - + Log Μητρώο καταγραφής @@ -464,13 +494,13 @@ CanardPCUploader - %1 transfert end without error - Το %1 μεταφέρθηκε χωρίς σφάλμα + %1 transfert end without error. + Το %1 μεταφέρθηκε χωρίς σφάλμα. - %1 transfert end with error (%2) - Το %1 μεταφέρθηκε με σφάλμα (%2) + %1 transfert end with error! (%2) + Το %1 μεταφέρθηκε με σφάλμα! (%2) @@ -494,117 +524,117 @@ EditorWidget - + Left-click to select item, Ctrl+Left Click then drag to select a group of items Αριστερό κλικ για επιλογή στοιχείου. Ctrl+αριστερό κλικ και σύρσιμο για επιλογή ομάδας στοιχείων - - + + Left-click to set center Αριστερό κλικ για ορισμό του κέντρου - - - - - - - - + + + + + + + + Left-click then drag to create the shape Αριστερό κλικ και σύρσιμο για δημιουργία του σχήματος - - - + + + Creation: left-click to create a point, middle-click to delete the last one and right-click to create a new shape. Modification: select vertex, left-click then drag to move, middle-click to delete and right-click to add a new one Δημιουργία: Αριστερό κλικ για δημιουργία σημείου, μεσαίο κλικ για διαγραφή του τελευταίου και δεξί κλικ για νέο σχήμα. Τροποποίηση: Επιλογή κορυφής, αριστερό κλικ και σύρσιμο για μετακίνηση, μεσαίο κλικ για διαγραφή και δεξί κλικ για προσθήκη νέου - + Left-click to set image center and drag if you want change the size Αριστερό κλικ για ορισμό κέντρου εικόνας και σύρσιμο εάν θέλετε να αλλάξετε το μέγεθος - + Left-click then drag to create the shape, select the area and press <Enter> to perform the operation Αριστερό κλικ και σύρσιμο για δημιουργία του σχήματος, επιλογή περιοχής και <Enter> για εκτέλεση της λειτουργίας - - There is existing annotation items, what do you want to do ? + + There is existing annotation items, what do you want to do? Υπάρχουν τρέχοντα στοιχεία σχολιασμού. Τι θέλετε να κάνετε; - + clear annotation items ... Απαλοιφή στοιχείων σχολιασμού - + update background image ... Ενημέρωση φόντου εικόνας - + Loading HotShots file failed Η φόρτωση του αρχείου HotShots απέτυχε - + Error loading HotShots file %1 Σφάλμα φόρτωσης του αρχείου HotShots %1 - + Snapshot editor: Επεξεργαστής στιγμιοτύπου: - + Scale x%1 Κλίμακα x%1 - + Clear edit Απαλοιφή επεξεργασίας - + Clear all the exiting items ? (no possible undo) Απαλοιφή όλων των υφιστάμενων στοιχείων; (χωρίς δυνατότητα αναίρεσης) - + Clear document Απαλοιφή εγγράφου - - Create a new document ? + + Create a new document? Δημιουργία νέου εγγράφου; - + Save HotShots File Αποθήκευση αρχείου HotShots - + HotShots files (*.hot) Αρχεία HotShots (*.hot) - + Saving HotShots file failed Η αποθήκευση του αρχείου HotShots απέτυχε - + Error saving HotShots file %1 Σφάλμα αποθήκευσης του αρχείου HotShots %1 @@ -669,438 +699,489 @@ Ενέργειες έκδοσης - + Select item Επιλογή στοιχείου - + Select Επιλογή - + + Esc + Esc + + + Text item Εργαλείο κειμένου - + Draw text Σχεδίαση κειμένου - + Line item Εργαλείο γραμμής - + Draw a simple line Σχεδίαση απλής γραμής - + Encircle item Εργαλείο κυκλικής επισήμανσης - + Encircle Κυκλική επισήμανση - + Polyline item Εργαλείο τεθλασμένης - + Draw a polyline Σχεδίαση τεθλασμένης - + Polygon item Εργαλείο πολυγώνου - + Draw a polygon Σχεδίαση πολυγώνου - + Curve item Εργαλείο καμπύλης - + Draw a curve Σχεδίαση καμπύλης - + Crop item Εργαλείο περικοπής - + Crop background image Περικοπή φόντου εικόνας - + Rectangle item Εργαλείο ορθογωνίου - + Draw a rectangle Σχεδίαση ορθογωνίου - + Ellipse item Εργαλείο έλλειψης - + Draw an ellipse Σχεδίαση έλλειψης - + Arrow item Εργαλείο βέλους - + Draw an arrow Σχεδίαση βέλους - + Tag item Εργαλείο ετικέτας - + Draw a numbered tag Σχεδίαση αριθμημένης ετικέτας - + Highlighter item Εργαλείο επισήμανσης - + Highlight Επισήμανση - + Magnifier item Εργαλείο μεγεθυντικού φακού - + Magnifier Μεγεθυντικός φακός - + Image item Εργαλείο εικόνας - + Add an image Προσθήκη εικόνας - + Blur item Εργαλείο θαμπώματος - - Obfuscate + + Blur Θάμπωμα - + Font size down Μείωση μεγέθους γραμματοσειράς - + Decrease font size Μείωση μεγέθους γραμματοσειράς - + Font size up Αύξηση μεγέθους γραμματοσειράς - + Increase font size Αύξηση μεγέθους γραμματοσειράς - + aAbB... αΑβΒ... - + Change font Αλλαγή γραμματοσειράς - + Quit Έξοδος - + Quit editor Έξοδος από τον επεξεργαστή - + Load Φόρτωση - + Open a file Άνοιγμα αρχείου - - + + New document Νέο έγγραφο - + Import clipboard Εισαγωγή από Πρόχειρο - + Import image from clipboard Εισαγωγή εικόνας από το Πρόχειρο - + Save Αποθήκευση - + Save edition Αποθήκευση έκδοσης - + Save as Αποθήκευση ως - + Save edition as Αποθήκευση έκδοσης ως - - + + Copy to clipboard Αντιγραφή στο Πρόχειρο - + Export Εξαγωγή - + Export image Εξαγωγή εικόνας - + Upload Μεταφόρτωση - + Upload the image to the web Αποστολή της εικόνας στο διαδίκτυο - + Print Εκτύπωση - + Fit to view Προσαρμογή προβολής - + Scale to fit window Κλίμακα προσαρμογής στο παράθυρο - - + + Reset scale Ακύρωση κλίμακας - + Undo Αναίρεση - + Undo the last action Αναίρεση της τελευταίας ενέργειας - + Redo Επανάληψη - + Redo the last undo action Ακύρωση της τελευταίας αναίρεσης - + Add frame Προσθήκη πλαισίου - + Add a post effect to background image Προσθήκη εφέ στο φόντο της εικόνας - + add shadow Προσθήκη σκιάς - + Enable/Disable item's shadow Απ-Ενεργοποίηση σκιάς στοιχείων - + Item up Στοιχείο πάνω - + Push selected elements up Ώθηση επιλεγμένων στοιχείων πάνω - + Item down Στοιχείο κάτω - + Push selected elements down Ώθηση επιλεγμένων στοιχείων κάτω - + Duplicate items Αντιγραφή στοιχείων - + Duplicate selected element Αντίγραφο επιλεγμένου στοιχείου - + Clear items Απαλοιφή στοιχείων - + Erase all elements Διαγραφή όλων των στοιχείων - + Delete items Διαγραφή στοιχείων - + Delete selected elements Διαγραφή επιλεγμένων στοιχείων - - Del - Διαγραφή - - - + No post effect Χωρίς προσθήκη εφέ - + Simple drop shadow Απλή σκιά - + Drop shadow with borders Σκιά μαζί με περίγραμμα - + Progressive opacity Προοδευτική αδιαφάνεια - + Torn edge Λείανση άκρων - + Item to top Ώθηση στην κορυφή - + Push selected elements to top Ώθηση επιλεγμένων στοιχείων στην κορυφή - + Item to bottom Ώθηση στη βάση - + Push selected elements to bottom Ώθηση επιλεγμένων στοιχείων στη βάση + + + + Align group to left + Στοίχιση ομάδας αριστερά + + + + + Align group to horizontal center + Στοίχιση ομάδας οριζόντια στο κέντρο + + + + + Align group to vertical center + Στοίχιση ομάδας κάθετα στο κέντρο + + + + + Align group to right + Στοίχιση ομάδας δεξιά + + + + + Align group to top + Στοίχιση ομάδας πάνω + + + + + Align group to bottom + Στοίχιση ομάδας κάτω + + + + Set alignment + Ρύθμιση στοίχισης + + + + Set alignment to a group + Ρύθμιση στοίχισης σε μια ομάδα + + + + Rescale background image + Επανάληψη κλιμάκωσης εικόνας φόντου + FileParser @@ -1111,8 +1192,8 @@ - Saving failed for project %1 : %2 - Απέτυχε η αποθήκευση για το έργο %1 : %2 + Saving failed for project %1: %2 + Απέτυχε η αποθήκευση για το έργο %1: %2 @@ -1126,12 +1207,12 @@ - The file is not a "Hotshots" file !! - Το αρχείο δεν είναι αρχείο «Hotshots»! + The file is not a "Hotshots" file! + Το αρχείο δεν είναι αρχείο του «Hotshots»! - Configuration has been automatically updated ! + Configuration has been automatically updated! Η διαμόρφωση έχει ενημερωθεί αυτόματα! @@ -1144,19 +1225,19 @@ FreeImageHostingUploader - %1 transfert end without error - Το %1 μεταφέρθηκε χωρίς σφάλμα + %1 transfert end without error. + Το %1 μεταφέρθηκε χωρίς σφάλμα. - %1 transfert end with error (%2) - Το %1 μεταφέρθηκε με σφάλμα (%2) + %1 transfert end with error! (%2) + Το %1 μεταφέρθηκε με σφάλμα! (%2) FreehandGrabber - + Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit. Επιλέξτε μια περιοχή χρησιμοποιώντας το ποντίκι. Για λήψη στιγμιοτύπου, πιέστε το πλήκτρο Enter ή κάντε διπλό κλικ. @@ -1182,7 +1263,7 @@ - successful uploading onto %1. + Uploaded successfully onto %1. Επιτυχής αποστολή στο %1. @@ -1197,13 +1278,13 @@ - %1 transfert end with error - Η μεταφορά του %1 τελείωσε με σφάλμα + %1 transfert end with error! + Η μεταφορά του %1 τελείωσε με σφάλμα! - %1 transfert end without error - Η μεταφορά του %1 τελείωσε χωρίς σφάλμα + %1 transfert end without error. + Η μεταφορά του %1 τελείωσε χωρίς σφάλμα. @@ -1275,7 +1356,7 @@ - Ftp port + FTP port Θύρα FTP @@ -1293,13 +1374,13 @@ ImageshackUploader - %1 transfert end without error - Το %1 μεταφέρθηκε χωρίς σφάλμα + %1 transfert end without error. + Το %1 μεταφέρθηκε χωρίς σφάλμα. - %1 transfert end with error (%2) - Το %1 μεταφέρθηκε με σφάλμα (%2) + %1 transfert end with error! (%2) + Το %1 μεταφέρθηκε με σφάλμα! (%2) @@ -1311,13 +1392,13 @@ ImgurUploader - %1 transfert end without error - Το %1 μεταφέρθηκε χωρίς σφάλμα + %1 transfert end without error. + Το %1 μεταφέρθηκε χωρίς σφάλμα. - %1 transfert end with error (%2) - Το %1 μεταφέρθηκε με σφάλμα (%2) + %1 transfert end with error! (%2) + Το %1 μεταφέρθηκε με σφάλμα! (%2) @@ -1328,118 +1409,118 @@ MainWindow - + Save Directory Κατάλογος αποθήκευσης - + Register of %1 uploaders Καταχώρηση προγράμματος μεταφόρτωσης %1 - - Can't create storage location, check why ?! (%1) + + Can't create storage location, check why?! (%1) Δεν μπορεί να δημιουργηθεί η θέση αποθήκευσης. Ελέγξτε την αιτία! (%1) - + No post effect Χωρίς προσθήκη εφέ - + Simple drop shadow Απλή σκιά - + Drop shadow with borders Σκιά μαζί με περίγραμμα - + Progressive opacity Προοδευτική αδιαφάνεια - + Torn edge Λείανση άκρων - + Main application Κύρια εφαρμογή - + Annotation editor Επεξεργαστής σχολιασμών - - + + Upload the image to the web Αποστολή εικόνας στο διαδίκτυο - - No default uploading web service defined ! + + No default uploading web service defined! Δεν έχει καθοριστεί προεπιλεγμένη υπηρεσία αποστολής στο διαδίκτυο! - + Uploader %1 Πρόγραμμα μεταφόρτωσης %1 - - The default uploader (%1) does not appear correctly configured, no value given for required parameters !! - Το προεπιλεγμένο πρόγραμμα μεταφόρτωσης (%1) δεν φαίνεται να είναι σωστά ρυθμισμένο. Δεν έχει τιμές για τις απαιτούμενες παραμέτρους ! + + The default uploader (%1) does not appear correctly configured, no value given for required parameters!! + Το προεπιλεγμένο πρόγραμμα μεταφόρτωσης (%1) δεν φαίνεται να είναι σωστά ρυθμισμένο. Δεν έχει τιμές για τις απαιτούμενες παραμέτρους! - - Upload image %1 to %2 service ? + + Upload image %1 to %2 service? Αποστολή της εικόνας %1 στην υπηρεσία %2; - + Print Document Εκτύπωση εγγράφου - + Save File Αποθήκευση αρχείου - + Images (*.%1) Εικόνες (*.%1) - + Save failed Η αποθήκευση απέτυχε - + Error saving file Σφάλμα αποθήκευσης αρχείου - + Systray Πειοχή ειδοποιήσεων - + The program will keep running in the system tray. To terminate the program, choose <b>Quit</b> in the context menu of the system tray entry. Το πρόγραμμα θα συνεχίσει να τρέχει στην περιοχή ειδοποιήσεων. Για να τερματίσετε το πρόγραμμα, επιλέξτε <b>Έξοδο</b> στο μενού περιβάλλοντος της περιοχής ειδοποιήσεων. - + message from other instance. Μήνυμα από άλλο παράδειγμα. @@ -1468,56 +1549,56 @@ Παράμετροι - - Snapshot Delay (s): - Καθυστέρηση στιγμιοτύπου (s): - - - + Output path: Κατάλογος εξαγωγής: - + Cap&ture mode: Λειτουργία &λήψης: - - Snapshot delay in seconds - Καθυστέρηση στιγμιοτύπου σε δευτερόλεπτα - - - - No delay - Χωρίς καθυστέρηση - - - + After snapshot: Μετά το στιγμιότυπο: - + Do nothing Καμία ενέργεια - + Auto save image Αυτόματη αποθήκευση εικόνας - + Save image (ask user) Αποθήκευση εικόνας (ερώτηση χρήστη) - + Launch editor Εκκίνηση του επεξεργαστή + + Snapshot delay in seconds + Καθυστέρηση στιγμιοτύπου σε δευτερόλεπτα + + + + No delay + Χωρίς καθυστέρηση + + + + Snapshot Delay (s): + Καθυστέρηση στιγμιοτύπου (s): + + Quit Έξοδος @@ -1553,88 +1634,88 @@ Εμφάνιση διεπαφής - + Copy To Clipboard Αντιγραφή στο Πρόχειρο - + Copy to clipboard Αντιγραφή στο Πρόχειρο - + Open editor Άνοιγμα επεξεργαστή - + Open editor and add annotations Άνοιγμα επεξεργαστή και προσθήκη σχολίων - + Grab Screen Αποτύπωση οθόνης - + Grab screen (current) Αποτύπωση οθόνης (τρέχουσα) - + Grab all screens Αποτύπωση όλων των οθονών - + Grab all screens (multi-monitors) Αποτύπωση όλων των οθονών (πολλαπλές οθόνες) - + Grab Window Αποτύπωση παραθύρου - + Grab window Αποτύπωση παραθύρου - + Grab Region Αποτύπωση περιοχής - + Grab region Αποτύπωση περιοχής - + Help Βοήθεια - + Upload Μεταφόρτωση - + Upload the image to the web Μεταφόρτωση της εικόνας στο διαδίκτυο + - Grab freehand region Αποτύπωση ακανόνιστης περιοχής - + Print Εκτύπωση @@ -1642,7 +1723,7 @@ QObject - + %1 found Βρέθηκαν 1% @@ -1663,18 +1744,18 @@ - Following options are known: - Είναι γνωστές οι ακόλουθες επιλογές: + Following options are available: + Είναι διαθέσιμες οι παρακάτω επιλογές: - --help - displays this help. - --βοήθεια - εμφάνιση αυτής της βοήθειας. + --help : displays this help. + --βοήθεια : εμφάνιση αυτής της βοήθειας. - --reset-config - clear the saved preference parameters. - --επαναφορά - απαλοιφή αποθηκευμένων προτιμήσεων. + --reset-config : clear the saved preference parameters. + --επαναφορά : απαλοιφή αποθηκευμένων προτιμήσεων. @@ -1683,33 +1764,38 @@ + --portable : use settings file location near the executable (for portable use). + --φορητό : χρήση θέσης αρχείου ρυθμίσεων δίπλα στο εκτελέσιμο (για φορητή χρήση). + + + file : file to load in the editor, can be a .hot file or an image file. Αρχείο : το αρχείο που θα φορτωθεί στον επεξεργαστή, μπορεί να είναι ένα αρχείο .hot ή ένα αρχείο εικόνας. - - %1 is already running !! + + %1 is already running!! Το %1 εκτελείται ήδη! - translations path %1 + Translations path %1 Κατάλογος μεταφράσεων %1 - setting language to : %1 - Ρύθμιση γλώσσας σε : %1 + Setting language to: %1 + Ρύθμιση γλώσσας σε: %1 - successfully loaded data from %1 + Successfully loaded data from %1 Επιτυχής φόρτωση δεδομένων από %1 - failed to load data from %1 + Failed to load data from %1 Αποτυχία φόρτωσης δεδομένων από %1 @@ -1739,7 +1825,7 @@ RegionGrabber - + Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit. Επιλέξτε μια περιοχή χρησιμοποιώντας το ποντίκι. Για λήψη στιγμιοτύπου, πιέστε το πλήκτρο Enter ή κάντε διπλό κλικ. @@ -1747,6 +1833,44 @@ + RescaleDialogClass + + + Rescale snapshot + Επανάληψη κλιμάκωσης στιγμιοτύπου + + + + Original size: + Αρχικό μέγεθος: + + + + Target size: + Τελικό μέγεθος: + + + + Scale snapshot + Κλίμακα στιγμιοτύπου + + + + % + % + + + + Size + Μέγεθος + + + + Keep aspect ratio + Διατήρηση αναλογιών εικόνας + + + WidgetBrush @@ -1859,12 +1983,12 @@ - Fill with translucent Background Color - Γέμισμα με το ημιδιαφανές χρώμα φόντου + Fill with transparent background color + Γέμισμα με το διαφανές χρώμα φόντου - Fill with Background Color + Fill with background color Γέμισμα με το χρώμα φόντου Binary files /tmp/0ShdhbevAJ/hotshots-2.0.1/lang/hotshots_es.qm and /tmp/i0vBy4mDwk/hotshots-2.1.0/lang/hotshots_es.qm differ diff -Nru hotshots-2.0.1/lang/hotshots_es.ts hotshots-2.1.0/lang/hotshots_es.ts --- hotshots-2.0.1/lang/hotshots_es.ts 2014-01-24 20:14:08.000000000 +0000 +++ hotshots-2.1.0/lang/hotshots_es.ts 2014-02-15 16:32:20.000000000 +0000 @@ -2,80 +2,80 @@ - + release of translation and translator name please - put your name here dear translator and the release of the translation file !! - Traducción 2.0 por manu007 + put your name here dear translator and the release of the translation file!! + Traducción 2.1 por manu007 AboutDialog - + <a href="%1">Check for new release ...</a> <a href="%1">Para ver si hay una nueva versión ...</a> - + About A proposito - + Preferences Preferencias - - Infos + + Info Información - + Log Diario - + Qt version %1 Qt version %1 - + The %1 file can't be found, sorry ... El fichero %1 no es accesible, lo siento ... - + detected language: %1 Idioma detectado : %1 - + Automatic detection Detección automática - + Default (no use of translation files) Defecto (no hay fichero de traducción) - + The application need to restart in order to take into account new translation -, Do you want to restart application now ? +, Do you want to restart application now? La aplicación necesita reiniciar para tener cuenta el nuevo idioma -¿ Desea reniciar la aplicacióm ahora ? +¿ Desea reiniciar la aplicación ahora ? - - Do you want to reset all the preferences to default value ? + + Do you want to reset all the preferences to default value? If yes, the application will be relaunch Desea borrar todas las preferencias ? -De ser si, la aplicación se reiniciará +En casi afirmativo, la aplicación se reiniciará - + Example: Ejemplo : @@ -213,7 +213,7 @@ Capture window with decoration - Capturar la ventana con su decoración + Capturar una ventana con su decoración @@ -232,211 +232,241 @@ + Add mouse cursor to snapshot + Añadir imagen del ratón a la captura. + + + + Snapshot Delay (s): + Retardo (s) : + + + + Snapshot delay in seconds + Retardo en segundos + + + + No delay + Ningún retardo + + + Scale snapshot Escalar la captura de pantalla - + % % - + Max width * height Ancho x alto máximo - + 800 800 - + 600 600 - - Hotkeys - Atajos + + Shortcut/Menu + Atajo/Menú - - Use system screen capture shortcuts - Usar atajos de captura de pantalla del sistema + + Action performed by double-clicking on system tray icon: + Acción realizada por un doble clic en el icono de la bandeja del sistema: - + + Shortcut editor + Editor de atajos. + + + Action Acción - + Shortcut Atajo - + Description Descripción - + + Use system screen capture shortcuts (only available for screen grab functions) + Usar el atajo sistema para la captura de pantalla (sólo disponible para las funciones de captura de pantalla) + + + Warning! Duplicated shortcuts will not be checked. ¡ Cuidado ! No se revisarán atajos duplicados. - - "Ctrl", "Shift", "Alt" and "Meta" are recognized as valid modifiers - "Ctrl", "Shift", "Alt" y "Meta" Son reconocidos como modificadores válidos. + + System tray additional functions: + Funciones adicionales para la bandeja del sistema: - + Network Red - + Default web service Servcio WEB por defecto - + Copy uploaded file URL to clipboard Capturar la URL del fichero al porta-papeles - + as como - + No format Sin formato - + Instant Messaging (IM) format Formato de mensajería instantanéa (IM) - + HTML format Formato HTML - + BBCode format Formato BBCode - + User format Formato definido por el usuario - + @url@ @url@ - + (*) @url@ is the uploaded URL (*) @url@ el la URL subida - + Use a proxy server to connect to Internet Utilizar un proxy para conectarse a Internet - + use Proxy Utilizar un Proxy - + Host Servidor - + Proxy hostname Nombre del Proxy - + Port Puerto - + Proxy Authentification Autentificación para el servidor proxy - + Username Nombre de usuario - + Proxy username Nombre de usuaurio en el servidor proxy - + Password Palabra de paso - + Proxy password Palabra de paso en el servidor Proxy - + Show/Hide password in interface Mostrar/Esconder la palabra de paso en la interfaz - + Show password Mostrar la palabra de paso - + Proxy port Puerto del servidor proxy - + Launch default Internet browser when done Inciar el manejador WEB al finalizar - + Uploaders Telecargadores - + Infos Infos - + Supported formats (via Qt plugins) Formatos soportados (via plugins Qt) - + Available translations Traducciones disponibles - + Log Diario @@ -464,12 +494,12 @@ CanardPCUploader - %1 transfert end without error - La transferencia %1 se ha terminado sin errores + %1 transfert end without error. + La transferencia de %1 se ha terminado sin errores - %1 transfert end with error (%2) + %1 transfert end with error! (%2) La transferencia %1 se ha terminado con el error (%2) @@ -494,117 +524,117 @@ EditorWidget - + Left-click to select item, Ctrl+Left Click then drag to select a group of items Click izquierdo para seleccionar el elemento, Ctrl+Click Izquierdo y desplazar el ratón lara seleccionar un grupo de elementos - - + + Left-click to set center Click izquierdo para posicionar el centro - - - - - - - - + + + + + + + + Left-click then drag to create the shape Click-izquierdo y desplazar el ratón para crear el elemento - - - + + + Creation: left-click to create a point, middle-click to delete the last one and right-click to create a new shape. Modification: select vertex, left-click then drag to move, middle-click to delete and right-click to add a new one Creatión: Click-Izquierdo para crear un punto, Click-Central para borrar este último et Click-Derecho para crear una nueva figura. MOdificación: seleccionar una cima, Click-Izquierdo y mover el ratón para desplazar, Click-Centro para borrar y Click-Derecho en el segmento para añadir un punto - + Left-click to set image center and drag if you want change the size Click Izquierdo para posicionar el centro de la imágen, luego desplazar el ratón si se desaa redimensionar la imágen - + Left-click then drag to create the shape, select the area and press <Enter> to perform the operation Clic-Izquierdo y desplazar para crear la figura, Seleccionar y tecla ENTER para efectuar la operación - - There is existing annotation items, what do you want to do ? - Existen elementos de anotación, ¿ Que desea hacer ? ? + + There is existing annotation items, what do you want to do? + Existen elementos de anotación. ¿ Que desea hacer ? - + clear annotation items ... borrar los elementos existentes ... - + update background image ... actualizar la imágen de fondo ... - + Loading HotShots file failed La carga del fichero HotShots ha fallado - + Error loading HotShots file %1 Error durante la carga del fichero HotShots %1 - + Snapshot editor: Editor de pantallas capturadas : - + Scale x%1 Escala x%1 - + Clear edit Limpiar la edición - + Clear all the exiting items ? (no possible undo) Limpiar todos las entradas existentes? (No se puede deshacer) - + Clear document Borrar el documento - - Create a new document ? + + Create a new document? ¿ Crear un nuevo documento ? - + Save HotShots File Salvar el fichero HotShots - + HotShots files (*.hot) Ficheros HostShots (*.hot) - + Saving HotShots file failed La salvaguardia del fichero HotShots a fallado - + Error saving HotShots file %1 Errores en la salvaguardia del fichero HotShots %1 @@ -669,438 +699,489 @@ Acciones de edición - + Select item Seleccionar articulo - + Select Seleccionar - + + Esc + Esc + + + Text item Elemento de texto - + Draw text Dibujar un texto - + Line item Elemento - + Draw a simple line Dibujar una linea - + Encircle item Rodear elemento - + Encircle Rodear - + Polyline item Elemento polilinea - + Draw a polyline Dibujar una polilínea - + Polygon item Elemento polígono - + Draw a polygon Dibujar un polígono - + Curve item Elemento curva - + Draw a curve Dibujar una linea curva - + Crop item Elemento crop - + Crop background image Cortar la imágen de fondo - + Rectangle item Elemento rectángulo - + Draw a rectangle Dibujar un rectángulo - + Ellipse item Elemento elipses - + Draw an ellipse Dibujar una elípsis - + Arrow item Elemento flecha - + Draw an arrow Dibujar una flecha - + Tag item Elemento diana - + Draw a numbered tag Dibujar una baliza - + Highlighter item Alumbrar elemento - + Highlight Poner en evidencia - + Magnifier item Magnificar elemento - + Magnifier Lupa - + Image item Elemento imagen - + Add an image Añadir una imágen - + Blur item Manchar elemento - - Obfuscate - Mascar + + Blur + Manchar - + Font size down Reducir fuente - + Decrease font size Decrecer el tamaño del fuente - + Font size up Agrandar fuente - + Increase font size Incrementar el tamaño del fuente - + aAbB... aAbB... - + Change font Cambiar la fuente - + Quit Salir - + Quit editor Salir del editor - + Load Cargar - + Open a file Abrir un fichero - - + + New document Nuevo documento - + Import clipboard Importar portapapeles - + Import image from clipboard Importar imágen desde el porta-papeles - + Save Salvar - + Save edition Salvar la edición - + Save as Salvar como - + Save edition as Salvar bajo - - + + Copy to clipboard Copiar hacia el porta-papeles - + Export Exportar - + Export image Exportar la imágen - + Upload Telecargar - + Upload the image to the web Telecargar la imágen hacia la WEB - + Print Imprimir - + Fit to view Encajar la vista - + Scale to fit window Escalar al tamaño de la ventana - - + + Reset scale Renicializar la escala - + Undo Deshacer - + Undo the last action Deshacer la última acción - + Redo Rehacer - + Redo the last undo action Rehacer la última acción - + Add frame Añadir marco - + Add a post effect to background image Añadir un efecto a la imágen de fondo - + add shadow Añadir sombra - + Enable/Disable item's shadow Mostrar/esconder el sombreado de los elementos - + Item up Subir elemento - + Push selected elements up Poner los elementos seleccionados encima - + Item down Bajar elemento - + Push selected elements down Poner los elementos seleccionados debajo - + Duplicate items Duplicar elementos - + Duplicate selected element Duplicar el elemento actual - + Clear items Limpiar elementos - + Erase all elements Borrar todos los elementos - + Delete items Borrar elementos - + Delete selected elements Borrar todos los elementos - - Del - Borrar - - - + No post effect Ningún post-effecto - + Simple drop shadow Gota de sombra simple - + Drop shadow with borders Gota de sombra con bordes - + Progressive opacity Opacidad progresiva - + Torn edge Bordes rotos - + Item to top Elemento a primer plano - + Push selected elements to top Llevar los elementos seleccionados al nivel superior - + Item to bottom Elemento al final - + Push selected elements to bottom Llevar los elementos seleccionados al final + + + + Align group to left + Alinear el grupo a la izquierda + + + + + Align group to horizontal center + Alinear el grupo en horizontal centrado. + + + + + Align group to vertical center + Alinear el grupo en vertical centrado + + + + + Align group to right + Alinear grupo a la derecha + + + + + Align group to top + Alinear grupo en el cabezal + + + + + Align group to bottom + Alinear el grupo al pié + + + + Set alignment + Definir alineación + + + + Set alignment to a group + Definir alineación para un grupo + + + + Rescale background image + Escalar imagen de fondo + FileParser @@ -1111,7 +1192,7 @@ - Saving failed for project %1 : %2 + Saving failed for project %1: %2 La salvaguardia del proyecto a fallado %1 : %2 @@ -1126,13 +1207,13 @@ - The file is not a "Hotshots" file !! - ¡¡ No es un fichero HotShots !! + The file is not a "Hotshots" file! + ¡ No es un fichero Hotshots ! - Configuration has been automatically updated ! - ¡ La configuración ha sido autmáticamente actualizada ! + Configuration has been automatically updated! + La configuración ha sido automáticamente actualizada. @@ -1144,19 +1225,19 @@ FreeImageHostingUploader - %1 transfert end without error - La transferencia de %1 se ha terminado sin errores + %1 transfert end without error. + La descarga %1 se ha terminado sin errores - %1 transfert end with error (%2) - La transferencia de %1 se ha terminado con un error (%2) + %1 transfert end with error! (%2) + La descargar de %1 se ha terminado con un error (%2) FreehandGrabber - + Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit. Seleccionar una región usando el ratón. Para efectura la captura de la pantalla, presionar ENTER; ou doble click. Presionar ESC para salir. @@ -1180,8 +1261,8 @@ - successful uploading onto %1. - Telecarga exitosa %1 + Uploaded successfully onto %1. + Descarga en %1 realizada con éxito @@ -1195,13 +1276,13 @@ - %1 transfert end with error - La transferencia de %1 se ha terminado con un error + %1 transfert end with error! + La descarga de %1 se ha terminado con error ! - %1 transfert end without error - La transferencia de %1 se ha terminado sin errores + %1 transfert end without error. + La descarga de %1 se ha terminado sin errores @@ -1273,7 +1354,7 @@ - Ftp port + FTP port Puerto FTP @@ -1291,13 +1372,13 @@ ImageshackUploader - %1 transfert end without error - La transferencia de %1 se ha terminado sin errores + %1 transfert end without error. + La descarga de %1 se ha terminado sin errores - %1 transfert end with error (%2) - La transferencia de %1 se ha terminado con el error (%2) + %1 transfert end with error! (%2) + La descarga de %1 se ha terminado con error (%2) @@ -1309,13 +1390,13 @@ ImgurUploader - %1 transfert end without error - La transferencia de %1 se ha terminado sin errores + %1 transfert end without error. + La descarga de %1 se ha terminado sin errores - %1 transfert end with error (%2) - La transferencia de %1 se ha terminado con un error (%2) + %1 transfert end with error! (%2) + La descarga de %1 se ha terminado con un error (%2) @@ -1326,118 +1407,118 @@ MainWindow - + Save Directory Carpeta de salvaguardia - + Register of %1 uploaders Registro de %1 telecargadores - - Can't create storage location, check why ?! (%1) - Imposble crear la carpeta de grabación temporal, ¡¡ BUSCA LA RAZÓN !! (%1) + + Can't create storage location, check why?! (%1) + Imposible crear la carpeta de grabación, ¡ BUSCA LA RAZÓN ! (%1) - + No post effect Ningún post-effecto - + Simple drop shadow Gota de sombra simple - + Drop shadow with borders Gota de sombra con bordes - + Progressive opacity Opacidad progresiva - + Torn edge Bordes rotos - + Main application Aplicación principal - + Annotation editor Editor de anotaciones - - + + Upload the image to the web Telecargar la imágen hacia la WEB - - No default uploading web service defined ! - ¡ No se especificado ningún servicio de telecarga ! + + No default uploading web service defined! + ¡ No se especificado ningún servicio de descarga WEB ! - + Uploader %1 Telecargador %1 - - The default uploader (%1) does not appear correctly configured, no value given for required parameters !! - ¡¡ El telecargador por defecto (%1) no parece estar correctamente configurado, no hay valores para los campos requeridos !! + + The default uploader (%1) does not appear correctly configured, no value given for required parameters!! + ¡ El descargador por defecto (%1) no parece estar correctamente configurado, no hay valores para los campos requeridos ! - - Upload image %1 to %2 service ? - Telecarga de la imágen %1 hacia el servicio %2 ? + + Upload image %1 to %2 service? + Subir de la imagen %1 hacia el servicio %2 ? - + Print Document Imprimir el documento - + Save File Salvar el fichero - + Images (*.%1) Imagenes (*.%1) - + Save failed La salvaguardia a fallado - + Error saving file Errores durante la salvaguardia - + Systray Zona de notificación - + The program will keep running in the system tray. To terminate the program, choose <b>Quit</b> in the context menu of the system tray entry. El programa quedará activo en la zona de notificación. Para salir definitivamente, elegir <b>Salir</b> En el menú contextual de la zona de notificación. - + message from other instance. Mensaje de otra instancia @@ -1466,56 +1547,56 @@ Parametros - - Snapshot Delay (s): - Retardo (s) : - - - + Output path: Carpeta de salida : - + Cap&ture mode: Modo de captura : - - Snapshot delay in seconds - Retardo en segundos - - - - No delay - Ningún retardo - - - + After snapshot: Después de la captura : - + Do nothing Nada que hacer - + Auto save image Salvar automáticamente la imágen - + Save image (ask user) Salvar la imágen (a petición del usuario) - + Launch editor Iniciar el editor + + Snapshot delay in seconds + Retardo en segundos + + + + No delay + Ningún retardo + + + + Snapshot Delay (s): + Retardo (s) : + + Quit Salir @@ -1551,88 +1632,88 @@ Mostrar la interfaz - + Copy To Clipboard Copiar hacia el porta-papeles - + Copy to clipboard Copiar hacia el porta-papeles - + Open editor Abrir editor. - + Open editor and add annotations Abrir editor y anotaciones. - + Grab Screen Capturar la pantalla - + Grab screen (current) Capturar la pantalla actual - + Grab all screens - Capturar todas las pantallas + Capturar pantalla activa - + Grab all screens (multi-monitors) Capturar todas las pantallas (multi-monitor) - + Grab Window - Capturar la ventana + Capturar ventana - + Grab window - Capturar la ventana + Capturar ventana - + Grab Region Capturar la región - + Grab region Capturar la región - + Help Ayuda - + Upload Telecargar - + Upload the image to the web Subir una imágen a la WEB + - Grab freehand region Capturar una región delimitada a mano - + Print Imprimir @@ -1640,7 +1721,7 @@ QObject - + %1 found %1 encontrado @@ -1661,18 +1742,18 @@ - Following options are known: - Son aceptadas las siguientes opciones : + Following options are available: + Las siguientes opciones están disponibles : - --help - displays this help. - --help : Muestra esta ayuda. + --help : displays this help. + --help : Muestra esta ayuda - --reset-config - clear the saved preference parameters. - --reset-config : Borrado de las preferencias guardadas. + --reset-config : clear the saved preference parameters. + --reset-config : borrar los parámetros de preferencia ya salvados @@ -1681,33 +1762,38 @@ + --portable : use settings file location near the executable (for portable use). + --portable : localizar el fichero de configuración cerca del ejecutable (para portabilidad) + + + file : file to load in the editor, can be a .hot file or an image file. fichero : Nombre del fichero que cargar en el editor, puede ser .hot o imágen. - - %1 is already running !! - %1 ya esta en funcionamiento !! + + %1 is already running!! + ¡ %1 ya esta en funcionamiento ! - translations path %1 - camino para las traducciones %1 + Translations path %1 + Camino para las traducciones %1 - setting language to : %1 + Setting language to: %1 Definir como idioma : %1 - successfully loaded data from %1 + Successfully loaded data from %1 Carga de %1 realizada con éxito - failed to load data from %1 + Failed to load data from %1 Carga de datos desde %1 fallida @@ -1737,12 +1823,50 @@ RegionGrabber - + Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit. Seleccionar una región usando el ratón. Para efectuar la captura de pantalla, presionar la tecla <ENTER> o doble click. Presionar <Esc> para salir. + RescaleDialogClass + + + Rescale snapshot + Escalar captura + + + + Original size: + Tamaño original: + + + + Target size: + Tamaño deseado: + + + + Scale snapshot + Escalar la captura de pantalla + + + + % + % + + + + Size + Tamaño + + + + Keep aspect ratio + Respetar el aspecto en ratio + + + WidgetBrush @@ -1855,13 +1979,13 @@ - Fill with translucent Background Color - Relleno con color translúcido + Fill with transparent background color + Relleno con color translúcido de fondo - Fill with Background Color - Relleno con color + Fill with background color + Relleno con color de fondo \ No newline at end of file Binary files /tmp/0ShdhbevAJ/hotshots-2.0.1/lang/hotshots_eu.qm and /tmp/i0vBy4mDwk/hotshots-2.1.0/lang/hotshots_eu.qm differ diff -Nru hotshots-2.0.1/lang/hotshots_eu.ts hotshots-2.1.0/lang/hotshots_eu.ts --- hotshots-2.0.1/lang/hotshots_eu.ts 2014-01-24 20:12:22.000000000 +0000 +++ hotshots-2.1.0/lang/hotshots_eu.ts 2014-02-15 16:30:38.000000000 +0000 @@ -2,82 +2,80 @@ - + release of translation and translator name please - put your name here dear translator and the release of the translation file !! + put your name here dear translator and the release of the translation file!! Euskara-itzultzailea: Alexander Gabilondo AboutDialog - + <a href="%1">Check for new release ...</a> <a href="%1">Begiratu bertsio berririk dagoen ...</a> - + About Honi buruz - + Preferences Hobespenak - - Infos - Infos + + Info + Info - + Log Log - + Qt version %1 Qt bertsioa %1 - + The %1 file can't be found, sorry ... %1 fitxategia ezin aurkitu, barkatu... - + detected language: %1 atzemandako hizkuntza: %1 - + Automatic detection detekzio automatikoa - + Default (no use of translation files) Lehenetsia (itzulpen fitxategirik erabili gabe) - + The application need to restart in order to take into account new translation -, Do you want to restart application now ? - Aplikazioa berrabiarazi behar da itzulpen berria kontuan izateko, -Nahi duzu aplikazioa orain berrabiaraztea? - +, Do you want to restart application now? + Aplikazioa berrabiarazi behar da itzulpen berria kontuan hartu ahal izateko, +nahi duzu orain berrabiaraztea? - - Do you want to reset all the preferences to default value ? + + Do you want to reset all the preferences to default value? If yes, the application will be relaunch - Nahi duzu lehenetsitako balioak berrezartzea? -Baiezkoan, aplikazioa berrabiaraziko da. - + Nahi duzu hobespenen guztiak lehenetsitako balioetara bueltatzea? +Baiezkoan aplikazioa berrabiaraziko da. - + Example: Adibidea: @@ -234,211 +232,241 @@ + Add mouse cursor to snapshot + Gehitu saguaren kurtsorea pantaila-argazkiari + + + + Snapshot Delay (s): + Pantaila-argazkiaren atzerapena (s): + + + + Snapshot delay in seconds + Pantaila-argazkiaren atzerapena segundotan + + + + No delay + Atzerapenik gabe + + + Scale snapshot Eskalatu pantaila-argazkia - + % % - + Max width * height Gehienezko zabalera * altuera - + 800 800 - + 600 600 - - Hotkeys - Laster-teklak + + Shortcut/Menu + Lasterbidea/Menua + + + + Action performed by double-clicking on system tray icon: + Sistemaren paneleko ikonoan egindako klik bikoitzaren ekintza - - Use system screen capture shortcuts - Erabili sistemaren pantaila-argazkien laster-teklak + + Shortcut editor + Lasterbideen editorea - + Action Ekintza - + Shortcut Laster-tekla - + Description Deskripzioa - + + Use system screen capture shortcuts (only available for screen grab functions) + Erabili pantaila-argazkien sistemaren lasterbideak (bakarrik pantaila osoko argazkietarako) + + + Warning! Duplicated shortcuts will not be checked. Kontuz! Bikoiztutako laster-teklak ez dira egiaztatuko. - - "Ctrl", "Shift", "Alt" and "Meta" are recognized as valid modifiers - "Ctrl", "Shift", "Alt" eta "Meta" modifikatzaile gisa onartzen dira + + System tray additional functions: + Sistemaren paneleko funtzio gehigarriak: - + Network Sarea - + Default web service Lehenetsitako web-zerbitzua - + Copy uploaded file URL to clipboard Kopiatu igotako fitxategiaren URLa arbelera - + as honela - + No format Formaturik gabe - + Instant Messaging (IM) format Instant Messaging (IM) formatua - + HTML format HTML formatua - + BBCode format BBCode formatua - + User format Formatu pertsonalizatua - + @url@ @url@ - + (*) @url@ is the uploaded URL (*) @url@ kargatutako URLa da - + Use a proxy server to connect to Internet Erabili proxy-zerbitzua internetera konektatzeko - + use Proxy Proxy-a erabili - + Host Ostalaria - + Proxy hostname Proxy-ostalariaren izena - + Port Ataka - + Proxy Authentification Proxy-baimena - + Username Erabiltzaile-izena - + Proxy username Proxy-ko erabiltzale-izena - + Password Pasahitza - + Proxy password Proxy-ko pasahitza - + Show/Hide password in interface Erakutsi/ezkutatu pasahitza interfazean - + Show password Erakutsi pasahitza - + Proxy port Proxy-ataka - + Launch default Internet browser when done Abiarazi lehenetsitako Internet-nabigatzailea egindakoan - + Uploaders Karga-zerbitzariak - + Infos Infos - + Supported formats (via Qt plugins) Formatu bateragarriak (QT-pluginen bidez) - + Available translations Itzulpen eskuragarriak - + Log Log @@ -466,13 +494,13 @@ CanardPCUploader - %1 transfert end without error - %1 bidalita errorerik gabe + %1 transfert end without error. + %1 transferentzia akatsik gabe burutu da. - %1 transfert end with error (%2) - %1 bidalita errorerik gabe (%2) + %1 transfert end with error! (%2) + %1 transferentzia akatsez burutu da! (%2) @@ -496,118 +524,118 @@ EditorWidget - + Left-click to select item, Ctrl+Left Click then drag to select a group of items Ezker-klik elementua hautatzeko, Ctrl+Ezker-klik eta arrastatu elementu multzo bat aukeratzeko - - + + Left-click to set center Ezker-klik egin erdiratzeko - - - - - - - - + + + + + + + + Left-click then drag to create the shape Ezker-klik egin eta arrastatu forma sortzeko - - - + + + Creation: left-click to create a point, middle-click to delete the last one and right-click to create a new shape. Modification: select vertex, left-click then drag to move, middle-click to delete and right-click to add a new one Sortzea: esker-klik puntu bat sortzeko, gurpileko klik azkena ezabatzeko eta eskuin-klik forma berria sortzeko. Eraldaketa: hautatu erpina, esker-klik eta arrastatu mugitzeko, gurpileko klik ezabatzeko eta eskuin-klik gehitzeko beste bat. - + Left-click to set image center and drag if you want change the size Ezker-klik egin irudiaren erdigunea ezartzeko eta arrastatu neurria aldatzeko - + Left-click then drag to create the shape, select the area and press <Enter> to perform the operation Ezker-klik egin eta arrastatu forma sortzeko, aukeratu area eta sakatu <Enter> eragiketa burutzeko - - There is existing annotation items, what do you want to do ? - Bada hainbat ohar, zer egin nahi duzu? + + There is existing annotation items, what do you want to do? + Badira jakinarazpenak, zer egin nahi duzu? - + clear annotation items ... garbitu oharrak ... - + update background image ... berritu atzeko planoko irudia ... - + Loading HotShots file failed Errorea HotShots-fitxategia irekitzen - + Error loading HotShots file %1 Errorea %1 HotShots-fitxategia irekitzen - + Snapshot editor: Pantaila-argazkien editorea - + Scale x%1 Eskala x%1 - + Clear edit Ezabatu edizioa - + Clear all the exiting items ? (no possible undo) Kendu elementu guztiak? (ezin da desegin) - + Clear document Ezabatu dokumentua - - Create a new document ? - Sortu dokumentu berria? + + Create a new document? + Dokumentu berria sortu? - + Save HotShots File Gorde HotShots-fitxategia - + HotShots files (*.hot) HotShots-fitxategiak (*.hot) - + Saving HotShots file failed Errorea HotShots-fitxategia gordetzen - + Error saving HotShots file %1 Errorea %1 HotShots-fitxategia gordetzen @@ -672,438 +700,489 @@ Edizio-ekintzak - + Select item Hautatu elementua - + Select Aukeratu - + + Esc + Esc + + + Text item Testu-elementua - + Draw text Marraztu testua - + Line item Lerro-elementua - + Draw a simple line Marraztu lerroa - + Encircle item Inguratze-elementua - + Encircle Inguratu - + Polyline item Polilerro-elementua - + Draw a polyline Marraztu polilerroa - + Polygon item Poligono-elementua - + Draw a polygon Marraztu poligonoa - + Curve item Kurba-elementua - + Draw a curve Marraztu kurba - + Crop item Mozte-elementua - + Crop background image Moztu atzeko planoko irudia - + Rectangle item Laukizuzen-elementua - + Draw a rectangle Marraztu laukizuzen bat - + Ellipse item Elipse-elementua - + Draw an ellipse Marraztu elipsea - + Arrow item Gezia-elementua - + Draw an arrow Marraztu gezia - + Tag item Etiketa-elementua - + Draw a numbered tag Marraztu zenbakidun etiketa bat - + Highlighter item Nabarmentze-elementua - + Highlight Nabarmendu - + Magnifier item Lupa-elementua - + Magnifier Lupa - + Image item Irudia-elementua - + Add an image Gehitu irudi bat - + Blur item Lausotze-elementua - - Obfuscate - Ezkutatu + + Blur + Lausotu - + Font size down Txikitu letra-mota - + Decrease font size Txikitu letra-tamaina - + Font size up Handitu letra-mota - + Increase font size Handitu letra-tamaina - + aAbB... aAbB... - + Change font Aldatu letra-mota - + Quit Irten - + Quit editor Itxi editorea - + Load Kargatu - + Open a file Ireki fitxategia - - + + New document Dokumentu berria - + Import clipboard Inportatu arbeletik - + Import image from clipboard Inportatu irudia arbeletik - + Save Gorde - + Save edition Gorde edizioa - + Save as Gorde honela - + Save edition as Gorde edizioa honela - - + + Copy to clipboard Kopiatu arbelera - + Export Esportatu - + Export image Esportatu irudia - + Upload Kargatu - + Upload the image to the web Kargatu irudia webera - + Print Inprimatu - + Fit to view Doitu ikuspegira - + Scale to fit window Eskalatu leihora doitzeko - - + + Reset scale Berrezarri eskala - + Undo Desegin - + Undo the last action Desegin azken ekintza - + Redo Berregin - + Redo the last undo action Berregin desegindako azken ekintza - + Add frame Gehitu fotograma - + Add a post effect to background image Gehitu ertz-efektua atzeko-planoko irudiari - + add shadow gehitu itzala - + Enable/Disable item's shadow Gaitu/ezgaitu objektuen itzala - + Item up Goratu elementua - + Push selected elements up Ekarri hautatutako elementuak gora - + Item down Behera eraman elementua - + Push selected elements down Eraman hautatutako elementuak behera - + Duplicate items Bikoiztu elementuak - + Duplicate selected element Bikoiztu aukeratutako elementuak - + Clear items Kendu elementuak - + Erase all elements Ezabatu elementu guztiak - + Delete items Ezabatu elementuak - + Delete selected elements Ezabatu hautatutako elementuak - - Del - Ezabatu - - - + No post effect Ertz-efekturik gabe - + Simple drop shadow Itzal sinplea - + Drop shadow with borders Ertza eta itzala - + Progressive opacity Opakutasun progresiboa - + Torn edge Koskadun ertza - + Item to top Elementua goraino - + Push selected elements to top Bultza hautatutako elementuak goraino - + Item to bottom Elementua beheraino - + Push selected elements to bottom Bultza hautatutako elementua beheraino + + + + Align group to left + Lerrokatu taldea ezkerrean + + + + + Align group to horizontal center + Lerrokatu taldea horizontalaren erdian + + + + + Align group to vertical center + Lerrokatu taldea bertikalaren erdian + + + + + Align group to right + Lerrokatu taldea eskuinean + + + + + Align group to top + Lerrokatu taldea goian + + + + + Align group to bottom + Lerrokatu taldea behean + + + + Set alignment + Ezarri lerrokatzeak + + + + Set alignment to a group + Ezarri lerrokatzea talde bati + + + + Rescale background image + Berreskalatu atzeko irudia + FileParser @@ -1114,8 +1193,8 @@ - Saving failed for project %1 : %2 - Errorea %1 proiektua gordetzen: %2 + Saving failed for project %1: %2 + %1 proiektuaren grabazioak huts egin du: %2 @@ -1129,12 +1208,12 @@ - The file is not a "Hotshots" file !! - Fitxategi hau ez da "Hotshots" fitxategia!! + The file is not a "Hotshots" file! + Fitxategia ez da "Hotshots" fitxategia! - Configuration has been automatically updated ! + Configuration has been automatically updated! Ezarpenak automatikoki eguneratu dira! @@ -1147,19 +1226,19 @@ FreeImageHostingUploader - %1 transfert end without error - %1 bidalita errorerik gabe + %1 transfert end without error. + %1 transferentzia akatsik gabe burutu da. - %1 transfert end with error (%2) - %1 bidalita errorerik gabe (%2) + %1 transfert end with error! (%2) + %1 transferentzia akatsez burutu da! (%2) FreehandGrabber - + Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit. Hautatu area bat saguaz. Pantaila-argazkiak egiteko sakatu Sartu-tekla edo klik bikoitza egin. Sakatu Esc ateratzeko. @@ -1183,8 +1262,8 @@ - successful uploading onto %1. - ondo kargatzen hemen %1. + Uploaded successfully onto %1. + Arrakastaz igo da hona %1. @@ -1198,13 +1277,13 @@ - %1 transfert end with error - %1 errorekin bidali da + %1 transfert end with error! + %1 transferentzia akatsez burutu da! - %1 transfert end without error - %1 bidalita errorerik gabe + %1 transfert end without error. + %1 transferentzia akatsik gabe burutu da. @@ -1276,7 +1355,7 @@ - Ftp port + FTP port FTP ataka @@ -1294,13 +1373,13 @@ ImageshackUploader - %1 transfert end without error - %1 bidalita errorerik gabe + %1 transfert end without error. + %1 transferentzia akatsik gabe burutu da. - %1 transfert end with error (%2) - %1 bidalita errorerik gabe (%2) + %1 transfert end with error! (%2) + %1 transferentzia akatsez burutu da! (%2) @@ -1312,13 +1391,13 @@ ImgurUploader - %1 transfert end without error - %1 bidalita errorerik gabe + %1 transfert end without error. + %1 transferentzia akatsik gabe burutu da. - %1 transfert end with error (%2) - %1 bidalita errorerik gabe (%2) + %1 transfert end with error! (%2) + %1 transferentzia akatsez burutu da! (%2) @@ -1329,118 +1408,118 @@ MainWindow - + Save Directory Gorde direktorioa - + Register of %1 uploaders %1 karga-zerbitzariaren erregistroa - - Can't create storage location, check why ?! (%1) - Ezin da sortu biltegiratzeko lekua, begiratu zergatik? (%1) + + Can't create storage location, check why?! (%1) + Ezin da biltegiratze kokapena sortu, egiaztatu zergatik? (%1) - + No post effect Ertz-efekturik gabe - + Simple drop shadow Itzal sinplea - + Drop shadow with borders Ertza eta itzala - + Progressive opacity Opakutasun progresiboa - + Torn edge Koskadun ertza - + Main application Aplikazio nagusia - + Annotation editor Ohar-editorea - - + + Upload the image to the web Kargatu irudia webera - - No default uploading web service defined ! - Kargatzeko web-zerbitzua definitu gabe! + + No default uploading web service defined! + Ez da definitu kargarako lehenetsitako web zerbitzurik! - + Uploader %1 Karga-zerbitzaria %1 - - The default uploader (%1) does not appear correctly configured, no value given for required parameters !! - Badirudi lehenetsitako karga-zerbitzaria (%1) ez dagoela ondo konfiguratua, ez du jasotzen eskatutako parametroak !! + + The default uploader (%1) does not appear correctly configured, no value given for required parameters!! + Lehenetsitako kargatzailea (%1) ez ei dago ongi ezarrita, eskatutako parametroentzako ez da baliorik eman. - - Upload image %1 to %2 service ? - Kargatu %1 irudia %2 zerbitzarira? + + Upload image %1 to %2 service? + %1 irudia %2 zerbitzura kargatu? - + Print Document Inprimatu dokumentua - + Save File Gorde fitxategia - + Images (*.%1) Irudiak (*.%1) - + Save failed Errorea gordetzean - + Error saving file Errorea fitxategia gordetzean - + Systray Sistema-barra - + The program will keep running in the system tray. To terminate the program, choose <b>Quit</b> in the context menu of the system tray entry. Programa martxan jarraituko du sistema-barran. Programa gelditzeko sakatu <b>Irten</b> sistema-barraren Hotshots-ikonoaren goitik beherako menuan. - + message from other instance. Beste instantzia baten mezua. @@ -1469,56 +1548,56 @@ Parametroak - - Snapshot Delay (s): - Pantaila-argazkiaren atzerapena (s): - - - + Output path: Gordetzeko direktorioa: - + Cap&ture mode: Kaptura-modua: - - Snapshot delay in seconds - Pantaila-argazkiaren atzerapena segundotan - - - - No delay - Atzerapenik gabe - - - + After snapshot: Pantaila-argazkia eta gero - + Do nothing Ez egin ezer - + Auto save image Gorde irudia automatikoki - + Save image (ask user) Gorde Irudia (galdetu erabiltzaileari) - + Launch editor Abiarazi editorea + + Snapshot delay in seconds + Pantaila-argazkiaren atzerapena segundotan + + + + No delay + Atzerapenik gabe + + + + Snapshot Delay (s): + Pantaila-argazkiaren atzerapena (s): + + Quit Irten @@ -1554,88 +1633,88 @@ Erakutsi interfazea - + Copy To Clipboard Kopiatu arbelera - + Copy to clipboard Kopiatu arbelera - + Open editor Ireki editorea - + Open editor and add annotations Ireki editorea eta gehitu oharrak - + Grab Screen Kapturatu pantaila - + Grab screen (current) Kapturatu pantaila (oraingoa) - + Grab all screens Kapturatu pantaila guztiak - + Grab all screens (multi-monitors) Kapturatu pantaila guztiak (monitore-anitza) - + Grab Window Kapturatu leihoa - + Grab window Kapturako leihoa - + Grab Region Kapturatu area - + Grab region Kapturatu area - + Help Laguntza - + Upload Kargatu - + Upload the image to the web Kargatu irudia webera + - Grab freehand region Kapturatu eskuzko area - + Print Inprimatu @@ -1643,7 +1722,7 @@ QObject - + %1 found %1 aurkitua @@ -1664,18 +1743,18 @@ - Following options are known: - Aukera ezagunak: + Following options are available: + Ondoko aukerak daude: - --help - displays this help. - --laguntza - erakusten du laguntza. + --help : displays this help. + --help : laguntza hau erakusten du. - --reset-config - clear the saved preference parameters. - --berrezarri-ezarpenak - ezabatzen ditu gorde ditugun hobetsitako parametroak + --reset-config : clear the saved preference parameters. + --reset-config : gordetako ezarpen lehenetsiak garbitzen ditu. @@ -1684,34 +1763,39 @@ + --portable : use settings file location near the executable (for portable use). + --portable : erabili exekutagarriaren ondoko ezarpenen fitxategi-kokapena (erabilera eramangarrirako) + + + file : file to load in the editor, can be a .hot file or an image file. Fitxategia: editorean ireki behar den fitxategia, izan daiteke .hot edo beste irudi-fitxategia. - - %1 is already running !! - %1 jadanik exekutatzen ari da!! + + %1 is already running!! + %1 dagoeneko martxan dago! - translations path %1 - itzulpenaren kokalekua %1 + Translations path %1 + Itzulpenen bidea %1 - setting language to : %1 - ezartzen hizkuntza hona: %1 + Setting language to: %1 + Ezarri hizkuntza hau: %1 - successfully loaded data from %1 - datuak ondo ireki dira hemendik %1 + Successfully loaded data from %1 + %1-etik datuak ongi kargatu dira. - failed to load data from %1 - akatsa datuak hemendik irekitzean %1 + Failed to load data from %1 + Huts egin du %1-etik kargatzen @@ -1740,12 +1824,50 @@ RegionGrabber - + Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit. Hautatu area bat saguaz. Pantaila-argazkiak egiteko, sakatu Sartu-tekla edo klik bikoitza egin. Sakatu Esc ateratzeko. + RescaleDialogClass + + + Rescale snapshot + Berreskalatu pantaila-argazkia. + + + + Original size: + Jatorrizko tamaina: + + + + Target size: + Helburuko tamaina: + + + + Scale snapshot + Eskalatu pantaila-argazkia + + + + % + % + + + + Size + Tamaina + + + + Keep aspect ratio + Mantendu aspektu-erlazioa + + + WidgetBrush @@ -1858,13 +1980,13 @@ - Fill with translucent Background Color - Bete atzeko-planoko kolore zeharrargiaz + Fill with transparent background color + Bete atzeko planoko kolore gardenaz - Fill with Background Color - Bete atzeko-planoko kolorez + Fill with background color + Bete atzeko planoko kolorez \ No newline at end of file Binary files /tmp/0ShdhbevAJ/hotshots-2.0.1/lang/hotshots_fr.qm and /tmp/i0vBy4mDwk/hotshots-2.1.0/lang/hotshots_fr.qm differ diff -Nru hotshots-2.0.1/lang/hotshots_fr.ts hotshots-2.1.0/lang/hotshots_fr.ts --- hotshots-2.0.1/lang/hotshots_fr.ts 2013-12-07 20:45:18.000000000 +0000 +++ hotshots-2.1.0/lang/hotshots_fr.ts 2014-02-15 16:31:04.000000000 +0000 @@ -1,83 +1,81 @@ - - - + - + - + release of translation and translator name please - put your name here dear translator and the release of the translation file !! + put your name here dear translator and the release of the translation file!! traduction 2.0 par xbee AboutDialog - + <a href="%1">Check for new release ...</a> <a href="%1">Voir pour une nouvelle version ...</a> - + About A propos - + Preferences Préférences - - Infos + + Info Informations - + Log Journal - + Qt version %1 Qt version %1 - + The %1 file can't be found, sorry ... Le fichier %1 n'est pas accessible, désolé ... - + detected language: %1 Langage détecté : %1 - + Automatic detection Détection automatique - + Default (no use of translation files) Défaut (pas de fichier de traduction) - + The application need to restart in order to take into account new translation -, Do you want to restart application now ? +, Do you want to restart application now? L'application a besoin de redémarrer pour tenir compte de la nouvelle langue Voulez-vous redémarrer l'application maintenant ? - - Do you want to reset all the preferences to default value ? + + Do you want to reset all the preferences to default value? If yes, the application will be relaunch Voulez-vous effacer toutes les préférences ? Si oui, l'application va redémarrer - + Example: Exemple : @@ -234,211 +232,241 @@ + Add mouse cursor to snapshot + Ajouter le pointeur de souris aux captures d'écran + + + + Snapshot Delay (s): + Délai (s) : + + + + Snapshot delay in seconds + Délai en secondes + + + + No delay + Aucun délai + + + Scale snapshot Mettre à l'échelle la capture d'écran - + % % - + Max width * height Taille maximale - + 800 800 - + 600 600 - - Hotkeys - Raccourcis + + Shortcut/Menu + Raccourcis/Menu - - Use system screen capture shortcuts - Utiliser les raccourcis au niveau système pour les captures d'écran + + Action performed by double-clicking on system tray icon: + Action effectuée en double cliquant dans la zone de notification : - + + Shortcut editor + Editeur de raccourcis + + + Action Action - + Shortcut Raccourci - + Description Description - + + Use system screen capture shortcuts (only available for screen grab functions) + Utiliser les raccourcis au niveau système pour les captures d'écran + + + Warning! Duplicated shortcuts will not be checked. Attention ! les duplications de raccourcis ne sont pas vérifiées. - - "Ctrl", "Shift", "Alt" and "Meta" are recognized as valid modifiers - "Ctrl", "Shift", "Alt" et"Meta" sont reconnus comme modificateurs valides + + System tray additional functions: + Actions supplémentaires de la zone de notification : - + Network Réseau - + Default web service Service Web par défaut - + Copy uploaded file URL to clipboard Copier l'URL du fichier téléchargé vers le presse-papier - + as comme - + No format Aucun format - + Instant Messaging (IM) format Format de Messagerie Instantannée (IM) - + HTML format Format HTML - + BBCode format Format BBCode - + User format Format définit par l'utilisateur - + @url@ @url@ - + (*) @url@ is the uploaded URL (*) @url@ is the uploaded URL - + Use a proxy server to connect to Internet Utiliser un Proxy pour se connecter à Internet - + use Proxy Utiliser un Proxy - + Host Serveur - + Proxy hostname Nom du Proxy - + Port Port - + Proxy Authentification Authentification sur le serveur Proxy - + Username Nom d'utilisateur - + Proxy username Nom d'utilisateur sur le serveur Proxy - + Password Mot de passe - + Proxy password Mot de passe sur le serveur Proxy - + Show/Hide password in interface Afficher/Cacher le mot de passe dans l'interface - + Show password Afficher le mot de passe - + Proxy port Port du serveur Proxy - + Launch default Internet browser when done Lancer le navigateur par défaut au final - + Uploaders Téléchargeurs - + Infos Infos - + Supported formats (via Qt plugins) Formats supportés (via greffons Qt) - + Available translations Traductions disponibles - + Log Journal @@ -466,13 +494,13 @@ CanardPCUploader - %1 transfert end without error - Le transfert %1 s'est terminé sans erreur + %1 transfert end without error. + Le transfert %1 s'est terminé sans erreur. - %1 transfert end with error (%2) - Le transfert %1 s'est terminé avec une erreur (%2) + %1 transfert end with error! (%2) + Le transfert %1 s'est terminé avec une erreur! (%2) @@ -496,117 +524,117 @@ EditorWidget - + Left-click to select item, Ctrl+Left Click then drag to select a group of items Click gauche pour sélectionner l'élément, Ctrl+Click Gauche puis faire glisser la souris pour sélectionner un groupe d'éléments - - + + Left-click to set center Click gauche pour positionner le centre - - - - - - - - + + + + + + + + Left-click then drag to create the shape Click gauche puis faire glisser la souris pour créer l'élément - - - + + + Creation: left-click to create a point, middle-click to delete the last one and right-click to create a new shape. Modification: select vertex, left-click then drag to move, middle-click to delete and right-click to add a new one Création: Click-Gauche pour créer un point, Click-Milieu pour effacer le dernier et Click-Droit pour créer une nouvelle figure. Modification: sélectionnerun sommet, Click-Gauche puis glisser pour déplacer, Click-Milieu pour effacer et Click-Droit sur segment pour ajouter un point - + Left-click to set image center and drag if you want change the size Click gauche pourpositionner le centre de l'image puis glisser la souris si vous voulez redimensionner l'image - + Left-click then drag to create the shape, select the area and press <Enter> to perform the operation Clic-Gauche puis faire glisser pour créer la figure, la sélectionner et tapez <Entrée> pour effectuer l'opération - - There is existing annotation items, what do you want to do ? + + There is existing annotation items, what do you want to do? Il existe des éléments d'annotation, que voulez-vous faire ? - + clear annotation items ... effacer les éléments existants ... - + update background image ... mettre à jour l'image de fond ... - + Loading HotShots file failed Le chargement du fichier HotShots a échoué - + Error loading HotShots file %1 Erreur lors du chargement du fichier HotSHots %1 - + Snapshot editor: Editeur de captures d'écran : - + Scale x%1 Echelle x%1 - + Clear edit Effacer l'édition - + Clear all the exiting items ? (no possible undo) Effacer tous les éléments ? (pas d'annulation possible) - + Clear document Effacer le document - - Create a new document ? + + Create a new document? Créer un nouveau document ? - + Save HotShots File Sauver le fichier HotShots - + HotShots files (*.hot) Fichiers HotShots (*.hot) - + Saving HotShots file failed La sauvagarde du fichier HotShots à échouée - + Error saving HotShots file %1 Erreur lors de la sauvegarde du fichier HotSHots %1 @@ -671,438 +699,489 @@ Actions d'édition - + Select item Sélectionner un élément - + Select Sélectionner - + + Esc + Echap + + + Text item Elément texte - + Draw text Tracer un texte - + Line item Elément ligne - + Draw a simple line Tracer une ligne - + Encircle item Elément entourage - + Encircle Entourer - + Polyline item Élément polyligne - + Draw a polyline Tracer une polyligne - + Polygon item Elément polygone - + Draw a polygon Tracer un polygone - + Curve item Elément courbe - + Draw a curve Dessiner une courbe - + Crop item Découpage - + Crop background image Couper l'image de fond - + Rectangle item Elément rectangle - + Draw a rectangle Tracer un rectangle - + Ellipse item Elément ellipse - + Draw an ellipse Tracer une ellipse - + Arrow item Elément flèche - + Draw an arrow Tracer une flèche - + Tag item Elément balise - + Draw a numbered tag Tracer une balise - + Highlighter item Mettre en évidence - + Highlight Mettre en évidence - + Magnifier item Loupe - + Magnifier Loupe - + Image item Elément image - + Add an image Ajouter une image - + Blur item Flou - - Obfuscate - Masquer + + Blur + Flou - + Font size down Taille de la police plus petite - + Decrease font size Décroître la taille de la fonte - + Font size up Taille de la police plus grande - + Increase font size Accroïtre la taille de la fonte - + aAbB... aAbB... - + Change font Changer la fonte - + Quit Quitter - + Quit editor Quitter l'éditeur - + Load Charger - + Open a file Ouvrir un fichier - - + + New document Nouveau document - + Import clipboard Importer une image du presse-papier - + Import image from clipboard Importer une image du presse-papier - + Save Sauver - + Save edition Sauver l'édition - + Save as Sauver sous - + Save edition as Sauver sous - - + + Copy to clipboard Copie vers le presse-papier - + Export Exporter l'image - + Export image Exporter l'image - + Upload Télécharger - + Upload the image to the web Télécharger l'image vers le Web - + Print Imprimer - + Fit to view Ajuster à la fenêtre - + Scale to fit window Ajuster à la fenêtre - - + + Reset scale Réinitialiser l'échelle - + Undo Annuler - + Undo the last action Annuler la dernière action - + Redo Refaire - + Redo the last undo action Refaire la dernière action - + Add frame Ajouter un cadre - + Add a post effect to background image Ajouter un effet à l'image de fond - + add shadow Ajouter une ombre - + Enable/Disable item's shadow Afficher/Cacher l'ombrage des éléments - + Item up Element vers le haut - + Push selected elements up Mettre les éléments sélectionnés au dessus - + Item down Elément vers le bas - + Push selected elements down Mettre les éléments sélectionnés en dessous - + Duplicate items Dupliquer les éléments courants - + Duplicate selected element Dupliquer l'élément courant - + Clear items Effacer l'édition - + Erase all elements Effacer tous les éléments - + Delete items Effacer les éléments sélectionnés - + Delete selected elements Effacer les éléments sélectionnés - - Del - Effacer - - - + No post effect Aucun post-effet - + Simple drop shadow Ombre portée simple - + Drop shadow with borders Ombre portée avec bordures - + Progressive opacity Opacité progressive - + Torn edge Bords déchirés - + Item to top Elément en haut - + Push selected elements to top Mettre les éléments sélectionnés en haut - + Item to bottom Elément en bas - + Push selected elements to bottom Mettre les éléments sélectionnés en bas + + + + Align group to left + Aligner le groupe à gauche + + + + + Align group to horizontal center + Centrer horizontalement le groupe + + + + + Align group to vertical center + Centrer verticalement le groupe + + + + + Align group to right + Aligner le groupe à droite + + + + + Align group to top + Aligner le groupe en haut + + + + + Align group to bottom + Aligner le groupe en bas + + + + Set alignment + Appliquer un alignement + + + + Set alignment to a group + Appliquer un alignement à un groupe + + + + Rescale background image + Retailler l'image de fond + FileParser @@ -1113,8 +1192,8 @@ - Saving failed for project %1 : %2 - La sauvegarde du projet à échoué %1 : %2 + Saving failed for project %1: %2 + La sauvegarde du projet à échouée %1 : %2 @@ -1128,13 +1207,13 @@ - The file is not a "Hotshots" file !! - Ce n'est pas un fichier HotShots !! + The file is not a "Hotshots" file! + Ce n'est pas un fichier HotShots ! - Configuration has been automatically updated ! - La configuration a été automatquement mise à jour ! + Configuration has been automatically updated! + La configuration a été automatiquement mise à jour ! @@ -1146,21 +1225,21 @@ FreeImageHostingUploader - %1 transfert end without error - Le transfert de %1 s'est terminé sans erreur + %1 transfert end without error. + Le transfert %1 s'est terminé sans erreur. - %1 transfert end with error (%2) - Le transfert de %1 s'est terminé avec une erreur (%2) + %1 transfert end with error! (%2) + Le transfert %1 s'est terminé avec une erreur ! (%2) FreehandGrabber - + Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit. - Selectionner une région en utilisant la souris. Pour effectuer la capture d'écran, appuyer sur <Entrée> ou double cliquer. Appuyer sur <Esc> pour quitter. + Sélectionner une région en utilisant la souris. Pour effectuer la capture d'écran, appuyer sur <Entrée> ou double cliquer. Appuyer sur <Esc> pour quitter. @@ -1182,8 +1261,8 @@ - successful uploading onto %1. - Téléchargement réussi sur %1 + Uploaded successfully onto %1. + Envoi réussi sur %1. @@ -1197,13 +1276,13 @@ - %1 transfert end with error - Le transfert de %1 s'est terminé avec une erreur + %1 transfert end with error! + Le transfert de %1 s'est terminé avec une erreur ! - %1 transfert end without error - Le transfert de %1 s'est terminé sans erreur + %1 transfert end without error. + Le transfert %1 s'est terminé sans erreur. @@ -1275,7 +1354,7 @@ - Ftp port + FTP port Port FTP @@ -1293,13 +1372,13 @@ ImageshackUploader - %1 transfert end without error - Le transfert %1 s'est terminé sans erreur + %1 transfert end without error. + Le transfert %1 s'est terminé sans erreur. - %1 transfert end with error (%2) - Le transfert %1 s'est terminé avec une erreur (%2) + %1 transfert end with error! (%2) + Le transfert %1 s'est terminé avec une erreur ! (%2) @@ -1311,13 +1390,13 @@ ImgurUploader - %1 transfert end without error - Le transfert %1 s'est terminé sans erreur + %1 transfert end without error. + Le transfert %1 s'est terminé sans erreur. - %1 transfert end with error (%2) - Le transfert %1 s'est terminé avec une erreur (%2) + %1 transfert end with error! (%2) + Le transfert %1 s'est terminé avec une erreur ! (%2) @@ -1328,118 +1407,118 @@ MainWindow - + Save Directory Répertoire de sauvegarde - + Register of %1 uploaders Enregistrement de %1 téléchargeurs - - Can't create storage location, check why ?! (%1) - Impossible de créer le répertoire de stockage temporaire, cherchez pourquoi ?! (%1) + + Can't create storage location, check why?! (%1) + Impossible de créer le répertoire de stockage, recherchez pourquoi ?! (%1) - + No post effect Aucun post-effet - + Simple drop shadow Ombre portée simple - + Drop shadow with borders Ombre portée avec bordures - + Progressive opacity Opacité progressive - + Torn edge Bords déchirés - + Main application Application principale - + Annotation editor Editeur d'annotations - - + + Upload the image to the web Télécharger l'image vers le Web - - No default uploading web service defined ! + + No default uploading web service defined! Aucun service de téléchargement spécifié ! - + Uploader %1 Téléchargeur %1 - - The default uploader (%1) does not appear correctly configured, no value given for required parameters !! + + The default uploader (%1) does not appear correctly configured, no value given for required parameters!! Le téléchargeur par défaut (%1) ne semble pas correctement configuré, aucune valeur donnée pour les champs requis !! - - Upload image %1 to %2 service ? - Téléchargé l'image %1 vers le service %2 ? + + Upload image %1 to %2 service? + Envoyé l'image %1 vers le service %2 ? - + Print Document Imprimer le document - + Save File Sauver le fichier - + Images (*.%1) Images (*.%1) - + Save failed La sauvegarde à échouée - + Error saving file Erreur lors de la sauvegarde - + Systray Zone de notification - + The program will keep running in the system tray. To terminate the program, choose <b>Quit</b> in the context menu of the system tray entry. Le programme va rester actif dans la zone de notification. Pour sortir définitivement, choisir <b>Quitter</b> dans le menu contextuel de la zone de notification. - + message from other instance. message d'une autre instance. @@ -1468,56 +1547,56 @@ Paramètres - - Snapshot Delay (s): - Délai (s) : - - - + Output path: Répertoire de sortie : - + Cap&ture mode: Mode de capture : - - Snapshot delay in seconds - Délai en secondes - - - - No delay - Aucun délai - - - + After snapshot: Après la capture : - + Do nothing Ne rien faire - + Auto save image Sauver automatiquement l'image - + Save image (ask user) Sauver l'image (demande à l'utilisateur) - + Launch editor Lancer l'éditeur + + Snapshot delay in seconds + Délai en secondes + + + + No delay + Aucun délai + + + + Snapshot Delay (s): + Délai (s) : + + Quit Quitter @@ -1553,88 +1632,88 @@ Afficher l'interface - + Copy To Clipboard Copie vers le presse-papier - + Copy to clipboard Copie vers le presse-papier - + Open editor Ouvrir l'éditeur - + Open editor and add annotations Ouvrir l'éditeur et ajouter des annotations - + Grab Screen Capturer l'écran - + Grab screen (current) Capturer l'écran courant - + Grab all screens Capturer tous les écrans - + Grab all screens (multi-monitors) Capturer tous les écrans (multi-moniteurs) - + Grab Window Capturer la fenêtre - + Grab window Capturer une fenêtre - + Grab Region Capturer la région - + Grab region Capturer une région - + Help Aide - + Upload Télécharger - + Upload the image to the web Télécharger l'image vers le Web + - Grab freehand region Capturer une région à main levée - + Print Imprimer @@ -1642,7 +1721,7 @@ QObject - + %1 found %1 trouvé @@ -1663,17 +1742,17 @@ - Following options are known: - Les options suivantes sont acceptées : + Following options are available: + Les options suivantes sont possibles : - --help - displays this help. + --help : displays this help. --help : Affichage de cette aide. - --reset-config - clear the saved preference parameters. + --reset-config : clear the saved preference parameters. --reset-config : Effacement des paramètres de configuration sauvegardés. @@ -1683,34 +1762,39 @@ + --portable : use settings file location near the executable (for portable use). + --portable : utiliser le fichier de configuration associé à l’exécutable (pour une utilisation portable). + + + file : file to load in the editor, can be a .hot file or an image file. fichier: fichier à charger dans l'éditeur, peut être un .hot ou un fichier image. - - %1 is already running !! + + %1 is already running!! %1 est déjà en fonctionnement !! - translations path %1 - chemin des traductions %1 + Translations path %1 + Chemin des traductions %1 - setting language to : %1 - positionner le lauguage à %1 + Setting language to: %1 + Positionner le language à : %1 - successfully loaded data from %1 - chargement réussi des données de %1 + Successfully loaded data from %1 + Chargement réussi des données de %1 - failed to load data from %1 - échec de chargement des données de %1 + Failed to load data from %1 + Échec de chargement des données de %1 @@ -1739,12 +1823,50 @@ RegionGrabber - + Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit. Selectionner une région en utilisant la souris. Pour effectuer la capture d'écran, appuyer sur <Entrée> ou double cliquer. Appuyer sur <Esc> pour quitter. + RescaleDialogClass + + + Rescale snapshot + Mettre à l'échelle la capture d'écran + + + + Original size: + Taille originale : + + + + Target size: + Taille cible : + + + + Scale snapshot + Mettre à l'échelle la capture d'écran + + + + % + % + + + + Size + Taille + + + + Keep aspect ratio + Conserver l'aspect + + + WidgetBrush @@ -1857,13 +1979,13 @@ - Fill with translucent Background Color + Fill with transparent background color Remplissage avec couleur translucide - Fill with Background Color + Fill with background color Remplissage avec couleur - + \ No newline at end of file Binary files /tmp/0ShdhbevAJ/hotshots-2.0.1/lang/hotshots_gl.qm and /tmp/i0vBy4mDwk/hotshots-2.1.0/lang/hotshots_gl.qm differ diff -Nru hotshots-2.0.1/lang/hotshots_gl.ts hotshots-2.1.0/lang/hotshots_gl.ts --- hotshots-2.0.1/lang/hotshots_gl.ts 2013-12-07 20:45:24.000000000 +0000 +++ hotshots-2.1.0/lang/hotshots_gl.ts 2014-02-15 16:30:10.000000000 +0000 @@ -1,83 +1,79 @@ - - - + - + - + release of translation and translator name please - put your name here dear translator and the release of the translation file !! + put your name here dear translator and the release of the translation file!! Miguel Anxo Bouzada, versión 2.0 AboutDialog - + <a href="%1">Check for new release ...</a> - + - + About Sobre - + Preferences Preferencias - - Infos - Información + + Info + - + Log Rexistro - + Qt version %1 Qt versión %1 - + The %1 file can't be found, sorry ... - + - + detected language: %1 detectouse o idioma: %1 - + Automatic detection Detección automática - + Default (no use of translation files) Predeterminado (sen usar os ficheiros de tradución) - + The application need to restart in order to take into account new translation -, Do you want to restart application now ? - Ten que reiniciar o aplicativo para que teña en conta a nova tradución - - +, Do you want to restart application now? + - - Do you want to reset all the preferences to default value ? + + Do you want to reset all the preferences to default value? If yes, the application will be relaunch - + - + Example: Exemplo: @@ -190,7 +186,7 @@ Default saving image format - + @@ -200,7 +196,7 @@ Post effect: - + @@ -225,220 +221,250 @@ Hide interface during screen capture - + Force background color for clipboard/web services - + + Add mouse cursor to snapshot + + + + + Snapshot Delay (s): + Atraso na captura (s): + + + + Snapshot delay in seconds + Atraso da captura en segundos + + + + No delay + Sen atraso + + + Scale snapshot Escala da captura de pantalla - + % % - + Max width * height - + - + 800 800 - + 600 600 - - Hotkeys - Teclas rápidas + + Shortcut/Menu + + + + + Action performed by double-clicking on system tray icon: + - - Use system screen capture shortcuts - + + Shortcut editor + - + Action Acción - + Shortcut Atallo de teclado - + Description Descrición - + + Use system screen capture shortcuts (only available for screen grab functions) + + + + Warning! Duplicated shortcuts will not be checked. - + - - "Ctrl", "Shift", "Alt" and "Meta" are recognized as valid modifiers - + + System tray additional functions: + - + Network Rede - + Default web service - + - + Copy uploaded file URL to clipboard - + - + as como - + No format Sen formato - + Instant Messaging (IM) format Formato de mensaxería instantánea (MI) - + HTML format Formato HTML - + BBCode format Formato BBCode - + User format Formato do usuario - + @url@ @url@ - + (*) @url@ is the uploaded URL - + - + Use a proxy server to connect to Internet Usar un servidor proxy para conectarse a Internet - + use Proxy usar proxy - + Host Servidor - + Proxy hostname Nome do servidor proxy - + Port Porto - + Proxy Authentification Autenticación no proxy - + Username Nome de usuario - + Proxy username Nome de usuario no proxy - + Password Contrasinal - + Proxy password Contrasinal do proxy - + Show/Hide password in interface Amosar/agochar o contrasinal na interface - + Show password Amosar o contrasinal - + Proxy port Porto do proxy - + Launch default Internet browser when done - + - + Uploaders - + - + Infos Información - + Supported formats (via Qt plugins) - + - + Available translations Traducións dispoñíbeis - + Log Rexistro @@ -448,36 +474,36 @@ Image has been resized according to uploading service constraint (%1x%2) - + Can't save tmp file %1 - + reduce file size according to limit (%1/%2 bytes) - + CanardPCUploader - %1 transfert end without error - + %1 transfert end without error. + - %1 transfert end with error (%2) - + %1 transfert end with error! (%2) + Can't extract URL from reply - + @@ -485,130 +511,130 @@ DefaultUploaderSettings - + No parameter for this uploader - + EditorWidget - + Left-click to select item, Ctrl+Left Click then drag to select a group of items - + - - + + Left-click to set center - + - - - - - - - - + + + + + + + + Left-click then drag to create the shape - + - - - + + + Creation: left-click to create a point, middle-click to delete the last one and right-click to create a new shape. Modification: select vertex, left-click then drag to move, middle-click to delete and right-click to add a new one - + - + Left-click to set image center and drag if you want change the size - + - + Left-click then drag to create the shape, select the area and press <Enter> to perform the operation - + - - There is existing annotation items, what do you want to do ? - + + There is existing annotation items, what do you want to do? + - + clear annotation items ... - + - + update background image ... - + - + Loading HotShots file failed - + - + Error loading HotShots file %1 - + - + Snapshot editor: - + - + Scale x%1 - + - + Clear edit - + - + Clear all the exiting items ? (no possible undo) - + - + Clear document - + - - Create a new document ? - Crea un documento novo ? + + Create a new document? + - + Save HotShots File Gardar o ficheiro HotShots - + HotShots files (*.hot) Ficheiros do HotShots (*.hot) - + Saving HotShots file failed - + - + Error saving HotShots file %1 - + @@ -616,7 +642,7 @@ Snapshot editor - + @@ -668,440 +694,491 @@ Edition actions - + - + Select item Seleccionar elemento - + Select Seleccionar - + + Esc + + + + Text item Elemento de texto - + Draw text - + - + Line item - + - + Draw a simple line - + - + Encircle item - + - + Encircle - + - + Polyline item - + - + Draw a polyline - + - + Polygon item - + - + Draw a polygon - + - + Curve item - + - + Draw a curve - + - + Crop item - + - + Crop background image - + - + Rectangle item - + - + Draw a rectangle - + - + Ellipse item - + - + Draw an ellipse - + - + Arrow item - + - + Draw an arrow - + - + Tag item - + - + Draw a numbered tag - + - + Highlighter item - + - + Highlight - + - + Magnifier item - + - + Magnifier - + - + Image item - + - + Add an image - + - + Blur item - + - - Obfuscate - + + Blur + - + Font size down - + - + Decrease font size - + - + Font size up - + - + Increase font size Aumentar o tamaño da letra - + aAbB... aAbB... - + Change font Cambiar o tipo de letra - + Quit Saí­r - + Quit editor - + - + Load Cargar - + Open a file Abrir un ficheiro - - + + New document Novo documento - + Import clipboard - + - + Import image from clipboard - + - + Save Gardar - + Save edition - + - + Save as Gardar como - + Save edition as - + - - + + Copy to clipboard Copiar ao portapapeis - + Export Exportar - + Export image Exportar a imaxe - + Upload Enviar - + Upload the image to the web - + - + Print Imprimir - + Fit to view - + - + Scale to fit window - + - - + + Reset scale - + - + Undo Desfacer - + Undo the last action Desfacer a última acción - + Redo Refacer - + Redo the last undo action Refacer a última acción desfeita - + Add frame - + - + Add a post effect to background image - + - + add shadow Engadir sombra - + Enable/Disable item's shadow - + - + Item up - + - + Push selected elements up - + - + Item down - + - + Push selected elements down - + - + Duplicate items - + - + Duplicate selected element - + - + Clear items - + - + Erase all elements Borrar todos os elementos - + Delete items Eliminar os elementos - + Delete selected elements Elevar os elementos seleccionados - - Del - Supr - - - + No post effect - + - + Simple drop shadow - + - + Drop shadow with borders - + - + Progressive opacity - + - + Torn edge - + - + Item to top - + - + Push selected elements to top - + - + Item to bottom - + - + Push selected elements to bottom - + + + + + + Align group to left + + + + + + Align group to horizontal center + + + + + + Align group to vertical center + + + + + + Align group to right + + + + + + Align group to top + + + + + + Align group to bottom + + + + + Set alignment + + + + + Set alignment to a group + + + + + Rescale background image + @@ -1109,58 +1186,58 @@ Cannot read file %1: (%2) - + - Saving failed for project %1 : %2 - + Saving failed for project %1: %2 + Cannot save file %1: (%2) - + Parse error at line %1, column %2: (%3) - + - The file is not a "Hotshots" file !! - + The file is not a "Hotshots" file! + - Configuration has been automatically updated ! - + Configuration has been automatically updated! + Unknown version of hotshots file (%1). - + FreeImageHostingUploader - %1 transfert end without error - + %1 transfert end without error. + - %1 transfert end with error (%2) - + %1 transfert end with error! (%2) + FreehandGrabber - + Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit. - + @@ -1168,22 +1245,22 @@ Unable to connect to the FTP server at %1. Please check that the hostname is correct. - + Logged onto %1. - + Canceled upload of %1 - + - successful uploading onto %1. - + Uploaded successfully onto %1. + @@ -1193,17 +1270,17 @@ %1 is'nt available on server %2 - + - %1 transfert end with error - + %1 transfert end with error! + - %1 transfert end without error - + %1 transfert end without error. + @@ -1211,7 +1288,7 @@ FtpUploaderSettings - + @@ -1221,7 +1298,7 @@ @filename@ is the uploaded file - + @@ -1266,7 +1343,7 @@ Define result url - + @@ -1275,8 +1352,8 @@ - Ftp port - Porto FTP + FTP port + @@ -1293,155 +1370,155 @@ ImageshackUploader - %1 transfert end without error - + %1 transfert end without error. + - %1 transfert end with error (%2) - + %1 transfert end with error! (%2) + %1 service reply with error (%2) - + ImgurUploader - %1 transfert end without error - + %1 transfert end without error. + - %1 transfert end with error (%2) - + %1 transfert end with error! (%2) + An error occurred during parsing of service response - + MainWindow - + Save Directory - + - + Register of %1 uploaders - + - - Can't create storage location, check why ?! (%1) - + + Can't create storage location, check why?! (%1) + - + No post effect - + - + Simple drop shadow - + - + Drop shadow with borders - + - + Progressive opacity - + - + Torn edge - + - + Main application - + - + Annotation editor - + - - + + Upload the image to the web - + - - No default uploading web service defined ! - + + No default uploading web service defined! + - + Uploader %1 - + - - The default uploader (%1) does not appear correctly configured, no value given for required parameters !! - + + The default uploader (%1) does not appear correctly configured, no value given for required parameters!! + - - Upload image %1 to %2 service ? - + + Upload image %1 to %2 service? + - + Print Document - + - + Save File Gardar o ficheiro - + Images (*.%1) - + - + Save failed - + - + Error saving file - + - + Systray Área de notificación - + The program will keep running in the system tray. To terminate the program, choose <b>Quit</b> in the context menu of the system tray entry. - + - + message from other instance. - + @@ -1449,7 +1526,7 @@ MainWindow - + @@ -1460,7 +1537,7 @@ Uploaded URL - + @@ -1468,54 +1545,54 @@ Parámetros - - Snapshot Delay (s): - Atraso na captura (s): - - - + Output path: - + - + Cap&ture mode: &Modo de captura: - - Snapshot delay in seconds - Atraso da captura en segundos - - - - No delay - Sen atraso - - - + After snapshot: - + - + Do nothing Non facer nada - + Auto save image - + - + Save image (ask user) - + - + Launch editor - + + + + + Snapshot delay in seconds + Atraso da captura en segundos + + + + No delay + Sen atraso + + + + Snapshot Delay (s): + Atraso na captura (s): @@ -1550,91 +1627,91 @@ Show interface - + - + Copy To Clipboard Copiar ao portapapeis - + Copy to clipboard Copiar ao portapapeis - + Open editor Abrir o editor - + Open editor and add annotations - + - + Grab Screen - + - + Grab screen (current) - + - + Grab all screens - + - + Grab all screens (multi-monitors) - + - + Grab Window - + - + Grab window - + - + Grab Region - + - + Grab region - + - + Help Axuda - + Upload Enviar - + Upload the image to the web - + + - Grab freehand region - + - + Print Imprimir @@ -1642,14 +1719,14 @@ QObject - + %1 found - + Screenshot management and annotation tool - + @@ -1659,63 +1736,68 @@ [options] [file] - + - Following options are known: - + Following options are available: + - --help - displays this help. - + --help : displays this help. + - --reset-config - clear the saved preference parameters. - + --reset-config : clear the saved preference parameters. + --no-singleinstance : enable the use of multiple instance of program (not recommended). - + + --portable : use settings file location near the executable (for portable use). + + + + file : file to load in the editor, can be a .hot file or an image file. - + - - %1 is already running !! - + + %1 is already running!! + - translations path %1 - + Translations path %1 + - setting language to : %1 - + Setting language to: %1 + - successfully loaded data from %1 - + Successfully loaded data from %1 + - failed to load data from %1 - + Failed to load data from %1 + stringToVariant(): Error in digit (%1). - + @@ -1739,9 +1821,47 @@ RegionGrabber - + Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit. - + + + + + RescaleDialogClass + + + Rescale snapshot + + + + + Original size: + + + + + Target size: + + + + + Scale snapshot + Escala da captura de pantalla + + + + % + % + + + + Size + + + + + Keep aspect ratio + @@ -1857,13 +1977,13 @@ - Fill with translucent Background Color - Encher coa cor de fondo transparente + Fill with transparent background color + - Fill with Background Color - Encher coa cor de fondo + Fill with background color + - + \ No newline at end of file Binary files /tmp/0ShdhbevAJ/hotshots-2.0.1/lang/hotshots_it.qm and /tmp/i0vBy4mDwk/hotshots-2.1.0/lang/hotshots_it.qm differ diff -Nru hotshots-2.0.1/lang/hotshots_it.ts hotshots-2.1.0/lang/hotshots_it.ts --- hotshots-2.0.1/lang/hotshots_it.ts 2013-12-07 20:45:18.000000000 +0000 +++ hotshots-2.1.0/lang/hotshots_it.ts 2014-02-15 16:31:32.000000000 +0000 @@ -1,83 +1,81 @@ - - - + - + - + release of translation and translator name please - put your name here dear translator and the release of the translation file !! + put your name here dear translator and the release of the translation file!! Man from Mars - ver. 2.0 AboutDialog - + <a href="%1">Check for new release ...</a> <a href="%1">Controlla aggiornamenti...</a> - + About Informazioni - + Preferences Preferenze - - Infos + + Info Informazioni - + Log Registro - + Qt version %1 Versione Qt %1 - + The %1 file can't be found, sorry ... Oops! File %1 non trovato - + detected language: %1 Lingua rilevata: %1 - + Automatic detection Rilevazione automatica - + Default (no use of translation files) Predefinito (non usare file di traduzione) - + The application need to restart in order to take into account new translation -, Do you want to restart application now ? - Il programma deve essere riavviato per applicare la nuova lingua impostata +, Do you want to restart application now? + Il programma deve essere riavviato per applicare la nuova lingua impostata. Vuoi riavviarlo subito? - - Do you want to reset all the preferences to default value ? + + Do you want to reset all the preferences to default value? If yes, the application will be relaunch Vuoi ripristinare tutte le impostazioni predefinite? Sarà necessario riavviare il programma - + Example: Esempio: @@ -234,211 +232,241 @@ + Add mouse cursor to snapshot + Includi il puntatore del mouse + + + + Snapshot Delay (s): + Ritardo (s): + + + + Snapshot delay in seconds + Ritardo in secondi + + + + No delay + Nessun ritardo + + + Scale snapshot Ridimensiona l'immagine - + % % - + Max width * height Massima larghezza * altezza - + 800 800 - + 600 600 - - Hotkeys - Scorciatoie + + Shortcut/Menu + Scorciatoie/Menu + + + + Action performed by double-clicking on system tray icon: + Azione eseguita con doppio click sull'icona dell'area di notifica: - - Use system screen capture shortcuts - Usa le scorciatoie di sistema per l'acquisizione + + Shortcut editor + Editor delle scorciatoie - + Action Azione - + Shortcut Scorciatoia - + Description Descrizione - + + Use system screen capture shortcuts (only available for screen grab functions) + Usa le scorciatoie di sistema per l'acquisizione (disponibile solo per l'acquisizione schermo) + + + Warning! Duplicated shortcuts will not be checked. Attenzione! Non c'è controllo delle scorciatoie duplicate. - - "Ctrl", "Shift", "Alt" and "Meta" are recognized as valid modifiers - "Ctrl", "Shift", "Alt" e "Meta" sono modificatori validi + + System tray additional functions: + Funzioni aggiuntive dell'area di notifica: - + Network Rete - + Default web service Servizio web predefinito - + Copy uploaded file URL to clipboard Copia l'URL del file caricato negli appunti - + as come - + No format Nessun formato - + Instant Messaging (IM) format Formato instant messaging (IM) - + HTML format Formato HTML - + BBCode format Formato BBCode - + User format Formato utente - + @url@ @url@ - + (*) @url@ is the uploaded URL (*) @url@ è l'URL caricato - + Use a proxy server to connect to Internet Usa un server proxy per connetterti ad Internet - + use Proxy Usa proxy - + Host Host - + Proxy hostname Nome host del proxy - + Port Porta - + Proxy Authentification Autenticazione proxy - + Username Nome utente - + Proxy username Nome utente proxy - + Password Password - + Proxy password Password del proxy - + Show/Hide password in interface Mostra/Nascondi la password nell'interfaccia - + Show password Mostra password - + Proxy port Porta del proxy - + Launch default Internet browser when done Lancia il browser predefinito alla fine - + Uploaders Caricamenti - + Infos Informazioni - + Supported formats (via Qt plugins) Formati supportati (via plugin Qt) - + Available translations Traduzioni disponibili - + Log Registro @@ -466,12 +494,12 @@ CanardPCUploader - %1 transfert end without error + %1 transfert end without error. %1 trasferimento concluso senza errori - %1 transfert end with error (%2) + %1 transfert end with error! (%2) %1 trasferimento concluso con errori (%2) @@ -496,117 +524,117 @@ EditorWidget - + Left-click to select item, Ctrl+Left Click then drag to select a group of items Click sinistro per selezionare un oggetto, Ctrl+Click sinistro e trascinare per selezionare un gruppo di oggetti - - + + Left-click to set center Click sinistro per impostare il centro - - - - - - - - + + + + + + + + Left-click then drag to create the shape Click sinistro e trascina per creare la forma - - - + + + Creation: left-click to create a point, middle-click to delete the last one and right-click to create a new shape. Modification: select vertex, left-click then drag to move, middle-click to delete and right-click to add a new one Creazione: click sinistro per creare un punto, click centrale per cancellare l'ultimo, click destro per creare una nuova forma. Modifica: selezionare il vertice, click sinistro e trascinare per muovere, click centrale per cancellare e click destro per aggiungerne una nuova - + Left-click to set image center and drag if you want change the size Click sinistro per impostare il centro dell'immagine e trascinare per cambiare le dimensioni - + Left-click then drag to create the shape, select the area and press <Enter> to perform the operation Click sinistro e trascina per creare la forma, selezionare l'area e premere <Invio> per eseguire - - There is existing annotation items, what do you want to do ? - Sono presenti elementi di annotazione, cosa vuoi fare? + + There is existing annotation items, what do you want to do? + Sono presenti annotazioni, cosa vuoi fare? - + clear annotation items ... Cancella le annotazioni... - + update background image ... Aggiorna l'immagine di sfondo... - + Loading HotShots file failed Caricamento del file HotShots fallito - + Error loading HotShots file %1 Errore nel caricamento del file HotSHots %1 - + Snapshot editor: Editor delle immagini: - + Scale x%1 Scala x%1 - + Clear edit Annulla modifiche - + Clear all the exiting items ? (no possible undo) Eliminare tutti gli elementi? (non è possibile annullare) - + Clear document Pulisci il documento - - Create a new document ? + + Create a new document? Creare un nuovo documento? - + Save HotShots File Salva il file HotShots - + HotShots files (*.hot) File HotShots (*.hot) - + Saving HotShots file failed Salvataggio del file HotShots fallito - + Error saving HotShots file %1 Errore nel salvataggio del file HotSHots %1 @@ -671,439 +699,490 @@ Azioni di modifica - + Select item Seleziona oggetto - + Select Seleziona - + + Esc + Esc + + + Text item Elemento di testo - + Draw text Aggiungi testo - + Line item Linea - + Draw a simple line Disegna una linea - + Encircle item Cerchia oggetto - + Encircle Cerchia - + Polyline item Polilinea - + Draw a polyline Disegna una polilinea - + Polygon item Poligono - + Draw a polygon Disegna un poligono - + Curve item Curva - + Draw a curve Disegna una curva - + Crop item Ritaglia oggetto - + Crop background image Ritaglia immagine di sfondo - + Rectangle item Rettangolo - + Draw a rectangle Disegna un rettangolo - + Ellipse item Ellisse - + Draw an ellipse Disegna un'ellisse - + Arrow item Freccia - + Draw an arrow Disegna un freccia - + Tag item Etichetta - + Draw a numbered tag Aggiungi etichetta numerata - + Highlighter item Evidenziatore - + Highlight Evidenzia - + Magnifier item Lente di ingrandimento - + Magnifier Lente d'ingrandimento - + Image item Immagine - + Add an image Aggiungi un'immagine - + Blur item - Sfuma + Offusca - - Obfuscate - Offusca + + Blur + Offusca - + Font size down Riduci dimensione font - + Decrease font size Diminuisci la dimensione del carattere - + Font size up Aumenta dimensione font - + Increase font size Aumenta la dimensione del carattere - + aAbB... aAbB... - + Change font Cambia carattere - + Quit Esci - + Quit editor Esci dall'editor - + Load Carica - + Open a file Apri un file - - + + New document Nuovo documento - + Import clipboard Importa dagli appunti - + Import image from clipboard Importa immagine dagli appunti - + Save Salva - + Save edition Salva le modifiche - + Save as Salva come - + Save edition as Salva come - - + + Copy to clipboard Copia negli appunti - + Export Esporta - + Export image Esporta immagine - + Upload Caricamento - + Upload the image to the web Carica immagine sul web - + Print Stampa - + Fit to view Adatta alla vista - + Scale to fit window Adatta alla finestra - - + + Reset scale Ripristina la scala - + Undo Annulla - + Undo the last action Annulla l'ultima azione - + Redo Ripeti - + Redo the last undo action Ripeti l'ultima azione annullata - + Add frame Aggiungi cornice - + Add a post effect to background image Aggiungi post-elaborazione all'immagine di sfondo - + add shadow Aggiungi ombra - + Enable/Disable item's shadow Abilita/Disabilita l'ombreggiatura - + Item up Porta su - + Push selected elements up Sposta gli elementi selezionati al livello superiore - + Item down Porta giù - + Push selected elements down Sposta gli elementi selezionati al livello inferiore - + Duplicate items Duplica oggetti - + Duplicate selected element Duplica l'elemento selezionato - + Clear items Elimina oggetti - + Erase all elements Cancella tutti gli elementi - + Delete items Cancella oggetti - + Delete selected elements Cancella gli elementi selezionati - - Del - Cancella - - - + No post effect Nessuna elaborazione - + Simple drop shadow Ombreggiatura semplice - + Drop shadow with borders Ombreggiatura con bordi - + Progressive opacity Opacità progressiva - + Torn edge Bordi strappati - + Item to top Porta in cima - + Push selected elements to top Sposta in cima gli elementi selezionati - + Item to bottom Porta in fondo - + Push selected elements to bottom Sposta in fondo gli elementi selezionati + + + + Align group to left + Allinea gruppo a sinistra + + + + + Align group to horizontal center + Allinea gruppo al centro orizzontalmente + + + + + Align group to vertical center + Allinea gruppo al centro verticalmente + + + + + Align group to right + Allinea gruppo a destra + + + + + Align group to top + Allinea gruppo in alto + + + + + Align group to bottom + Allinea gruppo in basso + + + + Set alignment + Imposta allineamento + + + + Set alignment to a group + Imposta allineamento per un gruppo + + + + Rescale background image + Ridimensiona immagine di sfondo + FileParser @@ -1114,7 +1193,7 @@ - Saving failed for project %1 : %2 + Saving failed for project %1: %2 Salvataggio del progetto fallito %1: %2 @@ -1129,12 +1208,12 @@ - The file is not a "Hotshots" file !! + The file is not a "Hotshots" file! File non in formato "HotShots"! - Configuration has been automatically updated ! + Configuration has been automatically updated! Configurazione aggiornata automaticamente! @@ -1147,19 +1226,19 @@ FreeImageHostingUploader - %1 transfert end without error + %1 transfert end without error. %1 trasferimento concluso senza errori - %1 transfert end with error (%2) + %1 transfert end with error! (%2) %1 trasferimento concluso con errori (%2) FreehandGrabber - + Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit. Selezionare una regione con il mouse. Per catturarla, premere Invio o fare doppio click. Premere Esc per annullare. @@ -1183,7 +1262,7 @@ - successful uploading onto %1. + Uploaded successfully onto %1. Caricamento su %1 riuscito @@ -1198,13 +1277,13 @@ - %1 transfert end with error - %1 trasferimento concluso con errori + %1 transfert end with error! + %1 trasferimento concluso con errori! - %1 transfert end without error - %1 trasferimento concluso senza errori + %1 transfert end without error. + %1 trasferimento concluso senza errori. @@ -1222,7 +1301,7 @@ @filename@ is the uploaded file - @filename@ è il file caricato + File caricato: @filename@ @@ -1276,7 +1355,7 @@ - Ftp port + FTP port Porta FTP @@ -1294,13 +1373,13 @@ ImageshackUploader - %1 transfert end without error - %1 trasferimento concluso senza errori + %1 transfert end without error. + %1 trasferimento concluso senza errori. - %1 transfert end with error (%2) - %1 trasferimento concluso con errori (%2) + %1 transfert end with error! (%2) + %1 trasferimento concluso con errori! (%2) @@ -1312,13 +1391,13 @@ ImgurUploader - %1 transfert end without error - %1 trasferimento concluso senza errori + %1 transfert end without error. + %1 trasferimento concluso senza errori. - %1 transfert end with error (%2) - %1 trasferimento concluso con errori (%2) + %1 transfert end with error! (%2) + %1 trasferimento concluso con errori! (%2) @@ -1329,118 +1408,118 @@ MainWindow - + Save Directory Cartella di salvataggio - + Register of %1 uploaders Registro dei caricamenti %1 - - Can't create storage location, check why ?! (%1) + + Can't create storage location, check why?! (%1) Impossibile creare posizione di salvataggio, verificare? (%1) - + No post effect Nessuna elaborazione - + Simple drop shadow Ombreggiatura semplice - + Drop shadow with borders Ombreggiatura con bordi - + Progressive opacity Opacità progressiva - + Torn edge Bordi strappati - + Main application Programma principale - + Annotation editor Editor delle annotazion - - + + Upload the image to the web Carica immagine sul web - - No default uploading web service defined ! + + No default uploading web service defined! Servizio web predefinito non impostato! - + Uploader %1 Caricamento %1 - - The default uploader (%1) does not appear correctly configured, no value given for required parameters !! - Il servizio predefinito (%1) non sembra correttamente configurato. Nessun valore assegnato ai parametri richiesti! + + The default uploader (%1) does not appear correctly configured, no value given for required parameters!! + Il caricamento predefinito (%1) non sembra correttamente configurato. Nessun valore assegnato ai parametri richiesti! - - Upload image %1 to %2 service ? + + Upload image %1 to %2 service? Caricare immagine %1 su %2? - + Print Document Stampa documento - + Save File Salva file - + Images (*.%1) Immagini (*.%1) - + Save failed Salvataggio fallito - + Error saving file Errore nel salvataggio - + Systray Area di notifica - + The program will keep running in the system tray. To terminate the program, choose <b>Quit</b> in the context menu of the system tray entry. Il programma resterà attivo nell'area di notifica. Per chiudere il programma, scegliere <b>Esci</b> nel menu contestuale dell'area di notifica. - + message from other instance. messaggio da un'altra istanza. @@ -1469,56 +1548,56 @@ Parametri - - Snapshot Delay (s): - Ritardo (s): - - - + Output path: Cartella di salvataggio: - + Cap&ture mode: Modo di cattura: - - Snapshot delay in seconds - Ritardo in secondi - - - - No delay - Nessun ritardo - - - + After snapshot: Dopo la cattura: - + Do nothing Non fare niente - + Auto save image Salva automaticamente - + Save image (ask user) Chiedi dove salvare - + Launch editor Lancia l'editor + + Snapshot delay in seconds + Ritardo in secondi + + + + No delay + Nessun ritardo + + + + Snapshot Delay (s): + Ritardo (s): + + Quit Esci @@ -1554,88 +1633,88 @@ Mostra l'interfaccia - + Copy To Clipboard Copia negli appunti - + Copy to clipboard Copia negli appunti - + Open editor Apri l'editor - + Open editor and add annotations Apri l'editor ed aggiungi annotazioni - + Grab Screen Cattura lo schermo - + Grab screen (current) Cattura schermo (corrente) - + Grab all screens Cattura tutti gli schermi - + Grab all screens (multi-monitors) Cattura tutti gli schermi (multi-monitor) - + Grab Window Cattura finestra - + Grab window Cattura finestra - + Grab Region Cattura regione - + Grab region Cattura regione - + Help Aiuto - + Upload Caricamento - + Upload the image to the web Carica immagine sul web + - Grab freehand region Cattura regione irregolare - + Print Stampa @@ -1643,7 +1722,7 @@ QObject - + %1 found %1 trovato @@ -1664,18 +1743,18 @@ - Following options are known: + Following options are available: Le seguenti opzioni sono disponibili: - --help - displays this help. - --help : Mostra l'aiuto. + --help : displays this help. + --help: Mostra l'aiuto. - --reset-config - clear the saved preference parameters. - --reset-config : Cancella i parametri di configurazione salvati. + --reset-config : clear the saved preference parameters. + --reset-config: Cancella i parametri di configurazione salvati. @@ -1684,33 +1763,38 @@ + --portable : use settings file location near the executable (for portable use). + --portable: salva le impostazioni in un file (rendi portabile il programma) + + + file : file to load in the editor, can be a .hot file or an image file. file: file da caricare nell'editor, può essere un file .hot o un'immagine - - %1 is already running !! + + %1 is already running!! %1 è già avviato! - translations path %1 - percorso delle traduzioni %1 + Translations path %1 + Percorso delle traduzioni %1 - setting language to : %1 - impostare la lingua a: %1 + Setting language to: %1 + Impostare la lingua a: %1 - successfully loaded data from %1 + Successfully loaded data from %1 Caricamento dei dati da %1 riuscito - failed to load data from %1 + Failed to load data from %1 Caricamento dei dati da %1 fallito @@ -1740,12 +1824,50 @@ RegionGrabber - + Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit. Selezionare una regione con il mouse. Per catturarla, premere Invio o fare doppio click. Premere Esc per annullare. + RescaleDialogClass + + + Rescale snapshot + Ridimensiona l'immagine + + + + Original size: + Dimensione originale: + + + + Target size: + Dimensione obiettivo: + + + + Scale snapshot + Ridimensiona l'immagine + + + + % + % + + + + Size + Dimensione + + + + Keep aspect ratio + Mantieni le proporzioni + + + WidgetBrush @@ -1858,13 +1980,13 @@ - Fill with translucent Background Color + Fill with transparent background color Riempimento con colore trasparente - Fill with Background Color + Fill with background color Riempimento con colore - + \ No newline at end of file Binary files /tmp/0ShdhbevAJ/hotshots-2.0.1/lang/hotshots_ja.qm and /tmp/i0vBy4mDwk/hotshots-2.1.0/lang/hotshots_ja.qm differ diff -Nru hotshots-2.0.1/lang/hotshots_ja.ts hotshots-2.1.0/lang/hotshots_ja.ts --- hotshots-2.0.1/lang/hotshots_ja.ts 2013-12-07 20:45:18.000000000 +0000 +++ hotshots-2.1.0/lang/hotshots_ja.ts 2014-02-15 16:27:46.000000000 +0000 @@ -1,83 +1,79 @@ - - - + - + - + release of translation and translator name please - put your name here dear translator and the release of the translation file !! + put your name here dear translator and the release of the translation file!! v1.0 by piyo AboutDialog - + <a href="%1">Check for new release ...</a> <a href="%1">最新版の確認...</a> - + About HotShotsについて - + Preferences 設定 - - Infos - 情報 + + Info + - + Log ログ - + Qt version %1 Qt バージョン %1 - + The %1 file can't be found, sorry ... ファイル「%1」が見つかりません ... - + detected language: %1 検出された言語: %1 - + Automatic detection 自動検出 - + Default (no use of translation files) 既定 (翻訳ファイルを使用しない) - + The application need to restart in order to take into account new translation -, Do you want to restart application now ? - 新しい翻訳を反映させるには再起動が必要です。 -今すぐ再起動しますか？ +, Do you want to restart application now? + - - Do you want to reset all the preferences to default value ? + + Do you want to reset all the preferences to default value? If yes, the application will be relaunch - 本当にすべての設定を規定にリセットしますか？ -「はい」を選択すると、再起動します。 + - + Example: 例: @@ -234,211 +230,241 @@ + Add mouse cursor to snapshot + + + + + Snapshot Delay (s): + 遅延時間 (秒) : + + + + Snapshot delay in seconds + スナップショットの遅延時間を秒で指定 + + + + No delay + 遅延なし + + + Scale snapshot スナップショットを縮小・拡大する - + % % - + Max width * height 最大幅 * 高さ - + 800 800 - + 600 600 - - Hotkeys - ホットキー + + Shortcut/Menu + + + + + Action performed by double-clicking on system tray icon: + - - Use system screen capture shortcuts - システムのスクリーンキャプチャー ショートカットを使用する + + Shortcut editor + - + Action 操作 - + Shortcut ショートカット - + Description 説明 - + + Use system screen capture shortcuts (only available for screen grab functions) + + + + Warning! Duplicated shortcuts will not be checked. 警告！ショートカットキーの重複はチェックしていません。 - - "Ctrl", "Shift", "Alt" and "Meta" are recognized as valid modifiers - 修飾キーは、"Ctrl"、"Shift"、"Alt"、"Meta"が使用できます + + System tray additional functions: + - + Network ネットワーク - + Default web service 既定のWebサービス - + Copy uploaded file URL to clipboard アップロードしたファイルのURLをクリップボードにコピーする - + as URL書式 - + No format 書式なし(URLのみ) - + Instant Messaging (IM) format インスタントメッセージ(IM)書式 - + HTML format HTML書式 - + BBCode format BBCode書式 - + User format ユーザー指定書式 - + @url@ @url@ - + (*) @url@ is the uploaded URL (*注) 「@url@」 はアップロードしたURL - + Use a proxy server to connect to Internet Internet接続にプロキシを使用する - + use Proxy プロキシを使用 - + Host ホスト名 - + Proxy hostname プロキシホスト名 - + Port ポート番号 - + Proxy Authentification プロキシ認証を使用する - + Username ユーザー名 - + Proxy username プロキシのユーザー名 - + Password パスワード - + Proxy password プロキシのパスワード - + Show/Hide password in interface パスワードを表示/隠す - + Show password パスワードを表示 - + Proxy port プロキシのポート番号 - + Launch default Internet browser when done 完了後に既定のブラウザを起動する - + Uploaders アップローダ - + Infos 情報 - + Supported formats (via Qt plugins) 対応画像フォーマット (Qtプラグイン) - + Available translations 利用可能な翻訳 - + Log ログ @@ -466,13 +492,13 @@ CanardPCUploader - %1 transfert end without error - %1 transfert end without error + %1 transfert end without error. + - %1 transfert end with error (%2) - %1 transfert end with error (%2) + %1 transfert end with error! (%2) + @@ -496,117 +522,117 @@ EditorWidget - + Left-click to select item, Ctrl+Left Click then drag to select a group of items 左クリックでアイテムを選択、Ctrl+左ドラッグで範囲内の複数アイテムを選択 - - + + Left-click to set center 左クリックで中心を決定 - - - - - - - - + + + + + + + + Left-click then drag to create the shape 左クリック後、ドラッグして作成 - - - + + + Creation: left-click to create a point, middle-click to delete the last one and right-click to create a new shape. Modification: select vertex, left-click then drag to move, middle-click to delete and right-click to add a new one 作成: 左クリックで点を追加、中クリックで最後の点を削除、右クリックで新規図形を作成。　編集: 点を左ドラッグで移動、点を中クリックで削除、右クリックで新しい点を追加 - + Left-click to set image center and drag if you want change the size 左クリックで画像の中心を決定、もしサイズを変更したい場合はそのままドラッグ - + Left-click then drag to create the shape, select the area and press <Enter> to perform the operation 左クリック後、ドラッグして作成、範囲を選択後、&lt;Enter&gt;キーを押して実行 - - There is existing annotation items, what do you want to do ? - すでに注釈アイテムが存在しますが、どうしますか？ + + There is existing annotation items, what do you want to do? + - + clear annotation items ... 注釈アイテムを削除 ... - + update background image ... 背景画像を更新 ... - + Loading HotShots file failed HotShotsファイルの読み込み失敗 - + Error loading HotShots file %1 HotSHotsファイル %1 の読み込みに失敗しました - + Snapshot editor: スナップショット エディタ: - + Scale x%1 倍率 x%1 - + Clear edit 編集を破棄 - + Clear all the exiting items ? (no possible undo) すべてのアイテムを削除しますか？（元に戻せません） - + Clear document ドキュメントの破棄 - - Create a new document ? - 本当に新規ドキュメントを作成しますか？ + + Create a new document? + - + Save HotShots File HotShotsファイルの保存 - + HotShots files (*.hot) HotShotsファイル (*.hot) - + Saving HotShots file failed HotShotsファイルの保存失敗 - + Error saving HotShots file %1 HotSHotsファイル「%1」の保存に失敗しました @@ -671,438 +697,489 @@ Edition actions - + Select item 選択ツール - + Select 選択 - + + Esc + Esc + + + Text item 文字ツール - + Draw text 文字を描画 - + Line item 直線ツール - + Draw a simple line 直線を描画 - + Encircle item 丸囲みツール - + Encircle 丸く囲む - + Polyline item 連続直線ツール - + Draw a polyline 連続直線を描画 - + Polygon item 多角形ツール - + Draw a polygon 多角形を描画 - + Curve item 曲線ツール - + Draw a curve 曲線を描画 - + Crop item 背景切り抜きツール - + Crop background image 背景画像を切り抜く - + Rectangle item 矩形ツール - + Draw a rectangle 矩形を描画 - + Ellipse item 円ツール - + Draw an ellipse 円を描画 - + Arrow item 矢印ツール - + Draw an arrow 矢印を描画 - + Tag item 番号タグツール - + Draw a numbered tag 番号タグを描画 - + Highlighter item ハイライトツール - + Highlight ハイライト - + Magnifier item 拡大鏡ツール - + Magnifier 拡大鏡 - + Image item 画像ツール - + Add an image 画像を追加 - + Blur item ぼかしツール - - Obfuscate - ぼかす + + Blur + - + Font size down 文字を小さく - + Decrease font size フォントサイズを小さく - + Font size up 文字を大きく - + Increase font size フォントサイズを大きく - + aAbB... aAbB... - + Change font フォント変更 - + Quit 終了 - + Quit editor エディタを終了 - + Load 開く - + Open a file ファイルを開く - - + + New document 新規ドキュメント - + Import clipboard クリップボードから読み込み - + Import image from clipboard クリップボードから背景画像を読み込み - + Save 保存 - + Save edition 保存 - + Save as 別名で保存 - + Save edition as 名前を付けて保存 - - + + Copy to clipboard クリップボードにコピー - + Export 書き出し - + Export image 画像を書き出し - + Upload アップロード - + Upload the image to the web 画像をWebにアップロード - + Print 印刷 - + Fit to view ウィンドウに合わせる - + Scale to fit window ウィンドウに合わせる - - + + Reset scale 画像の実サイズで表示 - + Undo 元に戻す - + Undo the last action 直前の操作を元に戻す - + Redo やり直す - + Redo the last undo action 直前の操作をやり直す - + Add frame 背景の縁取り - + Add a post effect to background image 背景画像に撮影後の効果を適用する - + add shadow アイテムの影 - + Enable/Disable item's shadow アイテムに影を付ける/付けない - + Item up 一つ前面に - + Push selected elements up 選択エレメントを一つ前面に - + Item down 一つ背面に - + Push selected elements down 選択エレメントを一つ背面に - + Duplicate items 複製 - + Duplicate selected element 選択エレメントを複製 - + Clear items すべて削除 - + Erase all elements すべてのエレメントを削除 - + Delete items 選択を削除 - + Delete selected elements 選択エレメントを削除 - - Del - 削除 - - - + No post effect 効果なし - + Simple drop shadow ドロップシャドウのみ - + Drop shadow with borders 枠とドロップシャドウ - + Progressive opacity 縁を半透明に - + Torn edge ぎざぎざの縁 - + Item to top 最前面に - + Push selected elements to top 選択エレメントを最前面に - + Item to bottom 最背面に - + Push selected elements to bottom 選択エレメントを最背面に + + + + Align group to left + + + + + + Align group to horizontal center + + + + + + Align group to vertical center + + + + + + Align group to right + + + + + + Align group to top + + + + + + Align group to bottom + + + + + Set alignment + + + + + Set alignment to a group + + + + + Rescale background image + + FileParser @@ -1113,8 +1190,8 @@ - Saving failed for project %1 : %2 - Saving failed for project %1 : %2 + Saving failed for project %1: %2 + @@ -1128,13 +1205,13 @@ - The file is not a "Hotshots" file !! - The file is not a "Hotshots" file !! + The file is not a "Hotshots" file! + - Configuration has been automatically updated ! - Configuration has been automatically updated ! + Configuration has been automatically updated! + @@ -1146,19 +1223,19 @@ FreeImageHostingUploader - %1 transfert end without error - %1 transfert end without error + %1 transfert end without error. + - %1 transfert end with error (%2) - %1 transfert end with error (%2) + %1 transfert end with error! (%2) + FreehandGrabber - + Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit. マウスドラッグで範囲を選択してください。Enterキーかダブルクリックで撮影、Escキーで中止。 @@ -1182,8 +1259,8 @@ - successful uploading onto %1. - successful uploading onto %1. + Uploaded successfully onto %1. + @@ -1197,13 +1274,13 @@ - %1 transfert end with error - %1 transfert end with error + %1 transfert end with error! + - %1 transfert end without error - %1 transfert end without error + %1 transfert end without error. + @@ -1275,8 +1352,8 @@ - Ftp port - FTPポート番号 + FTP port + @@ -1293,13 +1370,13 @@ ImageshackUploader - %1 transfert end without error - %1 transfert end without error + %1 transfert end without error. + - %1 transfert end with error (%2) - %1 transfert end with error (%2) + %1 transfert end with error! (%2) + @@ -1311,13 +1388,13 @@ ImgurUploader - %1 transfert end without error - %1 transfert end without error + %1 transfert end without error. + - %1 transfert end with error (%2) - %1 transfert end with error (%2) + %1 transfert end with error! (%2) + @@ -1328,118 +1405,118 @@ MainWindow - + Save Directory 保存ディレクトリ - + Register of %1 uploaders Register of %1 uploaders - - Can't create storage location, check why ?! (%1) - Can't create storage location, check why ?! (%1) + + Can't create storage location, check why?! (%1) + - + No post effect 効果なし - + Simple drop shadow ドロップシャドウのみ - + Drop shadow with borders 枠とドロップシャドウ - + Progressive opacity 縁を半透明に - + Torn edge ぎざぎざの縁 - + Main application メイン インターフェース - + Annotation editor エディタ - - + + Upload the image to the web 画像をWebにアップロード - - No default uploading web service defined ! - 既定のアップロードWebサーバーが指定されていません。 + + No default uploading web service defined! + - + Uploader %1 アップローダ %1 - - The default uploader (%1) does not appear correctly configured, no value given for required parameters !! - 既定のアップローダ (%1) は正しく設定されていないようです。必須パラメータに値が設定されていません。 + + The default uploader (%1) does not appear correctly configured, no value given for required parameters!! + - - Upload image %1 to %2 service ? - 画像「%1」を「%2」にアップロードしますか？ + + Upload image %1 to %2 service? + - + Print Document ドキュメントを印刷 - + Save File ファイルの保存 - + Images (*.%1) 画像 (*.%1) - + Save failed 保存失敗 - + Error saving file ファイル保存中にエラーが発生しました - + Systray システムトレイ - + The program will keep running in the system tray. To terminate the program, choose <b>Quit</b> in the context menu of the system tray entry. プログラムはシステムトレイで動作しています。終了するにはシステムトレイアイコンのコンテキストメニューから「<b>終了</b>」を選択してください。 - + message from other instance. message from other instance. @@ -1468,56 +1545,56 @@ パラメータ - - Snapshot Delay (s): - 遅延時間 (秒) : - - - + Output path: 保存場所: - + Cap&ture mode: 撮影方法: - - Snapshot delay in seconds - スナップショットの遅延時間を秒で指定 - - - - No delay - 遅延なし - - - + After snapshot: 撮影後: - + Do nothing 何もしない - + Auto save image 画像を自動保存 - + Save image (ask user) 画像を保存 (保存ダイアログ) - + Launch editor エディタを起動 + + Snapshot delay in seconds + スナップショットの遅延時間を秒で指定 + + + + No delay + 遅延なし + + + + Snapshot Delay (s): + 遅延時間 (秒) : + + Quit 終了 @@ -1553,88 +1630,88 @@ インターフェースを表示 - + Copy To Clipboard クリップボードにコピー - + Copy to clipboard クリップボードにコピー - + Open editor エディタを開く - + Open editor and add annotations エディタを開いて注釈を追加する - + Grab Screen スクリーンを撮影 - + Grab screen (current) 現在のスクリーンを撮影 - + Grab all screens 全スクリーンを撮影 - + Grab all screens (multi-monitors) すべてのスクリーンを撮影 (マルチモニター) - + Grab Window ウィンドウを撮影 - + Grab window ウィンドウを撮影 - + Grab Region 矩形範囲を指定して撮影 - + Grab region 矩形範囲を指定して撮影 - + Help オンラインヘルプ - + Upload アップロード - + Upload the image to the web 画像をWebにアップロード + - Grab freehand region フリーハンド範囲を撮影 - + Print 印刷 @@ -1642,7 +1719,7 @@ QObject - + %1 found %1 found @@ -1663,18 +1740,18 @@ - Following options are known: - Following options are known: + Following options are available: + - --help - displays this help. - --help - displays this help. + --help : displays this help. + - --reset-config - clear the saved preference parameters. - --reset-config - clear the saved preference parameters. + --reset-config : clear the saved preference parameters. + @@ -1683,34 +1760,39 @@ + --portable : use settings file location near the executable (for portable use). + + + + file : file to load in the editor, can be a .hot file or an image file. file : file to load in the editor, can be a .hot file or an image file. - - %1 is already running !! - %1 はすでに起動しています。 + + %1 is already running!! + - translations path %1 - translations path %1 + Translations path %1 + - setting language to : %1 - setting language to : %1 + Setting language to: %1 + - successfully loaded data from %1 - successfully loaded data from %1 + Successfully loaded data from %1 + - failed to load data from %1 - failed to load data from %1 + Failed to load data from %1 + @@ -1739,12 +1821,50 @@ RegionGrabber - + Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit. マウスドラッグで範囲を選択してください。Enterキーかダブルクリックで撮影、Escキーで中止。 + RescaleDialogClass + + + Rescale snapshot + + + + + Original size: + + + + + Target size: + + + + + Scale snapshot + スナップショットを縮小・拡大する + + + + % + % + + + + Size + + + + + Keep aspect ratio + + + + WidgetBrush @@ -1857,13 +1977,13 @@ - Fill with translucent Background Color - 半透明の背景色で塗りつぶす + Fill with transparent background color + - Fill with Background Color - 背景色で塗りつぶす + Fill with background color + - + \ No newline at end of file Binary files /tmp/0ShdhbevAJ/hotshots-2.0.1/lang/hotshots_lt.qm and /tmp/i0vBy4mDwk/hotshots-2.1.0/lang/hotshots_lt.qm differ diff -Nru hotshots-2.0.1/lang/hotshots_lt.ts hotshots-2.1.0/lang/hotshots_lt.ts --- hotshots-2.0.1/lang/hotshots_lt.ts 2014-01-24 20:13:46.000000000 +0000 +++ hotshots-2.1.0/lang/hotshots_lt.ts 2014-02-15 16:32:32.000000000 +0000 @@ -2,80 +2,78 @@ - + release of translation and translator name please - put your name here dear translator and the release of the translation file !! - v1.1 Algimantas Margevičius <margevicius.algimantas@gmail.com> + put your name here dear translator and the release of the translation file!! + v1.0 Algimantas Margevičius <margevicius.algimantas@gmail.com> AboutDialog - + <a href="%1">Check for new release ...</a> <a href="%1">Tikrinti ar yra atnaujinimų ...</a> - + About Apie - + Preferences Nustatymai - - Infos - Informacija + + Info + - + Log Žurnalas - + Qt version %1 Qt versija %1 - + The %1 file can't be found, sorry ... Failas %1 nerastas... - + detected language: %1 aptikta kalba: %1 - + Automatic detection Automatinis aptikimas - + Default (no use of translation files) Numatytoji (jokios naudos iš vertimo) - + The application need to restart in order to take into account new translation -, Do you want to restart application now ? - Norint pritaikyti naują vertimą reikia paleisti programą iš naujo. -Ar norite paleisti programą iš naujo dabar? +, Do you want to restart application now? + - - Do you want to reset all the preferences to default value ? + + Do you want to reset all the preferences to default value? If yes, the application will be relaunch - Ar norite atstatyti visus nustatymus į jų numatytąsias reikšmes? -Jei taip, programa bus paleista iš naujo + - + Example: Pavyzdys: @@ -232,211 +230,241 @@ + Add mouse cursor to snapshot + + + + + Snapshot Delay (s): + Ekranvaizdžio užlaikymas (s): + + + + Snapshot delay in seconds + Ekranvaizdžio užlaikymas sekundėmis + + + + No delay + Jokio vėlavimo + + + Scale snapshot Keisti ekranvaizdžio dydį - + % % - + Max width * height Didžiausias plotis * aukštis - + 800 800 - + 600 600 - - Hotkeys - Spartieji klavišai + + Shortcut/Menu + + + + + Action performed by double-clicking on system tray icon: + - - Use system screen capture shortcuts - Naudoti sistemos ekranvaizdžių kūrimo trumpinius + + Shortcut editor + - + Action Veiksmas - + Shortcut Trumpinys - + Description Aprašymas - + + Use system screen capture shortcuts (only available for screen grab functions) + + + + Warning! Duplicated shortcuts will not be checked. Atsargiai! Netikrinama ar tas pats klavišas neatlieka kelių veiksmų. - - "Ctrl", "Shift", "Alt" and "Meta" are recognized as valid modifiers - "Ctrl", "Shift", "Alt" ir "Meta" yra tinkami susiejimai + + System tray additional functions: + - + Network Tinklas - + Default web service Numatytoji interneto tarnyba - + Copy uploaded file URL to clipboard Kopijuoti įkelto failo URL į iškarpinę - + as Kaip - + No format Nėra formato - + Instant Messaging (IM) format Momentinių pranešimų (IM) formatas - + HTML format HTML formatas - + BBCode format BBCode formatas - + User format Naudotojo formatas - + @url@ @url@ - + (*) @url@ is the uploaded URL (*) @url@ yra įkeltojo failo URL - + Use a proxy server to connect to Internet Prisijungimui prie interneto naudoti tarpinį serverį - + use Proxy Naudoti tarpinį serverį - + Host Serveris - + Proxy hostname Tarpinis serveris - + Port Prievadas - + Proxy Authentification Naudoti tapatybės nustatymą - + Username Naudotojo vardas - + Proxy username Naudotojo vardas - + Password Slaptažodis - + Proxy password Tarpinio serverio slaptažodis - + Show/Hide password in interface Rodyti/Slėpti slaptažodį sąsajoje - + Show password Rodyti slaptažodį - + Proxy port Tarpinio serverio prievadas - + Launch default Internet browser when done Baigus paleisti numatytąją naršyklę - + Uploaders Įkėlimo tarnybos - + Infos Informacija - + Supported formats (via Qt plugins) Palaikomi formatai (su Qt įskiepiais) - + Available translations Prieinami vertimai - + Log Žurnalas @@ -464,13 +492,13 @@ CanardPCUploader - %1 transfert end without error - %1 perdavimas baigėsi be klaidų + %1 transfert end without error. + - %1 transfert end with error (%2) - %1 perdavimas baigėsi klaida (%2) + %1 transfert end with error! (%2) + @@ -494,118 +522,118 @@ EditorWidget - + Left-click to select item, Ctrl+Left Click then drag to select a group of items Norėdami pasirinkti paspauskite kairiuoju mygtuku, norėdami pasirinkite grupę paspauskite Ctrl+kairysis mygtukas ir vilkite - - + + Left-click to set center Kairysis pelės klavišas nustato centrą - - - - - - - - + + + + + + + + Left-click then drag to create the shape Norėdami sukurti formą paspauskite kairįjį pelės mygtuką ir vilkite pelę - - - + + + Creation: left-click to create a point, middle-click to delete the last one and right-click to create a new shape. Modification: select vertex, left-click then drag to move, middle-click to delete and right-click to add a new one Kūrimas: paspauskite kairiuoju mygtuku ir sukursite tašką, viduriniuoju mygtuku pašalinsite paskutinį, o dešiniuoju sukursite naują formą. Keitimas: pasirinkite verteksą, paspauskite dešiniuoju mygtuku ir vilkite, viduriniu mygtuku šalinkite, o dešiniuoju pridėkite naują. - + Left-click to set image center and drag if you want change the size Norėdami nustatyti paveikslėlio centrą paspauskite kairįjį pelės mygtuką ir vilkite pelę jei norite pakeisti dydį - + Left-click then drag to create the shape, select the area and press <Enter> to perform the operation Paspauskite kairįjį mygtuką ir vilkite taip sukurdami formą, norėdami atlikti operaciją pasirinkite sritį ir paspauskite <Enter> - - There is existing annotation items, what do you want to do ? - Teksto elementų jau yra, ką norite daryti? + + There is existing annotation items, what do you want to do? + - + clear annotation items ... išvalyti visus teksto elementus... - + update background image ... atnaujinti fono paveikslėlį... - + Loading HotShots file failed Įkelti „HotShots“ failo nepavyko - + Error loading HotShots file %1 Klaida įkeliant „HotShots“ failą %1 - + Snapshot editor: Ekranvaizdžių redaktorius: - + Scale x%1 Keisti mastelį x%1 - + Clear edit Išvalyti redagavimus - + Clear all the exiting items ? (no possible undo) Išvalyti visus esamus elementus? (neatšaukiama) - + Clear document Išvalyti dokumentą - - Create a new document ? - Sukurti naują dokumentą? + + Create a new document? + - + Save HotShots File Išsaugoti „HotShots“ failą - + HotShots files (*.hot) HotShots failai (*.hot) - + Saving HotShots file failed Išsaugoti „HotShots“ failo nepavyko - + Error saving HotShots file %1 Klaida saugant „HotShots“ failą %1 @@ -670,438 +698,489 @@ Redagavimo veiksmai - + Select item Pasirinkti elementą - + Select Pasirinkti - + + Esc + Esc + + + Text item Tekstinis elementas - + Draw text Piešti tekstą - + Line item Linija - + Draw a simple line Piešti paprastą liniją - + Encircle item Apskritimas - + Encircle Apskritimas - + Polyline item Polilinija - + Draw a polyline Piešti poliliniją - + Polygon item Daugiakampis - + Draw a polygon Piešti daugiakampį - + Curve item Kreivė - + Draw a curve Piešti kreivę - + Crop item Iškirptas elementas - + Crop background image Apkirpti foną - + Rectangle item Kvadratas - + Draw a rectangle Piešti kvadratą - + Ellipse item Elipsė - + Draw an ellipse Piešti elipsę - + Arrow item Rodyklė - + Draw an arrow Piešti rodyklę - + Tag item Žymė - + Draw a numbered tag Piešti skaičius - + Highlighter item Paryškinamasis elementas - + Highlight Paryškinti - + Magnifier item Didinimo įrankio elementas - + Magnifier Didinimas - + Image item Paveikslėlis - + Add an image Pridėti paveikslėlį - + Blur item Suliejimo elementas - - Obfuscate - Paslėpti + + Blur + Suliejimas - + Font size down Sumažinti šrifto dydį - + Decrease font size Sumažinti šriftą - + Font size up Padidinti šrifto dydį - + Increase font size Padidinti šriftą - + aAbB... aAbB... - + Change font Keisti šriftą - + Quit Baigti - + Quit editor Išeiti iš redaktoriaus - + Load Įkelti - + Open a file Atverti failą - - + + New document Naujas dokumentas - + Import clipboard Importuoti iškarpinę - + Import image from clipboard Importuoti paveikslėlį iš iškarpinės - + Save Išsaugoti - + Save edition Išsaugoti redaguotą - + Save as Išsaugoti kaip - + Save edition as Išsaugoti kaip - - + + Copy to clipboard Kopijuoti į iškarpinę - + Export Eksportuoti - + Export image Eksportuoti paveikslėlį - + Upload Įkelti - + Upload the image to the web Įkelti paveikslėlį į internetą - + Print Spausdinti - + Fit to view Pritaikyti prie lango - + Scale to fit window Sutalpinti lange - - + + Reset scale Atstatyti mastelį - + Undo Atšaukti - + Undo the last action Atšaukti paskutinį veiksmą - + Redo Pakartoti - + Redo the last undo action Pakartoti paskutinį veiksmą - + Add frame Pridėti rėmelį - + Add a post effect to background image Pridėti efektų fono paveikslėliui - + add shadow pridėti šešėlį - + Enable/Disable item's shadow Įjungti/Išjungti elemento šešėlį - + Item up Pakelti elementą - + Push selected elements up Perstumti pasirinktus elementus žemyn - + Item down Nuleisti elementą - + Push selected elements down Perstumti pasirinktus elementus žemyn - + Duplicate items Sukurti elemento kopiją - + Duplicate selected element Sukurti pasirinkto elemento kopiją - + Clear items Išvalyti elementus - + Erase all elements Pašalinti visus elementus - + Delete items Pašalinti elementus - + Delete selected elements Pašalinti pasirinktus elementus - - Del - Del - - - + No post effect Jokio papildomo efekto - + Simple drop shadow Paprastas šešėlio metimas - + Drop shadow with borders Mesti šešėlį su rėmeliu - + Progressive opacity Progresyvus permatomumas - + Torn edge Apkirpti kampus - + Item to top Elementas į viršų - + Push selected elements to top Perkelti pasirinktus elementus į viršų - + Item to bottom Elementas žemyn - + Push selected elements to bottom Perkelti pasirinktus elementus žemyn + + + + Align group to left + + + + + + Align group to horizontal center + + + + + + Align group to vertical center + + + + + + Align group to right + + + + + + Align group to top + + + + + + Align group to bottom + + + + + Set alignment + + + + + Set alignment to a group + + + + + Rescale background image + + FileParser @@ -1112,8 +1191,8 @@ - Saving failed for project %1 : %2 - Projekto %1 išsaugoti nepavyko: %2 + Saving failed for project %1: %2 + @@ -1127,13 +1206,13 @@ - The file is not a "Hotshots" file !! - Failas nėra „HotShots“ failas! + The file is not a "Hotshots" file! + - Configuration has been automatically updated ! - Konfigūracija automatiškai atnaujinta! + Configuration has been automatically updated! + @@ -1145,19 +1224,19 @@ FreeImageHostingUploader - %1 transfert end without error - %1 perdavimas baigėsi be klaidų + %1 transfert end without error. + - %1 transfert end with error (%2) - %1 perdavimas baigėsi klaida (%2) + %1 transfert end with error! (%2) + FreehandGrabber - + Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit. Pele pasirinkite srity. Norėdami įrašyti ekranvaizdį paspauskite „Enter“ klavišą arba dukart pelės kairįjį. Norėdami išeiti paspauskite „Esc“. @@ -1181,8 +1260,8 @@ - successful uploading onto %1. - sėkmingai įkelta į %1. + Uploaded successfully onto %1. + @@ -1196,13 +1275,13 @@ - %1 transfert end with error - %1 perdavimas baigėsi klaida + %1 transfert end with error! + - %1 transfert end without error - %1 perdavimas baigėsi be klaidų + %1 transfert end without error. + @@ -1274,8 +1353,8 @@ - Ftp port - FTP prievadas + FTP port + @@ -1292,13 +1371,13 @@ ImageshackUploader - %1 transfert end without error - %1 perdavimas baigėsi be klaidų + %1 transfert end without error. + - %1 transfert end with error (%2) - %1 perdavimas baigėsi klaida (%2) + %1 transfert end with error! (%2) + @@ -1310,13 +1389,13 @@ ImgurUploader - %1 transfert end without error - %1 perdavimas baigėsi be klaidų + %1 transfert end without error. + - %1 transfert end with error (%2) - %1 perdavimas baigėsi klaida (%2) + %1 transfert end with error! (%2) + @@ -1327,118 +1406,118 @@ MainWindow - + Save Directory Išsaugojimo aplankas - + Register of %1 uploaders Registruoti %1 tarnybas - - Can't create storage location, check why ?! (%1) - Nepavyko sukurti saugyklos, patikrinti kodėl?! (%1) + + Can't create storage location, check why?! (%1) + - + No post effect Jokio papildomo efekto - + Simple drop shadow Paprastas šešėlio metimas - + Drop shadow with borders Mesti šešėlį su rėmeliu - + Progressive opacity Progresyvus permatomumas - + Torn edge Apiplėšyti kampus - + Main application Pagrindinė programa - + Annotation editor Anotacijų redaktorius - - + + Upload the image to the web Įkelti paveikslėlį į internetą - - No default uploading web service defined ! - Nenustatyta numatytoji įkėlimo tarnyba! + + No default uploading web service defined! + - + Uploader %1 Įkėlimo tarnyba %1 - - The default uploader (%1) does not appear correctly configured, no value given for required parameters !! - Numatytoji įkėlimo tarnyba (%1) netinkamai nustatyta, nenurodyti reikalingi parametrai! + + The default uploader (%1) does not appear correctly configured, no value given for required parameters!! + - - Upload image %1 to %2 service ? - Įkelti paveikslėlį %1 į %2? + + Upload image %1 to %2 service? + - + Print Document Spausdinti dokumentą - + Save File Įrašyti failą - + Images (*.%1) Paveikslėliai (*.%1) - + Save failed Išsaugoti nepavyko - + Error saving file Klaida įrašant failą - + Systray Sistemos dėklas - + The program will keep running in the system tray. To terminate the program, choose <b>Quit</b> in the context menu of the system tray entry. Programa toliau veiks sistemos dėkle. Norėdami išjungti programą, sistemos dėklo piktogramos kontekstiniame meniu pasirinkite <b>Išeiti</b>. - + message from other instance. pranešimas iš kitos kopijos. @@ -1467,56 +1546,56 @@ Parametrai - - Snapshot Delay (s): - Ekranvaizdžio užlaikymas (s): - - - + Output path: Išsaugojimo kelias: - + Cap&ture mode: Fo&tografavimo veiksena: - - Snapshot delay in seconds - Ekranvaizdžio užlaikymas sekundėmis - - - - No delay - Jokio vėlavimo - - - + After snapshot: Po ekranvaizdžio sukūrimo: - + Do nothing Nieko nedaryti - + Auto save image Automatiškai išsaugoti paveikslėlį - + Save image (ask user) Išsaugoti paveikslėlį (klausti naudotojo) - + Launch editor Paleidimo redaktorius + + Snapshot delay in seconds + Ekranvaizdžio užlaikymas sekundėmis + + + + No delay + Jokio vėlavimo + + + + Snapshot Delay (s): + Ekranvaizdžio užlaikymas (s): + + Quit Išeiti @@ -1552,88 +1631,88 @@ Rodyti sąsają - + Copy To Clipboard Kopijuoti į iškarpinę - + Copy to clipboard Kopijuoti į iškarpinę - + Open editor Atverti redaktorių - + Open editor and add annotations Atverti redaktorių ir pridėti anotacijų - + Grab Screen Įrašyti ekraną - + Grab screen (current) Įrašyti ekraną (dabartinį) - + Grab all screens Įrašyti visus ekranus - + Grab all screens (multi-monitors) Įrašyti visus ekranus (kelis monitorius) - + Grab Window Įrašyti langą - + Grab window Įrašyti langą - + Grab Region Įrašyti sritį - + Grab region Įrašyti sritį - + Help Žinynas - + Upload Įkelti - + Upload the image to the web Įkelti paveikslėlį į internetą + - Grab freehand region Įrašyti laisvai pasirenkamą sritį - + Print Spausdinti @@ -1641,7 +1720,7 @@ QObject - + %1 found %1 rasta @@ -1662,18 +1741,18 @@ - Following options are known: - Žinomos parinktys: + Following options are available: + - --help - displays this help. + --help : displays this help. --help - parodo šį pranešimą. - --reset-config - clear the saved preference parameters. - --reset-config - išvalo išsaugotas parinktis. + --reset-config : clear the saved preference parameters. + --reset-config :išvalo išsaugotas parinktis. @@ -1682,34 +1761,39 @@ + --portable : use settings file location near the executable (for portable use). + + + + file : file to load in the editor, can be a .hot file or an image file. failas: failas kuris bus įkeltas į redaktorių, gali būt .hot failas arba paveikslėlis. - - %1 is already running !! - %1 jau paleistas! + + %1 is already running!! + - translations path %1 - vertimų kelias %1 + Translations path %1 + - setting language to : %1 - kalba nustatoma į: %1 + Setting language to: %1 + - successfully loaded data from %1 - duomenys iš „%1“ sėkmingai įkelti + Successfully loaded data from %1 + - failed to load data from %1 - nepavyko įkelti duomenų iš „%1“ + Failed to load data from %1 + @@ -1738,12 +1822,50 @@ RegionGrabber - + Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit. Pele pasirinkite srity. Norėdami įrašyti ekranvaizdį paspauskite „Enter“ klavišą arba dukart pelės kairįjį. Norėdami išeiti paspauskite „Esc“. + RescaleDialogClass + + + Rescale snapshot + + + + + Original size: + + + + + Target size: + + + + + Scale snapshot + Keisti ekranvaizdžio dydį + + + + % + % + + + + Size + + + + + Keep aspect ratio + + + + WidgetBrush @@ -1856,13 +1978,13 @@ - Fill with translucent Background Color - Užpildyti permatoma fono spalva + Fill with transparent background color + - Fill with Background Color - Užpildyti fono spalva + Fill with background color + \ No newline at end of file Binary files /tmp/0ShdhbevAJ/hotshots-2.0.1/lang/hotshots_pl.qm and /tmp/i0vBy4mDwk/hotshots-2.1.0/lang/hotshots_pl.qm differ diff -Nru hotshots-2.0.1/lang/hotshots_pl.ts hotshots-2.1.0/lang/hotshots_pl.ts --- hotshots-2.0.1/lang/hotshots_pl.ts 2013-12-07 20:45:20.000000000 +0000 +++ hotshots-2.1.0/lang/hotshots_pl.ts 2014-02-15 16:31:44.000000000 +0000 @@ -1,83 +1,81 @@ - - - + - + - + release of translation and translator name please - put your name here dear translator and the release of the translation file !! + put your name here dear translator and the release of the translation file!! v1.0 Andrzej Mazurkiewicz <andrzejmz69@gmail.com> AboutDialog - + <a href="%1">Check for new release ...</a> <a href="%1">Sprawdź aktualizację ...</a> - + About O programie - + Preferences Preferencje - - Infos + + Info Info - + Log Log - + Qt version %1 Wersja Qt %1 - + The %1 file can't be found, sorry ... Nie można odnaleźć pliku %1 przykro nam ... - + detected language: %1 wykryty język: %1 - + Automatic detection Auto-wykrywanie - + Default (no use of translation files) Domyślny (bez używania tłumaczenia) - + The application need to restart in order to take into account new translation -, Do you want to restart application now ? +, Do you want to restart application now? Aby zastosować nowe tłumaczenie należy uruchomić program ponownie . Czy chcesz uruchomić program ponownie teraz? - - Do you want to reset all the preferences to default value ? + + Do you want to reset all the preferences to default value? If yes, the application will be relaunch Czy chcesz, zresetować wszystkie ustawienia do wartości domyślnych ? Jeżeli tak, to program zostanie uruchomiony ponownie - + Example: Przykład: @@ -234,211 +232,241 @@ + Add mouse cursor to snapshot + Dodaj kursor myszy do zrzutu ekranu + + + + Snapshot Delay (s): + Opóźnienie Zrzutu (s): + + + + Snapshot delay in seconds + Opóźnienie zrzutu w sekundach + + + + No delay + Bez opóźnienia + + + Scale snapshot Zmiana wielkości zrzutu ekranu - + % % - + Max width * height Maks. szerokość * wysokość - + 800 800 - + 600 600 - - Hotkeys - Gorące klawisze + + Shortcut/Menu + Skrót/Menu - - Use system screen capture shortcuts - Użyj systemowych skrótów robienia zrzutów ekranu + + Action performed by double-clicking on system tray icon: + Akcja do wykonania po podwójnym kliknięciu na ikonę w systemowym trayu. - + + Shortcut editor + Edytor skrótów + + + Action Akcja - + Shortcut Skrót - + Description Opis - + + Use system screen capture shortcuts (only available for screen grab functions) + Użyj systemowych skrótów robienia zrzutów ekranu ( dostępne tylko dla funkcji przechwytywania ekranu) + + + Warning! Duplicated shortcuts will not be checked. - + Ostrzeżenie! Zdublowane skróty nie zostaną zaznaczone. - - "Ctrl", "Shift", "Alt" and "Meta" are recognized as valid modifiers - "Ctrl", "Shift", "Alt" and "Meta" są rozpoznawane jako prawidłowe modyfikatory + + System tray additional functions: + Dodatkowe funkcje w systemowym trayu: - + Network Sieć - + Default web service Domyślna usługa sieciowa - + Copy uploaded file URL to clipboard Skopiuj wysłany plik URL do schowka - + as jako - + No format Bez formatu - + Instant Messaging (IM) format Format (IM) - + HTML format Format HTML - + BBCode format Format BBCode - + User format Format użytkownika - + @url@ @url@ - + (*) @url@ is the uploaded URL (*) @url@ jest wysłanym URL - + Use a proxy server to connect to Internet Użyj serwera proxy aby połączyć się z Internetem - + use Proxy Użyj Proxy - + Host Host - + Proxy hostname Nazwa hosta proxy - + Port Port - + Proxy Authentification Uwierzytelnianie Proxy - + Username Nazwa użytkownika - + Proxy username Nazwa użytkownika Proxy - + Password Hasło - + Proxy password Hasło proxy - + Show/Hide password in interface Pokaż/Ukryj hasło w oknie programu - + Show password Pokaż hasło - + Proxy port Port Proxy - + Launch default Internet browser when done Po zakończeniu uruchom domyślną przeglądarkę internetową - + Uploaders Uploaderzy - + Infos Informacja - + Supported formats (via Qt plugins) Obsługiwane formatyi (via pluginy Qt) - + Available translations Dostępne tłumaczenia - + Log Log @@ -466,12 +494,12 @@ CanardPCUploader - %1 transfert end without error - %1 przetransferowano bez błędu + %1 transfert end without error. + %1 przetransferowano bez błędów - %1 transfert end with error (%2) + %1 transfert end with error! (%2) %1 przetransferowano z błędem (%2) @@ -496,117 +524,117 @@ EditorWidget - + Left-click to select item, Ctrl+Left Click then drag to select a group of items Kliknij lewą stroną myszy aby wybrać obiekt Alt+Lewe kliknięcie, następnie przeciągnij kursor myszki aby wybrać grupę obiektów - - + + Left-click to set center Kliknij Lewą stroną myszy aby ustawić środek - - - - - - - - + + + + + + + + Left-click then drag to create the shape Kliknij lewą stroną myszy a następnie przeciągnij kursor aby narysować kształt - - - + + + Creation: left-click to create a point, middle-click to delete the last one and right-click to create a new shape. Modification: select vertex, left-click then drag to move, middle-click to delete and right-click to add a new one Tworzenie: Kliknij lewą stroną myszy aby utworzyć punkt, środkowym przyciskiem aby go usunąć, i prawym aby utworzyć nowy kształt . Modyfikowanie: Wybierz wierzchołek obiektu kliknij lewą stroną myszy, następnie przeciągnij kursor aby go przenieść, kliknij środkowy przycisk myszy aby go usunąć, i prawy przycisk aby dodać nowy. - + Left-click to set image center and drag if you want change the size Aby określić środek obrazu , naciśnij lewy przycisk myszy i przeciągnij myszkę, jeżeli chcesz zmienić rozmiar obrazu - + Left-click then drag to create the shape, select the area and press <Enter> to perform the operation Naciśnij lewą stronę myszy i przeciągając kursor narysuj kształt,wybierz obszar i naciśnij <Enter> aby zrobić zrzut - - There is existing annotation items, what do you want to do ? + + There is existing annotation items, what do you want to do? Już dodano adnotacje, co chcesz zrobić? - + clear annotation items ... Wyczyścić wszystkie opisy ... - + update background image ... uaktualnij obraz tła ... - + Loading HotShots file failed Wczytywanie pliku HotShots nie powiodło się - + Error loading HotShots file %1 Błąd ładowania pliku tShots %1 - + Snapshot editor: Edytor Zrzutów: - + Scale x%1 Skalowanie x%1 - + Clear edit Anuluj edytowane - + Clear all the exiting items ? (no possible undo) Usunąć wszystkie istniejące obiekty ? (nie będzie można ich przywrócić) - + Clear document Wyczyść dokument - - Create a new document ? + + Create a new document? Utworzyć nowy dokument ? - + Save HotShots File Zapisz plik HotShots - + HotShots files (*.hot) Pliki HotShots (*.hot) - + Saving HotShots file failed Nie udało się zapisać pliku HotShots - + Error saving HotShots file %1 Błąd zapisywania pliku HotShot %1 @@ -638,7 +666,7 @@ ... - + Nieprzetłumaczony ciąg @@ -671,438 +699,489 @@ Akcje edycyjne - + Select item Wybierz obiekt - + Select Wybierz - + + Esc + Esc + + + Text item Tekst obiektu - + Draw text Dodaj tekst - + Line item Narysuj linię - + Draw a simple line Narysuj prostą linię - + Encircle item Narysuj okrąg - + Encircle Obrysuj linią spiralną - + Polyline item Narysuj linię łamaną - + Draw a polyline Narysuj linię łamaną - + Polygon item Narysuj wielokąt - + Draw a polygon Narysuj wielokąt - + Curve item Narysuj krzywą - + Draw a curve Narysuj linię krzywą - + Crop item Przytnij obiekt - + Crop background image Usuń tło obrazu - + Rectangle item Narysuj prostokąt - + Draw a rectangle Narysuj prostokąt - + Ellipse item Narysuj elipsę - + Draw an ellipse Narysuj elipsę - + Arrow item Narysuj strzałkę - + Draw an arrow Narysuj strzałkę - + Tag item Dodaj tag - + Draw a numbered tag Rysuj liczby - + Highlighter item Wyróżnij obiekt - + Highlight Wyróżnij - + Magnifier item Powiększ obiekt - + Magnifier Lupa - + Image item Dodaj obraz - + Add an image Dodaj obraz - + Blur item Rozmyj obiekt - - Obfuscate - Przyciemnij + + Blur + Rozmyj obiekt - + Font size down Zmniejsz czcionkę - + Decrease font size Zmniejsz rozmiar czcionki - + Font size up Zwiększ czcionkę - + Increase font size Zwiększ rozmiar czcionki - + aAbB... aAbB... - + Change font Zmień styl i rozmiar czcionki - + Quit Zamknij - + Quit editor Zamknij edytor - + Load Wczytaj - + Open a file Otwórz plik - - + + New document Nowy dokument - + Import clipboard Zaimportuj ze schowka - + Import image from clipboard Zaimportuj obraz ze schowka - + Save Zapisz - + Save edition Zapisz prze-edytowany obraz - + Save as Zapisz jako - + Save edition as Zapisz jako - - + + Copy to clipboard Skopiuj do Schowka - + Export Wyeksportuj - + Export image Wyeksportuj obraz - + Upload Wyślij - + Upload the image to the web Wyślij obraz do sieci - + Print Drukuj - + Fit to view Dopasuj do okna - + Scale to fit window Dostosuj do okna - - + + Reset scale Zresetuj skalowanie - + Undo Cofnij - + Undo the last action Cofnij ostatnią akcję - + Redo Do przodu - + Redo the last undo action Przywróć ostatnią cofniętą akcję - + Add frame Dodaj ramkę - + Add a post effect to background image Dodaj efekt do obrazu tła - + add shadow Dodaj cień - + Enable/Disable item's shadow Włącz/wyłącz cień pod obiektem - + Item up Pozycja w górę - + Push selected elements up Przenieś wybrane elementy w górę - + Item down Pozycja w dół - + Push selected elements down Przenieś wybrane elementy w dół - + Duplicate items Zduplikuj obiekty - + Duplicate selected element Utwórz kopię wybranego elementu - + Clear items Wyczyść obiekty - + Erase all elements Usuń wszystkie edytowane obiekty - + Delete items Usuń obiekty - + Delete selected elements Usuń zaznaczone edytowane obiekty - - Del - Del - - - + No post effect Bez efektów - + Simple drop shadow Zwykły cień - + Drop shadow with borders Cień z obramowaniem - + Progressive opacity Progresywna przeźroczystość - + Torn edge Postrzępiona krawędź - + Item to top Obiekt na górze - + Push selected elements to top Przesuń wybrane obiekty na górę - + Item to bottom Obiekt na dole - + Push selected elements to bottom Przesuń wybrane obiekty na dół + + + + Align group to left + Wyrównaj grupę do lewej + + + + + Align group to horizontal center + Wyśrodkuj grupę poziomo + + + + + Align group to vertical center + Wyśrodkuj grupę pionowo + + + + + Align group to right + Wyrównaj grupę do prawej + + + + + Align group to top + Wyrównaj grupę do góry + + + + + Align group to bottom + Wyrównaj grupę do dołu + + + + Set alignment + Ustawianie wyrównywania + + + + Set alignment to a group + Ustaw wyrównywanie dla grup + + + + Rescale background image + Przeskaluj obraz tła + FileParser @@ -1113,7 +1192,7 @@ - Saving failed for project %1 : %2 + Saving failed for project %1: %2 Nie udało się zapisać do projektu %1: %2 @@ -1128,12 +1207,12 @@ - The file is not a "Hotshots" file !! + The file is not a "Hotshots" file! Plik nie jest plikiem "HotShots“ !! - Configuration has been automatically updated ! + Configuration has been automatically updated! Konfiguracja została automatycznie zaktualizowana ! @@ -1146,19 +1225,19 @@ FreeImageHostingUploader - %1 transfert end without error + %1 transfert end without error. %1 przetransferowano bez błędów - %1 transfert end with error (%2) + %1 transfert end with error! (%2) %1 przetransferowano z błędem (%2) FreehandGrabber - + Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit. Wybierz region używając kursora myszy. Aby zrobić Zrzut Ekranu, naciśnij klawisz Enter lub kliknij dwa razy. Naciśnij Esc aby zrezygnować. @@ -1182,8 +1261,8 @@ - successful uploading onto %1. - pomyślnie wysłano na %1. + Uploaded successfully onto %1. + Pomyślnie wysłano na %1. @@ -1197,13 +1276,13 @@ - %1 transfert end with error + %1 transfert end with error! %1 przetransferowano z błędem - %1 transfert end without error - %1 przetransferowano,bez błędów + %1 transfert end without error. + %1 przetransferowano bez błędów @@ -1275,7 +1354,7 @@ - Ftp port + FTP port Port FTP @@ -1293,12 +1372,12 @@ ImageshackUploader - %1 transfert end without error + %1 transfert end without error. %1 przetransferowano bez błędów - %1 transfert end with error (%2) + %1 transfert end with error! (%2) %1 przetransferowano z błędem (%2) @@ -1311,12 +1390,12 @@ ImgurUploader - %1 transfert end without error + %1 transfert end without error. %1 przetransferowano bez błędów - %1 transfert end with error (%2) + %1 transfert end with error! (%2) %1 przetransferowano z błędem (%2) @@ -1328,118 +1407,118 @@ MainWindow - + Save Directory Katalog zapisu - + Register of %1 uploaders Rejestracja użytkowników %1 - - Can't create storage location, check why ?! (%1) + + Can't create storage location, check why?! (%1) Nie można utworzyć katalogu z danymi, sprawdź dlaczego ?! (%1) - + No post effect Bez efektów - + Simple drop shadow Zwykły cień - + Drop shadow with borders Cień z obramowaniem - + Progressive opacity Progresywna przeźroczystość - + Torn edge Postrzępiona krawędź - + Main application Aplikacja domyślna - + Annotation editor Edytor adnotacji - - + + Upload the image to the web Wyślij obraz do sieci - - No default uploading web service defined ! + + No default uploading web service defined! Nie określono żadnej domyślnej usługi wysyłającej ! - + Uploader %1 Uploader %1 - - The default uploader (%1) does not appear correctly configured, no value given for required parameters !! + + The default uploader (%1) does not appear correctly configured, no value given for required parameters!! Domyślny upload-er (%1) raczej nie jest poprawnie skonfigurowany, nie dodano żadnej wartości do wymaganych parametrów !! - - Upload image %1 to %2 service ? + + Upload image %1 to %2 service? Wysłać obraz %1 do usługi %2 ? - + Print Document Drukuj Dokument - + Save File Zapisz plik - + Images (*.%1) Obrazy (*.%1) - + Save failed Zapisywanie nieudane - + Error saving file Błąd zapisywania pliku - + Systray Zasobnik systemowy - + The program will keep running in the system tray. To terminate the program, choose <b>Quit</b> in the context menu of the system tray entry. Program będzie nadal działać w zasobniku systemowym. Aby go wyłączyć wybierz z meni kontekstowego w trayu <b>Zakończ</b>. - + message from other instance. Wiadomość od drugiej instancji. @@ -1468,56 +1547,56 @@ Parametry - - Snapshot Delay (s): - Opóźnienie Zrzutu (s): - - - + Output path: Ścieżka wyjściowa: - + Cap&ture mode: Tryb &przechwytywania: - - Snapshot delay in seconds - Opóźnienie zrzutu w sekundach - - - - No delay - Bez opóźnienia - - - + After snapshot: Po zrzucie ekranu: - + Do nothing Nie rób nic - + Auto save image Auto-zapis obrazu - + Save image (ask user) Zapisz obraz (zapytaj użytkownika) - + Launch editor Uruchom edytor + + Snapshot delay in seconds + Opóźnienie zrzutu w sekundach + + + + No delay + Bez opóźnienia + + + + Snapshot Delay (s): + Opóźnienie Zrzutu (s): + + Quit Zamknij @@ -1553,88 +1632,88 @@ Pokaż Interfejs - + Copy To Clipboard Skopiuj do Schowka - + Copy to clipboard Skopiuj do schowka - + Open editor Otwórz edytor - + Open editor and add annotations Otwórz edytor i dodaj adnotacje - + Grab Screen Przechwyć Pulpit - + Grab screen (current) Przechwyć Pulpit (obecny) - + Grab all screens Przechwyć wszystkie pulpity - + Grab all screens (multi-monitors) Przechwyć wszystkie pulpity (wiele- monitorów) - + Grab Window Przechwyć Okno - + Grab window Przechwyć okno - + Grab Region Przechwyć dowolny obszar - + Grab region Przechwyć obszar - + Help Pomoc - + Upload Wyślij - + Upload the image to the web Wyślij obraz do sieci + - Grab freehand region Przechwyć dowolny obszar - + Print Drukuj @@ -1642,7 +1721,7 @@ QObject - + %1 found Znaleziono %1 @@ -1663,18 +1742,18 @@ - Following options are known: + Following options are available: Dostępne są następujące opcje: - --help - displays this help. - --pomoc -wyświetl pomoc. + --help : displays this help. + --pomoc : wyświetl pomoc. - --reset-config - clear the saved preference parameters. - --reset-config -kasuje zapisane ustawienia. + --reset-config : clear the saved preference parameters. + --reset-config: kasuje zapisane ustawienia. @@ -1683,33 +1762,38 @@ + --portable : use settings file location near the executable (for portable use). + --portable : użyj ustawień lokalizacji pliku w pobliżu pliku wykonywalnego ( dla użytku przenośnego ). + + + file : file to load in the editor, can be a .hot file or an image file. plik : plik do wczytania do edytora, powinien być plikiem .hot lub plikiem obrazu. - - %1 is already running !! + + %1 is already running!! %1 jest już uruchomiony! - translations path %1 + Translations path %1 ścieżka tłumaczenia %1 - setting language to : %1 + Setting language to: %1 ustawienie języka na : %1 - successfully loaded data from %1 + Successfully loaded data from %1 Pomyślnie wczytano dane z „%1“ - failed to load data from %1 + Failed to load data from %1 Nie można załadować danych z %1 @@ -1739,12 +1823,50 @@ RegionGrabber - + Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit. Wybierz region używając myszy. Aby zrobić Zrzut Ekranu, naciśnij klawisz Enter lub kliknij dwa razy.Naciśnij Esc aby zrezygnować. + RescaleDialogClass + + + Rescale snapshot + Zmiana wielkości zrzutu ekranu + + + + Original size: + Oryginalny rozmiar: + + + + Target size: + Docelowy rozmiar: + + + + Scale snapshot + Zmiana wielkości zrzutu ekranu + + + + % + % + + + + Size + Rozmiar + + + + Keep aspect ratio + Zachowaj proporcje obrazu + + + WidgetBrush @@ -1857,13 +1979,13 @@ - Fill with translucent Background Color + Fill with transparent background color Wypełnij tło kolorem z efektem przeźroczystości - Fill with Background Color + Fill with background color Wypełnij tło kolorem - + \ No newline at end of file Binary files /tmp/0ShdhbevAJ/hotshots-2.0.1/lang/hotshots_pt.qm and /tmp/i0vBy4mDwk/hotshots-2.1.0/lang/hotshots_pt.qm differ diff -Nru hotshots-2.0.1/lang/hotshots_pt.ts hotshots-2.1.0/lang/hotshots_pt.ts --- hotshots-2.0.1/lang/hotshots_pt.ts 2013-12-07 20:37:32.000000000 +0000 +++ hotshots-2.1.0/lang/hotshots_pt.ts 2014-02-15 16:28:48.000000000 +0000 @@ -2,79 +2,78 @@ - + release of translation and translator name please - put your name here dear translator and the release of the translation file !! + put your name here dear translator and the release of the translation file!! Tradução para Português (Brasil) da versão 1.5.0 por Vinícius de Ávila Jorge AboutDialog - + <a href="%1">Check for new release ...</a> <a href="%1">Checar por atualizações...</a> - + About Sobre - + Preferences Preferências - - Infos - Informações + + Info + - + Log Log - + Qt version %1 Versão do Qt: %1 - + The %1 file can't be found, sorry ... O arquivo %1 não pode ser encontrado, desculpe... - + detected language: %1 Idioma detectado : %1 - + Automatic detection Detecção automática - + Default (no use of translation files) Padrão (não há arquivo de tradução) - + The application need to restart in order to take into account new translation -, Do you want to restart application now ? - A aplicação precisa ser reiniciada para carregar o novo idioma. Deseja reiniciar a aplicação agora? +, Do you want to restart application now? + - - Do you want to reset all the preferences to default value ? + + Do you want to reset all the preferences to default value? If yes, the application will be relaunch - Deseja restaurar todas as preferências para os valores padrão? -Se sim, a aplicação será reiniciada + - + Example: Exemplo: @@ -231,211 +230,241 @@ + Add mouse cursor to snapshot + + + + + Snapshot Delay (s): + Atraso na captura de tela (s): + + + + Snapshot delay in seconds + Atraso na captura de tela em segundos + + + + No delay + Sem atraso + + + Scale snapshot Escalar a captura de tela - + % % - + Max width * height Máxima largura * altura - + 800 800 - + 600 600 - - Hotkeys - Atalhos de teclado + + Shortcut/Menu + + + + + Action performed by double-clicking on system tray icon: + - - Use system screen capture shortcuts + + Shortcut editor - + Action - + Shortcut - + Description - + + Use system screen capture shortcuts (only available for screen grab functions) + + + + Warning! Duplicated shortcuts will not be checked. - - "Ctrl", "Shift", "Alt" and "Meta" are recognized as valid modifiers + + System tray additional functions: - + Network Rede - + Default web service Serviço web padrão - + Copy uploaded file URL to clipboard Copiar a URL do arquivo para a área de transferência - + as como - + No format Sem formato - + Instant Messaging (IM) format Formato de mensageiro instantâneo (IM) - + HTML format Formato HTML - + BBCode format Formato BBCode - + User format Formato definido pelo usuário - + @url@ @url@ - + (*) @url@ is the uploaded URL (*) @url@ é a URL carregada - + Use a proxy server to connect to Internet Usar um servidor proxy para conectar-se à internet - + use Proxy Usar um proxy - + Host Servidor - + Proxy hostname Nome do proxy - + Port Porta - + Proxy Authentification Autenticação para o proxy - + Username Nome de Usuário - + Proxy username Nome do usuário para o proxy - + Password Senha - + Proxy password Senha do proxy - + Show/Hide password in interface Mostrar/Esconder a senha na interface - + Show password Mostrar senha - + Proxy port Porta do proxy - + Launch default Internet browser when done Iniciar o browser de internet padrão quando terminar - + Uploaders Uploaders - + Infos Infos - + Supported formats (via Qt plugins) Formatos suportados (via plugins Qt) - + Available translations Traduções disponíveis - + Log Diário @@ -463,13 +492,13 @@ CanardPCUploader - %1 transfert end without error - A transferência de %1 terminou sem erros + %1 transfert end without error. + - %1 transfert end with error (%2) - A transferência de %1 terminou com o erro (%2) + %1 transfert end with error! (%2) + @@ -493,117 +522,117 @@ EditorWidget - + Left-click to select item, Ctrl+Left Click then drag to select a group of items Clique com o botão esquerdo para selecionar item, Ctrl+Clique esquerdo então arraste para selecionar um grupo de itens - - + + Left-click to set center Clique com o botão esquerdo para posicionar o centro - - - - - - - - + + + + + + + + Left-click then drag to create the shape Clique com o botão esquerdo então arraste para criar a forma - - - + + + Creation: left-click to create a point, middle-click to delete the last one and right-click to create a new shape. Modification: select vertex, left-click then drag to move, middle-click to delete and right-click to add a new one Criação: clique com o botão esquerdo para criar um ponto, clique com o botão do meio para apagar o último e clique com o botão direito para criar uma nova forma. Modificação: selecione vértice, clique com o botão esquerdo então arraste para mover, clique com o botão direito para apagar e clique com o botão direito para adicionar um novo ponto. - + Left-click to set image center and drag if you want change the size Cique com o botão esquerdo para posicionar o centro da imagem e arraste se você quiser alterar seu tamanho - + Left-click then drag to create the shape, select the area and press <Enter> to perform the operation Clique com o botão esquerdo então arraste para criar a forma, selecione a área e pressione <Enter> para realizar a operação - - There is existing annotation items, what do you want to do ? - Existem itens de anotação, o que deseja fazer? + + There is existing annotation items, what do you want to do? + - + clear annotation items ... Limpar itens de anotação ... - + update background image ... Atualizar a imagem de fundo ... - + Loading HotShots file failed O carregamento do arquivo HotShots falhou - + Error loading HotShots file %1 Erro durante o carregamento do arquivo HotShots %1 - + Snapshot editor: Editor de capturas de tela: - + Scale x%1 Escala x%1 - + Clear edit Limpar edição - + Clear all the exiting items ? (no possible undo) - + Clear document Limpar documento - - Create a new document ? - Criar um novo documento? + + Create a new document? + - + Save HotShots File Salvar arquivo HotShots - + HotShots files (*.hot) Arquivos HostShots (*.hot) - + Saving HotShots file failed O salvamento do arquivo HotShots falhou - + Error saving HotShots file %1 Erro no salvamento do arquivo HotShots %1 @@ -668,438 +697,489 @@ - + Select item - + Select Selecionar - + + Esc + + + + Text item - + Draw text Desenhar um texto - + Line item - + Draw a simple line Desenhar uma linha simples - + Encircle item - + Encircle Circular - + Polyline item - + Draw a polyline Desenhar uma polilinha - + Polygon item - + Draw a polygon Desenhar um polígono - + Curve item - + Draw a curve Desenhar uma linha curva - + Crop item - + Crop background image Recortar a imagem de fundo - + Rectangle item - + Draw a rectangle Desenhar um retângulo - + Ellipse item - + Draw an ellipse Desenhar uma elípse - + Arrow item - + Draw an arrow Desenhar uma seta - + Tag item - + Draw a numbered tag Desenhar uma tag numerada - + Highlighter item - + Highlight Destacar - + Magnifier item - + Magnifier Lupa - + Image item - + Add an image Adicionar uma imagem - + Blur item - - Obfuscate - Ofuscar + + Blur + - + Font size down - + Decrease font size Diminuir o tamanho da fonte - + Font size up - + Increase font size Aumentar o tamanho da fonte - + aAbB... aAbB... - + Change font Trocar a fonte - + Quit Sair - + Quit editor Sair do editor - + Load - + Open a file Abrir um arquivo - - + + New document Novo documento - + Import clipboard - + Import image from clipboard Importar imagem da área de transferência - + Save - + Save edition Salvar edição - + Save as - + Save edition as Salvar como... - - + + Copy to clipboard Copiar para a área de transferência - + Export - + Export image Exportar a imagem - + Upload Subir para web - + Upload the image to the web Subir a imagem para a web - + Print Imprimir - + Fit to view - + Scale to fit window Ajustar para o tamanho da janela - - + + Reset scale Reiniciar a escala - + Undo - + Undo the last action - + Redo - + Redo the last undo action - + Add frame - + Add a post effect to background image Adicionar um efeito a imagem de fundo - + add shadow - + Enable/Disable item's shadow Habilitar/Desabilitar o sombreado dos itens - + Item up - + Push selected elements up Enviar para frente os elementos selecionados - + Item down - + Push selected elements down Enviar para trás os elementos selecionados - + Duplicate items - + Duplicate selected element Duplicar o elemento selecionado - + Clear items - + Erase all elements Apagar todos os elementos - + Delete items - + Delete selected elements Apagar todos os elementos - - Del - Apagar - - - + No post effect Sem efeitos - + Simple drop shadow Sombra simples - + Drop shadow with borders Sombra com bordas - + Progressive opacity Opacidade progressiva - + Torn edge Bordas irregulares - + Item to top - + Push selected elements to top - + Item to bottom - + Push selected elements to bottom + + + + Align group to left + + + + + + Align group to horizontal center + + + + + + Align group to vertical center + + + + + + Align group to right + + + + + + Align group to top + + + + + + Align group to bottom + + + + + Set alignment + + + + + Set alignment to a group + + + + + Rescale background image + + FileParser @@ -1110,8 +1190,8 @@ - Saving failed for project %1 : %2 - O salvamento do projeto %1 falhou : %2 + Saving failed for project %1: %2 + @@ -1125,13 +1205,13 @@ - The file is not a "Hotshots" file !! - O arquivo não é um arquivo "Hotshots" + The file is not a "Hotshots" file! + - Configuration has been automatically updated ! - A configuração foi automaticamente atualizada! + Configuration has been automatically updated! + @@ -1143,19 +1223,19 @@ FreeImageHostingUploader - %1 transfert end without error - A transferência de %1 terminou sem erros + %1 transfert end without error. + - %1 transfert end with error (%2) - A transferência de %1 terminou com um erro (%2) + %1 transfert end with error! (%2) + FreehandGrabber - + Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit. Selecione uma região usando o mouse. Para efetuar a captura da tela, pressione ENTER ou duplo-clique. Pressione ESC para sair. @@ -1179,8 +1259,8 @@ - successful uploading onto %1. - Upload de %1 feito com sucesso + Uploaded successfully onto %1. + @@ -1194,13 +1274,13 @@ - %1 transfert end with error - A transferência de %1 terminou com erro + %1 transfert end with error! + - %1 transfert end without error - A transferência de %1 terminou sem erros + %1 transfert end without error. + @@ -1272,8 +1352,8 @@ - Ftp port - Porta FTP + FTP port + @@ -1290,13 +1370,13 @@ ImageshackUploader - %1 transfert end without error - A transferência %1 terminou sem erros + %1 transfert end without error. + - %1 transfert end with error (%2) - A transferência de %1 terminou com o erro (%2) + %1 transfert end with error! (%2) + @@ -1308,13 +1388,13 @@ ImgurUploader - %1 transfert end without error - A transferência de %1 terminou sem erros + %1 transfert end without error. + - %1 transfert end with error (%2) - A transferência de %1 terminou com o erro (%2) + %1 transfert end with error! (%2) + @@ -1325,118 +1405,118 @@ MainWindow - + Save Directory Diretório de salvamento - + Register of %1 uploaders Registro de %1 uploaders - - Can't create storage location, check why ?! (%1) - Impossível criar o diretório de salvamento, checar o motivo (%1) + + Can't create storage location, check why?! (%1) + - + No post effect Sem efeitos - + Simple drop shadow Sombra simples - + Drop shadow with borders Sombras com bordas - + Progressive opacity Opacidade progressiva - + Torn edge Bordas irregulares - + Main application - + Annotation editor - - + + Upload the image to the web Carregar a imagem para a web - - No default uploading web service defined ! - Não foi especificado nenhum serviço de upload! + + No default uploading web service defined! + - + Uploader %1 Uploader %1 - - The default uploader (%1) does not appear correctly configured, no value given for required parameters !! - O uploader padrão (%1) não parece estar corretamente configurado, não há valores para os campos requeridos! + + The default uploader (%1) does not appear correctly configured, no value given for required parameters!! + - - Upload image %1 to %2 service ? - Carregar imagem %1 para o serviço %2 ? + + Upload image %1 to %2 service? + - + Print Document Imprimir documento - + Save File Salvar arquivo - + Images (*.%1) Imagens (*.%1) - + Save failed Salvamento falhou - + Error saving file Erro durante o salvamento - + Systray Área de notificação - + The program will keep running in the system tray. To terminate the program, choose <b>Quit</b> in the context menu of the system tray entry. O programa se manterá rodando na bandeja do sistema. Para terminar o programa, escolha <b>Sair</b> no menu de contexto do ícone na bandeja do sistema. - + message from other instance. Mensagem de outra instância @@ -1465,56 +1545,56 @@ Parâmetros - - Snapshot Delay (s): - Atraso na captura de tela (s): - - - + Output path: Caminho de saída: - + Cap&ture mode: Modo de captura: - - Snapshot delay in seconds - Atraso na captura de tela em segundos - - - - No delay - Sem atraso - - - + After snapshot: Após a captura de tela: - + Do nothing Não faça nada - + Auto save image Salvar automaticamente a imagem - + Save image (ask user) Salvar a imagem (solicitar ao usuário) - + Launch editor Iniciar o editor + + Snapshot delay in seconds + Atraso na captura de tela em segundos + + + + No delay + Sem atraso + + + + Snapshot Delay (s): + Atraso na captura de tela (s): + + Quit Sair @@ -1550,88 +1630,88 @@ Mostrar interface - + Copy To Clipboard Copiar para a área de transferência - + Copy to clipboard Copiar para área de transferência - + Open editor - + Open editor and add annotations - + Grab Screen Capturar a tela - + Grab screen (current) Capturar a tela atual - + Grab all screens Capturar todas as telas - + Grab all screens (multi-monitors) Capturar todas as telas (modo multi-monitor) - + Grab Window Capturar a janela - + Grab window Capturar a janela - + Grab Region Capturar região - + Grab region Capturar região - + Help Ajuda - + Upload Subir para web - + Upload the image to the web Subir uma imagem para a web + - Grab freehand region Capturar uma região delimitada à mão - + Print Imprimir @@ -1639,7 +1719,7 @@ QObject - + %1 found %1 encontrado @@ -1660,18 +1740,18 @@ - Following options are known: - São aceitas as seguintes opções: + Following options are available: + - --help - displays this help. - --help : Mostra esta ajuda. + --help : displays this help. + - --reset-config - clear the saved preference parameters. - --reset-config : Reseta as configurações salvas. + --reset-config : clear the saved preference parameters. + @@ -1680,34 +1760,39 @@ + --portable : use settings file location near the executable (for portable use). + + + + file : file to load in the editor, can be a .hot file or an image file. file : arquivo para carregar no editor, pode ser um arquivo .hot ou um arquivo de imagem - - %1 is already running !! - %1 já está rodando! + + %1 is already running!! + - translations path %1 - caminho para as traduções %1 + Translations path %1 + - setting language to : %1 - Definir como idioma: %1 + Setting language to: %1 + - successfully loaded data from %1 - Dados de %1 carregados com sucesso + Successfully loaded data from %1 + - failed to load data from %1 - Dados de %1 falharam ao carregar + Failed to load data from %1 + @@ -1736,12 +1821,50 @@ RegionGrabber - + Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit. Selecionione uma região usando o mouse. Para fazer a captura da tela, pressione Enter ou dê um duplo-clique. Pressione Esc para sair. + RescaleDialogClass + + + Rescale snapshot + + + + + Original size: + + + + + Target size: + + + + + Scale snapshot + Escalar a captura de tela + + + + % + % + + + + Size + + + + + Keep aspect ratio + + + + WidgetBrush @@ -1854,13 +1977,13 @@ - Fill with translucent Background Color - Preencher com cor de fundo translúcida + Fill with transparent background color + - Fill with Background Color - Preencher com cor de fundo + Fill with background color + \ No newline at end of file Binary files /tmp/0ShdhbevAJ/hotshots-2.0.1/lang/hotshots_ro.qm and /tmp/i0vBy4mDwk/hotshots-2.1.0/lang/hotshots_ro.qm differ diff -Nru hotshots-2.0.1/lang/hotshots_ro.ts hotshots-2.1.0/lang/hotshots_ro.ts --- hotshots-2.0.1/lang/hotshots_ro.ts 2013-12-07 20:45:20.000000000 +0000 +++ hotshots-2.1.0/lang/hotshots_ro.ts 2014-02-15 16:25:36.000000000 +0000 @@ -1,83 +1,79 @@ - - - + - + - + release of translation and translator name please - put your name here dear translator and the release of the translation file !! + put your name here dear translator and the release of the translation file!! Jaff (Oprea Nicolae) - ver 2.xx AboutDialog - + <a href="%1">Check for new release ...</a> <a href="%1">Verificare pentru nouă versiune...</a> - + About Despre - + Preferences Preferinţe - - Infos - Informaţii + + Info + - + Log Jurnal - + Qt version %1 Versiune Qt %1 - + The %1 file can't be found, sorry ... Fişierul %1 nu a putut fi găsit, scuze ... - + detected language: %1 Limbă detectată: %1 - + Automatic detection Detectare automată - + Default (no use of translation files) Iniţial (fără folosire fişiere traduceri) - + The application need to restart in order to take into account new translation -, Do you want to restart application now ? - Aplicaţia necesită repornire pentru a lua în seamă noua traducere, -Doriţi să reporniţi aplicaţia acum ? +, Do you want to restart application now? + - - Do you want to reset all the preferences to default value ? + + Do you want to reset all the preferences to default value? If yes, the application will be relaunch - Dorţi resetarea preferinţelor la valorile implicite? -Dacă da, atunci aplicaţia va fi repornită + - + Example: Exemplu: @@ -234,211 +230,241 @@ + Add mouse cursor to snapshot + + + + + Snapshot Delay (s): + Întîrzîiere instantaneu: + + + + Snapshot delay in seconds + Întîrziere instantaneu în secunde + + + + No delay + Fără întîrziere + + + Scale snapshot Scalare instantaneu - + % % - + Max width * height Max lăţime * înălţime - + 800 800 - + 600 600 - - Hotkeys - Scurtături taste + + Shortcut/Menu + + + + + Action performed by double-clicking on system tray icon: + - - Use system screen capture shortcuts - Foloseşte scurtăturile sistemului pentru captură ecran + + Shortcut editor + - + Action Acţiune - + Shortcut Scurtătură - + Description Descriere - + + Use system screen capture shortcuts (only available for screen grab functions) + + + + Warning! Duplicated shortcuts will not be checked. Atenţie! Scurtăturile identice nu vor fi verificate. - - "Ctrl", "Shift", "Alt" and "Meta" are recognized as valid modifiers - "Ctrl", "Shift", "Alt" şi "Meta" sînt recunoscute ca modificatori valabili + + System tray additional functions: + - + Network Reţea - + Default web service Serviciu web implicit - + Copy uploaded file URL to clipboard Copiază în clipboard adresa fişierului încărcat - + as ca - + No format Fără format - + Instant Messaging (IM) format Format Mesaj Instant (IM) - + HTML format Format HTML - + BBCode format Format BBCode - + User format Format utilizator - + @url@ @url@ - + (*) @url@ is the uploaded URL (*) @url@ este URL-ul încărcat - + Use a proxy server to connect to Internet Foloseşte server proxy pentru conectarea la internet - + use Proxy Foloseşte proxy - + Host Gazdă - + Proxy hostname Nume gazdă proxy - + Port Port - + Proxy Authentification Autentificare proxy - + Username Nume utilizator - + Proxy username Nume utilizator proxy - + Password Parolă - + Proxy password Parolă proxy - + Show/Hide password in interface Arată/Ascunde parola în interfaţă - + Show password Arată parola - + Proxy port Port proxy - + Launch default Internet browser when done Pornire browser Internet implicit la terminare - + Uploaders Încărcători - + Infos Informaţii - + Supported formats (via Qt plugins) Formate suportate (via plug-in-urilor Qt) - + Available translations Traduceri disponibile - + Log Jurnal @@ -466,13 +492,13 @@ CanardPCUploader - %1 transfert end without error - %1 transferat fără erori + %1 transfert end without error. + - %1 transfert end with error (%2) - %1 transferat cu eroarea (%2) + %1 transfert end with error! (%2) + @@ -496,117 +522,117 @@ EditorWidget - + Left-click to select item, Ctrl+Left Click then drag to select a group of items Clic stînga pentru selectare element, Ctrl+Clic stînga apoi trageţi pentru a selecta un grup de elemente - - + + Left-click to set center Clic stînga pentru a stabili centrul - - - - - - - - + + + + + + + + Left-click then drag to create the shape Clic stînga apoi trageţi pentru a crea forma - - - + + + Creation: left-click to create a point, middle-click to delete the last one and right-click to create a new shape. Modification: select vertex, left-click then drag to move, middle-click to delete and right-click to add a new one Crearea: faceţi clic stînga pentru a crea un punct, clic-mijloc pentru a şterge ultimul şi faceţi clic dreapta pentru a crea o nouă formă. Modificarea: selectaţi vertex, faceţi clic stînga trageţi apoi pentru a muta, clic mijloc pentru a şterge şi clic dreapta pentru a adăuga unul nou - + Left-click to set image center and drag if you want change the size Clic stînga pentru a stabili centrul imaginii şi trageţi, dacă doriţi să modificaţi dimensiunea - + Left-click then drag to create the shape, select the area and press <Enter> to perform the operation Clic stînga, apoi trageţi pentru a crea forma, selectaţi zona şi apăsaţi <Enter> pentru a efectua operaţiunea - - There is existing annotation items, what do you want to do ? - Există elemente de adnotare, ce doriţi să faceţi? + + There is existing annotation items, what do you want to do? + - + clear annotation items ... Şterge elementele adnotări... - + update background image ... actualizare imagine fundal... - + Loading HotShots file failed Nu s-a reuşit încărcarea fişierului HotShots - + Error loading HotShots file %1 Eroare la încărcarea fişierului HotShots %1 - + Snapshot editor: Editor instantaneu: - + Scale x%1 Scalare x%1 - + Clear edit Şterge editare - + Clear all the exiting items ? (no possible undo) Şterge toate elementele existente? (fără anulare posibilă) - + Clear document Curăţă document - - Create a new document ? - Crează document nou? + + Create a new document? + - + Save HotShots File Salvare fişier HotShots - + HotShots files (*.hot) Fişiere HotShots (*.hot) - + Saving HotShots file failed Nu s-a reuşit salvarea fişierului HotShots - + Error saving HotShots file %1 Eroare la salvarea fişierului HotShots %1 @@ -671,438 +697,489 @@ Acţiuni editare - + Select item Selectare element - + Select Selectare - + + Esc + + + + Text item Element text - + Draw text Desenare text - + Line item Element linie - + Draw a simple line Desenare linie simplă - + Encircle item Element încercuire - + Encircle Încercuire - + Polyline item Element polilinie - + Draw a polyline Desenare polilinie - + Polygon item Element poligon - + Draw a polygon Desenare poligon - + Curve item Element curbă - + Draw a curve Desenare linie curbată - + Crop item Element decupare - + Crop background image Decupare imagine fundal - + Rectangle item Element dreptunghi - + Draw a rectangle Desenare dreptunghi - + Ellipse item Element elipsă - + Draw an ellipse Desenare elipsă - + Arrow item Element săgeată - + Draw an arrow Desenare săgeată - + Tag item Element etichetă - + Draw a numbered tag Desenare etichetă numerotată - + Highlighter item Element evidenţiator - + Highlight Evdenţiere - + Magnifier item Element lupă - + Magnifier Lupă - + Image item Element imagine - + Add an image Adaugă o imagine - + Blur item Element estompare - - Obfuscate - Umbreşte + + Blur + Neclar - + Font size down Micşorare font - + Decrease font size Micşorare mărime font - + Font size up Mărire font - + Increase font size Mărire mărime font - + aAbB... aAbB... - + Change font Schimbare font - + Quit Închidere - + Quit editor Închidere editor - + Load Încarcă - + Open a file Deschidere fişier - - + + New document Document nou - + Import clipboard Import din clipboard - + Import image from clipboard Importă imagine din clipboard - + Save Salvare - + Save edition Salvare editare - + Save as Salvează ca - + Save edition as Salvare editare ca - - + + Copy to clipboard Copiază în clipboard - + Export Export - + Export image Export imagine - + Upload Încărcare - + Upload the image to the web Încărcare imagine pe web - + Print Imprimare - + Fit to view Potrivire la vizualizare - + Scale to fit window Scalare pentru potrivire în fereastră - - + + Reset scale Resetare scalare - + Undo Anulare - + Undo the last action Anulează ultima acţiune - + Redo Reface - + Redo the last undo action Reface ultima acţiune - + Add frame Adaugă cadru - + Add a post effect to background image Adaugă efect postare la imaginea de fundal - + add shadow Adaugă unbră - + Enable/Disable item's shadow Activare/Dezactivare umbrire elemente - + Item up Element în sus - + Push selected elements up Împinge elementele selectate în sus - + Item down Element în jos - + Push selected elements down Împinge elementele selectate în jos - + Duplicate items Elemente duplicat - + Duplicate selected element Duplică elementul selectat - + Clear items Îndepărtează elemente - + Erase all elements Şterge toate elementele - + Delete items Şterge elemente - + Delete selected elements Şterge elementele selectate - - Del - Şterge - - - + No post effect Fără efect postare - + Simple drop shadow Umbră simplă - + Drop shadow with borders Umbră cu margini - + Progressive opacity Opacitate progresivă - + Torn edge Margine zimţată - + Item to top Element în top - + Push selected elements to top Împinge elementele selectate în top - + Item to bottom Element în partea de jos - + Push selected elements to bottom Împinge elementele selectate în partea de jos + + + + Align group to left + + + + + + Align group to horizontal center + + + + + + Align group to vertical center + + + + + + Align group to right + + + + + + Align group to top + + + + + + Align group to bottom + + + + + Set alignment + + + + + Set alignment to a group + + + + + Rescale background image + + FileParser @@ -1113,8 +1190,8 @@ - Saving failed for project %1 : %2 - Nu s-a reuşit salvarea proiectului %1 : %2 + Saving failed for project %1: %2 + @@ -1128,13 +1205,13 @@ - The file is not a "Hotshots" file !! - Acesta nu este un fişier HotShots! + The file is not a "Hotshots" file! + - Configuration has been automatically updated ! - Configurarea a fost actualizată în mod automat! + Configuration has been automatically updated! + @@ -1146,19 +1223,19 @@ FreeImageHostingUploader - %1 transfert end without error - %1 transferat fără erori + %1 transfert end without error. + - %1 transfert end with error (%2) - %1 transferat cu eroarea (%2) + %1 transfert end with error! (%2) + FreehandGrabber - + Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit. Selectaţi o regiune cu ajutorul mouse-ului. Pentru a face un instantaneu, apăsaţi tasta Enter sau faceţi dublu clic. Apăsaţi ESC pentru a ieşi. @@ -1182,8 +1259,8 @@ - successful uploading onto %1. - încărcat cu succes la %1. + Uploaded successfully onto %1. + @@ -1197,13 +1274,13 @@ - %1 transfert end with error - %1 transferat fără erori + %1 transfert end with error! + - %1 transfert end without error - %1 transferat fără erori + %1 transfert end without error. + @@ -1275,8 +1352,8 @@ - Ftp port - Port FTP + FTP port + @@ -1293,13 +1370,13 @@ ImageshackUploader - %1 transfert end without error - %1 transferat fără erori + %1 transfert end without error. + - %1 transfert end with error (%2) - %1 transferat cu eroarea (%2) + %1 transfert end with error! (%2) + @@ -1311,13 +1388,13 @@ ImgurUploader - %1 transfert end without error - %1 transferat fără erori + %1 transfert end without error. + - %1 transfert end with error (%2) - %1 transferat cu eroarea (%2) + %1 transfert end with error! (%2) + @@ -1328,118 +1405,118 @@ MainWindow - + Save Directory Folder salvare - + Register of %1 uploaders Registrul a %1 uploaderi - - Can't create storage location, check why ?! (%1) - Nu se poate crea locul de depozitare, verificaţi de ce?! (%1) + + Can't create storage location, check why?! (%1) + - + No post effect Fără efect postare - + Simple drop shadow Umbră simplă - + Drop shadow with borders Umbră cu margini - + Progressive opacity Opacitate progresivă - + Torn edge Margine zimţată - + Main application Aplicaţie principală - + Annotation editor Editor adnotări - - + + Upload the image to the web Încărcare imagine pe web - - No default uploading web service defined ! - Nici un serviciu iniţial web de încărcare este definit! + + No default uploading web service defined! + - + Uploader %1 Încărcător %1 - - The default uploader (%1) does not appear correctly configured, no value given for required parameters !! - Uploader-ul implicit (%1) nu apare configurat corect, nici o valoare dată pentru parametrii necesari! + + The default uploader (%1) does not appear correctly configured, no value given for required parameters!! + - - Upload image %1 to %2 service ? - Încărcare imagine %1 către serviciul %2? + + Upload image %1 to %2 service? + - + Print Document Imprimare document - + Save File Salvare fişier - + Images (*.%1) Imagini (*.%1) - + Save failed Salvare nereuşită - + Error saving file Eroare la salvarea fişierului - + Systray Bară sistem - + The program will keep running in the system tray. To terminate the program, choose <b>Quit</b> in the context menu of the system tray entry. Programul va continua să ruleze în bara de sistem. Pentru a termina programul, alegeţi <b>Închidere</b> din meniul contextual al intrării din bara de sistem. - + message from other instance. mesaj de la o altă instanţă. @@ -1468,56 +1545,56 @@ Parametrii - - Snapshot Delay (s): - Întîrzîiere instantaneu: - - - + Output path: Cale ieşire: - + Cap&ture mode: Mod cap&tură: - - Snapshot delay in seconds - Întîrziere instantaneu în secunde - - - - No delay - Fără întîrziere - - - + After snapshot: După instantaneu: - + Do nothing Nu face nimic - + Auto save image Salvare automată imagine - + Save image (ask user) Salvare imagine (întrebare utilizator) - + Launch editor Pornire editor + + Snapshot delay in seconds + Întîrziere instantaneu în secunde + + + + No delay + Fără întîrziere + + + + Snapshot Delay (s): + Întîrzîiere instantaneu: + + Quit Închidere @@ -1553,88 +1630,88 @@ Arată interfaţă - + Copy To Clipboard Copiază în clipboard - + Copy to clipboard Copiază în clipboard - + Open editor Deschidere editor - + Open editor and add annotations Deschidere editor şi adăugare adnotări - + Grab Screen Capturează ecran - + Grab screen (current) Capturează ecran (curent) - + Grab all screens Capturează toate ecranele - + Grab all screens (multi-monitors) Capturează toate ecranele (multi-monitorare) - + Grab Window Capturează fereastră - + Grab window Capturează fereastră - + Grab Region Capturează regiune - + Grab region Capturează regiune - + Help Ajutor - + Upload Încărcare - + Upload the image to the web Încărcare imagine pe web + - Grab freehand region Capturează regiune cu mîna liberă - + Print Imprimare @@ -1642,7 +1719,7 @@ QObject - + %1 found %1 găsit @@ -1663,17 +1740,17 @@ - Following options are known: - Următoarele opţiuni sînt cunoscute: + Following options are available: + - --help - displays this help. + --help : displays this help. --help - arată acest ajutor. - --reset-config - clear the saved preference parameters. + --reset-config : clear the saved preference parameters. --reset-config - şterge parametrii salvaţi ai preferinţelor. @@ -1683,34 +1760,39 @@ + --portable : use settings file location near the executable (for portable use). + + + + file : file to load in the editor, can be a .hot file or an image file. fişier : fişierul de încărcat în editor, Poate fi un fişier .hot sau un fişier imagine. - - %1 is already running !! - %1 deja rulează! + + %1 is already running!! + - translations path %1 - cale traduceri %1 + Translations path %1 + - setting language to : %1 - setare limbă la: %1 + Setting language to: %1 + - successfully loaded data from %1 - date încărcate cu succes din %1 + Successfully loaded data from %1 + - failed to load data from %1 - nu s-au putut încărca datele din %1 + Failed to load data from %1 + @@ -1739,12 +1821,50 @@ RegionGrabber - + Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit. Selectaţi o regiune cu ajutorul mouse-ului. Pentru a face un instantaneu, apăsaţi tasta Enter sau faceţi dublu clic. Apăsaţi ESC pentru a ieşi. + RescaleDialogClass + + + Rescale snapshot + + + + + Original size: + + + + + Target size: + + + + + Scale snapshot + Scalare instantaneu + + + + % + % + + + + Size + Mărime + + + + Keep aspect ratio + + + + WidgetBrush @@ -1857,13 +1977,13 @@ - Fill with translucent Background Color - Umplere cu culoare fundal translucidă + Fill with transparent background color + - Fill with Background Color - Umplere cu culoare fundal + Fill with background color + - + \ No newline at end of file Binary files /tmp/0ShdhbevAJ/hotshots-2.0.1/lang/hotshots_ru.qm and /tmp/i0vBy4mDwk/hotshots-2.1.0/lang/hotshots_ru.qm differ diff -Nru hotshots-2.0.1/lang/hotshots_ru.ts hotshots-2.1.0/lang/hotshots_ru.ts --- hotshots-2.0.1/lang/hotshots_ru.ts 2013-12-07 20:35:18.000000000 +0000 +++ hotshots-2.1.0/lang/hotshots_ru.ts 2014-02-15 16:27:12.000000000 +0000 @@ -2,78 +2,78 @@ - + release of translation and translator name please - put your name here dear translator and the release of the translation file !! + put your name here dear translator and the release of the translation file!! Локализация для hotshot 2.0 Andrey Maraev AboutDialog - + <a href="%1">Check for new release ...</a> <a href="%1">Проверить наличие обновлений</a> - + About О программе - + Preferences Настройки - - Infos - Информация + + Info + - + Log Журнал - + Qt version %1 Версия Qt %1 - + The %1 file can't be found, sorry ... Файл %1 не найден - + detected language: %1 Определить язык : %1 - + Automatic detection Автоматическое определение - + Default (no use of translation files) По умолчанию (не использовать файл локализации) - + The application need to restart in order to take into account new translation -, Do you want to restart application now ? - Для применения локализации нужен перезапуск приложения. Хотите произвести его сейчас? +, Do you want to restart application now? + - - Do you want to reset all the preferences to default value ? + + Do you want to reset all the preferences to default value? If yes, the application will be relaunch - Хотите восстановить настройки по умолчанию? Если "да", то будет произведен перезапуск приложения + - + Example: Пример : @@ -230,211 +230,241 @@ + Add mouse cursor to snapshot + Курсор в скриншоте + + + + Snapshot Delay (s): + Задержка (c): + + + + Snapshot delay in seconds + Задержка в секундах + + + + No delay + Нет задержки + + + Scale snapshot Масштаб - + % % - + Max width * height Ширина - Высота - + 800 800 - + 600 600 - - Hotkeys - Горячие клавиши + + Shortcut/Menu + Горячие клавиши/Меню - - Use system screen capture shortcuts - Использовать системные горячие клавиши + + Action performed by double-clicking on system tray icon: + Действие двойным щелчком на иконке в трее: - + + Shortcut editor + Редактор горячих клавиш + + + Action Команда - + Shortcut Горячая клавиша - + Description Описание - - Warning! Duplicated shortcuts will not be checked. + + Use system screen capture shortcuts (only available for screen grab functions) - - "Ctrl", "Shift", "Alt" and "Meta" are recognized as valid modifiers - Модификаторы - "Ctrl", "Shift", "Alt", "Meta" + + Warning! Duplicated shortcuts will not be checked. + Внимание! Дубликаты горячих клавиш не проверяются. + + + + System tray additional functions: + - + Network Сеть - + Default web service Веб-сервис - + Copy uploaded file URL to clipboard Копировать URL в буфер обмена - + as Формат: - + No format Как есть - + Instant Messaging (IM) format Формат IM - + HTML format Формат HTML - + BBCode format Формат BBCode - + User format Пользовательский формат - + @url@ @url@ - + (*) @url@ is the uploaded URL (*) @url@ - URL загруженного скриншота - + Use a proxy server to connect to Internet Использовать прокси - + use Proxy Использовать прокси - + Host Сервер - + Proxy hostname Прокси сервер - + Port Порт - + Proxy Authentification Авторизация - + Username Имя пользователя - + Proxy username Имя пользователя - + Password Пароль - + Proxy password Пароль - + Show/Hide password in interface Скрывать/Показывать пароль - + Show password Показать пароль - + Proxy port Порт прокси - + Launch default Internet browser when done Открыть в браузере - + Uploaders Веб-сервисы - + Infos Информация - + Supported formats (via Qt plugins) Поддерживаемые форматы - + Available translations Доступные локализации - + Log Журнал @@ -462,13 +492,13 @@ CanardPCUploader - %1 transfert end without error - Файл %1 загружен без ошибок + %1 transfert end without error. + - %1 transfert end with error (%2) - Файл %1 загружен с ошибкой (%2) + %1 transfert end with error! (%2) + @@ -492,117 +522,117 @@ EditorWidget - + Left-click to select item, Ctrl+Left Click then drag to select a group of items Левая кнопка выделяет элемент, Ctrl+левая кнопка перемещает выбранное - - + + Left-click to set center Центрирование левой кнопкой - - - - - - - - + + + + + + + + Left-click then drag to create the shape Форма создается левой кнопка, затем перемещением - - - + + + Creation: left-click to create a point, middle-click to delete the last one and right-click to create a new shape. Modification: select vertex, left-click then drag to move, middle-click to delete and right-click to add a new one Создание: левая кнопка создает точку, средняя кнопка удаляет последнюю точку, правая кнопка создает новую форму. Изменение:выбрать вершину, левая кнопка для перемещения, средняя кнопка для удаления, правая кнопка для создания новой. - + Left-click to set image center and drag if you want change the size Левая кнопка центрирует изображение и перемещает, если хотите изменить размер - + Left-click then drag to create the shape, select the area and press <Enter> to perform the operation Левая кнопка и перемещение создает форму, выбор области и <Enter> выполняют действие. - - There is existing annotation items, what do you want to do ? - Изображение существует, что делать? + + There is existing annotation items, what do you want to do? + - + clear annotation items ... очистить.. - + update background image ... обновить изображение фона.. - + Loading HotShots file failed Ошибка открытия файла - + Error loading HotShots file %1 Ошибка открытия файла % - + Snapshot editor: Редактирование скриншота - + Scale x%1 Масштаб x%1 - + Clear edit Очистить редактируемое - + Clear all the exiting items ? (no possible undo) Очистить все (без возможности восстановления)? - + Clear document Очистить документ - - Create a new document ? - Создать новый документ? + + Create a new document? + - + Save HotShots File Сохранить в HotShots файл - + HotShots files (*.hot) Файл HotShots (*.hot) - + Saving HotShots file failed Ошибка сохранения в файл HotShots - + Error saving HotShots file %1 Ошибка сохранения в файл HotShots %1 @@ -667,438 +697,489 @@ Действия редактора - + Select item Выбрать элемент - + Select Выбор - + + Esc + + + + Text item Текст - + Draw text Текст - + Line item Линия - + Draw a simple line Линия - + Encircle item Спираль - + Encircle Спираль - + Polyline item Свободная линия - + Draw a polyline Свободная линия - + Polygon item Многоугольник - + Draw a polygon Многоугольник - + Curve item Кривая - + Draw a curve Кривая - + Crop item Заполнить фоном - + Crop background image Заполнить фоном - + Rectangle item Прямоугольник - + Draw a rectangle Прямоугольник - + Ellipse item Эллипс - + Draw an ellipse Эллипс - + Arrow item Стрелка - + Draw an arrow Стрелка - + Tag item Нумерованные метки - + Draw a numbered tag Нумерованные метки - + Highlighter item Маркер - + Highlight Маркер - + Magnifier item Лупа - + Magnifier Лупа - + Image item Добавить изображение - + Add an image Добавить изображение - + Blur item Размыть - - Obfuscate - Размыть + + Blur + - + Font size down Уменьшить размер шрифта - + Decrease font size Уменьшить шрифт - + Font size up Увеличить размер шрифта - + Increase font size Увеличить шрифт - + aAbB... aAbB... - + Change font Шрифт - + Quit Выход - + Quit editor Выход - + Load Открыть - + Open a file Открыть - - + + New document Новый - + Import clipboard Вставить - + Import image from clipboard Вставить - + Save Сохранить - + Save edition Сохранить - + Save as Сохранить как.. - + Save edition as Сохранить как .. - - + + Copy to clipboard Копировать - + Export Экспорт - + Export image Экспорт - + Upload Загрузить на веб-сервис - + Upload the image to the web Загрузить на веб-сервис - + Print Печать - + Fit to view Масштаб к размеру окна - + Scale to fit window Масштаб к размеру окна - - + + Reset scale Масштаб 1:1 - + Undo Отменить - + Undo the last action Отменить последнее действие - + Redo Повторить - + Redo the last undo action Повторить последнее действие - + Add frame Эффекты - + Add a post effect to background image Эффекты - + add shadow Тень - + Enable/Disable item's shadow Тень - + Item up Поднять элемент выше - + Push selected elements up Выше - + Item down Опустить элемент ниже - + Push selected elements down Ниже - + Duplicate items Дубликат - + Duplicate selected element Дубликат - + Clear items Удалить все - + Erase all elements Удалить все - + Delete items Удалить выбранные - + Delete selected elements Удалить - - Del - Удалить - - - + No post effect Без эффектов - + Simple drop shadow Простая тень - + Drop shadow with borders Тень с границей - + Progressive opacity Непрозрачность - + Torn edge Рваная граница - + Item to top Поднять элемент наверх - + Push selected elements to top Наверх - + Item to bottom Опустить элемент вниз - + Push selected elements to bottom Вниз + + + + Align group to left + + + + + + Align group to horizontal center + + + + + + Align group to vertical center + + + + + + Align group to right + + + + + + Align group to top + + + + + + Align group to bottom + + + + + Set alignment + + + + + Set alignment to a group + + + + + Rescale background image + + FileParser @@ -1109,8 +1190,8 @@ - Saving failed for project %1 : %2 - Ошибка сохраненя проекта %1 : %2 + Saving failed for project %1: %2 + @@ -1124,13 +1205,13 @@ - The file is not a "Hotshots" file !! - Файл не является файлом Hotshots + The file is not a "Hotshots" file! + - Configuration has been automatically updated ! - Настройки автоматически обновлены + Configuration has been automatically updated! + @@ -1142,19 +1223,19 @@ FreeImageHostingUploader - %1 transfert end without error - Файл %1 загружен без ошибок + %1 transfert end without error. + - %1 transfert end with error (%2) - Файл %1 загружен с ошибкой (%2) + %1 transfert end with error! (%2) + FreehandGrabber - + Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit. Выбор области при помощи мыши. Создание скриншота при помощи Enter или двойного щелчка. Выход - <Esc> @@ -1178,8 +1259,8 @@ - successful uploading onto %1. - успешно загружен %1 + Uploaded successfully onto %1. + @@ -1193,13 +1274,13 @@ - %1 transfert end with error - Ошибка загрузки %1 + %1 transfert end with error! + - %1 transfert end without error - Файл %1 загружен без ошибок + %1 transfert end without error. + @@ -1271,8 +1352,8 @@ - Ftp port - Порт FTP + FTP port + @@ -1289,13 +1370,13 @@ ImageshackUploader - %1 transfert end without error - Файл %1 загружен успешно + %1 transfert end without error. + - %1 transfert end with error (%2) - Файл %1 загружен с ошибкой (%2) + %1 transfert end with error! (%2) + @@ -1307,13 +1388,13 @@ ImgurUploader - %1 transfert end without error - Файл %1 загружен успешно + %1 transfert end without error. + - %1 transfert end with error (%2) - Файл %1 загружен с ошибкой (%2) + %1 transfert end with error! (%2) + @@ -1324,118 +1405,118 @@ MainWindow - + Save Directory Сохранить в директории - + Register of %1 uploaders Известно %1 веб-сервисов - - Can't create storage location, check why ?! (%1) - Ошибка создания места сохранения (%1) + + Can't create storage location, check why?! (%1) + - + No post effect Без эффектов - + Simple drop shadow Простая тень - + Drop shadow with borders Тень с границами - + Progressive opacity Размытие - + Torn edge Рваные края - + Main application Основные команды - + Annotation editor Команды редактора - - + + Upload the image to the web Загрузить на веб-сервис - - No default uploading web service defined ! - Не опеределен веб-сервис для загрузки по умолчанию. + + No default uploading web service defined! + - + Uploader %1 Веб-сервис %1 - - The default uploader (%1) does not appear correctly configured, no value given for required parameters !! - Веб-сервис (%1) неправильно настроен. + + The default uploader (%1) does not appear correctly configured, no value given for required parameters!! + - - Upload image %1 to %2 service ? - Загрузить изображение %1 на веб-сервис %2 ? + + Upload image %1 to %2 service? + - + Print Document Печатать документ - + Save File Сохранить файл - + Images (*.%1) Изображения (*.%1) - + Save failed Ошибка сохранения - + Error saving file Ошибка сохранения файла - + Systray Трей - + The program will keep running in the system tray. To terminate the program, choose <b>Quit</b> in the context menu of the system tray entry. Программа минимизирована в трей. Для выхода из программы выберите <b>Выход</b> в контекстном меню программы в трее. - + message from other instance. Сообщение из другого источника @@ -1464,56 +1545,56 @@ Настройки - - Snapshot Delay (s): - Задержка (c): - - - + Output path: Сохранять в..: - + Cap&ture mode: Тип : - - Snapshot delay in seconds - Задержка в секундах - - - - No delay - Нет задержки - - - + After snapshot: Действие: - + Do nothing Ничего не делать - + Auto save image Автосохранение - + Save image (ask user) Сохранение с запросом - + Launch editor Открыть в редакторе + + Snapshot delay in seconds + Задержка в секундах + + + + No delay + Нет задержки + + + + Snapshot Delay (s): + Задержка (c): + + Quit Выход @@ -1549,88 +1630,88 @@ Показать окно программы - + Copy To Clipboard Копировать - + Copy to clipboard Копировать - + Open editor Открыть редактор - + Open editor and add annotations Открыть редактор и редактировать - + Grab Screen Скриншот экрана - + Grab screen (current) Скриншот текущего экрана - + Grab all screens Скриншот всех экранов - + Grab all screens (multi-monitors) Скриншот всех экранов - + Grab Window Скриншот окна - + Grab window Скриншот окна - + Grab Region Скриншот области экрана - + Grab region Скриншот области экрана - + Help Помощь - + Upload Загрузить на веб-сервис - + Upload the image to the web Загрузить на веб-сервис + - Grab freehand region Скриншот свободной области - + Print Печать @@ -1638,7 +1719,7 @@ QObject - + %1 found %1 найден @@ -1659,18 +1740,18 @@ - Following options are known: - Опции : + Following options are available: + - --help - displays this help. - --help : Вывести справку. + --help : displays this help. + - --reset-config - clear the saved preference parameters. - --reset-config : Восстановить значения настроек по умолчанию. + --reset-config : clear the saved preference parameters. + @@ -1679,34 +1760,39 @@ + --portable : use settings file location near the executable (for portable use). + + + + file : file to load in the editor, can be a .hot file or an image file. Файл : в редактор можно загружать .hot файлы и файлы изображений - - %1 is already running !! - %1 уже запущен + + %1 is already running!! + - translations path %1 - путь к локализациям %1 + Translations path %1 + - setting language to : %1 - установить язык %1 + Setting language to: %1 + - successfully loaded data from %1 - успешно загружены данные из %1 + Successfully loaded data from %1 + - failed to load data from %1 - ошибка загрузки данных из %1 + Failed to load data from %1 + @@ -1735,12 +1821,50 @@ RegionGrabber - + Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit. Выбор области при помощи мыши. Снять скриншот -Enter или двойной клик. Выход - Esc + RescaleDialogClass + + + Rescale snapshot + + + + + Original size: + + + + + Target size: + + + + + Scale snapshot + Масштаб + + + + % + % + + + + Size + + + + + Keep aspect ratio + + + + WidgetBrush @@ -1853,13 +1977,13 @@ - Fill with translucent Background Color - Заполнение прозрачным фоном + Fill with transparent background color + - Fill with Background Color - Заполнение фоном + Fill with background color + \ No newline at end of file Binary files /tmp/0ShdhbevAJ/hotshots-2.0.1/lang/hotshots_si.qm and /tmp/i0vBy4mDwk/hotshots-2.1.0/lang/hotshots_si.qm differ diff -Nru hotshots-2.0.1/lang/hotshots_si.ts hotshots-2.1.0/lang/hotshots_si.ts --- hotshots-2.0.1/lang/hotshots_si.ts 2013-12-07 20:38:56.000000000 +0000 +++ hotshots-2.1.0/lang/hotshots_si.ts 2014-02-15 16:30:26.000000000 +0000 @@ -2,78 +2,78 @@ - + release of translation and translator name please - put your name here dear translator and the release of the translation file !! + put your name here dear translator and the release of the translation file!! AboutDialog - + <a href="%1">Check for new release ...</a> - + About පිළිබඳ - + Preferences අභිරුචීන් - - Infos - තොරතුරු + + Info + - + Log ඇතුල්වන්න - + Qt version %1 - + The %1 file can't be found, sorry ... සමාවන්න, %1 ගොනුව සොයා ගැනීමට නොහැකි විය ... - + detected language: %1 භාෂාව අනාවරණය කරගත්තා: %1 - + Automatic detection - + Default (no use of translation files) - + The application need to restart in order to take into account new translation -, Do you want to restart application now ? +, Do you want to restart application now? - - Do you want to reset all the preferences to default value ? + + Do you want to reset all the preferences to default value? If yes, the application will be relaunch - + Example: උදාහරණය: @@ -230,211 +230,241 @@ + Add mouse cursor to snapshot + + + + + Snapshot Delay (s): + ඡායාරූප පමා කරන්න (s): + + + + Snapshot delay in seconds + ඡායාරූප තත්පර ගණනකින් ප්‍රමාදයි + + + + No delay + ප්‍රමාදයක් නොමැත + + + Scale snapshot - + % % - + Max width * height උපරිම පළල * උස - + 800 800 - + 600 600 - - Hotkeys - අත්‍යාවශ්‍ය යතුරු + + Shortcut/Menu + - - Use system screen capture shortcuts + + Action performed by double-clicking on system tray icon: - + + Shortcut editor + + + + Action - + Shortcut - + Description - + + Use system screen capture shortcuts (only available for screen grab functions) + + + + Warning! Duplicated shortcuts will not be checked. - - "Ctrl", "Shift", "Alt" and "Meta" are recognized as valid modifiers + + System tray additional functions: - + Network - + Default web service - + Copy uploaded file URL to clipboard - + as - + No format ආකෘතියක් නොමැත - + Instant Messaging (IM) format - + HTML format - + BBCode format - + User format - + @url@ - + (*) @url@ is the uploaded URL - + Use a proxy server to connect to Internet - + use Proxy - + Host - + Proxy hostname - + Port - + Proxy Authentification - + Username - + Proxy username - + Password මුරපදය - + Proxy password - + Show/Hide password in interface - + Show password මුරපදය පෙන්වන්න - + Proxy port - + Launch default Internet browser when done - + Uploaders - + Infos තොරතුරු - + Supported formats (via Qt plugins) - + Available translations ප්‍රයෝජනය සඳහා ඇති පරිවර්තන - + Log ඇතුල්වන්න @@ -462,12 +492,12 @@ CanardPCUploader - %1 transfert end without error + %1 transfert end without error. - %1 transfert end with error (%2) + %1 transfert end with error! (%2) @@ -492,117 +522,117 @@ EditorWidget - + Left-click to select item, Ctrl+Left Click then drag to select a group of items - - + + Left-click to set center - - - - - - - - + + + + + + + + Left-click then drag to create the shape - - - + + + Creation: left-click to create a point, middle-click to delete the last one and right-click to create a new shape. Modification: select vertex, left-click then drag to move, middle-click to delete and right-click to add a new one - + Left-click to set image center and drag if you want change the size - + Left-click then drag to create the shape, select the area and press <Enter> to perform the operation - - There is existing annotation items, what do you want to do ? + + There is existing annotation items, what do you want to do? - + clear annotation items ... - + update background image ... - + Loading HotShots file failed - + Error loading HotShots file %1 - + Snapshot editor: ඡායාරූප සැකසුම: - + Scale x%1 පරිමාණය x%1 - + Clear edit - + Clear all the exiting items ? (no possible undo) - + Clear document ලේඛනය පිරිසුදු කරන්න - - Create a new document ? - අලුත් ලේඛනයක් සාදන්නද ? + + Create a new document? + - + Save HotShots File හොට්ෂොට්ස් ගොනුව සුරකින්න - + HotShots files (*.hot) හොට්ෂොට්ස් ගොනු (*.hot) - + Saving HotShots file failed හොට්ෂොට්ස් ගොනුව සුරැකීම අසාර්ථක විය - + Error saving HotShots file %1 හොට්ෂොට්ස් ගොනුව සුරැකීමේ දෝෂයකි %1 @@ -667,438 +697,489 @@ - + Select item - + Select තෝරන්න - + + Esc + + + + Text item - + Draw text - + Line item - + Draw a simple line සරල රේඛාවක් අඳින්න - + Encircle item - + Encircle වටකරන්න - + Polyline item - + Draw a polyline බහු රේඛාවක් අඳින්න - + Polygon item - + Draw a polygon බහුඅස‍්‍රයක් අඳින්න - + Curve item - + Draw a curve වක්‍රයක් අඳින්න - + Crop item - + Crop background image පසුබිම් රූපය කපන්න - + Rectangle item - + Draw a rectangle ඍජුකෝණාස‍්‍රයක් අඳින්න - + Ellipse item - + Draw an ellipse ඉලිප්සයක් අඳින්න - + Arrow item - + Draw an arrow ඊ තලයක් අඳින්න - + Tag item - + Draw a numbered tag - + Highlighter item - + Highlight ඉස්මතු කරන්න - + Magnifier item - + Magnifier විශාලක කාචය - + Image item - + Add an image රූපයක් එකතු කරන්න - + Blur item - - Obfuscate + + Blur - + Font size down - + Decrease font size අකුරු වල විශාලත්වය අඩුකරන්න - + Font size up - + Increase font size අකුරු වල විශාලත්වය වැඩිකරන්න - + aAbB... - + Change font අකුර වෙනස් කරන්න - + Quit පිටවෙන්න - + Quit editor සැකසුමෙන් ඉවත්වන්න - + Load - + Open a file ගොනුවක් විවෘත කරන්න - - + + New document අලුත් ලේඛනය - + Import clipboard - + Import image from clipboard - + Save - + Save edition සැකසුම සුරකින්න - + Save as - + Save edition as සැකසුම මෙලෙස සුරකින්න - - + + Copy to clipboard වැඩ තලයට පිටපත් කරන්න - + Export - + Export image රූපය අපනයනය කරන්න - + Upload - + Upload the image to the web - + Print - + Fit to view - + Scale to fit window - - + + Reset scale පරිමාණය නැවත සකසන්න - + Undo - + Undo the last action - + Redo - + Redo the last undo action - + Add frame - + Add a post effect to background image - + add shadow - + Enable/Disable item's shadow - + Item up - + Push selected elements up - + Item down - + Push selected elements down - + Duplicate items - + Duplicate selected element - + Clear items - + Erase all elements සියලු අංග මකන්න - + Delete items - + Delete selected elements - - Del - - - - + No post effect - + Simple drop shadow - + Drop shadow with borders - + Progressive opacity - + Torn edge - + Item to top - + Push selected elements to top - + Item to bottom - + Push selected elements to bottom + + + + Align group to left + + + + + + Align group to horizontal center + + + + + + Align group to vertical center + + + + + + Align group to right + + + + + + Align group to top + + + + + + Align group to bottom + + + + + Set alignment + + + + + Set alignment to a group + + + + + Rescale background image + + FileParser @@ -1109,8 +1190,8 @@ - Saving failed for project %1 : %2 - ව්‍යාපෘතිය සුරැකීම අසාර්ථක විය %1 : %2 + Saving failed for project %1: %2 + @@ -1124,12 +1205,12 @@ - The file is not a "Hotshots" file !! - මෙම ගොනුව "හොට්ෂොට්ස්" ගොනුවක් නොවේ + The file is not a "Hotshots" file! + - Configuration has been automatically updated ! + Configuration has been automatically updated! @@ -1142,19 +1223,19 @@ FreeImageHostingUploader - %1 transfert end without error + %1 transfert end without error. - %1 transfert end with error (%2) + %1 transfert end with error! (%2) FreehandGrabber - + Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit. @@ -1178,7 +1259,7 @@ - successful uploading onto %1. + Uploaded successfully onto %1. @@ -1193,12 +1274,12 @@ - %1 transfert end with error + %1 transfert end with error! - %1 transfert end without error + %1 transfert end without error. @@ -1271,7 +1352,7 @@ - Ftp port + FTP port @@ -1289,12 +1370,12 @@ ImageshackUploader - %1 transfert end without error + %1 transfert end without error. - %1 transfert end with error (%2) + %1 transfert end with error! (%2) @@ -1307,12 +1388,12 @@ ImgurUploader - %1 transfert end without error + %1 transfert end without error. - %1 transfert end with error (%2) + %1 transfert end with error! (%2) @@ -1324,118 +1405,118 @@ MainWindow - + Save Directory නාමාවලිය සුරකින්න - + Register of %1 uploaders - - Can't create storage location, check why ?! (%1) + + Can't create storage location, check why?! (%1) - + No post effect - + Simple drop shadow - + Drop shadow with borders - + Progressive opacity - + Torn edge - + Main application - + Annotation editor - - + + Upload the image to the web - - No default uploading web service defined ! + + No default uploading web service defined! - + Uploader %1 - - The default uploader (%1) does not appear correctly configured, no value given for required parameters !! + + The default uploader (%1) does not appear correctly configured, no value given for required parameters!! - - Upload image %1 to %2 service ? + + Upload image %1 to %2 service? - + Print Document - + Save File ගොනුව සුරකින්න - + Images (*.%1) රූපය (*.%1) - + Save failed සුරැකුම අසාර්ථක විය - + Error saving file ගොනුව සුරැකීමේ දෝෂයකි - + Systray - + The program will keep running in the system tray. To terminate the program, choose <b>Quit</b> in the context menu of the system tray entry. - + message from other instance. @@ -1464,56 +1545,56 @@ - - Snapshot Delay (s): - ඡායාරූප පමා කරන්න (s): - - - + Output path: නිමැවුම් මාර්ගය: - + Cap&ture mode: - - Snapshot delay in seconds - ඡායාරූප තත්පර ගණනකින් ප්‍රමාදයි - - - - No delay - ප්‍රමාදයක් නොමැත - - - + After snapshot: ඡායාරූපයට පසු: - + Do nothing කරීමට කිසිවක් නොමැත - + Auto save image රූපය ස්වයංක්‍රීයව සුරැකේ - + Save image (ask user) රූපය සුරකින්න (පරිශ්‍රීලකගෙන් විමසන්න) - + Launch editor සැකසුම අරඹන්න + + Snapshot delay in seconds + ඡායාරූප තත්පර ගණනකින් ප්‍රමාදයි + + + + No delay + ප්‍රමාදයක් නොමැත + + + + Snapshot Delay (s): + ඡායාරූප පමා කරන්න (s): + + Quit පිටවෙන්න @@ -1549,88 +1630,88 @@ මුහුණත පෙන්වන්න - + Copy To Clipboard වැඩ තලයට පිටපත් කරන්න - + Copy to clipboard වැඩ තලයට පිටපත් කරන්න - + Open editor - + Open editor and add annotations - + Grab Screen තිරය අල්ලාගන්න - + Grab screen (current) තිරය අල්ලාගන්න (දැන් පවතින ) - + Grab all screens සියලු තිර අල්ලාගන්න - + Grab all screens (multi-monitors) - + Grab Window - + Grab window - + Grab Region - + Grab region - + Help උදව් කරන්න - + Upload - + Upload the image to the web + - Grab freehand region - + Print @@ -1638,7 +1719,7 @@ QObject - + %1 found @@ -1659,17 +1740,17 @@ - Following options are known: + Following options are available: - --help - displays this help. + --help : displays this help. - --reset-config - clear the saved preference parameters. + --reset-config : clear the saved preference parameters. @@ -1679,33 +1760,38 @@ + --portable : use settings file location near the executable (for portable use). + + + + file : file to load in the editor, can be a .hot file or an image file. - - %1 is already running !! + + %1 is already running!! - translations path %1 + Translations path %1 - setting language to : %1 + Setting language to: %1 - successfully loaded data from %1 + Successfully loaded data from %1 - failed to load data from %1 + Failed to load data from %1 @@ -1735,12 +1821,50 @@ RegionGrabber - + Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit. + RescaleDialogClass + + + Rescale snapshot + + + + + Original size: + + + + + Target size: + + + + + Scale snapshot + + + + + % + % + + + + Size + + + + + Keep aspect ratio + + + + WidgetBrush @@ -1853,13 +1977,13 @@ - Fill with translucent Background Color + Fill with transparent background color - Fill with Background Color - පසුබිම් වර්ණයෙන් පුරවන්න + Fill with background color + \ No newline at end of file Binary files /tmp/0ShdhbevAJ/hotshots-2.0.1/lang/hotshots_sk.qm and /tmp/i0vBy4mDwk/hotshots-2.1.0/lang/hotshots_sk.qm differ diff -Nru hotshots-2.0.1/lang/hotshots_sk.ts hotshots-2.1.0/lang/hotshots_sk.ts --- hotshots-2.0.1/lang/hotshots_sk.ts 2013-12-07 20:38:18.000000000 +0000 +++ hotshots-2.1.0/lang/hotshots_sk.ts 2014-02-15 16:29:42.000000000 +0000 @@ -2,80 +2,78 @@ - + release of translation and translator name please - put your name here dear translator and the release of the translation file !! + put your name here dear translator and the release of the translation file!! Slavko <linux@slavino.sk> (v 1.1.1) AboutDialog - + <a href="%1">Check for new release ...</a> <a href="%1">Skontrolovať aktualizácie…</a> - + About O programe - + Preferences Nastavenia - - Infos - Informácie + + Info + - + Log Záznam - + Qt version %1 Verzia Qt %1 - + The %1 file can't be found, sorry ... Prepáčte, súbor %1 nemožno nájsť… - + detected language: %1 zistený jazyk: %1 - + Automatic detection Automatické zistenie - + Default (no use of translation files) Predvolený (nepoužívať jazykové súbory) - + The application need to restart in order to take into account new translation -, Do you want to restart application now ? - Aby sa prejavil nový jazyk, je potrebné aplikáciu reštartovať -, Chcete aplikáciu reštartovať teraz? +, Do you want to restart application now? + - - Do you want to reset all the preferences to default value ? + + Do you want to reset all the preferences to default value? If yes, the application will be relaunch - Chcete obnoviť všetky nastavenia na predvolené hodnoty? - Ak áno, aplikácia sa znova spustí + - + Example: Príklad: @@ -232,211 +230,241 @@ + Add mouse cursor to snapshot + + + + + Snapshot Delay (s): + Oneskorenie snímky [s]: + + + + Snapshot delay in seconds + Oneskorenie sňatia snímky v sekundách + + + + No delay + Bez oneskorenia + + + Scale snapshot Škálovať snímku - + % % - + Max width * height Max šírka x výška - + 800 - + 600 - - Hotkeys - Klávesové skratky + + Shortcut/Menu + - - Use system screen capture shortcuts + + Action performed by double-clicking on system tray icon: - + + Shortcut editor + + + + Action - + Shortcut - + Description - + + Use system screen capture shortcuts (only available for screen grab functions) + + + + Warning! Duplicated shortcuts will not be checked. - - "Ctrl", "Shift", "Alt" and "Meta" are recognized as valid modifiers + + System tray additional functions: - + Network Sieť - + Default web service Predvolená webová služba - + Copy uploaded file URL to clipboard Kopírovať URL nahratého súboru do schránky - + as - + No format Bez formátu - + Instant Messaging (IM) format Formát okamžitých správ (IM) - + HTML format Formát HTML - + BBCode format Formát BBcode - + User format Používateľský formát - + @url@ @url@ - + (*) @url@ is the uploaded URL (*) @url@ je nahraná URL - + Use a proxy server to connect to Internet Na pripojenie k Internetu použiť server proxy - + use Proxy použiť Proxy - + Host Hostiteľ - + Proxy hostname Meno stroja proxy - + Port Port - + Proxy Authentification Autentifikácia proxy - + Username Použ. meno - + Proxy username Meno používateľa proxy - + Password Heslo - + Proxy password Heslo proxy - + Show/Hide password in interface Zobraziť/Skryť heslo v rozhraní - + Show password Zobraziť heslo - + Proxy port Port proxy - + Launch default Internet browser when done Po skončení spustiť predvolený webový prehliadač - + Uploaders Nahrávania - + Infos Informácie - + Supported formats (via Qt plugins) Podporované formáty (pomocou zás. modulov Qt) - + Available translations Dostupné preklady - + Log Záznam @@ -464,13 +492,13 @@ CanardPCUploader - %1 transfert end without error - %1 prenos skončený bez chyby + %1 transfert end without error. + - %1 transfert end with error (%2) - %1 prenos skončený s chybou (%2) + %1 transfert end with error! (%2) + @@ -494,117 +522,117 @@ EditorWidget - + Left-click to select item, Ctrl+Left Click then drag to select a group of items - - + + Left-click to set center - - - - - - - - + + + + + + + + Left-click then drag to create the shape - - - + + + Creation: left-click to create a point, middle-click to delete the last one and right-click to create a new shape. Modification: select vertex, left-click then drag to move, middle-click to delete and right-click to add a new one - + Left-click to set image center and drag if you want change the size - + Left-click then drag to create the shape, select the area and press <Enter> to perform the operation - - There is existing annotation items, what do you want to do ? + + There is existing annotation items, what do you want to do? - + clear annotation items ... - + update background image ... - + Loading HotShots file failed načítanie súboru HotShots zlyhalo - + Error loading HotShots file %1 Chyba načítanie súboru HotShots %1 - + Snapshot editor: Editor snímky: - + Scale x%1 Škálovať x%1 - + Clear edit Vymazať úpravy - + Clear all the exiting items ? (no possible undo) - + Clear document Vymazať dokument - - Create a new document ? - Vytvoriť nový dokument? + + Create a new document? + - + Save HotShots File Uložiť súbor HotShots - + HotShots files (*.hot) Súbory HotShots (*.hot) - + Saving HotShots file failed Ukladanie súboru HotShots zlyhalo - + Error saving HotShots file %1 Chyba ukaldania súboru HotShots %1 @@ -669,438 +697,489 @@ - + Select item - + Select Výber - + + Esc + + + + Text item - + Draw text Krelsiť text - + Line item - + Draw a simple line Kreliť jednoduchú čiaru - + Encircle item - + Encircle Zakrúžkovať - + Polyline item - + Draw a polyline Kresliť lomenú čiaru - + Polygon item - + Draw a polygon Kresliť obdĺžnik - + Curve item - + Draw a curve Kresliť krivku - + Crop item - + Crop background image Orezať obrázok pozadia - + Rectangle item - + Draw a rectangle Kresliť obdĺžnik - + Ellipse item - + Draw an ellipse Kresliť ellipsu - + Arrow item - + Draw an arrow Kresliť šípku - + Tag item - + Draw a numbered tag Kresliť číslovanú značku - + Highlighter item - + Highlight Zvýrazniť - + Magnifier item - + Magnifier Lupa - + Image item - + Add an image Pridať obrázok - + Blur item - - Obfuscate - Rozmazať + + Blur + - + Font size down - + Decrease font size Zmenšiť veľkosť písma - + Font size up - + Increase font size Zväčšiť veľkosť písma - + aAbB... aAbB… - + Change font Zmeniť písmo - + Quit Skončiť - + Quit editor Skončiť editor - + Load - + Open a file Otvoriť súbor - - + + New document Nový dokument - + Import clipboard - + Import image from clipboard Importovať obrázok zo schránku - + Save - + Save edition Uložiť úpravy - + Save as - + Save edition as Uložiť úpravy ako - - + + Copy to clipboard Kopírovať do schránky - + Export - + Export image Exportovať obrázok - + Upload Nahrať - + Upload the image to the web Nahraž obrázok na web - + Print - + Fit to view - + Scale to fit window Škálovať na veľkosť okna - - + + Reset scale Obnoviť mierku - + Undo - + Undo the last action - + Redo - + Redo the last undo action - + Add frame - + Add a post effect to background image - + add shadow - + Enable/Disable item's shadow Zapnúť/Vypnúť tieň prvkov - + Item up - + Push selected elements up Posunúť zvolené prvky vyššie - + Item down - + Push selected elements down Posunúť zvolené prvky nižšie - + Duplicate items - + Duplicate selected element Duplikovať zvolené položky - + Clear items - + Erase all elements Vymazať všetky prvky - + Delete items - + Delete selected elements Odstrániť zvolené prvky - - Del - Zmazať - - - + No post effect - + Simple drop shadow - + Drop shadow with borders - + Progressive opacity - + Torn edge - + Item to top - + Push selected elements to top - + Item to bottom - + Push selected elements to bottom + + + + Align group to left + + + + + + Align group to horizontal center + + + + + + Align group to vertical center + + + + + + Align group to right + + + + + + Align group to top + + + + + + Align group to bottom + + + + + Set alignment + + + + + Set alignment to a group + + + + + Rescale background image + + FileParser @@ -1111,8 +1190,8 @@ - Saving failed for project %1 : %2 - Uloženie projektu %1 zlyhalo: %2 + Saving failed for project %1: %2 + @@ -1126,13 +1205,13 @@ - The file is not a "Hotshots" file !! - Súbor nie je súborom „Hotshots”!!! + The file is not a "Hotshots" file! + - Configuration has been automatically updated ! - Konfigurácia bola automaticky aktualizovaná! + Configuration has been automatically updated! + @@ -1144,19 +1223,19 @@ FreeImageHostingUploader - %1 transfert end without error - %1 prenos skončený bez chyby + %1 transfert end without error. + - %1 transfert end with error (%2) - %1 prenos skončený s chybou (%2) + %1 transfert end with error! (%2) + FreehandGrabber - + Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit. Vyberte oblasť pomocou myši. na získanie snímky použite kláves Enter alebo dvojklik. Stlačením Esc akciu zrušíte. @@ -1180,8 +1259,8 @@ - successful uploading onto %1. - Úspešné nahranie do %1. + Uploaded successfully onto %1. + @@ -1195,13 +1274,13 @@ - %1 transfert end with error - %1 prenos skončený s chybou + %1 transfert end with error! + - %1 transfert end without error - %1 prenos skončený bez chyby + %1 transfert end without error. + @@ -1273,8 +1352,8 @@ - Ftp port - Port FTP + FTP port + @@ -1291,13 +1370,13 @@ ImageshackUploader - %1 transfert end without error - %1 prenos skončený bez chyby + %1 transfert end without error. + - %1 transfert end with error (%2) - %1 prenos skončený s chybou (%2) + %1 transfert end with error! (%2) + @@ -1309,13 +1388,13 @@ ImgurUploader - %1 transfert end without error - %1 prenos skončený bez chyby + %1 transfert end without error. + - %1 transfert end with error (%2) - %1 prenos skončený s chybou (%2) + %1 transfert end with error! (%2) + @@ -1326,118 +1405,118 @@ MainWindow - + Save Directory Adresár uloženia - + Register of %1 uploaders - - Can't create storage location, check why ?! (%1) + + Can't create storage location, check why?! (%1) - + No post effect - + Simple drop shadow - + Drop shadow with borders - + Progressive opacity - + Torn edge - + Main application - + Annotation editor - - + + Upload the image to the web Nahrať obrázok na web - - No default uploading web service defined ! + + No default uploading web service defined! - + Uploader %1 Nahrávanie %1 - - The default uploader (%1) does not appear correctly configured, no value given for required parameters !! - Predvolené nahrávanie (%1) vyzerá byť zle nastavené, chýba hodnota povinných parametrov!!! + + The default uploader (%1) does not appear correctly configured, no value given for required parameters!! + - - Upload image %1 to %2 service ? - Nahrať obrázok %1 do služby %2? + + Upload image %1 to %2 service? + - + Print Document - + Save File Uložiť súbor - + Images (*.%1) Obrázky (*.%1) - + Save failed Uloženie zlyhalo - + Error saving file Chyba ukladania súboru - + Systray Oznamovacia oblasť - + The program will keep running in the system tray. To terminate the program, choose <b>Quit</b> in the context menu of the system tray entry. Program ostane spustený v oznamovacej oblasti. Na ukončenie programu zvoľte <b>Skončiť</b> v kontextovom menu položky v oznamovacej oblasti. - + message from other instance. @@ -1466,56 +1545,56 @@ Parametre - - Snapshot Delay (s): - Oneskorenie snímky [s]: - - - + Output path: Výstupná cesta: - + Cap&ture mode: Režim zachy&tenia: - - Snapshot delay in seconds - Oneskorenie sňatia snímky v sekundách - - - - No delay - Bez oneskorenia - - - + After snapshot: Po snímaní: - + Do nothing Neurobiť nič - + Auto save image Automaticky uložiť - + Save image (ask user) Uložiť obrázok (spýtať sa) - + Launch editor Spustiť editor + + Snapshot delay in seconds + Oneskorenie sňatia snímky v sekundách + + + + No delay + Bez oneskorenia + + + + Snapshot Delay (s): + Oneskorenie snímky [s]: + + Quit Skončiť @@ -1551,88 +1630,88 @@ Zobraziť rozhranie - + Copy To Clipboard Kopírovať do schránky - + Copy to clipboard Kopírovať do schránky - + Open editor - + Open editor and add annotations - + Grab Screen Zachytiť obrazovku - + Grab screen (current) Zachytiť obrazovku (aktuálnu) - + Grab all screens Zachytiť všetky obrazovky - + Grab all screens (multi-monitors) Zachytiť všetky obrazovky (viac monitorov) - + Grab Window Zachytiť okno - + Grab window Zachytiť okno - + Grab Region Zachytiť oblasť - + Grab region Zachytiť oblasť - + Help Pomocník - + Upload Nahrať - + Upload the image to the web Nahrať obrázok na web + - Grab freehand region Zachytiť voľnú oblasť - + Print @@ -1640,7 +1719,7 @@ QObject - + %1 found %1 nájdené @@ -1661,18 +1740,18 @@ - Following options are known: - Rozpoznávané sú nasledujúce voľby: + Following options are available: + - --help - displays this help. - --help – zobrazí tohoto pomocníka. + --help : displays this help. + - --reset-config - clear the saved preference parameters. - --reset-config – vymaže uložené nastavenia volieb. + --reset-config : clear the saved preference parameters. + @@ -1681,34 +1760,39 @@ + --portable : use settings file location near the executable (for portable use). + + + + file : file to load in the editor, can be a .hot file or an image file. - - %1 is already running !! - %1 už je spustený!!! + + %1 is already running!! + - translations path %1 - cesta prekladov %1 + Translations path %1 + - setting language to : %1 - nastavenie jazyka na: %1 + Setting language to: %1 + - successfully loaded data from %1 - úspešne načítané dáta z %1 + Successfully loaded data from %1 + - failed to load data from %1 - zlyhalo načítanie dát z %1 + Failed to load data from %1 + @@ -1737,12 +1821,50 @@ RegionGrabber - + Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit. Vyberte oblasť pomocou myši. na získanie snímky použite kláves Enter alebo dvojklik. Stlačením Esc akciu zrušíte. + RescaleDialogClass + + + Rescale snapshot + + + + + Original size: + + + + + Target size: + + + + + Scale snapshot + Škálovať snímku + + + + % + % + + + + Size + + + + + Keep aspect ratio + + + + WidgetBrush @@ -1855,13 +1977,13 @@ - Fill with translucent Background Color - Vyplniť priehľadnou farbou pozadia + Fill with transparent background color + - Fill with Background Color - Vyplniť farbou pozadia + Fill with background color + \ No newline at end of file Binary files /tmp/0ShdhbevAJ/hotshots-2.0.1/lang/hotshots_sr.qm and /tmp/i0vBy4mDwk/hotshots-2.1.0/lang/hotshots_sr.qm differ diff -Nru hotshots-2.0.1/lang/hotshots_sr.ts hotshots-2.1.0/lang/hotshots_sr.ts --- hotshots-2.0.1/lang/hotshots_sr.ts 2013-12-07 20:33:48.000000000 +0000 +++ hotshots-2.1.0/lang/hotshots_sr.ts 2014-02-15 16:31:58.000000000 +0000 @@ -2,80 +2,80 @@ - + release of translation and translator name please - put your name here dear translator and the release of the translation file !! + put your name here dear translator and the release of the translation file!! Ozzii (ozzii.translate@gmail.com) AboutDialog - + <a href="%1">Check for new release ...</a> <a href="%1">Провери ажурирања...</a> - + About О - + Preferences Подешавања - - Infos + + Info Инфо - + Log Дневник - + Qt version %1 Qt верзија %1 - + The %1 file can't be found, sorry ... Нажалост, не може да се нађе датотека %1... - + detected language: %1 нађен језик: %1 - + Automatic detection Аутоматско - + Default (no use of translation files) Подразумевано (без превода) - + The application need to restart in order to take into account new translation -, Do you want to restart application now ? - Програм треба поново да се покрени да би користи превод +, Do you want to restart application now? + Програм треба поново да се покрени да би користио превод. Поново покренути? - - Do you want to reset all the preferences to default value ? + + Do you want to reset all the preferences to default value? If yes, the application will be relaunch Да ли да се врате сва подешавања на подразумевано? Ако да, програм ће бити рестартован - + Example: Пример: @@ -232,211 +232,241 @@ + Add mouse cursor to snapshot + Додај курсор на слику + + + + Snapshot Delay (s): + Чекање снимка (с): + + + + Snapshot delay in seconds + Кањење снимка у секундама + + + + No delay + Без чекања + + + Scale snapshot Скала снимка - + % % - + Max width * height Макс пирина*висина - + 800 800 - + 600 600 - - Hotkeys - Пречице + + Shortcut/Menu + Пречица/мени - - Use system screen capture shortcuts - Употребити системске пречице хватања + + Action performed by double-clicking on system tray icon: + Акција на дво-клик на иконицу: - + + Shortcut editor + Уређивач снимка + + + Action Акција - + Shortcut Пречица - + Description Опис - + + Use system screen capture shortcuts (only available for screen grab functions) + Употребити системске пречице хватања(доступно само за хватање екрана) + + + Warning! Duplicated shortcuts will not be checked. Пажња! Дупле пречице нису проверене. - - "Ctrl", "Shift", "Alt" and "Meta" are recognized as valid modifiers - "Ctrl", "Shift", "Alt" и "Meta" су вађећи + + System tray additional functions: + Додатне функције треја: - + Network Мрежа - + Default web service Подразумеван веб сервис - + Copy uploaded file URL to clipboard Копирај УРЛ послане датотеке у оставу - + as као - + No format Без формата - + Instant Messaging (IM) format Instant Messaging (IM) формат - + HTML format HTML формат - + BBCode format BBCode формат - + User format Кориснички формат - + @url@ @url@ - + (*) @url@ is the uploaded URL (*) @url@ је URL слања - + Use a proxy server to connect to Internet Употреби прокси за приступ интернету - + use Proxy употреби Прокси - + Host Хост - + Proxy hostname Име проксија - + Port Порт - + Proxy Authentification Аутентификација проксија - + Username Корисник - + Proxy username Корисник проксија - + Password Лозинка - + Proxy password Лозинка проксија - + Show/Hide password in interface Покажи/сакриј лозинку у интерфејсу - + Show password Покажи лозинку - + Proxy port Порт проксија - + Launch default Internet browser when done Покрени прегледач када се заврши - + Uploaders Пошиљаоци - + Infos Инфо - + Supported formats (via Qt plugins) Подржени формати (преко Qt додатци) - + Available translations Доступни преводи - + Log Дневник @@ -464,12 +494,12 @@ CanardPCUploader - %1 transfert end without error - %1 трансферт се завршио без грешке + %1 transfert end without error. + %1 трансфер се завршио без грешке. - %1 transfert end with error (%2) + %1 transfert end with error! (%2) %1 трансферт се завршио са грешком (%2) @@ -494,117 +524,117 @@ EditorWidget - + Left-click to select item, Ctrl+Left Click then drag to select a group of items Леви-клик за одабирање ставке, Ctrl+Леви клик па повуцити за одабирање групе ставке - - + + Left-click to set center Леви-клик за постављање центра - - - - - - - - + + + + + + + + Left-click then drag to create the shape Леви-клик па повлачење за креирање облика - - - + + + Creation: left-click to create a point, middle-click to delete the last one and right-click to create a new shape. Modification: select vertex, left-click then drag to move, middle-click to delete and right-click to add a new one Креација: леви-клик за креацију тачке, средњи-клик за брисање последње и десни-клик за креацију нове форме. Промена: Одабрати врхунац, леви-клик и повуците за премештање, средњи-клик за брисање и десни-клик за додавање нове - + Left-click to set image center and drag if you want change the size Леви-клик за постављање центра и повраћење за промену величине - + Left-click then drag to create the shape, select the area and press <Enter> to perform the operation Леви-клик па повлачење за креацију облика, после одабрати зону и стиснути <Enter> за извршавање - - There is existing annotation items, what do you want to do ? + + There is existing annotation items, what do you want to do? Има промене, шта желите да урадите? - + clear annotation items ... поништи промене... - + update background image ... ажурирај слику позадине... - + Loading HotShots file failed Погрешно учитавање датотеке - + Error loading HotShots file %1 Грешка учитавања датотеке %1 - + Snapshot editor: Уређивач снимка: - + Scale x%1 Скала x%1 - + Clear edit Очисти уређивач - + Clear all the exiting items ? (no possible undo) Очисти све ставке? (нема враћења) - + Clear document Обриши докуменат - - Create a new document ? + + Create a new document? Креирати нов докуменат? - + Save HotShots File Сачувај HotShots датотеку - + HotShots files (*.hot) HotShots датотеке (*.hot) - + Saving HotShots file failed Неуспешно сачувавање - + Error saving HotShots file %1 Грешка сачувавања датотеке %1 @@ -669,438 +699,489 @@ Акције едиције - + Select item Одабирање - + Select Одабери - + + Esc + Esc + + + Text item Текст - + Draw text Нацртај текст - + Line item Линија - + Draw a simple line Нацртај линију - + Encircle item Окружи - + Encircle Окружи - + Polyline item Полилинија - + Draw a polyline Нацртај полилинију - + Polygon item Полигон - + Draw a polygon Нацртај полигон - + Curve item Криво - + Draw a curve Нацртај кривину - + Crop item Исеци - + Crop background image Исеци позадинску слику - + Rectangle item Правоугаоник - + Draw a rectangle Нацртај правоугаоник - + Ellipse item Елипса - + Draw an ellipse Нацртај елипсу - + Arrow item Стрела - + Draw an arrow Нацртај стрелицу - + Tag item Етикета - + Draw a numbered tag Нацртај број - + Highlighter item Истакни - + Highlight Истакни - + Magnifier item Лупа - + Magnifier Лупа - + Image item Слика - + Add an image Додај слику - + Blur item Замагли - - Obfuscate - Замрачити + + Blur + Замагли - + Font size down Умањи величину слова - + Decrease font size Умањи величину фонта - + Font size up Повећај величину слова - + Increase font size Повећај фонт - + aAbB... aAbB... - + Change font Промени фонт - + Quit Затвори - + Quit editor Затвори уредник - + Load Учитај - + Open a file Отвори датотеку - - + + New document Нов докуменат - + Import clipboard Увоз оставе - + Import image from clipboard Увоз слике из оставе - + Save Сачувај - + Save edition Сачувај едитор - + Save as Сачувај као - + Save edition as Сачувај едитор као - - + + Copy to clipboard Копирај у оставу - + Export Извоз - + Export image Извоз снимка - + Upload Слање - + Upload the image to the web Пошаљи на веб - + Print Штампај - + Fit to view Попуни изглед - + Scale to fit window Скала за попуњавање прозора - - + + Reset scale Ресетуј скалу - + Undo Врати - + Undo the last action Поништи последњу акцију - + Redo Понови - + Redo the last undo action Понови последњу акцију - + Add frame Додај рам - + Add a post effect to background image Додај ефекат позадини - + add shadow додај сенку - + Enable/Disable item's shadow Упали/угаси сенку ставке - + Item up ставка горе - + Push selected elements up Постави одабран елеменат на горе - + Item down ставка доле - + Push selected elements down Постави одабран елеменат на доле - + Duplicate items Копирај ставке - + Duplicate selected element Копирај одабран елеменат - + Clear items Очисти ставке - + Erase all elements Избриши све елементе - + Delete items Обриши ставке - + Delete selected elements Избриши одабане елементе - - Del - Изб. - - - + No post effect Без ефеката - + Simple drop shadow Једноставна сенка - + Drop shadow with borders Сенка са ивицама - + Progressive opacity Погресивна непрозирност - + Torn edge Поцепана ивица - + Item to top Ставка на врх - + Push selected elements to top Пребаци одабране елементе на врх - + Item to bottom Ставка на дну - + Push selected elements to bottom Пребаци одабране елементе на дну + + + + Align group to left + Среди групе на лево + + + + + Align group to horizontal center + Среди групе на хоризонтално + + + + + Align group to vertical center + Среди групе на вертикално + + + + + Align group to right + Среди групе на десно + + + + + Align group to top + Среди групе на горе + + + + + Align group to bottom + Среди групе на доле + + + + Set alignment + Постави сређење + + + + Set alignment to a group + Постави сређење групе + + + + Rescale background image + Скала позадинске слике + FileParser @@ -1111,8 +1192,8 @@ - Saving failed for project %1 : %2 - Неуспешно сачувавање пројекта %1 : %2 + Saving failed for project %1: %2 + Неуспешно сачувавање пројекта %1: %2 @@ -1126,12 +1207,12 @@ - The file is not a "Hotshots" file !! - Датотека није "Hotshots" датотека !! + The file is not a "Hotshots" file! + Датотека није "Hotshots" датотека! - Configuration has been automatically updated ! + Configuration has been automatically updated! Подешавање је аутоматско ажуриран! @@ -1144,19 +1225,19 @@ FreeImageHostingUploader - %1 transfert end without error - %1 транфер завршен без проблема + %1 transfert end without error. + %1 трансфер се завршио без грешке. - %1 transfert end with error (%2) - %1 транфер завршен са проблемом (%2) + %1 transfert end with error! (%2) + %1 трансферт се завршио са грешком (%2) FreehandGrabber - + Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit. Одабрати регион са мишом. Да би се узео снимак, стисните Enter или дво-клик. Esc за излаз. @@ -1180,7 +1261,7 @@ - successful uploading onto %1. + Uploaded successfully onto %1. успешно слање на %1. @@ -1195,13 +1276,13 @@ - %1 transfert end with error - %1 трансферт се завршио са грешком + %1 transfert end with error! + %1 трансферт се завршио са грешком! - %1 transfert end without error - %1 трансферт се завршио без грешке + %1 transfert end without error. + %1 трансфер се завршио без грешке. @@ -1273,7 +1354,7 @@ - Ftp port + FTP port FTP порт @@ -1291,12 +1372,12 @@ ImageshackUploader - %1 transfert end without error - %1 трансферт се завршио без грешке + %1 transfert end without error. + %1 трансфер се завршио без грешке. - %1 transfert end with error (%2) + %1 transfert end with error! (%2) %1 трансферт се завршио са грешком (%2) @@ -1309,13 +1390,13 @@ ImgurUploader - %1 transfert end without error - %1 трансфер се завршио без грешке + %1 transfert end without error. + %1 трансфер се завршио без грешке. - %1 transfert end with error (%2) - %1 трансфер се завршио са грешком (%2) + %1 transfert end with error! (%2) + %1 трансферт се завршио са грешком (%2) @@ -1326,118 +1407,118 @@ MainWindow - + Save Directory Сачувај фасциклу - + Register of %1 uploaders Регистровање од %1 пошиљаоца - - Can't create storage location, check why ?! (%1) - Не могу да креирам смештај стоваришта, проверити зашто ?! (%1) + + Can't create storage location, check why?! (%1) + Не могу да креирам смештај стоваришта, проверити зашто?! (%1) - + No post effect Без ефеката - + Simple drop shadow Једноставна сенка - + Drop shadow with borders Сенка са ивицама - + Progressive opacity Погресивна непровидност - + Torn edge Поцепана ивица - + Main application Главна апликација - + Annotation editor Едитор забелешке - - + + Upload the image to the web Пошаљи на веб - - No default uploading web service defined ! + + No default uploading web service defined! Ни један сервис за слање није дефинисан! - + Uploader %1 Пошиљалац %1 - - The default uploader (%1) does not appear correctly configured, no value given for required parameters !! + + The default uploader (%1) does not appear correctly configured, no value given for required parameters!! Подразумеван пошиљалац (%1) не делује лепо подешен, вредност није дата за потребан параметар!! - - Upload image %1 to %2 service ? - Слање %1 на %2 ? + + Upload image %1 to %2 service? + Слање слике %1 на %2? - + Print Document Штампај докуменат - + Save File Сачувај датотеку - + Images (*.%1) Слике (*.%1) - + Save failed Неуспешно сачувавање - + Error saving file Грешка сачувавања - + Systray Системска икона - + The program will keep running in the system tray. To terminate the program, choose <b>Quit</b> in the context menu of the system tray entry. Програм ће наставити да ради у систему. Да би зауставили програм, одабрати <b>Затвори</b> из контекстуелног менија. - + message from other instance. порука од друге инстанце. @@ -1466,56 +1547,56 @@ Параметри - - Snapshot Delay (s): - Чекање снимка (с): - - - + Output path: Излазна путања: - + Cap&ture mode: Шта ухватити: - - Snapshot delay in seconds - Кањење снимка у секундама - - - - No delay - Без чекања - - - + After snapshot: После снимка: - + Do nothing Ништа - + Auto save image Ауто-сачувај снимак - + Save image (ask user) Сачувај снимак (питај корисника) - + Launch editor Покрени уређивач + + Snapshot delay in seconds + Кањење снимка у секундама + + + + No delay + Без чекања + + + + Snapshot Delay (s): + Чекање снимка (с): + + Quit Затвори @@ -1551,88 +1632,88 @@ Прикажи интерфејс - + Copy To Clipboard Копирај у остави - + Copy to clipboard Копирај у остави - + Open editor Отвори уређивач - + Open editor and add annotations Отвори уређивач и додај анотације - + Grab Screen Сними екран - + Grab screen (current) Сними екран (тренутни) - + Grab all screens Сними све екране - + Grab all screens (multi-monitors) Сними све екране (више-мониторно) - + Grab Window Сними прозор - + Grab window Сними прозор - + Grab Region Сними регион - + Grab region Сними регион - + Help Помоћ - + Upload Слање - + Upload the image to the web Пошаљи на веб + - Grab freehand region Сними слободни регион - + Print Штампај @@ -1640,7 +1721,7 @@ QObject - + %1 found %1 нађено @@ -1661,18 +1742,18 @@ - Following options are known: - Ове опције су познате: + Following options are available: + Ове опције су доступне: - --help - displays this help. - --help - показује помоћ. + --help : displays this help. + --help : показује помоћ. - --reset-config - clear the saved preference parameters. - --reset-config - брише сачувана подешавања. + --reset-config : clear the saved preference parameters. + --reset-config : брише сачувана подешавања. @@ -1681,34 +1762,39 @@ + --portable : use settings file location near the executable (for portable use). + --portable : постави подешавање поред покретне датотеке (за преносну употребу). + + + file : file to load in the editor, can be a .hot file or an image file. датотека: датотека да се учита у едитору, може да буде .hot или слика. - - %1 is already running !! + + %1 is already running!! %1 већ ради!! - translations path %1 - путања превода %1 + Translations path %1 + Путања превода %1 - setting language to : %1 + Setting language to: %1 Постављен језик на: %1 - successfully loaded data from %1 - успешно учитавање податке од %1 + Successfully loaded data from %1 + Успешно учитавање податке од %1 - failed to load data from %1 - неуспешно учитавање податке од %1 + Failed to load data from %1 + Неуспешно учитавање податке од %1 @@ -1737,12 +1823,50 @@ RegionGrabber - + Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit. Одабрати регион са мишом. За узимање снимка, стиснути Enter или дво-клик. Esc за излаз. + RescaleDialogClass + + + Rescale snapshot + Скала снимка + + + + Original size: + Оригинална величина: + + + + Target size: + Циљна величина: + + + + Scale snapshot + Скала снимка + + + + % + % + + + + Size + Величина + + + + Keep aspect ratio + Сачувај рацио изгледа + + + WidgetBrush @@ -1855,12 +1979,12 @@ - Fill with translucent Background Color - Попуни са прозирном бојом позадине + Fill with transparent background color + Попуни са провидном бојом позадине - Fill with Background Color + Fill with background color Попуни позадину са бојом Binary files /tmp/0ShdhbevAJ/hotshots-2.0.1/lang/hotshots_tr.qm and /tmp/i0vBy4mDwk/hotshots-2.1.0/lang/hotshots_tr.qm differ diff -Nru hotshots-2.0.1/lang/hotshots_tr.ts hotshots-2.1.0/lang/hotshots_tr.ts --- hotshots-2.0.1/lang/hotshots_tr.ts 2013-12-07 20:37:48.000000000 +0000 +++ hotshots-2.1.0/lang/hotshots_tr.ts 2014-02-15 16:29:04.000000000 +0000 @@ -2,80 +2,78 @@ - + release of translation and translator name please - put your name here dear translator and the release of the translation file !! + put your name here dear translator and the release of the translation file!! v1.0.1 - YFDogan, decent - 28.09.2013 AboutDialog - + <a href="%1">Check for new release ...</a> <a href="%1">Yeni sürüm kontrolü ...</a> - + About Hakkında - + Preferences Tercihler - - Infos - Bilgiler + + Info + - + Log Günlük kaydı - + Qt version %1 Qt sürümü %1 - + The %1 file can't be found, sorry ... % 1 dosya bulunamadı, üzgünüm ... - + detected language: %1 Algılanan dil: %1 - + Automatic detection Otomatik algılama - + Default (no use of translation files) Varsayılan (çeviri dosyalarını kullanmadan) - + The application need to restart in order to take into account new translation -, Do you want to restart application now ? - Seçtiğiniz dili etkinleştirmek için uygulamayı yeniden başlatmanız gerekiyor, -Uygulamayı şimdi yeniden başlatmak istiyor musunuz? +, Do you want to restart application now? + - - Do you want to reset all the preferences to default value ? + + Do you want to reset all the preferences to default value? If yes, the application will be relaunch - Tüm seçenekler varsayılan değerlere dönsün mü? -Evet ise uygulama yeniden başlatılacak. + - + Example: Örnek: @@ -232,211 +230,241 @@ + Add mouse cursor to snapshot + + + + + Snapshot Delay (s): + Ekran Yakalama Gecikmesi (s): + + + + Snapshot delay in seconds + Saniye cinsinden yakalama gecikmesi + + + + No delay + Gecikme yok + + + Scale snapshot Ekran görüntüsünü ölçekle - + % % - + Max width * height Azami genişlik * yükseklik - + 800 800 - + 600 600 - - Hotkeys - Kısayollar + + Shortcut/Menu + + + + + Action performed by double-clicking on system tray icon: + - - Use system screen capture shortcuts + + Shortcut editor - + Action - + Shortcut - + Description - + + Use system screen capture shortcuts (only available for screen grab functions) + + + + Warning! Duplicated shortcuts will not be checked. - - "Ctrl", "Shift", "Alt" and "Meta" are recognized as valid modifiers + + System tray additional functions: - + Network Ağ - + Default web service Varsayılan web hizmeti - + Copy uploaded file URL to clipboard Yüklenen dosya bağlantısını panoya kopyala - + as olarak - + No format Biçim yok - + Instant Messaging (IM) format Anlık Mesajlaşma (IM) biçimi - + HTML format HTML biçimi - + BBCode format BBCode Biçimi - + User format Özel - + @url@ @url@ - + (*) @url@ is the uploaded URL (*) @url@ yüklenmiş URL dir - + Use a proxy server to connect to Internet İnternet bağlantısı için bir vekil sunucu kullan - + use Proxy Vekil sunucu kullan - + Host Barındırıcı - + Proxy hostname Vekil sunucu ismi - + Port Port - + Proxy Authentification Vekil sunucu doğrulaması - + Username Kullanıcı adı - + Proxy username Vekil sunucu kullanıcı adı - + Password Şifre - + Proxy password Vekil sunucu şifresi - + Show/Hide password in interface Arayüzde şifreyi Göster/Gizle - + Show password Şifreyi göster - + Proxy port Vekil sunucu portu - + Launch default Internet browser when done Bittiğinde varsayılan İnternet tarayıcısını başlat - + Uploaders Yükleyiciler - + Infos Bilgiler - + Supported formats (via Qt plugins) Desteklenen biçimler (QT eklentileri üzerinden) - + Available translations Mevcut çeviriler - + Log Günlük kaydı @@ -464,13 +492,13 @@ CanardPCUploader - %1 transfert end without error - %1 transferi hatasız sonuçlandı + %1 transfert end without error. + - %1 transfert end with error (%2) - %1 transferi hata ile sonuçlandı (%2) + %1 transfert end with error! (%2) + @@ -494,117 +522,117 @@ EditorWidget - + Left-click to select item, Ctrl+Left Click then drag to select a group of items Öğeyi seçmek için sol tıklayın, bir grubun öğelerini CTRL+Sol Tıklama ile tutup seçin - - + + Left-click to set center Merkeze ayarlamak için sol tıklayın. - - - - - - - - + + + + + + + + Left-click then drag to create the shape Sağ tıklayın ve şekli sürükleyin - - - + + + Creation: left-click to create a point, middle-click to delete the last one and right-click to create a new shape. Modification: select vertex, left-click then drag to move, middle-click to delete and right-click to add a new one Oluşturma: bir nokta oluşturmak için sol tıklayın, en son oluşturulanı silmek için orta tuşa tıklayın ve yeni bir şekil oluşturmak için sağ tıklayın. Değiştirme: en üstten seçin, sol tıklamayla taşımak için tutun, silmek için orta tuşa tıklama ve yeni bir tane oluşturmak için sağ tuşa tıklayın. - + Left-click to set image center and drag if you want change the size Resim merkezini belirlemek için sol tıklayın ve boyut değiştirmek için sürükleyin - + Left-click then drag to create the shape, select the area and press <Enter> to perform the operation Sol tıklayın ve şekli sürükleyin, bölgenizi seçin ve uygulamak için <Enter> tuşuna basın - - There is existing annotation items, what do you want to do ? - Ek açıklama öğeleri mevcut, ne yapmak istersiniz ? + + There is existing annotation items, what do you want to do? + - + clear annotation items ... ek açıklamaların temizlenmesi - + update background image ... arkaplanı güncelle - + Loading HotShots file failed HotShots dosyası yüklenemedi - + Error loading HotShots file %1 %1 HotShots dosyası yükleme hatası - + Snapshot editor: Ekran Kaydedici Düzenleyicisi - + Scale x%1 x%1 Ölçek - + Clear edit Düzenlemeyi temizle - + Clear all the exiting items ? (no possible undo) - + Clear document Belgeyi temizle - - Create a new document ? - Yeni belge oluşturulsun mu? + + Create a new document? + - + Save HotShots File HotShots dosyasını kaydet - + HotShots files (*.hot) HotShots dosyası (*.hot) - + Saving HotShots file failed HotShots dosyası kaydedilemedi - + Error saving HotShots file %1 %1 HotShots dosyası kaydetme hatası @@ -669,438 +697,489 @@ - + Select item - + Select Seç - + + Esc + + + + Text item - + Draw text Metin ekle - + Line item - + Draw a simple line Basit bir çizgi çiz - + Encircle item - + Encircle Çembere al - + Polyline item - + Draw a polyline Çoklu çizgi çiz - + Polygon item - + Draw a polygon Çok köşeli çizim çiz - + Curve item - + Draw a curve Eğri çiz - + Crop item - + Crop background image Arka plan resmini kes - + Rectangle item - + Draw a rectangle Dikdörtgen çizin - + Ellipse item - + Draw an ellipse Elips çiz - + Arrow item - + Draw an arrow Bir ok çiz - + Tag item - + Draw a numbered tag Numaralanmış etiket çiz - + Highlighter item - + Highlight Vurgula - + Magnifier item - + Magnifier Büyüteç - + Image item - + Add an image Bir resim ekle - + Blur item - - Obfuscate - Karartma + + Blur + - + Font size down - + Decrease font size Yazı boyutunu küçült - + Font size up - + Increase font size Yazı boyutunu büyüt - + aAbB... aAbB.. - + Change font Yazı tipini değiştir - + Quit Çıkış - + Quit editor Düzenleyiciden çık - + Load - + Open a file Dosya aç - - + + New document Yeni belge - + Import clipboard - + Import image from clipboard Panodan resim aktar - + Save - + Save edition Düzenlemeyi kaydet - + Save as - + Save edition as Düzenlemeyi farklı kaydet - - + + Copy to clipboard Panoya kopyala - + Export - + Export image Resmi dışarı aktar - + Upload Yükle - + Upload the image to the web Resmi ağ sayfasına yükle - + Print Yazdır - + Fit to view - + Scale to fit window Pencereyi kaplayacak şekilde ölçeklendir - - + + Reset scale Ölçeklemeyi geri al - + Undo - + Undo the last action - + Redo - + Redo the last undo action - + Add frame - + Add a post effect to background image Arkaplan resmine bir geçiş efekti ekle - + add shadow - + Enable/Disable item's shadow Öğe gölgesini etkinleştir/me - + Item up - + Push selected elements up Seçilen öğeleri yukarı al - + Item down - + Push selected elements down Seçilen öğeleri alt sıralara indir - + Duplicate items - + Duplicate selected element Seçilen öğreleri çoğalt - + Clear items - + Erase all elements Tüm öğeleri temizle - + Delete items - + Delete selected elements Tüm öğeleri sil - - Del - Sil - - - + No post effect Geçiş efekti yok - + Simple drop shadow Basit gölge düşümü - + Drop shadow with borders Çerçevelerle gölge düşümü - + Progressive opacity Kademeli şeffaflık - + Torn edge Yırtık kenar - + Item to top - + Push selected elements to top - + Item to bottom - + Push selected elements to bottom + + + + Align group to left + + + + + + Align group to horizontal center + + + + + + Align group to vertical center + + + + + + Align group to right + + + + + + Align group to top + + + + + + Align group to bottom + + + + + Set alignment + + + + + Set alignment to a group + + + + + Rescale background image + + FileParser @@ -1111,8 +1190,8 @@ - Saving failed for project %1 : %2 - Proje için kaydedilemedi %1: %2 + Saving failed for project %1: %2 + @@ -1126,13 +1205,13 @@ - The file is not a "Hotshots" file !! - Bu bir "Hotshots" dosyası değil !! + The file is not a "Hotshots" file! + - Configuration has been automatically updated ! - Yapılandırma otomatik olarak güncellendi. + Configuration has been automatically updated! + @@ -1144,19 +1223,19 @@ FreeImageHostingUploader - %1 transfert end without error - %1 transferi hatasız sonuçlandı + %1 transfert end without error. + - %1 transfert end with error (%2) - %1 transferi hata ile sonuçlandı (%2) + %1 transfert end with error! (%2) + FreehandGrabber - + Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit. Fare kullanarak bir bölge seçin. Ekran görüntüsü almak için Enter tuşuna basın veya çift tıklayın. Çıkmak için Esc tuşuna basın. @@ -1180,8 +1259,8 @@ - successful uploading onto %1. - %1 üzerine yükleme başarılı + Uploaded successfully onto %1. + @@ -1195,13 +1274,13 @@ - %1 transfert end with error - %1 transferi hata ile sonuçlandı + %1 transfert end with error! + - %1 transfert end without error - transfer hatasız sonuçlandı %1 + %1 transfert end without error. + @@ -1273,8 +1352,8 @@ - Ftp port - Ftp portu + FTP port + @@ -1291,13 +1370,13 @@ ImageshackUploader - %1 transfert end without error - %1 transferi hatasız sonuçlandı + %1 transfert end without error. + - %1 transfert end with error (%2) - %1 transferi hata ile sonuçlandı (%2) + %1 transfert end with error! (%2) + @@ -1309,13 +1388,13 @@ ImgurUploader - %1 transfert end without error - %1 transferi hatasız sonuçlandı + %1 transfert end without error. + - %1 transfert end with error (%2) - %1 transferi hata ile sonuçlandı (%2) + %1 transfert end with error! (%2) + @@ -1326,118 +1405,118 @@ MainWindow - + Save Directory Kayıt Dizini - + Register of %1 uploaders %1 yükleyici kaydı - - Can't create storage location, check why ?! (%1) - Kayıt konumu oluşturulamıyor, sebebini araştırın ?! (%1) + + Can't create storage location, check why?! (%1) + - + No post effect geçiş efekti yok - + Simple drop shadow Basit gölge düşümü - + Drop shadow with borders Çerçevelerle gölge düşümü - + Progressive opacity Kademeli şeffaflık - + Torn edge Yırtık kenar - + Main application - + Annotation editor - - + + Upload the image to the web Resmi ağ sayfasına yükle - - No default uploading web service defined ! - Hiçbir varsayılan web yükleme hizmeti tanımlanmadı ! + + No default uploading web service defined! + - + Uploader %1 Yükleyici %1 - - The default uploader (%1) does not appear correctly configured, no value given for required parameters !! - Varsayılan yükleyicinin (%1) düzgünce yapılandırılmadığı anlaşılıyor, gerekli parametreler için bir değer sağlamıyor. + + The default uploader (%1) does not appear correctly configured, no value given for required parameters!! + - - Upload image %1 to %2 service ? - %1 resim dosyası %2 hizmetine yüklensin mi ? + + Upload image %1 to %2 service? + - + Print Document Belgeyi Yazdır - + Save File Dosyayı Kaydet - + Images (*.%1) Resimler (*.%1) - + Save failed Kaydetme başarısız - + Error saving file Dosya kaydetme başarısız - + Systray Sistem bildirim alanı - + The program will keep running in the system tray. To terminate the program, choose <b>Quit</b> in the context menu of the system tray entry. Program sistem bildirim alanında çalışmaya devam edecek. Programı sonlandırmak için sistem bildirim alanı simgesininin içerik menüsünden <b>Çıkış</b> 'a tıklayın. - + message from other instance. programın çalışan diğer örneğinden ileti @@ -1466,56 +1545,56 @@ Parametreler - - Snapshot Delay (s): - Ekran Yakalama Gecikmesi (s): - - - + Output path: Çıktı yolu: - + Cap&ture mode: Ya&kalama kipi: - - Snapshot delay in seconds - Saniye cinsinden yakalama gecikmesi - - - - No delay - Gecikme yok - - - + After snapshot: Ekran yakaladıktan sonra: - + Do nothing Hiçbirşey yapma - + Auto save image Resmi otomatik kaydet - + Save image (ask user) Resmi kaydet (kullanıcıya sor) - + Launch editor Düzenleyiciyi çalıştır + + Snapshot delay in seconds + Saniye cinsinden yakalama gecikmesi + + + + No delay + Gecikme yok + + + + Snapshot Delay (s): + Ekran Yakalama Gecikmesi (s): + + Quit Çıkış @@ -1551,88 +1630,88 @@ Arayüzü göster - + Copy To Clipboard Panoya Kopyala - + Copy to clipboard Panoya kopyala - + Open editor - + Open editor and add annotations - + Grab Screen Ekran Yakala - + Grab screen (current) Ekran yakala (şimdiki) - + Grab all screens Tüm ekranları yakala - + Grab all screens (multi-monitors) Tüm ekranları yakala (çoklu-ekranlar) - + Grab Window Pencere yakala - + Grab window Pencere yakala - + Grab Region Bölge Yakala - + Grab region Bölgeyi yakala - + Help Yardım - + Upload Yükle - + Upload the image to the web Resmi ağ sayfasına yükle + - Grab freehand region Serbest çizim alan yakala - + Print Yazdır @@ -1640,7 +1719,7 @@ QObject - + %1 found %1 bulundu @@ -1661,18 +1740,18 @@ - Following options are known: - Bilinen seçenekler şunlardır: + Following options are available: + - --help - displays this help. - --help - bu yardımı görüntüler. + --help : displays this help. + - --reset-config - clear the saved preference parameters. - --reset-config - kaydedilmiş tercih parametlerini temizler, sıfırlar. + --reset-config : clear the saved preference parameters. + @@ -1681,34 +1760,39 @@ + --portable : use settings file location near the executable (for portable use). + + + + file : file to load in the editor, can be a .hot file or an image file. dosya : düzenleyiciye yükleyeceğiniz dosya, .hot uzantılı olmalı veya bir resim dosyası olmalıdır. - - %1 is already running !! - %1 zaten çalışıyor !! + + %1 is already running!! + - translations path %1 - çeviri yolu %1 + Translations path %1 + - setting language to : %1 - dil %1 olarak ayarlandı + Setting language to: %1 + - successfully loaded data from %1 - %1 konumundan veriler başarıyla yüklendi. + Successfully loaded data from %1 + - failed to load data from %1 - %1 konumundan veri yüklenemedi + Failed to load data from %1 + @@ -1737,12 +1821,50 @@ RegionGrabber - + Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit. Fare kullanarak bir bölge seçin. Ekran görüntüsü almak için Enter tuşuna basın veya çift tıklayın. Çıkmak için Esc tuşuna basın. + RescaleDialogClass + + + Rescale snapshot + + + + + Original size: + + + + + Target size: + + + + + Scale snapshot + Ekran görüntüsünü ölçekle + + + + % + % + + + + Size + + + + + Keep aspect ratio + + + + WidgetBrush @@ -1856,13 +1978,13 @@ - Fill with translucent Background Color - Saydam Arkaplan Rengi ile doldur + Fill with transparent background color + - Fill with Background Color - Arkaplan Rengi ile doldur + Fill with background color + \ No newline at end of file Binary files /tmp/0ShdhbevAJ/hotshots-2.0.1/lang/hotshots_uk.qm and /tmp/i0vBy4mDwk/hotshots-2.1.0/lang/hotshots_uk.qm differ diff -Nru hotshots-2.0.1/lang/hotshots_uk.ts hotshots-2.1.0/lang/hotshots_uk.ts --- hotshots-2.0.1/lang/hotshots_uk.ts 2014-01-24 20:13:26.000000000 +0000 +++ hotshots-2.1.0/lang/hotshots_uk.ts 2014-02-15 16:29:56.000000000 +0000 @@ -2,78 +2,78 @@ - + release of translation and translator name please - put your name here dear translator and the release of the translation file !! + put your name here dear translator and the release of the translation file!! AboutDialog - + <a href="%1">Check for new release ...</a> - + About Про - + Preferences - + Налаштування - - Infos + + Info Інформація - + Log Лог - + Qt version %1 - + Версія Qt %1 - + The %1 file can't be found, sorry ... - + Файл %1 не знайдено, вибачте ... - + detected language: %1 - + виявлена мова: %1 - + Automatic detection Автоматичне виявлення - + Default (no use of translation files) - + Типова (не використовувати файли перекладу) - + The application need to restart in order to take into account new translation -, Do you want to restart application now ? +, Do you want to restart application now? - - Do you want to reset all the preferences to default value ? + + Do you want to reset all the preferences to default value? If yes, the application will be relaunch - + Example: Приклад: @@ -94,7 +94,7 @@ Changelog - + Журнал змін @@ -104,13 +104,13 @@ Preferences - + Налаштування Startup - + Запускати разом із системою @@ -125,27 +125,27 @@ Start in notification tray (minimized) - + Запускати в системному лотку (згорнутою) Display splashscreen at startup - + Відображати заставку при запуску Auto start with system - + Запускати разом із системою Reset preferences - + Скинути налаштування Splashscreen with transparent background - + Заставка з прозорим тлом @@ -156,22 +156,22 @@ Auto copy new snapshot to clipboard - + Автоматично копіювати новий зняток до буфера обміну Inserting current date time into saved filename - + Додання поточної дати та часу до назви збереженого файлу Insert DateTime in filename - + Додати дату та час до назви файлу Default filename: - + Типова назва файлу: @@ -186,12 +186,12 @@ Default saving image format - + Типовий формат збереження зображення Default filename - + Типова назва @@ -201,27 +201,27 @@ Rotate snapshot - + Повернути зняток Angle: - + Кут: Capture window with decoration - + Захопити вікно разом з його оформленням Play a sound when action is finished - + Програвати звук після завершення дії Hide interface during screen capture - + Приховувати інтерфейс під час захоплення @@ -230,211 +230,241 @@ + Add mouse cursor to snapshot + Додати курсор миші до знятка + + + + Snapshot Delay (s): + Затримка знятка (c): + + + + Snapshot delay in seconds + Затримка перед знятком в секундах + + + + No delay + Без затримки + + + Scale snapshot - + Масштабувати зняток - + % % - + Max width * height - + 800 800 - + 600 600 - - Hotkeys + + Shortcut/Menu - - Use system screen capture shortcuts + + Action performed by double-clicking on system tray icon: - - Action + + Shortcut editor - + + Action + Дія + + + Shortcut - + Description + Опис + + + + Use system screen capture shortcuts (only available for screen grab functions) - + Warning! Duplicated shortcuts will not be checked. - - "Ctrl", "Shift", "Alt" and "Meta" are recognized as valid modifiers - + + System tray additional functions: + Додаткові налаштування системного лотка: - + Network - + Мережа - + Default web service - + Copy uploaded file URL to clipboard - + Копіювати адресу відвантаженого файлу до буфера обміну - + as як - + No format - + Як є - + Instant Messaging (IM) format - + HTML format - + Формат HTML - + BBCode format - + Формат BBCode - + User format - + Формат користувача - + @url@ - + @url@ - + (*) @url@ is the uploaded URL - + Use a proxy server to connect to Internet - + Використовувати проксі для підключення до інтернету - + use Proxy - + використовувати проксі - + Host - + Хост - + Proxy hostname - + Хост проксі - + Port - + Порт - + Proxy Authentification - + Username Ім'я користувача - + Proxy username - + Користувач проксі - + Password Пароль - + Proxy password - + Пароль проксі - + Show/Hide password in interface - + Показати/приховати пароль в інтерфейсі - + Show password Показати пароль - + Proxy port - + Порт проксі - + Launch default Internet browser when done - + Запустити типовий оглядач інтернету після завершення - + Uploaders - + Infos Інформація - + Supported formats (via Qt plugins) - + Підтримувані формати (плагінами Qt) - + Available translations Доступні переклади - + Log Лог @@ -462,18 +492,18 @@ CanardPCUploader - %1 transfert end without error + %1 transfert end without error. - %1 transfert end with error (%2) + %1 transfert end with error! (%2) Can't extract URL from reply - + Невдалось витягнути адресу з відповіді @@ -492,117 +522,117 @@ EditorWidget - + Left-click to select item, Ctrl+Left Click then drag to select a group of items - - + + Left-click to set center - - - - - - - - + + + + + + + + Left-click then drag to create the shape - - - + + + Creation: left-click to create a point, middle-click to delete the last one and right-click to create a new shape. Modification: select vertex, left-click then drag to move, middle-click to delete and right-click to add a new one - + Left-click to set image center and drag if you want change the size - + Left-click then drag to create the shape, select the area and press <Enter> to perform the operation - - There is existing annotation items, what do you want to do ? + + There is existing annotation items, what do you want to do? - + clear annotation items ... - + update background image ... - + Loading HotShots file failed - + Error loading HotShots file %1 - + Snapshot editor: - + Редактор знятка: - + Scale x%1 - + Clear edit - + Clear all the exiting items ? (no possible undo) - + Clear document - + Очистити документ - - Create a new document ? - + + Create a new document? + Створити новий документ? - + Save HotShots File - + HotShots files (*.hot) - + Файли HotShots (*.hot) - + Saving HotShots file failed - + Error saving HotShots file %1 @@ -612,7 +642,7 @@ Snapshot editor - + Редактор знятка @@ -634,22 +664,22 @@ ... - + ... Preview font - + Попередній перегляд шрифта Reset colors - + Скинути кольори swap background and foreground colors - + поміняти місцями кольори переднього та заднього планів @@ -659,7 +689,7 @@ Main actions - + Основні дії @@ -667,438 +697,489 @@ - + Select item - + Select - + + Esc + Esc + + + Text item - + Draw text - + Намалювати текст - + Line item - + Draw a simple line - + Намалювати просту лінію - + Encircle item - + Encircle - + Polyline item - + Draw a polyline - + Намалювати ламану - + Polygon item - + Draw a polygon - + Намалювати полігон - + Curve item - + Draw a curve - + Намалювати криву - + Crop item - + Crop background image - + Rectangle item - + Draw a rectangle - + Намалювати прямокутник - + Ellipse item - + Draw an ellipse - + Намалювати еліпс - + Arrow item - + Draw an arrow - + Намалювати стрілку - + Tag item - + Draw a numbered tag - + Highlighter item - + Highlight - + Magnifier item - + Magnifier - + Image item - + Add an image - + Додати зображення - + Blur item - - Obfuscate - + + Blur + Розмиття - + Font size down - + Зменшити розмір шрифту - + Decrease font size - + Зменшити розмір шрифта - + Font size up - + Збільшити розмір шрифту - + Increase font size - + Збільшити розмір шрифта - + aAbB... - + Change font - + Змінити шрифт - + Quit - + Вийти - + Quit editor Закрити редактор - + Load - + Завантажити - + Open a file - + Відкрити файл - - + + New document - + Новий документ - + Import clipboard - + Імпортувати буфер обміну - + Import image from clipboard - + Імпортувати зображення з буфера обміну - + Save - + Зберегти - + Save edition - + Save as - + Зберегти як - + Save edition as - - + + Copy to clipboard - + Копіювати до буфера обміну - + Export - + Експортувати - + Export image - + Експортувати зображення - + Upload - + Відвантажити - + Upload the image to the web - + Відвантажити зображення в інтернет - + Print Друкувати - + Fit to view - + Scale to fit window - - + + Reset scale - + Undo - + Відмінити - + Undo the last action - + Скасувати останню дію - + Redo - + Повторити - + Redo the last undo action - + Повторити останню дію - + Add frame - + Додати рамку - + Add a post effect to background image - + add shadow - + додати тінь - + Enable/Disable item's shadow - + Item up - + Push selected elements up - + Item down - + Push selected elements down - + Duplicate items - + Дублювати елементи - + Duplicate selected element - + Clear items - + Очистити елементи - + Erase all elements - + Стерти всі елементи - + Delete items - + Вилучити елементи - + Delete selected elements - - Del - - - - + No post effect - + Simple drop shadow - + Просте відкидання тіні - + Drop shadow with borders - + Відкинути тінь з межами - + Progressive opacity - + Проґресивна прозорість - + Torn edge - + Item to top - + Push selected elements to top - + Item to bottom - + Push selected elements to bottom + + + + Align group to left + + + + + + Align group to horizontal center + + + + + + Align group to vertical center + + + + + + Align group to right + + + + + + Align group to top + + + + + + Align group to bottom + + + + + Set alignment + + + + + Set alignment to a group + + + + + Rescale background image + + FileParser @@ -1109,7 +1190,7 @@ - Saving failed for project %1 : %2 + Saving failed for project %1: %2 @@ -1124,37 +1205,37 @@ - The file is not a "Hotshots" file !! + The file is not a "Hotshots" file! - Configuration has been automatically updated ! + Configuration has been automatically updated! Unknown version of hotshots file (%1). - + Невідома версія hotshots-файлу (%1). FreeImageHostingUploader - %1 transfert end without error + %1 transfert end without error. - %1 transfert end with error (%2) + %1 transfert end with error! (%2) FreehandGrabber - + Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit. @@ -1178,7 +1259,7 @@ - successful uploading onto %1. + Uploaded successfully onto %1. @@ -1193,12 +1274,12 @@ - %1 transfert end with error + %1 transfert end with error! - %1 transfert end without error + %1 transfert end without error. @@ -1207,12 +1288,12 @@ FtpUploaderSettings - + Налаштування FTP відвантажувача Initial FTP directory - + Початкова директорія FTP @@ -1222,17 +1303,17 @@ Username: - + Користувач: Server: - + Сервер: FTP password - + пароль FTP @@ -1242,12 +1323,12 @@ Directory: - + Тека: Show/Hide password in interface - + Показати/приховати пароль в інтерфейсі @@ -1257,7 +1338,7 @@ FTP username - + користувач FTP @@ -1267,34 +1348,34 @@ ftp://whatyouwant/@filename@ - + ftp://бажаний_сервер/@назва_файлу@ - Ftp port - + FTP port + Порт FTP FTP Server name - + Назва FTP-сервера Port: - + Порт: ImageshackUploader - %1 transfert end without error + %1 transfert end without error. - %1 transfert end with error (%2) + %1 transfert end with error! (%2) @@ -1307,12 +1388,12 @@ ImgurUploader - %1 transfert end without error + %1 transfert end without error. - %1 transfert end with error (%2) + %1 transfert end with error! (%2) @@ -1324,118 +1405,118 @@ MainWindow - + Save Directory - + Register of %1 uploaders - - Can't create storage location, check why ?! (%1) + + Can't create storage location, check why?! (%1) - + No post effect - + Simple drop shadow - + Просте відкидання тіні - + Drop shadow with borders - + Відкинути тінь з межами - + Progressive opacity - + Проґресивна прозорість - + Torn edge - + Main application - + Annotation editor - + Редактор коментарів - - + + Upload the image to the web - + Відвантажити зображення в інтернет - - No default uploading web service defined ! + + No default uploading web service defined! - + Uploader %1 - - The default uploader (%1) does not appear correctly configured, no value given for required parameters !! + + The default uploader (%1) does not appear correctly configured, no value given for required parameters!! - - Upload image %1 to %2 service ? + + Upload image %1 to %2 service? - + Print Document Друк документа - + Save File - + Зберегти файли - + Images (*.%1) - + Зображення (*.%1) - + Save failed - + Помилка збереження - + Error saving file - + Помилка збереження файла - + Systray - + The program will keep running in the system tray. To terminate the program, choose <b>Quit</b> in the context menu of the system tray entry. - + message from other instance. @@ -1451,7 +1532,7 @@ Take a new snapshot - + Зробити новий зняток @@ -1461,62 +1542,62 @@ Parameters - - - - - Snapshot Delay (s): - + Параметри - + Output path: - + Вихідна тека: - + Cap&ture mode: - - - - - Snapshot delay in seconds - + Режим захоплення: - - No delay - - - - + After snapshot: - + Do nothing - + Нічого не робити - + Auto save image - + Автоматично зберегти зображення - + Save image (ask user) - + Зберегти зображення (запитати користувача) - + Launch editor - + Запустити редактор + + + + Snapshot delay in seconds + Затримка знятка в секундах + + + + No delay + Без затримки + + + + Snapshot Delay (s): + Затримка знятка (c): Quit - + Вийти @@ -1526,111 +1607,111 @@ Preferences - + Налаштування Save Snapshot - + Зберегти зняток Save snapshot - + Зберегти зняток Show Interface - + Показати інтерфейс Show interface - + Показати інтерфейс - + Copy To Clipboard - + Копіювати до буфера обміну - + Copy to clipboard - + Копіювати до буфера обміну - + Open editor - + Відкрити редакор - + Open editor and add annotations - + Відкрити редактор та додати коментар - + Grab Screen - + Захопити екран - + Grab screen (current) - + Grab all screens - + Захопити всі екрани - + Grab all screens (multi-monitors) - + Захопити всі екрани (багато моніторів) - + Grab Window - + Захопити вікно - + Grab window - + Захопити вікно - + Grab Region - + Захопити область - + Grab region - + Захопити область - + Help - + Довідка - + Upload - + Відвантажити - + Upload the image to the web - + Відвантажити зображення в інтернет + - Grab freehand region - + Print Друкувати @@ -1638,9 +1719,9 @@ QObject - + %1 found - + %1 знайдено @@ -1650,27 +1731,27 @@ Usage: - + Використання: [options] [file] - + [параметри] [файл] - Following options are known: + Following options are available: - --help - displays this help. - + --help : displays this help. + --help : показати цю довідку. - --reset-config - clear the saved preference parameters. - + --reset-config : clear the saved preference parameters. + --reset-config : очистити збережені параметри налаштування. @@ -1679,33 +1760,38 @@ + --portable : use settings file location near the executable (for portable use). + --portable : зберігати файл налаштувань в тій же теці що й виконуваний файл (портативне використання). + + + file : file to load in the editor, can be a .hot file or an image file. - - %1 is already running !! - + + %1 is already running!! + %1 вже запущено!! - translations path %1 + Translations path %1 - setting language to : %1 + Setting language to: %1 - successfully loaded data from %1 + Successfully loaded data from %1 - failed to load data from %1 + Failed to load data from %1 @@ -1724,38 +1810,76 @@ Choose foreground color - + Оберіть колір переднього плану Choose background color - + Оберіть колір заднього плану RegionGrabber - + Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit. + RescaleDialogClass + + + Rescale snapshot + + + + + Original size: + Початковий розмір: + + + + Target size: + + + + + Scale snapshot + Масштабувати зняток + + + + % + % + + + + Size + Розмір + + + + Keep aspect ratio + + + + WidgetBrush 1x1 - + 1x1 Circle - + Коло Square - + Квадрат @@ -1773,47 +1897,47 @@ Black - + Чорни White - + Білий Red - + Червоний Green - + Зелений Blue - + Синій Cyan - + Ціановий Magenta - + Пурпуровий Orange - + Помаранчевий Gray - + Сірий @@ -1821,7 +1945,7 @@ Solid Line - + Суцільна лінія @@ -1849,17 +1973,17 @@ No Fill - + Без заповнення - Fill with translucent Background Color - + Fill with transparent background color + Заповнити прозорим кольором тла - Fill with Background Color - + Fill with background color + Заповнити кольором тла \ No newline at end of file Binary files /tmp/0ShdhbevAJ/hotshots-2.0.1/lang/hotshots_vi.qm and /tmp/i0vBy4mDwk/hotshots-2.1.0/lang/hotshots_vi.qm differ diff -Nru hotshots-2.0.1/lang/hotshots_vi.ts hotshots-2.1.0/lang/hotshots_vi.ts --- hotshots-2.0.1/lang/hotshots_vi.ts 2013-12-07 20:45:22.000000000 +0000 +++ hotshots-2.1.0/lang/hotshots_vi.ts 2014-02-15 16:28:04.000000000 +0000 @@ -1,83 +1,79 @@ - - - + - + - + release of translation and translator name please - put your name here dear translator and the release of the translation file !! + put your name here dear translator and the release of the translation file!! ngôn ngữ được dịch và tên người dịch AboutDialog - + <a href="%1">Check for new release ...</a> <a href="%1">Kiểm tra phiên bản mới ...</a> - + About Dịch bởi Phan Anh - + Preferences Tùy biến - - Infos - Thông tin + + Info + - + Log Nhật ký - + Qt version %1 Phiên bản Qt %1 - + The %1 file can't be found, sorry ... Tập tin %1 không được tìm thấy, rất tiếc... - + detected language: %1 phát hiện ngôn ngữ: %1 - + Automatic detection Tự động nhận dạng - + Default (no use of translation files) Tự động (không sử dụng tiếng địa phương) - + The application need to restart in order to take into account new translation -, Do you want to restart application now ? - Ứng dụng cần khởi động lại để áp dụng phiên bản ngôn ngữ mới -, Bạn có muốn khởi động lại ứng dụng hay không? +, Do you want to restart application now? + - - Do you want to reset all the preferences to default value ? + + Do you want to reset all the preferences to default value? If yes, the application will be relaunch - Bạn có muốn thiết lập lại tất cả tùy biến về giá trị mặc định không? -Nếu có, ứng dụng sẽ nhanh chóng được mở lại + - + Example: Thí dụ: @@ -234,211 +230,241 @@ + Add mouse cursor to snapshot + + + + + Snapshot Delay (s): + Độ trễ giữa các hình ảnh (giây): + + + + Snapshot delay in seconds + Độ trễ tính bằng giây khi chụp các hình ảnh liên tục + + + + No delay + Không có độ trễ + + + Scale snapshot Tỉ lệ ảnh chụp - + % % - + Max width * height Rộng * cao tối đa - + 800 800 - + 600 600 - - Hotkeys - Phím tắt + + Shortcut/Menu + + + + + Action performed by double-clicking on system tray icon: + - - Use system screen capture shortcuts - + + Shortcut editor + - + Action - + - + Shortcut - + - + Description Mô tả - + + Use system screen capture shortcuts (only available for screen grab functions) + + + + Warning! Duplicated shortcuts will not be checked. - + - - "Ctrl", "Shift", "Alt" and "Meta" are recognized as valid modifiers - + + System tray additional functions: + - + Network Mạng lưới - + Default web service Dịch vụ web mặc định - + Copy uploaded file URL to clipboard Sao chép đường dẫn tập tin URL đã tải vào bộ nhớ ảo - + as như - + No format Không định dạng - + Instant Messaging (IM) format Định dạng tin nhắn ngẫu nhiên (IM) - + HTML format Định dạng HTML - + BBCode format Định dạng BBCode - + User format Định dạng người dùng chọn - + @url@ @url@ - + (*) @url@ is the uploaded URL (*) @url@ là đường dẫn đã được tải lên - + Use a proxy server to connect to Internet Sử dụng một proxy server để kết nối vào internet - + use Proxy sử dụng Proxy - + Host Host - + Proxy hostname Proxy hostname - + Port Cổng - + Proxy Authentification Xác nhận proxy - + Username Tên người dùng - + Proxy username Tên người dùng proxy - + Password Mật khẩu - + Proxy password Mật khẩu proxy - + Show/Hide password in interface Hiện/Ẩn mật khẩu trong giao diện - + Show password Hiển thị mật khẩu - + Proxy port Cổng proxy - + Launch default Internet browser when done Truy cập trình duyệt internet mặc định khi hoàn tất - + Uploaders Người tải lên - + Infos Thông tin - + Supported formats (via Qt plugins) Định dạng hỗ trợ (thông qua tiện ích từ Qt) - + Available translations Các bản dịch hiện có - + Log Nhật ký @@ -466,13 +492,13 @@ CanardPCUploader - %1 transfert end without error - %1 đã chuyển đổi và không có lỗi + %1 transfert end without error. + - %1 transfert end with error (%2) - %1 đã chuyển đổi với lỗi (%2) + %1 transfert end with error! (%2) + @@ -496,117 +522,117 @@ EditorWidget - + Left-click to select item, Ctrl+Left Click then drag to select a group of items Click chuột trái để chọn đối tượng, Ctrl+chuột trái để kéo và tạo một nhóm các đối tượng - - + + Left-click to set center Click chuột để đặt chính giữa - - - - - - - - + + + + + + + + Left-click then drag to create the shape Click chuột sau đó rê chuột để tạo hình dạng theo ý - - - + + + Creation: left-click to create a point, middle-click to delete the last one and right-click to create a new shape. Modification: select vertex, left-click then drag to move, middle-click to delete and right-click to add a new one Tạo: click chuột trái để tạo một điểm, click đúp chuột hai lần liên tiếp để xóa đối tượng cuối cùng và click phải chuột để tạo phần tạo hình mới. Chỉnh sửa: chọn vertex, click chuột trái để kéo nhằm di chuyển, click chuột giữa để xóa và click chuột phải để tạo một đối tượng mới. - + Left-click to set image center and drag if you want change the size Click chuột để tạo hình ảnh ở giữa và rê chuột nếu muốn chỉnh kích thước - + Left-click then drag to create the shape, select the area and press <Enter> to perform the operation Click chuột sau đó rê chuột để tạo hình dạng, chọn khu vực và nhấn <Enter> để hoàn tất vùng chọn - - There is existing annotation items, what do you want to do ? - Hiện không tồn tại phần ghi chú nào, bạn có muốn thêm vào? + + There is existing annotation items, what do you want to do? + - + clear annotation items ... làm rỗng toàn bộ mọi đối tượng ghi chú... - + update background image ... cập nhật hình ảnh nền.. - + Loading HotShots file failed Thất bại khi tải tập tin HotShots - + Error loading HotShots file %1 Lỗi khi tải tập tin HotShots %1 - + Snapshot editor: Chỉnh sửa Snapshot: - + Scale x%1 Tỉ lệ x%1 - + Clear edit Làm rỗng chỉnh sửa - + Clear all the exiting items ? (no possible undo) Xóa toàn bộ các đối tượng đang thoát? (không thể hủy bỏ thao tác này) - + Clear document Làm rỗng tài liệu - - Create a new document ? - Tạo một tài liệu mới? + + Create a new document? + - + Save HotShots File Lưu tập tin HotShots - + HotShots files (*.hot) Tập tin HotShots (*.hot) - + Saving HotShots file failed Thất bại khi lưu tập tin HotShots - + Error saving HotShots file %1 Lỗi khi lưu tập tin HotShots %1 @@ -671,438 +697,489 @@ Thao tác chỉnh sửa - + Select item Chọn đối tượng - + Select Chọn - + + Esc + + + + Text item Đối tượng dạng văn bản - + Draw text Vẽ văn bản - + Line item Đối tượng dạng đường kẻ - + Draw a simple line Vẽ một đường đơn giản - + Encircle item Đối tượng dạng vòng tròn - + Encircle Đường tròn - + Polyline item Đối tượng dạng đường kết nối - + Draw a polyline Vẽ một đường đa giác - + Polygon item Đối tượng dạng tứ giác - + Draw a polygon Vẽ hình đa giác - + Curve item Đối tượng dạng cong - + Draw a curve Vẽ một đường cong - + Crop item Cắt bỏ đối tượng - + Crop background image Bỏ hình ảnh nền - + Rectangle item Đối tượng dạng hình chữ nhật - + Draw a rectangle Vẽ một hình chữ nhật - + Ellipse item Đối tượng dạng hình ô voan - + Draw an ellipse Vẽ hình ê líp - + Arrow item Đối tượng dạng hình mũi tên - + Draw an arrow Vẽ một mũi tên - + Tag item Gắn thẻ đánh dấu lên đối tượng - + Draw a numbered tag Vẽ một thẻ đánh dấu có ghi số - + Highlighter item Tô sáng đối tượng - + Highlight Đánh dấu - + Magnifier item Phóng to đối tượng - + Magnifier Phóng to - + Image item Đối tượng dạng hình ảnh - + Add an image Thêm một hình ảnh - + Blur item Làm mờ đối tượng - - Obfuscate - Làm tối màu + + Blur + - + Font size down Giảm kích thước kiểu chữ - + Decrease font size Giảm kích thước kiểu chữ - + Font size up Tăng kích thước kiểu chữ - + Increase font size Tăng kích thước kiểu chữ - + aAbB... aAbB... - + Change font Thay đổi kiểu chữ - + Quit Thoát - + Quit editor Thoát trình chỉnh sửa - + Load Tải dữ liệu - + Open a file Mở một tập tin - - + + New document Tài liệu mới - + Import clipboard Từ bộ nhớ ảo - + Import image from clipboard Nhập hình ảnh từ bộ nhớ ảo - + Save Lưu lại - + Save edition Lưu phiên bản - + Save as Lưu dưới dạng - + Save edition as Lưu phiên bản dưới dạng - - + + Copy to clipboard Sao chép vào bộ nhớ ảo - + Export Xuất dữ liệu - + Export image Xuất hình ảnh - + Upload Tải lên - + Upload the image to the web Tải hình ảnh lên web - + Print In - + Fit to view Vừa tầm xem - + Scale to fit window Phóng to vừa theo cửa sổ - - + + Reset scale Đặt lại tỉ lệ - + Undo Hủy bỏ - + Undo the last action Hủy bỏ thao tác mới nhất - + Redo Làm lại - + Redo the last undo action Làm lại thao tác mới nhất - + Add frame Thêm khung hình - + Add a post effect to background image Thêm hiệu ứng post đối với hình ảnh nền - + add shadow thêm bóng - + Enable/Disable item's shadow Bật/Tắt phần đổ bóng của đối tượng - + Item up Đưa đối tượng lên - + Push selected elements up Đẩy các đối tượng được chọn lên phía trên - + Item down Đưa đối tượng xuống - + Push selected elements down Đẩy các đối tượng được chọn lên phía dưới - + Duplicate items Sao y đối tượng - + Duplicate selected element Gấp đôi đối tượng được chọn - + Clear items Xóa bỏ đối tượng - + Erase all elements Xóa tất cả các đối tượng - + Delete items Xóa đối tượng - + Delete selected elements Xóa các đối tượng được chọn - - Del - Xóa - - - + No post effect Không có hiệu ứng post - + Simple drop shadow Đổ bóng đơn giản - + Drop shadow with borders Đổ bóng kèm theo đường viền - + Progressive opacity Tình trạng mờ - + Torn edge Xé các góc cạnh - + Item to top Đưa đối tượng lên đầu - + Push selected elements to top Đẩy các đối tượng được chuyển lên phía trên cùng - + Item to bottom Đẩy đối tượng xuống dưới cùng - + Push selected elements to bottom Đẩy các đối tượng được chọn xuống phía dưới cùng + + + + Align group to left + + + + + + Align group to horizontal center + + + + + + Align group to vertical center + + + + + + Align group to right + + + + + + Align group to top + + + + + + Align group to bottom + + + + + Set alignment + + + + + Set alignment to a group + + + + + Rescale background image + + FileParser @@ -1113,8 +1190,8 @@ - Saving failed for project %1 : %2 - Thất bại khi lưu dự án %1 : %2 + Saving failed for project %1: %2 + @@ -1128,13 +1205,13 @@ - The file is not a "Hotshots" file !! - Tập tin này không phải là tập tin thuộc về "Hotshots"! + The file is not a "Hotshots" file! + - Configuration has been automatically updated ! - Đã cập nhật thành công phần cấu hình! + Configuration has been automatically updated! + @@ -1146,19 +1223,19 @@ FreeImageHostingUploader - %1 transfert end without error - %1 đã chuyển đổi và không có lỗi + %1 transfert end without error. + - %1 transfert end with error (%2) - %1 đã chuyển đổi với lỗi (%2) + %1 transfert end with error! (%2) + FreehandGrabber - + Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit. Chọn một vùng bằng chuột. Để chụp ảnh, nhấn phím Enter hoặc click đúp chuột. Nhấn phím Esc để thoát. @@ -1182,8 +1259,8 @@ - successful uploading onto %1. - đã tải lên thành công tại %1. + Uploaded successfully onto %1. + @@ -1197,13 +1274,13 @@ - %1 transfert end with error - %1 đã được chuyển đổi và không có lỗi + %1 transfert end with error! + - %1 transfert end without error - %1 đã chuyển đổi và không có lỗi + %1 transfert end without error. + @@ -1275,8 +1352,8 @@ - Ftp port - Cổng kết nối đến Ftp + FTP port + @@ -1293,13 +1370,13 @@ ImageshackUploader - %1 transfert end without error - %1 đã chuyển đổi và không có lỗi + %1 transfert end without error. + - %1 transfert end with error (%2) - %1 đã chuyển đổi với lỗi (%2) + %1 transfert end with error! (%2) + @@ -1311,13 +1388,13 @@ ImgurUploader - %1 transfert end without error - %1 đã chuyển đổi và không có lỗi + %1 transfert end without error. + - %1 transfert end with error (%2) - %1 đã chuyển đổi với lỗi (%2) + %1 transfert end with error! (%2) + @@ -1328,118 +1405,118 @@ MainWindow - + Save Directory Lưu thư mục - + Register of %1 uploaders Đăng ký %1 người tải - - Can't create storage location, check why ?! (%1) - Không thể tạo được địa điểm lưu trữ, kiểm tra tại sao ?! (%1) + + Can't create storage location, check why?! (%1) + - + No post effect Không có hiệu ứng post - + Simple drop shadow Đổ bóng đơn giản - + Drop shadow with borders Đổ bóng kèm theo đường viền - + Progressive opacity Tình trạng mờ - + Torn edge Xé các góc cạnh - + Main application - + - + Annotation editor - + - - + + Upload the image to the web Tải hình ảnh lên web - - No default uploading web service defined ! - Hiện dịch vụ tải lên nền web vẫn chưa được xác định ! + + No default uploading web service defined! + - + Uploader %1 Người tải lên %1 - - The default uploader (%1) does not appear correctly configured, no value given for required parameters !! - Người tải lên mặc định (%1) vẫn chưa được cấu hình chính xác, hiện không có giá trị nào về thông số được cung cấp !! + + The default uploader (%1) does not appear correctly configured, no value given for required parameters!! + - - Upload image %1 to %2 service ? - Tải lên hình ảnh %1 đến dịch vụ %2? + + Upload image %1 to %2 service? + - + Print Document In tài liệu - + Save File Lưu tập tin - + Images (*.%1) Hình ảnh (*.%1) - + Save failed Lưu thất bại - + Error saving file Lỗi khi lưu tập tin - + Systray Khay hệ thống - + The program will keep running in the system tray. To terminate the program, choose <b>Quit</b> in the context menu of the system tray entry. Chương trình sẽ vẫn được tiếp tục chạy ở dưới khay hệ thống. Để có thể thoát hoàn toàn chương trình, chọn <b>Thoát</b> từ menu ngữ cảnh của biểu tượng chương trình tại khay hệ thống bằng cách click phải chuột lên biểu tượng chương trình. - + message from other instance. thông điệp từ các tiến trình khác. @@ -1468,56 +1545,56 @@ Thông số - - Snapshot Delay (s): - Độ trễ giữa các hình ảnh (giây): - - - + Output path: Đường dẫn lưu các hình được chụp: - + Cap&ture mode: Chế độ G&hi hình: - - Snapshot delay in seconds - Độ trễ tính bằng giây khi chụp các hình ảnh liên tục - - - - No delay - Không có độ trễ - - - + After snapshot: Sau khi chụp xong: - + Do nothing Không thực hiện thao tác nào - + Auto save image Tự động lưu hình ảnh - + Save image (ask user) Lưu hình ảnh (hỏi trước khi lưu) - + Launch editor Mở hình ảnh với chương trình nào đó + + Snapshot delay in seconds + Độ trễ tính bằng giây khi chụp các hình ảnh liên tục + + + + No delay + Không có độ trễ + + + + Snapshot Delay (s): + Độ trễ giữa các hình ảnh (giây): + + Quit Thoát @@ -1553,88 +1630,88 @@ Hiển thị giao diện - + Copy To Clipboard Sao chép vào bộ nhớ ảo - + Copy to clipboard Sao chép vào bộ nhớ ảo - + Open editor - + - + Open editor and add annotations - + - + Grab Screen Chụp toàn màn hình - + Grab screen (current) Chụp toàn màn hình (hiện tại) - + Grab all screens Chụp tất cả các màn hình - + Grab all screens (multi-monitors) Chụp tất cả màn hình (nếu có nhiều màn hình kết nối) - + Grab Window Chụp cửa sổ - + Grab window Chụp cửa sổ - + Grab Region Chụp một phân vùng - + Grab region Chụp một phân vùng - + Help Trợ giúp - + Upload Tải lên - + Upload the image to the web Tải hình ảnh lên web + - Grab freehand region Chụp phân vùng lựa chọn bằng chuột - + Print In @@ -1642,7 +1719,7 @@ QObject - + %1 found Đã tìm thấy %1 @@ -1663,18 +1740,18 @@ - Following options are known: - Các tùy chọn sau đây được biết dưới dạng: + Following options are available: + - --help - displays this help. - --help - hiển thị trợ giúp phần này. + --help : displays this help. + - --reset-config - clear the saved preference parameters. - --reset-config - làm rỗng toàn bộ các thông số tùy biến đã lưu. + --reset-config : clear the saved preference parameters. + @@ -1683,34 +1760,39 @@ + --portable : use settings file location near the executable (for portable use). + + + + file : file to load in the editor, can be a .hot file or an image file. file : tập tin để tải trong chương trình chỉnh sửa, có thể là một tập tin .hot hoặc một tập tin hình ảnh. - - %1 is already running !! - Hiện đang chạy %1 !! + + %1 is already running!! + - translations path %1 - đường dẫn dịch thuật %1 + Translations path %1 + - setting language to : %1 - đặt ngôn ngữ : %1 + Setting language to: %1 + - successfully loaded data from %1 - đã tải thành công dữ liệu từ %1 + Successfully loaded data from %1 + - failed to load data from %1 - xảy ra lỗi khi tải dữ liệu từ %1 + Failed to load data from %1 + @@ -1739,12 +1821,50 @@ RegionGrabber - + Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit. Chọn một vùng bằng chuột. Để chụp ảnh, nhấn phím Enter hoặc click đúp chuột. Nhấn phím Esc để thoát. + RescaleDialogClass + + + Rescale snapshot + + + + + Original size: + + + + + Target size: + + + + + Scale snapshot + Tỉ lệ ảnh chụp + + + + % + % + + + + Size + + + + + Keep aspect ratio + + + + WidgetBrush @@ -1857,13 +1977,13 @@ - Fill with translucent Background Color - Đổ màu với cùng màu nền + Fill with transparent background color + - Fill with Background Color - Đổ với màu nền + Fill with background color + - + \ No newline at end of file Binary files /tmp/0ShdhbevAJ/hotshots-2.0.1/lang/hotshots_zh.qm and /tmp/i0vBy4mDwk/hotshots-2.1.0/lang/hotshots_zh.qm differ diff -Nru hotshots-2.0.1/lang/hotshots_zh.ts hotshots-2.1.0/lang/hotshots_zh.ts --- hotshots-2.0.1/lang/hotshots_zh.ts 2013-12-07 20:45:24.000000000 +0000 +++ hotshots-2.1.0/lang/hotshots_zh.ts 2014-02-15 16:29:18.000000000 +0000 @@ -1,83 +1,79 @@ - - - + - + - + release of translation and translator name please - put your name here dear translator and the release of the translation file !! - V1.2 by taijuin + put your name here dear translator and the release of the translation file!! + Chinese Translation V2.0 by Mikechang from Taiwan AboutDialog - + <a href="%1">Check for new release ...</a> <a href="%1">檢查新的發行版...</a> - + About 關於 - + Preferences 偏好設定 - - Infos - 相關訊息 + + Info + - + Log 日誌 - + Qt version %1 Qt 版本 %1 - + The %1 file can't be found, sorry ... 很抱歉，%1 檔案無法被找到... - + detected language: %1 檢測到的語言： %1 - + Automatic detection 自動檢測 - + Default (no use of translation files) 預設(不使用翻譯檔) - + The application need to restart in order to take into account new translation -, Do you want to restart application now ? - 本程式需要重新啟動，以採用新的翻譯 -，現在您是否要重新啟動程式？ +, Do you want to restart application now? + - - Do you want to reset all the preferences to default value ? + + Do you want to reset all the preferences to default value? If yes, the application will be relaunch - 您想要重置所有的偏好設定為預設值嗎？ -如果是的話，本程式將重新啟動 + - + Example: 例如： @@ -234,211 +230,241 @@ + Add mouse cursor to snapshot + + + + + Snapshot Delay (s): + 快照延遲(秒)： + + + + Snapshot delay in seconds + 快照延遲秒數 + + + + No delay + 無延遲 + + + Scale snapshot 縮放快照 - + % % - + Max width * height 最大寬度*高度 - + 800 800 - + 600 600 - - Hotkeys - 熱鍵 + + Shortcut/Menu + + + + + Action performed by double-clicking on system tray icon: + - - Use system screen capture shortcuts - + + Shortcut editor + - + Action - + - + Shortcut - + - + Description - + + + + + Use system screen capture shortcuts (only available for screen grab functions) + - + Warning! Duplicated shortcuts will not be checked. - + - - "Ctrl", "Shift", "Alt" and "Meta" are recognized as valid modifiers - + + System tray additional functions: + - + Network 網路 - + Default web service 預設的Web服務 - + Copy uploaded file URL to clipboard 複製上傳檔案的網址到剪貼簿 - + as 如同 - + No format 沒有格式 - + Instant Messaging (IM) format 即時訊息(IM)格式 - + HTML format HTML格式 - + BBCode format BBCode格式 - + User format 使用者自訂格式 - + @url@ @url@ - + (*) @url@ is the uploaded URL (*) @url@ 是上傳網址 - + Use a proxy server to connect to Internet 使用代理伺服器連接到網際網路 - + use Proxy 使用代理 - + Host 主機 - + Proxy hostname 代理伺服器主機名稱 - + Port 連接埠 - + Proxy Authentification 代理伺服器身份認證 - + Username 使用者名稱 - + Proxy username 代理伺服器的使用者名稱 - + Password 密碼 - + Proxy password 代理伺服器的使用者密碼 - + Show/Hide password in interface 在介面中顯示或隱藏密碼 - + Show password 顯示密碼 - + Proxy port 代理伺服器連接埠 - + Launch default Internet browser when done 完成後，啟動預設的網際網路瀏覽器 - + Uploaders 上傳 - + Infos 相關訊息 - + Supported formats (via Qt plugins) 支持格式(通過Qt的外掛程式) - + Available translations 可用的翻譯 - + Log 日誌 @@ -466,13 +492,13 @@ CanardPCUploader - %1 transfert end without error - %1 傳送完成且未出現錯誤 + %1 transfert end without error. + - %1 transfert end with error (%2) - %1 傳輸完成，有錯誤 (%2) + %1 transfert end with error! (%2) + @@ -496,117 +522,117 @@ EditorWidget - + Left-click to select item, Ctrl+Left Click then drag to select a group of items 按滑鼠左鍵一下以選取項目，按 Ctrl＋滑鼠左鍵然後拖動以選取一組項目 - - + + Left-click to set center 按滑鼠左鍵一下以設定中心 - - - - - - - - + + + + + + + + Left-click then drag to create the shape 按滑鼠左鍵然後拖動以建立形狀 - - - + + + Creation: left-click to create a point, middle-click to delete the last one and right-click to create a new shape. Modification: select vertex, left-click then drag to move, middle-click to delete and right-click to add a new one 建立：按滑鼠左鍵一下以產生一個點，按一下滑鼠中鍵以刪除的最後一個，而按一下滑鼠右鍵以建立一個新的形狀。修改：選擇頂點，按滑鼠左鍵然後拖動以移動，按滑鼠中鍵一下以刪除，而按滑鼠右鍵一下以加入一個新的 - + Left-click to set image center and drag if you want change the size 按滑鼠左鍵以設定圖片中心和拖動(如果您想要改變大小) - + Left-click then drag to create the shape, select the area and press <Enter> to perform the operation 按滑鼠左鍵然後拖動以建立形狀，選取區域然後按 <Enter> 以執行操作 - - There is existing annotation items, what do you want to do ? - 存在現有的註解項目，您想怎麼做？ + + There is existing annotation items, what do you want to do? + - + clear annotation items ... 清除註解項目... - + update background image ... 更新背景圖片... - + Loading HotShots file failed 載入 HotShots 檔案失敗 - + Error loading HotShots file %1 載入 HotShots 檔案 %1 時出錯 - + Snapshot editor: 快照編輯器： - + Scale x%1 縮放 x%1 - + Clear edit 清除編輯 - + Clear all the exiting items ? (no possible undo) - + - + Clear document 清除文件 - - Create a new document ? - 建立一新的文件？ + + Create a new document? + - + Save HotShots File 儲存 HotShots 檔 - + HotShots files (*.hot) HotShots 檔案 (*.hot) - + Saving HotShots file failed 儲存 HotShots 檔案失敗 - + Error saving HotShots file %1 在儲存 HotShots 檔 %1 時，出現錯誤 @@ -638,470 +664,521 @@ ... - + Preview font - + Reset colors - + swap background and foreground colors - + Foreground and background colors - + Main actions - + Edition actions - + - + Select item - + - + Select 選取 - + + Esc + + + + Text item - + - + Draw text 畫出文字 - + Line item - + - + Draw a simple line 畫一條簡單的直線 - + Encircle item - + - + Encircle 包圍 - + Polyline item - + - + Draw a polyline 畫一條折線 - + Polygon item - + - + Draw a polygon 畫一個多邊形 - + Curve item - + - + Draw a curve 畫一條曲線 - + Crop item - + - + Crop background image 裁切背景圖片 - + Rectangle item - + - + Draw a rectangle 畫一個矩形 - + Ellipse item - + - + Draw an ellipse 畫一個橢圓形 - + Arrow item - + - + Draw an arrow 畫一個箭頭 - + Tag item - + - + Draw a numbered tag 畫一個有編號的標籤 - + Highlighter item - + - + Highlight 反白顯示 - + Magnifier item - + - + Magnifier 放大鏡 - + Image item - + - + Add an image 加入一個圖片 - + Blur item - + - - Obfuscate - 模糊處理 + + Blur + - + Font size down - + - + Decrease font size 減小字體大小 - + Font size up - + - + Increase font size 增大字體大小 - + aAbB... aAbB... - + Change font 變更字型 - + Quit 結束 - + Quit editor 結束編輯器 - + Load - + - + Open a file 開啟一個檔案 - - + + New document 新增文件 - + Import clipboard - + - + Import image from clipboard 從剪貼簿匯入圖片 - + Save - + - + Save edition 儲存編輯 - + Save as - + - + Save edition as 儲存編輯為 - - + + Copy to clipboard 複製到剪貼簿 - + Export - + - + Export image 匯出圖片 - + Upload 上傳 - + Upload the image to the web 上傳圖片到網路上 - + Print 列印 - + Fit to view - + - + Scale to fit window 縮放以配合視窗大小 - - + + Reset scale 重置縮放 - + Undo - + - + Undo the last action - + - + Redo - + - + Redo the last undo action - + - + Add frame - + - + Add a post effect to background image 加入後製效果到背景圖片 - + add shadow - + - + Enable/Disable item's shadow 啟用/禁用該項的陰影 - + Item up - + - + Push selected elements up 推動選取的的元素往上 - + Item down - + - + Push selected elements down 推動選取的的元素往下 - + Duplicate items - + - + Duplicate selected element 重製選取的的元素 - + Clear items - + - + Erase all elements 清除所有的元素 - + Delete items - + - + Delete selected elements 刪除選取的元素 - - Del - 清除 - - - + No post effect 無後製效果 - + Simple drop shadow 簡單的陰影 - + Drop shadow with borders 具有邊框的陰影 - + Progressive opacity 漸進式不透明 - + Torn edge 撕邊的效果 - + Item to top - + - + Push selected elements to top - + - + Item to bottom - + - + Push selected elements to bottom - + + + + + + Align group to left + + + + + + Align group to horizontal center + + + + + + Align group to vertical center + + + + + + Align group to right + + + + + + Align group to top + + + + + + Align group to bottom + + + + + Set alignment + + + + + Set alignment to a group + + + + + Rescale background image + @@ -1113,8 +1190,8 @@ - Saving failed for project %1 : %2 - 儲存專案 %1 : %2 失敗 + Saving failed for project %1: %2 + @@ -1128,13 +1205,13 @@ - The file is not a "Hotshots" file !! - 檔案不是一個 "Hotshots" 檔！ + The file is not a "Hotshots" file! + - Configuration has been automatically updated ! - 配置已自動更新！ + Configuration has been automatically updated! + @@ -1146,19 +1223,19 @@ FreeImageHostingUploader - %1 transfert end without error - %1 傳送完成且未出現錯誤 + %1 transfert end without error. + - %1 transfert end with error (%2) - %1 傳輸完成，有錯誤 (%2) + %1 transfert end with error! (%2) + FreehandGrabber - + Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit. 使用滑鼠選取一個區域。然後按Enter鍵或連按兩下滑鼠以拍攝快照。而按Esc鍵則是退出不拍了。 @@ -1168,12 +1245,12 @@ Unable to connect to the FTP server at %1. Please check that the hostname is correct. - + Logged onto %1. - + @@ -1182,28 +1259,28 @@ - successful uploading onto %1. - 成功上傳到 %1。 + Uploaded successfully onto %1. + %1 is available - + %1 is'nt available on server %2 - + - %1 transfert end with error - + %1 transfert end with error! + - %1 transfert end without error - %1 傳送完成且未出現錯誤 + %1 transfert end without error. + @@ -1271,12 +1348,12 @@ ftp://whatyouwant/@filename@ - + - Ftp port - Ftp連接埠 + FTP port + @@ -1293,155 +1370,155 @@ ImageshackUploader - %1 transfert end without error - %1 傳送完成且未出現錯誤 + %1 transfert end without error. + - %1 transfert end with error (%2) - %1 傳輸完成，有錯誤 (%2) + %1 transfert end with error! (%2) + %1 service reply with error (%2) - + ImgurUploader - %1 transfert end without error - %1 傳送完成且未出現錯誤 + %1 transfert end without error. + - %1 transfert end with error (%2) - %1 傳輸完成，有錯誤 (%2) + %1 transfert end with error! (%2) + An error occurred during parsing of service response - + MainWindow - + Save Directory 儲存目錄 - + Register of %1 uploaders - + - - Can't create storage location, check why ?! (%1) - + + Can't create storage location, check why?! (%1) + - + No post effect 無後製效果 - + Simple drop shadow 簡單的陰影 - + Drop shadow with borders 具有邊框的陰影 - + Progressive opacity 漸進式不透明 - + Torn edge 撕邊的效果 - + Main application - + - + Annotation editor - + - - + + Upload the image to the web 上傳圖片到網路上 - - No default uploading web service defined ! - 沒有預設明確的上傳Web服務！ + + No default uploading web service defined! + - + Uploader %1 - + - - The default uploader (%1) does not appear correctly configured, no value given for required parameters !! - + + The default uploader (%1) does not appear correctly configured, no value given for required parameters!! + - - Upload image %1 to %2 service ? - 上傳圖片 %1 到 %2 服務？ + + Upload image %1 to %2 service? + - + Print Document 列印文件 - + Save File 儲存檔案 - + Images (*.%1) 圖片 (*.%1) - + Save failed 儲存失敗 - + Error saving file 儲存檔案時出錯 - + Systray - + - + The program will keep running in the system tray. To terminate the program, choose <b>Quit</b> in the context menu of the system tray entry. 本程式將保持運行在系統匣中。要終止程式，請在系統匣本程式圖示的選單中選擇<b>結束</b>。 - + message from other instance. - + @@ -1468,56 +1545,56 @@ 參數 - - Snapshot Delay (s): - 快照延遲(秒)： - - - + Output path: 輸出路徑： - + Cap&ture mode: 擷取模式： - - Snapshot delay in seconds - 快照延遲秒數 - - - - No delay - 無延遲 - - - + After snapshot: 快照之後： - + Do nothing 什麼都不做 - + Auto save image 自動儲存圖片 - + Save image (ask user) 儲存圖片(詢問使用者) - + Launch editor 啟動編輯器 + + Snapshot delay in seconds + 快照延遲秒數 + + + + No delay + 無延遲 + + + + Snapshot Delay (s): + 快照延遲(秒)： + + Quit 結束 @@ -1553,88 +1630,88 @@ 顯示本程式介面 - + Copy To Clipboard 複製到剪貼簿 - + Copy to clipboard 複製到剪貼簿 - + Open editor - + - + Open editor and add annotations - + - + Grab Screen 擷取螢幕 - + Grab screen (current) 擷取螢幕(目前的) - + Grab all screens 擷取所有螢幕 - + Grab all screens (multi-monitors) 擷取所有螢幕(多顯示器) - + Grab Window 擷取視窗 - + Grab window 擷取視窗 - + Grab Region 擷取區域 - + Grab region 擷取區域 - + Help 說明 - + Upload 上傳 - + Upload the image to the web 上傳圖片到網路 + - Grab freehand region 擷取徒手畫的區域 - + Print 列印 @@ -1642,14 +1719,14 @@ QObject - + %1 found %1 找到 Screenshot management and annotation tool - + @@ -1659,63 +1736,68 @@ [options] [file] - + - Following options are known: - 以下選項是已知的： + Following options are available: + - --help - displays this help. - + --help : displays this help. + - --reset-config - clear the saved preference parameters. - + --reset-config : clear the saved preference parameters. + --no-singleinstance : enable the use of multiple instance of program (not recommended). - + + --portable : use settings file location near the executable (for portable use). + + + + file : file to load in the editor, can be a .hot file or an image file. 檔案：檔案載入到編輯器中，可以是一個 .hot 檔或圖片檔。 - - %1 is already running !! - %1 已經在執行中！ + + %1 is already running!! + - translations path %1 - + Translations path %1 + - setting language to : %1 - 將語言設置為： %1 + Setting language to: %1 + - successfully loaded data from %1 - 從 %1 載入資料成功 + Successfully loaded data from %1 + - failed to load data from %1 - 從 %1 載入資料失敗 + Failed to load data from %1 + stringToVariant(): Error in digit (%1). - + @@ -1728,23 +1810,61 @@ Choose foreground color - + Choose background color - + RegionGrabber - + Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit. 使用滑鼠選取一個區域。然後按Enter鍵或連按兩下滑鼠拍攝快照。而按Esc鍵則是退出不拍了。 + RescaleDialogClass + + + Rescale snapshot + + + + + Original size: + + + + + Target size: + + + + + Scale snapshot + 縮放快照 + + + + % + % + + + + Size + + + + + Keep aspect ratio + + + + WidgetBrush @@ -1764,12 +1884,12 @@ Slash - + Backslash - + @@ -1857,13 +1977,13 @@ - Fill with translucent Background Color - 填充用半透明的背景色 + Fill with transparent background color + - Fill with Background Color - 填充用背景色 + Fill with background color + - + \ No newline at end of file Binary files /tmp/0ShdhbevAJ/hotshots-2.0.1/res/bak/clipboard.png and /tmp/i0vBy4mDwk/hotshots-2.1.0/res/bak/clipboard.png differ Binary files /tmp/0ShdhbevAJ/hotshots-2.0.1/res/bak/icon_open.png and /tmp/i0vBy4mDwk/hotshots-2.1.0/res/bak/icon_open.png differ Binary files /tmp/0ShdhbevAJ/hotshots-2.0.1/res/bak/icon_select.png and /tmp/i0vBy4mDwk/hotshots-2.1.0/res/bak/icon_select.png differ Binary files /tmp/0ShdhbevAJ/hotshots-2.0.1/res/bak/monitor_paint.png and /tmp/i0vBy4mDwk/hotshots-2.1.0/res/bak/monitor_paint.png differ Binary files /tmp/0ShdhbevAJ/hotshots-2.0.1/res/editor/align_bottom.png and /tmp/i0vBy4mDwk/hotshots-2.1.0/res/editor/align_bottom.png differ Binary files /tmp/0ShdhbevAJ/hotshots-2.0.1/res/editor/align_h_center.png and /tmp/i0vBy4mDwk/hotshots-2.1.0/res/editor/align_h_center.png differ Binary files /tmp/0ShdhbevAJ/hotshots-2.0.1/res/editor/align_left.png and /tmp/i0vBy4mDwk/hotshots-2.1.0/res/editor/align_left.png differ Binary files /tmp/0ShdhbevAJ/hotshots-2.0.1/res/editor/alignment.png and /tmp/i0vBy4mDwk/hotshots-2.1.0/res/editor/alignment.png differ Binary files /tmp/0ShdhbevAJ/hotshots-2.0.1/res/editor/align_right.png and /tmp/i0vBy4mDwk/hotshots-2.1.0/res/editor/align_right.png differ Binary files /tmp/0ShdhbevAJ/hotshots-2.0.1/res/editor/align_top.png and /tmp/i0vBy4mDwk/hotshots-2.1.0/res/editor/align_top.png differ Binary files /tmp/0ShdhbevAJ/hotshots-2.0.1/res/editor/align_v_center.png and /tmp/i0vBy4mDwk/hotshots-2.1.0/res/editor/align_v_center.png differ Binary files /tmp/0ShdhbevAJ/hotshots-2.0.1/res/editor/rescale.png and /tmp/i0vBy4mDwk/hotshots-2.1.0/res/editor/rescale.png differ diff -Nru hotshots-2.0.1/res/hotshots.qrc hotshots-2.1.0/res/hotshots.qrc --- hotshots-2.0.1/res/hotshots.qrc 2013-12-18 21:18:46.000000000 +0000 +++ hotshots-2.1.0/res/hotshots.qrc 2014-02-06 21:44:52.000000000 +0000 @@ -44,6 +44,14 @@ providers/unknown.png + editor/rescale.png + editor/alignment.png + editor/align_bottom.png + editor/align_h_center.png + editor/align_left.png + editor/align_right.png + editor/align_top.png + editor/align_v_center.png editor/cursor.png editor/editor.png editor/arrow_bottom_blue.png Binary files /tmp/0ShdhbevAJ/hotshots-2.0.1/res/osx/cursor.png and /tmp/i0vBy4mDwk/hotshots-2.1.0/res/osx/cursor.png differ Binary files /tmp/0ShdhbevAJ/hotshots-2.0.1/res/osx/editor/align_bottom.png and /tmp/i0vBy4mDwk/hotshots-2.1.0/res/osx/editor/align_bottom.png differ Binary files /tmp/0ShdhbevAJ/hotshots-2.0.1/res/osx/editor/align_h_center.png and /tmp/i0vBy4mDwk/hotshots-2.1.0/res/osx/editor/align_h_center.png differ Binary files /tmp/0ShdhbevAJ/hotshots-2.0.1/res/osx/editor/align_left.png and /tmp/i0vBy4mDwk/hotshots-2.1.0/res/osx/editor/align_left.png differ Binary files /tmp/0ShdhbevAJ/hotshots-2.0.1/res/osx/editor/alignment.png and /tmp/i0vBy4mDwk/hotshots-2.1.0/res/osx/editor/alignment.png differ Binary files /tmp/0ShdhbevAJ/hotshots-2.0.1/res/osx/editor/align_right.png and /tmp/i0vBy4mDwk/hotshots-2.1.0/res/osx/editor/align_right.png differ Binary files /tmp/0ShdhbevAJ/hotshots-2.0.1/res/osx/editor/align_top.png and /tmp/i0vBy4mDwk/hotshots-2.1.0/res/osx/editor/align_top.png differ Binary files /tmp/0ShdhbevAJ/hotshots-2.0.1/res/osx/editor/align_v_center.png and /tmp/i0vBy4mDwk/hotshots-2.1.0/res/osx/editor/align_v_center.png differ Binary files /tmp/0ShdhbevAJ/hotshots-2.0.1/res/osx/editor/rescale.png and /tmp/i0vBy4mDwk/hotshots-2.1.0/res/osx/editor/rescale.png differ diff -Nru hotshots-2.0.1/res/osx/hotshots.qrc hotshots-2.1.0/res/osx/hotshots.qrc --- hotshots-2.0.1/res/osx/hotshots.qrc 2013-12-08 09:41:24.000000000 +0000 +++ hotshots-2.1.0/res/osx/hotshots.qrc 2014-02-12 21:58:02.000000000 +0000 @@ -1,5 +1,6 @@ + cursor.png shortcut.png frame_border__shadow.png frame_progressive.png @@ -43,6 +44,14 @@ providers/unknown.png + editor/rescale.png + editor/alignment.png + editor/align_bottom.png + editor/align_h_center.png + editor/align_left.png + editor/align_right.png + editor/align_top.png + editor/align_v_center.png editor/cursor.png editor/editor.png editor/arrow_bottom_blue.png diff -Nru hotshots-2.0.1/setup/setup.nsi hotshots-2.1.0/setup/setup.nsi --- hotshots-2.0.1/setup/setup.nsi 2014-01-24 21:01:56.000000000 +0000 +++ hotshots-2.1.0/setup/setup.nsi 2014-02-06 20:21:16.000000000 +0000 @@ -172,6 +172,7 @@ File "..\AUTHORS.txt" File "..\LICENSE.txt" File "..\Changelog.txt" + File "..\hotshots-portable.bat" ; resources files SetOutPath $INSTDIR diff -Nru hotshots-2.0.1/src/3rdparty/wwWidgets/qwwtwocolorindicator.cpp hotshots-2.1.0/src/3rdparty/wwWidgets/qwwtwocolorindicator.cpp --- hotshots-2.0.1/src/3rdparty/wwWidgets/qwwtwocolorindicator.cpp 2013-11-01 16:37:36.000000000 +0000 +++ hotshots-2.1.0/src/3rdparty/wwWidgets/qwwtwocolorindicator.cpp 2014-02-12 20:57:50.000000000 +0000 @@ -330,17 +330,9 @@ */ void QwwTwoColorIndicator::dragMoveEvent(QDragMoveEvent *ev) { Q_D(QwwTwoColorIndicator); - bool acc = false; - if (ev->mimeData()->hasColor()) { - QColor col(qvariant_cast(ev->mimeData()->colorData())); - if (col.isValid()) - acc = true; - } else if (ev->mimeData()->hasFormat("text/plain")) { - QColor col; - col.setNamedColor(ev->mimeData()->text()); - if (col.isValid()) - acc = true; - } else ev->ignore(); + if (!ev->mimeData()->hasColor() && + !ev->mimeData()->hasFormat("text/plain")) + ev->ignore(); if (d->foregroundRect().intersects(ev->answerRect())) { ev->acceptProposedAction(); ev->accept(d->foregroundRect()); diff -Nru hotshots-2.0.1/src/AboutDialog.cpp hotshots-2.1.0/src/AboutDialog.cpp --- hotshots-2.0.1/src/AboutDialog.cpp 2013-12-12 21:01:08.000000000 +0000 +++ hotshots-2.1.0/src/AboutDialog.cpp 2014-02-15 15:24:50.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -26,6 +26,9 @@ #include #include #include +#include +#include + #include "AboutDialog.h" #include "MiscFunctions.h" @@ -150,7 +153,7 @@ m_titles.insert( TAB_ABOUT,tr("About") ); m_titles.insert( TAB_PREFERENCES,tr("Preferences") ); - m_titles.insert( TAB_INFOS,tr("Infos") ); + m_titles.insert( TAB_INFOS,tr("Info") ); m_titles.insert( TAB_LOG,tr("Log") ); } @@ -229,7 +232,7 @@ QTranslator translator; translator.load(file); - labelTranslation->setText( translator.translate("","release of translation and translator name please","put your name here dear translator and the release of the translation file !!") ); + labelTranslation->setText( translator.translate("","release of translation and translator name please","put your name here dear translator and the release of the translation file!!") ); } void AboutDialog::updateCredits() @@ -334,7 +337,7 @@ // check if recursive scan int ret = QMessageBox::question(this, PACKAGE_NAME, - tr("The application need to restart in order to take into account new translation\n, Do you want to restart application now ?"), + tr("The application need to restart in order to take into account new translation\n, Do you want to restart application now?"), QMessageBox::Yes | QMessageBox::No); @@ -349,7 +352,7 @@ { // check if recursive scan int ret = QMessageBox::question(this, PACKAGE_NAME, - tr("Do you want to reset all the preferences to default value ?\n If yes, the application will be relaunch"), + tr("Do you want to reset all the preferences to default value?\n If yes, the application will be relaunch"), QMessageBox::Yes | QMessageBox::No); @@ -426,6 +429,112 @@ setWindowTitle( tabWidget->tabText(index) ); } +void AboutDialog::updateSystrayUserActionList(QWidget *w, const QStringList ¤tList,const QStringList &backList) +{ + // update default systray action + comboBoxSystrayUserActionList->clear(); + + if (!w) + return; + + QStandardItemModel *model = new QStandardItemModel(this); + + QList childrens = w->children(); + QListIterator iterator(childrens); + int index = 0; + while( iterator.hasNext() ) + { + QObject *object = iterator.next(); + QString classe = object->metaObject()->className(); + if( classe == "QAction" ) + { + QString text = ( (QAction *)object )->text().remove("&"); + if( !text.isEmpty() && !backList.contains(object->objectName()) ) + { + QStandardItem* item = new QStandardItem(text); + item->setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled); + if (currentList.contains(object->objectName())) + item->setData(Qt::Checked, Qt::CheckStateRole); + else + item->setData(Qt::Unchecked, Qt::CheckStateRole); + + item->setData(((QAction *)object)->icon(), Qt::DecorationRole); + item->setData(addressToVariant(object),Qt::UserRole); + + model->setItem(index, 0, item); + + //comboBoxSystrayActionList->addItem(((QAction *)object)->icon(),text,addressToVariant(object)); + //comboBoxSystrayActionList->setItemData(index,true,Qt::ItemIsUserCheckable); + //comboBoxSystrayActionList->setItemData(index,true,Qt::CheckStateRole); + //if (defaultAction == object->objectName()) + // comboBoxSystrayActionList->setCurrentIndex(comboBoxSystrayAction->count()-1); + index++; + } + } + } + comboBoxSystrayUserActionList->setModel(model); +#ifdef Q_WS_X11 + comboBoxSystrayUserActionList->setStyle(new QPlastiqueStyle); // for a problem of checkbox on GNOME !!!! +#endif +} + +QStringList AboutDialog::getSystrayUserActionList() const +{ + QStringList res; + QStandardItemModel * model = qobject_cast(comboBoxSystrayUserActionList->model()); + if (!model) + return res; + + // search for checked + for (int i = 0; i < model->rowCount(); i++) + { + QStandardItem * item = model->item(i); + bool checked = item->data(Qt::CheckStateRole).toBool(); + if (checked) + { + QAction *act = variantToAction(item->data(Qt::UserRole)); + res << act->objectName(); + } + } + + return res; +} + +void AboutDialog::updateDefaultSystrayAction(QWidget *w,const QString &defaultAction) +{ + // update default systray action + comboBoxSystrayAction->clear(); + + if (!w) + return; + + QList childrens = w->children(); + QListIterator iterator(childrens); + while( iterator.hasNext() ) + { + QObject *object = iterator.next(); + QString classe = object->metaObject()->className(); + if( classe == "QAction" ) + { + QString text = ( (QAction *)object )->text().remove("&"); + if( !text.isEmpty() ) + { + comboBoxSystrayAction->addItem(((QAction *)object)->icon(),text,addressToVariant(object)); + if (defaultAction == object->objectName()) + comboBoxSystrayAction->setCurrentIndex(comboBoxSystrayAction->count()-1); + } + } + } +} + + +QString AboutDialog::getDefaultSystrayAction() const +{ + int currentIndex = comboBoxSystrayAction->currentIndex(); + QAction *action = (QAction *)variantToAction( comboBoxSystrayAction->itemData(currentIndex, Qt::UserRole) ); + return action->objectName(); +} + void AboutDialog::addWidgetToShortcutEditor(QWidget *w, const QString &desc) { updateListShortcuts(w,desc); @@ -442,10 +551,10 @@ QTreeWidgetItem *rootItem = new QTreeWidgetItem(treeWidgetShortCut); rootItem->setData(0,Qt::DisplayRole,desc); treeWidgetShortCut->addTopLevelItem(rootItem); - QListIterator iterator2(childrens); - while( iterator2.hasNext() ) + QListIterator iterator(childrens); + while( iterator.hasNext() ) { - QObject *object = iterator2.next(); + QObject *object = iterator.next(); QString classe = object->metaObject()->className(); if( classe == "QAction" ) { diff -Nru hotshots-2.0.1/src/AboutDialog.h hotshots-2.1.0/src/AboutDialog.h --- hotshots-2.0.1/src/AboutDialog.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/AboutDialog.h 2014-02-15 11:39:38.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -55,6 +55,12 @@ void clearShortcuts(); void applyShortcuts(); + void updateDefaultSystrayAction(QWidget *, const QString &defaultAction); + QString getDefaultSystrayAction() const; + + void updateSystrayUserActionList(QWidget *w,const QStringList ¤tList, const QStringList &backList); + QStringList getSystrayUserActionList() const; + public slots: void on_pushButtonClearLog_pressed(); diff -Nru hotshots-2.0.1/src/AppSettings.cpp hotshots-2.1.0/src/AppSettings.cpp --- hotshots-2.0.1/src/AppSettings.cpp 2013-12-12 21:18:56.000000000 +0000 +++ hotshots-2.1.0/src/AppSettings.cpp 2014-02-07 20:05:20.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/AppSettings.h hotshots-2.1.0/src/AppSettings.h --- hotshots-2.0.1/src/AppSettings.h 2014-01-24 20:19:28.000000000 +0000 +++ hotshots-2.1.0/src/AppSettings.h 2014-02-15 16:15:40.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -25,7 +25,7 @@ #define PACKAGE_ORGANIZATION "TheHive" #define PACKAGE_NAME "HotShots" -#define PACKAGE_VERSION "2.0.1" +#define PACKAGE_VERSION "2.1.0" #define PACKAGE_ONLINE_HELP_URL "http://thehive.xbee.net/index.php?module=pages&func=display&pageid=31" #define PACKAGE_CHECK_RELEASE_URL "http://sourceforge.net/projects/hotshots/files" #define PACKAGE_DESCRIPTION "Screenshot utility" diff -Nru hotshots-2.0.1/src/editor/EditorScene.cpp hotshots-2.1.0/src/editor/EditorScene.cpp --- hotshots-2.0.1/src/editor/EditorScene.cpp 2013-12-08 17:42:48.000000000 +0000 +++ hotshots-2.1.0/src/editor/EditorScene.cpp 2014-02-07 20:05:34.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -197,17 +197,17 @@ bool intercepted = false; -/* - QList items = selectedItems(); + /* + QList items = selectedItems(); - foreach (QGraphicsItem *item, items) - { - BaseItem *bi = dynamic_cast(item); - if (bi) - bi->prepareUndo(); - } - */ + foreach (QGraphicsItem *item, items) + { + BaseItem *bi = dynamic_cast(item); + if (bi) + bi->prepareUndo(); + } + */ if (m_typElem != "Select" && m_modeEdition == BaseItem::EDITION_NEXTITEM) { @@ -286,15 +286,15 @@ } { -/* - QList items = selectedItems(); - foreach (QGraphicsItem *item, items) - { - BaseItem *bi = dynamic_cast(item); - if (bi) - bi->saveUndo(); - } - */ + /* + QList items = selectedItems(); + foreach (QGraphicsItem *item, items) + { + BaseItem *bi = dynamic_cast(item); + if (bi) + bi->saveUndo(); + } + */ } if (intercepted) @@ -319,7 +319,7 @@ // no selection => default action if ( selectedItems().isEmpty() || - ( selectedItems().size() == 1 && selectedItems()[0]->data(0).toBool() ) ) // ugly hack for textitem in order to move text cursor with keyboard + ( selectedItems().size() == 1 && selectedItems()[0]->data(0).toBool() ) ) // ugly hack for textitem in order to move text cursor with keyboard { QGraphicsScene::keyPressEvent(event); return; @@ -327,32 +327,32 @@ switch ( event->key() ) { - case Qt::Key_Left: - if ( event->modifiers() & ( Qt::ShiftModifier | Qt::ControlModifier ) ) - action = EditorScene::MOVE_LEFT_FAST; - else - action = EditorScene::MOVE_LEFT; - break; - case Qt::Key_Right: - if ( event->modifiers() & ( Qt::ShiftModifier | Qt::ControlModifier ) ) - action = EditorScene::MOVE_RIGHT_FAST; - else - action = EditorScene::MOVE_RIGHT; - break; - case Qt::Key_Down: - if ( event->modifiers() & ( Qt::ShiftModifier | Qt::ControlModifier ) ) - action = EditorScene::MOVE_DOWN_FAST; - else - action = EditorScene::MOVE_DOWN; - break; - case Qt::Key_Up: - if ( event->modifiers() & ( Qt::ShiftModifier | Qt::ControlModifier ) ) - action = EditorScene::MOVE_UP_FAST; - else - action = EditorScene::MOVE_UP; - break; - default: - break; + case Qt::Key_Left: + if ( event->modifiers() & ( Qt::ShiftModifier | Qt::ControlModifier ) ) + action = EditorScene::MOVE_LEFT_FAST; + else + action = EditorScene::MOVE_LEFT; + break; + case Qt::Key_Right: + if ( event->modifiers() & ( Qt::ShiftModifier | Qt::ControlModifier ) ) + action = EditorScene::MOVE_RIGHT_FAST; + else + action = EditorScene::MOVE_RIGHT; + break; + case Qt::Key_Down: + if ( event->modifiers() & ( Qt::ShiftModifier | Qt::ControlModifier ) ) + action = EditorScene::MOVE_DOWN_FAST; + else + action = EditorScene::MOVE_DOWN; + break; + case Qt::Key_Up: + if ( event->modifiers() & ( Qt::ShiftModifier | Qt::ControlModifier ) ) + action = EditorScene::MOVE_UP_FAST; + else + action = EditorScene::MOVE_UP; + break; + default: + break; } if (action != EditorScene::MOVE_NONE) @@ -506,24 +506,24 @@ { switch (m_fillStyle) { - case WidgetFillStyle::NoFill: - { - m_brush.setColor(m_bgColor); - m_brush.setStyle(Qt::NoBrush); - break; - } - case WidgetFillStyle::FillWithTranslucentBackground: - { - m_brush.setColor( QColor(m_bgColor.red(),m_bgColor.green(),m_bgColor.blue(),100) ); - m_brush.setStyle(Qt::SolidPattern); - break; - } - case WidgetFillStyle::FillWithBackground: - { - m_brush.setColor(m_bgColor); - m_brush.setStyle(Qt::SolidPattern); - break; - } + case WidgetFillStyle::NoFill: + { + m_brush.setColor(m_bgColor); + m_brush.setStyle(Qt::NoBrush); + break; + } + case WidgetFillStyle::FillWithTranslucentBackground: + { + m_brush.setColor( QColor(m_bgColor.red(),m_bgColor.green(),m_bgColor.blue(),100) ); + m_brush.setStyle(Qt::SolidPattern); + break; + } + case WidgetFillStyle::FillWithBackground: + { + m_brush.setColor(m_bgColor); + m_brush.setStyle(Qt::SolidPattern); + break; + } } } @@ -643,33 +643,33 @@ switch (pos) { - case POSITION_TOP: - { - targetPos = CLAMP(lchild.size() - 1 - offsetIndex, 0,lchild.size() - 1); - for (int i = stackNum + 1; i <= targetPos; i++) - lchild[i]->stackBefore(item); - break; - } - case POSITION_UP: - { - targetPos = CLAMP(stackNum + 1, 0,lchild.size() - 1); - lchild[targetPos]->stackBefore(item); - break; - } - case POSITION_DOWN: - { - targetPos = CLAMP(stackNum - 1, 0,lchild.size() - 1); - item->stackBefore(lchild[targetPos]); - break; - } - case POSITION_BOTTOM: - { - targetPos = CLAMP(0 + offsetIndex, 0,lchild.size() - 1); - item->stackBefore(lchild[targetPos]); - break; - } - default: - break; + case POSITION_TOP: + { + targetPos = CLAMP(lchild.size() - 1 - offsetIndex, 0,lchild.size() - 1); + for (int i = stackNum + 1; i <= targetPos; i++) + lchild[i]->stackBefore(item); + break; + } + case POSITION_UP: + { + targetPos = CLAMP(stackNum + 1, 0,lchild.size() - 1); + lchild[targetPos]->stackBefore(item); + break; + } + case POSITION_DOWN: + { + targetPos = CLAMP(stackNum - 1, 0,lchild.size() - 1); + item->stackBefore(lchild[targetPos]); + break; + } + case POSITION_BOTTOM: + { + targetPos = CLAMP(0 + offsetIndex, 0,lchild.size() - 1); + item->stackBefore(lchild[targetPos]); + break; + } + default: + break; } offsetIndex++; parentItem->update(); @@ -684,32 +684,32 @@ { switch (pos) { - case MOVE_UP: - item->setPos( item->pos() + QPointF(0,-1) ); - break; - case MOVE_DOWN: - item->setPos( item->pos() + QPointF(0,1) ); - break; - case MOVE_RIGHT: - item->setPos( item->pos() + QPointF(1,0) ); - break; - case MOVE_LEFT: - item->setPos( item->pos() + QPointF(-1,0) ); - break; - case MOVE_UP_FAST: - item->setPos( item->pos() + QPointF(0,-10) ); - break; - case MOVE_DOWN_FAST: - item->setPos( item->pos() + QPointF(0,10) ); - break; - case MOVE_LEFT_FAST: - item->setPos( item->pos() + QPointF(-10,0) ); - break; - case MOVE_RIGHT_FAST: - item->setPos( item->pos() + QPointF(10,0) ); - break; - default: - break; + case MOVE_UP: + item->setPos( item->pos() + QPointF(0,-1) ); + break; + case MOVE_DOWN: + item->setPos( item->pos() + QPointF(0,1) ); + break; + case MOVE_RIGHT: + item->setPos( item->pos() + QPointF(1,0) ); + break; + case MOVE_LEFT: + item->setPos( item->pos() + QPointF(-1,0) ); + break; + case MOVE_UP_FAST: + item->setPos( item->pos() + QPointF(0,-10) ); + break; + case MOVE_DOWN_FAST: + item->setPos( item->pos() + QPointF(0,10) ); + break; + case MOVE_LEFT_FAST: + item->setPos( item->pos() + QPointF(-10,0) ); + break; + case MOVE_RIGHT_FAST: + item->setPos( item->pos() + QPointF(10,0) ); + break; + default: + break; } } } @@ -814,3 +814,62 @@ { return m_factory; } + +void EditorScene::setAlignment(typGroupAlignment align) +{ + QList items = selectedItems(); + + if (items.count() < 2) + return; + + QRectF bb(items.at(0)->sceneBoundingRect()); + foreach (QGraphicsItem *item, items) + { + bb = bb.united(item->sceneBoundingRect()); + qDebug() << item->scenePos(); + } + + qDebug() << bb; + + foreach (QGraphicsItem *item, items) + { + QRectF br(item->sceneBoundingRect()); + QPointF newPos; + QPointF oldPos(item->scenePos()); + switch (align) + { + case ALIGN_LEFT: + { + newPos = QPointF(bb.left()-br.left(),0); + break; + } + case ALIGN_V_CENTER: + { + newPos = QPointF(bb.center().x()-br.center().x(),0); + break; + } + case ALIGN_RIGHT: + { + newPos = QPointF(bb.right()-br.right(),0); + break; + } + case ALIGN_TOP: + { + newPos = QPointF(0,bb.top()-br.top()); + break; + } + case ALIGN_H_CENTER: + { + newPos = QPointF(0,bb.center().y()-br.center().y()); + break; + } + default: + case ALIGN_BOTTOM: + { + newPos = QPointF(0,bb.bottom()-br.bottom()); + break; + } + } + item->setPos(item->mapToParent(newPos)); + } +} \ No newline at end of file diff -Nru hotshots-2.0.1/src/editor/EditorScene.cpp.orig hotshots-2.1.0/src/editor/EditorScene.cpp.orig --- hotshots-2.0.1/src/editor/EditorScene.cpp.orig 1970-01-01 00:00:00.000000000 +0000 +++ hotshots-2.1.0/src/editor/EditorScene.cpp.orig 2014-02-06 20:21:18.000000000 +0000 @@ -0,0 +1,880 @@ + +/****************************************************************************** + HotShots: Screenshot utility + Copyright(C) 2011-2013 xbee@xbee.net + + 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 + *******************************************************************************/ + +#include +#include +#include + +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include +#include + +#include "EditorScene.h" +#include "ItemFactory.h" +#include "ItemRegistering.h" + +#include "GroupLayer.h" +#include "BaseItem.h" +#include "TagManager.h" + +#include "WidgetFillStyle.h" + +#include "LogHandler.h" + +#ifdef Q_WS_WIN +#include +#else +#include +#endif + +#if !defined(CLAMP) +#define CLAMP(x,min,max) ( (xmax) ? max : x ) ) +#endif + +EditorScene::EditorScene(QObject *parent) : QGraphicsScene(parent), + m_typElem("Select"), + m_modeEdition(BaseItem::EDITION_NONE), + m_primitive(NULL), + m_fgColor( QColor(Qt::black) ), + m_lineWidth(1), + m_dashStyle(Qt::SolidLine), + m_fillStyle(WidgetFillStyle::NoFill), + m_shadow(false), + m_multiSelection(false), + m_factory(new ItemFactory), + m_undoStack( new QUndoStack(this) ) +{ + m_pen.setColor(m_fgColor); + m_pen.setWidth(m_lineWidth); + m_pen.setStyle( (Qt::PenStyle)m_dashStyle ); + m_pen.setCapStyle(Qt::RoundCap); + m_pen.setJoinStyle(Qt::RoundJoin); + + setBrushFromStyle(); + + m_groupUnderlay = new GroupLayer; + addItem(m_groupUnderlay); + m_groupOverlay = new GroupLayer; + addItem(m_groupOverlay); + + connect( this,SIGNAL( selectionChanged() ),this,SLOT( innerSelectionChanged() ) ); + + ItemRegistering::allRegister(m_factory); +} + +EditorScene::~EditorScene() +{ + delete m_factory; +} + +void EditorScene::setItemPen(const QPen &pen) +{ + m_pen = pen; +} + +QPixmap EditorScene::getUnderlayPixmap() const +{ + QGraphicsPixmapItem* pixItem; + if ( !m_groupUnderlay->childItems().isEmpty() && ( pixItem = qgraphicsitem_cast(m_groupUnderlay->childItems()[0]) ) ) + return pixItem->pixmap(); + + return QPixmap(); +} + +QImage EditorScene::getUnderlayImage() const +{ + QGraphicsPixmapItem* pixItem; + if ( !m_groupUnderlay->childItems().isEmpty() && ( pixItem = qgraphicsitem_cast(m_groupUnderlay->childItems()[0]) ) ) + return pixItem->pixmap().toImage(); + + return QImage(); +} + +QPointF EditorScene::getUnderlayOffset() const +{ + QGraphicsPixmapItem* pixItem; + if ( !m_groupUnderlay->childItems().isEmpty() && ( pixItem = qgraphicsitem_cast(m_groupUnderlay->childItems()[0]) ) ) + return pixItem->pos(); + + return QPointF(); +} + +void EditorScene::setUnderlayImage(const QImage &image, const QPointF &pos) +{ + qDeleteAll( m_groupUnderlay->childItems() ); + + QGraphicsPixmapItem *item = new QGraphicsPixmapItem( QPixmap::fromImage(image) ); + item->setTransformationMode(Qt::SmoothTransformation); + item->setPos(pos); + m_groupUnderlay->addChildItem(item); + + setSceneRect( image.rect() ); +} + +void EditorScene::setItemBrush(const QBrush &brush) +{ + m_brush = brush; +} + +void EditorScene::setFont(const QFont &font) +{ + m_font = font; + applyChanges(); +} + +void EditorScene::innerSelectionChanged() +{ + qDebug() << "EditorScene::innerSelectionChanged" << selectedItems().size(); + QList items = selectedItems(); + + /* + foreach (QGraphicsItem *item, items) + { + BaseItem *bi = dynamic_cast(item); + if (bi) + bi->prepareUndo(); + } + */ + + if ( items.count() != 1 ) + { + m_primitive = NULL; + return; + } + else if (items.count() == 0) + { + clearFocus(); // especially for text item + } + + m_primitive = dynamic_cast(items[0]); + if (m_primitive) + { + // get base data + m_pen = m_primitive->pen(); + + m_brush = m_primitive->brush(); + m_font = m_primitive->font(); + + m_fgColor = m_pen.color(); + m_bgColor = m_brush.color(); + m_lineWidth = m_pen.width(); + m_dashStyle = m_pen.style(); + + m_fillStyle = getStyleFromBrush(); + } +} + +void EditorScene::mousePressEvent(QGraphicsSceneMouseEvent *mouseEvent) +{ + qDebug() << "EditorScene::mousePressEvent " << selectedItems().count() << " " << m_primitive; + + bool intercepted = false; + +/* + QList items = selectedItems(); + + + foreach (QGraphicsItem *item, items) + { + BaseItem *bi = dynamic_cast(item); + if (bi) + bi->prepareUndo(); + } + */ + + if (m_typElem != "Select" && m_modeEdition == BaseItem::EDITION_NEXTITEM) + { + if (m_primitive) + m_primitive->endEdition(); + + m_primitive = m_factory->create(m_typElem); + if (m_primitive) + { + m_primitive->setPen(m_pen); + m_primitive->setBrush(m_brush); + m_primitive->setFont(m_font); + m_primitive->setItemSettings(m_itemSettings); + m_groupOverlay->addChildItem(m_primitive); + } + intercepted = true; + } + + if (m_primitive) + { + m_primitive->mousePress(mouseEvent); + intercepted = true; + } + + if (intercepted) + mouseEvent->accept(); + + QGraphicsScene::mousePressEvent(mouseEvent); +} + +void EditorScene::mouseMoveEvent(QGraphicsSceneMouseEvent *mouseEvent) +{ + bool intercepted = false; + + if (m_typElem != "Select" && m_primitive) + { + m_primitive->mouseMove(mouseEvent); + } + + if (intercepted) + mouseEvent->accept(); + else + QGraphicsScene::mouseMoveEvent(mouseEvent); +} + +void EditorScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *mouseEvent) +{ + qDebug() << "EditorScene::mouseReleaseEvent " << selectedItems().count() << " " << m_primitive; + bool intercepted = false; + + if (m_primitive && m_typElem != "Select") + m_modeEdition = m_primitive->mouseRelease(mouseEvent); + + //m_resetPrimitive = m_primitive->mouseRelease(mouseEvent); + + if (m_modeEdition == BaseItem::EDITION_NEXTITEM) + { + intercepted = true; + + if (m_primitive) + { + m_primitive->endEdition(); + } + m_primitive = NULL; // in order to change pen or brush after creation + emit newColorPair(m_fgColor,m_bgColor); + } + else if (m_modeEdition == BaseItem::EDITION_FINISHITEM) + { + if (m_primitive) + { + m_primitive->endEdition(); + } + m_primitive = NULL; // in order to change pen or brush after creation + + setMode("Select"); + } + + { +/* + QList items = selectedItems(); + foreach (QGraphicsItem *item, items) + { + BaseItem *bi = dynamic_cast(item); + if (bi) + bi->saveUndo(); + } + */ + } + + if (intercepted) + mouseEvent->accept(); + + QGraphicsScene::mouseReleaseEvent(mouseEvent); +} + +void EditorScene::keyPressEvent(QKeyEvent *event) +{ + EditorScene::typMove action = EditorScene::MOVE_NONE; + + if ( m_typElem == "Select" && event->modifiers() & ( Qt::ControlModifier ) ) + { + //QApplication::setOverrideCursor( QCursor(Qt::PointingHandCursor) ); + m_multiSelection = true; + changeDragMode(QGraphicsView::RubberBandDrag); + +// QGraphicsScene::keyPressEvent(event); +// return; + } + + // no selection => default action + if ( selectedItems().isEmpty() || + ( selectedItems().size() == 1 && selectedItems()[0]->data(0).toBool() ) ) // ugly hack for textitem in order to move text cursor with keyboard + { + QGraphicsScene::keyPressEvent(event); + return; + } + + switch ( event->key() ) + { + case Qt::Key_Left: + if ( event->modifiers() & ( Qt::ShiftModifier | Qt::ControlModifier ) ) + action = EditorScene::MOVE_LEFT_FAST; + else + action = EditorScene::MOVE_LEFT; + break; + case Qt::Key_Right: + if ( event->modifiers() & ( Qt::ShiftModifier | Qt::ControlModifier ) ) + action = EditorScene::MOVE_RIGHT_FAST; + else + action = EditorScene::MOVE_RIGHT; + break; + case Qt::Key_Down: + if ( event->modifiers() & ( Qt::ShiftModifier | Qt::ControlModifier ) ) + action = EditorScene::MOVE_DOWN_FAST; + else + action = EditorScene::MOVE_DOWN; + break; + case Qt::Key_Up: + if ( event->modifiers() & ( Qt::ShiftModifier | Qt::ControlModifier ) ) + action = EditorScene::MOVE_UP_FAST; + else + action = EditorScene::MOVE_UP; + break; + default: + break; + } + + if (action != EditorScene::MOVE_NONE) + moveSelectedLayers(action); + else + QGraphicsScene::keyPressEvent(event); +} + +void EditorScene::keyReleaseEvent(QKeyEvent *event) +{ + if ( m_multiSelection && !( event->modifiers() & ( Qt::ControlModifier ) ) ) + { + //QApplication::restoreOverrideCursor(); + changeDragMode(QGraphicsView::ScrollHandDrag); + m_multiSelection = false; + } + QGraphicsScene::keyReleaseEvent(event); +} + +void EditorScene::resetSelection() +{ + clearSelection(); +} + +void EditorScene::setMode(const QString &m) +{ + m_typElem = m; + m_modeEdition = BaseItem::EDITION_NEXTITEM; + if (m_primitive) + m_primitive->endEdition(); + m_primitive = NULL; + + resetSelection(); + + clearFocus(); + + // restore cursor + if ( QApplication::overrideCursor() ) + QApplication::restoreOverrideCursor(); + + // change cursor and drag mode according to state + if (m_typElem == "Select") + { + m_modeEdition = BaseItem::EDITION_NONE; + changeDragMode(QGraphicsView::ScrollHandDrag); + enableSelection(true); + } + else + { + QApplication::setOverrideCursor( QCursor(Qt::CrossCursor) ); + changeDragMode(QGraphicsView::NoDrag); + enableSelection(false); + } + emit currentMode(m); +} + +void EditorScene::setLineWidth(int val) +{ + m_lineWidth = val; + m_pen.setWidth(m_lineWidth); + applyChanges(); +} + +void EditorScene::setDashStyle(int val) +{ + m_dashStyle = val; + m_pen.setStyle( (Qt::PenStyle)m_dashStyle ); + applyChanges(); +} + +void EditorScene::setFillStyle(int val) +{ + m_fillStyle = val; + setBrushFromStyle(); + applyChanges(); +} + +void EditorScene::increaseFontSize() +{ + int ps = m_font.pointSize(); + m_font.setPointSize(ps + 1); + applyChanges(); +} + +void EditorScene::decreaseFontSize() +{ + int ps = m_font.pointSize(); + m_font.setPointSize(ps - 1); + applyChanges(); +} + +void EditorScene::setColorPair(const QColor&fg, const QColor &bg) +{ + setFgColor(fg); + setBgColor(bg); +} + +void EditorScene::setFgColor(const QColor &color) +{ + m_fgColor = color; + m_pen.setColor(m_fgColor); + setBrushFromStyle(); + applyChanges(); +} + +void EditorScene::setBgColor(const QColor &color) +{ + m_bgColor = color; + m_brush.setColor(m_bgColor); + setBrushFromStyle(); + applyChanges(); +} + +void EditorScene::applyChanges() +{ + QList items = selectedItems(); + + if ( !items.isEmpty() ) + { + foreach (QGraphicsItem * item, items) + { + BaseItem *primitive = dynamic_cast(item); + if (primitive) + { + primitive->setPen(m_pen); + primitive->setBrush(m_brush); + primitive->setFont(m_font); + } + } + } + else if (m_primitive) + { + m_primitive->setPen(m_pen); + m_primitive->setBrush(m_brush); + m_primitive->setFont(m_font); + } +} + +int EditorScene::getStyleFromBrush() const +{ + int alpha = m_brush.color().alpha(); + if (m_brush.style() == Qt::NoBrush) + return WidgetFillStyle::NoFill; + else if (alpha != 255) + return WidgetFillStyle::FillWithTranslucentBackground; + + return WidgetFillStyle::FillWithBackground; +} + +void EditorScene::setBrushFromStyle() +{ + switch (m_fillStyle) + { + case WidgetFillStyle::NoFill: + { + m_brush.setColor(m_bgColor); + m_brush.setStyle(Qt::NoBrush); + break; + } + case WidgetFillStyle::FillWithTranslucentBackground: + { + m_brush.setColor( QColor(m_bgColor.red(),m_bgColor.green(),m_bgColor.blue(),100) ); + m_brush.setStyle(Qt::SolidPattern); + break; + } + case WidgetFillStyle::FillWithBackground: + { + m_brush.setColor(m_bgColor); + m_brush.setStyle(Qt::SolidPattern); + break; + } + } +} + +void EditorScene::changeDragMode(QGraphicsView::DragMode mode) +{ + foreach ( QGraphicsView * view, views() ) + view->setDragMode(mode); +} + +void EditorScene::addOverlayItem(BaseItem *item) +{ + m_groupOverlay->addChildItem(item); +} + +QList EditorScene::getOverlayItems() const +{ + return m_groupOverlay->childItems (); +} + +void EditorScene::enableSelection(bool val) +{ + QList items = m_groupOverlay->childItems (); + foreach (QGraphicsItem * item, items) + { + item->setFlag(QGraphicsItem::ItemIsSelectable,val); + item->setFlag(QGraphicsItem::ItemIsMovable,val); + } +} + +void EditorScene::toggleShadow() +{ + //m_shadow = val; + //QList items = m_groupOverlay->childItems (); + QList items = selectedItems(); + foreach (QGraphicsItem * item, items) + { + BaseItem *it = dynamic_cast(item); + if (it) + it->setEnableShadow( !it->isShadowEnabled() ); + } +} + +void EditorScene::deleteSelection() +{ + foreach ( QGraphicsItem * item, selectedItems() ) + { + BaseItem *it = dynamic_cast(item); + + if (it) + it->deleteLater(); + else + delete item; + } + m_primitive = NULL; +} + +void EditorScene::cloneSelection() +{ + foreach ( QGraphicsItem * item, selectedItems() ) + { + BaseItem *it = dynamic_cast(item); + + if (it) + { + BaseItem *newItem = it->clone(); + if (newItem) + { + // enable the selection + newItem->setFlag(QGraphicsItem::ItemIsSelectable,true); + newItem->setFlag(QGraphicsItem::ItemIsMovable,true); + newItem->setPos( newItem->pos() + QPointF(20,20) ); + m_groupOverlay->addChildItem(newItem); + } + } + } + m_primitive = NULL; +} + +bool EditorScene::hasItems() const +{ + return m_groupOverlay->childItems ().isEmpty() == false; +} + +void EditorScene::clearScene() +{ + clearItems(); + qDeleteAll( m_groupUnderlay->childItems() ); +} + +void EditorScene::clearItems() +{ + m_primitive = NULL; + TagManager::reset(); // to prevent unwanted update of tag items + resetSelection(); + qDeleteAll( m_groupOverlay->childItems () ); + m_undoStack->clear(); +} + +void EditorScene::placeSelectedLayers(typZPosition pos) +{ + QList items = selectedItems(); + + int offsetIndex = 0; // in order to preserve relative position of group of elements + + foreach (QGraphicsItem * item, items) + { + // get the parent item + QGraphicsItem *parentItem = m_groupOverlay; + + // get the list of sibling items + QList lchild = parentItem->childItems (); + + // get current position of item + int stackNum = lchild.indexOf(item); + + qreal targetPos = 0; + + switch (pos) + { + case POSITION_TOP: + { + targetPos = CLAMP(lchild.size() - 1 - offsetIndex, 0,lchild.size() - 1); + for (int i = stackNum + 1; i <= targetPos; i++) + lchild[i]->stackBefore(item); + break; + } + case POSITION_UP: + { + targetPos = CLAMP(stackNum + 1, 0,lchild.size() - 1); + lchild[targetPos]->stackBefore(item); + break; + } + case POSITION_DOWN: + { + targetPos = CLAMP(stackNum - 1, 0,lchild.size() - 1); + item->stackBefore(lchild[targetPos]); + break; + } + case POSITION_BOTTOM: + { + targetPos = CLAMP(0 + offsetIndex, 0,lchild.size() - 1); + item->stackBefore(lchild[targetPos]); + break; + } + default: + break; + } + offsetIndex++; + parentItem->update(); + } + update(); +} + +void EditorScene::moveSelectedLayers(typMove pos) +{ + QList items = selectedItems(); + foreach (QGraphicsItem * item, items) + { + switch (pos) + { + case MOVE_UP: + item->setPos( item->pos() + QPointF(0,-1) ); + break; + case MOVE_DOWN: + item->setPos( item->pos() + QPointF(0,1) ); + break; + case MOVE_RIGHT: + item->setPos( item->pos() + QPointF(1,0) ); + break; + case MOVE_LEFT: + item->setPos( item->pos() + QPointF(-1,0) ); + break; + case MOVE_UP_FAST: + item->setPos( item->pos() + QPointF(0,-10) ); + break; + case MOVE_DOWN_FAST: + item->setPos( item->pos() + QPointF(0,10) ); + break; + case MOVE_LEFT_FAST: + item->setPos( item->pos() + QPointF(-10,0) ); + break; + case MOVE_RIGHT_FAST: + item->setPos( item->pos() + QPointF(10,0) ); + break; + default: + break; + } + } +} + +QPixmap EditorScene::getRenderToPixmap() +{ + resetSelection (); + + bool cropped = false; + int margin = 5; + + if (cropped) + { + QPixmap p( width(), height() ); + QPainter painter(&p); + painter.setRenderHint(QPainter::Antialiasing); + render(&painter); + return p; + } + + QRectF rect(itemsBoundingRect()); + rect.adjust(-margin,-margin,margin,margin); + + QPixmap p( rect.width(), rect.height() ); + p.fill(Qt::transparent); + QPainter painter(&p); + painter.setRenderHint(QPainter::Antialiasing); + render( &painter,p.rect(),rect ); + return p; +} + +void EditorScene::setItemSetting(const QString &key, const QVariant &val) +{ + // settings data + m_itemSettings[key] = val; +} + +void EditorScene::cropBackground(const QRectF &cropRect) +{ + // cropRect is in scene coord + foreach ( QGraphicsItem * item, m_groupUnderlay->childItems() ) + { + QGraphicsPixmapItem* pixItem; + if ( ( pixItem = qgraphicsitem_cast(item) ) != NULL ) + { + QRect itemCropRect = pixItem->mapFromScene(cropRect).boundingRect().toRect(); + QRect pixRect = pixItem->pixmap().rect().intersect( itemCropRect ); + pixItem->setPixmap( pixItem->pixmap().copy(pixRect) ); + pixItem->setPos( pixItem->pos() + pixRect.topLeft() ); + } + } + emit backgroundChanged(); +} + +QFont EditorScene::font() const +{ + return m_font; +} + +QColor EditorScene::fgColor() const +{ + return m_fgColor; +} + +QColor EditorScene::bgColor() const +{ + // must return color without alpha !! + return QColor( m_bgColor.red(),m_bgColor.green(),m_bgColor.blue() ); +} + +QBrush EditorScene::itemBrush() const +{ + return m_brush; +} + +QPen EditorScene::itemPen() const +{ + return m_pen; +} + +int EditorScene::getLineWidth() const +{ + return m_lineWidth; +} + +int EditorScene::getDashStyle() const +{ + return m_dashStyle; +} + +int EditorScene::getFillStyle() const +{ + return m_fillStyle; +} + +const QString & EditorScene::getMode() const +{ + return m_typElem; +} + +ItemFactory *EditorScene::getItemFactory() const +{ + return m_factory; +} + +void EditorScene::setAlignment(typGroupAlignment align) +{ + QList items = selectedItems(); + + if (items.count() < 2) + return; + + QRectF bb(items.at(0)->sceneBoundingRect()); + foreach (QGraphicsItem *item, items) + { + bb = bb.united(item->sceneBoundingRect()); + qDebug() << item->scenePos(); + } + + qDebug() << bb; + + foreach (QGraphicsItem *item, items) + { + QRectF br(item->sceneBoundingRect()); + QPointF newPos; + QPointF oldPos(item->scenePos()); + switch (align) + { + case ALIGN_LEFT: + { + newPos = QPointF(bb.left()-br.left(),0); + break; + } + + case ALIGN_V_CENTER: + { + newPos = QPointF(bb.center().x()-br.center().x(),0); + break; + } + + case ALIGN_RIGHT: + { + newPos = QPointF(bb.right()-br.right(),0); + break; + } + + case ALIGN_TOP: + { + newPos = QPointF(0,bb.top()-br.top()); + break; + } + + case ALIGN_H_CENTER: + { + newPos = QPointF(0,bb.center().y()-br.center().y()); + break; + } + + default: + case ALIGN_BOTTOM: + { + newPos = QPointF(0,bb.bottom()-br.bottom()); + break; + } + } + item->setPos(item->mapToParent(newPos)); + } +} \ No newline at end of file diff -Nru hotshots-2.0.1/src/editor/EditorScene.h hotshots-2.1.0/src/editor/EditorScene.h --- hotshots-2.0.1/src/editor/EditorScene.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/EditorScene.h 2014-02-07 20:06:10.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -68,6 +68,16 @@ MOVE_RIGHT_FAST }; + enum typGroupAlignment + { + ALIGN_LEFT = 0, + ALIGN_H_CENTER, + ALIGN_RIGHT, + ALIGN_TOP, + ALIGN_V_CENTER, + ALIGN_BOTTOM + }; + EditorScene(QObject *parent = 0); ~EditorScene(); @@ -138,6 +148,8 @@ void cropBackground(const QRectF &); void setColorPair(const QColor&fg, const QColor &bg); + void setAlignment(typGroupAlignment); + signals: void currentMode(const QString &); diff -Nru hotshots-2.0.1/src/editor/EditorView.cpp hotshots-2.1.0/src/editor/EditorView.cpp --- hotshots-2.0.1/src/editor/EditorView.cpp 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/EditorView.cpp 2014-02-07 20:05:34.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/EditorView.h hotshots-2.1.0/src/editor/EditorView.h --- hotshots-2.0.1/src/editor/EditorView.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/EditorView.h 2014-02-07 20:06:08.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/EditorWidget.cpp hotshots-2.1.0/src/editor/EditorWidget.cpp --- hotshots-2.0.1/src/editor/EditorWidget.cpp 2013-12-12 20:48:32.000000000 +0000 +++ hotshots-2.1.0/src/editor/EditorWidget.cpp 2014-02-10 22:36:46.000000000 +0000 @@ -1,22 +1,22 @@ /****************************************************************************** - HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net +HotShots: Screenshot utility +Copyright(C) 2011-2014 xbee@xbee.net - 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 - *******************************************************************************/ +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 +*******************************************************************************/ #include #include @@ -47,15 +47,16 @@ #include "NameManager.h" #include "PostEffect.h" +#include "RescaleDialog.h" const int maxRecentlyOpenedFile = 10; EditorWidget::EditorWidget(QWidget *parent) : - QMainWindow(parent), - m_ui(new Ui::EditorWidgetClass), - m_lastImageDirectory( QDesktopServices::storageLocation(QDesktopServices::HomeLocation) ), - m_lastPostEffect(PostEffect::EFFECT_NONE), - m_recentFilesMenu(NULL) +QMainWindow(parent), +m_ui(new Ui::EditorWidgetClass), +m_lastImageDirectory( QDesktopServices::storageLocation(QDesktopServices::HomeLocation) ), +m_lastPostEffect(PostEffect::EFFECT_NONE), +m_recentFilesMenu(NULL) { m_ui->setupUi(this); updateUi(); @@ -103,13 +104,24 @@ updateHelp(); - QMenu *menu = new QMenu(this); - m_ui->actionAddFrame->setMenu(menu); - menu->addAction(m_ui->actionNoPostEffect); - menu->addAction(m_ui->actionSimpleDropShadow); - menu->addAction(m_ui->actionDropShadowWithBorders); - menu->addAction(m_ui->actionProgressiveOpacity); - menu->addAction(m_ui->actionTornEdge); + // add post effect menu + QMenu *peMenu = new QMenu(this); + m_ui->actionAddFrame->setMenu(peMenu); + peMenu->addAction(m_ui->actionNoPostEffect); + peMenu->addAction(m_ui->actionSimpleDropShadow); + peMenu->addAction(m_ui->actionDropShadowWithBorders); + peMenu->addAction(m_ui->actionProgressiveOpacity); + peMenu->addAction(m_ui->actionTornEdge); + + // add alignment menu + QMenu *aMenu = new QMenu(this); + m_ui->actionSetAlignment->setMenu(aMenu); + aMenu->addAction(m_ui->actionAlignGroupLeft); + aMenu->addAction(m_ui->actionAlignVerticalCenter); + aMenu->addAction(m_ui->actionAlignGroupRight); + aMenu->addAction(m_ui->actionAlignGroupTop); + aMenu->addAction(m_ui->actionAlignHorizontalCenter); + aMenu->addAction(m_ui->actionAlignGroupBottom); // trace change in the background image with crop item connect( m_scene,SIGNAL( backgroundChanged ( ) ),this,SLOT( updateBackground() ) ); @@ -214,6 +226,10 @@ void EditorWidget::displayCurrentItemData(bool force) { QList items = m_scene->selectedItems(); + + // enable/disable alignment actions + m_ui->actionSetAlignment->setEnabled(items.count()>1); + if ( items.count() !=1 && !force ) return; @@ -240,7 +256,7 @@ if ( m_scene->hasItems() ) { QMessageBox msgBox; - msgBox.setText( tr("There is existing annotation items, what do you want to do ?") ); + msgBox.setText( tr("There is existing annotation items, what do you want to do?") ); QPushButton *clearButton = msgBox.addButton(tr("clear annotation items ..."), QMessageBox::ActionRole); QPushButton *updateButton = msgBox.addButton(tr("update background image ..."), QMessageBox::ActionRole); @@ -498,28 +514,28 @@ { switch (m_lastPostEffect) { - case PostEffect::EFFECT_DROP_SHADOW: + case PostEffect::EFFECT_DROP_SHADOW: { updatePostEffectDefaultAction(m_ui->actionSimpleDropShadow); break; } - case PostEffect::EFFECT_POLAROID_DROP_SHADOW: + case PostEffect::EFFECT_POLAROID_DROP_SHADOW: { updatePostEffectDefaultAction(m_ui->actionDropShadowWithBorders); break; } - case PostEffect::EFFECT_PROGRESSIVE_EDGE: + case PostEffect::EFFECT_PROGRESSIVE_EDGE: { updatePostEffectDefaultAction(m_ui->actionProgressiveOpacity); break; } - case PostEffect::EFFECT_TORN_EDGE: + case PostEffect::EFFECT_TORN_EDGE: { updatePostEffectDefaultAction(m_ui->actionTornEdge); break; } - case PostEffect::EFFECT_NONE: - default: + case PostEffect::EFFECT_NONE: + default: { break; } @@ -831,10 +847,10 @@ return; if (QMessageBox::question(this, - tr("Clear edit"), - tr("Clear all the exiting items ? (no possible undo)"), - QMessageBox::Ok | QMessageBox::Cancel, - QMessageBox::Cancel) + tr("Clear edit"), + tr("Clear all the exiting items ? (no possible undo)"), + QMessageBox::Ok | QMessageBox::Cancel, + QMessageBox::Cancel) == QMessageBox::Ok) { m_scene->clearItems(); @@ -855,10 +871,10 @@ void EditorWidget::on_actionNewDocument_triggered() { if (QMessageBox::question(this, - tr("Clear document"), - tr("Create a new document ?"), - QMessageBox::Ok | QMessageBox::Cancel, - QMessageBox::Cancel) + tr("Clear document"), + tr("Create a new document?"), + QMessageBox::Ok | QMessageBox::Cancel, + QMessageBox::Cancel) == QMessageBox::Ok) { m_scene->clearScene(); @@ -889,8 +905,8 @@ // ask for a filename ... QString savefilename = QFileDialog::getSaveFileName( this, tr("Save HotShots File"), - proposedFile, - tr("HotShots files (*.hot)") ); + proposedFile, + tr("HotShots files (*.hot)") ); if ( savefilename.isEmpty() ) return; @@ -980,6 +996,20 @@ m_ui->actionAddFrame->menu()->defaultAction()->activate(QAction::Trigger); } +void EditorWidget::on_actionSetAlignment_triggered() +{ + if ( m_ui->actionSetAlignment->menu()->defaultAction() ) + m_ui->actionSetAlignment->menu()->defaultAction()->activate(QAction::Trigger); +} + +void EditorWidget::updateAlignmentDefaultAction(QAction *act) +{ + m_ui->actionSetAlignment->menu()->setDefaultAction(act); + m_ui->actionSetAlignment->menu()->setActiveAction(act); + m_ui->actionSetAlignment->setIcon( act->icon() ); +} + + void EditorWidget::updatePostEffectDefaultAction(QAction *act) { m_ui->actionAddFrame->menu()->setDefaultAction(act); @@ -1079,3 +1109,53 @@ m_ui->qwwTwoColorIndicator->setFgColor(fg); m_ui->qwwTwoColorIndicator->setBgColor(bg); } + +void EditorWidget::on_actionAlignGroupLeft_triggered() +{ + updateAlignmentDefaultAction(m_ui->actionAlignGroupLeft); + m_scene->setAlignment(EditorScene::ALIGN_LEFT); +} + +void EditorWidget::on_actionAlignHorizontalCenter_triggered() +{ + updateAlignmentDefaultAction(m_ui->actionAlignHorizontalCenter); + m_scene->setAlignment(EditorScene::ALIGN_H_CENTER); +} + +void EditorWidget::on_actionAlignVerticalCenter_triggered() +{ + updateAlignmentDefaultAction(m_ui->actionAlignVerticalCenter); + m_scene->setAlignment(EditorScene::ALIGN_V_CENTER); +} + +void EditorWidget::on_actionAlignGroupRight_triggered() +{ + updateAlignmentDefaultAction(m_ui->actionAlignGroupRight); + m_scene->setAlignment(EditorScene::ALIGN_RIGHT); +} + +void EditorWidget::on_actionAlignGroupTop_triggered() +{ + updateAlignmentDefaultAction(m_ui->actionAlignGroupTop); + m_scene->setAlignment(EditorScene::ALIGN_TOP); +} + +void EditorWidget::on_actionAlignGroupBottom_triggered() +{ + updateAlignmentDefaultAction(m_ui->actionAlignGroupBottom); + m_scene->setAlignment(EditorScene::ALIGN_BOTTOM); +} + +void EditorWidget::on_actionRescaleBackgroundImage_triggered() +{ + RescaleDialog dia; + + dia.setOriginalSize(m_originalPixmap.size()); + + if (dia.exec() == QDialog::Accepted) + { + m_originalPixmap = m_originalPixmap.scaled(dia.getFinalSize(),Qt::IgnoreAspectRatio,Qt::SmoothTransformation); + m_scene->setUnderlayImage( m_originalPixmap.toImage() ); + } +} + diff -Nru hotshots-2.0.1/src/editor/EditorWidget.h hotshots-2.1.0/src/editor/EditorWidget.h --- hotshots-2.0.1/src/editor/EditorWidget.h 2013-11-01 15:50:02.000000000 +0000 +++ hotshots-2.1.0/src/editor/EditorWidget.h 2014-02-07 20:06:18.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -100,6 +100,8 @@ void on_actionUpload_triggered(); void on_actionPrint_triggered(); + void on_actionRescaleBackgroundImage_triggered(); + void on_actionImportClipboard_triggered(); void on_labelFontSize_clicked(); @@ -123,6 +125,14 @@ void on_actionProgressiveOpacity_triggered(); void on_actionTornEdge_triggered(); + void on_actionAlignGroupLeft_triggered(); + void on_actionAlignHorizontalCenter_triggered(); + void on_actionAlignVerticalCenter_triggered(); + void on_actionAlignGroupRight_triggered(); + void on_actionAlignGroupTop_triggered(); + void on_actionAlignGroupBottom_triggered(); + void on_actionSetAlignment_triggered(); + void on_pushButtonResetColor_pressed(); void on_pushButtonSwapColor_pressed(); void setupRecentFilesMenu(); @@ -150,6 +160,7 @@ void updateHelp(); void updatePostEffectDefaultAction(QAction *); + void updateAlignmentDefaultAction(QAction *); void addRecentlyOpenedFile(const QString &fn, QStringList &lst); Ui::EditorWidgetClass *m_ui; diff -Nru hotshots-2.0.1/src/editor/GroupLayer.cpp hotshots-2.1.0/src/editor/GroupLayer.cpp --- hotshots-2.0.1/src/editor/GroupLayer.cpp 2013-11-01 15:49:54.000000000 +0000 +++ hotshots-2.1.0/src/editor/GroupLayer.cpp 2014-02-07 20:05:32.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/GroupLayer.h hotshots-2.1.0/src/editor/GroupLayer.h --- hotshots-2.0.1/src/editor/GroupLayer.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/GroupLayer.h 2014-02-07 20:06:08.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/io/FileParser.cpp hotshots-2.1.0/src/editor/io/FileParser.cpp --- hotshots-2.0.1/src/editor/io/FileParser.cpp 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/io/FileParser.cpp 2014-02-12 21:15:54.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShot: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -18,7 +18,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *******************************************************************************/ -#include #include #include #include @@ -99,7 +98,7 @@ if ( !success ) { // Failed : something wrong in model - LogHandler::getInstance()->reportError( tr("Saving failed for project %1 : %2").arg(filePath).arg( fileToWrite.errorString() ) ); + LogHandler::getInstance()->reportError( tr("Saving failed for project %1: %2").arg(filePath).arg( fileToWrite.errorString() ) ); } } else @@ -127,12 +126,12 @@ QDomElement root = m_domDocument.documentElement(); if ( root.tagName() != sTagProjectRoot ) { - LogHandler::getInstance()->reportError( tr("The file is not a \"Hotshots\" file !!") ); + LogHandler::getInstance()->reportError( tr("The file is not a \"Hotshots\" file!") ); return false; } if ( updateVersion() ) - LogHandler::getInstance()->reportInfo( tr("Configuration has been automatically updated !") ); + LogHandler::getInstance()->reportInfo( tr("Configuration has been automatically updated!") ); parse( m_domDocument.firstChildElement(), scn ); diff -Nru hotshots-2.0.1/src/editor/io/FileParser.h hotshots-2.1.0/src/editor/io/FileParser.h --- hotshots-2.0.1/src/editor/io/FileParser.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/io/FileParser.h 2014-02-07 20:06:00.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShot: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/io/IOHelper.cpp hotshots-2.1.0/src/editor/io/IOHelper.cpp --- hotshots-2.0.1/src/editor/io/IOHelper.cpp 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/io/IOHelper.cpp 2014-02-12 21:16:48.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -22,7 +22,6 @@ #include "LogHandler.h" -#include #include #include #include @@ -32,6 +31,7 @@ #include #include #include +#include IOHelper::IOHelper(void) {} diff -Nru hotshots-2.0.1/src/editor/io/IOHelper.h hotshots-2.1.0/src/editor/io/IOHelper.h --- hotshots-2.0.1/src/editor/io/IOHelper.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/io/IOHelper.h 2014-02-07 20:06:00.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/ItemFactory.h hotshots-2.1.0/src/editor/ItemFactory.h --- hotshots-2.0.1/src/editor/ItemFactory.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/ItemFactory.h 2014-02-07 20:05:32.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/ItemRegistering.cpp hotshots-2.1.0/src/editor/ItemRegistering.cpp --- hotshots-2.0.1/src/editor/ItemRegistering.cpp 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/ItemRegistering.cpp 2014-02-07 20:05:32.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/ItemRegistering.h hotshots-2.1.0/src/editor/ItemRegistering.h --- hotshots-2.0.1/src/editor/ItemRegistering.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/ItemRegistering.h 2014-02-07 20:05:32.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/items/BaseItem.cpp hotshots-2.1.0/src/editor/items/BaseItem.cpp --- hotshots-2.0.1/src/editor/items/BaseItem.cpp 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/items/BaseItem.cpp 2014-02-12 21:01:52.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -259,7 +259,7 @@ if ( !QRectF(line[i1],line[i2]).normalized().contains(newPos) ) continue; - if(qreal dist = abs( distancePointToLine(newPos, line[i1],line[i2]) ) < minDist) + if (abs( distancePointToLine(newPos, line[i1],line[i2]) ) < minDist) { insertPoint(i2,newPos,line); return true; diff -Nru hotshots-2.0.1/src/editor/items/BaseItem.h hotshots-2.1.0/src/editor/items/BaseItem.h --- hotshots-2.0.1/src/editor/items/BaseItem.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/items/BaseItem.h 2014-02-07 20:05:58.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/items/EditorArrowItem.cpp hotshots-2.1.0/src/editor/items/EditorArrowItem.cpp --- hotshots-2.0.1/src/editor/items/EditorArrowItem.cpp 2013-11-01 15:53:34.000000000 +0000 +++ hotshots-2.1.0/src/editor/items/EditorArrowItem.cpp 2014-02-07 20:05:58.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/items/EditorArrowItem.h hotshots-2.1.0/src/editor/items/EditorArrowItem.h --- hotshots-2.0.1/src/editor/items/EditorArrowItem.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/items/EditorArrowItem.h 2014-02-07 20:05:58.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/items/EditorBlurItem.cpp hotshots-2.1.0/src/editor/items/EditorBlurItem.cpp --- hotshots-2.0.1/src/editor/items/EditorBlurItem.cpp 2013-11-01 15:53:24.000000000 +0000 +++ hotshots-2.1.0/src/editor/items/EditorBlurItem.cpp 2014-02-07 20:05:56.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/items/EditorBlurItem.h hotshots-2.1.0/src/editor/items/EditorBlurItem.h --- hotshots-2.0.1/src/editor/items/EditorBlurItem.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/items/EditorBlurItem.h 2014-02-07 20:05:56.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/items/EditorCropItem.cpp hotshots-2.1.0/src/editor/items/EditorCropItem.cpp --- hotshots-2.0.1/src/editor/items/EditorCropItem.cpp 2013-11-01 15:53:12.000000000 +0000 +++ hotshots-2.1.0/src/editor/items/EditorCropItem.cpp 2014-02-07 20:05:56.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/items/EditorCropItem.h hotshots-2.1.0/src/editor/items/EditorCropItem.h --- hotshots-2.0.1/src/editor/items/EditorCropItem.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/items/EditorCropItem.h 2014-02-07 20:05:56.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/items/EditorCurveItem.cpp hotshots-2.1.0/src/editor/items/EditorCurveItem.cpp --- hotshots-2.0.1/src/editor/items/EditorCurveItem.cpp 2013-11-01 15:52:54.000000000 +0000 +++ hotshots-2.1.0/src/editor/items/EditorCurveItem.cpp 2014-02-12 21:05:58.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -91,7 +91,7 @@ void EditorCurveItem::mousePress ( QGraphicsSceneMouseEvent * mouseEvent ) { if ( (!m_initialized && mouseEvent->button() == Qt::RightButton) || - m_initialized && mouseEvent->button() == Qt::LeftButton ) // to avoid move by post selection of item + (m_initialized && mouseEvent->button() == Qt::LeftButton) ) // to avoid move by post selection of item return; QPointF newPos = mapFromScene( mouseEvent->scenePos() ); diff -Nru hotshots-2.0.1/src/editor/items/EditorCurveItem.h hotshots-2.1.0/src/editor/items/EditorCurveItem.h --- hotshots-2.0.1/src/editor/items/EditorCurveItem.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/items/EditorCurveItem.h 2014-02-07 20:05:54.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/items/EditorEllipseItem.cpp hotshots-2.1.0/src/editor/items/EditorEllipseItem.cpp --- hotshots-2.0.1/src/editor/items/EditorEllipseItem.cpp 2013-11-01 15:52:32.000000000 +0000 +++ hotshots-2.1.0/src/editor/items/EditorEllipseItem.cpp 2014-02-07 20:05:54.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/items/EditorEllipseItem.h hotshots-2.1.0/src/editor/items/EditorEllipseItem.h --- hotshots-2.0.1/src/editor/items/EditorEllipseItem.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/items/EditorEllipseItem.h 2014-02-07 20:05:54.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/items/EditorEncircleItem.cpp hotshots-2.1.0/src/editor/items/EditorEncircleItem.cpp --- hotshots-2.0.1/src/editor/items/EditorEncircleItem.cpp 2013-11-01 15:52:22.000000000 +0000 +++ hotshots-2.1.0/src/editor/items/EditorEncircleItem.cpp 2014-02-07 20:05:52.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/items/EditorEncircleItem.h hotshots-2.1.0/src/editor/items/EditorEncircleItem.h --- hotshots-2.0.1/src/editor/items/EditorEncircleItem.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/items/EditorEncircleItem.h 2014-02-07 20:05:52.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/items/EditorHighlighterItem.cpp hotshots-2.1.0/src/editor/items/EditorHighlighterItem.cpp --- hotshots-2.0.1/src/editor/items/EditorHighlighterItem.cpp 2013-11-01 15:52:10.000000000 +0000 +++ hotshots-2.1.0/src/editor/items/EditorHighlighterItem.cpp 2014-02-07 20:05:52.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/items/EditorHighlighterItem.h hotshots-2.1.0/src/editor/items/EditorHighlighterItem.h --- hotshots-2.0.1/src/editor/items/EditorHighlighterItem.h 2013-11-01 15:52:00.000000000 +0000 +++ hotshots-2.1.0/src/editor/items/EditorHighlighterItem.h 2014-02-07 20:05:52.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/items/EditorImageItem.cpp hotshots-2.1.0/src/editor/items/EditorImageItem.cpp --- hotshots-2.0.1/src/editor/items/EditorImageItem.cpp 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/items/EditorImageItem.cpp 2014-02-07 20:05:52.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/items/EditorImageItem.h hotshots-2.1.0/src/editor/items/EditorImageItem.h --- hotshots-2.0.1/src/editor/items/EditorImageItem.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/items/EditorImageItem.h 2014-02-07 20:05:50.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/items/EditorLineItem.cpp hotshots-2.1.0/src/editor/items/EditorLineItem.cpp --- hotshots-2.0.1/src/editor/items/EditorLineItem.cpp 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/items/EditorLineItem.cpp 2014-02-07 20:05:50.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/items/EditorLineItem.h hotshots-2.1.0/src/editor/items/EditorLineItem.h --- hotshots-2.0.1/src/editor/items/EditorLineItem.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/items/EditorLineItem.h 2014-02-07 20:05:50.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/items/EditorMagnifierItem.cpp hotshots-2.1.0/src/editor/items/EditorMagnifierItem.cpp --- hotshots-2.0.1/src/editor/items/EditorMagnifierItem.cpp 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/items/EditorMagnifierItem.cpp 2014-02-07 20:05:50.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/items/EditorMagnifierItem.h hotshots-2.1.0/src/editor/items/EditorMagnifierItem.h --- hotshots-2.0.1/src/editor/items/EditorMagnifierItem.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/items/EditorMagnifierItem.h 2014-02-07 20:05:48.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/items/EditorPolygonItem.cpp hotshots-2.1.0/src/editor/items/EditorPolygonItem.cpp --- hotshots-2.0.1/src/editor/items/EditorPolygonItem.cpp 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/items/EditorPolygonItem.cpp 2014-02-12 21:05:12.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -72,7 +72,7 @@ void EditorPolygonItem::mousePress ( QGraphicsSceneMouseEvent * mouseEvent ) { if ( (!m_initialized && mouseEvent->button() == Qt::RightButton) || - m_initialized && mouseEvent->button() == Qt::LeftButton ) // to avoid move by post selection of item + (m_initialized && mouseEvent->button() == Qt::LeftButton) ) // to avoid move by post selection of item return; QPointF newPos = mapFromScene( mouseEvent->scenePos() ); diff -Nru hotshots-2.0.1/src/editor/items/EditorPolygonItem.h hotshots-2.1.0/src/editor/items/EditorPolygonItem.h --- hotshots-2.0.1/src/editor/items/EditorPolygonItem.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/items/EditorPolygonItem.h 2014-02-07 20:05:48.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/items/EditorPolylineItem.cpp hotshots-2.1.0/src/editor/items/EditorPolylineItem.cpp --- hotshots-2.0.1/src/editor/items/EditorPolylineItem.cpp 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/items/EditorPolylineItem.cpp 2014-02-12 21:05:30.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -63,7 +63,7 @@ void EditorPolylineItem::mousePress ( QGraphicsSceneMouseEvent * mouseEvent ) { if ( (!m_initialized && mouseEvent->button() == Qt::RightButton) || - m_initialized && mouseEvent->button() == Qt::LeftButton ) // to avoid move by post selection of item + (m_initialized && mouseEvent->button() == Qt::LeftButton) ) // to avoid move by post selection of item return; QPointF newPos = mapFromScene( mouseEvent->scenePos() ); diff -Nru hotshots-2.0.1/src/editor/items/EditorPolylineItem.h hotshots-2.1.0/src/editor/items/EditorPolylineItem.h --- hotshots-2.0.1/src/editor/items/EditorPolylineItem.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/items/EditorPolylineItem.h 2014-02-07 20:05:46.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/items/EditorRectangleItem.cpp hotshots-2.1.0/src/editor/items/EditorRectangleItem.cpp --- hotshots-2.0.1/src/editor/items/EditorRectangleItem.cpp 2013-11-01 15:54:58.000000000 +0000 +++ hotshots-2.1.0/src/editor/items/EditorRectangleItem.cpp 2014-02-07 20:05:46.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/items/EditorRectangleItem.h hotshots-2.1.0/src/editor/items/EditorRectangleItem.h --- hotshots-2.0.1/src/editor/items/EditorRectangleItem.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/items/EditorRectangleItem.h 2014-02-07 20:05:46.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/items/EditorTagItem.cpp hotshots-2.1.0/src/editor/items/EditorTagItem.cpp --- hotshots-2.0.1/src/editor/items/EditorTagItem.cpp 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/items/EditorTagItem.cpp 2014-02-07 20:05:46.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/items/EditorTagItem.h hotshots-2.1.0/src/editor/items/EditorTagItem.h --- hotshots-2.0.1/src/editor/items/EditorTagItem.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/items/EditorTagItem.h 2014-02-07 20:05:44.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/items/EditorTextItem.cpp hotshots-2.1.0/src/editor/items/EditorTextItem.cpp --- hotshots-2.0.1/src/editor/items/EditorTextItem.cpp 2013-11-01 15:54:46.000000000 +0000 +++ hotshots-2.1.0/src/editor/items/EditorTextItem.cpp 2014-02-07 20:05:44.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -203,7 +203,7 @@ HandgripItem::syncHandgrips( m_item->boundingRect(), m_handgrips ); } -void EditorTextItem::setCenterPoint(const QPointF point) +void EditorTextItem::setCenterPoint(const QPointF &point) { m_centerPoint = point; textChanged(); @@ -243,7 +243,8 @@ void EditorTextItem::toXml(QDomElement &elt) const { - elt.setAttribute( "pos", IOHelper::variantToString( m_centerPoint + m_item->pos() ) ); + //elt.setAttribute( "pos", IOHelper::variantToString( m_centerPoint + m_item->pos() ) ); + elt.setAttribute( "pos", IOHelper::variantToString( scenePos() ) ); elt.setAttribute( "color", IOHelper::variantToString( m_item->defaultTextColor() ) ); elt.setAttribute( "bgColor", IOHelper::variantToString( m_brush.color() ) ); elt.setAttribute( "text", IOHelper::variantToString( m_item->toPlainText() ) ); diff -Nru hotshots-2.0.1/src/editor/items/EditorTextItem.h hotshots-2.1.0/src/editor/items/EditorTextItem.h --- hotshots-2.0.1/src/editor/items/EditorTextItem.h 2013-11-01 15:54:08.000000000 +0000 +++ hotshots-2.1.0/src/editor/items/EditorTextItem.h 2014-02-07 20:05:42.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -55,7 +55,7 @@ virtual void setBrush(const QBrush &b); virtual void setFont(const QFont &); - void setCenterPoint(const QPointF point); + void setCenterPoint(const QPointF &point); void activateEditor(); virtual QRectF boundingRect() const; diff -Nru hotshots-2.0.1/src/editor/items/EditorUndoCommand.cpp hotshots-2.1.0/src/editor/items/EditorUndoCommand.cpp --- hotshots-2.0.1/src/editor/items/EditorUndoCommand.cpp 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/items/EditorUndoCommand.cpp 2014-02-07 20:05:42.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/items/EditorUndoCommand.h hotshots-2.1.0/src/editor/items/EditorUndoCommand.h --- hotshots-2.0.1/src/editor/items/EditorUndoCommand.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/items/EditorUndoCommand.h 2014-02-07 20:05:42.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/items/HandgripItem.cpp hotshots-2.1.0/src/editor/items/HandgripItem.cpp --- hotshots-2.0.1/src/editor/items/HandgripItem.cpp 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/items/HandgripItem.cpp 2014-02-07 20:05:42.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/items/HandgripItem.h hotshots-2.1.0/src/editor/items/HandgripItem.h --- hotshots-2.0.1/src/editor/items/HandgripItem.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/items/HandgripItem.h 2014-02-07 20:05:40.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/items/SimpleTextItem.cpp hotshots-2.1.0/src/editor/items/SimpleTextItem.cpp --- hotshots-2.0.1/src/editor/items/SimpleTextItem.cpp 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/items/SimpleTextItem.cpp 2014-02-07 20:05:40.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/items/SimpleTextItem.h hotshots-2.1.0/src/editor/items/SimpleTextItem.h --- hotshots-2.0.1/src/editor/items/SimpleTextItem.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/items/SimpleTextItem.h 2014-02-07 20:05:40.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/items/TagManager.cpp hotshots-2.1.0/src/editor/items/TagManager.cpp --- hotshots-2.0.1/src/editor/items/TagManager.cpp 2013-11-26 21:48:12.000000000 +0000 +++ hotshots-2.1.0/src/editor/items/TagManager.cpp 2014-02-07 20:05:38.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/items/TagManager.h hotshots-2.1.0/src/editor/items/TagManager.h --- hotshots-2.0.1/src/editor/items/TagManager.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/items/TagManager.h 2014-02-07 20:05:38.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/PaletteBarWidget.cpp hotshots-2.1.0/src/editor/PaletteBarWidget.cpp --- hotshots-2.0.1/src/editor/PaletteBarWidget.cpp 2013-11-01 15:49:38.000000000 +0000 +++ hotshots-2.1.0/src/editor/PaletteBarWidget.cpp 2014-02-07 20:05:30.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/PaletteBarWidget.h hotshots-2.1.0/src/editor/PaletteBarWidget.h --- hotshots-2.0.1/src/editor/PaletteBarWidget.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/PaletteBarWidget.h 2014-02-07 20:05:30.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/PaletteWidget.cpp hotshots-2.1.0/src/editor/PaletteWidget.cpp --- hotshots-2.0.1/src/editor/PaletteWidget.cpp 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/PaletteWidget.cpp 2014-02-07 20:05:30.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/PaletteWidget.h hotshots-2.1.0/src/editor/PaletteWidget.h --- hotshots-2.0.1/src/editor/PaletteWidget.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/PaletteWidget.h 2014-02-07 20:05:28.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/widgets/WidgetBase.cpp hotshots-2.1.0/src/editor/widgets/WidgetBase.cpp --- hotshots-2.0.1/src/editor/widgets/WidgetBase.cpp 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/widgets/WidgetBase.cpp 2014-02-07 20:05:38.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/widgets/WidgetBase.h hotshots-2.1.0/src/editor/widgets/WidgetBase.h --- hotshots-2.0.1/src/editor/widgets/WidgetBase.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/widgets/WidgetBase.h 2014-02-07 20:06:14.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/widgets/WidgetBrush.cpp hotshots-2.1.0/src/editor/widgets/WidgetBrush.cpp --- hotshots-2.0.1/src/editor/widgets/WidgetBrush.cpp 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/widgets/WidgetBrush.cpp 2014-02-07 20:05:38.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/widgets/WidgetBrush.h hotshots-2.1.0/src/editor/widgets/WidgetBrush.h --- hotshots-2.0.1/src/editor/widgets/WidgetBrush.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/widgets/WidgetBrush.h 2014-02-07 20:06:14.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/widgets/WidgetColor.cpp hotshots-2.1.0/src/editor/widgets/WidgetColor.cpp --- hotshots-2.0.1/src/editor/widgets/WidgetColor.cpp 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/widgets/WidgetColor.cpp 2014-02-07 20:05:36.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/widgets/WidgetColor.h hotshots-2.1.0/src/editor/widgets/WidgetColor.h --- hotshots-2.0.1/src/editor/widgets/WidgetColor.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/widgets/WidgetColor.h 2014-02-07 20:06:12.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/widgets/WidgetDashStyle.cpp hotshots-2.1.0/src/editor/widgets/WidgetDashStyle.cpp --- hotshots-2.0.1/src/editor/widgets/WidgetDashStyle.cpp 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/widgets/WidgetDashStyle.cpp 2014-02-07 20:05:36.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/widgets/WidgetDashStyle.h hotshots-2.1.0/src/editor/widgets/WidgetDashStyle.h --- hotshots-2.0.1/src/editor/widgets/WidgetDashStyle.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/widgets/WidgetDashStyle.h 2014-02-07 20:06:12.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/widgets/WidgetFillStyle.cpp hotshots-2.1.0/src/editor/widgets/WidgetFillStyle.cpp --- hotshots-2.0.1/src/editor/widgets/WidgetFillStyle.cpp 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/widgets/WidgetFillStyle.cpp 2014-02-10 22:42:16.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -114,11 +114,11 @@ break; case FillWithTranslucentBackground: - return tr ("Fill with translucent Background Color"); + return tr ("Fill with transparent background color"); break; case FillWithBackground: - return tr ("Fill with Background Color"); + return tr ("Fill with background color"); break; default: diff -Nru hotshots-2.0.1/src/editor/widgets/WidgetFillStyle.h hotshots-2.1.0/src/editor/widgets/WidgetFillStyle.h --- hotshots-2.0.1/src/editor/widgets/WidgetFillStyle.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/widgets/WidgetFillStyle.h 2014-02-07 20:06:12.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/widgets/WidgetLineWidth.cpp hotshots-2.1.0/src/editor/widgets/WidgetLineWidth.cpp --- hotshots-2.0.1/src/editor/widgets/WidgetLineWidth.cpp 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/widgets/WidgetLineWidth.cpp 2014-02-07 20:05:34.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/editor/widgets/WidgetLineWidth.h hotshots-2.1.0/src/editor/widgets/WidgetLineWidth.h --- hotshots-2.0.1/src/editor/widgets/WidgetLineWidth.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/editor/widgets/WidgetLineWidth.h 2014-02-07 20:06:10.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/FreehandGrabber.cpp hotshots-2.1.0/src/FreehandGrabber.cpp --- hotshots-2.0.1/src/FreehandGrabber.cpp 2014-01-23 16:59:50.000000000 +0000 +++ hotshots-2.1.0/src/FreehandGrabber.cpp 2014-02-07 20:05:20.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/FreehandGrabber.h hotshots-2.1.0/src/FreehandGrabber.h --- hotshots-2.0.1/src/FreehandGrabber.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/FreehandGrabber.h 2014-02-07 20:05:18.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/GrabManager.cpp hotshots-2.1.0/src/GrabManager.cpp --- hotshots-2.0.1/src/GrabManager.cpp 2014-01-18 21:05:40.000000000 +0000 +++ hotshots-2.1.0/src/GrabManager.cpp 2014-02-08 11:20:28.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -40,7 +40,8 @@ m_mode(GRAB_ALL_SCREENS), m_defaultMode(GRAB_ALL_SCREENS), m_stop(false), - m_captureDecoration(true) + m_captureDecoration(true), + m_addMouseCursor(false) { } @@ -144,8 +145,13 @@ if (wRect.contains(mpos)) { - QPixmap curs(":/hotshots/cursor.png"); + //QPixmap curs(":/hotshots/cursor.png"); + + QPoint hotspot; + QPixmap curs = WindowGrabber::grabCursor(hotspot); + qDebug() <<"hotspot"<show(); + } MainWindow w; QObject::connect( &app, SIGNAL( messageAvailable(const QString &) ), &w, SLOT( wakeUp(const QString &) ) ); @@ -171,7 +176,7 @@ if (splashscreenAtStartup) { if (!startInTray) - sScreen.delayedFinish(&w); + sScreen->delayedFinish(&w); } { diff -Nru hotshots-2.0.1/src/MainWindow.cpp hotshots-2.1.0/src/MainWindow.cpp --- hotshots-2.0.1/src/MainWindow.cpp 2014-01-24 20:37:14.000000000 +0000 +++ hotshots-2.1.0/src/MainWindow.cpp 2014-02-10 22:37:04.000000000 +0000 @@ -1,1320 +1,1363 @@ - -/****************************************************************************** - HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net - - 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 - *******************************************************************************/ - -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#ifndef Q_WS_PM // OS/2 -#include -#endif - -#include "MainWindow.h" -#include "ui_MainWindow.h" - -#include "AppSettings.h" -#include "MiscFunctions.h" -#include "AboutDialog.h" -#include "GrabManager.h" -#include "PostEffect.h" -#include "LogHandler.h" - -#include "EditorWidget.h" - -#include "BaseUploader.h" -#include "UploaderRegistering.h" -#include "UploaderManager.h" -#include "NameManager.h" - -const int blinkInterval = 500; -const int blinkNumber = 6; -const int minDelayForRepeat = 5; - -MainWindow::MainWindow(QWidget *parent) : - QMainWindow(parent), - ui(new Ui::MainWindowClass), - m_version(PACKAGE_VERSION), - m_appName(PACKAGE_NAME), - m_splashscreenAtStartup(true), - m_splashscreenTransparentBackground(true), - m_startInTray(false), - m_autoCopyToClipboard(false), - m_startWithSystem(false), - m_delay(0), - m_captureWindowWithDecoration(true), - m_playSound(false), - m_hideUIForSnapshot(true), - m_about(NULL), - m_trayIcon(NULL), - m_trayIconMenu(NULL), - m_firstCloseMessage(false), - m_grabber(NULL), - m_useGlobalHotKey(false), - m_globalHotkeyGrabScreen("F5"), - m_globalHotkeyGrabAllScreens("Ctrl+Alt+F5"), - m_globalHotkeyGrabWindow("Ctrl+F5"), - m_globalHotkeyGrabRegion("Alt+F5"), - m_globalHotkeyGrabFreehand("Shift+Alt+F5"), -#ifndef Q_WS_PM // OS/2 - m_globShortCutGrabScreen(NULL), - m_globShortCutGrabAllScreens(NULL), - m_globShortCutGrabWindow(NULL), - m_globShortCutGrabRegion(NULL), - m_globShortCutGrabFreehand(NULL), -#endif - m_grabMode(GrabManager::GRAB_ALL_SCREENS), - m_doAfterShot(DO_NOTHING), - m_scaleImage(false), - m_scaleValue(100), - m_maxSnapshotSize( QSize(800,600) ), - m_modeScaleSnapshot(SCALE_BY_PERCENT), - m_postEffect(PostEffect::EFFECT_NONE), - m_rotateImage(false), - m_angle(0.0), - m_snapshotEditor(NULL), - m_wasHidden(false), - m_labelSize(NULL), - m_copyUploadedUrlToClipboard(true), - m_clipboardUrlFormat(BaseUploader::FORMAT_NONE), - m_userUrlFormat("@url@"), - m_defaultUploader(-1), - m_forceBgColor(false), - m_bgColor( QColor(Qt::white) ), - m_launchBrowserWhenDone(false), - m_grabWithMouseCursor(false) -{ - ui->setupUi(this); - updateUi(); - loadSettings(); - - // setup global key menu - initGlobalKeys(); -} - -MainWindow::~MainWindow() -{ - saveSettings(); - delete ui; - delete m_snapshotEditor; - UploaderManager::clear(); -} - -void MainWindow::on_actionQuit_triggered() -{ - QApplication::exit(0); -} - -void MainWindow::on_pushButtonOutputPath_pressed() -{ - QString dir = QFileDialog::getExistingDirectory(this, tr("Save Directory"), - NameManager::lastSnapshotDirectory, - QFileDialog::ShowDirsOnly - | QFileDialog::DontResolveSymlinks); - - if ( !dir.isEmpty() ) - { - NameManager::lastSnapshotDirectory = dir; - ui->lineEditOutputPath->setText(NameManager::lastSnapshotDirectory); - } -} - -void MainWindow::updateApplicationIdentity() -{ - QString title = m_appName + " - " + m_version; - if ( !m_currPixmap.isNull() ) - title += QString(" - %1x%2").arg( m_currPixmap.width() ).arg( m_currPixmap.height() ); - setWindowTitle(title); -} - -void MainWindow::updateUi() -{ - - - setStatusBar(NULL); //remove status bar - - QWidget* spacer = new QWidget(); - spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); - ui->mainToolBar->insertWidget(ui->actionHelp,spacer); - - // setup app name, release, ... - updateApplicationIdentity(); - - // uploader registering - int nb = UploaderRegistering::registerAll(); - LogHandler::getInstance()->reportDebug( tr("Register of %1 uploaders").arg(nb) ); - const QList list = UploaderManager::getUploaders(); - foreach (BaseUploader * up, list) - connect( up,SIGNAL( newUrl(const QString &) ),this, SLOT( readResultUrl(const QString &) ) ); - - initEditor(); - - m_about = new AboutDialog(this); - - // not yet functional !! - m_about->checkBoxGrabWithMouseCursor->hide(); - - connect( m_about,SIGNAL( restart() ),this,SLOT( restart() ) ); - connect( m_about, SIGNAL( accepted() ), this, SLOT( setPreferences() ) ); - - // add completer to line edit - QCompleter *completerFile = new QCompleter(this); - QDirModel *dirModelFile = new QDirModel(completerFile); - dirModelFile->setFilter(QDir::Dirs); - completerFile->setModel(dirModelFile); - ui->lineEditOutputPath->setCompleter(completerFile); - - createActionsSystemTray(); - createTrayIcon(); - - m_grabber = new GrabManager(this); - - //connect( m_grabber,SIGNAL( showMainInterface() ),this,SLOT( restoreDisplayState() ) ); - connect( m_grabber,SIGNAL( hideMainInterface() ),this,SLOT( saveDisplayState() ) ); - connect( m_grabber,SIGNAL( newSnapshot(const QPixmap &) ),this,SLOT( processNewSnapshot(const QPixmap &) ) ); - - // setup "blinking" timer - m_blinkTimer.setInterval(blinkInterval); - connect( &m_blinkTimer, SIGNAL( timeout() ), this, SLOT( blink() ) ); - - // post process class - //m_postProcess = new PostEffect(this); - - // add a label to display the size of the current snapshot) -// m_labelSize = new QLabel(this); -// QMainWindow::statusBar()->addPermanentWidget(m_labelSize); - - // temp storage check - QString tmpPath = MiscFunctions::getValidStorage(); - - if ( !QDir(tmpPath).exists() ) - { - if ( !QDir::home().mkpath(tmpPath) ) - QMessageBox::warning( this,m_appName,tr("Can't create storage location, check why ?! (%1)").arg(tmpPath) ); - } - - // init combo box - ui->comboBoxMode->addItem(ui->actionGrabScreen->text(),GrabManager::GRAB_ALL_SCREENS); - ui->comboBoxMode->addItem(ui->actionGrabAllScreens->text(),GrabManager::GRAB_CURRENT_SCREEN); - ui->comboBoxMode->addItem(ui->actionGrabWindow->text(),GrabManager::GRAB_WINDOW_UNDER_CURSOR); - ui->comboBoxMode->addItem(ui->actionGrabRegion->text(),GrabManager::GRAB_RECTANGULAR_REGION); - ui->comboBoxMode->addItem(ui->actionGrabFreehandRegion->text(),GrabManager::GRAB_FREEHAND_REGION); - -#ifdef Q_WS_PM // OS/2 - ui->actionGrabWindow->setEnabled(false); // not yet available, sorry ! -#endif -} - -//----------------------------------------------------------------------- -// Save/Restore parameters functions -//----------------------------------------------------------------------- - -void MainWindow::saveSettings() -{ - AppSettings settings; - - settings.beginGroup("MainWindow"); - - settings.setValue( "MainWindowState",saveState(0) ); - - settings.setValue( "size", size() ); - settings.setValue( "pos", pos() ); - - // save the screen number for the splashsreeen ... - if ( QApplication::desktop()->isVirtualDesktop() ) - settings.setValue( "screenNumber", QApplication::desktop()->screenNumber( pos() ) ); - else - settings.setValue( "screenNumber", QApplication::desktop()->screenNumber(this) ); - - settings.setValue( "screenNumber", QApplication::desktop()->screenNumber(this) ); - - settings.beginGroup("Shortcuts"); - - // Save shortcuts - QList childrens; - childrens = children(); - QListIterator iterator(childrens); - while( iterator.hasNext() ) - { - QObject *object = iterator.next(); - QString classe = object->metaObject()->className(); - if( classe == "QAction" ) - { - QString text = object->objectName(); - QString shortcut = ( (QAction *)object )->shortcut(); - //if( !shortcut.isEmpty() ) - settings.setValue(text, shortcut); - } - } - settings.endGroup(); - - settings.endGroup(); - - settings.beginGroup("Application"); - - settings.setValue("splashscreenAtStartup", m_splashscreenAtStartup); - settings.setValue("splashscreenTransparentBackground", m_splashscreenTransparentBackground); - settings.setValue("startInTray", m_startInTray); - settings.setValue("currentLanguage", m_currentLanguage); - - settings.setValue("lastSnapshotDirectory", NameManager::lastSnapshotDirectory); - settings.setValue("autoCopyToClipboard", m_autoCopyToClipboard); - settings.setValue("captureWindowWithoutDecoration", m_captureWindowWithDecoration); - settings.setValue("playSound", m_playSound); - settings.setValue("hideUIForSnapshot", m_hideUIForSnapshot); - settings.setValue("startWithSystem", m_startWithSystem); - - settings.setValue("useGlobalHotKey", m_useGlobalHotKey); - settings.setValue("globalHotkeyGrabScreen", m_globalHotkeyGrabScreen); - settings.setValue("globalHotkeyGrabAllScreens", m_globalHotkeyGrabAllScreens); - settings.setValue("globalHotkeyGrabWindow", m_globalHotkeyGrabWindow); - settings.setValue("globalHotkeyGrabRegion", m_globalHotkeyGrabRegion); - settings.setValue("globalHotkeyGrabFreehand", m_globalHotkeyGrabFreehand); - - settings.setValue("lastSnapshotName", NameManager::lastSnapshotName); - settings.setValue("defaultOutputFormat", NameManager::defaultOutputFormat); - - settings.setValue("addDateTime", NameManager::addDateTime); - settings.setValue("formatDateTime", NameManager::formatDateTime); - - settings.setValue("delay", m_delay); - - settings.setValue("grabMode", m_grabMode); - settings.setValue("doAfterShot", m_doAfterShot); - - settings.setValue("scaleImage", m_scaleImage); - settings.setValue("modeScaleSnapshot", m_modeScaleSnapshot); - settings.setValue("scaleValue", m_scaleValue); - settings.setValue("maxSize", m_maxSnapshotSize); - - settings.setValue("postEffect", m_postEffect); - settings.setValue("rotateImage", m_rotateImage); - settings.setValue("angle", m_angle); - - settings.setValue("defaultUploader", m_defaultUploader); - - settings.setValue("forceBgColor", m_forceBgColor); - settings.setValue("bgColor", m_bgColor); - - settings.setValue("launchBrowserWhenDone", m_launchBrowserWhenDone); - - settings.setValue("grabWithMouseCursor", m_grabWithMouseCursor); - - settings.endGroup(); - - settings.beginGroup("Proxy"); - - settings.setValue("useProxy", m_proxiParams.useProxy); - settings.setValue("proxyHostname", m_proxiParams.proxyHostname); - settings.setValue("proxyPort", m_proxiParams.proxyPort); - settings.setValue("useProxyAuthentification", m_proxiParams.useProxyAuthentification); - settings.setValue("proxyUsername", m_proxiParams.proxyUsername); - settings.setValue( "proxyPassword", MiscFunctions::base64Encode(m_proxiParams.proxyPassword) ); // in order to store unreadable password - settings.setValue("showProxyPassword", m_proxiParams.showProxyPassword); - - settings.endGroup(); - - settings.beginGroup("UrlToClipboard"); - - settings.setValue("copyUploadedUrlToClipboard", m_copyUploadedUrlToClipboard); - settings.setValue("clipboardUrlFormat", m_clipboardUrlFormat); - settings.setValue("userUrlFormat", m_userUrlFormat); - - settings.endGroup(); -} - -void MainWindow::loadSettings() -{ - AppSettings settings; - - settings.beginGroup("MainWindow"); - - restoreState(settings.value("MainWindowState").toByteArray(), 0); - - resize( settings.value( "size", QSize(400, 400) ).toSize() ); - move( settings.value( "pos", QPoint(200, 200) ).toPoint() ); - - // check if restore position isn't outside the current screen definitions (additional screen has been unplugged) - if (QApplication::desktop()->screenNumber( pos() ) < 0) - move( QPoint(200, 200) ); - - settings.beginGroup("Shortcuts"); - - // Load shortcuts - QList childrens; - childrens = children(); - QListIterator iterator(childrens); - while( iterator.hasNext() ) - { - QObject *object = iterator.next(); - QString classe = object->metaObject()->className(); - if( classe == "QAction" ) - { - QString text = object->objectName(); - QString shortcut = ( (QAction *)object )->shortcut(); - if( !text.isEmpty() ) - { - shortcut = settings.value(text, shortcut).toString(); - ( (QAction *)object )->setShortcut( shortcut ); - - // update the tooltip - if ( !shortcut.isEmpty() ) - { - // strip the (...) if needed - QString tooltip = ( (QAction *)object )->toolTip().replace(QRegExp(" \\(.*\\)$"),""); - ( (QAction *)object )->setToolTip(tooltip + " (" + shortcut + ")"); - } - } - } - } - settings.endGroup(); - - settings.endGroup(); - - settings.beginGroup("Application"); - - m_splashscreenAtStartup = settings.value( "splashscreenAtStartup", true).toBool(); - m_splashscreenTransparentBackground = settings.value("splashscreenTransparentBackground",true).toBool(); - - m_startInTray = settings.value("startInTray",false).toBool(); - - // start hidden => no message - if (m_startInTray) - m_firstCloseMessage = true; - - m_currentLanguage = settings.value("currentLanguage","auto").toString(); - - if ( m_currentLanguage.isEmpty() ) - m_currentLanguage = QLocale::system().name().left(2); - - NameManager::lastSnapshotDirectory = settings.value("lastSnapshotDirectory","/home").toString(); - ui->lineEditOutputPath->setText(NameManager::lastSnapshotDirectory); - - m_autoCopyToClipboard = settings.value("autoCopyToClipboard",false).toBool(); - m_captureWindowWithDecoration = settings.value("captureWindowWithoutDecoration",true).toBool(); - m_grabber->setCaptureDecoration(m_captureWindowWithDecoration); - m_startWithSystem = settings.value("startWithSystem",false).toBool(); - - //setStartWithSystem(m_startWithSystem); - m_playSound = settings.value("playSound",false).toBool(); - m_hideUIForSnapshot = settings.value("hideUIForSnapshot",true).toBool(); - - m_useGlobalHotKey = settings.value("useGlobalHotKey",false).toBool(); - m_globalHotkeyGrabScreen = settings.value("globalHotkeyGrabScreen","F5").toString(); - m_globalHotkeyGrabAllScreens = settings.value("globalHotkeyGrabAllScreens","Ctrl+Alt+F5").toString(); - m_globalHotkeyGrabWindow = settings.value("globalHotkeyGrabWindow","Ctrl+F5").toString(); - m_globalHotkeyGrabRegion = settings.value("globalHotkeyGrabRegion","Alt+F5").toString(); - m_globalHotkeyGrabFreehand = settings.value("globalHotkeyGrabFreehand","Shift+Alt+F5").toString(); - - NameManager::lastSnapshotName = settings.value("lastSnapshotName","snapshot").toString(); - - NameManager::defaultOutputFormat = settings.value("defaultOutputFormat","PNG").toString(); - - NameManager::addDateTime = settings.value("addDateTime",false).toBool(); - NameManager::formatDateTime = settings.value("formatDateTime","yyyy-MM-dd-hh-mm-ss").toString(); - - m_delay = settings.value("delay",0).toInt(); - ui->spinBoxDelay->setValue(m_delay); - - m_grabMode = settings.value("grabMode",0).toInt(); - ui->comboBoxMode->setCurrentIndex(m_grabMode); - m_grabber->setDefaultMode(m_grabMode); - - m_doAfterShot = settings.value("doAfterShot",0).toInt(); - ui->comboBoxAfterShot->setCurrentIndex(m_doAfterShot); - - m_scaleImage = settings.value("scaleImage",false).toBool(); - m_modeScaleSnapshot = settings.value("modeScaleSnapshot",SCALE_BY_PERCENT).toInt(); - - m_scaleValue = settings.value("scaleValue",100).toInt(); - - m_maxSnapshotSize = settings.value( "maxSize",QSize(800,600) ).toSize(); - - m_postEffect = settings.value("postEffect",PostEffect::EFFECT_NONE).toInt(); - m_rotateImage = settings.value("rotateImage",false).toBool(); - m_angle = settings.value("angle",false).toFloat(); - - m_defaultUploader = settings.value("defaultUploader",-1).toInt(); - - m_forceBgColor = settings.value("forceBgColor",false).toBool(); - m_bgColor = settings.value( "bgColor",QColor(Qt::white) ).value(); - - m_launchBrowserWhenDone = settings.value("launchBrowserWhenDone",false).toBool(); - - m_grabWithMouseCursor = settings.value("grabWithMouseCursor",false).toBool(); - m_grabber->setAddMouseCursor(m_grabWithMouseCursor); - - settings.endGroup(); - - settings.beginGroup("Proxy"); - - m_proxiParams.useProxy = settings.value("useProxy",false).toBool(); - m_proxiParams.proxyHostname = settings.value("proxyHostname","").toString(); - m_proxiParams.proxyPort = settings.value("proxyPort",BaseUploader::defaultProxyPort).toInt(); - m_proxiParams.useProxyAuthentification = settings.value("useProxyAuthentification",false).toBool(); - m_proxiParams.proxyUsername = settings.value("proxyUsername","").toString(); - m_proxiParams.proxyPassword = MiscFunctions::base64Decode( settings.value("proxyPassword","").toString() ); // decode encode password - m_proxiParams.showProxyPassword = settings.value("showProxyPassword",false).toBool(); - - settings.endGroup(); - - settings.beginGroup("UrlToClipboard"); - - m_copyUploadedUrlToClipboard = settings.value("copyUploadedUrlToClipboard",false).toBool(); - m_clipboardUrlFormat = settings.value("clipboardUrlFormat",BaseUploader::defaultUrlFormat).toInt(); - m_userUrlFormat = settings.value("userUrlFormat",BaseUploader::defaultUserFormat).toString(); - - // correct a previously erroneous value - m_userUrlFormat.replace("%url%",BaseUploader::defaultUserFormat); - - settings.endGroup(); -} - -void MainWindow::on_actionAbout_triggered() -{ - setupPreferences(); - - m_about->show(); - m_about->showAbout(); -} - -void MainWindow::on_actionPreferences_triggered() -{ - setupPreferences(); - - m_about->show(); - m_about->showPreferences(); -} - -//------------------------------------------------------------------------------------------ -// preferences functions -//------------------------------------------------------------------------------------------ - -void MainWindow::setupPreferences() -{ - // update prefs if needed - m_about->setCurrentLanguage(m_currentLanguage); - - // splashscreen params - m_about->checkBoxSplashscreenAtStartup->setChecked(m_splashscreenAtStartup); - m_about->checkBoxSplashscreenTransparentBackground->setChecked(m_splashscreenTransparentBackground); - m_about->checkBoxStartInTray->setChecked(m_startInTray); - - m_about->checkBoxAutoCopyToClipboard->setChecked(m_autoCopyToClipboard); - m_about->checkBoxCaptureWithDecoration->setChecked(m_captureWindowWithDecoration); - m_about->checkBoxStartWithSystem->setChecked(m_startWithSystem); - m_about->checkBoxPlaySound->setChecked(m_playSound); - m_about->checkBoxHideInterface->setChecked(m_hideUIForSnapshot); - - m_about->checkBoxForceBackgroundColor->setChecked(m_forceBgColor); - m_about->pushButtonBackgroundColor->setColor(m_bgColor); - - m_about->checkBoxLaunchBrowserWhenDone->setChecked(m_launchBrowserWhenDone); - - m_about->checkBoxGrabWithMouseCursor->setChecked(m_grabWithMouseCursor); - - m_about->spinBoxDelay->setValue(m_delay); - - // global hotkeys - m_about->checkBoxUseSystemShortcuts->setChecked(m_useGlobalHotKey); - - m_about->lineEditDefaultName->setText(NameManager::lastSnapshotName); - - QList formats = QImageReader::supportedImageFormats(); - m_about->comboBoxDefaultFormat->clear(); - for (int i = 0; i < formats.size(); ++i) - { - m_about->comboBoxDefaultFormat->addItem( formats[i].toUpper() ); - if ( NameManager::defaultOutputFormat == formats[i].toUpper() ) - m_about->comboBoxDefaultFormat->setCurrentIndex(i); - } - - m_about->checkBoxAddDate->setChecked(NameManager::addDateTime); - m_about->lineEditDateTimeTemplate->setText(NameManager::formatDateTime); - - m_about->comboBoxPostEffect->clear(); - m_about->comboBoxPostEffect->addItem(tr("No post effect"),PostEffect::EFFECT_NONE); - m_about->comboBoxPostEffect->addItem(tr("Simple drop shadow"),PostEffect::EFFECT_DROP_SHADOW); - m_about->comboBoxPostEffect->addItem(tr("Drop shadow with borders"),PostEffect::EFFECT_POLAROID_DROP_SHADOW); - m_about->comboBoxPostEffect->addItem(tr("Progressive opacity"),PostEffect::EFFECT_PROGRESSIVE_EDGE); - m_about->comboBoxPostEffect->addItem(tr("Torn edge"),PostEffect::EFFECT_TORN_EDGE); - - m_about->comboBoxPostEffect->setCurrentIndex(m_postEffect); - - m_about->checkBoxRotateImage->setChecked(m_rotateImage); - m_about->doubleSpinBoxAngle->setValue(m_angle); - - // scale data - m_about->groupBoxScaleSnapshot->setChecked(m_scaleImage); - - m_about->spinBoxScalePercent->setValue(m_scaleValue); - m_about->radioButtonPercent->setChecked(m_modeScaleSnapshot == SCALE_BY_PERCENT); - - m_about->lineEditScaleWidth->setText( QString::number( m_maxSnapshotSize.width() ) ); - m_about->lineEditScaleHeight->setText( QString::number( m_maxSnapshotSize.height() ) ); - m_about->radioButtonMaxSize->setChecked(m_modeScaleSnapshot == SCALE_BY_SIZE); - - // proxy settings - m_about->groupBoxProxy->setChecked(m_proxiParams.useProxy); - m_about->lineEditProxyHost->setText(m_proxiParams.proxyHostname); - m_about->spinBoxProxyPort->setValue(m_proxiParams.proxyPort); - m_about->groupBoxProxyAuthentification->setChecked(m_proxiParams.useProxyAuthentification); - m_about->lineEditProxyUsername->setText(m_proxiParams.proxyUsername); - m_about->lineEditProxyPassword->setText(m_proxiParams.proxyPassword); - m_about->checkBoxShowPassword->setChecked(m_proxiParams.showProxyPassword); - - // Url to clipboard settings - m_about->groupBoxCopyToClipboard->setChecked(m_copyUploadedUrlToClipboard); - m_about->comboBoxClipboardFormat->setCurrentIndex(m_clipboardUrlFormat); - m_about->lineEditUserFormat->setText(m_userUrlFormat); - - m_about->comboBoxUploaders->setCurrentIndex(m_defaultUploader); - - // prepare the shortcut edition - m_about->clearShortcuts(); - m_about->addWidgetToShortcutEditor( this,tr("Main application") ); - m_about->addWidgetToShortcutEditor( m_snapshotEditor,tr("Annotation editor") ); -} - -void MainWindow::setPreferences() -{ - if (!m_about) - return; - - // splashscreen - m_splashscreenAtStartup = m_about->checkBoxSplashscreenAtStartup->isChecked(); - m_splashscreenTransparentBackground = m_about->checkBoxSplashscreenTransparentBackground->isChecked(); - m_startInTray = m_about->checkBoxStartInTray->isChecked(); - - // get the language - m_currentLanguage = m_about->comboBoxLanguage->itemData( m_about->comboBoxLanguage->currentIndex() ).toString(); - - m_autoCopyToClipboard = m_about->checkBoxAutoCopyToClipboard->isChecked(); - m_captureWindowWithDecoration = m_about->checkBoxCaptureWithDecoration->isChecked(); - m_grabber->setCaptureDecoration(m_captureWindowWithDecoration); - m_playSound = m_about->checkBoxPlaySound->isChecked(); - m_hideUIForSnapshot = m_about->checkBoxHideInterface->isChecked(); - - m_forceBgColor = m_about->checkBoxForceBackgroundColor->isChecked(); - m_bgColor = m_about->pushButtonBackgroundColor->getColor(); - - m_launchBrowserWhenDone = m_about->checkBoxLaunchBrowserWhenDone->isChecked(); - - m_grabWithMouseCursor = m_about->checkBoxGrabWithMouseCursor->isChecked(); - m_grabber->setAddMouseCursor(m_grabWithMouseCursor); - - m_delay = m_about->spinBoxDelay->value(); - ui->spinBoxDelay->setValue(m_delay); - m_grabber->setDelay(m_delay); - - m_startWithSystem = m_about->checkBoxStartWithSystem->isChecked(); - MiscFunctions::setRunOnStartup(m_startWithSystem); - - //setStartWithSystem(m_startWithSystem); - - // shortcuts - m_about->applyShortcuts(); - - applyGlobalKeys( m_about->checkBoxUseSystemShortcuts->isChecked() ); - - //applyGlobalShortcut( m_about->checkBoxUseSystemShortcuts->isChecked() ); - - NameManager::lastSnapshotName = m_about->lineEditDefaultName->text(); - NameManager::defaultOutputFormat = m_about->comboBoxDefaultFormat->currentText(); - - NameManager::addDateTime = m_about->checkBoxAddDate->isChecked(); - NameManager::formatDateTime = m_about->lineEditDateTimeTemplate->text(); - - m_postEffect = m_about->comboBoxPostEffect->currentIndex(); - - m_rotateImage = m_about->checkBoxRotateImage->isChecked(); - m_angle = m_about->doubleSpinBoxAngle->value(); - - // scale - m_scaleImage = m_about->groupBoxScaleSnapshot->isChecked(); - - if ( m_about->radioButtonPercent->isChecked() ) - m_modeScaleSnapshot = SCALE_BY_PERCENT; - else - m_modeScaleSnapshot = SCALE_BY_SIZE; - - m_scaleValue = m_about->spinBoxScalePercent->value(); - m_maxSnapshotSize = QSize( m_about->lineEditScaleWidth->text().toInt(),m_about->lineEditScaleHeight->text().toInt() ); - - // setup proxy settings - m_proxiParams.useProxy = m_about->groupBoxProxy->isChecked(); - m_proxiParams.proxyHostname = m_about->lineEditProxyHost->text(); - m_proxiParams.proxyPort = m_about->spinBoxProxyPort->value(); - m_proxiParams.useProxyAuthentification = m_about->groupBoxProxyAuthentification->isChecked(); - m_proxiParams.proxyUsername = m_about->lineEditProxyUsername->text(); - m_proxiParams.proxyPassword = m_about->lineEditProxyPassword->text(); - m_proxiParams.showProxyPassword = m_about->checkBoxShowPassword->isChecked(); - - // Url to clipboard settings - m_copyUploadedUrlToClipboard = m_about->groupBoxCopyToClipboard->isChecked(); - m_clipboardUrlFormat = m_about->comboBoxClipboardFormat->currentIndex(); - m_userUrlFormat = m_about->lineEditUserFormat->text(); - - m_defaultUploader = m_about->comboBoxUploaders->currentIndex(); - - // save the settings - saveSettings(); -} - -void MainWindow::setStartWithSystem(bool val) -{ - Q_UNUSED(val); -#ifdef Q_WS_WIN - QSettings regSettings("HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Run", QSettings::NativeFormat); - - if (val) - regSettings.setValue( PACKAGE_NAME,QDir::toNativeSeparators( QCoreApplication::applicationFilePath () ) ); - else - regSettings.remove(PACKAGE_NAME); -#else - m_about->checkBoxStartWithSystem->hide(); // hide autostart checkbox only usable on Windows -#endif -} - -void MainWindow::restart() -{ - QProcess::startDetached( qApp->arguments()[0], qApp->arguments().mid(1) ); - QApplication::exit(0); -} - -void MainWindow::on_pushButtonSnapshot_clicked() -{ - m_grabber->grab(); -} - -void MainWindow::on_actionGrabScreen_triggered() -{ - m_grabber->grab(GrabManager::GRAB_CURRENT_SCREEN); -} - -void MainWindow::on_actionGrabAllScreens_triggered() -{ - m_grabber->grab(GrabManager::GRAB_ALL_SCREENS); -} - -void MainWindow::on_actionGrabWindow_triggered() -{ - m_grabber->grab(GrabManager::GRAB_WINDOW_UNDER_CURSOR); -} - -void MainWindow::on_actionGrabRegion_triggered() -{ - m_grabber->grab(GrabManager::GRAB_RECTANGULAR_REGION); -} - -void MainWindow::on_actionGrabFreehandRegion_triggered() -{ - m_grabber->grab(GrabManager::GRAB_FREEHAND_REGION); -} - -void MainWindow::processNewSnapshot(const QPixmap &pix) -{ - if ( pix.isNull() ) - return; - - m_blinkTimer.start(); // blink tray icon - - m_currPixmap = pix; - if (m_scaleImage) - { - if (m_modeScaleSnapshot == SCALE_BY_PERCENT) - { - m_currPixmap = pix.scaled(pix.size() * (m_scaleValue / 100.0),Qt::KeepAspectRatio,Qt::SmoothTransformation); - } - else - { - if ( pix.size().width() > m_maxSnapshotSize.width() || pix.size().height() > m_maxSnapshotSize.height() ) - m_currPixmap = pix.scaled(m_maxSnapshotSize,Qt::KeepAspectRatio,Qt::SmoothTransformation); - } - } - - if (m_playSound) - playSound(":/hotshots/camera.wav"); - - // add post effect if needed - if (m_postEffect != PostEffect::EFFECT_NONE) - m_currPixmap = PostEffect::process(m_currPixmap,m_postEffect); - - if (m_rotateImage) - { - QTransform transform; - QTransform trans = transform.rotate(m_angle); - m_currPixmap = m_currPixmap.transformed(trans,Qt::SmoothTransformation); - } - - // update dislayed image - updateScreenshotLabel(m_currPixmap); - - // update size label - updateApplicationIdentity(); - - //m_labelSize->setText( tr("Snapshot size: %1x%2").arg( m_currPixmap.width() ).arg( m_currPixmap.height() ) ); - - // copy to clipboard if needed - if (m_autoCopyToClipboard) - copyToClipboard(); - - switch (m_doAfterShot) - { - case DO_AUTOSAVE: - { - saveSnapshot( m_currPixmap, NameManager::getProposedFilename() ); - break; - } - case DO_SAVE: - { - on_actionSaveSnapshot_triggered(); - break; - } - case DO_EDITOR: - { - QTimer::singleShot( 10, this, SLOT( on_actionAddAnnotations_triggered() ) ); - break; - } - default: - break; - } - - restoreDisplayState(); -} - -void MainWindow::updateScreenshotLabel(const QPixmap &pix) -{ - ui->labelPreview->setPixmap( pix.scaled(ui->labelPreview->size(), - Qt::KeepAspectRatio, - Qt::SmoothTransformation) ); -} - -void MainWindow::resizeEvent(QResizeEvent * /* event */) -{ - // if not scrlabel pixmap - if ( !m_currPixmap.isNull() ) - { - updateScreenshotLabel(m_currPixmap); - } -} - -void MainWindow::on_actionUpload_triggered() -{ - uploadToWeb(m_currPixmap); -} - -void MainWindow::uploadToWeb(const QPixmap &pix, const QString &preferredName) -{ - if ( pix.isNull() ) - return; - - if (m_defaultUploader <0) - { - QMessageBox::warning( this, tr("Upload the image to the web"), tr("No default uploading web service defined !") ); - return; - } - - QString saveName(preferredName); - - if ( saveName.isEmpty() ) - saveName = NameManager::getProposedFilename(); - - const QList list = UploaderManager::getUploaders(); - - BaseUploader *up = list.value(m_defaultUploader); - - // Hohoho, it isn't very normal !! - if (!up) - return; - - // check uploader config - if ( !up->isValid() ) - { - QMessageBox::information( this, tr("Uploader %1").arg( up->getName() ), - tr("The default uploader (%1) does not appear correctly configured, no value given for required parameters !!").arg( up->getName() ) ); - return; - } - - QMessageBox msgBox; - msgBox.setText( tr("Upload the image to the web") ); - msgBox.setInformativeText( tr("Upload image %1 to %2 service ?").arg( QFileInfo(saveName).baseName() ).arg( up->getName() ) ); - msgBox.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel); - msgBox.setDefaultButton(QMessageBox::Cancel); - msgBox.setIconPixmap( up->getLogo().scaled(QSize(32,32), Qt::KeepAspectRatio,Qt::SmoothTransformation) ); - int ret = msgBox.exec(); - - if (ret == QMessageBox::Ok) - { - // clear previous value - ui->labelOuputUrl->setText(""); - if (m_forceBgColor) - up->upload( MiscFunctions::applyAlpha(pix,m_bgColor).toImage(),QFileInfo(saveName).baseName() ); - else - up->upload( pix.toImage(),QFileInfo(saveName).baseName() ); - - // update snapshot number if needed - if ( !NameManager::addDateTime && preferredName.isEmpty() ) - NameManager::currentSnapshotNum++; - } -} - -void MainWindow::on_actionSaveSnapshot_triggered() -{ - if ( m_currPixmap.isNull() ) - return; - - exportToDisk(m_currPixmap); -} - -void MainWindow::on_actionPrint_triggered() -{ - exportToPrinter(m_currPixmap); -} - -void MainWindow::exportToPrinter(const QPixmap &pix) -{ - if ( pix.isNull() ) - return; - - QPrinter printer; - - QPrintDialog *dialog = new QPrintDialog(&printer, this); - dialog->setWindowTitle( tr("Print Document") ); - dialog->addEnabledOption(QAbstractPrintDialog::PrintSelection); - - if (dialog->exec() != QDialog::Accepted) - return; - - QPainter painter; - - if ( !painter.begin(&printer) ) - return; - - QSize printSize = pix.size(); - QRect pageRect = printer.pageRect(); - printSize.scale( printer.pageRect().size(), Qt::KeepAspectRatio ); - QPoint printTopLeft( ( pageRect.width() - printSize.width() ) / 2,( pageRect.height() - printSize.height() ) / 2 ); - QRect printRect( printTopLeft, printSize ); - - painter.drawPixmap( printRect, pix, pix.rect() ); - painter.end(); -} - -void MainWindow::exportToDisk(const QPixmap &pix, const QString &preferredName) -{ - QString saveName(preferredName); - - if ( saveName.isEmpty() ) - { - // ask for a filename ... - saveName = QFileDialog::getSaveFileName( this, tr("Save File"), - NameManager::getProposedFilename(), - tr("Images (*.%1)").arg( MiscFunctions::getAvailablesImageFormatsForWriting() ) ); - } - - if ( !saveName.isEmpty() && saveSnapshot(pix, saveName) ) - { - NameManager::lastSnapshotDirectory = QFileInfo(saveName).absolutePath(); - ui->lineEditOutputPath->setText(NameManager::lastSnapshotDirectory); - } -} - -bool MainWindow::saveSnapshot(const QPixmap &pix, const QString &file) -{ - // try to extract base name if changed - if ( !QFileInfo(file).baseName().startsWith(NameManager::lastSnapshotName) ) - { - if (NameManager::addDateTime) - NameManager::lastSnapshotName = QFileInfo(file).baseName().replace(QString("-%1").arg(NameManager::lastDateTime),""); - else - NameManager::lastSnapshotName = QFileInfo(file).baseName().replace(QString("-%1").arg(NameManager::currentSnapshotNum),""); - } - - if (!NameManager::addDateTime) - NameManager::currentSnapshotNum++; - - // extract extension - QString ext = QFileInfo(file).suffix(); - - bool ok = pix.save( file, ext.toUpper().toStdString().c_str() ); - - if (!ok) - { - QMessageBox::warning( this, tr("Save failed"), tr("Error saving file") ); - return false; - } - - return true; -} - -//----------------------------------------------------------------------- -// tray icon functions -//----------------------------------------------------------------------- - -void MainWindow::closeEvent(QCloseEvent *event) -{ - if ( m_trayIcon && m_trayIcon->isVisible() ) - { - if (!m_firstCloseMessage) - { - QMessageBox::information( this, tr("Systray"), - tr("The program will keep running in the " - "system tray. To terminate the program, " - "choose Quit in the context menu " - "of the system tray entry.") ); - m_firstCloseMessage = true; - } - - hide(); - event->ignore(); - } -} - -void MainWindow::createActionsSystemTray() -{ -} - -void MainWindow::on_actionShowUI_triggered() -{ - show(); -} - -void MainWindow::createTrayIcon() -{ - // tray menu - m_trayIconMenu = new QMenu(this); - - m_trayIconMenu->addAction(ui->actionShowUI); - m_trayIconMenu->addAction(ui->actionAddAnnotations); - m_trayIconMenu->addSeparator(); - m_trayIconMenu->addAction(ui->actionGrabScreen); - m_trayIconMenu->addAction(ui->actionGrabAllScreens); - m_trayIconMenu->addAction(ui->actionGrabWindow); - m_trayIconMenu->addAction(ui->actionGrabRegion); - m_trayIconMenu->addAction(ui->actionGrabFreehandRegion); - m_trayIconMenu->addSeparator(); - m_trayIconMenu->addAction(ui->actionQuit); - - m_trayIconMenu->setTitle(m_appName); - m_trayIconMenu->setIcon( QIcon(":/hotshots/logo_big.png") ); - - m_trayIcon = new QSystemTrayIcon(this); - m_trayIcon->setContextMenu(m_trayIconMenu); - - connect( m_trayIcon, SIGNAL( activated(QSystemTrayIcon::ActivationReason) ), - this, SLOT( iconActivated(QSystemTrayIcon::ActivationReason) ) ); - - m_trayIcon->setIcon( QIcon(":/hotshots/logo_big.png") ); - - m_trayIcon->show(); -} - -void MainWindow::iconActivated(QSystemTrayIcon::ActivationReason reason) -{ - switch (reason) - { - case QSystemTrayIcon::Trigger: - break; - - case QSystemTrayIcon::DoubleClick: - showNormal (); - QWidget::setVisible(true); - break; - - case QSystemTrayIcon::MiddleClick: - - //showMessage(); - break; - - default: - ; - } -} - -void MainWindow::on_actionCopyToClipboard_triggered() -{ - copyToClipboard(); -} - -void MainWindow::copyToClipboard(const QPixmap &pix) -{ - if ( m_currPixmap.isNull() && pix.isNull() ) - return; - - // something send directly ? - QPixmap newPix; - if ( pix.isNull() ) - newPix = m_currPixmap; - else - newPix = pix; - - if (m_forceBgColor) - QApplication::clipboard()->setPixmap(MiscFunctions::applyAlpha(newPix,m_bgColor), QClipboard::Clipboard); - else - QApplication::clipboard()->setPixmap(newPix, QClipboard::Clipboard); -} - -void MainWindow::initGlobalKeys() -{ - // global hotkey not available for OS/2 -#ifdef Q_WS_PM // OS/2 - m_about->checkBoxUseSystemShortcuts->hide(); -#else - - // screen - m_globShortCutGrabScreen = new QxtGlobalShortcut(this); - connect( m_globShortCutGrabScreen, SIGNAL( activated() ), this, SLOT( on_actionGrabScreen_triggered() ) ); - - // all screens - m_globShortCutGrabAllScreens = new QxtGlobalShortcut(this); - connect( m_globShortCutGrabAllScreens, SIGNAL( activated() ), this, SLOT( on_actionGrabAllScreens_triggered() ) ); - - // window - m_globShortCutGrabWindow = new QxtGlobalShortcut(this); - connect( m_globShortCutGrabWindow, SIGNAL( activated() ), this, SLOT( on_actionGrabWindow_triggered() ) ); - - // region - m_globShortCutGrabRegion = new QxtGlobalShortcut(this); - connect( m_globShortCutGrabRegion, SIGNAL( activated() ), this, SLOT( on_actionGrabRegion_triggered() ) ); - - // freehand region - m_globShortCutGrabFreehand = new QxtGlobalShortcut(this); - connect( m_globShortCutGrabFreehand, SIGNAL( activated() ), this, SLOT( on_actionGrabFreehandRegion_triggered() ) ); - - applyGlobalKeys(m_useGlobalHotKey); - -#endif -} - -void MainWindow::applyGlobalKeys(bool val) -{ - m_useGlobalHotKey = val; - - // global hotkeys not available for OS/2 -#ifndef Q_WS_PM // OS/2 - - // screen - m_globShortCutGrabScreen->setShortcut( ui->actionGrabScreen->shortcut() ); - m_globShortCutGrabScreen->setEnabled(val); - - // all screens - m_globShortCutGrabAllScreens->setShortcut( ui->actionGrabAllScreens->shortcut() ); - m_globShortCutGrabAllScreens->setEnabled(val); - - // window - m_globShortCutGrabWindow->setShortcut( ui->actionGrabWindow->shortcut() ); - m_globShortCutGrabWindow->setEnabled(val); - - // region - m_globShortCutGrabRegion->setShortcut( ui->actionGrabRegion->shortcut() ); - m_globShortCutGrabRegion->setEnabled(val); - - // freehand region - m_globShortCutGrabFreehand->setShortcut( ui->actionGrabFreehandRegion->shortcut() ); - m_globShortCutGrabFreehand->setEnabled(val); - -#endif -} - -void MainWindow::on_spinBoxDelay_valueChanged(int val) -{ - m_delay = val; - m_grabber->setDelay(m_delay); -} - -void MainWindow::on_comboBoxAfterShot_activated(int val) -{ - m_doAfterShot = val; -} - -void MainWindow::on_comboBoxMode_activated(int val) -{ - m_grabMode = val; - m_grabber->setDefaultMode(m_grabMode); -} - -void MainWindow::blink() -{ - static int i = 0; - - if (i++ % 2) - m_trayIcon->setIcon( QIcon(":/hotshots/logo_idle.png") ); - else - m_trayIcon->setIcon( QIcon(":/hotshots/hotshots.png") ); - - if (i > blinkNumber) - { - m_blinkTimer.stop(); - m_trayIcon->setIcon( QIcon(":/hotshots/hotshots.png") ); // restore icon just in case ... - i = 0; - } -} - -void MainWindow::on_actionAddAnnotations_triggered() -{ - openEditor(m_currPixmap); -} - -bool MainWindow::openEditor(const QString &file) -{ - initEditor(); - if (QFileInfo(file).suffix().toLower() == "hot") - { - m_snapshotEditor->show(); - return m_snapshotEditor->load(file); - } - else - return openEditor( QPixmap(file) ); -} - -bool MainWindow::openEditor(const QPixmap &pixmap) -{ - initEditor(); - m_snapshotEditor->show(); - m_snapshotEditor->load(pixmap); - return true; -} - -void MainWindow::initEditor() -{ - if (!m_snapshotEditor) - { - m_snapshotEditor = new EditorWidget(); - connect( m_snapshotEditor,SIGNAL( requestUpload(const QPixmap &, const QString &) ),this,SLOT( uploadToWeb(const QPixmap &, const QString &) ) ); - connect( m_snapshotEditor,SIGNAL( requestExport(const QPixmap &, const QString &) ),this,SLOT( exportToDisk(const QPixmap &, const QString &) ) ); - connect( m_snapshotEditor,SIGNAL( requestPrint(const QPixmap &) ),this,SLOT( exportToPrinter(const QPixmap &) ) ); - connect( m_snapshotEditor,SIGNAL( requestClipboard(const QPixmap &) ),this,SLOT( copyToClipboard(const QPixmap &) ) ); - connect( m_snapshotEditor,SIGNAL( defaultDirectoryChanged(const QString &) ),this,SLOT( updateDefaultPath(const QString &) ) ); - } -} - -void MainWindow::restoreDisplayState() -{ - if (!m_wasHidden) - show(); -} - -void MainWindow::saveDisplayState() -{ - m_wasHidden = isHidden(); - if (m_hideUIForSnapshot) - hide(); -} - -void MainWindow::on_actionHelp_triggered() -{ - QDesktopServices::openUrl( QUrl( QString(PACKAGE_ONLINE_HELP_URL) ) ); -} - -QString MainWindow::formatUrl(const QString &url, int type) -{ - QString formatted(url); - switch (type) - { - case BaseUploader::FORMAT_IM: - { - formatted = QString("%1/%2").arg( QFileInfo(url).filePath() ).arg( QFileInfo(url).baseName() ); - break; - } - case BaseUploader::FORMAT_HTML: - { - formatted = QString("\"\"").arg(url); - break; - } - case BaseUploader::FORMAT_BBCODE: - { - formatted = QString("[img]%1[/img]").arg(url); - break; - } - case BaseUploader::FORMAT_USER: - { - formatted = m_userUrlFormat; - formatted.replace("@url@",url); - break; - } - case BaseUploader::FORMAT_NONE: - default: - { - break; - } - } - return formatted; -} - -void MainWindow::readResultUrl(const QString&url) -{ - QString formattedUrl = formatUrl(url,m_clipboardUrlFormat); - ui->labelOuputUrl->setText(formattedUrl); - if (m_copyUploadedUrlToClipboard) - QApplication::clipboard()->setText(formattedUrl); - - if (m_playSound) - playSound(":/hotshots/beep.wav"); - - if (m_launchBrowserWhenDone) - QDesktopServices::openUrl( QUrl( url) ); -} - -void MainWindow::playSound(const QString &file) -{ - if( !QSound::isAvailable() ) - return; - - QFile soundFile(file); - QString tmpFile = MiscFunctions::getValidStorage() + QDir::separator() + QFileInfo(file).fileName(); - soundFile.copy(tmpFile); - QSound::play(tmpFile); -} - -void MainWindow::wakeUp(const QString &mess) -{ - if ( !mess.isEmpty() ) - { - // a file ? - if ( QFileInfo(mess).exists() ) - openEditor(mess); - } - else - { - LogHandler::getInstance()->reportWarning( tr("message from other instance.") ); - } - show(); -} - -void MainWindow::updateDefaultPath(const QString &p) -{ - ui->lineEditOutputPath->setText(p); -} + +/****************************************************************************** + HotShots: Screenshot utility + Copyright(C) 2011-2014 xbee@xbee.net + + 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 + *******************************************************************************/ + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#ifndef Q_WS_PM // OS/2 +#include +#endif + +#include "MainWindow.h" +#include "ui_MainWindow.h" + +#include "AppSettings.h" +#include "MiscFunctions.h" +#include "AboutDialog.h" +#include "GrabManager.h" +#include "PostEffect.h" +#include "LogHandler.h" + +#include "EditorWidget.h" + +#include "BaseUploader.h" +#include "UploaderRegistering.h" +#include "UploaderManager.h" +#include "NameManager.h" + +const int blinkInterval = 500; +const int blinkNumber = 6; +const int minDelayForRepeat = 5; + +MainWindow::MainWindow(QWidget *parent) : + QMainWindow(parent), + ui(new Ui::MainWindowClass), + m_version(PACKAGE_VERSION), + m_appName(PACKAGE_NAME), + m_splashscreenAtStartup(true), + m_splashscreenTransparentBackground(true), + m_startInTray(false), + m_autoCopyToClipboard(false), + m_startWithSystem(false), + m_delay(0), + m_captureWindowWithDecoration(true), + m_playSound(false), + m_hideUIForSnapshot(true), + m_about(NULL), + m_trayIcon(NULL), + m_trayIconMenu(NULL), + m_firstCloseMessage(false), + m_grabber(NULL), + m_useGlobalHotKey(false), + m_globalHotkeyGrabScreen("F5"), + m_globalHotkeyGrabAllScreens("Ctrl+Alt+F5"), + m_globalHotkeyGrabWindow("Ctrl+F5"), + m_globalHotkeyGrabRegion("Alt+F5"), + m_globalHotkeyGrabFreehand("Shift+Alt+F5"), +#ifndef Q_WS_PM // OS/2 + m_globShortCutGrabScreen(NULL), + m_globShortCutGrabAllScreens(NULL), + m_globShortCutGrabWindow(NULL), + m_globShortCutGrabRegion(NULL), + m_globShortCutGrabFreehand(NULL), +#endif + m_grabMode(GrabManager::GRAB_ALL_SCREENS), + m_doAfterShot(DO_NOTHING), + m_scaleImage(false), + m_scaleValue(100), + m_maxSnapshotSize( QSize(800,600) ), + m_modeScaleSnapshot(SCALE_BY_PERCENT), + m_postEffect(PostEffect::EFFECT_NONE), + m_rotateImage(false), + m_angle(0.0), + m_snapshotEditor(NULL), + m_wasHidden(false), + m_labelSize(NULL), + m_copyUploadedUrlToClipboard(true), + m_clipboardUrlFormat(BaseUploader::FORMAT_NONE), + m_userUrlFormat("@url@"), + m_defaultUploader(-1), + m_forceBgColor(false), + m_bgColor( QColor(Qt::white) ), + m_launchBrowserWhenDone(false), + m_grabWithMouseCursor(false), + m_defaultActionSystrayName("actionShowUI") +{ + ui->setupUi(this); + updateUi(); + loadSettings(); + createTrayIcon(); + + // setup global key menu + initGlobalKeys(); +} + +MainWindow::~MainWindow() +{ + saveSettings(); + delete ui; + delete m_snapshotEditor; + UploaderManager::clear(); +} + +void MainWindow::on_actionQuit_triggered() +{ + QApplication::exit(0); +} + +void MainWindow::on_pushButtonOutputPath_pressed() +{ + QString dir = QFileDialog::getExistingDirectory(this, tr("Save Directory"), + NameManager::lastSnapshotDirectory, + QFileDialog::ShowDirsOnly + | QFileDialog::DontResolveSymlinks); + + if ( !dir.isEmpty() ) + { + NameManager::lastSnapshotDirectory = dir; + ui->lineEditOutputPath->setText(NameManager::lastSnapshotDirectory); + } +} + +void MainWindow::updateApplicationIdentity() +{ + QString title = m_appName + " - " + m_version; + if ( !m_currPixmap.isNull() ) + title += QString(" - %1x%2").arg( m_currPixmap.width() ).arg( m_currPixmap.height() ); + setWindowTitle(title); +} + +void MainWindow::updateUi() +{ + setStatusBar(NULL); //remove status bar + + QWidget* spacer = new QWidget(); + spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + ui->mainToolBar->insertWidget(ui->actionHelp,spacer); + + // setup app name, release, ... + updateApplicationIdentity(); + + // uploader registering + int nb = UploaderRegistering::registerAll(); + LogHandler::getInstance()->reportDebug( tr("Register of %1 uploaders").arg(nb) ); + const QList list = UploaderManager::getUploaders(); + foreach (BaseUploader * up, list) + connect( up,SIGNAL( newUrl(const QString &) ),this, SLOT( readResultUrl(const QString &) ) ); + + //initEditor(); + + // add completer to line edit + QCompleter *completerFile = new QCompleter(this); + QDirModel *dirModelFile = new QDirModel(completerFile); + dirModelFile->setFilter(QDir::Dirs); + completerFile->setModel(dirModelFile); + ui->lineEditOutputPath->setCompleter(completerFile); + + createActionsSystemTray(); + + + m_grabber = new GrabManager(this); + + //connect( m_grabber,SIGNAL( showMainInterface() ),this,SLOT( restoreDisplayState() ) ); + connect( m_grabber,SIGNAL( hideMainInterface() ),this,SLOT( saveDisplayState() ) ); + connect( m_grabber,SIGNAL( newSnapshot(const QPixmap &) ),this,SLOT( processNewSnapshot(const QPixmap &) ) ); + + // setup "blinking" timer + m_blinkTimer.setInterval(blinkInterval); + connect( &m_blinkTimer, SIGNAL( timeout() ), this, SLOT( blink() ) ); + + // post process class + //m_postProcess = new PostEffect(this); + + // add a label to display the size of the current snapshot) +// m_labelSize = new QLabel(this); +// QMainWindow::statusBar()->addPermanentWidget(m_labelSize); + + // temp storage check + QString tmpPath = MiscFunctions::getValidStorage(); + + if ( !QDir(tmpPath).exists() ) + { + if ( !QDir::home().mkpath(tmpPath) ) + QMessageBox::warning( this,m_appName,tr("Can't create storage location, check why?! (%1)").arg(tmpPath) ); + } + + // init combo box + ui->comboBoxMode->addItem(ui->actionGrabScreen->text(),GrabManager::GRAB_ALL_SCREENS); + ui->comboBoxMode->addItem(ui->actionGrabAllScreens->text(),GrabManager::GRAB_CURRENT_SCREEN); + ui->comboBoxMode->addItem(ui->actionGrabWindow->text(),GrabManager::GRAB_WINDOW_UNDER_CURSOR); + ui->comboBoxMode->addItem(ui->actionGrabRegion->text(),GrabManager::GRAB_RECTANGULAR_REGION); + ui->comboBoxMode->addItem(ui->actionGrabFreehandRegion->text(),GrabManager::GRAB_FREEHAND_REGION); + +#ifdef Q_WS_PM // OS/2 + ui->actionGrabWindow->setEnabled(false); // not yet available, sorry ! +#endif + + // mandatory systray actions list + m_systrayUserActionBlackList << "actionQuit"; + m_systrayUserActionBlackList << "actionShowUI"; + m_systrayUserActionBlackList << "actionGrabScreen"; + m_systrayUserActionBlackList << "actionGrabAllScreens"; + m_systrayUserActionBlackList << "actionGrabWindow"; + m_systrayUserActionBlackList << "actionGrabRegion"; + m_systrayUserActionBlackList << "actionGrabFreehandRegion"; + +} + +//----------------------------------------------------------------------- +// Save/Restore parameters functions +//----------------------------------------------------------------------- + +void MainWindow::saveSettings() +{ + AppSettings settings; + + settings.beginGroup("MainWindow"); + + settings.setValue( "MainWindowState",saveState(0) ); + + settings.setValue( "size", size() ); + settings.setValue( "pos", pos() ); + + // save the screen number for the splashsreeen ... + if ( QApplication::desktop()->isVirtualDesktop() ) + settings.setValue( "screenNumber", QApplication::desktop()->screenNumber( pos() ) ); + else + settings.setValue( "screenNumber", QApplication::desktop()->screenNumber(this) ); + + settings.setValue( "screenNumber", QApplication::desktop()->screenNumber(this) ); + + settings.beginGroup("Shortcuts"); + + // Save shortcuts + QList childrens; + childrens = children(); + QListIterator iterator(childrens); + while( iterator.hasNext() ) + { + QObject *object = iterator.next(); + QString classe = object->metaObject()->className(); + if( classe == "QAction" ) + { + QString text = object->objectName(); + QString shortcut = ( (QAction *)object )->shortcut(); + //if( !shortcut.isEmpty() ) + settings.setValue(text, shortcut); + } + } + settings.endGroup(); + + settings.endGroup(); + + settings.beginGroup("Application"); + + settings.setValue("splashscreenAtStartup", m_splashscreenAtStartup); + settings.setValue("splashscreenTransparentBackground", m_splashscreenTransparentBackground); + settings.setValue("startInTray", m_startInTray); + settings.setValue("currentLanguage", m_currentLanguage); + + settings.setValue("lastSnapshotDirectory", NameManager::lastSnapshotDirectory); + settings.setValue("autoCopyToClipboard", m_autoCopyToClipboard); + settings.setValue("captureWindowWithoutDecoration", m_captureWindowWithDecoration); + settings.setValue("playSound", m_playSound); + settings.setValue("hideUIForSnapshot", m_hideUIForSnapshot); + settings.setValue("startWithSystem", m_startWithSystem); + + settings.setValue("useGlobalHotKey", m_useGlobalHotKey); + settings.setValue("globalHotkeyGrabScreen", m_globalHotkeyGrabScreen); + settings.setValue("globalHotkeyGrabAllScreens", m_globalHotkeyGrabAllScreens); + settings.setValue("globalHotkeyGrabWindow", m_globalHotkeyGrabWindow); + settings.setValue("globalHotkeyGrabRegion", m_globalHotkeyGrabRegion); + settings.setValue("globalHotkeyGrabFreehand", m_globalHotkeyGrabFreehand); + + settings.setValue("lastSnapshotName", NameManager::lastSnapshotName); + settings.setValue("defaultOutputFormat", NameManager::defaultOutputFormat); + + settings.setValue("addDateTime", NameManager::addDateTime); + settings.setValue("formatDateTime", NameManager::formatDateTime); + + settings.setValue("delay", m_delay); + + settings.setValue("grabMode", m_grabMode); + settings.setValue("doAfterShot", m_doAfterShot); + + settings.setValue("scaleImage", m_scaleImage); + settings.setValue("modeScaleSnapshot", m_modeScaleSnapshot); + settings.setValue("scaleValue", m_scaleValue); + settings.setValue("maxSize", m_maxSnapshotSize); + + settings.setValue("postEffect", m_postEffect); + settings.setValue("rotateImage", m_rotateImage); + settings.setValue("angle", m_angle); + + settings.setValue("defaultUploader", m_defaultUploader); + + settings.setValue("forceBgColor", m_forceBgColor); + settings.setValue("bgColor", m_bgColor); + + settings.setValue("launchBrowserWhenDone", m_launchBrowserWhenDone); + + settings.setValue("grabWithMouseCursor", m_grabWithMouseCursor); + + settings.setValue("defaultActionSystrayName", m_defaultActionSystrayName); + + settings.setValue("systrayUserActionList", m_systrayUserActionList); + + + settings.endGroup(); + + settings.beginGroup("Proxy"); + + settings.setValue("useProxy", m_proxiParams.useProxy); + settings.setValue("proxyHostname", m_proxiParams.proxyHostname); + settings.setValue("proxyPort", m_proxiParams.proxyPort); + settings.setValue("useProxyAuthentification", m_proxiParams.useProxyAuthentification); + settings.setValue("proxyUsername", m_proxiParams.proxyUsername); + settings.setValue( "proxyPassword", MiscFunctions::base64Encode(m_proxiParams.proxyPassword) ); // in order to store unreadable password + settings.setValue("showProxyPassword", m_proxiParams.showProxyPassword); + + settings.endGroup(); + + settings.beginGroup("UrlToClipboard"); + + settings.setValue("copyUploadedUrlToClipboard", m_copyUploadedUrlToClipboard); + settings.setValue("clipboardUrlFormat", m_clipboardUrlFormat); + settings.setValue("userUrlFormat", m_userUrlFormat); + + settings.endGroup(); +} + +void MainWindow::loadSettings() +{ + AppSettings settings; + + settings.beginGroup("MainWindow"); + + restoreState(settings.value("MainWindowState").toByteArray(), 0); + + resize( settings.value( "size", QSize(400, 400) ).toSize() ); + move( settings.value( "pos", QPoint(200, 200) ).toPoint() ); + + // check if restore position isn't outside the current screen definitions (additional screen has been unplugged) + if (QApplication::desktop()->screenNumber( pos() ) < 0) + move( QPoint(200, 200) ); + + settings.beginGroup("Shortcuts"); + + // Load shortcuts + QList childrens; + childrens = children(); + QListIterator iterator(childrens); + while( iterator.hasNext() ) + { + QObject *object = iterator.next(); + QString classe = object->metaObject()->className(); + if( classe == "QAction" ) + { + QString text = object->objectName(); + QString shortcut = ( (QAction *)object )->shortcut(); + if( !text.isEmpty() ) + { + shortcut = settings.value(text, shortcut).toString(); + ( (QAction *)object )->setShortcut( shortcut ); + + // update the tooltip + if ( !shortcut.isEmpty() ) + { + // strip the (...) if needed + QString tooltip = ( (QAction *)object )->toolTip().replace(QRegExp(" \\(.*\\)$"),""); + ( (QAction *)object )->setToolTip(tooltip + " (" + shortcut + ")"); + } + } + } + } + settings.endGroup(); + + settings.endGroup(); + + settings.beginGroup("Application"); + + m_splashscreenAtStartup = settings.value( "splashscreenAtStartup", true).toBool(); + m_splashscreenTransparentBackground = settings.value("splashscreenTransparentBackground",true).toBool(); + + m_startInTray = settings.value("startInTray",false).toBool(); + + // start hidden => no message + if (m_startInTray) + m_firstCloseMessage = true; + + m_currentLanguage = settings.value("currentLanguage","auto").toString(); + + if ( m_currentLanguage.isEmpty() ) + m_currentLanguage = QLocale::system().name().left(2); + + NameManager::lastSnapshotDirectory = settings.value("lastSnapshotDirectory","/home").toString(); + ui->lineEditOutputPath->setText(NameManager::lastSnapshotDirectory); + + m_autoCopyToClipboard = settings.value("autoCopyToClipboard",false).toBool(); + m_captureWindowWithDecoration = settings.value("captureWindowWithoutDecoration",true).toBool(); + m_grabber->setCaptureDecoration(m_captureWindowWithDecoration); + m_startWithSystem = settings.value("startWithSystem",false).toBool(); + + m_playSound = settings.value("playSound",false).toBool(); + m_hideUIForSnapshot = settings.value("hideUIForSnapshot",true).toBool(); + + m_useGlobalHotKey = settings.value("useGlobalHotKey",false).toBool(); + m_globalHotkeyGrabScreen = settings.value("globalHotkeyGrabScreen","F5").toString(); + m_globalHotkeyGrabAllScreens = settings.value("globalHotkeyGrabAllScreens","Ctrl+Alt+F5").toString(); + m_globalHotkeyGrabWindow = settings.value("globalHotkeyGrabWindow","Ctrl+F5").toString(); + m_globalHotkeyGrabRegion = settings.value("globalHotkeyGrabRegion","Alt+F5").toString(); + m_globalHotkeyGrabFreehand = settings.value("globalHotkeyGrabFreehand","Shift+Alt+F5").toString(); + + NameManager::lastSnapshotName = settings.value("lastSnapshotName","snapshot").toString(); + + NameManager::defaultOutputFormat = settings.value("defaultOutputFormat","PNG").toString(); + + NameManager::addDateTime = settings.value("addDateTime",false).toBool(); + NameManager::formatDateTime = settings.value("formatDateTime","yyyy-MM-dd-hh-mm-ss").toString(); + + m_delay = settings.value("delay",0).toInt(); + ui->spinBoxDelay->setValue(m_delay); + + m_grabMode = settings.value("grabMode",0).toInt(); + ui->comboBoxMode->setCurrentIndex(m_grabMode); + m_grabber->setDefaultMode(m_grabMode); + + m_doAfterShot = settings.value("doAfterShot",0).toInt(); + ui->comboBoxAfterShot->setCurrentIndex(m_doAfterShot); + + m_scaleImage = settings.value("scaleImage",false).toBool(); + m_modeScaleSnapshot = settings.value("modeScaleSnapshot",SCALE_BY_PERCENT).toInt(); + + m_scaleValue = settings.value("scaleValue",100).toInt(); + + m_maxSnapshotSize = settings.value( "maxSize",QSize(800,600) ).toSize(); + + m_postEffect = settings.value("postEffect",PostEffect::EFFECT_NONE).toInt(); + m_rotateImage = settings.value("rotateImage",false).toBool(); + m_angle = settings.value("angle",false).toFloat(); + + m_defaultUploader = settings.value("defaultUploader",-1).toInt(); + + m_forceBgColor = settings.value("forceBgColor",false).toBool(); + m_bgColor = settings.value( "bgColor",QColor(Qt::white) ).value(); + + m_launchBrowserWhenDone = settings.value("launchBrowserWhenDone",false).toBool(); + + m_grabWithMouseCursor = settings.value("grabWithMouseCursor",false).toBool(); + m_grabber->setAddMouseCursor(m_grabWithMouseCursor); + + m_defaultActionSystrayName = settings.value("defaultActionSystrayName","actionShowUI").toString(); + + m_systrayUserActionList = settings.value("systrayUserActionList",QStringList() << "actionAddAnnotations").toStringList(); + + settings.endGroup(); + + settings.beginGroup("Proxy"); + + m_proxiParams.useProxy = settings.value("useProxy",false).toBool(); + m_proxiParams.proxyHostname = settings.value("proxyHostname","").toString(); + m_proxiParams.proxyPort = settings.value("proxyPort",BaseUploader::defaultProxyPort).toInt(); + m_proxiParams.useProxyAuthentification = settings.value("useProxyAuthentification",false).toBool(); + m_proxiParams.proxyUsername = settings.value("proxyUsername","").toString(); + m_proxiParams.proxyPassword = MiscFunctions::base64Decode( settings.value("proxyPassword","").toString() ); // decode encode password + m_proxiParams.showProxyPassword = settings.value("showProxyPassword",false).toBool(); + + settings.endGroup(); + + settings.beginGroup("UrlToClipboard"); + + m_copyUploadedUrlToClipboard = settings.value("copyUploadedUrlToClipboard",false).toBool(); + m_clipboardUrlFormat = settings.value("clipboardUrlFormat",BaseUploader::defaultUrlFormat).toInt(); + m_userUrlFormat = settings.value("userUrlFormat",BaseUploader::defaultUserFormat).toString(); + + // correct a previously erroneous value + m_userUrlFormat.replace("%url%",BaseUploader::defaultUserFormat); + + settings.endGroup(); +} + +void MainWindow::on_actionAbout_triggered() +{ + setupPreferences(); + + m_about->show(); + m_about->showAbout(); +} + +void MainWindow::on_actionPreferences_triggered() +{ + setupPreferences(); + + m_about->show(); + m_about->showPreferences(); +} + +//------------------------------------------------------------------------------------------ +// preferences functions +//------------------------------------------------------------------------------------------ + +void MainWindow::setupPreferences() +{ + if (!m_about) + { + m_about = new AboutDialog(this); + + connect( m_about,SIGNAL( restart() ),this,SLOT( restart() ) ); + connect( m_about, SIGNAL( accepted() ), this, SLOT( setPreferences() ) ); + + // global hotkey not available for OS/2 (also mouse pointer) +#ifdef Q_WS_PM // OS/2 + m_about->checkBoxUseSystemShortcuts->hide(); + m_about->checkBoxGrabWithMouseCursor->hide(); +#endif + } + + // update prefs if needed + m_about->setCurrentLanguage(m_currentLanguage); + + // splashscreen params + m_about->checkBoxSplashscreenAtStartup->setChecked(m_splashscreenAtStartup); + m_about->checkBoxSplashscreenTransparentBackground->setChecked(m_splashscreenTransparentBackground); + m_about->checkBoxStartInTray->setChecked(m_startInTray); + + m_about->checkBoxAutoCopyToClipboard->setChecked(m_autoCopyToClipboard); + m_about->checkBoxCaptureWithDecoration->setChecked(m_captureWindowWithDecoration); + m_about->checkBoxStartWithSystem->setChecked(m_startWithSystem); + m_about->checkBoxPlaySound->setChecked(m_playSound); + m_about->checkBoxHideInterface->setChecked(m_hideUIForSnapshot); + + m_about->checkBoxForceBackgroundColor->setChecked(m_forceBgColor); + m_about->pushButtonBackgroundColor->setColor(m_bgColor); + + m_about->checkBoxLaunchBrowserWhenDone->setChecked(m_launchBrowserWhenDone); + + m_about->checkBoxGrabWithMouseCursor->setChecked(m_grabWithMouseCursor); + + m_about->spinBoxDelay->setValue(m_delay); + + // global hotkeys + m_about->checkBoxUseSystemShortcuts->setChecked(m_useGlobalHotKey); + + m_about->lineEditDefaultName->setText(NameManager::lastSnapshotName); + + QList formats = QImageReader::supportedImageFormats(); + m_about->comboBoxDefaultFormat->clear(); + for (int i = 0; i < formats.size(); ++i) + { + m_about->comboBoxDefaultFormat->addItem( formats[i].toUpper() ); + if ( NameManager::defaultOutputFormat == formats[i].toUpper() ) + m_about->comboBoxDefaultFormat->setCurrentIndex(i); + } + + m_about->checkBoxAddDate->setChecked(NameManager::addDateTime); + m_about->lineEditDateTimeTemplate->setText(NameManager::formatDateTime); + + m_about->comboBoxPostEffect->clear(); + m_about->comboBoxPostEffect->addItem(tr("No post effect"),PostEffect::EFFECT_NONE); + m_about->comboBoxPostEffect->addItem(tr("Simple drop shadow"),PostEffect::EFFECT_DROP_SHADOW); + m_about->comboBoxPostEffect->addItem(tr("Drop shadow with borders"),PostEffect::EFFECT_POLAROID_DROP_SHADOW); + m_about->comboBoxPostEffect->addItem(tr("Progressive opacity"),PostEffect::EFFECT_PROGRESSIVE_EDGE); + m_about->comboBoxPostEffect->addItem(tr("Torn edge"),PostEffect::EFFECT_TORN_EDGE); + + m_about->comboBoxPostEffect->setCurrentIndex(m_postEffect); + + m_about->checkBoxRotateImage->setChecked(m_rotateImage); + m_about->doubleSpinBoxAngle->setValue(m_angle); + + // scale data + m_about->groupBoxScaleSnapshot->setChecked(m_scaleImage); + + m_about->spinBoxScalePercent->setValue(m_scaleValue); + m_about->radioButtonPercent->setChecked(m_modeScaleSnapshot == SCALE_BY_PERCENT); + + m_about->lineEditScaleWidth->setText( QString::number( m_maxSnapshotSize.width() ) ); + m_about->lineEditScaleHeight->setText( QString::number( m_maxSnapshotSize.height() ) ); + m_about->radioButtonMaxSize->setChecked(m_modeScaleSnapshot == SCALE_BY_SIZE); + + // proxy settings + m_about->groupBoxProxy->setChecked(m_proxiParams.useProxy); + m_about->lineEditProxyHost->setText(m_proxiParams.proxyHostname); + m_about->spinBoxProxyPort->setValue(m_proxiParams.proxyPort); + m_about->groupBoxProxyAuthentification->setChecked(m_proxiParams.useProxyAuthentification); + m_about->lineEditProxyUsername->setText(m_proxiParams.proxyUsername); + m_about->lineEditProxyPassword->setText(m_proxiParams.proxyPassword); + m_about->checkBoxShowPassword->setChecked(m_proxiParams.showProxyPassword); + + // Url to clipboard settings + m_about->groupBoxCopyToClipboard->setChecked(m_copyUploadedUrlToClipboard); + m_about->comboBoxClipboardFormat->setCurrentIndex(m_clipboardUrlFormat); + m_about->lineEditUserFormat->setText(m_userUrlFormat); + + m_about->comboBoxUploaders->setCurrentIndex(m_defaultUploader); + + // prepare the shortcut edition + m_about->clearShortcuts(); + m_about->addWidgetToShortcutEditor( this,tr("Main application") ); + m_about->addWidgetToShortcutEditor( m_snapshotEditor,tr("Annotation editor") ); + + // prepare default systray action + m_about->updateDefaultSystrayAction(this,m_defaultActionSystrayName); + + // prepare available function in system tray + m_about->updateSystrayUserActionList(this,m_systrayUserActionList, m_systrayUserActionBlackList); +} + +void MainWindow::setPreferences() +{ + if (!m_about) + return; + + // splashscreen + m_splashscreenAtStartup = m_about->checkBoxSplashscreenAtStartup->isChecked(); + m_splashscreenTransparentBackground = m_about->checkBoxSplashscreenTransparentBackground->isChecked(); + m_startInTray = m_about->checkBoxStartInTray->isChecked(); + + // get the language + m_currentLanguage = m_about->comboBoxLanguage->itemData( m_about->comboBoxLanguage->currentIndex() ).toString(); + + m_autoCopyToClipboard = m_about->checkBoxAutoCopyToClipboard->isChecked(); + m_captureWindowWithDecoration = m_about->checkBoxCaptureWithDecoration->isChecked(); + m_grabber->setCaptureDecoration(m_captureWindowWithDecoration); + m_playSound = m_about->checkBoxPlaySound->isChecked(); + m_hideUIForSnapshot = m_about->checkBoxHideInterface->isChecked(); + + m_forceBgColor = m_about->checkBoxForceBackgroundColor->isChecked(); + m_bgColor = m_about->pushButtonBackgroundColor->getColor(); + + m_launchBrowserWhenDone = m_about->checkBoxLaunchBrowserWhenDone->isChecked(); + + m_grabWithMouseCursor = m_about->checkBoxGrabWithMouseCursor->isChecked(); + m_grabber->setAddMouseCursor(m_grabWithMouseCursor); + + m_delay = m_about->spinBoxDelay->value(); + ui->spinBoxDelay->setValue(m_delay); + m_grabber->setDelay(m_delay); + + m_startWithSystem = m_about->checkBoxStartWithSystem->isChecked(); + MiscFunctions::setRunOnStartup(m_startWithSystem); + + // shortcuts + m_about->applyShortcuts(); + + applyGlobalKeys( m_about->checkBoxUseSystemShortcuts->isChecked() ); + + //applyGlobalShortcut( m_about->checkBoxUseSystemShortcuts->isChecked() ); + + NameManager::lastSnapshotName = m_about->lineEditDefaultName->text(); + NameManager::defaultOutputFormat = m_about->comboBoxDefaultFormat->currentText(); + + NameManager::addDateTime = m_about->checkBoxAddDate->isChecked(); + NameManager::formatDateTime = m_about->lineEditDateTimeTemplate->text(); + + m_postEffect = m_about->comboBoxPostEffect->currentIndex(); + + m_rotateImage = m_about->checkBoxRotateImage->isChecked(); + m_angle = m_about->doubleSpinBoxAngle->value(); + + // scale + m_scaleImage = m_about->groupBoxScaleSnapshot->isChecked(); + + if ( m_about->radioButtonPercent->isChecked() ) + m_modeScaleSnapshot = SCALE_BY_PERCENT; + else + m_modeScaleSnapshot = SCALE_BY_SIZE; + + m_scaleValue = m_about->spinBoxScalePercent->value(); + m_maxSnapshotSize = QSize( m_about->lineEditScaleWidth->text().toInt(),m_about->lineEditScaleHeight->text().toInt() ); + + // setup proxy settings + m_proxiParams.useProxy = m_about->groupBoxProxy->isChecked(); + m_proxiParams.proxyHostname = m_about->lineEditProxyHost->text(); + m_proxiParams.proxyPort = m_about->spinBoxProxyPort->value(); + m_proxiParams.useProxyAuthentification = m_about->groupBoxProxyAuthentification->isChecked(); + m_proxiParams.proxyUsername = m_about->lineEditProxyUsername->text(); + m_proxiParams.proxyPassword = m_about->lineEditProxyPassword->text(); + m_proxiParams.showProxyPassword = m_about->checkBoxShowPassword->isChecked(); + + // Url to clipboard settings + m_copyUploadedUrlToClipboard = m_about->groupBoxCopyToClipboard->isChecked(); + m_clipboardUrlFormat = m_about->comboBoxClipboardFormat->currentIndex(); + m_userUrlFormat = m_about->lineEditUserFormat->text(); + + m_defaultUploader = m_about->comboBoxUploaders->currentIndex(); + + m_defaultActionSystrayName = m_about->getDefaultSystrayAction(); + m_systrayUserActionList = m_about->getSystrayUserActionList(); + + createTrayIcon(); + + // save the settings + saveSettings(); +} + +void MainWindow::restart() +{ + QProcess::startDetached( qApp->arguments()[0], qApp->arguments().mid(1) ); + QApplication::exit(0); +} + +void MainWindow::on_pushButtonSnapshot_clicked() +{ + m_grabber->grab(); +} + +void MainWindow::on_actionGrabScreen_triggered() +{ + m_grabber->grab(GrabManager::GRAB_CURRENT_SCREEN); +} + +void MainWindow::on_actionGrabAllScreens_triggered() +{ + m_grabber->grab(GrabManager::GRAB_ALL_SCREENS); +} + +void MainWindow::on_actionGrabWindow_triggered() +{ + m_grabber->grab(GrabManager::GRAB_WINDOW_UNDER_CURSOR); +} + +void MainWindow::on_actionGrabRegion_triggered() +{ + m_grabber->grab(GrabManager::GRAB_RECTANGULAR_REGION); +} + +void MainWindow::on_actionGrabFreehandRegion_triggered() +{ + m_grabber->grab(GrabManager::GRAB_FREEHAND_REGION); +} + +void MainWindow::processNewSnapshot(const QPixmap &pix) +{ + if ( pix.isNull() ) + return; + + m_blinkTimer.start(); // blink tray icon + + m_currPixmap = pix; + if (m_scaleImage) + { + if (m_modeScaleSnapshot == SCALE_BY_PERCENT) + { + m_currPixmap = pix.scaled(pix.size() * (m_scaleValue / 100.0),Qt::KeepAspectRatio,Qt::SmoothTransformation); + } + else + { + if ( pix.size().width() > m_maxSnapshotSize.width() || pix.size().height() > m_maxSnapshotSize.height() ) + m_currPixmap = pix.scaled(m_maxSnapshotSize,Qt::KeepAspectRatio,Qt::SmoothTransformation); + } + } + + if (m_playSound) + playSound(":/hotshots/camera.wav"); + + // add post effect if needed + if (m_postEffect != PostEffect::EFFECT_NONE) + m_currPixmap = PostEffect::process(m_currPixmap,m_postEffect); + + if (m_rotateImage) + { + QTransform transform; + QTransform trans = transform.rotate(m_angle); + m_currPixmap = m_currPixmap.transformed(trans,Qt::SmoothTransformation); + } + + // update dislayed image + updateScreenshotLabel(m_currPixmap); + + // update size label + updateApplicationIdentity(); + + //m_labelSize->setText( tr("Snapshot size: %1x%2").arg( m_currPixmap.width() ).arg( m_currPixmap.height() ) ); + + // copy to clipboard if needed + if (m_autoCopyToClipboard) + copyToClipboard(); + + switch (m_doAfterShot) + { + case DO_AUTOSAVE: + { + saveSnapshot( m_currPixmap, NameManager::getProposedFilename() ); + break; + } + case DO_SAVE: + { + on_actionSaveSnapshot_triggered(); + break; + } + case DO_EDITOR: + { + QTimer::singleShot( 10, this, SLOT( on_actionAddAnnotations_triggered() ) ); + break; + } + default: + break; + } + + restoreDisplayState(); +} + +void MainWindow::updateScreenshotLabel(const QPixmap &pix) +{ + ui->labelPreview->setPixmap( pix.scaled(ui->labelPreview->size(), + Qt::KeepAspectRatio, + Qt::SmoothTransformation) ); +} + +void MainWindow::resizeEvent(QResizeEvent * /* event */) +{ + // if not scrlabel pixmap + if ( !m_currPixmap.isNull() ) + { + updateScreenshotLabel(m_currPixmap); + } +} + +void MainWindow::on_actionUpload_triggered() +{ + uploadToWeb(m_currPixmap); +} + +void MainWindow::uploadToWeb(const QPixmap &pix, const QString &preferredName) +{ + if ( pix.isNull() ) + return; + + if (m_defaultUploader <0) + { + QMessageBox::warning( this, tr("Upload the image to the web"), tr("No default uploading web service defined!") ); + return; + } + + QString saveName(preferredName); + + if ( saveName.isEmpty() ) + saveName = NameManager::getProposedFilename(); + + const QList list = UploaderManager::getUploaders(); + + BaseUploader *up = list.value(m_defaultUploader); + + // Hohoho, it isn't very normal !! + if (!up) + return; + + // check uploader config + if ( !up->isValid() ) + { + QMessageBox::information( this, tr("Uploader %1").arg( up->getName() ), + tr("The default uploader (%1) does not appear correctly configured, no value given for required parameters!!").arg( up->getName() ) ); + return; + } + + QMessageBox msgBox; + msgBox.setText( tr("Upload the image to the web") ); + msgBox.setInformativeText( tr("Upload image %1 to %2 service?").arg( QFileInfo(saveName).baseName() ).arg( up->getName() ) ); + msgBox.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel); + msgBox.setDefaultButton(QMessageBox::Cancel); + msgBox.setIconPixmap( up->getLogo().scaled(QSize(32,32), Qt::KeepAspectRatio,Qt::SmoothTransformation) ); + int ret = msgBox.exec(); + + if (ret == QMessageBox::Ok) + { + // clear previous value + ui->labelOuputUrl->setText(""); + if (m_forceBgColor) + up->upload( MiscFunctions::applyAlpha(pix,m_bgColor).toImage(),QFileInfo(saveName).baseName() ); + else + up->upload( pix.toImage(),QFileInfo(saveName).baseName() ); + + // update snapshot number if needed + if ( !NameManager::addDateTime && preferredName.isEmpty() ) + NameManager::currentSnapshotNum++; + } +} + +void MainWindow::on_actionSaveSnapshot_triggered() +{ + if ( m_currPixmap.isNull() ) + return; + + exportToDisk(m_currPixmap); +} + +void MainWindow::on_actionPrint_triggered() +{ + exportToPrinter(m_currPixmap); +} + +void MainWindow::exportToPrinter(const QPixmap &pix) +{ + if ( pix.isNull() ) + return; + + QPrinter printer; + + QPrintDialog *dialog = new QPrintDialog(&printer, this); + dialog->setWindowTitle( tr("Print Document") ); + dialog->addEnabledOption(QAbstractPrintDialog::PrintSelection); + + if (dialog->exec() != QDialog::Accepted) + return; + + QPainter painter; + + if ( !painter.begin(&printer) ) + return; + + QSize printSize = pix.size(); + QRect pageRect = printer.pageRect(); + printSize.scale( printer.pageRect().size(), Qt::KeepAspectRatio ); + QPoint printTopLeft( ( pageRect.width() - printSize.width() ) / 2,( pageRect.height() - printSize.height() ) / 2 ); + QRect printRect( printTopLeft, printSize ); + + painter.drawPixmap( printRect, pix, pix.rect() ); + painter.end(); +} + +void MainWindow::exportToDisk(const QPixmap &pix, const QString &preferredName) +{ + QString saveName(preferredName); + + if ( saveName.isEmpty() ) + { + // ask for a filename ... + saveName = QFileDialog::getSaveFileName( this, tr("Save File"), + NameManager::getProposedFilename(), + tr("Images (*.%1)").arg( MiscFunctions::getAvailablesImageFormatsForWriting() ) ); + } + + if ( !saveName.isEmpty() && saveSnapshot(pix, saveName) ) + { + NameManager::lastSnapshotDirectory = QFileInfo(saveName).absolutePath(); + ui->lineEditOutputPath->setText(NameManager::lastSnapshotDirectory); + } +} + +bool MainWindow::saveSnapshot(const QPixmap &pix, const QString &file) +{ + // try to extract base name if changed + if ( !QFileInfo(file).baseName().startsWith(NameManager::lastSnapshotName) ) + { + if (NameManager::addDateTime) + NameManager::lastSnapshotName = QFileInfo(file).baseName().replace(QString("-%1").arg(NameManager::lastDateTime),""); + else + NameManager::lastSnapshotName = QFileInfo(file).baseName().replace(QString("-%1").arg(NameManager::currentSnapshotNum),""); + } + + if (!NameManager::addDateTime) + NameManager::currentSnapshotNum++; + + // extract extension + QString ext = QFileInfo(file).suffix(); + + bool ok = pix.save( file, ext.toUpper().toStdString().c_str() ); + + if (!ok) + { + QMessageBox::warning( this, tr("Save failed"), tr("Error saving file") ); + return false; + } + + return true; +} + +//----------------------------------------------------------------------- +// tray icon functions +//----------------------------------------------------------------------- + +void MainWindow::closeEvent(QCloseEvent *event) +{ + if ( m_trayIcon && m_trayIcon->isVisible() ) + { + if (!m_firstCloseMessage) + { + QMessageBox::information( this, tr("Systray"), + tr("The program will keep running in the " + "system tray. To terminate the program, " + "choose Quit in the context menu " + "of the system tray entry.") ); + m_firstCloseMessage = true; + } + + hide(); + event->ignore(); + } +} + +void MainWindow::createActionsSystemTray() +{ +} + +void MainWindow::on_actionShowUI_triggered() +{ + show(); +} + +void MainWindow::createTrayIcon() +{ + // tray menu + if (!m_trayIconMenu) + { + m_trayIconMenu = new QMenu(this); + m_trayIcon = new QSystemTrayIcon(this); + m_trayIcon->setContextMenu(m_trayIconMenu); + + connect( m_trayIcon, SIGNAL( activated(QSystemTrayIcon::ActivationReason) ), + this, SLOT( iconActivated(QSystemTrayIcon::ActivationReason) ) ); + + m_trayIcon->setIcon( QIcon(":/hotshots/logo_big.png") ); + m_trayIcon->show(); + } + + m_trayIconMenu->clear(); + + m_trayIconMenu->addAction(ui->actionShowUI); + //m_trayIconMenu->addAction(ui->actionAddAnnotations); + m_trayIconMenu->addSeparator(); + // add user actions + foreach (const QString&actName, m_systrayUserActionList) + { + QAction *act = getActionByName(actName); + m_trayIconMenu->addAction(act); + } + + m_trayIconMenu->addSeparator(); + m_trayIconMenu->addAction(ui->actionGrabScreen); + m_trayIconMenu->addAction(ui->actionGrabAllScreens); + m_trayIconMenu->addAction(ui->actionGrabWindow); + m_trayIconMenu->addAction(ui->actionGrabRegion); + m_trayIconMenu->addAction(ui->actionGrabFreehandRegion); + m_trayIconMenu->addSeparator(); + m_trayIconMenu->addAction(ui->actionQuit); + + m_trayIconMenu->setTitle(m_appName); + m_trayIconMenu->setIcon( QIcon(":/hotshots/logo_big.png") ); +} + +void MainWindow::iconActivated(QSystemTrayIcon::ActivationReason reason) +{ + switch (reason) + { + case QSystemTrayIcon::Trigger: + qDebug() << "QSystemTrayIcon::Trigger"; + break; + + case QSystemTrayIcon::DoubleClick: + { + QAction *act = getActionByName(m_defaultActionSystrayName); + act->trigger(); + //show (); + //QWidget::setVisible(true); + break; + } + case QSystemTrayIcon::MiddleClick: + + //showMessage(); + break; + + default: + ; + } +} + +QAction *MainWindow::getActionByName(const QString &actName) +{ + QList childrens = children(); + QListIterator iterator(childrens); + while( iterator.hasNext() ) + { + QObject *object = iterator.next(); + if( object->objectName() == actName ) + return (QAction*)object; + } + return NULL; +} + +void MainWindow::on_actionCopyToClipboard_triggered() +{ + copyToClipboard(); +} + +void MainWindow::copyToClipboard(const QPixmap &pix) +{ + if ( m_currPixmap.isNull() && pix.isNull() ) + return; + + // something send directly ? + QPixmap newPix; + if ( pix.isNull() ) + newPix = m_currPixmap; + else + newPix = pix; + + if (m_forceBgColor) + QApplication::clipboard()->setPixmap(MiscFunctions::applyAlpha(newPix,m_bgColor), QClipboard::Clipboard); + else + QApplication::clipboard()->setPixmap(newPix, QClipboard::Clipboard); +} + +void MainWindow::initGlobalKeys() +{ + // global hotkey not available for OS/2 +#ifndef Q_WS_PM // OS/2 + // screen + m_globShortCutGrabScreen = new QxtGlobalShortcut(this); + connect( m_globShortCutGrabScreen, SIGNAL( activated() ), this, SLOT( on_actionGrabScreen_triggered() ) ); + + // all screens + m_globShortCutGrabAllScreens = new QxtGlobalShortcut(this); + connect( m_globShortCutGrabAllScreens, SIGNAL( activated() ), this, SLOT( on_actionGrabAllScreens_triggered() ) ); + + // window + m_globShortCutGrabWindow = new QxtGlobalShortcut(this); + connect( m_globShortCutGrabWindow, SIGNAL( activated() ), this, SLOT( on_actionGrabWindow_triggered() ) ); + + // region + m_globShortCutGrabRegion = new QxtGlobalShortcut(this); + connect( m_globShortCutGrabRegion, SIGNAL( activated() ), this, SLOT( on_actionGrabRegion_triggered() ) ); + + // freehand region + m_globShortCutGrabFreehand = new QxtGlobalShortcut(this); + connect( m_globShortCutGrabFreehand, SIGNAL( activated() ), this, SLOT( on_actionGrabFreehandRegion_triggered() ) ); + + applyGlobalKeys(m_useGlobalHotKey); + +#endif +} + +void MainWindow::applyGlobalKeys(bool val) +{ + m_useGlobalHotKey = val; + + // global hotkeys not available for OS/2 +#ifndef Q_WS_PM // OS/2 + + // screen + m_globShortCutGrabScreen->setShortcut( ui->actionGrabScreen->shortcut() ); + m_globShortCutGrabScreen->setEnabled(val); + + // all screens + m_globShortCutGrabAllScreens->setShortcut( ui->actionGrabAllScreens->shortcut() ); + m_globShortCutGrabAllScreens->setEnabled(val); + + // window + m_globShortCutGrabWindow->setShortcut( ui->actionGrabWindow->shortcut() ); + m_globShortCutGrabWindow->setEnabled(val); + + // region + m_globShortCutGrabRegion->setShortcut( ui->actionGrabRegion->shortcut() ); + m_globShortCutGrabRegion->setEnabled(val); + + // freehand region + m_globShortCutGrabFreehand->setShortcut( ui->actionGrabFreehandRegion->shortcut() ); + m_globShortCutGrabFreehand->setEnabled(val); + +#endif +} + +void MainWindow::on_spinBoxDelay_valueChanged(int val) +{ + m_delay = val; + m_grabber->setDelay(m_delay); +} + +void MainWindow::on_comboBoxAfterShot_activated(int val) +{ + m_doAfterShot = val; +} + +void MainWindow::on_comboBoxMode_activated(int val) +{ + m_grabMode = val; + m_grabber->setDefaultMode(m_grabMode); +} + +void MainWindow::blink() +{ + static int i = 0; + + if (i++ % 2) + m_trayIcon->setIcon( QIcon(":/hotshots/logo_idle.png") ); + else + m_trayIcon->setIcon( QIcon(":/hotshots/hotshots.png") ); + + if (i > blinkNumber) + { + m_blinkTimer.stop(); + m_trayIcon->setIcon( QIcon(":/hotshots/hotshots.png") ); // restore icon just in case ... + i = 0; + } +} + +void MainWindow::on_actionAddAnnotations_triggered() +{ + openEditor(m_currPixmap); +} + +bool MainWindow::openEditor(const QString &file) +{ + initEditor(); + if (QFileInfo(file).suffix().toLower() == "hot") + { + m_snapshotEditor->show(); + return m_snapshotEditor->load(file); + } + else + return openEditor( QPixmap(file) ); +} + +bool MainWindow::openEditor(const QPixmap &pixmap) +{ + initEditor(); + m_snapshotEditor->show(); + m_snapshotEditor->load(pixmap); + return true; +} + +void MainWindow::initEditor() +{ + if (!m_snapshotEditor) + { + m_snapshotEditor = new EditorWidget(); + connect( m_snapshotEditor,SIGNAL( requestUpload(const QPixmap &, const QString &) ),this,SLOT( uploadToWeb(const QPixmap &, const QString &) ) ); + connect( m_snapshotEditor,SIGNAL( requestExport(const QPixmap &, const QString &) ),this,SLOT( exportToDisk(const QPixmap &, const QString &) ) ); + connect( m_snapshotEditor,SIGNAL( requestPrint(const QPixmap &) ),this,SLOT( exportToPrinter(const QPixmap &) ) ); + connect( m_snapshotEditor,SIGNAL( requestClipboard(const QPixmap &) ),this,SLOT( copyToClipboard(const QPixmap &) ) ); + connect( m_snapshotEditor,SIGNAL( defaultDirectoryChanged(const QString &) ),this,SLOT( updateDefaultPath(const QString &) ) ); + } +} + +void MainWindow::restoreDisplayState() +{ + if (!m_wasHidden) + show(); +} + +void MainWindow::saveDisplayState() +{ + m_wasHidden = isHidden(); + if (m_hideUIForSnapshot) + hide(); +} + +void MainWindow::on_actionHelp_triggered() +{ + QDesktopServices::openUrl( QUrl( QString(PACKAGE_ONLINE_HELP_URL) ) ); +} + +QString MainWindow::formatUrl(const QString &url, int type) +{ + QString formatted(url); + switch (type) + { + case BaseUploader::FORMAT_IM: + { + formatted = QString("%1/%2").arg( QFileInfo(url).filePath() ).arg( QFileInfo(url).baseName() ); + break; + } + case BaseUploader::FORMAT_HTML: + { + formatted = QString("\"\"").arg(url); + break; + } + case BaseUploader::FORMAT_BBCODE: + { + formatted = QString("[img]%1[/img]").arg(url); + break; + } + case BaseUploader::FORMAT_USER: + { + formatted = m_userUrlFormat; + formatted.replace("@url@",url); + break; + } + case BaseUploader::FORMAT_NONE: + default: + { + break; + } + } + return formatted; +} + +void MainWindow::readResultUrl(const QString&url) +{ + QString formattedUrl = formatUrl(url,m_clipboardUrlFormat); + ui->labelOuputUrl->setText(formattedUrl); + if (m_copyUploadedUrlToClipboard) + QApplication::clipboard()->setText(formattedUrl); + + if (m_playSound) + playSound(":/hotshots/beep.wav"); + + if (m_launchBrowserWhenDone) + QDesktopServices::openUrl( QUrl( url) ); +} + +void MainWindow::playSound(const QString &file) +{ + if( !QSound::isAvailable() ) + return; + + QFile soundFile(file); + QString tmpFile = MiscFunctions::getValidStorage() + QDir::separator() + QFileInfo(file).fileName(); + soundFile.copy(tmpFile); + QSound::play(tmpFile); +} + +void MainWindow::wakeUp(const QString &mess) +{ + if ( !mess.isEmpty() ) + { + // a file ? + if ( QFileInfo(mess).exists() ) + openEditor(mess); + } + else + { + LogHandler::getInstance()->reportWarning( tr("message from other instance.") ); + } + show(); +} + +void MainWindow::updateDefaultPath(const QString &p) +{ + ui->lineEditOutputPath->setText(p); +} diff -Nru hotshots-2.0.1/src/MainWindow.h hotshots-2.1.0/src/MainWindow.h --- hotshots-2.0.1/src/MainWindow.h 2013-12-18 20:51:52.000000000 +0000 +++ hotshots-2.1.0/src/MainWindow.h 2014-02-08 17:31:10.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -38,6 +38,7 @@ #endif class EditorWidget; class QLabel; +class Action; struct ProxySetting { @@ -134,7 +135,6 @@ void updateUi(); void updateApplicationIdentity(); void setupPreferences(); - void setStartWithSystem(bool val); void saveSettings(); void loadSettings(); @@ -157,6 +157,7 @@ QString formatUrl(const QString &url, int type); void playSound(const QString &file); + QAction *getActionByName(const QString &actName); Ui::MainWindowClass *ui; @@ -233,6 +234,9 @@ QColor m_bgColor; bool m_launchBrowserWhenDone; bool m_grabWithMouseCursor; + QString m_defaultActionSystrayName; + QStringList m_systrayUserActionList; + QStringList m_systrayUserActionBlackList; }; #endif // _MAINWINDOW_H_ diff -Nru hotshots-2.0.1/src/MiscFunctions.cpp hotshots-2.1.0/src/MiscFunctions.cpp --- hotshots-2.0.1/src/MiscFunctions.cpp 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/MiscFunctions.cpp 2014-02-10 22:40:16.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -176,7 +176,7 @@ QString imglist; QStringList formats = getAvailablesImageFormatsList(); for (int i = 0; i < formats.size(); ++i) - imglist += "*." + formats[i] + " "; + imglist += "*." + formats[i] + ";;"; return imglist; } @@ -194,11 +194,11 @@ ldir << QCoreApplication::applicationDirPath () + "/../lang"; ldir << QCoreApplication::applicationDirPath () + "/../../lang"; ldir << QCoreApplication::applicationDirPath () + "/../translations"; // MacOSX + ldir << QString("/usr/share/%1/locale").arg(PACKAGE_NAME).toLower(); + ldir << QString("/usr/local/share/%1/locale").arg(PACKAGE_NAME).toLower(); ldir << "/usr/local/share/locale"; ldir << "/usr/share/local/locale"; ldir << "/usr/share/locale"; - ldir << QString("/usr/share/%1/locale").arg(PACKAGE_NAME).toLower(); - ldir << QString("/usr/local/share/%1/locale").arg(PACKAGE_NAME).toLower(); QString ext; if ( !refLang.isEmpty() ) @@ -220,7 +220,7 @@ QRegExp expr( QString("^%1_(\\w+)\\.qm$").arg(PACKAGE_NAME).toLower() ); QStringList files = dir.entryList(QDir::Files, QDir::Name); - LogHandler::getInstance()->reportDebug( QObject::tr("translations path %1").arg( dir.path() ) ); + LogHandler::getInstance()->reportDebug( QObject::tr("Translations path %1").arg( dir.path() ) ); foreach ( const QString &file, files ) { @@ -254,7 +254,7 @@ void MiscFunctions::setLanguage(const QString& lang) { QString language(lang); - LogHandler::getInstance()->reportDebug( QObject::tr("setting language to : %1").arg(language) ); + LogHandler::getInstance()->reportDebug( QObject::tr("Setting language to: %1").arg(language) ); // special cases if (language == "auto") // auto detection @@ -275,7 +275,7 @@ if ( qt->load( "qt_" + language, globalTranslationPath ) ) { - LogHandler::getInstance()->reportDebug( QObject::tr("successfully loaded data from %1").arg( globalTranslationPath + "/qt_" + language ) ); + LogHandler::getInstance()->reportDebug( QObject::tr("Successfully loaded data from %1").arg( globalTranslationPath + "/qt_" + language ) ); QCoreApplication::installTranslator(qt); excludedFiles << "qt_" + language + ".qm"; } @@ -296,12 +296,12 @@ if ( t->load( dir.filePath(s) ) ) { QCoreApplication::installTranslator(t); - LogHandler::getInstance()->reportDebug( QObject::tr("successfully loaded data from %1").arg( dir.filePath(s) ) ); + LogHandler::getInstance()->reportDebug( QObject::tr("Successfully loaded data from %1").arg( dir.filePath(s) ) ); } else { delete t; - LogHandler::getInstance()->reportDebug( QObject::tr("failed to load data from %1").arg( dir.filePath(s) ) ); + LogHandler::getInstance()->reportDebug( QObject::tr("Failed to load data from %1").arg( dir.filePath(s) ) ); } } } diff -Nru hotshots-2.0.1/src/MiscFunctions.h hotshots-2.1.0/src/MiscFunctions.h --- hotshots-2.0.1/src/MiscFunctions.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/MiscFunctions.h 2014-02-07 20:06:04.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/NameManager.cpp hotshots-2.1.0/src/NameManager.cpp --- hotshots-2.0.1/src/NameManager.cpp 2013-11-30 18:56:32.000000000 +0000 +++ hotshots-2.1.0/src/NameManager.cpp 2014-02-07 20:05:14.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/NameManager.h hotshots-2.1.0/src/NameManager.h --- hotshots-2.0.1/src/NameManager.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/NameManager.h 2014-02-07 20:05:14.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/PostEffect.cpp hotshots-2.1.0/src/PostEffect.cpp --- hotshots-2.0.1/src/PostEffect.cpp 2013-12-18 22:06:34.000000000 +0000 +++ hotshots-2.1.0/src/PostEffect.cpp 2014-02-07 20:05:12.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/PostEffect.h hotshots-2.1.0/src/PostEffect.h --- hotshots-2.0.1/src/PostEffect.h 2013-12-18 22:06:34.000000000 +0000 +++ hotshots-2.1.0/src/PostEffect.h 2014-02-07 20:06:04.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/QClickLabel.cpp hotshots-2.1.0/src/QClickLabel.cpp --- hotshots-2.0.1/src/QClickLabel.cpp 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/QClickLabel.cpp 2014-02-07 20:05:12.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/QClickLabel.h hotshots-2.1.0/src/QClickLabel.h --- hotshots-2.0.1/src/QClickLabel.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/QClickLabel.h 2014-02-07 20:05:12.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/QColorButton.cpp hotshots-2.1.0/src/QColorButton.cpp --- hotshots-2.0.1/src/QColorButton.cpp 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/QColorButton.cpp 2014-02-07 20:05:12.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/QColorButton.h hotshots-2.1.0/src/QColorButton.h --- hotshots-2.0.1/src/QColorButton.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/QColorButton.h 2014-02-07 20:05:10.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/RegionGrabber.cpp hotshots-2.1.0/src/RegionGrabber.cpp --- hotshots-2.0.1/src/RegionGrabber.cpp 2014-01-23 16:59:50.000000000 +0000 +++ hotshots-2.1.0/src/RegionGrabber.cpp 2014-02-07 20:05:10.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/RegionGrabber.h hotshots-2.1.0/src/RegionGrabber.h --- hotshots-2.0.1/src/RegionGrabber.h 2014-01-23 16:59:50.000000000 +0000 +++ hotshots-2.1.0/src/RegionGrabber.h 2014-02-07 20:05:10.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/RescaleDialog.cpp hotshots-2.1.0/src/RescaleDialog.cpp --- hotshots-2.0.1/src/RescaleDialog.cpp 1970-01-01 00:00:00.000000000 +0000 +++ hotshots-2.1.0/src/RescaleDialog.cpp 2014-02-07 22:29:32.000000000 +0000 @@ -0,0 +1,84 @@ + +/****************************************************************************** + HotShots: Screenshot utility + Copyright(C) 2011-2014 xbee@xbee.net + + 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 + *******************************************************************************/ + +#include + +#include "RescaleDialog.h" + + +RescaleDialog::RescaleDialog(QWidget *parent) + : QDialog(parent) +{ + setupUi(this); +} + +RescaleDialog::~RescaleDialog() +{ + +} + +void RescaleDialog::setOriginalSize(const QSize &sz) +{ + m_oriSize = sz; + labelOriSize->setText(QString("%1x%2").arg(sz.width()).arg(sz.height())); + labelTargetSize->setText(QString("%1x%2").arg(sz.width()).arg(sz.height())); + spinBoxScaleWidth->setValue(sz.width()); + spinBoxScaleHeight->setValue(sz.height()); +} + +void RescaleDialog::on_spinBoxScalePercent_valueChanged(int val) +{ + QSize newSize(m_oriSize); + newSize*=(val/100.); + labelTargetSize->setText(QString("%1x%2").arg(newSize.width()).arg(newSize.height())); +} + +void RescaleDialog::on_spinBoxScaleWidth_valueChanged(int) +{ + Qt::AspectRatioMode ar = checkBoxKeepAspectRatio->isChecked()? Qt::KeepAspectRatio : Qt::IgnoreAspectRatio ; + QSize newSize(m_oriSize); + newSize.scale(QSize(spinBoxScaleWidth->value(),spinBoxScaleHeight->value()),ar); + labelTargetSize->setText(QString("%1x%2").arg(newSize.width()).arg(newSize.height())); +} + +void RescaleDialog::on_spinBoxScaleHeight_valueChanged(int) +{ + Qt::AspectRatioMode ar = checkBoxKeepAspectRatio->isChecked()? Qt::KeepAspectRatio : Qt::IgnoreAspectRatio; + QSize newSize(m_oriSize); + newSize.scale(QSize(spinBoxScaleWidth->value(),spinBoxScaleHeight->value()),ar); + labelTargetSize->setText(QString("%1x%2").arg(newSize.width()).arg(newSize.height())); +} + +QSize RescaleDialog::getFinalSize() const +{ + QSize newSize(m_oriSize); + + if (radioButtonPercent->isChecked()) + { + newSize*=(spinBoxScalePercent->value()/100.); + } + else + { + Qt::AspectRatioMode ar = checkBoxKeepAspectRatio->isChecked()? Qt::KeepAspectRatio : Qt::IgnoreAspectRatio; + newSize.scale(QSize(spinBoxScaleWidth->value(),spinBoxScaleHeight->value()),ar); + } + + return newSize; +} \ No newline at end of file diff -Nru hotshots-2.0.1/src/RescaleDialog.h hotshots-2.1.0/src/RescaleDialog.h --- hotshots-2.0.1/src/RescaleDialog.h 1970-01-01 00:00:00.000000000 +0000 +++ hotshots-2.1.0/src/RescaleDialog.h 2014-02-07 22:03:28.000000000 +0000 @@ -0,0 +1,52 @@ + +/****************************************************************************** + HotShots: Screenshot utility + Copyright(C) 2011-2014 xbee@xbee.net + + 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 + *******************************************************************************/ + +#ifndef _RESCALEDIALOG_H_ +#define _RESCALEDIALOG_H_ + +#include +#include "ui_RescaleDialog.h" + +class RescaleDialog : public QDialog, public Ui::RescaleDialogClass +{ + Q_OBJECT + +public: + + RescaleDialog(QWidget *parent = 0); + ~RescaleDialog(); + + void setOriginalSize(const QSize &); + + QSize getFinalSize() const; + +private slots: + + void on_spinBoxScalePercent_valueChanged(int); + + void on_spinBoxScaleWidth_valueChanged(int); + void on_spinBoxScaleHeight_valueChanged(int); + +private: + + QSize m_oriSize; +}; + +#endif // _RESCALEDIALOG_H_ diff -Nru hotshots-2.0.1/src/SingleApplication.cpp hotshots-2.1.0/src/SingleApplication.cpp --- hotshots-2.0.1/src/SingleApplication.cpp 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/SingleApplication.cpp 2014-02-07 20:05:08.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/SingleApplication.h hotshots-2.1.0/src/SingleApplication.h --- hotshots-2.0.1/src/SingleApplication.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/SingleApplication.h 2014-02-07 20:06:02.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/SplashScreen.cpp hotshots-2.1.0/src/SplashScreen.cpp --- hotshots-2.0.1/src/SplashScreen.cpp 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/SplashScreen.cpp 2014-02-07 20:05:08.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/SplashScreen.h hotshots-2.1.0/src/SplashScreen.h --- hotshots-2.0.1/src/SplashScreen.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/SplashScreen.h 2014-02-07 20:06:02.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/uploaders/CanardPCUploader.cpp hotshots-2.1.0/src/uploaders/CanardPCUploader.cpp --- hotshots-2.0.1/src/uploaders/CanardPCUploader.cpp 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/uploaders/CanardPCUploader.cpp 2014-02-10 22:31:30.000000000 +0000 @@ -90,11 +90,11 @@ if (reply->error() == QNetworkReply::NoError) { parseReply( reply->readAll() ); - LogHandler::getInstance()->reportInfo( tr("%1 transfert end without error").arg(m_name) ); + LogHandler::getInstance()->reportInfo( tr("%1 transfert end without error.").arg(m_name) ); } else { - LogHandler::getInstance()->reportError( tr("%1 transfert end with error (%2)").arg(m_name).arg( reply->errorString() ) ); + LogHandler::getInstance()->reportError( tr("%1 transfert end with error! (%2)").arg(m_name).arg( reply->errorString() ) ); } reply->deleteLater(); diff -Nru hotshots-2.0.1/src/uploaders/CanardPCUploader.h hotshots-2.1.0/src/uploaders/CanardPCUploader.h --- hotshots-2.0.1/src/uploaders/CanardPCUploader.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/uploaders/CanardPCUploader.h 2014-02-07 20:05:28.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/uploaders/FreeImageHostingUploader.cpp hotshots-2.1.0/src/uploaders/FreeImageHostingUploader.cpp --- hotshots-2.0.1/src/uploaders/FreeImageHostingUploader.cpp 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/uploaders/FreeImageHostingUploader.cpp 2014-02-10 22:31:30.000000000 +0000 @@ -81,11 +81,11 @@ if (reply->error() == QNetworkReply::NoError) { parseReply( reply->readAll() ); - LogHandler::getInstance()->reportInfo( tr("%1 transfert end without error").arg(m_name) ); + LogHandler::getInstance()->reportInfo( tr("%1 transfert end without error.").arg(m_name) ); } else { - LogHandler::getInstance()->reportError( tr("%1 transfert end with error (%2)").arg(m_name).arg( reply->errorString() ) ); + LogHandler::getInstance()->reportError( tr("%1 transfert end with error! (%2)").arg(m_name).arg( reply->errorString() ) ); } reply->deleteLater(); diff -Nru hotshots-2.0.1/src/uploaders/FreeImageHostingUploader.h hotshots-2.1.0/src/uploaders/FreeImageHostingUploader.h --- hotshots-2.0.1/src/uploaders/FreeImageHostingUploader.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/uploaders/FreeImageHostingUploader.h 2014-02-07 20:05:28.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/uploaders/FtpUploader.cpp hotshots-2.1.0/src/uploaders/FtpUploader.cpp --- hotshots-2.0.1/src/uploaders/FtpUploader.cpp 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/uploaders/FtpUploader.cpp 2014-02-10 22:32:52.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -76,7 +76,7 @@ LogHandler::getInstance()->reportError( tr("Canceled upload of %1").arg(m_fileToUpload) ); } cancelDownload(); - LogHandler::getInstance()->reportInfo( tr("successful uploading onto %1.").arg(m_ftpHostname) ); + LogHandler::getInstance()->reportInfo( tr("Uploaded successfully onto %1.").arg(m_ftpHostname) ); // validate the ouput url m_url = QString("ftp://%1/%2/%3").arg(m_ftpHostname).arg(m_ftpDirectory).arg( QFileInfo(m_fileToUpload).fileName() ); @@ -224,9 +224,9 @@ void FtpUploader::ftpDone(bool error) { if (error) - LogHandler::getInstance()->reportError( tr("%1 transfert end with error").arg(m_name) ); + LogHandler::getInstance()->reportError( tr("%1 transfert end with error!").arg(m_name) ); else - LogHandler::getInstance()->reportInfo( tr("%1 transfert end without error").arg(m_name) ); + LogHandler::getInstance()->reportInfo( tr("%1 transfert end without error.").arg(m_name) ); } void FtpUploader::ftpStateChanged(int state) diff -Nru hotshots-2.0.1/src/uploaders/FtpUploader.h hotshots-2.1.0/src/uploaders/FtpUploader.h --- hotshots-2.0.1/src/uploaders/FtpUploader.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/uploaders/FtpUploader.h 2014-02-07 20:05:26.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/uploaders/FtpUploaderSettings.cpp hotshots-2.1.0/src/uploaders/FtpUploaderSettings.cpp --- hotshots-2.0.1/src/uploaders/FtpUploaderSettings.cpp 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/uploaders/FtpUploaderSettings.cpp 2014-02-07 20:05:26.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/uploaders/FtpUploaderSettings.h hotshots-2.1.0/src/uploaders/FtpUploaderSettings.h --- hotshots-2.0.1/src/uploaders/FtpUploaderSettings.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/uploaders/FtpUploaderSettings.h 2014-02-07 20:05:26.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/uploaders/ImageshackUploader.cpp hotshots-2.1.0/src/uploaders/ImageshackUploader.cpp --- hotshots-2.0.1/src/uploaders/ImageshackUploader.cpp 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/uploaders/ImageshackUploader.cpp 2014-02-10 22:31:30.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -105,11 +105,11 @@ if (reply->error() == QNetworkReply::NoError) { parseReply( reply->readAll() ); - LogHandler::getInstance()->reportInfo( tr("%1 transfert end without error").arg(m_name) ); + LogHandler::getInstance()->reportInfo( tr("%1 transfert end without error.").arg(m_name) ); } else { - LogHandler::getInstance()->reportError( tr("%1 transfert end with error (%2)").arg(m_name).arg( reply->errorString() ) ); + LogHandler::getInstance()->reportError( tr("%1 transfert end with error! (%2)").arg(m_name).arg( reply->errorString() ) ); } reply->deleteLater(); diff -Nru hotshots-2.0.1/src/uploaders/ImageshackUploader.h hotshots-2.1.0/src/uploaders/ImageshackUploader.h --- hotshots-2.0.1/src/uploaders/ImageshackUploader.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/uploaders/ImageshackUploader.h 2014-02-07 20:05:24.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/uploaders/ImgurUploader.cpp hotshots-2.1.0/src/uploaders/ImgurUploader.cpp --- hotshots-2.0.1/src/uploaders/ImgurUploader.cpp 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/uploaders/ImgurUploader.cpp 2014-02-10 22:31:30.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -89,11 +89,11 @@ if (reply->error() == QNetworkReply::NoError) { parseReply( reply->readAll() ); - LogHandler::getInstance()->reportInfo( tr("%1 transfert end without error").arg(m_name) ); + LogHandler::getInstance()->reportInfo( tr("%1 transfert end without error.").arg(m_name) ); } else { - LogHandler::getInstance()->reportError( tr("%1 transfert end with error (%2)").arg(m_name).arg( reply->errorString() ) ); + LogHandler::getInstance()->reportError( tr("%1 transfert end with error! (%2)").arg(m_name).arg( reply->errorString() ) ); } reply->deleteLater(); diff -Nru hotshots-2.0.1/src/uploaders/ImgurUploader.h hotshots-2.1.0/src/uploaders/ImgurUploader.h --- hotshots-2.0.1/src/uploaders/ImgurUploader.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/uploaders/ImgurUploader.h 2014-02-07 20:05:22.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/uploaders/UploaderManager.cpp hotshots-2.1.0/src/uploaders/UploaderManager.cpp --- hotshots-2.0.1/src/uploaders/UploaderManager.cpp 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/uploaders/UploaderManager.cpp 2014-02-07 20:05:22.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/uploaders/UploaderManager.h hotshots-2.1.0/src/uploaders/UploaderManager.h --- hotshots-2.0.1/src/uploaders/UploaderManager.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/uploaders/UploaderManager.h 2014-02-07 20:05:22.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/uploaders/UploaderRegistering.cpp hotshots-2.1.0/src/uploaders/UploaderRegistering.cpp --- hotshots-2.0.1/src/uploaders/UploaderRegistering.cpp 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/uploaders/UploaderRegistering.cpp 2014-02-07 20:05:22.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/uploaders/UploaderRegistering.h hotshots-2.1.0/src/uploaders/UploaderRegistering.h --- hotshots-2.0.1/src/uploaders/UploaderRegistering.h 2013-11-01 15:42:04.000000000 +0000 +++ hotshots-2.1.0/src/uploaders/UploaderRegistering.h 2014-02-07 20:05:20.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -Nru hotshots-2.0.1/src/WindowGrabber.h hotshots-2.1.0/src/WindowGrabber.h --- hotshots-2.0.1/src/WindowGrabber.h 2013-12-18 21:32:40.000000000 +0000 +++ hotshots-2.1.0/src/WindowGrabber.h 2014-02-11 21:04:22.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -21,6 +21,9 @@ #ifndef _WINDOWGRABBER_H_ #define _WINDOWGRABBER_H_ +#include +#include + #include class WindowGrabber @@ -30,8 +33,16 @@ WindowGrabber(); ~WindowGrabber(); - /* Grab a screenshot of the current window. x and y are set to the position of the window */ + //! Grab a screenshot of the current window. x and y are set to the position of the window static QPixmap grabCurrent( bool includeDecorations, QRect &wRect ); + + //! Grab the cursor image + static QPixmap grabCursor(QPoint &hotSpot); + +#ifdef Q_WS_WIN + static QPixmap grabCurrentOld( bool includeDecorations, QRect &wRect ); +#endif + }; #endif // _WINDOWGRABBER_H_ diff -Nru hotshots-2.0.1/src/WindowGrabber_mac.cpp hotshots-2.1.0/src/WindowGrabber_mac.cpp --- hotshots-2.0.1/src/WindowGrabber_mac.cpp 2014-01-24 21:30:40.000000000 +0000 +++ hotshots-2.1.0/src/WindowGrabber_mac.cpp 2014-02-07 20:05:08.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -46,4 +46,11 @@ return pixmap; } +QPixmap WindowGrabber::grabCursor(QPoint &hotSpot) +{ + QPixmap pm; + // TODO !! + return pm; +} + #endif // Q_WS_MAC diff -Nru hotshots-2.0.1/src/WindowGrabber_os2.cpp hotshots-2.1.0/src/WindowGrabber_os2.cpp --- hotshots-2.0.1/src/WindowGrabber_os2.cpp 2014-01-24 21:48:44.000000000 +0000 +++ hotshots-2.1.0/src/WindowGrabber_os2.cpp 2014-02-07 20:05:06.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -37,4 +37,11 @@ return QPixmap(); } +QPixmap WindowGrabber::grabCursor(QPoint &hotSpot) +{ + QPixmap pm; + // TODO !! + return pm; +} + #endif diff -Nru hotshots-2.0.1/src/WindowGrabber_win.cpp hotshots-2.1.0/src/WindowGrabber_win.cpp --- hotshots-2.0.1/src/WindowGrabber_win.cpp 2014-01-18 17:36:16.000000000 +0000 +++ hotshots-2.1.0/src/WindowGrabber_win.cpp 2014-02-11 21:06:00.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -24,12 +24,18 @@ #include #include +#include #include #include + #ifdef Q_WS_WIN + #include +#include +#include + static UINT cxWindowBorder, cyWindowBorder; static const int minSize = 8; @@ -39,71 +45,6 @@ return r1.width() * r1.height() < r2.width() * r2.height(); } -// Recursively iterates over the window w and its children, thereby building -// a tree of window descriptors. Windows in non-viewable state or with height -// or width smaller than minSize will be ignored. - -static bool maybeAddWindow(HWND hwnd, std::vector *windows) -{ - WINDOWINFO wi; - GetWindowInfo( hwnd, &wi ); - RECT rect = wi.rcClient; - -#if 0 - RECT rect; - GetWindowRect( hwnd, &rect ); -#endif - - int width = rect.right - rect.left; - int height = rect.bottom - rect.top; - - // For some reason, rect.left and rect.top are shifted by cxWindowBorders and cyWindowBorders pixels respectively - // in *every* case (for every window), but cxWindowBorders and cyWindowBorders are non-zero only in the - // biggest-window case, therefore we need to save the biggest cxWindowBorders and cyWindowBorders to adjust the rect later - cxWindowBorder = qMax(cxWindowBorder, wi.cxWindowBorders); - cyWindowBorder = qMax(cyWindowBorder, wi.cyWindowBorders); - - if ( ( ( wi.dwStyle & WS_VISIBLE ) != 0 ) && (width >= minSize ) && (height >= minSize ) ) - { - //QRect r( rect.left + 4, rect.top + 4, width, height); // 4 = max(wi.cxWindowBorders) = max(wi.cyWindowBorders) - QRect r(rect.left + cxWindowBorder, rect.top + cyWindowBorder, width, height); - if ( std::find( windows->begin(), windows->end(), r ) == windows->end() ) - { - windows->push_back( r ); - return true; - } - } - return false; -} - -static BOOL CALLBACK getWindowsRecursiveHelper( HWND hwnd, LPARAM lParam ) -{ - maybeAddWindow( hwnd, reinterpret_cast< std::vector* >(lParam) ); - return TRUE; -} - -static void getWindowsRecursive( std::vector *windows, HWND hwnd, - int rx = 0, int ry = 0, int depth = 0 ) -{ - Q_UNUSED(depth); - Q_UNUSED(rx); - Q_UNUSED(ry); - maybeAddWindow(hwnd, windows); - - EnumChildWindows( hwnd, getWindowsRecursiveHelper, (LPARAM) windows ); - - std::sort( windows->begin(), windows->end() ); -} - -static -HWND findRealWindow( HWND w, int depth = 0 ) -{ - Q_UNUSED(depth); - - // TODO Implement - return w; // This is WRONG but makes code compile for now -} - static HWND windowUnderCursor(bool includeDecorations = true) { POINT pointCursor; @@ -150,12 +91,12 @@ // upper left x = client upper left x + xborder // upper left y = client upper left y + yborder + titleb - qDebug () << "rcClient trnaslated = " << rcClient.left << "," << rcClient.top << " " << rcClient.right << "," << rcClient.bottom; - - wRect.setTop(rcClient.top); - wRect.setBottom(rcClient.bottom); - wRect.setLeft(rcClient.left); - wRect.setRight(windowRect.right); + qDebug () << "rcClient trnaslated = " << rcClient.left << "," << rcClient.top << " " << rcClient.right << "," << rcClient.bottom; + + wRect.setTop(rcClient.top); + wRect.setBottom(rcClient.bottom); + wRect.setLeft(rcClient.left); + wRect.setRight(windowRect.right); int w = windowRect.right - windowRect.left; int h = windowRect.bottom - windowRect.top; @@ -188,16 +129,8 @@ BitBlt(hDC, 0, 0, wc, hc, targetDC, rcClient.left - windowRect.left,rcClient.top - windowRect.top, SRCCOPY); tempPict = (HBITMAP) SelectObject(hDC, oldPict); pm = QPixmap::fromWinHBITMAP(tempPict); - - } - //HBITMAP tempPict = CreateCompatibleBitmap(targetDC, w, h); -// HBITMAP tempPict = CreateCompatibleBitmap(targetDC, wc, hc); -// HGDIOBJ oldPict = SelectObject(hDC, tempPict); -// //BitBlt(hDC, 0, 0, w, h, targetDC, 0, 0, SRCCOPY); -// BitBlt(hDC, 0, 0, wc, hc, targetDC, rcClient.left - windowRect.left ,rcClient.top - windowRect.top, SRCCOPY); -// tempPict = (HBITMAP) SelectObject(hDC, oldPict); -// QPixmap pm = QPixmap::fromWinHBITMAP(tempPict); + } DeleteDC(hDC); ReleaseDC(hWnd, targetDC); @@ -213,7 +146,24 @@ { } -QPixmap WindowGrabber::grabCurrent( bool includeDecorations, QRect &wRect ) +QPixmap WindowGrabber::grabCurrent(bool includeDecorations, QRect &wRect) +{ + QPixmap pixmap; + + WId id = QxtWindowSystem::activeWindow(); + if(includeDecorations) + { + wRect = QxtWindowSystem::windowGeometry(id); + pixmap = QPixmap::grabWindow(QApplication::desktop()->winId(), wRect.x(), wRect.y(), wRect.width(),wRect.height()); + } + else + { + pixmap = QPixmap::grabWindow(id); + } + return pixmap; +} + +QPixmap WindowGrabber::grabCurrentOld( bool includeDecorations, QRect &wRect ) { HWND hWindow; hWindow = windowUnderCursor(includeDecorations); @@ -234,4 +184,75 @@ return pm; } +HCURSOR GetCurrentCursorHandle() +{ + POINT pt; + HWND hWnd; + DWORD dwThreadID, dwCurrentThreadID; + HCURSOR hCursor = NULL; + + // Find out which window owns the cursor + GetCursorPos(&pt); + hWnd = WindowFromPoint(pt); + + // Get the thread ID for the cursor owner. + dwThreadID = GetWindowThreadProcessId(hWnd, NULL); + + // Get the thread ID for the current thread + dwCurrentThreadID = GetCurrentThreadId(); + + // If the cursor owner is not us then we must attach to + // the other thread in so that we can use GetCursor() to + // return the correct hCursor + if (dwCurrentThreadID != dwThreadID) + { + + // Attach to the thread that owns the cursor + if (AttachThreadInput(dwCurrentThreadID, dwThreadID, TRUE)) + { + + // Get the handle to the cursor + hCursor = GetCursor(); + + // Detach from the thread that owns the cursor + AttachThreadInput(dwCurrentThreadID, dwThreadID, FALSE); + } + } + else + hCursor = GetCursor(); + + return hCursor; +} + +QPixmap WindowGrabber::grabCursor(QPoint &hotSpot) +{ + QPixmap pm; + + HDC hdcScreen = GetDC(NULL); + HDC hdcMem = CreateCompatibleDC(hdcScreen); + CURSORINFO cursorInfo = { 0 }; + cursorInfo.cbSize = sizeof(cursorInfo); + if (::GetCursorInfo(&cursorInfo)) + { + ICONINFO ii = {0}; + GetIconInfo(cursorInfo.hCursor, &ii); + HBITMAP hbmCanvas = CreateCompatibleBitmap(hdcScreen, 32, 32); + // Select the bitmap into the device context. + HGDIOBJ hbmOld = SelectObject(hdcMem, hbmCanvas); + hotSpot.setX(ii.xHotspot); + hotSpot.setY(ii.yHotspot); + DrawIcon(hdcMem, 0,0 , cursorInfo.hCursor); + // Get the color of the pixel you're interested in. + COLORREF clr = GetPixel(hdcMem, 0, 0); + pm = QPixmap::fromWinHBITMAP(hbmCanvas,QPixmap::Alpha); + // Clean up after yourself. + SelectObject(hdcMem, hbmOld); + DeleteObject(hbmCanvas); + DeleteDC(hdcMem); + ReleaseDC(NULL,hdcScreen); + } + + return pm; +} + #endif // Q_WS_WIN diff -Nru hotshots-2.0.1/src/WindowGrabber_x11.cpp hotshots-2.1.0/src/WindowGrabber_x11.cpp --- hotshots-2.0.1/src/WindowGrabber_x11.cpp 2014-01-18 17:39:40.000000000 +0000 +++ hotshots-2.1.0/src/WindowGrabber_x11.cpp 2014-02-07 20:05:06.000000000 +0000 @@ -1,7 +1,7 @@ /****************************************************************************** HotShots: Screenshot utility - Copyright(C) 2011-2013 xbee@xbee.net + Copyright(C) 2011-2014 xbee@xbee.net This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -25,6 +25,7 @@ #include #include +#include #include #include @@ -32,6 +33,7 @@ #ifdef Q_WS_X11 #include +#include #ifdef HAVE_X11_EXTENSIONS_SHAPE_H #include @@ -289,4 +291,28 @@ return pm; } +QPixmap WindowGrabber::grabCursor(QPoint &hotSpot) +{ + QPixmap pm; + XFixesCursorImage *xfcursorImage = XFixesGetCursorImage( QX11Info::display() ); + if ( !xfcursorImage ) + return pm; + hotSpot.setX(xfcursorImage->xhot); + hotSpot.setY(xfcursorImage->yhot); + + //Annoyingly, xfixes specifies the data to be 32bit, but places it in an unsigned long * + //which can be 64 bit. So we need to iterate over a 64bit structure to put it in a 32bit + //structure. + QVarLengthArray< quint32 > pixels( xfcursorImage->width * xfcursorImage->height ); + for (int i = 0; i < xfcursorImage->width * xfcursorImage->height; ++i) + pixels[i] = xfcursorImage->pixels[i] & 0xffffffff; + + QImage mouseCursor((uchar *) pixels.data(), xfcursorImage->width, xfcursorImage->height, + QImage::Format_ARGB32_Premultiplied); + + pm = QPixmap::fromImage(mouseCursor); + XFree(xfcursorImage); + return pm; +} + #endif // Q_WS_X11 diff -Nru hotshots-2.0.1/TODO.txt hotshots-2.1.0/TODO.txt --- hotshots-2.0.1/TODO.txt 2013-12-15 22:13:40.000000000 +0000 +++ hotshots-2.1.0/TODO.txt 2014-02-08 16:21:42.000000000 +0000 @@ -1,10 +1,15 @@ - Bug hunt - more translations (I need help !). Send them to xbee at xbee dot net or project is referenced on www.transifex.com, feel free to give help. - And Feel free to write feedback, bug-reports and patches to xbee at xbee dot net + +Ideas: + - Add credential support for web server - Auto capture at fixed interval - Re Capture with same parameters -- Add snapshot delay also in preferences -- Mouse cursor ? +- User defined action list in systray menu + + + + -Ideas: diff -Nru hotshots-2.0.1/ui/AboutDialog.ui hotshots-2.1.0/ui/AboutDialog.ui --- hotshots-2.0.1/ui/AboutDialog.ui 2014-01-24 20:31:50.000000000 +0000 +++ hotshots-2.1.0/ui/AboutDialog.ui 2014-02-11 21:20:06.000000000 +0000 @@ -9,8 +9,8 @@ 0 0 - 547 - 489 + 589 + 497 @@ -524,7 +524,7 @@ - false + true Add mouse cursor to snapshot @@ -652,48 +652,77 @@ :/hotshots/hotkey.png:/hotshots/hotkey.png - Hotkeys + Shortcut/Menu - - + + + + + - Use system screen capture shortcuts (only available for screen grab functions) + Action performed by double-clicking on system tray icon: - - - - - Action - - - - - Shortcut - - - - - Description - - + + + + Shortcut editor + + + + + + + Action + + + + + Shortcut + + + + + Description + + + + + + + + Use system screen capture shortcuts (only available for screen grab functions) + + + + + + + + 75 + true + + + + Warning! Duplicated shortcuts will not be checked. + + + + - - - - - 75 - true - - + + - Warning! Duplicated shortcuts will not be checked. + System tray additional functions: + + + diff -Nru hotshots-2.0.1/ui/EditorWidget.ui hotshots-2.1.0/ui/EditorWidget.ui --- hotshots-2.0.1/ui/EditorWidget.ui 2013-12-08 09:36:10.000000000 +0000 +++ hotshots-2.1.0/ui/EditorWidget.ui 2014-02-10 22:27:44.000000000 +0000 @@ -637,6 +637,8 @@ + + @@ -970,7 +972,7 @@ Blur item - Obfuscate + Blur @@ -1387,7 +1389,7 @@ Delete selected elements - Del + Del @@ -1478,6 +1480,126 @@ + + + + + + :/editor/editor/align_left.png:/editor/editor/align_left.png + + + Align group to left + + + Align group to left + + + + + + + + + :/editor/editor/align_h_center.png:/editor/editor/align_h_center.png + + + Align group to horizontal center + + + Align group to horizontal center + + + + + + + + + :/editor/editor/align_v_center.png:/editor/editor/align_v_center.png + + + Align group to vertical center + + + Align group to vertical center + + + + + + + + + :/editor/editor/align_right.png:/editor/editor/align_right.png + + + Align group to right + + + Align group to right + + + + + + + + + :/editor/editor/align_top.png:/editor/editor/align_top.png + + + Align group to top + + + Align group to top + + + + + + + + + :/editor/editor/align_bottom.png:/editor/editor/align_bottom.png + + + Align group to bottom + + + Align group to bottom + + + + + + + + + :/editor/editor/alignment.png:/editor/editor/alignment.png + + + Set alignment + + + Set alignment to a group + + + + + + QAction::ApplicationSpecificRole + + + + + + :/editor/editor/rescale.png:/editor/editor/rescale.png + + + Rescale background image + + + diff -Nru hotshots-2.0.1/ui/FtpUploaderSettings.ui hotshots-2.1.0/ui/FtpUploaderSettings.ui --- hotshots-2.0.1/ui/FtpUploaderSettings.ui 2013-06-26 18:06:02.000000000 +0000 +++ hotshots-2.1.0/ui/FtpUploaderSettings.ui 2014-02-10 22:33:40.000000000 +0000 @@ -188,7 +188,7 @@ - Ftp port + FTP port 65536 diff -Nru hotshots-2.0.1/ui/RescaleDialog.ui hotshots-2.1.0/ui/RescaleDialog.ui --- hotshots-2.0.1/ui/RescaleDialog.ui 1970-01-01 00:00:00.000000000 +0000 +++ hotshots-2.1.0/ui/RescaleDialog.ui 2014-02-07 21:33:34.000000000 +0000 @@ -0,0 +1,264 @@ + + + RescaleDialogClass + + + Qt::NonModal + + + + 0 + 0 + 427 + 198 + + + + Rescale snapshot + + + true + + + + + + Original size: + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + + + + Target size: + + + + + + + + + + + + + + Scale snapshot + + + false + + + + + + % + + + true + + + + + + + Size + + + + + + + false + + + 1 + + + 10000 + + + 800 + + + + + + + false + + + 1 + + + 10000 + + + 600 + + + + + + + 1 + + + 999 + + + 100 + + + + + + + false + + + Keep aspect ratio + + + true + + + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + + + + + buttonBox + accepted() + RescaleDialogClass + accept() + + + 311 + 188 + + + 157 + 197 + + + + + buttonBox + rejected() + RescaleDialogClass + reject() + + + 379 + 188 + + + 286 + 197 + + + + + radioButtonPercent + toggled(bool) + spinBoxScalePercent + setEnabled(bool) + + + 60 + 49 + + + 363 + 51 + + + + + radioButtonMaxSize + toggled(bool) + checkBoxKeepAspectRatio + setEnabled(bool) + + + 45 + 68 + + + 53 + 91 + + + + + radioButtonMaxSize + toggled(bool) + spinBoxScaleWidth + setEnabled(bool) + + + 84 + 68 + + + 171 + 69 + + + + + radioButtonMaxSize + toggled(bool) + spinBoxScaleHeight + setEnabled(bool) + + + 66 + 67 + + + 319 + 69 + + + + +