Revert "Ensure %w and %# are also expaned in the 'Copy input' dialog"

That fix is not good enough because it makes '%w' being updated only
after keystroke instead of immediately . The issue of updating title is
actually a little more complicated than I have understood.

Revert it because the regression should influence more users than the
fixed problem does. Need to spend more time to find a better fix.

CCBUG: 175755
CCBUG: 287536

This reverts commit 1c1981501b.
wilder-portage
Jekyll Wu 15 years ago
parent f6044ad5c1
commit 36bd1828f3
  1. 8
      src/Session.cpp
  2. 8
      src/SessionController.cpp

@ -1010,14 +1010,6 @@ QString Session::getDynamicTitle()
title = process->format(tabTitleFormat(Session::LocalTabTitle));
}
// special handling for the "%w" marker which is replaced with the
// window title set by the terminal process(shell,mc,vim,etc)
title.replace("%w", userTitle());
// special handling for the "%#" marker which is replaced with the
// number of the session
title.replace("%#", QString::number(sessionId()));
return title;
}

@ -1122,6 +1122,14 @@ void SessionController::sessionTitleChanged()
}
QString title = _session->title(Session::DisplayedTitleRole);
// special handling for the "%w" marker which is replaced with the
// window title set by the shell
title.replace("%w",_session->userTitle());
// special handling for the "%#" marker which is replaced with the
// number of the shell
title.replace("%#",QString::number(_session->sessionId()));
if ( title.isEmpty() )
title = _session->title(Session::NameRole);

Loading…
Cancel
Save