OSDN Git Service

Force column resize, after an item in the source file list has been edited.
[lamexp/LameXP.git] / src / Dialog_MainWindow.cpp
index b242789..d20bd26 100644 (file)
@@ -90,6 +90,7 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel *metaInfo, S
        m_settings(settingsModel),
        m_neroEncoderAvailable(lamexp_check_tool("neroAacEnc.exe") && lamexp_check_tool("neroAacDec.exe") && lamexp_check_tool("neroAacTag.exe")),
        m_fhgEncoderAvailable(lamexp_check_tool("fhgaacenc.exe") && lamexp_check_tool("enc_fhgaac.dll") && lamexp_check_tool("nsutil.dll") && lamexp_check_tool("libmp4v2.dll")),
+       m_qaacEncoderAvailable(lamexp_check_tool("qaac.exe") && lamexp_check_tool("libsoxrate.dll")),
        m_accepted(false),
        m_firstTimeShown(true),
        m_OutputFolderViewInitialized(false)
@@ -207,10 +208,10 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel *metaInfo, S
        m_modeButtonGroup->addButton(radioButtonModeQuality, SettingsModel::VBRMode);
        m_modeButtonGroup->addButton(radioButtonModeAverageBitrate, SettingsModel::ABRMode);
        m_modeButtonGroup->addButton(radioButtonConstBitrate, SettingsModel::CBRMode);
-       radioButtonEncoderAAC->setEnabled(m_neroEncoderAvailable || m_fhgEncoderAvailable);
+       radioButtonEncoderAAC->setEnabled(m_neroEncoderAvailable || m_fhgEncoderAvailable || m_qaacEncoderAvailable);
        radioButtonEncoderMP3->setChecked(m_settings->compressionEncoder() == SettingsModel::MP3Encoder);
        radioButtonEncoderVorbis->setChecked(m_settings->compressionEncoder() == SettingsModel::VorbisEncoder);
-       radioButtonEncoderAAC->setChecked((m_settings->compressionEncoder() == SettingsModel::AACEncoder) && (m_neroEncoderAvailable || m_fhgEncoderAvailable));
+       radioButtonEncoderAAC->setChecked((m_settings->compressionEncoder() == SettingsModel::AACEncoder) && (m_neroEncoderAvailable || m_fhgEncoderAvailable || m_qaacEncoderAvailable));
        radioButtonEncoderAC3->setChecked(m_settings->compressionEncoder() == SettingsModel::AC3Encoder);
        radioButtonEncoderFLAC->setChecked(m_settings->compressionEncoder() == SettingsModel::FLACEncoder);
        radioButtonEncoderPCM->setChecked(m_settings->compressionEncoder() == SettingsModel::PCMEncoder);
@@ -246,7 +247,7 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel *metaInfo, S
        while(checkBoxUseSystemTempFolder->isChecked() == m_settings->customTempPathEnabled()) checkBoxUseSystemTempFolder->click();
        while(checkBoxRenameOutput->isChecked() != m_settings->renameOutputFilesEnabled()) checkBoxRenameOutput->click();
        while(checkBoxForceStereoDownmix->isChecked() != m_settings->forceStereoDownmix()) checkBoxForceStereoDownmix->click();
-       checkBoxNeroAAC2PassMode->setEnabled(!m_fhgEncoderAvailable);
+       checkBoxNeroAAC2PassMode->setEnabled(!(m_fhgEncoderAvailable || m_qaacEncoderAvailable));
        lineEditCustomParamLAME->setText(m_settings->customParametersLAME());
        lineEditCustomParamOggEnc->setText(m_settings->customParametersOggEnc());
        lineEditCustomParamNeroAAC->setText(m_settings->customParametersAacEnc());
@@ -1042,7 +1043,7 @@ void MainWindow::windowShown(void)
        }
        else
        {
-               if(m_settings->neroAacNotificationsEnabled() && (!m_fhgEncoderAvailable))
+               if(m_settings->neroAacNotificationsEnabled() && (!(m_fhgEncoderAvailable || m_qaacEncoderAvailable)))
                {
                        QString appPath = QDir(QCoreApplication::applicationDirPath()).canonicalPath();
                        if(appPath.isEmpty()) appPath = QCoreApplication::applicationDirPath();
@@ -1949,6 +1950,8 @@ void MainWindow::showDetailsButtonClicked(void)
        }
 
        LAMEXP_DELETE(metaInfoDialog);
+       QApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
+       sourceFilesScrollbarMoved(0);
 }
 
 /*