? Document-1.pdf
? doc/en/tutorials/short-words/Makefile
? doc/en/tutorials/short-words/Makefile.in
? plugins/gettext/odtim/.deps
? plugins/gettext/odtim/.libs
? plugins/gettext/odtim/Makefile
? plugins/gettext/odtim/Makefile.in
? plugins/gettext/odtim/contentreader.lo
? plugins/gettext/odtim/libodtimplugin.la
? plugins/gettext/odtim/odtdia.lo
? plugins/gettext/odtim/odtdia.moc
? plugins/gettext/odtim/odtim.lo
? plugins/gettext/odtim/stylereader.lo
? plugins/scriptplugin/editmacrodialog.cpp
? plugins/scriptplugin/editmacrodialog.h
? plugins/scriptplugin/managemacrosdialog.cpp
? plugins/scriptplugin/managemacrosdialog.h
? plugins/scriptplugin/samples/Makefile
? plugins/scriptplugin/samples/Makefile.in
? plugins/scriptplugin/scripts/Makefile
? plugins/scriptplugin/scripts/Makefile.in
Index: hyphenator.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/hyphenator.cpp,v
retrieving revision 1.19
diff -u -r1.19 hyphenator.cpp
--- hyphenator.cpp	18 Apr 2005 21:23:04 -0000	1.19
+++ hyphenator.cpp	1 Jul 2005 11:45:53 -0000
@@ -369,3 +369,31 @@
 	doc->DoDrawing = true;
 	nb1->OwnPage->RefreshItem(nb1);
 }
+
+/*!
+  \fn void Hyphenator::slotDeHyphenate(PageItem* it)
+  \brief Remove all Hyphenations from the whole text frame or its selected parts.
+  \date 2005-01-18
+  \author Thomas R. Koll, <tomk32@tomk32.de>
+  \param it references \see PageItem - text frame.
+  \retval None
+  */
+void Hyphenator::slotDeHyphenate(PageItem* it)
+{
+	uint c;
+	if ( it->HasSel )
+	{
+		for (c=0; c < it->Ptext.count(); c++ ) {
+			if (it->Ptext.at(c)->cselect)
+				it->Ptext.at(c)->cstyle &= 127;
+		}
+	}
+	else
+	{
+		for (c=0; c < it->Ptext.count(); c++ )
+			it->Ptext.at(c)->cstyle &= 127;
+	}
+	qApp->setOverrideCursor(QCursor(ArrowCursor), true);
+	doc->DoDrawing = true;
+	it->OwnPage->RefreshItem(it);
+}
Index: hyphenator.h
===================================================================
RCS file: /cvs/Scribus/scribus/hyphenator.h,v
retrieving revision 1.6
diff -u -r1.6 hyphenator.h
--- hyphenator.h	10 Apr 2004 10:08:59 -0000	1.6
+++ hyphenator.h	1 Jul 2005 11:45:53 -0000
@@ -47,5 +47,6 @@
 	void slotNewSettings(int Wordlen, bool Autom, bool ACheck, int Num);
 	void slotHyphenateWord(PageItem* it, QString text, int firstC);
 	void slotHyphenate(PageItem *it);
+	void slotDeHyphenate(PageItem *it);
 };
 #endif
Index: scribus.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/scribus.cpp,v
retrieving revision 1.288
diff -u -r1.288 scribus.cpp
--- scribus.cpp	24 Jun 2005 16:31:46 -0000	1.288
+++ scribus.cpp	1 Jul 2005 11:45:55 -0000
@@ -834,6 +834,9 @@
 	hyph = extraMenu->insertItem( tr("&Hyphenate Text"), this, SLOT(doHyphenate()));
 	extraMenu->setItemEnabled(hyph, 0);
 	SetKeyEntry(50, tr("Hyphenate Text"), hyph, 0);
