Finish moving kinfocenter files to kcontrol.

This partially resolves bug report 289.

7 files changed, 8 insertions, 179 deletions

diff --git a/kcontrol/kcontrol/CMakeLists.txt b/kcontrol/kcontrol/CMakeLists.txt
index b5eeb1ddd..5d7ba23f7 100644
--- a/kcontrol/kcontrol/CMakeLists.txt
+++ b/kcontrol/kcontrol/CMakeLists.txt
@@ -26,8 +26,7 @@ link_directories(
 
 tde_install_icons()
 install( FILES kcontrolui.rc DESTINATION ${DATA_INSTALL_DIR}/kcontrol )
-install( FILES kinfocenterui.rc DESTINATION ${DATA_INSTALL_DIR}/kinfocenter )
-install( FILES  KControl.desktop kinfocenter.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( FILES  KControl.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 
 ##### kcontrol (tdeinit) ########################
@@ -46,5 +45,3 @@ tde_add_tdeinit_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
   LINK tdehtml-shared
 )
-
-tde_install_symlink( kcontrol ${BIN_INSTALL_DIR}/kinfocenter )
diff --git a/kcontrol/kcontrol/Makefile.am b/kcontrol/kcontrol/Makefile.am
index 9ae27d42f..f39a2ee3f 100644
--- a/kcontrol/kcontrol/Makefile.am
+++ b/kcontrol/kcontrol/Makefile.am
@@ -37,15 +37,8 @@ kcontrol_la_LDFLAGS = $(all_libraries) -module -avoid-version
 
 rccontroldir = $(kde_datadir)/kcontrol
 rccontrol_DATA = kcontrolui.rc
-rcinfodir = $(kde_datadir)/kinfocenter
-rcinfo_DATA = kinfocenterui.rc
 
-xdg_apps_DATA = KControl.desktop kinfocenter.desktop
-
-install-data-local:
-	@-rm -f $(DESTDIR)$(kde_bindir)/kinfocenter
-	$(mkinstalldirs) $(DESTDIR)$(kde_bindir)
-	@$(LN_S) kcontrol $(DESTDIR)$(kde_bindir)/kinfocenter
+xdg_apps_DATA = KControl.desktop
 
 KDE_ICON=AUTO
 
diff --git a/kcontrol/kcontrol/helpwidget.cpp b/kcontrol/kcontrol/helpwidget.cpp
index 0e8cc4844..3e4fe717f 100644
--- a/kcontrol/kcontrol/helpwidget.cpp
+++ b/kcontrol/kcontrol/helpwidget.cpp
@@ -47,16 +47,10 @@ void HelpWidget::setText(const TQString& docPath, const TQString& text)
 
 void HelpWidget::setBaseText()
 {
-  if (KCGlobal::isInfoCenter())
-     helptext = (i18n("<h1>Trinity Info Center</h1>"
-			 "There is no quick help available for the active info module."
-			 "<br><br>"
-			 "Click <a href = \"kinfocenter/index.html\">here</a> to read the general Info Center manual.") );
-  else
-     helptext = (i18n("<h1>Trinity Control Center</h1>"
-			 "There is no quick help available for the active control module."
-			 "<br><br>"
-			 "Click <a href = \"kcontrol/index.html\">here</a> to read the general Control Center manual.") );
+	 helptext = (i18n("<h1>Trinity Control Center</h1>"
+		 "There is no quick help available for the active control module."
+		 "<br><br>"
+		 "Click <a href = \"kcontrol/index.html\">here</a> to read the general Control Center manual.") );
 }
 
 TQString HelpWidget::text() const
diff --git a/kcontrol/kcontrol/kinfocenter.desktop b/kcontrol/kcontrol/kinfocenter.desktop
deleted file mode 100644
index 080459037..000000000
--- a/kcontrol/kcontrol/kinfocenter.desktop
+++ /dev/null
@@ -1,116 +0,0 @@
-[Desktop Entry]
-Exec=kinfocenter -caption "%c" %i %m
-Icon=hwinfo
-Type=Application
-# Restore the following key and remove this comment when a help handbook
-# is written. Disabling this key prevents populating the main handbook
-# table of contents with a non-existent document, which results in a
-# main handbook error message of
-# 'There is no documentation available for /xyz/index.html.'
-# Also disable this key when there exists only a useless template handbook.
-# DocPath=kinfocenter/index.html
-X-TDE-StartupNotify=true
-OnlyShowIn=TDE;
-
-Name=KInfoCenter
-Name[af]=Inligting Sentrum
-Name[be]=Цэнтр інфармацыі
-Name[bn]=কে-ইনফো-সেন্টার
-Name[csb]=Centróm wëdowiédzë
-Name[de]=Infozentrum
-Name[el]=Κέντρο πληροφοριών
-Name[et]=TDE infokeskus
-Name[he]=מרכז המידע
-Name[ja]=インフォセンター
-Name[mk]=КИнфоцентар
-Name[nds]=TDE-Infozentrum
-Name[ne]=के सूचना केन्द्र
-Name[pa]=ਜਾਣਕਾਰੀ ਕੇਂਦਰ
-Name[pl]=Centrum informacyjne
-Name[pt_BR]=Centro de Informações do TDE
-Name[ro]=Centrul de informații TDE
-Name[rw]=K-AmakuruHagati
-Name[sk]=TDE Informačné centrum
-Name[sv]=Informationscentralen
-Name[ta]=கேதகவல் மையம்
-Name[te]=కెఇన్ఫొసెంటర్
-Name[tg]=КМаркази иттилоот
-Name[th]=ศูนย์ข้อมูล K
-Name[tr]=TDE Bilgi Merkezi
-Name[uz]=Maʼlumot markazi
-Name[uz@cyrillic]=Маълумот маркази
-Name[vi]=Trung tâm Thông tin TDE
-Name[wa]=Cinte d' informåcion KInfo
-GenericName=Info Center
-GenericName[af]=Inligting Sentrum
-GenericName[be]=Цэнтр інфармацыі
-GenericName[bg]=Информационен център
-GenericName[bn]=তথ্য কেন্দ্র
-GenericName[br]=Kreizenn Titouroù
-GenericName[bs]=Info centar
-GenericName[ca]=Centre d'informació
-GenericName[cs]=Informační centrum
-GenericName[csb]=Centróm wëdowiédzë
-GenericName[cy]=Canolfan Gwybodaeth
-GenericName[da]=Infocenter
-GenericName[de]=Infozentrum
-GenericName[el]=Κέντρο πληροφοριών
-GenericName[en_GB]=Info Centre
-GenericName[eo]=Infocentro
-GenericName[es]=Centro de información
-GenericName[et]=Infokeskus
-GenericName[eu]=Info gunea
-GenericName[fa]=مرکز اطلاعات
-GenericName[fi]=Infokeskus
-GenericName[fr]=Centre d'informations
-GenericName[fy]=Ynformaasjesintrum
-GenericName[ga]=Lárionad Eolais
-GenericName[gl]=Centro de Información
-GenericName[he]=מרכז המידע
-GenericName[hr]=Info središte
-GenericName[hu]=Rendszerinformáció
-GenericName[is]=Upplýsingaborð
-GenericName[it]=Centro informazioni
-GenericName[ja]=インフォセンター
-GenericName[ka]=საინფორმაციო ცენტრი
-GenericName[kk]=Мәлімет орталығы
-GenericName[km]=មជ្ឈមណ្ឌល​ព័ត៌មាន
-GenericName[ko]=정보 센터
-GenericName[lt]=Info centras
-GenericName[mk]=Информативен центар
-GenericName[ms]=Pusat Maklumat
-GenericName[nb]=TDEs informasjonssenter
-GenericName[nds]=Infozentrum
-GenericName[ne]=सूचना केन्द्र
-GenericName[nl]=Informatiecentrum
-GenericName[nn]=TDEs informasjonssenter
-GenericName[pa]=ਜਾਣਕਾਰੀ ਕੇਂਦਰ
-GenericName[pl]=Centrum informacyjne
-GenericName[pt]=Centro de Informações
-GenericName[pt_BR]=Centro de Informações
-GenericName[ro]=Centru de informații
-GenericName[ru]=Центр информации
-GenericName[rw]=Amakuru Hagati
-GenericName[se]=Diehtoguovddáš
-GenericName[sk]=Informačné centrum
-GenericName[sl]=Informacijsko središče
-GenericName[sr]=Информациони центар
-GenericName[sr@Latn]=Informacioni centar
-GenericName[sv]=Informationscentralen
-GenericName[ta]=தகவல் மையம்
-GenericName[te]=సమాచార కేంద్రం
-GenericName[tg]=Маркази иттилоот
-GenericName[th]=ศูนย์ข้อมูล
-GenericName[tr]=Bilgi Merkezi
-GenericName[tt]=Beleşmä Üzäge
-GenericName[uk]=Центр інформації
-GenericName[uz]=Maʼlumot markazi
-GenericName[uz@cyrillic]=Маълумот маркази
-GenericName[vi]=Trung tâm Thông tin
-GenericName[wa]=Cinte di contrôle
-GenericName[zh_CN]=信息中心
-GenericName[zh_TW]=資訊中心
-
-X-DCOP-ServiceType=Unique
-Categories=Qt;TDE;System;
-NoDisplay=true
diff --git a/kcontrol/kcontrol/kinfocenterui.rc b/kcontrol/kcontrol/kinfocenterui.rc
deleted file mode 100644
index 92867beb3..000000000
--- a/kcontrol/kcontrol/kinfocenterui.rc
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE kpartgui>
-<kpartgui name="kcontrol" version="2">
-<MenuBar>
-    <Menu name="view"><text>&amp;View</text>
-        <Menu name="view_mode"><text>&amp;Mode</text>
-            <Action name="activate_iconview"/>
-            <Action name="activate_treeview"/>
-        </Menu>
-        <Menu name="view_iconsize"><text>Icon &amp;Size</text>
-            <Action name="activate_smallicons"/>
-            <Action name="activate_mediumicons"/>
-            <Action name="activate_largeicons"/>
-            <Action name="activate_hugeicons"/>
-        </Menu>
-    </Menu>
-    <Menu name="help">
-        <Action name="help_about_module" append="about_merge"/>
-    </Menu>
-</MenuBar>
-</kpartgui>
diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp
index 21824d2bf..2656359c2 100644
--- a/kcontrol/kcontrol/main.cpp
+++ b/kcontrol/kcontrol/main.cpp
@@ -105,29 +105,15 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
     KCONTROL_VERSION, I18N_NOOP("The Trinity Control Center"), TDEAboutData::License_GPL,
     I18N_NOOP("(c) 1998-2004, The TDE Control Center Developers"));
 
-  TDEAboutData aboutKInfoCenter( "kinfocenter", I18N_NOOP("Trinity Info Center"),
-    KCONTROL_VERSION, I18N_NOOP("The Trinity Info Center"), TDEAboutData::License_GPL,
-    I18N_NOOP("(c) 1998-2004, The TDE Control Center Developers"));
-
   TQCString argv_0 = argv[0];
   TDEAboutData *aboutData;
-  if (argv_0.right(11) == "kinfocenter")
-  {
-     aboutData = &aboutKInfoCenter;
-     KCGlobal::setIsInfoCenter(true);
-     kdDebug(1208) << "Running as KInfoCenter!\n" << endl;
-  }
-  else
   {
      aboutData = &aboutKControl;
      KCGlobal::setIsInfoCenter(false);
   }
 
   aboutData->addAuthor("Timothy Pearson", I18N_NOOP("Current Maintainer"), "kb9vqf@pearsoncomputing.net");
-  if (argv_0.right(11) == "kinfocenter")
-    aboutData->addAuthor("Helge Deller", I18N_NOOP("Previous Maintainer"), "deller@kde.org");
-  else
-    aboutData->addAuthor("Daniel Molkentin", I18N_NOOP("Previous Maintainer"), "molkentin@kde.org");
+  aboutData->addAuthor("Daniel Molkentin", I18N_NOOP("Previous Maintainer"), "molkentin@kde.org");
 
   aboutData->addAuthor("Matthias Hoelzer-Kluepfel",0, "hoelzer@kde.org");
   aboutData->addAuthor("Matthias Elter",0, "elter@kde.org");
diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp
index a93122a26..519ec91df 100644
--- a/kcontrol/kcontrol/toplevel.cpp
+++ b/kcontrol/kcontrol/toplevel.cpp
@@ -270,12 +270,7 @@ actionCollection());
   about_module = new TDEAction(i18n("About Current Module"), 0, TQT_TQOBJECT(this), TQT_SLOT(aboutModule()), actionCollection(), "help_about_module");
   about_module->setEnabled(false);
 
-  // I need to add this so that each module can get a bug reported,
-  // and not just KControl
-  if (KCGlobal::isInfoCenter())
-    createGUI("kinfocenterui.rc");
-  else
-    createGUI("kcontrolui.rc");
+  createGUI("kcontrolui.rc");
 
   report_bug = actionCollection()->action("help_report_bug");
   report_bug->setText(i18n("&Report Bug..."));