Commit 083e1b53 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

No more Kde4Support, Qt5/KF5 port is almost done

parent 1764e230
......@@ -77,7 +77,7 @@ check_include_files(pthread.h HAVE_PTHREAD_H)
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 )
DBusAddons KIO WidgetsAddons Plotting NotifyConfig NewStuff XmlGui Notifications GuiAddons TextWidgets IconThemes )
#Service)
......
......@@ -14,9 +14,11 @@ include_directories(
#include(${QT_USE_FILE})
qt5_use_modules(kdenlive_render Widgets Concurrent DBus)
target_link_libraries(kdenlive_render
${QT_LIBRARIES}
KF5::KDELibs4Support
${Qt5_LIBRARIES}
)
install(TARGETS kdenlive_render DESTINATION ${BIN_INSTALL_DIR})
......@@ -104,7 +104,7 @@ list(APPEND kdenlive_SRCS
core.cpp
)
kde4_add_ui_files(kdenlive_UIS
qt5_wrap_ui(kdenlive_UIS
ui/addtrack_ui.ui
ui/archivewidget_ui.ui
ui/audiospectrum_ui.ui
......@@ -194,12 +194,12 @@ if(BUILD_JogShuttle)
)
endif(BUILD_JogShuttle)
qt4_add_dbus_adaptor(kdenlive_SRCS
qt5_add_dbus_adaptor(kdenlive_SRCS
org.kdenlive.MainWindow.xml
mainwindow.h
MainWindow
)
qt4_add_resources(kdenlive_SRCS ui/resources.qrc)
qt5_add_resources(kdenlive_SRCS ui/resources.qrc)
add_executable(kdenlive
${kdenlive_SRCS}
${kdenlive_UIS}
......@@ -230,7 +230,6 @@ include_directories(
target_link_libraries(kdenlive
KF5::KDELibs4Support
KF5::WidgetsAddons
KF5::Plotting
KF5::Archive
......@@ -242,6 +241,10 @@ target_link_libraries(kdenlive
KF5::NewStuff
KF5::DBusAddons
KF5::XmlGui
KF5::GuiAddons
KF5::Notifications
KF5::TextWidgets
KF5::IconThemes
#KF5::Service
#KF5::KIONTLM
#${KDE4_KDEUI_LIBS}
......@@ -252,7 +255,7 @@ target_link_libraries(kdenlive
#${KDE4_SOLID_LIBS}
${Qt5_LIBRARIES}
Qt5::Svg
#Qt5:OpenGL
${OPENGL_LIBRARIES}
${QT_LIBRARIES}
${MLT_LIBRARIES}
${MLTPP_LIBRARIES}
......
......@@ -24,6 +24,7 @@
#include <QDebug>
#include <QFontDatabase>
#include <KFileItem>
#include "klocalizedstring.h"
#include <QTreeWidgetItem>
#include <QFile>
......
......@@ -18,8 +18,7 @@
***************************************************************************/
#include "definitions.h"
#include <KLocale>
#include <klocalizedstring.h>
QDebug operator << (QDebug qd, const ItemInfo &info)
{
......
......@@ -21,8 +21,9 @@
#include "kdenlivesettings.h"
#include <QDebug>
#include "klocalizedstring.h"
#include <QDebug>
#include <QVBoxLayout>
#include <QLineEdit>
#include <QPlainTextEdit>
......
......@@ -28,12 +28,12 @@
#include "capture/v4lcapture.h"
#endif
#include <QDebug>
#include "klocalizedstring.h"
#include <kde_file.h>
#include <kdeversion.h>
#include <KMessageBox>
#include <KLineEdit>
#include <QDebug>
#include <QDir>
#include <QTimer>
#include <QThread>
......@@ -791,7 +791,7 @@ void KdenliveSettingsDialog::updateSettings()
actions << m_mappable_actions[button->currentText()];
}
QString maps = JogShuttleConfig::actionMap(actions);
//fprintf(stderr, "Shuttle config: %s\n", JogShuttleConfig::actionMap(actions).toAscii().constData());
//fprintf(stderr, "Shuttle config: %s\n", JogShuttleConfig::actionMap(actions).toLatin1().constData());
if (KdenliveSettings::shuttlebuttons() != maps)
KdenliveSettings::setShuttlebuttons(maps);
#endif
......
......@@ -18,18 +18,18 @@
***************************************************************************/
#include "profilesdialog.h"
#include "kdenlivesettings.h"
#include <QDebug>
#include <KMessageBox>
#include <KMessageBox>
#include "klocalizedstring.h"
#include <QDir>
#include <QScriptEngine>
#include <QCloseEvent>
#include <QScriptEngine>
#include <QStandardPaths>
#include <QDebug>
ProfilesDialog::ProfilesDialog(QWidget * parent) :
QDialog(parent),
......
......@@ -24,14 +24,13 @@
#include "timecode.h"
#include "dialogs/profilesdialog.h"
#include <QDebug>
#include "klocalizedstring.h"
#include <KMessageBox>
#include <KRun>
#include <KColorScheme>
#include <KNotification>
#include <QDebug>
#include <QDomDocument>
#include <QTreeWidgetItem>
#include <QListWidgetItem>
......@@ -286,15 +285,15 @@ RenderWidget::RenderWidget(const QString &projectfolder, bool enableProxy, const
m_view.running_jobs->setItemDelegate(m_jobsDelegate);
QHeaderView *header = m_view.running_jobs->header();
header->setResizeMode(0, QHeaderView::Fixed);
header->setSectionResizeMode(0, QHeaderView::Fixed);
header->resizeSection(0, 30);
header->setResizeMode(1, QHeaderView::Interactive);
header->setSectionResizeMode(1, QHeaderView::Interactive);
m_view.scripts_list->setHeaderLabels(QStringList() << QString() << i18n("Script Files"));
m_scriptsDelegate = new RenderViewDelegate(this);
m_view.scripts_list->setItemDelegate(m_scriptsDelegate);
header = m_view.scripts_list->header();
header->setResizeMode(0, QHeaderView::Fixed);
header->setSectionResizeMode(0, QHeaderView::Fixed);
header->resizeSection(0, 30);
// Find path for Kdenlive renderer
......
......@@ -31,7 +31,7 @@
#include <framework/mlt_version.h>
#include <KLocalizedString>
#include <klocalizedstring.h>
#include <KProcess>
#include <KRun>
#include <KMessageWidget>
......
......@@ -1067,8 +1067,8 @@ bool DocClipBase::checkHash() const
QString DocClipBase::getClipHash() const
{
QString hash;
if (m_clipType == SlideShow) hash = QCryptographicHash::hash(m_properties.value("resource").toAscii().data(), QCryptographicHash::Md5).toHex();
else if (m_clipType == Color) hash = QCryptographicHash::hash(m_properties.value("colour").toAscii().data(), QCryptographicHash::Md5).toHex();
if (m_clipType == SlideShow) hash = QCryptographicHash::hash(m_properties.value("resource").toLatin1().data(), QCryptographicHash::Md5).toHex();
else if (m_clipType == Color) hash = QCryptographicHash::hash(m_properties.value("colour").toLatin1().data(), QCryptographicHash::Md5).toHex();
else if (m_clipType == Text) hash = QCryptographicHash::hash(QString("title" + getId() + m_properties.value("xmldata")).toUtf8().data(), QCryptographicHash::Md5).toHex();
else {
if (m_properties.contains("file_hash")) hash = m_properties.value("file_hash");
......
......@@ -20,7 +20,7 @@
#include "doccommands.h"
#include "kdenlivedoc.h"
#include <KLocalizedString>
#include <klocalizedstring.h>
AddClipCommand::AddClipCommand(KdenliveDoc *doc, const QDomElement &xml, const QString &id, bool doIt, QUndoCommand * parent) :
QUndoCommand(parent),
......
......@@ -26,9 +26,11 @@
#include "definitions.h"
#include "kdenlivesettings.h"
#include <QDebug>
#include <KUrlRequesterDialog>
#include <KMessageBox>
#include <klocalizedstring.h>
#include <QDebug>
#include <QFontDatabase>
#include <QTreeWidgetItem>
#include <QFile>
......
......@@ -26,7 +26,7 @@
#include <QDebug>
#include <KMessageBox>
#include <KLocalizedString>
#include <klocalizedstring.h>
#include <QFile>
#include <QColor>
......
......@@ -37,7 +37,7 @@
#include <KMessageBox>
#include <QProgressDialog>
#include <KLocalizedString>
#include <klocalizedstring.h>
#include <KIO/CopyJob>
#include <KIO/JobUiDelegate>
#include <KBookmarkManager>
......@@ -52,6 +52,7 @@
#include <QUndoGroup>
#include <QTimer>
#include <QUndoStack>
#include <QTextEdit>
#include <mlt++/Mlt.h>
#include <KJobWidgets/KJobWidgets>
......
......@@ -42,7 +42,7 @@ class MainWindow;
class TrackInfo;
class NotesPlugin;
class KTextEdit;
class QTextEdit;
class QProgressDialog;
class QUndoGroup;
class QTimer;
......@@ -177,7 +177,7 @@ private:
int m_height;
Timecode m_timecode;
Render *m_render;
KTextEdit *m_notesWidget;
QTextEdit *m_notesWidget;
QUndoStack *m_commandStack;
ClipManager *m_clipManager;
MltVideoProfile m_profile;
......
......@@ -255,7 +255,7 @@ uint KThumb::imageVariance(const QImage &image )
{
uint delta = 0;
uint avg = 0;
uint bytes = image.numBytes();
uint bytes = image.byteCount();
uint STEPS = bytes/2;
QVarLengthArray<uchar> pivot(STEPS);
const uchar *bits=image.bits();
......
......@@ -27,7 +27,7 @@
#include "monitor/monitormanager.h"
#include <KLocalizedString>
#include <klocalizedstring.h>
#include <KMessageBox>
#include <QFile>
......
......@@ -23,10 +23,8 @@
#include <QDebug>
#include <KColorScheme>
#if KDE_IS_VERSION(4,6,0)
#include "klocalizedstring.h"
#include <QGraphicsDropShadowEffect>
#endif
#include "doc/kthumb.h"
......
......@@ -28,6 +28,7 @@
#include <KConfigGroup>
#include <KSharedConfig>
#include <KIO/Global>
#include "klocalizedstring.h"
#include <QFileDialog>
#include <QHBoxLayout>
......@@ -105,9 +106,9 @@ DvdWizardVob::DvdWizardVob(QWidget *parent) :
connect(m_view.dvd_profile, SIGNAL(activated(int)), this, SLOT(slotCheckProfiles()));
m_vobList->header()->setStretchLastSection(false);
m_vobList->header()->setResizeMode(0, QHeaderView::Stretch);
m_vobList->header()->setResizeMode(1, QHeaderView::Custom);
m_vobList->header()->setResizeMode(2, QHeaderView::Custom);
m_vobList->header()->setSectionResizeMode(0, QHeaderView::Stretch);
m_vobList->header()->setSectionResizeMode(1, QHeaderView::Custom);
m_vobList->header()->setSectionResizeMode(2, QHeaderView::Custom);
m_capacityBar = new KCapacityBar(KCapacityBar::DrawTextInline, this);
QHBoxLayout *lay = new QHBoxLayout;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment