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

Merge remote-tracking branch 'upstream/master' into v0.6-BugFixing_2

Browse Source
This commit is contained in:
csoler 2020-12-04 14:29:01 +01:00
commit d5cce14cb1
2 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
retroshare-gui/src/gui/settings/ServerPage.cpp
View File

@ -75,14 +75,14 @@ const static uint32_t TAB_RELAYS = 3;
//#define SERVER_DEBUG 1 //#define SERVER_DEBUG 1
ServerPage::ServerPage(QWidget * parent, Qt::WindowFlags flags) ServerPage::ServerPage(QWidget * parent, Qt::WindowFlags flags)
: ConfigPage(parent, flags), mIsHiddenNode(false), mHiddenType(RS_HIDDEN_TYPE_NONE) : ConfigPage(parent, flags)
, manager(NULL), mOngoingConnectivityCheck(-1)
, mIsHiddenNode(false), mHiddenType(RS_HIDDEN_TYPE_NONE)
, mBobAccessible(false)
{ {
/* Invoke the Qt Designer generated object setup routine */ /* Invoke the Qt Designer generated object setup routine */
ui.setupUi(this); ui.setupUi(this);
manager = NULL ;
mOngoingConnectivityCheck = -1;
#ifndef RS_USE_I2P_BOB #ifndef RS_USE_I2P_BOB
ui.hiddenServiceTab->removeTab(TAB_HIDDEN_SERVICE_I2P_BOB); // warning: the order of operation here is very important. ui.hiddenServiceTab->removeTab(TAB_HIDDEN_SERVICE_I2P_BOB); // warning: the order of operation here is very important.
#endif #endif

25
retroshare-gui/src/gui/statistics/GxsIdStatistics.cpp
View File

@ -319,10 +319,10 @@ void GxsIdStatisticsWidget::updateContent()
painter.drawLine(QPoint(ox+4*cellx,oy),QPoint(ox+4*cellx,oy-celly*hist_height)); painter.drawLine(QPoint(ox+4*cellx,oy),QPoint(ox+4*cellx,oy-celly*hist_height));
uint32_t max_entry=0; uint32_t max_entry=0;
for(int i=0;i<mPublishDateHist.entries().size();++i) for(size_t i=0;i<mPublishDateHist.entries().size();++i)
max_entry = std::max(max_entry,mPublishDateHist.entries()[i]); max_entry = std::max(max_entry,mPublishDateHist.entries()[i]);
for(int i=0;i<mPublishDateHist.entries().size();++i) for(size_t i=0;i<mPublishDateHist.entries().size();++i)
{ {
float h = floor(celly*mPublishDateHist.entries()[i]/(float)max_entry*hist_height); float h = floor(celly*mPublishDateHist.entries()[i]/(float)max_entry*hist_height);
int I = mPublishDateHist.entries().size() - 1 - i; int I = mPublishDateHist.entries().size() - 1 - i;
@ -331,7 +331,7 @@ void GxsIdStatisticsWidget::updateContent()
painter.setPen(QColor::fromRgb(0,0,0)); painter.setPen(QColor::fromRgb(0,0,0));
painter.drawRect(ox+4*cellx+I*2*cellx+cellx, oy-h, cellx, h); painter.drawRect(ox+4*cellx+I*2*cellx+cellx, oy-h, cellx, h);
} }
for(int i=0;i<mPublishDateHist.entries().size();++i) for(size_t i=0;i<mPublishDateHist.entries().size();++i)
{ {
QString txt = QString::number(i); QString txt = QString::number(i);
painter.drawText(ox+4*cellx+i*2*cellx+cellx*1.5 - 0.5*fm_times.width(txt),oy+celly,txt); painter.drawText(ox+4*cellx+i*2*cellx+cellx*1.5 - 0.5*fm_times.width(txt),oy+celly,txt);
@ -357,10 +357,10 @@ void GxsIdStatisticsWidget::updateContent()
painter.drawLine(QPoint(ox+4*cellx,oy),QPoint(ox+4*cellx,oy-celly*hist_height)); painter.drawLine(QPoint(ox+4*cellx,oy),QPoint(ox+4*cellx,oy-celly*hist_height));
max_entry=0; max_entry=0;
for(int i=0;i<mLastUsedHist.entries().size();++i) for(size_t i=0;i<mLastUsedHist.entries().size();++i)
max_entry = std::max(max_entry,mLastUsedHist.entries()[i]); max_entry = std::max(max_entry,mLastUsedHist.entries()[i]);
for(int i=0;i<mLastUsedHist.entries().size();++i) for(size_t i=0;i<mLastUsedHist.entries().size();++i)
{ {
float h = floor(celly*mLastUsedHist.entries()[i]/(float)max_entry*hist_height); float h = floor(celly*mLastUsedHist.entries()[i]/(float)max_entry*hist_height);
int I = mLastUsedHist.entries().size() - 1 - i; int I = mLastUsedHist.entries().size() - 1 - i;
@ -369,7 +369,7 @@ void GxsIdStatisticsWidget::updateContent()
painter.setPen(QColor::fromRgb(0,0,0)); painter.setPen(QColor::fromRgb(0,0,0));
painter.drawRect(ox+4*cellx+I*2*cellx+cellx, oy-h, cellx, h); painter.drawRect(ox+4*cellx+I*2*cellx+cellx, oy-h, cellx, h);
} }
for(int i=0;i<mLastUsedHist.entries().size();++i) for(size_t i=0;i<mLastUsedHist.entries().size();++i)
{ {
QString txt = QString::number(i); QString txt = QString::number(i);
painter.drawText(ox+4*cellx+i*2*cellx+cellx*1.5 - 0.5*fm_times.width(txt),oy+celly,txt); painter.drawText(ox+4*cellx+i*2*cellx+cellx*1.5 - 0.5*fm_times.width(txt),oy+celly,txt);
@ -393,16 +393,13 @@ void GxsIdStatisticsWidget::updateContent()
GxsIdStatisticsWidget::GxsIdStatisticsWidget(QWidget *parent) GxsIdStatisticsWidget::GxsIdStatisticsWidget(QWidget *parent)
: QWidget(parent) : QWidget(parent)
, mMaxHeight(0), mNbWeeks(52), mNbHours(52) ,mTotalIdentities(0)
{ {
float size = QFontMetricsF(font()).height() ; float size = QFontMetricsF(font()).height() ;
float fact = size/14.0 ; float fact = size/14.0 ;
mNbWeeks = 52; mMaxWidth = 400*fact ;
mNbHours = 52; //mCurrentN = PARTIAL_VIEW_SIZE/2+1 ;
mMaxWidth = 400*fact ;
mMaxHeight = 0 ;
//mCurrentN = PARTIAL_VIEW_SIZE/2+1 ;
} }
#ifdef TODO #ifdef TODO