[longomatch: 192/192] Merge branch 'rewrite_subcategories'
- From: Andoni Morales Alastruey <amorales src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [longomatch: 192/192] Merge branch 'rewrite_subcategories'
- Date: Mon, 22 Aug 2011 22:05:39 +0000 (UTC)
commit 717fb3c62aac9c1f8f67bcdb4a96a5a5ba286f45
Merge: 8698c20 3799df7
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date: Tue Aug 23 00:00:18 2011 +0200
Merge branch 'rewrite_subcategories'
.gitignore | 10 +-
CesarPlayer/AssemblyInfo.cs.in | 100 +-
CesarPlayer/Capturer/FakeCapturer.cs | 118 +-
CesarPlayer/Capturer/GstCameraCapturer.cs | 978 +++++-----
CesarPlayer/Capturer/ICapturer.cs | 186 +-
CesarPlayer/Capturer/LiveSourceTimer.cs | 60 +-
CesarPlayer/Capturer/ObjectManager.cs | 78 +-
CesarPlayer/CesarPlayer.csproj | 274 ++--
CesarPlayer/CesarPlayer.mdp | 8 +-
.../CaptureSettings.cs} | 34 +-
CesarPlayer/Common/Constants.cs | 14 +-
CesarPlayer/Common/EncodingProfiles.cs | 58 +
.../EncodingSettings.cs} | 37 +-
CesarPlayer/Common/Enum.cs | 60 +-
CesarPlayer/Common/Handlers.cs | 62 +-
CesarPlayer/Common/VideoStandards.cs | 53 +
CesarPlayer/Editor/EditorState.cs | 14 +-
CesarPlayer/Editor/GstVideoSplitter.cs | 842 ++++-----
CesarPlayer/Editor/IVideoEditor.cs | 141 +-
CesarPlayer/Editor/IVideoSplitter.cs | 84 -
CesarPlayer/Editor/VideoSegment.cs | 68 +-
CesarPlayer/Gui/CapturerBin.cs | 701 ++++----
CesarPlayer/Gui/PlayerBin.cs | 1268 +++++++------
CesarPlayer/Gui/VolumeWindow.cs | 60 +-
CesarPlayer/Makefile.am | 32 +-
CesarPlayer/MultimediaFactory.cs | 214 ++--
CesarPlayer/Player/GstDVDEvent.cs | 46 -
CesarPlayer/Player/GstPlayer.cs | 602 +++---
CesarPlayer/Player/IPlayer.cs | 138 +-
CesarPlayer/Player/ObjectManager.cs | 10 +-
CesarPlayer/Utils/Device.cs | 50 +-
CesarPlayer/Utils/FramesCapturer.cs | 68 +-
CesarPlayer/Utils/IFramesCapturer.cs | 8 +-
CesarPlayer/Utils/IMetadataReader.cs | 6 +-
CesarPlayer/Utils/MediaFile.cs | 201 ++-
CesarPlayer/Utils/PreviewMediaFile.cs | 92 +-
CesarPlayer/Utils/TimeString.cs | 130 +-
LongoMatch.mds | 2 +-
LongoMatch/AssemblyInfo.cs.in | 102 +-
LongoMatch/Common/Cairo.cs | 32 +-
LongoMatch/{Time/Tag.cs => Common/Cloner.cs} | 66 +-
LongoMatch/Common/ConsoleCrayon.cs | 280 +++
LongoMatch/Common/Constants.cs | 52 +-
LongoMatch/Common/Enums.cs | 10 +-
LongoMatch/Common/Log.cs | 443 +++++
LongoMatch/{Utils => Common}/ProjectUtils.cs | 232 ++--
LongoMatch/Common/SerializableObject.cs | 53 +
LongoMatch/Compat/0.0/DB/DataBase.cs | 62 -
LongoMatch/Compat/0.0/DB/MediaFile.cs | 103 -
LongoMatch/Compat/0.0/DB/Project.cs | 177 --
LongoMatch/Compat/0.0/DB/Sections.cs | 72 -
LongoMatch/Compat/0.0/DatabaseMigrator.cs | 251 ---
LongoMatch/Compat/0.0/IO/SectionsReader.cs | 98 -
LongoMatch/Compat/0.0/PlayListMigrator.cs | 121 --
LongoMatch/Compat/0.0/Playlist/IPlayList.cs | 49 -
LongoMatch/Compat/0.0/Playlist/PlayList.cs | 175 --
LongoMatch/Compat/0.0/TemplatesMigrator.cs | 100 -
LongoMatch/Compat/0.0/Time/MediaTimeNode.cs | 158 --
LongoMatch/Compat/0.0/Time/PixbufTimeNode.cs | 64 -
LongoMatch/Compat/0.0/Time/SectionsTimeNode.cs | 45 -
LongoMatch/Compat/0.0/Time/Time.cs | 149 --
LongoMatch/Compat/0.0/Time/TimeNode.cs | 136 --
LongoMatch/DB/DataBase.cs | 382 ----
LongoMatch/DB/Project.cs | 565 ------
LongoMatch/DB/Sections.cs | 293 ---
LongoMatch/DB/TeamTemplate.cs | 94 -
LongoMatch/Gui/Component/ButtonsWidget.cs | 68 +-
LongoMatch/Gui/Component/CategoriesScale.cs | 52 +-
LongoMatch/Gui/Component/CategoryProperties.cs | 168 ++-
LongoMatch/Gui/Component/DrawingToolBox.cs | 29 +-
LongoMatch/Gui/Component/DrawingWidget.cs | 112 +-
LongoMatch/Gui/Component/NotesWidget.cs | 12 +-
LongoMatch/Gui/Component/PlayListWidget.cs | 654 ++++----
LongoMatch/Gui/Component/PlayerProperties.cs | 40 +-
LongoMatch/Gui/Component/PlayersListTreeWidget.cs | 77 +-
LongoMatch/Gui/Component/PlayersTaggerWidget.cs | 61 +
LongoMatch/Gui/Component/PlaysListTreeWidget.cs | 341 ++--
LongoMatch/Gui/Component/ProjectDetailsWidget.cs | 1169 ++++++------
LongoMatch/Gui/Component/ProjectListWidget.cs | 58 +-
LongoMatch/Gui/Component/ProjectTemplateWidget.cs | 240 ---
LongoMatch/Gui/Component/StringTaggerWidget.cs | 90 +
LongoMatch/Gui/Component/TaggerWidget.cs | 125 +-
LongoMatch/Gui/Component/TagsTreeWidget.cs | 173 +-
LongoMatch/Gui/Component/TeamTaggerWidget.cs | 77 +
LongoMatch/Gui/Component/TeamTemplateWidget.cs | 85 -
LongoMatch/Gui/Component/TemplatesEditorBase.cs | 355 ++++
LongoMatch/Gui/Component/TimeAdjustWidget.cs | 66 -
LongoMatch/Gui/Component/TimeLineWidget.cs | 480 +++---
LongoMatch/Gui/Component/TimeReferenceWidget.cs | 322 ++--
LongoMatch/Gui/Component/TimeScale.cs | 726 ++++----
LongoMatch/Gui/Dialog/BusyDialog.cs | 28 +-
LongoMatch/Gui/Dialog/DrawingTool.cs | 12 +-
LongoMatch/Gui/Dialog/EditCategoryDialog.cs | 18 +-
LongoMatch/Gui/Dialog/EditPlayerDialog.cs | 2 +-
LongoMatch/Gui/Dialog/EndCaptureDialog.cs | 22 +-
LongoMatch/Gui/Dialog/EntryDialog.cs | 26 +-
.../Gui/Dialog/FramesCaptureProgressDialog.cs | 136 +-
LongoMatch/Gui/Dialog/HotKeySelectorDialog.cs | 158 +-
LongoMatch/Gui/Dialog/Migrator.cs | 24 +-
LongoMatch/Gui/Dialog/NewProjectDialog.cs | 21 +-
LongoMatch/Gui/Dialog/OpenProjectDialog.cs | 109 +-
LongoMatch/Gui/Dialog/PlayersSelectionDialog.cs | 97 +-
LongoMatch/Gui/Dialog/ProjectSelectionDialog.cs | 30 +-
LongoMatch/Gui/Dialog/ProjectsManager.cs | 272 ++--
LongoMatch/Gui/Dialog/SnapshotsDialog.cs | 2 +-
LongoMatch/Gui/Dialog/SubCategoryTagsEditor.cs | 130 ++
LongoMatch/Gui/Dialog/TaggerDialog.cs | 91 +-
...lateEditorDialog.cs => TemplateEditorDialog.cs} | 59 +-
LongoMatch/Gui/Dialog/TemplatesEditor.cs | 291 ---
LongoMatch/Gui/Dialog/TemplatesManager.cs | 269 +++
LongoMatch/Gui/Dialog/VideoEditionProperties.cs | 375 ++--
LongoMatch/Gui/MainWindow.cs | 1251 ++++++------
LongoMatch/Gui/Popup/CalendarPopup.cs | 66 +-
LongoMatch/Gui/Popup/MessagePopup.cs | 2 +-
LongoMatch/Gui/TransparentDrawingArea.cs | 20 +-
LongoMatch/Gui/TreeView/CategoriesTreeView.cs | 46 +-
LongoMatch/Gui/TreeView/ListTreeViewBase.cs | 281 +--
LongoMatch/Gui/TreeView/PlayListTreeView.cs | 316 ++--
.../Gui/TreeView/PlayerPropertiesTreeView.cs | 22 +-
LongoMatch/Gui/TreeView/PlayersTreeView.cs | 98 +-
LongoMatch/Gui/TreeView/PlaysTreeView.cs | 204 +-
LongoMatch/Gui/TreeView/SubCategoriesTreeView.cs | 133 ++
LongoMatch/Gui/TreeView/TagsTreeView.cs | 35 +-
LongoMatch/Handlers/DrawingManager.cs | 10 +-
LongoMatch/Handlers/EventsManager.cs | 931 +++++-----
LongoMatch/Handlers/Handlers.cs | 37 +-
LongoMatch/Handlers/HotKeysManager.cs | 32 +-
LongoMatch/Handlers/VideoDrawingsManager.cs | 30 +-
LongoMatch/IO/CSVExport.cs | 371 ++--
LongoMatch/IO/SectionsReader.cs | 101 -
LongoMatch/IO/SectionsWriter.cs | 108 --
LongoMatch/IO/XMLReader.cs | 176 +-
.../ISubCategory.cs} | 43 +-
.../TeamTemplateEditor.cs => Interfaces/ITag.cs} | 37 +-
LongoMatch/Interfaces/ITemplates.cs | 57 +
LongoMatch/LongoMatch.csproj | 412 ++--
LongoMatch/LongoMatch.mdp | 107 +-
LongoMatch/Main.cs | 476 +++---
LongoMatch/Makefile.am | 112 +-
LongoMatch/Playlist/IPlayList.cs | 102 +-
LongoMatch/Playlist/PlayList.cs | 358 ++--
LongoMatch/Services/DataBase.cs | 420 +++++
LongoMatch/Services/TemplatesService.cs | 253 +++
LongoMatch/Store/Category.cs | 162 ++
LongoMatch/{Time => Store}/Drawing.cs | 46 +-
LongoMatch/Store/DrawingsList.cs | 92 +
LongoMatch/{Time => Store}/HotKey.cs | 37 +-
LongoMatch/{Time => Store}/PixbufTimeNode.cs | 181 +-
LongoMatch/Store/Play.cs | 206 ++
.../PlayListTimeNode.cs => Store/PlayListPlay.cs} | 70 +-
LongoMatch/Store/Player.cs | 125 ++
LongoMatch/Store/Project.cs | 288 +++
LongoMatch/{DB => Store}/ProjectDescription.cs | 83 +-
LongoMatch/Store/SubCategory.cs | 163 ++
LongoMatch/Store/Tag.cs | 103 +
LongoMatch/Store/TagStore.cs | 84 +
LongoMatch/Store/Templates/CategoriesTemplate.cs | 120 ++
.../Templates/SubCategoryTemplate.cs} | 41 +-
LongoMatch/Store/Templates/TeamTemplate.cs | 83 +
.../Store/Templates/Template.cs | 47 +-
LongoMatch/{Time => Store}/Time.cs | 333 ++--
.../Time/PlayListTimeNode.cs => Store/TimeNode.cs} | 69 +-
LongoMatch/Time/DrawingsList.cs | 80 -
LongoMatch/Time/MediaTimeNode.cs | 367 ----
LongoMatch/Time/PlayListTimeNode.cs | 105 -
LongoMatch/Time/Player.cs | 204 --
LongoMatch/Time/SectionsTimeNode.cs | 165 --
LongoMatch/Time/TimeNode.cs | 129 --
LongoMatch/Updates/Updater.cs | 206 +-
LongoMatch/Updates/XmlUpdateParser.cs | 148 +-
.../LongoMatch.Gui.Component.CategoryProperties.cs | 486 ++++--
.../LongoMatch.Gui.Component.PlayerProperties.cs | 8 +-
...ngoMatch.Gui.Component.PlayersListTreeWidget.cs | 1 +
...LongoMatch.Gui.Component.PlayersTaggerWidget.cs | 83 +
...LongoMatch.Gui.Component.PlaysListTreeWidget.cs | 1 +
...ongoMatch.Gui.Component.ProjectDetailsWidget.cs | 409 ++---
.../LongoMatch.Gui.Component.ProjectListWidget.cs | 58 +-
.../LongoMatch.Gui.Component.StringTaggerWidget.cs | 47 +
.../LongoMatch.Gui.Component.TaggerWidget.cs | 84 +-
.../LongoMatch.Gui.Component.TagsTreeWidget.cs | 1 +
.../LongoMatch.Gui.Component.TeamTaggerWidget.cs | 47 +
.../LongoMatch.Gui.Component.TeamTemplateWidget.cs | 45 -
...ongoMatch.Gui.Component.TemplatesEditorBase.cs} | 218 ++-
.../LongoMatch.Gui.Component.TimeAdjustWidget.cs | 90 -
.../LongoMatch.Gui.Dialog.EditCategoryDialog.cs | 2 +-
.../LongoMatch.Gui.Dialog.NewProjectDialog.cs | 2 +-
...LongoMatch.Gui.Dialog.ProjectSelectionDialog.cs | 1 -
.../LongoMatch.Gui.Dialog.ProjectsManager.cs | 4 +-
.../LongoMatch.Gui.Dialog.SubCategoryTagsEditor.cs | 232 +++
.../gtk-gui/LongoMatch.Gui.Dialog.TaggerDialog.cs | 76 +-
.../LongoMatch.Gui.Dialog.TeamTemplateEditor.cs | 60 -
... LongoMatch.Gui.Dialog.TemplateEditorDialog.cs} | 25 +-
.../LongoMatch.Gui.Dialog.TemplatesManager.cs | 54 +-
...LongoMatch.Gui.Dialog.VideoEditionProperties.cs | 10 +-
LongoMatch/gtk-gui/LongoMatch.Gui.MainWindow.cs | 4 +-
LongoMatch/gtk-gui/gui.stetic | 1985 +++++++++++---------
LongoMatch/gtk-gui/objects.xml | 170 +-
LongoMatch/images/background.png | Bin 73017 -> 53472 bytes
LongoMatch/images/background.svg | 382 ++++
LongoMatch/images/logo.svg | 255 +++
LongoMatch/images/logo_48x48.png | Bin 4965 -> 3045 bytes
LongoMatch/images/longomatch.png | Bin 16818 -> 3045 bytes
LongoMatch/images/minilogo.ico | Bin 38078 -> 9662 bytes
LongoMatch/images/minilogo.png | Bin 16818 -> 3045 bytes
LongoMatch/images/minilogo.rc | 132 +-
LongoMatch/images/resource.h | 30 +-
build/DllMapVerifier.cs | 258 ---
build/Makefile.am | 13 +-
build/build.rules.mk | 8 +-
build/dll-map-makefile-verifier | 10 -
configure.ac | 1 -
env.in | 7 +-
libcesarplayer/Makefile.am | 54 +-
libcesarplayer/Makefile.win32 | 104 +-
libcesarplayer/{src => }/bacon-resize.c | 0
libcesarplayer/{src => }/bacon-resize.h | 0
.../{src => }/bacon-video-widget-gst-0.10.c | 4 +-
libcesarplayer/{src => }/bacon-video-widget.h | 0
.../{src => }/baconvideowidget-marshal.list | 0
libcesarplayer/{src => }/common.h | 0
libcesarplayer/{src => }/gst-camera-capturer.c | 18 +-
libcesarplayer/{src => }/gst-camera-capturer.h | 0
libcesarplayer/{src => }/gst-smart-video-scaler.c | 0
libcesarplayer/{src => }/gst-smart-video-scaler.h | 0
libcesarplayer/{src => }/gst-video-editor.c | 0
libcesarplayer/{src => }/gst-video-editor.h | 0
libcesarplayer/{src => }/gstscreenshot.c | 0
libcesarplayer/{src => }/gstscreenshot.h | 0
libcesarplayer/{src => }/gstvideowidget.c | 0
libcesarplayer/{src => }/gstvideowidget.h | 0
libcesarplayer/liblongomatch.mdp | 66 +-
libcesarplayer/{src => }/macros.h | 0
libcesarplayer/{src => }/main.c | 0
libcesarplayer/src/Makefile.am | 50 -
libcesarplayer/src/sources.gapi | 10 -
libcesarplayer/{src => }/video-utils.c | 0
libcesarplayer/{src => }/video-utils.h | 0
po/POTFILES.in | 128 +-
238 files changed, 17517 insertions(+), 17623 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
