Skip to content

Commit

Permalink
updated version to r15
Browse files Browse the repository at this point in the history
  • Loading branch information
emako committed Feb 22, 2020
1 parent 9fee9a2 commit c3152e2
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 13 deletions.
11 changes: 11 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -106,3 +106,14 @@ version r14
- fixed script creator func 'Nnedi3Resize'.
- fixed crash error on closing child window.
- updated installer version.

version r15
- added single image video funciton.
- fixed crash error on closing child window.
- fixed sometimes config, 'NotAddJobOnSaved' is not saved.
- updated vapoursynth to r48.
- updated mediainfo to v19.09.
- updated x265 to 3.2+5.
- updated mkvtoolnix to 43.0.0.
- updated ffmpeg to 4.2.2.
- updated LAVFilters to 0.74.1
2 changes: 1 addition & 1 deletion com/version.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#ifndef VERSION_H
#define VERSION_H

#define QVS_VERSION "r14"
#define QVS_VERSION "r15"

#endif // VERSION_H
2 changes: 1 addition & 1 deletion mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1686,7 +1686,7 @@ void MainWindow::setShutCountMessage(void)

void MainWindow::slotAbout(void)
{
QMessageBox::about(this, tr("About"), qvs::fromResource(":/strings/about").arg(QVS_VERSION));
QMessageBox::about(this, tr("About"), qvs::fromResource(":/strings/about").arg(QVS_VERSION).arg(qvs::getBuildDateTimeString().replace(" ", "-")));
}

void MainWindow::slotAboutQt(void)
Expand Down
2 changes: 1 addition & 1 deletion preview/preview_image_dialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class PreviewImageDialog : public QMainWindow
void setPreviewPixmap(const QImage &a_image);
void setPreviewPixmap(void);

inline QImage getFrameImage();
QImage getFrameImage();
QList<QImage> m_frameImages;
int m_frameImageIndex;
QPixmap m_framePixmap;
Expand Down
6 changes: 6 additions & 0 deletions preview/preview_image_dialog.ui
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,18 @@
<property name="contextMenuPolicy">
<enum>Qt::CustomContextMenu</enum>
</property>
<property name="acceptDrops">
<bool>true</bool>
</property>
<property name="sizeAdjustPolicy">
<enum>QAbstractScrollArea::AdjustToContents</enum>
</property>
<property name="widgetResizable">
<bool>true</bool>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
Expand Down
17 changes: 7 additions & 10 deletions res/strings/about
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
Qvs %1

By ema(egosub)
https://github.com/emako
http://weibo.com/egosub

This software is free and distributed under MIT license.

Software uses Qt 5 framework by The Qt Company, distributed under LGPL license.
https://qt.io/
Qvs %1 - [Build: %2]<br />
<br />
By ema (<a href='http://weibo.com/egosub'>egosub</a>)<br />
<br />
This software is free and distributed under MIT license.<br />
Please visit <a href='https://github.com/emako/qvs/releases'>Github</a> for the latest version.<br />
<br />

0 comments on commit c3152e2

Please sign in to comment.