Attachment #48951 for bug #114951

View | Details | Raw Unified | Return to bug 114951
Collapse All | Expand All




     * Creates a list of "icon" elements based on:
     * @param group The group in the KConfig object @p cfg
     * @param object Specifier (similiar, but not identical to @p group)
     * @param defsize default icon size
     * @param parent Parent element to append to
     * @param cfg The KConfig object to work with
     */
    void createIconElems( const QString & group, const QString & object,
                          int defsize, QDomElement parent, KConfig * cfg );

    /**
     * Creates a color DOM element @p name, with a specifier @p object,

Return to bug 114951

Lines 155-165 private: Link Here

(-)kcontrol/kthememanager/ktheme.h.sav (-1 / +2 lines)
155	* Creates a list of "icon" elements based on:	155	* Creates a list of "icon" elements based on:
156	* @param group The group in the KConfig object @p cfg	156	* @param group The group in the KConfig object @p cfg
157	* @param object Specifier (similiar, but not identical to @p group)	157	* @param object Specifier (similiar, but not identical to @p group)
		158	* @param defsize default icon size
158	* @param parent Parent element to append to	159	* @param parent Parent element to append to
159	* @param cfg The KConfig object to work with	160	* @param cfg The KConfig object to work with
160	*/	161	*/
161	void createIconElems( const QString & group, const QString & object,	162	void createIconElems( const QString & group, const QString & object,
162	QDomElement parent, KConfig * cfg );	163	int defsize, QDomElement parent, KConfig * cfg );
163		164
164	/**	165	/**
165	* Creates a color DOM element @p name, with a specifier @p object,	166	* Creates a color DOM element @p name, with a specifier @p object,

Lines 188-198 QString KTheme::createYourself( bool pac Link Here

(-)kcontrol/kthememanager/ktheme.cpp.sav (-7 / +9 lines)
188	globalConf->setGroup( "Icons" );	188	globalConf->setGroup( "Icons" );
189	QDomElement iconElem = m_dom.createElement( "icons" );	189	QDomElement iconElem = m_dom.createElement( "icons" );
190	iconElem.setAttribute( "name", globalConf->readEntry( "Theme",KIconTheme::current() ) );	190	iconElem.setAttribute( "name", globalConf->readEntry( "Theme",KIconTheme::current() ) );
191	createIconElems( "DesktopIcons", "desktop", iconElem, globalConf );	191	createIconElems( "DesktopIcons", "desktop", 32, iconElem, globalConf );
192	createIconElems( "MainToolbarIcons", "mainToolbar", iconElem, globalConf );	192	createIconElems( "MainToolbarIcons", "mainToolbar", 22, iconElem, globalConf );
193	createIconElems( "PanelIcons", "panel", iconElem, globalConf );	193	createIconElems( "PanelIcons", "panel", 32, iconElem, globalConf );
194	createIconElems( "SmallIcons", "small", iconElem, globalConf );	194	createIconElems( "SmallIcons", "small", 16, iconElem, globalConf );
195	createIconElems( "ToolbarIcons", "toolbar", iconElem, globalConf );	195	createIconElems( "ToolbarIcons", "toolbar", 22, iconElem, globalConf );
196	m_root.appendChild( iconElem );	196	m_root.appendChild( iconElem );
197		197
198	// 4. Sounds	198	// 4. Sounds
Lines 702-708 QString KTheme::getProperty( QDomElement Link Here
702	}	702	}
703		703
704	void KTheme::createIconElems( const QString & group, const QString & object,	704	void KTheme::createIconElems( const QString & group, const QString & object,
705	QDomElement parent, KConfig * cfg )	705	int defsize, QDomElement parent, KConfig * cfg )
706	{	706	{
707	cfg->setGroup( group );	707	cfg->setGroup( group );
708	QStringList elemNames;	708	QStringList elemNames;
Lines 721-727 void KTheme::createIconElems( const QStr Link Here
721	QDomElement tmpCol = m_dom.createElement( *it );	721	QDomElement tmpCol = m_dom.createElement( *it );
722	tmpCol.setAttribute( "object", object );	722	tmpCol.setAttribute( "object", object );
723		723
724	if ( (it).contains( "Value" ) \|\| it == "Size" )	724	if ( *it == "Size" )
		725	tmpCol.setAttribute( "value", cfg->readNumEntry( *it, defsize ) );
		726	else if ( (*it).contains( "Value" ))
725	tmpCol.setAttribute( "value", cfg->readNumEntry( *it, 1 ) );	727	tmpCol.setAttribute( "value", cfg->readNumEntry( *it, 1 ) );
726	else if ( (*it).contains( "Effect" ) )	728	else if ( (*it).contains( "Effect" ) )
727	tmpCol.setAttribute( "name", cfg->readEntry( *it, "none" ) );	729	tmpCol.setAttribute( "name", cfg->readEntry( *it, "none" ) );