fixed Make Friend Dialog

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@673 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2008-08-08 21:01:45 +00:00
parent 074e4adbf3
commit de2956637b
6 changed files with 230 additions and 305 deletions

View File

@ -42,7 +42,7 @@ ConnectDialog::ConnectDialog(QWidget *parent, Qt::WFlags flags)
// Create the status bar // Create the status bar
statusBar()->showMessage("Peer Informations"); statusBar()->showMessage("Peer Informations");
setFixedSize(QSize(330, 412)); //setFixedSize(QSize(330, 412));
connect(ui.cancelButton, SIGNAL(clicked()), this, SLOT(closeinfodlg())); connect(ui.cancelButton, SIGNAL(clicked()), this, SLOT(closeinfodlg()));
connect(ui.okButton, SIGNAL(clicked()), this, SLOT(authAttempt())); connect(ui.okButton, SIGNAL(clicked()), this, SLOT(authAttempt()));

View File

@ -5,8 +5,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>324</width> <width>462</width>
<height>428</height> <height>380</height>
</rect> </rect>
</property> </property>
<property name="palette" > <property name="palette" >
@ -493,315 +493,238 @@
<enum>Qt::NoContextMenu</enum> <enum>Qt::NoContextMenu</enum>
</property> </property>
<property name="windowTitle" > <property name="windowTitle" >
<string>Peer Details</string> <string>Make Friend</string>
</property> </property>
<property name="windowIcon" > <property name="windowIcon" >
<iconset/> <iconset resource="../images.qrc" >
<normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
</property> </property>
<widget class="QWidget" name="centralwidget" > <widget class="QWidget" name="centralwidget" >
<widget class="QWidget" name="layoutWidget_2" > <property name="geometry" >
<property name="geometry" > <rect>
<rect> <x>0</x>
<x>10</x> <y>0</y>
<y>330</y> <width>462</width>
<width>301</width> <height>359</height>
<height>25</height> </rect>
</rect> </property>
</property> <layout class="QGridLayout" name="gridLayout_2" >
<layout class="QGridLayout" > <item row="0" column="0" colspan="3" >
<property name="margin" > <widget class="QGroupBox" name="groupBox" >
<number>0</number> <property name="title" >
</property> <string>Peer Details</string>
<property name="spacing" > </property>
<number>6</number> <layout class="QGridLayout" name="gridLayout" >
</property> <item row="0" column="0" >
<item row="0" column="0" > <widget class="QLabel" name="label" >
<widget class="QLabel" name="label_7" > <property name="text" >
<property name="text" > <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
p, li { white-space: pre-wrap; }
&lt;/style>&lt;/head>&lt;body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal; text-decoration:none;">
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-size:8pt; font-weight:600;">AUTH CODE:&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QLineEdit" name="Ledit_name" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="0" column="2" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" >
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<widget class="QWidget" name="layoutWidget" >
<property name="geometry" >
<rect>
<x>10</x>
<y>360</y>
<width>301</width>
<height>33</height>
</rect>
</property>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<widget class="QPushButton" name="okButton" >
<property name="enabled" >
<bool>false</bool>
</property>
<property name="minimumSize" >
<size>
<width>77</width>
<height>0</height>
</size>
</property>
<property name="text" >
<string>Make Friend</string>
</property>
</widget>
</item>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
<width>131</width>
<height>31</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="cancelButton" >
<property name="minimumSize" >
<size>
<width>77</width>
<height>0</height>
</size>
</property>
<property name="text" >
<string>Close</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QGroupBox" name="groupBox" >
<property name="geometry" >
<rect>
<x>9</x>
<y>9</y>
<width>312</width>
<height>315</height>
</rect>
</property>
<property name="title" >
<string>Peer Details</string>
</property>
<widget class="QLabel" name="label_5" >
<property name="geometry" >
<rect>
<x>10</x>
<y>150</y>
<width>46</width>
<height>14</height>
</rect>
</property>
<property name="text" >
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
p, li { white-space: pre-wrap; }
&lt;/style>&lt;/head>&lt;body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;">
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-weight:600;">Country:&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
</property>
</widget>
<widget class="QLabel" name="label_3" >
<property name="geometry" >
<rect>
<x>10</x>
<y>90</y>
<width>46</width>
<height>14</height>
</rect>
</property>
<property name="text" >
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
p, li { white-space: pre-wrap; }
&lt;/style>&lt;/head>&lt;body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;">
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-weight:600;">Org:&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
</property>
</widget>
<widget class="QLabel" name="label_2" >
<property name="geometry" >
<rect>
<x>10</x>
<y>60</y>
<width>46</width>
<height>14</height>
</rect>
</property>
<property name="text" >
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
p, li { white-space: pre-wrap; }
&lt;/style>&lt;/head>&lt;body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;">
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-weight:600;">Name:&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
</property>
</widget>
<widget class="QLabel" name="label" >
<property name="geometry" >
<rect>
<x>10</x>
<y>30</y>
<width>46</width>
<height>14</height>
</rect>
</property>
<property name="text" >
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; }
&lt;/style>&lt;/head>&lt;body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;"> &lt;/style>&lt;/head>&lt;body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;">
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-weight:600;">Trust:&lt;/span>&lt;/p>&lt;/body>&lt;/html></string> &lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-weight:600;">Trust:&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="label_4" > </item>
<property name="geometry" > <item row="0" column="1" >
<rect> <widget class="QLineEdit" name="trust" >
<x>10</x> <property name="readOnly" >
<y>120</y> <bool>true</bool>
<width>46</width> </property>
<height>14</height> </widget>
</rect> </item>
</property> <item row="1" column="0" >
<property name="text" > <widget class="QLabel" name="label_2" >
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css"> <property name="text" >
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
p, li { white-space: pre-wrap; }
&lt;/style>&lt;/head>&lt;body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;">
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-weight:600;">Name:&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QLineEdit" name="name" >
<property name="readOnly" >
<bool>true</bool>
</property>
</widget>
</item>
<item row="2" column="0" >
<widget class="QLabel" name="label_3" >
<property name="text" >
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
p, li { white-space: pre-wrap; }
&lt;/style>&lt;/head>&lt;body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;">
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-weight:600;">Org:&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
</property>
</widget>
</item>
<item row="2" column="1" >
<widget class="QLineEdit" name="org" >
<property name="readOnly" >
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="0" >
<widget class="QLabel" name="label_4" >
<property name="text" >
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; }
&lt;/style>&lt;/head>&lt;body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;"> &lt;/style>&lt;/head>&lt;body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;">
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-weight:600;">Loc:&lt;/span>&lt;/p>&lt;/body>&lt;/html></string> &lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-weight:600;">Loc:&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="label_6" > </item>
<property name="geometry" > <item row="3" column="1" >
<rect> <widget class="QLineEdit" name="loc" >
<x>10</x> <property name="readOnly" >
<y>180</y> <bool>true</bool>
<width>57</width> </property>
<height>31</height> </widget>
</rect> </item>
</property> <item row="4" column="0" >
<property name="text" > <widget class="QLabel" name="label_5" >
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css"> <property name="text" >
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
p, li { white-space: pre-wrap; }
&lt;/style>&lt;/head>&lt;body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;">
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-weight:600;">Country:&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
</property>
</widget>
</item>
<item row="4" column="1" >
<widget class="QLineEdit" name="country" >
<property name="readOnly" >
<bool>true</bool>
</property>
</widget>
</item>
<item row="5" column="0" >
<widget class="QLabel" name="label_6" >
<property name="text" >
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; }
&lt;/style>&lt;/head>&lt;body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;"> &lt;/style>&lt;/head>&lt;body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;">
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-weight:600;">Certificate&lt;/span>&lt;/p> &lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-weight:600;">Certificate&lt;/span>&lt;/p>
&lt;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:&lt;/p>&lt;/body>&lt;/html></string> &lt;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:&lt;/p>&lt;/body>&lt;/html></string>
</property> </property>
</widget> </widget>
<widget class="QLineEdit" name="country" > </item>
<property name="geometry" > <item row="5" column="1" >
<rect> <widget class="QTextBrowser" name="signers" />
<x>70</x> </item>
<y>150</y> </layout>
<width>221</width> </widget>
<height>21</height> </item>
</rect> <item row="1" column="0" >
</property> <widget class="QLabel" name="label_7" >
<property name="readOnly" > <property name="text" >
<bool>true</bool> <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
</property> p, li { white-space: pre-wrap; }
</widget> &lt;/style>&lt;/head>&lt;body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal; text-decoration:none;">
<widget class="QLineEdit" name="loc" > &lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-size:8pt; font-weight:600;">AUTH CODE:&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
<property name="geometry" > </property>
<rect> </widget>
<x>70</x> </item>
<y>120</y> <item row="1" column="1" >
<width>221</width> <widget class="QLineEdit" name="Ledit_name" >
<height>21</height> <property name="sizePolicy" >
</rect> <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
</property> <horstretch>0</horstretch>
<property name="readOnly" > <verstretch>0</verstretch>
<bool>true</bool> </sizepolicy>
</property> </property>
</widget> </widget>
<widget class="QLineEdit" name="org" > </item>
<property name="geometry" > <item row="1" column="2" >
<rect> <spacer>
<x>70</x> <property name="orientation" >
<y>90</y> <enum>Qt::Horizontal</enum>
<width>221</width> </property>
<height>21</height> <property name="sizeType" >
</rect> <enum>QSizePolicy::Expanding</enum>
</property> </property>
<property name="readOnly" > <property name="sizeHint" stdset="0" >
<bool>true</bool> <size>
</property> <width>235</width>
</widget> <height>18</height>
<widget class="QLineEdit" name="name" > </size>
<property name="geometry" > </property>
<rect> </spacer>
<x>70</x> </item>
<y>60</y> <item row="2" column="0" colspan="3" >
<width>221</width> <layout class="QHBoxLayout" >
<height>21</height> <property name="spacing" >
</rect> <number>6</number>
</property> </property>
<property name="readOnly" > <property name="margin" >
<bool>true</bool> <number>0</number>
</property> </property>
</widget> <item>
<widget class="QLineEdit" name="trust" > <spacer>
<property name="geometry" > <property name="orientation" >
<rect> <enum>Qt::Horizontal</enum>
<x>70</x> </property>
<y>30</y> <property name="sizeHint" stdset="0" >
<width>221</width> <size>
<height>21</height> <width>131</width>
</rect> <height>31</height>
</property> </size>
<property name="readOnly" > </property>
<bool>true</bool> </spacer>
</property> </item>
</widget> <item>
<widget class="QTextBrowser" name="signers" > <widget class="QPushButton" name="cancelButton" >
<property name="geometry" > <property name="minimumSize" >
<rect> <size>
<x>70</x> <width>77</width>
<y>180</y> <height>0</height>
<width>221</width> </size>
<height>131</height> </property>
</rect> <property name="text" >
</property> <string>Cancel</string>
</widget> </property>
</widget> <property name="icon" >
<iconset resource="../images.qrc" >
<normaloff>:/images/cancel.png</normaloff>:/images/cancel.png</iconset>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="okButton" >
<property name="enabled" >
<bool>false</bool>
</property>
<property name="minimumSize" >
<size>
<width>77</width>
<height>0</height>
</size>
</property>
<property name="text" >
<string>Make Friend</string>
</property>
<property name="icon" >
<iconset resource="../images.qrc" >
<normaloff>:/images/user/add_user16.png</normaloff>:/images/user/add_user16.png</iconset>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<widget class="QStatusBar" name="statusbar" >
<property name="geometry" >
<rect>
<x>0</x>
<y>359</y>
<width>462</width>
<height>21</height>
</rect>
</property>
</widget> </widget>
<widget class="QStatusBar" name="statusbar" />
</widget> </widget>
<tabstops> <tabstops>
<tabstop>trust</tabstop> <tabstop>trust</tabstop>
@ -811,8 +734,6 @@ p, li { white-space: pre-wrap; }
<tabstop>country</tabstop> <tabstop>country</tabstop>
<tabstop>signers</tabstop> <tabstop>signers</tabstop>
<tabstop>Ledit_name</tabstop> <tabstop>Ledit_name</tabstop>
<tabstop>okButton</tabstop>
<tabstop>cancelButton</tabstop>
</tabstops> </tabstops>
<resources> <resources>
<include location="../images.qrc" /> <include location="../images.qrc" />

