| -rw-r--r-- | microkde/kcolordialog.cpp | 1 | ||||
| -rw-r--r-- | microkde/kdeui/ktoolbar.cpp | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/microkde/kcolordialog.cpp b/microkde/kcolordialog.cpp index 9a76e5e..a3d8973 100644 --- a/microkde/kcolordialog.cpp +++ b/microkde/kcolordialog.cpp @@ -54,39 +54,40 @@ KColorDialog::KColorDialog( QWidget *p ):QDialog( p, "input-dialog", true ) lay->addMultiCellWidget( hb,1,1, 0,1 ); QLabel* lr = new QLabel ( "Red:", this ); lay->addWidget( lr,2,0 ); r = new QSlider ( 0, 255, 1, 1, Horizontal, this ); lay->addWidget(r ,2,1 ); QLabel* lg = new QLabel( "Green:",this ); lay->addWidget(lg ,3,0 ); g = new QSlider ( 0, 255, 1, 1, Horizontal, this ); lay->addWidget( g ,3,1 ); QLabel* lb = new QLabel ( "Blue:",this ); lay->addWidget( lb,4,0 ); b = new QSlider ( 0, 255, 1, 1, Horizontal, this ); lay->addWidget(b ,4,1 ); QColor d = backgroundColor(); r->setValue(d.red() ); g->setValue(d.green() ); b->setValue(d.blue() ); old_color->setPalette( QPalette( d.dark() , d ) ); // kannst du wieder reinnehmen, aber es geht auch so. QPushButton * ok = new QPushButton (i18n(" OK "), this ); + ok->setDefault( true ); QPushButton * cancel = new QPushButton (i18n(" Cancel "), this ); lay->addWidget(ok ,5,0 ); lay->addWidget(cancel ,5,1 ); connect (ok, SIGNAL( clicked() ), this ,SLOT (accept() )); connect (cancel, SIGNAL( clicked() ), this ,SLOT (reject() )); connect (r, SIGNAL( valueChanged ( int ) ), this ,SLOT (updateColor( int ) )); connect (g, SIGNAL( valueChanged ( int ) ), this ,SLOT (updateColor( int ) )); connect (b, SIGNAL( valueChanged ( int ) ), this ,SLOT (updateColor( int ) )); } void KColorDialog::updateColor( int ) { QColor c = getColor( ) ; new_color->setPalette( QPalette( c.dark(), c ) ); } diff --git a/microkde/kdeui/ktoolbar.cpp b/microkde/kdeui/ktoolbar.cpp index 35d4916..36ede81 100644 --- a/microkde/kdeui/ktoolbar.cpp +++ b/microkde/kdeui/ktoolbar.cpp @@ -1140,48 +1140,49 @@ void KToolBar::saveState() */ // if that didn't work, we save to the config file KConfig *config = KGlobal::config(); saveSettings(config, QString::null); config->sync(); } QString KToolBar::settingsGroup() { QString configGroup; if (!::qstrcmp(name(), "unnamed") || !::qstrcmp(name(), "mainToolBar")) configGroup = "Toolbar style"; else configGroup = QString(name()) + " Toolbar style"; if ( this->mainWindow() ) { configGroup.prepend(" "); configGroup.prepend( this->mainWindow()->name() ); } return configGroup; } void KToolBar::saveSettings(KConfig *config, const QString &_configGroup) { + return; QString configGroup = _configGroup; if (configGroup.isEmpty()) configGroup = settingsGroup(); //kdDebug(220) << "KToolBar::saveSettings group=" << _configGroup << " -> " << configGroup << endl; QString position, icontext; int index; getAttributes( position, icontext, index ); //kdDebug(220) << "KToolBar::saveSettings " << name() << " newLine=" << newLine << endl; KConfigGroupSaver saver(config, configGroup); if ( position != d->PositionDefault ) config->writeEntry("Position", position); else config->deleteEntry("Position"); if ( icontext != d->IconTextDefault ) config->writeEntry("IconText", icontext); else config->deleteEntry("IconText"); if ( iconSize() != d->IconSizeDefault ) @@ -1583,48 +1584,49 @@ bool KToolBar::transparentSetting() { QString grpToolbar(QString::fromLatin1("Toolbar style")); KConfigGroupSaver saver(KGlobal::config(), grpToolbar); return KGlobal::config()->readBoolEntry(QString::fromLatin1("TransparentMoving"),true); } //static KToolBar::IconText KToolBar::iconTextSetting() { QString grpToolbar(QString::fromLatin1("Toolbar style")); KConfigGroupSaver saver(KGlobal::config(), grpToolbar); QString icontext = KGlobal::config()->readEntry(QString::fromLatin1("IconText"),QString::fromLatin1("IconOnly")); if ( icontext == "IconTextRight" ) return IconTextRight; else if ( icontext == "IconTextBottom" ) return IconTextBottom; else if ( icontext == "TextOnly" ) return TextOnly; else return IconOnly; } void KToolBar::applyAppearanceSettings(KConfig *config, const QString &_configGroup, bool forceGlobal) { + return; QString configGroup = _configGroup.isEmpty() ? settingsGroup() : _configGroup; //kdDebug(220) << "KToolBar::applyAppearanceSettings: configGroup=" << configGroup << endl; // We have application-specific settings in the XML file, // and nothing in the application's config file // -> don't apply the global defaults, the XML ones are preferred // See applySettings for a full explanation /*US :we do not support xml files if ( d->m_xmlguiClient && !d->m_xmlguiClient->xmlFile().isEmpty() && !config->hasGroup(configGroup) ) { //kdDebug(220) << "skipping global defaults, using XML ones instead" << endl; return; } */ if ( !config->hasGroup(configGroup) ) { //kdDebug(220) << "skipping global defaults, using XML ones instead" << endl; return; } KConfig *gconfig = KGlobal::config(); /*US static const QString &attrIconText = KGlobal::staticQString("IconText"); |