mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-12-15 10:54:22 -05:00
removed not gui _settings on PeersDialog
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1711 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
25f888b8c6
commit
805eecd7bd
@ -38,7 +38,6 @@
|
|||||||
#include "profile/ProfileWidget.h"
|
#include "profile/ProfileWidget.h"
|
||||||
#include "GenCertDialog.h"
|
#include "GenCertDialog.h"
|
||||||
#include "gui/connect/ConnectFriendWizard.h"
|
#include "gui/connect/ConnectFriendWizard.h"
|
||||||
#include "gui/Preferences/rsharesettings.h"
|
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
@ -89,9 +88,6 @@ PeersDialog::PeersDialog(QWidget *parent)
|
|||||||
/* Invoke the Qt Designer generated object setup routine */
|
/* Invoke the Qt Designer generated object setup routine */
|
||||||
ui.setupUi(this);
|
ui.setupUi(this);
|
||||||
|
|
||||||
/* Create RshareSettings object */
|
|
||||||
_settings = new RshareSettings();
|
|
||||||
|
|
||||||
last_status_send_time = 0 ;
|
last_status_send_time = 0 ;
|
||||||
|
|
||||||
connect( ui.peertreeWidget, SIGNAL( customContextMenuRequested( QPoint ) ), this, SLOT( peertreeWidgetCostumPopupMenu( QPoint ) ) );
|
connect( ui.peertreeWidget, SIGNAL( customContextMenuRequested( QPoint ) ), this, SLOT( peertreeWidgetCostumPopupMenu( QPoint ) ) );
|
||||||
@ -1303,7 +1299,7 @@ void PeersDialog::updateAvatar()
|
|||||||
|
|
||||||
void PeersDialog::getAvatar()
|
void PeersDialog::getAvatar()
|
||||||
{
|
{
|
||||||
QString fileName = QFileDialog::getOpenFileName(this, "Load File", QDir::homePath(), "Pictures (*.png *.xpm *.jpg)");
|
QString fileName = QFileDialog::getOpenFileName(this, "Load File", QDir::homePath(), "Pictures (*.png *.xpm *.jpg *.tiff)");
|
||||||
if(!fileName.isEmpty())
|
if(!fileName.isEmpty())
|
||||||
{
|
{
|
||||||
picture = QPixmap(fileName).scaled(82,82, Qt::IgnoreAspectRatio);
|
picture = QPixmap(fileName).scaled(82,82, Qt::IgnoreAspectRatio);
|
||||||
@ -1352,9 +1348,6 @@ void PeersDialog::on_actionCreate_new_Profile_activated()
|
|||||||
/** Loads own personal status */
|
/** Loads own personal status */
|
||||||
void PeersDialog::loadmypersonalstatus()
|
void PeersDialog::loadmypersonalstatus()
|
||||||
{
|
{
|
||||||
//_settings->beginGroup("Profile");
|
|
||||||
//ui.mypersonalstatuslabel->setText(_settings->value("StatusMessage","").toString());
|
|
||||||
//_settings->endGroup();
|
|
||||||
|
|
||||||
ui.mypersonalstatuslabel->setText(QString::fromStdString(rsMsgs->getCustomStateString()));
|
ui.mypersonalstatuslabel->setText(QString::fromStdString(rsMsgs->getCustomStateString()));
|
||||||
}
|
}
|
||||||
|
@ -25,7 +25,6 @@
|
|||||||
#include <QFileDialog>
|
#include <QFileDialog>
|
||||||
|
|
||||||
#include "chat/PopupChatDialog.h"
|
#include "chat/PopupChatDialog.h"
|
||||||
#include <gui/Preferences/rsharesettings.h>
|
|
||||||
|
|
||||||
#include "mainpage.h"
|
#include "mainpage.h"
|
||||||
#include "ui_PeersDialog.h"
|
#include "ui_PeersDialog.h"
|
||||||
@ -165,8 +164,6 @@ private:
|
|||||||
|
|
||||||
QFont mCurrentFont; /* how the text will come out */
|
QFont mCurrentFont; /* how the text will come out */
|
||||||
|
|
||||||
/** A RshareSettings object used for saving/loading settings */
|
|
||||||
RshareSettings* _settings;
|
|
||||||
|
|
||||||
/** Qt Designer generated object */
|
/** Qt Designer generated object */
|
||||||
Ui::PeersDialog ui;
|
Ui::PeersDialog ui;
|
||||||
|
Loading…
Reference in New Issue
Block a user