Commit a336183a authored by Glen Ditchfield's avatar Glen Ditchfield 🐛 Committed by Glen Ditchfield

Use consistent icons for events and to-dos

The Agenda view decorates events and to-dos with "recurring" and "reminder"
icons.  Use the same icons (in the same order) in the "Show" dialog and
similar places.  This change should be safe now, since all the icons were
in Oxygen and have been added to Breeze.
parent 104d0c65
Pipeline #46668 passed with stage
in 5 minutes
......@@ -14,6 +14,9 @@ th {
white-space: nowrap;
font-weight: bold;
}
.header th {
vertical-align: middle;
}
td {
padding-left: 5px;
}
......@@ -21,10 +24,10 @@ td {
</style>
<table class="header">
<tr>
<td>
<th>
<img src="file:view-calendar-day" align="top" height="16" width="16" alt="Event" title="Event" />
<img src="file:edit-redo" align="top" height="16" width="16" alt="Recurring incidence" title="Recurring incidence" />
</td>
<img src="file:appointment-recurring" align="top" height="16" width="16" alt="Recurring incidence" title="Recurring incidence" />
</th>
<td>
<b>
<u>20. Mai 2005, 19-20 Uhr, alle 3 Monate am -2. Fr, 17 mal</u>
......
......@@ -14,6 +14,9 @@ th {
white-space: nowrap;
font-weight: bold;
}
.header th {
vertical-align: middle;
}
td {
padding-left: 5px;
}
......@@ -21,11 +24,11 @@ td {
</style>
<table class="header">
<tr>
<td>
<th>
<img src="file:view-calendar-day" align="top" height="16" width="16" alt="Event" title="Event" />
<img src="file:preferences-desktop-notification-bell" align="top" height="16" width="16" alt="Incidence with a reminder" title="Incidence with a reminder" />
<img src="file:edit-redo" align="top" height="16" width="16" alt="Recurring incidence" title="Recurring incidence" />
</td>
<img src="file:appointment-recurring" align="top" height="16" width="16" alt="Recurring incidence" title="Recurring incidence" />
<img src="file:appointment-reminder" align="top" height="16" width="16" alt="Incidence with a reminder" title="Incidence with a reminder" />
</th>
<td>
<b>
<u>Plánovací meeting</u>
......
......@@ -14,6 +14,9 @@ th {
white-space: nowrap;
font-weight: bold;
}
.header th {
vertical-align: middle;
}
td {
padding-left: 5px;
}
......@@ -21,9 +24,9 @@ td {
</style>
<table class="header">
<tr>
<td>
<th>
<img src="file:view-calendar-day" align="top" height="16" width="16" alt="Event" title="Event" />
</td>
</th>
<td>
<b>
<u>20. May 2005, allday, multiday</u>
......
......@@ -14,6 +14,9 @@ th {
white-space: nowrap;
font-weight: bold;
}
.header th {
vertical-align: middle;
}
td {
padding-left: 5px;
}
......@@ -21,9 +24,9 @@ td {
</style>
<table class="header">
<tr>
<td>
<th>
<img src="file:view-calendar-day" align="top" height="16" width="16" alt="Event" title="Event" />
</td>
</th>
<td>
<b>
<u>20. May 2005, allday</u>
......
......@@ -14,6 +14,9 @@ th {
white-space: nowrap;
font-weight: bold;
}
.header th {
vertical-align: middle;
}
td {
padding-left: 5px;
}
......@@ -21,9 +24,9 @@ td {
</style>
<table class="header">
<tr>
<td>
<th>
<img src="file:view-calendar-day" align="top" height="16" width="16" alt="Event" title="Event" />
</td>
</th>
<td>
<b>
<u>summaryException</u>
......
......@@ -14,6 +14,9 @@ th {
white-space: nowrap;
font-weight: bold;
}
.header th {
vertical-align: middle;
}
td {
padding-left: 5px;
}
......@@ -21,9 +24,9 @@ td {
</style>
<table class="header">
<tr>
<td>
<th>
<img src="file:view-calendar-day" align="top" height="16" width="16" alt="Event" title="Event" />
</td>
</th>
<td>
<b>
<u>summaryException</u>
......
......@@ -14,6 +14,9 @@ th {
white-space: nowrap;
font-weight: bold;
}
.header th {
vertical-align: middle;
}
td {
padding-left: 5px;
}
......@@ -21,10 +24,10 @@ td {
</style>
<table class="header">
<tr>
<td>
<th>
<img src="file:view-calendar-day" align="top" height="16" width="16" alt="Event" title="Event" />
<img src="file:edit-redo" align="top" height="16" width="16" alt="Recurring incidence" title="Recurring incidence" />
</td>
<img src="file:appointment-recurring" align="top" height="16" width="16" alt="Recurring incidence" title="Recurring incidence" />
</th>
<td>
<b>
<u>20 May 2005 - 21 May 2015</u>
......
......@@ -14,6 +14,9 @@ th {
white-space: nowrap;
font-weight: bold;
}
.header th {
vertical-align: middle;
}
td {
padding-left: 5px;
}
......
......@@ -14,6 +14,9 @@ th {
white-space: nowrap;
font-weight: bold;
}
.header th {
vertical-align: middle;
}
td {
padding-left: 5px;
}
......
......@@ -14,6 +14,9 @@ th {
white-space: nowrap;
font-weight: bold;
}
.header th {
vertical-align: middle;
}
td {
padding-left: 5px;
}
......
......@@ -14,6 +14,9 @@ th {
white-space: nowrap;
font-weight: bold;
}
.header th {
vertical-align: middle;
}
td {
padding-left: 5px;
}
......
......@@ -14,6 +14,9 @@ th {
white-space: nowrap;
font-weight: bold;
}
.header th {
vertical-align: middle;
}
td {
padding-left: 5px;
}
......
......@@ -14,6 +14,9 @@ th {
white-space: nowrap;
font-weight: bold;
}
.header th {
vertical-align: middle;
}
td {
padding-left: 5px;
}
......
......@@ -14,6 +14,9 @@ th {
white-space: nowrap;
font-weight: bold;
}
.header th {
vertical-align: middle;
}
td {
padding-left: 5px;
}
......
......@@ -14,6 +14,9 @@ th {
white-space: nowrap;
font-weight: bold;
}
.header th {
vertical-align: middle;
}
td {
padding-left: 5px;
}
......
......@@ -14,6 +14,9 @@ th {
white-space: nowrap;
font-weight: bold;
}
.header th {
vertical-align: middle;
}
td {
padding-left: 5px;
}
......
......@@ -14,6 +14,9 @@ th {
white-space: nowrap;
font-weight: bold;
}
.header th {
vertical-align: middle;
}
td {
padding-left: 5px;
}
......
......@@ -14,6 +14,9 @@ th {
white-space: nowrap;
font-weight: bold;
}
.header th {
vertical-align: middle;
}
td {
padding-left: 5px;
}
......
......@@ -14,6 +14,9 @@ th {
white-space: nowrap;
font-weight: bold;
}
.header th {
vertical-align: middle;
}
td {
padding-left: 5px;
}
......
......@@ -14,6 +14,9 @@ th {
white-space: nowrap;
font-weight: bold;
}
.header th {
vertical-align: middle;
}
td {
padding-left: 5px;
}
......
......@@ -14,6 +14,9 @@ th {
white-space: nowrap;
font-weight: bold;
}
.header th {
vertical-align: middle;
}
td {
padding-left: 5px;
}
......
......@@ -14,6 +14,9 @@ th {
white-space: nowrap;
font-weight: bold;
}
.header th {
vertical-align: middle;
}
td {
padding-left: 5px;
}
......
......@@ -14,6 +14,9 @@ th {
white-space: nowrap;
font-weight: bold;
}
.header th {
vertical-align: middle;
}
td {
padding-left: 5px;
}
......
......@@ -14,6 +14,9 @@ th {
white-space: nowrap;
font-weight: bold;
}
.header th {
vertical-align: middle;
}
td {
padding-left: 5px;
}
......
......@@ -14,6 +14,9 @@ th {
white-space: nowrap;
font-weight: bold;
}
.header th {
vertical-align: middle;
}
td {
padding-left: 5px;
}
......
......@@ -14,6 +14,9 @@ th {
white-space: nowrap;
font-weight: bold;
}
.header th {
vertical-align: middle;
}
td {
padding-left: 5px;
}
......
......@@ -14,6 +14,9 @@ th {
white-space: nowrap;
font-weight: bold;
}
.header th {
vertical-align: middle;
}
td {
padding-left: 5px;
}
......
......@@ -14,6 +14,9 @@ th {
white-space: nowrap;
font-weight: bold;
}
.header th {
vertical-align: middle;
}
td {
padding-left: 5px;
}
......
......@@ -14,6 +14,9 @@ th {
white-space: nowrap;
font-weight: bold;
}
.header th {
vertical-align: middle;
}
td {
padding-left: 5px;
}
......
......@@ -14,6 +14,9 @@ th {
white-space: nowrap;
font-weight: bold;
}
.header th {
vertical-align: middle;
}
td {
padding-left: 5px;
}
......
......@@ -14,6 +14,9 @@ th {
white-space: nowrap;
font-weight: bold;
}
.header th {
vertical-align: middle;
}
td {
padding-left: 5px;
}
......
......@@ -14,6 +14,9 @@ th {
white-space: nowrap;
font-weight: bold;
}
.header th {
vertical-align: middle;
}
td {
padding-left: 5px;
}
......
......@@ -14,6 +14,9 @@ th {
white-space: nowrap;
font-weight: bold;
}
.header th {
vertical-align: middle;
}
td {
padding-left: 5px;
}
......
......@@ -14,6 +14,9 @@ th {
white-space: nowrap;
font-weight: bold;
}
.header th {
vertical-align: middle;
}
td {
padding-left: 5px;
}
......
......@@ -14,6 +14,9 @@ th {
white-space: nowrap;
font-weight: bold;
}
.header th {
vertical-align: middle;
}
td {
padding-left: 5px;
}
......@@ -21,9 +24,9 @@ td {
</style>
<table class="header">
<tr>
<td>
<th>
<img src="file:view-pim-journal" align="top" height="16" width="16" alt="Journal" title="Journal" />
</td>
</th>
<td>
<b>
<u>Dear diary</u>
......
......@@ -14,6 +14,9 @@ th {
white-space: nowrap;
font-weight: bold;
}
.header th {
vertical-align: middle;
}
td {
padding-left: 5px;
}
......@@ -21,10 +24,10 @@ td {
</style>
<table class="header">
<tr>
<td>
<th>
<img src="file:view-calendar-tasks" align="top" height="16" width="16" alt="Todo" title="Todo" />
<img src="file:preferences-desktop-notification-bell" align="top" height="16" width="16" alt="Incidence with a reminder" title="Incidence with a reminder" />
</td>
<img src="file:task-reminder" align="top" height="16" width="16" alt="Incidence with a reminder" title="Incidence with a reminder" />
</th>
<td>
<b>
<u>Buy Milk</u>
......
......@@ -405,6 +405,20 @@ static QVariantHash incidenceTemplateHeader(const Incidence::Ptr &incidence)
incidenceData[QStringLiteral("icon")] = incidence->iconName();
}
switch (incidence->type()) {
case IncidenceBase::IncidenceType::TypeEvent:
incidenceData[QStringLiteral("alarmIcon")] = QStringLiteral("appointment-reminder");
incidenceData[QStringLiteral("recursIcon")] = QStringLiteral("appointment-recurring");
break;
case IncidenceBase::IncidenceType::TypeTodo:
incidenceData[QStringLiteral("alarmIcon")] = QStringLiteral("task-reminder");
incidenceData[QStringLiteral("recursIcon")] = QStringLiteral("task-recurring");
break;
default:
// Others don't repeat and don't have reminders.
break;
}
incidenceData[QStringLiteral("hasEnabledAlarms")] = incidence->hasEnabledAlarms();
incidenceData[QStringLiteral("recurs")] = incidence->recurs();
incidenceData[QStringLiteral("isReadOnly")] = incidence->isReadOnly();
......
<table class="header">
<tr>
<td>
{% spaceless %}
<th>
{% if incidence.icon %}
{% icon incidence.icon small type %}
{% endif %}
{% if incidence.hasEnabledAlarms %}
{% icon "preferences-desktop-notification-bell" small _("Incidence with a reminder") %}
{% if incidence.recurs %}
{% icon incidence.recursIcon small _("Recurring incidence") %}
{% endif %}
{% if incidence.recurs %}
{% icon "edit-redo" small _("Recurring incidence") %}
{% if incidence.hasEnabledAlarms %}
{% icon incidence.alarmIcon small _("Incidence with a reminder") %}
{% endif %}
{% if incidence.isReadOnly %}
{% icon "object-locked" small _("Incidence is read only") %}
{% endif %}
</td>
</th>
{% endspaceless %}
<td>
<b><u>{{ incidence.summary|safe }}</u></b>
</td>
......
<style type="text/css">
{# The Qt CSS parser is rather dumb and does not handle more complex #}
{# selectors like "table.main th" (despite what documentation says) #}
th {
text-align: left;
width: 25%;
white-space: nowrap;
font-weight: bold;
}
.header th {
vertical-align: middle;
}
td {
padding-left: 5px;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment