[SCM] subtitlecomposer packaging branch, master, updated. debian/0.5.3-4-12-g386410e
Martin Steghöfer
martin.steghoefer-guest at moszumanska.debian.org
Sun Oct 4 19:55:07 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/subtitlecomposer.git;a=commitdiff;h=84dda8b
The following commit has been merged in the master branch:
commit 84dda8b1940e2d98ecf4cb52b3bea1752541eb7d
Merge: 90b7484e472a0a7487f13d6a24b0934ab3cc4634 26de5b57da9997271202c673f96dda3d37281c70
Author: Martin Steghöfer <martin at steghoefer.eu>
Date: Sun Oct 4 15:35:07 2015 +0200
Merge tag 'upstream/0.5.7'
Upstream version 0.5.7
.gitignore | 7 +
.uncrustify.cfg | 1578 ++++++++
CMakeLists.txt | 16 +-
ChangeLog | 24 +
README.CodingStyle.md | 286 ++
README.md | 44 +
TODO | 8 +-
pkg/arch/.gitignore | 8 +
pkg/arch/PKGBUILD | 38 +
pkg/arch/PKGBUILD-git | 44 +
{debian => pkg/debian}/changelog | 6 +
{debian => pkg/debian}/compat | 0
{debian => pkg/debian}/control | 9 +-
{debian => pkg/debian}/copyright | 3 +-
{debian => pkg/debian}/docs | 0
{debian => pkg/debian}/man/subtitlecomposer.1 | 0
{debian => pkg/debian}/patches/03_link_phonon.diff | 0
pkg/debian/patches/series | 2 +
pkg/debian/rules | 13 +
.../debian}/subtitlecomposer.lintian-overrides | 0
{debian => pkg/debian}/subtitlecomposer.manpages | 0
{debian => pkg/debian}/subtitlecomposer.menu | 0
{debian => pkg/debian}/watch | 0
po/CMakeLists.txt | 4 +
po/Messages.sh | 2 +-
po/bg/subtitlecomposer.po | 1380 ++++---
po/cs/subtitlecomposer.po | 1365 ++++---
po/de/subtitlecomposer.po | 2080 +++++-----
po/el/subtitlecomposer.po | 1361 ++++---
po/es/subtitlecomposer.po | 1374 ++++---
po/fr/subtitlecomposer.po | 1369 ++++---
po/hr/CMakeLists.txt | 2 +
po/hr/subtitlecomposer.po | 2699 +++++++++++++
po/hu/CMakeLists.txt | 2 +
po/hu/subtitlecomposer.po | 2735 +++++++++++++
po/it/CMakeLists.txt | 2 +
po/it/subtitlecomposer.po | 2751 +++++++++++++
po/pl/subtitlecomposer.po | 1371 ++++---
po/pt_BR/subtitlecomposer.po | 1359 ++++---
po/ru/CMakeLists.txt | 2 +
po/ru/subtitlecomposer.po | 2754 +++++++++++++
po/sr/subtitlecomposer.po | 1370 ++++---
po/sr at latin/subtitlecomposer.po | 1370 ++++---
po/status.txt | 20 +-
po/subtitlecomposer.pot | 1275 +++---
po/uk/CMakeLists.txt | 2 +
po/uk/subtitlecomposer.po | 2755 +++++++++++++
src/CMakeLists.txt | 36 +-
src/common/CMakeLists.txt | 1 +
src/common/commondefs.cpp | 182 +-
src/common/commondefs.h | 43 +-
src/common/fileloadhelper.cpp | 60 +-
src/common/fileloadhelper.h | 27 +-
src/common/filesavehelper.cpp | 72 +-
src/common/filesavehelper.h | 31 +-
src/common/filetrasher.cpp | 27 +-
src/common/filetrasher.h | 21 +-
src/common/languagecode.cpp | 434 ++
.../timevalidator.h => common/languagecode.h} | 51 +-
src/common/qxtsignalwaiter.cpp | 141 +-
src/common/qxtsignalwaiter.h | 47 +-
src/config.h.cmake | 6 +-
src/config/appconfig.cpp | 115 +-
src/config/appconfig.h | 57 +-
src/config/appconfiggroup.cpp | 203 +-
src/config/appconfiggroup.h | 123 +-
src/config/appconfiggroupwidget.cpp | 44 +-
src/config/appconfiggroupwidget.h | 58 +-
src/core/action.h | 196 +-
src/core/actionmanager.cpp | 88 +-
src/core/actionmanager.h | 74 +-
src/core/audiolevels.cpp | 111 +-
src/core/audiolevels.h | 139 +-
src/core/compositeaction.h | 191 +-
src/core/formatdata.h | 84 +-
src/core/range.h | 247 +-
src/core/rangelist.h | 749 ++--
src/core/sstring.cpp | 1157 +++---
src/core/sstring.h | 918 +++--
src/core/subtitle.cpp | 1605 ++++----
src/core/subtitle.h | 310 +-
src/core/subtitleactions.cpp | 382 +-
src/core/subtitleactions.h | 216 +-
src/core/subtitleiterator.cpp | 338 +-
src/core/subtitleiterator.h | 124 +-
src/core/subtitleline.cpp | 1102 +++--
src/core/subtitleline.h | 422 +-
src/core/subtitlelineactions.cpp | 334 +-
src/core/subtitlelineactions.h | 246 +-
src/core/tests/rangelisttest.cpp | 80 +-
src/core/tests/rangelisttest.h | 12 +-
src/core/tests/rangetest.cpp | 113 +-
src/core/tests/rangetest.h | 13 +-
src/core/tests/sstringtest.cpp | 463 +--
src/core/tests/sstringtest.h | 15 +-
src/core/tests/timetest.cpp | 147 +-
src/core/tests/timetest.h | 13 +-
src/core/time.cpp | 194 +-
src/core/time.h | 122 +-
src/formats/CMakeLists.txt | 27 +
src/formats/FindICU.cmake | 57 +
src/formats/format.h | 167 +-
src/formats/formatmanager.cpp | 270 +-
src/formats/formatmanager.h | 44 +-
src/formats/inputformat.h | 86 +-
src/formats/microdvd/microdvdinputformat.h | 171 +-
src/formats/microdvd/microdvdoutputformat.h | 115 +-
src/formats/mplayer/mplayerinputformat.h | 59 +-
src/formats/mplayer/mplayeroutputformat.h | 60 +-
src/formats/mplayer2/mplayer2inputformat.h | 57 +-
src/formats/mplayer2/mplayer2outputformat.h | 58 +-
src/formats/outputformat.h | 52 +-
src/formats/subrip/subripinputformat.h | 82 +-
src/formats/subrip/subripoutputformat.h | 68 +-
.../substationalpha/substationalphainputformat.h | 348 +-
.../substationalpha/substationalphaoutputformat.h | 273 +-
src/formats/subviewer1/subviewer1inputformat.h | 73 +-
src/formats/subviewer1/subviewer1outputformat.h | 65 +-
src/formats/subviewer2/subviewer2inputformat.h | 107 +-
src/formats/subviewer2/subviewer2outputformat.h | 88 +-
src/formats/tmplayer/tmplayerinputformat.h | 116 +-
src/formats/tmplayer/tmplayeroutputformat.h | 128 +-
src/formats/youtubecaptions/CMakeLists.txt | 5 +
.../youtubecaptionsinputformat.h} | 78 +-
.../youtubecaptionsoutputformat.h} | 90 +-
src/main/CMakeLists.txt | 11 +-
src/main/actions/CMakeLists.txt | 1 +
src/main/actions/kcodecactionext.cpp | 91 +
.../actions/kcodecactionext.h} | 46 +-
src/main/actions/krecentfilesactionext.cpp | 209 +-
src/main/actions/krecentfilesactionext.h | 70 +-
src/main/actions/useraction.cpp | 418 +-
src/main/actions/useraction.h | 246 +-
src/main/actions/useractionnames.h | 189 +-
src/main/application.cpp | 4204 ++++++++++----------
src/main/application.h | 441 +-
src/main/audiolevelswidget.cpp | 211 +-
src/main/audiolevelswidget.h | 68 +-
src/main/configdialog.cpp | 233 +-
src/main/configdialog.h | 82 +-
src/main/configs/errorsconfig.h | 170 +-
src/main/configs/errorsconfigwidget.cpp | 224 +-
src/main/configs/errorsconfigwidget.h | 43 +-
src/main/configs/generalconfig.h | 84 +-
src/main/configs/generalconfigwidget.cpp | 150 +-
src/main/configs/generalconfigwidget.h | 39 +-
src/main/configs/playerconfig.h | 238 +-
src/main/configs/playerconfigwidget.cpp | 330 +-
src/main/configs/playerconfigwidget.h | 64 +-
src/main/configs/spellingconfig.h | 114 +-
src/main/configs/spellingconfigwidget.cpp | 78 +-
src/main/configs/spellingconfigwidget.h | 41 +-
src/main/currentlinewidget.cpp | 619 +--
src/main/currentlinewidget.h | 146 +-
src/main/dialogs/CMakeLists.txt | 1 +
src/main/dialogs/actiondialog.cpp | 67 +-
src/main/dialogs/actiondialog.h | 38 +-
src/main/dialogs/actionwitherrortargetsdialog.cpp | 161 +-
src/main/dialogs/actionwitherrortargetsdialog.h | 44 +-
src/main/dialogs/actionwithtargetdialog.cpp | 370 +-
src/main/dialogs/actionwithtargetdialog.h | 169 +-
src/main/dialogs/adjusttimesdialog.cpp | 52 +-
src/main/dialogs/adjusttimesdialog.h | 30 +-
src/main/dialogs/autodurationsdialog.cpp | 137 +-
src/main/dialogs/autodurationsdialog.h | 44 +-
src/main/dialogs/changeframeratedialog.cpp | 79 +-
src/main/dialogs/changeframeratedialog.h | 37 +-
src/main/dialogs/changetextscasedialog.cpp | 81 +-
src/main/dialogs/changetextscasedialog.h | 41 +-
src/main/dialogs/checkerrorsdialog.cpp | 41 +-
src/main/dialogs/checkerrorsdialog.h | 33 +-
src/main/dialogs/clearerrorsdialog.cpp | 16 +-
src/main/dialogs/clearerrorsdialog.h | 22 +-
src/main/dialogs/durationlimitsdialog.cpp | 98 +-
src/main/dialogs/durationlimitsdialog.h | 47 +-
src/main/dialogs/fixoverlappingtimesdialog.cpp | 38 +-
src/main/dialogs/fixoverlappingtimesdialog.h | 24 +-
src/main/dialogs/fixpunctuationdialog.cpp | 52 +-
src/main/dialogs/fixpunctuationdialog.h | 38 +-
src/main/dialogs/inputdialog.cpp | 146 +-
src/main/dialogs/inputdialog.h | 84 +-
src/main/dialogs/insertlinedialog.cpp | 10 +-
src/main/dialogs/insertlinedialog.h | 15 +-
src/main/dialogs/joinsubtitlesdialog.cpp | 53 +-
src/main/dialogs/joinsubtitlesdialog.h | 35 +-
src/main/dialogs/opensubtitledialog.cpp | 79 +-
src/main/dialogs/opensubtitledialog.h | 58 +-
src/main/dialogs/progressdialog.cpp | 95 +-
src/main/dialogs/progressdialog.h | 56 +-
src/main/dialogs/removelinesdialog.cpp | 6 +-
src/main/dialogs/removelinesdialog.h | 15 +-
src/main/dialogs/savesubtitledialog.cpp | 155 +-
src/main/dialogs/savesubtitledialog.h | 70 +-
src/main/dialogs/selectablesubtitledialog.cpp | 120 +-
src/main/dialogs/selectablesubtitledialog.h | 48 +-
src/main/dialogs/shifttimesdialog.cpp | 32 +-
src/main/dialogs/shifttimesdialog.h | 26 +-
src/main/dialogs/smarttextsadjustdialog.cpp | 31 +-
src/main/dialogs/smarttextsadjustdialog.h | 22 +-
src/main/dialogs/splitsubtitledialog.cpp | 64 +-
src/main/dialogs/splitsubtitledialog.h | 37 +-
.../dialogs/subtitlecolordialog.cpp} | 72 +-
.../dialogs/subtitlecolordialog.h} | 39 +-
src/main/dialogs/syncsubtitlesdialog.cpp | 31 +-
src/main/dialogs/syncsubtitlesdialog.h | 28 +-
src/main/dialogs/translatedialog.cpp | 75 +-
src/main/dialogs/translatedialog.h | 26 +-
src/main/errorsdialog.cpp | 130 +-
src/main/errorsdialog.h | 78 +-
src/main/errorswidget.cpp | 742 ++--
src/main/errorswidget.h | 263 +-
src/main/images/hi128-app-subtitlecomposer.png | Bin 2028 -> 22018 bytes
src/main/images/hi16-app-subtitlecomposer.png | Bin 455 -> 922 bytes
src/main/images/hi256-app-subtitlecomposer.png | Bin 0 -> 57680 bytes
src/main/images/hi32-app-subtitlecomposer.png | Bin 869 -> 2644 bytes
src/main/images/hi48-action-audio-extract.png | Bin 0 -> 2113 bytes
...-closed.png => hi64-app-mediaplayer-closed.png} | Bin
...pp-mediaplayer.png => hi96-app-mediaplayer.png} | Bin
src/main/lineswidget.cpp | 1453 ++++---
src/main/lineswidget.h | 284 +-
src/main/main.cpp | 81 +-
src/main/main_tests.h | 106 +-
src/main/mainwindow.cpp | 87 +-
src/main/mainwindow.h | 57 +-
src/main/playerwidget.cpp | 1063 +++--
src/main/playerwidget.h | 192 +-
src/main/scripting/examples/CMakeLists.txt | 12 +-
src/main/scripting/examples/api/CMakeLists.txt | 8 -
src/main/scripting/examples/api/scripting_list.h | 1 -
src/main/scripting/examples/api/scripting_range.h | 1 -
.../scripting/examples/api/scripting_rangelist.h | 1 -
.../examples/api/scripting_rangesmodule.h | 1 -
.../scripting/examples/api/scripting_sstring.h | 1 -
.../examples/api/scripting_stringsmodule.h | 1 -
.../scripting/examples/api/scripting_subtitle.h | 1 -
.../examples/api/scripting_subtitleline.h | 1 -
.../examples/api/scripting_subtitlelinemodule.h | 1 -
.../examples/api/scripting_subtitlemodule.h | 1 -
...ple_iterate_selection.py => fix_dialog_cues.py} | 9 +-
.../examples/remove_hearing_impaired_text.js} | 26 +-
src/main/scripting/scripting_list.cpp | 84 +-
src/main/scripting/scripting_list.h | 58 +-
src/main/scripting/scripting_range.cpp | 30 +-
src/main/scripting/scripting_range.h | 43 +-
src/main/scripting/scripting_rangelist.cpp | 82 +-
src/main/scripting/scripting_rangelist.h | 95 +-
src/main/scripting/scripting_rangesmodule.cpp | 45 +-
src/main/scripting/scripting_rangesmodule.h | 39 +-
src/main/scripting/scripting_sstring.cpp | 273 +-
src/main/scripting/scripting_sstring.h | 111 +-
src/main/scripting/scripting_stringsmodule.cpp | 12 +-
src/main/scripting/scripting_stringsmodule.h | 41 +-
src/main/scripting/scripting_subtitle.cpp | 218 +-
src/main/scripting/scripting_subtitle.h | 110 +-
src/main/scripting/scripting_subtitleline.cpp | 325 +-
src/main/scripting/scripting_subtitleline.h | 160 +-
.../scripting/scripting_subtitlelinemodule.cpp | 7 +-
src/main/scripting/scripting_subtitlelinemodule.h | 94 +-
src/main/scripting/scripting_subtitlemodule.cpp | 15 +-
src/main/scripting/scripting_subtitlemodule.h | 41 +-
src/main/scripting/scriptsmanager.cpp | 567 ++-
src/main/scripting/scriptsmanager.h | 129 +-
src/main/statusbar.cpp | 112 +
src/main/{mainwindow.h => statusbar.h} | 62 +-
src/main/subtitlecomposer.desktop | 3 +
src/main/subtitlecomposer.xml | 4 +-
src/main/subtitlecomposerui.rc | 28 +-
src/main/utils/errorfinder.cpp | 220 +-
src/main/utils/errorfinder.h | 113 +-
src/main/utils/errortracker.cpp | 118 +-
src/main/utils/errortracker.h | 103 +-
src/main/utils/finder.cpp | 293 +-
src/main/utils/finder.h | 120 +-
src/main/utils/kfind_p.h | 171 +-
src/main/utils/kreplace.cpp | 606 ++-
src/main/utils/kreplace.h | 269 +-
src/main/utils/language.cpp | 251 +-
src/main/utils/language.h | 93 +-
src/main/utils/replacer.cpp | 262 +-
src/main/utils/replacer.h | 113 +-
src/main/utils/speller.cpp | 132 +-
src/main/utils/speller.h | 110 +-
src/main/utils/translator.cpp | 304 +-
src/main/utils/translator.h | 144 +-
src/player/CMakeLists.txt | 53 -
src/player/gstreamer/CMakeLists.txt | 30 -
src/player/gstreamer/gstreamerbackend.cpp | 640 ---
src/player/gstreamer/gstreamerbackend.h | 110 -
src/player/gstreamer/gstreamerconfig.h | 69 -
src/player/gstreamer/gstreamerconfigwidget.cpp | 90 -
src/player/mplayer/CMakeLists.txt | 9 -
src/player/mplayer/input.conf | 70 -
src/player/mplayer/mplayerbackend.cpp | 316 --
src/player/mplayer/mplayerconfig.h | 113 -
src/player/mplayer/mplayerconfigwidget.cpp | 161 -
src/player/mplayer/mplayerprocess.cpp | 431 --
src/player/mplayer/mplayerprocess.h | 117 -
src/player/phonon/phononbackend.cpp | 275 --
src/player/phonon/phononbackend.h | 105 -
src/player/player.cpp | 713 ----
src/player/player.h | 281 --
src/player/playerbackend.h | 148 -
src/player/xine/xinebackend.cpp | 581 ---
src/player/xine/xinebackend.h | 126 -
src/player/xine/xineconfigwidget.cpp | 90 -
src/profiler.h | 54 +-
src/services/CMakeLists.txt | 64 +
src/services/FindGStreamer.cmake | 149 +
src/services/decoder.cpp | 344 ++
src/services/decoder.h | 195 +
.../decoderbackend.cpp} | 14 +-
src/services/decoderbackend.h | 106 +
src/services/gstreamer/CMakeLists.txt | 35 +
src/services/gstreamer/gstreamer.cpp | 408 ++
.../gstreamer/gstreamer.h} | 56 +-
src/services/gstreamer/gstreamerconfig.h | 120 +
src/services/gstreamer/gstreamerconfigwidget.cpp | 90 +
.../gstreamer/gstreamerconfigwidget.h | 41 +-
src/services/gstreamer/gstreamerdecoderbackend.cpp | 437 ++
src/services/gstreamer/gstreamerdecoderbackend.h | 86 +
src/services/gstreamer/gstreamerplayerbackend.cpp | 386 ++
.../gstreamer/gstreamerplayerbackend.h} | 69 +-
src/services/gstreamer/manual.pdf | Bin 0 -> 891312 bytes
src/services/mplayer/CMakeLists.txt | 7 +
src/{player => services}/mplayer/mediadata.h | 81 +-
src/services/mplayer/mplayerconfig.h | 277 ++
src/services/mplayer/mplayerconfigwidget.cpp | 202 +
.../mplayer/mplayerconfigwidget.h | 57 +-
src/services/mplayer/mplayerplayerbackend.cpp | 298 ++
.../mplayer/mplayerplayerbackend.h} | 83 +-
src/services/mplayer/mplayerplayerprocess.cpp | 433 ++
src/services/mplayer/mplayerplayerprocess.h | 123 +
src/{player => services}/mplayer/slave.txt | 0
src/{player => services}/phonon/CMakeLists.txt | 4 +-
src/services/phonon/CompilingPhononOnLinux.pdf | Bin 0 -> 299296 bytes
src/{player => services}/phonon/phononconfig.h | 36 +-
.../phonon/phononconfigwidget.cpp | 22 +-
.../phonon/phononconfigwidget.h | 29 +-
src/services/phonon/phononplayerbackend.cpp | 294 ++
src/services/phonon/phononplayerbackend.h | 96 +
src/services/player.cpp | 609 +++
src/services/player.h | 253 ++
.../playerbackend.cpp} | 26 +-
src/services/playerbackend.h | 134 +
src/services/service.cpp | 158 +
src/services/service.h | 169 +
.../servicebackend.cpp} | 61 +-
src/services/servicebackend.h | 92 +
src/services/tests/CMakeLists.txt | 29 +
.../tests/wavewritertest.cpp} | 128 +-
.../tests/wavewritertest.h} | 20 +-
src/{player => services}/videowidget.cpp | 167 +-
src/{player => services}/videowidget.h | 90 +-
src/services/waveformat.h | 102 +
src/services/wavewriter.cpp | 341 ++
src/{common/commondefs.h => services/wavewriter.h} | 59 +-
src/{player => services}/xine/CMakeLists.txt | 26 +-
src/services/xine/COPYING-CMAKE-SCRIPTS | 22 +
src/{player => services}/xine/FindXCB.cmake | 0
src/{player => services}/xine/xineconfig.h | 87 +-
src/services/xine/xineconfigwidget.cpp | 90 +
src/{player => services}/xine/xineconfigwidget.h | 41 +-
src/services/xine/xinedecoderbackend.cpp | 385 ++
.../xine/xinedecoderbackend.h} | 91 +-
src/services/xine/xineplayerbackend.cpp | 559 +++
src/services/xine/xineplayerbackend.h | 117 +
.../xine/xinevideolayerwidget.cpp | 57 +-
.../xine/xinevideolayerwidget.h | 44 +-
src/widgets/attachablewidget.cpp | 218 +-
src/widgets/attachablewidget.h | 63 +-
src/widgets/layeredwidget.cpp | 39 +-
src/widgets/layeredwidget.h | 26 +-
src/widgets/pointingslider.cpp | 48 +-
src/widgets/pointingslider.h | 16 +-
src/widgets/simplerichtextedit.cpp | 648 +--
src/widgets/simplerichtextedit.h | 135 +-
src/widgets/textoverlaywidget.cpp | 530 ++-
src/widgets/textoverlaywidget.h | 107 +-
src/widgets/timeedit.cpp | 151 +-
src/widgets/timeedit.h | 45 +-
src/widgets/timevalidator.cpp | 80 +-
src/widgets/timevalidator.h | 16 +-
src/widgets/treeview.cpp | 76 +-
src/widgets/treeview.h | 67 +-
384 files changed, 52520 insertions(+), 32103 deletions(-)
--
subtitlecomposer packaging
More information about the pkg-kde-commits
mailing list