"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/dvb/dvbconfigdialog.cpp" between
kaffeine-2.0.16.tar.gz and kaffeine-2.0.17.tar.gz

About: Kaffeine is a full featured Multimedia-Player for KDE (default backend is xine).

dvbconfigdialog.cpp  (kaffeine-2.0.16):dvbconfigdialog.cpp  (kaffeine-2.0.17)
skipping to change at line 74 skipping to change at line 74
mainLayout->addWidget(tabWidget); mainLayout->addWidget(tabWidget);
QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept())); connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject())); connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
QWidget *widget = new QWidget(tabWidget); QWidget *widget = new QWidget(tabWidget);
mainLayout->addWidget(widget); mainLayout->addWidget(widget);
QBoxLayout *boxLayout = new QVBoxLayout(widget); QBoxLayout *boxLayout = new QVBoxLayout(widget);
int line = 0;
QGridLayout *gridLayout = new QGridLayout(); QGridLayout *gridLayout = new QGridLayout();
gridLayout->addWidget(new QLabel(i18n("Recording folder:")), 0, 0); gridLayout->addWidget(new QLabel(i18n("Recording folder:")), line, 0);
recordingFolderEdit = new QLineEdit(widget); recordingFolderEdit = new QLineEdit(widget);
recordingFolderEdit->setText(manager->getRecordingFolder()); recordingFolderEdit->setText(manager->getRecordingFolder());
gridLayout->addWidget(recordingFolderEdit, 0, 1); gridLayout->addWidget(recordingFolderEdit, line, 1);
QToolButton *toolButton = new QToolButton(widget); QToolButton *toolButton = new QToolButton(widget);
toolButton->setIcon(QIcon::fromTheme(QLatin1String("document-open-folder" ), QIcon(":document-open-folder"))); toolButton->setIcon(QIcon::fromTheme(QLatin1String("document-open-folder" ), QIcon(":document-open-folder")));
toolButton->setToolTip(i18n("Select Folder")); toolButton->setToolTip(i18n("Select Folder"));
connect(toolButton, SIGNAL(clicked()), this, SLOT(changeRecordingFolder() )); connect(toolButton, SIGNAL(clicked()), this, SLOT(changeRecordingFolder() ));
gridLayout->addWidget(toolButton, 0, 2); gridLayout->addWidget(toolButton, line++, 2);
gridLayout->addWidget(new QLabel(i18n("Time shift folder:")), 1, 0); gridLayout->addWidget(new QLabel(i18n("Time shift folder:")), line, 0);
timeShiftFolderEdit = new QLineEdit(widget); timeShiftFolderEdit = new QLineEdit(widget);
timeShiftFolderEdit->setText(manager->getTimeShiftFolder()); timeShiftFolderEdit->setText(manager->getTimeShiftFolder());
gridLayout->addWidget(timeShiftFolderEdit, 1, 1); gridLayout->addWidget(timeShiftFolderEdit, line, 1);
toolButton = new QToolButton(widget); toolButton = new QToolButton(widget);
toolButton->setIcon(QIcon::fromTheme(QLatin1String("document-open-folder" ), QIcon(":document-open-folder"))); toolButton->setIcon(QIcon::fromTheme(QLatin1String("document-open-folder" ), QIcon(":document-open-folder")));
toolButton->setToolTip(i18n("Select Folder")); toolButton->setToolTip(i18n("Select Folder"));
connect(toolButton, SIGNAL(clicked()), this, SLOT(changeTimeShiftFolder() )); connect(toolButton, SIGNAL(clicked()), this, SLOT(changeTimeShiftFolder() ));
gridLayout->addWidget(toolButton, 1, 2); gridLayout->addWidget(toolButton, line++, 2);
gridLayout->addWidget(new QLabel(i18n("xmltv file name (optional):")), li
ne, 0);
xmltvFileNameEdit = new QLineEdit(widget);
xmltvFileNameEdit->setText(manager->getXmltvFileName());
gridLayout->addWidget(xmltvFileNameEdit, line, 1);
toolButton = new QToolButton(widget);
toolButton->setIcon(QIcon::fromTheme(QLatin1String("document-open-folder"
), QIcon(":document-open-folder")));
toolButton->setToolTip(i18n("Add optional file to allow reading EPG data
from xmltv files"));
connect(toolButton, SIGNAL(clicked()), this, SLOT(changeXmltvFileName()))
;
gridLayout->addWidget(toolButton, line++, 2);
gridLayout->addWidget(new QLabel(i18n("Disable parsing EPG data from MPEG
-TS tables:")),
line, 0);
toolButton->setToolTip(i18n("Use this if your TV provider doesn't broadca
st reliable EPG data"));
disableEpgBox = new QCheckBox(widget);
disableEpgBox->setChecked(manager->disableEpg());
gridLayout->addWidget(disableEpgBox, line++, 1);
boxLayout->addLayout(gridLayout); boxLayout->addLayout(gridLayout);
gridLayout = new QGridLayout(); gridLayout = new QGridLayout();
gridLayout->addWidget(new QLabel(i18n("Begin margin (minutes):")), 2, 0); gridLayout->addWidget(new QLabel(i18n("Begin margin (minutes):")), line, 0);
beginMarginBox = new QSpinBox(widget); beginMarginBox = new QSpinBox(widget);
beginMarginBox->setRange(0, 99); beginMarginBox->setRange(0, 99);
beginMarginBox->setValue(manager->getBeginMargin() / 60); beginMarginBox->setValue(manager->getBeginMargin() / 60);
gridLayout->addWidget(beginMarginBox, 2, 1); gridLayout->addWidget(beginMarginBox, line++, 1);
gridLayout->addWidget(new QLabel(i18n("End margin (minutes):")), 3, 0); gridLayout->addWidget(new QLabel(i18n("End margin (minutes):")), line, 0) ;
endMarginBox = new QSpinBox(widget); endMarginBox = new QSpinBox(widget);
endMarginBox->setRange(0, 99); endMarginBox->setRange(0, 99);
endMarginBox->setValue(manager->getEndMargin() / 60); endMarginBox->setValue(manager->getEndMargin() / 60);
gridLayout->addWidget(endMarginBox, 3, 1); gridLayout->addWidget(endMarginBox, line++, 1);
gridLayout->addWidget(new QLabel(i18n("Naming style for recordings:")), 4 , 0); gridLayout->addWidget(new QLabel(i18n("Naming style for recordings:")), l ine, 0);
namingFormat = new QLineEdit(widget); namingFormat = new QLineEdit(widget);
namingFormat->setText(manager->getNamingFormat()); namingFormat->setText(manager->getNamingFormat());
namingFormat->setToolTip(i18n("The following substitutions work: \"%year\ " for year (YYYY) and the following: %month, %day, %hour, %min, %sec, %channel a nd %title")); namingFormat->setToolTip(i18n("The following substitutions work: \"%year\ " for year (YYYY) and the following: %month, %day, %hour, %min, %sec, %channel a nd %title"));
connect(namingFormat, SIGNAL(textChanged(QString)), this, SLOT(namingForm atChanged(QString))); connect(namingFormat, SIGNAL(textChanged(QString)), this, SLOT(namingForm atChanged(QString)));
gridLayout->addWidget(namingFormat, 4, 1); gridLayout->addWidget(namingFormat, line, 1);
validPixmap = QIcon::fromTheme(QLatin1String("dialog-ok-apply"), QIcon(": dialog-ok-apply")).pixmap(22); validPixmap = QIcon::fromTheme(QLatin1String("dialog-ok-apply"), QIcon(": dialog-ok-apply")).pixmap(22);
invalidPixmap = QIcon::fromTheme(QLatin1String("dialog-cancel"), QIcon(": dialog-cancel")).pixmap(22); invalidPixmap = QIcon::fromTheme(QLatin1String("dialog-cancel"), QIcon(": dialog-cancel")).pixmap(22);
namingFormatValidLabel = new QLabel(widget); namingFormatValidLabel = new QLabel(widget);
namingFormatValidLabel->setPixmap(validPixmap); namingFormatValidLabel->setPixmap(validPixmap);
gridLayout->addWidget(namingFormatValidLabel, 4,2); gridLayout->addWidget(namingFormatValidLabel, line++,2);
gridLayout->addWidget(new QLabel(i18n("Action after recording finishes:") ), 5, 0); gridLayout->addWidget(new QLabel(i18n("Action after recording finishes:") ), line, 0);
actionAfterRecordingLineEdit = new QLineEdit(widget); actionAfterRecordingLineEdit = new QLineEdit(widget);
actionAfterRecordingLineEdit->setText(manager->getActionAfterRecording()) ; actionAfterRecordingLineEdit->setText(manager->getActionAfterRecording()) ;
actionAfterRecordingLineEdit->setToolTip(i18n("Leave empty for no command .")); actionAfterRecordingLineEdit->setToolTip(i18n("Leave empty for no command ."));
gridLayout->addWidget(actionAfterRecordingLineEdit, 5, 1); gridLayout->addWidget(actionAfterRecordingLineEdit, line++, 1);
boxLayout->addLayout(gridLayout); boxLayout->addLayout(gridLayout);
gridLayout = new QGridLayout(); gridLayout = new QGridLayout();
gridLayout->addWidget(new QLabel(i18n("Use ISO 8859-1 charset instead of ISO 6937:")), gridLayout->addWidget(new QLabel(i18n("Use ISO 8859-1 charset instead of ISO 6937:")),
1, 0); 1, 0);
override6937CharsetBox = new QCheckBox(widget); override6937CharsetBox = new QCheckBox(widget);
override6937CharsetBox->setChecked(manager->override6937Charset()); override6937CharsetBox->setChecked(manager->override6937Charset());
gridLayout->addWidget(override6937CharsetBox, 1, 1); gridLayout->addWidget(override6937CharsetBox, 1, 1);
skipping to change at line 283 skipping to change at line 305
{ {
QString path = QFileDialog::getExistingDirectory(this, QString(), timeShi ftFolderEdit->text()); QString path = QFileDialog::getExistingDirectory(this, QString(), timeShi ftFolderEdit->text());
if (path.isEmpty()) { if (path.isEmpty()) {
return; return;
} }
timeShiftFolderEdit->setText(path); timeShiftFolderEdit->setText(path);
} }
void DvbConfigDialog::changeXmltvFileName()
{
QString path = QFileDialog::getOpenFileName(this, QString(), xmltvFileNam
eEdit->text());
if (path.isEmpty()) {
return;
}
xmltvFileNameEdit->setText(path);
}
void DvbConfigDialog::updateScanFile() void DvbConfigDialog::updateScanFile()
{ {
QDialog *dialog = new DvbScanFileDownloadDialog(manager, this); QDialog *dialog = new DvbScanFileDownloadDialog(manager, this);
dialog->setAttribute(Qt::WA_DeleteOnClose, true); dialog->setAttribute(Qt::WA_DeleteOnClose, true);
dialog->setModal(true); dialog->setModal(true);
dialog->show(); dialog->show();
} }
void DvbConfigDialog::newRegex() void DvbConfigDialog::newRegex()
{ {
skipping to change at line 530 skipping to change at line 563
for (; index < configPages.size(); ++index) { for (; index < configPages.size(); ++index) {
// configPages and tabWidget indexes differ by two // configPages and tabWidget indexes differ by two
tabWidget->setTabText(index + 2, i18n("Device %1", index + 1)); tabWidget->setTabText(index + 2, i18n("Device %1", index + 1));
} }
} }
void DvbConfigDialog::accept() void DvbConfigDialog::accept()
{ {
manager->setRecordingFolder(recordingFolderEdit->text()); manager->setRecordingFolder(recordingFolderEdit->text());
manager->setTimeShiftFolder(timeShiftFolderEdit->text()); manager->setTimeShiftFolder(timeShiftFolderEdit->text());
manager->setXmltvFileName(xmltvFileNameEdit->text());
manager->setNamingFormat(namingFormat->text()); manager->setNamingFormat(namingFormat->text());
manager->setActionAfterRecording(actionAfterRecordingLineEdit->text()); manager->setActionAfterRecording(actionAfterRecordingLineEdit->text());
manager->setBeginMargin(beginMarginBox->value() * 60); manager->setBeginMargin(beginMarginBox->value() * 60);
manager->setEndMargin(endMarginBox->value() * 60); manager->setEndMargin(endMarginBox->value() * 60);
manager->setOverride6937Charset(override6937CharsetBox->isChecked()); manager->setOverride6937Charset(override6937CharsetBox->isChecked());
manager->setCreateInfoFile(createInfoFileBox->isChecked()); manager->setCreateInfoFile(createInfoFileBox->isChecked());
manager->setDisableEpg(disableEpgBox->isChecked());
#if 0 #if 0
manager->setScanWhenIdle(scanWhenIdleBox->isChecked()); manager->setScanWhenIdle(scanWhenIdleBox->isChecked());
#endif #endif
manager->setRecordingRegexList(QStringList()); manager->setRecordingRegexList(QStringList());
manager->setRecordingRegexPriorityList(QList<int>()); manager->setRecordingRegexPriorityList(QList<int>());
foreach (RegexInputLine *regexInputLine, regexInputList) foreach (RegexInputLine *regexInputLine, regexInputList)
{ {
manager->addRecordingRegex(regexInputLine->lineEdit->text()); manager->addRecordingRegex(regexInputLine->lineEdit->text());
qCDebug(logDvb, "saved regex: %s", qPrintable(regexInputLine->lin eEdit->text())); qCDebug(logDvb, "saved regex: %s", qPrintable(regexInputLine->lin eEdit->text()));
 End of changes. 19 change blocks. 
15 lines changed or deleted 57 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)