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
261
Issues
261
List
Boards
Labels
Service Desk
Milestones
Merge Requests
16
Merge Requests
16
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
Multimedia
Kdenlive
Commits
2a223cff
Commit
2a223cff
authored
Mar 03, 2008
by
Jean-Baptiste Mardelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reindent all source files
svn path=/branches/KDE4/; revision=1987
parent
e7a03c1e
Changes
95
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
95 changed files
with
7108 additions
and
7728 deletions
+7108
-7728
src/addclipcommand.cpp
src/addclipcommand.cpp
+14
-16
src/addclipcommand.h
src/addclipcommand.h
+9
-10
src/addeffectcommand.cpp
src/addeffectcommand.cpp
+14
-16
src/addeffectcommand.h
src/addeffectcommand.h
+10
-11
src/addtimelineclipcommand.cpp
src/addtimelineclipcommand.cpp
+15
-17
src/addtimelineclipcommand.h
src/addtimelineclipcommand.h
+14
-15
src/clipitem.cpp
src/clipitem.cpp
+454
-509
src/clipitem.h
src/clipitem.h
+19
-20
src/clipmanager.cpp
src/clipmanager.cpp
+37
-48
src/clipmanager.h
src/clipmanager.h
+3
-3
src/complexparameter.cpp
src/complexparameter.cpp
+81
-82
src/complexparameter.h
src/complexparameter.h
+29
-30
src/customruler.cpp
src/customruler.cpp
+143
-149
src/customruler.h
src/customruler.h
+15
-16
src/customtrackview.cpp
src/customtrackview.cpp
+570
-626
src/customtrackview.h
src/customtrackview.h
+23
-25
src/definitions.h
src/definitions.h
+4
-4
src/docclipbase.cpp
src/docclipbase.cpp
+182
-221
src/docclipbase.h
src/docclipbase.h
+108
-104
src/documentaudiotrack.cpp
src/documentaudiotrack.cpp
+2
-3
src/documentaudiotrack.h
src/documentaudiotrack.h
+8
-9
src/documenttrack.cpp
src/documenttrack.cpp
+37
-47
src/documenttrack.h
src/documenttrack.h
+10
-11
src/documentvideotrack.cpp
src/documentvideotrack.cpp
+2
-3
src/documentvideotrack.h
src/documentvideotrack.h
+9
-10
src/editeffectcommand.cpp
src/editeffectcommand.cpp
+20
-24
src/editeffectcommand.h
src/editeffectcommand.h
+12
-13
src/effectslist.cpp
src/effectslist.cpp
+47
-53
src/effectslist.h
src/effectslist.h
+10
-10
src/effectslistview.cpp
src/effectslistview.cpp
+44
-53
src/effectslistview.h
src/effectslistview.h
+10
-11
src/effectslistwidget.cpp
src/effectslistwidget.cpp
+94
-104
src/effectslistwidget.h
src/effectslistwidget.h
+8
-9
src/effectstackedit.cpp
src/effectstackedit.cpp
+181
-182
src/effectstackedit.h
src/effectstackedit.h
+15
-16
src/effectstackview.cpp
src/effectstackview.cpp
+167
-171
src/effectstackview.h
src/effectstackview.h
+30
-31
src/events.h
src/events.h
+7
-5
src/gentime.cpp
src/gentime.cpp
+6
-12
src/gentime.h
src/gentime.h
+40
-40
src/graphicsscenerectmove.cpp
src/graphicsscenerectmove.cpp
+120
-120
src/graphicsscenerectmove.h
src/graphicsscenerectmove.h
+5
-5
src/headertrack.cpp
src/headertrack.cpp
+3
-5
src/headertrack.h
src/headertrack.h
+9
-10
src/initeffects.cpp
src/initeffects.cpp
+255
-273
src/initeffects.h
src/initeffects.h
+22
-23
src/kdenlivedoc.cpp
src/kdenlivedoc.cpp
+180
-215
src/kdenlivedoc.h
src/kdenlivedoc.h
+6
-6
src/kdenlivesettingsdialog.cpp
src/kdenlivesettingsdialog.cpp
+40
-44
src/kdenlivesettingsdialog.h
src/kdenlivesettingsdialog.h
+8
-9
src/kthumb.cpp
src/kthumb.cpp
+180
-194
src/kthumb.h
src/kthumb.h
+41
-41
src/labelitem.cpp
src/labelitem.cpp
+12
-15
src/labelitem.h
src/labelitem.h
+4
-5
src/main.cpp
src/main.cpp
+24
-26
src/mainwindow.cpp
src/mainwindow.cpp
+377
-412
src/mainwindow.h
src/mainwindow.h
+14
-15
src/monitor.cpp
src/monitor.cpp
+147
-167
src/monitor.h
src/monitor.h
+13
-14
src/monitormanager.cpp
src/monitormanager.cpp
+34
-42
src/monitormanager.h
src/monitormanager.h
+9
-10
src/moveclipcommand.cpp
src/moveclipcommand.cpp
+12
-14
src/moveclipcommand.h
src/moveclipcommand.h
+9
-10
src/parameterplotter.cpp
src/parameterplotter.cpp
+209
-209
src/parameterplotter.h
src/parameterplotter.h
+36
-36
src/profilesdialog.cpp
src/profilesdialog.cpp
+126
-132
src/profilesdialog.h
src/profilesdialog.h
+9
-10
src/projectitem.cpp
src/projectitem.cpp
+198
-214
src/projectitem.h
src/projectitem.h
+3
-4
src/projectlist.cpp
src/projectlist.cpp
+325
-358
src/projectlist.h
src/projectlist.h
+58
-65
src/projectlistview.cpp
src/projectlistview.cpp
+122
-137
src/projectlistview.h
src/projectlistview.h
+14
-15
src/projectsettings.cpp
src/projectsettings.cpp
+17
-19
src/projectsettings.h
src/projectsettings.h
+6
-7
src/renderer.cpp
src/renderer.cpp
+540
-613
src/renderer.h
src/renderer.h
+92
-92
src/resizeclipcommand.cpp
src/resizeclipcommand.cpp
+12
-14
src/resizeclipcommand.h
src/resizeclipcommand.h
+10
-11
src/smallruler.cpp
src/smallruler.cpp
+98
-106
src/smallruler.h
src/smallruler.h
+14
-15
src/timecode.cpp
src/timecode.cpp
+67
-81
src/timecode.h
src/timecode.h
+12
-12
src/titledocument.cpp
src/titledocument.cpp
+170
-170
src/titledocument.h
src/titledocument.h
+12
-12
src/titlewidget.cpp
src/titlewidget.cpp
+209
-210
src/titlewidget.h
src/titlewidget.h
+30
-30
src/trackpanelclipmovefunction.cpp
src/trackpanelclipmovefunction.cpp
+352
-368
src/trackpanelclipmovefunction.h
src/trackpanelclipmovefunction.h
+73
-73
src/trackpanelfunction.cpp
src/trackpanelfunction.cpp
+2
-4
src/trackpanelfunction.h
src/trackpanelfunction.h
+31
-31
src/trackpanelfunctionfactory.cpp
src/trackpanelfunctionfactory.cpp
+13
-18
src/trackpanelfunctionfactory.h
src/trackpanelfunctionfactory.h
+4
-4
src/trackview.cpp
src/trackview.cpp
+206
-232
src/trackview.h
src/trackview.h
+11
-12
No files found.
src/addclipcommand.cpp
View file @
2a223cff
...
...
@@ -22,25 +22,23 @@
#include "addclipcommand.h"
AddClipCommand
::
AddClipCommand
(
KdenliveDoc
*
doc
,
const
QDomElement
&
xml
,
const
uint
id
,
bool
doIt
)
:
m_doc
(
doc
),
m_xml
(
xml
),
m_id
(
id
),
m_doIt
(
doIt
)
{
if
(
doIt
)
setText
(
i18n
(
"Add clip"
));
else
setText
(
i18n
(
"Delete clip"
));
}
:
m_doc
(
doc
),
m_xml
(
xml
),
m_id
(
id
),
m_doIt
(
doIt
)
{
if
(
doIt
)
setText
(
i18n
(
"Add clip"
));
else
setText
(
i18n
(
"Delete clip"
));
}
// virtual
void
AddClipCommand
::
undo
()
{
kDebug
()
<<
"---- undoing action"
;
if
(
m_doIt
)
m_doc
->
deleteClip
(
m_id
);
else
m_doc
->
addClip
(
m_xml
,
m_id
);
// virtual
void
AddClipCommand
::
undo
()
{
kDebug
()
<<
"---- undoing action"
;
if
(
m_doIt
)
m_doc
->
deleteClip
(
m_id
);
else
m_doc
->
addClip
(
m_xml
,
m_id
);
}
// virtual
void
AddClipCommand
::
redo
()
{
kDebug
()
<<
"---- redoing action"
;
if
(
m_doIt
)
m_doc
->
addClip
(
m_xml
,
m_id
);
else
m_doc
->
deleteClip
(
m_id
);
// virtual
void
AddClipCommand
::
redo
()
{
kDebug
()
<<
"---- redoing action"
;
if
(
m_doIt
)
m_doc
->
addClip
(
m_xml
,
m_id
);
else
m_doc
->
deleteClip
(
m_id
);
}
#include "addclipcommand.moc"
src/addclipcommand.h
View file @
2a223cff
...
...
@@ -26,20 +26,19 @@
#include "kdenlivedoc.h"
class
AddClipCommand
:
public
QUndoCommand
{
public:
AddClipCommand
(
KdenliveDoc
*
list
,
const
QDomElement
&
xml
,
const
uint
id
,
bool
doIt
);
class
AddClipCommand
:
public
QUndoCommand
{
public:
AddClipCommand
(
KdenliveDoc
*
list
,
const
QDomElement
&
xml
,
const
uint
id
,
bool
doIt
);
virtual
void
undo
();
virtual
void
redo
();
private:
KdenliveDoc
*
m_doc
;
QDomElement
m_xml
;
uint
m_id
;
bool
m_doIt
;
};
private:
KdenliveDoc
*
m_doc
;
QDomElement
m_xml
;
uint
m_id
;
bool
m_doIt
;
};
#endif
src/addeffectcommand.cpp
View file @
2a223cff
...
...
@@ -22,25 +22,23 @@
#include "addeffectcommand.h"
AddEffectCommand
::
AddEffectCommand
(
CustomTrackView
*
view
,
const
int
track
,
GenTime
pos
,
QDomElement
effect
,
bool
doIt
)
:
m_view
(
view
),
m_track
(
track
),
m_pos
(
pos
),
m_effect
(
effect
),
m_doIt
(
doIt
)
{
if
(
doIt
)
setText
(
i18n
(
"Add effect"
));
else
setText
(
i18n
(
"Delete effect"
));
}
:
m_view
(
view
),
m_track
(
track
),
m_pos
(
pos
),
m_effect
(
effect
),
m_doIt
(
doIt
)
{
if
(
doIt
)
setText
(
i18n
(
"Add effect"
));
else
setText
(
i18n
(
"Delete effect"
));
}
// virtual
void
AddEffectCommand
::
undo
()
{
kDebug
()
<<
"---- undoing action"
;
if
(
m_doIt
)
m_view
->
deleteEffect
(
m_track
,
m_pos
,
m_effect
);
else
m_view
->
addEffect
(
m_track
,
m_pos
,
m_effect
);
// virtual
void
AddEffectCommand
::
undo
()
{
kDebug
()
<<
"---- undoing action"
;
if
(
m_doIt
)
m_view
->
deleteEffect
(
m_track
,
m_pos
,
m_effect
);
else
m_view
->
addEffect
(
m_track
,
m_pos
,
m_effect
);
}
// virtual
void
AddEffectCommand
::
redo
()
{
kDebug
()
<<
"---- redoing action"
;
if
(
m_doIt
)
m_view
->
addEffect
(
m_track
,
m_pos
,
m_effect
);
else
m_view
->
deleteEffect
(
m_track
,
m_pos
,
m_effect
);
// virtual
void
AddEffectCommand
::
redo
()
{
kDebug
()
<<
"---- redoing action"
;
if
(
m_doIt
)
m_view
->
addEffect
(
m_track
,
m_pos
,
m_effect
);
else
m_view
->
deleteEffect
(
m_track
,
m_pos
,
m_effect
);
}
#include "addeffectcommand.moc"
src/addeffectcommand.h
View file @
2a223cff
...
...
@@ -26,21 +26,20 @@
#include "customtrackview.h"
class
AddEffectCommand
:
public
QUndoCommand
{
public:
AddEffectCommand
(
CustomTrackView
*
view
,
const
int
track
,
GenTime
pos
,
QDomElement
effect
,
bool
doIt
);
class
AddEffectCommand
:
public
QUndoCommand
{
public:
AddEffectCommand
(
CustomTrackView
*
view
,
const
int
track
,
GenTime
pos
,
QDomElement
effect
,
bool
doIt
);
virtual
void
undo
();
virtual
void
redo
();
private:
CustomTrackView
*
m_view
;
int
m_track
;
QDomElement
m_effect
;
GenTime
m_pos
;
bool
m_doIt
;
};
private:
CustomTrackView
*
m_view
;
int
m_track
;
QDomElement
m_effect
;
GenTime
m_pos
;
bool
m_doIt
;
};
#endif
src/addtimelineclipcommand.cpp
View file @
2a223cff
...
...
@@ -22,26 +22,24 @@
#include "addtimelineclipcommand.h"
AddTimelineClipCommand
::
AddTimelineClipCommand
(
CustomTrackView
*
view
,
QDomElement
xml
,
int
clipId
,
int
track
,
int
startpos
,
QRectF
rect
,
int
duration
,
bool
doIt
,
bool
doRemove
)
:
m_view
(
view
),
m_xml
(
xml
),
m_clipId
(
clipId
),
m_clipTrack
(
track
),
m_clipPos
(
startpos
),
m_clipRect
(
rect
),
m_clipDuration
(
duration
),
m_doIt
(
doIt
),
m_remove
(
doRemove
)
{
if
(
!
m_remove
)
setText
(
i18n
(
"Add timeline clip"
));
else
setText
(
i18n
(
"Delete timeline clip"
));
}
:
m_view
(
view
),
m_xml
(
xml
),
m_clipId
(
clipId
),
m_clipTrack
(
track
),
m_clipPos
(
startpos
),
m_clipRect
(
rect
),
m_clipDuration
(
duration
),
m_doIt
(
doIt
),
m_remove
(
doRemove
)
{
if
(
!
m_remove
)
setText
(
i18n
(
"Add timeline clip"
));
else
setText
(
i18n
(
"Delete timeline clip"
));
}
// virtual
void
AddTimelineClipCommand
::
undo
()
{
if
(
!
m_remove
)
m_view
->
deleteClip
(
m_clipTrack
,
m_clipPos
,
m_clipRect
);
else
m_view
->
addClip
(
m_xml
,
m_clipId
,
m_clipTrack
,
m_clipPos
,
m_clipRect
,
m_clipDuration
);
// virtual
void
AddTimelineClipCommand
::
undo
()
{
if
(
!
m_remove
)
m_view
->
deleteClip
(
m_clipTrack
,
m_clipPos
,
m_clipRect
);
else
m_view
->
addClip
(
m_xml
,
m_clipId
,
m_clipTrack
,
m_clipPos
,
m_clipRect
,
m_clipDuration
);
}
// virtual
void
AddTimelineClipCommand
::
redo
()
{
if
(
m_doIt
)
{
if
(
!
m_remove
)
m_view
->
addClip
(
m_xml
,
m_clipId
,
m_clipTrack
,
m_clipPos
,
m_clipRect
,
m_clipDuration
);
else
m_view
->
deleteClip
(
m_clipTrack
,
m_clipPos
,
m_clipRect
);
}
m_doIt
=
true
;
// virtual
void
AddTimelineClipCommand
::
redo
()
{
if
(
m_doIt
)
{
if
(
!
m_remove
)
m_view
->
addClip
(
m_xml
,
m_clipId
,
m_clipTrack
,
m_clipPos
,
m_clipRect
,
m_clipDuration
);
else
m_view
->
deleteClip
(
m_clipTrack
,
m_clipPos
,
m_clipRect
);
}
m_doIt
=
true
;
}
#include "addtimelineclipcommand.moc"
src/addtimelineclipcommand.h
View file @
2a223cff
...
...
@@ -30,24 +30,23 @@
#include "projectlist.h"
#include "customtrackview.h"
class
AddTimelineClipCommand
:
public
QUndoCommand
{
public:
AddTimelineClipCommand
(
CustomTrackView
*
view
,
QDomElement
xml
,
int
clipId
,
int
track
,
int
startpos
,
QRectF
rect
,
int
duration
,
bool
doIt
,
bool
doRemove
);
class
AddTimelineClipCommand
:
public
QUndoCommand
{
public:
AddTimelineClipCommand
(
CustomTrackView
*
view
,
QDomElement
xml
,
int
clipId
,
int
track
,
int
startpos
,
QRectF
rect
,
int
duration
,
bool
doIt
,
bool
doRemove
);
virtual
void
undo
();
virtual
void
redo
();
private:
CustomTrackView
*
m_view
;
int
m_clipDuration
;
int
m_clipId
;
QDomElement
m_xml
;
int
m_clipTrack
;
int
m_clipPos
;
QRectF
m_clipRect
;
bool
m_doIt
;
bool
m_remove
;
};
private:
CustomTrackView
*
m_view
;
int
m_clipDuration
;
int
m_clipId
;
QDomElement
m_xml
;
int
m_clipTrack
;
int
m_clipPos
;
QRectF
m_clipRect
;
bool
m_doIt
;
bool
m_remove
;
};
#endif
src/clipitem.cpp
View file @
2a223cff
This diff is collapsed.
Click to expand it.
src/clipitem.h
View file @
2a223cff
...
...
@@ -33,17 +33,16 @@
#include "kthumb.h"
class
ClipItem
:
public
QObject
,
public
QGraphicsRectItem
{
Q_OBJECT
class
ClipItem
:
public
QObject
,
public
QGraphicsRectItem
{
Q_OBJECT
public:
public:
ClipItem
(
DocClipBase
*
clip
,
int
track
,
int
startpos
,
const
QRectF
&
rect
,
int
duration
);
virtual
~
ClipItem
();
virtual
void
paint
(
QPainter
*
painter
,
const
QStyleOptionGraphicsItem
*
option
,
QWidget
*
widget
);
virtual
int
type
()
const
;
const
QStyleOptionGraphicsItem
*
option
,
QWidget
*
widget
);
virtual
int
type
()
const
;
void
moveTo
(
int
x
,
double
scale
,
double
offset
,
int
newTrack
);
void
resizeStart
(
int
posx
,
double
scale
);
void
resizeEnd
(
int
posx
,
double
scale
);
...
...
@@ -82,15 +81,15 @@ class ClipItem : public QObject, public QGraphicsRectItem
void
setEffectAt
(
int
ix
,
QDomElement
effect
);
void
flashClip
();
protected:
virtual
void
mouseMoveEvent
(
QGraphicsSceneMouseEvent
*
event
);
virtual
void
mouseReleaseEvent
(
QGraphicsSceneMouseEvent
*
event
);
virtual
void
mousePressEvent
(
QGraphicsSceneMouseEvent
*
event
);
protected:
virtual
void
mouseMoveEvent
(
QGraphicsSceneMouseEvent
*
event
);
virtual
void
mouseReleaseEvent
(
QGraphicsSceneMouseEvent
*
event
);
virtual
void
mousePressEvent
(
QGraphicsSceneMouseEvent
*
event
);
virtual
void
dragEnterEvent
(
QGraphicsSceneDragDropEvent
*
event
);
virtual
void
dragLeaveEvent
(
QGraphicsSceneDragDropEvent
*
event
);
virtual
void
dropEvent
(
QGraphicsSceneDragDropEvent
*
event
);
private:
private:
QDomElement
m_xml
;
DocClipBase
*
m_clip
;
int
m_textWidth
;
...
...
@@ -117,25 +116,25 @@ class ClipItem : public QObject, public QGraphicsRectItem
double
m_opacity
;
QTimeLine
*
m_timeLine
;
uint
m_thumbsRequested
;
EffectsList
m_effectList
;
QMap
<
int
,
QPixmap
>
audioThumbCachePic
;
bool
audioThumbWasDrawn
,
audioThumbReady
;
QMap
<
int
,
QPixmap
>
audioThumbCachePic
;
bool
audioThumbWasDrawn
,
audioThumbReady
;
double
framePixelWidth
;
QMap
<
int
,
QPainterPath
>
channelPaths
;
QMap
<
int
,
QPainterPath
>
channelPaths
;
private
slots
:
private
slots
:
void
slotThumbReady
(
int
frame
,
QPixmap
pix
);
void
slotFetchThumbs
();
void
slotGetStartThumb
();
void
slotGetEndThumb
();
void
slotGotAudioData
();
void
slotPrepareAudioThumb
(
double
,
QPainterPath
,
int
,
int
);
void
slotPrepareAudioThumb
(
double
,
QPainterPath
,
int
,
int
);
void
animate
(
qreal
value
);
signals:
signals:
void
getThumb
(
int
,
int
);
void
prepareAudioThumb
(
double
,
QPainterPath
,
int
,
int
);
void
prepareAudioThumb
(
double
,
QPainterPath
,
int
,
int
);
};
...
...
src/clipmanager.cpp
View file @
2a223cff
...
...
@@ -24,69 +24,59 @@
#include "clipmanager.h"
#include "docclipbase.h"
ClipManager
::
ClipManager
(
KdenliveDoc
*
doc
)
:
m_doc
(
doc
)
{
m_clipIdCounter
=
1
;
ClipManager
::
ClipManager
(
KdenliveDoc
*
doc
)
:
m_doc
(
doc
)
{
m_clipIdCounter
=
1
;
}
ClipManager
::~
ClipManager
()
{
ClipManager
::~
ClipManager
()
{
}
void
ClipManager
::
setThumbsProgress
(
KUrl
url
,
int
progress
)
{
m_doc
->
setThumbsProgress
(
url
,
progress
);
void
ClipManager
::
setThumbsProgress
(
KUrl
url
,
int
progress
)
{
m_doc
->
setThumbsProgress
(
url
,
progress
);
}
void
ClipManager
::
addClip
(
DocClipBase
*
clip
)
{
m_clipList
.
append
(
clip
);
void
ClipManager
::
addClip
(
DocClipBase
*
clip
)
{
m_clipList
.
append
(
clip
);
}
void
ClipManager
::
slotDeleteClip
(
uint
clipId
)
{
for
(
int
i
=
0
;
i
<
m_clipList
.
count
();
i
++
)
{
if
(
m_clipList
.
at
(
i
)
->
getId
()
==
clipId
)
{
//m_clipList.removeAt(i
);
AddClipCommand
*
command
=
new
AddClipCommand
(
m_doc
,
m_clipList
.
at
(
i
)
->
toXML
(),
clipId
,
false
);
m_doc
->
commandStack
()
->
push
(
command
)
;
break
;
void
ClipManager
::
slotDeleteClip
(
uint
clipId
)
{
for
(
int
i
=
0
;
i
<
m_clipList
.
count
();
i
++
)
{
if
(
m_clipList
.
at
(
i
)
->
getId
()
==
clipId
)
{
//m_clipList.removeAt(i);
AddClipCommand
*
command
=
new
AddClipCommand
(
m_doc
,
m_clipList
.
at
(
i
)
->
toXML
(),
clipId
,
false
);
m_doc
->
commandStack
()
->
push
(
command
);
break
;
}
}
}
}
void
ClipManager
::
deleteClip
(
uint
clipId
)
{
for
(
int
i
=
0
;
i
<
m_clipList
.
count
();
i
++
)
{
if
(
m_clipList
.
at
(
i
)
->
getId
()
==
clipId
)
{
m_clipList
.
removeAt
(
i
)
;
break
;
void
ClipManager
::
deleteClip
(
uint
clipId
)
{
for
(
int
i
=
0
;
i
<
m_clipList
.
count
();
i
++
)
{
if
(
m_clipList
.
at
(
i
)
->
getId
()
==
clipId
)
{
m_clipList
.
removeAt
(
i
);
break
;
}
}
}
}
DocClipBase
*
ClipManager
::
getClipAt
(
int
pos
)
{
return
m_clipList
.
at
(
pos
);
DocClipBase
*
ClipManager
::
getClipAt
(
int
pos
)
{
return
m_clipList
.
at
(
pos
);
}
DocClipBase
*
ClipManager
::
getClipById
(
int
clipId
)
{
kDebug
()
<<
"++++ CLIP MAN, LOOKING FOR CLIP ID: "
<<
clipId
;
for
(
int
i
=
0
;
i
<
m_clipList
.
count
();
i
++
)
{
if
(
m_clipList
.
at
(
i
)
->
getId
()
==
clipId
)
{
kDebug
()
<<
"++++ CLIP MAN, FOUND FOR CLIP ID: "
<<
clipId
;
return
m_clipList
.
at
(
i
);
DocClipBase
*
ClipManager
::
getClipById
(
int
clipId
)
{
kDebug
()
<<
"++++ CLIP MAN, LOOKING FOR CLIP ID: "
<<
clipId
;
for
(
int
i
=
0
;
i
<
m_clipList
.
count
();
i
++
)
{
if
(
m_clipList
.
at
(
i
)
->
getId
()
==
clipId
)
{
kDebug
()
<<
"++++ CLIP MAN, FOUND FOR CLIP ID: "
<<
clipId
;
return
m_clipList
.
at
(
i
);
}
}
}
return
NULL
;
return
NULL
;
}
void
ClipManager
::
slotAddClipFile
(
const
KUrl
url
,
const
QString
group
)
{
kDebug
()
<<
"///// CLIP MANAGER, ADDING CLIP: "
<<
url
;
void
ClipManager
::
slotAddClipFile
(
const
KUrl
url
,
const
QString
group
)
{
kDebug
()
<<
"///// CLIP MANAGER, ADDING CLIP: "
<<
url
;
QDomDocument
doc
;
QDomElement
prod
=
doc
.
createElement
(
"producer"
);
prod
.
setAttribute
(
"resource"
,
url
.
path
());
...
...
@@ -95,16 +85,15 @@ void ClipManager::slotAddClipFile(const KUrl url, const QString group)
if
(
!
group
.
isEmpty
())
prod
.
setAttribute
(
"group"
,
group
);
KMimeType
::
Ptr
type
=
KMimeType
::
findByUrl
(
url
);
if
(
type
->
name
().
startsWith
(
"image/"
))
{
prod
.
setAttribute
(
"type"
,
(
int
)
IMAGE
);
prod
.
setAttribute
(
"in"
,
"0"
);
prod
.
setAttribute
(
"out"
,
m_doc
->
getFramePos
(
KdenliveSettings
::
image_duration
()));
prod
.
setAttribute
(
"type"
,
(
int
)
IMAGE
);
prod
.
setAttribute
(
"in"
,
"0"
);
prod
.
setAttribute
(
"out"
,
m_doc
->
getFramePos
(
KdenliveSettings
::
image_duration
()));
}
AddClipCommand
*
command
=
new
AddClipCommand
(
m_doc
,
prod
,
id
,
true
);
m_doc
->
commandStack
()
->
push
(
command
);
}
void
ClipManager
::
slotAddColorClipFile
(
const
QString
name
,
const
QString
color
,
QString
duration
,
const
QString
group
)
{
void
ClipManager
::
slotAddColorClipFile
(
const
QString
name
,
const
QString
color
,
QString
duration
,
const
QString
group
)
{
QDomDocument
doc
;
QDomElement
prod
=
doc
.
createElement
(
"producer"
);
prod
.
setAttribute
(
"mlt_service"
,
"colour"
);
...
...
src/clipmanager.h
View file @
2a223cff
...
...
@@ -39,8 +39,8 @@
class
KdenliveDoc
;
class
DocClipBase
;
class
ClipManager
:
public
QObject
{
Q_OBJECT
public
:
class
ClipManager
:
public
QObject
{
Q_OBJECT
public
:
ClipManager
(
KdenliveDoc
*
doc
);
...
...
@@ -54,7 +54,7 @@ class ClipManager:public QObject {
void
slotDeleteClip
(
uint
clipId
);
void
setThumbsProgress
(
KUrl
url
,
int
progress
);
private:
// Private attributes
private:
// Private attributes
/** the list of clips in the document */
QList
<
DocClipBase
*>
m_clipList
;
/** the document undo stack*/
...
...
src/complexparameter.cpp
View file @
2a223cff
...
...
@@ -25,115 +25,114 @@
#include <QMenu>
ComplexParameter
::
ComplexParameter
(
QWidget
*
parent
)
:
QWidget
(
parent
)
{
ui
.
setupUi
(
this
);
//ui.effectlist->horizontalHeader()->setVisible(false);
//ui.effectlist->verticalHeader()->setVisible(false);
activeRow
=-
1
;
clipref
=
NULL
;
ui
.
buttonLeftRight
->
setIcon
(
KIcon
(
"go-next"
));
//better icons needed
ui
.
buttonLeftRight
->
setToolTip
(
i18n
(
"Allow horizontal moves"
));
ui
.
buttonUpDown
->
setIcon
(
KIcon
(
"go-up"
));
ui
.
buttonUpDown
->
setToolTip
(
i18n
(
"Allow vertical moves"
));
ui
.
buttonShowInTimeline
->
setIcon
(
KIcon
(
"kmplayer"
));
ui
.
buttonShowInTimeline
->
setToolTip
(
i18n
(
"Show keyframes in timeline"
));
ui
.
buttonHelp
->
setIcon
(
KIcon
(
"help-about"
));
ui
.
buttonHelp
->
setToolTip
(
i18n
(
"Parameter info"
));
ui
.
buttonNewPoints
->
setIcon
(
KIcon
(
"xedit"
));
ui
.
buttonNewPoints
->
setToolTip
(
i18n
(
"Add keyframe"
));
connect
(
ui
.
buttonLeftRight
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
slotSetMoveX
()
)
);
connect
(
ui
.
buttonUpDown
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
slotSetMoveY
()
)
);
connect
(
ui
.
buttonShowInTimeline
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
slotShowInTimeline
()
)
);
connect
(
ui
.
buttonNewPoints
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
slotSetNew
()
)
);
connect
(
ui
.
buttonHelp
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
slotSetHelp
()
)
);
connect
(
ui
.
parameterList
,
SIGNAL
(
currentIndexChanged
(
const
QString
&
)
),
this
,
SLOT
(
slotParameterChanged
(
const
QString
&
)
)
);
//connect (ui.effectlist, SIGNAL (itemSelectionChanged() ) , this, SLOT ( itemSelectionChanged()));
connect
(
this
,
SIGNAL
(
transferParamDesc
(
const
QDomElement
&
,
int
,
int
)
),
ui
.
kplotwidget
,
SLOT
(
setPointLists
(
const
QDomElement
&
,
int
,
int
)
));
connect
(
ui
.
kplotwidget
,
SIGNAL
(
parameterChanged
(
QDomElement
)
),
this
,
SLOT
(
slotUpdateEffectParams
(
QDomElement
)));
connect
(
ui
.
kplotwidget
,
SIGNAL
(
parameterList
(
QStringList
)),
this
,
SLOT
(
slotUpdateParameterList
(
QStringList
)));
/*ÜeffectLists["audio"]=audioEffectList;
effectLists["video"]=videoEffectList;
effectLists["custom"]=customEffectList;*/
setSizePolicy
(
QSizePolicy
(
QSizePolicy
::
Expanding
,
QSizePolicy
::
Expanding
));
ui
.
infoBox
->
hide
();
updateButtonStatus
();
:
QWidget
(
parent
)
{
ui
.
setupUi
(
this
);
//ui.effectlist->horizontalHeader()->setVisible(false);
//ui.effectlist->verticalHeader()->setVisible(false);
activeRow
=
-
1
;
clipref
=
NULL
;
ui
.
buttonLeftRight
->
setIcon
(
KIcon
(
"go-next"
));
//better icons needed
ui
.
buttonLeftRight
->
setToolTip
(
i18n
(
"Allow horizontal moves"
));
ui
.
buttonUpDown
->
setIcon
(
KIcon
(
"go-up"
));
ui
.
buttonUpDown
->
setToolTip
(
i18n
(
"Allow vertical moves"
));
ui
.
buttonShowInTimeline
->
setIcon
(
KIcon
(
"kmplayer"
));
ui
.
buttonShowInTimeline
->
setToolTip
(
i18n
(
"Show keyframes in timeline"
));
ui
.
buttonHelp
->
setIcon
(
KIcon
(
"help-about"
));
ui
.
buttonHelp
->
setToolTip
(
i18n
(
"Parameter info"
));
ui
.
buttonNewPoints
->
setIcon
(
KIcon
(
"xedit"
));
ui
.
buttonNewPoints
->
setToolTip
(
i18n
(
"Add keyframe"
));
connect
(
ui
.
buttonLeftRight
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
slotSetMoveX
()));
connect
(
ui
.
buttonUpDown
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
slotSetMoveY
()));
connect
(
ui
.
buttonShowInTimeline
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
slotShowInTimeline
()));
connect
(
ui
.
buttonNewPoints
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
slotSetNew
()));
connect
(
ui
.
buttonHelp
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
slotSetHelp
()));
connect
(
ui
.
parameterList
,
SIGNAL
(
currentIndexChanged
(
const
QString
&
)),
this
,
SLOT
(
slotParameterChanged
(
const
QString
&
)));
//connect (ui.effectlist, SIGNAL (itemSelectionChanged() ) , this, SLOT ( itemSelectionChanged()));
connect
(
this
,
SIGNAL
(
transferParamDesc
(
const
QDomElement
&
,
int
,
int
)),
ui
.
kplotwidget
,
SLOT
(
setPointLists
(
const
QDomElement
&
,
int
,
int
)));
connect
(
ui
.
kplotwidget
,
SIGNAL
(
parameterChanged
(
QDomElement
)),
this
,
SLOT
(
slotUpdateEffectParams
(
QDomElement
)));
connect
(
ui
.
kplotwidget
,
SIGNAL
(
parameterList
(
QStringList
)),
this
,
SLOT
(
slotUpdateParameterList
(
QStringList
)));
/*ÜeffectLists["audio"]=audioEffectList;
effectLists["video"]=videoEffectList;
effectLists["custom"]=customEffectList;*/
setSizePolicy
(
QSizePolicy
(
QSizePolicy
::
Expanding
,
QSizePolicy
::
Expanding
));
ui
.
infoBox
->
hide
();
updateButtonStatus
();
}
void
ComplexParameter
::
slotSetMoveX
(){
ui
.
kplotwidget
->
setMoveX
(
!
ui
.
kplotwidget
->
isMoveX
());
updateButtonStatus
();
void
ComplexParameter
::
slotSetMoveX
()
{
ui
.
kplotwidget
->
setMoveX
(
!
ui
.
kplotwidget
->
isMoveX
());
updateButtonStatus
();
}
void
ComplexParameter
::
slotSetMoveY
(){
ui
.
kplotwidget
->
setMoveY
(
!
ui
.
kplotwidget
->
isMoveY
());
updateButtonStatus
();
void
ComplexParameter
::
slotSetMoveY
()
{
ui
.
kplotwidget
->
setMoveY
(
!
ui
.
kplotwidget
->
isMoveY
());
updateButtonStatus
();
}
void
ComplexParameter
::
slotSetNew
(){
ui
.
kplotwidget
->
setNewPoints
(
!
ui
.
kplotwidget
->
isNewPoints
());
updateButtonStatus
();
void
ComplexParameter
::
slotSetNew
()
{
ui
.
kplotwidget
->
setNewPoints
(
!
ui
.
kplotwidget
->
isNewPoints
());
updateButtonStatus
();
}
void
ComplexParameter
::
slotSetHelp
(){
ui
.
infoBox
->
setVisible
(
!
ui
.
infoBox
->
isVisible
());
ui
.
buttonHelp
->
setDown
(
ui
.
infoBox
->
isVisible
());
void
ComplexParameter
::
slotSetHelp
()
{
ui
.
infoBox
->
setVisible
(
!
ui
.
infoBox
->
isVisible
());
ui
.
buttonHelp
->
setDown
(
ui
.
infoBox
->
isVisible
());
}
void
ComplexParameter
::
slotShowInTimeline
(){
void
ComplexParameter
::
slotShowInTimeline
()
{