[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/KDE/3.5/kdebase/kcontrol/konqhtml
From: Helio Chissini de Castro <helio () conectiva ! com ! br>
Date: 2006-08-22 1:31:25
Message-ID: 1156210285.633555.22404.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 575753 by helio:
- Setting module to use system defaults
M +11 -5 appearance.cpp
M +1 -0 appearance.h
M +10 -3 filteropts.cpp
M +1 -0 filteropts.h
M +13 -7 htmlopts.cpp
M +1 -0 htmlopts.h
M +9 -11 javaopts.cpp
M +1 -0 javaopts.h
M +10 -9 jsopts.cpp
M +1 -0 jsopts.h
M +12 -3 khttpoptdlg.cpp
M +1 -0 khttpoptdlg.h
M +11 -24 pluginopts.cpp
M +1 -0 pluginopts.h
--- branches/KDE/3.5/kdebase/kcontrol/konqhtml/appearance.cpp #575752:575753
@@ -315,7 +315,16 @@
void KAppearanceOptions::load()
{
+ load( false );
+}
+
+void KAppearanceOptions::load( bool useDefaults )
+{
KConfig khtmlrc("khtmlrc", true, false);
+ m_pConfig->setReadDefaults( useDefaults );
+
+ khtmlrc.setReadDefaults( useDefaults );
+
#define SET_GROUP(x) m_pConfig->setGroup(x); khtmlrc.setGroup(x)
#define READ_NUM(x,y) m_pConfig->readNumEntry(x, khtmlrc.readNumEntry(x, y))
#define READ_ENTRY(x,y) m_pConfig->readEntry(x, khtmlrc.readEntry(x, y))
@@ -347,15 +356,12 @@
//kdDebug(0) << "encoding = " << encodingName << endl;
updateGUI();
- emit changed(false);
+ emit changed( useDefaults );
}
void KAppearanceOptions::defaults()
{
- bool old = m_pConfig->readDefaults();
- m_pConfig->setReadDefaults(true);
- load();
- m_pConfig->setReadDefaults(old);
+ load( true );
}
void KAppearanceOptions::updateGUI()
--- branches/KDE/3.5/kdebase/kcontrol/konqhtml/appearance.h #575752:575753
@@ -27,6 +27,7 @@
~KAppearanceOptions();
virtual void load();
+ virtual void load( bool useDefaults );
virtual void save();
virtual void defaults();
--- branches/KDE/3.5/kdebase/kcontrol/konqhtml/filteropts.cpp #575752:575753
@@ -223,8 +223,7 @@
void KCMFilter::defaults()
{
- mListBox->clear();
- updateButton();
+ load( true );
}
void KCMFilter::save()
@@ -247,11 +246,17 @@
DCOPClient::mainClient()->send("konqueror*","KonquerorIface","reparseConfiguration()",QByteArray());
}
-
void KCMFilter::load()
{
+ load( false );
+}
+
+void KCMFilter::load( bool useDefaults )
+{
QStringList paths;
+ mConfig->setReadDefaults( useDefaults );
+
mConfig->setGroup( mGroupname );
mEnableCheck->setChecked( mConfig->readBoolEntry("Enabled",false));
mKillCheck->setChecked( mConfig->readBoolEntry("Shrink",false));
@@ -268,6 +273,8 @@
}
mListBox->insertStringList( paths );
+
+ emit changed( useDefaults );
}
void KCMFilter::insertFilter()
--- branches/KDE/3.5/kdebase/kcontrol/konqhtml/filteropts.h #575752:575753
@@ -36,6 +36,7 @@
~KCMFilter();
void load();
+ void load( bool useDefaults );
void save();
void defaults();
QString quickHelp() const;
--- branches/KDE/3.5/kdebase/kcontrol/konqhtml/htmlopts.cpp #575752:575753
@@ -205,7 +205,15 @@
void KMiscHTMLOptions::load()
{
+ load( false );
+}
+
+void KMiscHTMLOptions::load( bool useDefaults )
+{
KConfig khtmlrc("khtmlrc", true, false);
+ khtmlrc.setReadDefaults( useDefaults );
+ m_pConfig->setReadDefaults( useDefaults );
+
#define SET_GROUP(x) m_pConfig->setGroup(x); khtmlrc.setGroup(x)
#define READ_BOOL(x,y) m_pConfig->readBoolEntry(x, khtmlrc.readBoolEntry(x, y))
#define READ_ENTRY(x) m_pConfig->readEntry(x, khtmlrc.readEntry(x))
@@ -263,19 +271,17 @@
m_pDynamicTabbarHide->setChecked( ! (m_pConfig->readBoolEntry( \
"AlwaysTabbedMode", false )) );
KConfig config("kbookmarkrc", true, false);
- config.setGroup("Bookmarks");
+ config.setReadDefaults( useDefaults );
+ config.setGroup("Bookmarks");
m_pAdvancedAddBookmarkCheckBox->setChecked( \
config.readBoolEntry("AdvancedAddBookmarkDialog", false) );
m_pOnlyMarkedBookmarksCheckBox->setChecked( \
config.readBoolEntry("FilteredToolbar", false) ); +
+ emit changed( useDefaults );
}
void KMiscHTMLOptions::defaults()
{
- bool old = m_pConfig->readDefaults();
- m_pConfig->setReadDefaults(true);
- load();
- m_pConfig->setReadDefaults(old);
- m_pAdvancedAddBookmarkCheckBox->setChecked(false);
- m_pOnlyMarkedBookmarksCheckBox->setChecked(false);
+ load( true );
}
void KMiscHTMLOptions::save()
--- branches/KDE/3.5/kdebase/kcontrol/konqhtml/htmlopts.h #575752:575753
@@ -37,6 +37,7 @@
KMiscHTMLOptions(KConfig *config, QString group, QWidget *parent = 0L, const \
char *name = 0L ); ~KMiscHTMLOptions();
virtual void load();
+ virtual void load( bool useDefaults );
virtual void save();
virtual void defaults();
--- branches/KDE/3.5/kdebase/kcontrol/konqhtml/javaopts.cpp #575752:575753
@@ -181,6 +181,13 @@
void KJavaOptions::load()
{
+ load( false );
+}
+
+void KJavaOptions::load(bool useDefaults)
+{
+ m_pConfig->setReadDefaults( useDefaults );
+
// *** load ***
java_global_policies.load();
bool bJavaGlobal = java_global_policies.isFeatureEnabled();
@@ -219,21 +226,12 @@
serverTimeoutSB->setValue( serverTimeout );
toggleJavaControls();
- emit changed( false );
+ emit changed( useDefaults );
}
void KJavaOptions::defaults()
{
- java_global_policies.defaults();
- enableJavaGloballyCB->setChecked( false );
- javaSecurityManagerCB->setChecked( true );
- useKioCB->setChecked( false );
- pathED->lineEdit()->setText( "java" );
- addArgED->setText( "" );
- enableShutdownCB->setChecked(true);
- serverTimeoutSB->setValue( 60 );
- toggleJavaControls();
- emit changed( true );
+ load( true );
}
void KJavaOptions::save()
--- branches/KDE/3.5/kdebase/kcontrol/konqhtml/javaopts.h #575752:575753
@@ -92,6 +92,7 @@
KJavaOptions( KConfig* config, QString group, QWidget* parent = 0, const char* \
name = 0 );
virtual void load();
+ virtual void load( bool useDefaults );
virtual void save();
virtual void defaults();
--- branches/KDE/3.5/kdebase/kcontrol/konqhtml/jsopts.cpp #575752:575753
@@ -103,9 +103,15 @@
load();
}
-
void KJavaScriptOptions::load()
{
+ load( false );
+}
+
+void KJavaScriptOptions::load( bool useDefaults )
+{
+ m_pConfig->setReadDefaults( useDefaults );
+
// *** load ***
m_pConfig->setGroup(m_groupname);
@@ -125,18 +131,13 @@
js_global_policies.isFeatureEnabled());
reportErrorsCB->setChecked( \
m_pConfig->readBoolEntry("ReportJavaScriptErrors",false));
jsDebugWindow->setChecked( m_pConfig->readBoolEntry( \
"EnableJavaScriptDebug",false ) );
-// js_popup->setButton( m_pConfig->readUnsignedNumEntry("WindowOpenPolicy", 0) );
- emit changed(false);
+
+ emit changed(useDefaults);
}
void KJavaScriptOptions::defaults()
{
- js_policies_frame->defaults();
- enableJavaScriptGloballyCB->setChecked(
- js_global_policies.isFeatureEnabled());
- reportErrorsCB->setChecked( false );
- jsDebugWindow->setChecked( false );
- emit changed(true);
+ load( true );
}
void KJavaScriptOptions::save()
--- branches/KDE/3.5/kdebase/kcontrol/konqhtml/jsopts.h #575752:575753
@@ -61,6 +61,7 @@
KJavaScriptOptions( KConfig* config, QString group, QWidget* parent = 0, const \
char* name = 0 );
virtual void load();
+ virtual void load( bool useDefaults );
virtual void save();
virtual void defaults();
--- branches/KDE/3.5/kdebase/kcontrol/konqhtml/khttpoptdlg.cpp #575752:575753
@@ -37,15 +37,25 @@
load();
}
-
void KHTTPOptions::load()
{
+ load( false );
+}
+
+void KHTTPOptions::load( bool useDefaults )
+{
QString tmp;
+
+ m_pConfig->setReadDefaults( useDefaults );
+
m_pConfig->setGroup( "Browser Settings/HTTP" );
tmp = m_pConfig->readEntry( \
"AcceptLanguages",KGlobal::locale()->languageList().join(",")); \
le_languages->setText( tmp ); tmp = m_pConfig->readEntry( \
"AcceptCharsets",defaultCharsets); le_charsets->setText( tmp );
+
+ emit changed( useDefaults );
+
}
void KHTTPOptions::save()
@@ -58,8 +68,7 @@
void KHTTPOptions::defaults()
{
- le_languages->setText( KGlobal::locale()->languageList().join(",") );
- le_charsets->setText( defaultCharsets );
+ load( true );
}
--- branches/KDE/3.5/kdebase/kcontrol/konqhtml/khttpoptdlg.h #575752:575753
@@ -22,6 +22,7 @@
KHTTPOptions(KConfig *config, QString group, QWidget *parent = 0L, const char \
*name = 0L);
virtual void load();
+ virtual void load( bool useDefaults );
virtual void save();
virtual void defaults();
--- branches/KDE/3.5/kdebase/kcontrol/konqhtml/pluginopts.cpp #575752:575753
@@ -170,9 +170,15 @@
priorityLabel->setText(i18n("CPU priority for plugins: %1").arg(level));
}
-
void KPluginOptions::load()
{
+ load( false );
+}
+
+void KPluginOptions::load( bool useDefaults )
+{
+
+
// *** load ***
global_policies.load();
bool bPluginGlobal = global_policies.isFeatureEnabled();
@@ -186,6 +192,8 @@
KConfig *config = new KConfig("kcmnspluginrc", true);
+ config->setReadDefaults( useDefaults );
+
config->setGroup("Misc");
m_widget->scanAtStartup->setChecked( config->readBoolEntry( "startkdeScan", false \
) );
@@ -204,33 +212,12 @@
delete config;
- change( false );
+ emit changed( useDefaults );
}
void KPluginOptions::defaults()
{
- global_policies.defaults();
- enablePluginsGloballyCB->setChecked( global_policies.isFeatureEnabled() );
- enableHTTPOnly->setChecked(false);
- enableUserDemand->setChecked(false);
- priority->setValue(100);
-
-/*****************************************************************************/
-
- KConfig *config = new KConfig( QString::null, true, false );
-
- m_widget->scanAtStartup->setChecked( false );
-
- m_widget->dirEdit->setURL("");
- m_widget->dirEdit->setEnabled( false );
- m_widget->dirRemove->setEnabled( false );
-
- dirLoad( config );
- pluginLoad( config );
-
- delete config;
-
- change();
+ load( true );
}
void KPluginOptions::save()
--- branches/KDE/3.5/kdebase/kcontrol/konqhtml/pluginopts.h #575752:575753
@@ -99,6 +99,7 @@
~KPluginOptions();
virtual void load();
+ virtual void load( bool useDefaults );
virtual void save();
virtual void defaults();
QString quickHelp() const;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic