Added new level gpg id to FriendSelectionWidget (groups, gpg id, ssl id).

Added friend selection to the group dialog for better assigning of friends to groups.
Updated english translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5881 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-11-24 14:48:31 +00:00
parent 0adff2d02a
commit 09f42dbc3c
14 changed files with 505 additions and 235 deletions

View file

@ -43,7 +43,8 @@ public:
{
IDTYPE_NONE,
IDTYPE_GROUP,
IDTYPE_SSL
IDTYPE_SSL,
IDTYPE_GPG
};
enum Modus
@ -53,21 +54,31 @@ public:
MODUS_CHECK
};
enum ShowType {
SHOW_GROUP = 1,
SHOW_GPG = 2,
SHOW_SSL = 4
};
Q_DECLARE_FLAGS(ShowTypes, ShowType)
public:
explicit FriendSelectionWidget(QWidget *parent = 0);
~FriendSelectionWidget();
void setHeaderText(const QString &text);
void setModus(Modus modus);
void setShowGroups(bool show);
void setShowType(ShowTypes types);
void start();
int selectedItemCount();
QString selectedId(IdType &idType);
void selectedSslIds(std::list<std::string> &sslIds, bool onlyDirectSelected) { selectedIds(IDTYPE_SSL, sslIds, onlyDirectSelected); }
void selectedGpgIds(std::list<std::string> &gpgIds, bool onlyDirectSelected) { selectedIds(IDTYPE_GPG, gpgIds, onlyDirectSelected); }
void selectedGroupIds(std::list<std::string> &groupIds) { selectedIds(IDTYPE_GROUP, groupIds, true); }
void setSelectedSslIds(const std::list<std::string> &sslIds, bool add) { setSelectedIds(IDTYPE_SSL, sslIds, add); }
void setSelectedGpgIds(const std::list<std::string> &gpgIds, bool add) { setSelectedIds(IDTYPE_GPG, gpgIds, add); }
void setSelectedGroupIds(const std::list<std::string> &groupIds, bool add) { setSelectedIds(IDTYPE_GROUP, groupIds, add); }
QColor textColorOnline() const { return mTextColorOnline; }
@ -99,8 +110,10 @@ private:
bool started;
RSTreeWidgetItemCompareRole *compareRole;
Modus listModus;
bool showGroups;
bool inItemChanged;
ShowTypes showTypes;
bool inGroupItemChanged;
bool inGpgItemChanged;
bool inSslItemChanged;
/* Color definitions (for standard see qss.default) */
QColor mTextColorOnline;
@ -108,4 +121,6 @@ private:
Ui::FriendSelectionWidget *ui;
};
Q_DECLARE_OPERATORS_FOR_FLAGS(FriendSelectionWidget::ShowTypes)
#endif // FRIENDSELECTIONWIDGET_H