Commit 6870d054 authored by Jason Wood's avatar Jason Wood

Removed the print document menu item - it makes no sense in the video editor at the moment.

Removed the close menu item - it is redundant as it works identically to quit.
Fixed up a few connections related to debug messages and KRender.

svn path=/trunk/kdenlive/; revision=265
parent f34dfaee
...@@ -77,7 +77,7 @@ KdenliveApp::KdenliveApp(QWidget* , const char* name): ...@@ -77,7 +77,7 @@ KdenliveApp::KdenliveApp(QWidget* , const char* name):
// disable actions at startup // disable actions at startup
fileSave->setEnabled(false); fileSave->setEnabled(false);
filePrint->setEnabled(false); // filePrint->setEnabled(false);
editCut->setEnabled(false); editCut->setEnabled(false);
editCopy->setEnabled(false); editCopy->setEnabled(false);
editPaste->setEnabled(false); editPaste->setEnabled(false);
...@@ -102,8 +102,8 @@ void KdenliveApp::initActions() ...@@ -102,8 +102,8 @@ void KdenliveApp::initActions()
fileOpenRecent = KStdAction::openRecent(this, SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); fileOpenRecent = KStdAction::openRecent(this, SLOT(slotFileOpenRecent(const KURL&)), actionCollection());
fileSave = KStdAction::save(this, SLOT(slotFileSave()), actionCollection()); fileSave = KStdAction::save(this, SLOT(slotFileSave()), actionCollection());
fileSaveAs = KStdAction::saveAs(this, SLOT(slotFileSaveAs()), actionCollection()); fileSaveAs = KStdAction::saveAs(this, SLOT(slotFileSaveAs()), actionCollection());
fileClose = KStdAction::close(this, SLOT(slotFileClose()), actionCollection()); //fileClose = KStdAction::close(this, SLOT(slotFileClose()), actionCollection());
filePrint = KStdAction::print(this, SLOT(slotFilePrint()), actionCollection()); // filePrint = KStdAction::print(this, SLOT(slotFilePrint()), actionCollection());
fileQuit = KStdAction::quit(this, SLOT(slotFileQuit()), actionCollection()); fileQuit = KStdAction::quit(this, SLOT(slotFileQuit()), actionCollection());
editCut = KStdAction::cut(this, SLOT(slotEditCut()), actionCollection()); editCut = KStdAction::cut(this, SLOT(slotEditCut()), actionCollection());
editCopy = KStdAction::copy(this, SLOT(slotEditCopy()), actionCollection()); editCopy = KStdAction::copy(this, SLOT(slotEditCopy()), actionCollection());
...@@ -138,10 +138,10 @@ void KdenliveApp::initActions() ...@@ -138,10 +138,10 @@ void KdenliveApp::initActions()
actionLoadLayout2 = new KAction(i18n("Load Layout &2"), "loadlayout2.png", KShortcut(Qt::Key_F10), this, SLOT(loadLayout2()), actionCollection(), "load_layout_2"); actionLoadLayout2 = new KAction(i18n("Load Layout &2"), "loadlayout2.png", KShortcut(Qt::Key_F10), this, SLOT(loadLayout2()), actionCollection(), "load_layout_2");
actionLoadLayout3 = new KAction(i18n("Load Layout &3"), "loadlayout3.png", KShortcut(Qt::Key_F11), this, SLOT(loadLayout3()), actionCollection(), "load_layout_3"); actionLoadLayout3 = new KAction(i18n("Load Layout &3"), "loadlayout3.png", KShortcut(Qt::Key_F11), this, SLOT(loadLayout3()), actionCollection(), "load_layout_3");
actionLoadLayout4 = new KAction(i18n("Load Layout &4"), "loadlayout4.png", KShortcut(Qt::Key_F12), this, SLOT(loadLayout4()), actionCollection(), "load_layout_4"); actionLoadLayout4 = new KAction(i18n("Load Layout &4"), "loadlayout4.png", KShortcut(Qt::Key_F12), this, SLOT(loadLayout4()), actionCollection(), "load_layout_4");
actionSaveLayout1 = new KAction(i18n("Save Layout &1"), KShortcut(Qt::Key_F9 | Qt::CTRL), this, SLOT(saveLayout1()), actionCollection(), "save_layout_1"); actionSaveLayout1 = new KAction(i18n("Save Layout &1"), KShortcut(Qt::Key_F9 | Qt::CTRL | Qt::SHIFT), this, SLOT(saveLayout1()), actionCollection(), "save_layout_1");
actionSaveLayout2 = new KAction(i18n("Save Layout &2"), KShortcut(Qt::Key_F10 | Qt::CTRL), this, SLOT(saveLayout2()), actionCollection(), "save_layout_2"); actionSaveLayout2 = new KAction(i18n("Save Layout &2"), KShortcut(Qt::Key_F10 | Qt::CTRL | Qt::SHIFT), this, SLOT(saveLayout2()), actionCollection(), "save_layout_2");
actionSaveLayout3 = new KAction(i18n("Save Layout &3"), KShortcut(Qt::Key_F11 | Qt::CTRL), this, SLOT(saveLayout3()), actionCollection(), "save_layout_3"); actionSaveLayout3 = new KAction(i18n("Save Layout &3"), KShortcut(Qt::Key_F11 | Qt::CTRL | Qt::SHIFT), this, SLOT(saveLayout3()), actionCollection(), "save_layout_3");
actionSaveLayout4 = new KAction(i18n("Save Layout &4"), KShortcut(Qt::Key_F12 | Qt::CTRL), this, SLOT(saveLayout4()), actionCollection(), "save_layout_4"); actionSaveLayout4 = new KAction(i18n("Save Layout &4"), KShortcut(Qt::Key_F12 | Qt::CTRL | Qt::SHIFT), this, SLOT(saveLayout4()), actionCollection(), "save_layout_4");
timelineMoveTool->setExclusiveGroup("timeline_tools"); timelineMoveTool->setExclusiveGroup("timeline_tools");
timelineRazorTool->setExclusiveGroup("timeline_tools"); timelineRazorTool->setExclusiveGroup("timeline_tools");
...@@ -152,8 +152,8 @@ void KdenliveApp::initActions() ...@@ -152,8 +152,8 @@ void KdenliveApp::initActions()
fileOpenRecent->setStatusText(i18n("Opens a recently used file")); fileOpenRecent->setStatusText(i18n("Opens a recently used file"));
fileSave->setStatusText(i18n("Saves the actual document")); fileSave->setStatusText(i18n("Saves the actual document"));
fileSaveAs->setStatusText(i18n("Saves the actual document as...")); fileSaveAs->setStatusText(i18n("Saves the actual document as..."));
fileClose->setStatusText(i18n("Closes the actual document")); // fileClose->setStatusText(i18n("Closes the actual document"));
filePrint ->setStatusText(i18n("Prints out the actual document")); // filePrint ->setStatusText(i18n("Prints out the actual document"));
fileQuit->setStatusText(i18n("Quits the application")); fileQuit->setStatusText(i18n("Quits the application"));
editCut->setStatusText(i18n("Cuts the selected section and puts it to the clipboard")); editCut->setStatusText(i18n("Cuts the selected section and puts it to the clipboard"));
editCopy->setStatusText(i18n("Copies the selected section to the clipboard")); editCopy->setStatusText(i18n("Copies the selected section to the clipboard"));
...@@ -294,7 +294,9 @@ void KdenliveApp::initView() ...@@ -294,7 +294,9 @@ void KdenliveApp::initView()
connect(getDocument()->renderer(), SIGNAL(rendering(const GenTime &)), this, SLOT(slotSetRenderProgress(const GenTime &))); connect(getDocument()->renderer(), SIGNAL(rendering(const GenTime &)), this, SLOT(slotSetRenderProgress(const GenTime &)));
connect(getDocument()->renderer(), SIGNAL(renderFinished()), this, SLOT(slotSetRenderFinished())); connect(getDocument()->renderer(), SIGNAL(renderFinished()), this, SLOT(slotSetRenderFinished()));
connect(m_renderManager, SIGNAL(recievedInfo(const QString &, const QString &)), m_renderDebugPanel, SLOT(slotPrintDebug(const QString &, const QString &))); connect(m_renderManager, SIGNAL(renderDebug(const QString &, const QString &)), m_renderDebugPanel, SLOT(slotPrintRenderDebug(const QString &, const QString &)));
connect(m_renderManager, SIGNAL(renderWarning(const QString &, const QString &)), m_renderDebugPanel, SLOT(slotPrintRenderWarning(const QString &, const QString &)));
connect(m_renderManager, SIGNAL(renderError(const QString &, const QString &)), m_renderDebugPanel, SLOT(slotPrintRenderError(const QString &, const QString &)));
connect(m_renderManager, SIGNAL(recievedStdout(const QString &, const QString &)), m_renderDebugPanel, SLOT(slotPrintWarning(const QString &, const QString &))); connect(m_renderManager, SIGNAL(recievedStdout(const QString &, const QString &)), m_renderDebugPanel, SLOT(slotPrintWarning(const QString &, const QString &)));
connect(m_renderManager, SIGNAL(recievedStderr(const QString &, const QString &)), m_renderDebugPanel, SLOT(slotPrintError(const QString &, const QString &))); connect(m_renderManager, SIGNAL(recievedStderr(const QString &, const QString &)), m_renderDebugPanel, SLOT(slotPrintError(const QString &, const QString &)));
connect(m_renderManager, SIGNAL(error(const QString &, const QString &)), this, SLOT(slotRenderError(const QString &, const QString &))); connect(m_renderManager, SIGNAL(error(const QString &, const QString &)), this, SLOT(slotRenderError(const QString &, const QString &)));
...@@ -500,9 +502,9 @@ void KdenliveApp::slotFileOpenRecent(const KURL& url) ...@@ -500,9 +502,9 @@ void KdenliveApp::slotFileOpenRecent(const KURL& url)
} }
else else
{ {
kdDebug() << "Opening url " << url.path() << endl; kdWarning() << "Opening url " << url.path() << endl;
doc->openDocument(url); doc->openDocument(url);
setCaption(url.fileName(), false); setCaption(url.fileName(), false);
} }
slotStatusMsg(i18n("Ready.")); slotStatusMsg(i18n("Ready."));
......
...@@ -272,8 +272,8 @@ class KdenliveApp : public KDockMainWindow ...@@ -272,8 +272,8 @@ class KdenliveApp : public KDockMainWindow
KRecentFilesAction* fileOpenRecent; KRecentFilesAction* fileOpenRecent;
KAction* fileSave; KAction* fileSave;
KAction* fileSaveAs; KAction* fileSaveAs;
KAction* fileClose; // KAction* fileClose;
KAction* filePrint; // KAction* filePrint;
KAction* fileQuit; KAction* fileQuit;
KAction* editCut; KAction* editCut;
KAction* editCopy; KAction* editCopy;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment