diff options
author | Darrell Anderson <[email protected]> | 2014-02-19 18:58:08 -0600 |
---|---|---|
committer | Darrell Anderson <[email protected]> | 2014-02-19 18:58:08 -0600 |
commit | 3aef1afb880077b776d9807b1186a6744d851760 (patch) | |
tree | ba6d616189cae07cc1ddf9e569890572e1941f57 /src | |
parent | b0f8ab59e81eae96dcd0adf27b29f9651e550d5d (diff) | |
download | kchmviewer-3aef1afb880077b776d9807b1186a6744d851760.tar.gz kchmviewer-3aef1afb880077b776d9807b1186a6744d851760.zip |
Add help handbook, add DocPath, rename files.
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.am | 8 | ||||
-rw-r--r-- | src/kchmbookmarkwindow.h | 2 | ||||
-rw-r--r-- | src/kchmconfig.cpp | 2 | ||||
-rw-r--r-- | src/kchmcontentswindow.cpp | 2 | ||||
-rw-r--r-- | src/kchmcontentswindow.h | 2 | ||||
-rw-r--r-- | src/kchmdialogchooseurlfromlist.cpp | 2 | ||||
-rw-r--r-- | src/kchmlistitemtooltip.h | 2 | ||||
-rw-r--r-- | src/kchmmainwindow.cpp | 2 | ||||
-rw-r--r-- | src/kchmmainwindow.h | 2 | ||||
-rw-r--r-- | src/kchmnavtoolbar.cpp | 2 | ||||
-rw-r--r-- | src/kchmsearchtoolbar.h | 2 | ||||
-rw-r--r-- | src/kchmsearchwindow.h | 2 | ||||
-rw-r--r-- | src/kchmsetupdialog.cpp | 7 | ||||
-rw-r--r-- | src/kchmviewwindow.h | 2 | ||||
-rw-r--r-- | src/kchmviewwindow_qtextbrowser.cpp | 2 | ||||
-rw-r--r-- | src/kchmviewwindow_qtextbrowser.h | 2 | ||||
-rw-r--r-- | src/kchmviewwindowmgr.cpp | 2 | ||||
-rw-r--r-- | src/kchmviewwindowmgr.h | 2 | ||||
-rw-r--r-- | src/main.cpp | 4 | ||||
-rw-r--r-- | src/tde-tqt.cpp (renamed from src/kde-qt.cpp) | 2 | ||||
-rw-r--r-- | src/tde-tqt.h (renamed from src/kde-qt.h) | 0 | ||||
-rw-r--r-- | src/tde/Makefile.am (renamed from src/kde/Makefile.am) | 0 | ||||
-rw-r--r-- | src/tde/kchmdcopiface.cpp (renamed from src/kde/kchmdcopiface.cpp) | 0 | ||||
-rw-r--r-- | src/tde/kchmdcopiface.h (renamed from src/kde/kchmdcopiface.h) | 0 | ||||
-rw-r--r-- | src/tde/kchmdcopiface_skel.cpp (renamed from src/kde/kchmdcopiface_skel.cpp) | 0 | ||||
-rw-r--r-- | src/tde/kchmviewwindow_tdehtmlpart.cpp (renamed from src/kde/kchmviewwindow_tdehtmlpart.cpp) | 2 | ||||
-rw-r--r-- | src/tde/kchmviewwindow_tdehtmlpart.h (renamed from src/kde/kchmviewwindow_tdehtmlpart.h) | 2 |
27 files changed, 32 insertions, 25 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index e14ed77..cd05f38 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,13 +1,13 @@ if AMC_USE_KDE -LIB_KDEEXTRADIR = kde -LIB_KDEEXTRA = kde/libkdeextra.a +LIB_KDEEXTRADIR = tde +LIB_KDEEXTRA = tde/libkdeextra.a endif bin_PROGRAMS = kchmviewer kchmviewer_SOURCES = iconstorage.cpp kchmbookmarkwindow.cpp kchmconfig.cpp \ kchmindexwindow.cpp kchmmainwindow.cpp kchmsearchtoolbar.cpp kchmsearchwindow.cpp \ kchmsettings.cpp kchmsourcefactory.cpp kchmtreeviewitem.cpp kchmviewwindow.cpp main.cpp \ - kchmdialogchooseurlfromlist.cpp kde-qt.cpp kchmviewwindow_qtextbrowser.cpp \ + kchmdialogchooseurlfromlist.cpp tde-tqt.cpp kchmviewwindow_qtextbrowser.cpp \ kchmsetupdialog.ui kqtempfile.cpp kchmnavtoolbar.cpp kchmviewwindowmgr.cpp \ kchmkeyeventfilter.cpp kchmcontentswindow.cpp kchmsearchengine_impl.cpp \ kchmsearchengine.cpp @@ -28,7 +28,7 @@ KDE_ICON = AUTO noinst_HEADERS = kchmsettings.h forwarddeclarations.h kchmsourcefactory.h \ iconstorage.h kchmbookmarkwindow.h kchmconfig.h kchmtreeviewitem.h \ kchmdialogchooseurlfromlist.h kchmviewwindow.h kchmindexwindow.h \ - kchmmainwindow.h kchmviewwindow_qtextbrowser.h kchmsearchtoolbar.h kde-qt.h \ + kchmmainwindow.h kchmviewwindow_qtextbrowser.h kchmsearchtoolbar.h tde-tqt.h \ kchmsearchwindow.h kqtempfile.h kqrunprocess.h kchmnavtoolbar.h kchmviewwindowmgr.h \ kchmkeyeventfilter.h kchmcontentswindow.h kchmlistitemtooltip.h kchmsearchengine_impl.h \ kchmsearchengine.h diff --git a/src/kchmbookmarkwindow.h b/src/kchmbookmarkwindow.h index ef57278..2a79b49 100644 --- a/src/kchmbookmarkwindow.h +++ b/src/kchmbookmarkwindow.h @@ -22,7 +22,7 @@ #ifndef KCHMBOOKMARKWINDOW_H #define KCHMBOOKMARKWINDOW_H -#include "kde-qt.h" +#include "tde-tqt.h" #include "forwarddeclarations.h" #include "kchmsettings.h" diff --git a/src/kchmconfig.cpp b/src/kchmconfig.cpp index 8f33057..c96acb0 100644 --- a/src/kchmconfig.cpp +++ b/src/kchmconfig.cpp @@ -19,7 +19,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include "kde-qt.h" +#include "tde-tqt.h" #include "kchmconfig.h" #include "kchmsettings.h" #include "kchmmainwindow.h" diff --git a/src/kchmcontentswindow.cpp b/src/kchmcontentswindow.cpp index b98b444..200df61 100644 --- a/src/kchmcontentswindow.cpp +++ b/src/kchmcontentswindow.cpp @@ -19,7 +19,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include "kde-qt.h" +#include "tde-tqt.h" #include "libchmfile.h" diff --git a/src/kchmcontentswindow.h b/src/kchmcontentswindow.h index e47b0fb..5c29956 100644 --- a/src/kchmcontentswindow.h +++ b/src/kchmcontentswindow.h @@ -22,7 +22,7 @@ #ifndef INCLUDE_KCHMCONTENTSWINDOW_H #define INCLUDE_KCHMCONTENTSWINDOW_H -#include "kde-qt.h" +#include "tde-tqt.h" #include "kchmtreeviewitem.h" /** diff --git a/src/kchmdialogchooseurlfromlist.cpp b/src/kchmdialogchooseurlfromlist.cpp index 41bc64a..bb50a13 100644 --- a/src/kchmdialogchooseurlfromlist.cpp +++ b/src/kchmdialogchooseurlfromlist.cpp @@ -19,7 +19,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include "kde-qt.h" +#include "tde-tqt.h" #include "kchmdialogchooseurlfromlist.h" #include "kchmtreeviewitem.h" diff --git a/src/kchmlistitemtooltip.h b/src/kchmlistitemtooltip.h index 8bf43bf..1867900 100644 --- a/src/kchmlistitemtooltip.h +++ b/src/kchmlistitemtooltip.h @@ -22,7 +22,7 @@ #ifndef INCLUDE_KCHMLISTITEMTOOLTIP_H #define INCLUDE_KCHMLISTITEMTOOLTIP_H -#include "kde-qt.h" +#include "tde-tqt.h" #include "forwarddeclarations.h" /** diff --git a/src/kchmmainwindow.cpp b/src/kchmmainwindow.cpp index da29e54..5aabdae 100644 --- a/src/kchmmainwindow.cpp +++ b/src/kchmmainwindow.cpp @@ -26,7 +26,7 @@ #include <errno.h> #include <unistd.h> -#include "kde-qt.h" +#include "tde-tqt.h" #include <tqaccel.h> #include <tqevent.h> diff --git a/src/kchmmainwindow.h b/src/kchmmainwindow.h index 586e0ee..a4d1127 100644 --- a/src/kchmmainwindow.h +++ b/src/kchmmainwindow.h @@ -22,7 +22,7 @@ #ifndef KCHMMAINWINDOW_H #define KCHMMAINWINDOW_H -#include "kde-qt.h" +#include "tde-tqt.h" #include "libchmfile.h" diff --git a/src/kchmnavtoolbar.cpp b/src/kchmnavtoolbar.cpp index de42ece..7ebb6fc 100644 --- a/src/kchmnavtoolbar.cpp +++ b/src/kchmnavtoolbar.cpp @@ -19,7 +19,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include "kde-qt.h" +#include "tde-tqt.h" #include "kchmnavtoolbar.h" #include "kchmmainwindow.h" #include "kchmviewwindow.h" diff --git a/src/kchmsearchtoolbar.h b/src/kchmsearchtoolbar.h index cde8e95..f031cca 100644 --- a/src/kchmsearchtoolbar.h +++ b/src/kchmsearchtoolbar.h @@ -22,7 +22,7 @@ #ifndef KCHMSEARCHTOOLBAR_H #define KCHMSEARCHTOOLBAR_H -#include "kde-qt.h" +#include "tde-tqt.h" #include "forwarddeclarations.h" diff --git a/src/kchmsearchwindow.h b/src/kchmsearchwindow.h index e52066d..5a068a8 100644 --- a/src/kchmsearchwindow.h +++ b/src/kchmsearchwindow.h @@ -22,7 +22,7 @@ #ifndef KCHMSEARCHWINDOW_H #define KCHMSEARCHWINDOW_H -#include "kde-qt.h" +#include "tde-tqt.h" #include "kchmsettings.h" #include "forwarddeclarations.h" diff --git a/src/kchmsetupdialog.cpp b/src/kchmsetupdialog.cpp index c7e8b6b..592db23 100644 --- a/src/kchmsetupdialog.cpp +++ b/src/kchmsetupdialog.cpp @@ -23,6 +23,7 @@ #include <tqlayout.h> #include <tqtooltip.h> #include <tqwhatsthis.h> +#include <tdeapplication.h> /* * Constructs a KCHMSetupDialog as a child of 'parent', with the @@ -277,6 +278,7 @@ KCHMSetupDialog::KCHMSetupDialog( TQWidget* parent, const char* name, bool modal clearWState( WState_Polished ); // signals and slots connections + connect( buttonHelp, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotShowHelp() ) ); connect( buttonOk, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) ); connect( buttonCancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( reject() ) ); connect( m_radioUseTDEHTMLPart, TQT_SIGNAL( toggled(bool) ), groupKhtmlSecurity, TQT_SLOT( setEnabled(bool) ) ); @@ -311,6 +313,11 @@ KCHMSetupDialog::KCHMSetupDialog( TQWidget* parent, const char* name, bool modal setTabOrder( buttonOk, buttonCancel ); } +void KCHMSetupDialog::slotShowHelp() +{ + kapp->invokeHelp( TQString(), "kchmviewer" ); +} + /* * Destroys the object and frees any allocated resources */ diff --git a/src/kchmviewwindow.h b/src/kchmviewwindow.h index fae779e..9a23a01 100644 --- a/src/kchmviewwindow.h +++ b/src/kchmviewwindow.h @@ -23,7 +23,7 @@ #define KCHMVIEWWINDOW_H #include "forwarddeclarations.h" -#include "kde-qt.h" +#include "tde-tqt.h" /** @author Georgy Yunaev diff --git a/src/kchmviewwindow_qtextbrowser.cpp b/src/kchmviewwindow_qtextbrowser.cpp index dea8626..41db166 100644 --- a/src/kchmviewwindow_qtextbrowser.cpp +++ b/src/kchmviewwindow_qtextbrowser.cpp @@ -24,7 +24,7 @@ #include <tqsimplerichtext.h> #include <tqpaintdevicemetrics.h> -#include "kde-qt.h" +#include "tde-tqt.h" #include "kchmmainwindow.h" #include "kchmviewwindow_qtextbrowser.h" diff --git a/src/kchmviewwindow_qtextbrowser.h b/src/kchmviewwindow_qtextbrowser.h index df76985..15550cb 100644 --- a/src/kchmviewwindow_qtextbrowser.h +++ b/src/kchmviewwindow_qtextbrowser.h @@ -22,7 +22,7 @@ #ifndef KCHMVIEWWINDOW_TQTEXTBROWSER_H #define KCHMVIEWWINDOW_TQTEXTBROWSER_H -#include "kde-qt.h" +#include "tde-tqt.h" #include "kchmviewwindow.h" #include "kchmsourcefactory.h" diff --git a/src/kchmviewwindowmgr.cpp b/src/kchmviewwindowmgr.cpp index 6499951..bf2bc69 100644 --- a/src/kchmviewwindowmgr.cpp +++ b/src/kchmviewwindowmgr.cpp @@ -30,7 +30,7 @@ #include "kchmviewwindow_qtextbrowser.h" #if defined (USE_KDE) - #include "kde/kchmviewwindow_tdehtmlpart.h" + #include "tde/kchmviewwindow_tdehtmlpart.h" #endif diff --git a/src/kchmviewwindowmgr.h b/src/kchmviewwindowmgr.h index 34d791f..eea46de 100644 --- a/src/kchmviewwindowmgr.h +++ b/src/kchmviewwindowmgr.h @@ -22,7 +22,7 @@ #ifndef INCLUDE_KCHMVIEWWINDOWMGR_H #define INCLUDE_KCHMVIEWWINDOWMGR_H -#include "kde-qt.h" +#include "tde-tqt.h" #include "forwarddeclarations.h" #include "kchmsettings.h" diff --git a/src/main.cpp b/src/main.cpp index 8e84f20..35542f4 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -19,7 +19,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include "kde-qt.h" +#include "tde-tqt.h" #include "kchmmainwindow.h" #include "kchmconfig.h" @@ -29,7 +29,7 @@ #include <tdeaboutdata.h> #include <dcopclient.h> - #include "kde/kchmdcopiface.h" + #include "tde/kchmdcopiface.h" #endif KCHMMainWindow * mainWindow; diff --git a/src/kde-qt.cpp b/src/tde-tqt.cpp index d12e01b..f668466 100644 --- a/src/kde-qt.cpp +++ b/src/tde-tqt.cpp @@ -19,7 +19,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include "kde-qt.h" +#include "tde-tqt.h" #if defined (USE_KDE) KQListView::KQListView( TQWidget * parent, const char * name, int ) diff --git a/src/kde-qt.h b/src/tde-tqt.h index f60c09e..f60c09e 100644 --- a/src/kde-qt.h +++ b/src/tde-tqt.h diff --git a/src/kde/Makefile.am b/src/tde/Makefile.am index 8524867..8524867 100644 --- a/src/kde/Makefile.am +++ b/src/tde/Makefile.am diff --git a/src/kde/kchmdcopiface.cpp b/src/tde/kchmdcopiface.cpp index d6a90da..d6a90da 100644 --- a/src/kde/kchmdcopiface.cpp +++ b/src/tde/kchmdcopiface.cpp diff --git a/src/kde/kchmdcopiface.h b/src/tde/kchmdcopiface.h index 6922a82..6922a82 100644 --- a/src/kde/kchmdcopiface.h +++ b/src/tde/kchmdcopiface.h diff --git a/src/kde/kchmdcopiface_skel.cpp b/src/tde/kchmdcopiface_skel.cpp index be1e994..be1e994 100644 --- a/src/kde/kchmdcopiface_skel.cpp +++ b/src/tde/kchmdcopiface_skel.cpp diff --git a/src/kde/kchmviewwindow_tdehtmlpart.cpp b/src/tde/kchmviewwindow_tdehtmlpart.cpp index 73f136e..3a57e35 100644 --- a/src/kde/kchmviewwindow_tdehtmlpart.cpp +++ b/src/tde/kchmviewwindow_tdehtmlpart.cpp @@ -24,7 +24,7 @@ #include <tdehtmlview.h> #include <kfinddialog.h> -#include "kde-qt.h" +#include "tde-tqt.h" #include "kchmmainwindow.h" #include "kchmconfig.h" #include "kchmviewwindow_tdehtmlpart.h" diff --git a/src/kde/kchmviewwindow_tdehtmlpart.h b/src/tde/kchmviewwindow_tdehtmlpart.h index 4bc45c7..0dcbe47 100644 --- a/src/kde/kchmviewwindow_tdehtmlpart.h +++ b/src/tde/kchmviewwindow_tdehtmlpart.h @@ -22,7 +22,7 @@ #ifndef KCHMVIEWWINDOW_TDEHTMLPART_H #define KCHMVIEWWINDOW_TDEHTMLPART_H -#include "kde-qt.h" +#include "tde-tqt.h" #include "kchmviewwindow.h" #include "kchmsourcefactory.h" |