← Back to branch summary

~ubuntu-branches/ubuntu/vivid/regina-normal/vivid

« back to all changes in this revision

Viewing changes to qtui/src/packettypes/nanglestructureui.cpp

  • Committer: Package Import Robot
  • Author(s): Ben Burton
  • Date: 2012-05-29 08:46:45 UTC
  • mfrom: (1.2.6)
  • Revision ID: package-import@ubuntu.com-20120529084645-ngrfs6rqtrwklrue
Tags: 4.93-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
qtui/src/packettypes/nanglestructureui.cpp
70
70
        if (index.column() == 0) {
71
71
            if (s->isStrict())
72
72
                return tr("Strict");
 
73
            else if (s->isVeering())
 
74
                return tr("Veering");
73
75
            else if (s->isTaut())
74
76
                return tr("Taut");
75
77
            else
96
98
        }
97
99
    } else if (role == Qt::ToolTipRole) {
98
100
        if (index.column() == 0)
99
 
            return tr("Taut or strict?");
 
101
            return tr("Strict, taut and/or veering?");
100
102
        else
101
103
            return tr("Tetrahedron %1, edges %2").
102
104
                arg((index.column() - 1) / 3).
103
105
                arg(regina::vertexSplitString[(index.column() - 1) % 3]);
104
 
    } else if (role == Qt::TextAlignmentRole)
105
 
        return Qt::AlignRight;
106
 
    else
 
106
    } else if (role == Qt::TextAlignmentRole) {
 
107
        if (index.column() == 0)
 
108
            return Qt::AlignLeft;
 
109
        else
 
110
            return Qt::AlignRight;
 
111
    } else
107
112
        return QVariant();
108
113
}
109
114
 
120
125
                regina::vertexSplitString[(section - 1) % 3];
121
126
    } else if (role == Qt::ToolTipRole) {
122
127
        if (section == 0)
123
 
            return tr("Taut or strict?");
 
128
            return tr("Strict, taut and/or veering?");
124
129
        else
125
130
            return tr("Tetrahedron %1, edges %2").arg((section - 1) / 3).
126
131
                arg(regina::vertexSplitString[(section - 1) % 3]);
231
236
    unsigned long nStructs = model->structures()->getNumberOfStructures();
232
237
    if (model->structures()->isTautOnly()) {
233
238
        if (nStructs == 0)
234
 
            count = tr("No taut structures");
 
239
            count = tr("No taut angle structures");
235
240
        else if (nStructs == 1)
236
 
            count = tr("1 taut structure");
 
241
            count = tr("1 taut angle structure");
237
242
        else
238
 
            count = tr("%1 taut structures").arg(nStructs);
 
243
            count = tr("%1 taut angle structures").arg(nStructs);
239
244
 
240
 
        span = tr("Enumerated taut structures only");
 
245
        span = tr("Enumerated taut angle structures only");
241
246
    } else {
242
247
        if (nStructs == 0)
243
248
            count = tr("No vertex angle structures");