Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-04-20 15:25:57 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'RetroShare:master' into fileuploadstatsv2

Browse Source
This commit is contained in:
defnax 2025-01-03 22:37:51 +01:00 committed by GitHub
commit 34d1dcecf6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
38 changed files with 986 additions and 786 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -36,3 +36,6 @@
[submodule "retroshare-webui"]
path = retroshare-webui
url = https://github.com/RetroShare/RSNewWebUI.git
[submodule "supportlibs/librnp"]
path = supportlibs/librnp
url = https://github.com/rnpgp/rnp.git

5
RetroShare.pro
View File

@ -25,9 +25,6 @@ CONFIG += c++14
TEMPLATE = subdirs
SUBDIRS += openpgpsdk
openpgpsdk.file = openpgpsdk/src/openpgpsdk.pro
rs_jsonapi:isEmpty(JSONAPI_GENERATOR_EXE) {
SUBDIRS += jsonapi-generator
jsonapi-generator.file = jsonapi-generator/src/jsonapi-generator.pro
@ -36,7 +33,7 @@ rs_jsonapi:isEmpty(JSONAPI_GENERATOR_EXE) {
SUBDIRS += libbitdht
libbitdht.file = libbitdht/src/libbitdht.pro
libretroshare.depends += openpgpsdk libbitdht
libretroshare.depends += libbitdht
SUBDIRS += libretroshare
libretroshare.file = libretroshare/src/libretroshare.pro

3
build_scripts/OSX/makeOSXPackage.sh
View File

@ -2,7 +2,7 @@
APP="RetroShare"
RSVERSION="0.6.7a"
QTVERSION="Qt-5.14.1"
QTVERSION="Qt-5.15.11"
# Install the 7z to create dmg archives.
#brew list p7zip || brew install p7zip
@ -21,6 +21,7 @@ rm -rf qrc
/usr/libexec/PlistBuddy -c "Delete :CFBundleGetInfoString" retroshare.app/Contents/Info.plist
/usr/libexec/PlistBuddy -c "Add :CFBundleVersion string $RSVERSION" retroshare.app/Contents/Info.plist
/usr/libexec/PlistBuddy -c "Add :CFBundleShortVersionString string $RSVERSION" retroshare.app/Contents/Info.plist
/usr/libexec/PlistBuddy -c "Delete :NSRequiresAquaSystemAppearance" retroshare.app/Contents/Info.plist
# This automatically creates retroshare.dmg

2
build_scripts/Windows-msys2/build/build.bat
View File

@ -18,6 +18,8 @@ if errorlevel 1 goto error_env
if not "%ParamNoupdate%"=="1" (
:: Install needed things
%EnvMSYS2Cmd% "pacman --noconfirm --needed -S make git mingw-w64-%RsMSYS2Architecture%-toolchain mingw-w64-%RsMSYS2Architecture%-qt5 mingw-w64-%RsMSYS2Architecture%-miniupnpc mingw-w64-%RsMSYS2Architecture%-sqlcipher mingw-w64-%RsMSYS2Architecture%-cmake mingw-w64-%RsMSYS2Architecture%-rapidjson"
:: rnp
%EnvMSYS2Cmd% "pacman --noconfirm --needed -S mingw-w64-%RsMSYS2Architecture%-json-c mingw-w64-%RsMSYS2Architecture%-libbotan"
:: Webui
if "%ParamWebui%"=="1" %EnvMSYS2Cmd% "pacman --noconfirm --needed -S mingw-w64-%RsMSYS2Architecture%-doxygen"

1
build_scripts/Windows-msys2/build/pack.bat
View File

@ -105,6 +105,7 @@ copy "%RsBuildPath%\retroshare-nogui\src\%RsBuildConfig%\retroshare*-nogui.exe"
copy "%RsBuildPath%\retroshare-service\src\%RsBuildConfig%\retroshare*-service.exe" "%RsDeployPath%" %Quite%
copy "%RsBuildPath%\supportlibs\cmark\build\src\libcmark.dll" "%RsDeployPath%" %Quite%
if exist "%RsBuildPath%\libretroshare\src\lib\retroshare.dll" copy "%RsBuildPath%\libretroshare\src\lib\retroshare.dll" "%RsDeployPath%" %Quite%
if exist "%RsBuildPath%\supportlibs\librnp\Build\src\lib\librnp.dll" copy "%RsBuildPath%\supportlibs\librnp\Build\src\lib\librnp.dll" "%RsDeployPath%" %Quite%
if exist "%RsBuildPath%\retroshare-friendserver\src\%RsBuildConfig%\retroshare-friendserver.exe" (
copy "%RsBuildPath%\retroshare-friendserver\src\%RsBuildConfig%\retroshare-friendserver.exe" "%RsDeployPath%" %Quite%
)

2
build_scripts/Windows-msys2/env/tools/prepare-msys2.bat vendored
View File

@ -16,7 +16,7 @@ if "%~1"=="clean" (
goto exit
)
set MSYS2Version=20231026
set MSYS2Version=20241208
set MSYS2Install=msys2-base-x86_64-%MSYS2Version%.sfx.exe
set MSYS2Url=https://github.com/msys2/msys2-installer/releases/download/%MSYS2Version:~0,4%-%MSYS2Version:~4,2%-%MSYS2Version:~6,2%/%MSYS2Install%

59
build_scripts/Windows/build-libs/Makefile
View File

@ -13,12 +13,18 @@ LIBMICROHTTPD_VERSION=0.9.75
FFMPEG_VERSION=4.4
RAPIDJSON_VERSION=1.1.0
XAPIAN_VERSION=1.4.19
#RNP_VERSION=0.17.1
# libaries for rnp
JSON_C_VERSION=0.18
BOTAN_VERSION=2.19.5
DOWNLOAD_PATH?=download
BUILD_PATH=build
LIBS_PATH?=libs
all: dirs zlib bzip2 miniupnpc openssl speex speexdsp libxml2 libxslt curl sqlcipher libmicrohttpd ffmpeg rapidjson xapian copylibs
all: dirs zlib bzip2 miniupnpc openssl speex speexdsp libxml2 libxslt curl sqlcipher libmicrohttpd ffmpeg rapidjson xapian jsonc botan copylibs
#rnp
download: \
$(DOWNLOAD_PATH)/zlib-$(ZLIB_VERSION).tar.gz \
@ -363,6 +369,57 @@ $(BUILD_PATH)/xapian-core-$(XAPIAN_VERSION): $(DOWNLOAD_PATH)/xapian-core-$(XAPI
rm -r -f xapian-core-$(XAPIAN_VERSION)
mv $(BUILD_PATH)/xapian-core-$(XAPIAN_VERSION).tmp $(BUILD_PATH)/xapian-core-$(XAPIAN_VERSION)
jsonc: $(BUILD_PATH)/json-c-$(JSON_C_VERSION)
$(BUILD_PATH)/json-c-$(JSON_C_VERSION):
# prepare
rm -r -f $(BUILD_PATH)/json-c-*
[ -d "json-c-$(JSON_C_VERSION)" ] || git clone https://github.com/json-c/json-c.git --depth=1 --branch json-c-$(JSON_C_VERSION) "json-c-$(JSON_C_VERSION)"
# build
mkdir -p json-c-$(JSON_C_VERSION)/build
cd json-c-$(JSON_C_VERSION)/build && cmake .. -G"MSYS Makefiles" -Wno-dev -DCMAKE_BUILD_TYPE="release" -DBUILD_SHARED_LIBS=off -DBUILD_STATIC_LIBS=on -DBUILD_TESTING=off -DCMAKE_CXX_FLAGS="-D__MINGW_USE_VC2005_COMPAT" -DCMAKE_INSTALL_PREFIX="`pwd`/install" -DCMAKE_INSTALL_PREFIX="`pwd`/../../$(BUILD_PATH)/json-c-$(JSON_C_VERSION).tmp"
cd json-c-$(JSON_C_VERSION)/build && make install
# cleanup
rm -r -f json-c-$(JSON_C_VERSION)
mv $(BUILD_PATH)/json-c-$(JSON_C_VERSION).tmp $(BUILD_PATH)/json-c-$(JSON_C_VERSION)
botan: $(BUILD_PATH)/botan-$(BOTAN_VERSION)
$(BUILD_PATH)/botan-$(BOTAN_VERSION):
# prepare
pacman --needed --noconfirm -S python3
rm -r -f $(BUILD_PATH)/botan-*
[ -d "botan-$(BOTAN_VERSION)" ] || git clone https://github.com/randombit/botan.git --depth=1 --branch $(BOTAN_VERSION) "botan-$(BOTAN_VERSION)"
# build
if [ $(MSYSTEM) = "MINGW32" ] ; then cd botan-$(BOTAN_VERSION) && ./configure.py --os=mingw --cpu=x86_32 --disable-shared-library --enable-static-library --extra-cxxflags="-D__MINGW_USE_VC2005_COMPAT" --prefix="`pwd`/../$(BUILD_PATH)/botan-$(BOTAN_VERSION).tmp" ; fi
if [ $(MSYSTEM) = "MINGW64" ] ; then cd botan-$(BOTAN_VERSION) && ./configure.py --os=mingw --cpu=x86_64 --disable-shared-library --enable-static-library --prefix="`pwd`/../$(BUILD_PATH)/botan-$(BOTAN_VERSION).tmp" ; fi
cd botan-$(BOTAN_VERSION) && make install
# cleanup
rm -r -f botan-$(BOTAN_VERSION)
mv $(BUILD_PATH)/botan-$(BOTAN_VERSION).tmp $(BUILD_PATH)/botan-$(BOTAN_VERSION)
rnp: $(BUILD_PATH)/rnp-$(RNP_VERSION)
$(BUILD_PATH)/rnp-$(RNP_VERSION):
# prepare
rm -r -f $(BUILD_PATH)/rnp-*
[ -d "rnp-$(RNP_VERSION)" ] || git clone https://github.com/rnpgp/rnp.git --depth=1 --branch v$(RNP_VERSION) --recurse-submodules --shallow-submodules "rnp-$(RNP_VERSION)"
# build
mkdir -p rnp-$(RNP_VERSION)/build
cd rnp-$(RNP_VERSION)/build && cmake .. -G"MSYS Makefiles" -Wno-dev -DCMAKE_INSTALL_PREFIX="`pwd`/install" -DBUILD_SHARED_LIBS=yes -DBUILD_TESTING=off -DCMAKE_CXX_FLAGS="-D__MINGW_USE_VC2005_COMPAT -D__STDC_FORMAT_MACROS" -DBZIP2_INCLUDE_DIR="`pwd`/../../$(BUILD_PATH)/bzip2-$(BZIP2_VERSION)/include" -DBZIP2_LIBRARY_RELEASE="`pwd`/../../$(BUILD_PATH)/bzip2-$(BZIP2_VERSION)/lib/libbz2.a" -DBZIP2_LIBRARIES="`pwd`/../../$(BUILD_PATH)/bzip2-$(BZIP2_VERSION)/lib/libbz2.a" -DZLIB_INCLUDE_DIR="`pwd`/../../$(BUILD_PATH)/zlib-$(ZLIB_VERSION)/include" -DZLIB_LIBRARY="`pwd`/../../$(BUILD_PATH)/zlib-$(ZLIB_VERSION)/lib/libz.a" -DJSON-C_INCLUDE_DIR="`pwd`/../../$(BUILD_PATH)/json-c-$(JSON_C_VERSION)/include/json-c" -DJSON-C_LIBRARY="`pwd`/../../$(BUILD_PATH)/json-c-$(JSON_C_VERSION)/lib/libjson-c.a" -DBOTAN_INCLUDE_DIR="`pwd`/../../$(BUILD_PATH)/botan-$(BOTAN_VERSION)/include/botan-`echo $(BOTAN_VERSION) | cut -c1-1`" -DBOTAN_LIBRARY="`pwd`/../../$(BUILD_PATH)/botan-$(BOTAN_VERSION)/lib/libbotan-`echo $(BOTAN_VERSION) | cut -c1-1`.a"
cmake --build rnp-$(RNP_VERSION)/build
# copy files
mkdir -p $(BUILD_PATH)/rnp-$(RNP_VERSION).tmp/include/rnp
cp -r rnp-$(RNP_VERSION)/include/rnp/* $(BUILD_PATH)/rnp-$(RNP_VERSION).tmp/include/rnp/
cp -r rnp-$(RNP_VERSION)/build/src/lib/rnp/* $(BUILD_PATH)/rnp-$(RNP_VERSION).tmp/include/rnp/
mkdir -p $(BUILD_PATH)/rnp-$(RNP_VERSION).tmp/lib
cp -r rnp-$(RNP_VERSION)/build/src/lib/librnp.dll.a $(BUILD_PATH)/rnp-$(RNP_VERSION).tmp/lib/
mkdir -p $(BUILD_PATH)/rnp-$(RNP_VERSION).tmp/bin
cp -r rnp-$(RNP_VERSION)/build/src/lib/librnp.dll $(BUILD_PATH)/rnp-$(RNP_VERSION).tmp/bin/
# cleanup
rm -r -f rnp-$(RNP_VERSION)
mv $(BUILD_PATH)/rnp-$(RNP_VERSION).tmp $(BUILD_PATH)/rnp-$(RNP_VERSION)
copylibs:
rm -r -f $(LIBS_PATH) ; \
mkdir -p $(LIBS_PATH) ; \

1
build_scripts/Windows/build/pack.bat
View File

@ -96,6 +96,7 @@ copy nul "%RsDeployPath%\portable" %Quite%
echo copy binaries
copy "%RsBuildPath%\retroshare-gui\src\%RsBuildConfig%\retroshare*.exe" "%RsDeployPath%" %Quite%
if exist "%RsBuildPath%\libretroshare\src\lib\retroshare.dll" copy "%RsBuildPath%\libretroshare\src\lib\retroshare.dll" "%RsDeployPath%" %Quite%
if exist "%RsBuildPath%\supportlibs\librnp\Build\src\lib\librnp.dll" copy "%RsBuildPath%\supportlibs\librnp\Build\src\lib\librnp.dll" "%RsDeployPath%" %Quite%
if "%ParamService%"=="1" (
copy "%RsBuildPath%\retroshare-service\src\%RsBuildConfig%\retroshare*-service.exe" "%RsDeployPath%" %Quite%

6
build_scripts/Windows/env/tools/prepare-msys2.bat vendored
View File

@ -16,13 +16,13 @@ if "%~1"=="clean" (
goto exit
)
set MSYS2Version=20231026
set MSYS2Version=20241208
set MSYS2Install=msys2-base-x86_64-%MSYS2Version%.sfx.exe
set MSYS2Url=https://github.com/msys2/msys2-installer/releases/download/%MSYS2Version:~0,4%-%MSYS2Version:~4,2%-%MSYS2Version:~6,2%/%MSYS2Install%
set MSYS2UnpackPath=%EnvMSYS2Path%\msys64
set CMakeInstall=cmake-3.19.0-win32-x86.zip
set CMakeUrl=https://github.com/Kitware/CMake/releases/download/v3.19.0/%CMakeInstall%
set CMakeInstall=cmake-3.31.3-windows-i386.zip
set CMakeUrl=https://github.com/Kitware/CMake/releases/download/v3.31.3/%CMakeInstall%
if exist "%MSYS2UnpackPath%\usr\bin\pacman.exe" (
if "%~1"=="reinstall" (

4
build_scripts/Windows/env/tools/prepare-tools.bat vendored
View File

@ -19,9 +19,9 @@ set MinGitInstallPath=%EnvToolsPath%\MinGit
set DoxygenInstall=doxygen-1.9.6.windows.x64.bin.zip
set DoxygenUrl=https://github.com/doxygen/doxygen/releases/download/Release_1_9_6/%DoxygenInstall%
set DoxygenInstallPath=%EnvToolsPath%\doxygen
set CMakeVersion=cmake-3.19.0-win32-x86
set CMakeVersion=cmake-3.31.3-windows-i386
set CMakeInstall=%CMakeVersion%.zip
set CMakeUrl=https://github.com/Kitware/CMake/releases/download/v3.19.0/%CMakeInstall%
set CMakeUrl=https://github.com/Kitware/CMake/releases/download/v3.31.3/%CMakeInstall%
set CMakeInstallPath=%EnvToolsPath%\cmake
set TorProjectUrl=https://www.torproject.org
set TorDownloadIndexUrl=%TorProjectUrl%/download/tor

1
build_scripts/Windows/installer/retroshare-Qt5.nsi
View File

@ -247,6 +247,7 @@ Section $(Section_Main) Section_Main
; External binaries
File "${EXTERNAL_LIB_DIR}\bin\miniupnpc.dll"
File "${RELEASEDIR}\supportlibs\librnp\Build\src\lib\librnp.dll"
!if ${ARCHITECTURE} == "x86"
File "${EXTERNAL_LIB_DIR}\bin\libcrypto-1_1.dll"
File "${EXTERNAL_LIB_DIR}\bin\libssl-1_1.dll"

2
data/retroshare.desktop
View File

@ -7,5 +7,5 @@ Exec=/usr/bin/retroshare %U
Icon=/usr/share/pixmaps/retroshare.xpm
Terminal=false
Type=Application
Categories=Application;Network;P2P;Feed;Chat;InstantMessaging
Categories=Application;Network;Email;InstantMessaging;Chat;Feed;FileTransfer;P2P
MimeType=x-scheme-handler/retroshare;

2
libretroshare

@ -1 +1 @@
Subproject commit 402f32eda026c3ec3e429b5fb842e87ebd985d73
Subproject commit 2a4df811f6bfe1904bc3956f285aa0fc891f9fd4

2
openpgpsdk

@ -1 +1 @@
Subproject commit b41667912751a453e8e5d4733215a0609277a26f
Subproject commit df542663d8bd698a8b5541fc6db07da6c59f1c3a

4
plugins/FeedReader/gui/FeedReaderDialog.ui
View File

@ -57,10 +57,10 @@
<item row="0" column="0">
<widget class="QFrame" name="toolBarFrame">
<property name="frameShape">
<enum>QFrame::Box</enum>
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
<enum>QFrame::Raised</enum>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<property name="leftMargin">

8
retroshare-friendserver/src/friendserver.cc
View File

@ -8,7 +8,11 @@
#include "pgp/pgpkeyutil.h"
#include "pgp/rscertificate.h"
#ifdef USE_OPENPGPSDK
#include "pgp/openpgpsdkhandler.h"
#else
#include "pgp/rnppgphandler.h"
#endif
#include "friendserver.h"
#include "friend_server/fsitem.h"
@ -393,7 +397,11 @@ FriendServer::FriendServer(const std::string& base_dir,const std::string& listen
std::string pgp_private_keyring_path = RsDirUtil::makePath(base_dir,"pgp_private_keyring") ; // not used.
std::string pgp_trustdb_path = RsDirUtil::makePath(base_dir,"pgp_trustdb") ; // not used.
#ifdef USE_OPENPGPSDK
mPgpHandler = new OpenPGPSDKHandler(pgp_public_keyring_path,pgp_private_keyring_path,pgp_trustdb_path,pgp_lock_path);
#else
mPgpHandler = new RNPPGPHandler(pgp_public_keyring_path,pgp_private_keyring_path,pgp_trustdb_path,pgp_lock_path);
#endif
// Random bias. Should be cryptographically safe.

6
retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.ui
View File

@ -23,10 +23,10 @@
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::Box</enum>
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
<enum>QFrame::Raised</enum>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="leftMargin">
@ -399,8 +399,8 @@ border-image: url(:/images/closepressed.png)
</customwidget>
</customwidgets>
<resources>
<include location="../images.qrc"/>
<include location="../icons.qrc"/>
<include location="../images.qrc"/>
</resources>
<connections/>
</ui>

8
retroshare-gui/src/gui/FriendsDialog.ui
View File

@ -102,7 +102,7 @@
<enum>Qt::NoFocus</enum>
</property>
<property name="icon">
<iconset resource="images.qrc">
<iconset resource="icons.qrc">
<normaloff>:/icons/help_64.png</normaloff>:/icons/help_64.png</iconset>
</property>
<property name="checkable">
@ -132,10 +132,10 @@
<string notr="true"/>
</property>
<property name="frameShape">
<enum>QFrame::Box</enum>
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="headerBFrame_GL">
<property name="leftMargin">
@ -401,8 +401,8 @@
</customwidget>
</customwidgets>
<resources>
<include location="images.qrc"/>
<include location="icons.qrc"/>
<include location="images.qrc"/>
</resources>
<connections/>
</ui>

50
retroshare-gui/src/gui/Identity/IdDialog.cpp
View File

@ -198,7 +198,7 @@ IdDialog::IdDialog(QWidget *parent)
mStateHelper->addLoadPlaceholder(IDDIALOG_IDLIST, ui->idTreeWidget, false);
mStateHelper->addClear(IDDIALOG_IDLIST, ui->idTreeWidget);
mStateHelper->addWidget(IDDIALOG_IDDETAILS, ui->lineEdit_Nickname);
//mStateHelper->addWidget(IDDIALOG_IDDETAILS, ui->lineEdit_Nickname);
mStateHelper->addWidget(IDDIALOG_IDDETAILS, ui->lineEdit_PublishTS);
mStateHelper->addWidget(IDDIALOG_IDDETAILS, ui->lineEdit_KeyId);
mStateHelper->addWidget(IDDIALOG_IDDETAILS, ui->lineEdit_Type);
@ -214,7 +214,7 @@ IdDialog::IdDialog(QWidget *parent)
mStateHelper->addWidget(IDDIALOG_IDDETAILS, ui->label_positive);
mStateHelper->addWidget(IDDIALOG_IDDETAILS, ui->label_negative);
mStateHelper->addLoadPlaceholder(IDDIALOG_IDDETAILS, ui->lineEdit_Nickname);
//mStateHelper->addLoadPlaceholder(IDDIALOG_IDDETAILS, ui->lineEdit_Nickname);
mStateHelper->addLoadPlaceholder(IDDIALOG_IDDETAILS, ui->lineEdit_PublishTS);
mStateHelper->addLoadPlaceholder(IDDIALOG_IDDETAILS, ui->lineEdit_KeyId);
mStateHelper->addLoadPlaceholder(IDDIALOG_IDDETAILS, ui->lineEdit_Type);
@ -225,7 +225,7 @@ IdDialog::IdDialog(QWidget *parent)
mStateHelper->addLoadPlaceholder(IDDIALOG_IDDETAILS, ui->overallOpinion_TF);
mStateHelper->addLoadPlaceholder(IDDIALOG_IDDETAILS, ui->usageStatistics_TB);
mStateHelper->addClear(IDDIALOG_IDDETAILS, ui->lineEdit_Nickname);
//mStateHelper->addClear(IDDIALOG_IDDETAILS, ui->lineEdit_Nickname);
mStateHelper->addClear(IDDIALOG_IDDETAILS, ui->lineEdit_PublishTS);
mStateHelper->addClear(IDDIALOG_IDDETAILS, ui->lineEdit_KeyId);
mStateHelper->addClear(IDDIALOG_IDDETAILS, ui->lineEdit_Type);
@ -429,14 +429,23 @@ void IdDialog::handleEvent_main_thread(std::shared_ptr<const RsEvent> event)
switch(e->mIdentityEventCode)
{
case RsGxsIdentityEventCode::DELETED_IDENTITY:
case RsGxsIdentityEventCode::NEW_IDENTITY:
if(mId == e->mIdentityId)
{
mId.clear();
updateIdentity();
}
updateIdList();
break;
case RsGxsIdentityEventCode::NEW_IDENTITY:
case RsGxsIdentityEventCode::UPDATED_IDENTITY:
if (isVisible())
{
if(rsIdentity->isOwnId(RsGxsId(e->mIdentityId)))
updateIdList();
else
updateIdTimer.start(3000); // use a timer for events not generated by local changes
updateIdTimer.start(3000); // use a timer for events not generated by local changes which generally
// come in large herds. Allows to group multiple changes into a single UI update.
}
else
needUpdateIdsOnNextShow = true;
@ -479,13 +488,13 @@ void IdDialog::handleEvent_main_thread(std::shared_ptr<const RsEvent> event)
void IdDialog::clearPerson()
{
QFontMetricsF f(ui->avLabel_Person->font()) ;
//QFontMetricsF f(ui->avLabel_Person->font()) ;
ui->avLabel_Person->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/people.png").scaled(f.height()*4,f.height()*4,Qt::KeepAspectRatio,Qt::SmoothTransformation));
ui->headerTextLabel_Person->setText(tr("People"));
ui->info_Frame_Invite->hide();
ui->avatarLabel->clear();
ui->avatarLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/people.png"));
whileBlocking(ui->ownOpinion_CB)->setCurrentIndex(1);
whileBlocking(ui->autoBanIdentities_CB)->setChecked(false);
@ -1330,6 +1339,7 @@ void IdDialog::updateSelection()
void IdDialog::updateIdList()
{
//int accept = filter;
std::cerr << "Updating ID list" << std::endl;
RsThread::async([this]()
{
@ -1512,7 +1522,9 @@ void IdDialog::loadIdentities(const std::map<RsGxsGroupId,RsGxsIdGroup>& ids_set
{
auto ids_set(ids_set_const);
//First: Get current item to restore after
std::cerr << "Loading ID list" << std::endl;
//First: Get current item to restore after
RsGxsGroupId oldCurrentId = mIdToNavigate;
{
QTreeWidgetItem *oldCurrent = ui->idTreeWidget->currentItem();
@ -1598,9 +1610,9 @@ void IdDialog::loadIdentities(const std::map<RsGxsGroupId,RsGxsIdGroup>& ids_set
int allCount = allItem->childCount() ;
int ownCount = ownItem->childCount();
contactsItem->setText(0, tr("My contacts") + " (" + QString::number( contactsCount ) + ")" );
allItem->setText(0, tr("All") + " (" + QString::number( allCount ) + ")" );
ownItem->setText(0, tr("My own identities") + " (" + QString::number( ownCount ) + ")" );
contactsItem->setText(0, tr("My contacts") + ((contactsCount>0)?" (" + QString::number( contactsCount ) + ")":"") );
allItem->setText(0, tr("All") + ((allCount>0)?" (" + QString::number( allCount ) + ")":"") );
ownItem->setText(0, tr("My own identities") + ((ownCount>0)?" (" + QString::number( ownCount ) + ")":"") );
//Restore expanding
@ -1675,7 +1687,7 @@ void IdDialog::loadIdentity(RsGxsIdGroup data)
RsPgpId ownPgpId = rsPeers->getGPGOwnId();
ui->lineEdit_PublishTS->setText(QDateTime::fromMSecsSinceEpoch(qint64(1000)*data.mMeta.mPublishTs).toString(Qt::SystemLocaleShortDate));
ui->lineEdit_Nickname->setText(QString::fromUtf8(data.mMeta.mGroupName.c_str()).left(RSID_MAXIMUM_NICKNAME_SIZE));
//ui->lineEdit_Nickname->setText(QString::fromUtf8(data.mMeta.mGroupName.c_str()).left(RSID_MAXIMUM_NICKNAME_SIZE));
ui->lineEdit_KeyId->setText(QString::fromStdString(data.mMeta.mGroupId.toStdString()));
//ui->lineEdit_GpgHash->setText(QString::fromStdString(data.mPgpIdHash.toStdString()));
if(data.mPgpKnown)
@ -1701,8 +1713,8 @@ void IdDialog::loadIdentity(RsGxsIdGroup data)
//ui->avLabel_Person->setPixmap(pixmap);
//ui->avatarLabel->setPixmap(pixmap);
QFontMetricsF f(ui->avLabel_Person->font()) ;
ui->avLabel_Person->setPixmap(pixmap.scaled(f.height()*4,f.height()*4,Qt::KeepAspectRatio,Qt::SmoothTransformation));
//QFontMetricsF f(ui->avLabel_Person->font()) ;
//ui->avLabel_Person->setPixmap(pixmap.scaled(f.height()*4,f.height()*4,Qt::KeepAspectRatio,Qt::SmoothTransformation));
ui->avatarLabel->setPixmap(pixmap.scaled(ui->inviteButton->width(),ui->inviteButton->width(),Qt::IgnoreAspectRatio,Qt::SmoothTransformation));
ui->avatarLabel->setScaledContents(true);
@ -2086,14 +2098,12 @@ void IdDialog::removeIdentity()
return;
}
if ((QMessageBox::question(this, tr("Really delete?"), tr("Do you really want to delete this identity?"), QMessageBox::Yes|QMessageBox::No, QMessageBox::No))== QMessageBox::Yes)
if ((QMessageBox::question(this, tr("Really delete?"), tr("Do you really want to delete this identity?\nThis cannot be undone."), QMessageBox::Yes|QMessageBox::No, QMessageBox::No))== QMessageBox::Yes)
{
std::string keyId = item->text(RSID_COL_KEYID).toStdString();
std::string keyId = item->text(RSID_COL_KEYID).toStdString();
RsGxsId kid(keyId);
uint32_t dummyToken = 0;
RsGxsIdGroup group;
group.mMeta.mGroupId=RsGxsGroupId(keyId);
rsIdentity->deleteIdentity(dummyToken, group);
rsIdentity->deleteIdentity(kid);
}
}

1127
retroshare-gui/src/gui/Identity/IdDialog.ui
View File

File diff suppressed because it is too large Load Diff

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

@ -161,7 +161,7 @@ void StartDialog::notSecureWarning()
QMessageBox::warning ( this, tr("Warning"), tr("The password to your SSL certificate (your node) will be stored encrypted in your Keychain. \n\n Your PGP passwd will not be stored.\n\nThis choice can be reverted in settings."), QMessageBox::Ok);
#else
// this handles all linux systems at once.
QMessageBox::warning ( this, tr("Warning"), tr("The password to your SSL certificate (your node) will be stored encrypted in your Gnome Keyring. \n\n Your PGP passwd will not be stored.\n\nThis choice can be reverted in settings."), QMessageBox::Ok);
QMessageBox::warning ( this, tr("Warning"), tr("The password to your SSL certificate (your node) will be stored encrypted in your desktop's keyring. \n\n Your PGP passwd will not be stored.\n\nThis choice can be reverted in settings."), QMessageBox::Ok);
#endif
#endif
}

4
retroshare-gui/src/gui/common/AvatarDefs.cpp
View File

@ -54,7 +54,9 @@ bool AvatarDefs::getAvatarFromSslId(const RsPeerId& sslId, QPixmap &avatar, cons
/* get avatar */
rsMsgs->getAvatarData(RsPeerId(sslId), data, size);
if (size == 0) {
avatar = FilesDefs::getPixmapFromQtResourcePath(defaultImage);
if (!defaultImage.isEmpty()) {
avatar = FilesDefs::getPixmapFromQtResourcePath(defaultImage);
}
return false;
}

177
retroshare-gui/src/gui/common/FriendListModel.cpp
View File

@ -65,7 +65,7 @@ static const uint32_t NODE_DETAILS_UPDATE_DELAY = 5; // update each node every 5
RsFriendListModel::RsFriendListModel(QObject *parent)
: QAbstractItemModel(parent)
, mDisplayGroups(true), mDisplayStatusString(true)
, mDisplayGroups(true), mDisplayStatusString(true), mDisplayStatusIcon (false)
, mLastInternalDataUpdate(0), mLastNodeUpdate(0)
{
mFilterStrings.clear();
@ -141,13 +141,39 @@ template<> bool RsFriendListModel::convertInternalIdToIndex<8>(quintptr ref,Entr
return true;
}
static QIcon createAvatar(const QPixmap &avatar, const QPixmap &overlay)
{
int avatarWidth = avatar.width();
int avatarHeight = avatar.height();
QPixmap pixmap(avatar);
int overlaySize = (avatarWidth > avatarHeight) ? (avatarWidth/2.5) : (avatarHeight/2.5);
int overlayX = avatarWidth - overlaySize;
int overlayY = avatarHeight - overlaySize;
QPainter painter(&pixmap);
painter.drawPixmap(overlayX, overlayY, overlaySize, overlaySize, overlay);
QIcon icon;
icon.addPixmap(pixmap);
return icon;
}
void RsFriendListModel::setDisplayStatusString(bool b)
{
preMods();
mDisplayStatusString = b;
postMods();
}
void RsFriendListModel::setDisplayStatusIcon(bool b)
{
preMods();
mDisplayStatusIcon = b;
postMods();
}
void RsFriendListModel::setDisplayGroups(bool b)
{
mDisplayGroups = b;
@ -413,17 +439,28 @@ QVariant RsFriendListModel::textColorRole(const EntryIndex& fmpe,int column) con
{
switch(fmpe.type)
{
case ENTRY_TYPE_GROUP: return QVariant(QBrush(mTextColorGroup));
case ENTRY_TYPE_PROFILE:
case ENTRY_TYPE_NODE: return QVariant(QBrush(mTextColorStatus[onlineRole(fmpe,column).toInt()]));
case ENTRY_TYPE_GROUP: return QVariant(QBrush(mTextColorGroup));
case ENTRY_TYPE_PROFILE: return QVariant(QBrush(mTextColorStatus[onlineRole(fmpe,column).toInt()]));
case ENTRY_TYPE_NODE: return QVariant(QBrush(mTextColorStatus[statusRole(fmpe,column).toInt()]));
default:
return QVariant();
}
}
QVariant RsFriendListModel::statusRole(const EntryIndex& /*fmpe*/,int /*column*/) const
// statusRole returns the status (e.g. RS_STATUS_BUSY). It is used only to change the font color
QVariant RsFriendListModel::statusRole(const EntryIndex& fmpe,int /*column*/) const
{
return QVariant();//fmpe.mMsgStatus);
const HierarchicalNodeInformation *node = getNodeInfo(fmpe);
if(node)
{
StatusInfo status;
rsStatus->getStatus(node->node_info.id, status);
return QVariant(status.status);
}
return QVariant();
}
bool RsFriendListModel::passesFilter(const EntryIndex& e,int /*column*/) const
@ -548,6 +585,9 @@ QVariant RsFriendListModel::sortRole(const EntryIndex& entry,int column) const
}
}
// Only returns two values: RS_STATUS_ONLINE, or RS_STATUS_OFFLINE. This is used to decide on text font (bold)
// and whether profiles have children or not when offline nodes are shown.
QVariant RsFriendListModel::onlineRole(const EntryIndex& e, int /*col*/) const
{
switch(e.type)
@ -585,13 +625,10 @@ QVariant RsFriendListModel::onlineRole(const EntryIndex& e, int /*col*/) const
{
const HierarchicalNodeInformation *node = getNodeInfo(e);
if(node)
{
StatusInfo status;
rsStatus->getStatus(node->node_info.id, status);
return QVariant(status.status);
}
if(node && bool(node->node_info.state & RS_PEER_STATE_CONNECTED))
return QVariant(RS_STATUS_ONLINE);
else
return QVariant(RS_STATUS_OFFLINE);
}
}
return QVariant(RS_STATUS_OFFLINE);
@ -626,12 +663,6 @@ QVariant RsFriendListModel::fontRole(const EntryIndex& e, int col) const
}
}
class AutoEndel
{
public:
~AutoEndel() { std::cerr << std::endl;}
};
QVariant RsFriendListModel::displayRole(const EntryIndex& e, int col) const
{
#ifdef DEBUG_MODEL_INDEX
@ -750,7 +781,7 @@ QVariant RsFriendListModel::displayRole(const EntryIndex& e, int col) const
else
{
return QVariant(QString::fromUtf8(node->node_info.location.c_str())+"\n"
+ "(" + StatusDefs::name(onlineRole(e,col).toInt()) + ")");
+ "(" + StatusDefs::name(statusRole(e,col).toInt()) + ")");
}
else
return QVariant(QString::fromUtf8(node->node_info.location.c_str()));
@ -869,6 +900,69 @@ bool RsFriendListModel::getPeerOnlineStatus(const EntryIndex& e) const
return (noded && (noded->node_info.state & RS_PEER_STATE_CONNECTED));
}
const RsFriendListModel::HierarchicalNodeInformation *RsFriendListModel::getBestNodeInformation(const HierarchicalProfileInformation *profileInfo, uint32_t *status) const
{
if (status) {
*status = RS_STATUS_OFFLINE;
}
if (!profileInfo) {
return NULL;
}
const RsFriendListModel::HierarchicalNodeInformation *bestNodeInformation = NULL;
int bestStatusIndex = 0;
/* Find the best status */
for (uint32_t i = 0; i < profileInfo->child_node_indices.size(); ++i) {
const RsFriendListModel::HierarchicalNodeInformation &nodeInformation = mLocations[profileInfo->child_node_indices[i]];
StatusInfo statusInfo;
rsStatus->getStatus(nodeInformation.node_info.id, statusInfo);
int statusIndex = 0;
switch (statusInfo.status) {
case RS_STATUS_OFFLINE:
statusIndex = 1;
break;
case RS_STATUS_INACTIVE:
statusIndex = 2;
break;
case RS_STATUS_AWAY:
statusIndex = 3;
break;
case RS_STATUS_BUSY:
statusIndex = 4;
break;
case RS_STATUS_ONLINE:
statusIndex = 5;
break;
default:
std::cerr << "FriendListModel: Unknown status " << statusInfo.status << std::endl;
}
if (bestStatusIndex == 0 || statusIndex > bestStatusIndex) {
/* first status or better status */
bestStatusIndex = statusIndex;
bestNodeInformation = &nodeInformation;
if (status) {
*status = statusInfo.status;
}
}
}
if (bestStatusIndex == 0) {
return NULL;
}
return bestNodeInformation;
}
QVariant RsFriendListModel::decorationRole(const EntryIndex& entry,int col) const
{
if(col > 0)
@ -902,13 +996,42 @@ QVariant RsFriendListModel::decorationRole(const EntryIndex& entry,int col) cons
{
if(!isProfileExpanded(entry))
{
QPixmap sslAvatar = FilesDefs::getPixmapFromQtResourcePath(AVATAR_DEFAULT_IMAGE);
QPixmap sslAvatar;
bool foundAvatar = false;
const HierarchicalProfileInformation *hn = getProfileInfo(entry);
uint32_t status = RS_STATUS_OFFLINE;
const HierarchicalNodeInformation *bestNodeInformation = NULL;
for(uint32_t i=0;i<hn->child_node_indices.size();++i)
if(AvatarDefs::getAvatarFromSslId(RsPeerId(mLocations[hn->child_node_indices[i]].node_info.id.toStdString()), sslAvatar))
return QVariant(QIcon(sslAvatar));
if (mDisplayStatusIcon) {
bestNodeInformation = getBestNodeInformation(hn, &status);
if (bestNodeInformation) {
if (AvatarDefs::getAvatarFromSslId(RsPeerId(bestNodeInformation->node_info.id.toStdString()), sslAvatar, "")) {
/* Use avatar from best node */
foundAvatar = true;
}
}
}
if (!foundAvatar) {
/* Use first available avatar */
for(uint32_t i=0;i<hn->child_node_indices.size();++i) {
if(AvatarDefs::getAvatarFromSslId(RsPeerId(mLocations[hn->child_node_indices[i]].node_info.id.toStdString()), sslAvatar, "")) {
foundAvatar = true;
break;
}
}
}
if (!foundAvatar || sslAvatar.isNull()) {
sslAvatar = FilesDefs::getPixmapFromQtResourcePath(AVATAR_DEFAULT_IMAGE);
}
if (mDisplayStatusIcon) {
if (bestNodeInformation) {
QPixmap sslOverlayIcon = FilesDefs::getPixmapFromQtResourcePath(StatusDefs::imageStatus(status));
return QVariant(QIcon(createAvatar(sslAvatar, sslOverlayIcon)));
}
}
return QVariant(QIcon(sslAvatar));
}
@ -925,6 +1048,10 @@ QVariant RsFriendListModel::decorationRole(const EntryIndex& entry,int col) cons
QPixmap sslAvatar;
AvatarDefs::getAvatarFromSslId(RsPeerId(hn->node_info.id.toStdString()), sslAvatar);
if (mDisplayStatusIcon) {
QPixmap sslOverlayIcon = FilesDefs::getPixmapFromQtResourcePath(StatusDefs::imageStatus(statusRole(entry, col).toInt()));
return QVariant(QIcon(createAvatar(sslAvatar, sslOverlayIcon)));
}
return QVariant(QIcon(sslAvatar));
}

7
retroshare-gui/src/gui/common/FriendListModel.h
View File

@ -129,6 +129,10 @@ public:
void setDisplayStatusString(bool b);
bool getDisplayStatusString() const { return mDisplayStatusString; }
void setDisplayStatusIcon(bool b);
bool getDisplayStatusIcon() const { return mDisplayStatusIcon; }
EntryType getType(const QModelIndex&) const;
@ -219,11 +223,14 @@ private:
uint32_t updateFilterStatus(ForumModelIndex i,int column,const QStringList& strings);
const HierarchicalNodeInformation *getBestNodeInformation(const HierarchicalProfileInformation *profileInfo, uint32_t *status = NULL) const;
QStringList mFilterStrings;
FilterType mFilterType;
bool mDisplayGroups ;
bool mDisplayStatusString ;
bool mDisplayStatusIcon ;
rstime_t mLastInternalDataUpdate;
rstime_t mLastNodeUpdate;;

4
retroshare-gui/src/gui/common/GroupTreeWidget.ui
View File

@ -35,10 +35,10 @@
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::Box</enum>
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
<enum>QFrame::Raised</enum>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="leftMargin">

17
retroshare-gui/src/gui/common/NewFriendList.cpp
View File

@ -54,6 +54,7 @@
#include "gui/chat/ChatUserNotify.h"
#include "gui/connect/ConnectProgressDialog.h"
#include "gui/common/ElidedLabel.h"
#include "gui/notifyqt.h"
#include "NewFriendList.h"
#include "ui_NewFriendList.h"
@ -202,6 +203,9 @@ NewFriendList::NewFriendList(QWidget */*parent*/) : /* RsAutoUpdatePage(5000,par
rsEvents->registerEventsHandler( [this](std::shared_ptr<const RsEvent> e) { handleEvent(e); }, mEventHandlerId_peer, RsEventType::PEER_CONNECTION );
rsEvents->registerEventsHandler( [this](std::shared_ptr<const RsEvent> e) { handleEvent(e); }, mEventHandlerId_gssp, RsEventType::GOSSIP_DISCOVERY );
connect(NotifyQt::getInstance(), SIGNAL(peerHasNewAvatar(QString)), this, SLOT(forceUpdateDisplay()));
connect(NotifyQt::getInstance(), SIGNAL(peerStatusChanged(QString,int)), this, SLOT(forceUpdateDisplay()));
mModel = new RsFriendListModel(ui->peerTreeWidget);
mProxyModel = new FriendListSortFilterProxyModel(ui->peerTreeWidget->header(),this);
@ -261,6 +265,7 @@ NewFriendList::NewFriendList(QWidget */*parent*/) : /* RsAutoUpdatePage(5000,par
connect(ui->actionShowOfflineFriends, SIGNAL(triggered(bool)), this, SLOT(setShowUnconnected(bool)));
connect(ui->actionShowState, SIGNAL(triggered(bool)), this, SLOT(setShowState(bool)) );
connect(ui->actionShowStateIcon, SIGNAL(triggered(bool)), this, SLOT(setShowStateIcon(bool)) );
connect(ui->actionShowGroups, SIGNAL(triggered(bool)), this, SLOT(setShowGroups(bool)) );
connect(ui->actionExportFriendlist, SIGNAL(triggered()) , this, SLOT(exportFriendlistClicked()));
connect(ui->actionImportFriendlist, SIGNAL(triggered()) , this, SLOT(importFriendlistClicked()));
@ -341,10 +346,12 @@ void NewFriendList::headerContextMenuRequested(QPoint /*p*/)
displayMenu.addAction(ui->actionShowOfflineFriends);
displayMenu.addAction(ui->actionShowState);
displayMenu.addAction(ui->actionShowStateIcon);
displayMenu.addAction(ui->actionShowGroups);
ui->actionShowOfflineFriends->setChecked(mProxyModel->showOfflineNodes());
ui->actionShowState->setChecked(mModel->getDisplayStatusString());
ui->actionShowStateIcon->setChecked(mModel->getDisplayStatusIcon());
ui->actionShowGroups->setChecked(mModel->getDisplayGroups());
QHeaderView *header = ui->peerTreeWidget->header();
@ -505,6 +512,8 @@ void NewFriendList::processSettings(bool load)
mModel->setDisplayStatusString(Settings->value("showState", mModel->getDisplayStatusString()).toBool());
mModel->setDisplayGroups(Settings->value("showGroups", mModel->getDisplayGroups()).toBool());
mModel->setDisplayStatusIcon(Settings->value("showStateIcon", mModel->getDisplayStatusIcon()).toBool());
setColumnVisible(RsFriendListModel::COLUMN_THREAD_IP,Settings->value("showIP", isColumnVisible(RsFriendListModel::COLUMN_THREAD_IP)).toBool());
setColumnVisible(RsFriendListModel::COLUMN_THREAD_ID,Settings->value("showID", isColumnVisible(RsFriendListModel::COLUMN_THREAD_ID)).toBool());
@ -528,6 +537,8 @@ void NewFriendList::processSettings(bool load)
Settings->setValue("hideUnconnected", !mProxyModel->showOfflineNodes());
Settings->setValue("showState", mModel->getDisplayStatusString());
Settings->setValue("showGroups", mModel->getDisplayGroups());
Settings->setValue("showStateIcon", mModel->getDisplayStatusIcon());
Settings->setValue("showIP",isColumnVisible(RsFriendListModel::COLUMN_THREAD_IP));
Settings->setValue("showID",isColumnVisible(RsFriendListModel::COLUMN_THREAD_ID));
@ -1643,6 +1654,12 @@ void NewFriendList::setShowState(bool show)
processSettings(false);
}
void NewFriendList::setShowStateIcon(bool show)
{
applyWhileKeepingTree([show,this]() { mModel->setDisplayStatusIcon(show) ; });
processSettings(false);
}
void NewFriendList::setShowGroups(bool show)
{
applyWhileKeepingTree([show,this]() { mModel->setDisplayGroups(show) ; });

1
retroshare-gui/src/gui/common/NewFriendList.h
View File

@ -87,6 +87,7 @@ public slots:
void setShowGroups(bool show);
void setShowUnconnected(bool hidden);
void setShowState(bool show);
void setShowStateIcon(bool show);
void headerContextMenuRequested(QPoint);
void exportFriendlistClicked();

15
retroshare-gui/src/gui/common/NewFriendList.ui
View File

@ -29,10 +29,10 @@
<item>
<widget class="QFrame" name="toolBarFrame">
<property name="frameShape">
<enum>QFrame::Box</enum>
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
<enum>QFrame::Raised</enum>
</property>
<layout class="QHBoxLayout" name="toolBarFrame_HL">
<property name="spacing">
@ -124,6 +124,17 @@
<string>import your friendlist including groups</string>
</property>
</action>
<action name="actionShowStateIcon">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Status icons</string>
</property>
<property name="toolTip">
<string>Show status icons</string>
</property>
</action>
</widget>
<customwidgets>
<customwidget>

22
retroshare-gui/src/gui/msgs/MessageComposer.ui
View File

@ -349,10 +349,10 @@
</size>
</property>
<property name="frameShape">
<enum>QFrame::Box</enum>
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
<enum>QFrame::Raised</enum>
</property>
<layout class="QHBoxLayout" name="toolBarFrameHLayout">
<property name="leftMargin">
@ -1400,6 +1400,11 @@ border-image: url(:/images/closepressed.png)
</action>
</widget>
<customwidgets>
<customwidget>
<class>RSComboBox</class>
<extends>QComboBox</extends>
<header>gui/common/RSComboBox.h</header>
</customwidget>
<customwidget>
<class>FriendSelectionWidget</class>
<extends>QWidget</extends>
@ -1411,21 +1416,16 @@ border-image: url(:/images/closepressed.png)
<extends>QComboBox</extends>
<header>gui/gxs/GxsIdChooser.h</header>
</customwidget>
<customwidget>
<class>HashBox</class>
<extends>QScrollArea</extends>
<header location="global">gui/common/HashBox.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>MimeTextEdit</class>
<extends>QTextEdit</extends>
<header location="global">gui/common/MimeTextEdit.h</header>
</customwidget>
<customwidget>
<class>RSComboBox</class>
<extends>QComboBox</extends>
<header>gui/common/RSComboBox.h</header>
<class>HashBox</class>
<extends>QScrollArea</extends>
<header location="global">gui/common/HashBox.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<tabstops>

2
retroshare-gui/src/gui/msgs/MessagesDialog.cpp
View File

@ -1296,7 +1296,7 @@ void MessagesDialog::updateMessageSummaryList()
/* calculating the new messages */
std::list<MsgInfoSummary> msgList;
rsMail->getMessageSummaries(mMessageModel->currentBox(),msgList);
rsMail->getMessageSummaries(Rs::Msgs::BoxName::BOX_ALL,msgList);
QMap<int, int> tagCount;

4
retroshare-gui/src/gui/qss/stylesheet/default.qss
View File

@ -352,9 +352,9 @@ NewFriendList
{
qproperty-textColorStatusOffline: black;
qproperty-textColorStatusAway: gray;
qproperty-textColorStatusBusy: gray;
qproperty-textColorStatusBusy: darkred;
qproperty-textColorStatusOnline: darkGreen;
qproperty-textColorStatusInactive: gray;
qproperty-textColorStatusInactive: orange;
qproperty-textColorGroup: rgb(123, 123, 123);
}

BIN
retroshare-gui/src/lang/retroshare_es.qm
View File

Binary file not shown.

26
retroshare-gui/src/lang/retroshare_es.ts
View File

@ -11022,32 +11022,32 @@ p, li { white-space: pre-wrap; }
<message>
<location line="+123"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy your RetroShare ID to clipboard&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copia tu ID de RetroShare al portapapeles&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<location line="+165"/>
<source>Add friend</source>
<translation type="unfinished"></translation>
<translation>Agregar amigo</translation>
</message>
<message>
<location line="+27"/>
<source>Did you receive a Retroshare ID from a friend?</source>
<translation type="unfinished"></translation>
<translation>¿Recibiste una identificación de Retroshare de una amiga?</translation>
</message>
<message>
<location line="+85"/>
<source>Do you need help with Retroshare?</source>
<translation type="unfinished"></translation>
<translation>¿Necesitas ayuda con Retroshare?</translation>
</message>
<message>
<location line="-254"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Comparte tu ID de RetroShare&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<location line="-63"/>
<source>This is your Retroshare ID. Copy and share with your friends!</source>
<translation type="unfinished"></translation>
<translation>Este es tu ID de Retroshare. ¡Cópialo y compártelo con tus amigos!</translation>
</message>
<message>
<location line="+10"/>
@ -11096,7 +11096,7 @@ de código abierto, multi-sistema, privada y segura.</translation>
<message>
<location line="+6"/>
<source>Copy your Retroshare ID to Clipboard</source>
<translation type="unfinished"></translation>
<translation>Copia tu ID de Retroshare al portapapeles</translation>
</message>
<message>
<location line="+21"/>
@ -11173,7 +11173,7 @@ new short format</source>
<message>
<location filename="../gui/HomePage.h" line="+46"/>
<source>Home</source>
<translation>Página principal</translation>
<translation>Casa</translation>
</message>
</context>
<context>
@ -11516,12 +11516,12 @@ p, li { white-space: pre-wrap; }
<message>
<location line="-291"/>
<source>Created on :</source>
<translation type="unfinished"></translation>
<translation>Creado el :</translation>
</message>
<message>
<location line="-64"/>
<source>Auto-Ban profile</source>
<translation type="unfinished"></translation>
<translation>Perfil de prohibición automática</translation>
</message>
<message>
<location line="+150"/>
@ -11531,7 +11531,7 @@ p, li { white-space: pre-wrap; }
<message>
<location line="+84"/>
<source>Edit Identity</source>
<translation type="unfinished"></translation>
<translation>Editar identidad</translation>
</message>
<message>
<location line="+151"/>
@ -11591,12 +11591,12 @@ p, li { white-space: pre-wrap; }
<message>
<location line="-407"/>
<source>Owner node ID :</source>
<translation>Identificación del nodo propietario :</translation>
<translation>Identificación del nodo:</translation>
</message>
<message>
<location line="-58"/>
<source>Identity name :</source>
<translation>Nombre de la identidad :</translation>
<translation>Nombre de identidad:</translation>
</message>
<message>
<location line="-587"/>

BIN
retroshare-gui/src/lang/retroshare_ru.qm
View File

Binary file not shown.

158
retroshare-gui/src/lang/retroshare_ru.ts
View File

@ -1527,12 +1527,12 @@ into the image, so as to
<message>
<location line="+75"/>
<source>Redock to Main window</source>
<translation type="unfinished"></translation>
<translation>Перезакрепить в главном окне</translation>
</message>
<message>
<location line="+15"/>
<source>Undock to a new window</source>
<translation type="unfinished"></translation>
<translation>Открепить в новом окне</translation>
</message>
</context>
<context>
@ -10717,17 +10717,17 @@ This message is missing. You should receive it later.</source>
<message>
<location filename="../gui/statusbar/hashingstatus.cpp" line="+78"/>
<source>Examining shared files...</source>
<translation type="unfinished">Проверка файлов, открытых к доступу...</translation>
<translation>Проверка файлов, открытых к доступу...</translation>
</message>
<message>
<location line="+5"/>
<source>Hashing file</source>
<translation type="unfinished">Хеширование файла</translation>
<translation>Хеширование файла</translation>
</message>
<message>
<location line="+3"/>
<source>Saving file index...</source>
<translation type="unfinished">Сохранение списка файлов...</translation>
<translation>Сохранение списка файлов...</translation>
</message>
</context>
<context>
@ -11025,32 +11025,32 @@ p, li { white-space: pre-wrap; }
<message>
<location line="+123"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy your RetroShare ID to clipboard&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Скопируйте свой идентификатор RetroShare в буфер обмена&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<location line="+165"/>
<source>Add friend</source>
<translation type="unfinished"></translation>
<translation>Добавить узел</translation>
</message>
<message>
<location line="+27"/>
<source>Did you receive a Retroshare ID from a friend?</source>
<translation type="unfinished"></translation>
<translation>Вы получили идентификатор Retroshare от друга?</translation>
</message>
<message>
<location line="+85"/>
<source>Do you need help with Retroshare?</source>
<translation type="unfinished"></translation>
<translation>Вам нужна помощь с Retroshare?</translation>
</message>
<message>
<location line="-254"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Поделитесь своим идентификатором RetroShare&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<location line="-63"/>
<source>This is your Retroshare ID. Copy and share with your friends!</source>
<translation type="unfinished"></translation>
<translation>Это ваш Retroshare ID. Скопируйте и поделитесь с друзьями!</translation>
</message>
<message>
<location line="+10"/>
@ -11120,7 +11120,7 @@ private and secure decentralized communication platform.
<message>
<location line="+6"/>
<source>Include all IPs history</source>
<translation type="unfinished"></translation>
<translation>Включить историю всех IP-адресов</translation>
</message>
<message>
<location line="+12"/>
@ -11130,12 +11130,12 @@ private and secure decentralized communication platform.
<message>
<location line="+70"/>
<source>Include all your known IPs</source>
<translation type="unfinished"></translation>
<translation>Включите все ваши известные IP-адреса</translation>
</message>
<message>
<location line="-109"/>
<source>Use old certificate format</source>
<translation type="unfinished"></translation>
<translation>Использовать старый формат сертификата</translation>
</message>
<message>
<location line="+1"/>
@ -11147,7 +11147,7 @@ new short format</source>
<message>
<location line="+99"/>
<source>Use new (short) certificate format</source>
<translation type="unfinished"></translation>
<translation>Использовать (короткий) формат сертификата</translation>
</message>
<message>
<location line="+143"/>
@ -11499,7 +11499,7 @@ p, li { white-space: pre-wrap; }
<message>
<location line="-41"/>
<source>Friend votes:</source>
<translation>Рейтинг согласно мнению участников из окружения:</translation>
<translation>Голоса друзей:</translation>
</message>
<message>
<location line="+358"/>
@ -11520,12 +11520,12 @@ p, li { white-space: pre-wrap; }
<message>
<location line="-291"/>
<source>Created on :</source>
<translation type="unfinished"></translation>
<translation>Создано:</translation>
</message>
<message>
<location line="-64"/>
<source>Auto-Ban profile</source>
<translation type="unfinished"></translation>
<translation>Профиль автобана</translation>
</message>
<message>
<location line="+150"/>
@ -11535,7 +11535,7 @@ p, li { white-space: pre-wrap; }
<message>
<location line="+84"/>
<source>Edit Identity</source>
<translation type="unfinished"></translation>
<translation>Изменить личность</translation>
</message>
<message>
<location line="+151"/>
@ -11595,7 +11595,7 @@ p, li { white-space: pre-wrap; }
<message>
<location line="-407"/>
<source>Owner node ID :</source>
<translation>Идентификатор владельца узла:</translation>
<translation>Идентификатор узла:</translation>
</message>
<message>
<location line="-58"/>
@ -11630,7 +11630,7 @@ p, li { white-space: pre-wrap; }
<message>
<location line="+58"/>
<source>Owner node name :</source>
<translation>Имя владельца узла:</translation>
<translation>Имя узла:</translation>
</message>
<message>
<location line="-569"/>
@ -11660,19 +11660,19 @@ p, li { white-space: pre-wrap; }
<message>
<location line="+116"/>
<source>Negative</source>
<translation>Отрицательное мнение</translation>
<translation>Отрицательно</translation>
</message>
<message>
<location line="+9"/>
<location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
<source>Neutral</source>
<translation>Нейтральное мнение</translation>
<translation>Нейтральный</translation>
</message>
<message>
<location line="+9"/>
<location filename="../gui/Identity/IdDialog.cpp" line="-11"/>
<source>Positive</source>
<translation>Положительное мнение</translation>
<translation>Положительный</translation>
</message>
<message>
<location line="-144"/>
@ -11799,7 +11799,7 @@ p, li { white-space: pre-wrap; }
<message>
<location line="+4"/>
<source>unsubscribed (Only receive invite list). Last seen: %1 days ago.</source>
<translation type="unfinished"></translation>
<translation>отписался (Только получать список приглашений). Последний раз был в сети: %1 дней назад.</translation>
</message>
<message>
<location line="+2"/>
@ -11829,7 +11829,7 @@ p, li { white-space: pre-wrap; }
<message>
<location line="+1"/>
<source>Status: </source>
<translation>Статус:</translation>
<translation>Статус: </translation>
</message>
<message>
<location line="+3"/>
@ -12011,7 +12011,7 @@ These identities will soon be not supported anymore.</source>
<message>
<location line="+2"/>
<source>Message</source>
<translation type="unfinished">Сообщение</translation>
<translation>Сообщение</translation>
</message>
<message>
<location line="+2"/>
@ -12281,7 +12281,7 @@ These identities will soon be not supported anymore.</source>
<message>
<location filename="../gui/Identity/IdDialog.ui" line="-231"/>
<source>Last used:</source>
<translation>Последний раз появлялся: </translation>
<translation>Последний раз появлялся:</translation>
</message>
<message>
<location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
@ -12321,7 +12321,7 @@ These identities will soon be not supported anymore.</source>
<message>
<location line="+607"/>
<source>Really delete?</source>
<translation>Действительно удалить? </translation>
<translation>Действительно удалить?</translation>
</message>
</context>
<context>
@ -14916,105 +14916,105 @@ Reported error:</source>
<message>
<location filename="../gui/common/NewFriendList.ui" line="+83"/>
<source>Offline Friends</source>
<translation type="unfinished"></translation>
<translation>Друзья офлайн</translation>
</message>
<message>
<location line="+3"/>
<source>Show Offline Friends</source>
<translation type="unfinished"></translation>
<translation>Показать друзей офлайн</translation>
</message>
<message>
<location line="+8"/>
<source>Status</source>
<translation type="unfinished">Статус</translation>
<translation>Статус</translation>
</message>
<message>
<location line="+3"/>
<source>Show status</source>
<translation type="unfinished"></translation>
<translation>Показать статус</translation>
</message>
<message>
<location line="+8"/>
<location filename="../gui/common/NewFriendList.cpp" line="+690"/>
<source>Groups</source>
<translation type="unfinished">Группы</translation>
<translation>Группы</translation>
</message>
<message>
<location line="+3"/>
<source>Show groups</source>
<translation type="unfinished"></translation>
<translation>Показать группы</translation>
</message>
<message>
<location line="+5"/>
<source>export friendlist</source>
<translation type="unfinished">Экспорт списка контактов</translation>
<translation>Экспорт списка контактов</translation>
</message>
<message>
<location line="+3"/>
<source>export your friendlist including groups</source>
<translation type="unfinished">Экспорт списка контактов, включая информацию о группах</translation>
<translation>Экспорт списка контактов, включая информацию о группах</translation>
</message>
<message>
<location line="+5"/>
<source>import friendlist</source>
<translation type="unfinished">Импорт списка контактов</translation>
<translation>Импорт списка контактов</translation>
</message>
<message>
<location line="+3"/>
<source>import your friendlist including groups</source>
<translation type="unfinished">Импорт списка контактов, включая информацию о группах</translation>
<translation>Импорт списка контактов, включая информацию о группах</translation>
</message>
<message>
<location filename="../gui/common/NewFriendList.cpp" line="-496"/>
<location line="+28"/>
<source>Search</source>
<translation type="unfinished"></translation>
<translation>Поиск</translation>
</message>
<message>
<location line="+1"/>
<location line="+144"/>
<source>ID</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location line="-144"/>
<source>Search ID</source>
<translation type="unfinished">Поиск идентификатора</translation>
<translation>Поиск идентификатора</translation>
</message>
<message>
<location line="+2"/>
<source>Online friends on top</source>
<translation type="unfinished"></translation>
<translation>Онлайн-друзья наверху</translation>
</message>
<message>
<location line="+82"/>
<source>Show Items</source>
<translation type="unfinished">Показать...</translation>
<translation>Показать...</translation>
</message>
<message>
<location line="+46"/>
<source>Last contact</source>
<translation type="unfinished"></translation>
<translation>Последний контакт</translation>
</message>
<message>
<location line="+7"/>
<source>IP</source>
<translation type="unfinished">IP</translation>
<translation>IP</translation>
</message>
<message>
<location line="+251"/>
<source>Group</source>
<translation type="unfinished">Группа</translation>
<translation>Группа</translation>
</message>
<message>
<location line="+4"/>
<source>Friend</source>
<translation type="unfinished"></translation>
<translation>Друг</translation>
</message>
<message>
<location line="+4"/>
<source>Node</source>
<translation type="unfinished"></translation>
<translation>Узел</translation>
</message>
<message>
<location line="+3"/>
@ -15024,126 +15024,126 @@ Reported error:</source>
<message>
<location line="+12"/>
<source>Edit Group</source>
<translation type="unfinished">Редактировать группу</translation>
<translation>Редактировать группу</translation>
</message>
<message>
<location line="+2"/>
<source>Remove Group</source>
<translation type="unfinished">Удалить группу</translation>
<translation>Удалить группу</translation>
</message>
<message>
<location line="+7"/>
<source>Profile details</source>
<translation type="unfinished">Сведения об узле</translation>
<translation>Сведения об узле</translation>
</message>
<message>
<location line="+1"/>
<source>Deny connections</source>
<translation type="unfinished"></translation>
<translation>Запретить соединения</translation>
</message>
<message>
<location line="+26"/>
<source>Add to group</source>
<translation type="unfinished">добавить в группу</translation>
<translation>добавить в группу</translation>
</message>
<message>
<location line="+9"/>
<source>Move to group</source>
<translation type="unfinished">Переместить в группу</translation>
<translation>Переместить в группу</translation>
</message>
<message>
<location line="+12"/>
<source>Create new group</source>
<translation type="unfinished">Создать новую группу</translation>
<translation>Создать новую группу</translation>
</message>
<message>
<location line="+19"/>
<source>Remove from group </source>
<translation type="unfinished"></translation>
<translation>Удалить из группы </translation>
</message>
<message>
<location line="+5"/>
<source>Remove from all groups</source>
<translation type="unfinished">Удалить из всех групп</translation>
<translation>Удалить из всех групп</translation>
</message>
<message>
<location line="+13"/>
<source>Chat</source>
<translation type="unfinished"></translation>
<translation>Чат</translation>
</message>
<message>
<location line="+1"/>
<source>Send message to this node</source>
<translation type="unfinished">Послать сообщение этому узлу</translation>
<translation>Послать сообщение этому узлу</translation>
</message>
<message>
<location line="+4"/>
<source>Node details</source>
<translation type="unfinished">Сведения об узле</translation>
<translation>Сведения об узле</translation>
</message>
<message>
<location line="+3"/>
<source>Recommend this node to...</source>
<translation type="unfinished">Рекомендовать этого участника...</translation>
<translation>Рекомендовать этого участника...</translation>
</message>
<message>
<location line="+6"/>
<source>Attempt to connect</source>
<translation type="unfinished">Соединиться</translation>
<translation>Соединиться</translation>
</message>
<message>
<location line="+2"/>
<source>Copy certificate link</source>
<translation type="unfinished">Скопировать ссылку сертификата</translation>
<translation>Скопировать ссылку сертификата</translation>
</message>
<message>
<location line="+3"/>
<source>Remove Friend Node</source>
<translation type="unfinished">Удалить этого участника</translation>
<translation>Удалить этого участника</translation>
</message>
<message>
<location line="+15"/>
<source>Paste certificate link</source>
<translation type="unfinished">Вставить ссылку на сертификат</translation>
<translation>Вставить ссылку на сертификат</translation>
</message>
<message>
<location line="+4"/>
<source>Expand all</source>
<translation type="unfinished">Раскрыть всё</translation>
<translation>Раскрыть всё</translation>
</message>
<message>
<location line="+1"/>
<source>Collapse all</source>
<translation type="unfinished">Свернуть всё</translation>
<translation>Свернуть всё</translation>
</message>
<message>
<location line="+236"/>
<source>Do you want to remove this node?</source>
<translation type="unfinished">Вы хотите удалить этот узел?</translation>
<translation>Вы хотите удалить этот узел?</translation>
</message>
<message>
<location line="+12"/>
<source>Do you want to remove this Friend?</source>
<translation type="unfinished"></translation>
<translation>Вы хотите удалить этот контакт?</translation>
</message>
<message>
<location line="+235"/>
<location line="+18"/>
<source>Done!</source>
<translation type="unfinished">Готово!</translation>
<translation>Готово!</translation>
</message>
<message>
<location line="-17"/>
<source>Your friendlist is stored at:
</source>
<translation type="unfinished">Ваш список список контактов сохранён в:
<translation>Ваш список список контактов сохранён в:
</translation>
</message>
<message>
<location line="+1"/>
<source>
(keep in mind that the file is unencrypted!)</source>
<translation type="unfinished">
<translation>
(помните, что файл не зашифрован!)</translation>
</message>
<message>
@ -15151,32 +15151,32 @@ Reported error:</source>
<location line="+7"/>
<source>Your friendlist was imported from:
</source>
<translation type="unfinished">Ваш список контактов импортирован из:
<translation>Ваш список контактов импортирован из:
</translation>
</message>
<message>
<location line="-1"/>
<source>Done - but errors happened!</source>
<translation type="unfinished">Выполнено, но с ошибками!</translation>
<translation>Выполнено, но с ошибками!</translation>
</message>
<message>
<location line="+2"/>
<source>
at least one peer was not added</source>
<translation type="unfinished">
<translation>
как минимум один участник не добавлен</translation>
</message>
<message>
<location line="+1"/>
<source>
at least one peer was not added to a group</source>
<translation type="unfinished">
<translation>
как минимум один участник не добавлен в группу</translation>
</message>
<message>
<location line="+20"/>
<source>Select file for importing your friendlist from</source>
<translation type="unfinished">Выберите файл, в котором хранится список ваших контактов</translation>
<translation>Выберите файл, в котором хранится список ваших контактов</translation>
</message>
<message>
<location line="+1"/>
@ -15193,7 +15193,7 @@ at least one peer was not added to a group</source>
<location line="+30"/>
<location line="+116"/>
<source>Error</source>
<translation type="unfinished">Ошибка</translation>
<translation>Ошибка</translation>
</message>
<message>
<location line="-115"/>

4
retroshare-gui/src/util/imageutil.cpp
View File

@ -274,7 +274,9 @@ bool ImageUtil::optimizeSizeHtml(QString &html, const QImage& original, QImage &
if(optimizeSizeBytes(bytearray, original, optimized,has_transparency?"PNG":"JPG",maxPixels, maxBytes))
{
QByteArray encodedByteArray = bytearray.toBase64();
html = "<img src=\"data:image/png;base64,";
html = "<img src=\"data:image/";
html.append(has_transparency ? "png" : "jpeg");
html.append(";base64,");
html.append(encodedByteArray);
html.append("\">");
return true;

32
retroshare.pri
View File

@ -182,6 +182,12 @@ rs_deep_files_index_taglib:CONFIG -= no_rs_deep_files_index_taglib
CONFIG *= no_rs_use_native_dialogs
rs_use_native_dialogs:CONFIG -= no_rs_use_native_dialogs
# By default, use RNP lib for RFC4880 PGP management. If not, compilation will
# default to openpgp-sdk, which is old and unmaintained, so probably not very secure.
CONFIG *= rs_rnplib
rs_no_rnplib:CONFIG -= rs_rnplib
rs_no_rnplib:CONFIG += rs_openpgpsdk
# To disable broadcast discovery append the following assignation to qmake
# command line "CONFIG+=no_rs_broadcast_discovery"
CONFIG *= rs_broadcast_discovery
@ -302,6 +308,18 @@ isEmpty(RS_THREAD_LIB):RS_THREAD_LIB = pthread
#
###########################################################################################################################################################
###########################################################################################################################################################
#
# V06_EXPERIMENTAL_CHANGE_001:
#
# What: removes issuer fingerprint from signature subpackets
# Why: This type of subpacket is not part of RFC4880 and not recognised by OpenPGP-SDK
# BackwardCompat: old RS before Sept.2024 will not be able to exchange keys
# Note: Since signature subpacket 33 is part of the hashed section of the signature, this also invalidates the signature.
# Depending on the implementation, certificates with self-signature that miss this subpacket may not be accepted.
#
###########################################################################################################################################################
DEFINES += V07_NON_BACKWARD_COMPATIBLE_CHANGE_001
DEFINES += V07_NON_BACKWARD_COMPATIBLE_CHANGE_002
@ -313,6 +331,7 @@ rs_v07_changes {
DEFINES += V07_NON_BACKWARD_COMPATIBLE_CHANGE_002
DEFINES += V07_NON_BACKWARD_COMPATIBLE_CHANGE_003
DEFINES += V07_NON_BACKWARD_COMPATIBLE_CHANGE_004
DEFINES += V07_NON_BACKWARD_COMPATIBLE_CHANGE_005
DEFINES += V07_NON_BACKWARD_COMPATIBLE_CHANGE_UNNAMED
}
@ -849,6 +868,19 @@ isEmpty(RS_UPNP_LIB) {
}
}
rs_openpgpsdk {
SUBDIRS += openpgpsdk
openpgpsdk.file = openpgpsdk/src/openpgpsdk.pro
libretroshare.depends += openpgpsdk
message("Using OpenPGP-SDK for PGP")
}
rs_rnplib {
DEFINES += USE_RNP_LIB
message("Using RNP lib for PGP")
}
equals(RS_UPNP_LIB, none):RS_UPNP_LIB=
equals(RS_UPNP_LIB, miniupnpc):DEFINES*=RS_USE_LIBMINIUPNPC
contains(RS_UPNP_LIB, upnp):DEFINES*=RS_USE_LIBUPNP

1
supportlibs/librnp Submodule

@ -0,0 +1 @@
Subproject commit ec78117269461b2cdce15a085033a8c6bff6d7e3