X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmain.cpp;h=7bdaed01b8525a36669276dbc5112868d79f7c0c;hb=5e20d14c06f14d962ffd59e6c927ba968c0ea8cc;hp=9d55ac16549dc9ee7af05374a20feff322216b74;hpb=ab56c248baef1511a75d7e04971d9f36bb14ca8d;p=kdenlive
diff --git a/src/main.cpp b/src/main.cpp
index 9d55ac16..7bdaed01 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -34,13 +34,15 @@ int main(int argc, char *argv[])
ki18n("Kdenlive"), VERSION,
ki18n("An open source video editor."),
KAboutData::License_GPL,
- ki18n("Copyright © 2007â2010 Kdenlive authors"));
- aboutData.addAuthor(ki18n("Jean-Baptiste Mardelle"), ki18n("MLT porting, KDE SC 4 porting, Main developer"), "jb@kdenlive.org");
- aboutData.addAuthor(ki18n("Marco Gittler"), ki18n("MLT Connection, Transition, Effect, Timeline Developer"), "g.marco@freenet.de");
+ ki18n("Copyright © 2007â2011 Kdenlive authors"));
+ aboutData.addAuthor(ki18n("Jean-Baptiste Mardelle"), ki18n("MLT and KDE SC 4 porting, main developer and maintainer"), "jb@kdenlive.org");
+ aboutData.addAuthor(ki18n("Marco Gittler"), ki18n("MLT transitions and effects, timeline, audio thumbs"), "g.marco@freenet.de");
+ aboutData.addAuthor(ki18n("Dan Dennedy"), ki18n("Bug fixing, etc."), "dan@dennedy.org");
+ aboutData.addAuthor(ki18n("Simon A. Eugster"), ki18n("Color scopes, bug fixing, etc."), "simon.eu@gmail.com");
+ aboutData.addAuthor(ki18n("Till Theato"), ki18n("Bug fixing, etc."), "root@ttill.de");
+ aboutData.addAuthor(ki18n("Alberto Villa"), ki18n("Bug fixing, logo, etc."), "avilla@FreeBSD.org");
aboutData.addAuthor(ki18n("Jean-Michel Poure"), ki18n("Rendering profiles customization"), "jm@poure.com");
aboutData.addAuthor(ki18n("Ray Lehtiniemi"), ki18n("Bug fixing, etc."), "rayl@mail.com");
- aboutData.addAuthor(ki18n("Dan Dennedy"), ki18n("Bug fixing, etc."), "dan@dennedy.org");
- aboutData.addAuthor(ki18n("Simon A. Eugster"), ki18n("Bug fixing, etc."), "simon.eu@gmail.com");
aboutData.addAuthor(ki18n("Jason Wood"), ki18n("Original KDE 3 version author (not active anymore)"), "jasonwood@blueyonder.co.uk");
aboutData.setHomepage("http://kdenlive.org");
aboutData.setCustomAuthorText(ki18n("Please report bugs to http://kdenlive.org/mantis"), ki18n("Please report bugs to http://kdenlive.org/mantis"));
@@ -52,9 +54,11 @@ int main(int argc, char *argv[])
KCmdLineOptions options;
options.add("mlt-path ", ki18n("Set the path for MLT environment"));
options.add("+[file]", ki18n("Document to open")); //new
+ options.add("i ", ki18n("Comma separated list of clips to add")); //new
KCmdLineArgs::addCmdLineOptions(options); //new
KApplication app;
+ MainWindow* window = 0;
// see if we are starting with session management
if (app.isSessionRestored()) {
@@ -62,8 +66,8 @@ int main(int argc, char *argv[])
while (KMainWindow::canBeRestored(n)) {
const QString className = KXmlGuiWindow::classNameOfToplevel(n);
if (className == QLatin1String("MainWindow")) {
- MainWindow* win = new MainWindow();
- win->restore(n);
+ window = new MainWindow();
+ window->restore(n);
} else {
kWarning() << "Unknown class " << className << " in session saved data!";
}
@@ -71,17 +75,17 @@ int main(int argc, char *argv[])
}
} else {
KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); //new
-
+ QString clipsToLoad = args->getOption("i");
QString mltPath = args->getOption("mlt-path");
KUrl url;
if (args->count()) {
url = args->url(0);
}
- MainWindow* window = new MainWindow(mltPath, url);
+ window = new MainWindow(mltPath, url, clipsToLoad);
window->show();
args->clear();
}
-
- return app.exec();
+ int result = app.exec();
+ return result;
}