Skip to content

Commit

Permalink
Merge pull request #20 from aurovine/testbranch
Browse files Browse the repository at this point in the history 
Updates GUI and Functionality
  • Loading branch information
@locohammerhead
locohammerhead committed Mar 19, 2018
2 parents 9fc2aac + 43a91a5 commit 6a24fd8
Show file tree
Hide file tree
Showing 291 changed files with 10,265 additions and 4,139 deletions.
30 changes: 18 additions & 12 deletions Audiocoin-Qt.pro
View file
Expand Up @@ -3,6 +3,7 @@ TARGET = audiocoin-qt
VERSION = 1.2.2
INCLUDEPATH += src src/json src/qt
QT += network
QT += svg
DEFINES += ENABLE_WALLET
DEFINES += BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE
CONFIG += no_include_pwd
Expand All @@ -29,8 +30,8 @@ UI_DIR = build

# use: qmake "RELEASE=1"
contains(RELEASE, 1) {
# Mac: compile for maximum compatibility (10.5, 32-bit)
macx:QMAKE_CXXFLAGS += -mmacosx-version-min=10.5 -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk
# Mac: compile for maximum compatibility (10.7, 32-bit)
macx:QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -arch x86_64 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk

!windows:!macx {
# Linux: static link
Expand Down Expand Up @@ -142,7 +143,7 @@ DEPENDPATH += src src/json src/qt
HEADERS += src/qt/bitcoingui.h \
src/qt/transactiontablemodel.h \
src/qt/addresstablemodel.h \
src/qt/optionsdialog.h \
src/qt/settingspage.h \
src/qt/coincontroldialog.h \
src/qt/coincontroltreewidget.h \
src/qt/sendcoinsdialog.h \
Expand Down Expand Up @@ -202,7 +203,7 @@ HEADERS += src/qt/bitcoingui.h \
src/wallet.h \
src/keystore.h \
src/qt/transactionfilterproxy.h \
src/qt/transactionview.h \
src/qt/transactionspage.h \
src/qt/walletmodel.h \
src/rpcclient.h \
src/rpcprotocol.h \
Expand All @@ -226,12 +227,14 @@ HEADERS += src/qt/bitcoingui.h \
src/netbase.h \
src/clientversion.h \
src/threadsafety.h \
src/tinyformat.h
src/tinyformat.h \
src/qt/qcustombutton.h \
src/qt/faderdialog.h

SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
src/qt/transactiontablemodel.cpp \
src/qt/addresstablemodel.cpp \
src/qt/optionsdialog.cpp \
src/qt/settingspage.cpp \
src/qt/sendcoinsdialog.cpp \
src/qt/coincontroldialog.cpp \
src/qt/coincontroltreewidget.cpp \
Expand Down Expand Up @@ -272,7 +275,7 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
src/wallet.cpp \
src/keystore.cpp \
src/qt/transactionfilterproxy.cpp \
src/qt/transactionview.cpp \
src/qt/transactionspage.cpp \
src/qt/walletmodel.cpp \
src/rpcclient.cpp \
src/rpcprotocol.cpp \
Expand Down Expand Up @@ -303,7 +306,9 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
src/scrypt-x86.S \
src/scrypt-x86_64.S \
src/scrypt.cpp \
src/pbkdf2.cpp
src/pbkdf2.cpp \
src/qt/qcustombutton.cpp \
src/qt/faderdialog.cpp

RESOURCES += \
src/qt/bitcoin.qrc
Expand All @@ -320,7 +325,8 @@ FORMS += \
src/qt/forms/sendcoinsentry.ui \
src/qt/forms/askpassphrasedialog.ui \
src/qt/forms/rpcconsole.ui \
src/qt/forms/optionsdialog.ui
src/qt/forms/settingspage.ui \
src/qt/forms/transactionspage.ui

contains(USE_QRCODE, 1) {
HEADERS += src/qt/qrcodedialog.h
Expand Down Expand Up @@ -396,11 +402,11 @@ windows:!contains(MINGW_THREAD_BUGFIX, 0) {
QMAKE_LIBS_QT_ENTRY = -lmingwthrd $$QMAKE_LIBS_QT_ENTRY
}

macx:HEADERS += src/qt/macdockiconhandler.h
macx:OBJECTIVE_SOURCES += src/qt/macdockiconhandler.mm
macx:HEADERS += src/qt/macdockiconhandler.h src/qt/macnotificationhandler.h
macx:OBJECTIVE_SOURCES += src/qt/macdockiconhandler.mm src/qt/macnotificationhandler.mm
macx:LIBS += -framework Foundation -framework ApplicationServices -framework AppKit
macx:DEFINES += MAC_OSX MSG_NOSIGNAL=0
macx:ICON = src/qt/res/icons/bitcoin.icns
macx:ICON = src/qt/res/icons/audiocoin.icns
macx:TARGET = "Audiocoin-Qt"
macx:QMAKE_CFLAGS_THREAD += -pthread
macx:QMAKE_LFLAGS_THREAD += -pthread
Expand Down
2 changes: 1 addition & 1 deletion share/qt/Info.plist
View file
Expand Up @@ -3,7 +3,7 @@
<plist version="0.9">
<dict>
<key>CFBundleIconFile</key>
<string>bitcoin.icns</string>
<string>audiocoin.icns</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleGetInfoString</key>
Expand Down
4 changes: 2 additions & 2 deletions share/qt/make_windows_icon.sh
View file
@@ -1,5 +1,5 @@
#!/bin/bash
# create multiresolution windows icon
ICON_DST=../../src/qt/res/icons/novacoin.ico
ICON_DST=../../src/qt/res/icons/audiocoin.ico

convert ../../src/qt/res/icons/novacoin-16.png ../../src/qt/res/icons/novacoin-32.png ../../src/qt/res/icons/novacoin-48.png ${ICON_DST}
convert ../../src/qt/res/icons/audiocoin-16.png ../../src/qt/res/icons/audiocoin-32.png ../../src/qt/res/icons/audiocoin-48.png ${ICON_DST}
32 changes: 16 additions & 16 deletions share/setup.nsi
View file
@@ -1,16 +1,16 @@
Name NovaCoin
Name Audiocoin

RequestExecutionLevel highest
SetCompressor /SOLID lzma

# General Symbol Definitions
!define REGKEY "SOFTWARE\$(^Name)"
!define VERSION 0.3.0
!define COMPANY "NovaCoin project"
!define URL http://www.novacoin.ru/
!define COMPANY "Audiocoin"
!define URL http://www.audiocoin.eu/

# MUI Symbol Definitions
!define MUI_ICON "../share/pixmaps/novacoin.ico"
!define MUI_ICON "../share/pixmaps/audiocoin.ico"
!define MUI_WELCOMEFINISHPAGE_BITMAP "../share/pixmaps/nsis-wizard.bmp"
!define MUI_HEADERIMAGE
!define MUI_HEADERIMAGE_RIGHT
Expand All @@ -19,8 +19,8 @@ SetCompressor /SOLID lzma
!define MUI_STARTMENUPAGE_REGISTRY_ROOT HKLM
!define MUI_STARTMENUPAGE_REGISTRY_KEY ${REGKEY}
!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME StartMenuGroup
!define MUI_STARTMENUPAGE_DEFAULTFOLDER NovaCoin
#!define MUI_FINISHPAGE_RUN $INSTDIR\novacoin-qt.exe
!define MUI_STARTMENUPAGE_DEFAULTFOLDER Audiocoin
#!define MUI_FINISHPAGE_RUN $INSTDIR\audiocoin-qt.exe
!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
!define MUI_UNWELCOMEFINISHPAGE_BITMAP "../share/pixmaps/nsis-wizard.bmp"
!define MUI_UNFINISHPAGE_NOAUTOCLOSE
Expand All @@ -45,14 +45,14 @@ Var StartMenuGroup
!insertmacro MUI_LANGUAGE English

# Installer attributes
OutFile novacoin-0.3.0-win32-setup.exe
InstallDir $PROGRAMFILES\NovaCoin
OutFile audiocoin-1.3.0-win32-setup.exe
InstallDir $PROGRAMFILES\Audiocoin
CRCCheck on
XPStyle on
BrandingText " "
ShowInstDetails show
VIProductVersion 0.3.0.0
VIAddVersionKey ProductName NovaCoin
VIAddVersionKey ProductName Audiocoin
VIAddVersionKey ProductVersion "${VERSION}"
VIAddVersionKey CompanyName "${COMPANY}"
VIAddVersionKey CompanyWebsite "${URL}"
Expand All @@ -66,18 +66,18 @@ ShowUninstDetails show
Section -Main SEC0000
SetOutPath $INSTDIR
SetOverwrite on
#File ../release/novacoin-qt.exe
#File ../release/audiocoin-qt.exe
File /oname=license.txt ../COPYING
File /oname=readme.txt ../doc/README_windows.txt
SetOutPath $INSTDIR\daemon
File ../src/novacoind.exe
File ../src/audiocoind.exe
SetOutPath $INSTDIR\src
File /r /x *.exe /x *.o ../src\*.*
SetOutPath $INSTDIR
WriteRegStr HKCU "${REGKEY}\Components" Main 1

# Remove old wxwidgets-based-bitcoin executable and locales:
#Delete /REBOOTOK $INSTDIR\novacoin.exe
#Delete /REBOOTOK $INSTDIR\audiocoin.exe
#RMDir /r /REBOOTOK $INSTDIR\locale
SectionEnd

Expand All @@ -87,7 +87,7 @@ Section -post SEC0001
WriteUninstaller $INSTDIR\uninstall.exe
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
CreateDirectory $SMPROGRAMS\$StartMenuGroup
CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Uninstall NovaCoin.lnk" $INSTDIR\uninstall.exe
CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Uninstall Audiocoin.lnk" $INSTDIR\uninstall.exe
!insertmacro MUI_STARTMENU_WRITE_END
WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayName "$(^Name)"
WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayVersion "${VERSION}"
Expand Down Expand Up @@ -120,7 +120,7 @@ done${UNSECTION_ID}:

# Uninstaller sections
Section /o -un.Main UNSEC0000
#Delete /REBOOTOK $INSTDIR\novacoin-qt.exe
#Delete /REBOOTOK $INSTDIR\audiocoin-qt.exe
Delete /REBOOTOK $INSTDIR\license.txt
Delete /REBOOTOK $INSTDIR\readme.txt
RMDir /r /REBOOTOK $INSTDIR\daemon
Expand All @@ -130,7 +130,7 @@ SectionEnd

Section -un.post UNSEC0001
DeleteRegKey HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)"
Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Uninstall NovaCoin.lnk"
Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Uninstall Audiocoin.lnk"
#Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Bitcoin.lnk"
#Delete /REBOOTOK "$SMSTARTUP\Bitcoin.lnk"
Delete /REBOOTOK $INSTDIR\uninstall.exe
Expand All @@ -140,7 +140,7 @@ Section -un.post UNSEC0001
DeleteRegValue HKCU "${REGKEY}" Path
DeleteRegKey /IfEmpty HKCU "${REGKEY}\Components"
DeleteRegKey /IfEmpty HKCU "${REGKEY}"
DeleteRegKey HKCR "novacoin"
DeleteRegKey HKCR "audiocoin"
RmDir /REBOOTOK $SMPROGRAMS\$StartMenuGroup
RmDir /REBOOTOK $INSTDIR
Push $R0
Expand Down
4 changes: 2 additions & 2 deletions src/clientversion.h
View file
Expand Up @@ -7,8 +7,8 @@

// These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it
#define CLIENT_VERSION_MAJOR 1
#define CLIENT_VERSION_MINOR 2
#define CLIENT_VERSION_REVISION 3
#define CLIENT_VERSION_MINOR 3
#define CLIENT_VERSION_REVISION 0
#define CLIENT_VERSION_BUILD 0

// Set to true for release, false for prerelease or test build
Expand Down
4 changes: 3 additions & 1 deletion src/qt/aboutdialog.cpp
View file
Expand Up @@ -5,10 +5,12 @@
#include "version.h"

AboutDialog::AboutDialog(QWidget *parent) :
QDialog(parent),
FaderDialog(parent),
ui(new Ui::AboutDialog)
{
ui->setupUi(this);

connect(ui->confirmButton, SIGNAL(clicked()), this, SLOT(accept()));
}

void AboutDialog::setModel(ClientModel *model)
Expand Down
3 changes: 2 additions & 1 deletion src/qt/aboutdialog.h
View file
Expand Up @@ -2,14 +2,15 @@
#define ABOUTDIALOG_H

#include <QDialog>
#include "faderdialog.h"

namespace Ui {
class AboutDialog;
}
class ClientModel;

/** "About" dialog box */
class AboutDialog : public QDialog
class AboutDialog : public FaderDialog
{
Q_OBJECT

Expand Down

0 comments on commit 6a24fd8

Please sign in to comment.