Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-13 13:31:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed up name/transfer rate display in FileTransfer Info.

Browse Source 
Updated Qblog interface file (from libretroshare)



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@576 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2008-06-06 00:04:45 +00:00
parent 9786a2ad54
commit 5f3c9873fc
2 changed files with 67 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
retroshare-gui/src/gui/TransfersDialog.cpp
View File

@ -288,7 +288,7 @@ int TransfersDialog::addUploadItem(QString symbol, QString name, QString coreID,
ULListModel->setData(ULListModel->index(row, UPROGRESS), QVariant((double)progress)); ULListModel->setData(ULListModel->index(row, UPROGRESS), QVariant((double)progress));
ULListModel->setData(ULListModel->index(row, ULSPEED), QVariant((double)dlspeed)); ULListModel->setData(ULListModel->index(row, ULSPEED), QVariant((double)dlspeed));
ULListModel->setData(ULListModel->index(row, USTATUS), QVariant((QString)status)); ULListModel->setData(ULListModel->index(row, USTATUS), QVariant((QString)status));
ULListModel->setData(ULListModel->index(row, UTRANSFERRED), QVariant((qlonglong)remaining)); ULListModel->setData(ULListModel->index(row, UTRANSFERRED), QVariant((qlonglong)completed));
return row; return row;
} }
@ -395,6 +395,8 @@ void TransfersDialog::insertTransfers()
//coreId = QString::fromStdString(it->hashout.str()); //coreId = QString::fromStdString(it->hashout.str());
coreId = QString::fromStdString(it->hash); coreId = QString::fromStdString(it->hash);
sources = QString::fromStdString(it->source);
switch(it->downloadStatus) switch(it->downloadStatus)
{ {

39
retroshare-gui/src/rsiface/rsQblog.h
View File

@ -6,7 +6,7 @@
* *
* RetroShare C++ Interface. * RetroShare C++ Interface.
* *
* Copyright 2007-2008 by Chris Parker, Robert Fernie. * Copyright 2007-2008 by Chris Evi-Parker, Robert Fernie.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -32,7 +32,7 @@
#include <map> #include <map>
/* delcare interface for everyone to use */ /* delcare interafce for everyone o use */
class RsQblog; class RsQblog;
extern RsQblog *rsQblog; extern RsQblog *rsQblog;
@ -43,47 +43,42 @@ extern RsQblog *rsQblog;
RsQblog() { return; } RsQblog() { return; }
virtual ~RsQblog() { return; } virtual ~RsQblog() { return; }
/** /**
* allow user to set his status * allows user to set his status
* @param status The status of the user * @param status The status of the user
*/ */
virtual bool setStatus(std::string &status) = 0; virtual bool setStatus(const std::string &status) = 0;
/** /**
* get status of users friends * returns reference to map of usrs and their status
* * @param usrStatus returns map to usr and their status
**/ */
virtual bool getStatus(std::string &status) = 0; virtual bool getStatus(std::map<std::string, std::string> &usrStatus) = 0;
/** /**
* choose whether to filter or not * choose whether to filter or not
* @param filterSwitch * @param filterSwitch
**/ */
virtual bool setFilterSwitch(bool &filterSwitch) = 0; virtual bool setFilterSwitch(bool &filterSwitch) = 0;
/**
* get usrs friend list
* @ param usrList
*/
virtual bool getFriendList(std::list<std::string> &friendList) =0;
/** /**
* retrieve usrs filterSwitch status * retrieve usrs filterSwitch status
**/ */
virtual bool getFilterSwitch(void) = 0; virtual bool getFilterSwitch(void) = 0;
/** /**
* add user id to filter list * add user id to filter list
* @param usr id to add to filter list * @param usr id to add to filter list
**/ */
virtual bool addToFilter(std::string &usrId) = 0; virtual bool addToFilter(std::string &usrId) = 0;
/** /**
* remove friend from filter list * remove friend from filter list
* @param id The user's frined's id * @param id The user's frined's id
**/ */
virtual bool removeFiltFriend(std::string &usrId) = 0; virtual bool removeFiltFriend(std::string &usrId) = 0;
/** /**
@ -91,20 +86,18 @@ virtual ~RsQblog() { return; }
* @param usrId the usr whose fav song you want * @param usrId the usr whose fav song you want
* @param favSong puts ref for fav song here * @param favSong puts ref for fav song here
*/ */
virtual bool getProfile(std::string &usrId, std::string &favSong) = 0; virtual bool getProfile(std::map<std::string, std::string> &profile) = 0;
/** /**
* for now just fav song, TODO: must find way to link to rs profile * for now just fav song, TODO: must find way to link to rs profile
*/ */
virtual bool setProfile(std::string &favSong) = 0; virtual bool setProfile(const std::string &favSong) = 0;
/** /**
* send blog info, will send to a data structure for transmission * send blog info, will send to a data structure for transmission
* @param msg The msg the usr wants to send * @param msg The msg the usr wants to send
*/ */
virtual bool sendBlog(std::string &msg) = 0; virtual bool sendBlog(const std::string &msg) = 0;
/** /**
* retrieve blog of a usr * retrieve blog of a usr