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:04:03.000000000 +0000
+++ hotshots-1.2.1/debian/changelog 2013-09-01 10:27:19.000000000 +0000
@@ -1,3 +1,15 @@
+hotshots (1.2.1-1dhor~raring) raring; 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~raring) raring; 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í...
-
+
+
+
+ Nahrání souboru HotShots se nezdařilo
+
+
+
+
+
+ Chyba při nahrávání souboru HotShots %1
+
+
+
Smazat úpravy
-
+
Smazat všechny existující položky?
-
+
Smazat dokument
-
+
Vytvořit nový dokument?
-
-
- Nahrání souboru HotShots se nezdařilo
-
-
-
-
- Chyba při nahrávání souboru HotShots %1
-
-
-
+
Uložit soubor HotShots
-
+
Soubory HotShots (*.hot)
-
+
Uložení souboru HotShots se nezdařilo
-
+
Chyba při ukládání souboru HotShots %1
-
+
Editor snímku obrazovky:
-
+
Měřítko x%1
@@ -1076,91 +1078,96 @@
Nelze vytvořit umístění pro ukládání, zjistěte proč?! (%1)
-
+
Žádný další efekt
-
+
Jednoduchý stín
-
+
Stín s okraji
-
+
Postupná neprůhlednost
-
+
Roztrhaný okraj
-
-
+
+
Nahrát obrázek na internet
-
+
Pro nahrávání nebyla stanovena žádná výchozí internetová služba!
-
+
Nahrávač %1
-
+
Zdá se, že výchozí nahrávač (%1) není správně nastaven, pro požadované parametry není zadána žádná hodnota!
-
+
Nahrát obrázek %1 na službu %2 ?
-
+
Vytisknout dokument
-
+
Uložit soubor
-
+
Obrázky (*.%1)
-
+
Uložení se nezdařilo
-
+
Chyba při ukládání souboru
-
+
Oznamovací oblast panelu
-
+
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.
+
+
+
+ zpráva od jiné instance.
+
MainWindowClass
@@ -1376,8 +1383,8 @@
-
- [volby]
+
+ [volby] [soubor]
@@ -1400,33 +1407,33 @@
--no-singleinstance : povolit použití více instancí programu (nedoporučuje se).
-
-
- zpráva od jiné instance.
+
+
+ soubor: soubor k nahrání do editoru, může to být soubor .hot nebo obrázkový soubor.
-
+
%1 již běží!
-
+
Cesta k překladům %1
-
+
Nastavení jazyka na: %1
-
-
+
+
Data z %1 byla úspěšně nahrána
-
+
Data z %1 se nepodařilo nahrát
Binary files /tmp/348z4ZDK76/hotshots-1.2.0/lang/hotshots_el.qm and /tmp/4Pt98Io8rY/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 @@
-
+
+
+
-
+
-
+
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: %1
-
+
Συγνώμη. Το αρχείο %1 δεν βρέθηκε.
-
+
Γλώσσα που εντοπίστηκε: %1
-
+
Αυτόματος εντοπισμός
-
+
Προεπιλογή (χωρίς χρήση αρχείων γλώσσας)
-
+
Η εφαρμογή πρέπει να κάνει επανεκκίνηση για να ισχύσει η νέα γλώσσα.
Είστε βέβαιος ότι θέλετε να κάνετε επανεκκίνηση της εφαρμογή τώρα;
-
+
Θέλετε να επαναφέρετε όλες τις προτιμήσεις στις προεπιλεγμένες τιμές;
Εάν ναι, η εφαρμογή θα κάνει επανεκκίνηση.
-
+
Παράδειγμα:
@@ -473,7 +475,7 @@
Το %1 μεταφέρθηκε με σφάλμα (%2)
-
+
Δεν μπορεί να εξαχθεί η διεύθυνση URL από την απάντηση
@@ -574,62 +576,64 @@
Ενημέρωση φόντου εικόνας
-
+
+
+
+ Η φόρτωση του αρχείου HotShots απέτυχε
+
+
+
+
+
+ Σφάλμα φόρτωσης του αρχείου HotShots %1
+
+
+
Απαλοιφή επεξεργασίας
-
+
Απαλοιφή όλων των στοιχεία που υπάρχουν;
-
+
Απαλοιφή εγγράφου
-
+
Δημιουργία νέου εγγράφου;
-
-
- Η φόρτωση του αρχείου HotShots απέτυχε
-
-
-
-
- Σφάλμα φόρτωσης του αρχείου HotShots %1
-
-
-
+
Αποθήκευση αρχείου HotShots
-
+
Αρχεία HotShots (*.hot)
-
+
Η αποθήκευση του αρχείου HotShots απέτυχε
-
+
Σφάλμα αποθήκευσης του αρχείου HotShots %1
-
+
Επεξεργαστής στιγμιοτύπου:
-
+
Κλίμακα x%1
@@ -921,22 +925,22 @@
Επιτυχής αποστολή στο %1.
-
+
Το %1 είναι διαθέσιμο
-
+
Το %1 δεν είναι διαθέσιμο στον διακομιστή %2
-
+
Η μεταφορά του %1 τελείωσε με σφάλμα
-
+
Η μεταφορά του %1 τελείωσε χωρίς σφάλμα
@@ -1045,17 +1049,17 @@
ImgurUploader
-
+
Το %1 μεταφέρθηκε χωρίς σφάλμα
-
+
Το %1 μεταφέρθηκε με σφάλμα (%2)
-
+
Παρουσιάστηκε σφάλμα κατά την ανάλυση της απόκρισης της υπηρεσίας
@@ -1063,106 +1067,111 @@
MainWindow
-
+
Κατάλογος αποθήκευσης
-
+
Καταχώρηση προγράμματος μεταφόρτωσης %1
-
+
Δεν μπορεί να δημιουργηθεί η θέση αποθήκευσης. Ελέγξτε την αιτία! (%1)
-
+
Χωρίς προσθήκη εφέ
-
+
Απλή σκιά
-
+
Σκιά μαζί με περίγραμμα
-
+
Προοδευτική αδιαφάνεια
-
+
Λείανση άκρων
-
-
+
+
Αποστολή εικόνας στο διαδίκτυο
-
+
Δεν έχει καθοριστεί προεπιλεγμένη υπηρεσία αποστολής στο διαδίκτυο!
-
+
Πρόγραμμα μεταφόρτωσης %1
-
+
Το προεπιλεγμένο πρόγραμμα μεταφόρτωσης (%1) δεν φαίνεται να είναι σωστά ρυθμισμένο. Δεν έχει τιμές για τις απαιτούμενες παραμέτρους !
-
+
Αποστολή της εικόνας %1 στην υπηρεσία %2;
-
+
Εκτύπωση εγγράφου
-
+
Αποθήκευση αρχείου
-
+
Εικόνες (*.%1)
-
+
Η αποθήκευση απέτυχε
-
+
Σφάλμα αποθήκευσης αρχείου
-
+
Πειοχή ειδοποιήσεων
-
+
Το πρόγραμμα θα συνεχίσει να τρέχει στην περιοχή ειδοποιήσεων. Για να τερματίσετε το πρόγραμμα, επιλέξτε <b>Έξοδο</b> στο μενού περιβάλλοντος της περιοχής ειδοποιήσεων.
+
+
+
+
+
MainWindowClass
@@ -1362,7 +1371,7 @@
QObject
-
+
Βρέθηκαν 1%
@@ -1378,8 +1387,8 @@
-
- [επιλογές]
+
+
@@ -1402,33 +1411,33 @@
--πολλαπλή συνεδρία : ενεργοποίηση χρήσης πολλαπλής εμφάνισης του προγράμματος (δεν συνιστάται).
-
-
- Μήνυμα από άλλη συνεδρία.
+
+
+
-
+
Το %1 εκτελείται ήδη!
-
+
Κατάλογος μεταφράσεων %1
-
+
Ρύθμιση γλώσσας σε : %1
-
-
+
+
Επιτυχής φόρτωση δεδομένων από %1
-
+
Αποτυχία φόρτωσης δεδομένων από %1
@@ -1575,4 +1584,4 @@
Γέμισμα με το χρώμα φόντου
-
\ No newline at end of file
+
Binary files /tmp/348z4ZDK76/hotshots-1.2.0/lang/hotshots_es.qm and /tmp/4Pt98Io8rY/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 @@
-
+
+
+
-
+
-
+
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
-
+
El fichero %1 no es accesible, lo siento ...
-
+
Idioma detectado : %1
-
+
Detección automática
-
+
Defecto (no hay fichero de traducción)
-
+
La aplicación necesita reiniciar para tener cuenta el nuevo idioma
¿ Desea reniciar la aplicacióm ahora ?
-
+
Desea borrar todas las preferencias ?
De ser si, la aplicación se reiniciará
-
+
Ejemplo :
@@ -473,7 +475,7 @@
La transferencia %1 se ha terminado con el error (%2)
-
+
Imposible de extraer la URL de la respuesta
@@ -574,62 +576,64 @@
actualizar la imágen de fondo ...
-
+
+
+
+ La carga del fichero HotShots ha fallado
+
+
+
+
+
+ Error durante la carga del fichero HotShots %1
+
+
+
Limpiar la edición
-
+
¿ Borrar todos los elementos ?
-
+
Borrar el documento
-
+
¿ Crear un nuevo documento ?
-
-
- La carga del fichero HotShots ha fallado
-
-
-
-
- Error durante la carga del fichero HotShots %1
-
-
-
+
Salvar el fichero HotShots
-
+
Ficheros HostShots (*.hot)
-
+
La salvaguardia del fichero HotShots a fallado
-
+
Errores en la salvaguardia del fichero HotShots %1
-
+
Editor de pantallas capturadas :
-
+
Escala x%1
@@ -919,22 +923,22 @@
Telecarga exitosa %1
-
+
%1 esta disponible
-
+
%1 no es accesible en el servidor %2
-
+
La transferencia de %1 se ha terminado con un error
-
+
La transferencia de %1 se ha terminado sin errores
@@ -1043,17 +1047,17 @@
ImgurUploader
-
+
La transferencia de %1 se ha terminado sin errores
-
+
La transferencia de %1 se ha terminado con un error (%2)
-
+
Ocurrió un error durante la interpretación de la respuesta del servicio
@@ -1061,106 +1065,111 @@
MainWindow
-
+
Carpeta de salvaguardia
-
+
Registro de %1 telecargadores
-
+
Imposble crear la carpeta de grabación temporal, ¡¡ BUSCA LA RAZÓN !! (%1)
-
+
Ningún post-effecto
-
+
Gota de sombra simple
-
+
Gota de sombra con bordes
-
+
Opacidad progresiva
-
+
Bordes rotos
-
-
+
+
Telecargar la imágen hacia la WEB
-
+
¡ No se especificado ningún servicio de telecarga !
-
+
Telecargador %1
-
+
¡¡ El telecargador por defecto (%1) no parece estar correctamente configurado, no hay valores para los campos requeridos !!
-
+
Telecarga de la imágen %1 hacia el servicio %2 ?
-
+
Imprimir el documento
-
+
Salvar el fichero
-
+
Imagenes (*.%1)
-
+
La salvaguardia a fallado
-
+
Errores durante la salvaguardia
-
+
Zona de notificación
-
+
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.
+
+
+
+
+
MainWindowClass
@@ -1360,7 +1369,7 @@
QObject
-
+
%1 encontrado
@@ -1376,8 +1385,8 @@
-
- [opciones]
+
+
@@ -1400,33 +1409,33 @@
--no-singleinstance : Habilita el uso de varias instancias del programa (no recomendado).
-
-
- mensaje de otra instancia.
+
+
+
-
+
%1 ya esta en funcionamiento !!
-
+
camino para las traducciones %1
-
+
Definir como idioma : %1
-
-
+
+
Carga de %1 realizada con éxito
-
+
Carga de datos desde %1 fallida
@@ -1571,4 +1580,4 @@
Relleno con color
-
\ No newline at end of file
+
Binary files /tmp/348z4ZDK76/hotshots-1.2.0/lang/hotshots_eu.qm and /tmp/4Pt98Io8rY/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 @@
-
+
+
+
-
+
-
+
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 bertsioa %1
-
+
%1 fitxategia ezin aurkitu, barkatu...
-
+
atzemandako hizkuntza: %1
-
+
detekzio automatikoa
-
+
Lehenetsia (itzulpen fitxategirik erabili gabe)
-
+
Aplikazioa berrabiarazi behar da itzulpen berria kontuan izateko,
@@ -69,7 +71,7 @@
-
+
Nahi duzu lehenetsitako balioak berrezartzea?
@@ -77,7 +79,7 @@
-
+
Adibidea:
@@ -475,7 +477,7 @@
%1 bidalita errorerik gabe (%2)
-
+
Ezin deskonprimitu URLa erantzunetik
@@ -577,62 +579,64 @@
berritu atzeko planoko irudia ...
-
+
+
+
+ Errorea HotShots-fitxategia irekitzen
+
+
+
+
+
+ Errorea %1 HotShots-fitxategia irekitzen
+
+
+
Ezabatu edizioa
-
+
Ezabatu elementu guztiak?
-
+
Ezabatu dokumentua
-
+
Sortu dokumentu berria?
-
-
- Errorea HotShots-fitxategia irekitzen
-
-
-
-
- Errorea %1 HotShots-fitxategia irekitzen
-
-
-
+
Gorde HotShots-fitxategia
-
+
HotShots-fitxategiak (*.hot)
-
+
Errorea HotShots-fitxategia gordetzen
-
+
Errorea %1 HotShots-fitxategia gordetzen
-
+
Pantaila-argazkien editorea
-
+
Eskala x%1
@@ -922,22 +926,22 @@
ondo kargatzen hemen %1.
-
+
%1 erabilgarri dago
-
+
%1 ez dago erabilgarri %2 zerbitzarian
-
+
%1 errorekin bidali da
-
+
%1 bidalita errorerik gabe
@@ -1046,17 +1050,17 @@
ImgurUploader
-
+
%1 bidalita errorerik gabe
-
+
%1 bidalita errorerik gabe (%2)
-
+
Errore bat gertatu da erantzun-zerbitzuaren analisian
@@ -1064,106 +1068,111 @@
MainWindow
-
+
Gorde direktorioa
-
+
%1 karga-zerbitzariaren erregistroa
-
+
Ezin da sortu biltegiratzeko lekua, begiratu zergatik? (%1)
-
+
Ertz-efekturik gabe
-
+
Itzal sinplea
-
+
Ertza eta itzala
-
+
Opakutasun progresiboa
-
+
Koskadun ertza
-
-
+
+
Kargatu irudia webera
-
+
Kargatzeko web-zerbitzua definitu gabe!
-
+
Karga-zerbitzaria %1
-
+
Badirudi lehenetsitako karga-zerbitzaria (%1) ez dagoela ondo konfiguratua, ez du jasotzen eskatutako parametroak !!
-
+
Kargatu %1 irudia %2 zerbitzarira?
-
+
Inprimatu dokumentua
-
+
Gorde fitxategia
-
+
Irudiak (*.%1)
-
+
Errorea gordetzean
-
+
Errorea fitxategia gordetzean
-
+
Sistema-barra
-
+
Programa martxan jarraituko du sistema-barran. Programa gelditzeko sakatu <b>Irten</b> sistema-barraren Hotshots-ikonoaren goitik beherako menuan.
+
+
+
+
+
MainWindowClass
@@ -1363,7 +1372,7 @@
QObject
-
+
%1 aurkitua
@@ -1379,8 +1388,8 @@
-
- [aukerak]
+
+
@@ -1403,33 +1412,33 @@
--ez-ataza bakarra: programaren ataza anitzen erabilera gaitzen du (ez gomendatua)
-
-
- Beste ataza baten mezua
+
+
+
-
+
%1 jadanik exekutatzen ari da!!
-
+
itzulpenaren kokalekua %1
-
+
ezartzen hizkuntza hona: %1
-
-
+
+
datuak ondo ireki dira hemendik %1
-
+
akatsa datuak hemendik irekitzean %1
@@ -1574,4 +1583,4 @@
Bete atzeko-planoko kolorez
-
\ No newline at end of file
+
Binary files /tmp/348z4ZDK76/hotshots-1.2.0/lang/hotshots_fr.qm and /tmp/4Pt98Io8rY/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 @@
-
+
+
+
-
+
-
+
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">Voir pour une nouvelle version ...</a>
+
- A propos
+
- Préférences
+
- Informations
+
- Journal
+
-
+
- Qt version %1
+
-
+
- Le fichier %1 n'est pas accessible, désolé ...
+
-
+
- Langage détecté : %1
+
-
+
- Détection automatique
+
-
+
- Défaut (pas de fichier de traduction)
+
-
+
- L'application a besoin de redémarrer pour tenir compte de la nouvelle langue
-Voulez-vous redémarrer l'application maintenant ?
+
-
+
- Voulez-vous effacer toutes les préférences ?
-Si oui, l'application va redémarrer
+
-
+
- Exemple :
+
@@ -86,359 +86,359 @@
- A propos
+
- Crédits
+
- Journal des modifications
+
- Version numéro
+
- Préférences
+
- Démarrage
+
- Langue
+
- Langue détectée ...
+
- Démarrer dans la zone de notification (minimisé)
+
- Afficher l'écran d'accueil au démarrage
+
- Démarrage automatique avec le système
+
- Effacer toutes les préférences
+
- Ecran d'acceuil avec fond transparent
+
- Capture d'écran
+
- Copie automatique de la capture d'écran vers le presse-papiers
+
- Ajouter la date courante au nom du fichier
+
- Ajouter la date courante au nom du fichier
+
- Nom par défaut :
+
- Format :
+
- Modèle :
+
- Format de sauvegarde par défaut
+
- Nom par défaut
+
- Post-effet :
+
- Tourner la capture d'écran
+
- Angle :
+
- Capturer la fenêtre avec sa décoration
+
- Jouer un son quand l'action est terminée
+
- Cacher l'interface pendant la capture d'écran
+
- Forcer la couleur de fond pour le presse papier/service web
+
- Mettre à l'échelle la capture d'écran
+
- %
+
- Taille maximale
+
- 800
+
- 600
+
- Raccourcis
+
- Utiliser des raccourcis clavier "système"
+
- Capturer l'écran courant
+
- Capturer l'ensemble des écrans (multi-moniteurs)
+
- Capturer une fenêtre
+
- Capturer une région
+
- Capturer une région à main levée
+
- Réseau
+
- Service Web par défaut
+
- Copier l'URL du fichier téléchargé vers le presse-papier
+
- comme
+
- Aucun format
+
- Format de Messagerie Instantannée (IM)
+
- Format HTML
+
- Format BBCode
+
- Format définit par l'utilisateur
+
- @url@
+
- (*) @url@ is the uploaded URL
+
- Utiliser un Proxy pour se connecter à Internet
+
- Utiliser un Proxy
+
- Serveur
+
- Nom du Proxy
+
- Port
+
- Authentification sur le serveur Proxy
+
- Nom d'utilisateur
+
- Nom d'utilisateur sur le serveur Proxy
+
- Mot de passe
+
- Mot de passe sur le serveur Proxy
+
- Afficher/Cacher le mot de passe dans l'interface
+
- Afficher le mot de passe
+
- Port du serveur Proxy
+
- Lancer le navigateur par défaut au final
+
- Téléchargeurs
+
- Infos
+
- Formats supportés (via greffons Qt)
+
- Traductions disponibles
+
- Journal
+
@@ -446,18 +446,18 @@
- L'image a été redimensionnée par rapport aux contraintes du service web (%1x%2)
+
- Impossible de sauver le fichier temporaire %1
+
- Redimensionnement du fichier par rapport aux limitations (%1/%2 octets)
+
@@ -465,17 +465,17 @@
- Le transfert %1 s'est terminé sans erreur
+
- Le transfert %1 s'est terminé avec une erreur (%2)
+
-
+
- Impossible d'extraire l'URL de la réponse
+
@@ -483,12 +483,12 @@
- Paramètres par défaut du téléchargeur
+
- Aucun paramètre pour ce téléchargeur
+
@@ -496,38 +496,38 @@
- Aucun post-effet
+
- Ombre portée simple
+
- Ombre portée avec bordures
+
- Opacité progressive
+
- Bords déchirés
+
- Click gauche pour sélectionner l'élément, Ctrl+Click Gauche puis faire glisser la souris pour sélectionner un groupe d'éléments
+
- Click gauche pour positionner le centre
+
@@ -539,99 +539,101 @@
- Click gauche puis faire glisser la souris pour créer l'élément
+
- 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
+
- Click gauche pourpositionner le centre de l'image puis glisser la souris si vous voulez redimensionner l'image
+
- Clic-Gauche puis faire glisser pour créer la figure, la sélectionner et tapez <Entrée> pour effectuer l'opération
+
- Il existe des éléments d'annotation, que voulez-vous faire ?
+
- effacer les éléments existants ...
+
- mettre à jour l'image de fond ...
+
-
-
- Effacer l'édition
+
+
+
+
-
-
- Effacer tous les éléments ?
+
+
+
+
-
-
- Effacer le document
+
+
+
-
-
- Créer un nouveau document ?
+
+
+
-
-
- Le chargement du fichier HotShots a échoué
+
+
+
-
-
- Erreur lors du chargement du fichier HotSHots %1
+
+
+
-
+
- Sauver le fichier HotShots
+
-
+
- Fichiers HotShots (*.hot)
+
-
+
- La sauvagarde du fichier HotShots à échouée
+
-
+
- Erreur lors de la sauvegarde du fichier HotSHots %1
+
-
+
- Editeur de captures d'écran :
+
-
+
- Echelle x%1
+
@@ -639,202 +641,202 @@
- Editeur de snapshot
+
- Sélectionner
+
- Tracer un texte
+
- Tracer une ligne
+
- Entourer
+
- Tracer une polyligne
+
- Tracer un polygone
+
- Dessiner une courbe
+
- Couper l'image de fond
+
- Tracer un rectangle
+
- Tracer une ellipse
+
- Tracer une flèche
+
- Tracer une balise
+
- Mettre en évidence
+
- Loupe
+
- Ajouter une image
+
- Masquer
+
- Décroître la taille de la fonte
+
- Accroïtre la taille de la fonte
+
- Changer la fonte
+
- aAbB...
+
- Quitter l'éditeur
+
- Ouvrir un fichier
+
- Nouveau document
+
- Importer une image du presse-papier
+
- Sauver l'édition
+
- Sauver sous
+
- Copie vers le presse-papier
+
- Exporter l'image
+
- Télécharger l'image vers le Web
+
- Ajuster à la fenêtre
+
- Réinitialiser l'échelle
+
- Ajouter un effet à l'image de fond
+
- Afficher/Cacher l'ombrage des éléments
+
- Mettre les éléments sélectionnés au dessus
+
- Mettre les éléments sélectionnés en dessous
+
- Dupliquer l'élément courant
+
- Effacer tous les éléments
+
- Effacer les éléments sélectionnés
+
- Effacer
+
@@ -842,37 +844,37 @@
- Impossible de lire %1: (%2)
+
- La sauvegarde du projet à échoué %1 : %2
+
- Impossible de sauver le fichier%1: (%2)
+
- Erreur d'analyse ligne %1, colonne %2: (%3)
+
- Ce n'est pas un fichier HotShots !!
+
- La configuration a été automatquement mise à jour !
+
- Version inconnue (%1).
+
@@ -880,12 +882,12 @@
- Le transfert de %1 s'est terminé sans erreur
+
- Le transfert de %1 s'est terminé avec une erreur (%2)
+
@@ -893,7 +895,7 @@
- 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 @@
- Impossible de se connecter au serveur FTP à %1. Merci de vérifier si le nom du serveur est correct.
+
- Connecté sur %1.
+
- Arrêt du téléchargement de %1
+
- Téléchargement réussi sur %1
+
-
+
- %1 est disponible
+
-
+
- %1 n'est pas accessible sur le serveur %2
+
-
+
- Le transfert de %1 s'est terminé avec une erreur
+
-
+
- Le transfert de %1 s'est terminé sans erreur
+
@@ -944,82 +946,82 @@
- Paramètres FTP
+
- Répertoire de base distant
+
- @filename@ est le fichier téléchargé
+
- Nom d'utilisateur :
+
- Serveur :
+
- Mot de passe FTP
+
- Mot de passe :
+
- Répertoire :
+
- Afficher/Cacher le mot de passe dans l'interface
+
- Afficher le mot de passe
+
- Nom d'utilisateur FTP
+
- Définir l'URL résultat
+
- ftp://cequevousvoulez/@filename@
+
- Port FTP
+
- Nom du serveur FTP
+
- Port :
+
@@ -1027,139 +1029,144 @@
- Le transfert %1 s'est terminé sans erreur
+
- Le transfert %1 s'est terminé avec une erreur (%2)
+
- Le service %1 répond avec une erreur (%2)
+
ImgurUploader
-
+
- Le transfert %1 s'est terminé sans erreur
+
-
+
- Le transfert %1 s'est terminé avec une erreur (%2)
+
-
+
- Une erreur est intervenue lors de la lecture de la réponse du service
+
MainWindow
-
+
- Répertoire de sauvegarde
+
-
+
- Enregistrement de %1 téléchargeurs
+
-
+
- Impossible de créer le répertoire de stockage temporaire, cherchez pourquoi ?! (%1)
+
-
+
- Aucun post-effet
+
-
+
- Ombre portée simple
+
-
+
- Ombre portée avec bordures
+
-
+
- Opacité progressive
+
-
+
- Bords déchirés
+
-
-
+
+
- Télécharger l'image vers le Web
+
-
+
- Aucun service de téléchargement spécifié !
+
-
+
- Téléchargeur %1
+
-
+
- Le téléchargeur par défaut (%1) ne semble pas correctement configuré, aucune valeur donnée pour les champs requis !!
+
-
+
- Téléchargé l'image %1 vers le service %2 ?
+
-
+
- Imprimer le document
+
-
+
- Sauver le fichier
+
-
+
- Images (*.%1)
+
-
+
- La sauvegarde à échouée
+
-
+
- Erreur lors de la sauvegarde
+
-
+
- Zone de notification
+
-
+
- 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.
+
+
+
+
+
+
@@ -1167,278 +1174,278 @@
-
+
- Prendre un nouveau cliché
+
- URL téléchargée
+
- Paramètres
+
- Délai (s) :
+
- Répertoire de sortie :
+
- Mode de capture :
+
- Délai en secondes
+
- Aucun délai
+
- Après la capture :
+
- Ne rien faire
+
- Sauver automatiquement l'image
+
- Sauver l'image (demande à l'utilisateur)
+
- Lancer l'éditeur
+
- Quitter
+
- A propos
+
- Préférences
+
- Sauver la capture d'écran
+
- Sauver la capture d'écran
+
- Afficher l'interface
+
- Afficher l'interface
+
- Copie vers le presse-papier
+
- Copie vers le presse-papier
+
- Ajouter des annotations
+
- Ajouter des annotations
+
- Capturer l'écran
+
- Capturer l'écran courant
+
- Capturer tous les écrans
+
- Capturer tous les écrans (multi-moniteurs)
+
- Capturer la fenêtre
+
- Capturer une fenêtre
+
- Capturer la région
+
- Capturer une région
+
- Aide
+
- Télécharger
+
- Télécharger l'image vers le Web
+
- Capturer une région à main levée
+
- Imprimer
+
QObject
-
+
- %1 trouvé
+
- Gestionnaire de captures d'écran.
+
- Usage :
+
-
- [options]
+
+
- Les options suivantes sont acceptées :
+
- --help : Affichage de cette aide.
+
- --reset-config : Effacement des paramètres de configuration sauvegardés.
+
- --no-singleinstance : autorise l'utilisation de plusieurs instances du programme (non recommandé).
+
-
-
- message d'une autre instance.
+
+
+
-
+
- %1 est déjà en fonctionnement !!
+
-
+
- chemin des traductions %1
+
-
+
- positionner le lauguage à %1
+
-
-
+
+
- chargement réussi des données de %1
+
-
+
- échec de chargement des données de %1
+
- stringToVariant(): Erreur sur les nombres (%1).
+
- <aucune image>
+
@@ -1446,7 +1453,7 @@
- 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
+
- Cercle
+
- Carré
+
- Barre oblique
+
- Antislash
+
@@ -1482,47 +1489,47 @@
- Noir
+
- Blanc
+
- Rouge
+
- Vert
+
- Bleu
+
- Cyan
+
- Magenta
+
- Orange
+
- Gris
+
@@ -1530,27 +1537,27 @@
- Ligne pleine
+
- Motif de pointillé
+
- Motif de points
+
- motif point-trait
+
- Motif point-point-trait
+
@@ -1558,17 +1565,17 @@
- Aucun remplissage
+
- Remplissage avec couleur translucide
+
- 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 @@
-
-
+
+
+
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -1076,91 +1078,96 @@
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
MainWindowClass
@@ -1376,7 +1383,7 @@
-
+
@@ -1400,33 +1407,33 @@
-
-
+
+
-
+
-
+
-
+
-
-
+
+
-
+
Binary files /tmp/348z4ZDK76/hotshots-1.2.0/lang/hotshots_it.qm and /tmp/4Pt98Io8rY/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 @@
-
+
+
+
-
+
-
+
put your name here dear translator and the release of the translation file !!
Man from Mars - ver. 1.2
@@ -36,46 +38,46 @@
Registro
-
+
Versione Qt %1
-
+
Oops! File %1 non trovato
-
+
Lingua rilevata: %1
-
+
Rilevazione automatica
-
+
Predefinito (non usare file di traduzione)
-
+
Il programma deve essere riavviato per applicare la nuova lingua impostata
Vuoi riavviarlo subito?
-
+
Vuoi ripristinare tutte le impostazioni predefinite?
Sarà necessario riavviare il programma
-
+
Esempio:
@@ -473,7 +475,7 @@
%1 trasferimento concluso con errori (%2)
-
+
Impossibile estrarre URL dalla risposta
@@ -574,62 +576,64 @@
Aggiorna l'immagine di sfondo...
-
+
+
+
+ Caricamento del file HotShots fallito
+
+
+
+
+
+ Errore nel caricamento del file HotSHots %1
+
+
+
Annulla modifiche
-
+
Eliminare tutti gli elementi?
-
+
Pulisci il documento
-
+
Creare un nuovo documento?
-
-
- Caricamento del file HotShots fallito
-
-
-
-
- Errore nel caricamento del file HotSHots %1
-
-
-
+
Salva il file HotShots
-
+
File HotShots (*.hot)
-
+
Salvataggio del file HotShots fallito
-
+
Errore nel salvataggio del file HotSHots %1
-
+
Editor delle immagini:
-
+
Scala x%1
@@ -919,22 +923,22 @@
Caricamento su %1 riuscito
-
+
%1 è disponibile
-
+
%1 non è disponibile sul server %2
-
+
%1 trasferimento concluso con errori
-
+
%1 trasferimento concluso senza errori
@@ -1043,17 +1047,17 @@
ImgurUploader
-
+
%1 trasferimento concluso senza errori
-
+
%1 trasferimento concluso con errori (%2)
-
+
Errore nell'elaborazione della risposta del servizio
@@ -1061,106 +1065,111 @@
MainWindow
-
+
Cartella di salvataggio
-
+
Registro dei caricamenti %1
-
+
Impossibile creare posizione di salvataggio, verificare? (%1)
-
+
Nessuna elaborazione
-
+
Ombreggiatura semplice
-
+
Ombreggiatura con bordi
-
+
Opacità progressiva
-
+
Bordi strappati
-
-
+
+
Carica immagine sul web
-
+
Servizio web predefinito non impostato!
-
+
Caricamento %1
-
+
Il servizio predefinito (%1) non sembra correttamente configurato. Nessun valore assegnato ai parametri richiesti!
-
+
Caricare immagine %1 su %2?
-
+
-
+ Stampa documento
-
+
Salva file
-
+
Immagini (*.%1)
-
+
Salvataggio fallito
-
+
Errore nel salvataggio
-
+
Area di notifica
-
+
Il programma resterà attivo nell'area di notifica. Per chiudere il programma, scegliere <b>Esci</b> nel menu contestuale dell'area di notifica.
+
+
+
+ messaggio da un'altra istanza.
+
MainWindowClass
@@ -1354,13 +1363,13 @@
-
+ Stampa
QObject
-
+
%1 trovato
@@ -1376,8 +1385,8 @@
-
- [opzioni]
+
+ [opzioni] [file]
@@ -1400,33 +1409,33 @@
--no-singleinstance : consenti più istanze (non raccomandato).
-
-
- messaggio da un'altra istanza.
+
+
+ file: file da caricare nell'editor, può essere un file .hot o un'immagine
-
+
%1 è già avviato!
-
+
percorso delle traduzioni %1
-
+
impostare la lingua a: %1
-
-
+
+
Caricamento dei dati da %1 riuscito
-
+
Caricamento dei dati da %1 fallito
@@ -1571,4 +1580,4 @@
Riempimento con colore
-
\ No newline at end of file
+
Binary files /tmp/348z4ZDK76/hotshots-1.2.0/lang/hotshots_ja.qm and /tmp/4Pt98Io8rY/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 @@
-
+
+
+
-
+
-
+
put your name here dear translator and the release of the translation file !!
v1.0 by piyo
@@ -36,46 +38,46 @@
ログ
-
+
Qt バージョン %1
-
+
ファイル「%1」が見つかりません ...
-
+
検出された言語: %1
-
+
自動検出
-
+
既定 (翻訳ファイルを使用しない)
-
+
新しい翻訳を反映させるには再起動が必要です。
今すぐ再起動しますか?
-
+
本当にすべての設定を規定にリセットしますか?
「はい」を選択すると、再起動します。
-
+
例:
@@ -473,7 +475,7 @@
%1 transfert end with error (%2)
-
+
応答からURLを抽出できません
@@ -574,62 +576,64 @@
背景画像を更新 ...
-
+
+
+
+ HotShotsファイルの読み込み失敗
+
+
+
+
+
+ HotSHotsファイル %1 の読み込みに失敗しました
+
+
+
編集を破棄
-
+
本当にすべてのアイテムを削除しますか?
-
+
ドキュメントの破棄
-
+
本当に新規ドキュメントを作成しますか?
-
-
- HotShotsファイルの読み込み失敗
-
-
-
-
- HotSHotsファイル %1 の読み込みに失敗しました
-
-
-
+
HotShotsファイルの保存
-
+
HotShotsファイル (*.hot)
-
+
HotShotsファイルの保存失敗
-
+
HotSHotsファイル「%1」の保存に失敗しました
-
+
スナップショット エディタ:
-
+
倍率 x%1
@@ -919,22 +923,22 @@
successful uploading onto %1.
-
+
%1 is available
-
+
%1 is'nt available on server %2
-
+
%1 transfert end with error
-
+
%1 transfert end without error
@@ -1043,17 +1047,17 @@
ImgurUploader
-
+
%1 transfert end without error
-
+
%1 transfert end with error (%2)
-
+
サービスからの応答を処理中にエラーが発生しました
@@ -1061,106 +1065,111 @@
MainWindow
-
+
保存ディレクトリ
-
+
Register of %1 uploaders
-
+
Can't create storage location, check why ?! (%1)
-
+
効果なし
-
+
ドロップシャドウのみ
-
+
枠とドロップシャドウ
-
+
縁を半透明に
-
+
ぎざぎざの縁
-
-
+
+
画像をWebにアップロード
-
+
既定のアップロードWebサーバーが指定されていません。
-
+
アップローダ %1
-
+
既定のアップローダ (%1) は正しく設定されていないようです。必須パラメータに値が設定されていません。
-
+
画像「%1」を「%2」にアップロードしますか?
-
+
ドキュメントを印刷
-
+
ファイルの保存
-
+
画像 (*.%1)
-
+
保存失敗
-
+
ファイル保存中にエラーが発生しました
-
+
システムトレイ
-
+
プログラムはシステムトレイで動作しています。終了するにはシステムトレイアイコンのコンテキストメニューから「<b>終了</b>」を選択してください。
+
+
+
+ message from other instance.
+
MainWindowClass
@@ -1360,7 +1369,7 @@
QObject
-
+
%1 found
@@ -1376,8 +1385,8 @@
-
- [options]
+
+ [options] [file]
@@ -1400,33 +1409,33 @@
--no-singleinstance : enable the use of multiple instance of program (not recommended).
-
-
- message from other instance.
+
+
+ file : file to load in the editor, can be a .hot file or an image file.
-
+
%1 はすでに起動しています。
-
+
translations path %1
-
+
setting language to : %1
-
-
+
+
successfully loaded data from %1
-
+
failed to load data from %1
@@ -1571,4 +1580,4 @@
背景色で塗りつぶす
-
\ No newline at end of file
+
Binary files /tmp/348z4ZDK76/hotshots-1.2.0/lang/hotshots_lt.qm and /tmp/4Pt98Io8rY/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 @@
-
+
+
+
-
+
-
+
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">Tikrinti ar yra atnaujinimų ...</a>
+
- Apie
+
- Nustatymai
+
- Informacija
+
- Žurnalas
+
-
+
- Qt versija %1
+
-
+
- Failas %1 nerastas...
+
-
+
- aptikta kalba: %1
+
-
+
- Automatinis aptikimas
+
-
+
- Numatytoji (jokios naudos iš vertimo)
+
-
+
- Norint pritaikyti naują vertimą reikia paleisti programą iš naujo.
-Ar norite paleisti programą iš naujo dabar?
+
-
+
- Ar norite atstatyti visus nustatymus į jų numatytąsias reikšmes?
-Jei taip, programa bus paleista iš naujo
+
-
+
- Pavyzdys:
+
@@ -86,359 +86,359 @@
- Apie
+
- Padėkos
+
- Pakeitimai
+
- Leidimas
+
- Nustatymai
+
- Paleidimas
+
- Kalba
+
- Aptikta kalba...
+
- Paleisti pranešimų srityje (sumažintą)
+
- Paleidžiant rodyti pasveikinimo ekraną
+
- Paleisti kartu su kompiuteriu
+
- Atstatyti nustatymus
+
- Pradžios ekranas su permatomu fonu
+
- Ekranvaizdis
+
- Automatiškai kopijuoti naują ekranvaizdį į iškarpinę
+
- Į išsaugotą failo vardą įterpiama dabartinė data ir laikas
+
- Failo varde įterpti datą ir laiką
+
- Numatytasis failo vardas:
+
- Formatas:
+
- Šablonas:
+
- Numatytasis saugomo failo formatas
+
- Numatytasis failo pavadinimas
+
- Papildomas efektas:
+
- Pasukti ekranvaizdį
+
- Kampas:
+
- Įrašyti langą su dekoracijomis
+
- Baigus veiksmą groti garsą
+
- Darant ekranvaizdį slėpti sąsają
+
- Iškarpinei/interneto tarnyboms priverstinai naudoti fono spalvą
+
- Keisti ekranvaizdžio dydį
+
- %
+
- Didžiausias plotis * aukštis
+
- 800
+
- 600
+
- Spartieji klavišai
+
- Naudoti sistemos sparčiuosius klavišus
+
- Įrašyti dabartinį ekraną
+
- Įrašyti visus ekranus (keli monitoriai)
+
- Įrašyti langą
+
- Įrašyti sritį
+
- Įrašyti laisvai pasirenkamą sritį
+
- Tinklas
+
- Numatytoji interneto tarnyba
+
- Kopijuoti įkelto failo URL į iškarpinę
+
- Kaip
+
- Nėra formato
+
- Momentinių pranešimų (IM) formatas
+
- HTML formatas
+
- BBCode formatas
+
- Naudotojo formatas
+
- @url@
+
- (*) @url@ yra įkeltojo failo URL
+
- Prisijungimui prie interneto naudoti tarpinį serverį
+
- Naudoti tarpinį serverį
+
- Serveris
+
- Tarpinis serveris
+
- Prievadas
+
- Naudoti tapatybės nustatymą
+
- Naudotojo vardas
+
- Naudotojo vardas
+
- Slaptažodis
+
- Tarpinio serverio slaptažodis
+
- Rodyti/Slėpti slaptažodį sąsajoje
+
- Rodyti slaptažodį
+
- Tarpinio serverio prievadas
+
- Baigus paleisti numatytąją naršyklę
+
- Įkėlimo tarnybos
+
- Informacija
+
- Palaikomi formatai (su Qt įskiepiais)
+
- Prieinami vertimai
+
- Žurnalas
+
@@ -446,18 +446,18 @@
- Paveikslėlis buvo sumažintas pagal įkėlimo tarnybos reikalavimus (%1x%2)
+
- Nepavyko įrašyti laikino failo %1
+
- sumažinti failo dydį iki ribos (%1/%2 bitai)
+
@@ -465,17 +465,17 @@
- %1 perdavimas baigėsi be klaidų
+
- %1 perdavimas baigėsi klaida (%2)
+
-
+
- Iš atsakymo gauti URl nepavyko
+
@@ -483,12 +483,12 @@
- DefaultUploaderSettings
+
- Šiai tarnybai nėra jokių parametrų
+
@@ -496,38 +496,38 @@
- Jokio papildomo efekto
+
- Paprastas šešėlio metimas
+
- Mesti šešėlį su rėmeliu
+
- Progresyvus permatomumas
+
- Apkirpti kampus
+
- Norėdami pasirinkti paspauskite kairiuoju mygtuku, norėdami pasirinkite grupę paspauskite Ctrl+kairysis mygtukas ir vilkite
+
- Kairysis pelės klavišas nustato centrą
+
@@ -539,100 +539,101 @@
- Norėdami sukurti formą paspauskite kairįjį pelės mygtuką ir vilkite pelę
+
- 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ą.
+
- Norėdami nustatyti paveikslėlio centrą paspauskite kairįjį pelės mygtuką ir vilkite pelę jei norite pakeisti dydį
+
- Paspauskite kairįjį mygtuką ir vilkite taip sukurdami formą, norėdami atlikti operaciją pasirinkite sritį ir paspauskite <Enter>
+
- Teksto elementų jau yra, ką norite daryti?
+
- išvalyti visus teksto elementus...
+
- atnaujinti fono paveikslėlį...
+
-
-
- Išvalyti redagavimus
+
+
+
+
-
-
- Išvalyti visus esamus elementus?
+
+
+
+
-
-
- Išvalyti dokumentą
+
+
+
-
-
- Sukurti naują dokumentą?
+
+
+
-
-
- Įkelti „HotShots“ failo nepavyko
+
+
+
-
-
- Klaida įkeliant „HotShots“ failą %1
+
+
+
-
+
- Išsaugoti „HotShots“ failą
+
-
+
- HotShots failai (*.hot)
+
-
+
- Išsaugoti „HotShots“ failo nepavyko
+
-
+
- Klaida saugant „HotShots“ failą %1
+
-
+
- Ekranvaizdžių redaktorius:
+
-
+
- Keisti mastelį x%1
+
@@ -640,202 +641,202 @@
- Ekranvaizdžių redaktorius
+
- Pasirinkti
+
- Piešti tekstą
+
- Piešti paprastą liniją
+
- Apskritimas
+
- Piešti poliliniją
+
- Piešti daugiakampį
+
- Piešti kreivę
+
- Apkirpti foną
+
- Piešti kvadratą
+
- Piešti elipsę
+
- Piešti rodyklę
+
- Piešti skaičius
+
- Paryškinti
+
- Didinimas
+
- Pridėti paveikslėlį
+
- Paslėpti
+
- Sumažinti šriftą
+
- Padidinti šriftą
+
- Keisti šriftą
+
- aAbB...
+
- Išeiti iš redaktoriaus
+
- Atverti failą
+
- Naujas dokumentas
+
- Importuoti paveikslėlį iš iškarpinės
+
- Išsaugoti redaguotą
+
- Išsaugoti kaip
+
- Kopijuoti į iškarpinę
+
- Eksportuoti paveikslėlį
+
- Įkelti paveikslėlį į internetą
+
- Sutalpinti lange
+
- Atstatyti mastelį
+
- Pridėti efektų fono paveikslėliui
+
- Įjungti/Išjungti elemento šešėlį
+
- Perstumti pasirinktus elementus žemyn
+
- Perstumti pasirinktus elementus žemyn
+
- Sukurti pasirinkto elemento kopiją
+
- Pašalinti visus elementus
+
- Pašalinti pasirinktus elementus
+
- Del
+
@@ -843,37 +844,37 @@
- Perskaityti failą %1 nepavyko: (%2)
+
- Projekto %1 išsaugoti nepavyko: %2
+
- Nepavyko įrašyti failo %1: (%2)
+
- Apdorojimo klaida eilutėje %1, stulpelyje %2: (%3)
+
- Failas nėra „HotShots“ failas!
+
- Konfigūracija automatiškai atnaujinta!
+
- Nežinoma „hotshots“ failo versija (%1).
+
@@ -881,12 +882,12 @@
- %1 perdavimas baigėsi be klaidų
+
- %1 perdavimas baigėsi klaida (%2)
+
@@ -894,7 +895,7 @@
- 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 @@
- Nepavyko prisijungti prie FTP serverio %1. Patikrinkite kompiuterio vardą.
+
- Prisijungta prie %1.
+
- %1 įkėlimas atšauktas
+
- sėkmingai įkelta į %1.
+
-
+
- %1 prieinama
+
-
+
- %1 serveryje %2 neprieinama
+
-
+
- %1 perdavimas baigėsi klaida
+
-
+
- %1 perdavimas baigėsi be klaidų
+
@@ -945,82 +946,82 @@
- FtpUploaderSettings
+
- Pradinis FTP aplankas
+
- @failo_vardas@ yra įkeltas failas
+
- Naudotojo vardas:
+
- Serveris:
+
- FTP slaptažodis
+
- Slaptažodis:
+
- Aplankas:
+
- Rodyti/Slėpti slaptažodį sąsajoje
+
- Rodyti slaptažodį
+
- FTP naudotojo vardas
+
- Nustatykite galutinį url
+
- ftp://ko_norite/@failo_vardas@
+
- FTP prievadas
+
- FTP serverio vardas
+
- Prievadas:
+
@@ -1028,139 +1029,144 @@
- %1 perdavimas baigėsi be klaidų
+
- %1 perdavimas baigėsi klaida (%2)
+
- %1 tarnyba atsakė su klaida (%2)
+
ImgurUploader
-
+
- %1 perdavimas baigėsi be klaidų
+
-
+
- %1 perdavimas baigėsi klaida (%2)
+
-
+
- Apdorojant serverio atsakymą įvyko klaida
+
MainWindow
-
+
- Išsaugojimo aplankas
+
-
+
- Registruoti %1 tarnybas
+
-
+
- Nepavyko sukurti saugyklos, patikrinti kodėl?! (%1)
+
-
+
- Jokio papildomo efekto
+
-
+
- Paprastas šešėlio metimas
+
-
+
- Mesti šešėlį su rėmeliu
+
-
+
- Progresyvus permatomumas
+
-
+
- Apiplėšyti kampus
+
-
-
+
+
- Įkelti paveikslėlį į internetą
+
-
+
- Nenustatyta numatytoji įkėlimo tarnyba!
+
-
+
- Įkėlimo tarnyba %1
+
-
+
- Numatytoji įkėlimo tarnyba (%1) netinkamai nustatyta, nenurodyti reikalingi parametrai!
+
-
+
- Įkelti paveikslėlį %1 į %2?
+
-
+
- Spausdinti dokumentą
+
-
+
- Įrašyti failą
+
-
+
- Paveikslėliai (*.%1)
+
-
+
- Išsaugoti nepavyko
+
-
+
- Klaida įrašant failą
+
-
+
- Sistemos dėklas
+
-
+
- Programa toliau veiks sistemos dėkle. Norėdami išjungti programą, sistemos dėklo piktogramos kontekstiniame meniu pasirinkite <b>Išeiti</b>.
+
+
+
+
+
+
@@ -1168,278 +1174,278 @@
- Pagrindinis langas
+
- Padaryti naują ekranvaizdį
+
- Įkeltojo URL
+
- Parametrai
+
- Ekranvaizdžio užlaikymas (s):
+
- Išsaugojimo kelias:
+
- Fo&tografavimo veiksena:
+
- Ekranvaizdžio užlaikymas sekundėmis
+
- Jokio vėlavimo
+
- Po ekranvaizdžio sukūrimo:
+
- Nieko nedaryti
+
- Automatiškai išsaugoti paveikslėlį
+
- Išsaugoti paveikslėlį (klausti naudotojo)
+
- Paleidimo redaktorius
+
- Išeiti
+
- Apie
+
- Nustatymai
+
- Išsaugoti ekranvaizdį
+
- Išsaugoti ekranvaizdį
+
- Rodyti sąsają
+
- Rodyti sąsają
+
- Kopijuoti į iškarpinę
+
- Kopijuoti į iškarpinę
+
- Pridėti anotacijas
+
- Pridėti anotacijas
+
- Įrašyti ekraną
+
- Įrašyti ekraną (dabartinį)
+
- Įrašyti visus ekranus
+
- Įrašyti visus ekranus (kelis monitorius)
+
- Įrašyti langą
+
- Įrašyti langą
+
- Įrašyti sritį
+
- Įrašyti sritį
+
- Žinynas
+
- Įkelti
+
- Įkelti paveikslėlį į internetą
+
- Įrašyti laisvai pasirenkamą sritį
+
- Spausdinti
+
QObject
-
+
- %1 rasta
+
- Ekranvaizdžių tvarkyklė.
+
- Naudojimas:
+
-
- [parinktys]
+
+
- Žinomos parinktys:
+
- --help - parodo šį pranešimą.
+
- --reset-config - išvalo išsaugotas parinktis.
+
- --no-singleinstance : leisti naudoti kelias programos kopijas (nerekomenduojama).
+
-
-
- pranešimas iš kitos kopijos.
+
+
+
-
+
- %1 jau paleistas!
+
-
+
- vertimų kelias %1
+
-
+
- kalba nustatoma į: %1
+
-
-
+
+
- duomenys iš „%1“ sėkmingai įkelti
+
-
+
- nepavyko įkelti duomenų iš „%1“
+
- stringToVariant(): Klaida skaičiuje (%1).
+
- <nėra paveikslėlio>
+
@@ -1447,7 +1453,7 @@
- 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
+
- Apskritimas
+
- Kvadratas
+
- Pasviręs brūkšnys
+
- Atvirkščiai įkypas brūkšnys
+
@@ -1483,47 +1489,47 @@
- Juoda
+
- Balta
+
- Raudona
+
- Žalia
+
- Mėlyna
+
- Žydra
+
- Purpurinė
+
- Oranžinė
+
- Pilka
+
@@ -1531,27 +1537,27 @@
- Ištisinė linija
+
- Punktyras
+
- Taškinis raštas
+
- Brūkšnys taškas raštas
+
- Brūkšnys taškas taškas raštas
+
@@ -1559,17 +1565,17 @@
- Jokio užpildo
+
- Užpildyti permatoma fono spalva
+
- Užpildyti fono spalva
+
-
\ No newline at end of file
+
Binary files /tmp/348z4ZDK76/hotshots-1.2.0/lang/hotshots_pl.qm and /tmp/4Pt98Io8rY/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 @@
-
+
+
+
-
+
-
+
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
-
+
Wersja Qt %1
-
+
Nie można odnaleźć pliku %1 przykro nam ...
-
+
wykryty język: %1
-
+
Auto-wykrywanie
-
+
Domyślny (bez używania tłumaczenia)
-
+
Aby zastosować nowe tłumaczenie należy uruchomić program ponownie .
Czy chcesz uruchomić program ponownie teraz?
-
+
Czy chcesz, zresetować wszystkie ustawienia do wartości domyślnych ?
Jeżeli tak, to program zostanie uruchomiony ponownie
-
+
Przykład:
@@ -473,7 +475,7 @@
%1 przetransferowano z błędem (%2)
-
+
Nie można wyodrębnić URL z odpowiedzi
@@ -574,62 +576,64 @@
uaktualnij obraz tła ...
-
+
+
+
+ Wczytywanie pliku HotShots nie powiodło się
+
+
+
+
+
+ Błąd ładowania pliku tShots %1
+
+
+
Anuluj edytowane
-
+
Wyczyścić wszystkie istniejące obiekty ?
-
+
Wyczyść dokument
-
+
Utworzyć nowy dokument ?
-
-
- Wczytywanie pliku HotShots nie powiodło się
-
-
-
-
- Błąd ładowania pliku tShots %1
-
-
-
+
Zapisz plik HotShots
-
+
Pliki HotShots (*.hot)
-
+
Nie udało się zapisać pliku HotShots
-
+
Błąd zapisywania pliku HotShot %1
-
+
Edytor Zrzutów:
-
+
Skalowanie x%1
@@ -919,22 +923,22 @@
pomyślnie wysłano na %1.
-
+
%1 jest dostępny
-
+
%1 nie jest dostępny na serwerze %2
-
+
%1 przetransferowano z błędem
-
+
%1 przetransferowano,bez błędów
@@ -1043,17 +1047,17 @@
ImgurUploader
-
+
%1 przetransferowano bez błędów
-
+
%1 przetransferowano z błędem (%2)
-
+
Wystąpił błąd podczas parsowania usługi odpowiadającej
@@ -1061,106 +1065,111 @@
MainWindow
-
+
Katalog zapisu
-
+
Rejestracja użytkowników %1
-
+
Nie można utworzyć katalogu z danymi, sprawdź dlaczego ?! (%1)
-
+
Bez efektów
-
+
Zwykły cień
-
+
Cień z obramowaniem
-
+
Progresywna przeźroczystość
-
+
Postrzępiona krawędź
-
-
+
+
Wyślij obraz do sieci
-
+
Nie określono żadnej domyślnej usługi wysyłającej !
-
+
Uploader %1
-
+
Domyślny upload-er (%1) raczej nie jest poprawnie skonfigurowany, nie dodano żadnej wartości do wymaganych parametrów !!
-
+
Wysłać obraz %1 do usługi %2 ?
-
+
-
+ Drukuj Dokument
-
+
Zapisz plik
-
+
Obrazy (*.%1)
-
+
Zapisywanie nieudane
-
+
Błąd zapisywania pliku
-
+
Zasobnik systemowy
-
+
Program będzie nadal działać w zasobniku systemowym. Aby go wyłączyć wybierz z meni kontekstowego w trayu <b>Zakończ</b>.
+
+
+
+
+
MainWindowClass
@@ -1354,13 +1363,13 @@
-
+ Drukuj
QObject
-
+
Znaleziono %1
@@ -1376,8 +1385,8 @@
-
- [opcje]
+
+
@@ -1400,33 +1409,33 @@
- No- singleinstance : włącz korzystanie z wielu instancji programu ( nie zalecane) .
-
-
- Wiadomość od drugiej instancji.
+
+
+
-
+
%1 jest już uruchomiony!
-
+
ścieżka tłumaczenia %1
-
+
ustawienie języka na : %1
-
-
+
+
Pomyślnie wczytano dane z „%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/348z4ZDK76/hotshots-1.2.0/lang/hotshots_ro.qm and /tmp/4Pt98Io8rY/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 @@
+
+
+
+
+
+
+
+
+ put your name here dear translator and the release of the translation file !!
+ Jaff (Oprea Nicolae) - ver.1.2
+
+
+
+ AboutDialog
+
+
+
+ <a href="%1">Verificare pentru nouă versiune...</a>
+
+
+
+
+ Despre
+
+
+
+
+ Preferinţe
+
+
+
+
+ Informaţii
+
+
+
+
+ Jurnal
+
+
+
+
+ Versiune Qt %1
+
+
+
+
+ Fişierul %1 nu a putut fi găsit, scuze ...
+
+
+
+
+ Limbă detectată: %1
+
+
+
+
+ Detectare automată
+
+
+
+
+ Iniţial (fără folosire fişiere traduceri)
+
+
+
+
+ Aplicaţia necesită repornire pentru a lua în seamă noua traducere,
+Doriţi să reporniţi aplicaţia acum ?
+
+
+
+
+ Dorţi resetarea preferinţelor la valorile implicite?
+Dacă da, atunci aplicaţia va fi repornită
+
+
+
+
+ Exemplu:
+
+
+
+ AboutDialogClass
+
+
+
+
+ Despre
+
+
+
+
+ Credite
+
+
+
+
+ Jurnal modificări
+
+
+
+
+ Versiune
+
+
+
+
+ Preferinţe
+
+
+
+
+
+ Pornire
+
+
+
+
+ Limbă
+
+
+
+
+ Limbă detectată...
+
+
+
+
+ Pornire în bara de notificări (minimizat)
+
+
+
+
+ Afişare imagine la pornire
+
+
+
+
+ Pornire automată cu sistemul
+
+
+
+
+ Resetare preferinţe
+
+
+
+
+ Instantaneu cu fundal transparent
+
+
+
+
+
+ Instantaneu
+
+
+
+
+ Copiere automată a instantaneului în clipboard
+
+
+
+
+ Inserează data curentă în numele fişierului salvat
+
+
+
+
+ Inserează DatăTimp în numele fişierului
+
+
+
+
+ Nume fişier implicit:
+
+
+
+
+ Format:
+
+
+
+
+ Şablon:
+
+
+
+
+ Format implicit salvare imagine
+
+
+
+
+ Nume fişier implicit
+
+
+
+
+ Efect postare:
+
+
+
+
+ Rotire instantaneu
+
+
+
+
+ Unghi:
+
+
+
+
+ Capturare fereastră cu decoraţiuni
+
+
+
+
+ Redare sunet la terminarea acţiunii
+
+
+
+
+ Ascunde interfaţa în timpul capturării ecranului
+
+
+
+
+ Forţare culoare fundal pentru clipboard/servicii web
+
+
+
+
+ Scalare instantaneu
+
+
+
+
+ %
+
+
+
+
+ Max lăţime * înălţime
+
+
+
+
+ 800
+
+
+
+
+ 600
+
+
+
+
+ Scurtături taste
+
+
+
+
+ Scurtături taste sistem
+
+
+
+
+ Capturează ecran curent
+
+
+
+
+ Capturează toate ecranele (multimonitor)
+
+
+
+
+ Capturează fereastră
+
+
+
+
+ Capturează regiune
+
+
+
+
+ Capturează regiune cu mîna liberă
+
+
+
+
+ Reţea
+
+
+
+
+ Serviciu web implicit
+
+
+
+
+ Copiază în clipboard adresa fişierului încărcat
+
+
+
+
+ ca
+
+
+
+
+ Fără format
+
+
+
+
+ Format Mesaj Instant (IM)
+
+
+
+
+ Format HTML
+
+
+
+
+ Format BBCode
+
+
+
+
+ Format utilizator
+
+
+
+
+ @url@
+
+
+
+
+ (*) @url@ este URL-ul încărcat
+
+
+
+
+ Foloseşte server proxy pentru conectarea la internet
+
+
+
+
+ Foloseşte proxy
+
+
+
+
+ Gazdă
+
+
+
+
+ Nume gazdă proxy
+
+
+
+
+ Port
+
+
+
+
+ Autentificare proxy
+
+
+
+
+ Nume utilizator
+
+
+
+
+ Nume utilizator proxy
+
+
+
+
+ Parolă
+
+
+
+
+ Parolă proxy
+
+
+
+
+ Arată/Ascunde parola în interfaţă
+
+
+
+
+ Arată parola
+
+
+
+
+ Port proxy
+
+
+
+
+ Pornire browser Internet implicit la terminare
+
+
+
+
+ Încărcători
+
+
+
+
+ Informaţii
+
+
+
+
+ Formate suportate (via plug-in-urilor Qt)
+
+
+
+
+ Traduceri disponibile
+
+
+
+
+ Jurnal
+
+
+
+ BaseUploader
+
+
+
+ Imaginea a fost redimensionată în fuuncţie de constrîngerile serviciului (%1x%2)
+
+
+
+
+
+ Nu se poate salva fişierul temporar %1
+
+
+
+
+ reduce mărimea fişierului în funcţie de limita (%1/%2 octeţi)
+
+
+
+ CanardPCUploader
+
+
+
+ %1 transferat fără erori
+
+
+
+
+ %1 transferat cu eroarea (%2)
+
+
+
+
+ Nu se poate extrage URL-ul din răspuns
+
+
+
+ DefaultUploaderSettingsClass
+
+
+
+ SetăriImpliciteUploader
+
+
+
+
+ Nu există parametrii pentru acest uploader
+
+
+
+ EditorWidget
+
+
+
+ Fără efect postare
+
+
+
+
+ Umbră simplă
+
+
+
+
+ Umbră cu margini
+
+
+
+
+ Opacitate progresivă
+
+
+
+
+ Margine zimţată
+
+
+
+
+ Clic stînga pentru selectare element, Ctrl+Clic stînga apoi trageţi pentru a selecta un grup de elemente
+
+
+
+
+
+ Clic stînga pentru a stabili centrul
+
+
+
+
+
+
+
+
+
+
+
+ Clic stînga apoi trageţi pentru a crea forma
+
+
+
+
+
+
+ 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
+
+
+
+
+ Clic stînga pentru a stabili centrul imaginii şi trageţi, dacă doriţi să modificaţi dimensiunea
+
+
+
+
+ Clic stînga, apoi trageţi pentru a crea forma, selectaţi zona şi apăsaţi <Enter> pentru a efectua operaţiunea
+
+
+
+
+ Există elemente de adnotare, ce doriţi să faceţi?
+
+
+
+
+ Şterge elementele adnotări...
+
+
+
+
+ actualizare imagine fundal...
+
+
+
+
+
+ Nu s-a reuşit încărcarea fişierului HotShots
+
+
+
+
+
+ Eroare la încărcarea fişierului HotShots %1
+
+
+
+
+ Şterge editare
+
+
+
+
+ Şterge toate elementele existente?
+
+
+
+
+ Curăţă document
+
+
+
+
+ Crează document nou?
+
+
+
+
+ Salvare fişier HotShots
+
+
+
+
+ Fişiere HotShots (*.hot)
+
+
+
+
+ Nu s-a reuşit salvarea fişierului HotShots
+
+
+
+
+ Eroare la salvarea fişierului HotShots %1
+
+
+
+
+ Editor instantaneu:
+
+
+
+
+ Scalare x%1
+
+
+
+ EditorWidgetClass
+
+
+
+ Editor instantaneu
+
+
+
+
+ Selectare
+
+
+
+
+ Desenare text
+
+
+
+
+ Desenare linie simplă
+
+
+
+
+ Încercuire
+
+
+
+
+ Desenare polilinie
+
+
+
+
+ Desenare poligon
+
+
+
+
+ Desenare linie curbată
+
+
+
+
+ Decupare imagine fundal
+
+
+
+
+ Desenare dreptunghi
+
+
+
+
+ Desenare elipsă
+
+
+
+
+ Desenare săgeată
+
+
+
+
+ Desenare etichetă numerotată
+
+
+
+
+ Evdenţiere
+
+
+
+
+ Lupă
+
+
+
+
+ Adaugă o imagine
+
+
+
+
+ Umbreşte
+
+
+
+
+ Micşorare mărime font
+
+
+
+
+ Mărire mărime font
+
+
+
+
+ Schimbare font
+
+
+
+
+ aAbB...
+
+
+
+
+ Închidere editor
+
+
+
+
+ Deschidere fişier
+
+
+
+
+ Document nou
+
+
+
+
+ Importă imagine din clipboard
+
+
+
+
+ Salvare editare
+
+
+
+
+ Salvare editare ca
+
+
+
+
+ Copiază în clipboard
+
+
+
+
+ Export imagine
+
+
+
+
+ Încărcare imagine pe web
+
+
+
+
+ Scalare pentru potrivire în fereastră
+
+
+
+
+ Resetare scalare
+
+
+
+
+ Adaugă efect postare la imaginea de fundal
+
+
+
+
+ Activare/Dezactivare umbrire elemente
+
+
+
+
+ Împinge elementele selectate în sus
+
+
+
+
+ Împinge elementele selectate în jos
+
+
+
+
+ Duplică elementul selectat
+
+
+
+
+ Şterge toate elementele
+
+
+
+
+ Şterge elementele selectate
+
+
+
+
+ Şterge
+
+
+
+ FileParser
+
+
+
+ Nu se poate citi fişierul %1: (%2)
+
+
+
+
+ Nu s-a reuşit salvarea proiectului %1 : %2
+
+
+
+
+ Nu se poate salva fişierul %1: (%2)
+
+
+
+
+ Eroare parsare la linia %1, coloana %2: (%3)
+
+
+
+
+ Acesta nu este un fişier HotShots!
+
+
+
+
+ Configurarea a fost actualizată în mod automat!
+
+
+
+
+ Versiune necunoscută a fişierului HotShots (%1).
+
+
+
+ FreeImageHostingUploader
+
+
+
+ %1 transferat fără erori
+
+
+
+
+ %1 transferat cu eroarea (%2)
+
+
+
+ FreehandGrabber
+
+
+
+ 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
+
+
+
+ Nu se poate conecta la serverul FTP de la%1. Vă rugăm să verificaţi dacă numele gazdei este corect.
+
+
+
+
+ Conectat la %1.
+
+
+
+
+ Anulare încărcare a %1
+
+
+
+
+ încărcat cu succes la %1.
+
+
+
+
+ %1 este disponibil
+
+
+
+
+ %1 nu este disponibil pe serverul %2
+
+
+
+
+ %1 transferat fără erori
+
+
+
+
+ %1 transferat fără erori
+
+
+
+ FtpUploaderSettingsClass
+
+
+
+ SetăriUploaderFTP
+
+
+
+
+ Folder FTP iniţial
+
+
+
+
+ @filename@ este fişierul încărcat
+
+
+
+
+ Nume utilizator:
+
+
+
+
+ Server:
+
+
+
+
+ Parolă FTP
+
+
+
+
+ Parolă:
+
+
+
+
+ Folder:
+
+
+
+
+ Arată/Ascunde parola în interfaţă
+
+
+
+
+ Arată parola
+
+
+
+
+ Nume utilizator FTP
+
+
+
+
+ Definire rezultat URL
+
+
+
+
+ ftp://cedoriţi/@filename@
+
+
+
+
+ Port FTP
+
+
+
+
+ Nume server FTP
+
+
+
+
+ Port:
+
+
+
+ ImageshackUploader
+
+
+
+ %1 transferat fără erori
+
+
+
+
+ %1 transferat cu eroarea (%2)
+
+
+
+
+ %1 răspuns serviciu cu eroarea (%2)
+
+
+
+ ImgurUploader
+
+
+
+ %1 transferat fără erori
+
+
+
+
+ %1 transferat cu eroarea (%2)
+
+
+
+
+ A apărut o eroare în timpul procesării răspunsului de serviciu
+
+
+
+ MainWindow
+
+
+
+ Folder salvare
+
+
+
+
+ Registrul a %1 uploaderi
+
+
+
+
+ Nu se poate crea locul de depozitare, verificaţi de ce?! (%1)
+
+
+
+
+ Fără efect postare
+
+
+
+
+ Umbră simplă
+
+
+
+
+ Umbră cu margini
+
+
+
+
+ Opacitate progresivă
+
+
+
+
+ Margine zimţată
+
+
+
+
+
+ Încărcare imagine pe web
+
+
+
+
+ Nici un serviciu iniţial web de încărcare este definit!
+
+
+
+
+ Încărcător %1
+
+
+
+
+ Uploader-ul implicit (%1) nu apare configurat corect, nici o valoare dată pentru parametrii necesari!
+
+
+
+
+ Încărcare imagine %1 către serviciul %2?
+
+
+
+
+ Imprimare document
+
+
+
+
+ Salvare fişier
+
+
+
+
+ Imagini (*.%1)
+
+
+
+
+ Salvare nereuşită
+
+
+
+
+ Eroare la salvarea fişierului
+
+
+
+
+ Bară sistem
+
+
+
+
+ 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.
+
+
+
+
+ mesaj de la o altă instanţă.
+
+
+
+ MainWindowClass
+
+
+
+ FereastraPrincipală
+
+
+
+
+
+ Luare instantaneu nou
+
+
+
+
+ URL încărcare
+
+
+
+
+ Parametrii
+
+
+
+
+ Întîrzîiere instantaneu:
+
+
+
+
+ Cale ieşire:
+
+
+
+
+ Mod cap&tură:
+
+
+
+
+ Întîrziere instantaneu în secunde
+
+
+
+
+ Fără întîrziere
+
+
+
+
+ După instantaneu:
+
+
+
+
+ Nu face nimic
+
+
+
+
+ Salvare automată imagine
+
+
+
+
+ Salvare imagine (întrebare utilizator)
+
+
+
+
+ Pornire editor
+
+
+
+
+ Închidere
+
+
+
+
+ Despre
+
+
+
+
+ Preferinţe
+
+
+
+
+ Salvare instantaneu
+
+
+
+
+ Salvare instantaneu
+
+
+
+
+ Arată interfaţă
+
+
+
+
+ Arată interfaţă
+
+
+
+
+ Copiază în clipboard
+
+
+
+
+ Copiază în clipboard
+
+
+
+
+ Adaugă adnotări
+
+
+
+
+ Adaugă adnotări
+
+
+
+
+ Capturează ecran
+
+
+
+
+ Capturează ecran (curent)
+
+
+
+
+ Capturează toate ecranele
+
+
+
+
+ Capturează toate ecranele (multi-monitorare)
+
+
+
+
+ Capturează fereastră
+
+
+
+
+ Capturează fereastră
+
+
+
+
+ Capturează regiune
+
+
+
+
+ Capturează regiune
+
+
+
+
+ Ajutor
+
+
+
+
+ Încărcare
+
+
+
+
+ Încărcare imagine pe web
+
+
+
+
+
+ Capturează regiune cu mîna liberă
+
+
+
+
+ Imprimare
+
+
+
+ QObject
+
+
+
+ %1 găsit
+
+
+
+
+ Manager instantanee.
+
+
+
+
+ Folosire:
+
+
+
+
+ [opţiuni] [fişier]
+
+
+
+
+ Următoarele opţiuni sînt cunoscute:
+
+
+
+
+ --help - arată acest ajutor.
+
+
+
+
+ --reset-config - şterge parametrii salvaţi ai preferinţelor.
+
+
+
+
+ --no-singleinstance : permite utilizarea instanţelor multiple ale programului (nerecomandat).
+
+
+
+
+ fişier : fişierul de încărcat în editor, Poate fi un fişier .hot sau un fişier imagine.
+
+
+
+
+ %1 deja rulează!
+
+
+
+
+ cale traduceri %1
+
+
+
+
+ setare limbă la: %1
+
+
+
+
+
+ date încărcate cu succes din %1
+
+
+
+
+ nu s-au putut încărca datele din %1
+
+
+
+
+ stringToVariant(): Eroare în cifre (%1).
+
+
+
+
+ <fără imagine>
+
+
+
+ RegionGrabber
+
+
+
+ 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
+
+
+
+
+ Cerc
+
+
+
+
+ Pătrat
+
+
+
+
+ Bară oblică
+
+
+
+
+ Bară oblică inversă
+
+
+
+ WidgetColor
+
+
+
+ Negru
+
+
+
+
+ Alb
+
+
+
+
+ Roşu
+
+
+
+
+ Verde
+
+
+
+
+ Albastru
+
+
+
+
+ Cyan
+
+
+
+
+ Magenta
+
+
+
+
+ Portocaliu
+
+
+
+
+ Gri
+
+
+
+ WidgetDashStyle
+
+
+
+ Linie solidă
+
+
+
+
+ Model liniuţe
+
+
+
+
+ Model punctat
+
+
+
+
+ Model liniuţă-punct
+
+
+
+
+ Model liniuţă-punct-punct
+
+
+
+ WidgetFillStyle
+
+
+
+ Fără umplere
+
+
+
+
+ Umplere cu culoare fundal translucidă
+
+
+
+
+ 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 @@
обновить изображение фона..
-
+
+
+
+ Ошибка открытия файла
+
+
+
+
+
+ Ошибка открытия файла %
+
+
+
Очистить редактируемое
-
+
Удалить все существующие элементы?
-
+
Очистить документ
-
+
Создать новый документ?
-
-
- Ошибка открытия файла
-
-
-
-
- Ошибка открытия файла %
-
-
-
+
Сохранить в HotShots файл
-
+
Файл HotShots (*.hot)
-
+
Ошибка сохранения в файл HotShots
-
+
Ошибка сохранения в файл HotShots %1
-
+
Редактирование скриншота
-
+
Масштаб x%1
@@ -1074,91 +1076,96 @@
Ошибка создания места сохранения (%1)
-
+
Без эффектов
-
+
Простая тень
-
+
Тень с границами
-
+
Размытие
-
+
Рваные края
-
-
+
+
Загрузить на веб сервис
-
+
Не опеределен веб сервис для загрузки по умолчанию.
-
+
Веб сервис %1
-
+
Веб сервис (%1) неправильно настроен.
-
+
Загрузить изображение %1 на веб сервис %2 ?
-
+
Печатать документ
-
+
Сохранить файл
-
+
Изображения (*.%1)
-
+
Ошибка сохранения
-
+
Ошибка сохранения файла
-
+
Трей
-
+
Программа минимизирована в трей. Для выхода из программы выберите <b>Выход</b> в контекстном меню программы в трее.
+
+
+
+
+
MainWindowClass
@@ -1374,8 +1381,8 @@
-
- [опции]
+
+
@@ -1398,33 +1405,33 @@
--no-singleinstance : Запуск множества копий программы (не рекомендуется).
-
-
- сообщения других копий.
+
+
+ Файл : в редактор можно загружать .hot файлы и файлы изображений
-
+
%1 уже запущен
-
+
путь к локализациям %1
-
+
установить язык %1
-
-
+
+
успешно загружены данные из %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 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
ලේඛනය පිරිසුදු කරන්න
-
+
අලුත් ලේඛනයක් සාදන්නද ?
-
-
-
-
-
-
-
-
-
-
-
+
හොට්ෂොට්ස් ගොනුව සුරකින්න
-
+
හොට්ෂොට්ස් ගොනු (*.hot)
-
+
හොට්ෂොට්ස් ගොනුව සුරැකීම අසාර්ථක විය
-
+
හොට්ෂොට්ස් ගොනුව සුරැකීමේ දෝෂයකි %1
-
+
ඡායාරූප සැකසුම:
-
+
පරිමාණය x%1
@@ -1074,91 +1076,96 @@
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
ගොනුව සුරකින්න
-
+
රූපය (*.%1)
-
+
සුරැකුම අසාර්ථක විය
-
+
ගොනුව සුරැකීමේ දෝෂයකි
-
+
-
+
+
+
+
+
+
MainWindowClass
@@ -1374,7 +1381,7 @@
-
+
@@ -1398,33 +1405,33 @@
-
-
+
+
-
+
-
+
-
+
-
-
+
+
-
+
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 @@
-
+
+
+
+ načítanie súboru HotShots zlyhalo
+
+
+
+
+
+ Chyba načítanie súboru HotShots %1
+
+
+
Vymazať úpravy
-
+
vymazať všetky existujúce položky?
-
+
Vymazať dokument
-
+
Vytvoriť nový dokument?
-
-
- načítanie súboru HotShots zlyhalo
-
-
-
-
- Chyba načítanie súboru HotShots %1
-
-
-
+
Uložiť súbor HotShots
-
+
Súbory HotShots (*.hot)
-
+
Ukladanie súboru HotShots zlyhalo
-
+
Chyba ukaldania súboru HotShots %1
-
+
Editor snímky:
-
+
Škálovať x%1
@@ -1076,91 +1078,96 @@
-
+
-
+
-
+
-
+
-
+
-
-
+
+
Nahrať obrázok na web
-
+
-
+
Nahrávanie %1
-
+
Predvolené nahrávanie (%1) vyzerá byť zle nastavené, chýba hodnota povinných parametrov!!!
-
+
Nahrať obrázok %1 do služby %2?
-
+
-
+
Uložiť súbor
-
+
Obrázky (*.%1)
-
+
Uloženie zlyhalo
-
+
Chyba ukladania súboru
-
+
Oznamovacia oblasť
-
+
Program ostane spustený v oznamovacej oblasti. Na ukončenie programu zvoľte <b>Skončiť</b> v kontextovom menu položky v oznamovacej oblasti.
+
+
+
+
+
MainWindowClass
@@ -1376,8 +1383,8 @@
-
- [voľby]
+
+
@@ -1400,33 +1407,33 @@
--no-singleinstance : zapína použitie viacerých inštancií programu (neodporúčané).
-
-
- správa z inej inštancie.
+
+
+
-
+
%1 už je spustený!!!
-
+
cesta prekladov %1
-
+
nastavenie jazyka na: %1
-
-
+
+
úspešne načítané dáta z %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 @@
ажурирај слику позадине...
-
+
+
+
+ Погрешно учитавање датотеке
+
+
+
+
+
+ Грешка учитавања датотеке %1
+
+
+
Очисти уређивач
-
+
Очисти све ставке?
-
+
Обриши докуменат
-
+
Креирати нов докуменат?
-
-
- Погрешно учитавање датотеке
-
-
-
-
- Грешка учитавања датотеке %1
-
-
-
+
Сачувај HotShots датотеку
-
+
HotShots датотеке (*.hot)
-
+
Неуспешно сачувавање
-
+
Грешка сачувавања датотеке %1
-
+
Уређивач снимка:
-
+
Скала x%1
@@ -1076,91 +1078,96 @@
Не могу да креирам смештај стоваришта, проверити зашто ?! (%1)
-
+
Без ефеката
-
+
Једноставна сенка
-
+
Сенка са ивицама
-
+
Погресивна непровидност
-
+
Поцепана ивица
-
-
+
+
Пошаљи на веб
-
+
Ни један сервис за слање није дефинисан!
-
+
Пошиљалац %1
-
+
Подразумеван пошиљалац (%1) не делује лепо подешен, вредност није дата за потребан параметар!!
-
+
Слање %1 на %2 ?
-
+
Штампај докуменат
-
+
Сачувај датотеку
-
+
Слике (*.%1)
-
+
Неуспешно сачувавање
-
+
Грешка сачувавања
-
+
Системска икона
-
+
Програм ће наставити да ради у систему. Да би зауставили програм, одабрати <b>Затвори</b> из контекстуелног менија.
+
+
+
+ порука од друге инстанце.
+
MainWindowClass
@@ -1376,8 +1383,8 @@
-
- [опције]
+
+ [опције][датотека]
@@ -1400,33 +1407,33 @@
--no-singleinstance : упали употребу више инстанце програма (није препоручено).
-
-
- порука од друге инстанце.
+
+
+ датотека: датотека да се учита у едитору, може да буде .hot или слика.
-
+
%1 већ ради!!
-
+
путања превода %1
-
+
Постављен језик на: %1
-
-
+
+
успешно учитавање податке од %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">Yeni sürüm kontrolü ...</a>
@@ -38,7 +38,7 @@
-
+ Qt sürümü %1
@@ -228,7 +228,7 @@
-
+ Pano/web hizmetleri için arkaplan zorlaması
@@ -338,12 +338,12 @@
-
+ @url@
-
+ (*) @url@ yüklenmiş URL dir
@@ -413,7 +413,7 @@
-
+ Bittiğinde varsayılan İnternet tarayıcısını başlat
@@ -465,17 +465,17 @@
-
+ %1 transferi hatasız sonuçlandı
-
+ %1 transferi hata ile sonuçlandı (%2)
-
+ Yanıttan URL alınamıyor.
@@ -496,32 +496,32 @@
-
+ Geçiş efekti yok
-
+ Basit gölge düşümü
-
+ Çerçevelerle gölge düşümü
-
+ Kademeli şeffaflık
-
+ Yırtık kenar
-
+ Öğeyi seçmek için sol tıklayın, bir grubun öğelerini CTRL+Sol Tıklama ile tutup seçin
@@ -546,7 +546,7 @@
-
+ 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 @@
-
+ Ek açıklama öğeleri mevcut, ne yapmak istersiniz ?
-
+ ek açıklamaların temizlenmesi
-
+ arkaplanı güncelle
+
+
+
+
+
+ HotShots dosyası yüklenemedi
+
+
+
+
+
+ %1 HotShots dosyası yükleme hatası
-
+
Düzenlemeyi temizle
-
+
Tüm çıkış yapılmış ögeleri temizle
-
+
Belgeyi temizle
-
+
Yeni belge oluşturulsun mu?
-
-
- HotShots dosyası yüklenemedi
-
-
-
-
- %1 HotShots dosyası yüklenme hatası
-
-
-
+
HotShots dosyasını kaydet
-
+
HotShots dosyası (*.hot)
-
+
HotShots dosyası kaydedilemedi
-
+
%1 HotShots dosyası kaydetme hatası
-
+
Ekran yakalayıcı düzenleyicisi
-
+
x%1 Ölçek
@@ -799,7 +801,7 @@
-
+ Arkaplan resmine bir geçiş efekti ekle
@@ -809,32 +811,32 @@
- Push selected elements up
+ Seçilen öğeleri yukarı al
-
+ Seçilen öğeleri alt sıralara indir
-
+ Seçilen öğreleri çoğalt
-
+ Tüm öğeleri temizle
-
+ Tüm öğeleri sil
-
+ Sil
@@ -842,37 +844,37 @@
-
+ Dosya okunamıyor %1: (%2)
-
+ Proje için kaydedilemedi %1: %2
-
+ Dosya kaydedilemiyor %1: (%2)
-
+ %1 satırında ayrıştırma hatası, sütun %2: (%3)
-
+ Bu bir "Hotshots" dosyası değil !!
-
+ Yapılandırma otomatik olarak güncellendi.
-
+ Sürümü bilinmeyen hotshots dosyası (%1).
@@ -880,12 +882,12 @@
-
+ %1 transferi hatasız sonuçlandı
-
+ %1 transferi hata ile sonuçlandı (%2)
@@ -893,7 +895,7 @@
-
+ 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 @@
-
+ %1 de FTP sunucusuna bağlantı kurulamıyor. Sunucu adının doğruluğunu kontrol edin.
-
+ %1 üzerinde oturum açıldı.
-
+ %1' i yüklemekten vazgeçildi
-
+ %1 üzerine yükleme başarılı
-
+ %1 uygun durumda
-
+ %2 sunucusu üzerindeki %1 uygun değil
-
+ %1 transferi hata ile sonuçlandı
-
+ transfer hatasız sonuçlandı %1
@@ -944,42 +946,42 @@
-
+ FTPYükleyiciAyarları
-
+ İlk FTP dizini
-
+ @dosyaadı@ yüklenmiş dosyadır
-
+ Kullanıcı adı:
-
+ Sunucu:
-
+ FTP şifresi
-
+ Şifre:
-
+ Dizin:
@@ -994,32 +996,32 @@
-
+ FTP kullanıcı adı
-
+ URL sonucunu tanımlayın
-
+ ftp://neistiyorsan/@dosyaadı@
-
+ Ftp portu
-
+ FTP Sunucu adı
-
+ Port:
@@ -1027,17 +1029,17 @@
-
+ %1 transferi hatasız sonuçlandı
-
+ %1 transferi hata ile sonuçlandı (%2)
-
+ %1 hizmeti hata döndürdü (%2)
@@ -1045,17 +1047,17 @@
-
+ %1 transferi hatasız sonuçlandı
-
+ %1 transferi hata ile sonuçlandı (%2)
-
+ Hizmet yanıtının ayrıştırılması sırasında bir hata oluştu
@@ -1063,102 +1065,107 @@
-
+ Kayıt Dizini
-
+ %1 yükleyici kaydı
-
+ Kayıt konumu oluşturulamıyor, sebebini araştırın ?! (%1)
-
+
-
+ geçiş efekti yok
-
+
-
+ Basit gölge düşümü
-
+
-
+ Çerçevelerle gölge düşümü
-
+
-
+ Kademeli şeffaflık
-
+
-
+ Yırtık kenar
-
-
+
+
Resmi ağ sayfasına yükle
-
+
-
+ Hiçbir varsayılan web yükleme hizmeti tanımlanmadı !
-
+
-
+ Yükleyici %1
-
+
-
+ 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.
-
+
-
+ %1 resim dosyası %2 hizmetine yüklensin mi ?
-
+
-
+ Belgeyi Yazdır
-
+
-
+ Dosyayı Kaydet
-
+
-
+ Resimler (*.%1)
-
+
-
+ Kaydetme başarısız
-
+
-
+ Dosya kaydetme başarısız
-
+
-
+ Sistem bildirim alanı
-
+
+ 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.
+
+
+
+
@@ -1167,78 +1174,78 @@
-
+ AnaPencere
-
+ Yeni bir görüntü yakala
-
+ Yüklenen URL
-
+ Parametreler
-
+ Ekran Yakalama Gecikmesi (s):
-
+ Çıktı yolu:
-
+ Ya&kalama kipi:
-
+ Saniye cinsinden yakalama gecikmesi
-
+ Gecikme yok
-
+ Ekran yakaladıktan sonra:
-
+ Hiçbirşey yapma
-
+ Resmi otomatik kaydet
-
+ Resmi kaydet (kullanıcıya sor)
-
+ Düzenleyiciyi çalıştır
-
+ Çıkış
@@ -1253,27 +1260,27 @@
-
+ Yakalanan görüntüyü kaydet
-
+ Ekran görüntüsünü kaydet
-
+ Arayüzü Göster
-
+ Arayüzü göster
-
+ Panoya Kopyala
@@ -1283,37 +1290,37 @@
-
+ Ek Açıklamalar Ekle
-
+ Ek açıklamalar ekle
-
+ Ekran Yakala
-
+ Ekran yakala (şimdiki)
-
+ Tüm ekranları yakala
-
+ Tüm ekranları yakala (çoklu-ekranlar)
-
+ Pencere yakala
@@ -1323,7 +1330,7 @@
-
+ Bölge Yakala
@@ -1333,12 +1340,12 @@
-
+ Yardım
-
+ Yükle
@@ -1354,7 +1361,7 @@
-
+ Yazdır
@@ -1362,83 +1369,83 @@
-
+ %1 bulundu
-
+ Ekran görüntüsü yöneticisi.
-
+ Kullanım:
-
+
-
+ Bilinen seçenekler şunlardır:
-
+ --help - bu yardımı görüntüler.
-
+ --reset-config - kaydedilmiş tercih parametlerini temizler, sıfırlar.
-
+ --no-singleinstance : programın aynı anda birden fazla sayıda çalıştırılabilmesini etkinleştirir. (önerilmez).
-
-
+
+
-
+
-
+ %1 zaten çalışıyor !!
-
+
-
+ çeviri yolu %1
-
+
-
+ dil %1 olarak ayarlandı
-
-
+
+
-
+ %1 konumundan veriler başarıyla yüklendi.
-
+
-
+ %1 konumundan veri yüklenemedi
-
+ stringToVariant(): Rakamda hata (%1).
-
+ <resim yok>
@@ -1446,7 +1453,7 @@
-
+ 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
-
+ Daire
-
+ Kare
-
+ Slash
-
+ Backslash
@@ -1482,47 +1489,48 @@
-
+ Siyah
-
+ Beyaz
-
+ Kırmızı
-
+ Yeşil
-
+ Mavi
-
+ Cam göbeği rengi
-
+
+Morumsu kırmızı
-
+ Turuncu
-
+ Gri
@@ -1530,27 +1538,27 @@
-
+ Koyu Çizgi
-
+ Şekillerin düzeni
-
+ Nokta düzeni
-
+ Şekil Nokta düzeni
-
+ Şekil Nokta Nokta düzeni
@@ -1558,17 +1566,17 @@
-
+ Doldurma yok
-
+ Saydam Arkaplan Rengi ile doldur
-
+ Arkaplan Rengi ile doldur
\ No newline at end of file
Binary files /tmp/348z4ZDK76/hotshots-1.2.0/lang/hotshots_vi.qm and /tmp/4Pt98Io8rY/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 @@
-
+
+
+
-
+
-
+
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ý
-
+
Phiên bản Qt %1
-
+
Tập tin %1 không được tìm thấy, rất tiếc...
-
+
phát hiện ngôn ngữ: %1
-
+
Tự động nhận dạng
-
+
Tự động (không sử dụng tiếng địa phương)
-
+
Ứ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?
-
+
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
-
+
Thí dụ:
@@ -473,7 +475,7 @@
%1 đã chuyển đổi với lỗi (%2)
-
+
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..
-
+
+
+
+ Thất bại khi tải tập tin HotShots
+
+
+
+
+
+ Lỗi khi tải tập tin HotShots %1
+
+
+
Làm rỗng chỉnh sửa
-
+
Làm rỗng mọi đối tượng đang thoát?
-
+
Làm rỗng tài liệu
-
+
Tạo một tài liệu mới?
-
-
- Thất bại khi tải tập tin HotShots
-
-
-
-
- Lỗi khi tải tập tin HotShots %1
-
-
-
+
Lưu tập tin HotShots
-
+
Tập tin HotShots (*.hot)
-
+
Thất bại khi lưu tập tin HotShots
-
+
Lỗi khi lưu tập tin HotShots %1
-
+
Chỉnh sửa Snapshot:
-
+
Tỉ lệ x%1
@@ -919,22 +923,22 @@
đã tải lên thành công tại %1.
-
+
Hiện có %1
-
+
Hiện không có %1 trên server %2
-
+
%1 đã được chuyển đổi và không có lỗi
-
+
%1 đã chuyển đổi và không có lỗi
@@ -1043,17 +1047,17 @@
ImgurUploader
-
+
%1 đã chuyển đổi và không có lỗi
-
+
%1 đã chuyển đổi với lỗi (%2)
-
+
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
-
+
Lưu thư mục
-
+
Đăng ký %1 người tải
-
+
Không thể tạo được địa điểm lưu trữ, kiểm tra tại sao ?! (%1)
-
+
Không có hiệu ứng post
-
+
Đổ bóng đơn giản
-
+
Đổ bóng kèm theo đường viền
-
+
Tình trạng mờ
-
+
Xé các góc cạnh
-
-
+
+
Tải hình ảnh lên web
-
+
Hiện dịch vụ tải lên nền web vẫn chưa được xác định !
-
+
Người tải lên %1
-
+
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 !!
-
+
Tải lên hình ảnh %1 đến dịch vụ %2?
-
+
In tài liệu
-
+
Lưu tập tin
-
+
Hình ảnh (*.%1)
-
+
Lưu thất bại
-
+
Lỗi khi lưu tập tin
-
+
Khay hệ thống
-
+
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.
+
+
+
+ thông điệp từ các tiến trình khác.
+
MainWindowClass
@@ -1360,7 +1369,7 @@
QObject
-
+
Đã tìm thấy %1
@@ -1376,8 +1385,8 @@
-
- [tùy chọn]
+
+ [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).
-
-
- thông điệp từ các tiến trình khác.
+
+
+ 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.
-
+
Hiện đang chạy %1 !!
-
+
đường dẫn dịch thuật %1
-
+
đặt ngôn ngữ : %1
-
-
+
+
đã tải thành công dữ liệu từ %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 @@
put your name here dear translator and the release of the translation file !!
-
+ V1.2 by taijuin
@@ -188,7 +188,7 @@
- 預設儲存影像格式
+ 預設儲存的圖片格式
@@ -446,7 +446,7 @@
-
+ 圖片已經調整過大小,根據上傳服務的限制 (%1x%2)
@@ -457,7 +457,7 @@
-
+ 減小檔案,根據限制 (%1/%2 bytes)
@@ -527,7 +527,7 @@
-
+ 按滑鼠左鍵以設定中心
@@ -539,7 +539,7 @@
-
+ 按滑鼠左鍵然後拖動以建立形狀
@@ -551,7 +551,7 @@
-
+ 按滑鼠左鍵以設定圖片中心和拖動(如果您想要改變大小)
@@ -571,65 +571,67 @@
- 更新的背景圖片...
+ 更新背景圖片...
+
+
+
+
+
+ 載入 HotShots 檔案失敗
-
+
+
+
+ 載入 HotShots 檔案 %1 時出錯
+
+
+
清除編輯
-
+
清除所有現有的項目嗎?
-
+
清除文件
-
+
建立一新的文件?
-
-
- 載入 HotShots 檔案失敗
-
-
-
-
- 載入 HotShots 檔案 %1 時出錯
-
-
-
+
儲存 HotShots 檔
-
+
HotShots 檔案 (*.hot)
-
+
儲存 HotShots 檔案失敗
-
+
-
+
快照編輯器:
-
+
縮放 x%1
@@ -714,7 +716,7 @@
- 添加一個圖片
+ 加入一個圖片
@@ -744,7 +746,7 @@
- 退出編輯器
+ 結束編輯器
@@ -759,7 +761,7 @@
- 從剪貼簿匯入影像
+ 從剪貼簿匯入圖片
@@ -779,12 +781,12 @@
- 匯出影像
+ 匯出圖片
- 上傳影像到網路上
+ 上傳圖片到網路上
@@ -799,7 +801,7 @@
- 加入後製效果到背景影像
+ 加入後製效果到背景圖片
@@ -1076,90 +1078,95 @@
-
+
無後製效果
-
+
簡單的陰影
-
+
具有邊框的陰影
-
+
漸進式不透明
-
+
撕邊的效果
-
-
+
+
- 上傳影像到網路
+ 上傳圖片到網路上
-
+
沒有預設明確的上傳Web服務!
-
+
-
+
-
+
-
+ 上傳圖片 %1 到 %2 服務?
-
+
列印文件
-
+
儲存檔案
-
+
-
+ 圖片 (*.%1)
-
+
儲存失敗
-
+
儲存檔案時出錯
-
+
-
+
- 本程式將保持運行在系統列中。要終止程式,請在系統列本程式圖示的選單中選擇<b>退出</b>。
+ 本程式將保持運行在系統匣中。要終止程式,請在系統匣本程式圖示的選單中選擇<b>結束</b>。
+
+
+
+
+
@@ -1223,12 +1230,12 @@
- 自動儲存影像
+ 自動儲存圖片
- 儲存影像(詢問使用者)
+ 儲存圖片(詢問使用者)
@@ -1238,7 +1245,7 @@
- 退出
+ 結束
@@ -1343,7 +1350,7 @@
- 上傳影像到網路
+ 上傳圖片到網路
@@ -1372,12 +1379,12 @@
-
+ 用法:
-
- [選項]
+
+
@@ -1400,33 +1407,33 @@
-
-
-
+
+
+ 檔案:檔案載入到編輯器中,可以是一個 .hot 檔或圖片檔。
-
+
%1 已經在執行中!
-
+
-
+
將語言設置為: %1
-
-
+
+
從 %1 載入資料成功
-
+
從 %1 載入資料失敗
@@ -1438,7 +1445,7 @@
-
+ <無圖片>
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