+	dehyph = extraMenu->insertItem( tr("&Deyphenate Text"), this, SLOT(doDeHyphenate()));
+	extraMenu->setItemEnabled(dehyph, 0);
+	SetKeyEntry(50, tr("Dehyphenate Text"), hyph, 0);
 
 	settingsMenu = new QPopupMenu();
 	tip = settingsMenu->insertItem( tr("Toolti&ps"), this, SLOT(ToggleTips()));
@@ -2701,6 +2704,7 @@
 		editMenu->setItemEnabled(edid4, 0);
 		editMenu->setItemEnabled(Sear, 0);
 		extraMenu->setItemEnabled(hyph, 0);
+		extraMenu->setItemEnabled(dehyph, 0);
 		StilMenu->clear();
 		WerkTools->KetteAus->setEnabled(false);
 		WerkTools->KetteEin->setEnabled(false);
@@ -2719,6 +2723,7 @@
 		editMenu->setItemEnabled(edid4, 0);
 		editMenu->setItemEnabled(Sear, 0);
 		extraMenu->setItemEnabled(hyph, 0);
+		extraMenu->setItemEnabled(dehyph, 0);
 		menuBar()->setItemEnabled(Stm, 1);
 		menuBar()->setItemEnabled(Obm, 1);
 		if ((b->isTableItem) && (b->isSingleSel))
@@ -2838,6 +2843,7 @@
 		editMenu->setItemEnabled(edid4, 0);
 		editMenu->setItemEnabled(Sear, 0);
 		extraMenu->setItemEnabled(hyph, 0);
+		extraMenu->setItemEnabled(dehyph, 0);
 		menuBar()->setItemEnabled(Stm, 1);
 		menuBar()->setItemEnabled(Obm, 1);
 		ObjMenu->setItemEnabled(ShapeM, 0);
@@ -2882,6 +2888,7 @@
 		editMenu->setItemEnabled(edid4, 0);
 		editMenu->setItemEnabled(Sear, 0);
 		extraMenu->setItemEnabled(hyph, 0);
+		extraMenu->setItemEnabled(dehyph, 0);
 		menuBar()->setItemEnabled(Stm, 1);
 		menuBar()->setItemEnabled(Obm, 1);
 		StilMenu->clear();
@@ -3886,6 +3893,7 @@
 		editMenu->setItemEnabled(edid6a, 0);
 		editMenu->setItemEnabled(Sear, 0);
 		extraMenu->setItemEnabled(hyph, 0);
+		extraMenu->setItemEnabled(dehyph, 0);
 		menuBar()->setItemEnabled(ViMen, 0);
 		menuBar()->setItemEnabled(WinMen, 0);
 		viewMenu->setItemChecked(uGuide, false);
@@ -8983,6 +8991,21 @@
 			doc->Trenner->slotHyphenate(b);
 			slotDocCh();
 		}
+		extraMenu->setItemEnabled(dehyph, 1);
+	}
+}
+
+void ScribusApp::doDeHyphenate()
+{
+    PageItem *b;
+    if (HaveDoc)
+    {
+        if (doc->ActPage->SelItem.count() != 0)
+		{
+			b = doc->ActPage->SelItem.at(0);
+			doc->Trenner->slotDeHyphenate(b);
+			slotDocCh();
+		}
 	}
 }
 
Index: scribus.h
===================================================================
RCS file: /cvs/Scribus/scribus/scribus.h,v
retrieving revision 1.67
diff -u -r1.67 scribus.h
--- scribus.h	1 Jun 2005 23:14:04 -0000	1.67
+++ scribus.h	1 Jul 2005 11:45:55 -0000
@@ -246,6 +246,7 @@
 	void CanUndo();
 	void configHyphenator();
 	void doHyphenate();
+	void doDeHyphenate();
 	void slotTest();
 	void slotTest2();
 	void PutScrap(QString t);
@@ -576,6 +577,7 @@
 	int LockOb;
 	int exmn;
 	int hyph;
+	int dehyph;
 	int ORaise;
 	int OLower;
 	int OBack;
