Diffstat (limited to 'noncore/multimedia/opierec/qtrec.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opierec/qtrec.cpp | 115 |
1 files changed, 65 insertions, 50 deletions
diff --git a/noncore/multimedia/opierec/qtrec.cpp b/noncore/multimedia/opierec/qtrec.cpp index 75413be..d8b8ce3 100644 --- a/noncore/multimedia/opierec/qtrec.cpp +++ b/noncore/multimedia/opierec/qtrec.cpp @@ -467,6 +467,4 @@ void QtRec::init() { needsStereoOut = false; - QPixmap image3( ( const char** ) image3_data ); - QPixmap image4( ( const char** ) image4_data ); QPixmap image6( ( const char** ) image6_data ); @@ -502,5 +500,5 @@ void QtRec::init() { layout1->addMultiCellWidget( Stop_PushButton, 1, 1, 4, 4); Stop_PushButton->setFixedSize( 22, 22); - Stop_PushButton->setPixmap( image4 ); + Stop_PushButton->setPixmap( Opie::Core::OResource::loadPixmap("play2", Opie::Core::OResource::SmallIcon) ); toBeginningButton = new QPushButton( tab, "Beginning_PushButton" ); @@ -538,5 +536,6 @@ void QtRec::init() { deleteSoundButton = new QPushButton( tab, "deleteSoundButton" ); layout1->addMultiCellWidget( deleteSoundButton, 1, 1, 8, 8); - deleteSoundButton->setText( tr( "Del" ) ); + deleteSoundButton->setFixedSize( 22, 22); + deleteSoundButton->setPixmap( Opie::Core::OResource::loadPixmap( "editdelete", Opie::Core::OResource::SmallIcon ) ); ListView1 = new QListView( tab, "IconView1" ); @@ -546,6 +545,8 @@ void QtRec::init() { ListView1->setSorting( 1, false); ListView1->addColumn( tr( "Time" ) ); //in seconds + ListView1->addColumn( tr( "Size" ) ); ListView1->setColumnWidthMode(0, QListView::Maximum); - ListView1->setColumnAlignment( 1, QListView::AlignCenter); + ListView1->setColumnAlignment( 1, QListView::AlignRight); + ListView1->setColumnAlignment( 2, QListView::AlignRight); ListView1->setAllColumnsShowFocus( true ); QPEApplication::setStylusOperation( ListView1->viewport(), QPEApplication::RightOnHold); @@ -703,8 +704,10 @@ void QtRec::initIconView() { fileS = cfg.readEntry( filePath, "0" );// file length in seconds + QString sizeStr; + fileSize(info.size(), sizeStr); mediaLocation = getStorage( filePath); if( info.exists()) { // owarn << "new item " << temp << oendl; - item = new QListViewItem( ListView1, temp, fileS /*, mediaLocation, fileDate*/); + item = new QListViewItem( ListView1, temp, fileS, sizeStr ); item->setPixmap( 0, image0); if( currentFileName == filePath) @@ -712,4 +715,6 @@ void QtRec::initIconView() { } } + + setButtons(); } @@ -787,5 +792,5 @@ void QtRec::initConfig() { sizeLimitCombo->setCurrentItem((i/5)); - stereoCheckBox->setChecked( cfg.readBoolEntry("stereo", 1)); + stereoCheckBox->setChecked( cfg.readBoolEntry("stereo", 0)); if( stereoCheckBox->isChecked()) { filePara.channels = 2; @@ -815,5 +820,4 @@ void QtRec::initConfig() { void QtRec::stop() { // owarn << "STOP" << oendl; - setRecordButton(false); if( !recording) { @@ -825,4 +829,5 @@ void QtRec::stop() { } timeSlider->setValue(0); + setButtons(); } @@ -842,9 +847,7 @@ void QtRec::doPlayBtn() { void QtRec::start() { //play if( stopped) { - QPixmap image3( ( const char** ) image3_data ); - Stop_PushButton->setPixmap( image3 ); - Stop_PushButton->setDown( true); stopped = false; paused = false; + setButtons(); secCount = 1; @@ -866,5 +869,5 @@ bool QtRec::rec() { //record // playLabel2->setText(tr("Stop")); monitoring = false; - setRecordButton( true); + setButtons(); if( setupAudio( true)) @@ -922,6 +925,5 @@ bool QtRec::rec() { //record pthread_create( &thread1, NULL, (void * (*)(void *))quickRec, NULL/* &*/); #endif - toBeginningButton->setEnabled( false); - toEndButton->setEnabled( false); + setButtons(); startTimer(1000); @@ -1141,6 +1143,5 @@ bool QtRec::doPlay() { #endif - toBeginningButton->setEnabled( false); - toEndButton->setEnabled( false); + setButtons(); #ifndef THREADED playIt(); @@ -1206,7 +1207,6 @@ void QtRec::changeSizeLimitCombo(int) { void QtRec::newSound() { - if( !rec()) { - endRecording(); - deleteSound(); + if(!rec()) { + stop(); } } @@ -1222,4 +1222,6 @@ void QtRec::deleteSound() { if( ListView1->currentItem() == NULL) return; + + if (QMessageBox::information(this, tr("Delete"), tr("Are you sure?"), QMessageBox::Yes, QMessageBox::No)==QMessageBox::Yes) { QString file = ListView1->currentItem()->text(0); QString fileName; @@ -1255,4 +1257,5 @@ void QtRec::deleteSound() { update(); setCaption( tr( "OpieRecord " )); + } } @@ -1377,8 +1380,6 @@ void QtRec::endRecording() { stopped = true; waveform->reset(); - setRecordButton( false); - toBeginningButton->setEnabled( true); - toEndButton->setEnabled( true); + setButtons(); killTimers(); @@ -1443,8 +1444,5 @@ void QtRec::endPlaying() { // errorStop(); odebug << "end playing" << oendl; - setRecordButton( false); - - toBeginningButton->setEnabled( true); - toEndButton->setEnabled( true); + setButtons(); if(autoMute) @@ -1532,4 +1530,5 @@ void QtRec::listPressed( int mouse, QListViewItem *item, const QPoint &, int ) { currentFile = item->text(0); + setButtons(); // setCaption( "OpieRecord " + currentFile); } @@ -1591,4 +1590,5 @@ void QtRec::doMenuPlay() { qApp->processEvents(); currentFile = ListView1->currentItem()->text(0); + doPlayBtn(); } @@ -1628,4 +1628,7 @@ void QtRec::okRename() { QString file = ListView1->currentItem()->text(0); + if(file == filename) + return; + odebug << "filename is " + filename << oendl; @@ -1939,27 +1942,4 @@ QString QtRec::getStorage(const QString &fileName) { } -void QtRec::setRecordButton(bool b) { - - if(b) { //about to record or play - - Rec_PushButton->setDown( true); - QPixmap image3( ( const char** ) image3_data ); - Stop_PushButton->setPixmap( image3 ); - if(Stop_PushButton->isDown()) - Stop_PushButton->setDown( true); -// playLabel2->setText( tr("Stop") ); - - } else { //about to stop - - QPixmap image4( ( const char** ) image4_data ); - Stop_PushButton->setPixmap( image4); - if(Stop_PushButton->isDown()) - Stop_PushButton->setDown( false); -// playLabel2->setText( tr("Play") ); - if(Rec_PushButton->isDown()) - Rec_PushButton->setDown( false); - } -} - void QtRec::fillDirectoryCombo() { if( directoryComboBox->count() > 0) @@ -2051,3 +2031,38 @@ void QtRec::changeStereoCheck(bool b) { } - +void QtRec::setButtons() { + if(stopped) { + Stop_PushButton->setPixmap( Opie::Core::OResource::loadPixmap("play2", Opie::Core::OResource::SmallIcon) ); + if(ListView1->currentItem()) { + Stop_PushButton->setEnabled(true); + toBeginningButton->setEnabled(true); + toEndButton->setEnabled(true); + deleteSoundButton->setEnabled(true); + timeSlider->setEnabled(true); + } + else { + Stop_PushButton->setEnabled(false); + toBeginningButton->setEnabled(false); + toEndButton->setEnabled(false); + deleteSoundButton->setEnabled(false); + timeSlider->setEnabled(false); + } + } + else { + timeSlider->setEnabled(true); + Stop_PushButton->setPixmap( Opie::Core::OResource::loadPixmap("stop", Opie::Core::OResource::SmallIcon) ); + Stop_PushButton->setEnabled(true); + toBeginningButton->setEnabled(false); + toEndButton->setEnabled(false); + deleteSoundButton->setEnabled(false); + } +} + +void QtRec::fileSize(unsigned long size, QString &str) { + if( size > 1048576 ) + str.sprintf( "%.0fM", size / 1048576.0 ); + else if( size > 1024 ) + str.sprintf( "%.0fk", size / 1024.0 ); + else + str.sprintf( "%d", size ); +} |