From 984ce2d3ad81264cbfcaf6c43102f44f73dd51bb Mon Sep 17 00:00:00 2001 From: csoler Date: Wed, 6 Jan 2016 18:07:20 -0500 Subject: [PATCH] removed circles tab from IdDialog. Came from a difficult manual merging between dos and unix encoded files --- retroshare-gui/src/gui/Identity/IdDialog.ui | 936 +++++++++----------- 1 file changed, 430 insertions(+), 506 deletions(-) diff --git a/retroshare-gui/src/gui/Identity/IdDialog.ui b/retroshare-gui/src/gui/Identity/IdDialog.ui index 25a9efd83..6e0e0c4ae 100644 --- a/retroshare-gui/src/gui/Identity/IdDialog.ui +++ b/retroshare-gui/src/gui/Identity/IdDialog.ui @@ -6,8 +6,8 @@ 0 0 - 1484 - 791 + 745 + 668 @@ -19,7 +19,7 @@ - + @@ -108,395 +108,390 @@ - - - Qt::Horizontal - - - + + + + + Qt::Horizontal + + + + + + + QFrame::Box + + + QFrame::Sunken + + + + 2 + + + + + + + + + + + + 0 + 0 + + + + Qt::NoFocus + + + Create new Identity + + + New ID + + + + :/images/identity/identity_create_32.png:/images/identity/identity_create_32.png + + + + 24 + 24 + + + + true + + + + + + + + + + + + + + 0 + 0 + + + + Qt::CustomContextMenu + + + QAbstractItemView::ExtendedSelection + + + + 22 + 22 + + + + 24 + + + true + + + false + + + + Persons + + + + + Identity ID + + + + + Owned by + + + + + Reputation + + + AlignLeft|AlignVCenter + + + + + + + + + + - + - QFrame::Box + QFrame::StyledPanel - QFrame::Sunken + QFrame::Raised - - - 2 + + + 12 - - - - - - - - - - - 0 - 0 - - - - Qt::NoFocus - - - Create new Identity - - - New ID - - - - :/images/identity/identity_create_32.png:/images/identity/identity_create_32.png - - + + + - 24 - 24 + 64 + 64 - + + + 64 + 64 + + + + + + + + + true + + + + People + + + - + + + Identity info + + + + + + 6 + + + 6 + + + + + Identity ID : + + + + + + + Identity name : + + + + + + + Owner node ID : + + + + + + + true + + + true + + + + + + + true + + + true + + + + + + + true + + + true + + + + + + + Owner node name : + + + + + + + true + + + true + + + + + + + Type: + + + + + + + + + + Last used: + + + + + + + + + + + + + + + 0 + 0 + + + + + 128 + 128 + + + + + 128 + 128 + + + + QFrame::Box + + + QFrame::Sunken + + + Your Avatar + + + true + + + Qt::AlignCenter + + + + + + + Send Invite + + + + + + + Qt::Vertical + + + + 20 + 2 + + + + + + + + - + - + 0 0 - - Qt::CustomContextMenu + + Reputation - - QAbstractItemView::ExtendedSelection - - - - 22 - 22 - - - - 24 - - - true - - - false - - - - Persons - - - - - Identity ID - - - - - Owned by - - - - - Reputation - - - AlignLeft|AlignVCenter - - - - - - - - - 0 - - - - Person - - - - + - - - QFrame::StyledPanel + + + 6 - - QFrame::Raised - - - - 12 - - - - - - 64 - 64 - - - - - 64 - 64 - - - - - - - - - - true - - - - - - - People - - - - - - - - - - Identity info - - - - - - 6 - - - 6 - - - - - Identity ID : - - - - - - - Identity name : - - - - - - - Owner node ID : - - - - - - - true - - - true - - - - - - - true - - - true - - - - - - - true - - - true - - - - - - - Owner node name : - - - - - - - true - - - true - - - - - - - Type: - - - - - - - - - - Last used: - - - - - - - - - - - - - - - 0 - 0 - - - - - 128 - 128 - - - - - 128 - 128 - - - - QFrame::Box - - - QFrame::Sunken - - - Your Avatar - - - true - - - Qt::AlignCenter - - - - - - - Send Invite - - - - - - - Qt::Vertical - - - - 20 - 2 - - - - - - - - - - - - - - 0 - 0 - - - - Reputation - - - - - - 6 - - - - - <html><head/><body><p>Average opinion of neighbor nodes about this identity. Negative is bad,</p><p>positive is good. Zero is neutral.</p></body></html> - - - true - - - - - - - Your opinion: - - - - - - - Neighbor nodes: - - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + + + + <html><head/><body><p>Average opinion of neighbor nodes about this identity. Negative is bad,</p><p>positive is good. Zero is neutral.</p></body></html> + + + true + + + + + + + Your opinion: + + + + + + + Neighbor nodes: + + + + + + + <!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:'Sans'; font-size:9pt; font-weight:400; font-style:normal;"> @@ -517,149 +512,78 @@ p, li { white-space: pre-wrap; } <p style="-qt-paragraph-type:empty; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The overall rating is computed in such a way that it is not possible for a single person to deterministically change someone's status at neighbor nodes.</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;"><br /></p></body></html> - - - 0 - - - - Negative - - - - ../icons/yellow_biohazard64.png../icons/yellow_biohazard64.png - - - - - Neutral - - - - - Positive - - - - - - - - <html><head/><body><p>Overall reputation score, accounting for yours and your friends'.</p><p>Negative is bad, positive is good. Zero is neutral. If the score is too low,</p><p>the identity is flagged as bad, and will be filtered out in forums, chat lobbies,</p><p>channels, etc.</p></body></html> - - - true - - - - - - - - 75 - true - - - - Overall: - - - - - - - - - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 20 - 40 - - - + + + 0 + + + + Negative + + + + ../icons/yellow_biohazard64.png../icons/yellow_biohazard64.png + + + + + Neutral + + + + + Positive + + + + + + + + <html><head/><body><p>Overall reputation score, accounting for yours and your friends'.</p><p>Negative is bad, positive is good. Zero is neutral. If the score is too low,</p><p>the identity is flagged as bad, and will be filtered out in forums, chat lobbies,</p><p>channels, etc.</p></body></html> + + + true + + + + + + + + 75 + true + + + + Overall: + + + + - - - - - - Circles - - - - - - - - Create Circle - - - - - - - Edit Circle - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - Qt::CustomContextMenu - - - true - - - - Name - - - - - IDs - - - - - Public Circles - - - - - Personal Circles - - - - - - - - + + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 20 + 40 + + + + + + +