feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Gerrit: Append " (Draft)" to draft changes

Browse Source 
Similar to the web UI.

Change-Id: I596a116a85536c010089afd9c8a0686a75d29dde
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Orgad Shaneh
2017-01-28 22:53:21 +02:00
committed by Orgad Shaneh
parent af82202274
commit b2b1f6bec1
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/git/gerrit/gerritmodel.cpp
View File

@@ -78,7 +78,7 @@ QDebug operator<<(QDebug d, const GerritPatchSet &p)
QDebug operator<<(QDebug d, const GerritChange &c)
{
d.nospace() << c.title << " by " << c.email
d.nospace() << c.fullTitle() << " by " << c.email
<< ' ' << c.lastUpdated << ' ' << c.currentPatchSet;
return d;
}
@@ -201,6 +201,14 @@ QStringList GerritChange::gitFetchArguments(const GerritServer &server) const
return { "fetch", server.url() + '/' + project, currentPatchSet.ref };
}
QString GerritChange::fullTitle() const
{
QString res = title;
if (status == "DRAFT")
res += GerritModel::tr(" (Draft)");
return res;
}
// Helper class that runs ssh gerrit queries from a list of query argument
// string lists,
// see http://gerrit.googlecode.com/svn/documentation/2.1.5/cmd-query.html
@@ -442,7 +450,7 @@ QString GerritModel::dependencyHtml(const QString &header, const int changeNumbe
str << "<tr><td>" << header << "</td><td><a href="
<< serverPrefix << "r/" << changeNumber << '>' << changeNumber << "</a>";
if (const QStandardItem *item = itemForNumber(changeNumber))
str << " (" << changeFromItem(item)->title << ')';
str << " (" << changeFromItem(item)->fullTitle() << ')';
str << "</td></tr>";
return res;
}
@@ -466,7 +474,7 @@ QString GerritModel::toHtml(const QModelIndex& index) const
QString result;
QTextStream str(&result);
str << "<html><head/><body><table>"
<< "<tr><td>" << subjectHeader << "</td><td>" << c->title << "</td></tr>"
<< "<tr><td>" << subjectHeader << "</td><td>" << c->fullTitle() << "</td></tr>"
<< "<tr><td>" << numberHeader << "</td><td><a href=\"" << c->url << "\">" << c->number << "</a></td></tr>"
<< "<tr><td>" << ownerHeader << "</td><td>" << c->owner << ' '
<< "<a href=\"mailto:" << c->email << "\">" << c->email << "</a></td></tr>"
@@ -703,7 +711,7 @@ QList<QStandardItem *> GerritModel::changeToRow(const GerritChangePtr &c) const
row.append(item);
}
row[NumberColumn]->setData(c->number, Qt::DisplayRole);
row[TitleColumn]->setText(c->title);
row[TitleColumn]->setText(c->fullTitle());
row[OwnerColumn]->setText(c->owner);
// Shorten columns: Display time if it is today, else date
const QString dateString = c->lastUpdated.date() == QDate::currentDate() ?

1
src/plugins/git/gerrit/gerritmodel.h
View File

@@ -69,6 +69,7 @@ public:
bool isValid() const { return number && !url.isEmpty() && !project.isEmpty(); }
QString filterString() const;
QStringList gitFetchArguments(const GerritServer &server) const;
QString fullTitle() const; // title with potential "Draft" specifier
QString url;
int number = 0;