Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-09-21 13:24:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Changes to the .pro file for the newly made files."

Browse source 
This reverts commit 3cc077ff38.

This commit adds the new files to the .pro file.
This commit is contained in:
PYRET1C 2023-07-02 12:48:38 +05:30
parent 680c1942df
commit 59c6eabad9
4 changed files with 105 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

20
retroshare-gui/src/gui/TheWire/CustomFrame.cpp
View file

@ -1,3 +1,23 @@
/*******************************************************************************
* gui/TheWire/CustomFrame.cpp *
* *
* Copyright (c) 2012-2020 Robert Fernie <retroshare.project@gmail.com> *
* *
* This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU Affero General Public License as *
* published by the Free Software Foundation, either version 3 of the *
* License, or (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU Affero General Public License for more details. *
* *
* You should have received a copy of the GNU Affero General Public License *
* along with this program. If not, see <https://www.gnu.org/licenses/>. *
* *
*******************************************************************************/
#include "CustomFrame.h" #include "CustomFrame.h"
#include <QPainter> #include <QPainter>

20
retroshare-gui/src/gui/TheWire/CustomFrame.h
View file

@ -1,3 +1,23 @@
/*******************************************************************************
* gui/TheWire/CustomFrame.h *
* *
* Copyright (c) 2012-2020 Robert Fernie <retroshare.project@gmail.com> *
* *
* This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU Affero General Public License as *
* published by the Free Software Foundation, either version 3 of the *
* License, or (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU Affero General Public License for more details. *
* *
* You should have received a copy of the GNU Affero General Public License *
* along with this program. If not, see <https://www.gnu.org/licenses/>. *
* *
*******************************************************************************/
#ifndef CUSTOMFRAMEH_H #ifndef CUSTOMFRAMEH_H
#define CUSTOMFRAMEH_H #define CUSTOMFRAMEH_H

21
retroshare-gui/src/gui/TheWire/PulseViewGroup.cpp
View file

@ -65,20 +65,21 @@ void PulseViewGroup::setup()
QSize frameSize = frame_masthead->size(); QSize frameSize = frame_masthead->size();
// Scale the pixmap based on the frame size // Scale the pixmap based on the frame size
pixmap = pixmap.scaled(frameSize, Qt::KeepAspectRatio, Qt::SmoothTransformation); pixmap = pixmap.scaledToWidth(frameSize.width(), Qt::SmoothTransformation);
frame_masthead->setPixmap(pixmap); frame_masthead->setPixmap(pixmap);
} }
} }
else // Uncomment the below code for default background
{ // else
// Default pixmap // {
QPixmap pixmap = FilesDefs::getPixmapFromQtResourcePath(":/icons/png/posted.png"); // // Default pixmap
QSize frameSize = frame_masthead->size(); // QPixmap pixmap = FilesDefs::getPixmapFromQtResourcePath(":/icons/png/posted.png");
// QSize frameSize = frame_masthead->size();
// Scale the pixmap based on the frame size // // Scale the pixmap based on the frame size
pixmap = pixmap.scaled(frameSize, Qt::KeepAspectRatio, Qt::SmoothTransformation); // pixmap = pixmap.scaled(frameSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
frame_masthead->setPixmap(pixmap); // frame_masthead->setPixmap(pixmap);
} // }
if (mGroup->mHeadshot.mData) if (mGroup->mHeadshot.mData)
{ {

2
retroshare-gui/src/retroshare-gui.pro
View file

@ -1220,6 +1220,7 @@ gxsthewire {
gui/TheWire/PulseReply.h \ gui/TheWire/PulseReply.h \
gui/TheWire/PulseReplySeperator.h \ gui/TheWire/PulseReplySeperator.h \
gui/TheWire/PulseMessage.h \ gui/TheWire/PulseMessage.h \
gui/TheWire/CustomFrame.h \
FORMS += gui/TheWire/WireDialog.ui \ FORMS += gui/TheWire/WireDialog.ui \
gui/TheWire/WireGroupItem.ui \ gui/TheWire/WireGroupItem.ui \
@ -1242,6 +1243,7 @@ gxsthewire {
gui/TheWire/PulseReply.cpp \ gui/TheWire/PulseReply.cpp \
gui/TheWire/PulseReplySeperator.cpp \ gui/TheWire/PulseReplySeperator.cpp \
gui/TheWire/PulseMessage.cpp \ gui/TheWire/PulseMessage.cpp \
gui/TheWire/CustomFrame.cpp \
RESOURCES += gui/TheWire/TheWire_images.qrc RESOURCES += gui/TheWire/TheWire_images.qrc
} }