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
252
Issues
252
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
bb14c073
Commit
bb14c073
authored
Aug 02, 2017
by
Luigi Toscano
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix terminology: mimetype(s) -> MIME type(s)
parent
e6a6fc62
Changes
16
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
24 additions
and
24 deletions
+24
-24
data/effects/README
data/effects/README
+1
-1
src/bin/projectitemmodel.h
src/bin/projectitemmodel.h
+1
-1
src/dialogs/clipcreationdialog.cpp
src/dialogs/clipcreationdialog.cpp
+4
-4
src/dialogs/renderwidget.cpp
src/dialogs/renderwidget.cpp
+1
-1
src/dialogs/wizard.cpp
src/dialogs/wizard.cpp
+1
-1
src/kdenlivesettings.kcfg
src/kdenlivesettings.kcfg
+1
-1
src/monitor/monitor.cpp
src/monitor/monitor.cpp
+1
-1
src/project/dialogs/archivewidget.cpp
src/project/dialogs/archivewidget.cpp
+2
-2
src/project/dialogs/projectsettings.cpp
src/project/dialogs/projectsettings.cpp
+1
-1
src/project/dialogs/slideshowclip.cpp
src/project/dialogs/slideshowclip.cpp
+2
-2
src/project/dialogs/slideshowclip.h
src/project/dialogs/slideshowclip.h
+1
-1
src/project/projectmanager.h
src/project/projectmanager.h
+3
-3
src/timeline/customtrackview.cpp
src/timeline/customtrackview.cpp
+1
-1
src/ui/configenv_ui.ui
src/ui/configenv_ui.ui
+2
-2
src/ui/slideshowclip_ui.ui
src/ui/slideshowclip_ui.ui
+1
-1
src/ui/wizardextra_ui.ui
src/ui/wizardextra_ui.ui
+1
-1
No files found.
data/effects/README
View file @
bb14c073
...
...
@@ -110,7 +110,7 @@ The rest:
- url/path
- represented by button to open "file open" dialog
- additional attributes:
- "filter": Filter for file extensions. Example : "*.cpp *.cc *.C|C++ Source Files\n*.h *.H|Header files" or as using
mime
type: "image/png text/html"
- "filter": Filter for file extensions. Example : "*.cpp *.cc *.C|C++ Source Files\n*.h *.H|Header files" or as using
MIME
type: "image/png text/html"
- "wipe":
- special GUI for the wipe transition makes it possible to select a direction of a slide
- "addedgeometry":
...
...
src/bin/projectitemmodel.h
View file @
bb14c073
...
...
@@ -58,7 +58,7 @@ public:
int
rowCount
(
const
QModelIndex
&
parent
=
QModelIndex
())
const
Q_DECL_OVERRIDE
;
/** @brief Mandatory reimplementation from QAbstractItemModel */
int
columnCount
(
const
QModelIndex
&
parent
=
QModelIndex
())
const
Q_DECL_OVERRIDE
;
/** @brief Returns the
mime
type used for Drag actions */
/** @brief Returns the
MIME
type used for Drag actions */
QStringList
mimeTypes
()
const
Q_DECL_OVERRIDE
;
/** @brief Create data that will be used for Drag events */
QMimeData
*
mimeData
(
const
QModelIndexList
&
indices
)
const
Q_DECL_OVERRIDE
;
...
...
src/dialogs/clipcreationdialog.cpp
View file @
bb14c073
...
...
@@ -52,16 +52,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// static
QStringList
ClipCreationDialog
::
getExtensions
()
{
// Build list of
mime
types
// Build list of
MIME
types
QStringList
mimeTypes
=
QStringList
()
<<
QStringLiteral
(
"application/x-kdenlive"
)
<<
QStringLiteral
(
"application/x-kdenlivetitle"
)
<<
QStringLiteral
(
"video/mlt-playlist"
)
<<
QStringLiteral
(
"text/plain"
);
// Video
mime
s
// Video
MIME
s
mimeTypes
<<
QStringLiteral
(
"video/x-flv"
)
<<
QStringLiteral
(
"application/vnd.rn-realmedia"
)
<<
QStringLiteral
(
"video/x-dv"
)
<<
QStringLiteral
(
"video/dv"
)
<<
QStringLiteral
(
"video/x-msvideo"
)
<<
QStringLiteral
(
"video/x-matroska"
)
<<
QStringLiteral
(
"video/mpeg"
)
<<
QStringLiteral
(
"video/ogg"
)
<<
QStringLiteral
(
"video/x-ms-wmv"
)
<<
QStringLiteral
(
"video/mp4"
)
<<
QStringLiteral
(
"video/quicktime"
)
<<
QStringLiteral
(
"video/webm"
)
<<
QStringLiteral
(
"video/3gpp"
)
<<
QStringLiteral
(
"video/mp2t"
);
// Audio
mime
s
// Audio
MIME
s
mimeTypes
<<
QStringLiteral
(
"audio/x-flac"
)
<<
QStringLiteral
(
"audio/x-matroska"
)
<<
QStringLiteral
(
"audio/mp4"
)
<<
QStringLiteral
(
"audio/mpeg"
)
<<
QStringLiteral
(
"audio/x-mp3"
)
<<
QStringLiteral
(
"audio/ogg"
)
<<
QStringLiteral
(
"audio/x-wav"
)
<<
QStringLiteral
(
"audio/x-aiff"
)
<<
QStringLiteral
(
"audio/aiff"
)
<<
QStringLiteral
(
"application/ogg"
)
<<
QStringLiteral
(
"application/mxf"
)
<<
QStringLiteral
(
"application/x-shockwave-flash"
)
<<
QStringLiteral
(
"audio/ac3"
);
// Image
mime
s
// Image
MIME
s
mimeTypes
<<
QStringLiteral
(
"image/gif"
)
<<
QStringLiteral
(
"image/jpeg"
)
<<
QStringLiteral
(
"image/png"
)
<<
QStringLiteral
(
"image/x-tga"
)
<<
QStringLiteral
(
"image/x-bmp"
)
<<
QStringLiteral
(
"image/svg+xml"
)
<<
QStringLiteral
(
"image/tiff"
)
<<
QStringLiteral
(
"image/x-xcf"
)
<<
QStringLiteral
(
"image/x-xcf-gimp"
)
<<
QStringLiteral
(
"image/x-vnd.adobe.photoshop"
)
<<
QStringLiteral
(
"image/x-pcx"
)
<<
QStringLiteral
(
"image/x-exr"
)
<<
QStringLiteral
(
"image/x-portable-pixmap"
)
<<
QStringLiteral
(
"application/x-krita"
);
QMimeDatabase
db
;
...
...
src/dialogs/renderwidget.cpp
View file @
bb14c073
...
...
@@ -1196,7 +1196,7 @@ void RenderWidget::slotExport(bool scriptExport, int zoneIn, int zoneOut,
KIO
::
DesktopExecParser
parser
(
*
serv
,
QList
<
QUrl
>
()
<<
QUrl
::
fromLocalFile
(
QUrl
::
toPercentEncoding
(
dest
)));
render_process_args
<<
parser
.
resultingArguments
().
join
(
QLatin1Char
(
' '
));
}
else
{
// no service found to play
mime
type
// no service found to play
MIME
type
//TODO: inform user
//errorMessage(PlaybackError, i18n("No service found to play %1", mime.name()));
render_process_args
<<
QStringLiteral
(
"-"
);
...
...
src/dialogs/wizard.cpp
View file @
bb14c073
...
...
@@ -660,7 +660,7 @@ void Wizard::installExtraMimes(const QString &baseName, const QStringList &globs
return
;
}
if
(
!
mime
.
isValid
()
||
mime
.
isDefault
())
{
qCDebug
(
KDENLIVE_LOG
)
<<
"
mimeT
ype "
<<
baseName
<<
" not found"
;
qCDebug
(
KDENLIVE_LOG
)
<<
"
MIME t
ype "
<<
baseName
<<
" not found"
;
}
else
{
QStringList
extensions
=
mime
.
globPatterns
();
QString
comment
=
mime
.
comment
();
...
...
src/kdenlivesettings.kcfg
View file @
bb14c073
...
...
@@ -823,7 +823,7 @@
</entry>
<entry
name=
"slideshowbymime"
type=
"Bool"
>
<label>
True if slideshow default method is
mime
type.
</label>
<label>
True if slideshow default method is
MIME
type.
</label>
<default>
true
</default>
</entry>
...
...
src/monitor/monitor.cpp
View file @
bb14c073
...
...
@@ -915,7 +915,7 @@ Qt::DropActions Monitor::supportedDropActions() const {
QStringList
Monitor
::
mimeTypes
()
const
{
QStringList
qstrList
;
// list of accepted
mime
types for drop
// list of accepted
MIME
types for drop
qstrList
.
append
(
QStringLiteral
(
"kdenlive/clip"
));
return
qstrList
;
}
...
...
src/project/dialogs/archivewidget.cpp
View file @
bb14c073
...
...
@@ -341,7 +341,7 @@ void ArchiveWidget::generateItems(QTreeWidgetItem *parentItem, const QStringList
QUrl
slideUrl
=
QUrl
::
fromLocalFile
(
file
);
QDir
dir
(
slideUrl
.
adjusted
(
QUrl
::
RemoveFilename
).
toLocalFile
());
if
(
slideUrl
.
fileName
().
startsWith
(
QLatin1String
(
".all."
)))
{
//
mime
type slideshow (for example *.png)
//
MIME
type slideshow (for example *.png)
QStringList
filters
;
// TODO: improve jpeg image detection with extension like jpeg, requires change in MLT image producers
filters
<<
QStringLiteral
(
"*."
)
+
slideUrl
.
fileName
().
section
(
QLatin1Char
(
'.'
),
-
1
);
...
...
@@ -425,7 +425,7 @@ void ArchiveWidget::generateItems(QTreeWidgetItem *parentItem, const QMap<QStrin
QUrl
slideUrl
=
QUrl
::
fromLocalFile
(
file
);
QDir
dir
(
slideUrl
.
adjusted
(
QUrl
::
RemoveFilename
).
toLocalFile
());
if
(
slideUrl
.
fileName
().
startsWith
(
QLatin1String
(
".all."
)))
{
//
mime
type slideshow (for example *.png)
//
MIME
type slideshow (for example *.png)
QStringList
filters
;
// TODO: improve jpeg image detection with extension like jpeg, requires change in MLT image producers
filters
<<
QStringLiteral
(
"*."
)
+
slideUrl
.
fileName
().
section
(
QLatin1Char
(
'.'
),
-
1
);
...
...
src/project/dialogs/projectsettings.cpp
View file @
bb14c073
...
...
@@ -569,7 +569,7 @@ QStringList ProjectSettings::extractSlideshowUrls(const QString &url)
QString
path
=
QFileInfo
(
url
).
absolutePath
();
QDir
dir
(
path
);
if
(
url
.
contains
(
QStringLiteral
(
".all."
)))
{
// this is a
mime
slideshow, like *.jpeg
// this is a
MIME
slideshow, like *.jpeg
QString
ext
=
url
.
section
(
QLatin1Char
(
'.'
),
-
1
);
QStringList
filters
;
filters
<<
QStringLiteral
(
"*."
)
+
ext
;
...
...
src/project/dialogs/slideshowclip.cpp
View file @
bb14c073
...
...
@@ -90,7 +90,7 @@ SlideshowClip::SlideshowClip(const Timecode &tc, QString clipFolder, ProjectClip
if
(
clip
)
{
QString
url
=
clip
->
url
();
if
(
QFileInfo
(
url
).
fileName
().
startsWith
(
QLatin1String
(
".all."
)))
{
// the image sequence is defined by
mime
type
// the image sequence is defined by
MIME
type
m_view
.
method_mime
->
setChecked
(
true
);
m_view
.
folder_url
->
setText
(
QFileInfo
(
url
).
absolutePath
());
QString
filter
=
QFileInfo
(
url
).
fileName
();
...
...
@@ -509,7 +509,7 @@ void SlideshowClip::slotUpdateDurationFormat(int ix)
void
SlideshowClip
::
slotMethodChanged
(
bool
active
)
{
if
(
active
)
{
// User wants
mime
type image sequence
// User wants
MIME
type image sequence
m_view
.
clip_duration
->
setText
(
m_timecode
.
reformatSeparators
(
KdenliveSettings
::
image_duration
()));
m_view
.
stackedWidget
->
setCurrentIndex
(
0
);
KdenliveSettings
::
setSlideshowbymime
(
true
);
...
...
src/project/dialogs/slideshowclip.h
View file @
bb14c073
...
...
@@ -63,7 +63,7 @@ private slots:
void
slotUpdateDurationFormat
(
int
ix
);
void
slotGenerateThumbs
();
void
slotSetPixmap
(
const
KFileItem
&
fileItem
,
const
QPixmap
&
pix
);
/** @brief Display correct widget depenging on user choice (
mime
type or pattern method). */
/** @brief Display correct widget depenging on user choice (
MIME
type or pattern method). */
void
slotMethodChanged
(
bool
active
);
private:
...
...
src/project/projectmanager.h
View file @
bb14c073
...
...
@@ -132,9 +132,9 @@ signals:
// void projectOpened(Project *project);
private:
/** @brief Checks that the Kdenlive
mime
type is correctly installed.
* @param open If set to true, this will return the
mime
type allowed for file opening (adds .tar.gz format)
* @return The
mime
type */
/** @brief Checks that the Kdenlive
MIME
type is correctly installed.
* @param open If set to true, this will return the
MIME
type allowed for file opening (adds .tar.gz format)
* @return The
MIME
type */
QString
getMimeType
(
bool
open
=
true
);
/** @brief checks if autoback files exists, recovers from it if user says yes, returns true if files were recovered. */
bool
checkForBackupFile
(
const
QUrl
&
url
);
...
...
src/timeline/customtrackview.cpp
View file @
bb14c073
...
...
@@ -3655,7 +3655,7 @@ void CustomTrackView::adjustTimelineTransitions(TimelineMode::EditMode mode, Tra
QStringList
CustomTrackView
::
mimeTypes
()
const
{
QStringList
qstrList
;
// list of accepted
mime
types for drop
// list of accepted
MIME
types for drop
qstrList
.
append
(
QStringLiteral
(
"text/plain"
));
qstrList
.
append
(
QStringLiteral
(
"kdenlive/producerslist"
));
qstrList
.
append
(
QStringLiteral
(
"kdenlive/clip"
));
...
...
src/ui/configenv_ui.ui
View file @
bb14c073
...
...
@@ -253,7 +253,7 @@
<item
row=
"0"
column=
"0"
>
<widget
class=
"QLabel"
name=
"label_5"
>
<property
name=
"text"
>
<string>
Additional clip
mime
types
</string>
<string>
Additional clip
MIME
types
</string>
</property>
</widget>
</item>
...
...
@@ -267,7 +267,7 @@
<item
row=
"2"
column=
"0"
>
<widget
class=
"QLabel"
name=
"label_12"
>
<property
name=
"text"
>
<string>
Supported clip
mime
types
</string>
<string>
Supported clip
MIME
types
</string>
</property>
</widget>
</item>
...
...
src/ui/slideshowclip_ui.ui
View file @
bb14c073
...
...
@@ -33,7 +33,7 @@
<item
row=
"0"
column=
"0"
>
<widget
class=
"QRadioButton"
name=
"method_mime"
>
<property
name=
"text"
>
<string>
&
M
ime
type
</string>
<string>
&
M
IME
type
</string>
</property>
<property
name=
"checked"
>
<bool>
true
</bool>
...
...
src/ui/wizardextra_ui.ui
View file @
bb14c073
...
...
@@ -63,7 +63,7 @@
<item row="4" column="0" >
<widget class="QCheckBox" name="installmimes" >
<property name="text" >
<string>Install extra video
mime
types</string>
<string>Install extra video
MIME
types</string>
</property>
<property name="checked" >
<bool>true</bool>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment