Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Merge remote-tracking branch 'upstream/master'"

Browse Source 
This reverts commit c390af5844, reversing
changes made to 1553508776.

bad commit needs to be reverted
This commit is contained in:
Tushar Garg 2023-04-09 22:07:35 +05:30
parent b3f55c5b51
commit 23dd7270f9
5 changed files with 27 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libbitdht

@ -1 +1 @@
Subproject commit 2ddc86fb575a61170f4c06a00152e3e7dc74c8f4
Subproject commit 659423769541169457c41f71c8a038e2d64ba079

2
libretroshare

@ -1 +1 @@
Subproject commit 036107c6ace161832100776077a11a3d1657d291
Subproject commit 74cd958cf8a3c8b3e2d3f8a22657b5e16bdad476

22
retroshare-gui/src/gui/settings/ChannelPage.cpp
View File

@ -22,8 +22,6 @@
#include "rsharesettings.h"
#include "util/misc.h"
#include "gui/notifyqt.h"
#include "../../libretroshare/src/retroshare/rsgxschannels.h"
#include "../../libretroshare/src/services/p3gxschannels.h"
ChannelPage::ChannelPage(QWidget * parent, Qt::WindowFlags flags)
: ConfigPage(parent, flags)
@ -35,10 +33,7 @@ ChannelPage::ChannelPage(QWidget * parent, Qt::WindowFlags flags)
ui.groupFrameSettingsWidget->setOpenAllInNewTabText(tr("Open each channel in a new tab"));
ui.groupFrameSettingsWidget->setType(GroupFrameSettings::Channel) ;
connect(ui.emoteicon_checkBox,SIGNAL(toggled(bool)),this,SLOT(updateEmotes())) ;
// Connecting the spin box with the maximum auto download size in channels
connect(ui.autoDownloadSpinBox, SIGNAL(valueChanged(int)), this, SLOT(updateMaxAutoDownloadSizeLimit(int)));
connect(ui.emoteicon_checkBox,SIGNAL(toggled(bool)),this,SLOT(updateEmotes())) ;
}
@ -54,13 +49,6 @@ void ChannelPage::load()
Settings->beginGroup(QString("ChannelPostsWidget"));
whileBlocking(ui.emoteicon_checkBox)->setChecked(Settings->value("Emoteicons_ChannelDecription", true).toBool());
Settings->endGroup();
// Getting the maximum auto download size from the configuration
uint64_t maxAutoDownloadSize;
rsGxsChannels->getMaxAutoDownloadSizeLimit(maxAutoDownloadSize);
int temp=(maxAutoDownloadSize/(Size_Of_1_GB));
whileBlocking(ui.autoDownloadSpinBox)->setValue(temp);
}
void ChannelPage::updateEmotes()
@ -69,11 +57,3 @@ void ChannelPage::updateEmotes()
Settings->setValue("Emoteicons_ChannelDecription", ui.emoteicon_checkBox->isChecked());
Settings->endGroup();
}
// Function to update the maximum size allowed for auto download in channels
void ChannelPage::updateMaxAutoDownloadSizeLimit(int value)
{
uint64_t temp=(static_cast<uint64_t>(value)*Size_Of_1_GB);
rsGxsChannels->setMaxAutoDownloadSizeLimit(temp);
}

9
retroshare-gui/src/gui/settings/ChannelPage.h
View File

@ -25,8 +25,6 @@
#include "ui_ChannelPage.h"
#include "gui/common/FilesDefs.h"
#define Size_Of_1_GB (1024 * 1024 * 1024) // It is the size of 1 GB in bytes.
class ChannelPage : public ConfigPage
{
Q_OBJECT
@ -36,7 +34,7 @@ public:
~ChannelPage();
/** Loads the settings for this page */
virtual void load();
virtual void load();
virtual QPixmap iconPixmap() const { return FilesDefs::getPixmapFromQtResourcePath(":/icons/settings/channels.svg") ; }
virtual QString pageName() const { return tr("Channels") ; }
@ -44,10 +42,7 @@ public:
private slots:
void updateEmotes();
// Function to update the maximum size allowed for auto download in channels
void updateMaxAutoDownloadSizeLimit(int value);
private:
Ui::ChannelPage ui;
};

70
retroshare-gui/src/gui/settings/ChannelPage.ui
View File

@ -6,23 +6,22 @@
<rect>
<x>0</x>
<y>0</y>
<width>526</width>
<width>423</width>
<height>334</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="3" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
<layout class="QGridLayout" name="gridLayout_3">
<item row="1" column="0">
<widget class="QGroupBox" name="tabsGroupBox">
<property name="title">
<string>Tabs</string>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>5</height>
</size>
</property>
</spacer>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="GroupFrameSettingsWidget" name="groupFrameSettingsWidget" native="true"/>
</item>
</layout>
</widget>
</item>
<item row="0" column="0">
<widget class="QGroupBox" name="generalGroupBox">
@ -40,43 +39,18 @@
</layout>
</widget>
</item>
<item row="1" column="0">
<widget class="QGroupBox" name="tabsGroupBox">
<property name="title">
<string>Tabs</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="GroupFrameSettingsWidget" name="groupFrameSettingsWidget" native="true"/>
</item>
</layout>
</widget>
</item>
<item row="2" column="0">
<widget class="QGroupBox" name="downloadsGroupBox">
<property name="title">
<string>Downloads</string>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QSpinBox" name="autoDownloadSpinBox">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>200</number>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label">
<property name="text">
<string>Maximum Auto Download Size (in GBs)</string>
</property>
</widget>
</item>
</layout>
</widget>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>