StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

refactor: 'correctNames' function refactoring

Browse Source 
'correctNames' function moved from class, renamed and refactored
according to its purpose
This commit is contained in:
noavarice 2017-08-12 13:21:30 +03:00
parent 30cae05d26
commit 26b16386ae
No known key found for this signature in database
GPG Key ID: 52A50775BE13DF17
2 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/widget/form/groupchatform.cpp
View File

@ -39,6 +39,26 @@
#include "src/widget/tool/croppinglabel.h"
#include "src/widget/translator.h"
/**
* @brief Edit name for correct representation if it is needed
* @param name Editing string
* @return Source name if it does not contain any newline character, otherwise it chops characters
* starting with first newline character and appends "..."
*/
QString editName(const QString& name)
{
const int pos = name.indexOf(QRegularExpression(QStringLiteral("[\n\r]")));
if (pos == -1) {
return name;
}
QString result = name;
const int len = result.length();
result.chop(len - pos);
result.append(QStringLiteral("…")); // \u2026 Unicode symbol, not just three separate dots
return result;
}
/**
* @var QList<QLabel*> GroupChatForm::peerLabels
* @brief Maps peernumbers to the QLabels in namesListLayout.
@ -77,15 +97,14 @@ GroupChatForm::GroupChatForm(Group* chatGroup)
msgEdit->setObjectName("group");
namesListLayout = new FlowLayout(0, 5, 0);
QStringList names(group->getPeerList());
for (QString& name : names) {
QLabel* l = new QLabel();
QString tooltip = correctNames(name);
if (tooltip.isNull()) {
l->setToolTip(tooltip);
const QStringList names(group->getPeerList());
for (const QString& fullName : names) {
const QString editedName = editName(fullName);
QLabel* l = new QLabel(editedName);
if (editedName != fullName) {
l->setToolTip(fullName);
}
l->setText(name);
l->setTextFormat(Qt::PlainText);
namesListLayout->addWidget(l);
}
@ -116,21 +135,6 @@ GroupChatForm::GroupChatForm(Group* chatGroup)
Translator::registerHandler(std::bind(&GroupChatForm::retranslateUi, this), this);
}
// Correct names with "\n" in NamesListLayout widget
QString GroupChatForm::correctNames(QString& name)
{
int pos = name.indexOf(QRegExp("\n|\r\n|\r"));
int len = name.length();
if ((pos < len) && (pos != -1)) {
QString tooltip = name;
name.remove(pos, len - pos);
name.append("...");
return tooltip;
} else {
return QString();
}
}
GroupChatForm::~GroupChatForm()
{
Translator::unregister(this);
@ -184,10 +188,11 @@ void GroupChatForm::onUserListChanged()
QStringList names = group->getPeerList();
unsigned nNames = names.size();
for (unsigned i = 0; i < nNames; ++i) {
QString tooltip = correctNames(names[i]);
peerLabels.append(new QLabel(names[i]));
if (!tooltip.isEmpty())
peerLabels[i]->setToolTip(tooltip);
const QString editedName = editName(names[i]);
peerLabels.append(new QLabel(editedName));
if (editedName != names[i]) {
peerLabels[i]->setToolTip(names[i]);
}
peerLabels[i]->setTextFormat(Qt::PlainText);
nickLabelList.append(peerLabels[i]);
if (group->isSelfPeerNumber(i))

1
src/widget/form/groupchatform.h
View File

@ -66,7 +66,6 @@ private:
QLabel* nusersLabel;
TabCompleter* tabber;
bool inCall;
QString correctNames(QString& name);
};
#endif // GROUPCHATFORM_H