Skip to content

Commit

Permalink
checks & seeds
Browse files Browse the repository at this point in the history
  • Loading branch information
jerrimus committed May 21, 2018
1 parent fb58f62 commit 48a5c6a
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 45 deletions.
48 changes: 9 additions & 39 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
OUTPUT_VARIABLE GIT_REVISION)

set(CRYPTONOTE_LIB cryptonote)
set (CMAKE_PREFIX_PATH "C:\\Qt\\Qt5.6.0\\5.6\\msvc2013_64\\")
set (CMAKE_PREFIX_PATH "C:\\Qt\\Qt5.8.0\\5.8\\msvc2013_64\\")

include_directories(${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
Expand Down Expand Up @@ -260,18 +260,18 @@ qt5_use_modules(${PROJECT_NAME} Widgets Gui Network)

set(CPACK_PACKAGE_NAME ${CN_PROJECT_NAME})
set(CPACK_PACKAGE_VERSION ${CN_VERSION})
set(CPACK_PACKAGE_VENDOR "Royalties Foundation")
set(CPACK_PACKAGE_CONTACT "https://xry.io/")
set(CPACK_PACKAGE_VENDOR "Pennykoin")
set(CPACK_PACKAGE_CONTACT "https://pennykoin.com/")
set(CPACK_STRIP_FILES ON)
if (APPLE)
set(CPACK_GENERATOR DragNDrop)
install(TARGETS ${PROJECT_NAME} BUNDLE DESTINATION .)
set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}.-${VERSION_RELEASE}")
elseif (UNIX)
install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
install(FILES src/royaltieswallet.desktop DESTINATION share/applications)
install(FILES src/images/cryptonote.png DESTINATION share/pixmaps RENAME royalties.png)
install(FILES copyright DESTINATION share/doc/royaltieswallet)
install(FILES src/QTpenny.desktop DESTINATION share/applications)
install(FILES src/images/cryptonote.png DESTINATION share/pixmaps RENAME pennykoin.png)


SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
SET(CPACK_PACKAGE_ICON src/images/cryptonote.png)
Expand All @@ -283,22 +283,7 @@ elseif (UNIX)
set(CPACK_DEBIAN_PACKAGE_MAINTAINER "${CPACK_PACKAGE_VENDOR} <[email protected]>")
set(CPACK_DEBIAN_PACKAGE_SECTION Office)
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "Royalties XRY wallet
Royalties is a decentrilized privacy protected peer-to-peer
cryptocurrency and untraceable encrypted messaging system. Royalties is
open-source; its design is public, nobody owns or controls Royalties and
everyone can take part.
.
Features of the Royalties wallet listed bellow:
* Classic Bitcoin alike appearance in CryptoNote based cryptocurrency,
made with QT and open-source.
* Instant anonymous XRY transfers and transfers notifications
* Instant untraceable encrypted messages transfers and notifications
* Safe and secure, full Royalties network node in wallet, fast network
syncronization.
* Wallet encryption
* Fast and hardware optimized
* Open and easy. Private keys can be exported into other clients.")
set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "QTPenny is the GUI wallet for pennykoin cryptocurrency.")
set(CPACK_PACKAGE_FILE_NAME "${CPACK_DEBIAN_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${VERSION_RELEASE}.${CPACK_SYSTEM_NAME}")
else ()
set(CPACK_GENERATOR RPM)
Expand All @@ -307,23 +292,8 @@ set(CPACK_PACKAGE_FILE_NAME "${CPACK_DEBIAN_PACKAGE_NAME}-${CPACK_PACKAGE_VERSIO
set(CPACK_RPM_PACKAGE_LICENSE "GPL3")
set(CPACK_RPM_PACKAGE_GROUP Office)
set(CPACK_RPM_PACKAGE_REQUIRES "qt5-qtbase >= 5.3.2, qt5-qtbase-gui >= 5.3.2")
set(CPACK_RPM_PACKAGE_SUMMARY "Royalties wallet")
set(CPACK_RPM_PACKAGE_DESCRIPTION "Open-source Royalties GUI wallet
Royalties is a decentrilized privacy protected peer-to-peer
cryptocurrency and untraceable encrypted messaging system. Royalties is
open-source; its design is public, nobody owns or controls Royalties and
everyone can take part.
Features of the Royalties wallet listed bellow:
*Classic Bitcoin alike appearance in CryptoNote based cryptocurrency,
made with QT and open-source.
*Instant anonymous Royalties transfers and transfers notifications
*Instant untraceable encrypted messages transfers and notifications
*Safe and secure, full Royalties network node in wallet, fast network
syncronization.
*Wallet encryption
*Fast and hardware optimized
*Open and easy. Private keys can be exported into other clients.")
set(CPACK_RPM_PACKAGE_SUMMARY "Pennykoin GUI wallet")
set(CPACK_RPM_PACKAGE_DESCRIPTION "QTPenny is the GUI wallet for pennykoin cryptocurrency.")
set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${VERSION_RELEASE}.${CPACK_SYSTEM_NAME}")
endif ()
elseif (WIN32)
Expand Down
2 changes: 1 addition & 1 deletion CryptoNoteWallet.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
set(CN_PROJECT_NAME "QTPenny")
set(CN_CURRENCY_DISPLAY_NAME "penny")
set(CN_CURRENCY_TICKER "Pk")
set(CN_VERSION 1.6.0)
set(CN_VERSION 1.6.1)
8 changes: 4 additions & 4 deletions src/QTpenny.desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[Desktop Entry]
Encoding=UTF-8
Name=Royalties Wallet
Comment=Royalties wallet
Exec=royaltieswallet
Name=QTPenny
Comment=Pennykoin wallet
Exec=QTPenny
Terminal=false
Type=Application
Icon=royalties
MimeType=x-scheme-handler/royaltieswallet;
MimeType=x-scheme-handler/*.wallet;
Categories=Office;Finance;
4 changes: 4 additions & 0 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include "CurrencyAdapter.h"
#include "LoggerAdapter.h"
#include "NodeAdapter.h"
#include "update.h"
#include "Settings.h"
#include "SignalHandler.h"
#include "WalletAdapter.h"
Expand Down Expand Up @@ -84,6 +85,9 @@ int main(int argc, char* argv[]) {
}

splash->finish(&MainWindow::instance());
Updater d;
d.checkForUpdate();

MainWindow::instance().show();
WalletAdapter::instance().open("");
QObject::connect(QApplication::instance(), &QApplication::aboutToQuit, []() {
Expand Down
2 changes: 1 addition & 1 deletion src/update.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ void Updater::replyFinished (QNetworkReply *reply)

if (ourVersion < remoteVersion) {

if (QMessageBox::warning(nullptr, QObject::tr("New version available"), QObject::tr("There is update available.\nDo you want to go to download page?"), QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Ok) {
if (QMessageBox::warning(nullptr, QObject::tr("New version available"), QObject::tr("There is an update available.\nDwonload or risk blockchain corruption"), QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Ok) {
QString link = "http://pennykoin.com/downloads";
QDesktopServices::openUrl(QUrl(link));
}
Expand Down

0 comments on commit 48a5c6a

Please sign in to comment.