1.1 Binary file demos/todo.vym has changed

     2.1 --- a/mainwindow.cpp	Thu Jul 06 14:47:01 2006 +0000
     2.2 +++ b/mainwindow.cpp	Thu Jul 06 15:39:54 2006 +0000
     2.3 @@ -668,23 +668,24 @@
     2.4  	a->setShortcut (Qt::CTRL + Qt::Key_U );
     2.5  	a->setShortcut (tr( "Open URL" ));
     2.6      tb->addAction (a);
     2.7 -	a->setEnabled (false);
     2.8 +	addAction(a);
     2.9      connect( a, SIGNAL( activated() ), this, SLOT( editOpenURL() ) );
    2.10  	actionEditOpenURL=a;
    2.11  
    2.12  	a = new QAction( tr( "Open URL in new tab" ), this);
    2.13  	a->setStatusTip (tr( "Open URL in new tab" ));
    2.14  	a->setShortcut (Qt::CTRL+Qt::Key_U );
    2.15 -	a->setEnabled (false);
    2.16 +	addAction(a);
    2.17      connect( a, SIGNAL( activated() ), this, SLOT( editOpenURLTab() ) );
    2.18  	actionEditOpenURLTab=a;
    2.19  
    2.20  	a = new QAction(QPixmap(), tr( "Edit URL"+QString("...") ), this);
    2.21  	a->setStatusTip ( tr( "Edit URL" ) );
    2.22 -	a->setShortcut (Qt::SHIFT + Qt::CTRL+Qt::Key_U );
    2.23 +	a->setShortcut (Qt::SHIFT + Qt::CTRL + Qt::Key_U );
    2.24 +	//a->setShortcut ( Qt::Key_U );
    2.25  	a->setShortcutContext (Qt::WindowShortcut);
    2.26 -	a->setEnabled (false);
    2.27  	actionListBranches.append(a);
    2.28 +	addAction(a);
    2.29      connect( a, SIGNAL( activated() ), this, SLOT( editURL() ) );
    2.30  	actionEditURL=a;
    2.31  	

     3.1 --- a/texteditor.cpp	Thu Jul 06 14:47:01 2006 +0000
     3.2 +++ b/texteditor.cpp	Thu Jul 06 15:39:54 2006 +0000
     3.3 @@ -314,17 +314,21 @@
     3.4  	actionEditDeleteAll=a;
     3.5  
     3.6  	a = new QAction(QPixmap(), tr( "&Convert Paragraphs" ),this);
     3.7 +	/* FIXME not needed any longer? remove also from docu...
     3.8  	a->setStatusTip(tr( "Convert paragraphs to linebreaks" )); 
     3.9  	a->setShortcut( Qt::ALT + Qt::Key_P );
    3.10      connect( a, SIGNAL( activated() ), this, SLOT( textConvertPar() ) );
    3.11  	editMenu->addAction (a);
    3.12 +	*/
    3.13  	actionEditConvertPar=a;
    3.14  
    3.15  	a = new QAction( QPixmap(), tr( "&Join lines" ), this);
    3.16 +	/* FIXME not needed any longer? remove also from docu...
    3.17  	a->setStatusTip(tr( "Join all lines of a paragraph" ) ); 
    3.18  	a->setShortcut(Qt::ALT + Qt::Key_J );
    3.19      connect( a, SIGNAL( activated() ), this, SLOT( textJoinLines() ) );
    3.20  	editMenu->addAction (a);
    3.21 +	*/
    3.22  	actionEditJoinLines=a;
    3.23  }
    3.24  
    3.25 @@ -659,9 +663,6 @@
    3.26  	// which is not always wanted
    3.27  	// This function replaces paragraphs by linebreaks.
    3.28  
    3.29 -	e->setBackgroundRole (QPalette::Text);
    3.30 -	cout << "dark\n";
    3.31 -
    3.32  	QString t;
    3.33  	t=e->text();
    3.34  	QRegExp re("<p.*>");
    3.35 @@ -700,9 +701,6 @@
    3.36  
    3.37  void TextEditor::textJoinLines()
    3.38  {
    3.39 -	e->setBackgroundRole (QPalette::Light);
    3.40 -	cout << "light\n";
    3.41 -
    3.42  /* FIXME QT3
    3.43  	int parFrom, parTo, indFrom, indTo;
    3.44  	e->getSelection (&parFrom,&indFrom,&parTo,&indTo);