From a6711dd22ab63901f8da22e84438e689e77cad93 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 2 Jun 2014 13:06:25 +0900 Subject: Fixed help button functionality in KCHMViewer setting dialogs. The bug was exposed only in in-source building, while was ok in out-of-source ones. This resolves bug 1948. --- src/Makefile.am | 4 +- src/kchmmainwindow.cpp | 4 +- src/kchmsetupdialog.cpp | 402 ------------------------------------------- src/kchmsetupdialog_impl.cpp | 31 ++++ src/kchmsetupdialog_impl.h | 34 ++++ 5 files changed, 69 insertions(+), 406 deletions(-) delete mode 100644 src/kchmsetupdialog.cpp create mode 100644 src/kchmsetupdialog_impl.cpp create mode 100644 src/kchmsetupdialog_impl.h diff --git a/src/Makefile.am b/src/Makefile.am index cd05f38..4bd0e12 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -10,7 +10,7 @@ kchmviewer_SOURCES = iconstorage.cpp kchmbookmarkwindow.cpp kchmconfig.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 + kchmsearchengine.cpp kchmsetupdialog_impl.cpp # set the include path found by configure INCLUDES = $(QT_INCLUDES) $(CHM_INCLUDES) $(KDE_INCLUDES) $(LIBCHMFILE_INCLUDES) @@ -31,7 +31,7 @@ noinst_HEADERS = kchmsettings.h forwarddeclarations.h kchmsourcefactory.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 + kchmsearchengine.h kchmsetupdialog_impl.h messages: rc.cpp $(EXTRACTRC) *.rc > rc.cpp diff --git a/src/kchmmainwindow.cpp b/src/kchmmainwindow.cpp index 5aabdae..9778b1c 100644 --- a/src/kchmmainwindow.cpp +++ b/src/kchmmainwindow.cpp @@ -43,7 +43,7 @@ #include "kchmtreeviewitem.h" #include "kchmsearchtoolbar.h" #include "kchmsettings.h" -#include "kchmsetupdialog.h" +#include "kchmsetupdialog_impl.h" #include "iconstorage.h" #include "kchmnavtoolbar.h" #include "kchmviewwindow.h" @@ -705,7 +705,7 @@ void KCHMMainWindow::slotBrowserCopy( ) void KCHMMainWindow::slotChangeSettingsMenuItemActivated() { - KCHMSetupDialog dlg ( this ); + KCHMSetupDialog_impl dlg ( this ); // Set up the parameters dlg.m_radioOnBeginOpenDialog->setChecked ( !appConfig.m_LoadLatestFileOnStartup ); diff --git a/src/kchmsetupdialog.cpp b/src/kchmsetupdialog.cpp deleted file mode 100644 index 592db23..0000000 --- a/src/kchmsetupdialog.cpp +++ /dev/null @@ -1,402 +0,0 @@ -/**************************************************************************** -** Form implementation generated from reading ui file './kchmsetupdialog.ui' -** -** Created: Sat Jun 16 22:08:58 2007 -** by: The User Interface Compiler ($Id: qt/main.cpp 3.3.8 edited Jan 11 14:47 $) -** -** WARNING! All changes made in this file will be lost! -****************************************************************************/ - -#include "kchmsetupdialog.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/* - * Constructs a KCHMSetupDialog as a child of 'parent', with the - * name 'name' and widget flags set to 'f'. - * - * The dialog will by default be modeless, unless you set 'modal' to - * TRUE to construct a modal dialog. - */ -KCHMSetupDialog::KCHMSetupDialog( TQWidget* parent, const char* name, bool modal, WFlags fl ) - : TQDialog( parent, name, modal, fl ) -{ - if ( !name ) - setName( "MyDialog1" ); - setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, sizePolicy().hasHeightForWidth() ) ); - setSizeGripEnabled( FALSE ); - setModal( TRUE ); - MyDialog1Layout = new TQVBoxLayout( this, 11, 6, "MyDialog1Layout"); - MyDialog1Layout->setResizeMode( TQLayout::Minimum ); - - tabWidget = new TQTabWidget( this, "tabWidget" ); - - Widget8 = new TQWidget( tabWidget, "Widget8" ); - Widget8Layout = new TQVBoxLayout( Widget8, 11, 6, "Widget8Layout"); - - layout4 = new TQHBoxLayout( 0, 0, 6, "layout4"); - - buttonGroup1 = new TQButtonGroup( Widget8, "buttonGroup1" ); - buttonGroup1->setColumnLayout(0, Qt::Vertical ); - buttonGroup1->layout()->setSpacing( 6 ); - buttonGroup1->layout()->setMargin( 11 ); - buttonGroup1Layout = new TQVBoxLayout( buttonGroup1->layout() ); - buttonGroup1Layout->setAlignment( TQt::AlignTop ); - - m_radioOnBeginOpenDialog = new TQRadioButton( buttonGroup1, "m_radioOnBeginOpenDialog" ); - buttonGroup1Layout->addWidget( m_radioOnBeginOpenDialog ); - - m_radioOnBeginOpenLast = new TQRadioButton( buttonGroup1, "m_radioOnBeginOpenLast" ); - buttonGroup1Layout->addWidget( m_radioOnBeginOpenLast ); - layout4->addWidget( buttonGroup1 ); - - buttonGroup2 = new TQButtonGroup( Widget8, "buttonGroup2" ); - buttonGroup2->setColumnLayout(0, Qt::Vertical ); - buttonGroup2->layout()->setSpacing( 6 ); - buttonGroup2->layout()->setMargin( 11 ); - buttonGroup2Layout = new TQVBoxLayout( buttonGroup2->layout() ); - buttonGroup2Layout->setAlignment( TQt::AlignTop ); - - layout3 = new TQHBoxLayout( 0, 0, 6, "layout3"); - - textLabel1 = new TQLabel( buttonGroup2, "textLabel1" ); - layout3->addWidget( textLabel1 ); - - m_historySize = new TQSpinBox( buttonGroup2, "m_historySize" ); - m_historySize->setValue( 10 ); - layout3->addWidget( m_historySize ); - - textLabel2 = new TQLabel( buttonGroup2, "textLabel2" ); - layout3->addWidget( textLabel2 ); - buttonGroup2Layout->addLayout( layout3 ); - - m_rememberHistoryInfo = new TQCheckBox( buttonGroup2, "m_rememberHistoryInfo" ); - buttonGroup2Layout->addWidget( m_rememberHistoryInfo ); - layout4->addWidget( buttonGroup2 ); - Widget8Layout->addLayout( layout4 ); - - groupBox1 = new TQGroupBox( Widget8, "groupBox1" ); - groupBox1->setColumnLayout(0, Qt::Vertical ); - groupBox1->layout()->setSpacing( 6 ); - groupBox1->layout()->setMargin( 11 ); - groupBox1Layout = new TQHBoxLayout( groupBox1->layout() ); - groupBox1Layout->setAlignment( TQt::AlignTop ); - - buttonGroup4 = new TQButtonGroup( groupBox1, "buttonGroup4" ); - buttonGroup4->setColumnLayout(0, Qt::Vertical ); - buttonGroup4->layout()->setSpacing( 6 ); - buttonGroup4->layout()->setMargin( 11 ); - buttonGroup4Layout = new TQVBoxLayout( buttonGroup4->layout() ); - buttonGroup4Layout->setAlignment( TQt::AlignTop ); - - m_radioExtLinkOpenAlways = new TQRadioButton( buttonGroup4, "m_radioExtLinkOpenAlways" ); - buttonGroup4Layout->addWidget( m_radioExtLinkOpenAlways ); - - m_radioExtLinkAsk = new TQRadioButton( buttonGroup4, "m_radioExtLinkAsk" ); - buttonGroup4Layout->addWidget( m_radioExtLinkAsk ); - - m_radioExtLinkOpenNever = new TQRadioButton( buttonGroup4, "m_radioExtLinkOpenNever" ); - buttonGroup4Layout->addWidget( m_radioExtLinkOpenNever ); - groupBox1Layout->addWidget( buttonGroup4 ); - - buttonGroup5 = new TQButtonGroup( groupBox1, "buttonGroup5" ); - buttonGroup5->setColumnLayout(0, Qt::Vertical ); - buttonGroup5->layout()->setSpacing( 6 ); - buttonGroup5->layout()->setMargin( 11 ); - buttonGroup5Layout = new TQVBoxLayout( buttonGroup5->layout() ); - buttonGroup5Layout->setAlignment( TQt::AlignTop ); - - m_radioNewChmOpenAlways = new TQRadioButton( buttonGroup5, "m_radioNewChmOpenAlways" ); - buttonGroup5Layout->addWidget( m_radioNewChmOpenAlways ); - - m_radioNewChmAsk = new TQRadioButton( buttonGroup5, "m_radioNewChmAsk" ); - buttonGroup5Layout->addWidget( m_radioNewChmAsk ); - - m_radioNewChmOpenNever = new TQRadioButton( buttonGroup5, "m_radioNewChmOpenNever" ); - buttonGroup5Layout->addWidget( m_radioNewChmOpenNever ); - groupBox1Layout->addWidget( buttonGroup5 ); - Widget8Layout->addWidget( groupBox1 ); - tabWidget->insertTab( Widget8, TQString::fromLatin1("") ); - - Widget9 = new TQWidget( tabWidget, "Widget9" ); - Widget9Layout = new TQVBoxLayout( Widget9, 11, 6, "Widget9Layout"); - - m_groupQtsettings = new TQGroupBox( Widget9, "m_groupQtsettings" ); - m_groupQtsettings->setColumnLayout(0, Qt::Vertical ); - m_groupQtsettings->layout()->setSpacing( 6 ); - m_groupQtsettings->layout()->setMargin( 11 ); - m_groupQtsettingsLayout = new TQHBoxLayout( m_groupQtsettings->layout() ); - m_groupQtsettingsLayout->setAlignment( TQt::AlignTop ); - - textLabel1_2 = new TQLabel( m_groupQtsettings, "textLabel1_2" ); - textLabel1_2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)7, 0, 0, textLabel1_2->sizePolicy().hasHeightForWidth() ) ); - textLabel1_2->setLineWidth( 1 ); - textLabel1_2->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); - m_groupQtsettingsLayout->addWidget( textLabel1_2 ); - - m_qtBrowserPath = new TQLineEdit( m_groupQtsettings, "m_qtBrowserPath" ); - m_qtBrowserPath->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, m_qtBrowserPath->sizePolicy().hasHeightForWidth() ) ); - m_groupQtsettingsLayout->addWidget( m_qtBrowserPath ); - Widget9Layout->addWidget( m_groupQtsettings ); - - m_groupKDEsettings = new TQGroupBox( Widget9, "m_groupKDEsettings" ); - m_groupKDEsettings->setColumnLayout(0, Qt::Vertical ); - m_groupKDEsettings->layout()->setSpacing( 6 ); - m_groupKDEsettings->layout()->setMargin( 11 ); - m_groupKDEsettingsLayout = new TQHBoxLayout( m_groupKDEsettings->layout() ); - m_groupKDEsettingsLayout->setAlignment( TQt::AlignTop ); - - buttonGroup5_2 = new TQButtonGroup( m_groupKDEsettings, "buttonGroup5_2" ); - buttonGroup5_2->setColumnLayout(0, Qt::Vertical ); - buttonGroup5_2->layout()->setSpacing( 6 ); - buttonGroup5_2->layout()->setMargin( 11 ); - buttonGroup5_2Layout = new TQVBoxLayout( buttonGroup5_2->layout() ); - buttonGroup5_2Layout->setAlignment( TQt::AlignTop ); - - m_radioUseQtextBrowser = new TQRadioButton( buttonGroup5_2, "m_radioUseQtextBrowser" ); - buttonGroup5_2Layout->addWidget( m_radioUseQtextBrowser ); - - m_radioUseTDEHTMLPart = new TQRadioButton( buttonGroup5_2, "m_radioUseTDEHTMLPart" ); - buttonGroup5_2Layout->addWidget( m_radioUseTDEHTMLPart ); - m_groupKDEsettingsLayout->addWidget( buttonGroup5_2 ); - - groupKhtmlSecurity = new TQGroupBox( m_groupKDEsettings, "groupKhtmlSecurity" ); - groupKhtmlSecurity->setColumnLayout(0, Qt::Vertical ); - groupKhtmlSecurity->layout()->setSpacing( 6 ); - groupKhtmlSecurity->layout()->setMargin( 11 ); - groupKhtmlSecurityLayout = new TQGridLayout( groupKhtmlSecurity->layout() ); - groupKhtmlSecurityLayout->setAlignment( TQt::AlignTop ); - - m_enableJS = new TQCheckBox( groupKhtmlSecurity, "m_enableJS" ); - - groupKhtmlSecurityLayout->addWidget( m_enableJS, 0, 0 ); - - m_enablePlugins = new TQCheckBox( groupKhtmlSecurity, "m_enablePlugins" ); - - groupKhtmlSecurityLayout->addWidget( m_enablePlugins, 0, 1 ); - - m_enableJava = new TQCheckBox( groupKhtmlSecurity, "m_enableJava" ); - - groupKhtmlSecurityLayout->addWidget( m_enableJava, 1, 0 ); - - m_enableRefresh = new TQCheckBox( groupKhtmlSecurity, "m_enableRefresh" ); - - groupKhtmlSecurityLayout->addWidget( m_enableRefresh, 1, 1 ); - m_groupKDEsettingsLayout->addWidget( groupKhtmlSecurity ); - Widget9Layout->addWidget( m_groupKDEsettings ); - tabWidget->insertTab( Widget9, TQString::fromLatin1("") ); - - TabPage = new TQWidget( tabWidget, "TabPage" ); - TabPageLayout = new TQVBoxLayout( TabPage, 11, 6, "TabPageLayout"); - - buttonGroup7 = new TQButtonGroup( TabPage, "buttonGroup7" ); - buttonGroup7->setColumnLayout(0, Qt::Vertical ); - buttonGroup7->layout()->setSpacing( 6 ); - buttonGroup7->layout()->setMargin( 11 ); - buttonGroup7Layout = new TQVBoxLayout( buttonGroup7->layout() ); - buttonGroup7Layout->setAlignment( TQt::AlignTop ); - - m_advViewSourceInternal = new TQRadioButton( buttonGroup7, "m_advViewSourceInternal" ); - buttonGroup7Layout->addWidget( m_advViewSourceInternal ); - - m_advViewSourceExternal = new TQRadioButton( buttonGroup7, "m_advViewSourceExternal" ); - buttonGroup7Layout->addWidget( m_advViewSourceExternal ); - - layout4_2 = new TQHBoxLayout( 0, 0, 6, "layout4_2"); - - textLabel1_3 = new TQLabel( buttonGroup7, "textLabel1_3" ); - layout4_2->addWidget( textLabel1_3 ); - - m_advExternalProgramName = new TQLineEdit( buttonGroup7, "m_advExternalProgramName" ); - layout4_2->addWidget( m_advExternalProgramName ); - buttonGroup7Layout->addLayout( layout4_2 ); - TabPageLayout->addWidget( buttonGroup7 ); - - groupBox6 = new TQButtonGroup( TabPage, "groupBox6" ); - groupBox6->setColumnLayout(0, Qt::Vertical ); - groupBox6->layout()->setSpacing( 6 ); - groupBox6->layout()->setMargin( 11 ); - groupBox6Layout = new TQGridLayout( groupBox6->layout() ); - groupBox6Layout->setAlignment( TQt::AlignTop ); - - m_useSearchEngineInternal = new TQRadioButton( groupBox6, "m_useSearchEngineInternal" ); - - groupBox6Layout->addWidget( m_useSearchEngineInternal, 1, 0 ); - - m_labelUseSearchEngineInternal = new TQLabel( groupBox6, "m_labelUseSearchEngineInternal" ); - m_labelUseSearchEngineInternal->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 10, 0, m_labelUseSearchEngineInternal->sizePolicy().hasHeightForWidth() ) ); - m_labelUseSearchEngineInternal->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); - - groupBox6Layout->addWidget( m_labelUseSearchEngineInternal, 1, 1 ); - - m_useSearchEngineNew = new TQRadioButton( groupBox6, "m_useSearchEngineNew" ); - - groupBox6Layout->addWidget( m_useSearchEngineNew, 0, 0 ); - - m_labelUseSearchEngineNew = new TQLabel( groupBox6, "m_labelUseSearchEngineNew" ); - m_labelUseSearchEngineNew->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 10, 0, m_labelUseSearchEngineNew->sizePolicy().hasHeightForWidth() ) ); - m_labelUseSearchEngineNew->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); - - groupBox6Layout->addWidget( m_labelUseSearchEngineNew, 0, 1 ); - TabPageLayout->addWidget( groupBox6 ); - tabWidget->insertTab( TabPage, TQString::fromLatin1("") ); - MyDialog1Layout->addWidget( tabWidget ); - - Layout1 = new TQHBoxLayout( 0, 0, 6, "Layout1"); - - buttonHelp = new TQPushButton( this, "buttonHelp" ); - buttonHelp->setAutoDefault( TRUE ); - Layout1->addWidget( buttonHelp ); - Horizontal_Spacing2 = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - Layout1->addItem( Horizontal_Spacing2 ); - - buttonOk = new TQPushButton( this, "buttonOk" ); - buttonOk->setAutoDefault( TRUE ); - buttonOk->setDefault( TRUE ); - Layout1->addWidget( buttonOk ); - - buttonCancel = new TQPushButton( this, "buttonCancel" ); - buttonCancel->setAutoDefault( TRUE ); - Layout1->addWidget( buttonCancel ); - MyDialog1Layout->addLayout( Layout1 ); - languageChange(); - resize( TQSize(654, 343).expandedTo(minimumSizeHint()) ); - 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) ) ); - 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) ) ); - - // tab order - setTabOrder( m_advViewSourceInternal, m_advViewSourceExternal ); - setTabOrder( m_advViewSourceExternal, m_useSearchEngineNew ); - setTabOrder( m_useSearchEngineNew, m_useSearchEngineInternal ); - setTabOrder( m_useSearchEngineInternal, tabWidget ); - setTabOrder( tabWidget, m_radioOnBeginOpenDialog ); - setTabOrder( m_radioOnBeginOpenDialog, m_radioOnBeginOpenLast ); - setTabOrder( m_radioOnBeginOpenLast, m_historySize ); - setTabOrder( m_historySize, m_rememberHistoryInfo ); - setTabOrder( m_rememberHistoryInfo, m_radioExtLinkOpenAlways ); - setTabOrder( m_radioExtLinkOpenAlways, m_radioExtLinkAsk ); - setTabOrder( m_radioExtLinkAsk, m_radioExtLinkOpenNever ); - setTabOrder( m_radioExtLinkOpenNever, m_radioNewChmOpenAlways ); - setTabOrder( m_radioNewChmOpenAlways, m_radioNewChmAsk ); - setTabOrder( m_radioNewChmAsk, m_radioNewChmOpenNever ); - setTabOrder( m_radioNewChmOpenNever, m_qtBrowserPath ); - setTabOrder( m_qtBrowserPath, m_radioUseQtextBrowser ); - 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 ); - setTabOrder( m_enableRefresh, m_advExternalProgramName ); - setTabOrder( m_advExternalProgramName, buttonHelp ); - setTabOrder( buttonHelp, buttonOk ); - setTabOrder( buttonOk, buttonCancel ); -} - -void KCHMSetupDialog::slotShowHelp() -{ - kapp->invokeHelp( TQString(), "kchmviewer" ); -} - -/* - * Destroys the object and frees any allocated resources - */ -KCHMSetupDialog::~KCHMSetupDialog() -{ - // no need to delete child widgets, TQt does it all for us -} - -/* - * Sets the strings of the subwidgets using the current - * language. - */ -void KCHMSetupDialog::languageChange() -{ - setCaption( tr( "KchmViewer settings" ) ); - buttonGroup1->setTitle( tr( "If no arguments given on load" ) ); - m_radioOnBeginOpenDialog->setText( tr( "Open the 'open CHM file' dialog" ) ); - m_radioOnBeginOpenLast->setText( tr( "Open the &last used CHM file, if exist" ) ); - m_radioOnBeginOpenLast->setAccel( TQKeySequence( tr( "Alt+L" ) ) ); - buttonGroup2->setTitle( tr( "History" ) ); - textLabel1->setText( tr( "Store history information for" ) ); - m_historySize->setPrefix( TQString() ); - textLabel2->setText( tr( "latest files" ) ); - m_rememberHistoryInfo->setText( tr( "R&emember extra information for history files" ) ); - m_rememberHistoryInfo->setAccel( TQKeySequence( tr( "Alt+E" ) ) ); - TQToolTip::add( m_rememberHistoryInfo, tr( "Remembers the information about the files, which were opened. Remembers last opened page, search history, font size, bookmarks and so on." ) ); - groupBox1->setTitle( tr( "CHM security settings" ) ); - buttonGroup4->setTitle( tr( "When external link clicked" ) ); - m_radioExtLinkOpenAlways->setText( tr( "Alwa&ys open it in external browser" ) ); - m_radioExtLinkOpenAlways->setAccel( TQKeySequence( tr( "Alt+Y" ) ) ); - m_radioExtLinkAsk->setText( tr( "Ask for confirmation" ) ); - m_radioExtLinkOpenNever->setText( tr( "Do not open the link" ) ); - m_radioExtLinkOpenNever->setAccel( TQKeySequence( TQString() ) ); - buttonGroup5->setTitle( tr( "When link pointed to a new CHM file clicked" ) ); - m_radioNewChmOpenAlways->setText( tr( "Always open a new CHM file" ) ); - m_radioNewChmAsk->setText( tr( "Ask for confirmation" ) ); - m_radioNewChmOpenNever->setText( tr( "Do not open a new CHM file" ) ); - tabWidget->changeTab( Widget8, tr( "General behavior" ) ); - m_groupQtsettings->setTitle( tr( "TQt version settings" ) ); - textLabel1_2->setText( tr( "Enter the path to the program, which will be used as a browser for external links. A %s symbol will be replaced by the URL clicked." ) ); - m_groupKDEsettings->setTitle( tr( "KDE version settings" ) ); - buttonGroup5_2->setTitle( tr( "To show HTML content, use" ) ); - m_radioUseQtextBrowser->setText( tr( "&TQTextBrowser-based widget" ) ); - m_radioUseQtextBrowser->setAccel( TQKeySequence( tr( "Alt+Q" ) ) ); - 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" ) ); - m_enablePlugins->setAccel( TQKeySequence( tr( "Alt+P" ) ) ); - m_enableJava->setText( tr( "Enable &Java" ) ); - m_enableJava->setAccel( TQKeySequence( tr( "Alt+J" ) ) ); - m_enableRefresh->setText( tr( "Enable &refresh" ) ); - m_enableRefresh->setAccel( TQKeySequence( tr( "Alt+R" ) ) ); - tabWidget->changeTab( Widget9, tr( "Version-specific settings" ) ); - buttonGroup7->setTitle( tr( "View HTML source command uses" ) ); - m_advViewSourceInternal->setText( tr( "Built-in HTML source viewer" ) ); - m_advViewSourceInternal->setAccel( TQKeySequence( TQString() ) ); - m_advViewSourceExternal->setText( tr( "E&xternal program, specified below" ) ); - m_advViewSourceExternal->setAccel( TQKeySequence( tr( "Alt+X" ) ) ); - textLabel1_3->setText( tr( "External program:" ) ); - groupBox6->setTitle( tr( "Search engine to use" ) ); - m_useSearchEngineInternal->setText( TQString() ); - m_labelUseSearchEngineInternal->setText( tr( "Use the search based on internal CHM index. This engine cannot search for any symbols except underscode, does not support multibyte languages, and is not always available." ) ); - m_useSearchEngineNew->setText( TQString() ); - m_labelUseSearchEngineNew->setText( tr( "Use new kchmviewer internal search engine (recommended). This engine indexes symbols, so it is possible to search for special symbols (like \"C++\"). All languages are supported. The index will be generated before the first search." ) ); - tabWidget->changeTab( TabPage, tr( "Advanced" ) ); - buttonHelp->setText( tr( "&Help" ) ); - buttonHelp->setAccel( TQKeySequence( tr( "F1" ) ) ); - buttonOk->setText( tr( "&OK" ) ); - buttonOk->setAccel( TQKeySequence( TQString() ) ); - buttonCancel->setText( tr( "&Cancel" ) ); - buttonCancel->setAccel( TQKeySequence( TQString() ) ); -} - -void KCHMSetupDialog::m_radioUseTDEHTMLPart_toggled(bool) -{ - tqWarning( "KCHMSetupDialog::m_radioUseTDEHTMLPart_toggled(bool): Not implemented yet" ); -} - -#include "kchmsetupdialog.moc" diff --git a/src/kchmsetupdialog_impl.cpp b/src/kchmsetupdialog_impl.cpp new file mode 100644 index 0000000..7478aef --- /dev/null +++ b/src/kchmsetupdialog_impl.cpp @@ -0,0 +1,31 @@ +/* + * KCHMSetupDialog_impl.cpp + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + */ + +#include "kchmsetupdialog_impl.h" +#include "kchmsetupdialog_impl.moc" +#include + +KCHMSetupDialog_impl::KCHMSetupDialog_impl(TQWidget* parent, const char* name, bool modal, WFlags fl) + : KCHMSetupDialog(parent, name, modal, fl) +{ +} + +void KCHMSetupDialog_impl::slotShowHelp() +{ + kapp->invokeHelp(); +} + diff --git a/src/kchmsetupdialog_impl.h b/src/kchmsetupdialog_impl.h new file mode 100644 index 0000000..c98b4d8 --- /dev/null +++ b/src/kchmsetupdialog_impl.h @@ -0,0 +1,34 @@ +/* + * KCHMSetupDialog_impl.h + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + */ + +#ifndef KCHMSETUPDIALOG_IMPL_H +#define KCHMSETUPDIALOG_IMPL_H + +#include + +class KCHMSetupDialog_impl : public KCHMSetupDialog +{ + Q_OBJECT + +public: + KCHMSetupDialog_impl( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + +public slots: + void slotShowHelp(); +}; + +#endif // KCHMSETUPDIALOG_IMPL_H -- cgit v1.2.3