Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-04 04:11:06 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed SharedFiles column size's

Browse Source 
Enabled for Network Log to show again rsversion
Added .rsfb extension for Uploads Progressbar

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1514 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2009-08-10 23:11:17 +00:00
parent a78013b131
commit 4e8294444b
4 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
retroshare-gui/src/gui/NetworkDialog.cpp
View File

@ -32,6 +32,7 @@
#include "GenCertDialog.h" #include "GenCertDialog.h"
#include "rsiface/rsiface.h" #include "rsiface/rsiface.h"
#include "rsiface/rspeers.h" #include "rsiface/rspeers.h"
#include "rsiface/rsdisc.h"
/* for GPGME */ /* for GPGME */
#include "rsiface/rsinit.h" #include "rsiface/rsinit.h"
@ -133,8 +134,16 @@ NetworkDialog::NetworkDialog(QWidget *parent)
ui.networkTab->addTab(new NetworkView(),QString(tr("Network View"))); ui.networkTab->addTab(new NetworkView(),QString(tr("Network View")));
ui.networkTab->addTab(new TrustView(),QString(tr("Trust matrix"))); ui.networkTab->addTab(new TrustView(),QString(tr("Trust matrix")));
QString version = "-";
std::map<std::string, std::string>::iterator vit;
std::map<std::string, std::string> versions;
bool retv = rsDisc->getDiscVersions(versions);
if (retv && versions.end() != (vit = versions.find(rsPeers->getOwnId()))) {
version = QString::fromStdString(vit->second);
}
// Set Log infos // Set Log infos
setLogInfo(tr("RetroShare started.")); setLogInfo(tr("RetroShare %1 started.").arg(version));
setLogInfo(tr("Welcome to RetroShare."), QString::fromUtf8("blue")); setLogInfo(tr("Welcome to RetroShare."), QString::fromUtf8("blue"));

8
retroshare-gui/src/gui/SharedFilesDialog.cpp
View File

@ -125,13 +125,13 @@ SharedFilesDialog::SharedFilesDialog(QWidget *parent)
/* Set header resize modes and initial section sizes */ /* Set header resize modes and initial section sizes */
QHeaderView * l_header = ui.localDirTreeView->header () ; QHeaderView * l_header = ui.localDirTreeView->header () ;
l_header->setResizeMode (0, QHeaderView::Interactive); l_header->setResizeMode (0, QHeaderView::Interactive);
l_header->setResizeMode (1, QHeaderView::Interactive); l_header->setResizeMode (1, QHeaderView::Fixed);
l_header->setResizeMode (2, QHeaderView::Interactive); l_header->setResizeMode (2, QHeaderView::Interactive);
l_header->setResizeMode (3, QHeaderView::Interactive); l_header->setResizeMode (3, QHeaderView::Interactive);
l_header->resizeSection ( 0, 490 ); l_header->resizeSection ( 0, 490 );
l_header->resizeSection ( 1, 70 ); l_header->resizeSection ( 1, 70 );
l_header->resizeSection ( 2, 60 ); l_header->resizeSection ( 2, 130 );
l_header->resizeSection ( 3, 100 ); l_header->resizeSection ( 3, 100 );
/* Set header resize modes and initial section sizes */ /* Set header resize modes and initial section sizes */
@ -141,13 +141,13 @@ SharedFilesDialog::SharedFilesDialog(QWidget *parent)
r_header->setStretchLastSection(false); r_header->setStretchLastSection(false);
r_header->setResizeMode (1, QHeaderView::Fixed); r_header->setResizeMode (1, QHeaderView::Fixed);
r_header->setResizeMode (2, QHeaderView::Fixed); r_header->setResizeMode (2, QHeaderView::Interactive);
r_header->setResizeMode (3, QHeaderView::Fixed); r_header->setResizeMode (3, QHeaderView::Fixed);
r_header->resizeSection ( 0, 490 ); r_header->resizeSection ( 0, 490 );
r_header->resizeSection ( 1, 70 ); r_header->resizeSection ( 1, 70 );
r_header->resizeSection ( 2, 60 ); r_header->resizeSection ( 2, 130 );
r_header->resizeSection ( 3, 100 ); r_header->resizeSection ( 3, 100 );
l_header->setHighlightSections(false); l_header->setHighlightSections(false);

2
retroshare-gui/src/gui/ULListDelegate.cpp
View File

@ -129,7 +129,7 @@ void ULListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
xProgressBar progressBar(option.rect, painter );// the 3rd param is the color schema (0 is the default value) xProgressBar progressBar(option.rect, painter );// the 3rd param is the color schema (0 is the default value)
QString ext = QFileInfo(QString::fromStdString(index.sibling(index.row(), UNAME).data().toString().toStdString())).suffix();; QString ext = QFileInfo(QString::fromStdString(index.sibling(index.row(), UNAME).data().toString().toStdString())).suffix();;
if (ext == "rsfc" || ext == "rsrl" || ext == "dist" ) if (ext == "rsfc" || ext == "rsrl" || ext == "dist" || ext == "rsfb")
{ {
progressBar.setColorSchema( 9); progressBar.setColorSchema( 9);
} }

3
retroshare-gui/src/rsiface/RemoteDirModel.cpp
View File

@ -458,6 +458,9 @@ QString RemoteDirModel::getFlagsString(uint32_t flags)
case 2: case 2:
return getFlagsString(details.flags); return getFlagsString(details.flags);
break; break;
case 3:
return misc::userFriendlyDuration(details.age);
break;
default: default:
return QString(tr("DIR")); return QString(tr("DIR"));