Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change project name #3

Merged
merged 1 commit into from
Jun 2, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 0 additions & 5 deletions SortPixels_Qt.desktop

This file was deleted.

4 changes: 2 additions & 2 deletions mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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));
}
Expand Down
2 changes: 1 addition & 1 deletion mainwindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
8 changes: 4 additions & 4 deletions mainwindow.ui
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>SortPixels</string>
<string>Pixsrt</string>
</property>
<property name="windowIcon">
<iconset resource="resources.qrc">
Expand Down Expand Up @@ -104,7 +104,7 @@
<property name="title">
<string>&amp;Help</string>
</property>
<addaction name="action_About_SortPixels"/>
<addaction name="action_About_Pixsrt"/>
<addaction name="actionAbout_Qt"/>
</widget>
<addaction name="menuFile"/>
Expand Down Expand Up @@ -161,9 +161,9 @@
<string>Alt+1</string>
</property>
</action>
<action name="action_About_SortPixels">
<action name="action_About_Pixsrt">
<property name="text">
<string>&amp;About SortPixels...</string>
<string>&amp;About Pixsrt...</string>
</property>
</action>
<action name="actionExit">
Expand Down
9 changes: 9 additions & 0 deletions pixsrt.desktop
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions SortPixels_Qt.pro → pixsrt.pro
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down