Menu
▾
▴
[Kdenlive-svn] SF.net SVN: kdenlive:[4363] trunk/kdenlive
|
From: <xz...@us...> - 2010-03-30 11:43:44
|
Revision: 4363
http://kdenlive.svn.sourceforge.net/kdenlive/?rev=4363&view=rev
Author: xzhayon
Date: 2010-03-30 11:43:37 +0000 (Tue, 30 Mar 2010)
Log Message:
-----------
- Make reindent.sh work when not called from its own directory.
- Reindent some source files.
Modified Paths:
--------------
trunk/kdenlive/reindent.sh
trunk/kdenlive/src/monitor.cpp
trunk/kdenlive/src/slideshowclip.cpp
trunk/kdenlive/src/timecode.cpp
trunk/kdenlive/src/titlewidget.cpp
trunk/kdenlive/src/titlewidget.h
Modified: trunk/kdenlive/reindent.sh
===================================================================
--- trunk/kdenlive/reindent.sh 2010-03-30 11:35:38 UTC (rev 4362)
+++ trunk/kdenlive/reindent.sh 2010-03-30 11:43:37 UTC (rev 4363)
@@ -1,6 +1,7 @@
#! /bin/sh
-SRCDIRS="src plugins renderer thumbnailer"
+WRKDIR=$(dirname $0)
+SRCDIRS="$WRKDIR/src $WRKDIR/plugins $WRKDIR/renderer $WRKDIR/thumbnailer"
if [ $# -gt 0 ]
then
Modified: trunk/kdenlive/src/monitor.cpp
===================================================================
--- trunk/kdenlive/src/monitor.cpp 2010-03-30 11:35:38 UTC (rev 4362)
+++ trunk/kdenlive/src/monitor.cpp 2010-03-30 11:43:37 UTC (rev 4363)
@@ -119,7 +119,7 @@
m_timePos->setInputMask(QString());
m_timePos->setValidator(new QIntValidator(this));
} else m_timePos->setInputMask(m_monitorManager->timecode().inputMask());
-
+
toolbar->addWidget(m_timePos);
connect(m_timePos, SIGNAL(editingFinished()), this, SLOT(slotSeek()));
Modified: trunk/kdenlive/src/slideshowclip.cpp
===================================================================
--- trunk/kdenlive/src/slideshowclip.cpp 2010-03-30 11:35:38 UTC (rev 4362)
+++ trunk/kdenlive/src/slideshowclip.cpp 2010-03-30 11:43:37 UTC (rev 4363)
@@ -52,7 +52,7 @@
m_view.image_type->addItem("TGA (*.tga)", "tga");
m_view.image_type->addItem("TIFF (*.tiff)", "tiff");
m_view.image_type->addItem("Open EXR (*.exr)", "exr");
-
+
m_view.clip_duration->setInputMask(m_timecode.inputMask());
m_view.clip_duration->setText(m_timecode.reformatSeparators(KdenliveSettings::image_duration()));
m_view.luma_duration->setInputMask(m_timecode.inputMask());
Modified: trunk/kdenlive/src/timecode.cpp
===================================================================
--- trunk/kdenlive/src/timecode.cpp 2010-03-30 11:35:38 UTC (rev 4362)
+++ trunk/kdenlive/src/timecode.cpp 2010-03-30 11:43:37 UTC (rev 4363)
@@ -66,7 +66,7 @@
if (m_dropFrame) {
//Get Hours, Minutes, Seconds, Frames from timecode
int hours, minutes, seconds, frames;
-
+
hours = duration.section(':', 0, 0).toInt();
if (duration.contains('.')) {
minutes = duration.section('.', 0, 0).section(':', 1, 1).toInt();
@@ -78,9 +78,9 @@
seconds = duration.section(':', 2, 2).toInt();
frames = duration.section(':', 3, 3).toInt();
}
-
+
//Calculate the frame count
- int dropRate = (int) ((ceil(m_displayedFramesPerSecond) / 30) * 2);
+ int dropRate = (int)((ceil(m_displayedFramesPerSecond) / 30) * 2);
frames += ((hours * 60 + minutes) * 60 + seconds) * m_displayedFramesPerSecond;
frames -= dropRate * ((hours * 60 + minutes) - (floor((hours * 60 + minutes) / 10)));
return frames;
@@ -243,12 +243,12 @@
text.append(':');
text.append(QString::number(minutes).rightJustified(2, '0', false));
if (m_dropFrame) {
- text.append('.');
+ text.append('.');
} else {
text.append(':');
}
text.append(QString::number(seconds).rightJustified(2, '0', false));
- text.append(':');
+ text.append(':');
text.append(QString::number(hundredths).rightJustified(2, '0', false));
return text;
@@ -277,7 +277,7 @@
// calculate how many frames need to be dropped every minute.
int dropRate = 0;
if (m_dropFrame) {
- dropRate = (int) ((ceil(m_displayedFramesPerSecond) / 30) * 2);
+ dropRate = (int)((ceil(m_displayedFramesPerSecond) / 30) * 2);
}
// calculate how many frames are in a normal minute, and how many are in a tenth minute.
@@ -321,12 +321,12 @@
text.append(QString::number(tenMinuteIntervals));
text.append(QString::number(numMinutes));
if (m_dropFrame) {
- text.append('.');
+ text.append('.');
} else {
text.append(':');
}
text.append(QString::number(seconds).rightJustified(2, '0', false));
- text.append(':');
+ text.append(':');
text.append(QString::number(frames).rightJustified(2, '0', false));
return text;
Modified: trunk/kdenlive/src/titlewidget.cpp
===================================================================
--- trunk/kdenlive/src/titlewidget.cpp 2010-03-30 11:35:38 UTC (rev 4362)
+++ trunk/kdenlive/src/titlewidget.cpp 2010-03-30 11:43:37 UTC (rev 4363)
@@ -431,18 +431,17 @@
initAnimation();
connect(anim_start, SIGNAL(toggled(bool)), this, SLOT(slotAnimStart(bool)));
connect(anim_end, SIGNAL(toggled(bool)), this, SLOT(slotAnimEnd(bool)));
- connect(templateBox,SIGNAL(currentIndexChanged(int)),this,SLOT(templateIndexChanged(int)));
+ connect(templateBox, SIGNAL(currentIndexChanged(int)), this, SLOT(templateIndexChanged(int)));
buttonBox->button(QDialogButtonBox::Ok)->setEnabled(KdenliveSettings::hastitleproducer());
- refreshTitleTemplates();
- //templateBox->setIconSize(QSize(60,60));
- templateBox->clear();
- templateBox->addItem("");
- foreach (TitleTemplate t, titletemplates)
- {
- templateBox->addItem(t.icon,t.name,t.file);
- }
- lastDocumentHash=QCryptographicHash::hash(xml().toString().toAscii(), QCryptographicHash::Md5).toHex();
+ refreshTitleTemplates();
+ //templateBox->setIconSize(QSize(60,60));
+ templateBox->clear();
+ templateBox->addItem("");
+ foreach(TitleTemplate t, titletemplates) {
+ templateBox->addItem(t.icon, t.name, t.file);
+ }
+ lastDocumentHash = QCryptographicHash::hash(xml().toString().toAscii(), QCryptographicHash::Md5).toHex();
}
TitleWidget::~TitleWidget()
@@ -527,38 +526,36 @@
//static
void TitleWidget::refreshTitleTemplates()
{
- QStringList titlenamelist = QStringList() << i18n("None");
+ QStringList titlenamelist = QStringList() << i18n("None");
QStringList titlefiles = QStringList() << QString();
QStringList filters;
filters << "*.kdenlivetitle" ;
- titletemplates.clear();
+ titletemplates.clear();
QStringList titleTemplates = KGlobal::dirs()->findDirs("appdata", "titles");
foreach(const QString &folder, titleTemplates) {
QStringList filesnames = QDir(folder).entryList(filters, QDir::Files);
foreach(const QString &fname, filesnames) {
- //titlenamelist.append(fname);
+ //titlenamelist.append(fname);
//titlefiles.append(KUrl(folder).path(KUrl::AddTrailingSlash) + fname);
- TitleTemplate t;
- t.name=fname;
- t.file=KUrl(folder).path(KUrl::AddTrailingSlash) + fname;
- t.icon=QIcon(KThumb::getImage(t.file,0,60,60));
- titletemplates.append(t);
+ TitleTemplate t;
+ t.name = fname;
+ t.file = KUrl(folder).path(KUrl::AddTrailingSlash) + fname;
+ t.icon = QIcon(KThumb::getImage(t.file, 0, 60, 60));
+ titletemplates.append(t);
}
}
- kDebug() << titlenamelist << titlefiles;
+ kDebug() << titlenamelist << titlefiles;
}
-void TitleWidget::templateIndexChanged(int index )
+void TitleWidget::templateIndexChanged(int index)
{
- QString item=templateBox->itemData(index).toString();
- if (item!="")
- {
- if (lastDocumentHash!=QCryptographicHash::hash(xml().toString().toAscii(), QCryptographicHash::Md5).toHex())
- {
- if (KMessageBox::questionYesNo(this, i18n("Title was changed !\nDo you really want to load a new template?\nAll changes in this document are lost !!")) == KMessageBox::No) return;
- }
- loadTitle(item);
- lastDocumentHash=QCryptographicHash::hash(xml().toString().toAscii(), QCryptographicHash::Md5).toHex();
- }
+ QString item = templateBox->itemData(index).toString();
+ if (item != "") {
+ if (lastDocumentHash != QCryptographicHash::hash(xml().toString().toAscii(), QCryptographicHash::Md5).toHex()) {
+ if (KMessageBox::questionYesNo(this, i18n("Title was changed !\nDo you really want to load a new template?\nAll changes in this document are lost !!")) == KMessageBox::No) return;
+ }
+ loadTitle(item);
+ lastDocumentHash = QCryptographicHash::hash(xml().toString().toAscii(), QCryptographicHash::Md5).toHex();
+ }
}
//virtual
void TitleWidget::resizeEvent(QResizeEvent * /*event*/)
Modified: trunk/kdenlive/src/titlewidget.h
===================================================================
--- trunk/kdenlive/src/titlewidget.h 2010-03-30 11:35:38 UTC (rev 4362)
+++ trunk/kdenlive/src/titlewidget.h 2010-03-30 11:43:37 UTC (rev 4363)
@@ -32,9 +32,9 @@
class TitleTemplate
{
public:
- QString file;
- QString name;
- QIcon icon;
+ QString file;
+ QString name;
+ QIcon icon;
};
class Transform
@@ -93,8 +93,8 @@
/** \brief Get clip duration. */
int duration() const;
- /** load Title Templates*/
- static void refreshTitleTemplates();
+ /** load Title Templates*/
+ static void refreshTitleTemplates();
protected:
virtual void resizeEvent(QResizeEvent * event);
@@ -134,7 +134,7 @@
/** project path for storing title clips */
QString m_projectTitlePath;
Timecode m_tc;
- QString lastDocumentHash;
+ QString lastDocumentHash;
/** See http://doc.trolltech.com/4.5/signalsandslots.html#advanced-signals-and-slots-usage */
QSignalMapper *m_signalMapper;
@@ -301,7 +301,7 @@
void slotZIndexDown();
void slotZIndexTop();
void slotZIndexBottom();
- void templateIndexChanged(int);
+ void templateIndexChanged(int);
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|