From de2956637b3989849610c51fed8f54750509c6ba Mon Sep 17 00:00:00 2001 From: defnax Date: Fri, 8 Aug 2008 21:01:45 +0000 Subject: [PATCH] fixed Make Friend Dialog git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@673 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- .../src/gui/connect/ConnectDialog.cpp | 2 +- .../src/gui/connect/ConnectDialog.ui | 517 ++++++++---------- retroshare-gui/src/gui/images.qrc | 2 + retroshare-gui/src/gui/images/cancel.png | Bin 0 -> 792 bytes retroshare-gui/src/gui/qss/default.qss | 7 +- retroshare-gui/src/release/qss/default.qss | 7 +- 6 files changed, 230 insertions(+), 305 deletions(-) create mode 100644 retroshare-gui/src/gui/images/cancel.png diff --git a/retroshare-gui/src/gui/connect/ConnectDialog.cpp b/retroshare-gui/src/gui/connect/ConnectDialog.cpp index c38f21f9a..d284b01ba 100644 --- a/retroshare-gui/src/gui/connect/ConnectDialog.cpp +++ b/retroshare-gui/src/gui/connect/ConnectDialog.cpp @@ -42,7 +42,7 @@ ConnectDialog::ConnectDialog(QWidget *parent, Qt::WFlags flags) // Create the status bar statusBar()->showMessage("Peer Informations"); - setFixedSize(QSize(330, 412)); + //setFixedSize(QSize(330, 412)); connect(ui.cancelButton, SIGNAL(clicked()), this, SLOT(closeinfodlg())); connect(ui.okButton, SIGNAL(clicked()), this, SLOT(authAttempt())); diff --git a/retroshare-gui/src/gui/connect/ConnectDialog.ui b/retroshare-gui/src/gui/connect/ConnectDialog.ui index 4f1a122fa..84dc67543 100644 --- a/retroshare-gui/src/gui/connect/ConnectDialog.ui +++ b/retroshare-gui/src/gui/connect/ConnectDialog.ui @@ -5,8 +5,8 @@ 0 0 - 324 - 428 + 462 + 380 @@ -493,315 +493,238 @@ Qt::NoContextMenu - Peer Details + Make Friend - + + :/images/rstray3.png:/images/rstray3.png - - - - 10 - 330 - 301 - 25 - - - - - 0 - - - 6 - - - - - <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; text-decoration:none;"> -<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;">AUTH CODE:</span></p></body></html> - - - - - - - - 0 - 0 - 0 - 0 - - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 40 - 20 - - - - - - - - - - 10 - 360 - 301 - 33 - - - - - 0 - - - 6 - - - - - false - - - - 77 - 0 - - - - Make Friend - - - - - - - Qt::Horizontal - - - - 131 - 31 - - - - - - - - - 77 - 0 - - - - Close - - - - - - - - - 9 - 9 - 312 - 315 - - - - Peer Details - - - - - 10 - 150 - 46 - 14 - - - - <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; text-decoration:none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Country:</span></p></body></html> - - - - - - 10 - 90 - 46 - 14 - - - - <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; text-decoration:none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Org:</span></p></body></html> - - - - - - 10 - 60 - 46 - 14 - - - - <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; text-decoration:none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Name:</span></p></body></html> - - - - - - 10 - 30 - 46 - 14 - - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> + + + 0 + 0 + 462 + 359 + + + + + + + Peer Details + + + + + + <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; text-decoration:none;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Trust:</span></p></body></html> - - - - - - 10 - 120 - 46 - 14 - - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> + + + + + + + true + + + + + + + <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; text-decoration:none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Name:</span></p></body></html> + + + + + + + true + + + + + + + <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; text-decoration:none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Org:</span></p></body></html> + + + + + + + true + + + + + + + <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; text-decoration:none;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Loc:</span></p></body></html> - - - - - - 10 - 180 - 57 - 31 - - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> + + + + + + + true + + + + + + + <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; text-decoration:none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Country:</span></p></body></html> + + + + + + + true + + + + + + + <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; text-decoration:none;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Certificate</span></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;">signers:</p></body></html> - - - - - - 70 - 150 - 221 - 21 - - - - true - - - - - - 70 - 120 - 221 - 21 - - - - true - - - - - - 70 - 90 - 221 - 21 - - - - true - - - - - - 70 - 60 - 221 - 21 - - - - true - - - - - - 70 - 30 - 221 - 21 - - - - true - - - - - - 70 - 180 - 221 - 131 - - - - + + + + + + + + + + + + + <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; text-decoration:none;"> +<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;">AUTH CODE:</span></p></body></html> + + + + + + + + 0 + 0 + + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 235 + 18 + + + + + + + + 6 + + + 0 + + + + + Qt::Horizontal + + + + 131 + 31 + + + + + + + + + 77 + 0 + + + + Cancel + + + + :/images/cancel.png:/images/cancel.png + + + + + + + false + + + + 77 + 0 + + + + Make Friend + + + + :/images/user/add_user16.png:/images/user/add_user16.png + + + + + + + + + + + 0 + 359 + 462 + 21 + + - trust @@ -811,8 +734,6 @@ p, li { white-space: pre-wrap; } country signers Ledit_name - okButton - cancelButton diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc index a07e50b8d..fb4f00ff4 100644 --- a/retroshare-gui/src/gui/images.qrc +++ b/retroshare-gui/src/gui/images.qrc @@ -52,6 +52,7 @@ images/chat/hide_avatar_frame.png images/chat/show_avatar_frame.png images/chats_24x24.png + images/cancel.png images/close-down.png images/close_normal.png images/console-small-down.png @@ -243,6 +244,7 @@ images/user/identitylightgrey24.png images/user/agt_forum24.png images/user/identity32.png + images/user/add_user16.pngg images/up.png images/underconstruction.png images/user.png diff --git a/retroshare-gui/src/gui/images/cancel.png b/retroshare-gui/src/gui/images/cancel.png new file mode 100644 index 0000000000000000000000000000000000000000..e2db55f22d6752e10a57f07e286081ebebacfea5 GIT binary patch literal 792 zcmV+z1LypSP)AsU_?Zci9d!A_6x~Insr^bw(It`ecQh8*8@Fx_eq|^b9kOS$wyR`|06NPhocs8 zU?v>-=-EnfdDG!10kVJ}=mfmL3x4C3JD#r5^Se7=<^gXYh=3bt;e*loYJQ%@zqp#o zc)ieEZw~|j12}i_vg*D#!8fNTYH-)p(SZRifR{fXpPVOOg5)8_Pfax}pxL$sOiaI_ z9663WbAXxGGQR;QY}-bF{nj_X{Nr6+f*aSdgArUWy~x7#3tYQ*U;M!9W0N|Xd56Y> zdw6NVP@4PMEslKs#fSj7!@bq{RDZ|F(lUi+9ee>|JyA+;y-hurBRMxmp;CdWNzChE zEgUAbv5jI00Q-_DfCrBwQLTgC1pOJbJebx(GO4#fZ-Z7r7eRrwu3!}WegvSSe~?;s zg&54uc6CmaclX!;Ty0b?pa&4c#fOgla1%y+p#)Z=f~-xR;Wr)XE6PJrdB<@ zkX^(65AWw<3BGfCZc8qEVwk5llHC!E4clf5C;=vLa<_ciGWRF}HJ|~Mfr?dU+T}WK zwsR5K0^D`Sq1rBg5bskfzs`!nAt2Vip96}O9S)jR-j65r$IZL|SSUu*ZczvKR4}MU zA;+G=VV*iLHje+;F`frfK+$f}Su8OX4QUMmEk`k$jYjm7Pd{sRn(48RUTuLs23_h7>hH;3oe{xsP*g;=fdj*7t_=_KYN7DNh9L(*MX+IPs+eE= zDxM&f=%ZXQal{bBz)%Dm!3LQf+RwS^Q`pLYql&h1ISRI;>9a!ve49Rq1EL~0BK!+x WVm^3T=Dr&M0000