From: <dde...@us...> - 2009-08-29 21:59:50
|
Revision: 3862 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3862&view=rev Author: ddennedy Date: 2009-08-29 21:59:44 +0000 (Sat, 29 Aug 2009) Log Message: ----------- 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. Modified Paths: -------------- trunk/kdenlive/src/kdenlivesettingsdialog.cpp trunk/kdenlive/src/mainwindow.cpp trunk/kdenlive/src/monitor.cpp trunk/kdenlive/src/renderer.cpp Modified: trunk/kdenlive/src/kdenlivesettingsdialog.cpp =================================================================== --- trunk/kdenlive/src/kdenlivesettingsdialog.cpp 2009-08-29 21:01:55 UTC (rev 3861) +++ trunk/kdenlive/src/kdenlivesettingsdialog.cpp 2009-08-29 21:59:44 UTC (rev 3862) @@ -75,6 +75,11 @@ 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); Modified: trunk/kdenlive/src/mainwindow.cpp =================================================================== --- trunk/kdenlive/src/mainwindow.cpp 2009-08-29 21:01:55 UTC (rev 3861) +++ trunk/kdenlive/src/mainwindow.cpp 2009-08-29 21:59:44 UTC (rev 3862) @@ -194,6 +194,7 @@ 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 @@ 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 @@ tabifyDockWidget(m_clipMonitorDock, m_projectMonitorDock); +#ifndef Q_WS_MAC tabifyDockWidget(m_clipMonitorDock, m_recMonitorDock); +#endif setCentralWidget(m_timelineArea); @@ -744,7 +748,11 @@ 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 @@ //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); Modified: trunk/kdenlive/src/monitor.cpp =================================================================== --- trunk/kdenlive/src/monitor.cpp 2009-08-29 21:01:55 UTC (rev 3861) +++ trunk/kdenlive/src/monitor.cpp 2009-08-29 21:59:44 UTC (rev 3862) @@ -190,9 +190,11 @@ 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); Modified: trunk/kdenlive/src/renderer.cpp =================================================================== --- trunk/kdenlive/src/renderer.cpp 2009-08-29 21:01:55 UTC (rev 3861) +++ trunk/kdenlive/src/renderer.cpp 2009-08-29 21:59:44 UTC (rev 3862) @@ -1356,7 +1356,11 @@ 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; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |