diff --git a/retroshare-gui/src/RetroShare.pro b/retroshare-gui/src/RetroShare.pro index 424e6d89d..96758f8bc 100644 --- a/retroshare-gui/src/RetroShare.pro +++ b/retroshare-gui/src/RetroShare.pro @@ -134,7 +134,7 @@ HEADERS += rshare.h \ gui/ExampleDialog.h \ gui/GamesDialog.h \ gui/PhotoDialog.h \ - gui/TurtleRouterDialog.h \ + gui/TurtleRouterDialog.h \ gui/PhotoShow.h \ gui/AddLinksDialog.h \ gui/LinksDialog.h \ @@ -155,6 +155,7 @@ HEADERS += rshare.h \ gui/StatisticDialog.h \ gui/SoundManager.h \ gui/HelpDialog.h \ + gui/InfoDialog.h \ gui/LogoBar.h \ gui/xprogressbar.h \ gui/plugins/PluginInterface.h \ @@ -246,8 +247,8 @@ HEADERS += rshare.h \ gui/MsgFeed.h \ gui/TransferFeed.h \ gui/ChannelFeed.h \ - gui/GeneralMsgDialog.h \ - gui/ChanGroupDelegate.h \ + gui/GeneralMsgDialog.h \ + gui/ChanGroupDelegate.h \ gui/feeds/FeedHolder.h \ gui/feeds/ForumNewItem.h \ gui/feeds/ForumMsgItem.h \ @@ -273,7 +274,7 @@ FORMS += gui/BlogDialog.ui \ gui/MainWindow.ui \ gui/ApplicationWindow.ui \ gui/ExampleDialog.ui \ - gui/TurtleRouterDialog.ui \ + gui/TurtleRouterDialog.ui \ gui/GamesDialog.ui \ gui/PhotoDialog.ui \ gui/PhotoShow.ui \ @@ -294,6 +295,7 @@ FORMS += gui/BlogDialog.ui \ gui/MessagesPopupDialog.ui \ gui/help/browser/helpbrowser.ui \ gui/HelpDialog.ui \ + gui/InfoDialog.ui \ gui/bwgraph/bwgraph.ui \ gui/profile/ProfileView.ui \ gui/profile/ProfileEdit.ui \ @@ -353,7 +355,7 @@ SOURCES += main.cpp \ gui/TransfersDialog.cpp \ gui/graphframe.cpp \ gui/mainpagestack.cpp \ - gui/TurtleRouterDialog.cpp \ + gui/TurtleRouterDialog.cpp \ gui/MainWindow.cpp \ gui/ApplicationWindow.cpp \ gui/ExampleDialog.cpp \ @@ -387,6 +389,7 @@ SOURCES += main.cpp \ gui/help/browser/helpbrowser.cpp \ gui/help/browser/helptextbrowser.cpp \ gui/HelpDialog.cpp \ + gui/InfoDialog.cpp \ gui/LogoBar.cpp \ gui/xprogressbar.cpp \ lang/languagesupport.cpp \ @@ -459,8 +462,8 @@ SOURCES += main.cpp \ gui/MsgFeed.cpp \ gui/TransferFeed.cpp \ gui/ChannelFeed.cpp \ - gui/GeneralMsgDialog.cpp \ - gui/ChanGroupDelegate.cpp \ + gui/GeneralMsgDialog.cpp \ + gui/ChanGroupDelegate.cpp \ gui/feeds/ForumNewItem.cpp \ gui/feeds/ForumMsgItem.cpp \ gui/feeds/PeerItem.cpp \ diff --git a/retroshare-gui/src/gui/GenCertDialog.cpp b/retroshare-gui/src/gui/GenCertDialog.cpp index 4ee755f6c..f66bd25eb 100644 --- a/retroshare-gui/src/gui/GenCertDialog.cpp +++ b/retroshare-gui/src/gui/GenCertDialog.cpp @@ -23,6 +23,7 @@ #include #include #include "GenCertDialog.h" +#include "InfoDialog.h" #include "gui/Preferences/rsharesettings.h" #include #include @@ -43,6 +44,7 @@ GenCertDialog::GenCertDialog(QWidget *parent, Qt::WFlags flags) connect(ui.genButton, SIGNAL(clicked()), this, SLOT(genPerson())); + 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))); @@ -248,3 +250,8 @@ void GenCertDialog::loadCertificates() } } +void GenCertDialog::infodlg() +{ + static InfoDialog *infodialog = new InfoDialog(); + infodialog->show(); +} diff --git a/retroshare-gui/src/gui/GenCertDialog.h b/retroshare-gui/src/gui/GenCertDialog.h index 4792a7dd0..f88f5b61c 100644 --- a/retroshare-gui/src/gui/GenCertDialog.h +++ b/retroshare-gui/src/gui/GenCertDialog.h @@ -54,6 +54,7 @@ private slots: //void loadPerson(); void selectFriend(); void checkChanged(int i); + void infodlg(); private: diff --git a/retroshare-gui/src/gui/GenCertDialog.ui b/retroshare-gui/src/gui/GenCertDialog.ui index e63bef4bc..42ddd3fa6 100644 --- a/retroshare-gui/src/gui/GenCertDialog.ui +++ b/retroshare-gui/src/gui/GenCertDialog.ui @@ -6,10 +6,22 @@ 0 0 - 486 - 427 + 437 + 350 + + + 0 + 0 + + + + + 167777 + 167777 + + @@ -500,629 +512,652 @@ :/images/rstray3.png:/images/rstray3.png - - - - - - - - - - 0 - 0 - 0 - - - - - - - 212 - 208 - 200 - - - - - - - 255 - 255 - 255 - - - - - - - 234 - 229 - 220 - - - - - - - 128 - 128 - 128 - - - - - - - 141 - 139 - 133 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 212 - 208 - 200 - - - - - - - 64 - 64 - 64 - - - - - - - 10 - 36 - 106 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 255 - - - - - - - 255 - 0 - 255 - - - - - - - 232 - 232 - 232 - - - - - - - - - 0 - 0 - 0 - - - - - - - 212 - 208 - 200 - - - - - - - 255 - 255 - 255 - - - - - - - 234 - 229 - 220 - - - - - - - 128 - 128 - 128 - - - - - - - 141 - 139 - 133 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 212 - 208 - 200 - - - - - - - 64 - 64 - 64 - - - - - - - 212 - 208 - 200 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 255 - - - - - - - 255 - 0 - 255 - - - - - - - 232 - 232 - 232 - - - - - - - - - 106 - 104 - 100 - - - - - - - 212 - 208 - 200 - - - - - - - 255 - 255 - 255 - - - - - - - 233 - 231 - 227 - - - - - - - 128 - 128 - 128 - - - - - - - 141 - 139 - 133 - - - - - - - 106 - 104 - 100 - - - - - - - 255 - 255 - 255 - - - - - - - 106 - 104 - 100 - - - - - - - 212 - 208 - 200 - - - - - - - 212 - 208 - 200 - - - - - - - 0 - 0 - 0 - - - - - - - 10 - 36 - 106 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 255 - - - - - - - 255 - 0 - 255 - - - - - - - 232 - 232 - 232 - - - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + + + + + + + + 0 + 0 + + + + + 16777215 + 116 + + + + + + + + + 0 + 0 + 0 + + + + + + + 212 + 208 + 200 + + + + + + + 255 + 255 + 255 + + + + + + + 234 + 229 + 220 + + + + + + + 128 + 128 + 128 + + + + + + + 141 + 139 + 133 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 212 + 208 + 200 + + + + + + + 64 + 64 + 64 + + + + + + + 10 + 36 + 106 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 255 + + + + + + + 255 + 0 + 255 + + + + + + + 232 + 232 + 232 + + + + + + + + + 0 + 0 + 0 + + + + + + + 212 + 208 + 200 + + + + + + + 255 + 255 + 255 + + + + + + + 234 + 229 + 220 + + + + + + + 128 + 128 + 128 + + + + + + + 141 + 139 + 133 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 212 + 208 + 200 + + + + + + + 64 + 64 + 64 + + + + + + + 212 + 208 + 200 + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 255 + + + + + + + 255 + 0 + 255 + + + + + + + 232 + 232 + 232 + + + + + + + + + 106 + 104 + 100 + + + + + + + 212 + 208 + 200 + + + + + + + 255 + 255 + 255 + + + + + + + 233 + 231 + 227 + + + + + + + 128 + 128 + 128 + + + + + + + 141 + 139 + 133 + + + + + + + 106 + 104 + 100 + + + + + + + 255 + 255 + 255 + + + + + + + 106 + 104 + 100 + + + + + + + 212 + 208 + 200 + + + + + + + 212 + 208 + 200 + + + + + + + 0 + 0 + 0 + + + + + + + 10 + 36 + 106 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 255 + + + + + + + 255 + 0 + 255 + + + + + + + 232 + 232 + 232 + + + + + + + + <!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;">Create a new RetroShare 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;"><span style=" font-size:9pt;">Friends.</span></p></body></html> - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - 100 - - - - - - - 0 - - - 6 - - - - - Name: - - - - - - - - - Qt::Horizontal + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - Organisation: - - - - - - - - - - Location: - - - - - - - - - - Country: - - - - - - - - - - Qt::Horizontal - - - - - - - Generate New Profil - - - - - - - Qt::Horizontal - - - - 211 - 20 - - - - - - - - - - - OpenPGP User + + 100 - - - PGP Password + + + 9 - - - - - - QLineEdit::Password + + 6 - + + + + Name: + + + + + + + + + + Qt::Horizontal + + + + + + + Organisation: + + + + + + + + + + Location: + + + + + + + + + + Country: + + + + + + + + + + Qt::Horizontal + + + + + + + + + + OpenPGP User + + + + + + + PGP Password + + + + + + + QLineEdit::Password + + + + + + + Qt::Horizontal + + + + + + + Qt::Horizontal + + + + - - - Qt::Horizontal + + + QLayout::SetFixedSize - - - - - - Qt::Horizontal + + 9 - + + 9 + + + + + Info + + + + + + + Qt::Horizontal + + + + 206 + 22 + + + + + + + + Generate New Profil + + + + - - - - Qt::Vertical - - - - 20 - 40 - - - - @@ -1132,7 +1167,6 @@ p, li { white-space: pre-wrap; } genOrg genLoc genCountry - genButton diff --git a/retroshare-gui/src/gui/InfoDialog.cpp b/retroshare-gui/src/gui/InfoDialog.cpp new file mode 100644 index 000000000..81b577cdd --- /dev/null +++ b/retroshare-gui/src/gui/InfoDialog.cpp @@ -0,0 +1,58 @@ +/**************************************************************** + * RetroShare is distributed under the following license: + * + * Copyright (C) 2009, RetroShare Team + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + ****************************************************************/ + + +#include "InfoDialog.h" +#include "rsiface/rsiface.h" + +#include +#include + +#include +#include + +#include +#include +#include +#include +#include +#include + +/* Images for context menu icons */ +#define IMAGE_DOWNLOAD ":/images/start.png" + +/** Constructor */ +InfoDialog::InfoDialog(QWidget *parent) +:QDialog(parent) +{ + /* Invoke the Qt Designer generated object setup routine */ + ui.setupUi(this); + + connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(reject())); + + + /* Hide platform specific features */ +#ifdef Q_WS_WIN + +#endif +} + + diff --git a/retroshare-gui/src/gui/InfoDialog.h b/retroshare-gui/src/gui/InfoDialog.h new file mode 100644 index 000000000..3f6364ab2 --- /dev/null +++ b/retroshare-gui/src/gui/InfoDialog.h @@ -0,0 +1,49 @@ +/**************************************************************** + * RetroShare is distributed under the following license: + * + * Copyright (C) 2006, crypton + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + ****************************************************************/ + +#ifndef _INFODIALOG_H +#define _INFODIALOG_H + +#include + +#include "ui_InfoDialog.h" + +#include "rsiface/rstypes.h" + +class InfoDialog : public QDialog +{ + Q_OBJECT + +public: + /** Default Constructor */ + InfoDialog(QWidget *parent = 0); + /** Default Destructor */ + +private slots: + +private: + /** Qt Designer generated object */ + Ui::InfoDialog ui; + +}; + +#endif + diff --git a/retroshare-gui/src/gui/InfoDialog.ui b/retroshare-gui/src/gui/InfoDialog.ui new file mode 100644 index 000000000..41a3814a9 --- /dev/null +++ b/retroshare-gui/src/gui/InfoDialog.ui @@ -0,0 +1,73 @@ + + + InfoDialog + + + + 0 + 0 + 595 + 227 + + + + Info + + + + :/images/info16.png:/images/info16.png + + + + + + background: white; +border: 2px solid black; +border-radius: 10px; + + + + + <!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;"><span style=" font-size:9pt; font-weight:600;">You must create for RetroShare a GPG key, this is required for creating a RetroShare Profile.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;"></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-size:8pt; font-weight:600;">1. On Linux must install GPA :</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt; font-weight:600;"></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-size:8pt; color:#0000ff;">sudo apt-get install gpa</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt; color:#0000ff;"></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-size:8pt; font-weight:600;">2. On Windows must install gpg4win package:</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt; font-weight:600;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://ftp.gpg4win.org/gpg4win-1.1.4.exe"><span style=" text-decoration: underline; color:#0000ff;">http://ftp.gpg4win.org/gpg4win-1.1.4.exe</span></a></p></body></html> + + + + + + + Qt::Horizontal + + + + 502 + 20 + + + + + + + + QDialogButtonBox::Close + + + + + + + + + + diff --git a/retroshare-gui/src/gui/StartDialog.cpp b/retroshare-gui/src/gui/StartDialog.cpp index 67926b8b8..42b9e6f81 100644 --- a/retroshare-gui/src/gui/StartDialog.cpp +++ b/retroshare-gui/src/gui/StartDialog.cpp @@ -23,6 +23,7 @@ #include #include "StartDialog.h" #include "GenCertDialog.h" +#include "InfoDialog.h" #include "LogoBar.h" #include #include @@ -67,6 +68,7 @@ StartDialog::StartDialog(QWidget *parent, Qt::WFlags flags) //connect(ui.selectButton, SIGNAL(clicked()), this, SLOT(selectFriend())); //connect(ui.friendBox, SIGNAL(stateChanged(int)), this, SLOT(checkChanged(int))); connect(ui.createaccountButton, SIGNAL(clicked()), this, SLOT(createnewaccount())); + connect(ui.infoButton,SIGNAL(clicked()), this, SLOT(infodlg())); /* load the Certificate File name */ std::string userName; @@ -259,6 +261,15 @@ void StartDialog::createnewaccount() } } + +void StartDialog::infodlg() +{ + static InfoDialog *infodialog = new InfoDialog(); + infodialog->show(); +} + + + bool StartDialog::requestedNewCert() { return reqNewCert; diff --git a/retroshare-gui/src/gui/StartDialog.h b/retroshare-gui/src/gui/StartDialog.h index e97d89bd7..98448a192 100644 --- a/retroshare-gui/src/gui/StartDialog.h +++ b/retroshare-gui/src/gui/StartDialog.h @@ -60,7 +60,9 @@ private slots: void closeinfodlg(); void loadPerson(); - void createnewaccount(); + void createnewaccount(); + void infodlg(); + private: diff --git a/retroshare-gui/src/gui/StartDialog.ui b/retroshare-gui/src/gui/StartDialog.ui index 607fe34f8..226e2f068 100644 --- a/retroshare-gui/src/gui/StartDialog.ui +++ b/retroshare-gui/src/gui/StartDialog.ui @@ -6,8 +6,8 @@ 0 0 - 268 - 627 + 244 + 529 @@ -581,71 +581,6 @@ p, li { white-space: pre-wrap; } - - - - Qt::Horizontal - - - - 25 - 208 - - - - - - - - <!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:'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> - - - - - - - Qt::Horizontal - - - - 24 - 198 - - - - - - - - Qt::Horizontal - - - - 75 - 20 - - - - - - - - Generate now a Profile - - - generate new a profile - - - false - - - @@ -787,7 +722,7 @@ p, li { white-space: pre-wrap; } - + @@ -803,11 +738,69 @@ p, li { white-space: pre-wrap; } + + + + Qt::Horizontal + + + + 24 + 198 + + + + + + + + Qt::Horizontal + + + + 25 + 208 + + + + + + + + Qt::Horizontal + + + + 75 + 20 + + + + + + + + Generate now a Profile + + + new profile + + + false + + + + + + + Info + + + - createaccountButton loadName loadPasswd loadGPGPasswd diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc index c7f66af91..66fb319ae 100644 --- a/retroshare-gui/src/gui/images.qrc +++ b/retroshare-gui/src/gui/images.qrc @@ -202,6 +202,7 @@ images/konversation.png images/konversation16.png images/konversation128.png + images/konv_message2.png images/konversation64.png images/ksysguard.png images/ksysguard32.png