From 3f530e7c8bbc523ef07d2abb4ad1c3fdd6fdd252 Mon Sep 17 00:00:00 2001 From: Lawrence Thorpe Date: Fri, 2 Jun 2017 17:20:59 +0100 Subject: [PATCH] New name --- .appveyor.yml | 10 +++++----- .travis.yml | 6 +++--- README.md | 6 +++--- SortPixels_Qt.desktop | 5 ----- mainwindow.cpp | 4 ++-- mainwindow.h | 2 +- mainwindow.ui | 8 ++++---- pixsrt.desktop | 9 +++++++++ SortPixels_Qt.pro => pixsrt.pro | 4 ++-- 9 files changed, 29 insertions(+), 25 deletions(-) delete mode 100644 SortPixels_Qt.desktop create mode 100755 pixsrt.desktop rename SortPixels_Qt.pro => pixsrt.pro (95%) diff --git a/.appveyor.yml b/.appveyor.yml index b49ff8c..f7e0284 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -16,13 +16,13 @@ before_build: - set PATH=%PATH%;%QTDIR%\bin;C:\Qt\Tools\QtCreator\bin build_script: - - qmake SortPixels_Qt.pro + - qmake pixsrt.pro - IF NOT "%BUILD%" == "mingw53_32" (jom) ELSE (mingw32-make) - - windeployqt .\release\SortPixels_Qt.exe + - windeployqt .\release\pixsrt.exe after_build: - - 7z a SortPixels-%APPVEYOR_REPO_TAG_NAME%-%BUILD%.zip .\release\* - - appveyor PushArtifact SortPixels-%APPVEYOR_REPO_TAG_NAME%-%BUILD%.zip + - 7z a pixsrt-%APPVEYOR_REPO_TAG_NAME%-%BUILD%.zip .\release\* + - appveyor PushArtifact pixsrt-%APPVEYOR_REPO_TAG_NAME%-%BUILD%.zip deploy: force_update: true @@ -31,6 +31,6 @@ deploy: provider: GitHub auth_token: secure: XHnnMTnDQkbvkyDieJI/yTD3BiPUsTLyI2SolnlWmjO/5EguoGSe9YgtHs1VCvQh - artifact: SortPixels-%APPVEYOR_REPO_TAG_NAME%-%BUILD%.zip + artifact: pixsrt-%APPVEYOR_REPO_TAG_NAME%-%BUILD%.zip on: appveyor_repo_tag: true diff --git a/.travis.yml b/.travis.yml index 7bd7f84..5e7a465 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,15 +23,15 @@ after_success: - ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -bundle-non-qt-libs - ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -appimage - find ./appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq - - mv ./SortPixels_Qt*.AppImage ./SortPixels-${TRAVIS_TAG}-gcc-64.AppImage - - curl --upload-file ./SortPixels-${TRAVIS_TAG}-gcc-64.AppImage https://transfer.sh/SortPixels-${TRAVIS_TAG}-gcc-64.AppImage + - mv ./pixsrt*.AppImage ./pixsrt-${TRAVIS_TAG}-gcc-64.AppImage + - curl --upload-file ./pixsrt-${TRAVIS_TAG}-gcc-64.AppImage https://transfer.sh/pixsrt-${TRAVIS_TAG}-gcc-64.AppImage deploy: provider: releases overwrite: true api_key: secure: "pP4sjXBH+r0dW3klNsfHoDv7nWjHpwNR25vdcjo0eCfhgx3l9HGmlTx7Cx4WS7G5/6ijVwuvyjr23a8XGgH9cnodkPyb8hD7UPoqqCmBGy63hPNC4A3hCHbH5aLCtQT1HWpdOFyBGrySyB1Jt89XQa2o6ib3KC9kmDwx74p0REfuR1+6tCAOyI+h4Ls1KbALxKFyry6h9EyPrx06KafHXKMhOokdbdey4PIAqGEu9AuTNnAlpsa3zUwPBe4rcPRa9DrJEYqDWCf6ejYMjl/Hw2uPIlLqXYpUAbW7zDCHSjrbqGG9pSRGQ9aplPQLILrJSAz5NV7K0MFS29rVdDY9C9q+YH91V7fmOWqSpZ4P3PLVU3m8wpIU/skkAoC7xb86eqE3KYw+ZUWiGOqSrCKvUw8tPrgPBII0fhLnoJgS03LL2qrUHL1q4i3yOu6GHKo00qWlU8R6fggxqxn9dSjKP4wjZfiqGyYiZgua2smnworIfCfk+sCufQBhxkpbtXKtNG6EXXBIG5AYNMfbVVkUM3bpY03nIfs2ATr+1968SD6cQbRQeNFuOoRnpEuO7rxzR9joM8VvUnX2qJ+iTwCcG31QVWZd8865VcbrmvEwRTvWTrN9/kf+KaANQGMBG//PgiMbulpK2OdOS7Sc7rSBjjWS0lZ0I/wtFKU8HZ8uTYs=" - file: ./SortPixels-${TRAVIS_TAG}-gcc-64.AppImage + file: ./pixsrt-${TRAVIS_TAG}-gcc-64.AppImage skip_cleanup: true on: tags: true diff --git a/README.md b/README.md index c080010..70e6a61 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -# SortPixels_Qt +# Pixsrt C++ Qt Pixel Sorter -[![Build status](https://ci.appveyor.com/api/projects/status/6kugvvt0cb5u2any?svg=true)](https://ci.appveyor.com/project/thorpelawrence/sortpixels-qt) -[![Build Status](https://travis-ci.org/thorpelawrence/SortPixels_Qt.svg?branch=master)](https://travis-ci.org/thorpelawrence/SortPixels_Qt) +[![Build status](https://ci.appveyor.com/api/projects/status/6kugvvt0cb5u2any?svg=true)](https://ci.appveyor.com/project/thorpelawrence/pixsrt) +[![Build Status](https://travis-ci.org/thorpelawrence/pixsrt.svg?branch=master)](https://travis-ci.org/thorpelawrence/pixsrt) ### Credits ASDF pixel sorting algorithm: https://github.com/kimasendorf/ASDFPixelSort diff --git a/SortPixels_Qt.desktop b/SortPixels_Qt.desktop deleted file mode 100644 index c6783ec..0000000 --- a/SortPixels_Qt.desktop +++ /dev/null @@ -1,5 +0,0 @@ -[Desktop Entry] -Type=Application -Exec=SortPixels_Qt -Icon=spectrum_sorted -Name=SortPixels_Qt diff --git a/mainwindow.cpp b/mainwindow.cpp index ea75807..d830d6e 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -108,7 +108,7 @@ void MainWindow::on_actionSave_triggered() else ui->statusBar->showMessage("No image to save"); } -void MainWindow::on_action_About_SortPixels_triggered() +void MainWindow::on_action_About_Pixsrt_triggered() { QString compiler = "Unknown compiler"; #ifdef Q_PROCESSOR_X86_64 @@ -132,7 +132,7 @@ void MainWindow::on_action_About_SortPixels_triggered() compiler = QString("GCC %1.%2.%3, 32 bit").arg(__GNUC__).arg(__GNUC_MINOR__).arg(__GNUC_PATCHLEVEL__); #endif #endif - QMessageBox::about(this, "About SortPixels", QString("SortPixels (%1)\ + QMessageBox::about(this, "About Pixsrt", QString("Pixsrt (%1)\ \nLawrence Thorpe\ \n\nBuilt with Qt %2 (%3)").arg(TAG).arg(QT_VERSION_STR).arg(compiler)); } diff --git a/mainwindow.h b/mainwindow.h index 17a08bc..42f1da1 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -39,7 +39,7 @@ private slots: void on_actionSave_triggered(); - void on_action_About_SortPixels_triggered(); + void on_action_About_Pixsrt_triggered(); void on_actionAbout_Qt_triggered(); diff --git a/mainwindow.ui b/mainwindow.ui index 1a0f24a..7976175 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -11,7 +11,7 @@ - SortPixels + Pixsrt @@ -104,7 +104,7 @@ &Help - + @@ -161,9 +161,9 @@ Alt+1 - + - &About SortPixels... + &About Pixsrt... diff --git a/pixsrt.desktop b/pixsrt.desktop new file mode 100755 index 0000000..cd035cd --- /dev/null +++ b/pixsrt.desktop @@ -0,0 +1,9 @@ +#!/usr/bin/env xdg-open +[Desktop Entry] +Type=Application +Encoding=UTF-8 +Name=Pixsrt +Comment=Pixel sorter +Exec=pixsrt +Icon=spectrum_sorted +Terminal=False diff --git a/SortPixels_Qt.pro b/pixsrt.pro similarity index 95% rename from SortPixels_Qt.pro rename to pixsrt.pro index 1f8c384..0e75634 100644 --- a/SortPixels_Qt.pro +++ b/pixsrt.pro @@ -8,7 +8,7 @@ QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets -TARGET = SortPixels_Qt +TARGET = pixsrt TEMPLATE = app TAG = "0.0.0" @@ -61,7 +61,7 @@ unix { target.path = $$PREFIX/bin - shortcutfiles.files = SortPixels_Qt.Desktop + shortcutfiles.files = pixsrt.desktop shortcutfiles.path = $$PREFIX/share/applications/ data.files += spectrum_sorted.png data.path = $$PREFIX/share/pixmaps