Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
kdenlive
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Farid Abdelnour
kdenlive
Commits
cd85961a
Commit
cd85961a
authored
Mar 04, 2009
by
Jean-Baptiste Mardelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Krazy fixes: cleanup all headers
svn path=/branches/KDE4/; revision=3096
parent
6b6e6ac5
Changes
100
Hide whitespace changes
Inline
Side-by-side
Showing
100 changed files
with
529 additions
and
469 deletions
+529
-469
plugins/sampleplugin/sampleplugin.cpp
plugins/sampleplugin/sampleplugin.cpp
+5
-6
renderer/renderjob.cpp
renderer/renderjob.cpp
+3
-1
src/abstractclipitem.cpp
src/abstractclipitem.cpp
+7
-9
src/abstractclipitem.h
src/abstractclipitem.h
+1
-1
src/abstractgroupitem.cpp
src/abstractgroupitem.cpp
+6
-9
src/addclipcommand.cpp
src/addclipcommand.cpp
+2
-1
src/addeffectcommand.cpp
src/addeffectcommand.cpp
+2
-1
src/addfoldercommand.cpp
src/addfoldercommand.cpp
+2
-1
src/addmarkercommand.cpp
src/addmarkercommand.cpp
+3
-1
src/addtimelineclipcommand.cpp
src/addtimelineclipcommand.cpp
+2
-1
src/addtrackcommand.cpp
src/addtrackcommand.cpp
+2
-1
src/addtransitioncommand.cpp
src/addtransitioncommand.cpp
+3
-1
src/addtransitioncommand.h
src/addtransitioncommand.h
+2
-2
src/changespeedcommand.cpp
src/changespeedcommand.cpp
+2
-1
src/changetrackcommand.cpp
src/changetrackcommand.cpp
+2
-1
src/clipdurationdialog.cpp
src/clipdurationdialog.cpp
+4
-3
src/clipdurationdialog.h
src/clipdurationdialog.h
+0
-1
src/clipitem.cpp
src/clipitem.cpp
+11
-15
src/clipmanager.cpp
src/clipmanager.cpp
+6
-4
src/clipproperties.cpp
src/clipproperties.cpp
+6
-5
src/clipproperties.h
src/clipproperties.h
+2
-3
src/complexparameter.cpp
src/complexparameter.cpp
+3
-3
src/customruler.cpp
src/customruler.cpp
+3
-4
src/customruler.h
src/customruler.h
+19
-0
src/customtrackscene.cpp
src/customtrackscene.cpp
+3
-3
src/customtrackview.cpp
src/customtrackview.cpp
+15
-15
src/docclipbase.cpp
src/docclipbase.cpp
+7
-5
src/docclipbase.h
src/docclipbase.h
+1
-1
src/dvdwizard.cpp
src/dvdwizard.cpp
+9
-10
src/dvdwizardmenu.cpp
src/dvdwizardmenu.cpp
+1
-1
src/dvdwizardvob.cpp
src/dvdwizardvob.cpp
+2
-1
src/editclipcommand.cpp
src/editclipcommand.cpp
+2
-2
src/editeffectcommand.cpp
src/editeffectcommand.cpp
+2
-1
src/editfoldercommand.cpp
src/editfoldercommand.cpp
+2
-1
src/editguidecommand.cpp
src/editguidecommand.cpp
+3
-1
src/editkeyframecommand.cpp
src/editkeyframecommand.cpp
+3
-1
src/edittransitioncommand.cpp
src/edittransitioncommand.cpp
+2
-1
src/effectslist.cpp
src/effectslist.cpp
+3
-2
src/effectslistview.cpp
src/effectslistview.cpp
+7
-7
src/effectslistview.h
src/effectslistview.h
+2
-2
src/effectslistwidget.cpp
src/effectslistwidget.cpp
+7
-5
src/effectslistwidget.h
src/effectslistwidget.h
+2
-2
src/effectstackedit.cpp
src/effectstackedit.cpp
+11
-12
src/effectstackview.cpp
src/effectstackview.cpp
+11
-10
src/geometryval.cpp
src/geometryval.cpp
+4
-7
src/graphicsscenerectmove.cpp
src/graphicsscenerectmove.cpp
+21
-1
src/graphicsscenerectmove.h
src/graphicsscenerectmove.h
+22
-2
src/guide.cpp
src/guide.cpp
+5
-7
src/headertrack.cpp
src/headertrack.cpp
+7
-8
src/initeffects.cpp
src/initeffects.cpp
+9
-10
src/insertspacecommand.cpp
src/insertspacecommand.cpp
+2
-1
src/jogshuttle.cpp
src/jogshuttle.cpp
+14
-17
src/kdenlivedoc.cpp
src/kdenlivedoc.cpp
+11
-10
src/kdenlivedoc.h
src/kdenlivedoc.h
+1
-1
src/kdenlivesettings.kcfg
src/kdenlivesettings.kcfg
+1
-1
src/kdenlivesettingsdialog.cpp
src/kdenlivesettingsdialog.cpp
+6
-5
src/keyframehelper.cpp
src/keyframehelper.cpp
+5
-4
src/kthumb.cpp
src/kthumb.cpp
+9
-11
src/kthumb.h
src/kthumb.h
+1
-1
src/locktrackcommand.cpp
src/locktrackcommand.cpp
+2
-2
src/mainwindow.cpp
src/mainwindow.cpp
+35
-41
src/managecapturesdialog.cpp
src/managecapturesdialog.cpp
+9
-8
src/managecapturesdialog.h
src/managecapturesdialog.h
+0
-1
src/markerdialog.cpp
src/markerdialog.cpp
+4
-2
src/markerdialog.h
src/markerdialog.h
+0
-1
src/monitor.cpp
src/monitor.cpp
+12
-11
src/monitormanager.cpp
src/monitormanager.cpp
+5
-4
src/moveclipcommand.cpp
src/moveclipcommand.cpp
+3
-1
src/moveeffectcommand.cpp
src/moveeffectcommand.cpp
+2
-1
src/movegroupcommand.cpp
src/movegroupcommand.cpp
+2
-1
src/movetransitioncommand.cpp
src/movetransitioncommand.cpp
+3
-1
src/profilesdialog.cpp
src/profilesdialog.cpp
+4
-4
src/profilesdialog.h
src/profilesdialog.h
+0
-1
src/projectitem.cpp
src/projectitem.cpp
+4
-9
src/projectlist.cpp
src/projectlist.cpp
+19
-19
src/projectlist.h
src/projectlist.h
+2
-2
src/projectlistview.cpp
src/projectlistview.cpp
+7
-7
src/projectlistview.h
src/projectlistview.h
+5
-2
src/projectsettings.cpp
src/projectsettings.cpp
+4
-4
src/razorclipcommand.cpp
src/razorclipcommand.cpp
+2
-1
src/recmonitor.cpp
src/recmonitor.cpp
+11
-11
src/renderer.cpp
src/renderer.cpp
+13
-13
src/renderer.h
src/renderer.h
+4
-3
src/renderwidget.cpp
src/renderwidget.cpp
+12
-12
src/renderwidget.h
src/renderwidget.h
+2
-1
src/resizeclipcommand.cpp
src/resizeclipcommand.cpp
+2
-1
src/slideshowclip.cpp
src/slideshowclip.cpp
+3
-3
src/slideshowclip.h
src/slideshowclip.h
+2
-3
src/smallruler.cpp
src/smallruler.cpp
+3
-4
src/spacerdialog.cpp
src/spacerdialog.cpp
+4
-2
src/spacerdialog.h
src/spacerdialog.h
+0
-1
src/titlewidget.cpp
src/titlewidget.cpp
+6
-10
src/titlewidget.h
src/titlewidget.h
+0
-2
src/trackview.cpp
src/trackview.cpp
+6
-6
src/trackview.h
src/trackview.h
+0
-1
src/transition.cpp
src/transition.cpp
+10
-12
src/transitionsettings.cpp
src/transitionsettings.cpp
+2
-1
src/wizard.cpp
src/wizard.cpp
+7
-8
thumbnailer/westleypreview.cpp
thumbnailer/westleypreview.cpp
+2
-1
thumbnailer/westleypreview.h
thumbnailer/westleypreview.h
+5
-7
No files found.
plugins/sampleplugin/sampleplugin.cpp
View file @
cd85961a
...
...
@@ -18,18 +18,17 @@
***************************************************************************/
#include <QtGui>
#include <QDialog>
#include <QDomDocument>
#include <QInputDialog>
#include "sampleplugin.h"
#include "ui_countdown_ui.h"
#include <KUrlRequester>
#include <KIntSpinBox>
#include <KDebug>
#include <KMessageBox>
#include "sampleplugin.h"
#include "ui_countdown_ui.h"
#include <QDialog>
#include <QDomDocument>
#include <QInputDialog>
QStringList
SamplePlugin
::
generators
()
const
{
return
QStringList
()
<<
i18n
(
"Countdown"
)
<<
i18n
(
"Noise"
);
...
...
renderer/renderjob.cpp
View file @
cd85961a
...
...
@@ -17,10 +17,12 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
#include "renderjob.h"
#include <QtDBus>
#include <QFile>
#include <QThread>
#include "renderjob.h"
// Can't believe I need to do this to sleep.
class
SleepThread
:
QThread
{
...
...
src/abstractclipitem.cpp
View file @
cd85961a
...
...
@@ -18,17 +18,15 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
#include <QGraphicsScene>
#include <QGraphicsView>
#include <QScrollBar>
#include <QToolTip>
#include "abstractclipitem.h"
#include "customtrackscene.h"
#include "kdenlivesettings.h"
#include <KDebug>
#include <KLocale>
#include "abstractclipitem.h"
#include "customtrackscene.h"
#include "kdenlivesettings.h"
#include <QPainter>
#include <QToolTip>
AbstractClipItem
::
AbstractClipItem
(
const
ItemInfo
info
,
const
QRectF
&
rect
,
double
fps
)
:
QGraphicsRectItem
(
rect
),
m_track
(
0
),
m_fps
(
fps
),
m_editedKeyframe
(
-
1
),
m_selectedKeyframe
(
0
),
m_keyframeFactor
(
1
)
{
setFlags
(
/*QGraphicsItem::ItemClipsToShape | */
QGraphicsItem
::
ItemIsMovable
|
QGraphicsItem
::
ItemIsSelectable
);
...
...
@@ -367,7 +365,7 @@ bool AbstractClipItem::hasKeyFrames() const {
return
!
m_keyframes
.
isEmpty
();
}
QRect
AbstractClipItem
::
visibleRect
()
{
/*
QRect AbstractClipItem::visibleRect() {
QRect rectInView;
if (scene()->views().size() > 0) {
rectInView = scene()->views()[0]->viewport()->rect();
...
...
@@ -376,7 +374,7 @@ QRect AbstractClipItem::visibleRect() {
//kDebug() << scene()->views()[0]->viewport()->rect() << " " << scene()->views()[0]->horizontalScrollBar()->value();
}
return rectInView;
}
}
*/
CustomTrackScene
*
AbstractClipItem
::
projectScene
()
{
if
(
scene
())
return
static_cast
<
CustomTrackScene
*>
(
scene
());
...
...
src/abstractclipitem.h
View file @
cd85961a
...
...
@@ -74,7 +74,7 @@ protected:
double
m_fps
;
QPainterPath
upperRectPart
(
QRectF
);
QPainterPath
lowerRectPart
(
QRectF
);
QRect
visibleRect
();
//
QRect visibleRect();
void
drawKeyFrames
(
QPainter
*
painter
,
QRectF
exposedRect
);
int
mouseOverKeyFrames
(
QPointF
pos
);
};
...
...
src/abstractgroupitem.cpp
View file @
cd85961a
...
...
@@ -18,20 +18,17 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
#include <QGraphicsScene>
#include <QGraphicsView>
#include <QScrollBar>
#include <QStyleOptionGraphicsItem>
#include <QToolTip>
#include <KDebug>
#include <KLocale>
#include "abstractgroupitem.h"
#include "abstractclipitem.h"
#include "kdenlivesettings.h"
#include "customtrackscene.h"
#include <KDebug>
#include <QPainter>
#include <QStyleOptionGraphicsItem>
AbstractGroupItem
::
AbstractGroupItem
(
double
fps
)
:
QGraphicsItemGroup
(),
m_fps
(
fps
)
{
setZValue
(
2
);
setFlags
(
QGraphicsItem
::
ItemClipsToShape
|
QGraphicsItem
::
ItemIsMovable
|
QGraphicsItem
::
ItemIsSelectable
);
...
...
src/addclipcommand.cpp
View file @
cd85961a
...
...
@@ -17,11 +17,12 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
#include <KLocale>
#include "addclipcommand.h"
#include "kdenlivedoc.h"
#include <KLocale>
AddClipCommand
::
AddClipCommand
(
KdenliveDoc
*
doc
,
const
QDomElement
&
xml
,
const
QString
&
id
,
bool
doIt
,
QUndoCommand
*
parent
)
:
QUndoCommand
(
parent
),
m_doc
(
doc
),
m_xml
(
xml
),
m_id
(
id
),
m_doIt
(
doIt
)
{
if
(
doIt
)
setText
(
i18n
(
"Add clip"
));
else
setText
(
i18n
(
"Delete clip"
));
...
...
src/addeffectcommand.cpp
View file @
cd85961a
...
...
@@ -17,11 +17,12 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
#include <KLocale>
#include "addeffectcommand.h"
#include "customtrackview.h"
#include <KLocale>
AddEffectCommand
::
AddEffectCommand
(
CustomTrackView
*
view
,
const
int
track
,
GenTime
pos
,
QDomElement
effect
,
bool
doIt
,
QUndoCommand
*
parent
)
:
QUndoCommand
(
parent
),
m_view
(
view
),
m_track
(
track
),
m_pos
(
pos
),
m_effect
(
effect
),
m_doIt
(
doIt
)
{
QString
effectName
;
QDomNode
namenode
=
effect
.
elementsByTagName
(
"name"
).
item
(
0
);
...
...
src/addfoldercommand.cpp
View file @
cd85961a
...
...
@@ -17,11 +17,12 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
#include <KLocale>
#include "addfoldercommand.h"
#include "projectlist.h"
#include <KLocale>
AddFolderCommand
::
AddFolderCommand
(
ProjectList
*
view
,
const
QString
folderName
,
const
QString
&
clipId
,
bool
doIt
,
QUndoCommand
*
parent
)
:
QUndoCommand
(
parent
),
m_view
(
view
),
m_name
(
folderName
),
m_id
(
clipId
),
m_doIt
(
doIt
)
{
if
(
doIt
)
setText
(
i18n
(
"Add folder"
));
else
setText
(
i18n
(
"Delete folder"
));
...
...
src/addmarkercommand.cpp
View file @
cd85961a
...
...
@@ -14,11 +14,13 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <KLocale>
#include "addmarkercommand.h"
#include "customtrackview.h"
#include <KLocale>
AddMarkerCommand
::
AddMarkerCommand
(
CustomTrackView
*
view
,
const
QString
&
oldcomment
,
const
QString
&
comment
,
const
QString
&
id
,
const
GenTime
&
pos
,
bool
doIt
,
QUndoCommand
*
parent
)
:
QUndoCommand
(
parent
),
m_view
(
view
),
m_oldcomment
(
oldcomment
),
m_comment
(
comment
),
m_id
(
id
),
m_pos
(
pos
),
m_doIt
(
doIt
)
{
if
(
m_comment
.
isEmpty
())
setText
(
i18n
(
"Delete marker"
));
else
if
(
m_oldcomment
.
isEmpty
())
setText
(
i18n
(
"Add marker"
));
...
...
src/addtimelineclipcommand.cpp
View file @
cd85961a
...
...
@@ -17,11 +17,12 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
#include <KLocale>
#include "addtimelineclipcommand.h"
#include "customtrackview.h"
#include <KLocale>
AddTimelineClipCommand
::
AddTimelineClipCommand
(
CustomTrackView
*
view
,
QDomElement
xml
,
const
QString
&
clipId
,
ItemInfo
info
,
EffectsList
effects
,
bool
doIt
,
bool
doRemove
,
QUndoCommand
*
parent
)
:
QUndoCommand
(
parent
),
m_view
(
view
),
m_xml
(
xml
),
m_clipId
(
clipId
),
m_clipInfo
(
info
),
m_effects
(
effects
),
m_doIt
(
doIt
),
m_remove
(
doRemove
)
{
if
(
!
m_remove
)
setText
(
i18n
(
"Add timeline clip"
));
else
setText
(
i18n
(
"Delete timeline clip"
));
...
...
src/addtrackcommand.cpp
View file @
cd85961a
...
...
@@ -17,11 +17,12 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
#include <KLocale>
#include "addtrackcommand.h"
#include "customtrackview.h"
#include <KLocale>
AddTrackCommand
::
AddTrackCommand
(
CustomTrackView
*
view
,
int
ix
,
TrackInfo
info
,
bool
addTrack
,
bool
doIt
,
QUndoCommand
*
parent
)
:
QUndoCommand
(
parent
),
m_view
(
view
),
m_ix
(
ix
),
m_info
(
info
),
m_addTrack
(
addTrack
),
m_doIt
(
doIt
)
{
if
(
addTrack
)
setText
(
i18n
(
"Add track"
));
else
setText
(
i18n
(
"Delete track"
));
...
...
src/addtransitioncommand.cpp
View file @
cd85961a
...
...
@@ -14,11 +14,13 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <KLocale>
#include "addtransitioncommand.h"
#include "customtrackview.h"
#include <KLocale>
AddTransitionCommand
::
AddTransitionCommand
(
CustomTrackView
*
view
,
ItemInfo
info
,
int
transitiontrack
,
QDomElement
params
,
bool
remove
,
bool
doIt
,
QUndoCommand
*
parent
)
:
QUndoCommand
(
parent
),
m_view
(
view
),
m_info
(
info
),
m_track
(
transitiontrack
),
m_params
(
params
),
m_remove
(
remove
),
m_doIt
(
doIt
)
{
if
(
m_remove
)
setText
(
i18n
(
"Delete transition from clip"
));
else
setText
(
i18n
(
"Add transition to clip"
));
...
...
src/addtransitioncommand.h
View file @
cd85961a
...
...
@@ -15,8 +15,8 @@
* *
***************************************************************************/
#ifndef
TIMELINE
TRANSITIONCOMMAND_H
#define
TIMELINE
TRANSITIONCOMMAND_H
#ifndef
ADD
TRANSITIONCOMMAND_H
#define
ADD
TRANSITIONCOMMAND_H
#include <QUndoCommand>
#include <QGraphicsView>
...
...
src/changespeedcommand.cpp
View file @
cd85961a
...
...
@@ -17,11 +17,12 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
#include <KLocale>
#include "changespeedcommand.h"
#include "customtrackview.h"
#include <KLocale>
ChangeSpeedCommand
::
ChangeSpeedCommand
(
CustomTrackView
*
view
,
ItemInfo
info
,
double
old_speed
,
double
new_speed
,
const
QString
&
clipId
,
bool
doIt
,
QUndoCommand
*
parent
)
:
QUndoCommand
(
parent
),
m_view
(
view
),
m_clipInfo
(
info
),
m_old_speed
(
old_speed
),
m_new_speed
(
new_speed
),
m_clipId
(
clipId
),
m_doIt
(
doIt
)
{
setText
(
i18n
(
"Adjust clip length"
));
}
...
...
src/changetrackcommand.cpp
View file @
cd85961a
...
...
@@ -17,11 +17,12 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
#include <KLocale>
#include "changetrackcommand.h"
#include "customtrackview.h"
#include <KLocale>
ChangeTrackCommand
::
ChangeTrackCommand
(
CustomTrackView
*
view
,
int
ix
,
TrackInfo
oldInfo
,
TrackInfo
newInfo
,
bool
doIt
,
QUndoCommand
*
parent
)
:
QUndoCommand
(
parent
),
m_view
(
view
),
m_ix
(
ix
),
m_oldinfo
(
oldInfo
),
m_newinfo
(
newInfo
),
m_doIt
(
doIt
)
{
setText
(
i18n
(
"Change track type"
));
}
...
...
src/clipdurationdialog.cpp
View file @
cd85961a
...
...
@@ -18,11 +18,12 @@
***************************************************************************/
#include <KDebug>
#include "clipitem.h"
#include "clipdurationdialog.h"
#include "clipitem.h"
#include "kdenlivesettings.h"
#include <KDebug>
#include <QWheelEvent>
ClipDurationDialog
::
ClipDurationDialog
(
AbstractClipItem
*
clip
,
Timecode
tc
,
QWidget
*
parent
)
:
QDialog
(
parent
),
m_tc
(
tc
),
m_clip
(
clip
)
{
...
...
src/clipdurationdialog.h
View file @
cd85961a
...
...
@@ -21,7 +21,6 @@
#ifndef CLIPDURATIONDIALOG_H
#define CLIPDURATIONDIALOG_H
#include <QDialog>
#include "abstractclipitem.h"
#include "timecode.h"
...
...
src/clipitem.cpp
View file @
cd85961a
...
...
@@ -18,18 +18,6 @@
***************************************************************************/
#include <QPainter>
#include <QTimer>
#include <QStyleOptionGraphicsItem>
#include <QGraphicsScene>
#include <QGraphicsView>
#include <QScrollBar>
#include <QMimeData>
#include <QApplication>
#include <KDebug>
#include "clipitem.h"
#include "customtrackview.h"
#include "customtrackscene.h"
...
...
@@ -39,6 +27,14 @@
#include "kdenlivesettings.h"
#include "kthumb.h"
#include <KDebug>
#include <QPainter>
#include <QTimer>
#include <QStyleOptionGraphicsItem>
#include <QGraphicsScene>
#include <QMimeData>
ClipItem
::
ClipItem
(
DocClipBase
*
clip
,
ItemInfo
info
,
double
fps
,
double
speed
,
bool
generateThumbs
)
:
AbstractClipItem
(
info
,
QRectF
(),
fps
),
m_clip
(
clip
),
m_resizeMode
(
NONE
),
m_grabPoint
(
0
),
m_maxTrack
(
0
),
m_hasThumbs
(
false
),
startThumbTimer
(
NULL
),
endThumbTimer
(
NULL
),
audioThumbWasDrawn
(
false
),
m_opacity
(
1.0
),
m_timeLine
(
0
),
m_startThumbRequested
(
false
),
m_endThumbRequested
(
false
),
m_startFade
(
0
),
m_endFade
(
0
),
m_hover
(
false
),
m_selectedEffect
(
-
1
),
m_speed
(
speed
),
framePixelWidth
(
0
),
m_startPix
(
QPixmap
()),
m_endPix
(
QPixmap
())
{
...
...
@@ -653,7 +649,7 @@ void ClipItem::paint(QPainter *painter,
framepos
=
br
.
x
()
+
pos
.
frames
(
m_fps
);
const
QRectF
r1
(
framepos
+
0.04
,
10
,
itemWidth
-
framepos
-
2
,
itemHeight
-
10
);
const
QRectF
r2
=
painter
->
matrix
().
mapRect
(
r1
);
const
QRectF
txtBounding
=
painter
->
boundingRect
(
r2
,
Qt
::
AlignLeft
|
Qt
::
AlignTop
,
" "
+
(
*
it
).
comment
()
+
" "
);
const
QRectF
txtBounding
=
painter
->
boundingRect
(
r2
,
Qt
::
AlignLeft
|
Qt
::
AlignTop
,
' '
+
(
*
it
).
comment
()
+
' '
);
QPainterPath
path
;
path
.
addRoundedRect
(
txtBounding
,
3
,
3
);
...
...
@@ -719,7 +715,7 @@ void ClipItem::paint(QPainter *painter,
}
// Draw clip name
QRectF
txtBounding
=
painter
->
boundingRect
(
mapped
,
Qt
::
AlignHCenter
|
Qt
::
AlignVCenter
,
" "
+
m_clipName
+
" "
);
QRectF
txtBounding
=
painter
->
boundingRect
(
mapped
,
Qt
::
AlignHCenter
|
Qt
::
AlignVCenter
,
' '
+
m_clipName
+
' '
);
painter
->
fillRect
(
txtBounding
,
QBrush
(
QColor
(
0
,
0
,
0
,
150
)));
//painter->setPen(QColor(0, 0, 0, 180));
//painter->drawText(txtBounding, Qt::AlignCenter, m_clipName);
...
...
@@ -1352,7 +1348,7 @@ double ClipItem::speed() const {
void
ClipItem
::
setSpeed
(
const
double
speed
)
{
m_speed
=
speed
;
if
(
m_speed
==
1.0
)
m_clipName
=
baseClip
()
->
name
();
else
m_clipName
=
baseClip
()
->
name
()
+
" - "
+
QString
::
number
(
speed
*
100
,
'f'
,
0
)
+
"%"
;
else
m_clipName
=
baseClip
()
->
name
()
+
" - "
+
QString
::
number
(
speed
*
100
,
'f'
,
0
)
+
'%'
;
//update();
}
...
...
src/clipmanager.cpp
View file @
cd85961a
...
...
@@ -16,18 +16,20 @@
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
#include <KDebug>
#include <KFileDialog>
#include <kio/netaccess.h>
#include "clipmanager.h"
#include "addclipcommand.h"
#include "kdenlivesettings.h"
#include "clipmanager.h"
#include "docclipbase.h"
#include "kdenlivedoc.h"
#include <mlt++/Mlt.h>
#include <KDebug>
#include <KFileDialog>
#include <kio/netaccess.h>
ClipManager
::
ClipManager
(
KdenliveDoc
*
doc
)
:
m_doc
(
doc
),
m_audioThumbsEnabled
(
false
),
m_audioThumbsQueue
(
QList
<
QString
>
()),
m_generatingAudioId
(
QString
())
{
m_clipIdCounter
=
1
;
m_folderIdCounter
=
1
;
...
...
src/clipproperties.cpp
View file @
cd85961a
...
...
@@ -17,16 +17,17 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
#include <QDir>
#include "clipproperties.h"
#include "kdenlivesettings.h"
#include "kthumb.h"
#include "markerdialog.h"
#include <KStandardDirs>
#include <KDebug>
#include <KFileItem>
#include "kdenlivesettings.h"
#include "clipproperties.h"
#include "kthumb.h"
#include "markerdialog.h"
#include <QDir>
static
const
int
VIDEOTAB
=
0
;
static
const
int
AUDIOTAB
=
1
;
...
...
src/clipproperties.h
View file @
cd85961a
...
...
@@ -18,10 +18,9 @@
***************************************************************************/
#ifndef CLIPPROP
SDIALOG
_H
#define CLIPPROP
SDIALOG
_H
#ifndef CLIPPROP
ERTIES
_H
#define CLIPPROP
ERTIES
_H
#include <QDialog>
#include "definitions.h"
#include "timecode.h"
...
...
src/complexparameter.cpp
View file @
cd85961a
...
...
@@ -15,12 +15,12 @@
* *
***************************************************************************/
#include "complexparameter.h"
#include <KDebug>
#include <KLocale>
#include "complexparameter.h"
#include "effectslist.h"
#include "clipitem.h"
#include <QHeaderView>
#include <QMenu>
...
...
src/customruler.cpp
View file @
cd85961a
...
...
@@ -17,16 +17,15 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
#include <QMouseEvent>
#include <QStylePainter>
#include "customruler.h"
#include <KDebug>
#include <KIcon>
#include <KCursor>
#include <KGlobalSettings>
#include
"customruler.h"
#include
<QMouseEvent>
#include <QStylePainter>
static
const
int
FIX_WIDTH
=
24
;
/* widget width in pixel */
static
const
int
LINE_END
=
(
FIX_WIDTH
-
3
);
...
...
src/customruler.h
View file @
cd85961a
/***************************************************************************
* Copyright (C) 2007 by Jean-Baptiste Mardelle (jb@kdenlive.org) *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
#ifndef CUSTOMRULER_H
#define CUSTOMRULER_H
...
...
src/customtrackscene.cpp
View file @
cd85961a
...
...
@@ -17,10 +17,10 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
#include <KStandardDirs>
#include "kdenlivedoc.h"
#include "customtrackscene.h"
#include "kdenlivedoc.h"
#include <KStandardDirs>
CustomTrackScene
::
CustomTrackScene
(
KdenliveDoc
*
doc
,
QObject
*
parent
)
:
QGraphicsScene
(
parent
),
m_document
(
doc
),
m_scale
(
1.0
)
{
...
...
src/customtrackview.cpp
View file @
cd85961a
...
...
@@ -17,19 +17,6 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
#include <QMouseEvent>
#include <QStylePainter>
#include <QGraphicsItem>
#include <QDomDocument>
#include <QScrollBar>
#include <QApplication>
#include <QInputDialog>
#include <KDebug>
#include <KLocale>
#include <KUrl>
#include <KIcon>
#include <KCursor>
#include "customtrackview.h"
#include "customtrackscene.h"
...
...
@@ -52,8 +39,6 @@
#include "razorclipcommand.h"
#include "kdenlivesettings.h"
#include "transition.h"
#include "clipitem.h"
#include "customtrackview.h"
#include "clipmanager.h"
#include "renderer.h"
#include "markerdialog.h"
...
...
@@ -70,6 +55,21 @@
#include "initeffects.h"
#include "locktrackcommand.h"
#include <KDebug>
#include <KLocale>
#include <KUrl>
#include <KIcon>
#include <KCursor>
#include <QMouseEvent>
#include <QStylePainter>
#include <QGraphicsItem>
#include <QDomDocument>
#include <QScrollBar>
#include <QApplication>
#include <QInputDialog>
//TODO:
// disable animation if user asked it in KDE's global settings
// http://lists.kde.org/?l=kde-commits&m=120398724717624&w=2
...
...
src/docclipbase.cpp
View file @
cd85961a
...
...
@@ -3,7 +3,8 @@
-------------------
begin : Fri Apr 12 2002
copyright : (C) 2002 by Jason Wood
email : jasonwood@blueyonder.co.uk
copyright : (C) 2009 by Jean-Baptiste Mardelle
***************************************************************************/
/***************************************************************************
...
...
@@ -15,15 +16,16 @@
* *
***************************************************************************/
#include <QCryptographicHash>
#include <KDebug>
#include "kdenlivesettings.h"
#include "docclipbase.h"
#include "kdenlivesettings.h"
#include "kthumb.h"
#include "clipmanager.h"
#include <KDebug>
#include <QCryptographicHash>
DocClipBase
::
DocClipBase
(
ClipManager
*
clipManager
,
QDomElement
xml
,
const
QString
&
id
)
:
m_id
(
id
),
m_description
(
QString
()),
m_refcount
(
0
),
m_audioThumbCreated
(
false
),
m_duration
(
GenTime
()),
m_thumbProd
(
NULL
),
m_audioTimer
(
NULL
),
m_properties
(
QMap
<
QString
,
QString
>
()),
audioFrameChache
(
QMap
<
int
,
QMap
<
int
,
QByteArray
>
>
()),
m_baseTrackProducers
(
QList
<
Mlt
::
Producer
*>
()),
m_snapMarkers
(
QList
<
CommentedTime
>
())
{
int
type
=
xml
.
attribute
(
"type"
).
toInt
();
...
...
src/docclipbase.h
View file @
cd85961a
...
...
@@ -50,7 +50,7 @@ class Producer;
class
DocClipBase
:
public
QObject
{
Q_OBJECT
public
:
/** this enum determines the types of "feed" available within this clip. types must be non-exclusive
* - e.g. if you can have audio and video sep
e
rately, it should be possible to combin the two, as is
* - e.g. if you can have audio and video sep
a
rately, it should be possible to combin the two, as is
* done here. If a new clip type is added then it should be possible to combine it with both audio
* and video. */
...
...
src/dvdwizard.cpp
View file @
cd85961a
...
...
@@ -17,13 +17,10 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
#include <QLabel>
#include <QFile>
#include <QXmlStreamWriter>
#include <QApplication>
#include <QTimer>
#include <QGraphicsView>
#include <QDomDocument>