// Hide multi tab option until Kdenlive really supports it
m_configMisc.kcfg_activatetabs->setVisible(false);
+ QWidget *p8 = new QWidget;
+ m_configProject.setupUi(p8);
+ m_page8 = addPage(p8, i18n("Project Defaults"), "file-new");
+
QWidget *p3 = new QWidget;
m_configDisplay.setupUi(p3);
m_page3 = addPage(p3, i18n("Display"), "video-display");
m_configCapture.setupUi(p4);
m_page4 = addPage(p4, i18n("Capture"), "media-record");
m_configCapture.tabWidget->setCurrentIndex(KdenliveSettings::defaultcapture());
+#ifdef Q_WS_MAC
+ m_configCapture.tabWidget->setEnabled(false);
+ m_configCapture.kcfg_defaultcapture->setEnabled(false);
+ m_configCapture.label->setText(i18n("Capture is not yet available on OS X."));
+#endif
QWidget *p5 = new QWidget;
m_configShuttle.setupUi(p5);
QWidget *p6 = new QWidget;
m_configSdl.setupUi(p6);
+
+ // Disable drop B frames, see Kdenlive issue #1330
+ m_configSdl.groupBox->setHidden(true);
+
m_page6 = addPage(p6, i18n("Playback"), "media-playback-start");
QWidget *p7 = new QWidget;
connect(m_configCapture.kcfg_video4vdevice, SIGNAL(editingFinished()), this, SLOT(rebuildVideo4Commands()));
connect(m_configCapture.kcfg_video4adevice, SIGNAL(editingFinished()), this, SLOT(rebuildVideo4Commands()));
+ connect(m_configCapture.kcfg_video4vcodec, SIGNAL(editingFinished()), this, SLOT(rebuildVideo4Commands()));
+ connect(m_configCapture.kcfg_video4acodec, SIGNAL(editingFinished()), this, SLOT(rebuildVideo4Commands()));
connect(m_configCapture.kcfg_video4vformat, SIGNAL(editingFinished()), this, SLOT(rebuildVideo4Commands()));
connect(m_configCapture.kcfg_video4aformat, SIGNAL(editingFinished()), this, SLOT(rebuildVideo4Commands()));
connect(m_configCapture.kcfg_video4size, SIGNAL(editingFinished()), this, SLOT(rebuildVideo4Commands()));
connect(m_configSdl.kcfg_audio_driver, SIGNAL(currentIndexChanged(int)), this, SLOT(slotCheckAlsaDriver()));
initDevices();
- connect(m_configMisc.kcfg_profiles_list, SIGNAL(currentIndexChanged(int)), this, SLOT(slotUpdateDisplay()));
+ connect(m_configProject.kcfg_profiles_list, SIGNAL(currentIndexChanged(int)), this, SLOT(slotUpdateDisplay()));
connect(m_configCapture.kcfg_rmd_capture_type, SIGNAL(currentIndexChanged(int)), this, SLOT(slotUpdateRmdRegionStatus()));
slotUpdateRmdRegionStatus();
void KdenliveSettingsDialog::checkProfile()
{
- m_configMisc.kcfg_profiles_list->clear();
+ m_configProject.kcfg_profiles_list->clear();
QMap <QString, QString> profilesInfo = ProfilesDialog::getProfilesInfo();
QMapIterator<QString, QString> i(profilesInfo);
while (i.hasNext()) {
i.next();
- m_configMisc.kcfg_profiles_list->addItem(i.key(), i.value());
+ m_configProject.kcfg_profiles_list->addItem(i.key(), i.value());
}
if (!KdenliveSettings::default_profile().isEmpty()) {
- for (int i = 0; i < m_configMisc.kcfg_profiles_list->count(); i++) {
- if (m_configMisc.kcfg_profiles_list->itemData(i).toString() == KdenliveSettings::default_profile()) {
- m_configMisc.kcfg_profiles_list->setCurrentIndex(i);
+ for (int i = 0; i < m_configProject.kcfg_profiles_list->count(); i++) {
+ if (m_configProject.kcfg_profiles_list->itemData(i).toString() == KdenliveSettings::default_profile()) {
+ m_configProject.kcfg_profiles_list->setCurrentIndex(i);
KdenliveSettings::setProfiles_list(i);
break;
}
{
// Fill audio drivers
m_configSdl.kcfg_audio_driver->addItem(i18n("Automatic"), QString());
+#ifndef Q_WS_MAC
m_configSdl.kcfg_audio_driver->addItem(i18n("OSS"), "dsp");
m_configSdl.kcfg_audio_driver->addItem(i18n("ALSA"), "alsa");
m_configSdl.kcfg_audio_driver->addItem(i18n("PulseAudio"), "pulse");
m_configSdl.kcfg_audio_driver->addItem(i18n("OSS with DMA access"), "dma");
m_configSdl.kcfg_audio_driver->addItem(i18n("Esound daemon"), "esd");
m_configSdl.kcfg_audio_driver->addItem(i18n("ARTS daemon"), "artsc");
+#endif
if (!KdenliveSettings::audiodrivername().isEmpty())
- for (int i = 1;i < m_configSdl.kcfg_audio_driver->count(); i++) {
+ for (int i = 1; i < m_configSdl.kcfg_audio_driver->count(); i++) {
if (m_configSdl.kcfg_audio_driver->itemData(i).toString() == KdenliveSettings::audiodrivername()) {
m_configSdl.kcfg_audio_driver->setCurrentIndex(i);
KdenliveSettings::setAudio_driver((uint) i);
// Fill video drivers
m_configSdl.kcfg_video_driver->addItem(i18n("Automatic"), QString());
+#ifndef Q_WS_MAC
m_configSdl.kcfg_video_driver->addItem(i18n("XVideo"), "x11");
m_configSdl.kcfg_video_driver->addItem(i18n("X11"), "x11_noaccel");
m_configSdl.kcfg_video_driver->addItem(i18n("XFree86 DGA 2.0"), "dga");
m_configSdl.kcfg_video_driver->addItem(i18n("SVGAlib"), "svgalib");
m_configSdl.kcfg_video_driver->addItem(i18n("General graphics interface"), "ggi");
m_configSdl.kcfg_video_driver->addItem(i18n("Ascii art library"), "aalib");
+#endif
// Fill the list of audio playback devices
m_configSdl.kcfg_audio_device->addItem(i18n("Default"), QString());
case 5:
setCurrentPage(m_page5);
break;
-
+ case 6:
+ setCurrentPage(m_page6);
+ break;
+ case 7:
+ setCurrentPage(m_page7);
+ break;
+ default:
+ setCurrentPage(m_page1);
}
}
void KdenliveSettingsDialog::rebuildVideo4Commands()
{
QString captureCommand;
- if (!m_configCapture.kcfg_video4adevice->text().isEmpty()) captureCommand = "-f " + m_configCapture.kcfg_video4aformat->text() + " -i " + m_configCapture.kcfg_video4adevice->text();
+ if (!m_configCapture.kcfg_video4adevice->text().isEmpty()) captureCommand = "-f " + m_configCapture.kcfg_video4aformat->text() + " -i " + m_configCapture.kcfg_video4adevice->text() + " -acodec " + m_configCapture.kcfg_video4acodec->text();
- captureCommand += " -f " + m_configCapture.kcfg_video4vformat->text() + " -s " + m_configCapture.kcfg_video4size->text() + " -r " + QString::number(m_configCapture.kcfg_video4rate->value()) + " -i " + m_configCapture.kcfg_video4vdevice->text();
+ captureCommand += " -f " + m_configCapture.kcfg_video4vformat->text() + " -s " + m_configCapture.kcfg_video4size->text() + " -r " + QString::number(m_configCapture.kcfg_video4rate->value()) + " -i " + m_configCapture.kcfg_video4vdevice->text() + " -vcodec " + m_configCapture.kcfg_video4vcodec->text();
m_configCapture.kcfg_video4capture->setText(captureCommand);
}
{
//kDebug() << "// // // KCONFIG UPDATE called";
- m_defaultProfile = m_configMisc.kcfg_profiles_list->currentText();
+ m_defaultProfile = m_configProject.kcfg_profiles_list->currentText();
KdenliveSettings::setDefault_profile(m_defaultPath);
bool resetProfile = false;
+ bool updateCapturePath = false;
if (m_configEnv.capturefolderurl->url().path() != KdenliveSettings::capturefolder()) {
- kDebug() << "/// CAPT FOLDER UPDATED";
KdenliveSettings::setCapturefolder(m_configEnv.capturefolderurl->url().path());
- emit updateCaptureFolder();
+ updateCapturePath = true;
}
+ if (m_configCapture.kcfg_dvgrabfilename->text() != KdenliveSettings::dvgrabfilename()) {
+ KdenliveSettings::setDvgrabfilename(m_configCapture.kcfg_dvgrabfilename->text());
+ updateCapturePath = true;
+ }
+
+ if ((uint) m_configCapture.kcfg_firewireformat->currentIndex() != KdenliveSettings::firewireformat()) {
+ KdenliveSettings::setFirewireformat(m_configCapture.kcfg_firewireformat->currentIndex());
+ updateCapturePath = true;
+ }
+
+ if (updateCapturePath) emit updateCaptureFolder();
+
QString value = m_configCapture.kcfg_rmd_alsa_device->itemData(m_configCapture.kcfg_rmd_alsa_device->currentIndex()).toString();
if (value != KdenliveSettings::rmd_alsadevicename()) {
KdenliveSettings::setRmd_alsadevicename(value);
resetProfile = true;
}
+ if (m_configSdl.kcfg_window_background->color() != KdenliveSettings::window_background()) {
+ KdenliveSettings::setWindow_background(m_configSdl.kcfg_window_background->color());
+ resetProfile = true;
+ }
+
+ if (m_configSdl.kcfg_volume->value() != KdenliveSettings::volume()) {
+ KdenliveSettings::setVolume(m_configSdl.kcfg_volume->value());
+ resetProfile = true;
+ }
+
bool updatePreview = false;
if (m_configSdl.kcfg_dropbframes->isChecked() != KdenliveSettings::dropbframes()) {
KdenliveSettings::setDropbframes(m_configSdl.kcfg_dropbframes->isChecked());
void KdenliveSettingsDialog::slotUpdateDisplay()
{
- QString currentProfile = m_configMisc.kcfg_profiles_list->itemData(m_configMisc.kcfg_profiles_list->currentIndex()).toString();
+ QString currentProfile = m_configProject.kcfg_profiles_list->itemData(m_configProject.kcfg_profiles_list->currentIndex()).toString();
QMap< QString, QString > values = ProfilesDialog::getSettingsFromFile(currentProfile);
- m_configMisc.p_size->setText(values.value("width") + 'x' + values.value("height"));
- m_configMisc.p_fps->setText(values.value("frame_rate_num") + '/' + values.value("frame_rate_den"));
- m_configMisc.p_aspect->setText(values.value("sample_aspect_num") + '/' + values.value("sample_aspect_den"));
- m_configMisc.p_display->setText(values.value("display_aspect_num") + '/' + values.value("display_aspect_den"));
- if (values.value("progressive").toInt() == 0) m_configMisc.p_progressive->setText(i18n("Interlaced"));
- else m_configMisc.p_progressive->setText(i18n("Progressive"));
- m_defaultProfile = m_configMisc.kcfg_profiles_list->itemText(m_configMisc.kcfg_profiles_list->currentIndex());
+ m_configProject.p_size->setText(values.value("width") + 'x' + values.value("height"));
+ m_configProject.p_fps->setText(values.value("frame_rate_num") + '/' + values.value("frame_rate_den"));
+ m_configProject.p_aspect->setText(values.value("sample_aspect_num") + '/' + values.value("sample_aspect_den"));
+ m_configProject.p_display->setText(values.value("display_aspect_num") + '/' + values.value("display_aspect_den"));
+ if (values.value("progressive").toInt() == 0) m_configProject.p_progressive->setText(i18n("Interlaced"));
+ else m_configProject.p_progressive->setText(i18n("Progressive"));
+ m_defaultProfile = m_configProject.kcfg_profiles_list->itemText(m_configProject.kcfg_profiles_list->currentIndex());
m_defaultPath = currentProfile;
}
projects / kdenlive / blobdiff