Menu
▾
▴
[Krusader-commits] krusader_kde3/krusader/Konfigurator kgcolors.cpp,NONE,1.1 kgcolors.h,NONE,1.1 Makefile.am,1.3,1.4 konfigurator.cpp,1.9,1.10 konfiguratoritems.cpp,1.6,1.7 konfiguratoritems.h,1.4,1.5
|
From: Karai C. <ck...@us...> - 2004-03-19 23:07:48
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Konfigurator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27280/krusader_kde3/krusader/Konfigurator Modified Files: Makefile.am konfigurator.cpp konfiguratoritems.cpp konfiguratoritems.h Added Files: kgcolors.cpp kgcolors.h Log Message: ADDED: scratch color konfigurator Index: Makefile.am =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Konfigurator/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.am 5 Feb 2004 20:30:45 -0000 1.3 --- Makefile.am 19 Mar 2004 22:57:57 -0000 1.4 *************** *** 6,13 **** libKonfigurator_a_METASOURCES = AUTO ! libKonfigurator_a_SOURCES = kgdependencies.cpp konfiguratorpage.cpp konfiguratoritems.cpp konfigurator.cpp kgwelcome.cpp kgstartup.cpp kglookfeel.cpp kggeneral.cpp kgarchives.cpp kgadvanced.cpp ! EXTRA_DIST = kgadvanced.cpp kgadvanced.h kgarchives.cpp kgarchives.h kggeneral.cpp kggeneral.h kglookfeel.cpp kglookfeel.h kgstartup.cpp kgstartup.h kgwelcome.cpp kgwelcome.h konfigurator.cpp konfigurator.h konfiguratoritems.cpp konfiguratoritems.h konfiguratorpage.cpp konfiguratorpage.h kgdependencies.h kgdependencies.cpp ####### kdevelop will overwrite this part!!! (end)############ --- 6,13 ---- libKonfigurator_a_METASOURCES = AUTO ! libKonfigurator_a_SOURCES = kgcolors.cpp kgdependencies.cpp konfiguratorpage.cpp konfiguratoritems.cpp konfigurator.cpp kgwelcome.cpp kgstartup.cpp kglookfeel.cpp kggeneral.cpp kgarchives.cpp kgadvanced.cpp ! EXTRA_DIST = kgadvanced.cpp kgadvanced.h kgarchives.cpp kgarchives.h kggeneral.cpp kggeneral.h kglookfeel.cpp kglookfeel.h kgstartup.cpp kgstartup.h kgwelcome.cpp kgwelcome.h konfigurator.cpp konfigurator.h konfiguratoritems.cpp konfiguratoritems.h konfiguratorpage.cpp konfiguratorpage.h kgdependencies.h kgdependencies.cpp kgcolors.cpp kgcolors.h ####### kdevelop will overwrite this part!!! (end)############ Index: konfiguratoritems.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Konfigurator/konfiguratoritems.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** konfiguratoritems.h 17 Mar 2004 20:47:37 -0000 1.4 --- konfiguratoritems.h 19 Mar 2004 22:57:57 -0000 1.5 *************** *** 329,332 **** --- 329,334 ---- void setDefaultColor( QColor dflt ); + void setDefaultText( QString text ); + QColor getColor(); public slots: --- NEW FILE: kgcolors.h --- /*************************************************************************** kgcolors.h - description ------------------- copyright : (C) 2004 by Csaba Karai e-mail : kru...@us... web site : http://krusader.sourceforge.net --------------------------------------------------------------------------- Description *************************************************************************** A db dD d8888b. db db .d8888. .d8b. d8888b. d88888b d8888b. 88 ,8P' 88 `8D 88 88 88' YP d8' `8b 88 `8D 88' 88 `8D 88,8P 88oobY' 88 88 `8bo. 88ooo88 88 88 88ooooo 88oobY' 88`8b 88`8b 88 88 `Y8b. 88~~~88 88 88 88~~~~~ 88`8b 88 `88. 88 `88. 88b d88 db 8D 88 88 88 .8D 88. 88 `88. YP YD 88 YD ~Y8888P' `8888Y' YP YP Y8888D' Y88888P 88 YD H e a d e r F i l e *************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * ***************************************************************************/ #ifndef __KGCOLORS_H__ #define __KGCOLORS_H__ #include "konfiguratorpage.h" class KgColors : public KonfiguratorPage { Q_OBJECT public: KgColors( bool first, QWidget* parent=0, const char* name=0 ); private: KonfiguratorColorChooser *foreground; KonfiguratorColorChooser *directoryForeground; KonfiguratorColorChooser *executableForeground; KonfiguratorColorChooser *symlinkForeground; KonfiguratorColorChooser *invalidSymlinkForeground; KonfiguratorColorChooser *markedForeground; KonfiguratorColorChooser *markedBackround; KonfiguratorColorChooser *currentForeground; KonfiguratorColorChooser *currentBackround; KonfiguratorColorChooser *backround; KonfiguratorColorChooser *alternateBackround; }; #endif /* __KGCOLORS_H__ */ Index: konfiguratoritems.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Konfigurator/konfiguratoritems.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** konfiguratoritems.cpp 17 Mar 2004 20:47:37 -0000 1.6 --- konfiguratoritems.cpp 19 Mar 2004 22:57:57 -0000 1.7 *************** *** 607,611 **** addColor( i18n("Custom color" ), QColor( 255, 255, 255 ) ); ! addColor( i18n("KDE default" ), defaultValue ); addColor( i18n("Red" ), Qt::red ); addColor( i18n("Green" ), Qt::green ); --- 607,611 ---- addColor( i18n("Custom color" ), QColor( 255, 255, 255 ) ); ! addColor( i18n("Default" ), defaultValue ); addColor( i18n("Red" ), Qt::red ); addColor( i18n("Green" ), Qt::green ); *************** *** 626,630 **** addColor( i18n("Black" ), Qt::black ); - connect( this, SIGNAL( highlighted(int) ), ext, SLOT( setChanged() ) ); connect( this, SIGNAL( activated(int) ), this, SLOT( slotCurrentChanged( int ) ) ); --- 626,629 ---- *************** *** 703,706 **** --- 702,710 ---- } + void KonfiguratorColorChooser::setDefaultText( QString text ) + { + changeItem( createPixmap( defaultValue ), text, 1 ); + } + void KonfiguratorColorChooser::slotApply(QObject *,QString cls, QString name) { *************** *** 736,738 **** --- 740,747 ---- } + QColor KonfiguratorColorChooser::getColor() + { + return palette[ currentItem() ]; + } + #include "konfiguratoritems.moc" --- NEW FILE: kgcolors.cpp --- /*************************************************************************** kgcolors.cpp - description ------------------- copyright : (C) 2004 by Csaba Karai e-mail : kru...@us... web site : http://krusader.sourceforge.net --------------------------------------------------------------------------- Description *************************************************************************** A db dD d8888b. db db .d8888. .d8b. d8888b. d88888b d8888b. 88 ,8P' 88 `8D 88 88 88' YP d8' `8b 88 `8D 88' 88 `8D 88,8P 88oobY' 88 88 `8bo. 88ooo88 88 88 88ooooo 88oobY' 88`8b 88`8b 88 88 `Y8b. 88~~~88 88 88 88~~~~~ 88`8b 88 `88. 88 `88. 88b d88 db 8D 88 88 88 .8D 88. 88 `88. YP YD 88 YD ~Y8888P' `8888Y' YP YP Y8888D' Y88888P 88 YD S o u r c e F i l e *************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * ***************************************************************************/ #include "kgcolors.h" #include "../defaults.h" #include <klocale.h> #include <kglobalsettings.h> KgColors::KgColors( bool first, QWidget* parent, const char* name ) : KonfiguratorPage( first, parent, name ) { QGridLayout *kgColorsLayout = new QGridLayout( parent ); kgColorsLayout->setSpacing( 6 ); kgColorsLayout->setMargin( 11 ); // -------------------------- GENERAL GROUPBOX ---------------------------------- QGroupBox *generalGrp = createFrame( i18n( "General" ), parent, "kgColorsGeneralGrp" ); QGridLayout *generalGrid = createGridLayout( generalGrp->layout() ); KONFIGURATOR_CHECKBOX_PARAM generalSettings[] = // cfg_class cfg_name default text restart tooltip {{"Colors","KDE Default", _KDEDefaultColors, i18n( "Use the default colors of KDE" ), true , "" }, {"Colors","Enable Alternate Background", _AlternateBackground, i18n( "Use alternate backround color" ), true , "" }}; KonfiguratorCheckBoxGroup *generals = createCheckBoxGroup( 1, 0, generalSettings, 2, generalGrp ); generalGrid->addWidget( generals, 1, 0 ); kgColorsLayout->addWidget( generalGrp, 0 ,0 ); // -------------------------- COLORS GROUPBOX ---------------------------------- QGroupBox *colorsGrp = createFrame( i18n( "Colors" ), parent, "kgColorsColorsGrp" ); QGridLayout *colorsGrid = createGridLayout( colorsGrp->layout() ); colorsGrid->setSpacing( 1 ); addLabel( colorsGrid, 0, 0, i18n( "Foreground:" ), colorsGrp, "ColorsLabel1" ); foreground = createColorChooser( "Colors", "Foreground", KGlobalSettings::textColor(), colorsGrp, true ); colorsGrid->addWidget( foreground, 0, 1 ); addLabel( colorsGrid, 1, 0, i18n( "Directory foreground:" ), colorsGrp, "ColorsLabel2" ); directoryForeground = createColorChooser( "Colors", "Directory Foreground", foreground->getColor(), colorsGrp, true ); colorsGrid->addWidget( directoryForeground, 1, 1 ); addLabel( colorsGrid, 2, 0, i18n( "Executable foreground:" ), colorsGrp, "ColorsLabel3" ); executableForeground = createColorChooser( "Colors", "Executable Foreground", foreground->getColor(), colorsGrp, true ); colorsGrid->addWidget( executableForeground, 2, 1 ); addLabel( colorsGrid, 3, 0, i18n( "Symbolic link foreground:" ), colorsGrp, "ColorsLabel4" ); symlinkForeground = createColorChooser( "Colors", "Symlink Foreground", foreground->getColor(), colorsGrp, true ); colorsGrid->addWidget( symlinkForeground, 3, 1 ); addLabel( colorsGrid, 4, 0, i18n( "Invalid Symlink foreground:" ), colorsGrp, "ColorsLabel5" ); invalidSymlinkForeground = createColorChooser( "Colors", "Invalid Symlink Foreground", foreground->getColor(), colorsGrp, true ); colorsGrid->addWidget( invalidSymlinkForeground, 4, 1 ); addLabel( colorsGrid, 5, 0, i18n( "Marked foreground:" ), colorsGrp, "ColorsLabel6" ); markedForeground = createColorChooser( "Colors", "Marked Foreground", KGlobalSettings::highlightedTextColor(), colorsGrp, true ); colorsGrid->addWidget( markedForeground, 5, 1 ); addLabel( colorsGrid, 6, 0, i18n( "Marked background:" ), colorsGrp, "ColorsLabel7" ); markedBackround = createColorChooser( "Colors", "Marked Background", KGlobalSettings::highlightColor(), colorsGrp, true ); colorsGrid->addWidget( markedBackround, 6, 1 ); addLabel( colorsGrid, 7, 0, i18n( "Current foreground:" ), colorsGrp, "ColorsLabel8" ); currentForeground = createColorChooser( "Colors", "Current Foreground", Qt::white, colorsGrp, true ); currentForeground->setDefaultText( i18n( "Not used" ) ); colorsGrid->addWidget( currentForeground, 7, 1 ); addLabel( colorsGrid, 8, 0, i18n( "Current background:" ), colorsGrp, "ColorsLabel9" ); currentBackround = createColorChooser( "Colors", "Current Background", Qt::white, colorsGrp, true ); currentBackround->setDefaultText( i18n( "Not used" ) ); colorsGrid->addWidget( currentBackround, 8, 1 ); addLabel( colorsGrid, 9, 0, i18n( "Background:" ), colorsGrp, "ColorsLabel10" ); backround = createColorChooser( "Colors", "Background", KGlobalSettings::baseColor(), colorsGrp, true ); colorsGrid->addWidget( backround, 9, 1 ); addLabel( colorsGrid, 10, 0, i18n( "Alternate background:" ), colorsGrp, "ColorsLabel11" ); alternateBackround = createColorChooser( "Colors", "Alternate Background", KGlobalSettings::alternateBackgroundColor(), colorsGrp, true ); colorsGrid->addWidget( alternateBackround, 10, 1 ); kgColorsLayout->addWidget( colorsGrp, 1 ,0 ); } #include "kgcolors.moc" Index: konfigurator.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Konfigurator/konfigurator.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** konfigurator.cpp 9 Mar 2004 22:59:53 -0000 1.9 --- konfigurator.cpp 19 Mar 2004 22:57:57 -0000 1.10 *************** *** 52,55 **** --- 52,56 ---- #include "kgarchives.h" #include "kgdependencies.h" + #include "kgcolors.h" Konfigurator::Konfigurator(bool f) : KDialogBase(0,0,true,"Konfigurator", *************** *** 91,94 **** --- 92,98 ---- newContent(new KgLookFeel(firstTime, widget->addPage(i18n("Look & Feel"), i18n("Look & Feel"),QPixmap(krLoader->loadIcon("appearance",KIcon::Desktop,32))))); + // colors + newContent(new KgColors(firstTime, widget->addPage(i18n("Colors"), + i18n("Colors"),QPixmap(krLoader->loadIcon("colors",KIcon::Desktop,32))))); // general newContent(new KgGeneral(firstTime, widget->addPage(i18n("General"), |