Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 19:55:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

repair usage of INI file for QSettings

Browse source
This commit is contained in:
Stephen Birarda 2014-02-19 14:09:18 -08:00
parent 0b4021ea43
commit 5f130872af
5 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/info/ApplicationInfo.ini
View file

@ -1,4 +1,4 @@
[INFO]
name=Interface
organizationName=High Fidelity
organizationDomain=highfidelity.io
organizationDomain=highfidelity.io

34
interface/src/Application.cpp
View file

@ -158,11 +158,27 @@ Application::Application(int& argc, char** argv, timeval &startup_time) :
_pasteMode(false),
_logger(new FileLogger(this))
{
switchToResourcesParentIfRequired();
// read the ApplicationInfo.ini file for Name/Version/Domain information
QSettings applicationInfo("resources/info/ApplicationInfo.ini", QSettings::IniFormat);
// set the associated application properties
applicationInfo.beginGroup("INFO");
qDebug() << "[VERSION] Build sequence: " << qPrintable(applicationVersion());
setApplicationName(applicationInfo.value("name").toString());
setApplicationVersion(BUILD_VERSION);
setOrganizationName(applicationInfo.value("organizationName").toString());
setOrganizationDomain(applicationInfo.value("organizationDomain").toString());
QSettings::setDefaultFormat(QSettings::IniFormat);
_myAvatar = _avatarManager.getMyAvatar();
_applicationStartupTime = startup_time;
switchToResourcesParentIfRequired();
QFontDatabase::addApplicationFont("resources/styles/Inconsolata.otf");
_window->setWindowTitle("Interface");
@ -212,21 +228,7 @@ Application::Application(int& argc, char** argv, timeval &startup_time) :
connect(&AccountManager::getInstance(), SIGNAL(authenticationRequired()),
Menu::getInstance(), SLOT(loginForCurrentDomain()));
// read the ApplicationInfo.ini file for Name/Version/Domain information
QSettings applicationInfo("resources/info/ApplicationInfo.ini", QSettings::IniFormat);
// set the associated application properties
applicationInfo.beginGroup("INFO");
setApplicationName(applicationInfo.value("name").toString());
setApplicationVersion(BUILD_VERSION);
setOrganizationName(applicationInfo.value("organizationName").toString());
setOrganizationDomain(applicationInfo.value("organizationDomain").toString());
qDebug() << "[VERSION] Build sequence: " << qPrintable(applicationVersion());
QSettings::setDefaultFormat(QSettings::IniFormat);
_settings = new QSettings(this);
// Check to see if the user passed in a command line option for loading a local

1
interface/src/Menu.cpp
View file

@ -745,6 +745,7 @@ void Menu::loginForCurrentDomain() {
QBoxLayout* layout = new QBoxLayout(QBoxLayout::TopToBottom);
loginDialog.setLayout(layout);
loginDialog.setWindowFlags(Qt::Sheet);
QFormLayout* form = new QFormLayout();
layout->addLayout(form, 1);

1
interface/src/main.cpp
View file

@ -38,6 +38,7 @@ int main(int argc, const char * argv[]) {
int exitCode;
{
QSettings::setDefaultFormat(QSettings::IniFormat);
Application app(argc, const_cast<char**>(argv), startup_time);
qDebug( "Created QT Application.");

4
libraries/shared/src/OAuthAccessToken.h
View file

@ -20,12 +20,12 @@ public:
OAuthAccessToken(const QJsonObject& jsonObject);
OAuthAccessToken(const OAuthAccessToken& otherToken);
OAuthAccessToken& operator=(const OAuthAccessToken& otherToken);
bool isExpired() { return expiryTimestamp <= QDateTime::currentMSecsSinceEpoch(); }
QString token;
QString refreshToken;
quint64 expiryTimestamp;
qlonglong expiryTimestamp;
QString tokenType;
friend QDataStream& operator<<(QDataStream &out, const OAuthAccessToken& token);