Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Multimedia
Kdenlive
Commits
aadd9305
Commit
aadd9305
authored
Dec 02, 2014
by
Jean-Baptiste Mardelle
Browse files
First step in KF5 porting. Compiles but startup crash
parent
b0ab905d
Changes
187
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
aadd9305
...
...
@@ -2,18 +2,29 @@ project(Kdenlive)
# An odd patch version number means development version, while an even one means
# stable release. An additional number can be used for bugfix-only releases.
set
(
KDENLIVE_VERSION 0.9.
10
)
set
(
KDENLIVE_VERSION 0.9.
99
)
cmake_minimum_required
(
VERSION 2.8.12
)
# Minimum versions of main dependencies.
set
(
MLT_MIN_MAJOR_VERSION 0
)
set
(
MLT_MIN_MINOR_VERSION 8
)
set
(
MLT_MIN_PATCH_VERSION 8
)
set
(
MLT_MIN_VERSION
${
MLT_MIN_MAJOR_VERSION
}
.
${
MLT_MIN_MINOR_VERSION
}
.
${
MLT_MIN_PATCH_VERSION
}
)
set
(
QT_MIN_VERSION 4.5.0
)
set
(
KDE_MIN_VERSION 4.3.0
)
set
(
CMAKE_MODULE_PATH
${
CMAKE_SOURCE_DIR
}
/cmake/modules
)
set
(
QT_MIN_VERSION 5.2.0
)
#set(KDE_MIN_VERSION 4.3.0)
find_package
(
ECM 1.2.0 REQUIRED CONFIG
)
set
(
CMAKE_MODULE_PATH
${
ECM_MODULE_PATH
}
${
CMAKE_SOURCE_DIR
}
/cmake/modules
)
include
(
FeatureSummary
)
include
(
ECMInstallIcons
)
include
(
GenerateExportHeader
)
include
(
KDEInstallDirs
)
include
(
KDECMakeSettings
)
include
(
KDECompilerSettings
)
set
(
CMAKE_MODULE_PATH
${
CMAKE_MODULE_PATH
}
${
ECM_MODULE_PATH
}
)
SET
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
${
Qt5Widgets_EXECUTABLE_COMPILE_FLAGS
}
"
)
SET
(
CMAKE_CXX_FLAGS
"-fPIC"
)
# To be switched on when releasing.
option
(
RELEASE_BUILD
"Remove Git revision from program version (use for stable releases)"
ON
)
...
...
@@ -49,40 +60,47 @@ check_include_files(malloc.h HAVE_MALLOC_H)
check_include_files
(
pthread.h HAVE_PTHREAD_H
)
# Search KDE and dependent packages.
find_package
(
KDE4
${
KDE_MIN_VERSION
}
REQUIRED
)
include
(
KDE4Defaults
)
include
(
MacroLibrary
)
macro_log_feature
(
KDE4_FOUND
"KDELibs"
"KDE core libraries"
"http://www.kde.org"
TRUE
${
KDE_MIN_VERSION
}
)
#
find_package(KDE4 ${KDE_MIN_VERSION} REQUIRED)
#
include(KDE4Defaults)
#
include(MacroLibrary)
#
macro_log_feature(KDE4_FOUND
#
"KDELibs"
#
"KDE core libraries"
#
"http://www.kde.org"
#
TRUE
#
${KDE_MIN_VERSION}
#
)
# Find Qt core modules (QtCore and QtGui).
find_package
(
Qt4
${
QT_MIN_VERSION
}
REQUIRED
)
#find_package(Qt4 ${QT_MIN_VERSION} REQUIRED)
find_package
(
Qt5 CONFIG REQUIRED Core DBus Test Widgets Script Svg OpenGL
)
find_package
(
KF5 REQUIRED Archive Bookmarks CoreAddons Config ConfigWidgets
DBusAddons KIO KDELibs4Support WidgetsAddons Plotting NotifyConfig NewStuff XmlGui
)
#Service)
# Search MLT package.
find_package
(
MLT
${
MLT_MIN_VERSION
}
REQUIRED
)
macro_log_feature
(
MLT_FOUND
"MLT"
"Multimedia framework and video playout server for TV broadcasting"
"http://mltframework.org"
TRUE
${
MLT_MIN_VERSION
}
)
set_package_properties
(
MLT PROPERTIES
DESCRIPTION
"Multimedia framework and video playout server for TV broadcasting"
URL
"http://mltframework.org"
TYPE RUNTIME
PURPOSE
"Required to do video processing"
)
set
(
MLT_PREFIX
${
MLT_ROOT_DIR
}
)
add_subdirectory
(
data
)
macro_optional_add_subdirectory
(
doc
)
add_subdirectory
(
plugins
)
macro_optional_add_subdirectory
(
po
)
#TODO: re-enable
#macro_optional_add_subdirectory(doc)
#add_subdirectory(plugins)
#macro_optional_add_subdirectory(po)
add_subdirectory
(
renderer
)
add_subdirectory
(
src
)
add_subdirectory
(
thumbnailer
)
#
add_subdirectory(thumbnailer)
#add_subdirectory(testingArea)
macro_display_feature_log
()
configure_file
(
config-kdenlive.h.cmake config-kdenlive.h @ONLY
)
data/CMakeLists.txt
View file @
aadd9305
...
...
@@ -32,7 +32,7 @@ install(FILES kdenlive.xpm DESTINATION share/pixmaps)
install
(
FILES kdenlive.menu DESTINATION share/menu RENAME kdenlive
)
install
(
FILES kdenlive.desktop DESTINATION
${
XDG_APPS_INSTALL_DIR
}
)
find_package
(
SharedMimeInfo REQUIRED
)
#
find_package(SharedMimeInfo REQUIRED)
install
(
FILES kdenlive.xml westley.xml DESTINATION
${
XDG_MIME_INSTALL_DIR
}
)
update_xdg_mimetypes
(
${
XDG_MIME_INSTALL_DIR
}
)
#
update_xdg_mimetypes(${XDG_MIME_INSTALL_DIR})
data/icons/CMakeLists.txt
View file @
aadd9305
...
...
@@ -3,6 +3,8 @@ install(FILES
novisible.png
DESTINATION
${
DATA_INSTALL_DIR
}
/kdenlive/pics
)
kde4_install_icons
(
${
ICON_INSTALL_DIR
}
)
#TODO: add icon names
#ecm_install_icons( ${ICON_INSTALL_DIR} )
plugins/sampleplugin/CMakeLists.txt
View file @
aadd9305
set
(
sampleplugin_SRCS sampleplugin.cpp
)
kde4_add_ui_files
(
sampleplugin_UIS countdown_ui.ui
)
qt5_wrap_ui
(
sampleplugin_UIS countdown_ui.ui
)
kde4_add_plugin
(
kdenlive_sampleplugin WITH_PREFIX
${
sampleplugin_SRCS
}
...
...
renderer/CMakeLists.txt
View file @
aadd9305
...
...
@@ -6,16 +6,17 @@ set(kdenlive_render_SRCS
renderjob.cpp
)
kde4_
add_executable
(
kdenlive_render
${
kdenlive_render_SRCS
}
)
add_executable
(
kdenlive_render
${
kdenlive_render_SRCS
}
)
include_directories
(
${
QT_INCLUDES
}
)
include
(
${
QT_USE_FILE
}
)
#
include(${QT_USE_FILE})
target_link_libraries
(
kdenlive_render
${
QT_LIBRARIES
}
KF5::KDELibs4Support
)
install
(
TARGETS kdenlive_render DESTINATION
${
BIN_INSTALL_DIR
}
)
src/CMakeLists.txt
View file @
aadd9305
...
...
@@ -8,22 +8,18 @@ find_package(OpenGL REQUIRED)
if
(
APPLE
)
find_package
(
SDL REQUIRED
)
endif
(
APPLE
)
macro_optional_find_package
(
Nepomuk
)
macro_optional_find_package
(
QJSON
)
find_package
(
QJSON
)
option
(
WITH_JogShuttle
"Build Jog/Shuttle support"
ON
)
set
(
FFMPEG_SUFFIX
""
CACHE STRING
"FFmpeg custom suffix"
)
macro_optional_find_package
(
LibV4L2
)
macro_log_feature
(
LIBV4L2_FOUND
"libv4l"
"Collection of video4linux support libraries"
"http://freecode.com/projects/libv4l"
FALSE
""
"Required for better webcam support"
)
find_package
(
LibV4L2
)
set_package_properties
(
LibV4L2 PROPERTIES
DESCRIPTION
"Collection of video4linux support libraries"
URL
"http://freecode.com/projects/libv4l"
TYPE RUNTIME
PURPOSE
"Required for better webcam support"
)
if
(
WITH_JogShuttle
)
check_include_files
(
linux/input.h HAVE_LINUX_INPUT_H
)
...
...
@@ -32,57 +28,42 @@ if(WITH_JogShuttle)
endif
(
HAVE_LINUX_INPUT_H
)
endif
(
WITH_JogShuttle
)
macro_log_feature
(
QT_QTOPENGL_FOUND
"QtOpenGL"
"Qt bindings for the OpenGL library"
"http://qt.nokia.com/products/qt"
TRUE
${
QT_MIN_VERSION
}
"QtOpenGL library and headers (most likely called libqt4-opengl and libqt4-opengl-dev)"
)
macro_log_feature
(
QT_QTSCRIPT_FOUND
"QtScript"
"Qt module providing core scripting facilities"
"http://qt.nokia.com/products/qt"
TRUE
${
QT_MIN_VERSION
}
"QtScript library (most likely called libqt4-script)"
)
set_package_properties
(
LibV4L2 PROPERTIES
DESCRIPTION
"Collection of video4linux support libraries"
URL
"http://freecode.com/projects/libv4l"
TYPE RUNTIME
PURPOSE
"Required for better webcam support"
)
set_package_properties
(
OpenGL PROPERTIES
DESCRIPTION
"the OpenGL library"
URL
""
TYPE RUNTIME
PURPOSE
""
)
set_package_properties
(
QtScript PROPERTIES
DESCRIPTION
"Qt module providing core scripting facilities"
URL
"http://qt.nokia.com/products/qt"
TYPE RUNTIME
PURPOSE
""
)
#if(APPLE)
# macro_log_feature(SDL_FOUND
# "SDL"
# "Cross-platform multimedia library"
# "http://www.libsdl.org"
# TRUE
# )
#endif(APPLE)
set_package_properties
(
QJson PROPERTIES
DESCRIPTION
"Qt module providing core scripting facilities"
URL
"http://qjson.sourceforge.net"
TYPE RUNTIME
PURPOSE
"Required to build the rotoscoping filter and for Freesound.org queries"
)
if
(
APPLE
)
macro_log_feature
(
SDL_FOUND
"SDL"
"Cross-platform multimedia library"
"http://www.libsdl.org"
TRUE
)
endif
(
APPLE
)
macro_log_feature
(
Nepomuk_FOUND
"Nepomuk"
"Support for the Nepomuk semantic desktop system"
"http://nepomuk.semanticdesktop.org"
)
macro_optional_find_package
(
NepomukCore
)
macro_log_feature
(
NepomukCore_FOUND
"NepomukCore"
"Support for the Nepomuk semantic desktop system"
"http://www.kde.org"
)
macro_log_feature
(
QJSON_FOUND
"QJson"
"Qt-based library that maps JSON data to QVariant objects"
"http://qjson.sourceforge.net"
FALSE
""
"Required to build the rotoscoping filter and for Freesound.org queries"
)
install
(
FILES kdenlivesettings.kcfg DESTINATION
${
KCFG_INSTALL_DIR
}
)
k
de4
_add_kcfg_files
(
kdenlive_SRCS kdenlivesettings.kcfgc
)
k
config
_add_kcfg_files
(
kdenlive_SRCS kdenlivesettings.kcfgc
)
add_subdirectory
(
doc
)
add_subdirectory
(
project
)
...
...
@@ -219,7 +200,7 @@ qt4_add_dbus_adaptor(kdenlive_SRCS
MainWindow
)
qt4_add_resources
(
kdenlive_SRCS ui/resources.qrc
)
kde4_
add_executable
(
kdenlive
add_executable
(
kdenlive
${
kdenlive_SRCS
}
${
kdenlive_UIS
}
)
...
...
@@ -244,21 +225,33 @@ include_directories(
# Adds Qt definitions and include directories, and sets QT_LIBRARIES according
# to the components requested in find_package().
include
(
${
QT_USE_FILE
}
)
#include(${QT_USE_FILE})
if
(
${
KDE_VERSION
}
VERSION_LESS 4.3.80
)
set
(
KDE4_KNEWSTUFF_LIBS
${
KDE4_KNEWSTUFF2_LIBS
}
)
else
(
${
KDE_VERSION
}
VERSION_LESS 4.3.80
)
set
(
KDE4_KNEWSTUFF_LIBS
${
KDE4_KNEWSTUFF3_LIBS
}
)
endif
(
${
KDE_VERSION
}
VERSION_LESS 4.3.80
)
target_link_libraries
(
kdenlive
${
KDE4_KDEUI_LIBS
}
${
KDE4_KIO_LIBS
}
${
KDE4_KNEWSTUFF_LIBS
}
${
KDE4_KNOTIFYCONFIG_LIBRARY
}
${
KDE4_KROSSUI_LIBS
}
${
KDE4_SOLID_LIBS
}
KF5::KDELibs4Support
KF5::WidgetsAddons
KF5::Plotting
KF5::Archive
KF5::CoreAddons
KF5::KIOCore
KF5::KIOFileWidgets
KF5::KIOWidgets
KF5::NotifyConfig
KF5::NewStuff
KF5::XmlGui
#KF5::Service
#KF5::KIONTLM
#${KDE4_KDEUI_LIBS}
#${KDE4_KIO_LIBS}
#${KDE4_KNEWSTUFF_LIBS}
#${KDE4_KNOTIFYCONFIG_LIBRARY}
#${KDE4_KROSSUI_LIBS}
#${KDE4_SOLID_LIBS}
${
Qt5_LIBRARIES
}
Qt5::Svg
#Qt5:OpenGL
${
QT_LIBRARIES
}
${
MLT_LIBRARIES
}
${
MLTPP_LIBRARIES
}
...
...
@@ -267,6 +260,8 @@ target_link_libraries(kdenlive
kiss_fft
)
qt5_use_modules
(
kdenlive Script Widgets Concurrent OpenGL
)
if
(
Q_WS_X11
)
include_directories
(
${
X11_Xlib_INCLUDE_PATH
}
)
target_link_libraries
(
kdenlive
${
X11_LIBRARIES
}
)
...
...
src/capture/managecapturesdialog.cpp
View file @
aadd9305
...
...
@@ -28,13 +28,12 @@
#include
<QTreeWidgetItem>
#include
<QFile>
#include
<QHeaderView>
#include
<QIcon>
#include
<QPixmap>
#include
<QTimer>
ManageCapturesDialog
::
ManageCapturesDialog
(
const
KUrl
::
List
&
files
,
QWidget
*
parent
)
ManageCapturesDialog
::
ManageCapturesDialog
(
const
QList
<
QUrl
>
&
files
,
QWidget
*
parent
)
:
QDialog
(
parent
)
{
setFont
(
KGlobalSettings
::
toolBarFont
());
...
...
@@ -42,7 +41,7 @@ ManageCapturesDialog::ManageCapturesDialog(const KUrl::List &files, QWidget * pa
m_importButton
=
m_view
.
buttonBox
->
button
(
QDialogButtonBox
::
Ok
);
m_importButton
->
setText
(
i18n
(
"import"
));
m_view
.
treeWidget
->
setIconSize
(
QSize
(
70
,
50
));
foreach
(
const
K
Url
&
url
,
files
)
{
foreach
(
const
Q
Url
&
url
,
files
)
{
QStringList
text
;
text
<<
url
.
fileName
();
KFileItem
file
(
KFileItem
::
Unknown
,
KFileItem
::
Unknown
,
url
,
true
);
...
...
@@ -77,7 +76,7 @@ void ManageCapturesDialog::slotCheckItemIcon()
QTreeWidgetItem
*
item
=
m_view
.
treeWidget
->
topLevelItem
(
ct
);
//QTreeWidgetItem *item = m_view.treeWidget->currentItem();
if
(
item
->
icon
(
0
).
isNull
())
{
QPixmap
p
=
KThumb
::
getImage
(
K
Url
(
item
->
data
(
0
,
Qt
::
UserRole
).
toString
()),
0
,
70
,
50
);
QPixmap
p
=
KThumb
::
getImage
(
Q
Url
(
item
->
data
(
0
,
Qt
::
UserRole
).
toString
()),
0
,
70
,
50
);
item
->
setIcon
(
0
,
QIcon
(
p
));
m_view
.
treeWidget
->
resizeColumnToContents
(
0
);
repaint
();
...
...
@@ -109,7 +108,7 @@ void ManageCapturesDialog::slotDeleteCurrent()
const
int
i
=
m_view
.
treeWidget
->
indexOfTopLevelItem
(
item
);
m_view
.
treeWidget
->
takeTopLevelItem
(
i
);
kDebug
()
<<
"DELETING FILE: "
<<
item
->
text
(
0
);
//KIO::NetAccess::del(
K
Url(item->text(0)), this);
//KIO::NetAccess::del(
Q
Url(item->text(0)), this);
QFile
f
(
item
->
data
(
0
,
Qt
::
UserRole
).
toString
());
f
.
remove
();
delete
item
;
...
...
@@ -130,15 +129,15 @@ void ManageCapturesDialog::slotToggle()
}
}
KUrl
::
List
ManageCapturesDialog
::
importFiles
()
QList
<
QUrl
>
ManageCapturesDialog
::
importFiles
()
{
KUrl
::
List
result
;
QList
<
QUrl
>
result
;
const
int
count
=
m_view
.
treeWidget
->
topLevelItemCount
();
for
(
int
i
=
0
;
i
<
count
;
++
i
)
{
QTreeWidgetItem
*
item
=
m_view
.
treeWidget
->
topLevelItem
(
i
);
if
(
item
&&
item
->
checkState
(
0
)
==
Qt
::
Checked
)
result
.
append
(
K
Url
(
item
->
data
(
0
,
Qt
::
UserRole
).
toString
()));
result
.
append
(
Q
Url
(
item
->
data
(
0
,
Qt
::
UserRole
).
toString
()));
}
return
result
;
}
...
...
src/capture/managecapturesdialog.h
View file @
aadd9305
...
...
@@ -23,7 +23,7 @@
#include
<QPushButton>
#include
<
K
Url>
#include
<
Q
Url>
#include
"ui_managecaptures_ui.h"
...
...
@@ -32,9 +32,9 @@ class ManageCapturesDialog : public QDialog
Q_OBJECT
public:
explicit
ManageCapturesDialog
(
const
KUrl
::
List
&
files
,
QWidget
*
parent
=
0
);
explicit
ManageCapturesDialog
(
const
QList
<
QUrl
>
&
files
,
QWidget
*
parent
=
0
);
~
ManageCapturesDialog
();
KUrl
::
List
importFiles
();
QList
<
QUrl
>
importFiles
();
private
slots
:
void
slotRefreshButtons
();
...
...
src/capture/mltdevicecapture.cpp
View file @
aadd9305
...
...
@@ -25,21 +25,14 @@
#include
<mlt++/Mlt.h>
#include
<KDebug>
#include
<KStandardDirs>
#include
<KMessageBox>
#include
<KLocalizedString>
#include
<KTemporaryFile>
#include
<QTimer>
#include
<QDir>
#include
<QString>
#include
<QApplication>
#include
<QThread>
#include
<cstdlib>
#include
<cstdarg>
#include
<QDebug>
...
...
src/capture/mltdevicecapture.h
View file @
aadd9305
...
...
@@ -29,9 +29,9 @@
#include
<mlt/framework/mlt_types.h>
#include
<QtConcurrentRun>
#include
<QTimer>
#include
<QMutex>
namespace
Mlt
{
class
Consumer
;
...
...
src/capture/v4lcapture.cpp
View file @
aadd9305
...
...
@@ -27,13 +27,8 @@
#include
<unistd.h>
#include
<fcntl.h>
#include
<QDebug>
#include
<QImage>
#include
<QTimer>
#include
<QPainter>
#include
<KDebug>
#include
<KLocalizedString>
#include
<linux/videodev2.h>
#include
<sys/ioctl.h>
...
...
src/capture/v4lcapture.h
View file @
aadd9305
...
...
@@ -21,10 +21,7 @@
#define __V4LCAPTUREHANDLER_H__
//#include "src.h"
#include
<QWidget>
#include
<QObject>
#include
<QLayout>
#include
<QLabel>
#include
<QStringList>
class
V4lCaptureHandler
...
...
src/definitions.cpp
View file @
aadd9305
...
...
@@ -19,6 +19,8 @@
#include
"definitions.h"
#include
<KLocale>
QDebug
operator
<<
(
QDebug
qd
,
const
ItemInfo
&
info
)
{
qd
<<
"ItemInfo "
<<
&
info
;
...
...
src/definitions.h
View file @
aadd9305
...
...
@@ -24,7 +24,6 @@
#include
"gentime.h"
#include
"effectslist/effectslist.h"
#include
<KLocalizedString>
#include
<QDebug>
#include
<QTreeWidgetItem>
...
...
src/dialogs/encodingprofilesdialog.cpp
View file @
aadd9305
...
...
@@ -21,13 +21,9 @@
#include
"kdenlivesettings.h"
#include
<KStandardDirs>
#include
<KDebug>
#include
<KMessageBox>
#include
<KIO/NetAccess>
#include
<QDir>
#include
<QCloseEvent>
#include
<QVBoxLayout>
#include
<KLineEdit>
#include
<QPlainTextEdit>
...
...
@@ -43,12 +39,12 @@ EncodingProfilesDialog::EncodingProfilesDialog(int profileType, QWidget * parent
profile_type
->
addItem
(
i18n
(
"Screen capture"
),
2
);
profile_type
->
addItem
(
i18n
(
"Decklink capture"
),
3
);
button_add
->
setIcon
(
K
Icon
(
"list-add"
));
button_edit
->
setIcon
(
K
Icon
(
"document-edit"
));
button_delete
->
setIcon
(
K
Icon
(
"list-remove"
));
button_download
->
setIcon
(
K
Icon
(
"download"
));
button_add
->
setIcon
(
Q
Icon
::
fromTheme
(
"list-add"
));
button_edit
->
setIcon
(
Q
Icon
::
fromTheme
(
"document-edit"
));
button_delete
->
setIcon
(
Q
Icon
::
fromTheme
(
"list-remove"
));
button_download
->
setIcon
(
Q
Icon
::
fromTheme
(
"download"
));
m_configFile
=
new
KConfig
(
"encodingprofiles.rc"
,
KConfig
::
CascadeConfig
,
"appdata"
);
m_configFile
=
new
KConfig
(
"encodingprofiles.rc"
,
KConfig
::
CascadeConfig
,
QStandardPaths
::
DataLocation
);
profile_type
->
setCurrentIndex
(
profileType
);
connect
(
profile_type
,
SIGNAL
(
currentIndexChanged
(
int
)),
this
,
SLOT
(
slotLoadProfiles
()));
connect
(
profile_list
,
SIGNAL
(
currentRowChanged
(
int
)),
this
,
SLOT
(
slotShowParams
()));
...
...
src/dialogs/encodingprofilesdialog.h
View file @
aadd9305
...
...
@@ -21,6 +21,7 @@
#ifndef ENCODINGPROFILESDIALOG_H
#define ENCODINGPROFILESDIALOG_H
#include
<KConfigGroup>
#include
"definitions.h"
#include
"ui_manageencodingprofile_ui.h"
...
...
src/dialogs/kdenlivesettingsdialog.cpp
View file @
aadd9305
...
...
@@ -23,14 +23,15 @@
#include
"kdenlivesettings.h"
#include
"renderer.h"
#ifdef USE_V4L
#include
"capture/v4lcapture.h"
#endif
#include
<KStandardDirs>
//#include <KService>
#include
<KDebug>
#include
<kopenwithdialog.h>
#include
<KConfigDialogManager>
//#include <KOpenWithDialog>
#include
<kde_file.h>
#include
<KIO/NetAccess>
#include
<kdeversion.h>
...
...
@@ -38,7 +39,6 @@
#include
<QDir>
#include
<QTimer>
#include
<QTreeWidgetItem>
#include
<QThread>
#include
<stdlib.h>
...
...
@@ -134,7 +134,7 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(const QMap<QString, QString>& map
QWidget
*
p5
=
new
QWidget
;
m_configShuttle
.
setupUi
(
p5
);
#ifdef USE_JOGSHUTTLE
m_configShuttle
.
toolBtnReload
->
setIcon
(
K
Icon
(
"view-refresh"
));
m_configShuttle
.
toolBtnReload
->
setIcon
(
Q
Icon
::
fromTheme
(
"view-refresh"
));
connect
(
m_configShuttle
.
kcfg_enableshuttle
,
SIGNAL
(
stateChanged
(
int
)),
this
,
SLOT
(
slotCheckShuttle
(
int
)));
connect
(
m_configShuttle
.
shuttledevicelist
,
SIGNAL
(
activated
(
int
)),
this
,
SLOT
(
slotUpdateShuttleDevice
(
int
)));
connect
(
m_configShuttle
.
toolBtnReload
,
SIGNAL
(
clicked
(
bool
)),
this
,
SLOT
(
slotReloadShuttleDevices
()));
...
...
@@ -172,7 +172,7 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(const QMap<QString, QString>& map
QWidget
*
p6
=
new
QWidget
;
m_configSdl
.
setupUi
(
p6
);
m_configSdl
.
reload_blackmagic
->
setIcon
(
K
Icon
(
"view-refresh"
));
m_configSdl
.
reload_blackmagic
->
setIcon
(
Q
Icon
::
fromTheme
(
"view-refresh"
));
connect
(
m_configSdl
.
reload_blackmagic
,
SIGNAL
(
clicked
(
bool
)),
this
,
SLOT
(
slotReloadBlackMagic
()));
#ifndef USE_OPENGL
...
...
@@ -226,8 +226,8 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(const QMap<QString, QString>& map
}
// decklink profile
m_configCapture
.
decklink_showprofileinfo
->
setIcon
(
K
Icon
(
"help-about"
));
m_configCapture
.
decklink_manageprofile
->
setIcon
(
K
Icon
(
"configure"
));
m_configCapture
.
decklink_showprofileinfo
->
setIcon
(
Q
Icon
::
fromTheme
(
"help-about"
));
m_configCapture
.
decklink_manageprofile
->
setIcon
(
Q
Icon
::
fromTheme
(
"configure"
));
m_configCapture
.
decklink_parameters
->
setVisible
(
false
);
m_configCapture
.
decklink_parameters
->
setMaximumHeight
(
QFontMetrics
(
font
()).
lineSpacing
()
*
4
);
m_configCapture
.
decklink_parameters
->
setPlainText
(
KdenliveSettings
::
decklink_parameters
());
...
...
@@ -236,8 +236,8 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(const QMap<QString, QString>& map
connect
(
m_configCapture
.
decklink_showprofileinfo
,
SIGNAL
(
clicked
(
bool
)),
m_configCapture
.
decklink_parameters
,
SLOT
(
setVisible
(
bool
)));
// ffmpeg profile
m_configCapture
.
v4l_showprofileinfo
->
setIcon
(
K
Icon
(
"help-about"
));
m_configCapture
.
v4l_manageprofile
->
setIcon
(
K
Icon
(
"configure"
));
m_configCapture
.
v4l_showprofileinfo
->
setIcon
(
Q
Icon
::
fromTheme
(
"help-about"
));
m_configCapture
.
v4l_manageprofile
->
setIcon
(
Q
Icon
::
fromTheme
(
"configure"
));
m_configCapture
.
v4l_parameters
->
setVisible
(
false
);
m_configCapture
.
v4l_parameters
->
setMaximumHeight
(
QFontMetrics
(
font
()).
lineSpacing
()
*
4
);
m_configCapture
.
v4l_parameters
->
setPlainText
(
KdenliveSettings
::
v4l_parameters
());
...
...
@@ -246,8 +246,8 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(const QMap<QString, QString>& map
connect
(
m_configCapture
.
v4l_showprofileinfo
,
SIGNAL
(
clicked
(
bool
)),
m_configCapture
.
v4l_parameters
,
SLOT
(
setVisible
(
bool
)));
// screen grab profile
m_configCapture
.
grab_showprofileinfo
->
setIcon
(
K
Icon
(
"help-about"
));
m_configCapture
.
grab_manageprofile
->
setIcon
(
K
Icon
(
"configure"
));
m_configCapture
.
grab_showprofileinfo
->
setIcon
(
Q
Icon
::
fromTheme
(
"help-about"
));
m_configCapture
.
grab_manageprofile
->
setIcon
(
Q
Icon
::
fromTheme
(
"configure"
));
m_configCapture
.
grab_parameters
->
setVisible
(
false
);
m_configCapture
.
grab_parameters
->
setMaximumHeight
(
QFontMetrics
(
font
()).
lineSpacing
()
*
4
);
m_configCapture
.
grab_parameters
->
setPlainText
(
KdenliveSettings
::
grab_parameters
());
...
...
@@ -256,8 +256,8 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(const QMap<QString, QString>& map
connect
(
m_configCapture
.
grab_showprofileinfo
,
SIGNAL
(
clicked
(
bool
)),
m_configCapture
.
grab_parameters
,
SLOT
(
setVisible
(
bool
)));
// proxy profile stuff
m_configProject
.
proxy_showprofileinfo
->
setIcon
(
K
Icon
(
"help-about"
));
m_configProject
.
proxy_manageprofile
->
setIcon
(
K
Icon
(
"configure"
));
m_configProject
.
proxy_showprofileinfo
->
setIcon
(
Q
Icon
::
fromTheme
(
"help-about"
));