aboutsummaryrefslogtreecommitdiff
path: root/src-qt5/desktop-utils
diff options
context:
space:
mode:
Diffstat (limited to 'src-qt5/desktop-utils')
-rw-r--r--src-qt5/desktop-utils/lumina-fm-dev/widgets/vidnail.cpp13
-rw-r--r--src-qt5/desktop-utils/lumina-fm-dev/widgets/vidnail.h60
-rw-r--r--src-qt5/desktop-utils/lumina-fm/OPWidget.cpp4
-rw-r--r--src-qt5/desktop-utils/lumina-fm/TrayUI.h2
4 files changed, 3 insertions, 76 deletions
diff --git a/src-qt5/desktop-utils/lumina-fm-dev/widgets/vidnail.cpp b/src-qt5/desktop-utils/lumina-fm-dev/widgets/vidnail.cpp
deleted file mode 100644
index e13894e1..00000000
--- a/src-qt5/desktop-utils/lumina-fm-dev/widgets/vidnail.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-//===========================================
-// Lumina-DE source code
-// Copyright (c) 2017, q5sys
-// Available under the 3-clause BSD license
-// See the LICENSE file for full details
-//===========================================
-#include "vidnail.h"
-
-VidNail::VidNail(QObject *parent) : QObject(parent){
-}
-
-VidNail::~VidNail(){
-}
diff --git a/src-qt5/desktop-utils/lumina-fm-dev/widgets/vidnail.h b/src-qt5/desktop-utils/lumina-fm-dev/widgets/vidnail.h
deleted file mode 100644
index 45b6ca58..00000000
--- a/src-qt5/desktop-utils/lumina-fm-dev/widgets/vidnail.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#ifndef VIDNAIL_H
-#define VIDNAIL_H
-
-extern "C" {
-#include <libavcodec/avcodec.h>
-#include <libavformat/avformat.h>
-}
-
-class VidNail;
-
-struct vFrame {
- vFrame() : *width(0), *height(0) {}
- vFrame(int *width, int *height : width(width), height(height) {}
- int *width;
- int *height;
-};
-
-public:
-
- QString getCodec();
- void goto(int timeInSeconds);
- void readVideoFrame();
- void getScaledVideoFrame(int scaledSize, vFrame& vFrame);
-
- int getWidth();
- int getHeight();
- int getLength();
-
- void makeThumbnail(const QString& videoFile, QImage &image);
- void setThumbnailSize(int size);
- void setPercentage(int percent);
- void setTime(const QString& Time);
-
- void writeVidNail(vFrame& frame, QImage& image);
-
-
- private:
-
- bool readVideoPacket();
- bool getVideoPacket();
- void scaleVideo(int scaledSize, int& scaledWidth, int& scaledHeight);
- void createVFrame(AVFrame *vFrame, quint8 *frameBuffer, int width, int height);
- void calculateDimensions(int size);
- void generateThumbnail(const QString& videoFile, ImageWriter& imageWriter, QImage& image);
- QString getMimeType(const QString& videoFile);
- QString getExtension(const QString& videoFilename);
-
-
- private:
- int videoStream;
- AVFormatContext *inputVideoFormatContext;
- AVCodecContext *inputvideoCodecContext;
- AVCodec *inputVideoCodec;
- AVStream *inputVideoStream;
- AVFrame *inputVideoFrame;
- quint8 *inputFrameBuffer;
- AVPacket *videoPacket;
-
-
-#endif // VIDNAIL_H
diff --git a/src-qt5/desktop-utils/lumina-fm/OPWidget.cpp b/src-qt5/desktop-utils/lumina-fm/OPWidget.cpp
index 3638e2a8..66169019 100644
--- a/src-qt5/desktop-utils/lumina-fm/OPWidget.cpp
+++ b/src-qt5/desktop-utils/lumina-fm/OPWidget.cpp
@@ -19,7 +19,7 @@ OPWidget::OPWidget(QWidget *parent) : QWidget(parent), ui(new Ui::OPWidget()){
//Now create the widget
ui->setupUi(this);
ui->tool_close->setIcon( LXDG::findIcon("dialog-close","view-close") );
- ui->tool_showerrors->setIcon(LXDG::findIcon("dialog-warning",""));
+ ui->tool_showerrors->setIcon(LXDG::findIcon("view-choose","view-preview"));
//connect the widget buttons
connect(ui->tool_close, SIGNAL(clicked()), this, SLOT(closeWidget()) );
connect(ui->tool_showerrors, SIGNAL(clicked()), this, SLOT(showErrors()) );
@@ -79,7 +79,7 @@ void OPWidget::startOperation(){
starttime = QDateTime::currentMSecsSinceEpoch();
endtime = -1;
QTimer::singleShot(0, worker, SLOT(slotStartOperations()) );
- emit starting(this->whatsThis());
+ emit starting(this->whatsThis());
}
diff --git a/src-qt5/desktop-utils/lumina-fm/TrayUI.h b/src-qt5/desktop-utils/lumina-fm/TrayUI.h
index 4210784a..a87e2da8 100644
--- a/src-qt5/desktop-utils/lumina-fm/TrayUI.h
+++ b/src-qt5/desktop-utils/lumina-fm/TrayUI.h
@@ -27,7 +27,7 @@ public slots:
private:
QList<OPWidget*> OPS;
-
+
void createOP( FILEOP, QStringList oldF, QStringList newF);
private slots:
bgstack15