[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdebase/kcontrol/locale
From:       Helio Chissini de Castro <helio () conectiva ! com ! br>
Date:       2006-08-22 2:00:23
Message-ID: 1156212023.705694.24621.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 575761 by helio:

- Setting module to use system defaults

 M  +12 -11    toplevel.cpp  
 M  +1 -0      toplevel.h  


--- branches/KDE/3.5/kdebase/kcontrol/locale/toplevel.cpp #575760:575761
@@ -155,12 +155,18 @@
 
 void KLocaleApplication::load()
 {
-  m_globalConfig->reparseConfiguration();
-  *m_locale = KLocale(QString::fromLatin1("kcmlocale"), m_globalConfig);
+	load( false );
+}
 
-  emit localeChanged();
-  emit languageChanged();
-  emit changed(false);
+void KLocaleApplication::load( bool useDefaults )
+{
+	m_globalConfig->setReadDefaults( useDefaults );
+	m_globalConfig->reparseConfiguration();
+	*m_locale = KLocale(QString::fromLatin1("kcmlocale"), m_globalConfig);
+	
+	emit localeChanged();
+	emit languageChanged();
+	emit changed(useDefaults);
 }
 
 void KLocaleApplication::save()
@@ -202,12 +208,7 @@
 
 void KLocaleApplication::defaults()
 {
-  *m_locale = KLocale(QString::fromLatin1("kcmlocale"), m_nullConfig);
-
-  kdDebug() << "defaults: " << m_locale->languageList() << endl;
-
-  emit localeChanged();
-  emit languageChanged();
+	load( true );
 }
 
 QString KLocaleApplication::quickHelp() const
--- branches/KDE/3.5/kdebase/kcontrol/locale/toplevel.h #575760:575761
@@ -49,6 +49,7 @@
   virtual ~KLocaleApplication();
 
   virtual void load();
+  virtual void load(bool useDefault);
   virtual void save();
   virtual void defaults();
   virtual QString quickHelp() const;
[prev in list] [next in list] [prev in thread] [next in thread]