Display log info when screen capture crashes: http://kdenlive.org/mantis/view.php...

diff --git a/src/recmonitor.cpp b/src/recmonitor.cpp
index 06dba63e6608e14d17fabf6d0eb14bc83c119632..f2395efb87d2294b945cc356777843c12238bcea 100644 (file)
--- a/src/recmonitor.cpp
+++ b/src/recmonitor.cpp
@@ -36,6 +36,7 @@
 #include <KMessageBox>
 #include <KApplication>
 #include <KDiskFreeSpaceInfo>
+
 #include <QMouseEvent>
 #include <QMenu>
 #include <QToolButton>
@@ -57,7 +58,6 @@ RecMonitor::RecMonitor(Kdenlive::MONITORID name, MonitorManager *manager, QWidge
     //video_frame->setAttribute(Qt::WA_PaintOnScreen);
     device_selector->setCurrentIndex(KdenliveSettings::defaultcapture());
     connect(device_selector, SIGNAL(currentIndexChanged(int)), this, SLOT(slotVideoDeviceChanged(int)));
-
     // Video widget holder
     QVBoxLayout *l = new QVBoxLayout;
     l->setContentsMargins(0, 0, 0, 0);
@@ -67,8 +67,8 @@ RecMonitor::RecMonitor(Kdenlive::MONITORID name, MonitorManager *manager, QWidge
     createVideoSurface();
 
     QToolBar *toolbar = new QToolBar(this);
-    QHBoxLayout *layout = new QHBoxLayout;
-    layout->setContentsMargins(0, 0, 0, 0);
+    QHBoxLayout *hlayout = new QHBoxLayout;
+    hlayout->setContentsMargins(0, 0, 0, 0);
     m_playIcon = KIcon("media-playback-start");
     m_pauseIcon = KIcon("media-playback-pause");
 
@@ -104,7 +104,6 @@ RecMonitor::RecMonitor(Kdenlive::MONITORID name, MonitorManager *manager, QWidge
     m_previewSettings = new QAction(i18n("Recording Preview"), this);
     m_previewSettings->setCheckable(true);
 
-
     rec_options->setMenu(menu);
     menu->addAction(m_previewSettings);
 
@@ -114,30 +113,30 @@ RecMonitor::RecMonitor(Kdenlive::MONITORID name, MonitorManager *manager, QWidge
     connect(configAction, SIGNAL(triggered()), this, SLOT(slotConfigure()));
     configAction->setCheckable(false);
 
-    layout->addWidget(toolbar);
-    layout->addWidget(&m_logger);
-    layout->addWidget(&m_dvinfo);
+    hlayout->addWidget(toolbar);
+    hlayout->addWidget(&m_logger);
+    hlayout->addWidget(&m_dvinfo);
     m_logger.setMaxCount(10);
     m_logger.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
     m_logger.setFrame(false);
     //m_logger.setInsertPolicy(QComboBox::InsertAtTop);
-
+    
     m_freeSpace = new KCapacityBar(KCapacityBar::DrawTextInline, this);
     m_freeSpace->setMaximumWidth(150);
     QFontMetricsF fontMetrics(font());
     m_freeSpace->setMaximumHeight(fontMetrics.height() * 1.2);
     slotUpdateFreeSpace();
-    layout->addWidget(m_freeSpace);
+    hlayout->addWidget(m_freeSpace);
     connect(&m_spaceTimer, SIGNAL(timeout()), this, SLOT(slotUpdateFreeSpace()));
     m_spaceTimer.setInterval(30000);
     m_spaceTimer.setSingleShot(false);
 
-    control_frame_firewire->setLayout(layout);
+    control_frame_firewire->setLayout(hlayout);
     m_displayProcess = new QProcess;
     m_captureProcess = new QProcess;
 
     connect(m_captureProcess, SIGNAL(stateChanged(QProcess::ProcessState)), this, SLOT(slotProcessStatus(QProcess::ProcessState)));
-    connect(m_captureProcess, SIGNAL(readyReadStandardError()), this, SLOT(slotReadDvgrabInfo()));
+    connect(m_captureProcess, SIGNAL(readyReadStandardError()), this, SLOT(slotReadProcessInfo()));
     
     QString videoDriver = KdenliveSettings::videodrivername();
 #if QT_VERSION >= 0x040600
@@ -165,6 +164,13 @@ RecMonitor::RecMonitor(Kdenlive::MONITORID name, MonitorManager *manager, QWidge
     setenv("SDL_VIDEO_ALLOW_SCREENSAVER", "1", 1);
 
     kDebug() << "/////// BUILDING MONITOR, ID: " << videoSurface->winId();
+#if KDE_IS_VERSION(4,7,0)
+    m_infoMessage = new KMessageWidget;
+    QVBoxLayout *s =  static_cast <QVBoxLayout *> (layout());
+    s->insertWidget(1, m_infoMessage);
+    m_infoMessage->hide();
+#endif
+    
     slotVideoDeviceChanged(device_selector->currentIndex());
     m_previewSettings->setChecked(KdenliveSettings::enable_recording_preview());
     connect(m_previewSettings, SIGNAL(triggered(bool)), this, SLOT(slotChangeRecordingPreview(bool)));
@@ -227,6 +233,7 @@ void RecMonitor::slotVideoDeviceChanged(int ix)
 {
     QString capturefile;
     QString capturename;
+    m_infoMessage->animatedHide();
     m_previewSettings->setEnabled(ix == VIDEO4LINUX || ix == BLACKMAGIC);
     control_frame->setVisible(ix == VIDEO4LINUX);
     m_playAction->setVisible(ix != SCREENGRAB);
@@ -259,13 +266,13 @@ void RecMonitor::slotVideoDeviceChanged(int ix)
                // Check for libav version
                exepath = KStandardDirs::findExe("avconv");
            }
-           if (exepath.isEmpty()) video_frame->setPixmap(mergeSideBySide(KIcon("dialog-warning").pixmap(QSize(50, 50)), i18n("ffmpeg or avconv not found,\n please install it for screen grabs")));
+           if (exepath.isEmpty()) showMessage(i18n("ffmpeg or avconv not found,\n please install it for screen grabs"), "dialog-warning");
            else KdenliveSettings::setFfmpegpath(exepath);
        }
         if (!KdenliveSettings::ffmpegpath().isEmpty()) {
            if (!Render::checkX11Grab()) {
                // FFmpeg does not support screen grab
-               video_frame->setPixmap(mergeSideBySide(KIcon("dialog-warning").pixmap(QSize(50, 50)), i18n("Your FFmpeg / Libav installation\n does not support screen grab")));
+               showMessage("dialog-warning", i18n("Your FFmpeg / Libav installation\n does not support screen grab"));
                m_recAction->setEnabled(false);
            }
            else video_frame->setPixmap(mergeSideBySide(KIcon("video-display").pixmap(QSize(50, 50)), i18n("Press record button\nto start screen capture\nFiles will be saved in:\n%1", m_capturePath)));
@@ -298,7 +305,9 @@ void RecMonitor::slotVideoDeviceChanged(int ix)
         // Check that dvgab is available
         if (KdenliveSettings::dvgrab_path().isEmpty()) {
             QString dvgrabpath = KStandardDirs::findExe("dvgrab");
-            if (dvgrabpath.isEmpty()) video_frame->setPixmap(mergeSideBySide(KIcon("dialog-warning").pixmap(QSize(50, 50)), i18n("dvgrab utility not found,\n please install it for firewire capture")));
+            if (dvgrabpath.isEmpty()) {
+               showMessage(i18n("dvgrab utility not found,\n please install it for firewire capture"), "dialog-warning");
+           }
             else KdenliveSettings::setDvgrab_path(dvgrabpath);
         } else {
             // Show capture info
@@ -564,6 +573,7 @@ void RecMonitor::slotStartPreview(bool play)
 
 void RecMonitor::slotRecord()
 {
+    m_error.clear();
     if (m_captureProcess->state() == QProcess::NotRunning && device_selector->currentIndex() == FIREWIRE) {
         slotStartPreview();
     }
@@ -746,6 +756,10 @@ void RecMonitor::slotRecord()
             } else m_captureArgs << "--no-sound";*/
 
             m_captureProcess->start(KdenliveSettings::ffmpegpath(), m_captureArgs);
+           if (!m_captureProcess->waitForStarted()) {
+               // Problem launching capture app
+               showMessage(i18n("Failed to start the capture application:\n%1", KdenliveSettings::ffmpegpath()), "dialog-warning");
+           }
             //kDebug() << "// Screen grab params: " << m_captureArgs;
             break;
         default:
@@ -767,6 +781,30 @@ void RecMonitor::slotRecord()
     }
 }
 
+
+void RecMonitor::showMessage(const QString &text, const QString &icon, bool logAction)
+{
+#if KDE_IS_VERSION(4,7,0)
+    m_infoMessage->setText(text);
+    m_infoMessage->setMessageType(KMessageWidget::Warning);
+    if (logAction) {
+       QAction *manualAction = new QAction(i18n("Show log"), this);
+       connect(manualAction, SIGNAL(triggered()), this, SLOT(slotShowLog()));
+       m_infoMessage->addAction(manualAction);
+    }
+    m_infoMessage->animatedShow();
+#else
+    if (!logAction) {
+       video_frame->setPixmap(mergeSideBySide(KIcon(icon).pixmap(QSize(50, 50)), text));
+       
+    }
+    else {
+       video_frame->setText(QString("<qt>" + text + "<br><a href=\"http://kde.org\">" + i18n("Show log") + "</a>"));
+       connect(video_frame, SIGNAL(linkActivated (const QString &)), this, SLOT(slotShowLog()));
+    }
+#endif
+}
+
 const QString RecMonitor::getV4lXmlPlaylist(MltVideoProfile profile, bool *isXml) 
 {
     QString playlist;
@@ -829,6 +867,7 @@ void RecMonitor::slotStartGrab(const QRect &rect) {
 
 void RecMonitor::slotProcessStatus(QProcess::ProcessState status)
 {
+    kDebug()<<"// STATUS CHANGED: "<<status;
     if (status == QProcess::NotRunning) {
         m_displayProcess->kill();
         if (m_isCapturing && device_selector->currentIndex() != FIREWIRE)
@@ -853,14 +892,14 @@ void RecMonitor::slotProcessStatus(QProcess::ProcessState status)
         m_stopAction->setEnabled(false);
         device_selector->setEnabled(true);
         if (m_captureProcess && m_captureProcess->exitStatus() == QProcess::CrashExit) {
-            video_frame->setText(i18n("Capture crashed, please check your parameters"));
+           showMessage(i18n("Capture crashed, please check your parameters"), "dialog-warning", true);
         } else {
             if (device_selector->currentIndex() != SCREENGRAB) {
                 video_frame->setText(i18n("Not connected"));
             } else {
                int code = m_captureProcess->exitCode();
                 if (code != 0 && code != 255) {
-                    video_frame->setText(i18n("Capture crashed, please check your parameters.\nExit code: %1", QString::number(m_captureProcess->exitCode())));
+                    showMessage(i18n("Capture crashed, please check your parameters"), "dialog-warning", true);
                 } else {
                     video_frame->setPixmap(mergeSideBySide(KIcon("video-display").pixmap(QSize(50, 50)), i18n("Press record button\nto start screen capture\nFiles will be saved in:\n%1", m_capturePath)));
                 }
@@ -961,12 +1000,22 @@ void RecMonitor::slotPlay()
     else slotStartPreview(true);*/
 }
 
-void RecMonitor::slotReadDvgrabInfo()
+void RecMonitor::slotReadProcessInfo()
 {
     QString data = m_captureProcess->readAllStandardError().simplified();
-    data = data.section('"', 2, 2).simplified();
-    m_dvinfo.setText(data.left(11));
-    m_dvinfo.updateGeometry();
+    if (device_selector->currentIndex() == SCREENGRAB) {
+       m_error.append(data + "\n");
+    }
+    else if (device_selector->currentIndex() == FIREWIRE) {
+       data = data.section('"', 2, 2).simplified();
+       m_dvinfo.setText(data.left(11));
+       m_dvinfo.updateGeometry();
+    }
+}
+
+void RecMonitor::slotShowLog()
+{
+    KMessageBox::information(this, m_error);
 }
 
 AbstractRender *RecMonitor::abstractRender()

diff --git a/src/recmonitor.h b/src/recmonitor.h
index 16063fafdfde60a5245cda57097f207f0f38d94f..791f97cfea777a43dd80add6d0b329e50264f312 100644 (file)
--- a/src/recmonitor.h
+++ b/src/recmonitor.h
@@ -43,6 +43,10 @@
 #include <KComboBox>
 #include <kcapacitybar.h>
 
+#if KDE_IS_VERSION(4,7,0)
+#include <KMessageWidget>
+#endif
+
 class MonitorManager;
 class MltDeviceCapture;
 class AbstractRender;
@@ -100,7 +104,12 @@ private:
     VideoContainer *m_videoBox;
     QAction *m_addCapturedClip;
     QAction *m_previewSettings;
-    
+    QString m_error;
+
+#if KDE_IS_VERSION(4,7,0)
+    KMessageWidget *m_infoMessage;
+#endif
+
     bool m_analyse;
     void checkDeviceAvailability();
     QPixmap mergeSideBySide(const QPixmap& pix, const QString &txt);
@@ -109,6 +118,8 @@ private:
     void buildMltDevice(const QString &path);
     /** @brief Create string containing an XML playlist for v4l capture. */
     const QString getV4lXmlPlaylist(MltVideoProfile profile, bool *isXml);
+    /** @brief Display an error message to user. */
+    void showMessage(const QString &text, const QString &icon, bool logAction = false);
 
 private slots:
     void slotStartPreview(bool play = true);
@@ -120,12 +131,14 @@ private slots:
     void slotDisconnect();
     //void slotStartGrab(const QRect &rect);
     void slotConfigure();
-    void slotReadDvgrabInfo();
+    void slotReadProcessInfo();
     void slotUpdateFreeSpace();
     void slotSetInfoMessage(const QString &message);
     void slotDroppedFrames(int dropped);
     /** @brief Change setting for preview while recording. */
     void slotChangeRecordingPreview(bool enable);
+    /** @brief Show last jog error log. */
+    void slotShowLog();
 
 public slots:
     void refreshRecMonitor(bool visible);

diff --git a/src/widgets/recmonitor_ui.ui b/src/widgets/recmonitor_ui.ui
index d03ec1cc63779a7e742e6c71356566996d1f2829..2a701fa8a283102812e524d27766d24bc19a1495 100644 (file)
--- a/src/widgets/recmonitor_ui.ui
+++ b/src/widgets/recmonitor_ui.ui
@@ -6,62 +6,34 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>298</width>
-    <height>163</height>
+    <width>312</width>
+    <height>204</height>
    </rect>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
+  <layout class="QVBoxLayout" name="verticalLayout">
    <property name="margin">
     <number>0</number>
    </property>
-   <item row="2" column="4">
-    <widget class="KComboBox" name="device_selector">
-     <item>
-      <property name="text">
-       <string>Firewire</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>FFmpeg</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Screen grab</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Blackmagic card</string>
-      </property>
-     </item>
-    </widget>
-   </item>
-   <item row="0" column="0" colspan="5">
+   <item>
     <widget class="QLabel" name="video_frame">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="text">
       <string>Not connected</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignCenter</set>
      </property>
-    </widget>
-   </item>
-   <item row="2" column="3">
-    <spacer name="horizontalSpacer">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
+     <property name="openExternalLinks">
+      <bool>false</bool>
      </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>40</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
+    </widget>
    </item>
-   <item row="1" column="0" colspan="5">
+   <item>
     <widget class="QFrame" name="control_frame_firewire">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
@@ -83,51 +55,85 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="0">
-    <widget class="QToolButton" name="rec_options">
-     <property name="text">
-      <string>...</string>
-     </property>
-     <property name="popupMode">
-      <enum>QToolButton::InstantPopup</enum>
-     </property>
-     <property name="autoRaise">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="1">
-    <widget class="QFrame" name="control_frame">
-     <property name="frameShape">
-      <enum>QFrame::NoFrame</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Plain</enum>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_2">
-      <property name="margin">
-       <number>0</number>
-      </property>
-      <item row="0" column="0">
-       <widget class="QCheckBox" name="rec_video">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QToolButton" name="rec_options">
+       <property name="text">
+        <string>...</string>
+       </property>
+       <property name="popupMode">
+        <enum>QToolButton::InstantPopup</enum>
+       </property>
+       <property name="autoRaise">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QFrame" name="control_frame">
+       <property name="frameShape">
+        <enum>QFrame::NoFrame</enum>
+       </property>
+       <property name="frameShadow">
+        <enum>QFrame::Plain</enum>
+       </property>
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <item>
+         <widget class="QCheckBox" name="rec_video">
+          <property name="text">
+           <string>Video</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="rec_audio">
+          <property name="text">
+           <string>Audio</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="KComboBox" name="device_selector">
+       <item>
         <property name="text">
-         <string>Video</string>
+         <string>Firewire</string>
         </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QCheckBox" name="rec_audio">
+       </item>
+       <item>
         <property name="text">
-         <string>Audio</string>
+         <string>FFmpeg</string>
         </property>
-       </widget>
-      </item>
-     </layout>
-     <zorder>rec_video</zorder>
-     <zorder>rec_audio</zorder>
-     <zorder>rec_video</zorder>
-     <zorder>rec_audio</zorder>
-    </widget>
+       </item>
+       <item>
+        <property name="text">
+         <string>Screen grab</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Blackmagic card</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+    </layout>
    </item>
   </layout>
  </widget>