View File

@ -52,6 +52,7 @@
<file>images/chat/hide_avatar_frame.png</file> <file>images/chat/hide_avatar_frame.png</file>
<file>images/chat/show_avatar_frame.png</file> <file>images/chat/show_avatar_frame.png</file>
<file>images/chats_24x24.png</file> <file>images/chats_24x24.png</file>
<file>images/cancel.png</file>
<file>images/close-down.png</file> <file>images/close-down.png</file>
<file>images/close_normal.png</file> <file>images/close_normal.png</file>
<file>images/console-small-down.png</file> <file>images/console-small-down.png</file>
@ -243,6 +244,7 @@
<file>images/user/identitylightgrey24.png</file> <file>images/user/identitylightgrey24.png</file>
<file>images/user/agt_forum24.png</file> <file>images/user/agt_forum24.png</file>
<file>images/user/identity32.png</file> <file>images/user/identity32.png</file>
<file>images/user/add_user16.png</file>g
<file>images/up.png</file> <file>images/up.png</file>
<file>images/underconstruction.png</file> <file>images/underconstruction.png</file>
<file>images/user.png</file> <file>images/user.png</file>

Binary file not shown.

After

Width:  |  Height:  |  Size: 792 B

View File

@ -17,14 +17,15 @@ QMenuBar {
QPushButton#okButton { QPushButton#okButton {
min-height: 27px; max-height: 25px
min-height: 25px;
min-width: 77px; min-width: 77px;
max-width: 77px; /*max-width: 77px;*/
} }
QPushButton#cancelprefButton { QPushButton#cancelprefButton {
min-height: 27px; min-height: 25px;
min-width: 77px; min-width: 77px;
max-width: 77px; max-width: 77px;
} }

View File

@ -17,14 +17,15 @@ QMenuBar {
QPushButton#okButton { QPushButton#okButton {
min-height: 27px; max-height: 25px
min-height: 25px;
min-width: 77px; min-width: 77px;
max-width: 77px; /*max-width: 77px;*/
} }
QPushButton#cancelprefButton { QPushButton#cancelprefButton {
min-height: 27px; min-height: 25px;
min-width: 77px; min-width: 77px;
max-width: 77px; max-width: 77px;
} }