diff --git a/Icon_resources.qrc b/Icon_resources.qrc index 6ae3253..2990d2f 100644 --- a/Icon_resources.qrc +++ b/Icon_resources.qrc @@ -19,6 +19,7 @@ Menu Icon/Create Images in Range.svg Menu Icon/DeleteImage.svg Menu Icon/Check Images.svg + Menu Icon/GitHub.png Menu Icon/Next.svg diff --git a/Menu Icon/GitHub.png b/Menu Icon/GitHub.png new file mode 100644 index 0000000..f6c5d0d Binary files /dev/null and b/Menu Icon/GitHub.png differ diff --git a/help.ui b/help.ui index b34561b..f288d18 100644 --- a/help.ui +++ b/help.ui @@ -75,7 +75,7 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">4. Use the sorting function well so you can add and remove rows easily.</span></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">5. You can use the </span><span style=" font-size:10pt; color:#0000ff;">Route Tool</span><span style=" font-size:10pt;"> (</span><img src=":/Menu Icon/Route_Tool.svg" /><span style=" font-size:10pt;">, </span><span style=" font-size:10pt; color:#aa00ff;">Ctrl + T</span><span style=" font-size:10pt;">) which has the icon of a hammer to assist you. You can drag the image to move, and use the wheel to change the size of the image (the centre point remains the same and this needs additional click of the </span><span style=" font-size:10pt; color:#0000ff;">View</span><span style=" font-size:10pt;"> button). Double click to set this point as the the centre point (this needs additional click of the </span><span style=" font-size:10pt; color:#0000ff;">View</span><span style=" font-size:10pt;"> button).</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Please note that in this version (v 5.0), the v rate only supports angle.</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Please note that in this version (v 5.1), the v rate only supports angle.</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Fifth, define </span><span style=" font-size:10pt; color:#00aa00;">other information</span><span style=" font-size:10pt;"> related to the project.</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p> @@ -111,11 +111,13 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">6. New Features is also available to be checked in the Menu More of the Help window.</span></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">7. Use the </span><span style=" font-size:10pt; color:#00aa00;">searching</span><span style=" font-size:10pt;"> function well and it supports Chinese searching.</span></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">8. All the editings can call the Undo (</span><img src=":/icon/Menu Icon/Undo.svg" /><span style=" font-size:10pt;">, </span><span style=" font-size:10pt; color:#aa00ff;">Ctrl + X</span><span style=" font-size:10pt;">) and Redo (</span><img src=":/icon/Menu Icon/Redo.svg" /><span style=" font-size:10pt;">, </span><span style=" font-size:10pt; color:#aa00ff;">Ctrl + Y</span><span style=" font-size:10pt;">) and supports momories up to 50 actions. (except the Compatibility Module.)</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">9. Be careful that finishing editing a line or a combo box (i.e. the focus is removed) can the information be recognized or saved.</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">10. To close a project (</span><img src=":/Menu Icon/Close.svg" /><span style=" font-size:10pt;">), </span><span style=" font-size:10pt; color:#aa00ff;">Ctrl + W</span><span style=" font-size:10pt;">. To exit the application (</span><img src=":/icon/Menu Icon/Exit.svg" /><span style=" font-size:10pt;">), </span><span style=" font-size:10pt; color:#aa00ff;">Crtl + E</span><span style=" font-size:10pt;">.</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">11. Fractal Designer 5.0 is licenced under </span><span style=" font-size:10pt; font-style:italic; text-decoration: underline;">The MIT Licence</span><span style=" font-size:10pt;">. © 2021 Teddy van Jerry</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">9. Check Images (</span><img src=":/icon/Menu Icon/Check Images.svg" /><span style=" font-size:10pt;">) can check if there are missed images and you can choose to recreate those.</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">10. Delete Images (</span><img src=":/icon/Menu Icon/DeleteImage.svg" /><span style=" font-size:10pt;">) can delete images already created.</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">11. Be careful that finishing editing a line or a combo box (i.e. the focus is removed) can the information be recognized or saved.</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">12. To close a project (</span><img src=":/Menu Icon/Close.svg" /><span style=" font-size:10pt;">), </span><span style=" font-size:10pt; color:#aa00ff;">Ctrl + W</span><span style=" font-size:10pt;">. To exit the application (</span><img src=":/icon/Menu Icon/Exit.svg" /><span style=" font-size:10pt;">), </span><span style=" font-size:10pt; color:#aa00ff;">Crtl + E</span><span style=" font-size:10pt;">.</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">13. Fractal Designer 5.0 is licenced under </span><span style=" font-size:10pt; font-style:italic; text-decoration: underline;">The MIT Licence</span><span style=" font-size:10pt;">. © 2021 Teddy van Jerry</span></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> </p> -<p align="right" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt; color:#828282;">Fractal Designer - Version 5.0.27 - 2021/03/01</span></p></body></html> +<p align="right" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt; color:#828282;">Fractal Designer - Version 5.1.8 - 2021/03/13</span></p></body></html> diff --git a/mainwindow.cpp b/mainwindow.cpp index 73e4c39..c35b704 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -293,7 +293,7 @@ void MainWindow::on_actionExit_E_triggered() void MainWindow::on_actionChinese_triggered() { - QDesktopServices::openUrl(QUrl("https://blog.csdn.net/weixin_50012998/article/details/114097695")); + QDesktopServices::openUrl(QUrl("https://blog.csdn.net/weixin_50012998/article/details/114767519")); } void MainWindow::on_MainWindow_AboutTVJ_clicked() @@ -834,6 +834,7 @@ void MainWindow::on_actionCreate_Images_triggered() ui->actionStop->setDisabled(false); ui->actionCreate_Images->setDisabled(true); ui->actionCreate_Images_in_Range->setDisabled(true); + ui->actionCheck_Images->setDisabled(true); on_actionPreview_Refresh_triggered(); work_thread->start(); qDebug() << ui->timeEdit->time().second() + 60 * ui->timeEdit->time().minute(); @@ -961,6 +962,7 @@ void MainWindow::on_actionStop_triggered() qDebug() << "Build Thread quit"; ui->actionCreate_Images->setDisabled(false); ui->actionCreate_Images_in_Range->setDisabled(false); + ui->actionCheck_Images->setDisabled(false); ui->actionStop->setDisabled(true); } @@ -968,6 +970,7 @@ void MainWindow::build_image_finished_deal() { ui->actionCreate_Images->setDisabled(false); ui->actionCreate_Images_in_Range->setDisabled(false); + ui->actionCheck_Images->setDisabled(false); ui->actionStop->setDisabled(true); emit build_image_updateInfo_signal(); } @@ -2464,7 +2467,7 @@ void MainWindow::on_actionVersion_2_triggered() void MainWindow::on_actionBug_Report_triggered() { - QDesktopServices::openUrl(QUrl("https://blog.csdn.net/weixin_50012998/article/details/114097618")); + QDesktopServices::openUrl(QUrl("https://blog.csdn.net/weixin_50012998/article/details/114767480")); } void MainWindow::on_actionVersion_triggered() @@ -2658,6 +2661,7 @@ void MainWindow::on_actionCreate_Images_in_Range_triggered() ui->actionStop->setDisabled(false); ui->actionCreate_Images->setDisabled(true); ui->actionCreate_Images_in_Range->setDisabled(true); + ui->actionCheck_Images->setDisabled(true); on_actionPreview_Refresh_triggered(); work_thread->start(); @@ -2818,6 +2822,8 @@ void MainWindow::on_actionGitHub_Repository_triggered() void MainWindow::on_actionCheck_Images_triggered() { + if(!ui->actionCheck_Images->isEnabled()) return; + int total_image = ui->comboBox_fps->currentText().toInt() * (ui->timeEdit->time().second() + 60 * ui->timeEdit->time().minute()); QList Missed_Images; for(int i = 0; i != total_image; i++) @@ -2911,13 +2917,35 @@ void MainWindow::on_actionCheck_Images_triggered() } } +bool MainWindow::existImage(int i) const +{ + QFile image_file(ui->lineEdit_imagePath->text() + "/" + ui->lineEdit_imagePrefix->text() + QString::number(i) + ".png"); + if(image_file.exists()) return true; + else return false; +} + void MainWindow::deleteImage(int i) { - QFile image_file(ui->lineEdit_videoPath->text() + "/" + ui->lineEdit_imagePrefix->text() + QString::number(i) + ".png"); + QFile image_file(ui->lineEdit_imagePath->text() + "/" + ui->lineEdit_imagePrefix->text() + QString::number(i) + ".png"); image_file.remove(); } void MainWindow::on_actionDelete_Images_triggered() { - + int total_image = ui->comboBox_fps->currentText().toInt() * (ui->timeEdit->time().second() + 60 * ui->timeEdit->time().minute()); + for(int i = 0; i != total_image; i++) + { + deleteImage(i); + } + int skip_number = 0; + int check_till = total_image - 1; + while(skip_number++ < 10000) + { + if(existImage(++check_till)) + { + deleteImage(check_till); + skip_number = 0; + } + } + QMessageBox::information(this, "Information", "Deleting Images Finished!"); } diff --git a/mainwindow.h b/mainwindow.h index 106691a..c2c8025 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -160,6 +160,8 @@ class MainWindow : public QMainWindow void createImagesInRange(int From_I, int To_I); + bool existImage(int) const; + void deleteImage(int); private slots: diff --git a/mainwindow.ui b/mainwindow.ui index 9780f44..814993f 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -76,11 +76,16 @@ Consolas + false + false Qt::NoFocus + + text-decoration: none + @@ -103,37 +108,17 @@ p, li { white-space: pre-wrap; } <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:16pt;"><br /></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:16pt;"> For more information, please refer to Help (Ctrl + H) or view the Chinese version with Ctrl + Shift + H.</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:16pt;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:16pt;"> Version: 5.1.5 (2021/03/08)</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'SimSun'; font-size:16pt;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'SimSun'; font-size:16pt;"> </span><span style=" font-family:'SimSun'; font-size:16pt; font-weight:600;">Contributors</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'SimSun'; font-size:16pt;"> </span><a href="https://blog.csdn.net/weixin_50012998"><span style=" font-family:'SimSun'; font-size:16pt; text-decoration: underline; color:#0000ff;">Teddy van Jerry</span></a><span style=" font-family:'SimSun'; font-size:16pt;">:</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'SimSun'; font-size:16pt;"> </span><span style=" font-family:'SimSun'; font-size:12pt;">* Fractal Designer 5 development</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'SimSun'; font-size:16pt;"> </span><span style=" font-family:'SimSun'; font-size:12pt;">* UI design</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'SimSun'; font-size:16pt;"> </span><span style=" font-family:'SimSun'; font-size:12pt;">* Route tool</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'SimSun'; font-size:16pt;"> </span><span style=" font-family:'SimSun'; font-size:12pt;">* Route formula calculation</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'SimSun'; font-size:16pt;"> </span><span style=" font-family:'SimSun'; font-size:12pt;">* Build thread (creating images)</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'SimSun'; font-size:16pt;"> </span><span style=" font-family:'SimSun'; font-size:12pt;">* Complex class</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'SimSun'; font-size:16pt;"> </span><span style=" font-family:'SimSun'; font-size:12pt;">* Sample writing</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'SimSun'; font-size:16pt;"> </span><span style=" font-family:'SimSun'; font-size:12pt;">* Integration</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'SimSun'; font-size:16pt;"> </span><span style=" font-family:'SimSun'; font-size:12pt;">* Help</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'SimSun'; font-size:16pt;"> </span><a href="https://panoan.org/"><span style=" font-family:'SimSun'; font-size:16pt; text-decoration: underline; color:#0000ff;">Panoan</span></a><span style=" font-family:'SimSun'; font-size:16pt;">:</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'SimSun'; font-size:16pt;"> </span><span style=" font-family:'SimSun'; font-size:12pt;">* Formula display of colours</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'SimSun'; font-size:16pt;"> </span><span style=" font-family:'SimSun'; font-size:12pt;">* FFmpeg codes</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'SimSun'; font-size:16pt;"> </span><span style=" font-family:'SimSun'; font-size:12pt;">* Cmd and Powershell codes</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'SimSun'; font-size:16pt;"> </span><span style=" font-family:'SimSun'; font-size:12pt;">* Complex class</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'SimSun'; font-size:16pt;"> </span><span style=" font-family:'SimSun'; font-size:12pt;">* Sample writing</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'SimSun'; font-size:16pt;"> King:</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'SimSun'; font-size:16pt;"> </span><span style=" font-family:'SimSun'; font-size:12pt;">* Define colour</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'SimSun'; font-size:16pt;"> </span><span style=" font-family:'SimSun'; font-size:12pt;">* Define colour parameters setting</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'SimSun'; font-size:16pt;"> </span><span style=" font-family:'SimSun'; font-size:12pt;">* Complex class</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'SimSun'; font-size:16pt;"> </span><span style=" font-family:'SimSun'; font-size:12pt;">* Sample writing</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'SimSun'; font-size:16pt;"> ZYB:</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'SimSun'; font-size:16pt;"> </span><span style=" font-family:'SimSun'; font-size:12pt;">* Design formulas</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'SimSun'; font-size:16pt;"> </span><span style=" font-family:'SimSun'; font-size:12pt;">* Create images</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'SimSun'; font-size:16pt;"> </span><span style=" font-family:'SimSun'; font-size:12pt;">* Route parameters setting</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'SimSun'; font-size:16pt;"> </span><span style=" font-family:'SimSun'; font-size:12pt;">* Complex class</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'SimSun'; font-size:16pt;"> </span><span style=" font-family:'SimSun'; font-size:12pt;">* Sample writing</span></p> -<p align="center" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'SimSun'; font-size:9.07563pt;"><br /></p></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:16pt;"> Version: 5.1.8 (2021/03/13)</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:16pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:16pt;"> </span><span style=" font-size:16pt; color:#555500;">Designer: </span><span style=" font-size:16pt; color:#aa00ff;">Teddy van Jerry</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:16pt; color:#aa00ff;"> </span><span style=" font-size:16pt; color:#000000;">* GitHub : </span><a href="https://github.com/Teddy-van-Jerry"><span style=" font-size:16pt; text-decoration: underline; color:#0000ff;">Teddy-van-Jerry</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:16pt; color:#000000;"> * CSDN : </span><a href="https://blog.csdn.net/weixin_50012998"><span style=" font-size:16pt; text-decoration: underline; color:#0000ff;">Teddy van Jerry</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:16pt; color:#000000;"> * Qt Forum : </span><a href="https://forum.qt.io/user/teddy-van-jerry"><span style=" font-size:16pt; text-decoration: underline; color:#0000ff;">Teddy van Jerry</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:16pt; color:#000000;"> * Stack Overflow: </span><a href="https://stackoverflow.com/users/15080514/teddy-van-jerry"><span style=" font-size:16pt; text-decoration: underline; color:#0000ff;">Teddy van Jerry</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:16pt; color:#000000;"> * Bilibili : </span><a href="https://space.bilibili.com/631883409"><span style=" font-size:16pt; text-decoration: underline; color:#0000ff;">Teddy_van_Jerry</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:16pt; color:#000000;"> * E-mail : </span><span style=" font-size:14pt; color:#00aa00;">teddy-van-jerry@foxmail.com</span><span style=" font-size:14pt; color:#000000;"> or </span><span style=" font-size:14pt; color:#00aa00;">teddy-jerry@qq.com</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:16pt; color:#000000;"><br /></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:16pt;"><br /></p></body></html> true @@ -2554,6 +2539,10 @@ p, li { white-space: pre-wrap; } + + + :/icon/Menu Icon/GitHub.png:/icon/Menu Icon/GitHub.png + GitHub Repository @@ -2578,8 +2567,8 @@ p, li { white-space: pre-wrap; } - + diff --git a/new_features.ui b/new_features.ui index 3d32b27..74fd870 100644 --- a/new_features.ui +++ b/new_features.ui @@ -173,6 +173,40 @@ 5.0 + + + Check Images + + + + + 255 + 0 + 0 + + + + + 5.1 + + + + + Delete Images + + + + + 255 + 0 + 0 + + + + + 5.1 + + diff --git a/search_result.cpp b/search_result.cpp index 7157e9a..5c1c722 100644 --- a/search_result.cpp +++ b/search_result.cpp @@ -1,6 +1,10 @@ #include "search_result.h" #include "ui_search_result.h" +#define Btn_Con(case_number__, action_triggered__) case case_number__: \ + connect(new_btn, SIGNAL(clicked()), parent(), SLOT(action_triggered__)); \ + break + Search_Result::Search_Result(QWidget *parent) : QDialog(parent), ui(new Ui::Search_Result) @@ -47,7 +51,7 @@ void Search_Result::getSearch(QString search) { already_open = true; } - Possible_Result All_P[25]; + Possible_Result All_P[27]; All_P[0] = {0, "Create Images", "Action to create images based on the parameters you have set.", {"create", "image", "images", "生成", "图片", "生成图片"}}; All_P[1] = {1, "Create Images in Range", "Action to create images in a specific range you set.", {"create", "image", "images", "range", "生成", "图片", "生成图片", "范围", "范围内生成图片"}}; All_P[2] = {2, "Create Video", "Action to create video based on images and music if added.", {"create", "video", "生成", "视频", "生成视频"}}; @@ -73,6 +77,8 @@ void Search_Result::getSearch(QString search) All_P[22] = {22, "Bug Report", "Report the bugs you have found.", {"bug", "bugs", "report", "错误"}}; All_P[23] = {23, "Close", "Close the project.", {"close", "关闭"}}; All_P[24] = {24, "GitHub Repository", "View the GitHub repository of Fractal Designer.", {"update", "check", "github", "repository", "git", "查看", "最新", "版本", "最新版", "最新版本", "查看最新版", "查看最新版本", "更新", "查看更新", "仓库"}}; + All_P[25] = {25, "Check Images", "Check if images are created or missed. You can choose to recreate missed ones.", {"create", "image", "images", "check", "检查", "图片", "检查图片"}}; + All_P[26] = {26, "Delete Images", "Delete Images that have already been created.", {"delete", "image", "images", "删除", "图片", "删除图片", "删除所有图片"}}; QFile Button_qss(":/StyleSheet/Button_Search_Result.qss"); Button_qss.open(QFile::ReadOnly); QString Button_qss_str = QLatin1String(Button_qss.readAll()); @@ -96,7 +102,7 @@ void Search_Result::getSearch(QString search) } } - sort_possible_result(All_P, 25); + sort_possible_result(All_P, 27); //connect(btn, SIGNAL(clicked()), this, SLOT(search_result_clicked())); @@ -111,31 +117,33 @@ void Search_Result::getSearch(QString search) btn.push_back(new_btn); switch(result.index) { - case 0: connect(new_btn, SIGNAL(clicked()), parent(), SLOT(on_actionCreate_Images_triggered())); break; - case 1: connect(new_btn, SIGNAL(clicked()), parent(), SLOT(on_actionCreate_Images_in_Range_triggered())); break; - case 2: connect(new_btn, SIGNAL(clicked()), parent(), SLOT(on_actionCreate_Video_triggered())); break; - case 3: connect(new_btn, SIGNAL(clicked()), parent(), SLOT(on_actionEnglish_triggered())); break; - case 4: connect(new_btn, SIGNAL(clicked()), parent(), SLOT(on_actionChinese_triggered())); break; - case 5: connect(new_btn, SIGNAL(clicked()), parent(), SLOT(on_actionExit_E_triggered())); break; - case 6: connect(new_btn, SIGNAL(clicked()), parent(), SLOT(on_MainWindow_AboutTVJ_clicked())); break; - case 7: connect(new_btn, SIGNAL(clicked()), parent(), SLOT(on_actionNew_N_triggered())); break; - case 8: connect(new_btn, SIGNAL(clicked()), parent(), SLOT(on_actionOpen_O_triggered())); break; - case 9: connect(new_btn, SIGNAL(clicked()), parent(), SLOT(on_actionSave_S_triggered())); break; - case 10: connect(new_btn, SIGNAL(clicked()), parent(), SLOT(on_actionPreviewRefresh_triggered())); break; - case 11: connect(new_btn, SIGNAL(clicked()), parent(), SLOT(on_actionRoute_Tool_triggered())); break; - case 12: connect(new_btn, SIGNAL(clicked()), parent(), SLOT(on_actionCheck_Update_triggered())); break; - case 13: connect(new_btn, SIGNAL(clicked()), parent(), SLOT(on_actionFFmpeg_triggered())); break; - case 14: connect(new_btn, SIGNAL(clicked()), parent(), SLOT(on_Button_Login_MainWindow_clicked())); break; - case 15: connect(new_btn, SIGNAL(clicked()), parent(), SLOT(on_actionAuto_Refresh_triggered())); break; - case 16: connect(new_btn, SIGNAL(clicked()), parent(), SLOT(on_actionStop_triggered())); break; - case 17: connect(new_btn, SIGNAL(clicked()), parent(), SLOT(on_actionUndo_triggered())); break; - case 18: connect(new_btn, SIGNAL(clicked()), parent(), SLOT(on_actionRedo_triggered())); break; - case 19: connect(new_btn, SIGNAL(clicked()), parent(), SLOT(on_actionFRD_4_Help_triggered())); break; - case 20: connect(new_btn, SIGNAL(clicked()), parent(), SLOT(on_actionNew_Features_triggered())); break; - case 21: connect(new_btn, SIGNAL(clicked()), parent(), SLOT(on_actionVersion_triggered())); break; - case 22: connect(new_btn, SIGNAL(clicked()), parent(), SLOT(on_actionBug_Report_triggered())); break; - case 23: connect(new_btn, SIGNAL(clicked()), parent(), SLOT(on_actionClose_triggered())); break; - case 24: connect(new_btn, SIGNAL(clicked()), parent(), SLOT(on_actionGitHub_Repository_triggered())); break; + Btn_Con(0 , on_actionCreate_Images_triggered()); + Btn_Con(1 , on_actionCreate_Images_in_Range_triggered()); + Btn_Con(2 , on_actionCreate_Video_triggered()); + Btn_Con(3 , on_actionEnglish_triggered()); + Btn_Con(4 , on_actionChinese_triggered()); + Btn_Con(5 , on_actionExit_E_triggered()); + Btn_Con(6 , on_MainWindow_AboutTVJ_clicked()); + Btn_Con(7 , on_actionNew_N_triggered()); + Btn_Con(8 , on_actionOpen_O_triggered()); + Btn_Con(9 , on_actionSave_S_triggered()); + Btn_Con(10, on_actionPreviewRefresh_triggered()); + Btn_Con(11, on_actionRoute_Tool_triggered()); + Btn_Con(12, on_actionCheck_Update_triggered()); + Btn_Con(13, on_actionFFmpeg_triggered()); + Btn_Con(14, on_Button_Login_MainWindow_clicked()); + Btn_Con(15, on_actionAuto_Refresh_triggered()); + Btn_Con(16, on_actionStop_triggered()); + Btn_Con(17, on_actionUndo_triggered()); + Btn_Con(18, on_actionRedo_triggered()); + Btn_Con(19, on_actionFRD_4_Help_triggered()); + Btn_Con(20, on_actionNew_Features_triggered()); + Btn_Con(21, on_actionVersion_triggered()); + Btn_Con(22, on_actionBug_Report_triggered()); + Btn_Con(23, on_actionClose_triggered()); + Btn_Con(24, on_actionGitHub_Repository_triggered()); + Btn_Con(25, on_actionCheck_Images_triggered()); + Btn_Con(26, on_actionDelete_Images_triggered()); default: break; } ui->gridLayout_search->addWidget(new_btn); diff --git a/version.ui b/version.ui index 2104ba3..1e7370b 100644 --- a/version.ui +++ b/version.ui @@ -23,7 +23,7 @@ - Fractal Designer 5.0.27 + Fractal Designer 5.1.8 Qt::AlignCenter @@ -33,7 +33,7 @@ - Updated in 2021/03/01. + Updated in 2021/03/13. Qt::AlignCenter