# HG changeset patch
# User insilmaril
# Date 1152200394 0
# Node ID e2a80d9b58580f5b501b88a4e6137894b08330f4
# Parent  f94317a94db19cbef237c39f6bb3b6a64521aea6
disabled join lines/paragraphs in TextEditor

diff -r f94317a94db1 -r e2a80d9b5858 demos/todo.vym
Binary file demos/todo.vym has changed
diff -r f94317a94db1 -r e2a80d9b5858 mainwindow.cpp
--- a/mainwindow.cpp	Thu Jul 06 14:47:01 2006 +0000
+++ b/mainwindow.cpp	Thu Jul 06 15:39:54 2006 +0000
@@ -668,23 +668,24 @@
 	a->setShortcut (Qt::CTRL + Qt::Key_U );
 	a->setShortcut (tr( "Open URL" ));
     tb->addAction (a);
-	a->setEnabled (false);
+	addAction(a);
     connect( a, SIGNAL( activated() ), this, SLOT( editOpenURL() ) );
 	actionEditOpenURL=a;
 
 	a = new QAction( tr( "Open URL in new tab" ), this);
 	a->setStatusTip (tr( "Open URL in new tab" ));
 	a->setShortcut (Qt::CTRL+Qt::Key_U );
-	a->setEnabled (false);
+	addAction(a);
     connect( a, SIGNAL( activated() ), this, SLOT( editOpenURLTab() ) );
 	actionEditOpenURLTab=a;
 
 	a = new QAction(QPixmap(), tr( "Edit URL"+QString("...") ), this);
 	a->setStatusTip ( tr( "Edit URL" ) );
-	a->setShortcut (Qt::SHIFT + Qt::CTRL+Qt::Key_U );
+	a->setShortcut (Qt::SHIFT + Qt::CTRL + Qt::Key_U );
+	//a->setShortcut ( Qt::Key_U );
 	a->setShortcutContext (Qt::WindowShortcut);
-	a->setEnabled (false);
 	actionListBranches.append(a);
+	addAction(a);
     connect( a, SIGNAL( activated() ), this, SLOT( editURL() ) );
 	actionEditURL=a;
 	
diff -r f94317a94db1 -r e2a80d9b5858 texteditor.cpp
--- a/texteditor.cpp	Thu Jul 06 14:47:01 2006 +0000
+++ b/texteditor.cpp	Thu Jul 06 15:39:54 2006 +0000
@@ -314,17 +314,21 @@
 	actionEditDeleteAll=a;
 
 	a = new QAction(QPixmap(), tr( "&Convert Paragraphs" ),this);
+	/* FIXME not needed any longer? remove also from docu...
 	a->setStatusTip(tr( "Convert paragraphs to linebreaks" )); 
 	a->setShortcut( Qt::ALT + Qt::Key_P );
     connect( a, SIGNAL( activated() ), this, SLOT( textConvertPar() ) );
 	editMenu->addAction (a);
+	*/
 	actionEditConvertPar=a;
 
 	a = new QAction( QPixmap(), tr( "&Join lines" ), this);
+	/* FIXME not needed any longer? remove also from docu...
 	a->setStatusTip(tr( "Join all lines of a paragraph" ) ); 
 	a->setShortcut(Qt::ALT + Qt::Key_J );
     connect( a, SIGNAL( activated() ), this, SLOT( textJoinLines() ) );
 	editMenu->addAction (a);
+	*/
 	actionEditJoinLines=a;
 }
 
@@ -659,9 +663,6 @@
 	// which is not always wanted
 	// This function replaces paragraphs by linebreaks.
 
-	e->setBackgroundRole (QPalette::Text);
-	cout << "dark\n";
-
 	QString t;
 	t=e->text();
 	QRegExp re("<p.*>");
@@ -700,9 +701,6 @@
 
 void TextEditor::textJoinLines()
 {
-	e->setBackgroundRole (QPalette::Light);
-	cout << "light\n";
-
 /* FIXME QT3
 	int parFrom, parTo, indFrom, indTo;
 	e->getSelection (&parFrom,&indFrom,&parTo,&indTo);