1.1 --- a/aboutdialog.cpp	Wed Jun 14 10:28:01 2006 +0000
     1.2 +++ b/aboutdialog.cpp	Wed Jun 14 14:43:18 2006 +0000
     1.3 @@ -21,7 +21,7 @@
     1.4      mainLayout=new QVBoxLayout( this, 10);
     1.5  
     1.6      tabs=new QTabWidget (this);
     1.7 -    credits=new AboutTextBrowser (tabs,"credits");
     1.8 +    credits=new AboutTextBrowser (parent,"credits");
     1.9  
    1.10      credits->setText (
    1.11  	"<center><img src=\""+iconPath+"vym-128x128.png\"></center>"
    1.12 @@ -55,8 +55,7 @@
    1.13      credits->setFrameStyle( Q3Frame::Panel | Q3Frame::Plain );
    1.14      tabs->addTab (credits,"Credits");
    1.15  
    1.16 -    license=new AboutTextBrowser (tabs,"license");
    1.17 -	//license->setTextFormat (PlainText);
    1.18 +    license=new AboutTextBrowser (parent,"license");
    1.19      license->setText (
    1.20  	"<h3>VYM - View Your Mind</h3>"
    1.21      "<p>Copyright (C) 2004-2005  Uwe Drechsel</p>"  

     2.1 --- a/mainwindow.cpp	Wed Jun 14 10:28:01 2006 +0000
     2.2 +++ b/mainwindow.cpp	Wed Jun 14 14:43:18 2006 +0000
     2.3 @@ -502,28 +502,29 @@
     2.4  	actionEditPaste=a;
     2.5  
     2.6      // Shortcuts to modify heading:
     2.7 -	/*
     2.8      a = new QAction(tr( "Edit heading" ),this);
     2.9  	a->setStatusTip ( tr( "edit Heading" ));
    2.10  	a->setShortcut ( Qt::Key_Enter);
    2.11 +	a->setShortcutContext (Qt::ApplicationShortcut);
    2.12 +	addAction (a);
    2.13      connect( a, SIGNAL( triggered() ), this, SLOT( editHeading() ) );
    2.14  	actionListBranches.append(a);
    2.15 -	*/
    2.16      a = new QAction( tr( "Edit heading" ), this);
    2.17  	a->setStatusTip (tr( "edit Heading" ));
    2.18  	a->setShortcut (Qt::Key_Return );
    2.19      connect( a, SIGNAL( activated() ), this, SLOT( editHeading() ) );
    2.20 -	//actionListBranches.append(a);
    2.21 +	actionListBranches.append(a);
    2.22  	editMenu->addAction (a);
    2.23 +	a->setShortcutContext (Qt::ApplicationShortcut);
    2.24 +	addAction (a);
    2.25  	actionEditHeading=a;
    2.26 -	/*
    2.27 -    a = new QAction( tr( "Edit heading" ),this);
    2.28 +    a = new QAction( tr( "Edit heading" ), this);
    2.29  	a->setStatusTip (tr( "edit Heading" ));
    2.30  	a->setShortcut ( Qt::Key_F2 );
    2.31 +	a->setShortcutContext (Qt::ApplicationShortcut);
    2.32 +	addAction (a);
    2.33      connect( a, SIGNAL( activated() ), this, SLOT( editHeading() ) );
    2.34 -	a->setEnabled (false);
    2.35  	actionListBranches.append(a);
    2.36 -	*/
    2.37      
    2.38      // Shortcut to delete selection
    2.39      a = new QAction( tr( "Delete Selection" ),this);
    2.40 @@ -2683,19 +2684,12 @@
    2.41  
    2.42  void Main::editHeading()
    2.43  {
    2.44 -	qWarning ("Main::editHeading called");
    2.45  	if (currentMapEditor())
    2.46  		currentMapEditor()->editHeading();
    2.47  }
    2.48  
    2.49  void Main::editNewBranch()
    2.50  {
    2.51 -	//FIXME
    2.52 -	// tried to see if maybe currentMapEditor is not set, but
    2.53 -	// ME does not seem to send a key event anyway...:q
    2.54 -	//here i was last time...
    2.55 -	
    2.56 -	cout << "Main::editNewBranch\n";
    2.57  	if (currentMapEditor())
    2.58  		currentMapEditor()->addNewBranch(0);
    2.59  }

     3.1 --- a/mapeditor.cpp	Wed Jun 14 10:28:01 2006 +0000
     3.2 +++ b/mapeditor.cpp	Wed Jun 14 14:43:18 2006 +0000
     3.3 @@ -1487,7 +1487,11 @@
     3.4  void MapEditor::editHeading()
     3.5  {
     3.6  	// Finish open lineEdits
     3.7 -	if (lineedit) finishedLineEdit();
     3.8 +	if (lineedit->isVisible()) 
     3.9 +	{	
    3.10 +		finishedLineEdit();
    3.11 +		return;
    3.12 +	}	
    3.13  
    3.14  	if (selection  &&  
    3.15  		 (typeid(*selection) == typeid(BranchObj) ||