| a6711dd2 | 2014-06-01 23:06:25 | Michele Calgaro |
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. |
||
|
A src/kchmsetupdialog_impl.cpp A src/kchmsetupdialog_impl.h M src/Makefile.am M src/kchmmainwindow.cpp R src/kchmsetupdialog.cpp |
||
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 @@
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 @@
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::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 <tqvariant.h>
-#include <tqpushbutton.h>
-#include <tqtabwidget.h>
-#include <tqwidget.h>
-#include <tqbuttongroup.h>
-#include <tqradiobutton.h>
-#include <tqlabel.h>
-#include <tqspinbox.h>
-#include <tqcheckbox.h>
-#include <tqgroupbox.h>
-#include <tqlineedit.h>
-#include <tqlayout.h>
-#include <tqtooltip.h>
-#include <tqwhatsthis.h>
-#include <tdeapplication.h>
-
-/*
- * 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 );
** Diff limit reached (max: 250 lines) **
|
||