From 8e6136491eebee929848c4c3072e744f9206deb4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 20:55:46 -0600 Subject: Rename kiobuffer and KHTML --- ChangeLog | 18 ++++++++--------- FAQ | 6 +++--- README | 6 +++--- acinclude.m4 | 4 ++-- cmake | 2 +- po/cs.po | 8 ++++---- po/du.po | 8 ++++---- po/fr.po | 8 ++++---- po/hu.pot | 8 ++++---- po/kchmviewer.pot | 4 ++-- po/ru.po | 8 ++++---- po/tr.po | 8 ++++---- po/zh_CN.po | 8 ++++---- src/Makefile.am | 2 +- src/kchmmainwindow.cpp | 2 +- src/kchmsetupdialog.cpp | 20 +++++++++---------- src/kchmsetupdialog.ui | 12 ++++++------ src/kchmviewwindow.cpp | 2 +- src/kchmviewwindowmgr.cpp | 2 +- src/kde/kchmviewwindow_tdehtmlpart.cpp | 36 +++++++++++++++++----------------- src/kde/kchmviewwindow_tdehtmlpart.h | 14 ++++++------- 21 files changed, 93 insertions(+), 93 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8bdc212..f390fdf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,7 +29,7 @@ - KDE version sometime didn't kill the process after quit; thanks Norberto Bensa for fix. - Fixed popup menu popping in a wrong place when using QTextBrowser if the scrollbar position is not at the top of the document. - - KHTMLPart options sometime were not disabled while QTextBrowser was choosen. + - TDEHTMLPart options sometime were not disabled while QTextBrowser was choosen. 2007-03-01 tim - The design changed; created the chm files processing library, and moved it outside the source @@ -222,32 +222,32 @@ - added a full-featured search engine with complex query support. 2005-06-02 tim - - added copy/selectall functionality to KHTML browser, including a popup menu. - - fixed storing scrollbar position for KHTML browser. - - fixed window refresh on encoding change, encoding change now works for KHTML browser. - - zoom in/out buttons also work for KHTML browser. + - added copy/selectall functionality to TDEHTML browser, including a popup menu. + - fixed storing scrollbar position for TDEHTML browser. + - fixed window refresh on encoding change, encoding change now works for TDEHTML browser. + - zoom in/out buttons also work for TDEHTML browser. 2005-06-01 tim - - clicking on links (in-book navigation) now works for KHTML browser. + - clicking on links (in-book navigation) now works for TDEHTML browser. - full links (ms-its:) in chm files are now supported. 2005-05-10 tim - switched to KPopupMenu for KDE. - - fixed search/print for KHTMLPart. + - fixed search/print for TDEHTMLPart. - fixed status bar in KDE window. - added QWhatsThis for every toolbar icon. - fixed command-line parsing for KDE app, remove external GetOpt class. - fixed build outside the work directory. 2005-05-04 tim - - KDE integration continues. Now we support printing from KHTML. + - KDE integration continues. Now we support printing from TDEHTML. - KIO-slave now works. - switched to KTabWidget for KDE. - fixed search/print for QTextBrowser. 2005-05-03 tim - Reimplemented browser history in a more convinient way. - - KDE integration continues. Now we support KHTML. + - KDE integration continues. Now we support TDEHTML. - Added a KIO-slave to handle CHMs. - Now it is possible to open files with non-latin filenames. - Added support for CHM urls containing anchors. diff --git a/FAQ b/FAQ index 1071013..e3c43dc 100644 --- a/FAQ +++ b/FAQ @@ -1,6 +1,6 @@ Browsing: -Q: The book shows without any problem using QTextWidget browser, but when I use KHTMLPart browser, I get the following error: +Q: The book shows without any problem using QTextWidget browser, but when I use TDEHTMLPart browser, I get the following error: An error occurred while loading ms-its:/home/user/SymphonyFrameWork.chm::/index.html Thefileorfolderms-its:/home/user/SymphonyFrameWork.chm::/index.htmldoesnotexist. @@ -11,9 +11,9 @@ A: You have kio_chm installed, and because it installs itself as KIO slave for m Q: When I open CHM document, there is no "Contents" or "Index" tab. A: The files required for Content or Index tabs are not present in chm file. Therefore it is not possible to show those tabs. -Q: I use KDE. Which browser is better to use - KHTMLPart or QTextBrowser? +Q: I use KDE. Which browser is better to use - TDEHTMLPart or QTextBrowser? A: QTextBrowser was reported to be faster, except for multibyte languages (Japanese/Chinese/Korean). - However KHTMLPart is obviously more standard-compliant. I use KHTMLPart. + However TDEHTMLPart is obviously more standard-compliant. I use TDEHTMLPart. Q: Font size increasing button does not increase the font size, just changes the font to bold once. A: Make sure you use resizeable (true type) fonts. The described behavior is expected when bitmap fonts are used, as their size diff --git a/README b/README index d2b01ec..218c864 100644 --- a/README +++ b/README @@ -2,7 +2,7 @@ KchmViewer is a chm (MS HTML help file format) viewer, written in C++. Unlike most existing CHM viewers for Unix, it uses Trolltech Qt widget library, and does not depend on KDE or Gnome. However, it may be compiled with full - KDE support, including KDE widgets and KIO/KHTML. + KDE support, including KDE widgets and KIO/TDEHTML. The main advantage of KchmViewer is extended support for non-English languages. Unlike others, KchmViewer in most cases correctly detects chm file encoding, correctly shows tables of context of Russian, Korean, Chinese and @@ -15,7 +15,7 @@ 2. FEATURES - Standalone viewer, depends on Qt only. Does not require KDE, Gnome or wxWindows toolkit. - - A KDE viewer can be compiled optionally, with KIO slave, KHTML and K*Widget support. + - A KDE viewer can be compiled optionally, with KIO slave, TDEHTML and K*Widget support. - Completely safe and harmless. Does not support JavaScript in any way, optionally warns you before opening an external web page, or switching to another help file. - Correctly detects and shows encoding of any valid chm file. @@ -56,7 +56,7 @@ 3.2 KDE version This procedure will create the Qt-only executable, which does not use KDE. If you want to compile executable - for KDE, add --with-kde to configure options. For KDE version, 'make install' is required to work with KHTML + for KDE, add --with-kde to configure options. For KDE version, 'make install' is required to work with TDEHTML browser. Note that you need tdelibs-devel package installed. > tar zxf kchmviewer-.tar.gz diff --git a/acinclude.m4 b/acinclude.m4 index 05fd784..0c30cc7 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2075,7 +2075,7 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KABC, "-lkabc") - AC_SUBST(LIB_KHTML, "-ltdehtml") + AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") @@ -2096,7 +2096,7 @@ elif test $kde_qtver = 2; then AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_KHTML, "-ltdehtml") + AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") diff --git a/cmake b/cmake index 9a21790..274366f 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 9a217903f9fa35ca12213a6e9ee3d2cb87d1131d +Subproject commit 274366fb8b90704586d7beef216b765cc0688b08 diff --git a/po/cs.po b/po/cs.po index a5846d8..3620b1f 100644 --- a/po/cs.po +++ b/po/cs.po @@ -194,8 +194,8 @@ msgstr "" #. i18n: file kchmsetupdialog.ui line 358 #: rc.cpp:92 #, no-c-format -msgid "&KHTMLPart-based widget" -msgstr "&KHTMLPart prvku" +msgid "&TDEHTMLPart-based widget" +msgstr "&TDEHTMLPart prvku" #. i18n: file kchmsetupdialog.ui line 361 #: rc.cpp:95 @@ -206,8 +206,8 @@ msgstr "" #. i18n: file kchmsetupdialog.ui line 371 #: rc.cpp:98 #, no-c-format -msgid "KHTMLPart security" -msgstr "Zabezpečení KHTMLPart" +msgid "TDEHTMLPart security" +msgstr "Zabezpečení TDEHTMLPart" #. i18n: file kchmsetupdialog.ui line 382 #: rc.cpp:101 diff --git a/po/du.po b/po/du.po index a166a43..04799af 100644 --- a/po/du.po +++ b/po/du.po @@ -199,8 +199,8 @@ msgstr "Alt+Q" #. i18n: file kchmsetupdialog.ui line 358 #: rc.cpp:92 #, no-c-format -msgid "&KHTMLPart-based widget" -msgstr "&KHTMLPart-gebaseerde widget" +msgid "&TDEHTMLPart-based widget" +msgstr "&TDEHTMLPart-gebaseerde widget" #. i18n: file kchmsetupdialog.ui line 361 #: rc.cpp:95 @@ -211,8 +211,8 @@ msgstr "Alt+K" #. i18n: file kchmsetupdialog.ui line 371 #: rc.cpp:98 #, no-c-format -msgid "KHTMLPart security" -msgstr "Veiligheid voor KHTMLPart" +msgid "TDEHTMLPart security" +msgstr "Veiligheid voor TDEHTMLPart" #. i18n: file kchmsetupdialog.ui line 382 #: rc.cpp:101 diff --git a/po/fr.po b/po/fr.po index 96af72e..a850b03 100644 --- a/po/fr.po +++ b/po/fr.po @@ -198,8 +198,8 @@ msgstr "Alt+Q" #. i18n: file kchmsetupdialog.ui line 358 #: rc.cpp:92 #, no-c-format -msgid "&KHTMLPart-based widget" -msgstr "un widget basé sur &KHTMLPart" +msgid "&TDEHTMLPart-based widget" +msgstr "un widget basé sur &TDEHTMLPart" #. i18n: file kchmsetupdialog.ui line 361 #: rc.cpp:95 @@ -210,8 +210,8 @@ msgstr "Alt+K" #. i18n: file kchmsetupdialog.ui line 371 #: rc.cpp:98 #, no-c-format -msgid "KHTMLPart security" -msgstr "Sécurité pour KHTMLPart" +msgid "TDEHTMLPart security" +msgstr "Sécurité pour TDEHTMLPart" #. i18n: file kchmsetupdialog.ui line 382 #: rc.cpp:101 diff --git a/po/hu.pot b/po/hu.pot index 39eb45d..377bfd7 100644 --- a/po/hu.pot +++ b/po/hu.pot @@ -194,8 +194,8 @@ msgstr "Alt+Q" #. i18n: file kchmsetupdialog.ui line 358 #: rc.cpp:92 #, no-c-format -msgid "&KHTMLPart-based widget" -msgstr "&KHTMLPart-alapú widget" +msgid "&TDEHTMLPart-based widget" +msgstr "&TDEHTMLPart-alapú widget" #. i18n: file kchmsetupdialog.ui line 361 #: rc.cpp:95 @@ -206,8 +206,8 @@ msgstr "Alt+K" #. i18n: file kchmsetupdialog.ui line 371 #: rc.cpp:98 #, no-c-format -msgid "KHTMLPart security" -msgstr "KHTMLPart biztonság" +msgid "TDEHTMLPart security" +msgstr "TDEHTMLPart biztonság" #. i18n: file kchmsetupdialog.ui line 382 #: rc.cpp:101 diff --git a/po/kchmviewer.pot b/po/kchmviewer.pot index a20341e..cf6f90f 100644 --- a/po/kchmviewer.pot +++ b/po/kchmviewer.pot @@ -191,7 +191,7 @@ msgstr "" #. i18n: file kchmsetupdialog.ui line 358 #: rc.cpp:92 #, no-c-format -msgid "&KHTMLPart-based widget" +msgid "&TDEHTMLPart-based widget" msgstr "" #. i18n: file kchmsetupdialog.ui line 361 @@ -203,7 +203,7 @@ msgstr "" #. i18n: file kchmsetupdialog.ui line 371 #: rc.cpp:98 #, no-c-format -msgid "KHTMLPart security" +msgid "TDEHTMLPart security" msgstr "" #. i18n: file kchmsetupdialog.ui line 382 diff --git a/po/ru.po b/po/ru.po index 3edf720..2f1d825 100644 --- a/po/ru.po +++ b/po/ru.po @@ -197,8 +197,8 @@ msgstr "" #. i18n: file kchmsetupdialog.ui line 358 #: rc.cpp:92 #, no-c-format -msgid "&KHTMLPart-based widget" -msgstr "основанный на KHTML" +msgid "&TDEHTMLPart-based widget" +msgstr "основанный на TDEHTML" #. i18n: file kchmsetupdialog.ui line 361 #: rc.cpp:95 @@ -209,8 +209,8 @@ msgstr "" #. i18n: file kchmsetupdialog.ui line 371 #: rc.cpp:98 #, no-c-format -msgid "KHTMLPart security" -msgstr "Настройки безопасности KHTML" +msgid "TDEHTMLPart security" +msgstr "Настройки безопасности TDEHTML" #. i18n: file kchmsetupdialog.ui line 382 #: rc.cpp:101 diff --git a/po/tr.po b/po/tr.po index 98217bf..7aff837 100644 --- a/po/tr.po +++ b/po/tr.po @@ -195,8 +195,8 @@ msgstr "Alt+Q" #. i18n: file kchmsetupdialog.ui line 358 #: rc.cpp:92 #, no-c-format -msgid "&KHTMLPart-based widget" -msgstr "&KHTMLPart-tabanlı bileşen" +msgid "&TDEHTMLPart-based widget" +msgstr "&TDEHTMLPart-tabanlı bileşen" #. i18n: file kchmsetupdialog.ui line 361 #: rc.cpp:95 @@ -207,8 +207,8 @@ msgstr "Alt+K" #. i18n: file kchmsetupdialog.ui line 371 #: rc.cpp:98 #, no-c-format -msgid "KHTMLPart security" -msgstr "KHTMLPart güvenliği" +msgid "TDEHTMLPart security" +msgstr "TDEHTMLPart güvenliği" #. i18n: file kchmsetupdialog.ui line 382 #: rc.cpp:101 diff --git a/po/zh_CN.po b/po/zh_CN.po index 3640b53..ba4561a 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -194,8 +194,8 @@ msgstr "Alt+Q" #. i18n: file kchmsetupdialog.ui line 358 #: rc.cpp:92 #, no-c-format -msgid "&KHTMLPart-based widget" -msgstr "基于KHTMLPart的组件(&K)" +msgid "&TDEHTMLPart-based widget" +msgstr "基于TDEHTMLPart的组件(&K)" #. i18n: file kchmsetupdialog.ui line 361 #: rc.cpp:95 @@ -206,8 +206,8 @@ msgstr "Alt+K" #. i18n: file kchmsetupdialog.ui line 371 #: rc.cpp:98 #, no-c-format -msgid "KHTMLPart security" -msgstr "KHTMLPart 安全性" +msgid "TDEHTMLPart security" +msgstr "TDEHTMLPart 安全性" #. i18n: file kchmsetupdialog.ui line 382 #: rc.cpp:101 diff --git a/src/Makefile.am b/src/Makefile.am index c853ef9..587ee65 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,7 +19,7 @@ SUBDIRS = $(LIB_KDEEXTRADIR) . pics # the library search path. kchmviewer_LDADD = $(top_builddir)/lib/libchmfile/libchmfile.a $(LIB_KDEEXTRA) \ - $(CHM_LIBS) $(LIB_QT) $(LIB_TDEUI) $(LIB_KHTML) $(LIB_KPARTS) $(LIB_KIO) + $(CHM_LIBS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDEHTML) $(LIB_KPARTS) $(LIB_KIO) kchmviewer_LDFLAGS = $(QT_LDFLAGS) $(KDE_LDFLAGS) $(LIB_TDECORE) -lDCOP $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_KIO) -L../lib/chmlib/ METASOURCES = AUTO diff --git a/src/kchmmainwindow.cpp b/src/kchmmainwindow.cpp index 137f228..da29e54 100644 --- a/src/kchmmainwindow.cpp +++ b/src/kchmmainwindow.cpp @@ -731,7 +731,7 @@ void KCHMMainWindow::slotChangeSettingsMenuItemActivated() dlg.m_qtBrowserPath->setText ( appConfig.m_TQtBrowserPath ); dlg.m_radioUseQtextBrowser->setChecked ( appConfig.m_kdeUseTQTextBrowser ); - dlg.m_radioUseKHTMLPart->setChecked ( !appConfig.m_kdeUseTQTextBrowser ); + dlg.m_radioUseTDEHTMLPart->setChecked ( !appConfig.m_kdeUseTQTextBrowser ); dlg.m_enableJS->setChecked ( appConfig.m_kdeEnableJS ); dlg.m_enablePlugins->setChecked ( appConfig.m_kdeEnablePlugins ); diff --git a/src/kchmsetupdialog.cpp b/src/kchmsetupdialog.cpp index e4809e9..c7e8b6b 100644 --- a/src/kchmsetupdialog.cpp +++ b/src/kchmsetupdialog.cpp @@ -169,8 +169,8 @@ KCHMSetupDialog::KCHMSetupDialog( TQWidget* parent, const char* name, bool modal m_radioUseQtextBrowser = new TQRadioButton( buttonGroup5_2, "m_radioUseQtextBrowser" ); buttonGroup5_2Layout->addWidget( m_radioUseQtextBrowser ); - m_radioUseKHTMLPart = new TQRadioButton( buttonGroup5_2, "m_radioUseKHTMLPart" ); - buttonGroup5_2Layout->addWidget( m_radioUseKHTMLPart ); + m_radioUseTDEHTMLPart = new TQRadioButton( buttonGroup5_2, "m_radioUseTDEHTMLPart" ); + buttonGroup5_2Layout->addWidget( m_radioUseTDEHTMLPart ); m_groupKDEsettingsLayout->addWidget( buttonGroup5_2 ); groupKhtmlSecurity = new TQGroupBox( m_groupKDEsettings, "groupKhtmlSecurity" ); @@ -279,7 +279,7 @@ KCHMSetupDialog::KCHMSetupDialog( TQWidget* parent, const char* name, bool modal // signals and slots connections connect( buttonOk, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) ); connect( buttonCancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( reject() ) ); - connect( m_radioUseKHTMLPart, TQT_SIGNAL( toggled(bool) ), groupKhtmlSecurity, TQT_SLOT( setEnabled(bool) ) ); + connect( m_radioUseTDEHTMLPart, TQT_SIGNAL( toggled(bool) ), groupKhtmlSecurity, TQT_SLOT( setEnabled(bool) ) ); connect( m_advViewSourceExternal, TQT_SIGNAL( toggled(bool) ), m_advExternalProgramName, TQT_SLOT( setEnabled(bool) ) ); connect( m_radioUseQtextBrowser, TQT_SIGNAL( toggled(bool) ), groupKhtmlSecurity, TQT_SLOT( setDisabled(bool) ) ); @@ -300,8 +300,8 @@ KCHMSetupDialog::KCHMSetupDialog( TQWidget* parent, const char* name, bool modal setTabOrder( m_radioNewChmAsk, m_radioNewChmOpenNever ); setTabOrder( m_radioNewChmOpenNever, m_qtBrowserPath ); setTabOrder( m_qtBrowserPath, m_radioUseQtextBrowser ); - setTabOrder( m_radioUseQtextBrowser, m_radioUseKHTMLPart ); - setTabOrder( m_radioUseKHTMLPart, m_enableJS ); + setTabOrder( m_radioUseQtextBrowser, m_radioUseTDEHTMLPart ); + setTabOrder( m_radioUseTDEHTMLPart, m_enableJS ); setTabOrder( m_enableJS, m_enablePlugins ); setTabOrder( m_enablePlugins, m_enableJava ); setTabOrder( m_enableJava, m_enableRefresh ); @@ -355,9 +355,9 @@ void KCHMSetupDialog::languageChange() buttonGroup5_2->setTitle( tr( "To show HTML content, use" ) ); m_radioUseQtextBrowser->setText( tr( "&TQTextBrowser-based widget" ) ); m_radioUseQtextBrowser->setAccel( TQKeySequence( tr( "Alt+Q" ) ) ); - m_radioUseKHTMLPart->setText( tr( "&KHTMLPart-based widget" ) ); - m_radioUseKHTMLPart->setAccel( TQKeySequence( tr( "Alt+K" ) ) ); - groupKhtmlSecurity->setTitle( tr( "KHTMLPart security" ) ); + m_radioUseTDEHTMLPart->setText( tr( "&TDEHTMLPart-based widget" ) ); + m_radioUseTDEHTMLPart->setAccel( TQKeySequence( tr( "Alt+K" ) ) ); + groupKhtmlSecurity->setTitle( tr( "TDEHTMLPart security" ) ); m_enableJS->setText( tr( "Enable Java&Script" ) ); m_enableJS->setAccel( TQKeySequence( tr( "Alt+S" ) ) ); m_enablePlugins->setText( tr( "Enable &plugins" ) ); @@ -387,9 +387,9 @@ void KCHMSetupDialog::languageChange() buttonCancel->setAccel( TQKeySequence( TQString() ) ); } -void KCHMSetupDialog::m_radioUseKHTMLPart_toggled(bool) +void KCHMSetupDialog::m_radioUseTDEHTMLPart_toggled(bool) { - tqWarning( "KCHMSetupDialog::m_radioUseKHTMLPart_toggled(bool): Not implemented yet" ); + tqWarning( "KCHMSetupDialog::m_radioUseTDEHTMLPart_toggled(bool): Not implemented yet" ); } #include "kchmsetupdialog.moc" diff --git a/src/kchmsetupdialog.ui b/src/kchmsetupdialog.ui index f4e3ca0..4d8ebd3 100644 --- a/src/kchmsetupdialog.ui +++ b/src/kchmsetupdialog.ui @@ -352,10 +352,10 @@ - m_radioUseKHTMLPart + m_radioUseTDEHTMLPart - &KHTMLPart-based widget + &TDEHTMLPart-based widget Alt+K @@ -368,7 +368,7 @@ groupKhtmlSecurity - KHTMLPart security + TDEHTMLPart security @@ -657,7 +657,7 @@ reject() - m_radioUseKHTMLPart + m_radioUseTDEHTMLPart toggled(bool) groupKhtmlSecurity setEnabled(bool) @@ -693,7 +693,7 @@ m_radioNewChmOpenNever m_qtBrowserPath m_radioUseQtextBrowser - m_radioUseKHTMLPart + m_radioUseTDEHTMLPart m_enableJS m_enablePlugins m_enableJava @@ -704,7 +704,7 @@ buttonCancel - m_radioUseKHTMLPart_toggled( bool ) + m_radioUseTDEHTMLPart_toggled( bool ) diff --git a/src/kchmviewwindow.cpp b/src/kchmviewwindow.cpp index 394df67..f776efe 100644 --- a/src/kchmviewwindow.cpp +++ b/src/kchmviewwindow.cpp @@ -110,7 +110,7 @@ bool KCHMViewWindow::openUrl ( const TQString& origurl ) tqFatal("KCHMViewWindow::openUrl(): opened new chm file %s while current is %s", chmfile.ascii(), ::mainWindow->getOpenedFileName().ascii() ); - // It is OK to have a new file in chm for KHTMLPart + // It is OK to have a new file in chm for TDEHTMLPart newurl = page; } diff --git a/src/kchmviewwindowmgr.cpp b/src/kchmviewwindowmgr.cpp index 5be3640..6499951 100644 --- a/src/kchmviewwindowmgr.cpp +++ b/src/kchmviewwindowmgr.cpp @@ -95,7 +95,7 @@ KCHMViewWindow * KCHMViewWindowMgr::addNewTab( bool set_active ) #if defined (USE_KDE) if ( !appConfig.m_kdeUseTQTextBrowser ) - viewvnd = new KCHMViewWindow_KHTMLPart( this ); + viewvnd = new KCHMViewWindow_TDEHTMLPart( this ); else #endif viewvnd = new KCHMViewWindow_QTextBrowser( this ); diff --git a/src/kde/kchmviewwindow_tdehtmlpart.cpp b/src/kde/kchmviewwindow_tdehtmlpart.cpp index 4ad2538..73f136e 100644 --- a/src/kde/kchmviewwindow_tdehtmlpart.cpp +++ b/src/kde/kchmviewwindow_tdehtmlpart.cpp @@ -32,13 +32,13 @@ #include "kchmviewwindow_tdehtmlpart.moc" -TQWidget * KCHMViewWindow_KHTMLPart::getTQWidget() +TQWidget * KCHMViewWindow_TDEHTMLPart::getTQWidget() { return view(); } -KCHMViewWindow_KHTMLPart::KCHMViewWindow_KHTMLPart( TQTabWidget * parent ) - : KHTMLPart ( parent ), KCHMViewWindow ( parent ) +KCHMViewWindow_TDEHTMLPart::KCHMViewWindow_TDEHTMLPart( TQTabWidget * parent ) + : TDEHTMLPart ( parent ), KCHMViewWindow ( parent ) { m_zoomfactor = 0; m_currentEncoding = 0; @@ -54,11 +54,11 @@ KCHMViewWindow_KHTMLPart::KCHMViewWindow_KHTMLPart( TQTabWidget * parent ) } -KCHMViewWindow_KHTMLPart::~KCHMViewWindow_KHTMLPart() +KCHMViewWindow_TDEHTMLPart::~KCHMViewWindow_TDEHTMLPart() { } -bool KCHMViewWindow_KHTMLPart::openPage (const TQString& url) +bool KCHMViewWindow_TDEHTMLPart::openPage (const TQString& url) { // Set or change the encoding if ( m_currentEncoding != ::mainWindow->chmFile()->currentEncoding() ) @@ -73,15 +73,15 @@ bool KCHMViewWindow_KHTMLPart::openPage (const TQString& url) return true; } -void KCHMViewWindow_KHTMLPart::setZoomFactor( int zoom ) +void KCHMViewWindow_TDEHTMLPart::setZoomFactor( int zoom ) { m_zoomfactor = zoom; // Default ZoomFactor is 100, any increase or decrease should modify this value. - KHTMLPart::setZoomFactor ( 100 + (m_zoomfactor * 10) ); + TDEHTMLPart::setZoomFactor ( 100 + (m_zoomfactor * 10) ); } -void KCHMViewWindow_KHTMLPart::invalidate( ) +void KCHMViewWindow_TDEHTMLPart::invalidate( ) { m_zoomfactor = 0; m_searchForward = true; @@ -95,28 +95,28 @@ void KCHMViewWindow_KHTMLPart::invalidate( ) KCHMViewWindow::invalidate( ); } -int KCHMViewWindow_KHTMLPart::getScrollbarPosition( ) +int KCHMViewWindow_TDEHTMLPart::getScrollbarPosition( ) { return view()->contentsY (); } -void KCHMViewWindow_KHTMLPart::setScrollbarPosition( int pos ) +void KCHMViewWindow_TDEHTMLPart::setScrollbarPosition( int pos ) { view()->scrollBy (0, pos); } -void KCHMViewWindow_KHTMLPart::addZoomFactor( int value ) +void KCHMViewWindow_TDEHTMLPart::addZoomFactor( int value ) { setZoomFactor( m_zoomfactor + value); } -bool KCHMViewWindow_KHTMLPart::printCurrentPage() +bool KCHMViewWindow_TDEHTMLPart::printCurrentPage() { view()->print(); return true; } -void KCHMViewWindow_KHTMLPart::searchWord( const TQString & word, bool forward, bool ) +void KCHMViewWindow_TDEHTMLPart::searchWord( const TQString & word, bool forward, bool ) { if ( word != m_searchText || forward != m_searchForward ) { @@ -129,25 +129,25 @@ void KCHMViewWindow_KHTMLPart::searchWord( const TQString & word, bool forward, findTextNext (); } -void KCHMViewWindow_KHTMLPart::onOpenURLRequest( const KURL & url, const KParts::URLArgs & ) +void KCHMViewWindow_TDEHTMLPart::onOpenURLRequest( const KURL & url, const KParts::URLArgs & ) { bool sourcechange = true; emit signalLinkClicked ( url.prettyURL(), sourcechange ); } -void KCHMViewWindow_KHTMLPart::slotLinkClicked( const TQString & newlink ) +void KCHMViewWindow_TDEHTMLPart::slotLinkClicked( const TQString & newlink ) { bool notused; emit signalLinkClicked (newlink, notused); } -void KCHMViewWindow_KHTMLPart::clipSelectAll() +void KCHMViewWindow_TDEHTMLPart::clipSelectAll() { selectAll (); } -void KCHMViewWindow_KHTMLPart::clipCopy() +void KCHMViewWindow_TDEHTMLPart::clipCopy() { TQString text = selectedText(); @@ -155,7 +155,7 @@ void KCHMViewWindow_KHTMLPart::clipCopy() TQApplication::clipboard()->setText( text ); } -void KCHMViewWindow_KHTMLPart::onPopupMenu ( const TQString &url, const TQPoint & point ) +void KCHMViewWindow_TDEHTMLPart::onPopupMenu ( const TQString &url, const TQPoint & point ) { KTQPopupMenu * menu = getContextMenu( url, view() ); menu->exec( point ); diff --git a/src/kde/kchmviewwindow_tdehtmlpart.h b/src/kde/kchmviewwindow_tdehtmlpart.h index b840b44..4bc45c7 100644 --- a/src/kde/kchmviewwindow_tdehtmlpart.h +++ b/src/kde/kchmviewwindow_tdehtmlpart.h @@ -19,8 +19,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef KCHMVIEWWINDOW_KHTMLPART_H -#define KCHMVIEWWINDOW_KHTMLPART_H +#ifndef KCHMVIEWWINDOW_TDEHTMLPART_H +#define KCHMVIEWWINDOW_TDEHTMLPART_H #include "kde-qt.h" @@ -36,19 +36,19 @@ @author Georgy Yunaev */ /* - * For TQt-only version, we cannot compile KCHMViewWindow_KHTMLPart. However, + * For TQt-only version, we cannot compile KCHMViewWindow_TDEHTMLPart. However, * we cannot just exclude it, because it would not generate a MOC file for a KDE * version. Therefore we declare it, and compile the .moc file, but do not provide * the class methods. */ #if defined (USE_KDE) -class KCHMViewWindow_KHTMLPart : public KHTMLPart, public KCHMViewWindow +class KCHMViewWindow_TDEHTMLPart : public TDEHTMLPart, public KCHMViewWindow { Q_OBJECT public: - KCHMViewWindow_KHTMLPart( TQTabWidget * parent ); - ~KCHMViewWindow_KHTMLPart(); + KCHMViewWindow_TDEHTMLPart( TQTabWidget * parent ); + ~KCHMViewWindow_TDEHTMLPart(); //! Open a page from current chm archive virtual bool openPage (const TQString& url); @@ -115,4 +115,4 @@ private: #endif /* USE_KDE */ -#endif /* KCHMVIEWWINDOW_KHTMLPART_H */ +#endif /* KCHMVIEWWINDOW_TDEHTMLPART_H */ -- cgit v1.2.3