Disable Record Monitor, Capture Settings, and Split view on OS X.

Fix frame dropping toggle and display of widgets in status bar on OS X.

svn path=/trunk/kdenlive/; revision=3862

diff --git a/src/kdenlivesettingsdialog.cpp b/src/kdenlivesettingsdialog.cpp
index ff01bba2823e1d299f782a0f0d15609483e13548..a9afce187af047e20c8017e7c0fac719a5f403d4 100644 (file)
--- a/src/kdenlivesettingsdialog.cpp
+++ b/src/kdenlivesettingsdialog.cpp
@@ -75,6 +75,11 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(QWidget * parent) :
     m_configCapture.setupUi(p4);
     m_page4 = addPage(p4, i18n("Capture"), "media-record");
     m_configCapture.tabWidget->setCurrentIndex(KdenliveSettings::defaultcapture());
+#ifdef Q_WS_MAC
+       m_configCapture.tabWidget->setEnabled(false);
+       m_configCapture.kcfg_defaultcapture->setEnabled(false);
+       m_configCapture.label->setText(i18n("Capture is not yet available on OS X."));
+#endif
 
     QWidget *p5 = new QWidget;
     m_configShuttle.setupUi(p5);

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 2f108fed876b830ff3e3258fb8379aa361894616..c5ea6537f18a10029a9bbf894da180d82973d82e 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -194,6 +194,7 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent
     m_projectMonitorDock->setWidget(m_projectMonitor);
     addDockWidget(Qt::TopDockWidgetArea, m_projectMonitorDock);
 
+#ifndef Q_WS_MAC
     m_recMonitorDock = new QDockWidget(i18n("Record Monitor"), this);
     m_recMonitorDock->setObjectName("record_monitor");
     m_recMonitor = new RecMonitor("record", this);
@@ -202,6 +203,7 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent
 
     connect(m_recMonitor, SIGNAL(addProjectClip(KUrl)), this, SLOT(slotAddProjectClip(KUrl)));
     connect(m_recMonitor, SIGNAL(showConfigDialog(int, int)), this, SLOT(slotPreferences(int, int)));
+#endif
 
     m_undoViewDock = new QDockWidget(i18n("Undo History"), this);
     m_undoViewDock->setObjectName("undo_history");
@@ -226,7 +228,9 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent
 
 
     tabifyDockWidget(m_clipMonitorDock, m_projectMonitorDock);
+#ifndef Q_WS_MAC
     tabifyDockWidget(m_clipMonitorDock, m_recMonitorDock);
+#endif
     setCentralWidget(m_timelineArea);
 
 
@@ -744,7 +748,11 @@ void MainWindow::setupActions()
     m_zoomSlider->setMaximumWidth(150);
     m_zoomSlider->setMinimumWidth(100);
 
+#ifdef Q_WS_MAC
+    const int contentHeight = QFontMetrics(w->font()).height() + 14;
+#else
     const int contentHeight = QFontMetrics(w->font()).height() + 8;
+#endif
 
     QString style = "QSlider::groove:horizontal { background-color: rgba(230, 230, 230, 220);border: 1px solid #999999;height: 8px;border-radius: 3px;margin-top:3px }";
     style.append("QSlider::handle:horizontal {  background-color: white; border: 1px solid #999999;width: 9px;margin: -2px 0;border-radius: 3px; }");
@@ -1895,7 +1903,9 @@ void MainWindow::slotPreferences(int page, int option)
     //connect(dialog, SIGNAL(doResetProfile()), this, SLOT(slotDetectAudioDriver()));
     connect(dialog, SIGNAL(doResetProfile()), m_monitorManager, SLOT(slotResetProfiles()));
     connect(dialog, SIGNAL(updatePreviewSettings()), this, SLOT(slotUpdatePreviewSettings()));
+#ifndef Q_WS_MAC
     connect(dialog, SIGNAL(updateCaptureFolder()), m_recMonitor, SLOT(slotUpdateCaptureFolder()));
+#endif
     //connect(dialog, SIGNAL(updatePreviewSettings()), this, SLOT(slotUpdatePreviewSettings()));
     dialog->show();
     if (page != -1) dialog->showPage(page, option);

diff --git a/src/monitor.cpp b/src/monitor.cpp
index 88f35599e97e4afbd2467f511ee862fcfc677c8e..ff2f7a4a7094721757712201915586e4855e7baa 100644 (file)
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -190,9 +190,11 @@ void Monitor::setupMenu(QMenu *goMenu, QAction *playZone, QAction *loopZone, QMe
     m_contextMenu->addAction(extractFrame);
 
     if (m_name != "clip") {
+#ifndef Q_WS_MAC
         QAction *splitView = m_contextMenu->addAction(KIcon("view-split-left-right"), i18n("Split view"), render, SLOT(slotSplitView(bool)));
         splitView->setCheckable(true);
         m_configMenu->addAction(splitView);
+#endif
     } else {
         QAction *setThumbFrame = m_contextMenu->addAction(KIcon("document-new"), i18n("Set current image as thumbnail"), this, SLOT(slotSetThumbFrame()));
         m_configMenu->addAction(setThumbFrame);

diff --git a/src/renderer.cpp b/src/renderer.cpp
index d107fbbc05076712df14147582d665b112e3fd44..32d40d227a001b3d38f15bc94feb8050fafcc613 100644 (file)
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -1356,7 +1356,11 @@ void Render::setDropFrames(bool show)
         int dropFrames = 1;
         if (show == false) dropFrames = 0;
         m_mltConsumer->stop();
+#ifdef Q_WS_MAC
+        m_mltConsumer->set("real_time", dropFrames);
+#else
         m_mltConsumer->set("play.real_time", dropFrames);
+#endif
         if (m_mltConsumer->start() == -1) {
             emit blockMonitors();
             delete m_mltProducer;