[Kdenlive-svn] SF.net SVN: kdenlive:[2808] branches/KDE4/src/kdenlivedoc.cpp

[<fre...@us...>]

Revision: 2808
          http://kdenlive.svn.sourceforge.net/kdenlive/?rev=2808&view=rev
Author:   freefrag
Date:     2008-12-18 13:31:46 +0000 (Thu, 18 Dec 2008)

Log Message:
-----------
Added message asking about searching manually or not when unable to locate clip. Patch by Alberto Villa. The best would have been to improve the logic to search last clip folder, but this is still a slight improvement, and I think we are now ready to close Fix issue 0000465: exporting to ogg theora 720x576 blocks system (http://www.kdenlive.org/mantis/view.php?id=465)

Modified Paths:
--------------
    branches/KDE4/src/kdenlivedoc.cpp

Modified: branches/KDE4/src/kdenlivedoc.cpp
===================================================================
--- branches/KDE4/src/kdenlivedoc.cpp	2008-12-18 11:54:03 UTC (rev 2807)
+++ branches/KDE4/src/kdenlivedoc.cpp	2008-12-18 13:31:46 UTC (rev 2808)
@@ -1160,9 +1160,10 @@
                 else action = (KMessageBox::ButtonCode)KMessageBox::messageBox(kapp->activeWindow(), KMessageBox::WarningYesNo, i18n("<qt>Clip <b>%1</b><br>is invalid, what do you want to do?", path), i18n("File not found"), KGuiItem(i18n("Search automatically")), /*KGuiItem(i18n("Remove from project")), */KGuiItem(i18n("Keep as placeholder")));
             } else {
                 if (elem.attribute("type").toInt() == SLIDESHOW) {
-                    if (KMessageBox::messageBox(kapp->activeWindow(), KMessageBox::WarningYesNo, i18n("<qt>Clip <b>%1</b><br>is invalid, what do you want to do?", path), i18n("File not found"), KGuiItem(i18n("Search automatically")), /*KGuiItem(i18n("Remove from project")),*/ KGuiItem(i18n("Keep as placeholder"))) == KMessageBox::Yes)
+                    if (KMessageBox::messageBox(kapp->activeWindow(), KMessageBox::WarningYesNo, i18n("<qt>Clip <b>%1</b><br>is invalid or missing, what do you want to do?", path), i18n("File not found"), KGuiItem(i18n("Search manually")), /*KGuiItem(i18n("Remove from project")),*/ KGuiItem(i18n("Keep as placeholder"))) == KMessageBox::Yes)
                         newpath = KFileDialog::getExistingDirectory(KUrl("kfiledialog:///clipfolder"), kapp->activeWindow(), i18n("Looking for %1", path));
-                } else newpath = KFileDialog::getOpenFileName(KUrl("kfiledialog:///clipfolder"), QString(), kapp->activeWindow(), i18n("Looking for %1", path));
+                } else if (KMessageBox::messageBox(kapp->activeWindow(), KMessageBox::WarningYesNo, i18n("<qt>Clip <b>%1</b><br>is invalid or missing, what do you want to do?", path), i18n("File not found"), KGuiItem(i18n("Search manually")), /*KGuiItem(i18n("Remove from project")),*/ KGuiItem(i18n("Keep as placeholder"))) == KMessageBox::Yes)
+					newpath = KFileDialog::getOpenFileName(KUrl("kfiledialog:///clipfolder"), QString(), kapp->activeWindow(), i18n("Looking for %1", path));
             }
             if (action == KMessageBox::Yes) {
                 kDebug() << "// ASKED FOR SRCH CLIP: " << clipId;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.