diff --git a/livesupport/products/gLiveSupport/src/SimplePlaylistManagementWindow.cxx b/livesupport/products/gLiveSupport/src/SimplePlaylistManagementWindow.cxx index 13f890b20..ddab8cb4e 100644 --- a/livesupport/products/gLiveSupport/src/SimplePlaylistManagementWindow.cxx +++ b/livesupport/products/gLiveSupport/src/SimplePlaylistManagementWindow.cxx @@ -22,7 +22,7 @@ Author : $Author: maroy $ - Version : $Revision: 1.4 $ + Version : $Revision: 1.5 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/SimplePlaylistManagementWindow.cxx,v $ ------------------------------------------------------------------------------*/ @@ -92,8 +92,12 @@ SimplePlaylistManagementWindow :: SimplePlaylistManagementWindow ( // Add the TreeView's view columns: try { + entriesView->append_column(*getResourceUstring("startColumnLabel"), + modelColumns.startColumn); entriesView->append_column(*getResourceUstring("titleColumnLabel"), modelColumns.titleColumn); + entriesView->append_column(*getResourceUstring("lengthColumnLabel"), + modelColumns.lengthColumn); } catch (std::invalid_argument &e) { std::cerr << e.what() << std::endl; } @@ -198,7 +202,11 @@ SimplePlaylistManagementWindow :: showContents(void) throw () Gtk::TreeModel::Row row = *(entriesModel->append()); row[modelColumns.idColumn] = playable->getId(); + row[modelColumns.startColumn] = + to_simple_string(*playlistElem->getRelativeOffset()); row[modelColumns.titleColumn] = *playable->getTitle(); + row[modelColumns.lengthColumn] = + to_simple_string(*playable->getPlaylength()); it++; } diff --git a/livesupport/products/gLiveSupport/src/SimplePlaylistManagementWindow.h b/livesupport/products/gLiveSupport/src/SimplePlaylistManagementWindow.h index 32e6d6f40..7f16f4eb2 100644 --- a/livesupport/products/gLiveSupport/src/SimplePlaylistManagementWindow.h +++ b/livesupport/products/gLiveSupport/src/SimplePlaylistManagementWindow.h @@ -22,7 +22,7 @@ Author : $Author: maroy $ - Version : $Revision: 1.1 $ + Version : $Revision: 1.2 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/SimplePlaylistManagementWindow.h,v $ ------------------------------------------------------------------------------*/ @@ -83,7 +83,7 @@ using namespace LiveSupport::Core; * * * @author $Author: maroy $ - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ */ class SimplePlaylistManagementWindow : public Gtk::Window, public LocalizedObject @@ -96,7 +96,7 @@ class SimplePlaylistManagementWindow : public Gtk::Window, * Lists one playlist entry per row. * * @author $Author: maroy $ - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ */ class ModelColumns : public Gtk::TreeModel::ColumnRecord { @@ -106,18 +106,30 @@ class SimplePlaylistManagementWindow : public Gtk::Window, */ Gtk::TreeModelColumn::Ref> idColumn; + /** + * The column for the start of the playlist entry. + */ + Gtk::TreeModelColumn startColumn; + /** * The column for the title of the audio clip or playlist. */ Gtk::TreeModelColumn titleColumn; + /** + * The column for the length of the playlist entry. + */ + Gtk::TreeModelColumn lengthColumn; + /** * Constructor. */ ModelColumns(void) throw () { add(idColumn); + add(startColumn); add(titleColumn); + add(lengthColumn); } }; diff --git a/livesupport/products/gLiveSupport/var/hu.txt b/livesupport/products/gLiveSupport/var/hu.txt index f54410569..206cffe61 100644 --- a/livesupport/products/gLiveSupport/var/hu.txt +++ b/livesupport/products/gLiveSupport/var/hu.txt @@ -79,7 +79,9 @@ hu:table { windowTitle:string { "LiveSupport Egyszerű Playlist Szerkesztő Ablak" } + startColumnLabel:string { "kezdet" } titleColumnLabel:string { "cím" } + lengthColumnLabel:string { "hossz" } nameLabel:string { "név" } saveButtonLabel:string { "elment" } closeButtonLabel:string { "bezár" } diff --git a/livesupport/products/gLiveSupport/var/root.txt b/livesupport/products/gLiveSupport/var/root.txt index 28e88694e..fab7af340 100644 --- a/livesupport/products/gLiveSupport/var/root.txt +++ b/livesupport/products/gLiveSupport/var/root.txt @@ -79,7 +79,9 @@ root:table { windowTitle:string { "LiveSupport Simple Playlist Management Window" } + startColumnLabel:string { "start" } titleColumnLabel:string { "title" } + lengthColumnLabel:string { "length" } nameLabel:string { "name" } saveButtonLabel:string { "save" } closeButtonLabel:string { "close" }