From 8601faf56e4773ac857820002055b1eee016e6f6 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Mardelle Date: Sat, 30 Jan 2010 16:10:46 +0000 Subject: [PATCH] Show error when problem with DVD button svn path=/trunk/kdenlive/; revision=4256 --- src/dvdwizard.cpp | 6 +- src/dvdwizardmenu.cpp | 35 +++++++-- src/dvdwizardmenu.h | 11 ++- src/widgets/dvdwizardmenu_ui.ui | 125 ++++++++++++++++---------------- 4 files changed, 100 insertions(+), 77 deletions(-) diff --git a/src/dvdwizard.cpp b/src/dvdwizard.cpp index 1d0213ce..cbde5f10 100644 --- a/src/dvdwizard.cpp +++ b/src/dvdwizard.cpp @@ -214,7 +214,7 @@ void DvdWizard::generateDvd() if (!m_pageMenu->menuMovie()) { // create menu vob file QListWidgetItem *vobitem = m_status.job_progress->item(1); - m_status.job_progress->setCurrentRow(1); + m_status.job_progress->setCurrentRow(1); vobitem->setIcon(KIcon("system-run")); qApp->processEvents(); @@ -262,7 +262,7 @@ void DvdWizard::generateDvd() // create xml spumux file QListWidgetItem *spuitem = m_status.job_progress->item(2); - m_status.job_progress->setCurrentRow(2); + m_status.job_progress->setCurrentRow(2); spuitem->setIcon(KIcon("system-run")); qApp->processEvents(); QDomDocument doc; @@ -330,6 +330,7 @@ void DvdWizard::generateDvd() spuitem->setIcon(KIcon("dialog-close")); m_status.error_log->append(result); m_status.error_box->setHidden(false); + m_status.button_start->setEnabled(true); kDebug() << "/// RENDERING SPUMUX MENU crashed"; return; } @@ -339,6 +340,7 @@ void DvdWizard::generateDvd() m_status.error_log->append("
" + i18n("Menu job timed out")); m_status.error_log->scrollToAnchor("result"); m_status.error_box->setHidden(false); + m_status.button_start->setEnabled(true); return; } diff --git a/src/dvdwizardmenu.cpp b/src/dvdwizardmenu.cpp index 9c0c8a7f..4a90c50a 100644 --- a/src/dvdwizardmenu.cpp +++ b/src/dvdwizardmenu.cpp @@ -20,7 +20,7 @@ #include "dvdwizardmenu.h" #include - +#include DvdWizardMenu::DvdWizardMenu(const QString &profile, QWidget *parent) : QWizardPage(parent), @@ -31,7 +31,7 @@ DvdWizardMenu::DvdWizardMenu(const QString &profile, QWidget *parent) : m_view.play_text->setText(i18n("Play")); m_scene = new DvdScene(this); m_view.menu_preview->setScene(m_scene); - + m_view.menu_preview->setMouseTracking(true); connect(m_view.create_menu, SIGNAL(toggled(bool)), m_view.menu_box, SLOT(setEnabled(bool))); connect(m_view.create_menu, SIGNAL(toggled(bool)), this, SIGNAL(completeChanged())); @@ -83,7 +83,6 @@ DvdWizardMenu::DvdWizardMenu(const QString &profile, QWidget *parent) : button->setFont(font); button->setDefaultTextColor(m_view.text_color->color()); button->setZValue(4); - button->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); QRectF r = button->sceneBoundingRect(); m_scene->addItem(button); button->setPos((m_width - r.width()) / 2, (m_height - r.height()) / 2); @@ -111,6 +110,13 @@ DvdWizardMenu::DvdWizardMenu(const QString &profile, QWidget *parent) : connect(m_scene, SIGNAL(selectionChanged()), this, SLOT(buttonChanged())); connect(m_scene, SIGNAL(changed(const QList &)), this, SIGNAL(completeChanged())); + // red background for error message + KColorScheme scheme(palette().currentColorGroup(), KColorScheme::Window); + QPalette p = m_view.error_message->palette(); + p.setColor(QPalette::Background, scheme.background(KColorScheme::NegativeBackground).color()); + m_view.error_message->setAutoFillBackground(true); + m_view.error_message->setPalette(p); + m_view.menu_box->setEnabled(false); } @@ -127,6 +133,7 @@ DvdWizardMenu::~DvdWizardMenu() bool DvdWizardMenu::isComplete() const { + m_view.error_message->setHidden(true); if (!m_view.create_menu->isChecked()) return true; QList targets; QList list = m_scene->items(); @@ -139,7 +146,11 @@ bool DvdWizardMenu::isComplete() const QList collisions = button->collidingItems(); if (!collisions.isEmpty()) { for (int j = 0; j < collisions.count(); j++) { - if (collisions.at(j)->type() == button->type()) return false; + if (collisions.at(j)->type() == button->type()) { + m_view.error_message->setText(i18n("Buttons overlapping")); + m_view.error_message->setHidden(false); + return false; + } } } targets.append(button->target()); @@ -147,12 +158,18 @@ bool DvdWizardMenu::isComplete() const } if (buttonCount == 0) { // We need at least one button + m_view.error_message->setText(i18n("No button in menu")); + m_view.error_message->setHidden(false); return false; } if (!m_view.background_image->isHidden()) { // Make sure user selected a valid image / video file - if (!QFile::exists(m_view.background_image->url().path())) return false; + if (!QFile::exists(m_view.background_image->url().path())) { + m_view.error_message->setText(i18n("Missing background image")); + m_view.error_message->setHidden(false); + return false; + } } // check that we have a "Play all" entry @@ -160,7 +177,11 @@ bool DvdWizardMenu::isComplete() const // ... or that each video file has a button for (int i = m_view.target_list->count() - 1; i > 0; i--) { // If there is a vob file entry and it has no button assigned, don't allow to go further - if (m_view.target_list->itemIcon(i).isNull() == false && !targets.contains(i)) return false; + if (m_view.target_list->itemIcon(i).isNull() == false && !targets.contains(i)) { + m_view.error_message->setText(i18n("No menu entry for %1", m_view.target_list->itemText(i))); + m_view.error_message->setHidden(false); + return false; + } } return true; } @@ -232,7 +253,6 @@ void DvdWizardMenu::addButton() button->setFont(font); button->setDefaultTextColor(m_view.text_color->color()); button->setZValue(4); - button->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); QRectF r = button->sceneBoundingRect(); m_scene->addItem(button); button->setPos((m_width - r.width()) / 2, (m_height - r.height()) / 2); @@ -612,7 +632,6 @@ void DvdWizardMenu::loadXml(QDomElement xml) button->setBackMenu(e.attribute("backtomenu").toInt()); button->setDefaultTextColor(m_view.text_color->color()); button->setZValue(4); - button->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); QRectF r = button->sceneBoundingRect(); m_scene->addItem(button); button->setPos(e.attribute("posx").toDouble(), e.attribute("posy").toDouble()); diff --git a/src/dvdwizardmenu.h b/src/dvdwizardmenu.h index 6374d2c3..4e5100fb 100644 --- a/src/dvdwizardmenu.h +++ b/src/dvdwizardmenu.h @@ -57,8 +57,12 @@ class DvdButton : public QGraphicsTextItem { public: - DvdButton(const QString & text): QGraphicsTextItem(text), m_target(0), m_command(QString("jump title 1")), m_backToMenu(false) {} - enum { Type = UserType + 1 }; + DvdButton(const QString & text): QGraphicsTextItem(text), m_target(0), m_command(QString("jump title 1")), m_backToMenu(false) { + setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); +#if QT_VERSION >= 0x040600 + setFlag(QGraphicsItem::ItemSendsGeometryChanges, true); +#endif + } void setTarget(int t, QString c) { m_target = t; m_command = c; @@ -74,7 +78,7 @@ public: } int type() const { // Enable the use of qgraphicsitem_cast with this item. - return Type; + return UserType + 1; } void setBackMenu(bool back) { m_backToMenu = back; @@ -89,7 +93,6 @@ protected: virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value) { if (change == ItemPositionChange && scene()) { - QPointF newPos = value.toPointF(); QRectF sceneShape = sceneBoundingRect(); DvdScene *sc = static_cast < DvdScene * >(scene()); diff --git a/src/widgets/dvdwizardmenu_ui.ui b/src/widgets/dvdwizardmenu_ui.ui index 78ba60f1..a98c48a9 100644 --- a/src/widgets/dvdwizardmenu_ui.ui +++ b/src/widgets/dvdwizardmenu_ui.ui @@ -23,69 +23,8 @@ - - - - - - - A - - - QToolButton::InstantPopup - - - - - - - D - - - QToolButton::InstantPopup - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - 0 - 0 - - - - - - - - ... - - - - - - - ... - - - - - - + + @@ -248,6 +187,66 @@ + + + + A + + + QToolButton::InstantPopup + + + + + + + + 0 + 0 + + + + + + + + D + + + QToolButton::InstantPopup + + + + + + + ... + + + + + + + ... + + + + + + + Qt::Vertical + + + + 20 + 135 + + + + + + + -- 2.39.2