~mateo-salta/nitroshare/nitroshare

Viewing changes to src/util/settings.cpp

Committer: Nathan Osman
Date: 2012-06-27 21:56:40 UTC
Revision ID: admin@quickmediasolutions.com-20120627215640-c6mspvllk1br9vx2

Implemented basic progress bar for uploads (which seems to be broken at the moment) and corrected a bug with the way unique IDs were generated for each machine.

files modified:
include/file/CFileSender.h

include/sharebox/CShareBox.h

include/util/settings.h

src/discovery/CBroadcastServer.cpp

src/file/CFileSender.cpp

src/main/CTrayIcon.cpp

src/sharebox/CShareBox.cpp

src/util/defaults.cpp

src/util/settings.cpp

Show diffs side-by-side

added added

removed removed

src/util/settings.cpp

#include <QDir>

#include <QFile>

#include <QSettings>

#include <QUuid>

#include <util/defaults.h>

#include <util/settings.h>

return Get("Notifications/" + type).toBool();

}

QString Settings::GetID()

{

QSettings settings;

/* If there is an exisiting ID, return it. */

if(settings.contains("Internal/ID"))

return settings.value("Internal/ID").toString();

/* Otherwise we need to generate one and store it. */

QString uuid = QUuid::createUuid().toString();

settings.setValue("Internal/ID", uuid);

return uuid;

}

#ifdef Q_OS_LINUX

QDir GetStartupDir()

{

Older »