[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/KDE/3.5/kdebase/kcontrol/konq
From: Helio Chissini de Castro <helio () conectiva ! com ! br>
Date: 2006-08-22 0:48:09
Message-ID: 1156207689.684259.19517.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 575744 by helio:
- Setting module to use system defaults
M +10 -18 behaviour.cpp
M +1 -0 behaviour.h
M +12 -15 desktop.cpp
M +1 -0 desktop.h
M +7 -17 desktopbehavior_impl.cpp
M +1 -0 desktopbehavior_impl.h
M +10 -27 fontopts.cpp
M +1 -0 fontopts.h
M +15 -8 rootopts.cpp
M +1 -0 rootopts.h
--- branches/KDE/3.5/kdebase/kcontrol/konq/behaviour.cpp #575743:575744
@@ -181,6 +181,13 @@
void KBehaviourOptions::load()
{
+ load( false );
+}
+
+void KBehaviourOptions::load( bool useDefaults )
+{
+ g_pConfig->setReadDefaults( useDefaults );
+
g_pConfig->setGroup( groupname );
cbNewWin->setChecked( g_pConfig->readBoolEntry("AlwaysNewWin", false) );
updateWinPixmap(cbNewWin->isChecked());
@@ -213,28 +220,13 @@
g_pConfig->setGroup( "Trash" );
cbMoveToTrash->setChecked( g_pConfig->readBoolEntry("ConfirmTrash", DEFAULT_CONFIRMTRASH) );
cbDelete->setChecked( g_pConfig->readBoolEntry("ConfirmDelete", DEFAULT_CONFIRMDELETE) );
+
+ emit changed( useDefaults );
}
void KBehaviourOptions::defaults()
{
- cbNewWin->setChecked(false);
-
- homeURL->setURL("~");
-
- cbListProgress->setChecked( false );
-
- cbShowTips->setChecked( true );
- //sbToolTip->setEnabled( true );
- //sbToolTip->setValue( 6 );
-
- cbShowPreviewsInTips->setChecked( true );
- cbShowPreviewsInTips->setEnabled( true );
-
- cbRenameDirectlyIcon->setChecked( DEFAULT_RENAMEICONDIRECTLY );
-
- cbMoveToTrash->setChecked( DEFAULT_CONFIRMTRASH );
- cbDelete->setChecked( DEFAULT_CONFIRMDELETE );
- cbShowDeleteCommand->setChecked( false );
+ load( true );
}
void KBehaviourOptions::save()
--- branches/KDE/3.5/kdebase/kcontrol/konq/behaviour.h #575743:575744
@@ -40,6 +40,7 @@
KBehaviourOptions(KConfig *config, QString group, QWidget *parent=0, const char *name=0);
~KBehaviourOptions();
virtual void load();
+ virtual void load( bool useDefaults );
virtual void save();
virtual void defaults();
--- branches/KDE/3.5/kdebase/kcontrol/konq/desktop.cpp #575743:575744
@@ -148,6 +148,11 @@
void KDesktopConfig::load()
{
+ load( false );
+}
+
+void KDesktopConfig::load( bool useDefaults )
+{
// get number of desktops
NETRootInfo info( qt_xdisplay(), NET::NumberOfDesktops | NET::DesktopNames );
int n = info.numberOfDesktops();
@@ -175,15 +180,20 @@
configfile.sprintf("kdesktop-screen-%drc", konq_screen_number);
KConfig *config = new KConfig(configfile, false, false);
+
+ config->setReadDefaults( useDefaults );
+
config->setGroup("Mouse Buttons");
_wheelOption->setChecked(config->readBoolEntry("WheelSwitchesWorkspace",false));
_wheelOptionImmutable = config->entryIsImmutable("WheelSwitchesWorkspace");
if (_wheelOptionImmutable || n<2)
- _wheelOption->setEnabled(false);
+ _wheelOption->setEnabled( false );
delete config;
+
+ emit changed( useDefaults );
}
void KDesktopConfig::save()
@@ -228,20 +238,7 @@
void KDesktopConfig::defaults()
{
- int n = 4;
- _numInput->setValue(n);
-
- for(int i = 0; i < maxDesktops; i++)
- _nameInput[i]->setText(i18n("Desktop %1").arg(i+1));
-
- for(int i = 0; i < maxDesktops; i++)
- _nameInput[i]->setEnabled(i < n);
-
- _wheelOption->setChecked(false);
- if (!_wheelOptionImmutable)
- _wheelOption->setEnabled(true);
-
- emit changed(false);
+ load( true );
}
void KDesktopConfig::slotValueChanged(int n)
--- branches/KDE/3.5/kdebase/kcontrol/konq/desktop.h #575743:575744
@@ -38,6 +38,7 @@
KDesktopConfig(QWidget *parent = 0L, const char *name = 0L);
void load();
+ void load( bool useDefaults );
void save();
void defaults();
--- branches/KDE/3.5/kdebase/kcontrol/konq/desktopbehavior_impl.cpp #575743:575744
@@ -277,6 +277,12 @@
void DesktopBehavior::load()
{
+ load( false );
+}
+
+void DesktopBehavior::load( bool useDefaults )
+{
+ g_pConfig->setReadDefaults( useDefaults );
g_pConfig->setGroup( "Desktop Icons" );
bool bShowHidden = g_pConfig->readBoolEntry("ShowHidden", DEFAULT_SHOW_HIDDEN_ROOT_ICONS);
showHiddenBox->setChecked(bShowHidden);
@@ -330,23 +336,7 @@
void DesktopBehavior::defaults()
{
- showHiddenBox->setChecked(DEFAULT_SHOW_HIDDEN_ROOT_ICONS);
- for (QListViewItem *item = previewListView->firstChild(); item; item = item->nextSibling())
- static_cast<DesktopBehaviorPreviewItem *>(item)->setOn(false);
- desktopMenuGroup->setButton( 0 );
- vrootBox->setChecked( false );
- autoLineupIconsBox->setChecked( true );
- leftComboBox->setCurrentItem( NOTHING );
- middleComboBox->setCurrentItem( WINDOWLISTMENU );
- rightComboBox->setCurrentItem( DESKTOPMENU );
- iconsEnabledBox->setChecked(true);
- autoLineupIconsBox->setChecked(false);
- toolTipBox->setChecked(true);
- if (m_bHasMedia)
- fillMediaListView();
-
- comboBoxChanged();
- enableChanged();
+ load( true );
}
--- branches/KDE/3.5/kdebase/kcontrol/konq/desktopbehavior_impl.h #575743:575744
@@ -31,6 +31,7 @@
public:
DesktopBehavior(KConfig *config, QWidget *parent = 0L, const char *name = 0L );
virtual void load();
+ virtual void load( bool useDefaults );
virtual void save();
virtual void defaults();
virtual QString quickHelp() const;
--- branches/KDE/3.5/kdebase/kcontrol/konq/fontopts.cpp #575743:575744
@@ -230,8 +230,15 @@
void KonqFontOptions::load()
{
- g_pConfig->setGroup(groupname);
+ load( false );
+}
+void KonqFontOptions::load( bool useDefaults )
+{
+ g_pConfig->setReadDefaults( useDefaults );
+
+ g_pConfig->setGroup(groupname);
+
QFont stdFont = g_pConfig->readFontEntry( "StandardFont" );
m_stdName = stdFont.family();
m_fSize = stdFont.pointSize();
@@ -280,36 +287,12 @@
cfg.setGroup("DesktopIcons");
updateGUI();
- emit KCModule::changed( false );
+ emit changed( useDefaults );
}
void KonqFontOptions::defaults()
{
- QFont stdFont = KGlobalSettings::generalFont();
- m_stdName = stdFont.family();
- m_fSize = stdFont.pointSize();
- // we have to use QFontInfo, in case the font was specified with a pixel size
- if ( m_fSize == -1 )
- m_fSize = QFontInfo(stdFont).pointSize();
-
- normalTextColor = KGlobalSettings::textColor();
- m_pNormalText->setColor( normalTextColor );
-
- //highlightedTextColor = KGlobalSettings::highlightedTextColor();
- //m_pHighlightedText->setColor( highlightedTextColor );
- if ( m_bDesktop )
- {
- m_cbTextBackground->setChecked(false);
- m_pTextBackground->setEnabled(false);
- }
- else
- {
- m_pNbLines->setValue( DEFAULT_TEXTHEIGHT );
- m_pNbWidth->setValue( DEFAULT_TEXTWIDTH_MULTICOLUMN );
- m_pSizeInBytes->setChecked( DEFAULT_FILESIZEINBYTES );
- }
- cbUnderline->setChecked( DEFAULT_UNDERLINELINKS );
- updateGUI();
+ load( true );
}
void KonqFontOptions::updateGUI()
--- branches/KDE/3.5/kdebase/kcontrol/konq/fontopts.h #575743:575744
@@ -57,6 +57,7 @@
QString quickHelp() const;
virtual void load();
+ virtual void load( bool readDefaults );
virtual void save();
virtual void defaults();
--- branches/KDE/3.5/kdebase/kcontrol/konq/rootopts.cpp #575743:575744
@@ -122,19 +122,26 @@
void DesktopPathConfig::load()
{
+ load( false );
+}
+
+void DesktopPathConfig::load( bool useDefaults )
+{
+ KConfig config("kdeglobals", true, false);
// Desktop Paths
- urDesktop->setURL( KGlobalSettings::desktopPath() );
- urAutostart->setURL( KGlobalSettings::autostartPath() );
- urDocument->setURL( KGlobalSettings::documentPath() );
- changed();
+ config.setReadDefaults( useDefaults );
+
+ config.setGroup("Paths");
+ urDesktop->setURL( config.readPathEntry( "Desktop" , KGlobalSettings::desktopPath() ));
+ urAutostart->setURL( config.readPathEntry( "Autostart" , KGlobalSettings::autostartPath() ));
+ urDocument->setURL( config.readPathEntry( "Documents", KGlobalSettings::documentPath() ));
+
+ emit changed( useDefaults );
}
void DesktopPathConfig::defaults()
{
- // Desktop Paths - keep defaults in sync with kglobalsettings.cpp
- urDesktop->setURL( QDir::homeDirPath() + "/Desktop/" );
- urAutostart->setURL( KGlobal::dirs()->localkdedir() + "Autostart/" );
- urDocument->setURL( QDir::homeDirPath() );
+ load( true );
}
void DesktopPathConfig::save()
--- branches/KDE/3.5/kdebase/kcontrol/konq/rootopts.h #575743:575744
@@ -39,6 +39,7 @@
public:
DesktopPathConfig(QWidget *parent = 0L, const char *name = 0L );
virtual void load();
+ virtual void load( bool useDefaults );
virtual void save();
virtual void defaults();
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic