Fix i18n

svn path=/branches/KDE4/; revision=2433

diff --git a/po/kdenlive.pot b/po/kdenlive.pot
index c78363458ec3f609cf8b9f3ea6522017b35662d2..e021a65bcdc4104d645526baecc7aacdd82c6271 100644 (file)
--- a/po/kdenlive.pot
+++ b/po/kdenlive.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-03 15:58+0200\n"
+"POT-Creation-Date: 2008-10-05 12:56+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1039,6 +1039,9 @@ msgstr ""
 msgid "New speed (percents)"
 msgstr ""
 
+msgid "No Custom Effects"
+msgstr ""
+
 msgid "No clip at cursor time"
 msgstr ""
 
@@ -1359,10 +1362,13 @@ msgstr ""
 msgid "Selection tool"
 msgstr ""
 
-msgid "Set current image as thumbnail"
+msgid "Set In Point"
 msgstr ""
 
-msgid "Set in point"
+msgid "Set Out Point"
+msgstr ""
+
+msgid "Set current image as thumbnail"
 msgstr ""
 
 msgid "Set zone end"

diff --git a/src/kdenliveui.rc b/src/kdenliveui.rc
index c42ed45de8e6a72e678a8de40f73e4fee2c552ac..66b47724c6f0d6afcc4f158be38b2d4dbd46b77d 100644 (file)
--- a/src/kdenliveui.rc
+++ b/src/kdenliveui.rc
@@ -44,8 +44,8 @@
       </Menu>
       <Menu name="audio_effects_menu" ><text>Add Audio Effect</text>
       </Menu>
-      <!-- <Menu name="custom_effects_menu" ><text>Add Custom Effect</text>
-      </Menu> -->
+      <Menu name="custom_effects_menu" ><text>Add Custom Effect</text>
+      </Menu>
          <Separator />
                <Action name="show_video_thumbs" />
                <Action name="show_audio_thumbs" />

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index d52c464fa36e762377e45148e70426f336aa08d0..80b52314b1dcf46ba61e659eba007c6d86cdbc3e 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -119,6 +119,8 @@ MainWindow::MainWindow(QWidget *parent)
     m_findTimer.setSingleShot(true);
 
     initEffects::parseEffectFiles();
+    initEffects::parseCustomEffectsFile();
+
     m_monitorManager = new MonitorManager();
 
     projectListDock = new QDockWidget(i18n("Project Tree"), this);
@@ -221,6 +223,11 @@ MainWindow::MainWindow(QWidget *parent)
     }
     m_customEffectsMenu = static_cast<QMenu*>(factory()->container("custom_effects_menu", this));
     effects = customEffects.effectNames();
+    if (effects.isEmpty()) {
+       action = new QAction(i18n("No Custom Effects"), this);
+       action->setEnabled(false);
+       m_customEffectsMenu->addAction(action);
+    }
     foreach(const QString &name, effects) {
         action = new QAction(name, this);
         action->setData(name);
@@ -263,7 +270,7 @@ MainWindow::MainWindow(QWidget *parent)
     m_timelineContextClipMenu->addMenu(videoEffectsMenu);
     m_timelineContextClipMenu->addMenu(audioEffectsMenu);
     //TODO: re-enable custom effects menu when it is implemented
-    //m_timelineContextClipMenu->addMenu(m_customEffectsMenu);
+    m_timelineContextClipMenu->addMenu(m_customEffectsMenu);
 
     m_timelineContextTransitionMenu->addAction(actionCollection()->action("delete_timeline_clip"));
     m_timelineContextTransitionMenu->addAction(actionCollection()->action(KStandardAction::name(KStandardAction::Copy)));
@@ -338,6 +345,11 @@ void MainWindow::slotReloadEffects() {
     m_customEffectsMenu->clear();
     const QStringList effects = customEffects.effectNames();
     QAction *action;
+    if (effects.isEmpty()) {
+       action = new QAction(i18n("No Custom Effects"), this);
+       action->setEnabled(false);
+       m_customEffectsMenu->addAction(action);
+    }
     foreach(const QString &name, effects) {
         action = new QAction(name, this);
         action->setData(name);
@@ -621,12 +633,12 @@ void MainWindow::setupActions() {
     connect(monitorPlay, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotPlay()));
 
     KAction *markIn = collection->addAction("mark_in");
-    markIn->setText(i18n("Set in point"));
+    markIn->setText(i18n("Set In Point"));
     markIn->setShortcut(Qt::Key_I);
     connect(markIn, SIGNAL(triggered(bool)), this, SLOT(slotSetInPoint()));
 
     KAction *markOut = collection->addAction("mark_out");
-    markOut->setText(i18n("Set in point"));
+    markOut->setText(i18n("Set Out Point"));
     markOut->setShortcut(Qt::Key_O);
     connect(markOut, SIGNAL(triggered(bool)), this, SLOT(slotSetOutPoint()));
 
@@ -1394,6 +1406,7 @@ void MainWindow::slotAddAudioEffect(QAction *result) {
 
 void MainWindow::slotAddCustomEffect(QAction *result) {
     if (!result) return;
+    if (result->data().toString().isEmpty()) return;
     QDomElement effect = customEffects.getEffectByName(result->data().toString());
     slotAddEffect(effect);
 }