Projects
Multimedia
qx11grab
Sign Up
Log In
Username
Password
We truncated the diff of some files because they were too big. If you want to see the full diff for every file,
click here
.
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 2
View file
qx11grab.changes
Changed
@@ -1,4 +1,31 @@ ------------------------------------------------------------------- +Fri Nov 08 2013 - joerg.lorenzen@ki.tng.de + +- Update to 0.4.10 + - Update Rubberband + - Changes for FFmpeg 2.0 + - Add Support for Codec_ID and AVCodec_ID + - added patch to skip pulse version check for opensuse > 12.3 + - added dependency libnotify-tools + + Version 0.4.9 + - remove Deprecated Macros + + Version 0.4.8 + - add audio option which quantizer to use + + Version 0.4.7 + * BUGFIX https://bugs.gentoo.org/show_bug.cgi?id=443236 + - Make AVCodec encode compatible with libav9.1 + - Supported FFmpeg Versions: 0.10 1.0 1.1 + - Supported libav Versions: libav 9.1 + * Remove Obselete "cmp=+chroma" from ffpresets + * Remove Deprecated Member QString functions + + Version 0.4.6 + * Bugfix invalid regular expressions replacement with libfdk-aac predicate -afterburner + +------------------------------------------------------------------- Mon Dec 10 23:55:11 UTC 2012 - fisiu@opensuse.org - Update to 0.4.5:
View file
qx11grab.spec
Changed
@@ -17,13 +17,16 @@ # Name: qx11grab -Version: 0.4.5 +Version: 0.4.10 Release: 0 License: GPL-3.0 Summary: Qt4 applet for recording x11 windows with ffmpeg Url: http://qx11grab.hjcms.de Group: Productivity/Multimedia/Other Source: http://qx11grab.hjcms.de/downloads/%{version}/%{name}-%{version}.tar.bz2 +## patch to skip pulse version check for open SUSE > 12.3, +## configure fails because version can't be parsed (4.0-270-g9490a) +Patch0: qx11grab-skip_pulse_version_check.patch BuildRequires: cmake >= 2.8.0 BuildRequires: libkde4-devel BuildRequires: update-desktop-files @@ -36,10 +39,14 @@ BuildRequires: pkgconfig(libavformat) >= 52.78.3 BuildRequires: pkgconfig(libavutil) >= 50.24.0 BuildRequires: pkgconfig(libpulse) => 0.9 +BuildRequires: pkgconfig(libv4l2) +BuildRequires: libnotify-tools +BuildRequires: fdupes # for building extra icons BuildRequires: inkscape BuildRoot: %{_tmppath}/%{name}-%{version}-build +%kde4_runtime_requires %description qx11grab is a systray program that uses FFmpeg for recording X11 desktop @@ -50,8 +57,12 @@ %prep %setup -q +%if 0%{?suse_version} > 1230 +%patch0 +%endif %build +export CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS" mkdir build && cd build cmake .. \ %ifarch x86_64 @@ -61,7 +72,8 @@ -DCMAKE_LIBDIR=%{_libdir} \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DINSTALL_EXTRA_FFPRESETS=ON \ - -DENABLE_KDE_SUPPORT=ON + -DENABLE_KDE_SUPPORT=ON \ + -DENABLE_WEBCAM_FILTER=TRUE make %{?_smp_mflags} %install @@ -69,6 +81,8 @@ %make_install %suse_update_desktop_file -r qx11grab Qt KDE Utility Applet +%fdupes %{buildroot} + %clean %{?buildroot:rm -rf %{buildroot}}
View file
qx11grab-skip_pulse_version_check.patch
Added
@@ -0,0 +1,14 @@ +--- modules/FindPulse.cmake.orig 2013-11-09 01:05:48.794677037 +0100 ++++ modules/FindPulse.cmake 2013-11-09 01:05:48.831676303 +0100 +@@ -45,9 +45,9 @@ + # Optional - pulseaudio library target + #============================================================================= + IF (PULSE_FOUND) +- INCLUDE (MacroEnsureVersion) ++## INCLUDE (MacroEnsureVersion) + ## from pulse version 1.1 to 2.0 the pulsecommon library was moved in a sub directory +- MACRO_ENSURE_VERSION_RANGE (${PULSE_MIN_VERSION} ${PULSE_VERSION} "1.9" PULSE_OLD_API) ++## MACRO_ENSURE_VERSION_RANGE (${PULSE_MIN_VERSION} ${PULSE_VERSION} "1.9" PULSE_OLD_API) + + IF (NOT PULSE_OLD_API) + MESSAGE (STATUS " search pulseaudio linker target for pulse>=${PULSE_VERSION}")
View file
qx11grab-0.4.10.tar.bz2/.gitmodules
Added
@@ -0,0 +1,3 @@ +[submodule "ffmpeg"] + path = utils/ffmpeg + url = ffmpeg:ffmpeg
View file
qx11grab-0.4.5.tar.bz2/BUGS -> qx11grab-0.4.10.tar.bz2/BUGS
Changed
@@ -1,5 +1,5 @@ -* Please Report Bugs to : https://launchpad.net/~juergen-heinemann/+archive/qx11grab.hjcms.de +* Please Report Bugs to : heinemann DOT juergen AT {online OR hjcms} DOT de * When writing your bug report, please include (uncompressed): - The exact command line Script e.g.: /tmp/qx11grab_$USER.sh
View file
qx11grab-0.4.10.tar.bz2/BUILD_TESTS
Added
@@ -0,0 +1,5 @@ +Building with FFmpeg v1.0 OK +Building with FFmpeg v2.0 OK +Building with FFmpeg v0.10 OK +Building with FFmpeg v1.2 OK +Building with libav v9.8 OK
View file
qx11grab-0.4.5.tar.bz2/CMakeLists.txt -> qx11grab-0.4.10.tar.bz2/CMakeLists.txt
Changed
@@ -38,7 +38,7 @@ SET (QX11GRAB_VERSION_MAJOR 0) SET (QX11GRAB_VERSION_MINOR 4) -SET (QX11GRAB_VERSION_RELEASE 5) +SET (QX11GRAB_VERSION_RELEASE 10) SET (QX11GRAB_VERSION_DEVELOPMENT "") SET (QX11GRAB_VERSION "${QX11GRAB_VERSION_MAJOR}.${QX11GRAB_VERSION_MINOR}.${QX11GRAB_VERSION_RELEASE}${QX11GRAB_VERSION_DEVELOPMENT}") SET (QX11GRAB_DBUS_DOMAIN_NAME "de.hjcms.qx11grab") @@ -72,7 +72,7 @@ SET (QX11GRAB_LDFLAGS "" CACHE STRING "additional project linker flags") IF (CMAKE_BUILD_TYPE STREQUAL "Debug") - SET (QX11GRAB_LDFLAGS "-Wl,--build-id") + SET (QX11GRAB_LDFLAGS "-Wl,--build-id -Wl,--warn-common") ENDIF(CMAKE_BUILD_TYPE STREQUAL "Debug") IF (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") @@ -81,7 +81,8 @@ OPTION (BUILD_WERROR "Build with -Werror" OFF) IF(BUILD_WERROR) - SET (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Werror") + SET (QX11GRAB_LDFLAGS "-Wl,--build-id -Wl,--warn-common -Wl,--warn-constructors -Wl,--warn-multiple-gp") + SET (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Werror -Wno-unused-local-typedefs") ENDIF (BUILD_WERROR) SET (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DQX11GRAB_DEBUG") @@ -163,6 +164,7 @@ MESSAGE (FATAL_ERROR "X11 or XRandr not found") ENDIF (NOT XLIBS_FOUND) + ############################################################## ## DBus-1 ## The current stable branch is 1.4.x @@ -193,6 +195,16 @@ ENDIF (DBUS_FOUND) ############################################################## +## libnotify>=0.6 +## ftp://ftp.gnome.org/pub/gnome/sources/libnotify/ +############################################################## + +FIND_PROGRAM (NOTIFYSEND_BINARY NAMES notify-send) +IF (NOTIFYSEND_BINARY_FOUND) + MESSAGE (STATUS "libnotify:notify-send exists") +ENDIF (NOTIFYSEND_BINARY_FOUND) + +############################################################## ## Inkscape ############################################################## @@ -204,6 +216,52 @@ ENDIF (INKSCAPE_BINARY) ############################################################## +## my debugger targets +############################################################## + +FIND_PROGRAM (VALGRIND_BINARY NAMES valgrind) +IF (VALGRIND_BINARY) + SET (VALGRIND_OPTIONS + --tool=memcheck --leak-check=full --show-leak-kinds=all --trace-children=yes --track-origins=yes + CACHE STRING "force my default options to ignore ~/.valgrindrc" FORCE + ) + ADD_CUSTOM_TARGET(memcheck + COMMAND ${VALGRIND_BINARY} ${VALGRIND_OPTIONS} ./${CMAKE_PROJECT_NAME} + WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} + COMMENT "run the valgrind tool to called memcheck" + VERBATIM + ) +ENDIF (VALGRIND_BINARY) + +FIND_PROGRAM (GDB_BINARY NAMES gdb) +IF (GDB_BINARY) + SET (GDB_OPTIONS + --nh --directory=${CMAKE_CURRENT_SOURCE_DIR}/src + CACHE STRING "force my default options to ignore ~/.gdbinit" FORCE + ) + ADD_CUSTOM_TARGET(gdb + COMMAND ${GDB_BINARY} ${GDB_OPTIONS} ./${CMAKE_PROJECT_NAME} + WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} + COMMENT "run the gdb debugger" + VERBATIM + ) +ENDIF (GDB_BINARY) + +FIND_PROGRAM (DDD_BINARY NAMES ddd) +IF (DDD_BINARY) + SET (DDD_OPTIONS + -x --nh --directory=${CMAKE_CURRENT_SOURCE_DIR}/src + CACHE STRING "create my default options to ignore ~/.gdbinit" FORCE + ) + ADD_CUSTOM_TARGET(ddd + COMMAND ${DDD_BINARY} ${DDD_OPTIONS} ./${CMAKE_PROJECT_NAME} + WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} + COMMENT "run the ddd debugger" + VERBATIM + ) +ENDIF (DDD_BINARY) + +############################################################## ## INCLUDES ############################################################## @@ -310,6 +368,14 @@ ) ############################################################## +## Application Package (PackageKit) +############################################################## + +CONFIGURE_FILE (qx11grab.app.cmake + ${ARCHIVE_OUTPUT_PATH}/info +) + +############################################################## ## RPM/PKGBUILD Helper ############################################################## @@ -343,6 +409,14 @@ ) ############################################################## +## cppcheck +############################################################## + +CONFIGURE_FILE (qx11grab.cppcheck.cmake + ${CMAKE_CURRENT_SOURCE_DIR}/qx11grab.cppcheck +) + +############################################################## ## CPack ############################################################## INCLUDE (QX11Grab.cpack) @@ -388,6 +462,7 @@ summary (ENABLE_WEBCAM_FILTER "webcam filter" TRUE) MESSAGE ("") MESSAGE ("Optional Packages:") +summary (NOTIFYSEND_BINARY "notify-send" TRUE) summary (INKSCAPE_BINARY "inkscape" TRUE) summary (PULSE_FOUND "pulseaudio" TRUE) summary (KDE4_FOUND "kde4" TRUE)
View file
qx11grab-0.4.5.tar.bz2/ChangeLog -> qx11grab-0.4.10.tar.bz2/ChangeLog
Changed
@@ -1,3 +1,28 @@ +Version 0.4.10 + - Update Rubberband + - Changes for FFmpeg 2.0 + - Add Support for Codec_ID and AVCodec_ID + +Version 0.4.9 + - remove Deprecated Macros + +Version 0.4.8 + - add audio option which quantizer to use + +Version 0.4.7 +* BUGFIX https://bugs.gentoo.org/show_bug.cgi?id=443236 + - Make AVCodec encode compatible with libav9.1 + - Supported FFmpeg Versions: 0.10 1.0 1.1 + - Supported libav Versions: libav 9.1 +* Remove Obselete "cmp=+chroma" from ffpresets +* Remove Deprecated Member QString functions + +Version 0.4.6 +* Bugfix invalid regular expressions replacement with libfdk-aac predicate -afterburner + +Version 0.4.5 +* Add FFmpeg v0.11 v1.0 Support + Version 0.4.4 * Czech and Lithuanian translation update * fix screen initialization with multiple Xserver layout configurations
View file
qx11grab-0.4.5.tar.bz2/INSTALL -> qx11grab-0.4.10.tar.bz2/INSTALL
Changed
@@ -2,17 +2,18 @@ *** WARNING - This Application is NOT testet on Mac OS X and incompatible with Windows *** REQUIREMENTS: - - Qt 4 >= 4.7.2 (required) http://qt.nokia.com/products/ - - Oxygen Icon Theme >= 4.6.0 (required) ftp://ftp.kde.org/pub/kde/stable/ - - FFmpeg >= 0.9 (required) 0.10 (recommended) http://www.ffmpeg.org - - libavformat >= 52.78.3 (required) 53.24.0 (recommended) http://www.ffmpeg.org - - libavcodec >= 52.86.1 (required) 52.20.0 (recommended) http://www.ffmpeg.org - - libavutil >= 50.24.0 (required) 51.32.0 (recommended) http://www.ffmpeg.org - - libavfilter >= 2.4.0 (required) 2.61.100 (recommended) http://www.ffmpeg.org - - pulseaudio >= 0.9 (required) 1.1 (recommended) http://pulseaudio.org/ - - alsa >= 1.0.14 (required) 1.0.24 (recommended) http://alsa-project.org - - dbus-1 >= 1.4.12 (required) 1.4.16 (recommended) http://www.freedesktop.org/wiki/Software/dbus - - cmake >= 2.8.0 (required for build) http://www.cmake.org + - Qt 4 >= 4.7.4 (required) http://qt.nokia.com/products/ (qt5 not supported) + - Oxygen Icon Theme >= 4.7.0 (required) ftp://ftp.kde.org/pub/kde/stable/ + - FFmpeg >= 0.10 (required) 1.1 (recommended) http://www.ffmpeg.org + - libavformat >= 53.32.100 (required) 54.59.106 (recommended) http://www.ffmpeg.org + - libavcodec >= 53.61.100 (required) 54.86.100 (recommended) http://www.ffmpeg.org + - libavutil >= 51.35.100 (required) 52.13.100 (recommended) http://www.ffmpeg.org + - libavfilter >= 2.61.100 (required) 2.61.100 (recommended) http://www.ffmpeg.org + - pulseaudio >= 0.9 (required) 3.0 (recommended) http://pulseaudio.org/ + - alsa >= 1.0.14 (required) 1.0.26 (recommended) http://alsa-project.org + - dbus-1 >= 1.4.12 (required) 1.6.4 (recommended) http://www.freedesktop.org/wiki/Software/dbus + - v4l2 >= 0.9.3 (optional) http://linuxtv.org/ + - cmake >= 2.8.7 (required for build) http://www.cmake.org Default INSTALLATION: 1) create a subdirectory build in source home directory @@ -33,7 +34,7 @@ -DCMAKE_BUILD_TYPE:STRING=[Debug|Release|RelWithDebInfo|MinSizeRel] The FFMPEG_SUFFIX option allow you to set different pkg-config Version - Example: -DFFMPEG_SUFFIX:STRING=_09x will search ${prefix}/${lib}/pkgconfig/libavformat_09x.pc + Example: -DFFMPEG_SUFFIX:STRING=_1.1x will search ${prefix}/${lib}/pkgconfig/libavformat_1.1x.pc Optional for FFpresets Support add: -DINSTALL_EXTRA_FFPRESETS:BOOL=ON @@ -137,7 +138,7 @@ | | |-- position_top_right.png | | `-- position_unknown.png | `-- qx11grab.png - |-- qt + |-- qt* | `-- translations | |-- qx11grab_cs.qm | |-- qx11grab_de.qm
View file
qx11grab-0.4.5.tar.bz2/TODO -> qx11grab-0.4.10.tar.bz2/TODO
Changed
@@ -1,1 +1,1 @@ -Grabbing Cloned Desktops +Fade IN/OUT Comments feature
View file
qx11grab-0.4.10.tar.bz2/configure
Added
@@ -0,0 +1,40 @@ +#!/usr/bin/env bash +######################################################################################## +# This file is part of the qx11grab project +# +# Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public License +# along with this library; see the file COPYING.LIB. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. +######################################################################################## + +target="`dirname $0`" + +mkdir -p /tmp/build-qx11grab + +prefix="`${QMAKE:-"qmake"} -query QT_INSTALL_PREFIX 2> /dev/null`" + +pushd /tmp/build-qx11grab + +/usr/bin/cmake -Wno-dev \ + -DCMAKE_INSTALL_PREFIX:PATH=${prefix:-"/usr/local"} \ + -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \ + -DENABLE_EXPERIMENTAL:BOOL=OFF \ + -DINSTALL_FFPRESETS:BOOL=OFF \ + $CMAKE_EXTRAS $@ ${target}/ + +popd + +
View file
qx11grab-0.4.5.tar.bz2/ffpresets/libx264-QX11Grab.ffpreset -> qx11grab-0.4.10.tar.bz2/ffpresets/libx264-QX11Grab.ffpreset
Changed
@@ -1,6 +1,5 @@ coder=1 flags=+loop -cmp=+chroma partitions=+parti8x8+parti4x4+partp8x8+partb8x8 me_method=hex subq=6
View file
qx11grab-0.4.5.tar.bz2/ffpresets/libx264-default.ffpreset -> qx11grab-0.4.10.tar.bz2/ffpresets/libx264-default.ffpreset
Changed
@@ -1,6 +1,5 @@ coder=1 flags=+loop -cmp=+chroma partitions=+parti8x8+parti4x4+partp8x8+partb8x8 me_method=hex subq=7
View file
qx11grab-0.4.5.tar.bz2/ffpresets/libx264-fast.ffpreset -> qx11grab-0.4.10.tar.bz2/ffpresets/libx264-fast.ffpreset
Changed
@@ -1,6 +1,5 @@ coder=1 flags=+loop -cmp=+chroma partitions=+parti8x8+parti4x4+partp8x8+partb8x8 me_method=hex subq=6
View file
qx11grab-0.4.5.tar.bz2/ffpresets/libx264-faster.ffpreset -> qx11grab-0.4.10.tar.bz2/ffpresets/libx264-faster.ffpreset
Changed
@@ -1,6 +1,5 @@ coder=1 flags=+loop -cmp=+chroma partitions=+parti8x8+parti4x4+partp8x8+partb8x8 me_method=hex subq=4
View file
qx11grab-0.4.5.tar.bz2/ffpresets/libx264-hq.ffpreset -> qx11grab-0.4.10.tar.bz2/ffpresets/libx264-hq.ffpreset
Changed
@@ -1,6 +1,5 @@ coder=1 flags=+loop -cmp=+chroma partitions=+parti8x8+parti4x4+partp8x8+partb8x8 me_method=umh subq=8
View file
qx11grab-0.4.5.tar.bz2/ffpresets/libx264-max.ffpreset -> qx11grab-0.4.10.tar.bz2/ffpresets/libx264-max.ffpreset
Changed
@@ -1,6 +1,5 @@ coder=1 flags=+loop -cmp=+chroma partitions=+parti8x8+parti4x4+partp8x8+partp4x4+partb8x8 me_method=tesa subq=10
View file
qx11grab-0.4.5.tar.bz2/ffpresets/libx264-medium.ffpreset -> qx11grab-0.4.10.tar.bz2/ffpresets/libx264-medium.ffpreset
Changed
@@ -1,6 +1,5 @@ coder=1 flags=+loop -cmp=+chroma partitions=+parti8x8+parti4x4+partp8x8+partb8x8 me_method=hex subq=7
View file
qx11grab-0.4.5.tar.bz2/ffpresets/libx264-placebo.ffpreset -> qx11grab-0.4.10.tar.bz2/ffpresets/libx264-placebo.ffpreset
Changed
@@ -1,6 +1,5 @@ coder=1 flags=+loop -cmp=+chroma partitions=+parti8x8+parti4x4+partp8x8+partp4x4+partb8x8 me_method=tesa subq=10
View file
qx11grab-0.4.5.tar.bz2/ffpresets/libx264-slow.ffpreset -> qx11grab-0.4.10.tar.bz2/ffpresets/libx264-slow.ffpreset
Changed
@@ -1,6 +1,5 @@ coder=1 flags=+loop -cmp=+chroma partitions=+parti8x8+parti4x4+partp8x8+partb8x8 me_method=umh subq=8
View file
qx11grab-0.4.5.tar.bz2/ffpresets/libx264-slower.ffpreset -> qx11grab-0.4.10.tar.bz2/ffpresets/libx264-slower.ffpreset
Changed
@@ -1,6 +1,5 @@ coder=1 flags=+loop -cmp=+chroma partitions=+parti8x8+parti4x4+partp8x8+partp4x4+partb8x8 me_method=umh subq=9
View file
qx11grab-0.4.5.tar.bz2/ffpresets/libx264-ultrafast.ffpreset -> qx11grab-0.4.10.tar.bz2/ffpresets/libx264-ultrafast.ffpreset
Changed
@@ -1,6 +1,5 @@ coder=0 flags=-loop -cmp=+chroma partitions=-parti8x8-parti4x4-partp8x8-partb8x8 me_method=dia subq=0
View file
qx11grab-0.4.5.tar.bz2/ffpresets/libx264-veryfast.ffpreset -> qx11grab-0.4.10.tar.bz2/ffpresets/libx264-veryfast.ffpreset
Changed
@@ -1,6 +1,5 @@ coder=1 flags=+loop -cmp=+chroma partitions=+parti8x8+parti4x4-partp8x8-partb8x8 me_method=dia subq=1
View file
qx11grab-0.4.5.tar.bz2/ffpresets/libx264-veryslow.ffpreset -> qx11grab-0.4.10.tar.bz2/ffpresets/libx264-veryslow.ffpreset
Changed
@@ -1,6 +1,5 @@ coder=1 flags=+loop -cmp=+chroma partitions=+parti8x8+parti4x4+partp8x8+partp4x4+partb8x8 me_method=umh subq=10
View file
qx11grab-0.4.10.tar.bz2/i18n/calculate_completion.sh
Added
@@ -0,0 +1,23 @@ +#!/usr/bin/env bash +# +# This script was written to get some data on how far the various translations are +# compared to each other +# +# This script is donated to the public domain +# +# Klaas van Gend, 2008 + +printf "\n translation file %%ready (unfinished/(total-obsolete))\n" +printf '=============================================================\n' +for I in `ls -1 *.ts`; +do + UNFINISHED=`grep 'type="unfinished"' $I | wc -l`; + OBSOLETE=`grep 'obsolete' $I | wc -l`; + MSGLINES=`grep '</message>' $I | wc -l`; + let "REALLINES=$MSGLINES-$OBSOLETE"; + let "PERCENT=(100*$UNFINISHED)/$REALLINES"; + let "FINISHED=100-$PERCENT"; + printf "% 18s : % 4d%% %d/(%d-%d)\n" $I $FINISHED $UNFINISHED $MSGLINES $OBSOLETE ; +done +printf "\n" +
View file
qx11grab-0.4.5.tar.bz2/i18n/qt_de.ts -> qx11grab-0.4.10.tar.bz2/i18n/qt_de.ts
Changed
@@ -2219,6 +2219,40 @@ </message> </context> <context> + <name>QDeclarativeTypeData</name> + <message> + <source>Type %1 unavailable</source> + <translation type="obsolete">Der Typ %1 ist nicht verfügbar</translation> + </message> + <message> + <source>Namespace %1 cannot be used as a type</source> + <translation type="obsolete">Der Namensraum %1 kann nicht als Typangabe verwendet werden</translation> + </message> + <message> + <source>%1 %2</source> + <translation type="obsolete">%1 %2</translation> + </message> +</context> +<context> + <name>QDeclarativeTypeLoader</name> + <message> + <source>Script %1 unavailable</source> + <translation>Das Skript %1 ist nicht verfügbar</translation> + </message> + <message> + <source>Type %1 unavailable</source> + <translation>Der Typ %1 ist nicht verfügbar</translation> + </message> + <message> + <source>Namespace %1 cannot be used as a type</source> + <translation>Der Namensraum %1 kann nicht als Typangabe verwendet werden</translation> + </message> + <message> + <source>%1 %2</source> + <translation>%1 %2</translation> + </message> +</context> +<context> <name>QDeclarativeVME</name> <message> <source>Unable to create object of type %1</source> @@ -2514,6 +2548,10 @@ <source>Cannot create %1 for output</source> <translation>%1 kann nicht erstellt werden</translation> </message> + <message> + <source>No file engine available or engine does not support UnMapExtension</source> + <translation>Es ist kein Datei-Engine verfügbar oder der gegenwärtig aktive Engine unterstützt die UnMap-Erweiterung nicht</translation> + </message> </context> <context> <name>QFileDialog</name> @@ -3483,6 +3521,18 @@ <source>Cannot resolve symbol "%1" in %2: %3</source> <translation>Das Symbol "%1" kann in %2 nicht aufgelöst werden: %3</translation> </message> + <message> + <source>'%1' is not an ELF object (%2)</source> + <translation>'%1' ist keine ELF-Objektdatei (%2)</translation> + </message> + <message> + <source>'%1' is not an ELF object</source> + <translation>'%1' ist keine ELF-Objektdatei</translation> + </message> + <message> + <source>'%1' is an invalid ELF object (%2)</source> + <translation>'%1' ist keine gültige ELF-Objektdatei (%2)</translation> + </message> </context> <context> <name>QLineEdit</name> @@ -3580,6 +3630,10 @@ <source>%1: Unknown error %2</source> <translation>%1: Unbekannter Fehler %2</translation> </message> + <message> + <source>%1: Access denied</source> + <translation>%1: Zugriff verweigert</translation> + </message> </context> <context> <name>QMYSQLDriver</name> @@ -3766,7 +3820,7 @@ <translation><h3>Über Qt</h3><p>Dieses Programm verwendet Qt Version %1.</p></translation> </message> <message> - <source><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p><p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://qt.nokia.com/">qt.nokia.com</a> for more information.</p></source> + <source><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p><p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://qt.digia.com/product/licensing">qt.digia.com/product/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).</p><p>Qt is a Digia product. See <a href="http://qt.digia.com/">qt.digia.com</a> for more information.</p></source> <translation type="unfinished"></translation> </message> <message> @@ -3922,7 +3976,7 @@ <name>QNetworkAccessDataBackend</name> <message> <source>Operation not supported on %1</source> - <translation>Diese Operation wird von %1 nicht unterstützt</translation> + <translation type="obsolete">Diese Operation wird von %1 nicht unterstützt</translation> </message> <message> <source>Invalid URI: %1</source>
View file
qx11grab-0.4.5.tar.bz2/i18n/qx11grab_ar.ts -> qx11grab-0.4.10.tar.bz2/i18n/qx11grab_ar.ts
Changed
@@ -700,23 +700,23 @@ <context> <name>FFProcess</name> <message> - <location filename="../src/ffprocess/ffprocess.cpp" line="+80"/> - <location line="+222"/> + <location filename="../src/ffprocess/ffprocess.cpp" line="+81"/> + <location line="+226"/> <source>Permission Denied: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-222"/> + <location line="-226"/> <source>Working Directory</source> <translation type="unfinished"></translation> </message> <message> - <location line="+221"/> + <location line="+225"/> <source>Executable Script</source> <translation type="unfinished"></translation> </message> <message> - <location line="-92"/> + <location line="-96"/> <source>shutdown please wait ...</source> <translation type="unfinished"></translation> </message> @@ -809,7 +809,7 @@ <context> <name>GrabberInfo</name> <message> - <location filename="../src/utils/grabberinfo.cpp" line="+66"/> + <location filename="../src/utils/grabberinfo.cpp" line="+64"/> <source>Dimension:</source> <translation type="unfinished"></translation> </message> @@ -876,34 +876,23 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Screen:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>current selected screen</source> - <extracomment>WhatsThis</extracomment> + <location line="+9"/> + <source>Screen</source> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> - <source>Color depth:</source> + <location line="+14"/> + <source>Framerate</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>current color depth</source> + <location line="-7"/> + <source>current selected screen</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> - <source>Framerate:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> + <location line="+15"/> <source>Set the framerate in the captured video.</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> @@ -1178,7 +1167,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+138"/> + <location line="+135"/> <source>commandline exported</source> <translation type="unfinished"></translation> </message> @@ -1206,12 +1195,12 @@ <context> <name>MenuBar</name> <message> - <location filename="../src/menubar.cpp" line="+44"/> + <location filename="../src/menubar.cpp" line="+45"/> <source>File</source> <translation type="unfinished"></translation> </message> <message> - <location line="+284"/> + <location line="+302"/> <source>Kill</source> <extracomment>MenuEntry</extracomment> <translation type="unfinished"></translation> @@ -1223,7 +1212,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-295"/> + <location line="-313"/> <source>Load</source> <translation type="unfinished"></translation> </message> @@ -1309,7 +1298,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+71"/> + <location line="+89"/> <source>Create</source> <translation type="unfinished"></translation> </message> @@ -1430,12 +1419,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-298"/> + <location line="-316"/> <source>Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location line="+311"/> + <location line="+329"/> <source>Save current Settings</source> <extracomment>ToolTip</extracomment> <translation type="unfinished"></translation> @@ -1468,7 +1457,7 @@ <context> <name>Messanger</name> <message> - <location filename="../src/messanger/messanger.cpp" line="+136"/> + <location filename="../src/messanger/messanger.cpp" line="+156"/> <source>Notification not send!</source> <translation type="unfinished"></translation> </message> @@ -1476,7 +1465,7 @@ <context> <name>MetaData</name> <message> - <location filename="../src/utils/metadata.cpp" line="+43"/> + <location filename="../src/utils/metadata.cpp" line="+44"/> <source>Insert Metadata</source> <extracomment>GroupBoxTitle</extracomment> <translation type="unfinished"></translation> @@ -1526,7 +1515,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> + <location line="+12"/> <source>Creation Date:</source> <translation type="unfinished"></translation> </message> @@ -1665,7 +1654,7 @@ <context> <name>PlayerAction</name> <message> - <location filename="../src/playeraction.cpp" line="+99"/> + <location filename="../src/playeraction.cpp" line="+101"/> <source>MPlayer</source> <extracomment>MenuEntry for "mplayer" http://www.mplayerhq.hu</extracomment> <translation type="unfinished"></translation> @@ -1718,6 +1707,12 @@ <extracomment>MenuEntry for "totem" http://projects.gnome.org/totem/</extracomment> <translation type="unfinished"></translation> </message> + <message> + <location line="+2"/> + <source>GStreamer</source> + <extracomment>MenuEntry for "gst-launch" http://gstreamer.freedesktop.org/</extracomment> + <translation type="unfinished"></translation> + </message> </context> <context> <name>PresetSelector</name> @@ -1746,9 +1741,92 @@ </message> </context> <context> + <name>QObject</name> + <message> + <location filename="../src/filters/webcam/v4l2-api.cpp" line="+184"/> + <source>Set Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <source>Set Output</source> + <translation type="unfinished"></translation>
View file
qx11grab-0.4.5.tar.bz2/i18n/qx11grab_cs.ts -> qx11grab-0.4.10.tar.bz2/i18n/qx11grab_cs.ts
Changed
@@ -702,7 +702,7 @@ <context> <name>FFProcess</name> <message> - <location filename="../src/ffprocess/ffprocess.cpp" line="+209"/> + <location filename="../src/ffprocess/ffprocess.cpp" line="+210"/> <source>shutdown please wait ...</source> <translation>Probíhá ukončování programu. Počkejte, prosím,...</translation> </message> @@ -770,17 +770,17 @@ </message> <message> <location line="-34"/> - <location line="+222"/> + <location line="+226"/> <source>Permission Denied: %1.</source> <translation>Přístup odepřen: %1.</translation> </message> <message> - <location line="-222"/> + <location line="-226"/> <source>Working Directory</source> <translation>Pracovní adresář</translation> </message> <message> - <location line="+221"/> + <location line="+225"/> <source>Executable Script</source> <translation>Spustitelný skript</translation> </message> @@ -811,7 +811,7 @@ <context> <name>GrabberInfo</name> <message> - <location filename="../src/utils/grabberinfo.cpp" line="+78"/> + <location filename="../src/utils/grabberinfo.cpp" line="+76"/> <source>Width:</source> <translation>Šířka:</translation> </message> @@ -831,12 +831,7 @@ <translation>Poloha Y:</translation> </message> <message> - <location line="+49"/> - <source>Framerate:</source> - <translation>Počet snímků:</translation> - </message> - <message> - <location line="-130"/> + <location line="-81"/> <source>Dimension:</source> <translation>Rozměr:</translation> </message> @@ -847,13 +842,23 @@ <translation>Předem stanovené velikosti rámečků</translation> </message> <message> - <location line="+130"/> + <location line="+101"/> + <source>Screen</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+14"/> + <source>Framerate</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> <source>Set the framerate in the captured video.</source> <extracomment>WhatsThis</extracomment> <translation>Nastavuje velikost bloku přenosu dat v zachytávaném videu.</translation> </message> <message> - <location line="-115"/> + <location line="-108"/> <location line="+8"/> <source>made rubberband witdh smaller/greater</source> <extracomment>WhatsThis @@ -889,23 +894,7 @@ <translation>Vytlačí souřadnice osy y z gumičky</translation> </message> <message> - <location line="+19"/> - <source>Color depth:</source> - <translation>Barevná hloubka:</translation> - </message> - <message> - <location line="+7"/> - <source>current color depth</source> - <extracomment>WhatsThis</extracomment> - <translation>Nynější barevná hloubka</translation> - </message> - <message> - <location line="-19"/> - <source>Screen:</source> - <translation>Obrazovka:</translation> - </message> - <message> - <location line="+6"/> + <location line="+16"/> <source>current selected screen</source> <extracomment>WhatsThis</extracomment> <translation>Nyní vybraná obrazovka</translation> @@ -1160,7 +1149,7 @@ <translation>QX11Grab není spuštěn</translation> </message> <message> - <location line="+138"/> + <location line="+135"/> <source>commandline exported</source> <translation>Příkazový řádek vyveden</translation> </message> @@ -1185,7 +1174,7 @@ <translation>Otevřít záložku %1</translation> </message> <message> - <location line="-211"/> + <location line="-208"/> <source>Missing Input</source> <translation>Chybí vstup</translation> </message> @@ -1208,12 +1197,12 @@ <context> <name>MenuBar</name> <message> - <location filename="../src/menubar.cpp" line="+44"/> + <location filename="../src/menubar.cpp" line="+45"/> <source>File</source> <translation>Soubor</translation> </message> <message> - <location line="+284"/> + <location line="+302"/> <source>Kill</source> <extracomment>MenuEntry</extracomment> <translation>Ukončit</translation> @@ -1225,7 +1214,7 @@ <translation>Uložit</translation> </message> <message> - <location line="-295"/> + <location line="-313"/> <source>Load</source> <translation>Nahrát</translation> </message> @@ -1235,7 +1224,7 @@ <translation>Nápověda</translation> </message> <message> - <location line="+152"/> + <location line="+170"/> <source>Quit</source> <extracomment>MenuEntry</extracomment> <translation>Ukončit</translation> @@ -1328,7 +1317,7 @@ <translation>Obnovit náhled na příkazový řádek</translation> </message> <message> - <location line="-278"/> + <location line="-296"/> <source>FFmpeg</source> <translation>FFmpeg</translation> </message> @@ -1350,7 +1339,7 @@ <translation>Stránky QX11Grab</translation> </message> <message> - <location line="+267"/> + <location line="+285"/> <source>Save current Settings</source> <extracomment>ToolTip</extracomment> <translation>Uložit nynější nastavení</translation> @@ -1380,7 +1369,7 @@ <translation>Vyvést nynější soubor příkazů</translation> </message> <message> - <location line="-298"/> + <location line="-316"/> <source>Bookmark</source> <translation>Záložka</translation> </message> @@ -1390,7 +1379,7 @@ <translation>Činnosti</translation> </message> <message> - <location line="+137"/> + <location line="+155"/> <source>Create</source> <translation>Vytvořit</translation> </message> @@ -1412,7 +1401,7 @@ <translation>Otevřít dialog na smazání záložky</translation> </message> <message> - <location line="-98"/> + <location line="-116"/> <source>x264</source> <translation>x264</translation> </message>
View file
qx11grab-0.4.5.tar.bz2/i18n/qx11grab_da.ts -> qx11grab-0.4.10.tar.bz2/i18n/qx11grab_da.ts
Changed
@@ -700,23 +700,23 @@ <context> <name>FFProcess</name> <message> - <location filename="../src/ffprocess/ffprocess.cpp" line="+80"/> - <location line="+222"/> + <location filename="../src/ffprocess/ffprocess.cpp" line="+81"/> + <location line="+226"/> <source>Permission Denied: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-222"/> + <location line="-226"/> <source>Working Directory</source> <translation type="unfinished"></translation> </message> <message> - <location line="+221"/> + <location line="+225"/> <source>Executable Script</source> <translation type="unfinished"></translation> </message> <message> - <location line="-92"/> + <location line="-96"/> <source>shutdown please wait ...</source> <translation type="unfinished"></translation> </message> @@ -809,7 +809,7 @@ <context> <name>GrabberInfo</name> <message> - <location filename="../src/utils/grabberinfo.cpp" line="+66"/> + <location filename="../src/utils/grabberinfo.cpp" line="+64"/> <source>Dimension:</source> <translation type="unfinished"></translation> </message> @@ -876,34 +876,23 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Screen:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>current selected screen</source> - <extracomment>WhatsThis</extracomment> + <location line="+9"/> + <source>Screen</source> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> - <source>Color depth:</source> + <location line="+14"/> + <source>Framerate</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>current color depth</source> + <location line="-7"/> + <source>current selected screen</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> - <source>Framerate:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> + <location line="+15"/> <source>Set the framerate in the captured video.</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> @@ -1178,7 +1167,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+138"/> + <location line="+135"/> <source>commandline exported</source> <translation type="unfinished"></translation> </message> @@ -1206,12 +1195,12 @@ <context> <name>MenuBar</name> <message> - <location filename="../src/menubar.cpp" line="+44"/> + <location filename="../src/menubar.cpp" line="+45"/> <source>File</source> <translation type="unfinished"></translation> </message> <message> - <location line="+284"/> + <location line="+302"/> <source>Kill</source> <extracomment>MenuEntry</extracomment> <translation type="unfinished"></translation> @@ -1223,7 +1212,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-295"/> + <location line="-313"/> <source>Load</source> <translation type="unfinished"></translation> </message> @@ -1309,7 +1298,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+71"/> + <location line="+89"/> <source>Create</source> <translation type="unfinished"></translation> </message> @@ -1430,12 +1419,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-298"/> + <location line="-316"/> <source>Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location line="+311"/> + <location line="+329"/> <source>Save current Settings</source> <extracomment>ToolTip</extracomment> <translation type="unfinished"></translation> @@ -1468,7 +1457,7 @@ <context> <name>Messanger</name> <message> - <location filename="../src/messanger/messanger.cpp" line="+136"/> + <location filename="../src/messanger/messanger.cpp" line="+156"/> <source>Notification not send!</source> <translation type="unfinished"></translation> </message> @@ -1476,7 +1465,7 @@ <context> <name>MetaData</name> <message> - <location filename="../src/utils/metadata.cpp" line="+43"/> + <location filename="../src/utils/metadata.cpp" line="+44"/> <source>Insert Metadata</source> <extracomment>GroupBoxTitle</extracomment> <translation type="unfinished"></translation> @@ -1526,7 +1515,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> + <location line="+12"/> <source>Creation Date:</source> <translation type="unfinished"></translation> </message> @@ -1665,7 +1654,7 @@ <context> <name>PlayerAction</name> <message> - <location filename="../src/playeraction.cpp" line="+99"/> + <location filename="../src/playeraction.cpp" line="+101"/> <source>MPlayer</source> <extracomment>MenuEntry for "mplayer" http://www.mplayerhq.hu</extracomment> <translation type="unfinished"></translation> @@ -1718,6 +1707,12 @@ <extracomment>MenuEntry for "totem" http://projects.gnome.org/totem/</extracomment> <translation type="unfinished"></translation> </message> + <message> + <location line="+2"/> + <source>GStreamer</source> + <extracomment>MenuEntry for "gst-launch" http://gstreamer.freedesktop.org/</extracomment> + <translation type="unfinished"></translation> + </message> </context> <context> <name>PresetSelector</name> @@ -1746,9 +1741,92 @@ </message> </context> <context> + <name>QObject</name> + <message> + <location filename="../src/filters/webcam/v4l2-api.cpp" line="+184"/> + <source>Set Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <source>Set Output</source> + <translation type="unfinished"></translation>
View file
qx11grab-0.4.5.tar.bz2/i18n/qx11grab_de.ts -> qx11grab-0.4.10.tar.bz2/i18n/qx11grab_de.ts
Changed
@@ -705,7 +705,7 @@ <context> <name>FFProcess</name> <message> - <location filename="../src/ffprocess/ffprocess.cpp" line="+209"/> + <location filename="../src/ffprocess/ffprocess.cpp" line="+210"/> <source>shutdown please wait ...</source> <translation>Beende bitte warten ...</translation> </message> @@ -773,17 +773,17 @@ </message> <message> <location line="-34"/> - <location line="+222"/> + <location line="+226"/> <source>Permission Denied: %1.</source> <translation>Zugriff Verweigert: %1.</translation> </message> <message> - <location line="-222"/> + <location line="-226"/> <source>Working Directory</source> <translation>Arbeits Verzeichnis</translation> </message> <message> - <location line="+221"/> + <location line="+225"/> <source>Executable Script</source> <translation>Ausführbares Script</translation> </message> @@ -814,7 +814,7 @@ <context> <name>GrabberInfo</name> <message> - <location filename="../src/utils/grabberinfo.cpp" line="+78"/> + <location filename="../src/utils/grabberinfo.cpp" line="+76"/> <source>Width:</source> <translation>Breite:</translation> </message> @@ -834,12 +834,7 @@ <translation>Position Y:</translation> </message> <message> - <location line="+49"/> - <source>Framerate:</source> - <translation></translation> - </message> - <message> - <location line="-130"/> + <location line="-81"/> <source>Dimension:</source> <translation></translation> </message> @@ -850,13 +845,23 @@ <translation>Vordefinierte Rahmengrößen</translation> </message> <message> - <location line="+130"/> + <location line="+101"/> + <source>Screen</source> + <translation>Bildschirm</translation> + </message> + <message> + <location line="+14"/> + <source>Framerate</source> + <translation>Framerate</translation> + </message> + <message> + <location line="+8"/> <source>Set the framerate in the captured video.</source> <extracomment>WhatsThis</extracomment> <translation>Setzt die Datenübertragungs Blockgröße im Aufnahme Video.</translation> </message> <message> - <location line="-115"/> + <location line="-108"/> <location line="+8"/> <source>made rubberband witdh smaller/greater</source> <extracomment>WhatsThis @@ -892,23 +897,7 @@ <translation>Verschiebt das Gummiband auf der Y-Achse</translation> </message> <message> - <location line="+19"/> - <source>Color depth:</source> - <translation>Farbtiefe</translation> - </message> - <message> - <location line="+7"/> - <source>current color depth</source> - <extracomment>WhatsThis</extracomment> - <translation>Aktuelle Farbtiefe</translation> - </message> - <message> - <location line="-19"/> - <source>Screen:</source> - <translation>Bildschirm:</translation> - </message> - <message> - <location line="+6"/> + <location line="+16"/> <source>current selected screen</source> <extracomment>WhatsThis</extracomment> <translation>Aktuell ausgewählter Bildschirm</translation> @@ -1163,7 +1152,7 @@ <translation>qx11grab ist nicht gestartet</translation> </message> <message> - <location line="+138"/> + <location line="+135"/> <source>commandline exported</source> <translation>Kommandozeile Exportiert</translation> </message> @@ -1188,7 +1177,7 @@ <translation>Öffne Lesezeichen %1</translation> </message> <message> - <location line="-211"/> + <location line="-208"/> <source>Missing Input</source> <translation>Keine Eingabe erhalten</translation> </message> @@ -1211,12 +1200,12 @@ <context> <name>MenuBar</name> <message> - <location filename="../src/menubar.cpp" line="+44"/> + <location filename="../src/menubar.cpp" line="+45"/> <source>File</source> <translation>Datei</translation> </message> <message> - <location line="+284"/> + <location line="+302"/> <source>Kill</source> <extracomment>MenuEntry</extracomment> <translation>Abbrechen</translation> @@ -1228,7 +1217,7 @@ <translation>Speichern</translation> </message> <message> - <location line="-295"/> + <location line="-313"/> <source>Load</source> <translation>Laden</translation> </message> @@ -1238,7 +1227,7 @@ <translation>Hilfe</translation> </message> <message> - <location line="+152"/> + <location line="+170"/> <source>Quit</source> <extracomment>MenuEntry</extracomment> <translation>Beenden</translation> @@ -1331,7 +1320,7 @@ <translation>Erneuere die Befehlsketten Vorschau</translation> </message> <message> - <location line="-278"/> + <location line="-296"/> <source>FFmpeg</source> <translation></translation> </message> @@ -1353,7 +1342,7 @@ <translation>QX11Grab Webseite</translation> </message> <message> - <location line="+267"/> + <location line="+285"/> <source>Save current Settings</source> <extracomment>ToolTip</extracomment> <translation>Speichere die aktuellen Einstellungen</translation> @@ -1383,7 +1372,7 @@ <translation>Exportiere die aktuelle Kommando Zeile</translation> </message> <message> - <location line="-298"/> + <location line="-316"/> <source>Bookmark</source> <translation>Lesezeichen</translation> </message> @@ -1393,7 +1382,7 @@ <translation>Aktionen</translation> </message> <message> - <location line="+137"/> + <location line="+155"/> <source>Create</source> <translation>Erstellen</translation> </message> @@ -1415,7 +1404,7 @@ <translation>Öffne den Lesezeichen entfernen Dialog</translation> </message> <message> - <location line="-98"/> + <location line="-116"/> <source>x264</source> <translation>x264</translation> </message>
View file
qx11grab-0.4.5.tar.bz2/i18n/qx11grab_es.ts -> qx11grab-0.4.10.tar.bz2/i18n/qx11grab_es.ts
Changed
@@ -700,23 +700,23 @@ <context> <name>FFProcess</name> <message> - <location filename="../src/ffprocess/ffprocess.cpp" line="+80"/> - <location line="+222"/> + <location filename="../src/ffprocess/ffprocess.cpp" line="+81"/> + <location line="+226"/> <source>Permission Denied: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-222"/> + <location line="-226"/> <source>Working Directory</source> <translation type="unfinished"></translation> </message> <message> - <location line="+221"/> + <location line="+225"/> <source>Executable Script</source> <translation type="unfinished"></translation> </message> <message> - <location line="-92"/> + <location line="-96"/> <source>shutdown please wait ...</source> <translation type="unfinished"></translation> </message> @@ -809,7 +809,7 @@ <context> <name>GrabberInfo</name> <message> - <location filename="../src/utils/grabberinfo.cpp" line="+66"/> + <location filename="../src/utils/grabberinfo.cpp" line="+64"/> <source>Dimension:</source> <translation type="unfinished"></translation> </message> @@ -876,34 +876,23 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Screen:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>current selected screen</source> - <extracomment>WhatsThis</extracomment> + <location line="+9"/> + <source>Screen</source> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> - <source>Color depth:</source> + <location line="+14"/> + <source>Framerate</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>current color depth</source> + <location line="-7"/> + <source>current selected screen</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> - <source>Framerate:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> + <location line="+15"/> <source>Set the framerate in the captured video.</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> @@ -1178,7 +1167,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+138"/> + <location line="+135"/> <source>commandline exported</source> <translation type="unfinished"></translation> </message> @@ -1206,12 +1195,12 @@ <context> <name>MenuBar</name> <message> - <location filename="../src/menubar.cpp" line="+44"/> + <location filename="../src/menubar.cpp" line="+45"/> <source>File</source> <translation type="unfinished"></translation> </message> <message> - <location line="+284"/> + <location line="+302"/> <source>Kill</source> <extracomment>MenuEntry</extracomment> <translation type="unfinished"></translation> @@ -1223,7 +1212,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-295"/> + <location line="-313"/> <source>Load</source> <translation type="unfinished"></translation> </message> @@ -1309,7 +1298,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+71"/> + <location line="+89"/> <source>Create</source> <translation type="unfinished"></translation> </message> @@ -1430,12 +1419,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-298"/> + <location line="-316"/> <source>Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location line="+311"/> + <location line="+329"/> <source>Save current Settings</source> <extracomment>ToolTip</extracomment> <translation type="unfinished"></translation> @@ -1468,7 +1457,7 @@ <context> <name>Messanger</name> <message> - <location filename="../src/messanger/messanger.cpp" line="+136"/> + <location filename="../src/messanger/messanger.cpp" line="+156"/> <source>Notification not send!</source> <translation type="unfinished"></translation> </message> @@ -1476,7 +1465,7 @@ <context> <name>MetaData</name> <message> - <location filename="../src/utils/metadata.cpp" line="+43"/> + <location filename="../src/utils/metadata.cpp" line="+44"/> <source>Insert Metadata</source> <extracomment>GroupBoxTitle</extracomment> <translation type="unfinished"></translation> @@ -1526,7 +1515,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> + <location line="+12"/> <source>Creation Date:</source> <translation type="unfinished"></translation> </message> @@ -1665,7 +1654,7 @@ <context> <name>PlayerAction</name> <message> - <location filename="../src/playeraction.cpp" line="+99"/> + <location filename="../src/playeraction.cpp" line="+101"/> <source>MPlayer</source> <extracomment>MenuEntry for "mplayer" http://www.mplayerhq.hu</extracomment> <translation type="unfinished"></translation> @@ -1718,6 +1707,12 @@ <extracomment>MenuEntry for "totem" http://projects.gnome.org/totem/</extracomment> <translation type="unfinished"></translation> </message> + <message> + <location line="+2"/> + <source>GStreamer</source> + <extracomment>MenuEntry for "gst-launch" http://gstreamer.freedesktop.org/</extracomment> + <translation type="unfinished"></translation> + </message> </context> <context> <name>PresetSelector</name> @@ -1746,9 +1741,92 @@ </message> </context> <context> + <name>QObject</name> + <message> + <location filename="../src/filters/webcam/v4l2-api.cpp" line="+184"/> + <source>Set Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <source>Set Output</source> + <translation type="unfinished"></translation>
View file
qx11grab-0.4.5.tar.bz2/i18n/qx11grab_fr.ts -> qx11grab-0.4.10.tar.bz2/i18n/qx11grab_fr.ts
Changed
@@ -700,23 +700,23 @@ <context> <name>FFProcess</name> <message> - <location filename="../src/ffprocess/ffprocess.cpp" line="+80"/> - <location line="+222"/> + <location filename="../src/ffprocess/ffprocess.cpp" line="+81"/> + <location line="+226"/> <source>Permission Denied: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-222"/> + <location line="-226"/> <source>Working Directory</source> <translation type="unfinished"></translation> </message> <message> - <location line="+221"/> + <location line="+225"/> <source>Executable Script</source> <translation type="unfinished"></translation> </message> <message> - <location line="-92"/> + <location line="-96"/> <source>shutdown please wait ...</source> <translation type="unfinished"></translation> </message> @@ -809,7 +809,7 @@ <context> <name>GrabberInfo</name> <message> - <location filename="../src/utils/grabberinfo.cpp" line="+66"/> + <location filename="../src/utils/grabberinfo.cpp" line="+64"/> <source>Dimension:</source> <translation type="unfinished"></translation> </message> @@ -876,34 +876,23 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Screen:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>current selected screen</source> - <extracomment>WhatsThis</extracomment> + <location line="+9"/> + <source>Screen</source> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> - <source>Color depth:</source> + <location line="+14"/> + <source>Framerate</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>current color depth</source> + <location line="-7"/> + <source>current selected screen</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> - <source>Framerate:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> + <location line="+15"/> <source>Set the framerate in the captured video.</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> @@ -1178,7 +1167,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+138"/> + <location line="+135"/> <source>commandline exported</source> <translation type="unfinished"></translation> </message> @@ -1206,12 +1195,12 @@ <context> <name>MenuBar</name> <message> - <location filename="../src/menubar.cpp" line="+44"/> + <location filename="../src/menubar.cpp" line="+45"/> <source>File</source> <translation type="unfinished"></translation> </message> <message> - <location line="+284"/> + <location line="+302"/> <source>Kill</source> <extracomment>MenuEntry</extracomment> <translation type="unfinished"></translation> @@ -1223,7 +1212,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-295"/> + <location line="-313"/> <source>Load</source> <translation type="unfinished"></translation> </message> @@ -1309,7 +1298,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+71"/> + <location line="+89"/> <source>Create</source> <translation type="unfinished"></translation> </message> @@ -1430,12 +1419,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-298"/> + <location line="-316"/> <source>Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location line="+311"/> + <location line="+329"/> <source>Save current Settings</source> <extracomment>ToolTip</extracomment> <translation type="unfinished"></translation> @@ -1468,7 +1457,7 @@ <context> <name>Messanger</name> <message> - <location filename="../src/messanger/messanger.cpp" line="+136"/> + <location filename="../src/messanger/messanger.cpp" line="+156"/> <source>Notification not send!</source> <translation type="unfinished"></translation> </message> @@ -1476,7 +1465,7 @@ <context> <name>MetaData</name> <message> - <location filename="../src/utils/metadata.cpp" line="+43"/> + <location filename="../src/utils/metadata.cpp" line="+44"/> <source>Insert Metadata</source> <extracomment>GroupBoxTitle</extracomment> <translation type="unfinished"></translation> @@ -1526,7 +1515,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> + <location line="+12"/> <source>Creation Date:</source> <translation type="unfinished"></translation> </message> @@ -1665,7 +1654,7 @@ <context> <name>PlayerAction</name> <message> - <location filename="../src/playeraction.cpp" line="+99"/> + <location filename="../src/playeraction.cpp" line="+101"/> <source>MPlayer</source> <extracomment>MenuEntry for "mplayer" http://www.mplayerhq.hu</extracomment> <translation type="unfinished"></translation> @@ -1718,6 +1707,12 @@ <extracomment>MenuEntry for "totem" http://projects.gnome.org/totem/</extracomment> <translation type="unfinished"></translation> </message> + <message> + <location line="+2"/> + <source>GStreamer</source> + <extracomment>MenuEntry for "gst-launch" http://gstreamer.freedesktop.org/</extracomment> + <translation type="unfinished"></translation> + </message> </context> <context> <name>PresetSelector</name> @@ -1746,9 +1741,92 @@ </message> </context> <context> + <name>QObject</name> + <message> + <location filename="../src/filters/webcam/v4l2-api.cpp" line="+184"/> + <source>Set Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <source>Set Output</source> + <translation type="unfinished"></translation>
View file
qx11grab-0.4.5.tar.bz2/i18n/qx11grab_ja_JP.ts -> qx11grab-0.4.10.tar.bz2/i18n/qx11grab_ja_JP.ts
Changed
@@ -700,23 +700,23 @@ <context> <name>FFProcess</name> <message> - <location filename="../src/ffprocess/ffprocess.cpp" line="+80"/> - <location line="+222"/> + <location filename="../src/ffprocess/ffprocess.cpp" line="+81"/> + <location line="+226"/> <source>Permission Denied: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-222"/> + <location line="-226"/> <source>Working Directory</source> <translation type="unfinished"></translation> </message> <message> - <location line="+221"/> + <location line="+225"/> <source>Executable Script</source> <translation type="unfinished"></translation> </message> <message> - <location line="-92"/> + <location line="-96"/> <source>shutdown please wait ...</source> <translation type="unfinished"></translation> </message> @@ -809,7 +809,7 @@ <context> <name>GrabberInfo</name> <message> - <location filename="../src/utils/grabberinfo.cpp" line="+66"/> + <location filename="../src/utils/grabberinfo.cpp" line="+64"/> <source>Dimension:</source> <translation type="unfinished"></translation> </message> @@ -876,34 +876,23 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Screen:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>current selected screen</source> - <extracomment>WhatsThis</extracomment> + <location line="+9"/> + <source>Screen</source> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> - <source>Color depth:</source> + <location line="+14"/> + <source>Framerate</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>current color depth</source> + <location line="-7"/> + <source>current selected screen</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> - <source>Framerate:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> + <location line="+15"/> <source>Set the framerate in the captured video.</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> @@ -1178,7 +1167,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+138"/> + <location line="+135"/> <source>commandline exported</source> <translation type="unfinished"></translation> </message> @@ -1206,12 +1195,12 @@ <context> <name>MenuBar</name> <message> - <location filename="../src/menubar.cpp" line="+44"/> + <location filename="../src/menubar.cpp" line="+45"/> <source>File</source> <translation type="unfinished"></translation> </message> <message> - <location line="+284"/> + <location line="+302"/> <source>Kill</source> <extracomment>MenuEntry</extracomment> <translation type="unfinished"></translation> @@ -1223,7 +1212,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-295"/> + <location line="-313"/> <source>Load</source> <translation type="unfinished"></translation> </message> @@ -1309,7 +1298,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+71"/> + <location line="+89"/> <source>Create</source> <translation type="unfinished"></translation> </message> @@ -1430,12 +1419,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-298"/> + <location line="-316"/> <source>Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location line="+311"/> + <location line="+329"/> <source>Save current Settings</source> <extracomment>ToolTip</extracomment> <translation type="unfinished"></translation> @@ -1468,7 +1457,7 @@ <context> <name>Messanger</name> <message> - <location filename="../src/messanger/messanger.cpp" line="+136"/> + <location filename="../src/messanger/messanger.cpp" line="+156"/> <source>Notification not send!</source> <translation type="unfinished"></translation> </message> @@ -1476,7 +1465,7 @@ <context> <name>MetaData</name> <message> - <location filename="../src/utils/metadata.cpp" line="+43"/> + <location filename="../src/utils/metadata.cpp" line="+44"/> <source>Insert Metadata</source> <extracomment>GroupBoxTitle</extracomment> <translation type="unfinished"></translation> @@ -1526,7 +1515,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> + <location line="+12"/> <source>Creation Date:</source> <translation type="unfinished"></translation> </message> @@ -1665,7 +1654,7 @@ <context> <name>PlayerAction</name> <message> - <location filename="../src/playeraction.cpp" line="+99"/> + <location filename="../src/playeraction.cpp" line="+101"/> <source>MPlayer</source> <extracomment>MenuEntry for "mplayer" http://www.mplayerhq.hu</extracomment> <translation type="unfinished"></translation> @@ -1718,6 +1707,12 @@ <extracomment>MenuEntry for "totem" http://projects.gnome.org/totem/</extracomment> <translation type="unfinished"></translation> </message> + <message> + <location line="+2"/> + <source>GStreamer</source> + <extracomment>MenuEntry for "gst-launch" http://gstreamer.freedesktop.org/</extracomment> + <translation type="unfinished"></translation> + </message> </context> <context> <name>PresetSelector</name> @@ -1746,9 +1741,92 @@ </message> </context> <context> + <name>QObject</name> + <message> + <location filename="../src/filters/webcam/v4l2-api.cpp" line="+184"/> + <source>Set Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <source>Set Output</source> + <translation type="unfinished"></translation>
View file
qx11grab-0.4.5.tar.bz2/i18n/qx11grab_lt.ts -> qx11grab-0.4.10.tar.bz2/i18n/qx11grab_lt.ts
Changed
@@ -702,23 +702,23 @@ <context> <name>FFProcess</name> <message> - <location filename="../src/ffprocess/ffprocess.cpp" line="+80"/> - <location line="+222"/> + <location filename="../src/ffprocess/ffprocess.cpp" line="+81"/> + <location line="+226"/> <source>Permission Denied: %1.</source> <translation>Neleidžiama: %1.</translation> </message> <message> - <location line="-222"/> + <location line="-226"/> <source>Working Directory</source> <translation>Darbinis katalogas</translation> </message> <message> - <location line="+221"/> + <location line="+225"/> <source>Executable Script</source> <translation>Vykdomasis scenarijus</translation> </message> <message> - <location line="-151"/> + <location line="-155"/> <location line="+4"/> <location line="+4"/> <location line="+4"/> @@ -811,7 +811,7 @@ <context> <name>GrabberInfo</name> <message> - <location filename="../src/utils/grabberinfo.cpp" line="+66"/> + <location filename="../src/utils/grabberinfo.cpp" line="+64"/> <source>Dimension:</source> <translation>Dydis:</translation> </message> @@ -878,34 +878,23 @@ <translation>rėmelio viršutinio kampo padėtis nuo ekrano viršutinio kampo y ašyje</translation> </message> <message> - <location line="+7"/> - <source>Screen:</source> - <translation>Ekranas:</translation> - </message> - <message> - <location line="+6"/> - <source>current selected screen</source> - <extracomment>WhatsThis</extracomment> - <translation>dabar pasirinktas ekranas</translation> + <location line="+9"/> + <source>Screen</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> - <source>Color depth:</source> - <translation>Spalvų skaičius:</translation> + <location line="+14"/> + <source>Framerate</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>current color depth</source> + <location line="-7"/> + <source>current selected screen</source> <extracomment>WhatsThis</extracomment> - <translation>dabartinis spalvų skaičius</translation> - </message> - <message> - <location line="+6"/> - <source>Framerate:</source> - <translation>Kadrų dažnis:</translation> + <translation>dabar pasirinktas ekranas</translation> </message> <message> - <location line="+6"/> + <location line="+15"/> <source>Set the framerate in the captured video.</source> <extracomment>WhatsThis</extracomment> <translation>Nurodykite įrašomo vaizdo įrašo kadrų dažnį.</translation> @@ -1180,7 +1169,7 @@ <translation>qx11grap nepaleista</translation> </message> <message> - <location line="+138"/> + <location line="+135"/> <source>commandline exported</source> <translation>komandinė eilutė eksportuota</translation> </message> @@ -1208,7 +1197,7 @@ <context> <name>MenuBar</name> <message> - <location filename="../src/menubar.cpp" line="+44"/> + <location filename="../src/menubar.cpp" line="+45"/> <source>File</source> <translation>Failas</translation> </message> @@ -1299,7 +1288,7 @@ <translation>Apie Qt4</translation> </message> <message> - <location line="+71"/> + <location line="+89"/> <source>Create</source> <translation>Sukurti</translation> </message> @@ -1426,12 +1415,12 @@ <translation>Eksportuoti dabartinę komandinę eilutę</translation> </message> <message> - <location line="-298"/> + <location line="-316"/> <source>Bookmark</source> <translation>Žymelės</translation> </message> <message> - <location line="+308"/> + <location line="+326"/> <source>Save</source> <extracomment>MenuEntry</extracomment> <translation>Įrašyti</translation> @@ -1470,7 +1459,7 @@ <context> <name>Messanger</name> <message> - <location filename="../src/messanger/messanger.cpp" line="+136"/> + <location filename="../src/messanger/messanger.cpp" line="+156"/> <source>Notification not send!</source> <translation>Pranešimas neišsilstas!</translation> </message> @@ -1478,7 +1467,7 @@ <context> <name>MetaData</name> <message> - <location filename="../src/utils/metadata.cpp" line="+43"/> + <location filename="../src/utils/metadata.cpp" line="+44"/> <source>Insert Metadata</source> <extracomment>GroupBoxTitle</extracomment> <translation>Įterpti meta duomenis</translation> @@ -1528,7 +1517,7 @@ <translation>Autorinės teisės</translation> </message> <message> - <location line="+4"/> + <location line="+12"/> <source>Creation Date:</source> <translation>Sukūrimo data:</translation> </message> @@ -1667,7 +1656,7 @@ <context> <name>PlayerAction</name> <message> - <location filename="../src/playeraction.cpp" line="+99"/> + <location filename="../src/playeraction.cpp" line="+101"/> <source>MPlayer</source> <extracomment>MenuEntry for "mplayer" http://www.mplayerhq.hu</extracomment> <translation>MPlayer</translation> @@ -1720,6 +1709,12 @@ <extracomment>MenuEntry for "totem" http://projects.gnome.org/totem/</extracomment> <translation>Totem leistuvė</translation> </message> + <message> + <location line="+2"/> + <source>GStreamer</source> + <extracomment>MenuEntry for "gst-launch" http://gstreamer.freedesktop.org/</extracomment> + <translation type="unfinished"></translation> + </message> </context> <context> <name>PresetSelector</name> @@ -1748,9 +1743,92 @@ </message> </context> <context> + <name>QObject</name> + <message> + <location filename="../src/filters/webcam/v4l2-api.cpp" line="+184"/> + <source>Set Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <source>Set Output</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+15"/> + <source>Set Audio Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+15"/> + <source>Set Audio Output</source> + <translation type="unfinished"></translation> + </message> + <message>
View file
qx11grab-0.4.5.tar.bz2/i18n/qx11grab_pl.ts -> qx11grab-0.4.10.tar.bz2/i18n/qx11grab_pl.ts
Changed
@@ -701,18 +701,18 @@ <context> <name>FFProcess</name> <message> - <location filename="../src/ffprocess/ffprocess.cpp" line="+80"/> + <location filename="../src/ffprocess/ffprocess.cpp" line="+81"/> <source>Working Directory</source> <translation type="unfinished"></translation> </message> <message> <location line="+0"/> - <location line="+222"/> + <location line="+226"/> <source>Permission Denied: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-188"/> + <location line="-192"/> <source>Recording started writing to: %1</source> <translation type="unfinished"></translation> </message> @@ -779,7 +779,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+50"/> + <location line="+54"/> <source>Executable Script</source> <translation type="unfinished"></translation> </message> @@ -810,7 +810,7 @@ <context> <name>GrabberInfo</name> <message> - <location filename="../src/utils/grabberinfo.cpp" line="+66"/> + <location filename="../src/utils/grabberinfo.cpp" line="+64"/> <source>Dimension:</source> <translation type="unfinished"></translation> </message> @@ -877,34 +877,23 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Screen:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>current selected screen</source> - <extracomment>WhatsThis</extracomment> + <location line="+9"/> + <source>Screen</source> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> - <source>Color depth:</source> + <location line="+14"/> + <source>Framerate</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>current color depth</source> + <location line="-7"/> + <source>current selected screen</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> - <source>Framerate:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> + <location line="+15"/> <source>Set the framerate in the captured video.</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> @@ -1179,7 +1168,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+138"/> + <location line="+135"/> <source>commandline exported</source> <translation type="unfinished"></translation> </message> @@ -1207,7 +1196,7 @@ <context> <name>MenuBar</name> <message> - <location filename="../src/menubar.cpp" line="+44"/> + <location filename="../src/menubar.cpp" line="+45"/> <source>File</source> <translation type="unfinished"></translation> </message> @@ -1303,7 +1292,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+71"/> + <location line="+89"/> <source>Create</source> <translation type="unfinished"></translation> </message> @@ -1469,7 +1458,7 @@ <context> <name>Messanger</name> <message> - <location filename="../src/messanger/messanger.cpp" line="+136"/> + <location filename="../src/messanger/messanger.cpp" line="+156"/> <source>Notification not send!</source> <translation type="unfinished"></translation> </message> @@ -1477,7 +1466,7 @@ <context> <name>MetaData</name> <message> - <location filename="../src/utils/metadata.cpp" line="+43"/> + <location filename="../src/utils/metadata.cpp" line="+44"/> <source>Insert Metadata</source> <extracomment>GroupBoxTitle</extracomment> <translation type="unfinished"></translation> @@ -1527,7 +1516,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> + <location line="+12"/> <source>Creation Date:</source> <translation type="unfinished"></translation> </message> @@ -1666,7 +1655,7 @@ <context> <name>PlayerAction</name> <message> - <location filename="../src/playeraction.cpp" line="+99"/> + <location filename="../src/playeraction.cpp" line="+101"/> <source>MPlayer</source> <extracomment>MenuEntry for "mplayer" http://www.mplayerhq.hu</extracomment> <translation type="unfinished"></translation> @@ -1719,6 +1708,12 @@ <extracomment>MenuEntry for "totem" http://projects.gnome.org/totem/</extracomment> <translation type="unfinished"></translation> </message> + <message> + <location line="+2"/> + <source>GStreamer</source> + <extracomment>MenuEntry for "gst-launch" http://gstreamer.freedesktop.org/</extracomment> + <translation type="unfinished"></translation> + </message> </context> <context> <name>PresetSelector</name> @@ -1747,9 +1742,92 @@ </message> </context> <context> + <name>QObject</name> + <message> + <location filename="../src/filters/webcam/v4l2-api.cpp" line="+184"/> + <source>Set Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <source>Set Output</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+15"/> + <source>Set Audio Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+15"/> + <source>Set Audio Output</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <source>Set TV Standard</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>Query TV Standard</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+20"/> + <source>Set Preset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/>
View file
qx11grab-0.4.5.tar.bz2/i18n/qx11grab_pt.ts -> qx11grab-0.4.10.tar.bz2/i18n/qx11grab_pt.ts
Changed
@@ -700,23 +700,23 @@ <context> <name>FFProcess</name> <message> - <location filename="../src/ffprocess/ffprocess.cpp" line="+80"/> - <location line="+222"/> + <location filename="../src/ffprocess/ffprocess.cpp" line="+81"/> + <location line="+226"/> <source>Permission Denied: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-222"/> + <location line="-226"/> <source>Working Directory</source> <translation type="unfinished"></translation> </message> <message> - <location line="+221"/> + <location line="+225"/> <source>Executable Script</source> <translation type="unfinished"></translation> </message> <message> - <location line="-92"/> + <location line="-96"/> <source>shutdown please wait ...</source> <translation type="unfinished"></translation> </message> @@ -809,7 +809,7 @@ <context> <name>GrabberInfo</name> <message> - <location filename="../src/utils/grabberinfo.cpp" line="+66"/> + <location filename="../src/utils/grabberinfo.cpp" line="+64"/> <source>Dimension:</source> <translation type="unfinished"></translation> </message> @@ -876,34 +876,23 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Screen:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>current selected screen</source> - <extracomment>WhatsThis</extracomment> + <location line="+9"/> + <source>Screen</source> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> - <source>Color depth:</source> + <location line="+14"/> + <source>Framerate</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>current color depth</source> + <location line="-7"/> + <source>current selected screen</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> - <source>Framerate:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> + <location line="+15"/> <source>Set the framerate in the captured video.</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> @@ -1178,7 +1167,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+138"/> + <location line="+135"/> <source>commandline exported</source> <translation type="unfinished"></translation> </message> @@ -1206,12 +1195,12 @@ <context> <name>MenuBar</name> <message> - <location filename="../src/menubar.cpp" line="+44"/> + <location filename="../src/menubar.cpp" line="+45"/> <source>File</source> <translation type="unfinished"></translation> </message> <message> - <location line="+284"/> + <location line="+302"/> <source>Kill</source> <extracomment>MenuEntry</extracomment> <translation type="unfinished"></translation> @@ -1223,7 +1212,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-295"/> + <location line="-313"/> <source>Load</source> <translation type="unfinished"></translation> </message> @@ -1309,7 +1298,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+71"/> + <location line="+89"/> <source>Create</source> <translation type="unfinished"></translation> </message> @@ -1430,12 +1419,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-298"/> + <location line="-316"/> <source>Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location line="+311"/> + <location line="+329"/> <source>Save current Settings</source> <extracomment>ToolTip</extracomment> <translation type="unfinished"></translation> @@ -1468,7 +1457,7 @@ <context> <name>Messanger</name> <message> - <location filename="../src/messanger/messanger.cpp" line="+136"/> + <location filename="../src/messanger/messanger.cpp" line="+156"/> <source>Notification not send!</source> <translation type="unfinished"></translation> </message> @@ -1476,7 +1465,7 @@ <context> <name>MetaData</name> <message> - <location filename="../src/utils/metadata.cpp" line="+43"/> + <location filename="../src/utils/metadata.cpp" line="+44"/> <source>Insert Metadata</source> <extracomment>GroupBoxTitle</extracomment> <translation type="unfinished"></translation> @@ -1526,7 +1515,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> + <location line="+12"/> <source>Creation Date:</source> <translation type="unfinished"></translation> </message> @@ -1665,7 +1654,7 @@ <context> <name>PlayerAction</name> <message> - <location filename="../src/playeraction.cpp" line="+99"/> + <location filename="../src/playeraction.cpp" line="+101"/> <source>MPlayer</source> <extracomment>MenuEntry for "mplayer" http://www.mplayerhq.hu</extracomment> <translation type="unfinished"></translation> @@ -1718,6 +1707,12 @@ <extracomment>MenuEntry for "totem" http://projects.gnome.org/totem/</extracomment> <translation type="unfinished"></translation> </message> + <message> + <location line="+2"/> + <source>GStreamer</source> + <extracomment>MenuEntry for "gst-launch" http://gstreamer.freedesktop.org/</extracomment> + <translation type="unfinished"></translation> + </message> </context> <context> <name>PresetSelector</name> @@ -1746,9 +1741,92 @@ </message> </context> <context> + <name>QObject</name> + <message> + <location filename="../src/filters/webcam/v4l2-api.cpp" line="+184"/> + <source>Set Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <source>Set Output</source> + <translation type="unfinished"></translation>
View file
qx11grab-0.4.5.tar.bz2/i18n/qx11grab_ru.ts -> qx11grab-0.4.10.tar.bz2/i18n/qx11grab_ru.ts
Changed
@@ -700,23 +700,23 @@ <context> <name>FFProcess</name> <message> - <location filename="../src/ffprocess/ffprocess.cpp" line="+80"/> - <location line="+222"/> + <location filename="../src/ffprocess/ffprocess.cpp" line="+81"/> + <location line="+226"/> <source>Permission Denied: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-222"/> + <location line="-226"/> <source>Working Directory</source> <translation type="unfinished"></translation> </message> <message> - <location line="+221"/> + <location line="+225"/> <source>Executable Script</source> <translation type="unfinished"></translation> </message> <message> - <location line="-92"/> + <location line="-96"/> <source>shutdown please wait ...</source> <translation type="unfinished"></translation> </message> @@ -809,7 +809,7 @@ <context> <name>GrabberInfo</name> <message> - <location filename="../src/utils/grabberinfo.cpp" line="+66"/> + <location filename="../src/utils/grabberinfo.cpp" line="+64"/> <source>Dimension:</source> <translation type="unfinished"></translation> </message> @@ -876,34 +876,23 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Screen:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>current selected screen</source> - <extracomment>WhatsThis</extracomment> + <location line="+9"/> + <source>Screen</source> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> - <source>Color depth:</source> + <location line="+14"/> + <source>Framerate</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>current color depth</source> + <location line="-7"/> + <source>current selected screen</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> - <source>Framerate:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> + <location line="+15"/> <source>Set the framerate in the captured video.</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> @@ -1178,7 +1167,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+138"/> + <location line="+135"/> <source>commandline exported</source> <translation type="unfinished"></translation> </message> @@ -1206,12 +1195,12 @@ <context> <name>MenuBar</name> <message> - <location filename="../src/menubar.cpp" line="+44"/> + <location filename="../src/menubar.cpp" line="+45"/> <source>File</source> <translation type="unfinished"></translation> </message> <message> - <location line="+284"/> + <location line="+302"/> <source>Kill</source> <extracomment>MenuEntry</extracomment> <translation type="unfinished"></translation> @@ -1223,7 +1212,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-295"/> + <location line="-313"/> <source>Load</source> <translation type="unfinished"></translation> </message> @@ -1309,7 +1298,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+71"/> + <location line="+89"/> <source>Create</source> <translation type="unfinished"></translation> </message> @@ -1430,12 +1419,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-298"/> + <location line="-316"/> <source>Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location line="+311"/> + <location line="+329"/> <source>Save current Settings</source> <extracomment>ToolTip</extracomment> <translation type="unfinished"></translation> @@ -1468,7 +1457,7 @@ <context> <name>Messanger</name> <message> - <location filename="../src/messanger/messanger.cpp" line="+136"/> + <location filename="../src/messanger/messanger.cpp" line="+156"/> <source>Notification not send!</source> <translation type="unfinished"></translation> </message> @@ -1476,7 +1465,7 @@ <context> <name>MetaData</name> <message> - <location filename="../src/utils/metadata.cpp" line="+43"/> + <location filename="../src/utils/metadata.cpp" line="+44"/> <source>Insert Metadata</source> <extracomment>GroupBoxTitle</extracomment> <translation type="unfinished"></translation> @@ -1526,7 +1515,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> + <location line="+12"/> <source>Creation Date:</source> <translation type="unfinished"></translation> </message> @@ -1665,7 +1654,7 @@ <context> <name>PlayerAction</name> <message> - <location filename="../src/playeraction.cpp" line="+99"/> + <location filename="../src/playeraction.cpp" line="+101"/> <source>MPlayer</source> <extracomment>MenuEntry for "mplayer" http://www.mplayerhq.hu</extracomment> <translation type="unfinished"></translation> @@ -1718,6 +1707,12 @@ <extracomment>MenuEntry for "totem" http://projects.gnome.org/totem/</extracomment> <translation type="unfinished"></translation> </message> + <message> + <location line="+2"/> + <source>GStreamer</source> + <extracomment>MenuEntry for "gst-launch" http://gstreamer.freedesktop.org/</extracomment> + <translation type="unfinished"></translation> + </message> </context> <context> <name>PresetSelector</name> @@ -1746,9 +1741,92 @@ </message> </context> <context> + <name>QObject</name> + <message> + <location filename="../src/filters/webcam/v4l2-api.cpp" line="+184"/> + <source>Set Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <source>Set Output</source> + <translation type="unfinished"></translation>
View file
qx11grab-0.4.5.tar.bz2/i18n/qx11grab_sk.ts -> qx11grab-0.4.10.tar.bz2/i18n/qx11grab_sk.ts
Changed
@@ -700,23 +700,23 @@ <context> <name>FFProcess</name> <message> - <location filename="../src/ffprocess/ffprocess.cpp" line="+80"/> - <location line="+222"/> + <location filename="../src/ffprocess/ffprocess.cpp" line="+81"/> + <location line="+226"/> <source>Permission Denied: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-222"/> + <location line="-226"/> <source>Working Directory</source> <translation type="unfinished"></translation> </message> <message> - <location line="+221"/> + <location line="+225"/> <source>Executable Script</source> <translation type="unfinished"></translation> </message> <message> - <location line="-92"/> + <location line="-96"/> <source>shutdown please wait ...</source> <translation type="unfinished"></translation> </message> @@ -809,7 +809,7 @@ <context> <name>GrabberInfo</name> <message> - <location filename="../src/utils/grabberinfo.cpp" line="+66"/> + <location filename="../src/utils/grabberinfo.cpp" line="+64"/> <source>Dimension:</source> <translation type="unfinished"></translation> </message> @@ -876,34 +876,23 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Screen:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>current selected screen</source> - <extracomment>WhatsThis</extracomment> + <location line="+9"/> + <source>Screen</source> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> - <source>Color depth:</source> + <location line="+14"/> + <source>Framerate</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>current color depth</source> + <location line="-7"/> + <source>current selected screen</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> - <source>Framerate:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> + <location line="+15"/> <source>Set the framerate in the captured video.</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> @@ -1178,7 +1167,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+138"/> + <location line="+135"/> <source>commandline exported</source> <translation type="unfinished"></translation> </message> @@ -1206,12 +1195,12 @@ <context> <name>MenuBar</name> <message> - <location filename="../src/menubar.cpp" line="+44"/> + <location filename="../src/menubar.cpp" line="+45"/> <source>File</source> <translation type="unfinished"></translation> </message> <message> - <location line="+284"/> + <location line="+302"/> <source>Kill</source> <extracomment>MenuEntry</extracomment> <translation type="unfinished"></translation> @@ -1223,7 +1212,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-295"/> + <location line="-313"/> <source>Load</source> <translation type="unfinished"></translation> </message> @@ -1309,7 +1298,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+71"/> + <location line="+89"/> <source>Create</source> <translation type="unfinished"></translation> </message> @@ -1430,12 +1419,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-298"/> + <location line="-316"/> <source>Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location line="+311"/> + <location line="+329"/> <source>Save current Settings</source> <extracomment>ToolTip</extracomment> <translation type="unfinished"></translation> @@ -1468,7 +1457,7 @@ <context> <name>Messanger</name> <message> - <location filename="../src/messanger/messanger.cpp" line="+136"/> + <location filename="../src/messanger/messanger.cpp" line="+156"/> <source>Notification not send!</source> <translation type="unfinished"></translation> </message> @@ -1476,7 +1465,7 @@ <context> <name>MetaData</name> <message> - <location filename="../src/utils/metadata.cpp" line="+43"/> + <location filename="../src/utils/metadata.cpp" line="+44"/> <source>Insert Metadata</source> <extracomment>GroupBoxTitle</extracomment> <translation type="unfinished"></translation> @@ -1526,7 +1515,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> + <location line="+12"/> <source>Creation Date:</source> <translation type="unfinished"></translation> </message> @@ -1665,7 +1654,7 @@ <context> <name>PlayerAction</name> <message> - <location filename="../src/playeraction.cpp" line="+99"/> + <location filename="../src/playeraction.cpp" line="+101"/> <source>MPlayer</source> <extracomment>MenuEntry for "mplayer" http://www.mplayerhq.hu</extracomment> <translation type="unfinished"></translation> @@ -1718,6 +1707,12 @@ <extracomment>MenuEntry for "totem" http://projects.gnome.org/totem/</extracomment> <translation type="unfinished"></translation> </message> + <message> + <location line="+2"/> + <source>GStreamer</source> + <extracomment>MenuEntry for "gst-launch" http://gstreamer.freedesktop.org/</extracomment> + <translation type="unfinished"></translation> + </message> </context> <context> <name>PresetSelector</name> @@ -1746,9 +1741,92 @@ </message> </context> <context> + <name>QObject</name> + <message> + <location filename="../src/filters/webcam/v4l2-api.cpp" line="+184"/> + <source>Set Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <source>Set Output</source> + <translation type="unfinished"></translation>
View file
qx11grab-0.4.5.tar.bz2/i18n/qx11grab_sl.ts -> qx11grab-0.4.10.tar.bz2/i18n/qx11grab_sl.ts
Changed
@@ -700,23 +700,23 @@ <context> <name>FFProcess</name> <message> - <location filename="../src/ffprocess/ffprocess.cpp" line="+80"/> - <location line="+222"/> + <location filename="../src/ffprocess/ffprocess.cpp" line="+81"/> + <location line="+226"/> <source>Permission Denied: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-222"/> + <location line="-226"/> <source>Working Directory</source> <translation type="unfinished"></translation> </message> <message> - <location line="+221"/> + <location line="+225"/> <source>Executable Script</source> <translation type="unfinished"></translation> </message> <message> - <location line="-92"/> + <location line="-96"/> <source>shutdown please wait ...</source> <translation type="unfinished"></translation> </message> @@ -809,7 +809,7 @@ <context> <name>GrabberInfo</name> <message> - <location filename="../src/utils/grabberinfo.cpp" line="+66"/> + <location filename="../src/utils/grabberinfo.cpp" line="+64"/> <source>Dimension:</source> <translation type="unfinished"></translation> </message> @@ -876,34 +876,23 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Screen:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>current selected screen</source> - <extracomment>WhatsThis</extracomment> + <location line="+9"/> + <source>Screen</source> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> - <source>Color depth:</source> + <location line="+14"/> + <source>Framerate</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>current color depth</source> + <location line="-7"/> + <source>current selected screen</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> - <source>Framerate:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> + <location line="+15"/> <source>Set the framerate in the captured video.</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> @@ -1178,7 +1167,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+138"/> + <location line="+135"/> <source>commandline exported</source> <translation type="unfinished"></translation> </message> @@ -1206,12 +1195,12 @@ <context> <name>MenuBar</name> <message> - <location filename="../src/menubar.cpp" line="+44"/> + <location filename="../src/menubar.cpp" line="+45"/> <source>File</source> <translation type="unfinished"></translation> </message> <message> - <location line="+284"/> + <location line="+302"/> <source>Kill</source> <extracomment>MenuEntry</extracomment> <translation type="unfinished"></translation> @@ -1223,7 +1212,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-295"/> + <location line="-313"/> <source>Load</source> <translation type="unfinished"></translation> </message> @@ -1309,7 +1298,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+71"/> + <location line="+89"/> <source>Create</source> <translation type="unfinished"></translation> </message> @@ -1430,12 +1419,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-298"/> + <location line="-316"/> <source>Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location line="+311"/> + <location line="+329"/> <source>Save current Settings</source> <extracomment>ToolTip</extracomment> <translation type="unfinished"></translation> @@ -1468,7 +1457,7 @@ <context> <name>Messanger</name> <message> - <location filename="../src/messanger/messanger.cpp" line="+136"/> + <location filename="../src/messanger/messanger.cpp" line="+156"/> <source>Notification not send!</source> <translation type="unfinished"></translation> </message> @@ -1476,7 +1465,7 @@ <context> <name>MetaData</name> <message> - <location filename="../src/utils/metadata.cpp" line="+43"/> + <location filename="../src/utils/metadata.cpp" line="+44"/> <source>Insert Metadata</source> <extracomment>GroupBoxTitle</extracomment> <translation type="unfinished"></translation> @@ -1526,7 +1515,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> + <location line="+12"/> <source>Creation Date:</source> <translation type="unfinished"></translation> </message> @@ -1665,7 +1654,7 @@ <context> <name>PlayerAction</name> <message> - <location filename="../src/playeraction.cpp" line="+99"/> + <location filename="../src/playeraction.cpp" line="+101"/> <source>MPlayer</source> <extracomment>MenuEntry for "mplayer" http://www.mplayerhq.hu</extracomment> <translation type="unfinished"></translation> @@ -1718,6 +1707,12 @@ <extracomment>MenuEntry for "totem" http://projects.gnome.org/totem/</extracomment> <translation type="unfinished"></translation> </message> + <message> + <location line="+2"/> + <source>GStreamer</source> + <extracomment>MenuEntry for "gst-launch" http://gstreamer.freedesktop.org/</extracomment> + <translation type="unfinished"></translation> + </message> </context> <context> <name>PresetSelector</name> @@ -1746,9 +1741,92 @@ </message> </context> <context> + <name>QObject</name> + <message> + <location filename="../src/filters/webcam/v4l2-api.cpp" line="+184"/> + <source>Set Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <source>Set Output</source> + <translation type="unfinished"></translation>
View file
qx11grab-0.4.5.tar.bz2/i18n/qx11grab_sr_RS.ts -> qx11grab-0.4.10.tar.bz2/i18n/qx11grab_sr_RS.ts
Changed
@@ -700,23 +700,23 @@ <context> <name>FFProcess</name> <message> - <location filename="../src/ffprocess/ffprocess.cpp" line="+80"/> - <location line="+222"/> + <location filename="../src/ffprocess/ffprocess.cpp" line="+81"/> + <location line="+226"/> <source>Permission Denied: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-222"/> + <location line="-226"/> <source>Working Directory</source> <translation type="unfinished"></translation> </message> <message> - <location line="+221"/> + <location line="+225"/> <source>Executable Script</source> <translation type="unfinished"></translation> </message> <message> - <location line="-151"/> + <location line="-155"/> <location line="+4"/> <location line="+4"/> <location line="+4"/> @@ -809,7 +809,7 @@ <context> <name>GrabberInfo</name> <message> - <location filename="../src/utils/grabberinfo.cpp" line="+66"/> + <location filename="../src/utils/grabberinfo.cpp" line="+64"/> <source>Dimension:</source> <translation>Димензије:</translation> </message> @@ -857,35 +857,29 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Screen:</source> - <translation>Екран:</translation> - </message> - <message> - <location line="+6"/> - <source>current selected screen</source> - <extracomment>WhatsThis</extracomment> + <location line="+9"/> + <source>Screen</source> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> - <source>Color depth:</source> - <translation>Дубина боја:</translation> + <location line="+14"/> + <source>Framerate</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>current color depth</source> + <location line="-7"/> + <source>current selected screen</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> </message> <message> - <location line="+12"/> + <location line="+15"/> <source>Set the framerate in the captured video.</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> </message> <message> - <location line="-78"/> + <location line="-71"/> <source>Position X:</source> <translation>Положај X:</translation> </message> @@ -903,11 +897,6 @@ <source>Position Y:</source> <translation>Положај Y:</translation> </message> - <message> - <location line="+49"/> - <source>Framerate:</source> - <translation>Број кадрова:</translation> - </message> </context> <context> <name>GraphicsEngineSelecter</name> @@ -1178,7 +1167,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+138"/> + <location line="+135"/> <source>commandline exported</source> <translation type="unfinished"></translation> </message> @@ -1206,12 +1195,12 @@ <context> <name>MenuBar</name> <message> - <location filename="../src/menubar.cpp" line="+44"/> + <location filename="../src/menubar.cpp" line="+45"/> <source>File</source> <translation>Фајл</translation> </message> <message> - <location line="+284"/> + <location line="+302"/> <source>Kill</source> <extracomment>MenuEntry</extracomment> <translation>Укини</translation> @@ -1223,7 +1212,7 @@ <translation>Сачувај</translation> </message> <message> - <location line="-295"/> + <location line="-313"/> <source>Load</source> <translation>Учитај</translation> </message> @@ -1309,7 +1298,7 @@ <translation>О Кјуту4</translation> </message> <message> - <location line="+71"/> + <location line="+89"/> <source>Create</source> <translation>Направи</translation> </message> @@ -1430,12 +1419,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-298"/> + <location line="-316"/> <source>Bookmark</source> <translation type="unfinished">Обележивач</translation> </message> <message> - <location line="+311"/> + <location line="+329"/> <source>Save current Settings</source> <extracomment>ToolTip</extracomment> <translation type="unfinished"></translation> @@ -1468,7 +1457,7 @@ <context> <name>Messanger</name> <message> - <location filename="../src/messanger/messanger.cpp" line="+136"/> + <location filename="../src/messanger/messanger.cpp" line="+156"/> <source>Notification not send!</source> <translation>Обавештење није послато!</translation> </message> @@ -1476,7 +1465,7 @@ <context> <name>MetaData</name> <message> - <location filename="../src/utils/metadata.cpp" line="+43"/> + <location filename="../src/utils/metadata.cpp" line="+44"/> <source>Insert Metadata</source> <extracomment>GroupBoxTitle</extracomment> <translation>Уметни метаподатке</translation> @@ -1526,7 +1515,7 @@ <translation>Ауторска права</translation> </message> <message> - <location line="+4"/> + <location line="+12"/> <source>Creation Date:</source> <translation>Датум:</translation> </message> @@ -1665,7 +1654,7 @@ <context> <name>PlayerAction</name> <message> - <location filename="../src/playeraction.cpp" line="+99"/> + <location filename="../src/playeraction.cpp" line="+101"/> <source>MPlayer</source> <extracomment>MenuEntry for "mplayer" http://www.mplayerhq.hu</extracomment> <translation type="unfinished"></translation> @@ -1718,6 +1707,12 @@ <extracomment>MenuEntry for "totem" http://projects.gnome.org/totem/</extracomment> <translation type="unfinished"></translation> </message> + <message> + <location line="+2"/> + <source>GStreamer</source> + <extracomment>MenuEntry for "gst-launch" http://gstreamer.freedesktop.org/</extracomment> + <translation type="unfinished"></translation> + </message> </context> <context>
View file
qx11grab-0.4.5.tar.bz2/i18n/qx11grab_sv.ts -> qx11grab-0.4.10.tar.bz2/i18n/qx11grab_sv.ts
Changed
@@ -700,23 +700,23 @@ <context> <name>FFProcess</name> <message> - <location filename="../src/ffprocess/ffprocess.cpp" line="+80"/> - <location line="+222"/> + <location filename="../src/ffprocess/ffprocess.cpp" line="+81"/> + <location line="+226"/> <source>Permission Denied: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-222"/> + <location line="-226"/> <source>Working Directory</source> <translation type="unfinished"></translation> </message> <message> - <location line="+221"/> + <location line="+225"/> <source>Executable Script</source> <translation type="unfinished"></translation> </message> <message> - <location line="-92"/> + <location line="-96"/> <source>shutdown please wait ...</source> <translation type="unfinished"></translation> </message> @@ -809,7 +809,7 @@ <context> <name>GrabberInfo</name> <message> - <location filename="../src/utils/grabberinfo.cpp" line="+66"/> + <location filename="../src/utils/grabberinfo.cpp" line="+64"/> <source>Dimension:</source> <translation type="unfinished"></translation> </message> @@ -876,34 +876,23 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Screen:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>current selected screen</source> - <extracomment>WhatsThis</extracomment> + <location line="+9"/> + <source>Screen</source> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> - <source>Color depth:</source> + <location line="+14"/> + <source>Framerate</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>current color depth</source> + <location line="-7"/> + <source>current selected screen</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> - <source>Framerate:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> + <location line="+15"/> <source>Set the framerate in the captured video.</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> @@ -1178,7 +1167,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+138"/> + <location line="+135"/> <source>commandline exported</source> <translation type="unfinished"></translation> </message> @@ -1206,12 +1195,12 @@ <context> <name>MenuBar</name> <message> - <location filename="../src/menubar.cpp" line="+44"/> + <location filename="../src/menubar.cpp" line="+45"/> <source>File</source> <translation type="unfinished"></translation> </message> <message> - <location line="+284"/> + <location line="+302"/> <source>Kill</source> <extracomment>MenuEntry</extracomment> <translation type="unfinished"></translation> @@ -1223,7 +1212,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-295"/> + <location line="-313"/> <source>Load</source> <translation type="unfinished"></translation> </message> @@ -1309,7 +1298,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+71"/> + <location line="+89"/> <source>Create</source> <translation type="unfinished"></translation> </message> @@ -1430,12 +1419,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-298"/> + <location line="-316"/> <source>Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location line="+311"/> + <location line="+329"/> <source>Save current Settings</source> <extracomment>ToolTip</extracomment> <translation type="unfinished"></translation> @@ -1468,7 +1457,7 @@ <context> <name>Messanger</name> <message> - <location filename="../src/messanger/messanger.cpp" line="+136"/> + <location filename="../src/messanger/messanger.cpp" line="+156"/> <source>Notification not send!</source> <translation type="unfinished"></translation> </message> @@ -1476,7 +1465,7 @@ <context> <name>MetaData</name> <message> - <location filename="../src/utils/metadata.cpp" line="+43"/> + <location filename="../src/utils/metadata.cpp" line="+44"/> <source>Insert Metadata</source> <extracomment>GroupBoxTitle</extracomment> <translation type="unfinished"></translation> @@ -1526,7 +1515,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> + <location line="+12"/> <source>Creation Date:</source> <translation type="unfinished"></translation> </message> @@ -1665,7 +1654,7 @@ <context> <name>PlayerAction</name> <message> - <location filename="../src/playeraction.cpp" line="+99"/> + <location filename="../src/playeraction.cpp" line="+101"/> <source>MPlayer</source> <extracomment>MenuEntry for "mplayer" http://www.mplayerhq.hu</extracomment> <translation type="unfinished"></translation> @@ -1718,6 +1707,12 @@ <extracomment>MenuEntry for "totem" http://projects.gnome.org/totem/</extracomment> <translation type="unfinished"></translation> </message> + <message> + <location line="+2"/> + <source>GStreamer</source> + <extracomment>MenuEntry for "gst-launch" http://gstreamer.freedesktop.org/</extracomment> + <translation type="unfinished"></translation> + </message> </context> <context> <name>PresetSelector</name> @@ -1746,9 +1741,92 @@ </message> </context> <context> + <name>QObject</name> + <message> + <location filename="../src/filters/webcam/v4l2-api.cpp" line="+184"/> + <source>Set Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <source>Set Output</source> + <translation type="unfinished"></translation>
View file
qx11grab-0.4.5.tar.bz2/i18n/qx11grab_uk.ts -> qx11grab-0.4.10.tar.bz2/i18n/qx11grab_uk.ts
Changed
@@ -700,23 +700,23 @@ <context> <name>FFProcess</name> <message> - <location filename="../src/ffprocess/ffprocess.cpp" line="+80"/> - <location line="+222"/> + <location filename="../src/ffprocess/ffprocess.cpp" line="+81"/> + <location line="+226"/> <source>Permission Denied: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-222"/> + <location line="-226"/> <source>Working Directory</source> <translation type="unfinished"></translation> </message> <message> - <location line="+221"/> + <location line="+225"/> <source>Executable Script</source> <translation type="unfinished"></translation> </message> <message> - <location line="-92"/> + <location line="-96"/> <source>shutdown please wait ...</source> <translation type="unfinished"></translation> </message> @@ -809,7 +809,7 @@ <context> <name>GrabberInfo</name> <message> - <location filename="../src/utils/grabberinfo.cpp" line="+66"/> + <location filename="../src/utils/grabberinfo.cpp" line="+64"/> <source>Dimension:</source> <translation type="unfinished"></translation> </message> @@ -876,34 +876,23 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Screen:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>current selected screen</source> - <extracomment>WhatsThis</extracomment> + <location line="+9"/> + <source>Screen</source> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> - <source>Color depth:</source> + <location line="+14"/> + <source>Framerate</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>current color depth</source> + <location line="-7"/> + <source>current selected screen</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> - <source>Framerate:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> + <location line="+15"/> <source>Set the framerate in the captured video.</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> @@ -1178,7 +1167,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+138"/> + <location line="+135"/> <source>commandline exported</source> <translation type="unfinished"></translation> </message> @@ -1206,12 +1195,12 @@ <context> <name>MenuBar</name> <message> - <location filename="../src/menubar.cpp" line="+44"/> + <location filename="../src/menubar.cpp" line="+45"/> <source>File</source> <translation type="unfinished"></translation> </message> <message> - <location line="+284"/> + <location line="+302"/> <source>Kill</source> <extracomment>MenuEntry</extracomment> <translation type="unfinished"></translation> @@ -1223,7 +1212,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-295"/> + <location line="-313"/> <source>Load</source> <translation type="unfinished"></translation> </message> @@ -1309,7 +1298,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+71"/> + <location line="+89"/> <source>Create</source> <translation type="unfinished"></translation> </message> @@ -1430,12 +1419,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-298"/> + <location line="-316"/> <source>Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location line="+311"/> + <location line="+329"/> <source>Save current Settings</source> <extracomment>ToolTip</extracomment> <translation type="unfinished"></translation> @@ -1468,7 +1457,7 @@ <context> <name>Messanger</name> <message> - <location filename="../src/messanger/messanger.cpp" line="+136"/> + <location filename="../src/messanger/messanger.cpp" line="+156"/> <source>Notification not send!</source> <translation type="unfinished"></translation> </message> @@ -1476,7 +1465,7 @@ <context> <name>MetaData</name> <message> - <location filename="../src/utils/metadata.cpp" line="+43"/> + <location filename="../src/utils/metadata.cpp" line="+44"/> <source>Insert Metadata</source> <extracomment>GroupBoxTitle</extracomment> <translation type="unfinished"></translation> @@ -1526,7 +1515,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> + <location line="+12"/> <source>Creation Date:</source> <translation type="unfinished"></translation> </message> @@ -1665,7 +1654,7 @@ <context> <name>PlayerAction</name> <message> - <location filename="../src/playeraction.cpp" line="+99"/> + <location filename="../src/playeraction.cpp" line="+101"/> <source>MPlayer</source> <extracomment>MenuEntry for "mplayer" http://www.mplayerhq.hu</extracomment> <translation type="unfinished"></translation> @@ -1718,6 +1707,12 @@ <extracomment>MenuEntry for "totem" http://projects.gnome.org/totem/</extracomment> <translation type="unfinished"></translation> </message> + <message> + <location line="+2"/> + <source>GStreamer</source> + <extracomment>MenuEntry for "gst-launch" http://gstreamer.freedesktop.org/</extracomment> + <translation type="unfinished"></translation> + </message> </context> <context> <name>PresetSelector</name> @@ -1746,9 +1741,92 @@ </message> </context> <context> + <name>QObject</name> + <message> + <location filename="../src/filters/webcam/v4l2-api.cpp" line="+184"/> + <source>Set Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <source>Set Output</source> + <translation type="unfinished"></translation>
View file
qx11grab-0.4.5.tar.bz2/i18n/qx11grab_untranslated.ts -> qx11grab-0.4.10.tar.bz2/i18n/qx11grab_untranslated.ts
Changed
@@ -700,23 +700,23 @@ <context> <name>FFProcess</name> <message> - <location filename="../src/ffprocess/ffprocess.cpp" line="+80"/> - <location line="+222"/> + <location filename="../src/ffprocess/ffprocess.cpp" line="+81"/> + <location line="+226"/> <source>Permission Denied: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-222"/> + <location line="-226"/> <source>Working Directory</source> <translation type="unfinished"></translation> </message> <message> - <location line="+221"/> + <location line="+225"/> <source>Executable Script</source> <translation type="unfinished"></translation> </message> <message> - <location line="-151"/> + <location line="-155"/> <location line="+4"/> <location line="+4"/> <location line="+4"/> @@ -809,7 +809,7 @@ <context> <name>GrabberInfo</name> <message> - <location filename="../src/utils/grabberinfo.cpp" line="+66"/> + <location filename="../src/utils/grabberinfo.cpp" line="+64"/> <source>Dimension:</source> <translation type="unfinished"></translation> </message> @@ -876,34 +876,23 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Screen:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>current selected screen</source> - <extracomment>WhatsThis</extracomment> + <location line="+9"/> + <source>Screen</source> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> - <source>Color depth:</source> + <location line="+14"/> + <source>Framerate</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>current color depth</source> + <location line="-7"/> + <source>current selected screen</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> - <source>Framerate:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> + <location line="+15"/> <source>Set the framerate in the captured video.</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> @@ -1178,7 +1167,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+138"/> + <location line="+135"/> <source>commandline exported</source> <translation type="unfinished"></translation> </message> @@ -1206,12 +1195,12 @@ <context> <name>MenuBar</name> <message> - <location filename="../src/menubar.cpp" line="+44"/> + <location filename="../src/menubar.cpp" line="+45"/> <source>File</source> <translation type="unfinished"></translation> </message> <message> - <location line="+284"/> + <location line="+302"/> <source>Kill</source> <extracomment>MenuEntry</extracomment> <translation type="unfinished"></translation> @@ -1223,7 +1212,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-295"/> + <location line="-313"/> <source>Load</source> <translation type="unfinished"></translation> </message> @@ -1309,7 +1298,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+71"/> + <location line="+89"/> <source>Create</source> <translation type="unfinished"></translation> </message> @@ -1430,12 +1419,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-298"/> + <location line="-316"/> <source>Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location line="+311"/> + <location line="+329"/> <source>Save current Settings</source> <extracomment>ToolTip</extracomment> <translation type="unfinished"></translation> @@ -1468,7 +1457,7 @@ <context> <name>Messanger</name> <message> - <location filename="../src/messanger/messanger.cpp" line="+136"/> + <location filename="../src/messanger/messanger.cpp" line="+156"/> <source>Notification not send!</source> <translation type="unfinished"></translation> </message> @@ -1476,7 +1465,7 @@ <context> <name>MetaData</name> <message> - <location filename="../src/utils/metadata.cpp" line="+43"/> + <location filename="../src/utils/metadata.cpp" line="+44"/> <source>Insert Metadata</source> <extracomment>GroupBoxTitle</extracomment> <translation type="unfinished"></translation> @@ -1526,7 +1515,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> + <location line="+12"/> <source>Creation Date:</source> <translation type="unfinished"></translation> </message> @@ -1665,7 +1654,7 @@ <context> <name>PlayerAction</name> <message> - <location filename="../src/playeraction.cpp" line="+99"/> + <location filename="../src/playeraction.cpp" line="+101"/> <source>MPlayer</source> <extracomment>MenuEntry for "mplayer" http://www.mplayerhq.hu</extracomment> <translation type="unfinished"></translation> @@ -1718,6 +1707,12 @@ <extracomment>MenuEntry for "totem" http://projects.gnome.org/totem/</extracomment> <translation type="unfinished"></translation> </message> + <message> + <location line="+2"/> + <source>GStreamer</source> + <extracomment>MenuEntry for "gst-launch" http://gstreamer.freedesktop.org/</extracomment> + <translation type="unfinished"></translation> + </message> </context> <context> <name>PresetSelector</name> @@ -1746,9 +1741,92 @@ </message> </context> <context> + <name>QObject</name> + <message> + <location filename="../src/filters/webcam/v4l2-api.cpp" line="+184"/> + <source>Set Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <source>Set Output</source> + <translation type="unfinished"></translation>
View file
qx11grab-0.4.5.tar.bz2/i18n/qx11grab_zh_CN.ts -> qx11grab-0.4.10.tar.bz2/i18n/qx11grab_zh_CN.ts
Changed
@@ -700,23 +700,23 @@ <context> <name>FFProcess</name> <message> - <location filename="../src/ffprocess/ffprocess.cpp" line="+80"/> - <location line="+222"/> + <location filename="../src/ffprocess/ffprocess.cpp" line="+81"/> + <location line="+226"/> <source>Permission Denied: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-222"/> + <location line="-226"/> <source>Working Directory</source> <translation type="unfinished"></translation> </message> <message> - <location line="+221"/> + <location line="+225"/> <source>Executable Script</source> <translation type="unfinished"></translation> </message> <message> - <location line="-92"/> + <location line="-96"/> <source>shutdown please wait ...</source> <translation type="unfinished"></translation> </message> @@ -809,7 +809,7 @@ <context> <name>GrabberInfo</name> <message> - <location filename="../src/utils/grabberinfo.cpp" line="+66"/> + <location filename="../src/utils/grabberinfo.cpp" line="+64"/> <source>Dimension:</source> <translation type="unfinished"></translation> </message> @@ -876,34 +876,23 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Screen:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>current selected screen</source> - <extracomment>WhatsThis</extracomment> + <location line="+9"/> + <source>Screen</source> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> - <source>Color depth:</source> + <location line="+14"/> + <source>Framerate</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>current color depth</source> + <location line="-7"/> + <source>current selected screen</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> - <source>Framerate:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> + <location line="+15"/> <source>Set the framerate in the captured video.</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> @@ -1178,7 +1167,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+138"/> + <location line="+135"/> <source>commandline exported</source> <translation type="unfinished"></translation> </message> @@ -1206,12 +1195,12 @@ <context> <name>MenuBar</name> <message> - <location filename="../src/menubar.cpp" line="+44"/> + <location filename="../src/menubar.cpp" line="+45"/> <source>File</source> <translation type="unfinished"></translation> </message> <message> - <location line="+284"/> + <location line="+302"/> <source>Kill</source> <extracomment>MenuEntry</extracomment> <translation type="unfinished"></translation> @@ -1223,7 +1212,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-295"/> + <location line="-313"/> <source>Load</source> <translation type="unfinished"></translation> </message> @@ -1309,7 +1298,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+71"/> + <location line="+89"/> <source>Create</source> <translation type="unfinished"></translation> </message> @@ -1430,12 +1419,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-298"/> + <location line="-316"/> <source>Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location line="+311"/> + <location line="+329"/> <source>Save current Settings</source> <extracomment>ToolTip</extracomment> <translation type="unfinished"></translation> @@ -1468,7 +1457,7 @@ <context> <name>Messanger</name> <message> - <location filename="../src/messanger/messanger.cpp" line="+136"/> + <location filename="../src/messanger/messanger.cpp" line="+156"/> <source>Notification not send!</source> <translation type="unfinished"></translation> </message> @@ -1476,7 +1465,7 @@ <context> <name>MetaData</name> <message> - <location filename="../src/utils/metadata.cpp" line="+43"/> + <location filename="../src/utils/metadata.cpp" line="+44"/> <source>Insert Metadata</source> <extracomment>GroupBoxTitle</extracomment> <translation type="unfinished"></translation> @@ -1526,7 +1515,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> + <location line="+12"/> <source>Creation Date:</source> <translation type="unfinished"></translation> </message> @@ -1665,7 +1654,7 @@ <context> <name>PlayerAction</name> <message> - <location filename="../src/playeraction.cpp" line="+99"/> + <location filename="../src/playeraction.cpp" line="+101"/> <source>MPlayer</source> <extracomment>MenuEntry for "mplayer" http://www.mplayerhq.hu</extracomment> <translation type="unfinished"></translation> @@ -1718,6 +1707,12 @@ <extracomment>MenuEntry for "totem" http://projects.gnome.org/totem/</extracomment> <translation type="unfinished"></translation> </message> + <message> + <location line="+2"/> + <source>GStreamer</source> + <extracomment>MenuEntry for "gst-launch" http://gstreamer.freedesktop.org/</extracomment> + <translation type="unfinished"></translation> + </message> </context> <context> <name>PresetSelector</name> @@ -1746,9 +1741,92 @@ </message> </context> <context> + <name>QObject</name> + <message> + <location filename="../src/filters/webcam/v4l2-api.cpp" line="+184"/> + <source>Set Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <source>Set Output</source> + <translation type="unfinished"></translation>
View file
qx11grab-0.4.5.tar.bz2/i18n/qx11grab_zh_TW.ts -> qx11grab-0.4.10.tar.bz2/i18n/qx11grab_zh_TW.ts
Changed
@@ -700,23 +700,23 @@ <context> <name>FFProcess</name> <message> - <location filename="../src/ffprocess/ffprocess.cpp" line="+80"/> - <location line="+222"/> + <location filename="../src/ffprocess/ffprocess.cpp" line="+81"/> + <location line="+226"/> <source>Permission Denied: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-222"/> + <location line="-226"/> <source>Working Directory</source> <translation type="unfinished"></translation> </message> <message> - <location line="+221"/> + <location line="+225"/> <source>Executable Script</source> <translation type="unfinished"></translation> </message> <message> - <location line="-92"/> + <location line="-96"/> <source>shutdown please wait ...</source> <translation type="unfinished"></translation> </message> @@ -809,7 +809,7 @@ <context> <name>GrabberInfo</name> <message> - <location filename="../src/utils/grabberinfo.cpp" line="+66"/> + <location filename="../src/utils/grabberinfo.cpp" line="+64"/> <source>Dimension:</source> <translation type="unfinished"></translation> </message> @@ -876,34 +876,23 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Screen:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>current selected screen</source> - <extracomment>WhatsThis</extracomment> + <location line="+9"/> + <source>Screen</source> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> - <source>Color depth:</source> + <location line="+14"/> + <source>Framerate</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>current color depth</source> + <location line="-7"/> + <source>current selected screen</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> - <source>Framerate:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> + <location line="+15"/> <source>Set the framerate in the captured video.</source> <extracomment>WhatsThis</extracomment> <translation type="unfinished"></translation> @@ -1178,7 +1167,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+138"/> + <location line="+135"/> <source>commandline exported</source> <translation type="unfinished"></translation> </message> @@ -1206,12 +1195,12 @@ <context> <name>MenuBar</name> <message> - <location filename="../src/menubar.cpp" line="+44"/> + <location filename="../src/menubar.cpp" line="+45"/> <source>File</source> <translation type="unfinished"></translation> </message> <message> - <location line="+284"/> + <location line="+302"/> <source>Kill</source> <extracomment>MenuEntry</extracomment> <translation type="unfinished"></translation> @@ -1223,7 +1212,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-295"/> + <location line="-313"/> <source>Load</source> <translation type="unfinished"></translation> </message> @@ -1309,7 +1298,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+71"/> + <location line="+89"/> <source>Create</source> <translation type="unfinished"></translation> </message> @@ -1430,12 +1419,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-298"/> + <location line="-316"/> <source>Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location line="+311"/> + <location line="+329"/> <source>Save current Settings</source> <extracomment>ToolTip</extracomment> <translation type="unfinished"></translation> @@ -1468,7 +1457,7 @@ <context> <name>Messanger</name> <message> - <location filename="../src/messanger/messanger.cpp" line="+136"/> + <location filename="../src/messanger/messanger.cpp" line="+156"/> <source>Notification not send!</source> <translation type="unfinished"></translation> </message> @@ -1476,7 +1465,7 @@ <context> <name>MetaData</name> <message> - <location filename="../src/utils/metadata.cpp" line="+43"/> + <location filename="../src/utils/metadata.cpp" line="+44"/> <source>Insert Metadata</source> <extracomment>GroupBoxTitle</extracomment> <translation type="unfinished"></translation> @@ -1526,7 +1515,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> + <location line="+12"/> <source>Creation Date:</source> <translation type="unfinished"></translation> </message> @@ -1665,7 +1654,7 @@ <context> <name>PlayerAction</name> <message> - <location filename="../src/playeraction.cpp" line="+99"/> + <location filename="../src/playeraction.cpp" line="+101"/> <source>MPlayer</source> <extracomment>MenuEntry for "mplayer" http://www.mplayerhq.hu</extracomment> <translation type="unfinished"></translation> @@ -1718,6 +1707,12 @@ <extracomment>MenuEntry for "totem" http://projects.gnome.org/totem/</extracomment> <translation type="unfinished"></translation> </message> + <message> + <location line="+2"/> + <source>GStreamer</source> + <extracomment>MenuEntry for "gst-launch" http://gstreamer.freedesktop.org/</extracomment> + <translation type="unfinished"></translation> + </message> </context> <context> <name>PresetSelector</name> @@ -1746,9 +1741,92 @@ </message> </context> <context> + <name>QObject</name> + <message> + <location filename="../src/filters/webcam/v4l2-api.cpp" line="+184"/> + <source>Set Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <source>Set Output</source> + <translation type="unfinished"></translation>
View file
qx11grab-0.4.5.tar.bz2/modules/CheckingGNUCXX.cmake -> qx11grab-0.4.10.tar.bz2/modules/CheckingGNUCXX.cmake
Changed
@@ -14,6 +14,8 @@ MACRO_ENSURE_VERSION ("4.2.0" "${_gcc_version}" GCC_IS_NEWER_THAN_4_2) MACRO_ENSURE_VERSION ("4.5.0" "${_gcc_version}" GCC_IS_NEWER_THAN_4_5) MACRO_ENSURE_VERSION ("4.6.0" "${_gcc_version}" GCC_IS_NEWER_THAN_4_6) +MACRO_ENSURE_VERSION ("4.7.0" "${_gcc_version}" GCC_IS_NEWER_THAN_4_7) +MACRO_ENSURE_VERSION ("4.8.0" "${_gcc_version}" GCC_IS_NEWER_THAN_4_8) IF (CMAKE_SYSTEM_NAME MATCHES Linux) SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wundef -Wcast-align -Wchar-subscripts -Wpointer-arith") @@ -112,3 +114,8 @@ SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-missing-declarations -Wno-old-style-cast") ENDIF (GCC_IS_NEWER_THAN_4_6) ENDIF (CMAKE_BUILD_TYPE STREQUAL "Debug") + +IF (GCC_IS_NEWER_THAN_4_7) + ## FIXME force remove invalid "-std=c++0x" user sets + REMOVE_DEFINITIONS ("-std=c++0x") +ENDIF (GCC_IS_NEWER_THAN_4_7)
View file
qx11grab-0.4.5.tar.bz2/modules/FindFFmpeg.cmake -> qx11grab-0.4.10.tar.bz2/modules/FindFFmpeg.cmake
Changed
@@ -23,23 +23,26 @@ # Configuration #============================================================================= +## Currently Supported Versions +## ffmpeg >= 0.10.7 +## libav >= 0.9 SET (FFMPEG_SUFFIX "" CACHE STRING "ffmpeg pkg-config or library file suffix (STRING)" ) -SET (FFMPEG_AVFORMAT_VERSION "52.78.3" CACHE STRING +SET (FFMPEG_AVFORMAT_VERSION "53.32.100" CACHE STRING "Required libavformat${FFMPEG_SUFFIX} Version" FORCE ) -SET (FFMPEG_AVCODEC_VERSION "52.86.1" CACHE STRING +SET (FFMPEG_AVCODEC_VERSION "53.61.100" CACHE STRING "Required libavcodec${FFMPEG_SUFFIX} Version" FORCE ) -SET (FFMPEG_AVUTIL_VERSION "50.24.0" CACHE STRING +SET (FFMPEG_AVUTIL_VERSION "51.35.100" CACHE STRING "Required libavutil${FFMPEG_SUFFIX} Version" FORCE ) -SET (FFMPEG_AVFILTER_VERSION "2.4.0" CACHE STRING +SET (FFMPEG_AVFILTER_VERSION "2.61.100" CACHE STRING "Required libavfilter${FFMPEG_SUFFIX} Version" FORCE ) @@ -151,6 +154,31 @@ ENDIF (NOT FFMPEG_BINARY) #============================================================================= +# Check for AVCodecID +#============================================================================= + +MACRO (FFMPEG_ABI_ENUM_CHECK) +TRY_RUN (__run_ret _compile_ret + ${CMAKE_BINARY_DIR}/CMakeTmp + ${CMAKE_SOURCE_DIR}/modules/check_ffmpeg_codecid.c + COMPILE_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS} -std=gnu89" + CMAKE_FLAGS + "-DINCLUDE_DIRECTORIES:STRING=${FFMPEG_INCLUDEDIR}" + "-DLINK_LIBRARIES:STRING=${FFMPEG_AVCODEC_LIBRARY}" + OUTPUT_VARIABLE OUTPUT +) +IF (_compile_ret) + MESSAGE (STATUS "AVCodecID supported." ) + REMOVE_DEFINITIONS (-DQX11GRAB_OLD_AVCODEC_ID) +ELSE (_compile_ret) + MESSAGE (WARNING "This version of ffmpeg using Deprecated CodecID. The most recent version of ffmpeg now using AVCodecID") + ADD_DEFINITIONS (-DQX11GRAB_OLD_AVCODEC_ID) +ENDIF (_compile_ret) +ENDMACRO (FFMPEG_ABI_ENUM_CHECK) + +FFMPEG_ABI_ENUM_CHECK () + +#============================================================================= # Find Filters Macro #=============================================================================
View file
qx11grab-0.4.5.tar.bz2/modules/FindV4L2.cmake -> qx11grab-0.4.10.tar.bz2/modules/FindV4L2.cmake
Changed
@@ -21,11 +21,17 @@ SET (V4L2_FOUND 0) FIND_PATH (V4L2_INCLUDE_DIR - NAMES libv4l2.h libv4lconvert.h + NAMES libv4l2.h PATH_SUFFIXES v4l2 video4linux DOC "The Video4Linux Version 2 (v4l2) include directory" ) +FIND_PATH (V4L2_CONVERT_INCLUDE_DIR + NAMES libv4lconvert.h + PATH_SUFFIXES v4l2 v4lconvert + DOC "The v4l format conversion (v4lconvert) include directory" +) + FIND_PATH (_videodev2 NAMES videodev2.h PATH_SUFFIXES linux @@ -33,26 +39,29 @@ ) FIND_LIBRARY (V4L2_LIBRARY - NAMES v4l2 v4lconvert + NAMES v4l2 DOC "The Video4Linux Version 2 (v4l2) library" ) +FIND_LIBRARY (V4L2_CONVERT_LIBRARY + NAMES v4lconvert + DOC "The v4l format conversion (v4lconvert) library" +) + # handle the QUIETLY and REQUIRED arguments and set V4L2_FOUND to TRUE if all listed variables are TRUE INCLUDE (FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS (V4L2 DEFAULT_MSG V4L2_LIBRARY V4L2_INCLUDE_DIR) +FIND_PACKAGE_HANDLE_STANDARD_ARGS (V4L2 DEFAULT_MSG + V4L2_LIBRARY V4L2_CONVERT_LIBRARY V4L2_INCLUDE_DIR V4L2_CONVERT_INCLUDE_DIR) -IF (V4L2_FOUND) - SET (V4L2_LIBRARIES ${V4L2_LIBRARY}) - SET (V4L2_INCLUDE_DIRS ${V4L2_INCLUDE_DIR}) -ELSE (V4L2_FOUND) +IF (NOT V4L2_FOUND) MESSAGE (WARNING "libv4l2 or libv4lconvert libraries from http://linuxtv.org not found!") -ENDIF (V4L2_FOUND) +ENDIF (NOT V4L2_FOUND) IF (NOT _videodev2) MESSAGE (WARNING "videodev2.h kernel header not found!") SET (V4L2_FOUND 0) ENDIF(NOT _videodev2) -MARK_AS_ADVANCED (V4L2_INCLUDE_DIR V4L2_LIBRARY) +MARK_AS_ADVANCED (V4L2_INCLUDE_DIR V4L2_CONVERT_INCLUDE_DIR V4L2_LIBRARY V4L2_CONVERT_LIBRARY) ##EOF
View file
qx11grab-0.4.10.tar.bz2/modules/check_ffmpeg_codecid.c
Added
@@ -0,0 +1,34 @@ +/** +* This file is part of the qx11grab project +* +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Library General Public +* License as published by the Free Software Foundation; either +* version 2 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Library General Public License for more details. +* +* You should have received a copy of the GNU Library General Public License +* along with this library; see the file COPYING.LIB. If not, write to +* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +* Boston, MA 02110-1301, USA. +**/ + +#include <stdio.h> +#include <stdlib.h> +#ifdef FF_API_CODEC_ID +# undef FF_API_CODEC_ID +#endif +#include <libavcodec/avcodec.h> + +int main(void) +{ + AVCodec *_co; + _co = avcodec_find_encoder(AV_CODEC_ID_PNG); + return (!_co) ? EXIT_FAILURE : EXIT_SUCCESS; +}
View file
qx11grab-0.4.5.tar.bz2/modules/check_ffmpeg_filter.c -> qx11grab-0.4.10.tar.bz2/modules/check_ffmpeg_filter.c
Changed
@@ -1,7 +1,7 @@ /** * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/mpackages.pl -> qx11grab-0.4.10.tar.bz2/mpackages.pl
Changed
@@ -2,7 +2,7 @@ ######################################################################################## # This file is part of the qx11grab project # -# Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +# Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/patches/ffmpeg_1.2_build_version.diff
Added
@@ -0,0 +1,38 @@ +/** +* @file ffmpeg_1.2_build_version.diff +* @author Juergen Heinemann (Undefined) http://www.hjcms.de +* @since Fri Jul 5 09:29:12 CEST 2013 +* @short diff options:-Nau6 +*/ +--- ./configure.orig 2013-07-05 09:25:30.158437111 +0200 ++++ ./configure 2013-07-05 09:26:06.692478075 +0200 +@@ -4555,13 +4555,13 @@ + cat <<EOF > $name/$name${build_suffix}.pc + prefix=$prefix + exec_prefix=\${prefix} + libdir=$libdir + includedir=$incdir + +-Name: $name ++Name: $name${build_suffix} + Description: $comment + Version: $version + Requires: $(enabled shared || echo $requires) + Requires.private: $(enabled shared && echo $requires) + Conflicts: + Libs: -L\${libdir} -l${shortname} $(enabled shared || echo $libs) +@@ -4575,13 +4575,13 @@ + cat <<EOF > doc/examples/pc-uninstalled/$name.pc + prefix= + exec_prefix= + libdir=\${pcfiledir}/../../../$name + includedir=${includedir} + +-Name: $name ++Name: $name${build_suffix} + Description: $comment + Version: $version + Requires: $requires + Conflicts: + Libs: -L\${libdir} -l${shortname} $(enabled shared || echo $libs) + Cflags: -I\${includedir}
View file
qx11grab-0.4.10.tar.bz2/qx11grab.app.cmake
Added
@@ -0,0 +1,14 @@ +[Application] +Name=qx11grab +Version=1.0 +Description=A Application to record X11 desktops +Type=X-ApplicationPackage +Exec=qx11grab +ExecType=application/x-executable +Maintainer=Juergen Heinemann (Undefined) http://www.hjcms.de +Authors=Juergen Heinemann (Undefined) http://www.hjcms.de +Application-Version=@QX11GRAB_VERSION_MAJOR@.@QX11GRAB_VERSION_MINOR@.@QX11GRAB_VERSION_RELEASE@ +License=GPL3;Creative-Commons +Icon=http://qx11grab.hjcms.de/qx11grab.svgz +DownloadURL=ftp://ftp.hjcms.de/qx11grab/@QX11GRAB_VERSION_MAJOR@.@QX11GRAB_VERSION_MINOR@.@QX11GRAB_VERSION_RELEASE@/qx11grab-@QX11GRAB_VERSION_MAJOR@.@QX11GRAB_VERSION_MINOR@.@QX11GRAB_VERSION_RELEASE@.tar.xz +UpdateInfo=http://qx11grab.hjcms.de/news.html
View file
qx11grab-0.4.10.tar.bz2/qx11grab.cppcheck.cmake
Added
@@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="1"> + <includedir> + <dir name="src/"/> + <dir name="@CMAKE_CURRENT_BINARY_DIR@/src/"/> + <dir name="@QT_INCLUDE_DIR@/"/> + <dir name="@ALSA_INCLUDE_DIR@/"/> + <dir name="@PULSE_INCLUDEDIR@/"/> + <dir name="@FFMPEG_INCLUDEDIR@/"/> + </includedir> + <exclude> + <path name="@CMAKE_CURRENT_BINARY_DIR@/CMakeFiles/"/> + <path name="@CMAKE_CURRENT_BINARY_DIR@/CMakeTmp/"/> + </exclude> +</project>
View file
qx11grab-0.4.5.tar.bz2/src/aboutdialog.cpp -> qx11grab-0.4.10.tar.bz2/src/aboutdialog.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/aboutdialog.h -> qx11grab-0.4.10.tar.bz2/src/aboutdialog.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/adaptor.cpp -> qx11grab-0.4.10.tar.bz2/src/adaptor.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/adaptor.h -> qx11grab-0.4.10.tar.bz2/src/adaptor.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/application.cpp -> qx11grab-0.4.10.tar.bz2/src/application.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -86,7 +86,7 @@ #endif #ifdef HAVE_KDE4_SUPPORT - QByteArray appsName = applicationName().toAscii(); + QByteArray appsName = applicationName().toUtf8(); KAboutData kdata ( appsName, appsName, ki18n ( "QX11Grab" ), QX11GRAB_VERSION,
View file
qx11grab-0.4.5.tar.bz2/src/application.h -> qx11grab-0.4.10.tar.bz2/src/application.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/audio/abstractaudiodialog.cpp -> qx11grab-0.4.10.tar.bz2/src/audio/abstractaudiodialog.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/audio/abstractaudiodialog.h -> qx11grab-0.4.10.tar.bz2/src/audio/abstractaudiodialog.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/audio/alsaaudiodialog.cpp -> qx11grab-0.4.10.tar.bz2/src/audio/alsaaudiodialog.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -75,7 +75,7 @@ QString infoHint = QString ( snd_device_name_get_hint ( *n, "DESC" ) ); if ( ! buffer.contains ( cardHint.remove ( pattern ) ) ) { - int index = snd_card_get_index ( cardHint.toAscii().data() ); + int index = snd_card_get_index ( cardHint.toUtf8().data() ); if ( index >= 0 ) hwIndex = QString ( "hw=%1" ).arg ( QString::number ( index ) );
View file
qx11grab-0.4.5.tar.bz2/src/audio/alsaaudiodialog.h -> qx11grab-0.4.10.tar.bz2/src/audio/alsaaudiodialog.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/audio/audiodevice.cpp -> qx11grab-0.4.10.tar.bz2/src/audio/audiodevice.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/audio/audiodevice.h -> qx11grab-0.4.10.tar.bz2/src/audio/audiodevice.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/audio/audiodevicewidget.cpp -> qx11grab-0.4.10.tar.bz2/src/audio/audiodevicewidget.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/audio/audiodevicewidget.h -> qx11grab-0.4.10.tar.bz2/src/audio/audiodevicewidget.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/audio/opensounddialog.cpp -> qx11grab-0.4.10.tar.bz2/src/audio/opensounddialog.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/audio/opensounddialog.h -> qx11grab-0.4.10.tar.bz2/src/audio/opensounddialog.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/audio/pulseaudiodialog.cpp -> qx11grab-0.4.10.tar.bz2/src/audio/pulseaudiodialog.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/audio/pulseaudiodialog.h -> qx11grab-0.4.10.tar.bz2/src/audio/pulseaudiodialog.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/avoptions/avfilteritem.cpp -> qx11grab-0.4.10.tar.bz2/src/avoptions/avfilteritem.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/avoptions/avfilteritem.h -> qx11grab-0.4.10.tar.bz2/src/avoptions/avfilteritem.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/avoptions/avfiltermodel.cpp -> qx11grab-0.4.10.tar.bz2/src/avoptions/avfiltermodel.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/avoptions/avfiltermodel.h -> qx11grab-0.4.10.tar.bz2/src/avoptions/avfiltermodel.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/avoptions/avoptions.cpp -> qx11grab-0.4.10.tar.bz2/src/avoptions/avoptions.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -51,13 +51,13 @@ */ static bool qx11grab_is_encoder ( AVCodec* _c ) { -#if ( LIBAVCODEC_VERSION_INT >= 3489124 ) -// qDebug() << "NEW_ENCODER_API" << LIBAVCODEC_VERSION_INT; - #if ( LIBAVCODEC_VERSION_INT >= 3554148 ) +#if ( LIBAVCODEC_VERSION_MAJOR >= 53 ) + // qDebug() << "NEW_ENCODER_API" << LIBAVCODEC_VERSION_INT; +#if ( LIBAVCODEC_VERSION_MAJOR >= 54 ) return ( ( _c && ( _c->encode2 ) ) == 1 ); - #else +#else return ( ( _c && ( _c->encode || _c->encode2 ) ) == 1 ); - #endif +#endif #else return ( ( _c && ( _c->encode ) ) == 1 ); #endif @@ -95,47 +95,51 @@ * nach Optionen und ihrer Hilfe Texte. * \todo Standard Werte Vorschläge! */ - const QList<FFOption> AVOptions::optionQuery ( const QByteArray &option ) + const QList<FFOption> AVOptions::optionQuery ( const QByteArray &_option, const QByteArray &_codec ) { QList<FFOption> output; FFOption ffOption; - AVCodecContext* avcodec_opts[AVMEDIA_TYPE_NB]; - const char *opt = option.constData(); + const char *opt = _option.constData(); + const char *data = _codec.data(); - avcodec_register_all(); +#ifdef MAINTAINER_REPOSITORY + qDebug ( "AVOptions::optionQuery( Option: %s, Codec: %s )", opt, data ); +#endif + avcodec_register_all(); // initial options buffer - for ( int i = 0; i < AVMEDIA_TYPE_NB; i++ ) - { - avcodec_opts[i] = avcodec_alloc_context2 ( static_cast<AVMediaType> ( i ) ); - } + AVCodecContext* avcodec_opts = avcodec_alloc_context3 ( avcodec_find_decoder_by_name ( data ) ); - qDebug ( "Searching for: %s", opt ); - const AVOption *obj = av_opt_find ( avcodec_opts[0], opt, NULL, AV_OPT_FLAG_VIDEO_PARAM, 0 ); + const AVOption *obj = av_opt_find ( avcodec_opts, opt, NULL, AV_OPT_FLAG_VIDEO_PARAM, AV_OPT_SEARCH_FAKE_OBJ ); if ( obj ) { - qDebug ( "Found video option for Name:%s Help:%s", obj->name, obj->help ); +#ifdef MAINTAINER_REPOSITORY + qDebug ( "Found video option for Name: %s Help: %s Default: %s Unit: %s", + obj->name, obj->help, obj->default_val.str, obj->unit ); +#endif ffOption.name = QString ( obj->name ); - // if ( obj->type == FF_OPT_TYPE_STRING ) {} ffOption.value = QVariant(); ffOption.help = QString ( obj->help ); output.append ( ffOption ); + goto ready; } - else if ( ( obj = av_opt_find ( avcodec_opts[0], opt, NULL, AV_OPT_FLAG_AUDIO_PARAM, 0 ) ) ) + + if ( ( obj = av_opt_find ( avcodec_opts, opt, NULL, AV_OPT_FLAG_AUDIO_PARAM, AV_OPT_SEARCH_FAKE_OBJ ) ) ) { - qDebug ( "Found audio option for Name:%s Help:%s", obj->name, obj->help ); +#ifdef MAINTAINER_REPOSITORY + qDebug ( "Found audio option for Name: %s Help: %s Default: %s Unit: %s", + obj->name, obj->help, obj->default_val.str, obj->unit ); +#endif ffOption.name = QString ( obj->name ); - // opt.value = QString ( obj->default_val.str ); ffOption.value = QVariant(); ffOption.help = QString ( obj->help ); output.append ( ffOption ); + goto ready; } + ready: // destroy options buffer - for ( int i = 0; i < AVMEDIA_TYPE_NB; i++ ) - { - av_freep ( &avcodec_opts[i] ); - } + av_freep ( &avcodec_opts ); return output; } @@ -262,7 +266,7 @@ * inklusive ihrer Formate. Wird auch von \ref videoCodecs verwendet * um fest zu stellen ob ein Ausgabe Format zu verfügung steht! */ - const QList<QX11Grab::FFFormat> AVOptions::supportedFormats ( CodecID id ) + const QList<QX11Grab::FFFormat> AVOptions::supportedFormats ( AVCodecID id ) { QList<QX11Grab::FFFormat> list; // alle codecs und demuxer initialisieren @@ -287,7 +291,7 @@ * nicht gesetzt und ist es ein Video Kodierer ? */ if ( ( name == NULL || strcmp ( ofmt->name, name ) < 0 ) && ( strcmp ( ofmt->name, buffer ) > 0 ) - && ( ofmt->video_codec != CODEC_ID_NONE ) ) + && ( ofmt->video_codec != AV_CODEC_ID_NONE ) ) { /* Jetzt nachsehen ob dieser Kodierer die gleiche ID besitzt! * NOTE Das funktioniert erst jetzt (Warum ? keine Ahnung :-/) */
View file
qx11grab-0.4.5.tar.bz2/src/avoptions/avoptions.h -> qx11grab-0.4.10.tar.bz2/src/avoptions/avoptions.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -35,6 +35,10 @@ extern "C" { #include <libavcodec/avcodec.h> +#ifdef QX11GRAB_OLD_AVCODEC_ID +# define AVCodecID CodecID +# define AV_CODEC_ID_NONE CODEC_ID_NONE +#endif } namespace QX11Grab @@ -45,7 +49,7 @@ */ typedef struct Q_DECL_EXPORT { - CodecID id; /**< Codec ID from avcodec.h */ + AVCodecID id; /**< AV Codec ID from avcodec.h */ QString name; /**< Codec Name */ QString fullname; /**< Full Codec Description */ QString info; /**< Extra Codec Information for Tool Tips */ @@ -106,9 +110,10 @@ AVOptions ( QObject * parent = 0 ); /** send a avcodec option request only VIDEO/AUDIO supported - * \param option query option \b without leading hyphens + * \param _option query option \b without leading hyphens + * \param _codec codec name */ - static const QList<FFOption> optionQuery ( const QByteArray &option ); + static const QList<FFOption> optionQuery ( const QByteArray &_option, const QByteArray &_codec ); /** ffmpeg -sample_fmts */ static const QList<FFOption> sampleFormats(); @@ -123,7 +128,7 @@ static const QList<FFCodec> audioCodecs(); /** find valid Format for given codecID */ - static const QList<FFFormat> supportedFormats ( CodecID id ); + static const QList<FFFormat> supportedFormats ( AVCodecID id ); /** complete list of all ~/.ffmpeg/?.ffpreset */ static const QStringList userPresets ( const QString &suffix );
View file
qx11grab-0.4.5.tar.bz2/src/avoptions/codecoptions.cpp -> qx11grab-0.4.10.tar.bz2/src/avoptions/codecoptions.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/avoptions/codecoptions.h -> qx11grab-0.4.10.tar.bz2/src/avoptions/codecoptions.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/avoptions/codecselecter.cpp -> qx11grab-0.4.10.tar.bz2/src/avoptions/codecselecter.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -38,20 +38,19 @@ { setObjectName ( QLatin1String ( "CodecSelecter" ) ); setEditable ( true ); // Benutzer kann neue Einträge erzeugen! - connect ( this, SIGNAL ( activated ( int ) ), - this, SLOT ( itemSelected ( int ) ) ); + connect ( this, SIGNAL ( activated ( int ) ), this, SLOT ( itemSelected ( int ) ) ); } /** * Ein Menü Eintrag wurde ausgewählt. - * \li Suche nach der FFmpeg \ref CodecID + * \li Suche nach der FFmpeg \ref AVCodecID * \li Sende bei erfolg das Signal \ref codecChanged */ void CodecSelecter::itemSelected ( int index ) { QString name = itemData ( index, Qt::DisplayRole ).toString(); bool ok; - CodecID id = static_cast<CodecID> ( itemData ( index, Qt::UserRole ).toUInt ( &ok ) ); + AVCodecID id = static_cast<AVCodecID> ( itemData ( index, Qt::UserRole ).toUInt ( &ok ) ); if ( ok ) emit codecChanged ( name, id ); } @@ -98,7 +97,7 @@ * \li Suche nach Vorhandenen Einträgen, * \li Wenn vorhanden - Markieren und aussteigen, * \li Andernfalls neuen Eintrag einfügen. - * \note Neue Einträge werden mit \ref CODEC_ID_NONE eingefügt + * \note Neue Einträge werden mit \ref AV_CODEC_ID_NONE eingefügt * und senden deshalb bei einer Auswahl kein Signal! */ void CodecSelecter::setCustomItem ( const QString &key, const QVariant &value ) @@ -116,7 +115,7 @@ insertItem ( c, key, value ); setItemData ( c, key, Qt::DisplayRole ); setItemData ( c, key, Qt::EditRole ); - setItemData ( c, CODEC_ID_NONE, Qt::UserRole ); + setItemData ( c, AV_CODEC_ID_NONE, Qt::UserRole ); /*: ToolTip */ setItemData ( c, trUtf8 ( "Customized" ), Qt::ToolTipRole ); }
View file
qx11grab-0.4.5.tar.bz2/src/avoptions/codecselecter.h -> qx11grab-0.4.10.tar.bz2/src/avoptions/codecselecter.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -48,7 +48,7 @@ Q_SIGNALS: /** codec entry has changed */ - void codecChanged ( const QString &name, CodecID ); + void codecChanged ( const QString &name, AVCodecID ); public Q_SLOTS: /** marking codec as selected */
View file
qx11grab-0.4.5.tar.bz2/src/avoptions/ffoptionsmenu.cpp -> qx11grab-0.4.10.tar.bz2/src/avoptions/ffoptionsmenu.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -105,11 +105,12 @@ insertVideoItem ( "bufsize", trUtf8 ( "Set video buffer verifier buffer size (in bits)." ) ); m_audioMenu->clear(); + insertAudioItem ( "qscale:a", trUtf8 ( "Sets the quantizer to use" ) ); + insertAudioItem ( "bsf:a", trUtf8 ( "Set bitstream filters for matching stream." ) ); insertAudioItem ( "ar", trUtf8 ( "Set the audio sampling frequency." ) ); insertAudioItem ( "ac", trUtf8 ( "Set the number of audio channels." ) ); insertAudioItem ( "apre", trUtf8 ( "Set audio preset." ) ); insertAudioItem ( "sample_fmt", trUtf8 ( "Audio sample format." ) ); - insertAudioItem ( "bsf:a", trUtf8 ( "Set bitstream filters for matching stream." ) ); setEnabled ( true ); }
View file
qx11grab-0.4.5.tar.bz2/src/avoptions/ffoptionsmenu.h -> qx11grab-0.4.10.tar.bz2/src/avoptions/ffoptionsmenu.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/avoptions/formatmenu.cpp -> qx11grab-0.4.10.tar.bz2/src/avoptions/formatmenu.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -114,13 +114,13 @@ /** * Lese das Menü neu ein und setze den Button Text zurück. - * Lese mit \ref CodecID alle Unterstützen Formate für diesen + * Lese mit \ref AVCodecID alle Unterstützen Formate für diesen * Codec (\ref name) Neu ein. Und erstelle ein Menü mit den * einzelnen Formaten an. Im Moment fehlt noch seitens FFmpeg * die Unterstützung für die Standard Auswahl. Aus diesem Grund * wird hier zusätzlich auf \ref findDefaultExtension zugegriffen. */ - void FormatMenu::updateMenu ( const QString &name, CodecID id ) + void FormatMenu::updateMenu ( const QString &name, AVCodecID id ) { m_menu->clear(); p_ActionsList.clear();
View file
qx11grab-0.4.5.tar.bz2/src/avoptions/formatmenu.h -> qx11grab-0.4.10.tar.bz2/src/avoptions/formatmenu.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -66,9 +66,9 @@ public Q_SLOTS: /** clear and create a new menutree for this codec * \param name selected codec name - * \param id AVCodec CodecID + * \param id AVCodec AVCodecID */ - void updateMenu ( const QString &name, CodecID id ); + void updateMenu ( const QString &name, AVCodecID id ); public: /**
View file
qx11grab-0.4.5.tar.bz2/src/avoptions/options/options.dtd -> qx11grab-0.4.10.tar.bz2/src/avoptions/options/options.dtd
Changed
@@ -1,7 +1,7 @@ <!-- This file is part of the qx11grab project - Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2012 + Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/avoptions/optionsfinder.cpp -> qx11grab-0.4.10.tar.bz2/src/avoptions/optionsfinder.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -60,9 +60,10 @@ { QString path; #ifdef MAINTAINER_REPOSITORY - path = QString::fromUtf8 ( "%1/../../src/avoptions/options/" ).arg ( qApp->applicationDirPath() ); + QString projectHome ( qgetenv("HJCMS_PROJECTS_DIR") ); + path = QString::fromUtf8 ( "%1/%2/src/avoptions/options" ).arg ( projectHome, qApp->applicationName() ); #else - path = QString::fromUtf8 ( "%1/../share/qx11grab/options" ).arg ( qApp->applicationDirPath() ); + path = QString::fromUtf8 ( "%1/../share/%2/options" ).arg ( qApp->applicationDirPath(), qApp->applicationName() ); #endif QDir d ( path ); foreach ( QString xml, d.entryList ( QStringList ( "*.xml" ), ( QDir::Files | QDir::NoSymLinks ) ) )
View file
qx11grab-0.4.5.tar.bz2/src/avoptions/optionsfinder.h -> qx11grab-0.4.10.tar.bz2/src/avoptions/optionsfinder.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/bookmark/bookmark.cpp -> qx11grab-0.4.10.tar.bz2/src/bookmark/bookmark.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/bookmark/bookmark.h -> qx11grab-0.4.10.tar.bz2/src/bookmark/bookmark.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/bookmark/bookmarkdialog.cpp -> qx11grab-0.4.10.tar.bz2/src/bookmark/bookmarkdialog.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/bookmark/bookmarkdialog.h -> qx11grab-0.4.10.tar.bz2/src/bookmark/bookmarkdialog.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/bookmark/bookmarkentry.cpp -> qx11grab-0.4.10.tar.bz2/src/bookmark/bookmarkentry.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/bookmark/bookmarkentry.h -> qx11grab-0.4.10.tar.bz2/src/bookmark/bookmarkentry.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/bookmark/bookmarkselecter.cpp -> qx11grab-0.4.10.tar.bz2/src/bookmark/bookmarkselecter.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/bookmark/bookmarkselecter.h -> qx11grab-0.4.10.tar.bz2/src/bookmark/bookmarkselecter.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/cmd/commandlineedit.cpp -> qx11grab-0.4.10.tar.bz2/src/cmd/commandlineedit.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/cmd/commandlineedit.h -> qx11grab-0.4.10.tar.bz2/src/cmd/commandlineedit.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/cmd/commandpreview.cpp -> qx11grab-0.4.10.tar.bz2/src/cmd/commandpreview.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/cmd/commandpreview.h -> qx11grab-0.4.10.tar.bz2/src/cmd/commandpreview.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/cmd/createcustomitem.cpp -> qx11grab-0.4.10.tar.bz2/src/cmd/createcustomitem.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/cmd/createcustomitem.h -> qx11grab-0.4.10.tar.bz2/src/cmd/createcustomitem.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/exportdialog.cpp -> qx11grab-0.4.10.tar.bz2/src/exportdialog.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/exportdialog.h -> qx11grab-0.4.10.tar.bz2/src/exportdialog.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/ffprocess/ffprocess.cpp -> qx11grab-0.4.10.tar.bz2/src/ffprocess/ffprocess.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -19,6 +19,7 @@ * Boston, MA 02110-1301, USA. */ +#include <iostream> #include <cstdlib> #include "ffprocess.h" @@ -94,7 +95,7 @@ if ( fp.open ( QIODevice::WriteOnly ) ) { QTextStream stream ( &fp ); - stream << QLatin1String ( "#!/usr/bin/env sh\n" ); + stream << QLatin1String ( "#!/usr/bin/env bash\n" ); stream << QLatin1String ( "## QX11Grab FFmpeg Screencast Script\n\nset -o xtrace\n\n" ); stream << cmd.join ( " " ).trimmed(); stream << QString::fromUtf8 ( " $@ -y %1" ).arg ( vfile ); @@ -270,7 +271,7 @@ if ( ! m_QProcess ) return false; - const char* q = new const char ( data.toAscii() ); + const char* q = new const char ( data.toLatin1() ); if ( m_QProcess->write ( q, qstrlen ( q ) ) == -1 ) { qWarning ( "QX11Grab - failed to send command to FFmpeg process!\n%s", @@ -295,6 +296,10 @@ if ( cmd.size() < 3 || application().isEmpty() || workdir().isEmpty() ) return false; +#if defined(MAINTAINER_REPOSITORY) && defined(QX11GRAB_DEBUG) + std::cout << cmd.join(" ").toStdString() << std::endl; +#endif + QFileInfo script ( writeScript ( cmd, out ) ); if ( ! script.isExecutable() ) { @@ -307,6 +312,7 @@ qWarning ( "QX11Grab: can not set listener ouput file" ); QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); + env.insert ( "NO_COLOR", "1" ); env.insert ( "FFMPEG_FORCE_NOCOLOR", "1" ); env.insert ( "AV_LOG_FORCE_NOCOLOR", "1" );
View file
qx11grab-0.4.5.tar.bz2/src/ffprocess/ffprocess.h -> qx11grab-0.4.10.tar.bz2/src/ffprocess/ffprocess.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/ffprocess/listener.cpp -> qx11grab-0.4.10.tar.bz2/src/ffprocess/listener.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/ffprocess/listener.h -> qx11grab-0.4.10.tar.bz2/src/ffprocess/listener.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/filters/CMakeLists.txt -> qx11grab-0.4.10.tar.bz2/src/filters/CMakeLists.txt
Changed
@@ -75,8 +75,8 @@ ADD_SUBDIRECTORY (drawtext) ENDIF (ENABLE_DRAWTEXT_FILTER) -IF (ENABLE_WEBCAM_FILTER) +IF (ENABLE_WEBCAM_FILTER AND V4L2_FOUND) ADD_SUBDIRECTORY (webcam) -ENDIF (ENABLE_WEBCAM_FILTER) +ENDIF (ENABLE_WEBCAM_FILTER AND V4L2_FOUND) ## EOF
View file
qx11grab-0.4.5.tar.bz2/src/filters/drawtext/colorpreview.cpp -> qx11grab-0.4.10.tar.bz2/src/filters/drawtext/colorpreview.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/filters/drawtext/colorpreview.h -> qx11grab-0.4.10.tar.bz2/src/filters/drawtext/colorpreview.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/filters/drawtext/drawtext.cpp -> qx11grab-0.4.10.tar.bz2/src/filters/drawtext/drawtext.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/filters/drawtext/drawtext.h -> qx11grab-0.4.10.tar.bz2/src/filters/drawtext/drawtext.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/filters/drawtext/drawtextplugin.cpp -> qx11grab-0.4.10.tar.bz2/src/filters/drawtext/drawtextplugin.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/filters/drawtext/drawtextplugin.h -> qx11grab-0.4.10.tar.bz2/src/filters/drawtext/drawtextplugin.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/filters/drawtext/dropshadowbox.cpp -> qx11grab-0.4.10.tar.bz2/src/filters/drawtext/dropshadowbox.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/filters/drawtext/dropshadowbox.h -> qx11grab-0.4.10.tar.bz2/src/filters/drawtext/dropshadowbox.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/filters/drawtext/fontpreview.cpp -> qx11grab-0.4.10.tar.bz2/src/filters/drawtext/fontpreview.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/filters/drawtext/fontpreview.h -> qx11grab-0.4.10.tar.bz2/src/filters/drawtext/fontpreview.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/filters/drawtext/textposition.cpp -> qx11grab-0.4.10.tar.bz2/src/filters/drawtext/textposition.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/filters/drawtext/textposition.h -> qx11grab-0.4.10.tar.bz2/src/filters/drawtext/textposition.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/filters/fade/fade.cpp -> qx11grab-0.4.10.tar.bz2/src/filters/fade/fade.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/filters/fade/fade.h -> qx11grab-0.4.10.tar.bz2/src/filters/fade/fade.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/filters/fade/fadeplugin.cpp -> qx11grab-0.4.10.tar.bz2/src/filters/fade/fadeplugin.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/filters/fade/fadeplugin.h -> qx11grab-0.4.10.tar.bz2/src/filters/fade/fadeplugin.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/filters/interface.h.cmake -> qx11grab-0.4.10.tar.bz2/src/filters/interface.h.cmake
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://www.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann http://www.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/filters/qx11grabplugins.cpp -> qx11grab-0.4.10.tar.bz2/src/filters/qx11grabplugins.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/filters/qx11grabplugins.h -> qx11grab-0.4.10.tar.bz2/src/filters/qx11grabplugins.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/filters/setdar/setdar.cpp -> qx11grab-0.4.10.tar.bz2/src/filters/setdar/setdar.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/filters/setdar/setdar.h -> qx11grab-0.4.10.tar.bz2/src/filters/setdar/setdar.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/filters/setdar/setdarplugin.cpp -> qx11grab-0.4.10.tar.bz2/src/filters/setdar/setdarplugin.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/filters/setdar/setdarplugin.h -> qx11grab-0.4.10.tar.bz2/src/filters/setdar/setdarplugin.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/filters/unsharp/unsharp.cpp -> qx11grab-0.4.10.tar.bz2/src/filters/unsharp/unsharp.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/filters/unsharp/unsharp.h -> qx11grab-0.4.10.tar.bz2/src/filters/unsharp/unsharp.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/filters/unsharp/unsharpplugin.cpp -> qx11grab-0.4.10.tar.bz2/src/filters/unsharp/unsharpplugin.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/filters/unsharp/unsharpplugin.h -> qx11grab-0.4.10.tar.bz2/src/filters/unsharp/unsharpplugin.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/filters/watermark/imagepreview.cpp -> qx11grab-0.4.10.tar.bz2/src/filters/watermark/imagepreview.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/filters/watermark/imagepreview.h -> qx11grab-0.4.10.tar.bz2/src/filters/watermark/imagepreview.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/filters/watermark/openimagedialog.cpp -> qx11grab-0.4.10.tar.bz2/src/filters/watermark/openimagedialog.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/filters/watermark/openimagedialog.h -> qx11grab-0.4.10.tar.bz2/src/filters/watermark/openimagedialog.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/filters/watermark/watermark.cpp -> qx11grab-0.4.10.tar.bz2/src/filters/watermark/watermark.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/filters/watermark/watermark.h -> qx11grab-0.4.10.tar.bz2/src/filters/watermark/watermark.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/filters/watermark/watermarkplugin.cpp -> qx11grab-0.4.10.tar.bz2/src/filters/watermark/watermarkplugin.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/filters/watermark/watermarkplugin.h -> qx11grab-0.4.10.tar.bz2/src/filters/watermark/watermarkplugin.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/filters/webcam/CMakeLists.txt -> qx11grab-0.4.10.tar.bz2/src/filters/webcam/CMakeLists.txt
Changed
@@ -36,7 +36,8 @@ INCLUDE_DIRECTORIES ( ${QX11GRAB_INCLUDES} - ${V4L2_INCLUDE_DIRS} + ${V4L2_INCLUDE_DIR} + ${V4L2_CONVERT_INCLUDE_DIR} ) ADD_LIBRARY (${target_plugin} MODULE @@ -50,14 +51,15 @@ ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDBUS_LIBRARY} - ${V4L2_LIBRARIES} + ${V4L2_LIBRARY} + ${V4L2_CONVERT_LIBRARY} qx11grabinterface ) SET_TARGET_PROPERTIES (${target_plugin} PROPERTIES OUTPUT_NAME ${target_plugin} LINKER_LANGUAGE CXX - COMPILE_FLAGS "${LIB_FPIC_CXXFLAGS} -Wno-missing-declarations" + COMPILE_FLAGS "${LIB_FPIC_CXXFLAGS} -Wno-stack-protector -Wno-missing-declarations" LINK_FLAGS "${LIB_FPIC_CXXFLAGS} ${LIB_RDYNAMIC_CXXFLAGS} ${QX11GRAB_LDFLAGS}" )
View file
qx11grab-0.4.5.tar.bz2/src/filters/webcam/v4l2-api.cpp -> qx11grab-0.4.10.tar.bz2/src/filters/webcam/v4l2-api.cpp
Changed
@@ -1,6 +1,7 @@ /* v4l2-api: low-level wrapper around v4l2 devices * * Copyright (C) 2009 Hans Verkuil <hverkuil@xs4all.nl> +* Copyright (C) 2011-2013 Juergen Heinemann (Undefined) http://www.hjcms.de * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -28,16 +29,31 @@ #include <libv4l2.h> +/* QtCore */ +#include <QtCore/QObject> + +v4l2::v4l2() + : m_fd ( -1 ) +{} + +v4l2::v4l2 ( v4l2 &old ) + : m_fd ( old.m_fd ) + , m_device ( old.m_device ) + , m_useWrapper ( old.m_useWrapper ) + , m_capability ( old.m_capability ) +{} + bool v4l2::open ( const QString &device, bool useWrapper ) { m_device = device; m_useWrapper = useWrapper; - m_fd = ::open ( device.toAscii(), O_RDWR | O_NONBLOCK ); + m_fd = ::open ( device.toLatin1(), O_RDWR | O_NONBLOCK ); if ( m_fd < 0 ) { error ( "Cannot open " + device ); return false; } + if ( !querycap ( m_capability ) ) { ::close ( m_fd ); @@ -117,7 +133,7 @@ void v4l2::error ( const QString &error ) { if ( !error.isEmpty() ) - fprintf ( stderr, "%s\n", error.toAscii().data() ); + fprintf ( stderr, "%s\n", error.toLatin1().data() ); } QString v4l2::pixfmt2s ( unsigned id ) @@ -165,7 +181,7 @@ bool v4l2::s_input ( int input ) { - return ioctl ( "Set Input", VIDIOC_S_INPUT, &input ); + return ioctl ( QObject::trUtf8 ( "Set Input" ), VIDIOC_S_INPUT, &input ); } bool v4l2::g_output ( int &output ) @@ -175,7 +191,7 @@ bool v4l2::s_output ( int output ) { - return ioctl ( "Set Output", VIDIOC_S_OUTPUT, &output ); + return ioctl ( QObject::trUtf8 ( "Set Output" ), VIDIOC_S_OUTPUT, &output ); } bool v4l2::g_audio ( v4l2_audio &audio ) @@ -190,7 +206,7 @@ memset ( &audio, 0, sizeof ( audio ) ); audio.index = input; - return ioctl ( "Set Audio Input", VIDIOC_S_AUDIO, &audio ); + return ioctl ( QObject::trUtf8 ( "Set Audio Input" ), VIDIOC_S_AUDIO, &audio ); } bool v4l2::g_audout ( v4l2_audioout &audout ) @@ -205,7 +221,7 @@ memset ( &audout, 0, sizeof ( audout ) ); audout.index = output; - return ioctl ( "Set Audio Output", VIDIOC_S_AUDOUT, &audout ); + return ioctl ( QObject::trUtf8 ( "Set Audio Output" ), VIDIOC_S_AUDOUT, &audout ); } bool v4l2::g_std ( v4l2_std_id &std ) @@ -215,12 +231,12 @@ bool v4l2::s_std ( v4l2_std_id std ) { - return ioctl ( "Set TV Standard", VIDIOC_S_STD, &std ); + return ioctl ( QObject::trUtf8 ( "Set TV Standard" ), VIDIOC_S_STD, &std ); } bool v4l2::query_std ( v4l2_std_id &std ) { - return ioctl ( "Query TV Standard", VIDIOC_QUERYSTD, &std ); + return ioctl ( QObject::trUtf8 ( "Query TV Standard" ), VIDIOC_QUERYSTD, &std ); } bool v4l2::g_dv_preset ( __u32 &preset ) @@ -240,12 +256,12 @@ memset ( &p, 0, sizeof ( p ) ); p.preset = preset; - return ioctl ( "Set Preset", VIDIOC_S_DV_PRESET, &p ); + return ioctl ( QObject::trUtf8 ( "Set Preset" ), VIDIOC_S_DV_PRESET, &p ); } bool v4l2::query_dv_preset ( v4l2_dv_preset &preset ) { - return ioctl ( "Query Preset", VIDIOC_QUERY_DV_PRESET, &preset ); + return ioctl ( QObject::trUtf8 ( "Query Preset" ), VIDIOC_QUERY_DV_PRESET, &preset ); } bool v4l2::g_frequency ( v4l2_frequency &freq ) @@ -257,7 +273,7 @@ bool v4l2::s_frequency ( v4l2_frequency &freq ) { - return ioctl ( "Set Frequency", VIDIOC_S_FREQUENCY, &freq ); + return ioctl ( QObject::trUtf8 ( "Set Frequency" ), VIDIOC_S_FREQUENCY, &freq ); } bool v4l2::s_frequency ( int val ) @@ -288,13 +304,13 @@ { fmt.fmt.pix.field = V4L2_FIELD_ANY; fmt.fmt.pix.bytesperline = 0; - return ioctl ( "Try Capture Format", VIDIOC_TRY_FMT, &fmt ); + return ioctl ( QObject::trUtf8 ( "Try Capture Format" ), VIDIOC_TRY_FMT, &fmt ); } bool v4l2::s_fmt ( v4l2_format &fmt ) { fmt.fmt.pix.bytesperline = 0; - return ioctl ( "Set Capture Format", VIDIOC_S_FMT, &fmt ); + return ioctl ( QObject::trUtf8 ( "Set Capture Format" ), VIDIOC_S_FMT, &fmt ); } bool v4l2::enum_input ( v4l2_input &in, bool init, int index ) @@ -481,7 +497,7 @@ bool v4l2::qbuf ( v4l2_buffer &buf ) { - return ( ioctl ( VIDIOC_QBUF, &buf ) >= 0 ); + return ( ( ioctl ( VIDIOC_QBUF, &buf ) ) >= 0 ); } bool v4l2::qbuf_mmap_cap ( int index ) @@ -512,14 +528,14 @@ { enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - return ioctl ( "Start Capture", VIDIOC_STREAMON, &type ); + return ioctl ( QObject::trUtf8 ( "Start Capture" ), VIDIOC_STREAMON, &type ); } bool v4l2::streamoff_cap() { enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - return ioctl ( "Stop Capture", VIDIOC_STREAMOFF, &type ); + return ioctl ( QObject::trUtf8 ( "Stop Capture" ), VIDIOC_STREAMOFF, &type ); } bool v4l2::reqbufs_user_out ( v4l2_requestbuffers &reqbuf ) @@ -585,14 +601,14 @@ { enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_OUTPUT; - return ioctl ( "Start Output", VIDIOC_STREAMON, &type ); + return ioctl ( QObject::trUtf8 ( "Start Output" ), VIDIOC_STREAMON, &type ); } bool v4l2::streamoff_out() { enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_OUTPUT; - return ioctl ( "Stop Output", VIDIOC_STREAMOFF, &type ); + return ioctl ( QObject::trUtf8 ( "Stop Output" ), VIDIOC_STREAMOFF, &type ); } bool v4l2::set_interval ( v4l2_fract interval ) @@ -608,7 +624,7 @@ parm.parm.capture.timeperframe = interval; - return ioctl ( "Set FPS", VIDIOC_S_PARM, &parm ); + return ioctl ( QObject::trUtf8 ( "Set FPS" ), VIDIOC_S_PARM, &parm ); } bool v4l2::get_interval ( v4l2_fract &interval ) @@ -616,8 +632,7 @@ v4l2_streamparm parm; parm.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - if ( ioctl ( VIDIOC_G_PARM, &parm ) >= 0 && - ( parm.parm.capture.capability & V4L2_CAP_TIMEPERFRAME ) ) + if ( ioctl ( VIDIOC_G_PARM, &parm ) >= 0 && ( parm.parm.capture.capability & V4L2_CAP_TIMEPERFRAME ) )
View file
qx11grab-0.4.5.tar.bz2/src/filters/webcam/v4l2-api.h -> qx11grab-0.4.10.tar.bz2/src/filters/webcam/v4l2-api.h
Changed
@@ -1,6 +1,7 @@ /* v4l2-api: low-level wrapper around v4l2 devices * * Copyright (C) 2009 Hans Verkuil <hverkuil@xs4all.nl> +* Copyright (C) 2011-2013 Juergen Heinemann (Undefined) http://www.hjcms.de * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -29,15 +30,16 @@ class v4l2 { + private: + int m_fd; + QString m_device; + bool m_useWrapper; /**< true if using the libv4l2 wrappers */ + v4l2_capability m_capability; + void clear() { error ( QString() ); } + public: - v4l2() : m_fd ( -1 ) {} - v4l2 ( v4l2 &old ) : - m_fd ( old.m_fd ), - m_device ( old.m_device ), - m_useWrapper ( old.m_useWrapper ), - m_capability ( old.m_capability ) - {} - virtual ~v4l2() {}; + v4l2(); + v4l2 ( v4l2 &old ); bool open ( const QString &device, bool useWrapper = true ); void close(); @@ -113,14 +115,7 @@ bool set_interval ( v4l2_fract interval ); bool get_interval ( v4l2_fract &interval ); - private: - void clear() { error ( QString() ); } - - private: - int m_fd; - QString m_device; - bool m_useWrapper; // true if using the libv4l2 wrappers - v4l2_capability m_capability; + virtual ~v4l2() {}; }; #endif
View file
qx11grab-0.4.5.tar.bz2/src/filters/webcam/webcam.cpp -> qx11grab-0.4.10.tar.bz2/src/filters/webcam/webcam.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -184,7 +184,6 @@ void Webcam::cameraDeviceChanged ( const WebCamDeviceInfo &dev ) { p_v4lDevice = dev.path; - m_scaleFrame->setRange ( 100, qMax ( dev.size.width(), dev.size.height() ) ); m_webCamCaptureFrames->setInterface ( dev ); // Ausgabezeile neu Schreiben
View file
qx11grab-0.4.5.tar.bz2/src/filters/webcam/webcam.h -> qx11grab-0.4.10.tar.bz2/src/filters/webcam/webcam.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/filters/webcam/webcamcaptureframes.cpp -> qx11grab-0.4.10.tar.bz2/src/filters/webcam/webcamcaptureframes.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -24,6 +24,9 @@ /* std */ #include <errno.h> +/* Kernel/v4l2 */ +#include <libv4lconvert.h> + /* QtCore */ #include <QtCore/QDebug> #include <QtCore/QFileInfo> @@ -35,10 +38,10 @@ WebCamCaptureFrames::WebCamCaptureFrames ( QWidget * parent ) : QWidget ( parent ) , m_v4l2 ( new v4l2 ) + , m_devInfo ( 0 ) , m_frameImage ( 0 ) , m_socketNotifier ( 0 ) , m_convertData ( 0 ) - , p_device ( QString() ) { setObjectName ( QLatin1String ( "WebCamCaptureFrames" ) ); setContentsMargins ( 0, 0, 0, 0 ); @@ -90,10 +93,14 @@ m_outputFormat.fmt.pix.pixelformat = V4L2_PIX_FMT_RGB24; // QImage bietet kein "YUV420 planar" an deshalb müssen wir immer konvertieren - v4lconvert_try_format ( m_convertData, &m_outputFormat, &m_inputFormat ); + v4lconvert_try_format ( m_convertData, + &m_outputFormat, + &m_inputFormat ); + m_v4l2->g_fmt_cap ( m_inputFormat ); // Erstelle ein leeres Bild + qDebug() << "QX11Grab - Capture fromSize:" << m_outputFormat.fmt.pix.width << m_outputFormat.fmt.pix.height; m_frameImage = new QImage ( m_outputFormat.fmt.pix.width, m_outputFormat.fmt.pix.height, QImage::Format_RGB888 ); m_frameImage->fill ( 0 ); @@ -124,8 +131,13 @@ } memcpy ( m_frameImage->bits(), m_streamData, s ); - int err = v4lconvert_convert ( m_convertData, &m_inputFormat, &m_outputFormat, m_streamData, - s, m_frameImage->bits(), m_outputFormat.fmt.pix.sizeimage ); + int err = v4lconvert_convert ( m_convertData, + &m_inputFormat, + &m_outputFormat, + m_streamData, + s, + m_frameImage->bits(), + m_outputFormat.fmt.pix.sizeimage ); if ( err == -1 ) { @@ -148,10 +160,18 @@ // laufende aufnahmen beenden stopCapture(); } - else if ( m_v4l2->open ( p_device, false ) ) + else if ( m_v4l2->open ( m_devInfo->path, false ) ) { // QImage bietet kein "YUV420 planar" an deshalb müssen wir immer konvertieren - m_convertData = v4lconvert_create ( m_v4l2->fd(), NULL, &libv4l2_default_dev_ops ); + // m_convertData = v4lconvert_create ( m_v4l2->fd(), NULL, &libv4l2_default_dev_ops ); + qDebug() << "QX11Grab - v4lconvert_create - " << m_devInfo->driver; + m_convertData = v4lconvert_create ( m_v4l2->fd() ); + if ( ! m_convertData ) + { + qWarning ( "QX11Grab - can not open device - %s", + v4lconvert_get_error_message ( m_convertData ) ); + return; + } m_button->setText ( trUtf8 ( "Stop" ) ); startCaptureFrames ( true ); } @@ -194,29 +214,42 @@ qDebug ( "QX11Grab - v4lconvert destroy buffer" ); v4lconvert_destroy ( m_convertData ); + qDebug ( "QX11Grab - close capture device" ); m_v4l2->close(); + qDebug ( "QX11Grab - capture frames done" ); } } -void WebCamCaptureFrames::setInterface ( const WebCamDeviceInfo &devInfo, const QSize &toSize ) +void WebCamCaptureFrames::setInterface ( const WebCamDeviceInfo &devInfo ) { - Q_UNUSED ( toSize ); // TODO Ausgabe Größe QFileInfo info ( devInfo.path ); m_button->setEnabled ( false ); // Vorhandene Aufnahmen zuerst stoppen - if ( m_v4l2->fd() >= 0 ) - stopCapture(); + stopCapture(); if ( info.isReadable() ) { - p_device = devInfo.path; + if ( m_devInfo ) + { + qDebug ( "QX11Grab - destroy device info" ); + delete m_devInfo; + } + m_devInfo = new WebCamDeviceInfo ( devInfo ); m_button->setEnabled ( true ); } } +const QSize WebCamCaptureFrames::captureSize() +{ + if ( m_devInfo ) + return m_devInfo->outputSize; + + return QSize ( 160, 120 ); +} + WebCamCaptureFrames::~WebCamCaptureFrames() { stopCapture();
View file
qx11grab-0.4.5.tar.bz2/src/filters/webcam/webcamcaptureframes.h -> qx11grab-0.4.10.tar.bz2/src/filters/webcam/webcamcaptureframes.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -26,6 +26,7 @@ #include <QtCore/QObject> #include <QtCore/QPointer> #include <QtCore/QString> +#include <QtCore/QSize> #include <QtCore/QSocketNotifier> #include <QtCore/QTimer> @@ -54,6 +55,9 @@ /** v4l2-api */ v4l2* m_v4l2; + /** to capture frame size */ + WebCamDeviceInfo* m_devInfo; + /** captured frame image */ QImage* m_frameImage; @@ -63,9 +67,6 @@ /** except that the try format will succeed */ struct v4lconvert_data* m_convertData; - /** current v4l2 device path */ - QString p_device; - /** timer for timeout capture frames */ QTimer* m_timer; @@ -106,7 +107,9 @@ explicit WebCamCaptureFrames ( QWidget * parent = 0 ); /** init capture device */ - void setInterface ( const WebCamDeviceInfo &devInfo, const QSize &toSize = QSize ( 160, 120 ) ); + void setInterface ( const WebCamDeviceInfo &devInfo ); + + const QSize captureSize(); virtual ~WebCamCaptureFrames(); };
View file
qx11grab-0.4.5.tar.bz2/src/filters/webcam/webcamdevicechooser.cpp -> qx11grab-0.4.10.tar.bz2/src/filters/webcam/webcamdevicechooser.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -24,9 +24,11 @@ /* QtCore */ #include <QtCore/QDebug> #include <QtCore/QDir> +#include <QtCore/QRect> #include <QtCore/QStringList> /* QtGui */ +#include <QtGui/QHBoxLayout> #include <QtGui/QIcon> /* V4L2 */ @@ -34,15 +36,34 @@ #include "v4l2-api.h" WebCamDeviceChooser::WebCamDeviceChooser ( QWidget * parent ) - : QComboBox ( parent ) + : QWidget ( parent ) , cameraIcon ( QIcon::fromTheme ( "camera-web" ) ) { setObjectName ( QLatin1String ( "WebCamDeviceChooser" ) ); - addItem ( cameraIcon, trUtf8 ( "No web camera found" ), false ); - setEnabled ( false ); - connect ( this, SIGNAL ( currentIndexChanged ( int ) ), + QHBoxLayout* layout = new QHBoxLayout ( this ); + + m_setWebcamDevice = new QComboBox ( this ); + m_setWebcamDevice->addItem ( cameraIcon, trUtf8 ( "No web camera found" ), false ); + m_setWebcamDevice->setEnabled ( false ); + layout->addWidget ( m_setWebcamDevice ); + + m_setCaptureSize = new QComboBox ( this ); + m_setCaptureSize->setToolTip ( trUtf8 ( "capture from framesize" ) ); + m_setCaptureSize->setWhatsThis ( trUtf8 ( "set maximum input framesize to capture from source" ) ); + QIcon captureIcon = QIcon::fromTheme ( "media-record" ); + m_setCaptureSize->addItem ( captureIcon, QLatin1String ( "160x120" ), QSize ( 160, 120 ) ); + m_setCaptureSize->addItem ( captureIcon, QLatin1String ( "320x240" ), QSize ( 320, 240 ) ); + m_setCaptureSize->addItem ( captureIcon, QLatin1String ( "640x480" ), QSize ( 640, 480 ) ); + layout->addWidget ( m_setCaptureSize ); + + setLayout ( layout ); + + connect ( m_setWebcamDevice, SIGNAL ( currentIndexChanged ( int ) ), this, SLOT ( itemChanged ( int ) ) ); + + connect ( m_setCaptureSize, SIGNAL ( currentIndexChanged ( int ) ), + this, SLOT ( itemSizeChanged ( int ) ) ); } /** @@ -111,9 +132,10 @@ p_v4l2.g_fmt_cap ( fmt ); do { - // qDebug() << Q_FUNC_INFO << fmt.fmt.pix.width << fmt.fmt.pix.height; info.pixfmt = p_v4l2.pixfmt2s ( fdesc.pixelformat ); - info.size = QSize ( fmt.fmt.pix.width, fmt.fmt.pix.height ); + info.sourceSize = QSize ( fmt.fmt.pix.width, fmt.fmt.pix.height ); + info.outputSize = m_setCaptureSize->itemData ( m_setCaptureSize->currentIndex(), Qt::UserRole ).toSize(); + // qDebug() << Q_FUNC_INFO << info.size; break; } while ( p_v4l2.enum_fmt_cap ( fdesc ) ); @@ -122,7 +144,8 @@ { // Wenn nicht gefunden Versuche YUV420 planar (V4L2_PIX_FMT_YUV420M) info.pixfmt = QLatin1String ( "yuv420p" ); - info.size = QSize ( 160, 120 ); + info.sourceSize = m_setCaptureSize->itemData ( m_setCaptureSize->currentIndex(), Qt::UserRole ).toSize(); + info.outputSize = m_setCaptureSize->itemData ( m_setCaptureSize->currentIndex(), Qt::UserRole ).toSize(); } } @@ -156,10 +179,10 @@ if ( devInfo.size() > 0 ) { - setEnabled ( true ); - clear(); + m_setWebcamDevice->setEnabled ( true ); + m_setWebcamDevice->clear(); int index = 0; - insertItem ( index, cameraIcon, trUtf8 ( "Choose Camera" ), false ); + m_setWebcamDevice->insertItem ( index, cameraIcon, trUtf8 ( "Choose Camera" ), false ); qRegisterMetaType<WebCamDeviceInfo>(); @@ -173,27 +196,37 @@ QString title = QString::fromUtf8 ( "%1 (%2 - %3)" ) .arg ( info.card, info.driver, info.pixfmt ); - insertItem ( ++index, cameraIcon, title, data ); - setItemData ( index, info.path, Qt::ToolTipRole ); + m_setWebcamDevice->insertItem ( ++index, cameraIcon, title, data ); + m_setWebcamDevice->setItemData ( index, info.path, Qt::ToolTipRole ); } } } } /** -* Ein Eintrag wurde ausgewählt +* Ein Video Schnittstellen eintrag wurde ausgewählt */ void WebCamDeviceChooser::itemChanged ( int index ) { if ( index > 0 ) { - QVariant var = itemData ( index, Qt::UserRole ); + QVariant var = m_setWebcamDevice->itemData ( index, Qt::UserRole ); WebCamDeviceInfo info = var.value<WebCamDeviceInfo>(); emit cameraSelected ( info ); } } /** +* Die Video Einstellungen für die Aufnahme Größe wurde geändert +*/ +void WebCamDeviceChooser::itemSizeChanged ( int index ) +{ + QSize size = m_setCaptureSize->itemData ( index, Qt::UserRole ).toSize(); + if ( size.isValid() ) + emit captureSizeSelected ( size ); +} + +/** * Initialisiere alle Schnittstellen und befülle die ComboBox */ void WebCamDeviceChooser::init()
View file
qx11grab-0.4.5.tar.bz2/src/filters/webcam/webcamdevicechooser.h -> qx11grab-0.4.10.tar.bz2/src/filters/webcam/webcamdevicechooser.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -26,6 +26,7 @@ #include <QtCore/QFileInfo> #include <QtCore/QList> #include <QtCore/QObject> +#include <QtCore/QSize> #include <QtCore/QString> /* QtGui */ @@ -36,13 +37,15 @@ /* QX11Grab */ #include "webcamdeviceinfo.h" -class WebCamDeviceChooser : public QComboBox +class WebCamDeviceChooser : public QWidget { Q_OBJECT Q_CLASSINFO ( "Author", "Jürgen Heinemann (Undefined)" ) Q_CLASSINFO ( "URL", "http://qx11grab.hjcms.de" ) private: + QComboBox* m_setWebcamDevice; /**< set device */ + QComboBox* m_setCaptureSize; /**< select predefined framesize */ const QIcon cameraIcon; QList<WebCamDeviceInfo> devInfo; inline const QString toString ( unsigned char* ptr ) const; @@ -51,9 +54,11 @@ private Q_SLOTS: void itemChanged ( int index ); + void itemSizeChanged ( int index ); Q_SIGNALS: void cameraSelected ( const WebCamDeviceInfo & ); + void captureSizeSelected ( const QSize & ); public Q_SLOTS: void init();
View file
qx11grab-0.4.5.tar.bz2/src/filters/webcam/webcamdeviceinfo.h -> qx11grab-0.4.10.tar.bz2/src/filters/webcam/webcamdeviceinfo.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -27,17 +27,37 @@ #include <QtCore/QSize> #include <QtCore/QString> #include <QtCore/Qt> -#include <QtCore/QVariant> -typedef struct Q_DECL_EXPORT +class Q_DECL_EXPORT WebCamDeviceInfo { - QString path; /**< Absolute DevicePath */ - QString driver; /**< Driver Name */ - QString card; /**< Card Name */ - QString bus; /**< SystemBus Name */ - QString pixfmt; /**< Pixel Format */ - QSize size; /**< Default Frame Size */ -} WebCamDeviceInfo; + public: + QString path; /**< Absolute DevicePath */ + QString driver; /**< Driver Name */ + QString card; /**< Card Name */ + QString bus; /**< SystemBus Name */ + QString pixfmt; /**< Pixel Format */ + QSize sourceSize; /**< Default Source Frame Size */ + QSize outputSize; /**< Different Output Frame Size */ + WebCamDeviceInfo () + : path ( QString::null ) + , driver ( QString::null ) + , card ( QString::null ) + , bus ( QString::null ) + , pixfmt ( QString::null ) + , sourceSize ( QSize ( 160, 120 ) ) + , outputSize ( QSize ( 160, 120 ) ) + {}; + + WebCamDeviceInfo ( const WebCamDeviceInfo &p ) + : path ( p.path ) + , driver ( p.driver ) + , card ( p.card ) + , bus ( p.bus ) + , pixfmt ( p.pixfmt ) + , sourceSize ( p.sourceSize ) + , outputSize ( p.outputSize ) + {}; +}; Q_DECLARE_METATYPE ( WebCamDeviceInfo )
View file
qx11grab-0.4.5.tar.bz2/src/filters/webcam/webcamplugin.cpp -> qx11grab-0.4.10.tar.bz2/src/filters/webcam/webcamplugin.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/filters/webcam/webcamplugin.h -> qx11grab-0.4.10.tar.bz2/src/filters/webcam/webcamplugin.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/filters/webcam/webcampreview.cpp -> qx11grab-0.4.10.tar.bz2/src/filters/webcam/webcampreview.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/filters/webcam/webcampreview.h -> qx11grab-0.4.10.tar.bz2/src/filters/webcam/webcampreview.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -54,7 +54,7 @@ public: explicit WebCamPreview ( const QSizeF &baseSize, QWidget * parent = 0 ); - const QSizeF itemSize(); + const QSizeF itemSize(); virtual ~WebCamPreview(); };
View file
qx11grab-0.4.5.tar.bz2/src/logviewer/highlighter.cpp -> qx11grab-0.4.10.tar.bz2/src/logviewer/highlighter.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the xhtmldbg project * -* Copyright (C) Juergen Heinemann http://www.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann http://www.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/logviewer/highlighter.h -> qx11grab-0.4.10.tar.bz2/src/logviewer/highlighter.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the xhtmldbg project * -* Copyright (C) Juergen Heinemann http://hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann http://hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/logviewer/logviewer.cpp -> qx11grab-0.4.10.tar.bz2/src/logviewer/logviewer.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/logviewer/logviewer.h -> qx11grab-0.4.10.tar.bz2/src/logviewer/logviewer.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/logviewer/textview.cpp -> qx11grab-0.4.10.tar.bz2/src/logviewer/textview.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/logviewer/textview.h -> qx11grab-0.4.10.tar.bz2/src/logviewer/textview.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/main.cpp -> qx11grab-0.4.10.tar.bz2/src/main.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/mainwindow.cpp -> qx11grab-0.4.10.tar.bz2/src/mainwindow.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -586,7 +586,8 @@ commandLine << "-xerror"; commandLine << "-loglevel" << cfg->logLevel(); commandLine << "-f" << "x11grab"; - commandLine << "-framerate" << QString::number ( m_grabberInfo->frameRate() ); + if ( m_grabberInfo->frameRate() >=1 ) + commandLine << "-framerate" << QString::number ( m_grabberInfo->frameRate() ); /* WARNING ordered SIZE before POINT is implicit required * or else FFmpeg didnt correct scale the stream */ @@ -623,10 +624,6 @@ if ( m_audioGroupBox->isChecked() ) commandLine << m_audioEditor->getCmd(); -// #ifdef MAINTAINER_REPOSITORY -// qDebug() << Q_FUNC_INFO << commandLine; -// #endif - m_commandPreview->setCommandLine ( commandLine ); cfg->setValue ( QLatin1String ( "SoundRecording" ), m_audioGroupBox->isChecked() );
View file
qx11grab-0.4.5.tar.bz2/src/mainwindow.h -> qx11grab-0.4.10.tar.bz2/src/mainwindow.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/menubar.cpp -> qx11grab-0.4.10.tar.bz2/src/menubar.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -29,7 +29,8 @@ #include <QtCore/QCoreApplication> #include <QtCore/QDebug> #include <QtCore/QString> -#include <QtCore/QUrl> +#include <QtCore/QProcess> +#include <QtCore/QProcessEnvironment> /* QtGui */ #include <QtGui/QDesktopServices> @@ -202,6 +203,24 @@ qApp, SLOT ( aboutQt() ) ); } +void MenuBar::openWebLink ( const QUrl &u ) +{ + QByteArray ch = qgetenv ( "BROWSER" ); + if ( ! ch.isEmpty() ) + { + QString browser ( ch ); + if ( browser.contains ( "firefox" ) || browser.contains ( "chrom" ) ) + { + QProcess process; + QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); + process.setProcessEnvironment ( env ); + process.startDetached ( browser, QStringList ( u.toString() ) ); + } + return; + } + QDesktopServices::openUrl ( u ); +} + QAction* MenuBar::bookmarkCreateAction ( QMenu * parent ) { QAction* ac = new QAction ( trUtf8 ( "Create" ), parent ); @@ -225,22 +244,22 @@ void MenuBar::openFFmpegHomepage() { - QDesktopServices::openUrl ( QUrl ( "http://www.ffmpeg.org/documentation.html" ) ); + openWebLink ( QUrl ( "http://www.ffmpeg.org/documentation.html" ) ); } void MenuBar::openQX11GrabHomepage() { - QDesktopServices::openUrl ( QUrl ( "http://qx11grab.hjcms.de" ) ); + openWebLink ( QUrl ( "http://qx11grab.hjcms.de" ) ); } void MenuBar::openWebMProjectHomepage() { - QDesktopServices::openUrl ( QUrl ( "http://www.webmproject.org/code/specs/container/" ) ); + openWebLink ( QUrl ( "http://www.webmproject.org/docs/" ) ); } void MenuBar::openVideoLanHomepage() { - QDesktopServices::openUrl ( QUrl ( "http://www.videolan.org/developers/x264.html" ) ); + openWebLink ( QUrl ( "http://www.videolan.org/developers/x264.html" ) ); } void MenuBar::openAboutDialog()
View file
qx11grab-0.4.5.tar.bz2/src/menubar.h -> qx11grab-0.4.10.tar.bz2/src/menubar.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -24,6 +24,7 @@ /* QtCore */ #include <QtCore/QObject> +#include <QtCore/QUrl> /* QtGui */ #include <QtGui/QAction> @@ -44,6 +45,8 @@ private: MainWindow* m_mainWindow; + void openWebLink ( const QUrl & ); + protected: // File Menu QMenu* m_menuFile;
View file
qx11grab-0.4.5.tar.bz2/src/messanger/CMakeLists.txt -> qx11grab-0.4.10.tar.bz2/src/messanger/CMakeLists.txt
Changed
@@ -28,6 +28,10 @@ ${QX11GRAB_INCLUDES} ) +IF (NOTIFYSEND_BINARY) + ADD_DEFINITIONS (-DNOTIFYSEND_BINARY="${NOTIFYSEND_BINARY}") +ENDIF (NOTIFYSEND_BINARY) + ADD_LIBRARY (${_subproject} STATIC ${_subproject_MOC} ${_subproject_HEADERS}
View file
qx11grab-0.4.5.tar.bz2/src/messanger/icon_p.h -> qx11grab-0.4.10.tar.bz2/src/messanger/icon_p.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/messanger/messanger.cpp -> qx11grab-0.4.10.tar.bz2/src/messanger/messanger.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -25,6 +25,7 @@ /* QtCore */ #include <QtCore/QDebug> +#include <QtCore/QProcess> /* QtGui */ #include <QtGui/QApplication> @@ -108,12 +109,31 @@ setObjectName ( QLatin1String ( "Messanger" ) ); } +bool Messanger::notify_send ( const QString &type, const QString &title, const QString &body ) +{ +#ifdef NOTIFYSEND_BINARY + QStringList args; + args << "-a" << qApp->applicationName(); + args << "-t" << "1500"; // 2,5 Sekunden + args << "-i" << qApp->applicationName(); + args << "-c" << type; + args << QString::fromUtf8 ( "\"%1\"" ).arg ( title ); + args << QString::fromUtf8 ( "\"%1\"" ).arg ( body ); + QProcess process ( this ); + return process.startDetached ( "notify-send", args ); +#endif + + return false; +} + void Messanger::notify ( const QString &type, const QString &title, const QString &body ) { Q_D ( Messanger ); qint32 id = 0; - qint32 timeout = 3000; // 5 Sekunden + qint32 timeout = 1500; // 2,5 Sekunden + + // qDebug() << Q_FUNC_INFO << type; QString appName = qApp->applicationName(); QDBusPendingReply<uint> reply = d->iface->Notify ( @@ -152,10 +172,8 @@ bool Messanger::sendInfoMessage ( const QString &title, const QString &body ) { if ( ! createConnection() ) - { - qWarning() << "Notification Daemon not available!"; - return false; - } + return notify_send ( "dialog-information", title, body ); + notify ( "dialog-information", title, body ); return true; } @@ -163,10 +181,8 @@ bool Messanger::sendWarnMessage ( const QString &title, const QString &body ) { if ( ! createConnection() ) - { - qWarning() << "Notification Daemon not available!"; - return false; - } + return notify_send ( "dialog-warning", title, body ); + notify ( "dialog-warning", title, body ); return true; } @@ -174,10 +190,8 @@ bool Messanger::sendErrorMessage ( const QString &title, const QString &body ) { if ( ! createConnection() ) - { - qWarning() << "Notification Daemon not available!"; - return false; - } + return notify_send ( "dialog-error", title, body ); + notify ( "dialog-error", title, body ); return true; }
View file
qx11grab-0.4.5.tar.bz2/src/messanger/messanger.h -> qx11grab-0.4.10.tar.bz2/src/messanger/messanger.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -47,6 +47,7 @@ Q_DISABLE_COPY ( Messanger ) QDBusConnection p_dbus; QScopedPointer<MessangerPrivate> d_ptr; + bool notify_send ( const QString &type, const QString &title, const QString &body ); private Q_SLOTS: void notify ( const QString &type, const QString &title, const QString &body );
View file
qx11grab-0.4.5.tar.bz2/src/messanger/messanger_p.h -> qx11grab-0.4.10.tar.bz2/src/messanger/messanger_p.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/navigator.cpp -> qx11grab-0.4.10.tar.bz2/src/navigator.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/navigator.h -> qx11grab-0.4.10.tar.bz2/src/navigator.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/playeraction.cpp -> qx11grab-0.4.10.tar.bz2/src/playeraction.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -29,6 +29,8 @@ #include <QtCore/QDir> #include <QtCore/QFileInfo> #include <QtCore/QProcess> +#include <QtCore/QProcessEnvironment> +#include <QtCore/QRegExp> #include <QtCore/QSettings> #include <QtCore/QStringList> @@ -113,6 +115,8 @@ hash["dragon"] = trUtf8 ( "Dragon Player" ); //: MenuEntry for "totem" http://projects.gnome.org/totem/ hash["totem"] = trUtf8 ( "Totem Player" ); + //: MenuEntry for "gst-launch" http://gstreamer.freedesktop.org/ + hash["gst-launch"] = trUtf8 ( "GStreamer" ); return ( hash[txt].isEmpty() ) ? txt : hash[txt]; } @@ -124,7 +128,7 @@ void PlayerAction::searchPlayers() { QStringList nameFilters; - nameFilters << "*mplayer" << "xine" << "vlc" << "ffplay" << "dragon" << "kplayer"; + nameFilters << "*mplayer" << "xine" << "vlc" << "ffplay" << "dragon" << "kplayer" << "gst-launch"; QByteArray env = qgetenv ( "PATH" ); if ( env.contains ( "bin" ) ) { @@ -169,7 +173,27 @@ if ( p.isNull() ) return; - QProcess::startDetached ( player, QStringList ( p ) ); + QStringList args; + QFileInfo info ( player ); + if ( info.baseName().contains ( QRegExp ( "^[g]?mplayer" ) ) ) + args << "-msglevel" << "all=-1" << p; + else if ( info.baseName().contains ( QRegExp ( "^xine" ) ) ) + args << "--no-gui" << "--no-logo" << "--verbose=0" << "--auto-play=q" << p; + else if ( info.baseName().contains ( QRegExp ( "^ffplay" ) ) ) + args << "-loglevel" << "fatal" << "-window_title" << "QX11Grab Preview" << "-showmode" << "0" << "-i" << p; + else if ( info.baseName().contains ( QRegExp ( "^smplayer" ) ) ) + args << "-minigui" << "-close-at-end" << p; + else if ( info.baseName().contains ( QRegExp ( "^gst\\-launch" ) ) ) + args << "playbin" << QString::fromUtf8 ( "uri=file://%1" ).arg ( p ); + else + args << p; + + info.setFile ( p ); + + QProcess process; + QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); + process.setProcessEnvironment ( env ); + process.startDetached ( player, args, info.dir().absolutePath() ); } PlayerAction::~PlayerAction()
View file
qx11grab-0.4.5.tar.bz2/src/playeraction.h -> qx11grab-0.4.10.tar.bz2/src/playeraction.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/preseteditor/filesavedialog.cpp -> qx11grab-0.4.10.tar.bz2/src/preseteditor/filesavedialog.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/preseteditor/filesavedialog.h -> qx11grab-0.4.10.tar.bz2/src/preseteditor/filesavedialog.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/preseteditor/presetedit.cpp -> qx11grab-0.4.10.tar.bz2/src/preseteditor/presetedit.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/preseteditor/presetedit.h -> qx11grab-0.4.10.tar.bz2/src/preseteditor/presetedit.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/preseteditor/preseteditlayout.cpp -> qx11grab-0.4.10.tar.bz2/src/preseteditor/preseteditlayout.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/preseteditor/preseteditlayout.h -> qx11grab-0.4.10.tar.bz2/src/preseteditor/preseteditlayout.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/preseteditor/preseteditor.cpp -> qx11grab-0.4.10.tar.bz2/src/preseteditor/preseteditor.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/preseteditor/preseteditor.h -> qx11grab-0.4.10.tar.bz2/src/preseteditor/preseteditor.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/preseteditor/presetscombobox.cpp -> qx11grab-0.4.10.tar.bz2/src/preseteditor/presetscombobox.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/preseteditor/presetscombobox.h -> qx11grab-0.4.10.tar.bz2/src/preseteditor/presetscombobox.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/preseteditor/presetselector.cpp -> qx11grab-0.4.10.tar.bz2/src/preseteditor/presetselector.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/preseteditor/presetselector.h -> qx11grab-0.4.10.tar.bz2/src/preseteditor/presetselector.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/preseteditor/syntaxhighlight.cpp -> qx11grab-0.4.10.tar.bz2/src/preseteditor/syntaxhighlight.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/preseteditor/syntaxhighlight.h -> qx11grab-0.4.10.tar.bz2/src/preseteditor/syntaxhighlight.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/settings/abstractconfigwidget.cpp -> qx11grab-0.4.10.tar.bz2/src/settings/abstractconfigwidget.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/settings/abstractconfigwidget.h -> qx11grab-0.4.10.tar.bz2/src/settings/abstractconfigwidget.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/settings/configdialog.cpp -> qx11grab-0.4.10.tar.bz2/src/settings/configdialog.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/settings/configdialog.h -> qx11grab-0.4.10.tar.bz2/src/settings/configdialog.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/settings/configextensions.cpp -> qx11grab-0.4.10.tar.bz2/src/settings/configextensions.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/settings/configextensions.h -> qx11grab-0.4.10.tar.bz2/src/settings/configextensions.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/settings/configrubberband.cpp -> qx11grab-0.4.10.tar.bz2/src/settings/configrubberband.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/settings/configrubberband.h -> qx11grab-0.4.10.tar.bz2/src/settings/configrubberband.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/settings/extensionselecter/extensioncodeccombobox.cpp -> qx11grab-0.4.10.tar.bz2/src/settings/extensionselecter/extensioncodeccombobox.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/settings/extensionselecter/extensioncodeccombobox.h -> qx11grab-0.4.10.tar.bz2/src/settings/extensionselecter/extensioncodeccombobox.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/settings/extensionselecter/extensiondelegation.cpp -> qx11grab-0.4.10.tar.bz2/src/settings/extensionselecter/extensiondelegation.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/settings/extensionselecter/extensiondelegation.h -> qx11grab-0.4.10.tar.bz2/src/settings/extensionselecter/extensiondelegation.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/settings/extensionselecter/extensionlineedit.cpp -> qx11grab-0.4.10.tar.bz2/src/settings/extensionselecter/extensionlineedit.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -39,9 +39,9 @@ setValidator ( mask ); } -void ExtensionLineEdit::insertCompleter ( CodecID id ) +void ExtensionLineEdit::insertCompleter ( AVCodecID id ) { - if ( id == CODEC_ID_NONE ) + if ( id == AV_CODEC_ID_NONE ) return; QStringList buffer;
View file
qx11grab-0.4.5.tar.bz2/src/settings/extensionselecter/extensionlineedit.h -> qx11grab-0.4.10.tar.bz2/src/settings/extensionselecter/extensionlineedit.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -40,7 +40,7 @@ Q_CLASSINFO ( "URL", "http://qx11grab.hjcms.de" ) private: - void insertCompleter ( CodecID ); + void insertCompleter ( AVCodecID ); public Q_SLOTS: void setCompleterCodec ( const QString & );
View file
qx11grab-0.4.5.tar.bz2/src/settings/extensionselecter/extensionscombobox.cpp -> qx11grab-0.4.10.tar.bz2/src/settings/extensionselecter/extensionscombobox.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -48,9 +48,9 @@ * erstelle das Auswahl Menü! * TODO Alternativen aus Settings lesen! */ -void ExtensionsComboBox::insertExtensions ( CodecID id ) +void ExtensionsComboBox::insertExtensions ( AVCodecID id ) { - if ( id == CODEC_ID_NONE ) + if ( id == AV_CODEC_ID_NONE ) return; QStringList buffer;
View file
qx11grab-0.4.5.tar.bz2/src/settings/extensionselecter/extensionscombobox.h -> qx11grab-0.4.10.tar.bz2/src/settings/extensionselecter/extensionscombobox.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -41,7 +41,7 @@ Q_CLASSINFO ( "URL", "http://qx11grab.hjcms.de" ) private: - void insertExtensions ( CodecID ); + void insertExtensions ( AVCodecID ); private Q_SLOTS: void updateItemList ( const QString & );
View file
qx11grab-0.4.5.tar.bz2/src/settings/extensionselecter/extensiontable.cpp -> qx11grab-0.4.10.tar.bz2/src/settings/extensionselecter/extensiontable.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -155,7 +155,7 @@ { for ( int i = 0; i < codecList.size(); ++i ) { - if ( codecList.at ( i ).id != CODEC_ID_NONE ) + if ( codecList.at ( i ).id != AV_CODEC_ID_NONE ) { QStringList buffer; QList<QX11Grab::FFFormat> extsList = QX11Grab::AVOptions::supportedFormats ( codecList.at ( i ).id );
View file
qx11grab-0.4.5.tar.bz2/src/settings/extensionselecter/extensiontable.h -> qx11grab-0.4.10.tar.bz2/src/settings/extensionselecter/extensiontable.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/settings/extensionselecter/extensiontablemodel.cpp -> qx11grab-0.4.10.tar.bz2/src/settings/extensionselecter/extensiontablemodel.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/settings/extensionselecter/extensiontablemodel.h -> qx11grab-0.4.10.tar.bz2/src/settings/extensionselecter/extensiontablemodel.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/settings/extraoptions.cpp -> qx11grab-0.4.10.tar.bz2/src/settings/extraoptions.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/settings/extraoptions.h -> qx11grab-0.4.10.tar.bz2/src/settings/extraoptions.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/settings/graphicsengineselecter.cpp -> qx11grab-0.4.10.tar.bz2/src/settings/graphicsengineselecter.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/settings/graphicsengineselecter.h -> qx11grab-0.4.10.tar.bz2/src/settings/graphicsengineselecter.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/settings/iconthemeitem.cpp -> qx11grab-0.4.10.tar.bz2/src/settings/iconthemeitem.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the xhtmldbg project * -* Copyright (C) Juergen Heinemann http://www.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann http://www.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/settings/iconthemeitem.h -> qx11grab-0.4.10.tar.bz2/src/settings/iconthemeitem.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the xhtmldbg project * -* Copyright (C) Juergen Heinemann http://www.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann http://www.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/settings/iconthememodel.cpp -> qx11grab-0.4.10.tar.bz2/src/settings/iconthememodel.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the xhtmldbg project * -* Copyright (C) Juergen Heinemann http://www.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann http://www.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/settings/iconthememodel.h -> qx11grab-0.4.10.tar.bz2/src/settings/iconthememodel.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the xhtmldbg project * -* Copyright (C) Juergen Heinemann http://www.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann http://www.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/settings/iconthemeselector.cpp -> qx11grab-0.4.10.tar.bz2/src/settings/iconthemeselector.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab/xhtmldbg project * -* Copyright (C) Juergen Heinemann (Undefined) http://www.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://www.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/settings/iconthemeselector.h -> qx11grab-0.4.10.tar.bz2/src/settings/iconthemeselector.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab/xhtmldbg project * -* Copyright (C) Juergen Heinemann (Undefined) http://www.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://www.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/settings/loglevelcombobox.cpp -> qx11grab-0.4.10.tar.bz2/src/settings/loglevelcombobox.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/settings/loglevelcombobox.h -> qx11grab-0.4.10.tar.bz2/src/settings/loglevelcombobox.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/settings/mainfcuntions.cpp -> qx11grab-0.4.10.tar.bz2/src/settings/mainfcuntions.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/settings/mainfcuntions.h -> qx11grab-0.4.10.tar.bz2/src/settings/mainfcuntions.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/settings/outputedit.cpp -> qx11grab-0.4.10.tar.bz2/src/settings/outputedit.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/settings/outputedit.h -> qx11grab-0.4.10.tar.bz2/src/settings/outputedit.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/settings/settings.cpp -> qx11grab-0.4.10.tar.bz2/src/settings/settings.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -44,6 +44,7 @@ setValue ( "Version", QX11GRAB_VERSION ); // DEPRECATED Config Options remove ( "enable_pulse_pasuspender" ); + remove ( "Grabber/Depth" ); } }
View file
qx11grab-0.4.5.tar.bz2/src/settings/settings.h -> qx11grab-0.4.10.tar.bz2/src/settings/settings.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/settings/targetswidget.cpp -> qx11grab-0.4.10.tar.bz2/src/settings/targetswidget.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/settings/targetswidget.h -> qx11grab-0.4.10.tar.bz2/src/settings/targetswidget.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/settings/threadsspinbox.cpp -> qx11grab-0.4.10.tar.bz2/src/settings/threadsspinbox.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/settings/threadsspinbox.h -> qx11grab-0.4.10.tar.bz2/src/settings/threadsspinbox.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/systemtray.cpp -> qx11grab-0.4.10.tar.bz2/src/systemtray.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/systemtray.h -> qx11grab-0.4.10.tar.bz2/src/systemtray.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/tableeditor/abstractedit.cpp -> qx11grab-0.4.10.tar.bz2/src/tableeditor/abstractedit.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/tableeditor/abstractedit.h -> qx11grab-0.4.10.tar.bz2/src/tableeditor/abstractedit.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/tableeditor/abstractselection.cpp -> qx11grab-0.4.10.tar.bz2/src/tableeditor/abstractselection.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/tableeditor/abstractselection.h -> qx11grab-0.4.10.tar.bz2/src/tableeditor/abstractselection.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/tableeditor/abstracttableeditor.cpp -> qx11grab-0.4.10.tar.bz2/src/tableeditor/abstracttableeditor.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/tableeditor/abstracttableeditor.h -> qx11grab-0.4.10.tar.bz2/src/tableeditor/abstracttableeditor.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/tableeditor/audiotableeditor.cpp -> qx11grab-0.4.10.tar.bz2/src/tableeditor/audiotableeditor.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -78,7 +78,7 @@ const QStringList AudioTableEditor::getCmd() { QStringList cmd; - cmd << QLatin1String ( "-acodec" ) << selectedCodec(); + cmd << QLatin1String ( "-c:a" ) << selectedCodec(); QHash<QString,QVariant> hash = getTableItems(); if ( hash.size() >= 1 )
View file
qx11grab-0.4.5.tar.bz2/src/tableeditor/audiotableeditor.h -> qx11grab-0.4.10.tar.bz2/src/tableeditor/audiotableeditor.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/tableeditor/codectable.cpp -> qx11grab-0.4.10.tar.bz2/src/tableeditor/codectable.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/tableeditor/codectable.h -> qx11grab-0.4.10.tar.bz2/src/tableeditor/codectable.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/tableeditor/codectabledelegate.cpp -> qx11grab-0.4.10.tar.bz2/src/tableeditor/codectabledelegate.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -156,7 +156,7 @@ return w; } - DefaultEdit* w = new DefaultEdit ( parent ); + DefaultEdit* w = new DefaultEdit ( queryCodec(), parent ); w->setValue ( index.model()->data ( index ) ); return w; }
View file
qx11grab-0.4.5.tar.bz2/src/tableeditor/codectabledelegate.h -> qx11grab-0.4.10.tar.bz2/src/tableeditor/codectabledelegate.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/tableeditor/codectablemodel.cpp -> qx11grab-0.4.10.tar.bz2/src/tableeditor/codectablemodel.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -57,9 +57,9 @@ str.trimmed(); // ab sofort kein -vf mehr zulassen! if ( str.contains ( "-vf" ) ) - str.replace ( "-vf", QX11Grab::avFilterPredicate ); + str.replace ( QRegExp( "^\\-vf\\b" ), QX11Grab::avFilterPredicate ); else if ( str.contains ( "-af" ) ) - str.replace ( "-af", QX11Grab::acFilterPredicate ); + str.replace ( QRegExp( "^\\-af\\b" ), QX11Grab::acFilterPredicate ); return str; }
View file
qx11grab-0.4.5.tar.bz2/src/tableeditor/codectablemodel.h -> qx11grab-0.4.10.tar.bz2/src/tableeditor/codectablemodel.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/tableeditor/defaultedit.cpp -> qx11grab-0.4.10.tar.bz2/src/tableeditor/defaultedit.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -30,8 +30,9 @@ /* QX11Grab */ #include "avoptions.h" -DefaultEdit::DefaultEdit ( QWidget * parent ) +DefaultEdit::DefaultEdit ( const QString &codec, QWidget * parent ) : AbstractEdit ( parent ) + , p_codec ( codec.toUtf8() ) { setObjectName ( QLatin1String ( "DefaultEdit" ) ); } @@ -40,9 +41,9 @@ { QString buffer ( param ); QRegExp pattern ( "((^\\-{1,2})|(:\\w{1}$))" ); - QByteArray query = buffer.remove ( pattern ).toAscii(); + QByteArray query = buffer.remove ( pattern ).toUtf8(); - QList<QX11Grab::FFOption> opts = QX11Grab::AVOptions::optionQuery ( query ); + QList<QX11Grab::FFOption> opts = QX11Grab::AVOptions::optionQuery ( query, p_codec ); if ( opts.size() > 0 ) { setToolTip ( opts.first().help );
View file
qx11grab-0.4.5.tar.bz2/src/tableeditor/defaultedit.h -> qx11grab-0.4.10.tar.bz2/src/tableeditor/defaultedit.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -41,10 +41,11 @@ Q_CLASSINFO ( "URL", "http://qx11grab.hjcms.de" ) private: + const QByteArray p_codec; void setCodecOptions ( const QString ¶m ); public: - DefaultEdit ( QWidget * parent = 0 ); + DefaultEdit ( const QString &codec, QWidget * parent = 0 ); void setCompleterId ( const QString &id ); ~DefaultEdit(); };
View file
qx11grab-0.4.5.tar.bz2/src/tableeditor/filtermenu.cpp -> qx11grab-0.4.10.tar.bz2/src/tableeditor/filtermenu.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/tableeditor/filtermenu.h -> qx11grab-0.4.10.tar.bz2/src/tableeditor/filtermenu.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/tableeditor/selectacodecpresets.cpp -> qx11grab-0.4.10.tar.bz2/src/tableeditor/selectacodecpresets.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/tableeditor/selectacodecpresets.h -> qx11grab-0.4.10.tar.bz2/src/tableeditor/selectacodecpresets.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/tableeditor/selectvcodecpresets.cpp -> qx11grab-0.4.10.tar.bz2/src/tableeditor/selectvcodecpresets.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/tableeditor/selectvcodecpresets.h -> qx11grab-0.4.10.tar.bz2/src/tableeditor/selectvcodecpresets.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/tableeditor/videotableeditor.cpp -> qx11grab-0.4.10.tar.bz2/src/tableeditor/videotableeditor.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -33,8 +33,8 @@ setToolTip ( QString::fromUtf8 ( "-vcodec" ) ); // ComboBoxes - connect ( m_codecSelecter, SIGNAL ( codecChanged ( const QString &, CodecID ) ), - m_formatMenu, SLOT ( updateMenu ( const QString &, CodecID ) ) ); + connect ( m_codecSelecter, SIGNAL ( codecChanged ( const QString &, AVCodecID ) ), + m_formatMenu, SLOT ( updateMenu ( const QString &, AVCodecID ) ) ); connect ( m_formatMenu, SIGNAL ( extensionChanged ( const QString & ) ), this, SLOT ( setCodecExtension ( const QString & ) ) ); @@ -139,7 +139,7 @@ const QStringList VideoTableEditor::getCmd() { QStringList cmd; - cmd << QLatin1String ( "-vcodec" ) << selectedCodec(); + cmd << QLatin1String ( "-c:v" ) << selectedCodec(); QHash<QString,QVariant> hash = getTableItems(); if ( hash.size() >= 1 )
View file
qx11grab-0.4.5.tar.bz2/src/tableeditor/videotableeditor.h -> qx11grab-0.4.10.tar.bz2/src/tableeditor/videotableeditor.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/tapping/desktopinfo.cpp -> qx11grab-0.4.10.tar.bz2/src/tapping/desktopinfo.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/tapping/desktopinfo.h -> qx11grab-0.4.10.tar.bz2/src/tapping/desktopinfo.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/tapping/desktoptapping.cpp -> qx11grab-0.4.10.tar.bz2/src/tapping/desktoptapping.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -126,7 +126,7 @@ * \warning Wir verwenden Qt:DISPLAY und nicht X:Display \n * Hiermit sind wegen \e XLIB_ILLEGAL_ACCESS einige Einschränkungen verbunden! * \li Wir haben \b nicht die ganze Klassen-Struktur wie unter XLib! -* \li Daraus ergibt sich: Das \e screen_number unf \e number fehlen! +* \li Daraus ergibt sich: Das \e screen_number und \e number fehlen! */ void DesktopTapping::grabWindowRect () { @@ -216,11 +216,9 @@ /** * Startet das abgreifen der Desktop Auflösung -* DEPRECATED SCREEN wird jetzt Automatisch ermittelt! */ -void DesktopTapping::createRequest ( int screen ) +void DesktopTapping::createRequest () { - Q_UNUSED ( screen ); grabWindowRect (); }
View file
qx11grab-0.4.5.tar.bz2/src/tapping/desktoptapping.h -> qx11grab-0.4.10.tar.bz2/src/tapping/desktoptapping.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -54,7 +54,7 @@ public Q_SLOTS: /** Create a Desktop tapping Request */ - void createRequest ( int screen = 0 ); + void createRequest (); public: explicit DesktopTapping ( QObject * parent = 0 );
View file
qx11grab-0.4.5.tar.bz2/src/tapping/rubberband.cpp -> qx11grab-0.4.10.tar.bz2/src/tapping/rubberband.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -24,16 +24,29 @@ /* QtCore */ #include <QtCore/QDebug> #include <QtCore/QLineF> +#include <QtCore/QPointF> +#include <QtCore/QSettings> /* QtGui */ +#include <QtGui/QApplication> #include <QtGui/QBrush> +#include <QtGui/QColor> #include <QtGui/QPainter> #include <QtGui/QPainterPath> -#include <QtGui/QPen> +#include <QtGui/QStyle> +#include <QtGui/QStylePainter> + +static const QPen defaultPenStyle() +{ + QBrush b ( Qt::red, Qt::SolidPattern ); + QPen p ( b, 1, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin ); + return p; +} RubberBand::RubberBand ( QWidget * parent ) - : QRubberBand ( QRubberBand::Rectangle, parent ) - , p_settings ( new QSettings ( QSettings::NativeFormat, QSettings::UserScope, "hjcms.de", "qx11grab" ) ) + : QRubberBand ( QRubberBand::Line, parent ) + , p_pen ( defaultPenStyle() ) + , p_style ( QStyleOption::Version, QStyleOption::SO_RubberBand ) { setMinimumWidth ( 128 ); setMinimumHeight ( 96 ); @@ -47,53 +60,62 @@ setAttribute ( Qt::WA_PaintOnScreen, true ); } -const QColor RubberBand::frameColor() const -{ - QColor color; - color.setNamedColor ( p_settings.value ( "Rubberband/Color", "#800000" ).toString() ); - return color; -} - -void RubberBand::initStyleOption ( QStyleOptionRubberBand * option ) const +/** +* Initialsiere den Stylesheet erst bei einer neuen Ansicht! +*/ +void RubberBand::showEvent ( QShowEvent * event ) { - if ( option ) - option->initFrom ( this ); + QSettings s ( QSettings::NativeFormat, QSettings::UserScope, + qApp->organizationDomain(), qApp->applicationName() ); + QString hex = s.value ( "Rubberband/Color", "#800000" ).toString(); + updateFrameColor ( hex ); + QRubberBand::showEvent ( event ); } /** -* Es gibt eingige Distribution die der Meinung sind sie müssten +* Es gibt einige Distribution die der Meinung sind sie müssten * Unbedingt den Rubberband Style an Windoof anpassen. :-/ * Hier mein Hack um dieses wieder zu umgehen! */ -void RubberBand::paintEvent ( QPaintEvent * event ) +void RubberBand::paintEvent ( QPaintEvent * _e ) { - QRubberBand::paintEvent ( event ); + const QRect r = _e->rect(); + const QPointF p[8] = + { + QPointF ( r.topLeft() ), + QPointF ( r.topRight() ), + QPointF ( r.topRight() ), + QPointF ( r.bottomRight() ), + QPointF ( r.bottomRight() ), + QPointF ( r.bottomLeft() ), + QPointF ( r.bottomLeft() ), + QPointF ( r.topLeft() ) + }; - QStyleOptionRubberBand panel; - initStyleOption ( &panel ); + QStylePainter sp ( this ); + sp.setCompositionMode ( QPainter::CompositionMode_Clear ); + sp.setBackgroundMode ( Qt::TransparentMode ); + sp.setRenderHint ( QPainter::NonCosmeticDefaultPen, true ); + sp.setPen ( p_pen ); + sp.drawLines ( p, 4 ); + style()->drawControl ( QStyle::CE_RubberBand, &p_style, &sp, this ); +} - QPainter painter ( this ); - painter.fillRect ( panel.rect, frameColor() ); +void RubberBand::updateFrameColor ( const QString &hex ) +{ + QColor c ( Qt::red ); + c.setNamedColor ( hex ); + p_pen.setColor ( c ); } bool RubberBand::isScalability() { - if ( size().width() & 1 ) - { - QString str = QString::number ( size().width() ); - emit error ( trUtf8 ( "Scalability Failure Width" ), - trUtf8 ( "Frame Width must be a multiple of 2" ) ); - return false; - } - - if ( size().height() & 1 ) + if ( ( size().width() & 1 ) || ( size().height() & 1 ) ) { - QString str = QString::number ( size().height() ); - emit error ( trUtf8 ( "Scalability Failure Height" ), - trUtf8 ( "Frame Height must be a multiple of 2" ) ); + emit error ( trUtf8 ( "Scalability Failure" ), + trUtf8 ( "Frame Width/Height must be a multiple of 2" ) ); return false; } - return true; }
View file
qx11grab-0.4.5.tar.bz2/src/tapping/rubberband.h -> qx11grab-0.4.10.tar.bz2/src/tapping/rubberband.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -24,14 +24,14 @@ /* QtCore */ #include <QtCore/QObject> -#include <QtCore/QSettings> #include <QtCore/QString> /* QtGui */ -#include <QtGui/QColor> #include <QtGui/QPaintEvent> +#include <QtGui/QPen> #include <QtGui/QRubberBand> -#include <QtGui/QStyleOptionRubberBand> +#include <QtGui/QShowEvent> +#include <QtGui/QStyleOption> #include <QtGui/QWidget> class RubberBand : public QRubberBand @@ -41,17 +41,23 @@ Q_CLASSINFO ( "URL", "http://qx11grab.hjcms.de" ) private: - const QSettings p_settings; - const QColor frameColor() const; + QPen p_pen; + QStyleOption p_style; protected: - void initStyleOption ( QStyleOptionRubberBand * ) const; + /** init user configuration for border color */ + void showEvent ( QShowEvent * ); + + /** update QStyle::CE_RubberBand */ void paintEvent ( QPaintEvent * ); Q_SIGNALS: - void warning ( const QString & ); void error ( const QString &, const QString & ); + public Q_SLOTS: + /** a Hex Color Codes is required */ + void updateFrameColor ( const QString &hex ); + public: explicit RubberBand ( QWidget * parent = 0 );
View file
qx11grab-0.4.5.tar.bz2/src/toolbar.cpp -> qx11grab-0.4.10.tar.bz2/src/toolbar.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/toolbar.h -> qx11grab-0.4.10.tar.bz2/src/toolbar.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/utils/cspinbox.cpp -> qx11grab-0.4.10.tar.bz2/src/utils/cspinbox.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/utils/cspinbox.h -> qx11grab-0.4.10.tar.bz2/src/utils/cspinbox.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/utils/grabberinfo.cpp -> qx11grab-0.4.10.tar.bz2/src/utils/grabberinfo.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -36,10 +36,8 @@ #include <QtGui/QDesktopWidget> #include <QtGui/QHBoxLayout> #include <QtGui/QGridLayout> -#include <QtGui/QGroupBox> #include <QtGui/QLabel> #include <QtGui/QPalette> -#include <QtGui/QSpacerItem> /** * @class GrabberInfo @@ -166,43 +164,38 @@ // end: Y Position QHBoxLayout* horizontalLayout = new QHBoxLayout; + horizontalLayout->setContentsMargins ( 5, 5, 5, 5 ); + horizontalLayout->addStretch ( 1 ); + // begin: Desktop Screen - QLabel* txt7 = new QLabel ( this ); - txt7->setText ( trUtf8 ( "Screen:" ) ); - txt7->setAlignment ( labelAlignment ); - horizontalLayout->addWidget ( txt7, Qt::AlignRight ); + m_grouBox0 = new QGroupBox ( trUtf8 ( "Screen" ), this ); + + QHBoxLayout* m_screenLayout = new QHBoxLayout ( m_grouBox0 ); + m_grouBox0->setLayout ( m_screenLayout ); - m_screenBox = new ScreenBox ( this ); + m_screenBox = new ScreenBox ( m_grouBox0 ); /*: WhatsThis */ m_screenBox->setToolTip ( trUtf8 ( "current selected screen" ) ); - horizontalLayout->addWidget ( m_screenBox, Qt::AlignLeft ); - // end: Desktop Screen - - // begin: Desktop Color Depth - QLabel* txt8 = new QLabel ( this ); - txt8->setText ( trUtf8 ( "Color depth:" ) ); - txt8->setAlignment ( labelAlignment ); - horizontalLayout->addWidget ( txt8, Qt::AlignRight ); + m_screenLayout->addWidget ( m_screenBox, Qt::AlignLeft ); - setDepth = new QSpinBox ( this ); - setDepth->setDisabled ( true ); - /*: WhatsThis */ - setDepth->setToolTip ( trUtf8 ( "current color depth" ) ); - horizontalLayout->addWidget ( setDepth, Qt::AlignLeft ); - // end: Desktop Color Depth + horizontalLayout->addWidget ( m_grouBox0, Qt::AlignLeft ); + // end: Desktop Screen // begin: Frame Rate - QLabel* txt9 = new QLabel ( this ); - txt9->setText ( trUtf8 ( "Framerate:" ) ); - txt9->setAlignment ( labelAlignment ); - horizontalLayout->addWidget ( txt9, Qt::AlignRight ); + m_grouBox1 = new QGroupBox ( trUtf8 ( "Framerate" ), this ); + m_grouBox1->setCheckable ( true ); + m_grouBox1->setChecked ( false ); + QHBoxLayout* m_framerateLayout = new QHBoxLayout ( m_grouBox1 ); + m_grouBox1->setLayout ( m_framerateLayout ); - setFrameRate = new QSpinBox ( this ); + setFrameRate = new QSpinBox ( m_grouBox1 ); /*: WhatsThis */ setFrameRate->setWhatsThis ( trUtf8 ( "Set the framerate in the captured video." ) ); setFrameRate->setRange ( 0, 150 ); setFrameRate->setValue ( 25 ); - horizontalLayout->addWidget ( setFrameRate, Qt::AlignLeft ); + m_framerateLayout->addWidget ( setFrameRate, Qt::AlignLeft ); + + horizontalLayout->addWidget ( m_grouBox1, Qt::AlignLeft ); // end: Frame Rate gridLayout->addLayout ( horizontalLayout, grow++, 0, 1, 3 ); @@ -222,9 +215,6 @@ connect ( m_screenComboBox, SIGNAL ( screenHeightChanged ( int ) ), setHeightBox, SLOT ( setValue ( int ) ) ); - connect ( m_screenComboBox, SIGNAL ( screenDepthChanged ( int ) ), - setDepth, SLOT ( setValue ( int ) ) ); - // SIGNALS:Width { connect ( setWidthBox, SIGNAL ( valueChanged ( int ) ), setWidthSlider, SLOT ( setValue ( int ) ) ); @@ -267,6 +257,9 @@ // } SIGNALS:Y-Position // Updates + connect ( m_grouBox1, SIGNAL ( toggled ( bool ) ), + this, SLOT ( toggleUpdate ( bool ) ) ); + connect ( setFrameRate, SIGNAL ( valueChanged ( int ) ), this, SLOT ( integerUpdate ( int ) ) ); @@ -278,6 +271,14 @@ } /** +* Umleitung Signal bool nach void Update Datensatz +*/ +void GrabberInfo::toggleUpdate ( bool ) +{ + emit postUpdate(); +} + +/** * Umleitung Signal int nach void Update Datensatz */ void GrabberInfo::integerUpdate ( int ) @@ -315,7 +316,6 @@ { QRect maxRect = m_desktopTapping->fullDesktopsRect(); emit showRubber ( true ); - // qDebug() << Q_FUNC_INFO << maxRect; int maxWidth = maxRect.width(); int boxRight = qRound ( setXBox->value() + setWidthBox->value() ); @@ -333,7 +333,8 @@ setHeightBox->setValue ( ( ( h & 1 ) ? ( 1 ^ h ) : h ) ); } - if ( i > 0 ) + // Alle Signale von x/y 0 bis max w/h durchlassen! + if ( i >= 0 ) emit screenDataChanged ( true ); } @@ -344,7 +345,7 @@ { // Grabber setRect ( cfg->value ( QLatin1String ( "Grabber/Dimension" ) ).toRect() ); - setDepth->setValue ( cfg->value ( QLatin1String ( "Grabber/Depth" ), 24 ).toUInt() ); + m_grouBox1->setChecked ( cfg->value ( QLatin1String ( "Grabber/FrameRateEnabled" ), false ).toBool() ); setFrameRate->setValue ( cfg->value ( QLatin1String ( "Grabber/FrameRate" ), 25 ).toUInt() ); } @@ -355,7 +356,7 @@ { // Grabber cfg->setValue ( QLatin1String ( "Grabber/Dimension" ), getRect() ); - cfg->setValue ( QLatin1String ( "Grabber/Depth" ), setDepth->value() ); + cfg->setValue ( QLatin1String ( "Grabber/FrameRateEnabled" ), m_grouBox1->isChecked() ); cfg->setValue ( QLatin1String ( "Grabber/FrameRate" ), setFrameRate->value() ); } @@ -425,6 +426,9 @@ */ int GrabberInfo::frameRate() { + if ( !m_grouBox1->isChecked() ) + return 0; + int rate = setFrameRate->value(); return ( rate > 0 ) ? rate : 25; }
View file
qx11grab-0.4.5.tar.bz2/src/utils/grabberinfo.h -> qx11grab-0.4.10.tar.bz2/src/utils/grabberinfo.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -31,6 +31,7 @@ /* QtGui */ #include <QtGui/QCheckBox> #include <QtGui/QDoubleSpinBox> +#include <QtGui/QGroupBox> #include <QtGui/QSlider> #include <QtGui/QSpinBox> #include <QtGui/QWidget> @@ -60,11 +61,13 @@ QSlider* setXSlider; QSpinBox* setYBox; QSlider* setYSlider; + QGroupBox* m_grouBox0; ScreenBox* m_screenBox; - QSpinBox* setDepth; + QGroupBox* m_grouBox1; QSpinBox* setFrameRate; private Q_SLOTS: + void toggleUpdate ( bool ); void integerUpdate ( int ); void setInputDefaults ( int screen ); void setRubberbandUpdate ( int );
View file
qx11grab-0.4.5.tar.bz2/src/utils/metadata.cpp -> qx11grab-0.4.10.tar.bz2/src/utils/metadata.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/utils/metadata.h -> qx11grab-0.4.10.tar.bz2/src/utils/metadata.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/utils/screenbox.cpp -> qx11grab-0.4.10.tar.bz2/src/utils/screenbox.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/utils/screenbox.h -> qx11grab-0.4.10.tar.bz2/src/utils/screenbox.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/utils/screencombobox.cpp -> qx11grab-0.4.10.tar.bz2/src/utils/screencombobox.cpp
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/utils/screencombobox.h -> qx11grab-0.4.10.tar.bz2/src/utils/screencombobox.h
Changed
@@ -1,7 +1,7 @@ /* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.5.tar.bz2/src/version.h.cmake -> qx11grab-0.4.10.tar.bz2/src/version.h.cmake
Changed
@@ -1,7 +1,7 @@ -/** +/* * This file is part of the qx11grab project * -* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2012 +* Copyright (C) Juergen Heinemann http://qx11grab.hjcms.de, (C) 2007-2013 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -17,7 +17,7 @@ * along with this library; see the file COPYING.LIB. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. -**/ +*/ #ifndef QX11GRAB_VERSION_H #define QX11GRAB_VERSION_H
View file
qx11grab-0.4.5.tar.bz2/utils/cmake.sh -> qx11grab-0.4.10.tar.bz2/utils/cmake.sh
Changed
@@ -1,8 +1,8 @@ -#!/bin/bash +#!/usr/bin/env bash ######################################################################################## # This file is part of the qx11grab project # -# Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +# Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Library General Public @@ -21,16 +21,24 @@ ######################################################################################## target_project="qx11grab" -ff_suffix=-1.0 +# ff_suffix=-av-9.1 +# ff_suffix=_10x +ff_suffix=-2.0 if test -f $HJCMS_PROJECTS_DIR/projectconfigurations.sh ; then source $HJCMS_PROJECTS_DIR/projectconfigurations.sh fi +rm -rf /tmp/${target_project}/build/* mkdir -p /tmp/${target_project}/build pushd /tmp/${target_project}/build +CMAKE_KDE4= +if test -n "$WITH_KDE4" ; then + CMAKE_KDE4="-DENABLE_KDE_SUPPORT:BOOL=ON -DAUTOMOC4_EXECUTABLE:FILEPATH=$(which automoc4)" +fi + /usr/bin/cmake -W-dev \ -DCMAKE_CXX_FLAGS:STRING="$CXXFLAGS" \ -DCMAKE_BUILD_TYPE:STRING=Debug \ @@ -39,7 +47,7 @@ -DINSTALL_FFPRESETS:BOOL=OFF \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ - $CMAKE_EXTRAS $@ $HJCMS_PROJECTS_DIR/${target_project}/ + $CMAKE_EXTRAS $CMAKE_KDE4 $@ $HJCMS_PROJECTS_DIR/${target_project}/ popd
View file
qx11grab-0.4.5.tar.bz2/utils/commit.sh -> qx11grab-0.4.10.tar.bz2/utils/commit.sh
Changed
@@ -2,7 +2,7 @@ ######################################################################################## # This file is part of the qx11grab project # -# Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +# Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/utils/freecode.tags
Added
@@ -0,0 +1,1 @@ +Linux, Desktop Environment, Video, GUI, Qt4, Recording
View file
qx11grab-0.4.10.tar.bz2/utils/gstpulse.sh
Added
@@ -0,0 +1,49 @@ +#!/usr/bin/env bash +######################################################################################## +# This file is part of the qx11grab project +# +# Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public License +# along with this library; see the file COPYING.LIB. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. +######################################################################################## + +## http://wiki.gentoo.org/wiki/PulseAudio + +gst_ver=${1:-"0.10"} + +if ! which gconftool-2 &> /dev/null; then + echo -e "\E[1;37;44m\033[1m FATAL: missing gconftool-2\033[0m" + exit 1 +fi + +function setPulseAudio() +{ + echo -e "\E[1;37;44m\033[1m Update Configuration \033[0m" + gconftool-2 -R /system/gstreamer/${gst_ver}/default + + gconftool-2 -t string --set /system/gstreamer/${gst_ver}/default/audiosink pulsesink + gconftool-2 -t string --set /system/gstreamer/${gst_ver}/default/audiosrc pulsesrc + gconftool-2 -t string --set /system/gstreamer/${gst_ver}/default/musicaudiosink pulsesink + gconftool-2 -t string --set /system/gstreamer/${gst_ver}/default/videosink glimagesink + gconftool-2 -t string --set /system/gstreamer/${gst_ver}/default/chataudiosink fakesink + + echo -e "\E[1;37;44m\033[1m Show Configuration \033[0m" + gconftool-2 -R /system/gstreamer/${gst_ver}/default +} + +setPulseAudio + +echo "gst-launch-${gst_ver} playbin uri=file:///usr/share/sounds/test/test.wav"
View file
qx11grab-0.4.5.tar.bz2/utils/lupdate.sh -> qx11grab-0.4.10.tar.bz2/utils/lupdate.sh
Changed
@@ -2,7 +2,7 @@ ######################################################################################## # This file is part of the qx11grab project # -# Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2012 +# Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Library General Public
View file
qx11grab-0.4.10.tar.bz2/utils/optimize-webm.sh
Added
@@ -0,0 +1,36 @@ +#!/usr/bin/env bash +######################################################################################## +# This file is part of the qx11grab project +# +# Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public License +# along with this library; see the file COPYING.LIB. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. +######################################################################################## + +in="${1:-"dummy"}" + +test -e ${in}.webm || { + echo "FATAL: ${in}.webm not found" + exit 1 +} + +/usr/bin/ffmpeg -i ${in}.webm -threads 4 \ + -c:v libvpx -r:v 25 -s 1920x1080 -pix_fmt yuv420p -speed 2 -vpre 1080p \ + -c:a libvorbis -ar 44100 -b:a 256k -q:a 4 \ + -metadata copyright='CC BY-NC-SA 3.0' \ + -y /tmp/${in}_data.webm + +# EOF
View file
qx11grab-0.4.10.tar.bz2/utils/version_tests.sh
Added
@@ -0,0 +1,98 @@ +#!/usr/bin/env bash +######################################################################################## +# This file is part of the qx11grab project +# +# Copyright (C) Juergen Heinemann (Undefined) http://qx11grab.hjcms.de, (C) 2007-2013 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public License +# along with this library; see the file COPYING.LIB. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. +######################################################################################## +# +# Test Script for Building all my Installed FFmpeg/libav Versions with QX11Grab +# +######################################################################################## + +target_project="qx11grab" +ff_suffix= +smp_flags="-j$(getconf _NPROCESSORS_ONLN)" + +notify_message() { + echo -e '\033[1m' "$1" '\033[0m'; +} + +if test -f $HJCMS_PROJECTS_DIR/projectconfigurations.sh ; then +source $HJCMS_PROJECTS_DIR/projectconfigurations.sh +fi + +mkdir -p /tmp/${target_project} +rm -rf /tmp/${target_project}/*.* + +> $HJCMS_PROJECTS_DIR/${target_project}/BUILD_TESTS + +find /usr/include/ffmpeg -mindepth 1 -maxdepth 1 -type d -exec basename "{}" \; > /tmp/qx11grab.destdirs +find /usr/include/libav -mindepth 1 -maxdepth 1 -type d -exec basename "{}" \; >> /tmp/qx11grab.destdirs + +while read v ; do + summary="" + v1="`echo $v | cut -d\. -f2`" + if [ -e /usr/lib/libavformat-${v}.so ] || [ -e /usr/lib64/libavformat-${v}.so ] ; then + ff_suffix="-${v}" + summary="Building with FFmpeg v${v}" + notify_message "Running ffmpeg Test vor version ${ff_suffix}" + elif [ -e /usr/lib/libavformat_${v1}x.so ] || [ -e /usr/lib64/libavformat-${v1}x.so ] ; then + ff_suffix="_${v1}x" + summary="Building with FFmpeg v${v}" + notify_message "Running ffmpeg Test vor version ${ff_suffix}" + elif [ -e /usr/lib/libavformat-av-${v}.so ] || [ -e /usr/lib64/libavformat-av-${v}.so ] ; then + ff_suffix="-av-${v}" + summary="Building with libav v${v}" + notify_message "Running libav Test vor version ${ff_suffix}" + else + continue + fi + mkdir -p /tmp/${target_project}/${v} + pushd /tmp/${target_project}/${v} + + /usr/bin/cmake -W-dev \ + -DCMAKE_CXX_FLAGS:STRING="$CXXFLAGS" \ + -DCMAKE_BUILD_TYPE:STRING=Debug \ + -DFFMPEG_SUFFIX:STRING="${ff_suffix}" \ + -DENABLE_EXPERIMENTAL:BOOL=ON \ + -DINSTALL_FFPRESETS:BOOL=OFF \ + -DCMAKE_SKIP_RPATH:BOOL=ON \ + -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ + $CMAKE_EXTRAS $@ $HJCMS_PROJECTS_DIR/${target_project}/ + + LC_ALL=C make ${smp_flags} -C /tmp/${target_project}/${v} + + popd + + if test -x /tmp/${target_project}/${v}/app/${target_project} ; then + notify_message "Building with ${v} and ${ff_suffix} done!" + echo "${summary} OK" >> $HJCMS_PROJECTS_DIR/${target_project}/BUILD_TESTS + else + notify_message "Building with ${v} and ${ff_suffix} failed!" + echo "${summary} FAILED" >> $HJCMS_PROJECTS_DIR/${target_project}/BUILD_TESTS + tput bel + exit 1 + fi + +done < /tmp/qx11grab.destdirs + +rm -f /tmp/qx11grab.destdirs + +cat $HJCMS_PROJECTS_DIR/${target_project}/BUILD_TESTS + +##EOF
View file
qx11grab-0.4.5.tar.bz2/modules/FindPkgConfig.cmake
Deleted
@@ -1,349 +0,0 @@ -# - a pkg-config module for CMake -# -# Usage: -# pkg_check_modules(<PREFIX> [REQUIRED] <MODULE> [<MODULE>]*) -# checks for all the given modules -# -# pkg_search_module(<PREFIX> [REQUIRED] <MODULE> [<MODULE>]*) -# checks for given modules and uses the first working one -# -# When the 'REQUIRED' argument was set, macros will fail with an error -# when module(s) could not be found -# -# It sets the following variables: -# PKG_CONFIG_FOUND ... true if pkg-config works on the system -# PKG_CONFIG_EXECUTABLE ... pathname of the pkg-config program -# <PREFIX>_FOUND ... set to 1 if module(s) exist -# -# For the following variables two sets of values exist; first one is the -# common one and has the given PREFIX. The second set contains flags -# which are given out when pkgconfig was called with the '--static' -# option. -# <XPREFIX>_LIBRARIES ... only the libraries (w/o the '-l') -# <XPREFIX>_LIBRARY_DIRS ... the paths of the libraries (w/o the '-L') -# <XPREFIX>_LDFLAGS ... all required linker flags -# <XPREFIX>_LDFLAGS_OTHER ... all other linker flags -# <XPREFIX>_INCLUDE_DIRS ... the '-I' preprocessor flags (w/o the '-I') -# <XPREFIX>_CFLAGS ... all required cflags -# <XPREFIX>_CFLAGS_OTHER ... the other compiler flags -# -# <XPREFIX> = <PREFIX> for common case -# <XPREFIX> = <PREFIX>_STATIC for static linking -# -# There are some special variables whose prefix depends on the count -# of given modules. When there is only one module, <PREFIX> stays -# unchanged. When there are multiple modules, the prefix will be -# changed to <PREFIX>_<MODNAME>: -# <XPREFIX>_VERSION ... version of the module -# <XPREFIX>_PREFIX ... prefix-directory of the module -# <XPREFIX>_INCLUDEDIR ... include-dir of the module -# <XPREFIX>_LIBDIR ... lib-dir of the module -# -# <XPREFIX> = <PREFIX> when |MODULES| == 1, else -# <XPREFIX> = <PREFIX>_<MODNAME> -# -# A <MODULE> parameter can have the following formats: -# {MODNAME} ... matches any version -# {MODNAME}>={VERSION} ... at least version <VERSION> is required -# {MODNAME}={VERSION} ... exactly version <VERSION> is required -# {MODNAME}<={VERSION} ... modules must not be newer than <VERSION> -# -# Examples -# pkg_check_modules (GLIB2 glib-2.0) -# -# pkg_check_modules (GLIB2 glib-2.0>=2.10) -# requires at least version 2.10 of glib2 and defines e.g. -# GLIB2_VERSION=2.10.3 -# -# pkg_check_modules (FOO glib-2.0>=2.10 gtk+-2.0) -# requires both glib2 and gtk2, and defines e.g. -# FOO_glib-2.0_VERSION=2.10.3 -# FOO_gtk+-2.0_VERSION=2.8.20 -# -# pkg_check_modules (XRENDER REQUIRED xrender) -# defines e.g.: -# XRENDER_LIBRARIES=Xrender;X11 -# XRENDER_STATIC_LIBRARIES=Xrender;X11;pthread;Xau;Xdmcp -# -# pkg_search_module (BAR libxml-2.0 libxml2 libxml>=2) - -#============================================================================= -# Copyright 2006-2009 Kitware, Inc. -# Copyright 2006 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> -# -# Distributed under the OSI-approved BSD License (the "License"); -# see accompanying file Copyright.txt for details. -# -# This software is distributed WITHOUT ANY WARRANTY; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the License for more information. -#============================================================================= -# (To distributed this file outside of CMake, substitute the full -# License text for the above reference.) - -### Common stuff #### -set(PKG_CONFIG_VERSION 1) -set(PKG_CONFIG_FOUND 0) - -find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable") -mark_as_advanced(PKG_CONFIG_EXECUTABLE) - -if(PKG_CONFIG_EXECUTABLE) - set(PKG_CONFIG_FOUND 1) -endif(PKG_CONFIG_EXECUTABLE) - - -# Unsets the given variables -macro(_pkgconfig_unset var) - set(${var} "" CACHE INTERNAL "") -endmacro(_pkgconfig_unset) - -macro(_pkgconfig_set var value) - set(${var} ${value} CACHE INTERNAL "") -endmacro(_pkgconfig_set) - -# Invokes pkgconfig, cleans up the result and sets variables -macro(_pkgconfig_invoke _pkglist _prefix _varname _regexp) - set(_pkgconfig_invoke_result) - - execute_process( - COMMAND ${PKG_CONFIG_EXECUTABLE} ${ARGN} ${_pkglist} - OUTPUT_VARIABLE _pkgconfig_invoke_result - RESULT_VARIABLE _pkgconfig_failed) - - if (_pkgconfig_failed) - set(_pkgconfig_${_varname} "") - _pkgconfig_unset(${_prefix}_${_varname}) - else(_pkgconfig_failed) - string(REGEX REPLACE "[\r\n]" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}") - string(REGEX REPLACE " +$" "" _pkgconfig_invoke_result "${_pkgconfig_invoke_result}") - - if (NOT ${_regexp} STREQUAL "") - string(REGEX REPLACE "${_regexp}" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}") - endif(NOT ${_regexp} STREQUAL "") - - separate_arguments(_pkgconfig_invoke_result) - - #message(STATUS " ${_varname} ... ${_pkgconfig_invoke_result}") - set(_pkgconfig_${_varname} ${_pkgconfig_invoke_result}) - _pkgconfig_set(${_prefix}_${_varname} "${_pkgconfig_invoke_result}") - endif(_pkgconfig_failed) -endmacro(_pkgconfig_invoke) - -# Invokes pkgconfig two times; once without '--static' and once with -# '--static' -macro(_pkgconfig_invoke_dyn _pkglist _prefix _varname cleanup_regexp) - _pkgconfig_invoke("${_pkglist}" ${_prefix} ${_varname} "${cleanup_regexp}" ${ARGN}) - _pkgconfig_invoke("${_pkglist}" ${_prefix} STATIC_${_varname} "${cleanup_regexp}" --static ${ARGN}) -endmacro(_pkgconfig_invoke_dyn) - -# Splits given arguments into options and a package list -macro(_pkgconfig_parse_options _result _is_req) - set(${_is_req} 0) - - foreach(_pkg ${ARGN}) - if (_pkg STREQUAL "REQUIRED") - set(${_is_req} 1) - endif (_pkg STREQUAL "REQUIRED") - endforeach(_pkg ${ARGN}) - - set(${_result} ${ARGN}) - list(REMOVE_ITEM ${_result} "REQUIRED") -endmacro(_pkgconfig_parse_options) - -### -macro(_pkg_check_modules_internal _is_required _is_silent _prefix) - _pkgconfig_unset(${_prefix}_FOUND) - _pkgconfig_unset(${_prefix}_VERSION) - _pkgconfig_unset(${_prefix}_PREFIX) - _pkgconfig_unset(${_prefix}_INCLUDEDIR) - _pkgconfig_unset(${_prefix}_LIBDIR) - _pkgconfig_unset(${_prefix}_LIBS) - _pkgconfig_unset(${_prefix}_LIBS_L) - _pkgconfig_unset(${_prefix}_LIBS_PATHS) - _pkgconfig_unset(${_prefix}_LIBS_OTHER) - _pkgconfig_unset(${_prefix}_CFLAGS) - _pkgconfig_unset(${_prefix}_CFLAGS_I) - _pkgconfig_unset(${_prefix}_CFLAGS_OTHER) - _pkgconfig_unset(${_prefix}_STATIC_LIBDIR) - _pkgconfig_unset(${_prefix}_STATIC_LIBS) - _pkgconfig_unset(${_prefix}_STATIC_LIBS_L) - _pkgconfig_unset(${_prefix}_STATIC_LIBS_PATHS) - _pkgconfig_unset(${_prefix}_STATIC_LIBS_OTHER) - _pkgconfig_unset(${_prefix}_STATIC_CFLAGS) - _pkgconfig_unset(${_prefix}_STATIC_CFLAGS_I) - _pkgconfig_unset(${_prefix}_STATIC_CFLAGS_OTHER) - - # create a better addressable variable of the modules and calculate its size - set(_pkg_check_modules_list ${ARGN}) - list(LENGTH _pkg_check_modules_list _pkg_check_modules_cnt) - - if(PKG_CONFIG_EXECUTABLE) - # give out status message telling checked module - if (NOT ${_is_silent}) - if (_pkg_check_modules_cnt EQUAL 1) - message(STATUS "checking for module '${_pkg_check_modules_list}'") - else(_pkg_check_modules_cnt EQUAL 1) - message(STATUS "checking for modules '${_pkg_check_modules_list}'") - endif(_pkg_check_modules_cnt EQUAL 1) - endif(NOT ${_is_silent}) - - set(_pkg_check_modules_packages) - set(_pkg_check_modules_failed) - - # iterate through module list and check whether they exist and match the required version - foreach (_pkg_check_modules_pkg ${_pkg_check_modules_list}) - set(_pkg_check_modules_exist_query) - - # check whether version is given - if (_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*")
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.