Ticket #20: mythmusic_qual_chooser_fix_tr.diff

mythmusic/cdrip.h

@@ -49 +49 @@
     QFrame *firstdiag;
 
     MythComboBox *artistedit;
+    MythComboBox *qualchooser;
     MythLineEdit *albumedit;
     MythComboBox *genreedit;
     MythCheckBox *compilation;
@@ -56 +57 @@
 
     MythTable *table;
 
-    MythButtonGroup *qualitygroup;
-
     QLabel *statusline;
     QProgressBar *overall;
     QProgressBar *current;

mythmusic/cdrip.cpp

@@ -73 +73 @@
     inst->setBackgroundOrigin(WindowOrigin);
     vbox->addWidget(inst);
 
-    QHBoxLayout *qualbox = new QHBoxLayout(vbox, 10);
-    qualitygroup = new MythButtonGroup(firstdiag);
-    qualitygroup->setFrameStyle(QFrame::NoFrame);
-    qualitygroup->hide();
+    QLabel *quality = new QLabel(tr("Quality: "), firstdiag);
+    quality->setBackgroundOrigin(WindowOrigin);
 
-    QRadioButton *lowquality = new QRadioButton(tr("Low"), firstdiag);
-    lowquality->setBackgroundOrigin(WindowOrigin);
-    qualbox->addWidget(lowquality);
-    qualitygroup->insert(lowquality);
+    qualchooser = new MythComboBox(false, firstdiag);
+    qualchooser->insertItem(tr("Low"));
+    qualchooser->insertItem(tr("Medium"));
+    qualchooser->insertItem(tr("High"));
+    qualchooser->insertItem(tr("Perfect"));
+    qualchooser->setCurrentItem(gContext->GetNumSetting("DefaultRipQuality", 1));
+    qualchooser->setMaximumWidth(screenwidth / 2);
 
-    QRadioButton *mediumquality = new QRadioButton(tr("Medium"), firstdiag);
-    mediumquality->setBackgroundOrigin(WindowOrigin);
-    qualbox->addWidget(mediumquality);
-    qualitygroup->insert(mediumquality);
-
-    QRadioButton *highquality = new QRadioButton(tr("High"), firstdiag);
-    highquality->setBackgroundOrigin(WindowOrigin);
-    qualbox->addWidget(highquality);
-    qualitygroup->insert(highquality);
-
-    QRadioButton *perfectflac = new QRadioButton(tr("Perfect"), firstdiag);
-    perfectflac->setBackgroundOrigin(WindowOrigin);
-    qualbox->addWidget(perfectflac);
-    qualitygroup->insert(perfectflac);
-
-    qualitygroup->setRadioButtonExclusive(true);
-    qualitygroup->setButton(gContext->GetNumSetting("DefaultRipQuality", 1));
-
     QGridLayout *grid = new QGridLayout(vbox, 1, 1, 20);
     
     QLabel *artistl = new QLabel(tr("Artist: "), firstdiag);
@@ -136 +119 @@
     connect(switchtitleartist, SIGNAL(clicked()), this, SLOT(switchTitlesAndArtists())); 
     
 
-    grid->addMultiCellWidget(artistl, 0, 0, 0, 0);
-    grid->addMultiCellWidget(artistedit,  0, 0, 1, 2);
-    grid->addMultiCellWidget(albuml, 1, 1, 0, 0);
-    grid->addMultiCellWidget(albumedit,  1, 1, 1, 2);
-    grid->addMultiCellWidget(genrelabel, 2, 2, 0, 0);
-    grid->addMultiCellWidget(genreedit, 2, 2, 1, 2);
-    grid->addMultiCellWidget(compilation, 3, 3, 0, 0);
-    grid->addMultiCellWidget(switchtitleartist, 3, 3, 1, 2);
+    grid->addMultiCellWidget(quality, 0, 0, 0, 0);
+    grid->addMultiCellWidget(qualchooser,  0, 0, 1, 2);
+    grid->addMultiCellWidget(artistl, 1, 1, 0, 0);
+    grid->addMultiCellWidget(artistedit,  1, 1, 1, 2);
+    grid->addMultiCellWidget(albuml, 2, 2, 0, 0);
+    grid->addMultiCellWidget(albumedit,  2, 2, 1, 2);
+    grid->addMultiCellWidget(genrelabel, 3, 3, 0, 0);
+    grid->addMultiCellWidget(genreedit, 3, 3, 1, 2);
+    grid->addMultiCellWidget(compilation, 4, 4, 0, 0);
+    grid->addMultiCellWidget(switchtitleartist, 4, 4, 1, 2);
 
     table = new MythTable(firstdiag);
-    grid->addMultiCellWidget(table, 4, 4, 0, 2);
+    grid->addMultiCellWidget(table, 5, 5, 0, 2);
     table->setNumCols(4);
     table->setLeftMargin(0);
     table->setNumRows(1);
@@ -625 +610 @@
     overall->setBackgroundOrigin(WindowOrigin);
     overall->setProgress(0);
     vb->addWidget(overall);
-    
+
     statusline = new QLabel(" ", newdiag);
     statusline->setBackgroundOrigin(WindowOrigin);
     statusline->setAlignment(AlignAuto | AlignVCenter | ExpandTabs | WordBreak);
@@ -644 +629 @@
     QString textstatus;
     QString cddevice = gContext->GetSetting("CDDevice");
     QString encodertype = gContext->GetSetting("EncoderType");
-    int encodequal = qualitygroup->id(qualitygroup->selected());
+    int encodequal = qualchooser->currentItem();
     bool mp3usevbr = gContext->GetNumSetting("Mp3UseVBR", 0);
 
     CdDecoder *decoder = new CdDecoder("cda", NULL, NULL, NULL);