# HG changeset patch
# User insilmaril
# Date 1157464097 0
# Node ID 06ab6df252fab3405568588cd51bf0232d7bd16c
# Parent  8df2895c131c70d154b64d175a0d31dba8001f25
Version 1.55. Fixed (recently) broken saveToDir

diff -r 8df2895c131c -r 06ab6df252fa branchobj.cpp
--- a/branchobj.cpp	Tue Sep 05 11:53:54 2006 +0000
+++ b/branchobj.cpp	Tue Sep 05 13:48:17 2006 +0000
@@ -158,11 +158,10 @@
 int BranchObj::getNum(BranchObj *bo)
 {
 	// keep current pointer in branch, 
-	// otherwise save might fail
-	// FIXME is this _really_ still true?
-//	int cur=branch.at();
+	// otherwise saveToDir will fail
+	int cur=branch.at();
 	int ind=branch.findRef (bo);
-//	branch.at(cur);
+	branch.at(cur);
 	return ind;
 }
 
@@ -790,6 +789,11 @@
 		+getIncludeImageAttr() );
     incIndent();
 
+	/* Testing
+	for (int i=1; i<depth;i++) cout << "  ";
+	cout <<getHeading().ascii()<<endl;
+	*/
+
 	// save heading
     s+=valueElement("heading", getHeading(),
 		attribut ("textColor",QColor(heading->getColor()).name()));
diff -r 8df2895c131c -r 06ab6df252fa demos/todo.vym
Binary file demos/todo.vym has changed
diff -r 8df2895c131c -r 06ab6df252fa findwindow.cpp
--- a/findwindow.cpp	Tue Sep 05 11:53:54 2006 +0000
+++ b/findwindow.cpp	Tue Sep 05 13:48:17 2006 +0000
@@ -11,8 +11,6 @@
 
 {
 	setWindowTitle(__VYM " - " +tr("Find Text"));
-	//resize (180,130);
-	//move (130,130);
 
     QVBoxLayout* mainLayout = new QVBoxLayout;
     
@@ -32,7 +30,6 @@
 		this, SLOT( findPressed() ) );
 	connect ( findcombo, SIGNAL( textChanged(const QString &) ), 
 		this, SLOT( findTextChanged(const QString&) ) );
-    //findcombo->insertItem( "Normal", -1 );
 
 	row2Layout->addWidget(findcombo);
 
@@ -43,21 +40,11 @@
 	connect ( clearbutton, SIGNAL( clicked() ), this, SLOT( clearLineEdit() ) );
 	row3Layout->addWidget (clearbutton);
 	
-	/*
-	QSpacerItem *si1= new QSpacerItem (10,0,QSizePolicy::Minimum, QSizePolicy::Expanding );
-	row3Layout->addItem(si1);
-	*/
-	
 	cancelbutton = new QPushButton;
 	cancelbutton->setText(tr("Cancel"));
 	cancelbutton->setShortcut (Qt::Key_Escape);
 	connect ( cancelbutton, SIGNAL( clicked() ), this, SLOT( cancelPressed() ) );
 	row3Layout->addWidget (cancelbutton);
-
-/*
-	QSpacerItem *si2= new QSpacerItem (10,0,QSizePolicy::Fixed, QSizePolicy::Fixed);
-	row3Layout->addItem(si2);
-	*/
 	
 	findbutton = new QPushButton;
 	findbutton->setText (tr("Find"));
@@ -65,6 +52,7 @@
 	findbutton->setShortcut (Qt::Key_Return);
 	connect ( findbutton, SIGNAL( clicked() ), this, SLOT( findPressed() ) );
 
+	row3Layout->addStretch(2);
 	row3Layout->addWidget(findbutton);
 
 	mainLayout->addLayout (row1Layout);
diff -r 8df2895c131c -r 06ab6df252fa mainwindow.cpp
--- a/mainwindow.cpp	Tue Sep 05 11:53:54 2006 +0000
+++ b/mainwindow.cpp	Tue Sep 05 13:48:17 2006 +0000
@@ -641,6 +641,7 @@
 	a->setShortcut ( Qt::Key_ScrollLock );
 	a->setStatusTip (tr( "Scroll branch" ) );
     connect( a, SIGNAL( triggered() ), this, SLOT( editToggleScroll() ) );
+
 	alt = new QAction( QPixmap(flagsPath+"flag-scrolled-right.png"), tr( "Scroll branch" ), this);
 	alt->setShortcut ( Qt::Key_S );
 	alt->setStatusTip (tr( "Scroll branch" )); 
@@ -655,6 +656,8 @@
     tb->addAction (actionEditToggleScroll);
     editMenu->addAction ( actionEditToggleScroll);
 	editMenu->addAction (actionEditToggleScroll);
+	addAction (a);
+	addAction (alt);
 	actionListBranches.append(actionEditToggleScroll);
 	
     a = new QAction( tr( "Unscroll all scrolled branches" ), this);
@@ -800,6 +803,7 @@
 	a->setShortcut (Qt::ALT + Qt::Key_Delete );
     connect( a, SIGNAL( triggered() ), this, SLOT( editRemoveBranchKeepChilds() ) );
 	a->setEnabled (false);
+	addAction (a);
 	actionListBranches.append(a);
 	actionEditRemoveBranchKeepChilds=a;
 
diff -r 8df2895c131c -r 06ab6df252fa mapeditor.cpp
--- a/mapeditor.cpp	Tue Sep 05 11:53:54 2006 +0000
+++ b/mapeditor.cpp	Tue Sep 05 13:48:17 2006 +0000
@@ -1,10 +1,6 @@
 #include "mapeditor.h"
 
-//#include <qstatusbar.h>
-//#include <qapplication.h>
-//#include <q3popupmenu.h>
 #include <QActionGroup>
-#include <QBitmap>
 #include <QColor>
 #include <QColorDialog>
 #include <QContextMenuEvent>
@@ -18,11 +14,9 @@
 #include <QPainter>
 #include <QPixmap>
 #include <QPrinter>
-#include <QRegExp>
 #include <QResizeEvent>
 #include <QTextStream>
 
-//#include <Q3StrList>
 #include <Q3PtrList>
 #include <q3dragobject.h>
 #include <q3urloperator.h>
diff -r 8df2895c131c -r 06ab6df252fa tex/vym.changelog
--- a/tex/vym.changelog	Tue Sep 05 11:53:54 2006 +0000
+++ b/tex/vym.changelog	Tue Sep 05 13:48:17 2006 +0000
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Sep  5 15:38:20 CEST 2006 - uwedr
+
+- Version: 1.8.55
+- Bugfix: Undo/Redo moving floatimages
+- Bugfix: Shortcuts for scrolling branches/removing branch
+- Feature: Findwindow ported to QT4
+
 -------------------------------------------------------------------
 Tue Sep  5 09:55:55 CEST 2006 - uwedr
 
diff -r 8df2895c131c -r 06ab6df252fa version.h
--- a/version.h	Tue Sep 05 11:53:54 2006 +0000
+++ b/version.h	Tue Sep 05 13:48:17 2006 +0000
@@ -2,7 +2,7 @@
 #define VERSION_H
 
 #define __VYM "VYM"
-#define __VYM_VERSION "1.8.54"
+#define __VYM_VERSION "1.8.55"
 #define __BUILD_DATE "September 5, 2006"
 
 #endif