From dcc8d1573618593b77c4abed8f7b1df875d90d51 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Sat, 22 Mar 2014 22:49:28 +0900
Subject: [PATCH] Removes references to printing.kde.org in tdeprint. Then
 remove "Documentation" button from tdeprint config module, since the help
 handbook is available through the help button already. This relates to bug
 1846. (cherry picked from commit ef338f1187c7f4520be38c5c6b394f863cccb5d4)

---
 kdeprint/cups/cupsdconf2/cupsd.conf.template |  2 --
 kdeprint/management/kmmainview.cpp           | 23 --------------------
 kdeprint/management/kmmainview.h             |  1 -
 kdeprint/posterpreview.cpp                   |  3 +--
 4 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/kdeprint/cups/cupsdconf2/cupsd.conf.template b/kdeprint/cups/cupsdconf2/cupsd.conf.template
index ae1a4c362..f6679f9bd 100644
--- a/kdeprint/cups/cupsdconf2/cupsd.conf.template
+++ b/kdeprint/cups/cupsdconf2/cupsd.conf.template
@@ -7,8 +7,6 @@
 #
 # Author: Michael Goffioul <kdeprint@swing.be>
 #
-# Web site: http://printing.kde.org/
-#
 ########################################################################
 #                                                                      #
 # This is the CUPS configuration file.  If you are familiar with       #
diff --git a/kdeprint/management/kmmainview.cpp b/kdeprint/management/kmmainview.cpp
index a1a63d61f..ec248c516 100644
--- a/kdeprint/management/kmmainview.cpp
+++ b/kdeprint/management/kmmainview.cpp
@@ -227,9 +227,6 @@ void KMMainView::initActions()
 	tact->setChecked(KMManager::self()->isFilterEnabled());
 	connect(tact, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggleFilter(bool)));
 
-	new KAction( i18n( "%1 &Handbook" ).arg( "KDEPrint" ), "contents", 0, TQT_TQOBJECT(this), TQT_SLOT( slotHelp() ), m_actions, "invoke_help" );
-	new KAction( i18n( "%1 &Web Site" ).arg( "KDEPrint" ), "network", 0, TQT_TQOBJECT(this), TQT_SLOT( slotHelp() ), m_actions, "invoke_web" );
-
 	KActionMenu	*mact = new KActionMenu(i18n("Pri&nter Tools"), "package_utilities", m_actions, "printer_tool");
 	mact->setDelayed(false);
 	connect(mact->popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotToolSelected(int)));
@@ -315,11 +312,6 @@ void KMMainView::initActions()
 	m_menubar->insertButton( "view_remove", 4, true, i18n( "View" ) );
 	m_menubar->getButton( 4 )->setPopup( menu, true );
 	//m_menubar->setMinimumHeight( m_menubar->heightForWidth( 1000 ) );
-	menu = new TQPopupMenu( this );
-	m_actions->action( "invoke_help" )->plug( menu );
-	m_actions->action( "invoke_web" )->plug( menu );
-	m_menubar->insertButton( "help", 5, true, i18n( "Documentation" ) );
-	m_menubar->getButton( 5 )->setPopup( menu, true );
 
 	loadPluginActions();
 	slotPrinterSelected(TQString::null);
@@ -902,19 +894,4 @@ void KMMainView::reset( const TQString& msg, bool useDelay, bool holdTimer )
 	m_manager->checkUpdatePossible();
 }
 
-void KMMainView::slotHelp()
-{
-	TQString s = TQT_TQOBJECT_CONST(sender())->name();
-	if ( s == "invoke_help" )
-		kapp->invokeHelp( TQString::null, "kdeprint" );
-	else if ( s == "invoke_web" )
-	{
-		TQStringList args;
-		args << "exec" << "http://printing.kde.org";
-		kapp->kdeinitExec( "kfmclient", args );
-	}
-	else
-		kdDebug( 500 ) << "Unknown help invokator: " << s << endl;
-}
-
 #include "kmmainview.moc"
diff --git a/kdeprint/management/kmmainview.h b/kdeprint/management/kmmainview.h
index c924b3e90..eaffe6217 100644
--- a/kdeprint/management/kmmainview.h
+++ b/kdeprint/management/kmmainview.h
@@ -84,7 +84,6 @@ public slots:
 	void slotRefresh();
 	void slotToolSelected(int);
 	void slotToggleFilter(bool);
-	void slotHelp();
 
 protected slots:
 	void slotPrinterSelected(const TQString&);
diff --git a/kdeprint/posterpreview.cpp b/kdeprint/posterpreview.cpp
index b20f49c4f..a7666071f 100644
--- a/kdeprint/posterpreview.cpp
+++ b/kdeprint/posterpreview.cpp
@@ -113,8 +113,7 @@ void PosterPreview::drawContents( TQPainter *painter )
 		if ( m_rows <= 0 || m_cols <= 0 || m_pw <= 0 || m_ph <= 0 )
 		{
 			TQString txt = i18n( "Poster preview not available. Either the <b>poster</b> "
-				          "executable is not properly installed, or you don't have "
-						  "the required version; available at http://printing.kde.org/downloads/." );
+				          "executable is not properly installed, or you don't have the required version" );
 			TQSimpleRichText richtext( ( m_buffer.isEmpty() ? txt : m_buffer.prepend( "<pre>" ).append( "</pre>" ) ), p->font() );
 			richtext.adjustSize();
 			int x = ( width()-richtext.widthUsed() )/2, y = ( height()-richtext.height() )/2;