Attachment 1814 Details for Bug 1683 – updated KControl patch, after KDE->TDE rename in commit 26dbe18e on 2013-12-26

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] updated KControl patch, after KDE->TDE rename in commit 26dbe18e on 2013-12-26

026_kcontrol_UI.diff (text/plain), 46.63 KB, created by Michele Calgaro on 2014-01-01 09:00:21 CST

(hide)

Description:

Filename:

MIME Type:

Creator: Michele Calgaro

Created: 2014-01-01 09:00:21 CST

Size: 46.63 KB

patch

obsolete

>diff -Nura ori/tdebase/kcontrol/konqhtml/advancedTabDialog.cpp new/tdebase/kcontrol/konqhtml/advancedTabDialog.cpp
>--- ori/tdebase/kcontrol/konqhtml/advancedTabDialog.cpp	2013-10-27 22:03:51.000000000 +0900
>+++ new/tdebase/kcontrol/konqhtml/advancedTabDialog.cpp	1970-01-01 09:00:00.000000000 +0900
>@@ -1,150 +0,0 @@
>-/*
>- *  advancedTabDialog.cpp
>- *
>- *  Copyright (c) 2002 Aaron J. Seigo <aseigo@olympusproject.org>
>- *
>- *  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
>-
>-    --------------------------------------------------------------
>-    Additional changes:
>-    - 2013/10/16 Michele Calgaro
>-      * centralized "tabbed browsing" options in this dialog
>- */
>-
>-#include <tqbuttongroup.h>
>-#include <tqcheckbox.h>
>-#include <tqlayout.h>
>-#include <tqpushbutton.h>
>-#include <tqradiobutton.h>
>-#include <tqslider.h>
>-
>-#include <tdeapplication.h>
>-#include <dcopclient.h>
>-#include <kcolorbutton.h>
>-#include <tdelocale.h>
>-#include <tdeconfig.h>
>-
>-#include "advancedTabDialog.h"
>-#include "advancedTabOptions.h"
>-#include "main.h"
>-
>-advancedTabDialog::advancedTabDialog(TQWidget* parent, TDEConfig* config, const char* name)
>-    : KDialogBase(KDialogBase::Plain,
>-                  i18n("Advanced Options"),
>-                  KDialogBase::Ok |
>-                  KDialogBase::Apply |
>-                  KDialogBase::Cancel,
>-                  KDialogBase::Ok,
>-                  parent,
>-                  name,
>-                  true, true),
>-                  m_pConfig(config)
>-{
>-    connect(this, TQT_SIGNAL(applyClicked()),
>-            this, TQT_SLOT(save()));
>-    connect(this, TQT_SIGNAL(okClicked()),
>-            this, TQT_SLOT(save()));
>-    actionButton(Apply)->setEnabled(false);
>-    TQFrame* page = plainPage();
>-    TQVBoxLayout* layout = new TQVBoxLayout(page);
>-    m_advancedWidget = new advancedTabOptions(page);
>-    layout->addWidget(m_advancedWidget);
>-    layout->addSpacing( 20 );
>-    layout->addStretch();
>-
>-    connect(m_advancedWidget->m_pShowMMBInTabs, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
>-    connect(m_advancedWidget->m_pDynamicTabbarHide, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
>-    connect(m_advancedWidget->m_pDynamicTabbarCycle, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
>-    connect(m_advancedWidget->m_pNewTabsInBackground, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
>-    connect(m_advancedWidget->m_pOpenAfterCurrentPage, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
>-    connect(m_advancedWidget->m_pTabConfirm, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
>-    connect(m_advancedWidget->m_pTabCloseActivatePrevious, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
>-    connect(m_advancedWidget->m_pPermanentCloseButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
>-    connect(m_advancedWidget->m_pHoverCloseButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
>-    connect(m_advancedWidget->m_pKonquerorTabforExternalURL, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
>-    connect(m_advancedWidget->m_pPopupsWithinTabs, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
>-
>-    load();
>-}
>-
>-advancedTabDialog::~advancedTabDialog()
>-{
>-}
>-
>-void advancedTabDialog::load()
>-{
>-    m_pConfig->setGroup("FMSettings");
>-    m_advancedWidget->m_pShowMMBInTabs->setChecked( m_pConfig->readBoolEntry( "MMBOpensTab", false ) );
>-    m_advancedWidget->m_pDynamicTabbarHide->setChecked( !(m_pConfig->readBoolEntry( "AlwaysTabbedMode", false )) );
>-    m_advancedWidget->m_pDynamicTabbarCycle->setChecked( m_pConfig->readBoolEntry( "TabsCycleWheel", true ) );
>-    m_advancedWidget->m_pNewTabsInBackground->setChecked( ! (m_pConfig->readBoolEntry( "NewTabsInFront", false )) );
>-    m_advancedWidget->m_pOpenAfterCurrentPage->setChecked( m_pConfig->readBoolEntry( "OpenAfterCurrentPage", false ) );
>-    m_advancedWidget->m_pPermanentCloseButton->setChecked( m_pConfig->readBoolEntry( "PermanentCloseButton", false ) );
>-    m_advancedWidget->m_pHoverCloseButton->setChecked( m_pConfig->readBoolEntry( "HoverCloseButton", false ) );
>-    m_advancedWidget->m_pKonquerorTabforExternalURL->setChecked( m_pConfig->readBoolEntry( "KonquerorTabforExternalURL", false ) );
>-    m_advancedWidget->m_pPopupsWithinTabs->setChecked( m_pConfig->readBoolEntry( "PopupsWithinTabs", false ) );
>-    m_advancedWidget->m_pTabCloseActivatePrevious->setChecked( m_pConfig->readBoolEntry( "TabCloseActivatePrevious", false ) );
>-
>-    m_pConfig->setGroup("Notification Messages");
>-    m_advancedWidget->m_pTabConfirm->setChecked( !m_pConfig->hasKey("MultipleTabConfirm") );
>-
>-    if ( m_advancedWidget->m_pPermanentCloseButton->isChecked() )
>-      m_advancedWidget->m_pHoverCloseButton->setEnabled(false);
>-    else
>-      m_advancedWidget->m_pHoverCloseButton->setEnabled(true);
>-    actionButton(Apply)->setEnabled(false);
>-}
>-
>-void advancedTabDialog::save()
>-{
>-    m_pConfig->setGroup("FMSettings");
>-    m_pConfig->writeEntry( "MMBOpensTab", (m_advancedWidget->m_pShowMMBInTabs->isChecked()) );
>-    m_pConfig->writeEntry( "AlwaysTabbedMode", ( !(m_advancedWidget->m_pDynamicTabbarHide->isChecked())) );
>-    m_pConfig->writeEntry( "TabsCycleWheel", (m_advancedWidget->m_pDynamicTabbarCycle->isChecked()) );
>-    m_pConfig->writeEntry( "NewTabsInFront", !(m_advancedWidget->m_pNewTabsInBackground->isChecked()) );
>-    m_pConfig->writeEntry( "OpenAfterCurrentPage", m_advancedWidget->m_pOpenAfterCurrentPage->isChecked() );
>-    m_pConfig->writeEntry( "PermanentCloseButton", m_advancedWidget->m_pPermanentCloseButton->isChecked() );
>-    m_pConfig->writeEntry( "HoverCloseButton", m_advancedWidget->m_pHoverCloseButton->isChecked() );
>-    m_pConfig->writeEntry( "KonquerorTabforExternalURL", m_advancedWidget->m_pKonquerorTabforExternalURL->isChecked() );
>-    m_pConfig->writeEntry( "PopupsWithinTabs", m_advancedWidget->m_pPopupsWithinTabs->isChecked() );
>-    m_pConfig->writeEntry( "TabCloseActivatePrevious", m_advancedWidget->m_pTabCloseActivatePrevious->isChecked() );
>-    m_pConfig->sync();
>-
>-    // It only matters whether the key is present, its value has no meaning
>-    m_pConfig->setGroup("Notification Messages");
>-    if ( m_advancedWidget->m_pTabConfirm->isChecked() ) m_pConfig->deleteEntry( "MultipleTabConfirm" );
>-    else m_pConfig->writeEntry( "MultipleTabConfirm", true );
>-
>-    TQByteArray data;
>-    if ( !TDEApplication::kApplication()->dcopClient()->isAttached() )
>-      kapp->dcopClient()->attach();
>-    TDEApplication::kApplication()->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
>-
>-    if ( m_advancedWidget->m_pPermanentCloseButton->isChecked() )
>-      m_advancedWidget->m_pHoverCloseButton->setEnabled(false);
>-    else
>-      m_advancedWidget->m_pHoverCloseButton->setEnabled(true);
>-    actionButton(Apply)->setEnabled(false);
>-}
>-
>-void advancedTabDialog::changed()
>-{
>-    if ( m_advancedWidget->m_pPermanentCloseButton->isChecked() )
>-      m_advancedWidget->m_pHoverCloseButton->setEnabled(false);
>-    else
>-      m_advancedWidget->m_pHoverCloseButton->setEnabled(true);
>-    actionButton(Apply)->setEnabled(true);
>-}
>-
>-#include "advancedTabDialog.moc"
>diff -Nura ori/tdebase/kcontrol/konqhtml/advancedTabDialog.h new/tdebase/kcontrol/konqhtml/advancedTabDialog.h
>--- ori/tdebase/kcontrol/konqhtml/advancedTabDialog.h	2013-07-27 02:36:58.000000000 +0900
>+++ new/tdebase/kcontrol/konqhtml/advancedTabDialog.h	1970-01-01 09:00:00.000000000 +0900
>@@ -1,45 +0,0 @@
>-/*
>- *  advancedTabDialog.h
>- *
>- *  Copyright (c) 2002 Aaron J. Seigo <aseigo@olympusproject.org>
>- *
>- *  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 __ADVANCEDTABDIALOG_H
>-#define __ADVANCEDTABDIALOG_H
>-
>-#include <kdialogbase.h>
>-
>-class advancedTabOptions;
>-
>-class advancedTabDialog : public KDialogBase
>-{
>-    Q_OBJECT
>-
>-    public:
>-        advancedTabDialog(TQWidget* parent, TDEConfig *config, const char* name);
>-        ~advancedTabDialog();
>-
>-    protected slots:
>-        void load();
>-        void save();
>-        void changed();
>-
>-    private:
>-        TDEConfig* m_pConfig;
>-        advancedTabOptions* m_advancedWidget;
>-};
>-
>-#endif
>diff -Nura ori/tdebase/kcontrol/konqhtml/advancedTabOptions.ui new/tdebase/kcontrol/konqhtml/advancedTabOptions.ui
>--- ori/tdebase/kcontrol/konqhtml/advancedTabOptions.ui	2013-10-21 00:09:49.000000000 +0900
>+++ new/tdebase/kcontrol/konqhtml/advancedTabOptions.ui	1970-01-01 09:00:00.000000000 +0900
>@@ -1,199 +0,0 @@
>-<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
>-<class>advancedTabOptions</class>
>-<widget class="TQWidget">
>-    <property name="name">
>-        <cstring>advancedTabOptions</cstring>
>-    </property>
>-    <property name="geometry">
>-        <rect>
>-            <x>0</x>
>-            <y>0</y>
>-            <width>644</width>
>-            <height>208</height>
>-        </rect>
>-    </property>
>-    <vbox>
>-        <property name="name">
>-            <cstring>unnamed</cstring>
>-        </property>
>-        <property name="margin">
>-            <number>0</number>
>-        </property>
>-        <widget class="TQLabel">
>-            <property name="name">
>-                <cstring>TextLabel3</cstring>
>-            </property>
>-            <property name="text">
>-                <string>&lt;b&gt;Tab Options&lt;/b&gt;</string>
>-            </property>
>-        </widget>
>-        <widget class="Line">
>-            <property name="name">
>-                <cstring>Line1</cstring>
>-            </property>
>-            <property name="frameShape">
>-                <enum>HLine</enum>
>-            </property>
>-            <property name="frameShadow">
>-                <enum>Sunken</enum>
>-            </property>
>-            <property name="orientation">
>-                <enum>Horizontal</enum>
>-            </property>
>-        </widget>
>-        <widget class="TQLayoutWidget">
>-            <property name="name">
>-                <cstring>layout</cstring>
>-            </property>
>-            <vbox>
>-                <property name="name">
>-                    <cstring>unnamed</cstring>
>-                </property>
>-                <widget class="TQCheckBox">
>-                  <property name="name">
>-                    <cstring>m_pShowMMBInTabs</cstring>
>-                  </property>
>-                  <property name="text">
>-                    <string>Open &amp;links in new tab instead of in new window</string>
>-                  </property>
>-                  <property name="whatsThis" stdset="0">
>-                    <string>This will open a new tab instead of a new window in various situations, such as choosing a link or a folder with the middle mouse button.</string>
>-                  </property>
>-                </widget>
>-                <widget class="TQCheckBox">
>-                  <property name="name">
>-                    <cstring>m_pDynamicTabbarHide</cstring>
>-                  </property>
>-                  <property name="text">
>-                    <string>&amp;Hide the tab bar when only one tab is open</string>
>-                  </property>
>-                  <property name="whatsThis" stdset="0">
>-                    <string>This will display the tab bar only if there are two or more tabs. Otherwise it will always be displayed.</string>
>-                  </property>
>-                </widget>
>-                <widget class="TQCheckBox">
>-                  <property name="name">
>-                    <cstring>m_pDynamicTabbarCycle</cstring>
>-                  </property>
>-                  <property name="text">
>-                    <string>C&amp;ycle tabs with mouse wheel</string>
>-                  </property>
>-                  <property name="whatsThis" stdset="0">
>-                    <string>This will cycle through tabs when there are two or more tabs using the mouse wheel.</string>
>-                  </property>
>-                </widget>
>-                <widget class="TQCheckBox">
>-                    <property name="name">
>-                        <cstring>m_pNewTabsInBackground</cstring>
>-                    </property>
>-                    <property name="text">
>-                        <string>O&amp;pen new tabs in the background</string>
>-                    </property>
>-                    <property name="whatsThis" stdset="0">
>-                        <string>This will open a new tab in the background, instead of in the foreground.</string>
>-                    </property>
>-                </widget>
>-                <widget class="TQCheckBox">
>-                    <property name="name">
>-                        <cstring>m_pOpenAfterCurrentPage</cstring>
>-                    </property>
>-                    <property name="text">
>-                        <string>Open &amp;new tab after current tab</string>
>-                    </property>
>-                    <property name="whatsThis" stdset="0">
>-                        <string>This will open a new tab opened from a page after the current tab, instead of after the last tab.</string>
>-                    </property>
>-                </widget>
>-                <widget class="TQCheckBox">
>-                    <property name="name">
>-                        <cstring>m_pTabConfirm</cstring>
>-                    </property>
>-                    <property name="text">
>-                        <string>Confirm &amp;when closing windows with multiple tabs</string>
>-                    </property>
>-                    <property name="whatsThis" stdset="0">
>-                        <string>This will ask you whether you are sure you want to close a window when it has multiple tabs opened in it.</string>
>-                    </property>
>-                </widget>
>-                <widget class="TQCheckBox">
>-                    <property name="name">
>-                        <cstring>m_pPermanentCloseButton</cstring>
>-                    </property>
>-                    <property name="text">
>-                        <string>&amp;Show close button instead of website icon</string>
>-                    </property>
>-                    <property name="whatsThis" stdset="0">
>-                        <string>This will display close buttons inside each tab instead of websites' icons.</string>
>-                    </property>
>-                </widget>
>-                <widget class="TQCheckBox">
>-                    <property name="name">
>-                        <cstring>m_pHoverCloseButton</cstring>
>-                    </property>
>-                    <property name="text">
>-                        <string>&amp;Show close button instead of website icon with mouse hover</string>
>-                    </property>
>-                    <property name="whatsThis" stdset="0">
>-                        <string>This will display a close button inside each tab instead of websites' icons when the mouse pointer hovers the icon.</string>
>-                    </property>
>-                </widget>
>-                <widget class="TQCheckBox">
>-                    <property name="name">
>-                       <cstring>m_pPopupsWithinTabs</cstring>
>-                    </property>
>-                   <property name="text">
>-                       <string>Open pop&amp;ups in new tab instead of in new window</string>
>-                   </property>
>-                   <property name="whatsThis" stdset="0">
>-                       <string>Whether or not JavaScript popups if allowed shall open in a new tab or in a new window.</string>
>-                   </property>
>-                </widget>
>-                <widget class="TQCheckBox">
>-                    <property name="name">
>-                       <cstring>m_pTabCloseActivatePrevious</cstring>
>-                    </property>
>-                   <property name="text">
>-                       <string>Activate previous used tab when closing the current tab</string>
>-                   </property>
>-                   <property name="whatsThis" stdset="0">
>-                       <string>When checking this the previous used or opened tab will be activated when you close the current active tab instead of the one right to the current tab.</string>
>-                   </property>
>-                </widget>
>-                <widget class="TQCheckBox">
>-                    <property name="name">
>-                        <cstring>m_pKonquerorTabforExternalURL</cstring>
>-                    </property>
>-                    <property name="text">
>-                        <string>Open as tab in existing Konqueror when URL is called externally</string>
>-                    </property>
>-                    <property name="whatsThis" stdset="0">
>-                        <string>When you click a URL in another TDE program or call kfmclient to open a URL, the current desktop will be searched for a non-minimized Konqueror and, if found, the URL opened as a new tab within it. Otherwise a new Konqueror window will be opened with the required URL.</string>
>-                    </property>
>-                </widget>
>-            </vbox>
>-        </widget>
>-        <spacer>
>-            <property name="name">
>-                <cstring>spacer</cstring>
>-            </property>
>-            <property name="orientation">
>-                <enum>Vertical</enum>
>-            </property>
>-            <property name="sizeType">
>-                <enum>Expanding</enum>
>-            </property>
>-            <property name="sizeHint">
>-                <size>
>-                    <width>20</width>
>-                    <height>0</height>
>-                </size>
>-            </property>
>-        </spacer>
>-    </vbox>
>-</widget>
>-<includes>
>-    <include location="local" impldecl="in implementation">kdialog.h</include>
>-</includes>
>-<layoutdefaults spacing="3" margin="6"/>
>-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
>-</UI>
>diff -Nura ori/tdebase/kcontrol/konqhtml/CMakeLists.txt new/tdebase/kcontrol/konqhtml/CMakeLists.txt
>--- ori/tdebase/kcontrol/konqhtml/CMakeLists.txt	2013-07-27 02:36:58.000000000 +0900
>+++ new/tdebase/kcontrol/konqhtml/CMakeLists.txt	2013-12-18 15:20:24.603415018 +0900
>@@ -26,6 +26,7 @@
> install( FILES
>     tdehtml_behavior.desktop tdehtml_java_js.desktop
>     tdehtml_fonts.desktop tdehtml_filter.desktop
>+    tdehtml_userInter.desktop
>   DESTINATION ${XDG_APPS_INSTALL_DIR} )
> 
> install(
>@@ -42,12 +43,11 @@
> 
> tde_add_kpart( kcm_konqhtml AUTOMOC
>   SOURCES
>-    advancedTabDialog.cpp htmlopts.cpp jsopts.cpp
>-    javaopts.cpp pluginopts.cpp appearance.cpp
>-    khttpoptdlg.cpp policydlg.cpp main.cpp
>+    userInterOpts.ui userInterOpts_impl.cpp userInterConfig.cpp
>+    htmlopts.cpp jsopts.cpp javaopts.cpp pluginopts.cpp
>+    appearance.cpp khttpoptdlg.cpp policydlg.cpp main.cpp
>     jspolicies.cpp nsconfigwidget.ui policies.cpp
>-    domainlistview.cpp advancedTabOptions.ui
>-    filteropts.cpp
>+    domainlistview.cpp filteropts.cpp
>   LINK tdehtml-shared
>   DESTINATION ${PLUGIN_INSTALL_DIR}
> )
>diff -Nura ori/tdebase/kcontrol/konqhtml/htmlopts.cpp new/tdebase/kcontrol/konqhtml/htmlopts.cpp
>--- ori/tdebase/kcontrol/konqhtml/htmlopts.cpp	2013-10-21 00:09:49.000000000 +0900
>+++ new/tdebase/kcontrol/konqhtml/htmlopts.cpp	2013-12-18 15:45:12.059371068 +0900
>@@ -16,7 +16,6 @@
> #include <tqpushbutton.h>
> 
> #include "htmlopts.h"
>-#include "advancedTabDialog.h"
> 
> #include <konq_defaults.h> // include default values directly from konqueror
> #include <tdeglobalsettings.h> // get default for DEFAULT_CHANGECURSOR
>@@ -83,19 +82,6 @@
>     lay->addMultiCellWidget( bgForm, row, row, 0, 1 );
>     row++;
> 
>-    // Tabbed Browsing
>-
>-    TQGroupBox *bgTabbedBrowsing = new TQGroupBox( 0, Qt::Vertical, i18n("Tabbed Browsing"), this );
>-    TQHBoxLayout *laytab = new TQHBoxLayout(bgTabbedBrowsing->layout(), KDialog::spacingHint());
>-
>-    TQPushButton *advancedTabButton = new TQPushButton( i18n( "Show &tab options"), bgTabbedBrowsing );
>-    laytab->addWidget(advancedTabButton);
>-    laytab->addStretch();
>-    connect(advancedTabButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(launchAdvancedTabDialog()));
>-
>-    lay->addMultiCellWidget( bgTabbedBrowsing, row, row, 0, 1 );
>-    row++;
>-
>     // Mouse behavior
> 
>     TQVGroupBox *bgMouse = new TQVGroupBox( i18n("Mouse Beha&vior"), this );
>@@ -386,7 +372,6 @@
>     emit changed(false);
> }
> 
>-
> void KMiscHTMLOptions::slotChanged()
> {
>     m_pMaxFormCompletionItems->setEnabled( m_pFormCompletionCheckBox->isChecked() );
>@@ -394,10 +379,3 @@
> }
> 
> 
>-void KMiscHTMLOptions::launchAdvancedTabDialog()
>-{
>-    advancedTabDialog* dialog = new advancedTabDialog(this, m_pConfig, "advancedTabDialog");
>-    dialog->exec();
>-}
>-
>-
>diff -Nura ori/tdebase/kcontrol/konqhtml/htmlopts.h new/tdebase/kcontrol/konqhtml/htmlopts.h
>--- ori/tdebase/kcontrol/konqhtml/htmlopts.h	2013-10-21 00:09:49.000000000 +0900
>+++ new/tdebase/kcontrol/konqhtml/htmlopts.h	2013-12-18 15:45:19.275370855 +0900
>@@ -48,7 +48,6 @@
> 
> private slots:
>     void slotChanged();
>-    void launchAdvancedTabDialog();
> 
> private:
>     TDEConfig* m_pConfig;
>diff -Nura ori/tdebase/kcontrol/konqhtml/main.cpp new/tdebase/kcontrol/konqhtml/main.cpp
>--- ori/tdebase/kcontrol/konqhtml/main.cpp	2013-07-27 02:36:58.000000000 +0900
>+++ new/tdebase/kcontrol/konqhtml/main.cpp	2013-12-18 15:57:13.119349763 +0900
>@@ -36,6 +36,7 @@
> #include "appearance.h"
> #include "htmlopts.h"
> #include "filteropts.h"
>+#include "userInterConfig.h"
> 
> #include "main.h"
> #include <tdeaboutdata.h>
>@@ -67,11 +68,17 @@
> 		return new KPluginOptions(c, "Java/JavaScript Settings", parent, name);
> 	}
> 
>-        KDE_EXPORT TDECModule *create_tdehtml_filter(TQWidget *parent, const char *name )
>-        {
>-	    TDEConfig *c = new TDEConfig( "tdehtmlrc", false, false );
>-            return new KCMFilter(c, "Filter Settings", parent, name);
>-        }
>+  KDE_EXPORT TDECModule *create_tdehtml_filter(TQWidget *parent, const char *name )
>+  {
>+    TDEConfig *c = new TDEConfig( "tdehtmlrc", false, false );
>+    return new KCMFilter(c, "Filter Settings", parent, name);
>+  }
>+
>+  KDE_EXPORT TDECModule *create_tdehtml_userInter(TQWidget *parent, const char *name )
>+  {
>+    TDEConfig *c = new TDEConfig( "konquerorrc", false, false );
>+    return new userInterConfig(c, "FMSettings", parent, name);
>+  }
> }
> 
> 
>diff -Nura ori/tdebase/kcontrol/konqhtml/Makefile.am new/tdebase/kcontrol/konqhtml/Makefile.am
>--- ori/tdebase/kcontrol/konqhtml/Makefile.am	2013-07-27 02:36:58.000000000 +0900
>+++ new/tdebase/kcontrol/konqhtml/Makefile.am	2013-12-18 15:20:25.107415003 +0900
>@@ -5,17 +5,17 @@
> 
> kde_module_LTLIBRARIES = kcm_konqhtml.la
> 
>-kcm_konqhtml_la_SOURCES = advancedTabDialog.cpp htmlopts.cpp jsopts.cpp \
>+kcm_konqhtml_la_SOURCES = userInterOpts.ui userInterOpts_impl.cpp \
>+			     userInterConfig.cpp htmlopts.cpp jsopts.cpp \
> 			     javaopts.cpp pluginopts.cpp appearance.cpp \
> 			     khttpoptdlg.cpp policydlg.cpp main.cpp \
> 			     jspolicies.cpp nsconfigwidget.ui policies.cpp \
>-			     domainlistview.cpp advancedTabOptions.ui \
>-			     filteropts.cpp
>+			     domainlistview.cpp filteropts.cpp
> 
> kcm_konqhtml_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
> kcm_konqhtml_la_LIBADD = -ltdehtml -ltdeui
> 
>-xdg_apps_DATA = tdehtml_behavior.desktop tdehtml_java_js.desktop tdehtml_fonts.desktop tdehtml_filter.desktop
>+xdg_apps_DATA = tdehtml_behavior.desktop tdehtml_java_js.desktop tdehtml_fonts.desktop tdehtml_filter.desktop tdehtml_userInter.desktop
> 
> messages: rc.cpp
> 	$(XGETTEXT) *.cpp -o $(podir)/kcmkonqhtml.pot
>diff -Nura ori/tdebase/kcontrol/konqhtml/tdehtml_userInter.desktop new/tdebase/kcontrol/konqhtml/tdehtml_userInter.desktop
>--- ori/tdebase/kcontrol/konqhtml/tdehtml_userInter.desktop	1970-01-01 09:00:00.000000000 +0900
>+++ new/tdebase/kcontrol/konqhtml/tdehtml_userInter.desktop	2013-12-18 15:55:54.063352099 +0900
>@@ -0,0 +1,18 @@
>+[Desktop Entry]
>+Type=Application
>+DocPath=kcontrol/tdehtml/index.html#userInter
>+Icon=konqueror
>+Exec=tdecmshell tdehtml_userInter
>+
>+
>+X-TDE-Library=konqhtml
>+X-TDE-FactoryName=tdehtml_userInter
>+
>+Name=User Interface
>+Name[it]=Interfaccia utente
>+Comment=Configure user interface options
>+Comment[it]=Configura opzioni dell'interfaccia utente
>+Keywords=konqueror,kfm,user,interface,tabbed,browsing
>+Keywords[it]=konqueror,kfm,utente,interfaccia,linguette,navigazione
>+
>+Categories=Qt;TDE;X-TDE-settings-webbrowsing;
>diff -Nura ori/tdebase/kcontrol/konqhtml/userInterConfig.cpp new/tdebase/kcontrol/konqhtml/userInterConfig.cpp
>--- ori/tdebase/kcontrol/konqhtml/userInterConfig.cpp	1970-01-01 09:00:00.000000000 +0900
>+++ new/tdebase/kcontrol/konqhtml/userInterConfig.cpp	2013-12-18 15:20:26.971414948 +0900
>@@ -0,0 +1,72 @@
>+/*
>+ *  Copyright (c) 2005      Stefan Nikolaus <stefan.nikolaus@kdemail.net>
>+ *
>+ *  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 <tqlayout.h>
>+#include <tqtimer.h>
>+
>+#include <tdelocale.h>
>+#include <kdebug.h>
>+
>+#include "userInterOpts_impl.h"
>+#include "main.h"
>+
>+#include "userInterConfig.h"
>+#include "userInterConfig.moc"
>+
>+userInterConfig::userInterConfig(TDEConfig *config, TQString groupName,
>+                                 TQWidget *parent, const char *name)
>+  : TDECModule(parent, "kcmkonqhtml")
>+{
>+    TQVBoxLayout *layout = new TQVBoxLayout(this);
>+    m_widget = new userInterOpts(config, groupName, this, name);
>+    layout->addWidget(m_widget);
>+    layout->addStretch();
>+
>+    connect(m_widget, TQT_SIGNAL(changed()),
>+            this, TQT_SLOT(changed()));
>+
>+    load();
>+    TQTimer::singleShot(0, this, TQT_SLOT(notChanged()));
>+}
>+
>+void userInterConfig::notChanged()
>+{
>+    emit changed(false);
>+}
>+
>+void userInterConfig::load()
>+{
>+    m_widget->load();
>+    TDECModule::load();
>+}
>+
>+void userInterConfig::save()
>+{
>+    m_widget->save();
>+    TDECModule::save();
>+}
>+
>+void userInterConfig::defaults()
>+{
>+    m_widget->defaults();
>+    TDECModule::defaults();
>+
>+    // TDEConfigDialogManager may queue an changed(false) signal,
>+    // so we make sure, that the module is labeled as changed,
>+    // while we manage some of the widgets ourselves
>+    TQTimer::singleShot(0, this, TQT_SLOT(changed()));
>+}
>diff -Nura ori/tdebase/kcontrol/konqhtml/userInterConfig.h new/tdebase/kcontrol/konqhtml/userInterConfig.h
>--- ori/tdebase/kcontrol/konqhtml/userInterConfig.h	1970-01-01 09:00:00.000000000 +0900
>+++ new/tdebase/kcontrol/konqhtml/userInterConfig.h	2013-12-18 15:20:26.523414961 +0900
>@@ -0,0 +1,44 @@
>+/*
>+ *  Copyright (c) 2005      Stefan Nikolaus <stefan.nikolaus@kdemail.net>
>+ *
>+ *  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 __USER_INTER_CONFIG_H__
>+#define __USER_INTER_CONFIG_H__
>+
>+#include <tdecmodule.h>
>+
>+class userInterOpts;
>+
>+class userInterConfig : public TDECModule
>+{
>+    Q_OBJECT
>+
>+public:
>+    userInterConfig(TDEConfig *config, TQString group,
>+                    TQWidget *parent = 0, const char *name = 0);
>+
>+    void load();
>+    void save();
>+    void defaults();
>+
>+public slots:
>+    void notChanged();
>+
>+private:
>+    userInterOpts *m_widget;
>+};
>+
>+#endif // __USER_INTER_CONFIG_H__
>diff -Nura ori/tdebase/kcontrol/konqhtml/userInterOpts_impl.cpp new/tdebase/kcontrol/konqhtml/userInterOpts_impl.cpp
>--- ori/tdebase/kcontrol/konqhtml/userInterOpts_impl.cpp	1970-01-01 09:00:00.000000000 +0900
>+++ new/tdebase/kcontrol/konqhtml/userInterOpts_impl.cpp	2013-12-18 16:30:30.023290761 +0900
>@@ -0,0 +1,127 @@
>+/*
>+ *  userInterOpts.cpp
>+ *
>+ *  Copyright (c) 2002 Aaron J. Seigo <aseigo@olympusproject.org>
>+ *
>+ *  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 <tqbuttongroup.h>
>+#include <tqcheckbox.h>
>+#include <tqlayout.h>
>+#include <tqpushbutton.h>
>+#include <tqradiobutton.h>
>+#include <tqslider.h>
>+
>+#include <tdeapplication.h>
>+#include <dcopclient.h>
>+#include <kcolorbutton.h>
>+#include <tdelocale.h>
>+#include <tdeconfig.h>
>+
>+#include "main.h"
>+#include "userInterOpts_impl.h"
>+#include "userInterOpts_impl.moc"
>+
>+userInterOpts::userInterOpts(TDEConfig *config, TQString groupName,
>+                             TQWidget* parent, const char* name)
>+    : userInterOptsBase(parent, name), m_pConfig(config), m_groupName(groupName)
>+{
>+    // connections
>+    connect(m_pShowMMBInTabs, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
>+    connect(m_pDynamicTabbarHide, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
>+    connect(m_pDynamicTabbarCycle, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
>+    connect(m_pNewTabsInBackground, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
>+    connect(m_pOpenAfterCurrentPage, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
>+    connect(m_pTabConfirm, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
>+    connect(m_pPermanentCloseButton, TQT_SIGNAL(toggled(bool)),  TQT_SLOT(slotChanged()));
>+    connect(m_pHoverCloseButton, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
>+    connect(m_pKonquerorTabforExternalURL, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
>+    connect(m_pPopupsWithinTabs, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
>+    connect(m_pTabCloseActivatePrevious, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
>+}
>+
>+void userInterOpts::load()
>+{
>+  load(false);
>+}
>+
>+void userInterOpts::load(bool useDefaults)
>+{
>+    m_pConfig->setReadDefaults(useDefaults);
>+    m_pConfig->setGroup(m_groupName);
>+    
>+    m_pShowMMBInTabs->setChecked( m_pConfig->readBoolEntry( "MMBOpensTab", false ) );
>+    m_pDynamicTabbarHide->setChecked( !(m_pConfig->readBoolEntry( "AlwaysTabbedMode", false )) );
>+    m_pDynamicTabbarCycle->setChecked( m_pConfig->readBoolEntry( "TabsCycleWheel", true ) );
>+    m_pNewTabsInBackground->setChecked( ! (m_pConfig->readBoolEntry( "NewTabsInFront", false )) );
>+    m_pOpenAfterCurrentPage->setChecked( m_pConfig->readBoolEntry( "OpenAfterCurrentPage", false ) );
>+    m_pPermanentCloseButton->setChecked( m_pConfig->readBoolEntry( "PermanentCloseButton", false ) );
>+    m_pHoverCloseButton->setChecked( m_pConfig->readBoolEntry( "HoverCloseButton", false ) );
>+    m_pKonquerorTabforExternalURL->setChecked( m_pConfig->readBoolEntry( "KonquerorTabforExternalURL", false ) );
>+    m_pPopupsWithinTabs->setChecked( m_pConfig->readBoolEntry( "PopupsWithinTabs", false ) );
>+    m_pTabCloseActivatePrevious->setChecked( m_pConfig->readBoolEntry( "TabCloseActivatePrevious", false ) );
>+
>+    m_pConfig->setGroup("Notification Messages");
>+    m_pTabConfirm->setChecked( !m_pConfig->hasKey("MultipleTabConfirm") );
>+
>+    if ( m_pPermanentCloseButton->isChecked() )
>+      m_pHoverCloseButton->setEnabled(false);
>+    else
>+      m_pHoverCloseButton->setEnabled(true);
>+}
>+
>+void userInterOpts::save()
>+{
>+    m_pConfig->setGroup(m_groupName);
>+    
>+    m_pConfig->writeEntry( "MMBOpensTab", (m_pShowMMBInTabs->isChecked()) );
>+    m_pConfig->writeEntry( "AlwaysTabbedMode", ( !(m_pDynamicTabbarHide->isChecked())) );
>+    m_pConfig->writeEntry( "TabsCycleWheel", (m_pDynamicTabbarCycle->isChecked()) );
>+    m_pConfig->writeEntry( "NewTabsInFront", !(m_pNewTabsInBackground->isChecked()) );
>+    m_pConfig->writeEntry( "OpenAfterCurrentPage", m_pOpenAfterCurrentPage->isChecked() );
>+    m_pConfig->writeEntry( "PermanentCloseButton", m_pPermanentCloseButton->isChecked() );
>+    m_pConfig->writeEntry( "HoverCloseButton", m_pHoverCloseButton->isChecked() );
>+    m_pConfig->writeEntry( "KonquerorTabforExternalURL", m_pKonquerorTabforExternalURL->isChecked() );
>+    m_pConfig->writeEntry( "PopupsWithinTabs", m_pPopupsWithinTabs->isChecked() );
>+    m_pConfig->writeEntry( "TabCloseActivatePrevious", m_pTabCloseActivatePrevious->isChecked() );
>+    m_pConfig->sync();
>+
>+    // It only matters whether the key is present, its value has no meaning
>+    m_pConfig->setGroup("Notification Messages");
>+    if ( m_pTabConfirm->isChecked() ) m_pConfig->deleteEntry( "MultipleTabConfirm" );
>+    else m_pConfig->writeEntry( "MultipleTabConfirm", true );
>+
>+    TQByteArray data;
>+    if ( !TDEApplication::kApplication()->dcopClient()->isAttached() )
>+      kapp->dcopClient()->attach();
>+    TDEApplication::kApplication()->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
>+
>+    if ( m_pPermanentCloseButton->isChecked() )
>+      m_pHoverCloseButton->setEnabled(false);
>+    else
>+      m_pHoverCloseButton->setEnabled(true);
>+}
>+
>+void userInterOpts::defaults()
>+{
>+   load(true);
>+}
>+
>+void userInterOpts::slotChanged()
>+{
>+    emit changed();
>+}
>+
>+
>diff -Nura ori/tdebase/kcontrol/konqhtml/userInterOpts_impl.h new/tdebase/kcontrol/konqhtml/userInterOpts_impl.h
>--- ori/tdebase/kcontrol/konqhtml/userInterOpts_impl.h	1970-01-01 09:00:00.000000000 +0900
>+++ new/tdebase/kcontrol/konqhtml/userInterOpts_impl.h	2013-12-18 16:23:02.303303990 +0900
>@@ -0,0 +1,49 @@
>+/*
>+ *  userInterOpts_impl.h
>+ *
>+ *  Copyright (c) 2002 Aaron J. Seigo <aseigo@olympusproject.org>
>+ *
>+ *  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 __USERINTERFACE_OPTIONS_IMPL_H
>+#define __USERINTERFACE_OPTIONS_IMPL_H
>+
>+#include "userInterOpts.h"
>+      
>+class userInterOpts : public userInterOptsBase
>+{
>+  Q_OBJECT
>+
>+  public:
>+    userInterOpts(TDEConfig *config, TQString groupName,
>+                  TQWidget* parent =0, const char* name =0);
>+
>+    void load();
>+    void load(bool useDefaults);
>+    void save();
>+    void defaults();
>+        
>+  signals:
>+    void changed();
>+
>+  protected:
>+    TDEConfig *m_pConfig;
>+    TQString   m_groupName;
>+
>+  private slots:
>+    void slotChanged();
>+};
>+
>+#endif
>diff -Nura ori/tdebase/kcontrol/konqhtml/userInterOpts.ui new/tdebase/kcontrol/konqhtml/userInterOpts.ui
>--- ori/tdebase/kcontrol/konqhtml/userInterOpts.ui	1970-01-01 09:00:00.000000000 +0900
>+++ new/tdebase/kcontrol/konqhtml/userInterOpts.ui	2013-12-18 15:20:27.955414918 +0900
>@@ -0,0 +1,195 @@
>+<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
>+<class>userInterOptsBase</class>
>+<widget class="TQWidget">
>+    <property name="name">
>+        <cstring>userInterOptsBase</cstring>
>+    </property>
>+    <property name="geometry">
>+        <rect>
>+            <x>0</x>
>+            <y>0</y>
>+            <width>644</width>
>+            <height>208</height>
>+        </rect>
>+    </property>
>+    <vbox>
>+        <property name="name">
>+            <cstring>unnamed</cstring>
>+        </property>
>+        <property name="margin">
>+            <number>0</number>
>+        </property>
>+        <widget class="TQGroupBox">
>+            <property name="name">
>+                <cstring>m_group_1</cstring>
>+            </property>
>+            <property name="sizePolicy">
>+                <sizepolicy>
>+                    <hsizetype>1</hsizetype>
>+                    <vsizetype>4</vsizetype>
>+                    <horstretch>0</horstretch>
>+                    <verstretch>0</verstretch>
>+                </sizepolicy>
>+            </property>
>+            <property name="title">
>+                <string>Tabbed Browsing</string>
>+            </property>
>+            <grid>
>+                <property name="name">
>+                    <cstring>unnamed</cstring>
>+                </property>
>+                <widget class="TQLayoutWidget">
>+                    <property name="name">
>+                        <cstring>layout</cstring>
>+                    </property>
>+                    <vbox>
>+                        <property name="name">
>+                            <cstring>unnamed</cstring>
>+                        </property>
>+                        <widget class="TQCheckBox">
>+                          <property name="name">
>+                            <cstring>m_pShowMMBInTabs</cstring>
>+                          </property>
>+                          <property name="text">
>+                            <string>Open &amp;links in new tab instead of in new window</string>
>+                          </property>
>+                          <property name="whatsThis" stdset="0">
>+                            <string>This will open a new tab instead of a new window in various situations, such as choosing a link or a folder with the middle mouse button.</string>
>+                          </property>
>+                        </widget>
>+                        <widget class="TQCheckBox">
>+                          <property name="name">
>+                            <cstring>m_pDynamicTabbarHide</cstring>
>+                          </property>
>+                          <property name="text">
>+                            <string>&amp;Hide the tab bar when only one tab is open</string>
>+                          </property>
>+                          <property name="whatsThis" stdset="0">
>+                            <string>This will display the tab bar only if there are two or more tabs. Otherwise it will always be displayed.</string>
>+                          </property>
>+                        </widget>
>+                        <widget class="TQCheckBox">
>+                          <property name="name">
>+                            <cstring>m_pDynamicTabbarCycle</cstring>
>+                          </property>
>+                          <property name="text">
>+                            <string>C&amp;ycle tabs with mouse wheel</string>
>+                          </property>
>+                          <property name="whatsThis" stdset="0">
>+                            <string>This will cycle through tabs when there are two or more tabs using the mouse wheel.</string>
>+                          </property>
>+                        </widget>
>+                        <widget class="TQCheckBox">
>+                            <property name="name">
>+                                <cstring>m_pNewTabsInBackground</cstring>
>+                            </property>
>+                            <property name="text">
>+                                <string>O&amp;pen new tabs in the background</string>
>+                            </property>
>+                            <property name="whatsThis" stdset="0">
>+                                <string>This will open a new tab in the background, instead of in the foreground.</string>
>+                            </property>
>+                        </widget>
>+                        <widget class="TQCheckBox">
>+                            <property name="name">
>+                                <cstring>m_pOpenAfterCurrentPage</cstring>
>+                            </property>
>+                            <property name="text">
>+                                <string>Open &amp;new tab after current tab</string>
>+                            </property>
>+                            <property name="whatsThis" stdset="0">
>+                                <string>This will open a new tab opened from a page after the current tab, instead of after the last tab.</string>
>+                            </property>
>+                        </widget>
>+                        <widget class="TQCheckBox">
>+                            <property name="name">
>+                                <cstring>m_pTabConfirm</cstring>
>+                            </property>
>+                            <property name="text">
>+                                <string>Confirm &amp;when closing windows with multiple tabs</string>
>+                            </property>
>+                            <property name="whatsThis" stdset="0">
>+                                <string>This will ask you whether you are sure you want to close a window when it has multiple tabs opened in it.</string>
>+                            </property>
>+                        </widget>
>+                        <widget class="TQCheckBox">
>+                            <property name="name">
>+                                <cstring>m_pPermanentCloseButton</cstring>
>+                            </property>
>+                            <property name="text">
>+                                <string>&amp;Show close button instead of website icon</string>
>+                            </property>
>+                            <property name="whatsThis" stdset="0">
>+                                <string>This will display close buttons inside each tab instead of websites' icons.</string>
>+                            </property>
>+                        </widget>
>+                        <widget class="TQCheckBox">
>+                            <property name="name">
>+                                <cstring>m_pHoverCloseButton</cstring>
>+                            </property>
>+                            <property name="text">
>+                                <string>&amp;Show close button instead of website icon with mouse hover</string>
>+                            </property>
>+                            <property name="whatsThis" stdset="0">
>+                                <string>This will display a close button inside each tab instead of websites' icons when the mouse pointer hovers the icon.</string>
>+                            </property>
>+                        </widget>
>+                        <widget class="TQCheckBox">
>+                            <property name="name">
>+                              <cstring>m_pPopupsWithinTabs</cstring>
>+                            </property>
>+                          <property name="text">
>+                              <string>Open pop&amp;ups in new tab instead of in new window</string>
>+                          </property>
>+                          <property name="whatsThis" stdset="0">
>+                              <string>Whether or not JavaScript popups if allowed shall open in a new tab or in a new window.</string>
>+                          </property>
>+                        </widget>
>+                        <widget class="TQCheckBox">
>+                            <property name="name">
>+                                <cstring>m_pKonquerorTabforExternalURL</cstring>
>+                            </property>
>+                            <property name="text">
>+                                <string>Open as tab in existing Konqueror when URL is called externally</string>
>+                            </property>
>+                            <property name="whatsThis" stdset="0">
>+                                <string>When you click a URL in another TDE program or call kfmclient to open a URL, the current desktop will be searched for a non-minimized Konqueror and, if found, the URL opened as a new tab within it. Otherwise a new Konqueror window will be opened with the required URL.</string>
>+                            </property>                    
>+                        </widget>
>+                        <widget class="TQCheckBox">
>+                            <property name="name">
>+                              <cstring>m_pTabCloseActivatePrevious</cstring>
>+                            </property>
>+                          <property name="text">
>+                              <string>Activate previous used tab when closing the current tab</string>
>+                          </property>
>+                          <property name="whatsThis" stdset="0">
>+                              <string>When checking this the previous used or opened tab will be activated when you close the current active tab instead of the one right to the current tab.</string>
>+                          </property>
>+                        </widget>
>+                    </vbox>
>+                </widget>
>+          </grid>
>+        </widget>
>+        <spacer>
>+            <property name="name">
>+                <cstring>spacer</cstring>
>+            </property>
>+            <property name="orientation">
>+                <enum>Vertical</enum>
>+            </property>
>+            <property name="sizeType">
>+                <enum>Expanding</enum>
>+            </property>
>+            <property name="sizeHint">
>+                <size>
>+                    <width>20</width>
>+                    <height>16</height>
>+                </size>
>+            </property>
>+        </spacer>
>+    </vbox>
>+</widget>
>+<layoutdefaults spacing="3" margin="6"/>
>+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
>+</UI>

Actions: View | Diff

Attachments on bug 1683: 1730 | 1731 | 1732 | 1814 | 1886