1.1 --- a/branchobj.cpp	Tue Sep 05 11:53:54 2006 +0000
     1.2 +++ b/branchobj.cpp	Tue Sep 05 13:48:17 2006 +0000
     1.3 @@ -158,11 +158,10 @@
     1.4  int BranchObj::getNum(BranchObj *bo)
     1.5  {
     1.6  	// keep current pointer in branch, 
     1.7 -	// otherwise save might fail
     1.8 -	// FIXME is this _really_ still true?
     1.9 -//	int cur=branch.at();
    1.10 +	// otherwise saveToDir will fail
    1.11 +	int cur=branch.at();
    1.12  	int ind=branch.findRef (bo);
    1.13 -//	branch.at(cur);
    1.14 +	branch.at(cur);
    1.15  	return ind;
    1.16  }
    1.17  
    1.18 @@ -790,6 +789,11 @@
    1.19  		+getIncludeImageAttr() );
    1.20      incIndent();
    1.21  
    1.22 +	/* Testing
    1.23 +	for (int i=1; i<depth;i++) cout << "  ";
    1.24 +	cout <<getHeading().ascii()<<endl;
    1.25 +	*/
    1.26 +
    1.27  	// save heading
    1.28      s+=valueElement("heading", getHeading(),
    1.29  		attribut ("textColor",QColor(heading->getColor()).name()));

     2.1 Binary file demos/todo.vym has changed

     3.1 --- a/findwindow.cpp	Tue Sep 05 11:53:54 2006 +0000
     3.2 +++ b/findwindow.cpp	Tue Sep 05 13:48:17 2006 +0000
     3.3 @@ -11,8 +11,6 @@
     3.4  
     3.5  {
     3.6  	setWindowTitle(__VYM " - " +tr("Find Text"));
     3.7 -	//resize (180,130);
     3.8 -	//move (130,130);
     3.9  
    3.10      QVBoxLayout* mainLayout = new QVBoxLayout;
    3.11      
    3.12 @@ -32,7 +30,6 @@
    3.13  		this, SLOT( findPressed() ) );
    3.14  	connect ( findcombo, SIGNAL( textChanged(const QString &) ), 
    3.15  		this, SLOT( findTextChanged(const QString&) ) );
    3.16 -    //findcombo->insertItem( "Normal", -1 );
    3.17  
    3.18  	row2Layout->addWidget(findcombo);
    3.19  
    3.20 @@ -43,21 +40,11 @@
    3.21  	connect ( clearbutton, SIGNAL( clicked() ), this, SLOT( clearLineEdit() ) );
    3.22  	row3Layout->addWidget (clearbutton);
    3.23  	
    3.24 -	/*
    3.25 -	QSpacerItem *si1= new QSpacerItem (10,0,QSizePolicy::Minimum, QSizePolicy::Expanding );
    3.26 -	row3Layout->addItem(si1);
    3.27 -	*/
    3.28 -	
    3.29  	cancelbutton = new QPushButton;
    3.30  	cancelbutton->setText(tr("Cancel"));
    3.31  	cancelbutton->setShortcut (Qt::Key_Escape);
    3.32  	connect ( cancelbutton, SIGNAL( clicked() ), this, SLOT( cancelPressed() ) );
    3.33  	row3Layout->addWidget (cancelbutton);
    3.34 -
    3.35 -/*
    3.36 -	QSpacerItem *si2= new QSpacerItem (10,0,QSizePolicy::Fixed, QSizePolicy::Fixed);
    3.37 -	row3Layout->addItem(si2);
    3.38 -	*/
    3.39  	
    3.40  	findbutton = new QPushButton;
    3.41  	findbutton->setText (tr("Find"));
    3.42 @@ -65,6 +52,7 @@
    3.43  	findbutton->setShortcut (Qt::Key_Return);
    3.44  	connect ( findbutton, SIGNAL( clicked() ), this, SLOT( findPressed() ) );
    3.45  
    3.46 +	row3Layout->addStretch(2);
    3.47  	row3Layout->addWidget(findbutton);
    3.48  
    3.49  	mainLayout->addLayout (row1Layout);

     4.1 --- a/mainwindow.cpp	Tue Sep 05 11:53:54 2006 +0000
     4.2 +++ b/mainwindow.cpp	Tue Sep 05 13:48:17 2006 +0000
     4.3 @@ -641,6 +641,7 @@
     4.4  	a->setShortcut ( Qt::Key_ScrollLock );
     4.5  	a->setStatusTip (tr( "Scroll branch" ) );
     4.6      connect( a, SIGNAL( triggered() ), this, SLOT( editToggleScroll() ) );
     4.7 +
     4.8  	alt = new QAction( QPixmap(flagsPath+"flag-scrolled-right.png"), tr( "Scroll branch" ), this);
     4.9  	alt->setShortcut ( Qt::Key_S );
    4.10  	alt->setStatusTip (tr( "Scroll branch" )); 
    4.11 @@ -655,6 +656,8 @@
    4.12      tb->addAction (actionEditToggleScroll);
    4.13      editMenu->addAction ( actionEditToggleScroll);
    4.14  	editMenu->addAction (actionEditToggleScroll);
    4.15 +	addAction (a);
    4.16 +	addAction (alt);
    4.17  	actionListBranches.append(actionEditToggleScroll);
    4.18  	
    4.19      a = new QAction( tr( "Unscroll all scrolled branches" ), this);
    4.20 @@ -800,6 +803,7 @@
    4.21  	a->setShortcut (Qt::ALT + Qt::Key_Delete );
    4.22      connect( a, SIGNAL( triggered() ), this, SLOT( editRemoveBranchKeepChilds() ) );
    4.23  	a->setEnabled (false);
    4.24 +	addAction (a);
    4.25  	actionListBranches.append(a);
    4.26  	actionEditRemoveBranchKeepChilds=a;
    4.27  

     5.1 --- a/mapeditor.cpp	Tue Sep 05 11:53:54 2006 +0000
     5.2 +++ b/mapeditor.cpp	Tue Sep 05 13:48:17 2006 +0000
     5.3 @@ -1,10 +1,6 @@
     5.4  #include "mapeditor.h"
     5.5  
     5.6 -//#include <qstatusbar.h>
     5.7 -//#include <qapplication.h>
     5.8 -//#include <q3popupmenu.h>
     5.9  #include <QActionGroup>
    5.10 -#include <QBitmap>
    5.11  #include <QColor>
    5.12  #include <QColorDialog>
    5.13  #include <QContextMenuEvent>
    5.14 @@ -18,11 +14,9 @@
    5.15  #include <QPainter>
    5.16  #include <QPixmap>
    5.17  #include <QPrinter>
    5.18 -#include <QRegExp>
    5.19  #include <QResizeEvent>
    5.20  #include <QTextStream>
    5.21  
    5.22 -//#include <Q3StrList>
    5.23  #include <Q3PtrList>
    5.24  #include <q3dragobject.h>
    5.25  #include <q3urloperator.h>

     6.1 --- a/tex/vym.changelog	Tue Sep 05 11:53:54 2006 +0000
     6.2 +++ b/tex/vym.changelog	Tue Sep 05 13:48:17 2006 +0000
     6.3 @@ -1,3 +1,11 @@
     6.4 +-------------------------------------------------------------------
     6.5 +Tue Sep  5 15:38:20 CEST 2006 - uwedr
     6.6 +
     6.7 +- Version: 1.8.55
     6.8 +- Bugfix: Undo/Redo moving floatimages
     6.9 +- Bugfix: Shortcuts for scrolling branches/removing branch
    6.10 +- Feature: Findwindow ported to QT4
    6.11 +
    6.12  -------------------------------------------------------------------
    6.13  Tue Sep  5 09:55:55 CEST 2006 - uwedr
    6.14  

     7.1 --- a/version.h	Tue Sep 05 11:53:54 2006 +0000
     7.2 +++ b/version.h	Tue Sep 05 13:48:17 2006 +0000
     7.3 @@ -2,7 +2,7 @@
     7.4  #define VERSION_H
     7.5  
     7.6  #define __VYM "VYM"
     7.7 -#define __VYM_VERSION "1.8.54"
     7.8 +#define __VYM_VERSION "1.8.55"
     7.9  #define __BUILD_DATE "September 5, 2006"
    7.10  
    7.11  #endif