* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
-#include <QDir>
-#include <QTimer>
+#include "kdenlivesettingsdialog.h"
+#include "profilesdialog.h"
+#include "kdenlivesettings.h"
#include <KStandardDirs>
#include <KDebug>
#include <kopenwithdialog.h>
+#include <KConfigDialogManager>
+#include <kde_file.h>
+
+#include <QDir>
+#include <QTimer>
#include <stdlib.h>
#include <stdio.h>
#include <linux/input.h>
#endif /* NO_JOGSHUTTLE */
-#include "profilesdialog.h"
-#include "kdenlivesettings.h"
-#include "kdenlivesettingsdialog.h"
KdenliveSettingsDialog::KdenliveSettingsDialog(QWidget * parent): KConfigDialog(parent, "settings", KdenliveSettings::self()) {
m_configMisc.setupUi(p1);
page1 = addPage(p1, i18n("Misc"), "configure");
+ // Hide multi tab option until Kdenlive really supports it
+ m_configMisc.kcfg_activatetabs->setVisible(false);
+
QWidget *p3 = new QWidget;
m_configDisplay.setupUi(p3);
page3 = addPage(p3, i18n("Display"), "display");
connect(m_configEnv.kp_audio, SIGNAL(clicked()), this, SLOT(slotEditAudioApplication()));
connect(m_configEnv.kp_player, SIGNAL(clicked()), this, SLOT(slotEditVideoApplication()));
-
-
- 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());
- }
-
checkProfile();
+
slotUpdateDisplay();
initDevices();
connect(m_configMisc.kcfg_profiles_list, SIGNAL(currentIndexChanged(int)), this, SLOT(slotUpdateDisplay()));
-
connect(m_configCapture.kcfg_rmd_capture_type, SIGNAL(currentIndexChanged(int)), this, SLOT(slotUpdateRmdRegionStatus()));
slotUpdateRmdRegionStatus();
m_configCapture.kcfg_firewiretimestamp->setEnabled(false);
}
m_configCapture.dvgrab_info->setText(i18n("dvgrab version %1 at %2", dvgrabVersion, KdenliveSettings::dvgrab_path()));
- } else m_configCapture.dvgrab_info->setText("<strong>" + i18n("<em>dvgrab</em> utility not found, please install it for firewire capture") + "</strong>");
+ } else m_configCapture.dvgrab_info->setText(i18n("<strong><em>dvgrab</em> utility not found, please install it for firewire capture</strong>"));
if (KdenliveSettings::rmd_path().isEmpty() || !QFile::exists(KdenliveSettings::rmd_path())) {
QString rmdpath = KStandardDirs::findExe("recordmydesktop");
KdenliveSettings::setRmd_path(rmdpath);
}
- if (KdenliveSettings::rmd_path().isEmpty()) m_configCapture.rmd_info->setText("<strong>" + i18n("<em>Recordmydesktop</em> utility not found, please install it for screen grabs") + "</strong>");
+ if (KdenliveSettings::rmd_path().isEmpty()) m_configCapture.rmd_info->setText(i18n("<strong><em>Recordmydesktop</em> utility not found, please install it for screen grabs</strong>"));
else m_configCapture.rmd_info->setText(i18n("Recordmydesktop found at: %1", KdenliveSettings::rmd_path()));
}
}
void KdenliveSettingsDialog::checkProfile() {
+ m_configMisc.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());
+ }
+
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_configSdl.kcfg_audio_driver->addItem(i18n("Automatic"), QString());
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");
- /*if (!KdenliveSettings::audiodriver().isEmpty())
- for (uint i = 1;i < m_configDisplay.kcfg_audio_driver->count(); i++) {
- if (m_configDisplay.kcfg_audio_driver->itemData(i).toString() == KdenliveSettings::audiodriver())
- m_configDisplay.kcfg_audio_driver->setCurrentIndex(i);
- }*/
+ if (!KdenliveSettings::audiodrivername().isEmpty())
+ 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());
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("XFree86 DGA 2.0"), "dga");
m_configSdl.kcfg_video_driver->addItem(i18n("Nano X"), "nanox");
m_configSdl.kcfg_video_driver->addItem(i18n("Framebuffer console"), "fbcon");
m_configSdl.kcfg_video_driver->addItem(i18n("Direct FB"), "directfb");
m_configSdl.kcfg_video_driver->addItem(i18n("Ascii art library"), "aalib");
// Fill the list of audio playback devices
- m_configSdl.audio_device->addItem(i18n("Default"), QString());
- m_configCapture.rmd_alsa_device->addItem(i18n("Default"), QString());
- if (KStandardDirs::findExe("aplay") != QString::null) {
+ m_configSdl.kcfg_audio_device->addItem(i18n("Default"), QString());
+ m_configCapture.kcfg_rmd_alsa_device->addItem(i18n("Default"), QString());
+ if (!KStandardDirs::findExe("aplay").isEmpty()) {
m_readProcess.setOutputChannelMode(KProcess::OnlyStdoutChannel);
m_readProcess.setProgram("aplay", QStringList() << "-l");
connect(&m_readProcess, SIGNAL(readyReadStandardOutput()) , this, SLOT(slotReadAudioDevices()));
while (!stream.atEnd()) {
line = stream.readLine();
if (line.contains("playback")) {
- deviceId = line.section(":", 0, 0);
- m_configSdl.audio_device->addItem(line.section(":", 1, 1), "plughw:" + QString::number(deviceId.section("-", 0, 0).toInt()) + "," + QString::number(deviceId.section("-", 1, 1).toInt()));
+ deviceId = line.section(':', 0, 0);
+ m_configSdl.kcfg_audio_device->addItem(line.section(':', 1, 1), "plughw:" + QString::number(deviceId.section('-', 0, 0).toInt()) + ',' + QString::number(deviceId.section('-', 1, 1).toInt()));
}
if (line.contains("capture")) {
- deviceId = line.section(":", 0, 0);
- m_configCapture.rmd_alsa_device->addItem(line.section(":", 1, 1), "plughw:" + QString::number(deviceId.section("-", 0, 0).toInt()) + "," + QString::number(deviceId.section("-", 1, 1).toInt()));
+ deviceId = line.section(':', 0, 0);
+ m_configCapture.kcfg_rmd_alsa_device->addItem(line.section(':', 1, 1), "plughw:" + QString::number(deviceId.section('-', 0, 0).toInt()) + ',' + QString::number(deviceId.section('-', 1, 1).toInt()));
}
}
file.close();
}
if (!KdenliveSettings::audiodevicename().isEmpty()) {
// Select correct alsa device
- int ix = m_configSdl.audio_device->findData(KdenliveSettings::audiodevicename());
- if (ix > 0) m_configSdl.audio_device->setCurrentIndex(ix);
+ int ix = m_configSdl.kcfg_audio_device->findData(KdenliveSettings::audiodevicename());
+ m_configSdl.kcfg_audio_device->setCurrentIndex(ix);
+ KdenliveSettings::setAudio_device(ix);
}
if (!KdenliveSettings::rmd_alsadevicename().isEmpty()) {
// Select correct alsa device
- int ix = m_configCapture.rmd_alsa_device->findData(KdenliveSettings::rmd_alsadevicename());
- if (ix > 0) m_configCapture.rmd_alsa_device->setCurrentIndex(ix);
+ int ix = m_configCapture.kcfg_rmd_alsa_device->findData(KdenliveSettings::rmd_alsadevicename());
+ m_configCapture.kcfg_rmd_alsa_device->setCurrentIndex(ix);
+ KdenliveSettings::setRmd_alsa_device(ix);
}
}
kDebug() << "// / / / / / READING APLAY: ";
kDebug() << result;
QStringList lines = result.split('\n');
- foreach(QString data, lines) {
+ foreach(const QString &data, lines) {
kDebug() << "// READING LINE: " << data;
if (data.simplified().startsWith("card")) {
- QString card = data.section(":", 0, 0).section(" ", -1);
- QString device = data.section(":", 1, 1).section(" ", -1);
- m_configSdl.audio_device->addItem(data.section(":", -1), "plughw:" + card + "," + device);
- m_configCapture.rmd_alsa_device->addItem(data.section(":", -1), "plughw:" + card + "," + device);
+ QString card = data.section(':', 0, 0).section(' ', -1);
+ QString device = data.section(':', 1, 1).section(' ', -1);
+ m_configSdl.kcfg_audio_device->addItem(data.section(':', -1), "plughw:" + card + ',' + device);
+ m_configCapture.kcfg_rmd_alsa_device->addItem(data.section(':', -1), "plughw:" + card + ',' + device);
}
}
}
kDebug() << "/// CHECKING OFR: " << filename;
char name[256] = "unknown";
- fd = ::open((char *) filename.toUtf8().data(), O_RDONLY);
+ fd = KDE_open((char *) filename.toUtf8().data(), O_RDONLY);
if (fd >= 0 && ioctl(fd, EVIOCGNAME(sizeof(name)), name) >= 0) {
m_configShuttle.shuttledevicelist->addItem(name, filename);
}
}
-// virtual protected
-bool KdenliveSettingsDialog::isDefault() {
- return KConfigDialog::isDefault();
-}
-
-// virtual protected
-bool KdenliveSettingsDialog::hasChanged() {
- kDebug() << "// // // KCONFIG hasChanged called: " << m_configMisc.kcfg_profiles_list->currentText() << ", " << m_defaultProfile;
-
- if (m_configMisc.kcfg_profiles_list->currentText() != m_defaultProfile) return true;
- return KConfigDialog::hasChanged();
-}
-
void KdenliveSettingsDialog::updateSettings() {
kDebug() << "// // // KCONFIG UPDATE called";
m_defaultProfile = m_configMisc.kcfg_profiles_list->currentText();
KdenliveSettings::setDefault_profile(m_defaultPath);
bool resetProfile = false;
- QString value = m_configSdl.audio_device->itemData(m_configSdl.audio_device->currentIndex()).toString();
+ QString value = m_configSdl.kcfg_audio_device->itemData(m_configSdl.kcfg_audio_device->currentIndex()).toString();
if (value != KdenliveSettings::audiodevicename()) {
KdenliveSettings::setAudiodevicename(value);
resetProfile = true;
}
- value = m_configCapture.rmd_alsa_device->itemData(m_configCapture.rmd_alsa_device->currentIndex()).toString();
+ 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);
}
void KdenliveSettingsDialog::slotUpdateDisplay() {
QString currentProfile = m_configMisc.kcfg_profiles_list->itemData(m_configMisc.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"));
+ 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());
projects / kdenlive / blobdiff