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

removed not needed info buttons for the infodialog

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5313 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2012-07-18 14:08:53 +00:00
parent dece8cc8b6
commit b52fc7708f
6 changed files with 7 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
retroshare-gui/src/gui/GenCertDialog.cpp
View File

@ -24,7 +24,6 @@
#include <retroshare/rsinit.h>
#include <retroshare/rspeers.h>
#include "GenCertDialog.h"
#include "InfoDialog.h"
#include <QAbstractEventDispatcher>
#include <QFileDialog>
#include <QMessageBox>
@ -48,7 +47,6 @@ GenCertDialog::GenCertDialog(QWidget *parent, Qt::WFlags flags)
connect(ui.genButton, SIGNAL(clicked()), this, SLOT(genPerson()));
connect(ui.importIdentity_PB, SIGNAL(clicked()), this, SLOT(importIdentity()));
connect(ui.exportIdentity_PB, SIGNAL(clicked()), this, SLOT(exportIdentity()));
connect(ui.infopushButton,SIGNAL(clicked()), this, SLOT(infodlg()));
//connect(ui.selectButton, SIGNAL(clicked()), this, SLOT(selectFriend()));
//connect(ui.friendBox, SIGNAL(stateChanged(int)), this, SLOT(checkChanged(int)));
@ -238,7 +236,6 @@ void GenCertDialog::genPerson()
ui.genPGPuser->hide();
ui.location_label->hide();
ui.location_input->hide();
ui.infopushButton->hide();
ui.genButton->hide();
ui.label_location2->hide();
// QMessageBox::StandardButton info = QMessageBox::information(this,
@ -362,8 +359,3 @@ void GenCertDialog::loadCertificates()
}
}
void GenCertDialog::infodlg()
{
InfoDialog infodialog (this);
infodialog.exec ();
}

3
retroshare-gui/src/gui/GenCertDialog.h
View File

@ -23,7 +23,7 @@
#ifndef _GENCERTDIALOG_H
#define _GENCERTDIALOG_H
//#include "rsiface/rsiface.h"
#include <retroshare/rstypes.h>
#include "ui_GenCertDialog.h"
@ -45,7 +45,6 @@ private slots:
void importIdentity();
void exportIdentity();
void checkChanged(int i);
void infodlg();
void newGPGKeyGenUiSetup();
private:

23
retroshare-gui/src/gui/GenCertDialog.ui
View File

@ -803,35 +803,18 @@ anonymous, you can use a fake email.</string>
</widget>
</item>
<item>
<spacer>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>210</width>
<height>22</height>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="infopushButton">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>26</height>
</size>
</property>
<property name="text">
<string>Info</string>
</property>
<property name="icon">
<iconset resource="images.qrc">
<normaloff>:/images/info16.png</normaloff>:/images/info16.png</iconset>
</property>
</widget>
</item>
</layout>
</item>
</layout>

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

@ -22,7 +22,6 @@
#include <rshare.h>
#include <retroshare/rsinit.h>
#include "StartDialog.h"
#include "InfoDialog.h"
#include "LogoBar.h"
#include <QFileDialog>
#include <QMessageBox>
@ -194,12 +193,6 @@ void StartDialog::on_labelProfile_linkActivated(QString /*link*/)
}
void StartDialog::on_labelInfo_linkActivated(QString /*link*/)
{
InfoDialog infodialog (this);
infodialog.exec ();
}
bool StartDialog::requestedNewCert()
{
return reqNewCert;

1
retroshare-gui/src/gui/StartDialog.h
View File

@ -64,7 +64,6 @@ private slots:
void notSecureWarning();
void on_labelProfile_linkActivated(QString link);
void on_labelInfo_linkActivated(QString link);
private:

17
retroshare-gui/src/gui/StartDialog.ui
View File

@ -435,7 +435,7 @@
<string>RetroShare</string>
</property>
<property name="windowIcon">
<iconset>
<iconset resource="images.qrc">
<normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
</property>
<property name="styleSheet">
@ -498,7 +498,7 @@ border-image: url(:/images/avatar_background.png);
<string/>
</property>
<property name="icon">
<iconset>
<iconset resource="images.qrc">
<normaloff>:/images/user/personal64.png</normaloff>:/images/user/personal64.png</iconset>
</property>
<property name="iconSize">
@ -597,18 +597,7 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="6" column="2">
<widget class="QLabel" name="labelInfo">
<property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;Info&quot;&gt;&lt;span style=&quot; font-size:8pt; text-decoration: underline; color:#0000ff;&quot;&gt;Info...&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item row="6" column="1">
<item row="6" column="1" colspan="2">
<widget class="QLabel" name="labelProfile">
<property name="toolTip">
<string>Opens a dialog for creating a new profile or