summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidgetgui.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
index 5d9fb5d..a217c94 100644
--- a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
@@ -62,168 +62,168 @@
62extern MediaPlayerState *mediaPlayerState; 62extern MediaPlayerState *mediaPlayerState;
63 63
64PlayListWidgetGui::PlayListWidgetGui( QWidget* parent, const char* name, WFlags fl ) 64PlayListWidgetGui::PlayListWidgetGui( QWidget* parent, const char* name, WFlags fl )
65 : QMainWindow( parent, name, fl ) { 65 : QMainWindow( parent, name, fl ) {
66 66
67 d = new PlayListWidgetPrivate; 67 d = new PlayListWidgetPrivate;
68 d->setDocumentUsed = FALSE; 68 d->setDocumentUsed = FALSE;
69 d->current = NULL; 69 d->current = NULL;
70 70
71 setBackgroundMode( PaletteButton ); 71 setBackgroundMode( PaletteButton );
72 setToolBarsMovable( FALSE ); 72 setToolBarsMovable( FALSE );
73 73
74 // Create Toolbar 74 // Create Toolbar
75 QPEToolBar *toolbar = new QPEToolBar( this ); 75 QPEToolBar *toolbar = new QPEToolBar( this );
76 toolbar->setHorizontalStretchable( TRUE ); 76 toolbar->setHorizontalStretchable( TRUE );
77 77
78 // Create Menubar 78 // Create Menubar
79 QPEMenuBar *menu = new QPEMenuBar( toolbar ); 79 QPEMenuBar *menu = new QPEMenuBar( toolbar );
80 menu->setMargin( 0 ); 80 menu->setMargin( 0 );
81 81
82 bar = new QPEToolBar( this ); 82 bar = new QPEToolBar( this );
83 bar->setLabel( tr( "Play Operations" ) ); 83 bar->setLabel( tr( "Play Operations" ) );
84 84
85 tbDeletePlaylist = new QPushButton( Resource::loadIconSet( "trash" ), "", bar, "close" ); 85 tbDeletePlaylist = new QPushButton( Resource::loadIconSet( "trash" ), "", bar, "close" );
86 tbDeletePlaylist->setFlat( TRUE ); 86 tbDeletePlaylist->setFlat( TRUE );
87 tbDeletePlaylist->setFixedSize( 20, 20 ); 87 tbDeletePlaylist->setFixedSize( 20, 20 );
88 88
89 tbDeletePlaylist->hide(); 89 tbDeletePlaylist->hide();
90 90
91 pmPlayList = new QPopupMenu( this ); 91 pmPlayList = new QPopupMenu( this );
92 menu->insertItem( tr( "File" ), pmPlayList ); 92 menu->insertItem( tr( "File" ), pmPlayList );
93 93
94 pmView = new QPopupMenu( this ); 94 pmView = new QPopupMenu( this );
95 menu->insertItem( tr( "View" ), pmView ); 95 menu->insertItem( tr( "View" ), pmView );
96 pmView->isCheckable(); 96 pmView->isCheckable();
97 97
98 skinsMenu = new QPopupMenu( this ); 98 skinsMenu = new QPopupMenu( this );
99 pmView->insertItem( tr( "Skins" ), skinsMenu ); 99 pmView->insertItem( tr( "Skins" ), skinsMenu );
100 skinsMenu->isCheckable(); 100 skinsMenu->isCheckable();
101 101
102 gammaMenu = new QPopupMenu( this ); 102 gammaMenu = new QPopupMenu( this );
103 pmView->insertItem( tr( "Gamma (Video)" ), gammaMenu ); 103 pmView->insertItem( tr( "Gamma (Video)" ), gammaMenu );
104 104
105 gammaSlider = new QSlider( QSlider::Vertical, gammaMenu ); 105 gammaSlider = new QSlider( QSlider::Vertical, gammaMenu );
106 gammaSlider->setRange( -40, 40 ); 106 gammaSlider->setRange( -40, 40 );
107 gammaSlider->setTickmarks( QSlider::Left ); 107 gammaSlider->setTickmarks( QSlider::Left );
108 gammaSlider->setTickInterval( 20 ); 108 gammaSlider->setTickInterval( 20 );
109 gammaSlider->setFocusPolicy( QWidget::StrongFocus ); 109 gammaSlider->setFocusPolicy( QWidget::StrongFocus );
110 gammaSlider->setValue( 0 ); 110 gammaSlider->setValue( 0 );
111 gammaSlider->setMinimumHeight( 50 ); 111 gammaSlider->setMinimumHeight( 50 );
112 112
113 gammaLCD = new QLCDNumber( 3, gammaMenu ); 113 gammaLCD = new QLCDNumber( 3, gammaMenu );
114 gammaLCD-> setFrameShape ( QFrame::NoFrame ); 114 gammaLCD-> setFrameShape ( QFrame::NoFrame );
115 gammaLCD-> setSegmentStyle ( QLCDNumber::Flat ); 115 gammaLCD-> setSegmentStyle ( QLCDNumber::Flat );
116 116
117 gammaMenu->insertItem( gammaSlider ); 117 gammaMenu->insertItem( gammaSlider );
118 gammaMenu->insertItem( gammaLCD ); 118 gammaMenu->insertItem( gammaLCD );
119 119
120 connect( gammaSlider, SIGNAL( valueChanged( int ) ), gammaLCD, SLOT( display( int ) ) ); 120 connect( gammaSlider, SIGNAL( valueChanged( int ) ), gammaLCD, SLOT( display( int ) ) );
121 121
122 vbox5 = new QVBox( this ); 122 vbox5 = new QVBox( this );
123 QVBox *vbox4 = new QVBox( vbox5 ); 123 QVBox *vbox4 = new QVBox( vbox5 );
124 QHBox *hbox6 = new QHBox( vbox4 ); 124 QHBox *hbox6 = new QHBox( vbox4 );
125 125
126 tabWidget = new QTabWidget( hbox6, "tabWidget" ); 126 tabWidget = new QTabWidget( hbox6, "tabWidget" );
127 127
128 QWidget *pTab; 128 QWidget *pTab;
129 pTab = new QWidget( tabWidget, "pTab" ); 129 pTab = new QWidget( tabWidget, "pTab" );
130 tabWidget->insertTab( pTab, "Playlist"); 130 tabWidget->insertTab( pTab, "Playlist");
131 131
132 QGridLayout *Playout = new QGridLayout( pTab ); 132 QGridLayout *Playout = new QGridLayout( pTab );
133 Playout->setSpacing( 2); 133 Playout->setSpacing( 2);
134 Playout->setMargin( 2); 134 Playout->setMargin( 2);
135 135
136 // Add the playlist area 136 // Add the playlist area
137 QVBox *vbox3 = new QVBox( pTab ); 137 QVBox *vbox3 = new QVBox( pTab );
138 d->playListFrame = vbox3; 138 d->playListFrame = vbox3;
139 139
140 QHBox *hbox2 = new QHBox( vbox3 ); 140 QHBox *hbox2 = new QHBox( vbox3 );
141 d->selectedFiles = new PlayListSelection( hbox2 ); 141 d->selectedFiles = new PlayListSelection( hbox2 );
142 142
143 vbox1 = new QVBox( hbox2 ); 143 vbox1 = new QVBox( hbox2 );
144 QPEApplication::setStylusOperation( d->selectedFiles->viewport(), QPEApplication::RightOnHold ); 144 QPEApplication::setStylusOperation( d->selectedFiles->viewport(), QPEApplication::RightOnHold );
145 QVBox *stretch1 = new QVBox( vbox1 ); // add stretch 145 QVBox *stretch1 = new QVBox( vbox1 ); // add stretch
146 146
147 Playout->addMultiCellWidget( vbox3, 0, 0, 0, 1 ); 147 Playout->addMultiCellWidget( vbox3, 0, 0, 0, 1 );
148 148
149 QWidget *aTab; 149 QWidget *aTab;
150 aTab = new QWidget( tabWidget, "aTab" ); 150 aTab = new QWidget( tabWidget, "aTab" );
151 151
152 QGridLayout *Alayout = new QGridLayout( aTab ); 152 QGridLayout *Alayout = new QGridLayout( aTab );
153 Alayout->setSpacing( 2 ); 153 Alayout->setSpacing( 2 );
154 Alayout->setMargin( 2 ); 154 Alayout->setMargin( 2 );
155 audioView = new QListView( aTab, "Audioview" ); 155 audioView = new QListView( aTab, "Audioview" );
156 audioView->addColumn( tr( "Title" ), 140 ); 156 audioView->addColumn( tr( "Title" ), 140 );
157 audioView->addColumn( tr( "Size" ), -1 ); 157 audioView->addColumn( tr( "Size" ), -1 );
158 audioView->addColumn( tr( "Media" ), -1 ); 158 audioView->addColumn( tr( "Media" ), 0 );
159 audioView->addColumn( tr( "Path" ), 0 ); 159 audioView->addColumn( tr( "Path" ), -1 );
160 audioView->setColumnAlignment( 1, Qt::AlignRight ); 160 audioView->setColumnAlignment( 1, Qt::AlignRight );
161 audioView->setColumnAlignment( 2, Qt::AlignRight ); 161 audioView->setColumnAlignment( 2, Qt::AlignRight );
162 audioView->setAllColumnsShowFocus( TRUE ); 162 audioView->setAllColumnsShowFocus( TRUE );
163 audioView->setSorting( 0, TRUE ); 163 audioView->setSorting( 3, TRUE );
164 audioView->setMultiSelection( TRUE ); 164 audioView->setMultiSelection( TRUE );
165 audioView->setSelectionMode( QListView::Extended ); 165 audioView->setSelectionMode( QListView::Extended );
166 Alayout->addMultiCellWidget( audioView, 0, 0, 0, 1 ); 166 Alayout->addMultiCellWidget( audioView, 0, 0, 0, 1 );
167 tabWidget->insertTab( aTab, tr( "Audio" ) ); 167 tabWidget->insertTab( aTab, tr( "Audio" ) );
168 168
169 QPEApplication::setStylusOperation( audioView->viewport(), QPEApplication::RightOnHold ); 169 QPEApplication::setStylusOperation( audioView->viewport(), QPEApplication::RightOnHold );
170 170
171 QWidget *vTab; 171 QWidget *vTab;
172 vTab = new QWidget( tabWidget, "vTab" ); 172 vTab = new QWidget( tabWidget, "vTab" );
173 173
174 QGridLayout *Vlayout = new QGridLayout( vTab ); 174 QGridLayout *Vlayout = new QGridLayout( vTab );
175 Vlayout->setSpacing( 2 ); 175 Vlayout->setSpacing( 2 );
176 Vlayout->setMargin( 2 ); 176 Vlayout->setMargin( 2 );
177 videoView = new QListView( vTab, "Videoview" ); 177 videoView = new QListView( vTab, "Videoview" );
178 videoView->addColumn( tr( "Title" ), 140); 178 videoView->addColumn( tr( "Title" ), 140);
179 videoView->addColumn( tr( "Size" ), -1 ); 179 videoView->addColumn( tr( "Size" ), -1 );
180 videoView->addColumn(tr( "Media" ), -1 ); 180 videoView->addColumn(tr( "Media" ), 0 );
181 videoView->addColumn(tr( "Path" ), 0 ); 181 videoView->addColumn(tr( "Path" ), -1 );
182 videoView->setColumnAlignment( 1, Qt::AlignRight ); 182 videoView->setColumnAlignment( 1, Qt::AlignRight );
183 videoView->setColumnAlignment( 2, Qt::AlignRight ); 183 videoView->setColumnAlignment( 2, Qt::AlignRight );
184 videoView->setAllColumnsShowFocus( TRUE ); 184 videoView->setAllColumnsShowFocus( TRUE );
185 videoView->setSorting( 0, TRUE ); 185 videoView->setSorting( 3, TRUE );
186 videoView->setMultiSelection( TRUE ); 186 videoView->setMultiSelection( TRUE );
187 videoView->setSelectionMode( QListView::Extended ); 187 videoView->setSelectionMode( QListView::Extended );
188 Vlayout->addMultiCellWidget( videoView, 0, 0, 0, 1 ); 188 Vlayout->addMultiCellWidget( videoView, 0, 0, 0, 1 );
189 189
190 QPEApplication::setStylusOperation( videoView->viewport(), QPEApplication::RightOnHold ); 190 QPEApplication::setStylusOperation( videoView->viewport(), QPEApplication::RightOnHold );
191 191
192 tabWidget->insertTab( vTab, tr( "Video" ) ); 192 tabWidget->insertTab( vTab, tr( "Video" ) );
193 193
194 //playlists list 194 //playlists list
195 QWidget *LTab; 195 QWidget *LTab;
196 LTab = new QWidget( tabWidget, "LTab" ); 196 LTab = new QWidget( tabWidget, "LTab" );
197 QGridLayout *Llayout = new QGridLayout( LTab ); 197 QGridLayout *Llayout = new QGridLayout( LTab );
198 Llayout->setSpacing( 2 ); 198 Llayout->setSpacing( 2 );
199 Llayout->setMargin( 2 ); 199 Llayout->setMargin( 2 );
200 200
201 playLists = new FileSelector( "playlist/plain;audio/x-mpegurl", LTab, "fileselector" , FALSE, FALSE ); 201 playLists = new FileSelector( "playlist/plain;audio/x-mpegurl", LTab, "fileselector" , FALSE, FALSE );
202 Llayout->addMultiCellWidget( playLists, 0, 0, 0, 1 ); 202 Llayout->addMultiCellWidget( playLists, 0, 0, 0, 1 );
203 203
204 tabWidget->insertTab( LTab, tr( "Lists" ) ); 204 tabWidget->insertTab( LTab, tr( "Lists" ) );
205 205
206 setCentralWidget( vbox5 ); 206 setCentralWidget( vbox5 );
207} 207}
208 208
209 209
210 210
211PlayListWidgetGui::~PlayListWidgetGui() { 211PlayListWidgetGui::~PlayListWidgetGui() {
212} 212}
213 213
214void PlayListWidgetGui::setView( char view ) { 214void PlayListWidgetGui::setView( char view ) {
215 if ( view == 'l' ) 215 if ( view == 'l' )
216 showMaximized(); 216 showMaximized();
217 else 217 else
218 hide(); 218 hide();
219} 219}
220 220
221 221
222void PlayListWidgetGui::setActiveWindow() { 222void PlayListWidgetGui::setActiveWindow() {
223 // qDebug("SETTING active window"); 223 // qDebug("SETTING active window");
224 // When we get raised we need to ensure that it switches views 224 // When we get raised we need to ensure that it switches views
225 char origView = mediaPlayerState->view(); 225 char origView = mediaPlayerState->view();
226 mediaPlayerState->setView( 'l' ); // invalidate 226 mediaPlayerState->setView( 'l' ); // invalidate
227 mediaPlayerState->setView( origView ); // now switch back 227 mediaPlayerState->setView( origView ); // now switch back
228} 228}
229 229