mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-07-22 14:10:54 -04:00
added for Network menu Create new Profile action to can generate more Profiles without need to run Login Window.
disabled from Profile Generator Dialog not used the optional Cert loading sections. fixed startdialogs layout git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1493 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax
parent
2bf94b909a
commit
01935af39b
7 changed files with 532 additions and 560 deletions
|
|
@ -32,7 +32,6 @@
|
|||
#define DATETIME_FMT "MMM dd hh:mm:ss"
|
||||
|
||||
|
||||
|
||||
/** Default constructor */
|
||||
GenCertDialog::GenCertDialog(QWidget *parent, Qt::WFlags flags)
|
||||
: QDialog(parent, flags)
|
||||
|
|
@ -44,8 +43,8 @@ GenCertDialog::GenCertDialog(QWidget *parent, Qt::WFlags flags)
|
|||
|
||||
|
||||
connect(ui.genButton, SIGNAL(clicked()), this, SLOT(genPerson()));
|
||||
connect(ui.selectButton, SIGNAL(clicked()), this, SLOT(selectFriend()));
|
||||
connect(ui.friendBox, SIGNAL(stateChanged(int)), this, SLOT(checkChanged(int)));
|
||||
//connect(ui.selectButton, SIGNAL(clicked()), this, SLOT(selectFriend()));
|
||||
//connect(ui.friendBox, SIGNAL(stateChanged(int)), this, SLOT(checkChanged(int)));
|
||||
|
||||
ui.genName->setFocus(Qt::OtherFocusReason);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>GenCertDialog</class>
|
||||
<widget class="QDialog" name="GenCertDialog">
|
||||
|
|
@ -6,7 +7,7 @@
|
|||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>394</width>
|
||||
<height>457</height>
|
||||
<height>408</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="palette">
|
||||
|
|
@ -972,12 +973,12 @@
|
|||
</palette>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
||||
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:16pt;">Generate a new profile</span><br /><br /><span style=" font-size:9pt;">Please fill in the information which will<br />allow your RetroShare to connect to</span></p>
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;">Friends.</p></body></html></string>
|
||||
</style></head><body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:16pt;">Generate a new profile</span><br /><br /><span style=" font-size:9pt;">Please fill in the information which will<br />allow your RetroShare to connect to</span></p>
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;">Friends.</p></body></html></string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
|
||||
|
|
@ -1077,59 +1078,14 @@ p, li { white-space: pre-wrap; }
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="12" column="0" colspan="3" >
|
||||
<widget class="QCheckBox" name="friendBox" >
|
||||
<property name="text" >
|
||||
<string>Load Trusted Certificate (Optional)</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="13" column="0" colspan="2" >
|
||||
<layout class="QGridLayout" >
|
||||
<property name="margin" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="spacing" >
|
||||
<number>6</number>
|
||||
</property>
|
||||
<item row="0" column="0" >
|
||||
<widget class="QLabel" name="label_10" >
|
||||
<property name="text" >
|
||||
<string>Friend</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1" >
|
||||
<widget class="QLineEdit" name="genFriend" >
|
||||
<property name="readOnly" >
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="2" >
|
||||
<widget class="QPushButton" name="selectButton" >
|
||||
<property name="text" >
|
||||
<string>Select File</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item row="14" column="0" colspan="3" >
|
||||
<widget class="Line" name="line_3" >
|
||||
<property name="orientation" >
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="15" column="2" >
|
||||
<item row="12" column="2">
|
||||
<widget class="QPushButton" name="genButton">
|
||||
<property name="text">
|
||||
<string>Generate New Certificate</string>
|
||||
<string>Generate New Profil</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="15" column="0" colspan="2" >
|
||||
<item row="12" column="0" colspan="2">
|
||||
<spacer>
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
|
|
@ -1173,7 +1129,7 @@ p, li { white-space: pre-wrap; }
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="2" >
|
||||
<item row="2" column="1" colspan="2">
|
||||
<widget class="Line" name="line_6">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
|
|
@ -1196,10 +1152,9 @@ p, li { white-space: pre-wrap; }
|
|||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
<zorder></zorder>
|
||||
<zorder></zorder>
|
||||
<zorder>loginLabel</zorder>
|
||||
<zorder></zorder>
|
||||
<zorder></zorder>
|
||||
<zorder></zorder>
|
||||
</widget>
|
||||
<tabstops>
|
||||
<tabstop>genName</tabstop>
|
||||
|
|
@ -1208,9 +1163,6 @@ p, li { white-space: pre-wrap; }
|
|||
<tabstop>genOrg</tabstop>
|
||||
<tabstop>genLoc</tabstop>
|
||||
<tabstop>genCountry</tabstop>
|
||||
<tabstop>friendBox</tabstop>
|
||||
<tabstop>genFriend</tabstop>
|
||||
<tabstop>selectButton</tabstop>
|
||||
<tabstop>genButton</tabstop>
|
||||
</tabstops>
|
||||
<resources>
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@
|
|||
#include "NetworkView.h"
|
||||
#include "TrustView.h"
|
||||
#include "connect/ConnectDialog.h"
|
||||
#include "GenCertDialog.h"
|
||||
#include "rsiface/rsiface.h"
|
||||
#include "rsiface/rspeers.h"
|
||||
|
||||
|
|
@ -141,6 +142,7 @@ NetworkDialog::NetworkDialog(QWidget *parent)
|
|||
menu->addAction(ui.actionAddFriend);
|
||||
//menu->addAction(ui.actionCopyKey);
|
||||
menu->addAction(ui.actionExportKey);
|
||||
menu->addAction(ui.actionCreate_New_Profile);
|
||||
menu->addSeparator();
|
||||
menu->addAction(ui.actionTabsright);
|
||||
menu->addAction(ui.actionTabswest);
|
||||
|
|
@ -702,6 +704,14 @@ void NetworkDialog::on_actionClearLog_triggered() {
|
|||
ui.infoLog->clear();
|
||||
}
|
||||
|
||||
void NetworkDialog::on_actionCreate_New_Profile_activated()
|
||||
{
|
||||
static GenCertDialog *gencertdialog = new GenCertDialog();
|
||||
gencertdialog->show();
|
||||
|
||||
|
||||
}
|
||||
|
||||
void NetworkDialog::displayInfoLogMenu(const QPoint& pos) {
|
||||
// Log Menu
|
||||
QMenu myLogMenu(this);
|
||||
|
|
|
|||
|
|
@ -73,6 +73,9 @@ private slots:
|
|||
//void on_actionCopyKey_activated();
|
||||
void on_actionExportKey_activated();
|
||||
|
||||
void on_actionCreate_New_Profile_activated();
|
||||
|
||||
|
||||
void on_actionClearLog_triggered();
|
||||
void displayInfoLogMenu(const QPoint& pos);
|
||||
|
||||
|
|
|
|||
|
|
@ -554,6 +554,14 @@ p, li { white-space: pre-wrap; }
|
|||
<string>Export My Key</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionCreate_New_Profile">
|
||||
<property name="text">
|
||||
<string>Create New Profile</string>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Create a new Profile</string>
|
||||
</property>
|
||||
</action>
|
||||
</widget>
|
||||
<resources>
|
||||
<include location="images.qrc"/>
|
||||
|
|
|
|||
|
|
@ -240,8 +240,8 @@ void StartDialog::createnewaccount()
|
|||
//gencertdialog->show();
|
||||
|
||||
QMessageBox::StandardButton sb = QMessageBox::question ( NULL,
|
||||
"Create New Certificate",
|
||||
"This will delete your existing Certificate\n Are you sure you want to continue",
|
||||
"Create a New Profil",
|
||||
"This will generate a new Profile\n Are you sure you want to continue",
|
||||
(QMessageBox::Ok | QMessageBox::No));
|
||||
|
||||
if (sb == QMessageBox::Ok)
|
||||
|
|
|
|||
|
|
@ -600,10 +600,10 @@ p, li { white-space: pre-wrap; }
|
|||
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><span style=" font-size:10pt;">You can login with your Default</span></p>
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;">RetroShare profile.</p>
|
||||
<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;">You have a Profile?</p></body></html></string>
|
||||
</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">You can login with your</span></p>
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">RetroShare profile.</span></p>
|
||||
<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">You want a new Profile?</span></p></body></html></string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue