diff -Nru hotshots-1.2.0/Changelog.txt hotshots-1.2.1/Changelog.txt --- hotshots-1.2.0/Changelog.txt 2013-07-17 16:28:32.000000000 +0000 +++ hotshots-1.2.1/Changelog.txt 2013-08-24 15:20:06.000000000 +0000 @@ -1,3 +1,15 @@ +Version 1.2.1 +* Features: +- keep window manager settings in some cases (option) +- Add Romanian translation. Thanks to Jaff. +- Editor: ESC key force select mode. +- Editor: add key +/- for zooming +- Add ability to directly load a file (.hot/image) in editor with command line +* Bugs: +- find the correct path for translation files on linux in some cases +- incorrect display on multiple screen configuration in some cases +- incorrect display of splashscreen on linux in some cases +- auto close function is now disabled by a user action Version 1.2.0 * Features: - some layout changes @@ -6,7 +18,7 @@ - Editor: ability to edit some items (polygon, polyline, curve) more easily - Editor: ability to add post-effect to image background - Uploader: add a user field to define the output template for FTP uploader -- Ability to send directly to printer a ducument +- Ability to directly send to printer a ducument - Add Slovak translation. Thanks to Slavko. - Add Turkish translation. Thanks to reis33. - Add Russian translation. Thanks to Andrey Maraev. diff -Nru hotshots-1.2.0/INSTALL.txt hotshots-1.2.1/INSTALL.txt --- hotshots-1.2.0/INSTALL.txt 2013-05-19 18:18:44.000000000 +0000 +++ hotshots-1.2.1/INSTALL.txt 2013-07-26 18:55:12.000000000 +0000 @@ -4,12 +4,12 @@ #> dos2unix tounix.sh #> sh ./tounix.sh #> cd build -#> qmake-qt4 -recursive +#> qmake-qt4 -recursive HotShots.pro or #> cd build -#> qmake -recursive +#> qmake -recursive HotShots.pro #> make #>sudo make install diff -Nru hotshots-1.2.0/build/CMakeLists.txt hotshots-1.2.1/build/CMakeLists.txt --- hotshots-1.2.0/build/CMakeLists.txt 2013-06-22 17:24:12.000000000 +0000 +++ hotshots-1.2.1/build/CMakeLists.txt 2013-08-29 19:07:14.000000000 +0000 @@ -18,7 +18,7 @@ PROJECT(HotShots) # note: change this BEFORE making a release !! -SET( MYAPP_VERSION "1.2.0" ) +SET( MYAPP_VERSION "1.2.1" ) set( PROGNAME hotshots ) IF( APPLE ) @@ -55,7 +55,7 @@ ENDIF( MSVC ) IF (UNIX) - INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR} "/usr/include/qxt/QxtGui" "/usr/include/qxt/QxtCore" "/usr/include/QxtGui" "/usr/include/QxtCore") + INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR} "/usr/include/qxt/QxtGui" "/usr/include/qxt/QxtCore" "/usr/include/QxtGui" "/usr/include/QxtCore" "/usr/local/Qxt/include/QxtGui" "/usr/local/Qxt/include/QxtCore") ENDIF( UNIX ) @@ -232,6 +232,7 @@ # freedesktop file INSTALL(FILES ${PROGNAME}.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications/" ) INSTALL(FILES ../res/${PROGNAME}.png DESTINATION "${CMAKE_INSTALL_PREFIX}/share/pixmaps/" ) + INSTALL(FILES hotshots.xml DESTINATION "${CMAKE_INSTALL_PREFIX}/share/mime/packages" ) INSTALL(FILES ../CREDITS.txt ../README.txt ../AUTHORS.txt ../Changelog.txt DESTINATION share/${PROGNAME}) endif (UNIX AND NOT APPLE) diff -Nru hotshots-1.2.0/build/HotShots.pro hotshots-1.2.1/build/HotShots.pro --- hotshots-1.2.0/build/HotShots.pro 2013-07-23 19:24:06.000000000 +0000 +++ hotshots-1.2.1/build/HotShots.pro 2013-08-30 20:06:38.000000000 +0000 @@ -19,7 +19,8 @@ isEmpty( INSTALL_MANDIR ) : INSTALL_MANDIR = $$INSTALL_PREFIX/share/man isEmpty( INSTALL_DATADIR ) : INSTALL_DATADIR = $$INSTALL_PREFIX/share -isEmpty( MYAPP_INSTALL_DESKTOP ) : MYAPP_INSTALL_DESKTOP = $$INSTALL_DATADIR/applications +isEmpty( MYAPP_INSTALL_MIMETYPE ) : MYAPP_INSTALL_MIMETYPE = $$INSTALL_DATADIR/mime/packages +isEmpty( MYAPP_INSTALL_DESKTOP ) : MYAPP_INSTALL_DESKTOP = $$INSTALL_DATADIR/application isEmpty( MYAPP_INSTALL_PIXMAPS ) : MYAPP_INSTALL_PIXMAPS = $$INSTALL_DATADIR/pixmaps isEmpty( MYAPP_INSTALL_DATA ) : MYAPP_INSTALL_DATA = $$INSTALL_DATADIR/$$TARGET isEmpty( MYAPP_INSTALL_DIR ) : MYAPP_INSTALL_DIR = $$INSTALL_LIBDIR/$$TARGET @@ -57,11 +58,22 @@ ../src/3rdparty/qxt/qxtglobal.cpp \ ../src/3rdparty/qxt/qxtglobalshortcut.cpp \ ../src/3rdparty/qxt/qxtglobalshortcut_win.cpp + +!isEmpty(BUNDLE):SOURCES += \ + ../src/3rdparty/qxt/qxtglobal.cpp \ + ../src/3rdparty/qxt/qxtglobalshortcut.cpp \ + ../src/3rdparty/qxt/qxtglobalshortcut_x11.cpp + win32:HEADERS += \ ../src/3rdparty/qxt/qxtglobal.h \ ../src/3rdparty/qxt/qxtglobalshortcut.h +!isEmpty(BUNDLE):HEADERS += \ + ../src/3rdparty/qxt/qxtglobal.h \ + ../src/3rdparty/qxt/qxtglobalshortcut.h + + FORMS += ../ui/*.ui @@ -81,6 +93,7 @@ TRANSLATIONS += ../lang/hotshots_es.ts # Spain TRANSLATIONS += ../lang/hotshots_eu.ts # Basque TRANSLATIONS += ../lang/hotshots_zh.ts # Chinese +TRANSLATIONS += ../lang/hotshots_ro.ts # Romanian macx:ICON = ../res/hotshots.icns @@ -90,7 +103,11 @@ RESOURCES += ../res/hotshots.qrc win32:LIBS += -lgdi32 -unix:LIBS+= -lQxtGui -lX11 +unix:LIBS+= -lX11 +isEmpty(BUNDLE) +{ +unix:LIBS+= -lQxtGui +} INCLUDEPATH += \ $${DESTDIR} \ @@ -105,7 +122,8 @@ ../src win32:INCLUDEPATH += ../src/3rdparty/qxt -unix:INCLUDEPATH += /usr/include/qxt/QxtGui /usr/include/qxt/QxtCore /usr/include/QxtGui /usr/include/QxtCore +!isEmpty(BUNDLE):INCLUDEPATH += ../src/3rdparty/qxt +unix:INCLUDEPATH += /usr/include/qxt/QxtGui /usr/include/qxt/QxtCore /usr/include/QxtGui /usr/include/QxtCore /usr/local/Qxt/include/QxtGui /usr/local/Qxt/include/QxtCore win32:DEFINES += QXT_STATIC @@ -171,13 +189,16 @@ icons.files += ../res/hotshots.png icons.path = $$MYAPP_INSTALL_PIXMAPS - + + mimetype.files += hotshots.xml + mimetype.path = $$MYAPP_INSTALL_MIMETYPE + # generate manpage system( sh hotshots-manpage.sh > hotshots.1 ) system( gzip -9 -f hotshots.1 ) manual.files += hotshots.1.gz manual.path = $$MYAPP_INSTALL_MAN - INSTALLS += starter transl data desktop icons manual + INSTALLS += starter transl data desktop icons manual mimetype } diff -Nru hotshots-1.2.0/build/hotshots-desktop.sh hotshots-1.2.1/build/hotshots-desktop.sh --- hotshots-1.2.0/build/hotshots-desktop.sh 2013-04-20 16:34:24.000000000 +0000 +++ hotshots-1.2.1/build/hotshots-desktop.sh 2013-08-26 18:33:00.000000000 +0000 @@ -10,4 +10,5 @@ Exec=$1/bin/hotshots Categories=Utility;Application; Icon=$1/share/pixmaps/hotshots.png +MimeType=application/x-hot; EOF diff -Nru hotshots-1.2.0/build/hotshots.xml hotshots-1.2.1/build/hotshots.xml --- hotshots-1.2.0/build/hotshots.xml 1970-01-01 00:00:00.000000000 +0000 +++ hotshots-1.2.1/build/hotshots.xml 2013-08-26 20:14:02.000000000 +0000 @@ -0,0 +1,9 @@ + + + + HotShots project + + + + + diff -Nru hotshots-1.2.0/build/mandriva/hotshots.spec hotshots-1.2.1/build/mandriva/hotshots.spec --- hotshots-1.2.0/build/mandriva/hotshots.spec 1970-01-01 00:00:00.000000000 +0000 +++ hotshots-1.2.1/build/mandriva/hotshots.spec 2013-07-29 20:52:58.000000000 +0000 @@ -0,0 +1,82 @@ +###################################################### +# SpecFile: hotshots.spec +# Generato: http://www.mandrivausers.ro/ +# MRB-Falticska Florin +###################################################### +%define distsuffix mrb +%define debug_package %{nil} + +Name: hotshots +Version: 1.2.0 +Release: 1 +License: GPLv2+ +Summary: Screen-shot and Annotation Tool +URL: https://sourceforge.net/projects/hotshots/ +Group: Graphics +Source0: http://sourceforge.net/projects/hotshots/files/%{version}/HotShots-%{version}.zip +BuildRequires: imagemagick +BuildRequires: hicolor-icon-theme +BuildRequires: libqxt-devel +BuildRequires: qt4-devel +BuildRequires: desktop-file-utils + + +%description +HotShots is an application for capturing screens and saving them in +a variety of image formats as well as adding annotations and graphical +data (arrows, lines, texts, ...). + +%prep +%setup -qn HotShots-%{version} +sed -i 's/\r$//' *.txt + +%build +cd build +%qmake_qt4 \ + QMAKE_CFLAGS+="%{optflags}" \ + QMAKE_CXXFLAGS+="%{optflags}" \ + QMAKE_STRIP="true" \ + INSTALL_PREFIX=%{_prefix} +%make + +%install +pushd build +make INSTALL_ROOT=%{buildroot} install +popd + +# icons +rm -f %{buildroot}%{_datadir}/pixmaps/%{name}.png +install -Dm 0644 res/%{name}.png \ + %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/%{name}.png +for size in 96x96 64x64 48x48 32x32 22x22 16x16 ; do + install -dm 0755 \ + %{buildroot}%{_datadir}/icons/hicolor/${size}/apps + convert -strip -resize ${size} res/%{name}.png \ + %{buildroot}%{_datadir}/icons/hicolor/${size}/apps/%{name}.png +done +# menu entry +cd build +desktop-file-install %{name}.desktop \ + --dir=%{buildroot}%{_datadir}/applications \ + --remove-key=Version \ + --remove-key=Icon \ + --set-icon=%{name} \ + --remove-key=GenericName \ + --remove-category=Utility \ + --remove-category=Application \ + --add-category=Qt \ + --add-category=KDE \ + --add-category=Graphics +cd - + +%find_lang %{name} --with-qt + +%files -f %{name}.lang +%doc *.txt +%{_bindir}/%{name} +%{_datadir}/applications/%{name}.desktop +%{_datadir}/icons/hicolor/*/*/%{name}.* +%{_mandir}/man?/* +%{_datadir}/%{name} + + diff -Nru hotshots-1.2.0/debian/changelog hotshots-1.2.1/debian/changelog --- hotshots-1.2.0/debian/changelog 2013-07-24 05:03:59.000000000 +0000 +++ hotshots-1.2.1/debian/changelog 2013-09-01 10:27:15.000000000 +0000 @@ -1,3 +1,15 @@ +hotshots (1.2.1-1dhor~quantal) quantal; urgency=low + + * Add Romanian translation. Thanks to Jaff. + * Editor: ESC key force select mode. + * Editor: add key +/- for zooming + * Add ability to directly load a file (.hot/image) in editor with command line + * find the correct path for translation files on linux in some cases + * incorrect display on multiple screen configuration in some cases + * incorrect display of splashscreen on linux in some cases + + -- Dariusz Duma Sun, 01 Sep 2013 10:58:19 +0200 + hotshots (1.2.0-2dhor~quantal) quantal; urgency=low * Some layout changes diff -Nru hotshots-1.2.0/debian/patches/usr hotshots-1.2.1/debian/patches/usr --- hotshots-1.2.0/debian/patches/usr 2013-07-24 05:03:43.000000000 +0000 +++ hotshots-1.2.1/debian/patches/usr 2013-09-01 10:24:39.000000000 +0000 @@ -1,38 +1,19 @@ -Description: Place hotshot to /usr +Description: Install to /usr TODO: Put a short summary on the line above and replace this paragraph with a longer explanation of this change. Complete the meta-information with other relevant fields (see below for details). To make it easier, the information below has been extracted from the changelog. Adjust it or drop it. . - hotshots (1.2.0-2dhor~precise) precise; urgency=low + hotshots (1.2.1-1dhor~raring) raring; urgency=low . - * Some layout changes - * Editor: add multi selection - * Editor: ability to select shadow on each item - * Editor: ability to edit some items (polygon, polyline, curve) more easily - * Editor: ability to add post-effect to image background - * Uploader: add a user field to define the output template for FTP uploader - * Ability to send directly to printer a ducument - * Add Slovak translation. Thanks to Slavko. - * Add Turkish translation. Thanks to reis33. - * Add Russian translation. Thanks to Andrey Maraev. - * Add Sinhala translation. Thanks to chathu151. - * Add Serbian translation. Thanks to ozzii. - * Add Czech translation. Thanks to fri. - * Add Vietnamese translation. Thanks to ppanhh. - * Add Basque translation. Thanks to Alexander Gabilondo. - * Add Spanish translation. Thanks to Manuel Soriano. - * Add Chinese translation. Thanks to taijuin. - * default location not updated in some case - * add a message box to clear/update background image if annotation exists - * can't crop an already cropped image - * start in tray don't works - * Blurring don't work on small area - * Font preview can "disrupt" the editor layout - * Incorrect post effect after crop - * incorrect loading of translation file in some cases - * incorrect list of supported image format list in save dialog + * Add Romanian translation. Thanks to Jaff. + * Editor: ESC key force select mode. + * Editor: add key +/- for zooming + * Add ability to directly load a file (.hot/image) in editor with command line + * find the correct path for translation files on linux in some cases + * incorrect display on multiple screen configuration in some cases + * incorrect display of splashscreen on linux in some cases Author: Dariusz Duma --- @@ -48,8 +29,8 @@ Reviewed-By: Last-Update: ---- hotshots-1.2.0.orig/build/HotShots.pro -+++ hotshots-1.2.0/build/HotShots.pro +--- hotshots-1.2.1.orig/build/HotShots.pro ++++ hotshots-1.2.1/build/HotShots.pro @@ -7,7 +7,7 @@ TARGET = hotshots TEMPLATE = app diff -Nru hotshots-1.2.0/lang/hotshots_cs.ts hotshots-1.2.1/lang/hotshots_cs.ts --- hotshots-1.2.0/lang/hotshots_cs.ts 2013-07-23 19:13:02.000000000 +0000 +++ hotshots-1.2.1/lang/hotshots_cs.ts 2013-08-29 19:01:48.000000000 +0000 @@ -574,62 +574,64 @@ 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 + + + Clear edit Smazat úpravy - + Clear all the exiting items ? Smazat všechny existující položky? - + Clear document Smazat dokument - + Create a new document ? Vytvořit nový dokument? - - 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 - - - + 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 - + Snapshot editor: Editor snímku obrazovky: - + Scale x%1 Měřítko x%1 @@ -1076,91 +1078,96 @@ 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 - - + + Upload the image to the web Nahrát obrázek na internet - + 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 !! 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 ? - + 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. + MainWindowClass @@ -1376,8 +1383,8 @@ - [options] - [volby] + [options] [file] + [volby] [soubor] @@ -1400,33 +1407,33 @@ --no-singleinstance : povolit použití více instancí programu (nedoporučuje se). - - message from other instance. - zpráva od jiné instance. + + 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 již běží! - + translations path %1 Cesta k překladům %1 - + setting language to : %1 Nastavení jazyka na: %1 - - + + successfully loaded data from %1 Data z %1 byla úspěšně nahrána - + failed to load data from %1 Data z %1 se nepodařilo nahrát Binary files /tmp/T4Fk5mD1D0/hotshots-1.2.0/lang/hotshots_el.qm and /tmp/0F4nBsYHQM/hotshots-1.2.1/lang/hotshots_el.qm differ diff -Nru hotshots-1.2.0/lang/hotshots_el.ts hotshots-1.2.1/lang/hotshots_el.ts --- hotshots-1.2.0/lang/hotshots_el.ts 2013-07-23 19:13:50.000000000 +0000 +++ hotshots-1.2.1/lang/hotshots_el.ts 2013-08-29 19:05:36.000000000 +0000 @@ -1,8 +1,10 @@ - + + + - + - + 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) @@ -36,46 +38,46 @@ Μητρώο καταγραφής - + 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 reset all the preferences to default value ? If yes, the application will be relaunch Θέλετε να επαναφέρετε όλες τις προτιμήσεις στις προεπιλεγμένες τιμές; Εάν ναι, η εφαρμογή θα κάνει επανεκκίνηση. - + Example: Παράδειγμα: @@ -473,7 +475,7 @@ Το %1 μεταφέρθηκε με σφάλμα (%2) - + Can't extract URL from reply Δεν μπορεί να εξαχθεί η διεύθυνση URL από την απάντηση @@ -574,62 +576,64 @@ Ενημέρωση φόντου εικόνας - + + + Loading HotShots file failed + Η φόρτωση του αρχείου HotShots απέτυχε + + + + + Error loading HotShots file %1 + Σφάλμα φόρτωσης του αρχείου HotShots %1 + + + Clear edit Απαλοιφή επεξεργασίας - + Clear all the exiting items ? Απαλοιφή όλων των στοιχεία που υπάρχουν; - + Clear document Απαλοιφή εγγράφου - + Create a new document ? Δημιουργία νέου εγγράφου; - - Loading HotShots file failed - Η φόρτωση του αρχείου HotShots απέτυχε - - - - Error loading HotShots file %1 - Σφάλμα φόρτωσης του αρχείου HotShots %1 - - - + Save HotShots File Αποθήκευση αρχείου HotShots - + HotShots files (*.hot) Αρχεία HotShots (*.hot) - + Saving HotShots file failed Η αποθήκευση του αρχείου HotShots απέτυχε - + Error saving HotShots file %1 Σφάλμα αποθήκευσης του αρχείου HotShots %1 - + Snapshot editor: Επεξεργαστής στιγμιοτύπου: - + Scale x%1 Κλίμακα x%1 @@ -921,22 +925,22 @@ Επιτυχής αποστολή στο %1. - + %1 is available Το %1 είναι διαθέσιμο - + %1 is'nt available on server %2 Το %1 δεν είναι διαθέσιμο στον διακομιστή %2 - + %1 transfert end with error Η μεταφορά του %1 τελείωσε με σφάλμα - + %1 transfert end without error Η μεταφορά του %1 τελείωσε χωρίς σφάλμα @@ -1045,17 +1049,17 @@ ImgurUploader - + %1 transfert end without error Το %1 μεταφέρθηκε χωρίς σφάλμα - + %1 transfert end with error (%2) Το %1 μεταφέρθηκε με σφάλμα (%2) - + An error occurred during parsing of service response Παρουσιάστηκε σφάλμα κατά την ανάλυση της απόκρισης της υπηρεσίας @@ -1063,106 +1067,111 @@ MainWindow - + Save Directory Κατάλογος αποθήκευσης - + Register of %1 uploaders Καταχώρηση προγράμματος μεταφόρτωσης %1 - + Can't create storage location, check why ?! (%1) Δεν μπορεί να δημιουργηθεί η θέση αποθήκευσης. Ελέγξτε την αιτία! (%1) - + No post effect Χωρίς προσθήκη εφέ - + Simple drop shadow Απλή σκιά - + Drop shadow with borders Σκιά μαζί με περίγραμμα - + Progressive opacity Προοδευτική αδιαφάνεια - + Torn edge Λείανση άκρων - - + + Upload the image to the 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) δεν φαίνεται να είναι σωστά ρυθμισμένο. Δεν έχει τιμές για τις απαιτούμενες παραμέτρους ! - + 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. + + MainWindowClass @@ -1362,7 +1371,7 @@ QObject - + %1 found Βρέθηκαν 1% @@ -1378,8 +1387,8 @@ - [options] - [επιλογές] + [options] [file] + @@ -1402,33 +1411,33 @@ --πολλαπλή συνεδρία : ενεργοποίηση χρήσης πολλαπλής εμφάνισης του προγράμματος (δεν συνιστάται). - - message from other instance. - Μήνυμα από άλλη συνεδρία. + + file : file to load in the editor, can be a .hot file or an image file. + - + %1 is already running !! Το %1 εκτελείται ήδη! - + translations path %1 Κατάλογος μεταφράσεων %1 - + setting language to : %1 Ρύθμιση γλώσσας σε : %1 - - + + successfully loaded data from %1 Επιτυχής φόρτωση δεδομένων από %1 - + failed to load data from %1 Αποτυχία φόρτωσης δεδομένων από %1 @@ -1575,4 +1584,4 @@ Γέμισμα με το χρώμα φόντου - \ No newline at end of file + Binary files /tmp/T4Fk5mD1D0/hotshots-1.2.0/lang/hotshots_es.qm and /tmp/0F4nBsYHQM/hotshots-1.2.1/lang/hotshots_es.qm differ diff -Nru hotshots-1.2.0/lang/hotshots_es.ts hotshots-1.2.1/lang/hotshots_es.ts --- hotshots-1.2.0/lang/hotshots_es.ts 2013-07-23 19:15:18.000000000 +0000 +++ hotshots-1.2.1/lang/hotshots_es.ts 2013-08-29 19:05:36.000000000 +0000 @@ -1,8 +1,10 @@ - + + + - + - + release of translation and translator name please put your name here dear translator and the release of the translation file !! Traducción 1.2 por manu @@ -36,46 +38,46 @@ 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 ? La aplicación necesita reiniciar para tener cuenta el nuevo idioma ¿ Desea reniciar la aplicacióm ahora ? - + 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á - + Example: Ejemplo : @@ -473,7 +475,7 @@ La transferencia %1 se ha terminado con el error (%2) - + Can't extract URL from reply Imposible de extraer la URL de la respuesta @@ -574,62 +576,64 @@ 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 + + + Clear edit Limpiar la edición - + Clear all the exiting items ? ¿ Borrar todos los elementos ? - + Clear document Borrar el documento - + Create a new document ? ¿ Crear un nuevo documento ? - - Loading HotShots file failed - La carga del fichero HotShots ha fallado - - - - Error loading HotShots file %1 - Error durante la carga del fichero HotShots %1 - - - + 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 - + Snapshot editor: Editor de pantallas capturadas : - + Scale x%1 Escala x%1 @@ -919,22 +923,22 @@ Telecarga exitosa %1 - + %1 is available %1 esta disponible - + %1 is'nt available on server %2 %1 no es accesible en el servidor %2 - + %1 transfert end with error La transferencia de %1 se ha terminado con un error - + %1 transfert end without error La transferencia de %1 se ha terminado sin errores @@ -1043,17 +1047,17 @@ ImgurUploader - + %1 transfert end without error La transferencia de %1 se ha terminado sin errores - + %1 transfert end with error (%2) La transferencia de %1 se ha terminado con un error (%2) - + An error occurred during parsing of service response Ocurrió un error durante la interpretación de la respuesta del servicio @@ -1061,106 +1065,111 @@ 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) - + 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 - - + + 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 ! - + 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 !! - + Upload image %1 to %2 service ? Telecarga de la imágen %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. + + MainWindowClass @@ -1360,7 +1369,7 @@ QObject - + %1 found %1 encontrado @@ -1376,8 +1385,8 @@ - [options] - [opciones] + [options] [file] + @@ -1400,33 +1409,33 @@ --no-singleinstance : Habilita el uso de varias instancias del programa (no recomendado). - - message from other instance. - mensaje de otra instancia. + + file : file to load in the editor, can be a .hot file or an image file. + - + %1 is already running !! %1 ya esta en funcionamiento !! - + translations path %1 camino para las traducciones %1 - + setting language to : %1 Definir como idioma : %1 - - + + successfully loaded data from %1 Carga de %1 realizada con éxito - + failed to load data from %1 Carga de datos desde %1 fallida @@ -1571,4 +1580,4 @@ Relleno con color - \ No newline at end of file + Binary files /tmp/T4Fk5mD1D0/hotshots-1.2.0/lang/hotshots_eu.qm and /tmp/0F4nBsYHQM/hotshots-1.2.1/lang/hotshots_eu.qm differ diff -Nru hotshots-1.2.0/lang/hotshots_eu.ts hotshots-1.2.1/lang/hotshots_eu.ts --- hotshots-1.2.0/lang/hotshots_eu.ts 2013-07-23 19:12:40.000000000 +0000 +++ hotshots-1.2.1/lang/hotshots_eu.ts 2013-08-29 19:05:36.000000000 +0000 @@ -1,8 +1,10 @@ - + + + - + - + release of translation and translator name please put your name here dear translator and the release of the translation file !! itzulpenaren bertsioa eta itzultzailearen izena, mesedez @@ -36,32 +38,32 @@ 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, @@ -69,7 +71,7 @@ - + Do you want to reset all the preferences to default value ? If yes, the application will be relaunch Nahi duzu lehenetsitako balioak berrezartzea? @@ -77,7 +79,7 @@ - + Example: Adibidea: @@ -475,7 +477,7 @@ %1 bidalita errorerik gabe (%2) - + Can't extract URL from reply Ezin deskonprimitu URLa erantzunetik @@ -577,62 +579,64 @@ berritu atzeko planoko irudia ... - + + + Loading HotShots file failed + Errorea HotShots-fitxategia irekitzen + + + + + Error loading HotShots file %1 + Errorea %1 HotShots-fitxategia irekitzen + + + Clear edit Ezabatu edizioa - + Clear all the exiting items ? Ezabatu elementu guztiak? - + Clear document Ezabatu dokumentua - + Create a new document ? Sortu dokumentu berria? - - Loading HotShots file failed - Errorea HotShots-fitxategia irekitzen - - - - Error loading HotShots file %1 - Errorea %1 HotShots-fitxategia irekitzen - - - + 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 - + Snapshot editor: Pantaila-argazkien editorea - + Scale x%1 Eskala x%1 @@ -922,22 +926,22 @@ ondo kargatzen hemen %1. - + %1 is available %1 erabilgarri dago - + %1 is'nt available on server %2 %1 ez dago erabilgarri %2 zerbitzarian - + %1 transfert end with error %1 errorekin bidali da - + %1 transfert end without error %1 bidalita errorerik gabe @@ -1046,17 +1050,17 @@ ImgurUploader - + %1 transfert end without error %1 bidalita errorerik gabe - + %1 transfert end with error (%2) %1 bidalita errorerik gabe (%2) - + An error occurred during parsing of service response Errore bat gertatu da erantzun-zerbitzuaren analisian @@ -1064,106 +1068,111 @@ 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) - + 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 - - + + Upload the image to the web Kargatu irudia webera - + No default uploading web service defined ! Kargatzeko web-zerbitzua definitu gabe! - + 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 !! - + Upload image %1 to %2 service ? Kargatu %1 irudia %2 zerbitzarira? - + 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. + + MainWindowClass @@ -1363,7 +1372,7 @@ QObject - + %1 found %1 aurkitua @@ -1379,8 +1388,8 @@ - [options] - [aukerak] + [options] [file] + @@ -1403,33 +1412,33 @@ --ez-ataza bakarra: programaren ataza anitzen erabilera gaitzen du (ez gomendatua) - - message from other instance. - Beste ataza baten mezua + + file : file to load in the editor, can be a .hot file or an image file. + - + %1 is already running !! %1 jadanik exekutatzen ari da!! - + translations path %1 itzulpenaren kokalekua %1 - + setting language to : %1 ezartzen hizkuntza hona: %1 - - + + successfully loaded data from %1 datuak ondo ireki dira hemendik %1 - + failed to load data from %1 akatsa datuak hemendik irekitzean %1 @@ -1574,4 +1583,4 @@ Bete atzeko-planoko kolorez - \ No newline at end of file + Binary files /tmp/T4Fk5mD1D0/hotshots-1.2.0/lang/hotshots_fr.qm and /tmp/0F4nBsYHQM/hotshots-1.2.1/lang/hotshots_fr.qm differ diff -Nru hotshots-1.2.0/lang/hotshots_fr.ts hotshots-1.2.1/lang/hotshots_fr.ts --- hotshots-1.2.0/lang/hotshots_fr.ts 2013-07-23 19:13:26.000000000 +0000 +++ hotshots-1.2.1/lang/hotshots_fr.ts 2013-08-29 19:05:36.000000000 +0000 @@ -1,11 +1,13 @@ - + + + - + - + release of translation and translator name please put your name here dear translator and the release of the translation file !! - traduction 1.2 par xbee + @@ -13,71 +15,69 @@ <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 - 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 ? - 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 ? If yes, the application will be relaunch - Voulez-vous effacer toutes les préférences ? -Si oui, l'application va redémarrer + - + Example: - Exemple : + @@ -86,359 +86,359 @@ About - A propos + Credits - Crédits + Changelog - Journal des modifications + Release Number - Version numéro + Preferences - Préférences + Startup - Démarrage + Language - Langue + Detected language ... - Langue détectée ... + Start in notification tray (minimized) - Démarrer dans la zone de notification (minimisé) + Display splashscreen at startup - Afficher l'écran d'accueil au démarrage + Auto start with system - Démarrage automatique avec le système + Reset preferences - Effacer toutes les préférences + Splashscreen with transparent background - Ecran d'acceuil avec fond transparent + Snapshot - Capture d'écran + Auto copy new snapshot to clipboard - Copie automatique de la capture d'écran vers le presse-papiers + Inserting current date time into saved filename - Ajouter la date courante au nom du fichier + Insert DateTime in filename - Ajouter la date courante au nom du fichier + Default filename: - Nom par défaut : + Format: - Format : + Template: - Modèle : + Default saving image format - Format de sauvegarde par défaut + Default filename - Nom par défaut + Post effect: - Post-effet : + Rotate snapshot - Tourner la capture d'écran + Angle: - Angle : + Capture window with decoration - Capturer la fenêtre avec sa décoration + Play a sound when action is finished - Jouer un son quand l'action est terminée + Hide interface during screen capture - Cacher l'interface pendant la capture d'écran + Force background color for clipboard/web services - Forcer la couleur de fond pour le presse papier/service web + Scale snapshot - Mettre à l'échelle la capture d'écran + % - % + Max width * height - Taille maximale + 800 - 800 + 600 - 600 + Hotkeys - Raccourcis + Use system Hotkey - Utiliser des raccourcis clavier "système" + Grab current screen - Capturer l'écran courant + Grab all screens (multimonitor) - Capturer l'ensemble des écrans (multi-moniteurs) + Grab window - Capturer une fenêtre + Grab region - Capturer une région + Grab freehand region - Capturer une région à main levée + 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 + @@ -446,18 +446,18 @@ Image has been resized according to uploading service constraint (%1x%2) - L'image a été redimensionnée par rapport aux contraintes du service web (%1x%2) + Can't save tmp file %1 - Impossible de sauver le fichier temporaire %1 + reduce file size according to limit (%1/%2 bytes) - Redimensionnement du fichier par rapport aux limitations (%1/%2 octets) + @@ -465,17 +465,17 @@ %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) + - + Can't extract URL from reply - Impossible d'extraire l'URL de la réponse + @@ -483,12 +483,12 @@ DefaultUploaderSettings - Paramètres par défaut du téléchargeur + No parameter for this uploader - Aucun paramètre pour ce téléchargeur + @@ -496,38 +496,38 @@ 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 + 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 + @@ -539,99 +539,101 @@ 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 ? - 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 ... + - - Clear edit - Effacer l'édition + + + Loading HotShots file failed + - - Clear all the exiting items ? - Effacer tous les éléments ? + + + Error loading HotShots file %1 + - - Clear document - Effacer le document + + Clear edit + - - Create a new document ? - Créer un nouveau document ? + + Clear all the exiting items ? + - - Loading HotShots file failed - Le chargement du fichier HotShots a échoué + + Clear document + - - Error loading HotShots file %1 - Erreur lors du chargement du fichier HotSHots %1 + + Create a new 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 + - + Snapshot editor: - Editeur de captures d'écran : + - + Scale x%1 - Echelle x%1 + @@ -639,202 +641,202 @@ Snapshot editor - Editeur de snapshot + Select - Sélectionner + Draw text - Tracer un texte + Draw a simple line - Tracer une ligne + Encircle - Entourer + Draw a polyline - Tracer une polyligne + Draw a polygon - Tracer un polygone + Draw a curve - Dessiner une courbe + Crop background image - Couper l'image de fond + Draw a rectangle - Tracer un rectangle + Draw an ellipse - Tracer une ellipse + Draw an arrow - Tracer une flèche + Draw a numbered tag - Tracer une balise + Highlight - Mettre en évidence + Magnifier - Loupe + Add an image - Ajouter une image + Obfuscate - Masquer + Decrease font size - Décroître la taille de la fonte + Increase font size - Accroïtre la taille de la fonte + Change font - Changer la fonte + aAbB... - aAbB... + Quit editor - Quitter l'éditeur + Open a file - Ouvrir un fichier + New document - Nouveau document + Import image from clipboard - Importer une image du presse-papier + Save edition - Sauver l'édition + Save edition as - Sauver sous + Copy to clipboard - Copie vers le presse-papier + Export image - Exporter l'image + Upload the image to the web - Télécharger l'image vers le Web + Scale to fit window - Ajuster à la fenêtre + Reset scale - Réinitialiser l'échelle + Add a post effect to background image - Ajouter un effet à l'image de fond + Enable/Disable item's shadow - Afficher/Cacher l'ombrage des éléments + Push selected elements up - Mettre les éléments sélectionnés au dessus + Push selected elements down - Mettre les éléments sélectionnés en dessous + Duplicate selected element - Dupliquer l'élément courant + Erase all elements - Effacer tous les éléments + Delete selected elements - Effacer les éléments sélectionnés + Del - Effacer + @@ -842,37 +844,37 @@ Cannot read file %1: (%2) - Impossible de lire %1: (%2) + Saving failed for project %1 : %2 - La sauvegarde du projet à échoué %1 : %2 + Cannot save file %1: (%2) - Impossible de sauver le fichier%1: (%2) + Parse error at line %1, column %2: (%3) - Erreur d'analyse ligne %1, colonne %2: (%3) + 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 ! + Unknown version of hotshots file (%1). - Version inconnue (%1). + @@ -880,12 +882,12 @@ %1 transfert end without error - Le transfert de %1 s'est terminé sans erreur + %1 transfert end with error (%2) - Le transfert de %1 s'est terminé avec une erreur (%2) + @@ -893,7 +895,7 @@ 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. + @@ -901,42 +903,42 @@ Unable to connect to the FTP server at %1. Please check that the hostname is correct. - Impossible de se connecter au serveur FTP à %1. Merci de vérifier si le nom du serveur est correct. + Logged onto %1. - Connecté sur %1. + Canceled upload of %1 - Arrêt du téléchargement de %1 + successful uploading onto %1. - Téléchargement réussi sur %1 + - + %1 is available - %1 est disponible + - + %1 is'nt available on server %2 - %1 n'est pas accessible sur le serveur %2 + - + %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 + @@ -944,82 +946,82 @@ FtpUploaderSettings - Paramètres FTP + Initial FTP directory - Répertoire de base distant + @filename@ is the uploaded file - @filename@ est le fichier téléchargé + Username: - Nom d'utilisateur : + Server: - Serveur : + FTP password - Mot de passe FTP + Password: - Mot de passe : + Directory: - Répertoire : + Show/Hide password in interface - Afficher/Cacher le mot de passe dans l'interface + Show password - Afficher le mot de passe + FTP username - Nom d'utilisateur FTP + Define result url - Définir l'URL résultat + ftp://whatyouwant/@filename@ - ftp://cequevousvoulez/@filename@ + Ftp port - Port FTP + FTP Server name - Nom du serveur FTP + Port: - Port : + @@ -1027,139 +1029,144 @@ %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 service reply with error (%2) - Le service %1 répond avec une erreur (%2) + ImgurUploader - + %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) + - + An error occurred during parsing of service response - Une erreur est intervenue lors de la lecture de la réponse du service + 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) + - + 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 + - - + + Upload the image to the web - Télécharger l'image vers le Web + - + 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 !! - 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 ? + - + 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. + @@ -1167,278 +1174,278 @@ MainWindow - + Take a new snapshot - Prendre un nouveau cliché + Uploaded URL - URL téléchargée + Parameters - 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 + Quit - Quitter + About - A propos + Preferences - Préférences + Save Snapshot - Sauver la capture d'écran + Save snapshot - Sauver la capture d'écran + Show Interface - Afficher l'interface + Show interface - Afficher l'interface + Copy To Clipboard - Copie vers le presse-papier + Copy to clipboard - Copie vers le presse-papier + Add Annotations - Ajouter des annotations + Add annotations - 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 + QObject - + %1 found - %1 trouvé + Screenshot manager. - Gestionnaire de captures d'écran. + Usage: - Usage : + - [options] - [options] + [options] [file] + Following options are known: - Les options suivantes sont acceptées : + --help - displays this help. - --help : Affichage de cette aide. + --reset-config - clear the saved preference parameters. - --reset-config : Effacement des paramètres de configuration sauvegardés. + --no-singleinstance : enable the use of multiple instance of program (not recommended). - --no-singleinstance : autorise l'utilisation de plusieurs instances du programme (non recommandé). + - - message from other instance. - message d'une autre instance. + + file : file to load in the editor, can be a .hot file or an image file. + - + %1 is already running !! - %1 est déjà en fonctionnement !! + - + translations path %1 - chemin des traductions %1 + - + setting language to : %1 - positionner le lauguage à %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 + stringToVariant(): Error in digit (%1). - stringToVariant(): Erreur sur les nombres (%1). + <no image> - <aucune image> + @@ -1446,7 +1453,7 @@ 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. + @@ -1454,27 +1461,27 @@ 1x1 - 1x1 + Circle - Cercle + Square - Carré + Slash - Barre oblique + Backslash - Antislash + @@ -1482,47 +1489,47 @@ Black - Noir + White - Blanc + Red - Rouge + Green - Vert + Blue - Bleu + Cyan - Cyan + Magenta - Magenta + Orange - Orange + Gray - Gris + @@ -1530,27 +1537,27 @@ Solid Line - Ligne pleine + Dash pattern - Motif de pointillé + Dot pattern - Motif de points + Dash Dot pattern - motif point-trait + Dash Dot Dot pattern - Motif point-point-trait + @@ -1558,17 +1565,17 @@ No Fill - Aucun remplissage + Fill with translucent Background Color - Remplissage avec couleur translucide + Fill with Background Color - Remplissage avec couleur + - \ No newline at end of file + diff -Nru hotshots-1.2.0/lang/hotshots_fr.ts.source hotshots-1.2.1/lang/hotshots_fr.ts.source --- hotshots-1.2.0/lang/hotshots_fr.ts.source 2013-07-11 18:54:48.000000000 +0000 +++ hotshots-1.2.1/lang/hotshots_fr.ts.source 2013-08-24 15:42:46.000000000 +0000 @@ -574,62 +574,64 @@ - - Clear edit + + + Loading HotShots file failed - - Clear all the exiting items ? + + + Error loading HotShots file %1 - - Clear document + + Clear edit - - Create a new document ? + + Clear all the exiting items ? - - Loading HotShots file failed + + Clear document - - Error loading HotShots file %1 + + Create a new document ? - + Save HotShots File - + HotShots files (*.hot) - + Saving HotShots file failed - + Error saving HotShots file %1 - + Snapshot editor: - + Scale x%1 @@ -1076,91 +1078,96 @@ - + No post effect - + Simple drop shadow - + Drop shadow with borders - + Progressive opacity - + Torn edge - - + + Upload the image to the web - + No default uploading web service defined ! - + Uploader %1 - + The default uploader (%1) does not appear correctly configured, no value given for required parameters !! - + Upload image %1 to %2 service ? - + Print Document - + Save File - + Images (*.%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. + + MainWindowClass @@ -1376,7 +1383,7 @@ - [options] + [options] [file] @@ -1400,33 +1407,33 @@ - - message from other instance. + + file : file to load in the editor, can be a .hot file or an image file. - + %1 is already running !! - + translations path %1 - + setting language to : %1 - - + + successfully loaded data from %1 - + failed to load data from %1 Binary files /tmp/T4Fk5mD1D0/hotshots-1.2.0/lang/hotshots_it.qm and /tmp/0F4nBsYHQM/hotshots-1.2.1/lang/hotshots_it.qm differ diff -Nru hotshots-1.2.0/lang/hotshots_it.ts hotshots-1.2.1/lang/hotshots_it.ts --- hotshots-1.2.0/lang/hotshots_it.ts 2013-07-23 19:15:54.000000000 +0000 +++ hotshots-1.2.1/lang/hotshots_it.ts 2013-08-29 19:05:38.000000000 +0000 @@ -1,8 +1,10 @@ - + + + - + - + release of translation and translator name please put your name here dear translator and the release of the translation file !! Man from Mars - ver. 1.2 @@ -36,46 +38,46 @@ 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 Vuoi riavviarlo subito? - + 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: @@ -473,7 +475,7 @@ %1 trasferimento concluso con errori (%2) - + Can't extract URL from reply Impossibile estrarre URL dalla risposta @@ -574,62 +576,64 @@ 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 + + + Clear edit Annulla modifiche - + Clear all the exiting items ? Eliminare tutti gli elementi? - + Clear document Pulisci il documento - + Create a new document ? Creare un nuovo documento? - - Loading HotShots file failed - Caricamento del file HotShots fallito - - - - Error loading HotShots file %1 - Errore nel caricamento del file HotSHots %1 - - - + 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 - + Snapshot editor: Editor delle immagini: - + Scale x%1 Scala x%1 @@ -919,22 +923,22 @@ Caricamento su %1 riuscito - + %1 is available %1 è disponibile - + %1 is'nt available on server %2 %1 non è disponibile sul server %2 - + %1 transfert end with error %1 trasferimento concluso con errori - + %1 transfert end without error %1 trasferimento concluso senza errori @@ -1043,17 +1047,17 @@ ImgurUploader - + %1 transfert end without error %1 trasferimento concluso senza errori - + %1 transfert end with error (%2) %1 trasferimento concluso con errori (%2) - + An error occurred during parsing of service response Errore nell'elaborazione della risposta del servizio @@ -1061,106 +1065,111 @@ MainWindow - + Save Directory Cartella di salvataggio - + Register of %1 uploaders Registro dei caricamenti %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 - - + + Upload the image to the web Carica immagine sul web - + 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! - + 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. + MainWindowClass @@ -1354,13 +1363,13 @@ Print - + Stampa QObject - + %1 found %1 trovato @@ -1376,8 +1385,8 @@ - [options] - [opzioni] + [options] [file] + [opzioni] [file] @@ -1400,33 +1409,33 @@ --no-singleinstance : consenti più istanze (non raccomandato). - - message from other instance. - messaggio da un'altra istanza. + + 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 è già avviato! - + translations path %1 percorso delle traduzioni %1 - + setting language to : %1 impostare la lingua a: %1 - - + + successfully loaded data from %1 Caricamento dei dati da %1 riuscito - + failed to load data from %1 Caricamento dei dati da %1 fallito @@ -1571,4 +1580,4 @@ Riempimento con colore - \ No newline at end of file + Binary files /tmp/T4Fk5mD1D0/hotshots-1.2.0/lang/hotshots_ja.qm and /tmp/0F4nBsYHQM/hotshots-1.2.1/lang/hotshots_ja.qm differ diff -Nru hotshots-1.2.0/lang/hotshots_ja.ts hotshots-1.2.1/lang/hotshots_ja.ts --- hotshots-1.2.0/lang/hotshots_ja.ts 2013-07-23 19:14:16.000000000 +0000 +++ hotshots-1.2.1/lang/hotshots_ja.ts 2013-08-29 19:05:38.000000000 +0000 @@ -1,8 +1,10 @@ - + + + - + - + release of translation and translator name please put your name here dear translator and the release of the translation file !! v1.0 by piyo @@ -36,46 +38,46 @@ ログ - + 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 reset all the preferences to default value ? If yes, the application will be relaunch 本当にすべての設定を規定にリセットしますか？ 「はい」を選択すると、再起動します。 - + Example: 例: @@ -473,7 +475,7 @@ %1 transfert end with error (%2) - + Can't extract URL from reply 応答からURLを抽出できません @@ -574,62 +576,64 @@ 背景画像を更新 ... - + + + Loading HotShots file failed + HotShotsファイルの読み込み失敗 + + + + + Error loading HotShots file %1 + HotSHotsファイル %1 の読み込みに失敗しました + + + Clear edit 編集を破棄 - + Clear all the exiting items ? 本当にすべてのアイテムを削除しますか？ - + Clear document ドキュメントの破棄 - + Create a new document ? 本当に新規ドキュメントを作成しますか？ - - Loading HotShots file failed - HotShotsファイルの読み込み失敗 - - - - Error loading HotShots file %1 - HotSHotsファイル %1 の読み込みに失敗しました - - - + Save HotShots File HotShotsファイルの保存 - + HotShots files (*.hot) HotShotsファイル (*.hot) - + Saving HotShots file failed HotShotsファイルの保存失敗 - + Error saving HotShots file %1 HotSHotsファイル「%1」の保存に失敗しました - + Snapshot editor: スナップショット エディタ: - + Scale x%1 倍率 x%1 @@ -919,22 +923,22 @@ successful uploading onto %1. - + %1 is available %1 is available - + %1 is'nt available on server %2 %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 @@ -1043,17 +1047,17 @@ 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 サービスからの応答を処理中にエラーが発生しました @@ -1061,106 +1065,111 @@ 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) - + No post effect 効果なし - + Simple drop shadow ドロップシャドウのみ - + Drop shadow with borders 枠とドロップシャドウ - + Progressive opacity 縁を半透明に - + Torn edge ぎざぎざの縁 - - + + Upload the image to the web 画像をWebにアップロード - + No default uploading web service defined ! 既定のアップロードWebサーバーが指定されていません。 - + Uploader %1 アップローダ %1 - + The default uploader (%1) does not appear correctly configured, no value given for required parameters !! 既定のアップローダ (%1) は正しく設定されていないようです。必須パラメータに値が設定されていません。 - + 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. + message from other instance. + MainWindowClass @@ -1360,7 +1369,7 @@ QObject - + %1 found %1 found @@ -1376,8 +1385,8 @@ - [options] - [options] + [options] [file] + [options] [file] @@ -1400,33 +1409,33 @@ --no-singleinstance : enable the use of multiple instance of program (not recommended). - - message from other instance. - message from other instance. + + 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 はすでに起動しています。 - + 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 @@ -1571,4 +1580,4 @@ 背景色で塗りつぶす - \ No newline at end of file + Binary files /tmp/T4Fk5mD1D0/hotshots-1.2.0/lang/hotshots_lt.qm and /tmp/0F4nBsYHQM/hotshots-1.2.1/lang/hotshots_lt.qm differ diff -Nru hotshots-1.2.0/lang/hotshots_lt.ts hotshots-1.2.1/lang/hotshots_lt.ts --- hotshots-1.2.0/lang/hotshots_lt.ts 2013-07-23 19:14:36.000000000 +0000 +++ hotshots-1.2.1/lang/hotshots_lt.ts 2013-08-29 19:05:38.000000000 +0000 @@ -1,11 +1,13 @@ - + + + - + - + 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> + @@ -13,71 +15,69 @@ <a href="%1">Check for new release ...</a> - <a href="%1">Tikrinti ar yra atnaujinimų ...</a> + About - Apie + Preferences - Nustatymai + Infos - Informacija + 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 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: + @@ -86,359 +86,359 @@ About - Apie + Credits - Padėkos + Changelog - Pakeitimai + Release Number - Leidimas + Preferences - Nustatymai + Startup - Paleidimas + Language - Kalba + Detected language ... - Aptikta kalba... + Start in notification tray (minimized) - Paleisti pranešimų srityje (sumažintą) + Display splashscreen at startup - Paleidžiant rodyti pasveikinimo ekraną + Auto start with system - Paleisti kartu su kompiuteriu + Reset preferences - Atstatyti nustatymus + Splashscreen with transparent background - Pradžios ekranas su permatomu fonu + Snapshot - Ekranvaizdis + Auto copy new snapshot to clipboard - Automatiškai kopijuoti naują ekranvaizdį į iškarpinę + Inserting current date time into saved filename - Į išsaugotą failo vardą įterpiama dabartinė data ir laikas + Insert DateTime in filename - Failo varde įterpti datą ir laiką + Default filename: - Numatytasis failo vardas: + Format: - Formatas: + Template: - Šablonas: + Default saving image format - Numatytasis saugomo failo formatas + Default filename - Numatytasis failo pavadinimas + Post effect: - Papildomas efektas: + Rotate snapshot - Pasukti ekranvaizdį + Angle: - Kampas: + Capture window with decoration - Įrašyti langą su dekoracijomis + Play a sound when action is finished - Baigus veiksmą groti garsą + Hide interface during screen capture - Darant ekranvaizdį slėpti sąsają + Force background color for clipboard/web services - Iškarpinei/interneto tarnyboms priverstinai naudoti fono spalvą + Scale snapshot - Keisti ekranvaizdžio dydį + % - % + Max width * height - Didžiausias plotis * aukštis + 800 - 800 + 600 - 600 + Hotkeys - Spartieji klavišai + Use system Hotkey - Naudoti sistemos sparčiuosius klavišus + Grab current screen - Įrašyti dabartinį ekraną + Grab all screens (multimonitor) - Įrašyti visus ekranus (keli monitoriai) + Grab window - Įrašyti langą + Grab region - Įrašyti sritį + Grab freehand region - Įrašyti laisvai pasirenkamą sritį + 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 + @@ -446,18 +446,18 @@ Image has been resized according to uploading service constraint (%1x%2) - Paveikslėlis buvo sumažintas pagal įkėlimo tarnybos reikalavimus (%1x%2) + Can't save tmp file %1 - Nepavyko įrašyti laikino failo %1 + reduce file size according to limit (%1/%2 bytes) - sumažinti failo dydį iki ribos (%1/%2 bitai) + @@ -465,17 +465,17 @@ %1 transfert end without error - %1 perdavimas baigėsi be klaidų + %1 transfert end with error (%2) - %1 perdavimas baigėsi klaida (%2) + - + Can't extract URL from reply - Iš atsakymo gauti URl nepavyko + @@ -483,12 +483,12 @@ DefaultUploaderSettings - DefaultUploaderSettings + No parameter for this uploader - Šiai tarnybai nėra jokių parametrų + @@ -496,38 +496,38 @@ 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 + 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ą + @@ -539,100 +539,101 @@ 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? + clear annotation items ... - išvalyti visus teksto elementus... + update background image ... - atnaujinti fono paveikslėlį... + - - Clear edit - Išvalyti redagavimus + + + Loading HotShots file failed + - - Clear all the exiting items ? - Išvalyti visus esamus elementus? + + + Error loading HotShots file %1 + - - Clear document - Išvalyti dokumentą + + Clear edit + - - Create a new document ? - Sukurti naują dokumentą? + + Clear all the exiting items ? + - - Loading HotShots file failed - Įkelti „HotShots“ failo nepavyko + + Clear document + - - Error loading HotShots file %1 - Klaida įkeliant „HotShots“ failą %1 + + 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 + - + Snapshot editor: - Ekranvaizdžių redaktorius: + - + Scale x%1 - Keisti mastelį x%1 + @@ -640,202 +641,202 @@ Snapshot editor - Ekranvaizdžių redaktorius + Select - Pasirinkti + Draw text - Piešti tekstą + Draw a simple line - Piešti paprastą liniją + Encircle - Apskritimas + Draw a polyline - Piešti poliliniją + Draw a polygon - Piešti daugiakampį + Draw a curve - Piešti kreivę + Crop background image - Apkirpti foną + Draw a rectangle - Piešti kvadratą + Draw an ellipse - Piešti elipsę + Draw an arrow - Piešti rodyklę + Draw a numbered tag - Piešti skaičius + Highlight - Paryškinti + Magnifier - Didinimas + Add an image - Pridėti paveikslėlį + Obfuscate - Paslėpti + Decrease font size - Sumažinti šriftą + Increase font size - Padidinti šriftą + Change font - Keisti šriftą + aAbB... - aAbB... + Quit editor - Išeiti iš redaktoriaus + Open a file - Atverti failą + New document - Naujas dokumentas + Import image from clipboard - Importuoti paveikslėlį iš iškarpinės + Save edition - Išsaugoti redaguotą + Save edition as - Išsaugoti kaip + Copy to clipboard - Kopijuoti į iškarpinę + Export image - Eksportuoti paveikslėlį + Upload the image to the web - Įkelti paveikslėlį į internetą + Scale to fit window - Sutalpinti lange + Reset scale - Atstatyti mastelį + Add a post effect to background image - Pridėti efektų fono paveikslėliui + Enable/Disable item's shadow - Įjungti/Išjungti elemento šešėlį + Push selected elements up - Perstumti pasirinktus elementus žemyn + Push selected elements down - Perstumti pasirinktus elementus žemyn + Duplicate selected element - Sukurti pasirinkto elemento kopiją + Erase all elements - Pašalinti visus elementus + Delete selected elements - Pašalinti pasirinktus elementus + Del - Del + @@ -843,37 +844,37 @@ Cannot read file %1: (%2) - Perskaityti failą %1 nepavyko: (%2) + Saving failed for project %1 : %2 - Projekto %1 išsaugoti nepavyko: %2 + Cannot save file %1: (%2) - Nepavyko įrašyti failo %1: (%2) + Parse error at line %1, column %2: (%3) - Apdorojimo klaida eilutėje %1, stulpelyje %2: (%3) + The file is not a "Hotshots" file !! - Failas nėra „HotShots“ failas! + Configuration has been automatically updated ! - Konfigūracija automatiškai atnaujinta! + Unknown version of hotshots file (%1). - Nežinoma „hotshots“ failo versija (%1). + @@ -881,12 +882,12 @@ %1 transfert end without error - %1 perdavimas baigėsi be klaidų + %1 transfert end with error (%2) - %1 perdavimas baigėsi klaida (%2) + @@ -894,7 +895,7 @@ 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“. + @@ -902,42 +903,42 @@ Unable to connect to the FTP server at %1. Please check that the hostname is correct. - Nepavyko prisijungti prie FTP serverio %1. Patikrinkite kompiuterio vardą. + Logged onto %1. - Prisijungta prie %1. + Canceled upload of %1 - %1 įkėlimas atšauktas + successful uploading onto %1. - sėkmingai įkelta į %1. + - + %1 is available - %1 prieinama + - + %1 is'nt available on server %2 - %1 serveryje %2 neprieinama + - + %1 transfert end with error - %1 perdavimas baigėsi klaida + - + %1 transfert end without error - %1 perdavimas baigėsi be klaidų + @@ -945,82 +946,82 @@ FtpUploaderSettings - FtpUploaderSettings + Initial FTP directory - Pradinis FTP aplankas + @filename@ is the uploaded file - @failo_vardas@ yra įkeltas failas + Username: - Naudotojo vardas: + Server: - Serveris: + FTP password - FTP slaptažodis + Password: - Slaptažodis: + Directory: - Aplankas: + Show/Hide password in interface - Rodyti/Slėpti slaptažodį sąsajoje + Show password - Rodyti slaptažodį + FTP username - FTP naudotojo vardas + Define result url - Nustatykite galutinį url + ftp://whatyouwant/@filename@ - ftp://ko_norite/@failo_vardas@ + Ftp port - FTP prievadas + FTP Server name - FTP serverio vardas + Port: - Prievadas: + @@ -1028,139 +1029,144 @@ %1 transfert end without error - %1 perdavimas baigėsi be klaidų + %1 transfert end with error (%2) - %1 perdavimas baigėsi klaida (%2) + %1 service reply with error (%2) - %1 tarnyba atsakė su klaida (%2) + ImgurUploader - + %1 transfert end without error - %1 perdavimas baigėsi be klaidų + - + %1 transfert end with error (%2) - %1 perdavimas baigėsi klaida (%2) + - + An error occurred during parsing of service response - Apdorojant serverio atsakymą įvyko klaida + 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) + - + 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 + - - + + Upload the image to the web - Įkelti paveikslėlį į internetą + - + No default uploading web service defined ! - Nenustatyta numatytoji įkėlimo tarnyba! + - + 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! + - + Upload image %1 to %2 service ? - Įkelti paveikslėlį %1 į %2? + - + 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. + @@ -1168,278 +1174,278 @@ MainWindow - Pagrindinis langas + Take a new snapshot - Padaryti naują ekranvaizdį + Uploaded URL - Įkeltojo URL + Parameters - 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 + Quit - Išeiti + About - Apie + Preferences - Nustatymai + Save Snapshot - Išsaugoti ekranvaizdį + Save snapshot - Išsaugoti ekranvaizdį + Show Interface - Rodyti sąsają + Show interface - Rodyti sąsają + Copy To Clipboard - Kopijuoti į iškarpinę + Copy to clipboard - Kopijuoti į iškarpinę + Add Annotations - Pridėti anotacijas + Add annotations - Pridėti anotacijas + 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 + QObject - + %1 found - %1 rasta + Screenshot manager. - Ekranvaizdžių tvarkyklė. + Usage: - Naudojimas: + - [options] - [parinktys] + [options] [file] + Following options are known: - Žinomos parinktys: + --help - displays this help. - --help - parodo šį pranešimą. + --reset-config - clear the saved preference parameters. - --reset-config - išvalo išsaugotas parinktis. + --no-singleinstance : enable the use of multiple instance of program (not recommended). - --no-singleinstance : leisti naudoti kelias programos kopijas (nerekomenduojama). + - - message from other instance. - pranešimas iš kitos kopijos. + + file : file to load in the editor, can be a .hot file or an image file. + - + %1 is already running !! - %1 jau paleistas! + - + translations path %1 - vertimų kelias %1 + - + setting language to : %1 - kalba nustatoma į: %1 + - - + + successfully loaded data from %1 - duomenys iš „%1“ sėkmingai įkelti + - + failed to load data from %1 - nepavyko įkelti duomenų iš „%1“ + stringToVariant(): Error in digit (%1). - stringToVariant(): Klaida skaičiuje (%1). + <no image> - <nėra paveikslėlio> + @@ -1447,7 +1453,7 @@ 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“. + @@ -1455,27 +1461,27 @@ 1x1 - 1x1 + Circle - Apskritimas + Square - Kvadratas + Slash - Pasviręs brūkšnys + Backslash - Atvirkščiai įkypas brūkšnys + @@ -1483,47 +1489,47 @@ Black - Juoda + White - Balta + Red - Raudona + Green - Žalia + Blue - Mėlyna + Cyan - Žydra + Magenta - Purpurinė + Orange - Oranžinė + Gray - Pilka + @@ -1531,27 +1537,27 @@ Solid Line - Ištisinė linija + Dash pattern - Punktyras + Dot pattern - Taškinis raštas + Dash Dot pattern - Brūkšnys taškas raštas + Dash Dot Dot pattern - Brūkšnys taškas taškas raštas + @@ -1559,17 +1565,17 @@ No Fill - Jokio užpildo + Fill with translucent Background Color - Užpildyti permatoma fono spalva + Fill with Background Color - Užpildyti fono spalva + - \ No newline at end of file + Binary files /tmp/T4Fk5mD1D0/hotshots-1.2.0/lang/hotshots_pl.qm and /tmp/0F4nBsYHQM/hotshots-1.2.1/lang/hotshots_pl.qm differ diff -Nru hotshots-1.2.0/lang/hotshots_pl.ts hotshots-1.2.1/lang/hotshots_pl.ts --- hotshots-1.2.0/lang/hotshots_pl.ts 2013-07-23 19:16:12.000000000 +0000 +++ hotshots-1.2.1/lang/hotshots_pl.ts 2013-08-29 19:05:38.000000000 +0000 @@ -1,8 +1,10 @@ - + + + - + - + release of translation and translator name please put your name here dear translator and the release of the translation file !! v1.0 Andrzej Mazurkiewicz <andrzejmz69@gmail.com> @@ -36,46 +38,46 @@ 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 ? 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 ? 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: @@ -473,7 +475,7 @@ %1 przetransferowano z błędem (%2) - + Can't extract URL from reply Nie można wyodrębnić URL z odpowiedzi @@ -574,62 +576,64 @@ 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 + + + Clear edit Anuluj edytowane - + Clear all the exiting items ? Wyczyścić wszystkie istniejące obiekty ? - + Clear document Wyczyść dokument - + Create a new document ? Utworzyć nowy dokument ? - - Loading HotShots file failed - Wczytywanie pliku HotShots nie powiodło się - - - - Error loading HotShots file %1 - Błąd ładowania pliku tShots %1 - - - + 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 - + Snapshot editor: Edytor Zrzutów: - + Scale x%1 Skalowanie x%1 @@ -919,22 +923,22 @@ pomyślnie wysłano na %1. - + %1 is available %1 jest dostępny - + %1 is'nt available on server %2 %1 nie jest dostępny na serwerze %2 - + %1 transfert end with error %1 przetransferowano z błędem - + %1 transfert end without error %1 przetransferowano,bez błędów @@ -1043,17 +1047,17 @@ ImgurUploader - + %1 transfert end without error %1 przetransferowano bez błędów - + %1 transfert end with error (%2) %1 przetransferowano z błędem (%2) - + An error occurred during parsing of service response Wystąpił błąd podczas parsowania usługi odpowiadającej @@ -1061,106 +1065,111 @@ MainWindow - + Save Directory Katalog zapisu - + Register of %1 uploaders Rejestracja użytkowników %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ź - - + + Upload the image to the web Wyślij obraz do sieci - + 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 !! 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 ? 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. + + MainWindowClass @@ -1354,13 +1363,13 @@ Print - + Drukuj QObject - + %1 found Znaleziono %1 @@ -1376,8 +1385,8 @@ - [options] - [opcje] + [options] [file] + @@ -1400,33 +1409,33 @@ - No- singleinstance : włącz korzystanie z wielu instancji programu ( nie zalecane) . - - message from other instance. - Wiadomość od drugiej instancji. + + file : file to load in the editor, can be a .hot file or an image file. + - + %1 is already running !! %1 jest już uruchomiony! - + translations path %1 ścieżka tłumaczenia %1 - + setting language to : %1 ustawienie języka na : %1 - - + + successfully loaded data from %1 Pomyślnie wczytano dane z „%1“ - + failed to load data from %1 Nie można załadować danych z %1 @@ -1571,4 +1580,4 @@ Wypełnij tło kolorem - \ No newline at end of file + Binary files /tmp/T4Fk5mD1D0/hotshots-1.2.0/lang/hotshots_ro.qm and /tmp/0F4nBsYHQM/hotshots-1.2.1/lang/hotshots_ro.qm differ diff -Nru hotshots-1.2.0/lang/hotshots_ro.ts hotshots-1.2.1/lang/hotshots_ro.ts --- hotshots-1.2.0/lang/hotshots_ro.ts 1970-01-01 00:00:00.000000000 +0000 +++ hotshots-1.2.1/lang/hotshots_ro.ts 2013-08-29 19:05:38.000000000 +0000 @@ -0,0 +1,1583 @@ + + + + + + + + release of translation and translator name please + put your name here dear translator and the release of the translation file !! + Jaff (Oprea Nicolae) - ver.1.2 + + + + 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 + + + + 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 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: + + + + AboutDialogClass + + + + About + Despre + + + + Credits + Credite + + + + Changelog + Jurnal modificări + + + + Release Number + Versiune + + + + Preferences + Preferinţe + + + + + Startup + Pornire + + + + Language + Limbă + + + + Detected language ... + Limbă detectată... + + + + Start in notification tray (minimized) + Pornire în bara de notificări (minimizat) + + + + Display splashscreen at startup + Afişare imagine la pornire + + + + Auto start with system + Pornire automată cu sistemul + + + + Reset preferences + Resetare preferinţe + + + + Splashscreen with transparent background + Instantaneu cu fundal transparent + + + + + Snapshot + Instantaneu + + + + Auto copy new snapshot to clipboard + Copiere automată a instantaneului în clipboard + + + + Inserting current date time into saved filename + Inserează data curentă în numele fişierului salvat + + + + Insert DateTime in filename + Inserează DatăTimp în numele fişierului + + + + Default filename: + Nume fişier implicit: + + + + Format: + Format: + + + + Template: + Şablon: + + + + Default saving image format + Format implicit salvare imagine + + + + Default filename + Nume fişier implicit + + + + Post effect: + Efect postare: + + + + Rotate snapshot + Rotire instantaneu + + + + Angle: + Unghi: + + + + Capture window with decoration + Capturare fereastră cu decoraţiuni + + + + Play a sound when action is finished + Redare sunet la terminarea acţiunii + + + + Hide interface during screen capture + Ascunde interfaţa în timpul capturării ecranului + + + + Force background color for clipboard/web services + Forţare culoare fundal pentru clipboard/servicii web + + + + Scale snapshot + Scalare instantaneu + + + + % + % + + + + Max width * height + Max lăţime * înălţime + + + + 800 + 800 + + + + 600 + 600 + + + + Hotkeys + Scurtături taste + + + + Use system Hotkey + Scurtături taste sistem + + + + Grab current screen + Capturează ecran curent + + + + Grab all screens (multimonitor) + Capturează toate ecranele (multimonitor) + + + + Grab window + Capturează fereastră + + + + Grab region + Capturează regiune + + + + Grab freehand region + Capturează regiune cu mîna liberă + + + + 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 + + + + BaseUploader + + + Image has been resized according to uploading service constraint (%1x%2) + Imaginea a fost redimensionată în fuuncţie de constrîngerile serviciului (%1x%2) + + + + + Can't save tmp file %1 + Nu se poate salva fişierul temporar %1 + + + + reduce file size according to limit (%1/%2 bytes) + reduce mărimea fişierului în funcţie de limita (%1/%2 octeţi) + + + + CanardPCUploader + + + %1 transfert end without error + %1 transferat fără erori + + + + %1 transfert end with error (%2) + %1 transferat cu eroarea (%2) + + + + Can't extract URL from reply + Nu se poate extrage URL-ul din răspuns + + + + DefaultUploaderSettingsClass + + + DefaultUploaderSettings + SetăriImpliciteUploader + + + + No parameter for this uploader + Nu există parametrii pentru acest uploader + + + + EditorWidget + + + 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ă + + + + 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? + + + + 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 + + + + Clear edit + Şterge editare + + + + Clear all the exiting items ? + Şterge toate elementele existente? + + + + Clear document + Curăţă document + + + + Create a new document ? + Crează document nou? + + + + 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 + + + + Snapshot editor: + Editor instantaneu: + + + + Scale x%1 + Scalare x%1 + + + + EditorWidgetClass + + + Snapshot editor + Editor instantaneu + + + + Select + Selectare + + + + Draw text + Desenare text + + + + Draw a simple line + Desenare linie simplă + + + + Encircle + Încercuire + + + + Draw a polyline + Desenare polilinie + + + + Draw a polygon + Desenare poligon + + + + Draw a curve + Desenare linie curbată + + + + Crop background image + Decupare imagine fundal + + + + Draw a rectangle + Desenare dreptunghi + + + + Draw an ellipse + Desenare elipsă + + + + Draw an arrow + Desenare săgeată + + + + Draw a numbered tag + Desenare etichetă numerotată + + + + Highlight + Evdenţiere + + + + Magnifier + Lupă + + + + Add an image + Adaugă o imagine + + + + Obfuscate + Umbreşte + + + + Decrease font size + Micşorare mărime font + + + + Increase font size + Mărire mărime font + + + + Change font + Schimbare font + + + + aAbB... + aAbB... + + + + Quit editor + Închidere editor + + + + Open a file + Deschidere fişier + + + + New document + Document nou + + + + Import image from clipboard + Importă imagine din clipboard + + + + Save edition + Salvare editare + + + + Save edition as + Salvare editare ca + + + + Copy to clipboard + Copiază în clipboard + + + + Export image + Export imagine + + + + Upload the image to the web + Încărcare imagine pe web + + + + Scale to fit window + Scalare pentru potrivire în fereastră + + + + Reset scale + Resetare scalare + + + + Add a post effect to background image + Adaugă efect postare la imaginea de fundal + + + + Enable/Disable item's shadow + Activare/Dezactivare umbrire elemente + + + + Push selected elements up + Împinge elementele selectate în sus + + + + Push selected elements down + Împinge elementele selectate în jos + + + + Duplicate selected element + Duplică elementul selectat + + + + Erase all elements + Şterge toate elementele + + + + Delete selected elements + Şterge elementele selectate + + + + Del + Şterge + + + + FileParser + + + Cannot read file %1: (%2) + Nu se poate citi fişierul %1: (%2) + + + + Saving failed for project %1 : %2 + Nu s-a reuşit salvarea proiectului %1 : %2 + + + + Cannot save file %1: (%2) + Nu se poate salva fişierul %1: (%2) + + + + Parse error at line %1, column %2: (%3) + Eroare parsare la linia %1, coloana %2: (%3) + + + + The file is not a "Hotshots" file !! + Acesta nu este un fişier HotShots! + + + + Configuration has been automatically updated ! + Configurarea a fost actualizată în mod automat! + + + + Unknown version of hotshots file (%1). + Versiune necunoscută a fişierului HotShots (%1). + + + + FreeImageHostingUploader + + + %1 transfert end without error + %1 transferat fără erori + + + + %1 transfert end with error (%2) + %1 transferat cu eroarea (%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. + + + + FtpUploader + + + Unable to connect to the FTP server at %1. Please check that the hostname is correct. + Nu se poate conecta la serverul FTP de la%1. Vă rugăm să verificaţi dacă numele gazdei este corect. + + + + Logged onto %1. + Conectat la %1. + + + + Canceled upload of %1 + Anulare încărcare a %1 + + + + successful uploading onto %1. + încărcat cu succes la %1. + + + + %1 is available + %1 este disponibil + + + + %1 is'nt available on server %2 + %1 nu este disponibil pe serverul %2 + + + + %1 transfert end with error + %1 transferat fără erori + + + + %1 transfert end without error + %1 transferat fără erori + + + + FtpUploaderSettingsClass + + + FtpUploaderSettings + SetăriUploaderFTP + + + + Initial FTP directory + Folder FTP iniţial + + + + @filename@ is the uploaded file + @filename@ este fişierul încărcat + + + + Username: + Nume utilizator: + + + + Server: + Server: + + + + FTP password + Parolă FTP + + + + Password: + Parolă: + + + + Directory: + Folder: + + + + Show/Hide password in interface + Arată/Ascunde parola în interfaţă + + + + Show password + Arată parola + + + + FTP username + Nume utilizator FTP + + + + Define result url + Definire rezultat URL + + + + ftp://whatyouwant/@filename@ + ftp://cedoriţi/@filename@ + + + + Ftp port + Port FTP + + + + FTP Server name + Nume server FTP + + + + Port: + Port: + + + + ImageshackUploader + + + %1 transfert end without error + %1 transferat fără erori + + + + %1 transfert end with error (%2) + %1 transferat cu eroarea (%2) + + + + %1 service reply with error (%2) + %1 răspuns serviciu cu eroarea (%2) + + + + ImgurUploader + + + %1 transfert end without error + %1 transferat fără erori + + + + %1 transfert end with error (%2) + %1 transferat cu eroarea (%2) + + + + An error occurred during parsing of service response + A apărut o eroare în timpul procesării răspunsului de serviciu + + + + 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) + + + + 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ă + + + + + 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! + + + + 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! + + + + Upload image %1 to %2 service ? + Încărcare imagine %1 către serviciul %2? + + + + 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ţă. + + + + MainWindowClass + + + MainWindow + FereastraPrincipală + + + + + Take a new snapshot + Luare instantaneu nou + + + + Uploaded URL + URL încărcare + + + + Parameters + 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 + + + + Quit + Închidere + + + + About + Despre + + + + Preferences + Preferinţe + + + + Save Snapshot + Salvare instantaneu + + + + Save snapshot + Salvare instantaneu + + + + Show Interface + Arată interfaţă + + + + Show interface + Arată interfaţă + + + + Copy To Clipboard + Copiază în clipboard + + + + Copy to clipboard + Copiază în clipboard + + + + Add Annotations + Adaugă adnotări + + + + Add annotations + Adaugă 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 + + + + QObject + + + %1 found + %1 găsit + + + + Screenshot manager. + Manager instantanee. + + + + Usage: + Folosire: + + + + [options] [file] + [opţiuni] [fişier] + + + + Following options are known: + Următoarele opţiuni sînt cunoscute: + + + + --help - displays this help. + --help - arată acest ajutor. + + + + --reset-config - clear the saved preference parameters. + --reset-config - şterge parametrii salvaţi ai preferinţelor. + + + + --no-singleinstance : enable the use of multiple instance of program (not recommended). + --no-singleinstance : permite utilizarea instanţelor multiple ale programului (nerecomandat). + + + + 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ă! + + + + translations path %1 + cale traduceri %1 + + + + setting language to : %1 + setare limbă la: %1 + + + + + successfully loaded data from %1 + date încărcate cu succes din %1 + + + + failed to load data from %1 + nu s-au putut încărca datele din %1 + + + + stringToVariant(): Error in digit (%1). + stringToVariant(): Eroare în cifre (%1). + + + + <no image> + <fără imagine> + + + + 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. + + + + WidgetBrush + + + 1x1 + 1x1 + + + + Circle + Cerc + + + + Square + Pătrat + + + + Slash + Bară oblică + + + + Backslash + Bară oblică inversă + + + + WidgetColor + + + Black + Negru + + + + White + Alb + + + + Red + Roşu + + + + Green + Verde + + + + Blue + Albastru + + + + Cyan + Cyan + + + + Magenta + Magenta + + + + Orange + Portocaliu + + + + Gray + Gri + + + + WidgetDashStyle + + + Solid Line + Linie solidă + + + + Dash pattern + Model liniuţe + + + + Dot pattern + Model punctat + + + + Dash Dot pattern + Model liniuţă-punct + + + + Dash Dot Dot pattern + Model liniuţă-punct-punct + + + + WidgetFillStyle + + + No Fill + Fără umplere + + + + Fill with translucent Background Color + Umplere cu culoare fundal translucidă + + + + Fill with Background Color + Umplere cu culoare fundal + + + diff -Nru hotshots-1.2.0/lang/hotshots_ru.ts hotshots-1.2.1/lang/hotshots_ru.ts --- hotshots-1.2.0/lang/hotshots_ru.ts 2013-07-23 19:16:30.000000000 +0000 +++ hotshots-1.2.1/lang/hotshots_ru.ts 2013-08-29 18:59:44.000000000 +0000 @@ -572,62 +572,64 @@ обновить изображение фона.. - + + + Loading HotShots file failed + Ошибка открытия файла + + + + + Error loading HotShots file %1 + Ошибка открытия файла % + + + Clear edit Очистить редактируемое - + Clear all the exiting items ? Удалить все существующие элементы? - + Clear document Очистить документ - + Create a new document ? Создать новый документ? - - Loading HotShots file failed - Ошибка открытия файла - - - - Error loading HotShots file %1 - Ошибка открытия файла % - - - + Save HotShots File Сохранить в HotShots файл - + HotShots files (*.hot) Файл HotShots (*.hot) - + Saving HotShots file failed Ошибка сохранения в файл HotShots - + Error saving HotShots file %1 Ошибка сохранения в файл HotShots %1 - + Snapshot editor: Редактирование скриншота - + Scale x%1 Масштаб x%1 @@ -1074,91 +1076,96 @@ Ошибка создания места сохранения (%1) - + No post effect Без эффектов - + Simple drop shadow Простая тень - + Drop shadow with borders Тень с границами - + Progressive opacity Размытие - + Torn edge Рваные края - - + + Upload the image to the 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) неправильно настроен. - + 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. + + MainWindowClass @@ -1374,8 +1381,8 @@ - [options] - [опции] + [options] [file] + @@ -1398,33 +1405,33 @@ --no-singleinstance : Запуск множества копий программы (не рекомендуется). - - message from other instance. - сообщения других копий. + + file : file to load in the editor, can be a .hot file or an image file. + Файл : в редактор можно загружать .hot файлы и файлы изображений - + %1 is already running !! %1 уже запущен - + translations path %1 путь к локализациям %1 - + setting language to : %1 установить язык %1 - - + + successfully loaded data from %1 успешно загружены данные из %1 - + failed to load data from %1 ошибка загрузки данных из %1 diff -Nru hotshots-1.2.0/lang/hotshots_si.ts hotshots-1.2.1/lang/hotshots_si.ts --- hotshots-1.2.0/lang/hotshots_si.ts 2013-07-23 19:17:50.000000000 +0000 +++ hotshots-1.2.1/lang/hotshots_si.ts 2013-08-29 19:01:06.000000000 +0000 @@ -572,62 +572,64 @@ - + + + Loading HotShots file failed + + + + + + Error loading HotShots file %1 + + + + Clear edit - + Clear all the exiting items ? - + Clear document ලේඛනය පිරිසුදු කරන්න - + Create a new document ? අලුත් ලේඛනයක් සාදන්නද ? - - Loading HotShots file failed - - - - - Error loading HotShots file %1 - - - - + Save HotShots File හොට්ෂොට්ස් ගොනුව සුරකින්න - + HotShots files (*.hot) හොට්ෂොට්ස් ගොනු (*.hot) - + Saving HotShots file failed හොට්ෂොට්ස් ගොනුව සුරැකීම අසාර්ථක විය - + Error saving HotShots file %1 හොට්ෂොට්ස් ගොනුව සුරැකීමේ දෝෂයකි %1 - + Snapshot editor: ඡායාරූප සැකසුම: - + Scale x%1 පරිමාණය x%1 @@ -1074,91 +1076,96 @@ - + No post effect - + Simple drop shadow - + Drop shadow with borders - + Progressive opacity - + Torn edge - - + + Upload the image to the web - + No default uploading web service defined ! - + Uploader %1 - + The default uploader (%1) does not appear correctly configured, no value given for required parameters !! - + 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. + + MainWindowClass @@ -1374,7 +1381,7 @@ - [options] + [options] [file] @@ -1398,33 +1405,33 @@ - - message from other instance. + + file : file to load in the editor, can be a .hot file or an image file. - + %1 is already running !! - + translations path %1 - + setting language to : %1 - - + + successfully loaded data from %1 - + failed to load data from %1 diff -Nru hotshots-1.2.0/lang/hotshots_sk.ts hotshots-1.2.1/lang/hotshots_sk.ts --- hotshots-1.2.0/lang/hotshots_sk.ts 2013-07-23 19:16:50.000000000 +0000 +++ hotshots-1.2.1/lang/hotshots_sk.ts 2013-08-29 19:00:36.000000000 +0000 @@ -574,62 +574,64 @@ - + + + Loading HotShots file failed + načítanie súboru HotShots zlyhalo + + + + + Error loading HotShots file %1 + Chyba načítanie súboru HotShots %1 + + + Clear edit Vymazať úpravy - + Clear all the exiting items ? vymazať všetky existujúce položky? - + Clear document Vymazať dokument - + Create a new document ? Vytvoriť nový dokument? - - Loading HotShots file failed - načítanie súboru HotShots zlyhalo - - - - Error loading HotShots file %1 - Chyba načítanie súboru HotShots %1 - - - + 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 - + Snapshot editor: Editor snímky: - + Scale x%1 Škálovať x%1 @@ -1076,91 +1078,96 @@ - + No post effect - + Simple drop shadow - + Drop shadow with borders - + Progressive opacity - + Torn edge - - + + Upload the image to the web Nahrať obrázok na web - + 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!!! - + Upload image %1 to %2 service ? Nahrať obrázok %1 do služby %2? - + 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. + + MainWindowClass @@ -1376,8 +1383,8 @@ - [options] - [voľby] + [options] [file] + @@ -1400,33 +1407,33 @@ --no-singleinstance : zapína použitie viacerých inštancií programu (neodporúčané). - - message from other instance. - správa z inej inštancie. + + file : file to load in the editor, can be a .hot file or an image file. + - + %1 is already running !! %1 už je spustený!!! - + translations path %1 cesta prekladov %1 - + setting language to : %1 nastavenie jazyka na: %1 - - + + successfully loaded data from %1 úspešne načítané dáta z %1 - + failed to load data from %1 zlyhalo načítanie dát z %1 diff -Nru hotshots-1.2.0/lang/hotshots_sr.ts hotshots-1.2.1/lang/hotshots_sr.ts --- hotshots-1.2.0/lang/hotshots_sr.ts 2013-07-23 19:15:02.000000000 +0000 +++ hotshots-1.2.1/lang/hotshots_sr.ts 2013-08-29 19:03:18.000000000 +0000 @@ -574,62 +574,64 @@ ажурирај слику позадине... - + + + Loading HotShots file failed + Погрешно учитавање датотеке + + + + + Error loading HotShots file %1 + Грешка учитавања датотеке %1 + + + Clear edit Очисти уређивач - + Clear all the exiting items ? Очисти све ставке? - + Clear document Обриши докуменат - + Create a new document ? Креирати нов докуменат? - - Loading HotShots file failed - Погрешно учитавање датотеке - - - - Error loading HotShots file %1 - Грешка учитавања датотеке %1 - - - + Save HotShots File Сачувај HotShots датотеку - + HotShots files (*.hot) HotShots датотеке (*.hot) - + Saving HotShots file failed Неуспешно сачувавање - + Error saving HotShots file %1 Грешка сачувавања датотеке %1 - + Snapshot editor: Уређивач снимка: - + Scale x%1 Скала x%1 @@ -1076,91 +1078,96 @@ Не могу да креирам смештај стоваришта, проверити зашто ?! (%1) - + No post effect Без ефеката - + Simple drop shadow Једноставна сенка - + Drop shadow with borders Сенка са ивицама - + Progressive opacity Погресивна непровидност - + Torn edge Поцепана ивица - - + + Upload the image to the 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) не делује лепо подешен, вредност није дата за потребан параметар!! - + 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. + порука од друге инстанце. + MainWindowClass @@ -1376,8 +1383,8 @@ - [options] - [опције] + [options] [file] + [опције][датотека] @@ -1400,33 +1407,33 @@ --no-singleinstance : упали употребу више инстанце програма (није препоручено). - - message from other instance. - порука од друге инстанце. + + file : file to load in the editor, can be a .hot file or an image file. + датотека: датотека да се учита у едитору, може да буде .hot или слика. - + %1 is already running !! %1 већ ради!! - + translations path %1 путања превода %1 - + setting language to : %1 Постављен језик на: %1 - - + + successfully loaded data from %1 успешно учитавање податке од %1 - + failed to load data from %1 неуспешно учитавање податке од %1 diff -Nru hotshots-1.2.0/lang/hotshots_tr.ts hotshots-1.2.1/lang/hotshots_tr.ts --- hotshots-1.2.0/lang/hotshots_tr.ts 2013-07-23 19:17:32.000000000 +0000 +++ hotshots-1.2.1/lang/hotshots_tr.ts 2013-08-29 19:00:22.000000000 +0000 @@ -13,7 +13,7 @@ <a href="%1">Check for new release ...</a> - + <a href="%1">Yeni sürüm kontrolü ...</a> @@ -38,7 +38,7 @@ Qt version %1 - + Qt sürümü %1 @@ -228,7 +228,7 @@ Force background color for clipboard/web services - + Pano/web hizmetleri için arkaplan zorlaması @@ -338,12 +338,12 @@ @url@ - + @url@ (*) @url@ is the uploaded URL - + (*) @url@ yüklenmiş URL dir @@ -413,7 +413,7 @@ Launch default Internet browser when done - + Bittiğinde varsayılan İnternet tarayıcısını başlat @@ -465,17 +465,17 @@ %1 transfert end without error - + %1 transferi hatasız sonuçlandı %1 transfert end with error (%2) - + %1 transferi hata ile sonuçlandı (%2) Can't extract URL from reply - + Yanıttan URL alınamıyor. @@ -496,32 +496,32 @@ 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 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 @@ -546,7 +546,7 @@ 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. @@ -561,75 +561,77 @@ There is existing annotation items, what do you want to do ? - + Ek açıklama öğeleri mevcut, ne yapmak istersiniz ? 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ı - + Clear edit Düzenlemeyi temizle - + Clear all the exiting items ? Tüm çıkış yapılmış ögeleri temizle - + Clear document Belgeyi temizle - + Create a new document ? Yeni belge oluşturulsun mu? - - Loading HotShots file failed - HotShots dosyası yüklenemedi - - - - Error loading HotShots file %1 - %1 HotShots dosyası yüklenme hatası - - - + 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ı - + Snapshot editor: Ekran yakalayıcı düzenleyicisi - + Scale x%1 x%1 Ölçek @@ -799,7 +801,7 @@ Add a post effect to background image - + Arkaplan resmine bir geçiş efekti ekle @@ -809,32 +811,32 @@ Push selected elements up - Push selected elements up + Seçilen öğeleri yukarı al Push selected elements down - + Seçilen öğeleri alt sıralara indir Duplicate selected element - + Seçilen öğreleri çoğalt Erase all elements - + Tüm öğeleri temizle Delete selected elements - + Tüm öğeleri sil Del - + Sil @@ -842,37 +844,37 @@ Cannot read file %1: (%2) - + Dosya okunamıyor %1: (%2) Saving failed for project %1 : %2 - + Proje için kaydedilemedi %1: %2 Cannot save file %1: (%2) - + Dosya kaydedilemiyor %1: (%2) Parse error at line %1, column %2: (%3) - + %1 satırında ayrıştırma hatası, sütun %2: (%3) The file is not a "Hotshots" file !! - + Bu bir "Hotshots" dosyası değil !! Configuration has been automatically updated ! - + Yapılandırma otomatik olarak güncellendi. Unknown version of hotshots file (%1). - + Sürümü bilinmeyen hotshots dosyası (%1). @@ -880,12 +882,12 @@ %1 transfert end without error - + %1 transferi hatasız sonuçlandı %1 transfert end with error (%2) - + %1 transferi hata ile sonuçlandı (%2) @@ -893,7 +895,7 @@ 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. @@ -901,42 +903,42 @@ Unable to connect to the FTP server at %1. Please check that the hostname is correct. - + %1 de FTP sunucusuna bağlantı kurulamıyor. Sunucu adının doğruluğunu kontrol edin. Logged onto %1. - + %1 üzerinde oturum açıldı. Canceled upload of %1 - + %1' i yüklemekten vazgeçildi successful uploading onto %1. - + %1 üzerine yükleme başarılı %1 is available - + %1 uygun durumda %1 is'nt available on server %2 - + %2 sunucusu üzerindeki %1 uygun değil %1 transfert end with error - + %1 transferi hata ile sonuçlandı %1 transfert end without error - + transfer hatasız sonuçlandı %1 @@ -944,42 +946,42 @@ FtpUploaderSettings - + FTPYükleyiciAyarları Initial FTP directory - + İlk FTP dizini @filename@ is the uploaded file - + @dosyaadı@ yüklenmiş dosyadır Username: - + Kullanıcı adı: Server: - + Sunucu: FTP password - + FTP şifresi Password: - + Şifre: Directory: - + Dizin: @@ -994,32 +996,32 @@ FTP username - + FTP kullanıcı adı Define result url - + URL sonucunu tanımlayın ftp://whatyouwant/@filename@ - + ftp://neistiyorsan/@dosyaadı@ Ftp port - + Ftp portu FTP Server name - + FTP Sunucu adı Port: - + Port: @@ -1027,17 +1029,17 @@ %1 transfert end without error - + %1 transferi hatasız sonuçlandı %1 transfert end with error (%2) - + %1 transferi hata ile sonuçlandı (%2) %1 service reply with error (%2) - + %1 hizmeti hata döndürdü (%2) @@ -1045,17 +1047,17 @@ %1 transfert end without error - + %1 transferi hatasız sonuçlandı %1 transfert end with error (%2) - + %1 transferi hata ile sonuçlandı (%2) An error occurred during parsing of service response - + Hizmet yanıtının ayrıştırılması sırasında bir hata oluştu @@ -1063,102 +1065,107 @@ 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) - + 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 - - + + 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ı ! - + 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. - + Upload image %1 to %2 service ? - + %1 resim dosyası %2 hizmetine yüklensin mi ? - + 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. @@ -1167,78 +1174,78 @@ MainWindow - + AnaPencere Take a new snapshot - + Yeni bir görüntü yakala Uploaded URL - + Yüklenen URL Parameters - + 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 Quit - + Çıkış @@ -1253,27 +1260,27 @@ Save Snapshot - + Yakalanan görüntüyü kaydet Save snapshot - + Ekran görüntüsünü kaydet Show Interface - + Arayüzü Göster Show interface - + Arayüzü göster Copy To Clipboard - + Panoya Kopyala @@ -1283,37 +1290,37 @@ Add Annotations - + Ek Açıklamalar Ekle Add annotations - + Ek açıklamalar ekle 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 @@ -1323,7 +1330,7 @@ Grab Region - + Bölge Yakala @@ -1333,12 +1340,12 @@ Help - + Yardım Upload - + Yükle @@ -1354,7 +1361,7 @@ Print - + Yazdır @@ -1362,83 +1369,83 @@ %1 found - + %1 bulundu Screenshot manager. - + Ekran görüntüsü yöneticisi. Usage: - + Kullanım: - [options] + [options] [file] Following options are known: - + Bilinen seçenekler şunlardır: --help - displays this help. - + --help - bu yardımı görüntüler. --reset-config - clear the saved preference parameters. - + --reset-config - kaydedilmiş tercih parametlerini temizler, sıfırlar. --no-singleinstance : enable the use of multiple instance of program (not recommended). - + --no-singleinstance : programın aynı anda birden fazla sayıda çalıştırılabilmesini etkinleştirir. (önerilmez). - - message from other instance. + + file : file to load in the editor, can be a .hot file or an image file. - + %1 is already running !! - + %1 zaten çalışıyor !! - + translations path %1 - + çeviri yolu %1 - + setting language to : %1 - + dil %1 olarak ayarlandı - - + + successfully loaded data from %1 - + %1 konumundan veriler başarıyla yüklendi. - + failed to load data from %1 - + %1 konumundan veri yüklenemedi stringToVariant(): Error in digit (%1). - + stringToVariant(): Rakamda hata (%1). <no image> - + <resim yok> @@ -1446,7 +1453,7 @@ 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. @@ -1454,27 +1461,27 @@ 1x1 - + 1x1 Circle - + Daire Square - + Kare Slash - + Slash Backslash - + Backslash @@ -1482,47 +1489,48 @@ Black - + Siyah White - + Beyaz Red - + Kırmızı Green - + Yeşil Blue - + Mavi Cyan - + Cam göbeği rengi Magenta - + +Morumsu kırmızı Orange - + Turuncu Gray - + Gri @@ -1530,27 +1538,27 @@ Solid Line - + Koyu Çizgi Dash pattern - + Şekillerin düzeni Dot pattern - + Nokta düzeni Dash Dot pattern - + Şekil Nokta düzeni Dash Dot Dot pattern - + Şekil Nokta Nokta düzeni @@ -1558,17 +1566,17 @@ No Fill - + Doldurma yok Fill with translucent Background Color - + Saydam Arkaplan Rengi ile doldur Fill with Background Color - + Arkaplan Rengi ile doldur \ No newline at end of file Binary files /tmp/T4Fk5mD1D0/hotshots-1.2.0/lang/hotshots_vi.qm and /tmp/0F4nBsYHQM/hotshots-1.2.1/lang/hotshots_vi.qm differ diff -Nru hotshots-1.2.0/lang/hotshots_vi.ts hotshots-1.2.1/lang/hotshots_vi.ts --- hotshots-1.2.0/lang/hotshots_vi.ts 2013-07-23 19:15:38.000000000 +0000 +++ hotshots-1.2.1/lang/hotshots_vi.ts 2013-08-29 19:05:40.000000000 +0000 @@ -1,8 +1,10 @@ - + + + - + - + release of translation and translator name please 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 @@ -36,46 +38,46 @@ 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 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ụ: @@ -473,7 +475,7 @@ %1 đã chuyển đổi với lỗi (%2) - + Can't extract URL from reply Không thể trích xuất đường dẫn từ phản hồi @@ -574,62 +576,64 @@ 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 + + + Clear edit Làm rỗng chỉnh sửa - + Clear all the exiting items ? Làm rỗng mọi đối tượng đang thoát? - + Clear document Làm rỗng tài liệu - + Create a new document ? Tạo một tài liệu mới? - - 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 - - - + 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 - + Snapshot editor: Chỉnh sửa Snapshot: - + Scale x%1 Tỉ lệ x%1 @@ -919,22 +923,22 @@ đã tải lên thành công tại %1. - + %1 is available Hiện có %1 - + %1 is'nt available on server %2 Hiện không có %1 trên server %2 - + %1 transfert end with error %1 đã được chuyển đổi và không có lỗi - + %1 transfert end without error %1 đã chuyển đổi và không có lỗi @@ -1043,17 +1047,17 @@ ImgurUploader - + %1 transfert end without error %1 đã chuyển đổi và không có lỗi - + %1 transfert end with error (%2) %1 đã chuyển đổi với lỗi (%2) - + An error occurred during parsing of service response Xảy ra lỗi khi tiến hành chuyển thông tin về phản hồi của dịch vụ @@ -1061,106 +1065,111 @@ 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) - + 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 - - + + 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 ! - + 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 !! - + Upload image %1 to %2 service ? Tải lên hình ảnh %1 đến dịch vụ %2? - + 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. + MainWindowClass @@ -1360,7 +1369,7 @@ QObject - + %1 found Đã tìm thấy %1 @@ -1376,8 +1385,8 @@ - [options] - [tùy chọn] + [options] [file] + [options] [file] @@ -1400,33 +1409,33 @@ --no-singleinstance : cho phép mở nhiều tiến trình của ứng dụng (không khuyên dùng). - - message from other instance. - thông điệp từ các tiến trình khác. + + 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 !! - + translations path %1 đường dẫn dịch thuật %1 - + setting language to : %1 đặt ngôn ngữ : %1 - - + + successfully loaded data from %1 đã tải thành công dữ liệu từ %1 - + failed to load data from %1 xảy ra lỗi khi tải dữ liệu từ %1 @@ -1571,4 +1580,4 @@ Đổ với màu nền - \ No newline at end of file + diff -Nru hotshots-1.2.0/lang/hotshots_zh.ts hotshots-1.2.1/lang/hotshots_zh.ts --- hotshots-1.2.0/lang/hotshots_zh.ts 2013-07-23 19:23:06.000000000 +0000 +++ hotshots-1.2.1/lang/hotshots_zh.ts 2013-08-29 19:00:50.000000000 +0000 @@ -5,7 +5,7 @@ release of translation and translator name please put your name here dear translator and the release of the translation file !! - + V1.2 by taijuin @@ -188,7 +188,7 @@ Default saving image format - 預設儲存影像格式 + 預設儲存的圖片格式 @@ -446,7 +446,7 @@ Image has been resized according to uploading service constraint (%1x%2) - + 圖片已經調整過大小，根據上傳服務的限制 (%1x%2) @@ -457,7 +457,7 @@ reduce file size according to limit (%1/%2 bytes) - + 減小檔案，根據限制 (%1/%2 bytes) @@ -527,7 +527,7 @@ Left-click to set center - + 按滑鼠左鍵以設定中心 @@ -539,7 +539,7 @@ Left-click then drag to create the shape - + 按滑鼠左鍵然後拖動以建立形狀 @@ -551,7 +551,7 @@ Left-click to set image center and drag if you want change the size - + 按滑鼠左鍵以設定圖片中心和拖動（如果您想要改變大小） @@ -571,65 +571,67 @@ update background image ... - 更新的背景圖片... + 更新背景圖片... + + + + + Loading HotShots file failed + 載入 HotShots 檔案失敗 - + + + Error loading HotShots file %1 + 載入 HotShots 檔案 %1 時出錯 + + + Clear edit 清除編輯 - + Clear all the exiting items ? 清除所有現有的項目嗎？ - + Clear document 清除文件 - + Create a new document ? 建立一新的文件？ - - Loading HotShots file failed - 載入 HotShots 檔案失敗 - - - - Error loading HotShots file %1 - 載入 HotShots 檔案 %1 時出錯 - - - + Save HotShots File 儲存 HotShots 檔 - + HotShots files (*.hot) HotShots 檔案 (*.hot) - + Saving HotShots file failed 儲存 HotShots 檔案失敗 - + Error saving HotShots file %1 - + Snapshot editor: 快照編輯器： - + Scale x%1 縮放 x%1 @@ -714,7 +716,7 @@ Add an image - 添加一個圖片 + 加入一個圖片 @@ -744,7 +746,7 @@ Quit editor - 退出編輯器 + 結束編輯器 @@ -759,7 +761,7 @@ Import image from clipboard - 從剪貼簿匯入影像 + 從剪貼簿匯入圖片 @@ -779,12 +781,12 @@ Export image - 匯出影像 + 匯出圖片 Upload the image to the web - 上傳影像到網路上 + 上傳圖片到網路上 @@ -799,7 +801,7 @@ Add a post effect to background image - 加入後製效果到背景影像 + 加入後製效果到背景圖片 @@ -1076,90 +1078,95 @@ - + No post effect 無後製效果 - + Simple drop shadow 簡單的陰影 - + Drop shadow with borders 具有邊框的陰影 - + Progressive opacity 漸進式不透明 - + Torn edge 撕邊的效果 - - + + Upload the image to the web - 上傳影像到網路 + 上傳圖片到網路上 - + No default uploading web service defined ! 沒有預設明確的上傳Web服務！ - + Uploader %1 - + The default uploader (%1) does not appear correctly configured, no value given for required parameters !! - + 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>。 + 本程式將保持運行在系統匣中。要終止程式，請在系統匣本程式圖示的選單中選擇<b>結束</b>。 + + + + message from other instance. + @@ -1223,12 +1230,12 @@ Auto save image - 自動儲存影像 + 自動儲存圖片 Save image (ask user) - 儲存影像(詢問使用者) + 儲存圖片(詢問使用者) @@ -1238,7 +1245,7 @@ Quit - 退出 + 結束 @@ -1343,7 +1350,7 @@ Upload the image to the web - 上傳影像到網路 + 上傳圖片到網路 @@ -1372,12 +1379,12 @@ Usage: - + 用法： - [options] - [選項] + [options] [file] + @@ -1400,33 +1407,33 @@ - - message from other instance. - + + file : file to load in the editor, can be a .hot file or an image file. + 檔案：檔案載入到編輯器中，可以是一個 .hot 檔或圖片檔。 - + %1 is already running !! %1 已經在執行中！ - + translations path %1 - + setting language to : %1 將語言設置為： %1 - - + + successfully loaded data from %1 從 %1 載入資料成功 - + failed to load data from %1 從 %1 載入資料失敗 @@ -1438,7 +1445,7 @@ <no image> - + <無圖片> diff -Nru hotshots-1.2.0/src/AboutDialog.cpp hotshots-1.2.1/src/AboutDialog.cpp --- hotshots-1.2.0/src/AboutDialog.cpp 2013-05-17 19:35:28.000000000 +0000 +++ hotshots-1.2.1/src/AboutDialog.cpp 2013-08-24 20:31:14.000000000 +0000 @@ -67,7 +67,7 @@ LogHandler::getInstance()->setBufferization(false); // get all stored messages if exists labelRelease->setText( QString(PACKAGE_NAME) + " " + QString(PACKAGE_VERSION) ); - labelCheckRelease->setText(tr("Check for new release ...").arg(PACKAGE_CHECK_RELEASE_URL)); + labelCheckRelease->setText( tr("Check for new release ...").arg(PACKAGE_CHECK_RELEASE_URL) ); // add validators QValidator *validator = new QIntValidator(1, 9999, this); @@ -78,11 +78,10 @@ if( !QSound::isAvailable() ) checkBoxPlaySound->setEnabled(false); - 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_LOG,tr("Log")); - + 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_LOG,tr("Log") ); } void AboutDialog::updateUploaders() @@ -121,7 +120,7 @@ } // Qt version - labelQtVersion->setText(tr("Qt version %1").arg(QT_VERSION_STR)); + labelQtVersion->setText( tr("Qt version %1").arg(QT_VERSION_STR) ); } void AboutDialog::updateInfosLanguages() @@ -155,7 +154,7 @@ void AboutDialog::on_listWidgetTranslations_itemClicked( QListWidgetItem * item) { QString lang = item->data(Qt::UserRole).toString(); - QString file( MiscFunctions::getTranslationsPath() ); + QString file( MiscFunctions::getTranslationsPath("fr") ); file += QString("/%1_%2.qm").arg( QString(PACKAGE_NAME).toLower() ).arg(lang); QTranslator translator; @@ -353,5 +352,5 @@ void AboutDialog::on_tabWidget_currentChanged ( int index ) { - setWindowTitle(tabWidget->tabText(index)); + setWindowTitle( tabWidget->tabText(index) ); } diff -Nru hotshots-1.2.0/src/AboutDialog.h hotshots-1.2.1/src/AboutDialog.h --- hotshots-1.2.0/src/AboutDialog.h 2013-05-12 17:16:32.000000000 +0000 +++ hotshots-1.2.1/src/AboutDialog.h 2013-08-24 20:31:16.000000000 +0000 @@ -35,7 +35,8 @@ public: - enum { + enum + { TAB_ABOUT = 0, TAB_PREFERENCES, TAB_INFOS, diff -Nru hotshots-1.2.0/src/AppSettings.h hotshots-1.2.1/src/AppSettings.h --- hotshots-1.2.0/src/AppSettings.h 2013-06-22 17:24:34.000000000 +0000 +++ hotshots-1.2.1/src/AppSettings.h 2013-08-29 19:07:28.000000000 +0000 @@ -25,7 +25,7 @@ #define PACKAGE_ORGANIZATION "TheHive" #define PACKAGE_NAME "HotShots" -#define PACKAGE_VERSION "1.2.0" +#define PACKAGE_VERSION "1.2.1" #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" diff -Nru hotshots-1.2.0/src/FreehandGrabber.cpp hotshots-1.2.1/src/FreehandGrabber.cpp --- hotshots-1.2.0/src/FreehandGrabber.cpp 2013-05-13 19:23:30.000000000 +0000 +++ hotshots-1.2.1/src/FreehandGrabber.cpp 2013-08-24 20:31:14.000000000 +0000 @@ -282,29 +282,28 @@ if ( !pol.isEmpty() ) { /* - int xOffset = m_desktopPixmap.rect().x() - pol.boundingRect().x(); - int yOffset = m_desktopPixmap.rect().y() - pol.boundingRect().y(); - QPolygon translatedPol = pol.translated(xOffset, yOffset); + int xOffset = m_desktopPixmap.rect().x() - pol.boundingRect().x(); + int yOffset = m_desktopPixmap.rect().y() - pol.boundingRect().y(); + QPolygon translatedPol = pol.translated(xOffset, yOffset); + + LogHandler::getInstance()->reportDebug( QString("FreehandGrabber::getSelection(): processing polygon with %1 nodes").arg( translatedPol.size() )); + + // first try a simple extraction + //return m_desktopPixmap.copy(pol.boundingRect()); + + // a second try: a simple clipping region + QPixmap pix( pol.boundingRect().size() ); + pix.fill(Qt::transparent); + + QPainter painter(&pix); + painter.setClipRegion( QRegion(translatedPol.boundingRect()) ); + painter.setCompositionMode(QPainter::CompositionMode_Source); + painter.drawPixmap( pix.rect(), m_desktopPixmap, pol.boundingRect() ); + painter.end(); - LogHandler::getInstance()->reportDebug( QString("FreehandGrabber::getSelection(): processing polygon with %1 nodes").arg( translatedPol.size() )); + return pix; + */ - // first try a simple extraction - //return m_desktopPixmap.copy(pol.boundingRect()); - - // a second try: a simple clipping region - QPixmap pix( pol.boundingRect().size() ); - pix.fill(Qt::transparent); - - QPainter painter(&pix); - painter.setClipRegion( QRegion(translatedPol.boundingRect()) ); - painter.setCompositionMode(QPainter::CompositionMode_Source); - painter.drawPixmap( pix.rect(), m_desktopPixmap, pol.boundingRect() ); - painter.end(); - - return pix; - */ - - int xOffset = m_desktopPixmap.rect().x() - pol.boundingRect().x(); int yOffset = m_desktopPixmap.rect().y() - pol.boundingRect().y(); QPolygon translatedPol = pol.translated(xOffset, yOffset); @@ -319,40 +318,37 @@ painter.end(); return pix; - /* - int xOffset = m_desktopPixmap.rect().x() - pol.boundingRect().x(); - int yOffset = m_desktopPixmap.rect().y() - pol.boundingRect().y(); - QPolygon translatedPol = pol.translated(xOffset, yOffset); - - QPixmap pix(pol.boundingRect().size()); - pix.fill(Qt::transparent); - - QPainter pt; - pt.begin(&pix); - if (pt.paintEngine()->hasFeature(QPaintEngine::PorterDuff)) - { + int xOffset = m_desktopPixmap.rect().x() - pol.boundingRect().x(); + int yOffset = m_desktopPixmap.rect().y() - pol.boundingRect().y(); + QPolygon translatedPol = pol.translated(xOffset, yOffset); + + QPixmap pix(pol.boundingRect().size()); + pix.fill(Qt::transparent); + + QPainter pt; + pt.begin(&pix); + if (pt.paintEngine()->hasFeature(QPaintEngine::PorterDuff)) + { pt.setRenderHints(QPainter::Antialiasing | QPainter::HighQualityAntialiasing | QPainter::SmoothPixmapTransform, true); pt.setBrush(Qt::black); pt.setPen(QPen(QBrush(Qt::black), 0.5)); pt.drawPolygon(translatedPol); pt.setCompositionMode(QPainter::CompositionMode_SourceIn); - } - else - { + } + else + { pt.setClipRegion(QRegion(translatedPol)); pt.setCompositionMode(QPainter::CompositionMode_Source); - } + } - pt.drawPixmap(pix.rect(), m_desktopPixmap, pol.boundingRect()); - pt.end(); + pt.drawPixmap(pix.rect(), m_desktopPixmap, pol.boundingRect()); + pt.end(); - return pix; -*/ - - + return pix; + */ } return QPixmap(); } diff -Nru hotshots-1.2.0/src/MainWindow.cpp hotshots-1.2.1/src/MainWindow.cpp --- hotshots-1.2.0/src/MainWindow.cpp 2013-07-17 16:27:26.000000000 +0000 +++ hotshots-1.2.1/src/MainWindow.cpp 2013-08-24 20:31:16.000000000 +0000 @@ -36,7 +36,6 @@ #include #include - #include #ifndef Q_WS_PM // OS/2 @@ -113,7 +112,7 @@ m_userUrlFormat("@url@"), m_defaultUploader(-1), m_forceBgColor(false), - m_bgColor(QColor(Qt::white)), + m_bgColor( QColor(Qt::white) ), m_launchBrowserWhenDone(false) { ui->setupUi(this); @@ -163,11 +162,10 @@ { setStatusBar(NULL); //remove status bar - QWidget* spacer = new QWidget(); + QWidget* spacer = new QWidget(); spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); ui->mainToolBar->insertWidget(ui->actionHelp,spacer); - // setup app name, release, ... updateApplicationIdentity(); @@ -337,6 +335,10 @@ 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()->screenGeometry().contains( pos() ) ) + move( QPoint(200, 200) ); + settings.endGroup(); settings.beginGroup("Application"); @@ -427,6 +429,7 @@ 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); @@ -565,13 +568,11 @@ 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_startWithSystem = m_about->checkBoxStartWithSystem->isChecked(); setStartWithSystem(m_startWithSystem); @@ -826,7 +827,7 @@ // clear previous value ui->labelOuputUrl->setText(""); if (m_forceBgColor) - up->upload(MiscFunctions::applyAlpha(pix,m_bgColor).toImage(),QFileInfo(saveName).baseName() ); + up->upload( MiscFunctions::applyAlpha(pix,m_bgColor).toImage(),QFileInfo(saveName).baseName() ); else up->upload( pix.toImage(),QFileInfo(saveName).baseName() ); @@ -851,13 +852,13 @@ void MainWindow::exportToPrinter(const QPixmap &pix) { - if (pix.isNull()) + if ( pix.isNull() ) return; QPrinter printer; QPrintDialog *dialog = new QPrintDialog(&printer, this); - dialog->setWindowTitle(tr("Print Document")); + dialog->setWindowTitle( tr("Print Document") ); dialog->addEnabledOption(QAbstractPrintDialog::PrintSelection); if (dialog->exec() != QDialog::Accepted) @@ -865,13 +866,13 @@ QPainter painter; - if (!painter.begin(&printer)) + 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 ); + QPoint printTopLeft( ( pageRect.width() - printSize.width() ) / 2,( pageRect.height() - printSize.height() ) / 2 ); QRect printRect( printTopLeft, printSize ); painter.drawPixmap( printRect, pix, pix.rect() ); @@ -882,14 +883,12 @@ { QString saveName(preferredName); - if (saveName.isEmpty()) + if ( saveName.isEmpty() ) { - - - // ask for a filename ... - saveName = QFileDialog::getSaveFileName( this, tr("Save File"), - NameManager::getProposedFilename(), - tr("Images (*.%1)").arg( MiscFunctions::getAvailablesImageFormatsForWriting() ) ); + // 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) ) @@ -1022,7 +1021,7 @@ // something send directly ? QPixmap newPix; - if (pix.isNull()) + if ( pix.isNull() ) newPix = m_currPixmap; else newPix = pix; @@ -1075,16 +1074,15 @@ void MainWindow::updateTooltips() { - QList actions = findChildren(); - foreach(QAction *act, actions ) + foreach(QAction * act, actions ) { QString tooltip = act->toolTip(); QKeySequence keyShortcut = act->shortcut(); QString strShortcutString = keyShortcut.toString(); - if (!strShortcutString.isEmpty()) - act->setToolTip(QString("%1 (%2)").arg(tooltip,strShortcutString)); + if ( !strShortcutString.isEmpty() ) + act->setToolTip( QString("%1 (%2)").arg(tooltip,strShortcutString) ); } } @@ -1137,7 +1135,6 @@ updateShortcuts(); - #endif } @@ -1192,8 +1189,28 @@ 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(); @@ -1203,11 +1220,6 @@ connect( m_snapshotEditor,SIGNAL( requestClipboard(const QPixmap &) ),this,SLOT( copyToClipboard(const QPixmap &) ) ); connect( m_snapshotEditor,SIGNAL( defaultDirectoryChanged(const QString &) ),this,SLOT( updateDefaultPath(const QString &) ) ); } - - m_snapshotEditor->show(); - m_snapshotEditor->load(pixmap); - - return true; } void MainWindow::restoreDisplayState() @@ -1274,8 +1286,7 @@ playSound(":/hotshots/beep.wav"); if (m_launchBrowserWhenDone) - QDesktopServices::openUrl( QUrl( url) ) ; - + QDesktopServices::openUrl( QUrl( url) ); } void MainWindow::playSound(const QString &file) @@ -1291,11 +1302,20 @@ void MainWindow::wakeUp(const QString &mess) { - LogHandler::getInstance()->reportWarning(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); -} \ No newline at end of file +} diff -Nru hotshots-1.2.0/src/MainWindow.h hotshots-1.2.1/src/MainWindow.h --- hotshots-1.2.0/src/MainWindow.h 2013-07-10 21:05:30.000000000 +0000 +++ hotshots-1.2.1/src/MainWindow.h 2013-08-24 20:31:16.000000000 +0000 @@ -74,6 +74,8 @@ explicit MainWindow(QWidget *parent = 0); ~MainWindow(); + bool openEditor(const QString &); + public slots: void on_actionQuit_triggered(); @@ -84,7 +86,7 @@ void on_actionSaveSnapshot_triggered(); void on_actionCopyToClipboard_triggered(); - void copyToClipboard(const QPixmap &pix = QPixmap()); + void copyToClipboard( const QPixmap &pix = QPixmap() ); void on_actionShowUI_triggered(); void iconActivated(QSystemTrayIcon::ActivationReason reason); @@ -153,11 +155,12 @@ bool openEditor(const QPixmap &pixmap); + void initEditor(); + void applyGlobalShortcut(bool val); QString formatUrl(const QString &url, int type); void playSound(const QString &file); - Ui::MainWindowClass *ui; QString m_version; diff -Nru hotshots-1.2.0/src/MiscFunctions.cpp hotshots-1.2.1/src/MiscFunctions.cpp --- hotshots-1.2.0/src/MiscFunctions.cpp 2013-07-17 16:28:54.000000000 +0000 +++ hotshots-1.2.1/src/MiscFunctions.cpp 2013-08-24 20:31:16.000000000 +0000 @@ -180,7 +180,12 @@ return imglist; } -QString MiscFunctions::getTranslationsPath() +QString MiscFunctions::getTranslationsFile(const QString &lang) +{ + return QString("%1_%2.qm").arg(PACKAGE_NAME).arg(lang).toLower(); +} + +QString MiscFunctions::getTranslationsPath(const QString &refLang) { // search in application path QStringList ldir; @@ -189,11 +194,15 @@ ldir << QCoreApplication::applicationDirPath () + "/../../lang"; ldir << "/usr/local/share/locale"; ldir << "/usr/share/local/locale"; + ldir << "/usr/share/locale"; + + QString ext; + if ( !refLang.isEmpty() ) + ext = "/" + getTranslationsFile(refLang); foreach (const QString &dir, ldir) { - QDir gdp (dir); - if ( QDir(dir).exists() ) + if ( QFileInfo(dir + ext).exists() ) return dir; } @@ -203,7 +212,7 @@ QMap MiscFunctions::getAvailableLanguages() { QMap languageMap; - QDir dir( MiscFunctions::getTranslationsPath() ); + QDir dir( MiscFunctions::getTranslationsPath("fr") ); QRegExp expr( QString("^%1_(\\w+)\\.qm$").arg(PACKAGE_NAME).toLower() ); QStringList files = dir.entryList(QDir::Files, QDir::Name); @@ -257,8 +266,8 @@ QTranslator *qt = new QTranslator(); QStringList excludedFiles; QString globalTranslationPath = QLibraryInfo::location(QLibraryInfo::TranslationsPath); - if (!QFileInfo(globalTranslationPath).exists()) - globalTranslationPath = MiscFunctions::getTranslationsPath(); + if ( !QFileInfo(globalTranslationPath).exists() ) + globalTranslationPath = MiscFunctions::getTranslationsPath("fr"); if ( qt->load( "qt_" + language, globalTranslationPath ) ) { @@ -272,11 +281,11 @@ } QString suff = language + ".qm"; - QDir dir( MiscFunctions::getTranslationsPath() ); + QDir dir( MiscFunctions::getTranslationsPath("fr") ); foreach ( const QString &s, dir.entryList(QDir::Files | QDir::Readable) ) { - if ( !s.endsWith(suff) || excludedFiles.contains(s)) + if ( !s.endsWith(suff) || excludedFiles.contains(s) ) continue; QTranslator *t = new QTranslator(); @@ -354,9 +363,9 @@ QPixmap MiscFunctions::applyAlpha(const QPixmap &pix,const QColor &bgColor) { - QPixmap newPix(pix.size()); + QPixmap newPix( pix.size() ); newPix.fill(bgColor); QPainter painter(&newPix); painter.drawPixmap(0,0,pix); return newPix; -} \ No newline at end of file +} diff -Nru hotshots-1.2.0/src/MiscFunctions.h hotshots-1.2.1/src/MiscFunctions.h --- hotshots-1.2.0/src/MiscFunctions.h 2013-07-17 16:27:26.000000000 +0000 +++ hotshots-1.2.1/src/MiscFunctions.h 2013-08-24 20:31:16.000000000 +0000 @@ -38,7 +38,8 @@ static QMap getLongImageFormats(); // translations functions - static QString getTranslationsPath(); + static QString getTranslationsPath( const QString &refLang = QString() ); + static QString getTranslationsFile(const QString &lang); static QMap getAvailableLanguages(); static void setDefaultLanguage(); static void setLanguage(const QString& lang); @@ -52,7 +53,7 @@ static QString HTMLToText(const QString &t ); static QString TextToHTML(const QString &t ); - static QPixmap applyAlpha(const QPixmap &, const QColor &bgColor = QColor(Qt::white)); + static QPixmap applyAlpha( const QPixmap &, const QColor &bgColor = QColor(Qt::white) ); }; #endif // _MISCFUNCTIONS_H_ diff -Nru hotshots-1.2.0/src/PostEffect.cpp hotshots-1.2.1/src/PostEffect.cpp --- hotshots-1.2.0/src/PostEffect.cpp 2013-06-21 21:06:30.000000000 +0000 +++ hotshots-1.2.1/src/PostEffect.cpp 2013-08-24 20:31:16.000000000 +0000 @@ -329,12 +329,12 @@ return drawShadowedPixmap(returnImage); } -QPixmap PostEffect::tornEdgePixmap(const QPixmap &pm) +QPixmap PostEffect::tornEdgePixmap(const QPixmap &pm) { return CreateTornEdge(pm,defaultToothHeight,defaultHorizontalToothRange,defaultVerticalToothRange); } -QPixmap PostEffect::progressivePixmap(const QPixmap &pm) +QPixmap PostEffect::progressivePixmap(const QPixmap &pm) { int maxSize = qMax( pm.width(),pm.height() ); float factor = (maxSize - 2 * progressiveBorderSize) / (float)maxSize; @@ -351,7 +351,7 @@ return res; } -QPixmap PostEffect::addBorderToPixmap(const QPixmap &pm, const QColor &color, int size) +QPixmap PostEffect::addBorderToPixmap(const QPixmap &pm, const QColor &color, int size) { QPixmap newPm = QPixmap( pm.rect().adjusted(-size,-size,size,size).size() ); newPm.fill( color ); @@ -360,7 +360,7 @@ return newPm; } -QPixmap PostEffect::shadoizePixmapWithBorder(const QPixmap &pm) +QPixmap PostEffect::shadoizePixmapWithBorder(const QPixmap &pm) { QPixmap icon = QPixmap( pm.width() + 2 * shadowBorderSize + 2 * defaultBorderSize,pm.height() + 2 * shadowBorderSize + 2 * defaultBorderSize); diff -Nru hotshots-1.2.0/src/PostEffect.h hotshots-1.2.1/src/PostEffect.h --- hotshots-1.2.0/src/PostEffect.h 2013-06-21 21:06:32.000000000 +0000 +++ hotshots-1.2.1/src/PostEffect.h 2013-08-24 20:31:16.000000000 +0000 @@ -29,7 +29,6 @@ class PostEffect { - public: enum typPostEffect @@ -45,12 +44,12 @@ private: - static QPixmap tornEdgePixmap(const QPixmap &pm) ; - static QPixmap shadoizePixmapWithBorder(const QPixmap &pm) ; - static QPixmap progressivePixmap(const QPixmap &pm) ; - static QPixmap addBorderToPixmap(const QPixmap &pm, const QColor &color, int size) ; + static QPixmap tornEdgePixmap(const QPixmap &pm); + static QPixmap shadoizePixmapWithBorder(const QPixmap &pm); + static QPixmap progressivePixmap(const QPixmap &pm); + static QPixmap addBorderToPixmap(const QPixmap &pm, const QColor &color, int size); - static QPixmap generateFuzzyRect(const QSize& size, const QColor& color, int radius) ; + static QPixmap generateFuzzyRect(const QSize& size, const QColor& color, int radius); }; #endif // _POSTEFFECT_H_ diff -Nru hotshots-1.2.0/src/QColorButton.cpp hotshots-1.2.1/src/QColorButton.cpp --- hotshots-1.2.0/src/QColorButton.cpp 2013-05-30 19:47:06.000000000 +0000 +++ hotshots-1.2.1/src/QColorButton.cpp 2013-08-24 20:31:16.000000000 +0000 @@ -17,13 +17,11 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *******************************************************************************/ - + #include #include - -#include"QColorButton.h" - +#include "QColorButton.h" #define COLOR_LABEL_SPACING 5 @@ -34,7 +32,7 @@ colorLabel->setText(""); colorLabel->setStyleSheet("background: rgb(127,127,127); border: solid 1px #000000;"); updateColorLabelSize(); - connect(this, SIGNAL(clicked()), this, SLOT(click())); + connect( this, SIGNAL( clicked() ), this, SLOT( click() ) ); } void QColorButton::resizeEvent(QResizeEvent *) @@ -50,16 +48,16 @@ void QColorButton::updateColorLabelSize() { colorLabel->move(COLOR_LABEL_SPACING, COLOR_LABEL_SPACING); - colorLabel->resize(this->width()-(COLOR_LABEL_SPACING * 2),this->height()-(COLOR_LABEL_SPACING * 2)); + colorLabel->resize( this->width() - (COLOR_LABEL_SPACING * 2),this->height() - (COLOR_LABEL_SPACING * 2) ); } void QColorButton::setColor(const QColor &color) { colorLabel->setStyleSheet("background: rgb(" - +QString::number(color.red())+ ", " - +QString::number(color.green())+ ", " - +QString::number(color.blue())+ ");" - +"border: solid 1px #000000;"); + + QString::number( color.red() ) + ", " + + QString::number( color.green() ) + ", " + + QString::number( color.blue() ) + ");" + + "border: solid 1px #000000;"); emit colorChanged(color); } @@ -77,10 +75,9 @@ { QColorDialog * dialog = new QColorDialog(this); QColor savedColor = getColor(); - connect(dialog, SIGNAL(currentColorChanged(const QColor &)), this, SLOT(currentColorChanged(const QColor &))); - dialog->setCurrentColor(getColor()); + connect( dialog, SIGNAL( currentColorChanged(const QColor &) ), this, SLOT( currentColorChanged(const QColor &) ) ); + dialog->setCurrentColor( getColor() ); if (dialog->exec() != QDialog::Accepted) setColor(savedColor); delete dialog; } - diff -Nru hotshots-1.2.0/src/QColorButton.h hotshots-1.2.1/src/QColorButton.h --- hotshots-1.2.0/src/QColorButton.h 2013-05-15 15:12:30.000000000 +0000 +++ hotshots-1.2.1/src/QColorButton.h 2013-08-24 20:31:16.000000000 +0000 @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *******************************************************************************/ - + #ifndef _QCOLORBUTTON_H_ #define _QCOLORBUTTON_H_ @@ -29,14 +29,14 @@ class QColorButton : public QPushButton { Q_OBJECT - + public: QColorButton(QWidget *parent); ~QColorButton(); QColor getColor(); void setColor(const QColor& color); - + protected: void updateColorLabelSize(); @@ -49,9 +49,10 @@ signals: - void colorChanged(const QColor &); + void colorChanged(const QColor &); protected: + QLabel * colorLabel; }; diff -Nru hotshots-1.2.0/src/SplashScreen.cpp hotshots-1.2.1/src/SplashScreen.cpp --- hotshots-1.2.0/src/SplashScreen.cpp 2013-05-06 06:37:10.000000000 +0000 +++ hotshots-1.2.1/src/SplashScreen.cpp 2013-08-24 20:31:16.000000000 +0000 @@ -22,9 +22,12 @@ #include #include +#include #include #include +const int refreshInterval = 201; + SplashScreen::SplashScreen(const QPixmap& pixmap, unsigned int minimalDisplayDuration, int screenId, bool transparentBackground, Qt::WindowFlags /* f */) : QSplashScreen(), m_nextWidget(NULL), @@ -35,12 +38,21 @@ { setWindowModality(Qt::ApplicationModal); setSplash(pixmap,transparentBackground); + m_refreshId = startTimer(0); startTimer(minimalDisplayDuration); } void SplashScreen::timerEvent(QTimerEvent *event) { + if ( event->timerId() == m_refreshId) + { + repaint(); + return; + } + killTimer( event->timerId() ); + killTimer( m_refreshId ); + m_timerFired = true; if (m_nextWidget) { @@ -90,7 +102,10 @@ { m_nextWidget = next; if (m_timerFired && m_nextWidget) + { m_nextWidget->show(); + QSplashScreen::finish(m_nextWidget); + } } void SplashScreen::closeEvent(QCloseEvent *event) diff -Nru hotshots-1.2.0/src/SplashScreen.h hotshots-1.2.1/src/SplashScreen.h --- hotshots-1.2.0/src/SplashScreen.h 2013-05-06 06:37:18.000000000 +0000 +++ hotshots-1.2.1/src/SplashScreen.h 2013-08-19 19:50:24.000000000 +0000 @@ -64,6 +64,7 @@ int m_currAlign; QColor m_currColor; int m_screenId; + int m_refreshId; }; #endif // _SPLASHSCREEN_H_ diff -Nru hotshots-1.2.0/src/editor/EditorScene.cpp hotshots-1.2.1/src/editor/EditorScene.cpp --- hotshots-1.2.0/src/editor/EditorScene.cpp 2013-07-10 20:03:08.000000000 +0000 +++ hotshots-1.2.1/src/editor/EditorScene.cpp 2013-08-24 20:31:18.000000000 +0000 @@ -225,7 +225,8 @@ if (m_primitive && m_typElem != "Select") m_modeEdition = m_primitive->mouseRelease(mouseEvent); - //m_resetPrimitive = m_primitive->mouseRelease(mouseEvent); + + //m_resetPrimitive = m_primitive->mouseRelease(mouseEvent); if (m_modeEdition == BaseItem::EDITION_NEXTITEM) { @@ -254,14 +255,15 @@ { 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); + 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() ) @@ -308,7 +310,7 @@ void EditorScene::keyReleaseEvent(QKeyEvent *event) { - if ( m_multiSelection && !(event->modifiers() & ( Qt::ControlModifier )) ) + if ( m_multiSelection && !( event->modifiers() & ( Qt::ControlModifier ) ) ) { //QApplication::restoreOverrideCursor(); changeDragMode(QGraphicsView::ScrollHandDrag); @@ -399,9 +401,9 @@ { QList items = selectedItems(); - if (!items.isEmpty()) + if ( !items.isEmpty() ) { - foreach (QGraphicsItem *item, items) + foreach (QGraphicsItem * item, items) { BaseItem *primitive = dynamic_cast(item); if (primitive) @@ -491,7 +493,7 @@ { BaseItem *it = dynamic_cast(item); if (it) - it->setEnableShadow(!it->isShadowEnabled()); + it->setEnableShadow( !it->isShadowEnabled() ); } } @@ -675,9 +677,9 @@ foreach ( QGraphicsItem * item, m_groupUnderlay->childItems() ) { QGraphicsPixmapItem* pixItem; - if ( (pixItem = qgraphicsitem_cast(item)) != NULL ) + if ( ( pixItem = qgraphicsitem_cast(item) ) != NULL ) { - QRect itemCropRect = pixItem->mapFromScene(cropRect).boundingRect().toRect(); + 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() ); diff -Nru hotshots-1.2.0/src/editor/EditorScene.h hotshots-1.2.1/src/editor/EditorScene.h --- hotshots-1.2.0/src/editor/EditorScene.h 2013-07-10 20:03:08.000000000 +0000 +++ hotshots-1.2.1/src/editor/EditorScene.h 2013-08-24 20:31:18.000000000 +0000 @@ -184,6 +184,7 @@ void resetSelection(); QString m_typElem; + //bool m_resetPrimitive; int m_modeEdition; diff -Nru hotshots-1.2.0/src/editor/EditorView.cpp hotshots-1.2.1/src/editor/EditorView.cpp --- hotshots-1.2.0/src/editor/EditorView.cpp 2013-05-26 19:40:08.000000000 +0000 +++ hotshots-1.2.1/src/editor/EditorView.cpp 2013-08-24 20:31:18.000000000 +0000 @@ -28,6 +28,8 @@ #include "EditorView.h" +const double defaultScaleFactor = 1.3; + EditorView::EditorView(QWidget * map) : QGraphicsView(map) { // OpenGL @@ -98,7 +100,7 @@ if ( scene() ) { fitInView(scene()->sceneRect(), Qt::KeepAspectRatio ); - setCenter(scene()->sceneRect().center()); + setCenter( scene()->sceneRect().center() ); emit scaleChanged( transform().m22() ); } } @@ -106,7 +108,7 @@ void EditorView::resetScale() { setMatrix( QMatrix() ); - setCenter(scene()->sceneRect().center()); + setCenter( scene()->sceneRect().center() ); emit scaleChanged( transform().m22() ); } @@ -143,6 +145,22 @@ * Zoom the view in and out. */ +void EditorView::zoomPlus() +{ + zoom(defaultScaleFactor); +} + +void EditorView::zoomMinus() +{ + zoom(1.0 / defaultScaleFactor); +} + +void EditorView::zoom(double scaleFactor) +{ + scale(scaleFactor, scaleFactor); + emit scaleChanged( transform().m22() ); +} + void EditorView::wheelEvent(QWheelEvent* event) { // Scaled ? @@ -154,35 +172,20 @@ //Get the original screen centerpoint QPointF screenCenter = mapToScene( rect().center() ); - //Scale the view ie. do the zoom - double scaleFactor = 1.3; //How fast we zoom if(event->delta() > 0 ) - { - //Zoom in - scale(scaleFactor, scaleFactor); - scaled = true; - } + zoomPlus(); else - { - //Zooming out - scale(1.0 / scaleFactor, 1.0 / scaleFactor); - scaled = true; - } + zoomMinus(); - emit scaleChanged( transform().m22() ); + //Get the position after scaling, in scene coords + QPointF pointAfterScale( QGraphicsView::mapToScene( event->pos() ) ); - if ( scaled ) - { - //Get the position after scaling, in scene coords - QPointF pointAfterScale( QGraphicsView::mapToScene( event->pos() ) ); + //Get the offset of how the screen moved + QPointF offset = pointBeforeScale - pointAfterScale; - //Get the offset of how the screen moved - QPointF offset = pointBeforeScale - pointAfterScale; - - //Adjust to the new center for correct zooming - QPointF newCenter = screenCenter + offset; - setCenter(newCenter); - } + //Adjust to the new center for correct zooming + QPointF newCenter = screenCenter + offset; + setCenter(newCenter); // mouse position has changed!! emit mouseMoved( QGraphicsView::mapToScene( event->pos() ) ); diff -Nru hotshots-1.2.0/src/editor/EditorView.h hotshots-1.2.1/src/editor/EditorView.h --- hotshots-1.2.0/src/editor/EditorView.h 2013-05-26 17:54:50.000000000 +0000 +++ hotshots-1.2.1/src/editor/EditorView.h 2013-08-23 15:56:58.000000000 +0000 @@ -42,6 +42,10 @@ void fitScale(); void updateSceneRect(const QRectF &); + void zoomPlus(); + void zoomMinus(); + void zoom(double factor); + signals: void mouseMoved(const QPointF &pos); diff -Nru hotshots-1.2.0/src/editor/EditorWidget.cpp hotshots-1.2.1/src/editor/EditorWidget.cpp --- hotshots-1.2.0/src/editor/EditorWidget.cpp 2013-07-10 20:40:04.000000000 +0000 +++ hotshots-1.2.1/src/editor/EditorWidget.cpp 2013-08-24 20:31:18.000000000 +0000 @@ -113,50 +113,50 @@ QAction *act1 = new QAction(tr("No post effect"),this); act1->setData(PostEffect::EFFECT_NONE); menu->addAction(act1); - connect(act1,SIGNAL(triggered()),this,SLOT(changePostEffect())); + connect( act1,SIGNAL( triggered() ),this,SLOT( changePostEffect() ) ); QAction *act2 = new QAction(tr("Simple drop shadow"),this); act2->setData(PostEffect::EFFECT_DROP_SHADOW); menu->addAction(act2); - connect(act2,SIGNAL(triggered()),this,SLOT(changePostEffect())); + connect( act2,SIGNAL( triggered() ),this,SLOT( changePostEffect() ) ); QAction *act3 = new QAction(tr("Drop shadow with borders"),this); act3->setData(PostEffect::EFFECT_POLAROID_DROP_SHADOW); menu->addAction(act3); - connect(act3,SIGNAL(triggered()),this,SLOT(changePostEffect())); + connect( act3,SIGNAL( triggered() ),this,SLOT( changePostEffect() ) ); QAction *act4 = new QAction(tr("Progressive opacity"),this); act4->setData(PostEffect::EFFECT_PROGRESSIVE_EDGE); menu->addAction(act4); - connect(act4,SIGNAL(triggered()),this,SLOT(changePostEffect())); + connect( act4,SIGNAL( triggered() ),this,SLOT( changePostEffect() ) ); QAction *act5 = new QAction(tr("Torn edge"),this); act5->setData(PostEffect::EFFECT_TORN_EDGE); menu->addAction(act5); - connect(act5,SIGNAL(triggered()),this,SLOT(changePostEffect())); + connect( act5,SIGNAL( triggered() ),this,SLOT( changePostEffect() ) ); - // trace change in the background image with crop item + // trace change in the background image with crop item connect( m_scene,SIGNAL( backgroundChanged ( ) ),this,SLOT( updateBackground() ) ); } void EditorWidget::updateHelp() { - m_commandHelp["Select"] = tr("Left-click to select item, Ctrl+Left Click then drag to select a group of items"); - m_commandHelp["EditorTextItem"] = tr("Left-click to set center"); - m_commandHelp["EditorLineItem"] = tr("Left-click then drag to create the shape"); - m_commandHelp["EditorEncircleItem"] = tr("Left-click then drag to create the shape"); - m_commandHelp["EditorPolylineItem"] = tr("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"); - m_commandHelp["EditorPolygonItem"] = tr("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"); - m_commandHelp["EditorEllipseItem"] = tr("Left-click then drag to create the shape"); - m_commandHelp["EditorRectangleItem"] = tr("Left-click then drag to create the shape"); - m_commandHelp["EditorArrowItem"] = tr("Left-click then drag to create the shape"); - m_commandHelp["EditorTagItem"] = tr("Left-click to set center"); - m_commandHelp["EditorImageItem"] = tr("Left-click to set image center and drag if you want change the size"); - m_commandHelp["EditorBlurItem"] = tr("Left-click then drag to create the shape"); + m_commandHelp["Select"] = tr("Left-click to select item, Ctrl+Left Click then drag to select a group of items"); + m_commandHelp["EditorTextItem"] = tr("Left-click to set center"); + m_commandHelp["EditorLineItem"] = tr("Left-click then drag to create the shape"); + m_commandHelp["EditorEncircleItem"] = tr("Left-click then drag to create the shape"); + m_commandHelp["EditorPolylineItem"] = tr("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"); + m_commandHelp["EditorPolygonItem"] = tr("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"); + m_commandHelp["EditorEllipseItem"] = tr("Left-click then drag to create the shape"); + m_commandHelp["EditorRectangleItem"] = tr("Left-click then drag to create the shape"); + m_commandHelp["EditorArrowItem"] = tr("Left-click then drag to create the shape"); + m_commandHelp["EditorTagItem"] = tr("Left-click to set center"); + m_commandHelp["EditorImageItem"] = tr("Left-click to set image center and drag if you want change the size"); + m_commandHelp["EditorBlurItem"] = tr("Left-click then drag to create the shape"); m_commandHelp["EditorHighlighterItem"] = tr("Left-click then drag to create the shape"); - m_commandHelp["EditorMagnifierItem"] = tr("Left-click then drag to create the shape"); - m_commandHelp["EditorCurveItem"] = tr("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"); - m_commandHelp["EditorCropItem"] = tr("Left-click then drag to create the shape, select the area and press to perform the operation"); + m_commandHelp["EditorMagnifierItem"] = tr("Left-click then drag to create the shape"); + m_commandHelp["EditorCurveItem"] = tr("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"); + m_commandHelp["EditorCropItem"] = tr("Left-click then drag to create the shape, select the area and press to perform the operation"); } void EditorWidget::displayStatus(int) @@ -196,17 +196,18 @@ 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); msgBox.exec(); - if (msgBox.clickedButton() == clearButton) + if (msgBox.clickedButton() == clearButton) { // clear m_scene->clearItems(); - } else if (msgBox.clickedButton() == updateButton) + } + else if (msgBox.clickedButton() == updateButton) { // update } @@ -219,9 +220,27 @@ updateTitle(""); } -void EditorWidget::load(const QString &file) +bool EditorWidget::load(const QString &file) { - load( QPixmap(file) ); + if (QFileInfo(file).suffix().toLower() == "hot") + { + FileParser parser; + + if ( !parser.load(file,m_scene) ) + { + QMessageBox::warning( this, tr("Loading HotShots file failed"), tr("Error loading HotShots file %1").arg( file ) ); + m_currentFile = ""; + updateTitle(""); + return false; + } + m_currentFile = file; + updateTitle(m_currentFile); + } + else // simple image file + { + load( QPixmap(file) ); + } + return true; } //------------------------------------------------------------------------------------------ @@ -400,12 +419,13 @@ { ui->pushButtonFont->setText("aAbBcCdD"); ui->pushButtonFont->setFont(font); + // QString elidedText = ui->pushButtonFont->fontMetrics().elidedText("aAbBcCdD",Qt::ElideRight, ui->pushButtonFont->maximumWidth() - 10); // qDebug() << "elidedText = " << elidedText; // if (elidedText.size() > 1) // elidedText = elidedText.left(elidedText.size()-1); // else elidedText = ""; -// +// // ui->pushButtonFont->setText(elidedText); } @@ -441,25 +461,26 @@ void EditorWidget::on_pushButtonExport_pressed() { emit requestExport(m_scene->getRenderToPixmap(),""); + /* - QString proposedFile = NameManager::getProposedFilename(); + QString proposedFile = NameManager::getProposedFilename(); - if ( !m_currentFile.isEmpty() ) - { + if ( !m_currentFile.isEmpty() ) + { QFileInfo fi(m_currentFile); QFileInfo exported(fi.absolutePath() + "/" + fi.baseName() + ".png"); proposedFile = exported.absoluteFilePath(); - } + } - QString formats = MiscFunctions::getAvailablesImageFormats(); + QString formats = MiscFunctions::getAvailablesImageFormats(); - // ask for a filename ... - QString savefilename = QFileDialog::getSaveFileName( this, tr("Export to Image File"), + // ask for a filename ... + QString savefilename = QFileDialog::getSaveFileName( this, tr("Export to Image File"), proposedFile, formats); - if ( !savefilename.isEmpty() ) - { + if ( !savefilename.isEmpty() ) + { NameManager::lastSnapshotDirectory = QFileInfo(savefilename).absolutePath(); // check if a suffix is defined (png by default) @@ -469,14 +490,15 @@ QPixmap pix = m_scene->getRenderToPixmap(); if ( !pix.save(savefilename) ) QMessageBox::warning( this, tr("Save failed"), tr("Error exporting Image file") ); - } - */ + } + */ } void EditorWidget::on_pushButtonCopyToClipboard_pressed() { QPixmap pix = m_scene->getRenderToPixmap(); emit requestClipboard(pix); + // if ( !pix.isNull() ) // QApplication::clipboard()->setPixmap(pix, QClipboard::Clipboard); } @@ -509,7 +531,7 @@ NameManager::lastSnapshotDirectory = QFileInfo(file).absolutePath(); m_scene->clearScene(); - if (QFileInfo(file).suffix() == "hot") + if (QFileInfo(file).suffix().toLower() == "hot") { FileParser parser; @@ -529,14 +551,6 @@ { load(file); } - - /* - if ( !m_scene->loadSvgFile(file) ) - { - QMessageBox::warning( this, tr("Problem when loading Snapshot Editor file"), tr("Can't read this file as a previously saved Snapshot Editor file (%1)").arg(file) ); - return; - } - */ } } @@ -768,7 +782,7 @@ void EditorWidget::on_pushButtonPrint_pressed() { - emit requestPrint(m_scene->getRenderToPixmap()); + emit requestPrint( m_scene->getRenderToPixmap() ); } void EditorWidget::on_pushButtonUpload_pressed() @@ -795,17 +809,33 @@ void EditorWidget::changePostEffect() { - QAction *act = qobject_cast(sender()); + QAction *act = qobject_cast( sender() ); if (!act) return; - if (m_originalPixmap.isNull()) - m_originalPixmap = QPixmap::fromImage(m_scene->getUnderlayImage()); + if ( m_originalPixmap.isNull() ) + m_originalPixmap = QPixmap::fromImage( m_scene->getUnderlayImage() ); - m_scene->setUnderlayImage( PostEffect::process(m_originalPixmap,act->data().toInt()).toImage() ); + m_scene->setUnderlayImage( PostEffect::process( m_originalPixmap,act->data().toInt() ).toImage() ); } void EditorWidget::updateBackground() { - m_originalPixmap = QPixmap::fromImage(m_scene->getUnderlayImage()); -} \ No newline at end of file + m_originalPixmap = QPixmap::fromImage( m_scene->getUnderlayImage() ); +} + +void EditorWidget::keyPressEvent ( QKeyEvent * event ) +{ + if ( event->key() == Qt::Key_Escape ) + { + ui->pushButtonSelect->animateClick(); + } + else if (event->key() == Qt::Key_Plus) + { + ui->graphicsView->zoomPlus(); + } + else if (event->key() == Qt::Key_Minus) + { + ui->graphicsView->zoomMinus(); + } +} diff -Nru hotshots-1.2.0/src/editor/EditorWidget.h hotshots-1.2.1/src/editor/EditorWidget.h --- hotshots-1.2.0/src/editor/EditorWidget.h 2013-07-10 20:40:04.000000000 +0000 +++ hotshots-1.2.1/src/editor/EditorWidget.h 2013-08-24 15:21:18.000000000 +0000 @@ -40,7 +40,7 @@ explicit EditorWidget(QWidget *parent = 0); ~EditorWidget(); - void load(const QString &); + bool load(const QString &); void load(const QPixmap &); signals: @@ -114,6 +114,7 @@ void dragMoveEvent(QDragMoveEvent *event); void dropEvent(QDropEvent *event); void closeEvent(QCloseEvent *event); + void keyPressEvent ( QKeyEvent * event ); private: diff -Nru hotshots-1.2.0/src/editor/GroupLayer.cpp hotshots-1.2.1/src/editor/GroupLayer.cpp --- hotshots-1.2.0/src/editor/GroupLayer.cpp 2013-05-16 11:50:20.000000000 +0000 +++ hotshots-1.2.1/src/editor/GroupLayer.cpp 2013-08-24 20:31:18.000000000 +0000 @@ -36,5 +36,6 @@ QRectF GroupLayer::boundingRect() const { return QRectF(); - // return childrenBoundingRect(); + + // return childrenBoundingRect(); } diff -Nru hotshots-1.2.0/src/editor/io/FileParser.cpp hotshots-1.2.1/src/editor/io/FileParser.cpp --- hotshots-1.2.0/src/editor/io/FileParser.cpp 2013-06-22 16:57:20.000000000 +0000 +++ hotshots-1.2.1/src/editor/io/FileParser.cpp 2013-08-24 20:31:20.000000000 +0000 @@ -194,7 +194,7 @@ QDomElement root = m_domDocument.documentElement(); QString version = root.attribute(sTagAttVersion); - if (version.toFloat() > currentFormatVersion.toFloat()) + if ( version.toFloat() > currentFormatVersion.toFloat() ) { LogHandler::getInstance()->reportInfo( tr("Unknown version of hotshots file (%1).").arg(version) ); } @@ -209,8 +209,8 @@ QImage img; img.loadFromData(bgNode.text().toAscii(),"XPM"); QDomText t = bgNode.firstChild().toText(); - if (!t.isNull()) - t.setData(IOHelper::variantToString( img )); + if ( !t.isNull() ) + t.setData( IOHelper::variantToString( img ) ); } updated = true; } diff -Nru hotshots-1.2.0/src/editor/io/IOHelper.cpp hotshots-1.2.1/src/editor/io/IOHelper.cpp --- hotshots-1.2.0/src/editor/io/IOHelper.cpp 2013-05-06 06:37:18.000000000 +0000 +++ hotshots-1.2.1/src/editor/io/IOHelper.cpp 2013-08-24 20:31:20.000000000 +0000 @@ -167,12 +167,12 @@ case QVariant::Image: { /* Version 1.0 + QImage img; + img.loadFromData(s.toAscii(),"XPM"); + result = img; + */ QImage img; - img.loadFromData(s.toAscii(),"XPM"); - result = img; - */ - QImage img; - img.loadFromData(QByteArray::fromBase64(s.toAscii())); + img.loadFromData( QByteArray::fromBase64( s.toAscii() ) ); result = img; break; } @@ -266,10 +266,11 @@ return QObject::tr(""); /* version 1.0 => xpm - QByteArray block; - QBuffer buffer(&block); - img.save(&buffer,"XPM"); - */ + QByteArray block; + QBuffer buffer(&block); + img.save(&buffer,"XPM"); + */ + // version 1.1 => QByteArray block; QBuffer buffer(&block); @@ -277,7 +278,7 @@ img.save(&buffer, "PNG"); buffer.close(); - return QString(block.toBase64()); + return QString( block.toBase64() ); } case QVariant::Line: return QString::fromUtf8("%1 x %2 at %3 x %4") diff -Nru hotshots-1.2.0/src/editor/items/BaseItem.cpp hotshots-1.2.1/src/editor/items/BaseItem.cpp --- hotshots-1.2.0/src/editor/items/BaseItem.cpp 2013-05-30 20:25:22.000000000 +0000 +++ hotshots-1.2.1/src/editor/items/BaseItem.cpp 2013-08-24 20:31:18.000000000 +0000 @@ -172,10 +172,10 @@ { line.insert(index,pos); - m_handgrips.insert(index,new HandgripItem(this,this,index)); + m_handgrips.insert( index,new HandgripItem(this,this,index) ); // update tag for next handgrip in the list - for (int i = index+1 ; i < m_handgrips.size(); i++) + for (int i = index + 1; i < m_handgrips.size(); i++) m_handgrips[i]->setId(i); // m_handgrips[i2]->hide(); @@ -186,24 +186,25 @@ void BaseItem::deletePoint(int index, QList & line) { - if (line.isEmpty()) + if ( line.isEmpty() ) return; line.takeAt(index); delete m_handgrips.takeAt(index); + // update tag for next handgrip in the list - for (int i = index ; i < m_handgrips.size(); i++) + for (int i = index; i < m_handgrips.size(); i++) m_handgrips[i]->setId(i); } bool BaseItem::isPointSelected(const QPointF &newPos, QList & line, int & index, qreal selectDist ) { // first check if press point isn't on an existing vertex - for(int i = 0; i < line.size() ; i++) + for(int i = 0; i < line.size(); i++) { qreal distX = newPos.x() - line[i].x(); qreal distY = newPos.y() - line[i].y(); - qreal dist = sqrtf(distX*distX + distY*distY); + qreal dist = sqrtf(distX * distX + distY * distY); if (dist < selectDist) { index = i; @@ -220,7 +221,7 @@ float C = b.x() - a.x(); float D = b.y() - a.y(); - return (fabs(A * D - C * B) / sqrtf(C * C + D * D)); + return ( fabs(A * D - C * B) / sqrtf(C * C + D * D) ); } bool BaseItem::createPointIfNeeded(const QPointF &newPos, QList & line, bool loop ) @@ -232,21 +233,22 @@ // check if new point is on a segment int max = line.size() - 1; - if (loop) max++; - for(int i = 0; i < max ; i++) + if (loop) + max++; + for(int i = 0; i < max; i++) { int i1 = i; - int i2 = i+1; + int i2 = i + 1; if (loop) { i1 %= line.size(); i2 %= line.size(); } - if (!QRectF(line[i1],line[i2]).normalized().contains(newPos)) + if ( !QRectF(line[i1],line[i2]).normalized().contains(newPos) ) continue; - if(qreal dist = abs(distancePointToLine(newPos, line[i1],line[i2])) < minDist) + if(qreal dist = abs( distancePointToLine(newPos, line[i1],line[i2]) ) < minDist) { insertPoint(i2,newPos,line); return true; @@ -255,4 +257,3 @@ return false; } - diff -Nru hotshots-1.2.0/src/editor/items/BaseItem.h hotshots-1.2.1/src/editor/items/BaseItem.h --- hotshots-1.2.0/src/editor/items/BaseItem.h 2013-05-30 20:20:34.000000000 +0000 +++ hotshots-1.2.1/src/editor/items/BaseItem.h 2013-08-24 20:31:20.000000000 +0000 @@ -39,15 +39,15 @@ class BaseItem : public QGraphicsObject { - Q_OBJECT public: - enum typModeEdition { + enum typModeEdition + { EDITION_NONE = 0, // no current mode EDITION_NEXTITEM, // item finished, create a new item next mouse press - EDITION_CONTINUEITEM, // continue same item + EDITION_CONTINUEITEM, // continue same item EDITION_FINISHITEM // end item and change to select mode }; diff -Nru hotshots-1.2.0/src/editor/items/EditorArrowItem.cpp hotshots-1.2.1/src/editor/items/EditorArrowItem.cpp --- hotshots-1.2.0/src/editor/items/EditorArrowItem.cpp 2013-05-26 20:51:56.000000000 +0000 +++ hotshots-1.2.1/src/editor/items/EditorArrowItem.cpp 2013-08-24 20:31:18.000000000 +0000 @@ -275,7 +275,7 @@ elt.setAttribute( "end", IOHelper::variantToString( m_handgrips[HEAD]->scenePos() ) ); elt.setAttribute( "color", IOHelper::variantToString( m_item->pen().color() ) ); elt.setAttribute( "width", IOHelper::variantToString( m_item->pen().width() ) ); - elt.setAttribute( "shadow", IOHelper::variantToString( isShadowEnabled() )); + elt.setAttribute( "shadow", IOHelper::variantToString( isShadowEnabled() ) ); } void EditorArrowItem::fromXml(const QDomElement &elt) @@ -284,7 +284,7 @@ m_initialized = true; m_line[TAIL] = IOHelper::stringToVariant(elt.attribute("start"),QVariant::PointF,ok).toPointF(); m_line[HEAD] = IOHelper::stringToVariant(elt.attribute("end"),QVariant::PointF,ok).toPointF(); - setEnableShadow(IOHelper::stringToVariant(elt.attribute("shadow","true"),QVariant::Bool,ok).toBool()); + setEnableShadow( IOHelper::stringToVariant(elt.attribute("shadow","true"),QVariant::Bool,ok).toBool() ); QColor color = IOHelper::stringToVariant(elt.attribute("color"),QVariant::Color,ok).value(); int width = elt.attribute("width").toInt(); diff -Nru hotshots-1.2.0/src/editor/items/EditorBlurItem.cpp hotshots-1.2.1/src/editor/items/EditorBlurItem.cpp --- hotshots-1.2.0/src/editor/items/EditorBlurItem.cpp 2013-05-26 16:05:06.000000000 +0000 +++ hotshots-1.2.1/src/editor/items/EditorBlurItem.cpp 2013-08-24 20:31:18.000000000 +0000 @@ -79,7 +79,7 @@ { QImage background = scn->getUnderlayImage().copy( rect.translated( pos() - scn->getUnderlayOffset() ).toRect() ); - QImage blur = background.scaled(background.size()/4,Qt::KeepAspectRatio,Qt::SmoothTransformation); + QImage blur = background.scaled(background.size() / 4,Qt::KeepAspectRatio,Qt::SmoothTransformation); painter->drawImage(rect,blur); } diff -Nru hotshots-1.2.0/src/editor/items/EditorCropItem.cpp hotshots-1.2.1/src/editor/items/EditorCropItem.cpp --- hotshots-1.2.0/src/editor/items/EditorCropItem.cpp 2013-05-26 19:07:46.000000000 +0000 +++ hotshots-1.2.1/src/editor/items/EditorCropItem.cpp 2013-08-24 20:31:18.000000000 +0000 @@ -33,7 +33,6 @@ #include #include - #include "EditorCropItem.h" #include "EditorScene.h" #include "HandgripItem.h" @@ -126,6 +125,7 @@ Q_UNUSED(mouseEvent); m_stopEdition = true; QTimer::singleShot( 10, this, SLOT( forceSelection() ) ); + // return false; return BaseItem::EDITION_FINISHITEM; } @@ -174,19 +174,20 @@ // musn't duplicate this item return NULL; } + /* -void EditorCropItem::forceSceneSelection() -{ -// EditorScene *scn = qobject_cast( scene() ); -// if (scn && m_valid) -// scn->setMode("Select"); + void EditorCropItem::forceSceneSelection() + { + // EditorScene *scn = qobject_cast( scene() ); + // if (scn && m_valid) + // scn->setMode("Select"); setFlag(QGraphicsItem::ItemIsSelectable,true); setFlag(QGraphicsItem::ItemIsMovable,true); setFocus(Qt::MouseFocusReason); setSelected(true); -} -*/ + } + */ void EditorCropItem::keyPressEvent(QKeyEvent *event) { diff -Nru hotshots-1.2.0/src/editor/items/EditorCropItem.h hotshots-1.2.1/src/editor/items/EditorCropItem.h --- hotshots-1.2.0/src/editor/items/EditorCropItem.h 2013-05-26 16:52:24.000000000 +0000 +++ hotshots-1.2.1/src/editor/items/EditorCropItem.h 2013-08-24 20:31:20.000000000 +0000 @@ -63,6 +63,7 @@ private slots: void updatePoint(const QPointF &); + //void forceSceneSelection(); private: diff -Nru hotshots-1.2.0/src/editor/items/EditorCurveItem.cpp hotshots-1.2.1/src/editor/items/EditorCurveItem.cpp --- hotshots-1.2.0/src/editor/items/EditorCurveItem.cpp 2013-05-30 21:17:06.000000000 +0000 +++ hotshots-1.2.1/src/editor/items/EditorCurveItem.cpp 2013-08-24 20:31:18.000000000 +0000 @@ -83,7 +83,7 @@ foreach (const QPointF &pt, m_line) tmpLine << mapToScene(pt); - painter->drawPolyline(m_line.toVector()); + painter->drawPolyline( m_line.toVector() ); painter->restore(); } } @@ -91,46 +91,47 @@ 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()); + QPointF newPos = mapFromScene( mouseEvent->scenePos() ); if (m_initialized) { // check if point of line selected - int index = -1; - if (mouseEvent->button() == Qt::MiddleButton && - isPointSelected(newPos,m_line,index,5.0f)) + int index = -1; + if ( mouseEvent->button() == Qt::MiddleButton && + isPointSelected(newPos,m_line,index,5.0f) ) { deletePoint(index,m_line); m_item->setPath( createSplinePath() ); return; } - if (mouseEvent->button() == Qt::RightButton && - !isPointSelected(newPos,m_line,index,10.0f) && - createPointIfNeeded(newPos,m_line, false)) + if ( mouseEvent->button() == Qt::RightButton && + !isPointSelected(newPos,m_line,index,10.0f) && + createPointIfNeeded(newPos,m_line, false) ) m_item->setPath( createSplinePath() ); return; } if (mouseEvent->button() == Qt::MiddleButton) { - deletePoint(m_line.size()-1,m_line); - mouseMove(mouseEvent); // simulate + deletePoint(m_line.size() - 1,m_line); + mouseMove(mouseEvent); // simulate //m_item->setPath( createSplinePath() ); return; } insertPoint(m_line.size(),newPos,m_line); m_item->setPath( createSplinePath() ); + /* - if (m_initialized || mouseEvent->button() == Qt::RightButton) // to avoid move by post selection of item + if (m_initialized || mouseEvent->button() == Qt::RightButton) // to avoid move by post selection of item return; - if (mouseEvent->button() == Qt::MiddleButton) - { + if (mouseEvent->button() == Qt::MiddleButton) + { if ( !m_line.isEmpty() ) { // remove last point @@ -146,24 +147,24 @@ m_item->setPath(p); } return; - } + } - m_line << mouseEvent->scenePos(); + m_line << mouseEvent->scenePos(); - m_handgrips << new HandgripItem(this,this,m_line.size() - 1); - m_handgrips.last()->hide(); - connect( m_handgrips.last(), SIGNAL( moved(const QPointF &) ),this, SLOT( updatePoint(const QPointF &) ) ); + m_handgrips << new HandgripItem(this,this,m_line.size() - 1); + m_handgrips.last()->hide(); + connect( m_handgrips.last(), SIGNAL( moved(const QPointF &) ),this, SLOT( updatePoint(const QPointF &) ) ); - m_handgrips.last()->setPos( m_line.last() ); - m_item->setPath( createSplinePath() ); + m_handgrips.last()->setPos( m_line.last() ); + m_item->setPath( createSplinePath() ); - */ + */ } void EditorCurveItem::mouseMove ( QGraphicsSceneMouseEvent * mouseEvent ) { // create a temp last point - QVector tmpLine(m_line.toVector()); + QVector tmpLine( m_line.toVector() ); tmpLine << mouseEvent->scenePos(); QPainterPath p = createSplinePath(tmpLine); m_item->setPath(p); @@ -265,7 +266,7 @@ elt.setAttribute( "color", IOHelper::variantToString( m_item->pen().color() ) ); elt.setAttribute( "width", IOHelper::variantToString( m_item->pen().width() ) ); elt.setAttribute( "style", IOHelper::variantToString( m_item->pen().style() ) ); - elt.setAttribute( "shadow", IOHelper::variantToString( isShadowEnabled() )); + elt.setAttribute( "shadow", IOHelper::variantToString( isShadowEnabled() ) ); } void EditorCurveItem::fromXml(const QDomElement &elt) @@ -284,7 +285,7 @@ m_handgrips.last()->setPos( m_line.last() ); } - setEnableShadow(IOHelper::stringToVariant(elt.attribute("shadow","true"),QVariant::Bool,ok).toBool()); + setEnableShadow( IOHelper::stringToVariant(elt.attribute("shadow","true"),QVariant::Bool,ok).toBool() ); QColor color = IOHelper::stringToVariant(elt.attribute("color"),QVariant::Color,ok).value(); int width = elt.attribute("width").toInt(); int style = elt.attribute("style").toInt(); diff -Nru hotshots-1.2.0/src/editor/items/EditorEllipseItem.cpp hotshots-1.2.1/src/editor/items/EditorEllipseItem.cpp --- hotshots-1.2.0/src/editor/items/EditorEllipseItem.cpp 2013-06-05 19:16:24.000000000 +0000 +++ hotshots-1.2.1/src/editor/items/EditorEllipseItem.cpp 2013-08-24 20:31:18.000000000 +0000 @@ -204,7 +204,7 @@ elt.setAttribute( "rect", IOHelper::variantToString( m_item->rect() ) ); elt.setAttribute( "pos", IOHelper::variantToString( pos() ) ); elt.setAttribute( "style", IOHelper::variantToString( m_item->pen().style() ) ); - elt.setAttribute( "shadow", IOHelper::variantToString( isShadowEnabled() )); + elt.setAttribute( "shadow", IOHelper::variantToString( isShadowEnabled() ) ); } void EditorEllipseItem::fromXml(const QDomElement &elt) @@ -216,7 +216,7 @@ m_line << rect.topLeft(); m_line << rect.bottomRight(); - setEnableShadow(IOHelper::stringToVariant(elt.attribute("shadow","true"),QVariant::Bool,ok).toBool()); + setEnableShadow( IOHelper::stringToVariant(elt.attribute("shadow","true"),QVariant::Bool,ok).toBool() ); QColor color = IOHelper::stringToVariant(elt.attribute("color"),QVariant::Color,ok).value(); int width = elt.attribute("width").toInt(); int style = elt.attribute("style").toInt(); diff -Nru hotshots-1.2.0/src/editor/items/EditorEncircleItem.cpp hotshots-1.2.1/src/editor/items/EditorEncircleItem.cpp --- hotshots-1.2.0/src/editor/items/EditorEncircleItem.cpp 2013-05-26 21:01:12.000000000 +0000 +++ hotshots-1.2.1/src/editor/items/EditorEncircleItem.cpp 2013-08-24 20:31:18.000000000 +0000 @@ -242,7 +242,7 @@ elt.setAttribute( "rect", IOHelper::variantToString( QRectF(m_line[BEGIN],m_line[END]).normalized() ) ); elt.setAttribute( "pos", IOHelper::variantToString( pos() ) ); elt.setAttribute( "style", IOHelper::variantToString( m_item->pen().style() ) ); - elt.setAttribute( "shadow", IOHelper::variantToString( isShadowEnabled() )); + elt.setAttribute( "shadow", IOHelper::variantToString( isShadowEnabled() ) ); } void EditorEncircleItem::fromXml(const QDomElement &elt) @@ -254,7 +254,7 @@ m_line << rect.topLeft(); m_line << rect.bottomRight(); - setEnableShadow(IOHelper::stringToVariant(elt.attribute("shadow","true"),QVariant::Bool,ok).toBool()); + setEnableShadow( IOHelper::stringToVariant(elt.attribute("shadow","true"),QVariant::Bool,ok).toBool() ); QColor color = IOHelper::stringToVariant(elt.attribute("color"),QVariant::Color,ok).value(); int width = elt.attribute("width").toInt(); int style = elt.attribute("style").toInt(); diff -Nru hotshots-1.2.0/src/editor/items/EditorHighlighterItem.cpp hotshots-1.2.1/src/editor/items/EditorHighlighterItem.cpp --- hotshots-1.2.0/src/editor/items/EditorHighlighterItem.cpp 2013-05-26 21:01:12.000000000 +0000 +++ hotshots-1.2.1/src/editor/items/EditorHighlighterItem.cpp 2013-08-24 20:31:18.000000000 +0000 @@ -188,7 +188,7 @@ elt.setAttribute( "end", IOHelper::variantToString( mapToScene(m_line[END] ) ) ); elt.setAttribute( "color", IOHelper::variantToString( m_highlightColor ) ); elt.setAttribute( "width", IOHelper::variantToString( m_item->pen().width() / widthFactor ) ); - elt.setAttribute( "shadow", IOHelper::variantToString( isShadowEnabled() )); + elt.setAttribute( "shadow", IOHelper::variantToString( isShadowEnabled() ) ); } void EditorHighlighterItem::fromXml(const QDomElement &elt) @@ -198,7 +198,7 @@ m_line[BEGIN] = IOHelper::stringToVariant(elt.attribute("start"),QVariant::PointF,ok).toPointF(); m_line[END] = IOHelper::stringToVariant(elt.attribute("end"),QVariant::PointF,ok).toPointF(); - setEnableShadow(IOHelper::stringToVariant(elt.attribute("shadow","true"),QVariant::Bool,ok).toBool()); + setEnableShadow( IOHelper::stringToVariant(elt.attribute("shadow","true"),QVariant::Bool,ok).toBool() ); m_highlightColor = IOHelper::stringToVariant(elt.attribute("color"),QVariant::Color,ok).value(); int width = elt.attribute("width").toInt(); m_pen = QPen(QColor(Qt::black),width); diff -Nru hotshots-1.2.0/src/editor/items/EditorImageItem.cpp hotshots-1.2.1/src/editor/items/EditorImageItem.cpp --- hotshots-1.2.0/src/editor/items/EditorImageItem.cpp 2013-05-26 21:01:12.000000000 +0000 +++ hotshots-1.2.1/src/editor/items/EditorImageItem.cpp 2013-08-24 20:31:18.000000000 +0000 @@ -203,7 +203,7 @@ elt.setAttribute( "end", IOHelper::variantToString( m_line[1] ) ); elt.setAttribute( "pos", IOHelper::variantToString( pos() ) ); elt.setAttribute( "path", IOHelper::variantToString( m_file ) ); - elt.setAttribute( "shadow", IOHelper::variantToString( isShadowEnabled() )); + elt.setAttribute( "shadow", IOHelper::variantToString( isShadowEnabled() ) ); } void EditorImageItem::fromXml(const QDomElement &elt) @@ -214,7 +214,7 @@ QPointF pos = IOHelper::stringToVariant(elt.attribute("pos"),QVariant::PointF,ok).toPointF(); setPos(pos); - setEnableShadow(IOHelper::stringToVariant(elt.attribute("shadow","true"),QVariant::Bool,ok).toBool()); + setEnableShadow( IOHelper::stringToVariant(elt.attribute("shadow","true"),QVariant::Bool,ok).toBool() ); QString file = elt.attribute("path"); setImage(file); diff -Nru hotshots-1.2.0/src/editor/items/EditorLineItem.cpp hotshots-1.2.1/src/editor/items/EditorLineItem.cpp --- hotshots-1.2.0/src/editor/items/EditorLineItem.cpp 2013-05-26 21:01:12.000000000 +0000 +++ hotshots-1.2.1/src/editor/items/EditorLineItem.cpp 2013-08-24 20:31:18.000000000 +0000 @@ -126,7 +126,7 @@ elt.setAttribute( "color", IOHelper::variantToString( m_item->pen().color() ) ); elt.setAttribute( "width", IOHelper::variantToString( m_item->pen().width() ) ); elt.setAttribute( "style", IOHelper::variantToString( m_item->pen().style() ) ); - elt.setAttribute( "shadow", IOHelper::variantToString( isShadowEnabled() )); + elt.setAttribute( "shadow", IOHelper::variantToString( isShadowEnabled() ) ); } void EditorLineItem::fromXml(const QDomElement &elt) @@ -136,7 +136,7 @@ m_line[BEGIN] = IOHelper::stringToVariant(elt.attribute("start"),QVariant::PointF,ok).toPointF(); m_line[END] = IOHelper::stringToVariant(elt.attribute("end"),QVariant::PointF,ok).toPointF(); - setEnableShadow(IOHelper::stringToVariant(elt.attribute("shadow","true"),QVariant::Bool,ok).toBool()); + setEnableShadow( IOHelper::stringToVariant(elt.attribute("shadow","true"),QVariant::Bool,ok).toBool() ); QColor color = IOHelper::stringToVariant(elt.attribute("color"),QVariant::Color,ok).value(); int width = elt.attribute("width").toInt(); int style = elt.attribute("style").toInt(); diff -Nru hotshots-1.2.0/src/editor/items/EditorMagnifierItem.cpp hotshots-1.2.1/src/editor/items/EditorMagnifierItem.cpp --- hotshots-1.2.0/src/editor/items/EditorMagnifierItem.cpp 2013-05-26 16:05:06.000000000 +0000 +++ hotshots-1.2.1/src/editor/items/EditorMagnifierItem.cpp 2013-08-24 20:31:18.000000000 +0000 @@ -51,7 +51,7 @@ m_handgrips << new HandgripItem(this,this,HandgripItem::BottomRight); foreach (HandgripItem * item, m_handgrips) - connect( item, SIGNAL( moved(const QPointF &) ),this, SLOT( updatePoint(const QPointF &) ) ); + connect( item, SIGNAL( moved(const QPointF &) ),this, SLOT( updatePoint(const QPointF &) ) ); hideHandgrips(); @@ -139,7 +139,7 @@ QRectF bgRect = scn->getUnderlayImage().rect(); QRectF croppedRect = extractRect.intersected(bgRect); - if (!croppedRect.isNull()) + if ( !croppedRect.isNull() ) { QImage background = scn->getUnderlayImage().copy( croppedRect.toRect() ); QImage mag = background.scaled(rect.size().toSize(),Qt::KeepAspectRatio,Qt::SmoothTransformation); @@ -220,19 +220,19 @@ QRectF square; if (hg->getId() == HandgripItem::TopLeft) { - square = QRectF(newRect.bottomRight(),QSize(-width,-width)).normalized(); + square = QRectF( newRect.bottomRight(),QSize(-width,-width) ).normalized(); } else if (hg->getId() == HandgripItem::TopRight) { - square = QRectF(newRect.bottomLeft(),QSize(width,-width)).normalized(); + square = QRectF( newRect.bottomLeft(),QSize(width,-width) ).normalized(); } else if (hg->getId() == HandgripItem::BottomLeft) { - square = QRectF(newRect.topRight(),QSize(-width,width)).normalized(); + square = QRectF( newRect.topRight(),QSize(-width,width) ).normalized(); } else if (hg->getId() == HandgripItem::BottomRight) { - square = QRectF(newRect.topLeft(),QSize(width,width)).normalized(); + square = QRectF( newRect.topLeft(),QSize(width,width) ).normalized(); } m_line[BEGIN] = square.topLeft(); diff -Nru hotshots-1.2.0/src/editor/items/EditorPolygonItem.cpp hotshots-1.2.1/src/editor/items/EditorPolygonItem.cpp --- hotshots-1.2.0/src/editor/items/EditorPolygonItem.cpp 2013-05-30 21:17:08.000000000 +0000 +++ hotshots-1.2.1/src/editor/items/EditorPolygonItem.cpp 2013-08-24 20:31:18.000000000 +0000 @@ -72,34 +72,34 @@ 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()); + QPointF newPos = mapFromScene( mouseEvent->scenePos() ); if (m_initialized) { // check if point of line selected - int index = -1; - if (mouseEvent->button() == Qt::MiddleButton && - isPointSelected(newPos,m_line,index,5.0f)) + int index = -1; + if ( mouseEvent->button() == Qt::MiddleButton && + isPointSelected(newPos,m_line,index,5.0f) ) { deletePoint(index,m_line); m_item->setPolygon( createPolygon() ); return; } - if (mouseEvent->button() == Qt::RightButton && - !isPointSelected(newPos,m_line,index,10.0f) && - createPointIfNeeded(newPos,m_line)) - m_item->setPolygon( createPolygon() ); + if ( mouseEvent->button() == Qt::RightButton && + !isPointSelected(newPos,m_line,index,10.0f) && + createPointIfNeeded(newPos,m_line) ) + m_item->setPolygon( createPolygon() ); return; } if (mouseEvent->button() == Qt::MiddleButton) { - deletePoint(m_line.size()-1,m_line); - mouseMove(mouseEvent); // simulate + deletePoint(m_line.size() - 1,m_line); + mouseMove(mouseEvent); // simulate return; } diff -Nru hotshots-1.2.0/src/editor/items/EditorPolygonItem.h hotshots-1.2.1/src/editor/items/EditorPolygonItem.h --- hotshots-1.2.0/src/editor/items/EditorPolygonItem.h 2013-05-30 19:57:00.000000000 +0000 +++ hotshots-1.2.1/src/editor/items/EditorPolygonItem.h 2013-08-24 20:31:20.000000000 +0000 @@ -63,8 +63,6 @@ QPolygonF createPolygon(); - - QGraphicsPolygonItem *m_item; QList m_line; }; diff -Nru hotshots-1.2.0/src/editor/items/EditorPolylineItem.cpp hotshots-1.2.1/src/editor/items/EditorPolylineItem.cpp --- hotshots-1.2.0/src/editor/items/EditorPolylineItem.cpp 2013-05-30 21:13:48.000000000 +0000 +++ hotshots-1.2.1/src/editor/items/EditorPolylineItem.cpp 2013-08-24 20:31:18.000000000 +0000 @@ -62,46 +62,47 @@ 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 - return; - - QPointF newPos = mapFromScene(mouseEvent->scenePos()); + if ( (!m_initialized && mouseEvent->button() == Qt::RightButton) || + m_initialized && mouseEvent->button() == Qt::LeftButton ) // to avoid move by post selection of item + return; + + QPointF newPos = mapFromScene( mouseEvent->scenePos() ); if (m_initialized) { // check if point of line selected - int index = -1; - if (mouseEvent->button() == Qt::MiddleButton && - isPointSelected(newPos,m_line,index,5.0f)) + int index = -1; + if ( mouseEvent->button() == Qt::MiddleButton && + isPointSelected(newPos,m_line,index,5.0f) ) { deletePoint(index,m_line); m_item->setPath( createPath() ); return; } - if (mouseEvent->button() == Qt::RightButton && - !isPointSelected(newPos,m_line,index,10.0f) && - createPointIfNeeded(newPos,m_line, false)) + if ( mouseEvent->button() == Qt::RightButton && + !isPointSelected(newPos,m_line,index,10.0f) && + createPointIfNeeded(newPos,m_line, false) ) m_item->setPath( createPath() ); return; } if (mouseEvent->button() == Qt::MiddleButton) { - deletePoint(m_line.size()-1,m_line); - mouseMove(mouseEvent); // simulate + deletePoint(m_line.size() - 1,m_line); + mouseMove(mouseEvent); // simulate return; } insertPoint(m_line.size(),newPos,m_line); m_item->setPath( createPath() ); + /* - if (mouseEvent->button() == Qt::RightButton) // to avoid move by post selection of item + if (mouseEvent->button() == Qt::RightButton) // to avoid move by post selection of item return; - if (mouseEvent->button() == Qt::MiddleButton) - { + if (mouseEvent->button() == Qt::MiddleButton) + { if ( !m_line.isEmpty() ) { // remove last point @@ -119,18 +120,18 @@ m_item->setPath(p); } return; - } + } - m_line << mouseEvent->scenePos(); + m_line << mouseEvent->scenePos(); - m_handgrips << new HandgripItem(this,this,m_line.size() - 1); - m_handgrips.last()->hide(); - connect( m_handgrips.last(), SIGNAL( moved(const QPointF &) ),this, SLOT( updatePoint(const QPointF &) ) ); + m_handgrips << new HandgripItem(this,this,m_line.size() - 1); + m_handgrips.last()->hide(); + connect( m_handgrips.last(), SIGNAL( moved(const QPointF &) ),this, SLOT( updatePoint(const QPointF &) ) ); - m_handgrips.last()->setPos( m_line.last() ); - m_item->setPath( createPath() ); + m_handgrips.last()->setPos( m_line.last() ); + m_item->setPath( createPath() ); - */ + */ } void EditorPolylineItem::mouseMove ( QGraphicsSceneMouseEvent * mouseEvent ) diff -Nru hotshots-1.2.0/src/main.cpp hotshots-1.2.1/src/main.cpp --- hotshots-1.2.0/src/main.cpp 2013-07-16 18:55:18.000000000 +0000 +++ hotshots-1.2.1/src/main.cpp 2013-08-24 20:31:14.000000000 +0000 @@ -57,12 +57,13 @@ QTextStream out(stdout); out << endl; out << QObject::tr("Screenshot manager.") << endl; - out << QObject::tr("Usage: ") << QCoreApplication::arguments().at(0) << " " << QObject::tr("[options]") << endl; + out << QObject::tr("Usage: ") << QCoreApplication::arguments().at(0) << " " << QObject::tr("[options] [file]") << endl; out << endl; out << QObject::tr("Following options are known:") << endl; out << QObject::tr(" --help - displays this help.") << endl; out << QObject::tr(" --reset-config - clear the saved preference parameters.") << endl; out << QObject::tr(" --no-singleinstance : enable the use of multiple instance of program (not recommended).") << endl; + out << QObject::tr(" file : file to load in the editor, can be a .hot file or an image file.") << endl; out << endl; } @@ -90,6 +91,7 @@ bool forceResetConfig = false; bool ignoreSingleInstance = false; QStringList args = QApplication::arguments(); + QString fileToLoad; for ( int i = 1; i < args.count(); ++i ) { const QString arg = args.at(i); @@ -107,13 +109,18 @@ usage(); return 0; } + else + { + fileToLoad = arg; + } } // check for multiple instance of program if (app.isRunning() && !ignoreSingleInstance) { - app.sendMessage( QObject::tr("message from other instance.") ); - QMessageBox::critical( 0,PACKAGE_NAME,QObject::tr("%1 is already running !!").arg(PACKAGE_NAME) ); + app.sendMessage( fileToLoad ); + if ( fileToLoad.isEmpty() ) + QMessageBox::critical( 0,PACKAGE_NAME,QObject::tr("%1 is already running !!").arg(PACKAGE_NAME) ); return 0; } @@ -121,7 +128,7 @@ // in order to display splashscreen on the same screen than application ... settings.beginGroup("MainWindow"); - int screenNumber = settings.value("screenNumber",QApplication::desktop()->primaryScreen()).toInt(); + int screenNumber = ( settings.value( "screenNumber",QApplication::desktop()->primaryScreen() ).toInt() ) % ( QApplication::desktop()->screenCount() ); // in order to be sure to display on a right screen settings.endGroup(); settings.beginGroup("Application"); @@ -163,5 +170,8 @@ w.show(); } + if ( !fileToLoad.isEmpty() ) + w.openEditor(fileToLoad); + return app.exec(); } diff -Nru hotshots-1.2.0/src/uploaders/CanardPCUploader.cpp hotshots-1.2.1/src/uploaders/CanardPCUploader.cpp --- hotshots-1.2.0/src/uploaders/CanardPCUploader.cpp 2013-05-17 06:42:48.000000000 +0000 +++ hotshots-1.2.1/src/uploaders/CanardPCUploader.cpp 2013-08-29 19:10:00.000000000 +0000 @@ -18,7 +18,7 @@ const QString ServiceUrl = "http://tof.canardpc.com/"; CanardPCUploader::CanardPCUploader(QObject *parent) : BaseUploader(parent), -m_readUrlAnswer(false) + m_readUrlAnswer(false) { m_name = "CanardPC"; m_settingsUI = createSettingsInterface(getLogo(),ServiceUrl); @@ -114,7 +114,6 @@ parser.String2Sgml(text); for(QSgml::iterator i = parser.begin(); i!=parser.end(); ++i ) - { if (i->Name == "input") { QRegExp rx("\\[url=(.+)\\]"); @@ -127,7 +126,6 @@ break; } } - } return; } @@ -137,8 +135,8 @@ // text = file.readAll(); // file.close(); - // Result to parse - // + // Result to parse + // QSgml parser; parser.String2Sgml(text); @@ -146,20 +144,18 @@ // first: extract the answer URL QString answerURL; for(QSgml::iterator i = parser.begin(); i!=parser.end(); ++i ) - { if (i->Name == "meta" && i->Attributes["http-equiv"] == "Refresh") { - answerURL=i->Attributes["content"].split("=")[1]; + answerURL = i->Attributes["content"].split("=")[1]; break; } - } // read the result URL for image path extraction - if (!answerURL.isEmpty()) + if ( !answerURL.isEmpty() ) { m_readUrlAnswer = true; - m_manager->get(QNetworkRequest(QUrl(answerURL))); + m_manager->get( QNetworkRequest( QUrl(answerURL) ) ); } - else - LogHandler::getInstance()->reportError( tr("Can't extract URL from reply")); + else + LogHandler::getInstance()->reportError( tr("Can't extract URL from reply") ); } diff -Nru hotshots-1.2.0/src/uploaders/DefaultUploaderSettings.cpp hotshots-1.2.1/src/uploaders/DefaultUploaderSettings.cpp --- hotshots-1.2.0/src/uploaders/DefaultUploaderSettings.cpp 2013-05-17 05:51:56.000000000 +0000 +++ hotshots-1.2.1/src/uploaders/DefaultUploaderSettings.cpp 2013-08-24 20:31:16.000000000 +0000 @@ -6,7 +6,7 @@ { setupUi(this); labelPixmap->setPixmap(logo); - labelBaseURL->setText(QString("%1").arg(url)); + labelBaseURL->setText( QString("%1").arg(url) ); } DefaultUploaderSettings::~DefaultUploaderSettings() diff -Nru hotshots-1.2.0/src/uploaders/DefaultUploaderSettings.h hotshots-1.2.1/src/uploaders/DefaultUploaderSettings.h --- hotshots-1.2.0/src/uploaders/DefaultUploaderSettings.h 2013-05-17 05:51:56.000000000 +0000 +++ hotshots-1.2.1/src/uploaders/DefaultUploaderSettings.h 2013-08-24 20:31:18.000000000 +0000 @@ -11,7 +11,7 @@ public: - DefaultUploaderSettings(QWidget *parent , const QPixmap &logo, const QString &url); + DefaultUploaderSettings(QWidget *parent, const QPixmap &logo, const QString &url); ~DefaultUploaderSettings(); }; diff -Nru hotshots-1.2.0/src/uploaders/FtpUploader.cpp hotshots-1.2.1/src/uploaders/FtpUploader.cpp --- hotshots-1.2.0/src/uploaders/FtpUploader.cpp 2013-06-26 18:43:14.000000000 +0000 +++ hotshots-1.2.1/src/uploaders/FtpUploader.cpp 2013-08-24 20:31:16.000000000 +0000 @@ -80,11 +80,12 @@ // validate the ouput url m_url = QString("ftp://%1/%2/%3").arg(m_ftpHostname).arg(m_ftpDirectory).arg( QFileInfo(m_fileToUpload).fileName() ); + // take care of user URL format if needed if (m_ftpUserURL) { m_url = m_ftpUserURLTemplate; - m_url.replace("@filename@",QFileInfo(m_fileToUpload).fileName()); + m_url.replace( "@filename@",QFileInfo(m_fileToUpload).fileName() ); } emit newUrl(m_url); LogHandler::getInstance()->reportInfo( tr("%1 is available").arg(m_url) ); diff -Nru hotshots-1.2.0/src/uploaders/FtpUploaderSettings.cpp hotshots-1.2.1/src/uploaders/FtpUploaderSettings.cpp --- hotshots-1.2.0/src/uploaders/FtpUploaderSettings.cpp 2013-06-26 19:04:20.000000000 +0000 +++ hotshots-1.2.1/src/uploaders/FtpUploaderSettings.cpp 2013-08-24 20:31:16.000000000 +0000 @@ -52,7 +52,6 @@ void FtpUploaderSettings::updateOriginalURL() { - QString url = QString("ftp://%1/%2/%filename%").arg(lineEditServer->text()).arg(lineEditDirectory->text()); + QString url = QString("ftp://%1/%2/%filename%").arg( lineEditServer->text() ).arg( lineEditDirectory->text() ); labelResultOriginalURL->setText(url); - -} \ No newline at end of file +} diff -Nru hotshots-1.2.0/src/uploaders/ImgurUploader.cpp hotshots-1.2.1/src/uploaders/ImgurUploader.cpp --- hotshots-1.2.0/src/uploaders/ImgurUploader.cpp 2013-05-17 06:00:22.000000000 +0000 +++ hotshots-1.2.1/src/uploaders/ImgurUploader.cpp 2013-08-24 20:31:16.000000000 +0000 @@ -35,7 +35,6 @@ const QString UploadUrl = "https://api.imgur.com/3/image"; const QString ServiceUrl = "http://www.imgur.com"; - ImgurUploader::ImgurUploader(QObject *parent) : BaseUploader(parent) { m_name = "Imgur.com"; diff -Nru hotshots-1.2.0/src/uploaders/UploaderRegistering.h hotshots-1.2.1/src/uploaders/UploaderRegistering.h --- hotshots-1.2.0/src/uploaders/UploaderRegistering.h 2013-05-06 06:37:12.000000000 +0000 +++ hotshots-1.2.1/src/uploaders/UploaderRegistering.h 2013-08-24 20:31:18.000000000 +0000 @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *******************************************************************************/ - + #ifndef _UPLOADERREGISTERING_H #define _UPLOADERREGISTERING_H diff -Nru hotshots-1.2.0/ui/AboutDialog.ui hotshots-1.2.1/ui/AboutDialog.ui --- hotshots-1.2.0/ui/AboutDialog.ui 2013-06-24 20:22:50.000000000 +0000 +++ hotshots-1.2.1/ui/AboutDialog.ui 2013-08-19 18:42:54.000000000 +0000 @@ -211,7 +211,7 @@ - 3 + 1