From: <j-...@us...> - 2009-05-13 09:56:08
|
Revision: 3383 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3383&view=rev Author: j-b-m Date: 2009-05-13 09:55:59 +0000 (Wed, 13 May 2009) Log Message: ----------- Fix antialiasing creating broken menu pictures (too many colors) in dvd wizard menu Modified Paths: -------------- trunk/kdenlive/src/dvdwizardmenu.cpp Modified: trunk/kdenlive/src/dvdwizardmenu.cpp =================================================================== --- trunk/kdenlive/src/dvdwizardmenu.cpp 2009-05-12 23:19:47 UTC (rev 3382) +++ trunk/kdenlive/src/dvdwizardmenu.cpp 2009-05-13 09:55:59 UTC (rev 3383) @@ -23,7 +23,9 @@ DvdWizardMenu::DvdWizardMenu(const QString &profile, QWidget *parent) : - QWizardPage(parent) + QWizardPage(parent), + m_color(NULL), + m_safeRect(NULL) { m_view.setupUi(this); m_view.play_text->setText(i18n("Play")); @@ -47,6 +49,8 @@ m_isPal = false; } else m_isPal = true; + changeProfile(m_view.menu_profile->currentIndex()); + // Create color background m_color = new QGraphicsRectItem(0, 0, m_width, m_height); m_color->setBrush(m_view.background_color->color()); @@ -70,7 +74,6 @@ m_safeRect->setZValue(5); m_scene->addItem(m_safeRect); - changeProfile(m_view.menu_profile->currentIndex()); checkBackgroundType(0); connect(m_view.menu_profile, SIGNAL(activated(int)), this, SLOT(changeProfile(int))); @@ -256,11 +259,11 @@ m_view.menu_preview->setMatrix(matrix); m_view.menu_preview->setMinimumSize(m_width / 2 + 4, m_height / 2 + 8); - m_color->setRect(0, 0, m_width, m_height); + if (m_color) m_color->setRect(0, 0, m_width, m_height); int safeW = m_width / 20; int safeH = m_height / 20; - m_safeRect->setRect(safeW, safeH, m_width - 2 * safeW, m_height - 2 * safeH); + if (m_safeRect) m_safeRect->setRect(safeW, safeH, m_width - 2 * safeW, m_height - 2 * safeH); } void DvdWizardMenu::setTargets(QStringList list, QStringList targetlist) @@ -366,38 +369,50 @@ m_scene->clearSelection(); QImage img(m_width, m_height, QImage::Format_ARGB32); QPainter p(&img); + p.setRenderHints(QPainter::Antialiasing, false); + p.setRenderHints(QPainter::TextAntialiasing, false); m_scene->removeItem(m_safeRect); m_scene->removeItem(m_color); m_scene->removeItem(m_background); m_scene->render(&p, QRectF(0, 0, m_width, m_height)); p.end(); - QImage saved; + img.setNumColors(4); + img.save(img1); + /*QImage saved; if (m_view.menu_profile->currentIndex() < 2) saved = img.scaled(720, 576); else saved = img.scaled(720, 480); saved.setNumColors(4); - saved.save(img1); + saved.save(img1);*/ updateColor(m_view.selected_color->color()); p.begin(&img); + p.setRenderHints(QPainter::Antialiasing, false); + p.setRenderHints(QPainter::TextAntialiasing, false); m_scene->render(&p, QRectF(0, 0, m_width, m_height)); p.end(); - if (m_view.menu_profile->currentIndex() < 2) - saved = img.scaled(720, 576); - else saved = img.scaled(720, 480); - saved.setNumColors(4); - saved.save(img2); + /* if (m_view.menu_profile->currentIndex() < 2) + saved = img.scaled(720, 576); + else saved = img.scaled(720, 480); + saved.setNumColors(4); + saved.save(img2);*/ + img.setNumColors(4); + img.save(img2); updateColor(m_view.highlighted_color->color()); p.begin(&img); + p.setRenderHints(QPainter::Antialiasing, false); + p.setRenderHints(QPainter::TextAntialiasing, false); m_scene->render(&p, QRectF(0, 0, m_width, m_height)); p.end(); - if (m_view.menu_profile->currentIndex() < 2) + /*if (m_view.menu_profile->currentIndex() < 2) saved = img.scaled(720, 576); else saved = img.scaled(720, 480); saved.setNumColors(4); - saved.save(img3); + saved.save(img3);*/ + img.setNumColors(4); + img.save(img3); updateColor(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-05-26 06:55:53
|
Revision: 3426 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3426&view=rev Author: j-b-m Date: 2009-05-26 06:55:32 +0000 (Tue, 26 May 2009) Log Message: ----------- save dvd menu settings even if it is disabled Modified Paths: -------------- trunk/kdenlive/src/dvdwizardmenu.cpp Modified: trunk/kdenlive/src/dvdwizardmenu.cpp =================================================================== --- trunk/kdenlive/src/dvdwizardmenu.cpp 2009-05-26 00:01:17 UTC (rev 3425) +++ trunk/kdenlive/src/dvdwizardmenu.cpp 2009-05-26 06:55:32 UTC (rev 3426) @@ -507,9 +507,9 @@ QDomElement DvdWizardMenu::toXml() const { QDomDocument doc; - if (!m_view.create_menu->isChecked()) return doc.documentElement(); QDomElement xml = doc.createElement("menu"); doc.appendChild(xml); + xml.setAttribute("enabled", m_view.create_menu->isChecked()); if (m_view.background_list->currentIndex() == 0) { // Color bg xml.setAttribute("background_color", m_view.background_color->color().name()); @@ -553,7 +553,7 @@ kDebug() << "// LOADING MENU"; if (xml.isNull()) return; kDebug() << "// LOADING MENU 1"; - m_view.create_menu->setChecked(true) ; + m_view.create_menu->setChecked(xml.attribute("enabled").toInt()); if (xml.hasAttribute("background_color")) { m_view.background_list->setCurrentIndex(0); m_view.background_color->setColor(xml.attribute("background_color")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-06-02 21:11:54
|
Revision: 3483 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3483&view=rev Author: j-b-m Date: 2009-06-02 21:11:45 +0000 (Tue, 02 Jun 2009) Log Message: ----------- Fix compilation against KDE 4.1.x Modified Paths: -------------- trunk/kdenlive/src/dvdwizardmenu.cpp Modified: trunk/kdenlive/src/dvdwizardmenu.cpp =================================================================== --- trunk/kdenlive/src/dvdwizardmenu.cpp 2009-06-02 21:08:13 UTC (rev 3482) +++ trunk/kdenlive/src/dvdwizardmenu.cpp 2009-06-02 21:11:45 UTC (rev 3483) @@ -519,10 +519,10 @@ xml.setAttribute("background_color", m_view.background_color->color().name()); } else if (m_view.background_list->currentIndex() == 1) { // Image bg - xml.setAttribute("background_image", m_view.background_image->text()); + xml.setAttribute("background_image", m_view.background_image->url().path()); } else { // Video bg - xml.setAttribute("background_video", m_view.background_image->text()); + xml.setAttribute("background_video", m_view.background_image->url().path()); } xml.setAttribute("text_color", m_view.text_color->color().name()); xml.setAttribute("selected_color", m_view.selected_color->color().name()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-12-21 19:20:08
|
Revision: 4188 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=4188&view=rev Author: j-b-m Date: 2009-12-21 19:19:58 +0000 (Mon, 21 Dec 2009) Log Message: ----------- Try to fix dvd menu error: http://www.kdenlive.org/mantis/view.php?id=832 Modified Paths: -------------- trunk/kdenlive/src/dvdwizardmenu.cpp Modified: trunk/kdenlive/src/dvdwizardmenu.cpp =================================================================== --- trunk/kdenlive/src/dvdwizardmenu.cpp 2009-12-21 19:13:49 UTC (rev 4187) +++ trunk/kdenlive/src/dvdwizardmenu.cpp 2009-12-21 19:19:58 UTC (rev 4188) @@ -389,7 +389,7 @@ { if (m_view.create_menu->isChecked()) { m_scene->clearSelection(); - QImage img(m_width, m_height, QImage::Format_ARGB32); + QImage img(m_width, m_height, QImage::Format_ARGB8555_Premultiplied); QPainter p(&img); p.setRenderHints(QPainter::Antialiasing, false); p.setRenderHints(QPainter::TextAntialiasing, false); @@ -398,7 +398,11 @@ if (m_background->scene() != 0) m_scene->removeItem(m_background); m_scene->render(&p, QRectF(0, 0, m_width, m_height)); p.end(); +#if QT_VERSION >= 0x040600 + img.setColorCount(4); +#else img.setNumColors(4); +#endif img.save(img1); /*QImage saved; if (m_view.menu_profile->currentIndex() < 2) @@ -418,7 +422,11 @@ else saved = img.scaled(720, 480); saved.setNumColors(4); saved.save(img2);*/ +#if QT_VERSION >= 0x040600 + img.setColorCount(4); +#else img.setNumColors(4); +#endif img.save(img2); @@ -433,7 +441,11 @@ else saved = img.scaled(720, 480); saved.setNumColors(4); saved.save(img3);*/ +#if QT_VERSION >= 0x040600 + img.setColorCount(4); +#else img.setNumColors(4); +#endif img.save(img3); updateColor(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2010-03-28 13:16:50
|
Revision: 4360 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=4360&view=rev Author: j-b-m Date: 2010-03-28 13:16:44 +0000 (Sun, 28 Mar 2010) Log Message: ----------- Fix crash in DVD Wizard: http://www.kdenlive.org:80/mantis/view.php?id=1474 Modified Paths: -------------- trunk/kdenlive/src/dvdwizardmenu.cpp Modified: trunk/kdenlive/src/dvdwizardmenu.cpp =================================================================== --- trunk/kdenlive/src/dvdwizardmenu.cpp 2010-03-27 09:31:13 UTC (rev 4359) +++ trunk/kdenlive/src/dvdwizardmenu.cpp 2010-03-28 13:16:44 UTC (rev 4360) @@ -304,7 +304,7 @@ void DvdWizardMenu::setTargets(QStringList list, QStringList targetlist) { m_view.target_list->clear(); - m_view.target_list->addItem(i18n("Play All"), "title 1"); + m_view.target_list->addItem(i18n("Play All"), "jump title 1"); int movieCount = 0; for (int i = 0; i < list.count(); i++) { if (targetlist.at(i).contains("chapter")) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |