IdDialog:

- Added missing tooltip "Edit Identity"
- Fixed gui layout
- Updated todo

IdEditDialog:
- Added window icon
- Added spacer to gui layout
- Set recogn tags at dialog start to hidden

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7276 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2014-04-14 15:37:06 +00:00
parent e916299ceb
commit 0be1f8ee98
4 changed files with 72 additions and 29 deletions

View File

@ -164,7 +164,6 @@ void IdDialog::todo()
QMessageBox::information(this, "Todo",
"<b>Open points:</b><ul>"
"<li>Delete ID"
"<li>Edit ID"
"<li>Reputation"
"<li>Load/save settings"
"</ul>");
@ -275,11 +274,11 @@ bool IdDialog::fillIdListItem(const RsGxsIdGroup& data, QTreeWidgetItem *&item,
rsPeers->getGPGDetails(data.mPgpId, details);
item->setText(RSID_COL_IDTYPE, QString::fromUtf8(details.name.c_str()));
}
else
{
else
{
item->setText(RSID_COL_IDTYPE, tr("PGP Linked Id"));
}
}
}
else
{
item->setText(RSID_COL_IDTYPE, tr("Anon Id"));
@ -312,7 +311,7 @@ void IdDialog::insertIdList(uint32_t token)
mStateHelper->clear(IDDIALOG_REPLIST);
return;
}
}
mStateHelper->setActive(IDDIALOG_IDLIST, true);
@ -536,8 +535,6 @@ void IdDialog::insertIdDetails(uint32_t token)
ui.line_RatingPeers->setText(rating);
}
/* request network ratings */
// Removing this for the moment.
// requestRepList(data.mMeta.mGroupId);
@ -598,7 +595,6 @@ void IdDialog::modifyReputation()
return;
}
void IdDialog::updateDisplay(bool /*complete*/)
{
/* Update identity list */
@ -610,7 +606,7 @@ void IdDialog::addIdentity()
IdEditDialog dlg(this);
dlg.setupNewId(false);
dlg.exec();
}
}
void IdDialog::editIdentity()
{
@ -627,7 +623,7 @@ void IdDialog::editIdentity()
IdEditDialog dlg(this);
dlg.setupExistingId(keyId);
dlg.exec();
}
}
void IdDialog::filterIds()
{
@ -671,7 +667,6 @@ void IdDialog::insertRepList(uint32_t token)
return;
}
for(vit = opinions.begin(); vit != opinions.end(); vit++)
{
RsGxsIdOpinion &op = (*vit);

View File

@ -102,6 +102,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="toolTip">
<string>Create new Identity</string>
</property>
@ -180,7 +183,7 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="layoutWidget">
<widget class="QWidget" name="layoutWidget1">
<layout class="QVBoxLayout" name="rightLayout">
<item>
<widget class="QFrame" name="toolBarFrame">
@ -196,6 +199,9 @@
</property>
<item>
<widget class="QToolButton" name="toolButton_Delete">
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="toolTip">
<string>Delete Identity</string>
</property>
@ -219,6 +225,12 @@
</item>
<item>
<widget class="QToolButton" name="toolButton_EditId">
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="toolTip">
<string>Edit Identity</string>
</property>
<property name="text">
<string>Edit ID</string>
</property>
@ -239,6 +251,9 @@
</item>
<item>
<widget class="QToolButton" name="toolButton_Reputation">
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>Edit Reputation</string>
</property>
@ -675,12 +690,6 @@
</tabstops>
<resources>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
</resources>
<connections/>
</ui>

View File

@ -61,6 +61,9 @@ IdEditDialog::IdEditDialog(QWidget *parent)
mStateHelper->addLoadPlaceholder(IDEDITDIALOG_LOADID, ui.lineEdit_GpgId);
mStateHelper->addLoadPlaceholder(IDEDITDIALOG_LOADID, ui.lineEdit_GpgName);
/* Initialize recogn tags */
loadRecognTags();
/* Connect signals */
connect(ui.radioButton_GpgId, SIGNAL(toggled(bool)), this, SLOT(idTypeToggled(bool)));
connect(ui.radioButton_Pseudo, SIGNAL(toggled(bool)), this, SLOT(idTypeToggled(bool)));
@ -255,7 +258,6 @@ void IdEditDialog::checkNewTag()
ok = true;
}
if (mEditGroup.mRecognTags.size() >= MAX_RECOGN_TAGS)
{
ok = false;
@ -356,7 +358,6 @@ bool IdEditDialog::tagDetails(const RsGxsId &id, const std::string &name, const
return ok;
}
void IdEditDialog::loadRecognTags()
{
std::cerr << "IdEditDialog::loadRecognTags()";
@ -426,7 +427,6 @@ void IdEditDialog::submit()
}
}
void IdEditDialog::createId()
{
std::string groupname = ui.lineEdit_Nickname->text().toUtf8().constData();
@ -448,7 +448,6 @@ void IdEditDialog::createId()
close();
}
void IdEditDialog::updateId()
{
/* submit updated details */
@ -469,9 +468,6 @@ void IdEditDialog::updateId()
close();
}
void IdEditDialog::loadRequest(const TokenQueue */*queue*/, const TokenRequest &req)
{
std::cerr << "IdDialog::loadRequest() UserType: " << req.mUserType;

View File

@ -7,14 +7,27 @@
<x>0</x>
<y>0</y>
<width>510</width>
<height>462</height>
<height>471</height>
</rect>
</property>
<property name="windowIcon">
<iconset resource="../images.qrc">
<normaloff>:/images/identity/identities_32.png</normaloff>:/images/identity/identities_32.png</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>0</number>
</property>
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
@ -58,6 +71,19 @@
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="1" column="0">
@ -226,6 +252,12 @@
</item>
<item row="7" column="0">
<widget class="QLabel" name="label_TagCheck">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>TextLabel</string>
</property>
@ -257,7 +289,16 @@
<item>
<widget class="QFrame" name="frame">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="margin">
<property name="leftMargin">
<number>6</number>
</property>
<property name="topMargin">
<number>6</number>
</property>
<property name="rightMargin">
<number>6</number>
</property>
<property name="bottomMargin">
<number>6</number>
</property>
<item>
@ -298,6 +339,8 @@
<tabstop>radioButton_Pseudo</tabstop>
<tabstop>buttonBox</tabstop>
</tabstops>
<resources/>
<resources>
<include location="../images.qrc"/>
</resources>
<connections/>
</ui>