Commit 09312071 authored by Joachim Eibl's avatar Joachim Eibl

- When word wrap is active toggling line numbers now recalculates the word wrap.

- Removed confusing "For compatibility ..." hint from option -qall


git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@143 c8aa9fed-2811-0410-8543-893ada326672
parent a1c9a475
- On Windows use config file .kdiff3rc next to kdiff3.exe if exists.
- In overwiev for two way diff show if only one side contains text.
- Fix for Fedora by Neal Becker in src-QT4/kdiff3part.desktop.
- When word wrap is active toggling line numbers now recalculates the word wrap.
- Removed confusing "For compatibility ..." hint from option -qall
Version 0.9.96 - 2011-09-02
===========================
- KDiff3FileItemActionPlugin : Context menu that also works in dolphin (for KDE>=4.6)
......
......@@ -1575,6 +1575,8 @@ void DiffTextWindow::recalcWordWrap( bool bWordWrap, int wrapLineVectorSize, int
if ( bWordWrap )
{
d->m_lineNumberWidth = d->m_pOptionDialog->m_bShowLineNumbers ? (int)log10((double)qMax(d->m_size,1))+1 : 0;
d->m_diff3WrapLineVector.resize( wrapLineVectorSize );
if (nofVisibleColumns<0)
......
......@@ -200,7 +200,7 @@ int main(int argc, char *argv[])
options.add( "o" ).add( "output file", ki18n("Output file. Implies -m. E.g.: -o newfile.txt"));
options.add( "out file", ki18n("Output file, again. (For compatibility with certain tools.)") );
options.add( "auto", ki18n("No GUI if all conflicts are auto-solvable. (Needs -o file)") );
options.add( "qall", ki18n("Don't solve conflicts automatically. (For compatibility...)") );
options.add( "qall", ki18n("Don't solve conflicts automatically.") );
options.add( "L1 alias1", ki18n("Visible name replacement for input file 1 (base).") );
options.add( "L2 alias2", ki18n("Visible name replacement for input file 2.") );
options.add( "L3 alias3", ki18n("Visible name replacement for input file 3.") );
......
......@@ -1718,13 +1718,17 @@ void KDiff3App::slotShowWhiteSpaceToggled()
void KDiff3App::slotShowLineNumbersToggled()
{
m_pOptionDialog->m_bShowLineNumbers = showLineNumbers->isChecked();
if ( wordWrap->isChecked() )
recalcWordWrap();
if ( m_pDiffTextWindow1!=0 )
m_pDiffTextWindow1->update();
if ( m_pDiffTextWindow2!=0 )
m_pDiffTextWindow2->update();
if ( m_pDiffTextWindow3!=0 )
m_pDiffTextWindow3->update();
}
}
/// Return true for success, else false
bool KDiff3App::improveFilenames( bool bCreateNewInstance )
......
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