Skip to content

Commit

Permalink
some last minute tweaks before release
Browse files Browse the repository at this point in the history
  • Loading branch information
joshuatz committed Apr 24, 2019
1 parent df3e61b commit e5a98f8
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 5 deletions.
1 change: 1 addition & 0 deletions DCT.pro
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ SOURCES += \
globalsettings.cpp

HEADERS += \
appinfo.h \
helpers.h \
database.h \
globalsettings.h \
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ Macro | Incoming Transformation | Outgoing Transformation | What it does
# Deploying
I'm using windeployqt to pull in DLLs to bundle with my exe for release. however, it doesn't pull in OpenSSL although it is needed for the Cloudinary API calls.

# License
Licensed under Apache 2.0
See LICENSE file for details.

# Notes to self:
## Stats logging
### Syntax:
Expand Down
10 changes: 10 additions & 0 deletions appinfo.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#ifndef APPINFO_H
#define APPINFO_H

#define APP_VERSION_STRING "0.1.0"

#define APP_ORG_NAME "JoshuaTzucker"
#define APP_ORG_DOMAIN "joshuatz.com"
#define APP_NAME "Desktop Cloud Transform"

#endif // APPINFO_H
5 changes: 5 additions & 0 deletions helpers.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "appinfo.h"
#include "helpers.h"
#include <QObject>
#include <QDebug>
Expand Down Expand Up @@ -113,3 +114,7 @@ bool Helpers::getIsDebug(){
return false;
#endif
}

QString Helpers::getVersionString(){
return APP_VERSION_STRING;
}
1 change: 1 addition & 0 deletions helpers.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ public slots:
static QString forceEndingSlash(QString input);
static QString removeBeginSlash(QString input);
static bool getIsDebug();
static QString getVersionString();
private:
};

Expand Down
13 changes: 9 additions & 4 deletions main.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/**
* Copyright (C) 2019 Joshua Tzucker
*/

#include "appinfo.h"
#include "apis/cloudinary.h"
#include "database.h"
#include "globalsettings.h"
Expand All @@ -20,10 +25,10 @@ int main(int argc, char *argv[])
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);

// Register settings config
QCoreApplication::setOrganizationName("JoshuaTzucker");
QCoreApplication::setOrganizationDomain("joshuatz.com");
QCoreApplication::setApplicationName("Desktop Cloud Transform");
QCoreApplication::setApplicationVersion("0.0.1");
QCoreApplication::setOrganizationName(APP_ORG_NAME);
QCoreApplication::setOrganizationDomain(APP_ORG_DOMAIN);
QCoreApplication::setApplicationName(APP_NAME);
QCoreApplication::setApplicationVersion(APP_VERSION_STRING);

QGuiApplication app(argc, argv);
QQmlApplicationEngine engine;
Expand Down
2 changes: 1 addition & 1 deletion qml/components/AboutPage.qml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Item {
color: Qt.rgba(255/255,255/255,255/255,0.8)
Text {
anchors.centerIn: parent
text: "About DCT"
text: "About DCT - v" + Helpers.getVersionString()
color: ThemeColors.darkPrimary
font.pixelSize: 30
}
Expand Down

0 comments on commit e5a98f8

Please sign in to comment.