Changeset View
Changeset View
Standalone View
Standalone View
client.cpp
Show First 20 Lines • Show All 1436 Lines • ▼ Show 20 Line(s) | 1426 | { | |||
---|---|---|---|---|---|
1437 | bool reset_name = force; | 1437 | bool reset_name = force; | ||
1438 | bool was_suffix = (!cap_suffix.isEmpty()); | 1438 | bool was_suffix = (!cap_suffix.isEmpty()); | ||
1439 | cap_suffix.clear(); | 1439 | cap_suffix.clear(); | ||
1440 | QString machine_suffix; | 1440 | QString machine_suffix; | ||
1441 | if (!options->condensedTitle()) { // machine doesn't qualify for "clean" | 1441 | if (!options->condensedTitle()) { // machine doesn't qualify for "clean" | ||
1442 | if (clientMachine()->hostName() != ClientMachine::localhost() && !clientMachine()->isLocal()) | 1442 | if (clientMachine()->hostName() != ClientMachine::localhost() && !clientMachine()->isLocal()) | ||
1443 | machine_suffix = QLatin1String(" <@") + QString::fromUtf8(clientMachine()->hostName()) + QLatin1Char('>') + LRM; | 1443 | machine_suffix = QLatin1String(" <@") + QString::fromUtf8(clientMachine()->hostName()) + QLatin1Char('>') + LRM; | ||
1444 | } | 1444 | } | ||
1445 | QString shortcut_suffix = !shortcut().isEmpty() ? (QLatin1String(" {") + shortcut().toString() + QLatin1Char('}')) : QString(); | 1445 | QString shortcut_suffix = shortcutCaptionSuffix(); | ||
1446 | cap_suffix = machine_suffix + shortcut_suffix; | 1446 | cap_suffix = machine_suffix + shortcut_suffix; | ||
1447 | auto fetchNameInternalPredicate = [this](const Client *cl) { | 1447 | auto fetchNameInternalPredicate = [this](const Client *cl) { | ||
1448 | return (!cl->isSpecialWindow() || cl->isToolbar()) && | 1448 | return (!cl->isSpecialWindow() || cl->isToolbar()) && | ||
1449 | cl != this && cl->caption() == caption(); | 1449 | cl != this && cl->caption() == caption(); | ||
1450 | }; | 1450 | }; | ||
1451 | if ((!isSpecialWindow() || isToolbar()) && workspace()->findClient(fetchNameInternalPredicate)) { | 1451 | if ((!isSpecialWindow() || isToolbar()) && workspace()->findClient(fetchNameInternalPredicate)) { | ||
1452 | int i = 2; | 1452 | int i = 2; | ||
1453 | do { | 1453 | do { | ||
▲ Show 20 Lines • Show All 712 Lines • Show Last 20 Lines |