~mateo-salta/nitroshare/nitroshare

Viewing changes to src/util/defaults.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/defaults.cpp

#include <QDesktopWidget>

#include <QHostInfo>

#include <QPoint>

#include <QUuid>

#include <QVariantList>

#include <sharebox/CShareBox.h>

Map["Network/TransmissionPort"] = 41721;

Map["ShareBox/Instances"] = GenerateDefaultShareBoxInstance();

Map["Internal/ID"] = QUuid::createUuid().toString();

}

Older »