Branch: refs/heads/master Home: http://github.com/VLMC/vlmc
Commit: d6329e1f35589520eebf9ffd836ad1b528a5d32e http://github.com/VLMC/vlmc/commit/d6329e1f35589520eebf9ffd836ad1b528a5d32e Author: Geoffroy Lacarriere <geoffroyl...@gmail.com> Date: 2009-09-11 (Fri, 11 Sep 2009) Changed paths: A src/GUI/Import.cpp A src/GUI/Import.h M src/GUI/MainWindow.cpp M src/GUI/MainWindow.h M src/GUI/ProjectPreferences.cpp M src/GUI/ProjectPreferences.h A src/GUI/ui/Import.ui M src/GUI/ui/MainWindow.ui M src/GUI/ui/ProjectPreferences.ui M src/GUI/ui/VideoProjectPreferences.ui M vlmc.pro Log Message: ----------- First version of the import dialog box Commit: b069c277a8530d0263a04e4b21c4f20ecbb35fe1 http://github.com/VLMC/vlmc/commit/b069c277a8530d0263a04e4b21c4f20ecbb35fe1 Author: Geoffroy Lacarriere <geoffroyl...@gmail.com> Date: 2009-09-11 (Fri, 11 Sep 2009) Changed paths: M src/GUI/Import.cpp M src/GUI/Import.h M src/GUI/ui/Import.ui Log Message: ----------- Bug fix of the widgets positions Commit: 6ce9337f83631508659c63fadde06e7a7efb9891 http://github.com/VLMC/vlmc/commit/6ce9337f83631508659c63fadde06e7a7efb9891 Author: Geoff <ge...@geoff-desktop.(none)> Date: 2009-09-15 (Tue, 15 Sep 2009) Changed paths: A src/GUI/FileInfoListModel.cpp A src/GUI/FileInfoListModel.h M src/GUI/Import.cpp M src/GUI/Import.h A src/GUI/ImportBrowser.cpp A src/GUI/ImportBrowser.h M src/GUI/ui/Import.ui A src/GUI/ui/ImportBrowser.ui M vlmc.pro Log Message: ----------- First version of the import browser with MVC pattern. Commit: 1270b69306f39cf3c8c2cc0edfa329afaec17a6f http://github.com/VLMC/vlmc/commit/1270b69306f39cf3c8c2cc0edfa329afaec17a6f Author: Geoffroy Lacarriere <geoffroyl...@gmail.com> Date: 2009-09-17 (Thu, 17 Sep 2009) Changed paths: M src/GUI/Import.cpp M src/GUI/Import.h M src/GUI/ImportBrowser.cpp M src/GUI/ImportBrowser.h Log Message: ----------- It's now possible to add multiple medias to the library in one time Commit: 9974128b3902c041e8732fb73d1e086603e93d5a http://github.com/VLMC/vlmc/commit/9974128b3902c041e8732fb73d1e086603e93d5a Author: Geoffroy Lacarriere <geoffroyl...@gmail.com> Date: 2009-09-18 (Fri, 18 Sep 2009) Changed paths: M src/GUI/Import.cpp M src/GUI/Import.h Log Message: ----------- Import: Bug fix of the metadata ui display Commit: cce1dea3a3fc907cc7003100328ead0602f5d0f7 http://github.com/VLMC/vlmc/commit/cce1dea3a3fc907cc7003100328ead0602f5d0f7 Author: Geoffroy Lacarriere <geoffroyl...@gmail.com> Date: 2009-09-18 (Fri, 18 Sep 2009) Changed paths: M src/GUI/Import.cpp M src/GUI/Import.h M src/GUI/ImportBrowser.cpp M src/GUI/ImportBrowser.h Log Message: ----------- Cleanning code, add of a complete folder content in one click Commit: d909aace12608453a7b74a632b3897096abc0842 http://github.com/VLMC/vlmc/commit/d909aace12608453a7b74a632b3897096abc0842 Author: Geoffroy Lacarriere <geoffroyl...@gmail.com> Date: 2009-09-18 (Fri, 18 Sep 2009) Changed paths: M src/GUI/Import.cpp M src/GUI/ImportBrowser.cpp M src/Renderer/ClipRenderer.cpp Log Message: ----------- Import: Stop playing the preview when selecting another media. Commit: 7fabcf97efad54d4faff003e4f7fff3cd935cdf0 http://github.com/VLMC/vlmc/commit/7fabcf97efad54d4faff003e4f7fff3cd935cdf0 Author: Hugo Beauzee-Luyssen <beauz...@gmail.com> Date: 2009-09-24 (Thu, 24 Sep 2009) Changed paths: M src/GUI/Import.cpp Log Message: ----------- Metadata are correctly computed in the Import class. The wrong signal was used, my bad... Commit: aa4b65b0b05ddc5a39e398e49beffff650d30a31 http://github.com/VLMC/vlmc/commit/aa4b65b0b05ddc5a39e398e49beffff650d30a31 Author: Hugo Beauzee-Luyssen <beauz...@gmail.com> Date: 2009-09-24 (Thu, 24 Sep 2009) Changed paths: M src/GUI/Import.cpp Log Message: ----------- Corrected parameter, so that we won't create a screwed UUID Commit: e104b30f4cfb33dc9d4c8d5e1aa2d2b62dee8111 http://github.com/VLMC/vlmc/commit/e104b30f4cfb33dc9d4c8d5e1aa2d2b62dee8111 Author: Hugo Beauzee-Luyssen <beauz...@gmail.com> Date: 2009-09-24 (Thu, 24 Sep 2009) Changed paths: M src/Library/Library.cpp M src/Library/Library.h M src/Media/Media.cpp M src/Media/Media.h M src/Metadata/MetaDataManager.cpp Log Message: ----------- Adding some stuff to avoid multiple metadata parsing. This would be used once imported media are stored as Media* Commit: 7726a12ee27cf17a716698718aa4c57161eafa61 http://github.com/VLMC/vlmc/commit/7726a12ee27cf17a716698718aa4c57161eafa61 Author: Hugo Beauzee-Luyssen <beauz...@gmail.com> Date: 2009-09-24 (Thu, 24 Sep 2009) Changed paths: M src/GUI/ImportBrowser.h Log Message: ----------- Avoid copy Commit: 329ed3e650c15c94b9d7ddc79b2954ad2a2dea27 http://github.com/VLMC/vlmc/commit/329ed3e650c15c94b9d7ddc79b2954ad2a2dea27 Author: Geoffroy Lacarriere <geoffroyl...@gmail.com> Date: 2009-09-25 (Fri, 25 Sep 2009) Changed paths: M fortunes.txt A images/editcut.png A images/mouse.png A images/zoom_in.png A images/zoom_out.png M ressources.qrc M src/Commands/Commands.cpp M src/Commands/Commands.h A src/Configuration/SettingsManager.cpp A src/Configuration/SettingsManager.h M src/GUI/AbstractGraphicsMediaItem.cpp M src/GUI/AbstractGraphicsMediaItem.h M src/GUI/AudioProjectPreferences.cpp M src/GUI/AudioProjectPreferences.h M src/GUI/DockWidgetManager.cpp M src/GUI/GraphicsCursorItem.cpp M src/GUI/GraphicsMovieItem.cpp M src/GUI/GraphicsMovieItem.h M src/GUI/GraphicsTrack.hpp M src/GUI/Import.cpp M src/GUI/Import.h M src/GUI/LibraryWidget.cpp M src/GUI/ListViewMediaItem.cpp M src/GUI/MainWindow.cpp M src/GUI/MainWindow.h M src/GUI/PreferenceWidget.cpp M src/GUI/PreferenceWidget.h M src/GUI/PreviewWidget.cpp M src/GUI/ProjectPreferences.cpp M src/GUI/ProjectPreferences.h M src/GUI/Settings.cpp M src/GUI/Settings.h A src/GUI/TagWidget.cpp A src/GUI/TagWidget.h M src/GUI/Timeline.cpp M src/GUI/Timeline.h M src/GUI/TracksRuler.cpp M src/GUI/TracksView.cpp M src/GUI/TracksView.h M src/GUI/Transcode.h M src/GUI/VLMCPreferences.cpp M src/GUI/VLMCPreferences.h M src/GUI/VideoProjectPreferences.cpp M src/GUI/VideoProjectPreferences.h M src/GUI/ui/AudioProjectPreferences.ui M src/GUI/ui/Import.ui M src/GUI/ui/ImportBrowser.ui M src/GUI/ui/MainWindow.ui A src/GUI/ui/TagWidget.ui M src/GUI/ui/VideoProjectPreferences.ui M src/LibVLCpp/VLCInstance.cpp M src/LibVLCpp/VLCInstance.h M src/LibVLCpp/VLCMedia.cpp M src/LibVLCpp/VLCMediaPlayer.cpp M src/LibVLCpp/VLCMediaPlayer.h M src/LibVLCpp/VLCpp.hpp M src/Library/Library.cpp M src/Media/Clip.cpp M src/Media/Clip.h M src/Media/Media.cpp M src/Media/Media.h M src/Metadata/MetaDataWorker.cpp M src/Project/ProjectManager.cpp M src/Renderer/ClipRenderer.cpp M src/Renderer/WorkflowFileRenderer.cpp M src/Renderer/WorkflowRenderer.cpp M src/Renderer/WorkflowRenderer.h M src/Tools/Pool.hpp M src/Tools/WaitCondition.hpp M src/Workflow/ClipWorkflow.cpp M src/Workflow/ClipWorkflow.h M src/Workflow/MainWorkflow.cpp M src/Workflow/MainWorkflow.h M src/Workflow/TrackWorkflow.cpp M src/Workflow/TrackWorkflow.h M src/vlmc.h M vlmc.pro Log Message: ----------- Merge commit 'origin/master' into geoff_import Conflicts: src/GUI/MainWindow.h src/GUI/ui/MainWindow.ui src/Media/Media.cpp src/Media/Media.h vlmc.pro Commit: 56674f4c0928bc7067a664ee2419f3429c9a9a60 http://github.com/VLMC/vlmc/commit/56674f4c0928bc7067a664ee2419f3429c9a9a60 Author: Thomas Boquet <thomas.boq...@gmail.com> Date: 2009-09-25 (Fri, 25 Sep 2009) Changed paths: M src/GUI/MainWindow.cpp M src/Library/Library.cpp M src/Library/Library.h M src/Metadata/MetaDataManager.cpp M src/Metadata/MetaDataManager.h M vlmc.pro Log Message: ----------- added new media library and stackview classes Commit: e3dd088a51140aa55bbbb809f7870e1b860f6f74 http://github.com/VLMC/vlmc/commit/e3dd088a51140aa55bbbb809f7870e1b860f6f74 Author: Thomas Boquet <thomas.boq...@gmail.com> Date: 2009-09-25 (Fri, 25 Sep 2009) Changed paths: A src/GUI/Library/ListViewController.cpp A src/GUI/Library/ListViewController.h A src/GUI/Library/MediaCellView.cpp A src/GUI/Library/MediaCellView.h A src/GUI/Library/MediaLibraryWidget.cpp A src/GUI/Library/MediaLibraryWidget.h A src/GUI/Library/MediaListViewController.cpp A src/GUI/Library/MediaListViewController.h A src/GUI/Library/StackViewController.cpp A src/GUI/Library/StackViewController.h A src/GUI/Library/StackViewNavController.cpp A src/GUI/Library/StackViewNavController.h A src/GUI/Library/StackViewNavController.ui A src/GUI/Library/ViewController.h A src/GUI/Library/ui/MediaCellView.ui A src/GUI/Library/ui/StackViewNavController.ui Log Message: ----------- forgot some files sorry. Commit: a37e981f5e1d0a10aa2b3e3b9aa858bbecd44ba6 http://github.com/VLMC/vlmc/commit/a37e981f5e1d0a10aa2b3e3b9aa858bbecd44ba6 Author: Geoffroy Lacarriere <geoffroyl...@gmail.com> Date: 2009-10-02 (Fri, 02 Oct 2009) Changed paths: M src/GUI/WorkflowFileRendererDialog.h M src/Renderer/ClipRenderer.cpp M src/Renderer/ClipRenderer.h M src/Renderer/GenericRenderer.h M src/Renderer/WorkflowFileRenderer.cpp M src/Renderer/WorkflowFileRenderer.h M src/Renderer/WorkflowRenderer.cpp M src/Renderer/WorkflowRenderer.h M src/Workflow/ClipWorkflow.cpp M src/Workflow/MainWorkflow.h M src/Workflow/TrackWorkflow.cpp Log Message: ----------- Merge commit 'origin/master' into geoff_import Commit: 163a002d54dd2750db2667caacc9c3291a6e91e6 http://github.com/VLMC/vlmc/commit/163a002d54dd2750db2667caacc9c3291a6e91e6 Author: Geoffroy Lacarriere <geoffroyl...@gmail.com> Date: 2009-10-02 (Fri, 02 Oct 2009) Changed paths: M src/GUI/Import.cpp M src/GUI/Import.h M src/GUI/ImportBrowser.cpp M src/GUI/ImportBrowser.h M src/Renderer/ClipRenderer.cpp Log Message: ----------- Import: Refactor of the import menu excluding Clip the benefit of Media. Commit: a37958d3f2ea6b6dd72651b613c29850ee9c20e2 http://github.com/VLMC/vlmc/commit/a37958d3f2ea6b6dd72651b613c29850ee9c20e2 Author: Thomas Boquet <thomas.boq...@gmail.com> Date: 2009-10-02 (Fri, 02 Oct 2009) Changed paths: M src/GUI/Library/ListViewController.cpp M src/GUI/Library/ListViewController.h M src/GUI/Library/MediaCellView.cpp M src/GUI/Library/MediaCellView.h Log Message: ----------- handling double click in media library Commit: dc1cb387a0f04cb5a3adbd0708817dd79bafd4d8 http://github.com/VLMC/vlmc/commit/dc1cb387a0f04cb5a3adbd0708817dd79bafd4d8 Author: Geoffroy Lacarriere <geoffroyl...@gmail.com> Date: 2009-10-02 (Fri, 02 Oct 2009) Changed paths: M src/GUI/FileInfoListModel.cpp Log Message: ----------- remove of a warning Commit: 486527f11ac6e17598c6d443844aa86d50d0a6b9 http://github.com/VLMC/vlmc/commit/486527f11ac6e17598c6d443844aa86d50d0a6b9 Author: Thomas Boquet <thomas.boq...@gmail.com> Date: 2009-10-02 (Fri, 02 Oct 2009) Changed paths: M src/GUI/Library/ListViewController.cpp M src/GUI/Library/ListViewController.h M src/GUI/Library/MediaCellView.cpp M src/GUI/Library/MediaCellView.h M src/GUI/Library/MediaLibraryWidget.cpp M src/GUI/Library/MediaLibraryWidget.h M src/GUI/Library/MediaListViewController.cpp M src/GUI/Library/MediaListViewController.h M src/GUI/Library/StackViewController.cpp M src/GUI/Library/StackViewController.h M src/GUI/Library/ViewController.h M src/GUI/MainWindow.cpp M vlmc.pro Log Message: ----------- handling cellSelected signal for preview Commit: ef724196b61f3b245fc7a6d88770ed1bb3a62f50 http://github.com/VLMC/vlmc/commit/ef724196b61f3b245fc7a6d88770ed1bb3a62f50 Author: Thomas Boquet <thomas.boq...@gmail.com> Date: 2009-10-02 (Fri, 02 Oct 2009) Changed paths: M src/GUI/Library/ListViewController.cpp M src/GUI/Library/ListViewController.h Log Message: ----------- not reemit when same clip selected Commit: c91089f1e1d6925214287f6bd563abdb98d7f722 http://github.com/VLMC/vlmc/commit/c91089f1e1d6925214287f6bd563abdb98d7f722 Author: Thomas Boquet <thomas.boq...@gmail.com> Date: 2009-10-02 (Fri, 02 Oct 2009) Changed paths: M src/GUI/Library/MediaCellView.cpp M src/GUI/Library/MediaCellView.h Log Message: ----------- handling drag and drop Commit: 9cb8c6749ad551f9a824743700ec8ade77d90c20 http://github.com/VLMC/vlmc/commit/9cb8c6749ad551f9a824743700ec8ade77d90c20 Author: Thomas Boquet <thomas.boq...@gmail.com> Date: 2009-10-02 (Fri, 02 Oct 2009) Changed paths: M src/GUI/Library/MediaCellView.cpp M src/GUI/Library/ui/MediaCellView.ui Log Message: ----------- resolved scaled pixmaps not perfect yet, to be continued ... Commit: 36fa73fd5f457dedb0a22c80463368113adc2c76 http://github.com/VLMC/vlmc/commit/36fa73fd5f457dedb0a22c80463368113adc2c76 Author: Thomas Boquet <thomas.boq...@gmail.com> Date: 2009-10-03 (Sat, 03 Oct 2009) Changed paths: M src/GUI/Library/MediaCellView.cpp M src/GUI/Library/MediaCellView.h M src/GUI/Library/MediaLibraryWidget.cpp M src/GUI/Library/MediaLibraryWidget.h M src/GUI/Library/StackViewController.cpp M src/GUI/Library/StackViewController.h M src/GUI/Library/ViewController.h Log Message: ----------- added missing GPL headers Commit: 8a5ea283a207aacdd57e6dad7b59a00c995e78c5 http://github.com/VLMC/vlmc/commit/8a5ea283a207aacdd57e6dad7b59a00c995e78c5 Author: Geoff <ge...@geoff-desktop.(none)> Date: 2009-10-08 (Thu, 08 Oct 2009) Changed paths: M src/GUI/TagWidget.cpp M src/GUI/TagWidget.h M src/GUI/ui/Import.ui M src/GUI/ui/ImportBrowser.ui M src/GUI/ui/TagWidget.ui Log Message: ----------- Import: Add of the first working version of the tagging system Commit: 7ef18902f8d73dc965c6d1e6d2aa41d9cde47e2d http://github.com/VLMC/vlmc/commit/7ef18902f8d73dc965c6d1e6d2aa41d9cde47e2d Author: Thomas Boquet <thomas.boq...@gmail.com> Date: 2009-10-09 (Fri, 09 Oct 2009) Changed paths: M src/GUI/Library/ListViewController.cpp M src/GUI/Library/MediaCellView.cpp M src/GUI/Library/MediaListViewController.cpp M src/GUI/Library/MediaListViewController.h M src/GUI/Library/ui/MediaCellView.ui Log Message: ----------- Better looking Media list bigger thumnails, no margin Commit: 03859859ab93d58bbc519c34c03c91fc63acfa4e http://github.com/VLMC/vlmc/commit/03859859ab93d58bbc519c34c03c91fc63acfa4e Author: Thomas Boquet <thomas.boq...@gmail.com> Date: 2009-10-09 (Fri, 09 Oct 2009) Changed paths: M src/GUI/Library/ListViewController.cpp M src/GUI/Library/MediaLibraryWidget.cpp M src/GUI/Library/MediaListViewController.cpp M src/GUI/Library/MediaListViewController.h Log Message: ----------- Forgot to delete some object instances Commit: 83c0c239f789c4400312d39b23d4879c5d9b6854 http://github.com/VLMC/vlmc/commit/83c0c239f789c4400312d39b23d4879c5d9b6854 Author: Geoffroy Lacarriere <geoffroyl...@gmail.com> Date: 2009-10-09 (Fri, 09 Oct 2009) Changed paths: M src/Configuration/SettingsManager.h M src/GUI/Import.cpp M src/GUI/Import.h M src/GUI/ImportBrowser.cpp M src/GUI/ImportBrowser.h A src/GUI/ImportMediaCellView.cpp A src/GUI/ImportMediaCellView.h A src/GUI/ImportMediaListController.cpp A src/GUI/ImportMediaListController.h A src/GUI/Library/ListViewController.cpp A src/GUI/Library/ListViewController.h A src/GUI/Library/MediaCellView.cpp A src/GUI/Library/MediaCellView.h A src/GUI/Library/MediaLibraryWidget.cpp A src/GUI/Library/MediaLibraryWidget.h A src/GUI/Library/MediaListViewController.cpp A src/GUI/Library/MediaListViewController.h A src/GUI/Library/StackViewController.cpp A src/GUI/Library/StackViewController.h A src/GUI/Library/StackViewNavController.cpp A src/GUI/Library/StackViewNavController.h A src/GUI/Library/StackViewNavController.ui A src/GUI/Library/ViewController.h A src/GUI/Library/ui/MediaCellView.ui A src/GUI/Library/ui/StackViewNavController.ui M src/GUI/MainWindow.cpp M src/GUI/ui/ImportBrowser.ui M src/Library/Library.cpp M src/Library/Library.h M src/Metadata/MetaDataManager.cpp M src/Metadata/MetaDataManager.h M vlmc.pro Log Message: ----------- Merge branch 'tomb_new_media_library' into geoff_import Conflicts: src/GUI/MainWindow.cpp vlmc.pro Commit: 2636c6cf96fa449d1bdffbf7dfbfcbfe14492912 http://github.com/VLMC/vlmc/commit/2636c6cf96fa449d1bdffbf7dfbfcbfe14492912 Author: Geoffroy Lacarriere <geoffroyl...@gmail.com> Date: 2009-10-15 (Thu, 15 Oct 2009) Changed paths: A src/GUI/ClickableLabel.cpp A src/GUI/ClickableLabel.h M src/GUI/Import.cpp M src/GUI/Import.h M src/GUI/ImportBrowser.cpp M src/GUI/ImportBrowser.h M src/GUI/ImportMediaCellView.cpp M src/GUI/ImportMediaCellView.h M src/GUI/ImportMediaListController.cpp M src/GUI/ImportMediaListController.h M src/GUI/Library/ListViewController.cpp M src/GUI/Library/ListViewController.h M src/GUI/Library/MediaCellView.cpp M src/GUI/Library/MediaCellView.h M src/GUI/Library/StackViewController.cpp M src/GUI/Library/StackViewController.h M src/GUI/Library/ui/MediaCellView.ui M src/GUI/ui/Import.ui M src/GUI/ui/ImportBrowser.ui M src/Media/Clip.h M src/Media/Media.cpp M src/Media/Media.h M vlmc.pro Log Message: ----------- The medias can now be removed from the listView in the import menu. Add of a clip list inside a media. This list can now be shown by the arrow in the MediaCellView. This arrow is a generic clickableLabel. Commit: cafe9d508328c804ec15c97108c51d8cd63c8fc8 http://github.com/VLMC/vlmc/commit/cafe9d508328c804ec15c97108c51d8cd63c8fc8 Author: Thomas Boquet <thomas.boq...@gmail.com> Date: 2009-10-16 (Fri, 16 Oct 2009) Changed paths: M src/Configuration/SettingsManager.cpp M src/Configuration/SettingsManager.h M src/GUI/AudioProjectPreferences.cpp M src/GUI/AudioProjectPreferences.h M src/GUI/Import.cpp A src/GUI/Import/ImportController.cpp A src/GUI/Import/ImportController.h A src/GUI/Import/ImportModel.cpp A src/GUI/Import/ImportModel.h A src/GUI/Import/ui/ImportController.ui M src/GUI/ImportBrowser.cpp M src/GUI/Library/StackViewController.cpp M src/GUI/MainWindow.cpp M src/GUI/MainWindow.h M src/GUI/PreferenceWidget.h M src/GUI/ProjectPreferences.cpp M src/GUI/ProjectPreferences.h M src/GUI/Settings.cpp M src/GUI/Settings.h M src/GUI/VLMCPreferences.cpp M src/GUI/VLMCPreferences.h M src/GUI/VideoProjectPreferences.cpp M src/GUI/VideoProjectPreferences.h M src/GUI/ui/Import.ui M src/GUI/ui/MainWindow.ui M src/LibVLCpp/VLCMedia.cpp M src/Project/ProjectManager.cpp M vlmc.pro Log Message: ----------- Refactoring Import Import refactoring stared, not over yet Commit: 054f9c58c0da3354d1dcb3fc972b246af1574acb http://github.com/VLMC/vlmc/commit/054f9c58c0da3354d1dcb3fc972b246af1574acb Author: Geoffroy Lacarriere <geoffroyl...@gmail.com> Date: 2009-10-22 (Thu, 22 Oct 2009) Changed paths: M src/GUI/Import/ImportController.cpp M src/GUI/Import/ImportController.h M src/GUI/Import/ImportModel.cpp M src/GUI/Import/ImportModel.h Log Message: ----------- [Import]: Refactor: Importing medias is available again Commit: 79e1d04f48a2c15c85dcee31fdb17ab01ca3dee2 http://github.com/VLMC/vlmc/commit/79e1d04f48a2c15c85dcee31fdb17ab01ca3dee2 Author: Geoffroy Lacarriere <geoffroyl...@gmail.com> Date: 2009-10-23 (Fri, 23 Oct 2009) Changed paths: M src/GUI/Import/ImportController.cpp M src/GUI/Import/ImportController.h M src/GUI/Import/ImportModel.cpp M src/GUI/Import/ImportModel.h M src/GUI/ImportMediaCellView.cpp M src/GUI/ImportMediaCellView.h M src/GUI/ImportMediaListController.cpp M src/GUI/ImportMediaListController.h M src/GUI/Library/ListViewController.cpp M src/GUI/Library/ListViewController.h Log Message: ----------- [Import]: Refactor: The preview and the tag system are available again. Some clean Commit: f5edbac07116bb083d7b6213ec708d1763d05180 http://github.com/VLMC/vlmc/commit/f5edbac07116bb083d7b6213ec708d1763d05180 Author: Geoffroy Lacarriere <geoffroyl...@gmail.com> Date: 2009-10-29 (Thu, 29 Oct 2009) Changed paths: M src/GUI/Import/ImportController.cpp M src/GUI/Import/ImportController.h M src/GUI/Import/ImportModel.cpp M src/GUI/Import/ImportModel.h M src/GUI/ImportMediaCellView.cpp M src/GUI/ImportMediaListController.cpp M src/GUI/ImportMediaListController.h M src/GUI/Library/MediaCellView.cpp M src/GUI/Library/MediaCellView.h M src/GUI/Library/ui/MediaCellView.ui Log Message: ----------- [Import]: Refactor Add of a delete button on the media cell and an hightlight selection. Commit: f6c589d7f0682f1b442d634c40ae52b2dcecc1c9 http://github.com/VLMC/vlmc/commit/f6c589d7f0682f1b442d634c40ae52b2dcecc1c9 Author: Geoffroy Lacarriere <geoffroyl...@gmail.com> Date: 2009-10-29 (Thu, 29 Oct 2009) Changed paths: A src/EffectsEngine/EffectsEngine.cpp A src/EffectsEngine/EffectsEngine.h A src/EffectsEngine/GenericEffect.cpp A src/EffectsEngine/GenericEffect.h A src/EffectsEngine/GreenFilterEffect.cpp A src/EffectsEngine/GreenFilterEffect.h A src/EffectsEngine/InSlot.hpp A src/EffectsEngine/LightVideoFrame.cpp A src/EffectsEngine/LightVideoFrame.h A src/EffectsEngine/MixerEffect.cpp A src/EffectsEngine/MixerEffect.h A src/EffectsEngine/OutSlot.hpp A src/EffectsEngine/TODO M src/GUI/Import/ImportController.cpp M src/GUI/LibraryWidget.cpp M src/GUI/MainWindow.cpp M src/GUI/MainWindow.h M src/GUI/MediaListWidget.cpp M src/GUI/MediaListWidget.h M src/GUI/PreviewWidget.cpp M src/GUI/Settings.cpp M src/GUI/TracksView.cpp M src/GUI/ui/MainWindow.ui M src/GUI/ui/PreviewWidget.ui M src/Media/Clip.cpp M src/Renderer/ClipRenderer.cpp M src/Renderer/GenericRenderer.h M src/Renderer/WorkflowRenderer.cpp M src/Renderer/WorkflowRenderer.h M src/Workflow/ClipWorkflow.cpp M src/Workflow/ClipWorkflow.h M src/Workflow/MainWorkflow.cpp M src/Workflow/MainWorkflow.h M src/Workflow/TrackWorkflow.cpp M src/Workflow/TrackWorkflow.h M vlmc.pro Log Message: ----------- Merge remote branch 'origin/master' into geoff_import Conflicts: src/GUI/ui/MainWindow.ui vlmc.pro Commit: dca03dbb5454f98a5790f22ca7bad5dde98ed9ab http://github.com/VLMC/vlmc/commit/dca03dbb5454f98a5790f22ca7bad5dde98ed9ab Author: Geoffroy Lacarriere <geoffroyl...@gmail.com> Date: 2009-10-30 (Fri, 30 Oct 2009) Changed paths: M src/GUI/Import/ImportController.cpp Log Message: ----------- [Import]: Refactor: Bug fix: seg fault on selecting an new item when the previous was deleted. Commit: 03c4614affcc39f4202e0ac10ec518854280b39b http://github.com/VLMC/vlmc/commit/03c4614affcc39f4202e0ac10ec518854280b39b Author: Geoffroy Lacarriere <geoffroyl...@gmail.com> Date: 2009-10-30 (Fri, 30 Oct 2009) Changed paths: M src/Commands/Commands.cpp M src/Commands/Commands.h M src/Configuration/SettingsManager.h M src/GUI/Import/ImportController.cpp M src/GUI/Import/ImportModel.cpp M src/GUI/Import/ImportModel.h M src/GUI/Import/ui/ImportController.ui M src/GUI/MainWindow.cpp M src/GUI/PreviewWidget.cpp M src/GUI/PreviewWidget.h M src/GUI/Settings.cpp M src/GUI/Timeline.cpp M src/GUI/Timeline.h M src/GUI/TracksRuler.cpp M src/GUI/TracksView.cpp M src/GUI/ui/MainWindow.ui M src/GUI/ui/PreviewWidget.ui M src/LibVLCpp/VLCMedia.cpp M src/LibVLCpp/VLCMedia.h M src/Media/Media.cpp M src/Media/Media.h M src/Renderer/ClipRenderer.cpp M src/Renderer/ClipRenderer.h M src/Renderer/GenericRenderer.h M src/Renderer/WorkflowRenderer.cpp M src/Renderer/WorkflowRenderer.h A src/Workflow/AudioClipWorkflow.cpp A src/Workflow/AudioClipWorkflow.h M src/Workflow/ClipWorkflow.cpp M src/Workflow/ClipWorkflow.h M src/Workflow/MainWorkflow.cpp M src/Workflow/MainWorkflow.h A src/Workflow/TrackHandler.cpp A src/Workflow/TrackHandler.h M src/Workflow/TrackWorkflow.cpp M src/Workflow/TrackWorkflow.h A src/Workflow/VideoClipWorkflow.cpp A src/Workflow/VideoClipWorkflow.h M vlmc.pro Log Message: ----------- Merge remote branch 'origin/master' into geoff_import Conflicts: src/GUI/MainWindow.cpp src/GUI/ui/MainWindow.ui vlmc.pro Commit: 53d776e8a35c85541cdf9bb67896fa3ad660552e http://github.com/VLMC/vlmc/commit/53d776e8a35c85541cdf9bb67896fa3ad660552e Author: Geoffroy Lacarriere <geoffroyl...@gmail.com> Date: 2009-10-30 (Fri, 30 Oct 2009) Changed paths: A src/GUI/ClickableLabel.cpp A src/GUI/ClickableLabel.h A src/GUI/FileInfoListModel.cpp A src/GUI/FileInfoListModel.h A src/GUI/Import.cpp A src/GUI/Import.h A src/GUI/Import/ImportController.cpp A src/GUI/Import/ImportController.h A src/GUI/Import/ImportModel.cpp A src/GUI/Import/ImportModel.h A src/GUI/Import/ui/ImportController.ui A src/GUI/ImportBrowser.cpp A src/GUI/ImportBrowser.h A src/GUI/ImportMediaCellView.cpp A src/GUI/ImportMediaCellView.h A src/GUI/ImportMediaListController.cpp A src/GUI/ImportMediaListController.h A src/GUI/Library/ListViewController.cpp A src/GUI/Library/ListViewController.h A src/GUI/Library/MediaCellView.cpp A src/GUI/Library/MediaCellView.h A src/GUI/Library/MediaLibraryWidget.cpp A src/GUI/Library/MediaLibraryWidget.h A src/GUI/Library/MediaListViewController.cpp A src/GUI/Library/MediaListViewController.h A src/GUI/Library/StackViewController.cpp A src/GUI/Library/StackViewController.h A src/GUI/Library/StackViewNavController.cpp A src/GUI/Library/StackViewNavController.h A src/GUI/Library/StackViewNavController.ui A src/GUI/Library/ViewController.h A src/GUI/Library/ui/MediaCellView.ui A src/GUI/Library/ui/StackViewNavController.ui M src/GUI/MainWindow.cpp M src/GUI/MainWindow.h M src/GUI/ProjectPreferences.cpp M src/GUI/ProjectPreferences.h A src/GUI/TagWidget.cpp A src/GUI/TagWidget.h M src/GUI/Transcode.h A src/GUI/ui/Import.ui A src/GUI/ui/ImportBrowser.ui M src/GUI/ui/MainWindow.ui M src/GUI/ui/ProjectPreferences.ui A src/GUI/ui/TagWidget.ui M src/GUI/ui/VideoProjectPreferences.ui M src/Library/Library.cpp M src/Library/Library.h M src/Media/Clip.h M src/Media/Media.cpp M src/Media/Media.h M src/Metadata/MetaDataManager.cpp M src/Metadata/MetaDataManager.h M vlmc.pro Log Message: ----------- Merge branch 'geoff_import' _______________________________________________ vlmc-devel mailing list vlmc-devel@vlmc.org http://vlmc.org/mailman/listinfo/vlmc-devel