summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/playlistfileview.cpp10
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidgetgui.cpp20
2 files changed, 10 insertions, 20 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistfileview.cpp b/noncore/multimedia/opieplayer2/playlistfileview.cpp
index bdd38e0..c4f93e7 100644
--- a/noncore/multimedia/opieplayer2/playlistfileview.cpp
+++ b/noncore/multimedia/opieplayer2/playlistfileview.cpp
@@ -1,14 +1,24 @@
1 1
2#include "playlistfileview.h" 2#include "playlistfileview.h"
3 3
4PlayListFileView::PlayListFileView( QWidget *parent, const char *name ) 4PlayListFileView::PlayListFileView( QWidget *parent, const char *name )
5 : PlayListView( parent, name ) 5 : PlayListView( parent, name )
6{ 6{
7 addColumn( tr( "Title" ), 140);
8 addColumn( tr( "Size" ), -1 );
9 addColumn(tr( "Media" ), 0 );
10 addColumn(tr( "Path" ), -1 );
11 setColumnAlignment( 1, Qt::AlignRight );
12 setColumnAlignment( 2, Qt::AlignRight );
13 setAllColumnsShowFocus( TRUE );
14 setSorting( 3, TRUE );
15 setMultiSelection( TRUE );
16 setSelectionMode( QListView::Extended );
7} 17}
8 18
9PlayListFileView::~PlayListFileView() 19PlayListFileView::~PlayListFileView()
10{ 20{
11} 21}
12 22
13/* vim: et sw=4 ts=4 23/* vim: et sw=4 ts=4
14 */ 24 */
diff --git a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
index de7b6d5..cfca5e3 100644
--- a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
@@ -122,96 +122,76 @@ PlayListWidgetGui::PlayListWidgetGui( MediaPlayerState &_mediaPlayerState, QWidg
122 QHBox *hbox6 = new QHBox( vbox4 ); 122 QHBox *hbox6 = new QHBox( vbox4 );
123 123
124 tabWidget = new QTabWidget( hbox6, "tabWidget" ); 124 tabWidget = new QTabWidget( hbox6, "tabWidget" );
125 125
126 QWidget *pTab; 126 QWidget *pTab;
127 pTab = new QWidget( tabWidget, "pTab" ); 127 pTab = new QWidget( tabWidget, "pTab" );
128 tabWidget->insertTab( pTab, "Playlist"); 128 tabWidget->insertTab( pTab, "Playlist");
129 129
130 QGridLayout *Playout = new QGridLayout( pTab ); 130 QGridLayout *Playout = new QGridLayout( pTab );
131 Playout->setSpacing( 2); 131 Playout->setSpacing( 2);
132 Playout->setMargin( 2); 132 Playout->setMargin( 2);
133 133
134 // Add the playlist area 134 // Add the playlist area
135 QVBox *vbox3 = new QVBox( pTab ); 135 QVBox *vbox3 = new QVBox( pTab );
136 d->playListFrame = vbox3; 136 d->playListFrame = vbox3;
137 137
138 QHBox *hbox2 = new QHBox( vbox3 ); 138 QHBox *hbox2 = new QHBox( vbox3 );
139 d->selectedFiles = new PlayListSelection( hbox2 ); 139 d->selectedFiles = new PlayListSelection( hbox2 );
140 140
141 vbox1 = new QVBox( hbox2 ); 141 vbox1 = new QVBox( hbox2 );
142 QPEApplication::setStylusOperation( d->selectedFiles->viewport(), QPEApplication::RightOnHold ); 142 QPEApplication::setStylusOperation( d->selectedFiles->viewport(), QPEApplication::RightOnHold );
143 QVBox *stretch1 = new QVBox( vbox1 ); // add stretch 143 QVBox *stretch1 = new QVBox( vbox1 ); // add stretch
144 144
145 Playout->addMultiCellWidget( vbox3, 0, 0, 0, 1 ); 145 Playout->addMultiCellWidget( vbox3, 0, 0, 0, 1 );
146 146
147 QWidget *aTab; 147 QWidget *aTab;
148 aTab = new QWidget( tabWidget, "aTab" ); 148 aTab = new QWidget( tabWidget, "aTab" );
149 149
150 QGridLayout *Alayout = new QGridLayout( aTab ); 150 QGridLayout *Alayout = new QGridLayout( aTab );
151 Alayout->setSpacing( 2 ); 151 Alayout->setSpacing( 2 );
152 Alayout->setMargin( 2 ); 152 Alayout->setMargin( 2 );
153 audioView = new PlayListFileView( aTab, "Audioview" ); 153 audioView = new PlayListFileView( aTab, "Audioview" );
154 audioView->addColumn( tr( "Title" ), 140 );
155 audioView->addColumn( tr( "Size" ), -1 );
156 audioView->addColumn( tr( "Media" ), 0 );
157 audioView->addColumn( tr( "Path" ), -1 );
158 audioView->setColumnAlignment( 1, Qt::AlignRight );
159 audioView->setColumnAlignment( 2, Qt::AlignRight );
160 audioView->setAllColumnsShowFocus( TRUE );
161 audioView->setSorting( 3, TRUE );
162 audioView->setMultiSelection( TRUE );
163 audioView->setSelectionMode( QListView::Extended );
164 Alayout->addMultiCellWidget( audioView, 0, 0, 0, 1 ); 154 Alayout->addMultiCellWidget( audioView, 0, 0, 0, 1 );
165 tabWidget->insertTab( aTab, tr( "Audio" ) ); 155 tabWidget->insertTab( aTab, tr( "Audio" ) );
166 156
167 QPEApplication::setStylusOperation( audioView->viewport(), QPEApplication::RightOnHold ); 157 QPEApplication::setStylusOperation( audioView->viewport(), QPEApplication::RightOnHold );
168 158
169 QWidget *vTab; 159 QWidget *vTab;
170 vTab = new QWidget( tabWidget, "vTab" ); 160 vTab = new QWidget( tabWidget, "vTab" );
171 161
172 QGridLayout *Vlayout = new QGridLayout( vTab ); 162 QGridLayout *Vlayout = new QGridLayout( vTab );
173 Vlayout->setSpacing( 2 ); 163 Vlayout->setSpacing( 2 );
174 Vlayout->setMargin( 2 ); 164 Vlayout->setMargin( 2 );
175 videoView = new PlayListFileView( vTab, "Videoview" ); 165 videoView = new PlayListFileView( vTab, "Videoview" );
176 videoView->addColumn( tr( "Title" ), 140);
177 videoView->addColumn( tr( "Size" ), -1 );
178 videoView->addColumn(tr( "Media" ), 0 );
179 videoView->addColumn(tr( "Path" ), -1 );
180 videoView->setColumnAlignment( 1, Qt::AlignRight );
181 videoView->setColumnAlignment( 2, Qt::AlignRight );
182 videoView->setAllColumnsShowFocus( TRUE );
183 videoView->setSorting( 3, TRUE );
184 videoView->setMultiSelection( TRUE );
185 videoView->setSelectionMode( QListView::Extended );
186 Vlayout->addMultiCellWidget( videoView, 0, 0, 0, 1 ); 166 Vlayout->addMultiCellWidget( videoView, 0, 0, 0, 1 );
187 167
188 QPEApplication::setStylusOperation( videoView->viewport(), QPEApplication::RightOnHold ); 168 QPEApplication::setStylusOperation( videoView->viewport(), QPEApplication::RightOnHold );
189 169
190 tabWidget->insertTab( vTab, tr( "Video" ) ); 170 tabWidget->insertTab( vTab, tr( "Video" ) );
191 171
192 //playlists list 172 //playlists list
193 QWidget *LTab; 173 QWidget *LTab;
194 LTab = new QWidget( tabWidget, "LTab" ); 174 LTab = new QWidget( tabWidget, "LTab" );
195 QGridLayout *Llayout = new QGridLayout( LTab ); 175 QGridLayout *Llayout = new QGridLayout( LTab );
196 Llayout->setSpacing( 2 ); 176 Llayout->setSpacing( 2 );
197 Llayout->setMargin( 2 ); 177 Llayout->setMargin( 2 );
198 178
199 playLists = new FileSelector( "playlist/plain;audio/x-mpegurl", LTab, "fileselector" , FALSE, FALSE ); 179 playLists = new FileSelector( "playlist/plain;audio/x-mpegurl", LTab, "fileselector" , FALSE, FALSE );
200 Llayout->addMultiCellWidget( playLists, 0, 0, 0, 1 ); 180 Llayout->addMultiCellWidget( playLists, 0, 0, 0, 1 );
201 181
202 tabWidget->insertTab( LTab, tr( "Lists" ) ); 182 tabWidget->insertTab( LTab, tr( "Lists" ) );
203 183
204 setCentralWidget( vbox5 ); 184 setCentralWidget( vbox5 );
205} 185}
206 186
207 187
208 188
209PlayListWidgetGui::~PlayListWidgetGui() { 189PlayListWidgetGui::~PlayListWidgetGui() {
210} 190}
211 191
212void PlayListWidgetGui::setView( char view ) { 192void PlayListWidgetGui::setView( char view ) {
213 if ( view == 'l' ) 193 if ( view == 'l' )
214 showMaximized(); 194 showMaximized();
215 else 195 else
216 hide(); 196 hide();
217} 197}