[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

TortoiseMerge window title (issue #345) not fixed in 1.4.4, and a suggestion

From: Flavio Stanchina <flavio_at_stanchina.net>
Date: 2007-07-05 16:30:55 CEST

Please apply the fix for issue #345 to the next release, I hoped it went
into 1.4.4 but it didn't.

I rebuilt TMerge 1.4.4 with the fix applied, but I noticed that if the
descriptive name is not set, nothing is shown in the window title.
Please change CWorkingFile::GetDescriptiveName() to return the file name
if the descriptive name is empty (see below), or do something similar in
CTortoiseMergeApp::InitInstance() where you retrieve the descriptive names.

CString
CWorkingFile::GetDescriptiveName() const
{
        if(m_sDescriptiveName.IsEmpty())
        {
                // We don't have a proper name - use the filename part of the path
                return CPathUtils::GetFileNameFromPath(m_sFilename);
        }
        return m_sDescriptiveName;
}

-- 
Ciao, Flavio
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Jul 5 16:30:54 2007

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.