krusader-commits

[Krusader-commits] krusader_kde3/krusader/Konfigurator kgcolors.cpp,1.12,1.13 kgcolors.h,1.7,1.8

[Karai C. <ck...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/Konfigurator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5883/krusader_kde3/krusader/Konfigurator

Modified Files:
	kgcolors.cpp kgcolors.h 
Log Message:

ADDED: color links


Index: kgcolors.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Konfigurator/kgcolors.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** kgcolors.cpp	29 Mar 2004 21:28:46 -0000	1.12
--- kgcolors.cpp	31 Mar 2004 18:47:25 -0000	1.13
***************
*** 89,93 ****
    colorsGrid->setMargin( 2 );
  
!   ADDITIONAL_COLOR transparent = { i18n("Transparent"), Qt::white, "transparent" };
  
    addColorSelector( "Foreground",                 i18n( "Foreground:" ),                  KGlobalSettings::textColor()                                                );
--- 89,93 ----
    colorsGrid->setMargin( 2 );
  
!   ADDITIONAL_COLOR transparent  = { i18n("Transparent"),       Qt::white, "transparent" };
  
    addColorSelector( "Foreground",                 i18n( "Foreground:" ),                  KGlobalSettings::textColor()                                                );
***************
*** 97,108 ****
    addColorSelector( "Invalid Symlink Foreground", i18n( "Invalid symlink foreground:" ),  getColorSelector( "Foreground" )->getColor(), i18n( "Same as foreground" )  );
    addColorSelector( "Background",                 i18n( "Background:" ),                  KGlobalSettings::baseColor()                                                );
!   addColorSelector( "Alternate Background",       i18n( "Alternate background:" ),        KGlobalSettings::alternateBackgroundColor()                                 );
    addColorSelector( "Marked Foreground",          i18n( "Marked foreground:" ),           KGlobalSettings::highlightedTextColor(), "", &transparent, 1                );
!   addColorSelector( "Marked Background",          i18n( "Marked background:" ),           KGlobalSettings::highlightColor()                                           );
!   addColorSelector( "Alternate Marked Background",i18n( "Alternate marked background:" ), getColorSelector( "Marked Background" )->getColor(), i18n( "Same as marked background" )  );
    addColorSelector( "Current Foreground",         i18n( "Current foreground:" ),          Qt::white,                                    i18n( "Not used" )            );
!   addColorSelector( "Current Background",         i18n( "Current background:" ),          Qt::white,                                    i18n( "Not used" )            );
  
    connect( getColorSelector( "Foreground" ), SIGNAL( colorChanged() ), this, SLOT( slotForegroundChanged() ) );
    connect( getColorSelector( "Marked Background" ), SIGNAL( colorChanged() ), this, SLOT( slotMarkedBackgroundChanged() ) );
  
--- 97,112 ----
    addColorSelector( "Invalid Symlink Foreground", i18n( "Invalid symlink foreground:" ),  getColorSelector( "Foreground" )->getColor(), i18n( "Same as foreground" )  );
    addColorSelector( "Background",                 i18n( "Background:" ),                  KGlobalSettings::baseColor()                                                );
!   ADDITIONAL_COLOR sameAsBckgnd = { i18n("Same as backgound"), getColorSelector( "Background" )->getColor(), "Background" };
!   addColorSelector( "Alternate Background",       i18n( "Alternate background:" ),        KGlobalSettings::alternateBackgroundColor(),"", &sameAsBckgnd, 1            );
    addColorSelector( "Marked Foreground",          i18n( "Marked foreground:" ),           KGlobalSettings::highlightedTextColor(), "", &transparent, 1                );
!   addColorSelector( "Marked Background",          i18n( "Marked background:" ),           KGlobalSettings::highlightColor(), "", &sameAsBckgnd, 1                     );
!   ADDITIONAL_COLOR sameAsAltern = { i18n("Same as alt. backgound"), getColorSelector( "Alternate Background" )->getColor(), "Alternate Background" };
!   addColorSelector( "Alternate Marked Background",i18n( "Alternate marked background:" ), getColorSelector( "Marked Background" )->getColor(), i18n( "Same as marked background" ), &sameAsAltern, 1 );
    addColorSelector( "Current Foreground",         i18n( "Current foreground:" ),          Qt::white,                                    i18n( "Not used" )            );
!   addColorSelector( "Current Background",         i18n( "Current background:" ),          Qt::white, i18n( "Not used" ), &sameAsBckgnd, 1                             );
  
    connect( getColorSelector( "Foreground" ), SIGNAL( colorChanged() ), this, SLOT( slotForegroundChanged() ) );
+   connect( getColorSelector( "Background" ), SIGNAL( colorChanged() ), this, SLOT( slotBackgroundChanged() ) );
+   connect( getColorSelector( "Alternate Background" ), SIGNAL( colorChanged() ), this, SLOT( slotAltBackgroundChanged() ) );
    connect( getColorSelector( "Marked Background" ), SIGNAL( colorChanged() ), this, SLOT( slotMarkedBackgroundChanged() ) );
  
***************
*** 117,132 ****
    
    addColorSelector( "Inactive Foreground",                  i18n( "Foreground:" ),                  getColorSelector( "Foreground" )->getColor(), i18n( "Same as active" ) );
!   addColorSelector( "Inactive Directory Foreground",        i18n( "Directory foreground:" ),        getColorSelector( "Directory Foreground" )->getColor(), i18n( "Same as active" ) );
!   addColorSelector( "Inactive Executable Foreground",       i18n( "Executable foreground:" ),       getColorSelector( "Executable Foreground" )->getColor(), i18n( "Same as active" ) );
!   addColorSelector( "Inactive Symlink Foreground",          i18n( "Symbolic link foreground:" ),    getColorSelector( "Symlink Foreground" )->getColor(), i18n( "Same as active" ) );
!   addColorSelector( "Inactive Invalid Symlink Foreground",  i18n( "Invalid symlink foreground:" ),  getColorSelector( "Invalid Symlink Foreground" )->getColor(), i18n( "Same as active" ) );
    addColorSelector( "Inactive Background",                  i18n( "Background:" ),                  getColorSelector( "Background" )->getColor(), i18n( "Same as active" ) );
!   addColorSelector( "Inactive Alternate Background",        i18n( "Alternate background:" ),        getColorSelector( "Alternate Background" )->getColor(), i18n( "Same as active" ) );
    addColorSelector( "Inactive Marked Foreground",           i18n( "Marked foreground:" ),           getColorSelector( "Marked Foreground" )->getColor(), i18n( "Same as active" ), &transparent, 1 );
!   addColorSelector( "Inactive Marked Background",           i18n( "Marked background:" ),           getColorSelector( "Marked Background" )->getColor(), i18n( "Same as active" ) );
!   addColorSelector( "Inactive Alternate Marked Background", i18n( "Alternate marked background:" ), getColorSelector( "Alternate Marked Background" )->getColor(), i18n( "Same as active" )  );
    addColorSelector( "Inactive Current Foreground",          i18n( "Current foreground:" ),          getColorSelector( "Current Foreground" )->getColor(), i18n( "Same as active" ) );
!   addColorSelector( "Inactive Current Background",          i18n( "Current background:" ),          getColorSelector( "Current Background" )->getColor(), i18n( "Same as active" ) );
  
    colorsFrameGrid->addWidget( colorTabWidget, 0, 0 );
    
--- 121,145 ----
    
    addColorSelector( "Inactive Foreground",                  i18n( "Foreground:" ),                  getColorSelector( "Foreground" )->getColor(), i18n( "Same as active" ) );
!   ADDITIONAL_COLOR sameAsInactForegnd = { i18n("Same as foregound"), getColorSelector( "Inactive Foreground" )->getColor(), "Inactive Foreground" };
!   addColorSelector( "Inactive Directory Foreground",        i18n( "Directory foreground:" ),        getColorSelector( "Directory Foreground" )->getColor(), i18n( "Same as active" ), &sameAsInactForegnd, 1 );
!   addColorSelector( "Inactive Executable Foreground",       i18n( "Executable foreground:" ),       getColorSelector( "Executable Foreground" )->getColor(), i18n( "Same as active" ), &sameAsInactForegnd, 1 );
!   addColorSelector( "Inactive Symlink Foreground",          i18n( "Symbolic link foreground:" ),    getColorSelector( "Symlink Foreground" )->getColor(), i18n( "Same as active" ), &sameAsInactForegnd, 1 );
!   addColorSelector( "Inactive Invalid Symlink Foreground",  i18n( "Invalid symlink foreground:" ),  getColorSelector( "Invalid Symlink Foreground" )->getColor(), i18n( "Same as active" ), &sameAsInactForegnd, 1 );
    addColorSelector( "Inactive Background",                  i18n( "Background:" ),                  getColorSelector( "Background" )->getColor(), i18n( "Same as active" ) );
!   ADDITIONAL_COLOR sameAsInactBckgnd = { i18n("Same as backgound"), getColorSelector( "Inactive Background" )->getColor(), "Inactive Background" };
!   addColorSelector( "Inactive Alternate Background",        i18n( "Alternate background:" ),        getColorSelector( "Alternate Background" )->getColor(), i18n( "Same as active" ), &sameAsInactBckgnd, 1 );
    addColorSelector( "Inactive Marked Foreground",           i18n( "Marked foreground:" ),           getColorSelector( "Marked Foreground" )->getColor(), i18n( "Same as active" ), &transparent, 1 );
!   addColorSelector( "Inactive Marked Background",           i18n( "Marked background:" ),           getColorSelector( "Marked Background" )->getColor(), i18n( "Same as active" ), &sameAsInactBckgnd, 1 );
!   ADDITIONAL_COLOR sameAsInactAltern[] = {{ i18n("Same as alt. backgound"), getColorSelector( "Inactive Alternate Background" )->getColor(), "Inactive Alternate Background" },
!                                           { i18n("Same as marked backgound"), getColorSelector( "Inactive Marked Background" )->getColor(), "Inactive Marked Background" } };
!   addColorSelector( "Inactive Alternate Marked Background", i18n( "Alternate marked background:" ), getColorSelector( "Alternate Marked Background" )->getColor(), i18n( "Same as active" ), sameAsInactAltern, 2 );
    addColorSelector( "Inactive Current Foreground",          i18n( "Current foreground:" ),          getColorSelector( "Current Foreground" )->getColor(), i18n( "Same as active" ) );
!   addColorSelector( "Inactive Current Background",          i18n( "Current background:" ),          getColorSelector( "Current Background" )->getColor(), i18n( "Same as active" ), &sameAsInactBckgnd, 1 );
  
+   connect( getColorSelector( "Inactive Foreground" ), SIGNAL( colorChanged() ), this, SLOT( slotInactiveForegroundChanged() ) );
+   connect( getColorSelector( "Inactive Background" ), SIGNAL( colorChanged() ), this, SLOT( slotInactiveBackgroundChanged() ) );
+   connect( getColorSelector( "Inactive Alternate Background" ), SIGNAL( colorChanged() ), this, SLOT( slotInactiveAltBackgroundChanged() ) );
+   connect( getColorSelector( "Inactive Marked Background" ), SIGNAL( colorChanged() ), this, SLOT( slotInactiveMarkedBackgroundChanged() ) );
+   
    colorsFrameGrid->addWidget( colorTabWidget, 0, 0 );
    
***************
*** 250,260 ****
  }
  
  void KgColors::slotMarkedBackgroundChanged()
  {
    QColor color = getColorSelector( "Marked Background" )->getColor();
- 
    getColorSelector( "Alternate Marked Background" )->setDefaultColor( color );
  }
  
  void KgColors::generatePreview()
  {
--- 263,318 ----
  }
  
+ void KgColors::slotBackgroundChanged()
+ {
+   QColor color = getColorSelector( "Background" )->getColor();
+ 
+   getColorSelector( "Alternate Background" )->changeAdditionalColor( 0, color );
+   getColorSelector( "Marked Background" )->changeAdditionalColor( 0, color );
+   getColorSelector( "Current Background" )->changeAdditionalColor( 0, color );
+ }
+ 
+ void KgColors::slotAltBackgroundChanged()
+ {
+   QColor color = getColorSelector( "Alternate Background" )->getColor();
+   getColorSelector( "Alternate Marked Background" )->changeAdditionalColor( 0, color );
+ }
+ 
  void KgColors::slotMarkedBackgroundChanged()
  {
    QColor color = getColorSelector( "Marked Background" )->getColor();
    getColorSelector( "Alternate Marked Background" )->setDefaultColor( color );
  }
  
+ void KgColors::slotInactiveForegroundChanged()
+ {
+   QColor color = getColorSelector( "Inactive Foreground" )->getColor();
+ 
+   getColorSelector( "Inactive Directory Foreground" )->changeAdditionalColor( 0, color );
+   getColorSelector( "Inactive Executable Foreground" )->changeAdditionalColor( 0, color );
+   getColorSelector( "Inactive Symlink Foreground" )->changeAdditionalColor( 0, color );
+   getColorSelector( "Inactive Invalid Symlink Foreground" )->changeAdditionalColor( 0, color );
+ }
+ 
+ void KgColors::slotInactiveBackgroundChanged()
+ {
+   QColor color = getColorSelector( "Inactive Background" )->getColor();
+ 
+   getColorSelector( "Inactive Alternate Background" )->changeAdditionalColor( 0, color );
+   getColorSelector( "Inactive Marked Background" )->changeAdditionalColor( 0, color );
+   getColorSelector( "Inactive Current Background" )->changeAdditionalColor( 0, color );
+ }
+ 
+ void KgColors::slotInactiveAltBackgroundChanged()
+ {
+   QColor color = getColorSelector( "Inactive Alternate Background" )->getColor();
+   getColorSelector( "Inactive Alternate Marked Background" )->changeAdditionalColor( 0, color );
+ }
+ 
+ void KgColors::slotInactiveMarkedBackgroundChanged()
+ {
+   QColor color = getColorSelector( "Inactive Marked Background" )->getColor();
+   getColorSelector( "Inactive Alternate Marked Background" )->changeAdditionalColor( 1, color );
+ }
+ 
  void KgColors::generatePreview()
  {

Index: kgcolors.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Konfigurator/kgcolors.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** kgcolors.h	29 Mar 2004 06:22:58 -0000	1.7
--- kgcolors.h	31 Mar 2004 18:47:25 -0000	1.8
***************
*** 49,54 ****
--- 49,60 ----
    void slotDisable();
    void slotForegroundChanged();
+   void slotBackgroundChanged();
+   void slotAltBackgroundChanged();
    void slotActiveChanged();
    void slotMarkedBackgroundChanged();
+   void slotInactiveForegroundChanged();
+   void slotInactiveBackgroundChanged();
+   void slotInactiveAltBackgroundChanged();
+   void slotInactiveMarkedBackgroundChanged();
    void slotDisableCurrent();
    void generatePreview();

[Krusader-commits] krusader_kde3/krusader/Konfigurator kgcolors.cpp,1.11,1.12

[Karai C. <ck...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/Konfigurator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27684/krusader_kde3/krusader/Konfigurator

Modified Files:
	kgcolors.cpp 
Log Message:

FIXED: disable bugfix for colors


Index: kgcolors.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Konfigurator/kgcolors.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** kgcolors.cpp	29 Mar 2004 06:22:58 -0000	1.11
--- kgcolors.cpp	29 Mar 2004 21:28:46 -0000	1.12
***************
*** 154,164 ****
    pwDir     = new PreviewItem( preview, i18n( "Directory" ) );
    
-   generatePreview();
- 
    previewGrid->addWidget( preview, 0 ,0 );
    
    kgColorsLayout->addWidget( hbox, 1 ,0 );
    slotDisable();
-   slotDisableCurrent();
  } 
  
--- 154,162 ----
    pwDir     = new PreviewItem( preview, i18n( "Directory" ) );
    
    previewGrid->addWidget( preview, 0 ,0 );
    
    kgColorsLayout->addWidget( hbox, 1 ,0 );
+ 
    slotDisable();
  } 
  
***************
*** 222,226 ****
    generals->find("Enable Alternate Background")->setEnabled( enabled );
    generals->find("Show Current Item Always")->setEnabled( !enabled );
!   generatePreview();
  }
  
--- 220,225 ----
    generals->find("Enable Alternate Background")->setEnabled( enabled );
    generals->find("Show Current Item Always")->setEnabled( !enabled );
! 
!   slotDisableCurrent();
  }
  

[Krusader-commits] krusader_kde3/krusader/Panel krcolorcache.cpp,1.2,1.3 krcolorcache.h,1.2,1.3 krdetailedview.cpp,1.68,1.69 krdetailedview.h,1.23,1.24 krdetailedviewitem.cpp,1.24,1.25 listpanel.cpp,1.56,1.57

[Karai C. <ck...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19013/krusader_kde3/krusader/Panel

Modified Files:
	krcolorcache.cpp krcolorcache.h krdetailedview.cpp 
	krdetailedview.h krdetailedviewitem.cpp listpanel.cpp 
Log Message:

ADDED: Heiner's inactive color patch


Index: krcolorcache.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krcolorcache.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** krcolorcache.cpp	26 Mar 2004 08:11:52 -0000	1.2
--- krcolorcache.cpp	29 Mar 2004 21:00:45 -0000	1.3
***************
*** 82,143 ****
  }
  
! const QColor * KrColorCache::getForegroundColor() const
  {
!    return getColor("Foreground");
  }
  
! const QColor * KrColorCache::getDirectoryForegroundColor() const
  {
!    return getColor("Directory Foreground");
  }
  
! const QColor * KrColorCache::getExecutableForegroundColor() const
  {
!    return getColor("Executable Foreground");
  }
  
! const QColor * KrColorCache::getSymlinkForegroundColor() const
  {
!    return getColor("Symlink Foreground");
  }
  
! const QColor * KrColorCache::getInvalidSymlinkForegroundColor() const
  {
!    return getColor("Invalid Symlink Foreground");
  }
  
! const QColor * KrColorCache::getMarkedForegroundColor() const
  {
!    return getColor("Marked Foreground");
  }
  
! const QColor * KrColorCache::getMarkedBackgroundColor() const
  {
!    return getColor("Marked Background");
  }
  
! const QColor * KrColorCache::getCurrentForegroundColor() const
  {
!    return getColor("Current Foreground");
  }
  
! const QColor * KrColorCache::getCurrentBackgroundColor() const
  {
!    return getColor("Current Background");
  }
  
! const QColor * KrColorCache::getBackgroundColor() const
  {
!    return getColor("Background");
  }
  
! const QColor * KrColorCache::getAlternateBackgroundColor() const
  {
!    return getColor("Alternate Background");
  }
  
! const QColor * KrColorCache::getAlternateMarkedBackgroundColor() const
  {
!    return getColor("Alternate Marked Background");
  }
  
--- 82,155 ----
  }
  
! const QColor * KrColorCache::getForegroundColor(bool isActive) const
  {
!    const QColor * color = isActive?0:getColor("Inactive Foreground");
!    return color?color:getColor("Foreground");
  }
  
! const QColor * KrColorCache::getDirectoryForegroundColor(bool isActive) const
  {
!    const QColor * color = isActive?0:getColor("Inactive Directory Foreground");
!    return color?color:getColor("Directory Foreground");
  }
  
! const QColor * KrColorCache::getExecutableForegroundColor(bool isActive) const
  {
!    const QColor * color = isActive?0:getColor("Inactive Executable Foreground");
!    return color?color:getColor("Executable Foreground");
  }
  
! const QColor * KrColorCache::getSymlinkForegroundColor(bool isActive) const
  {
!    const QColor * color = isActive?0:getColor("Inactive Symlink Foreground");
!    return color?color:getColor("Symlink Foreground");
  }
  
! const QColor * KrColorCache::getInvalidSymlinkForegroundColor(bool isActive) const
  {
!    const QColor * color = isActive?0:getColor("Inactive Invalid Symlink Foreground");
!    return color?color:getColor("Invalid Symlink Foreground");
  }
  
! const QColor * KrColorCache::getMarkedForegroundColor(bool isActive) const
  {
!    const QColor * color = isActive?0:getColor("Inactive Marked Foreground");
!    return color?color:getColor("Marked Foreground");
  }
  
! const QColor * KrColorCache::getMarkedBackgroundColor(bool isActive) const
  {
!    const QColor * color = isActive?0:getColor("Inactive Marked Background");
!    return color?color:getColor("Marked Background");
  }
  
! const QColor * KrColorCache::getCurrentForegroundColor(bool isActive) const
  {
!    const QColor * color = isActive?0:getColor("Inactive Current Foreground");
!    return color?color:getColor("Current Foreground");
  }
  
! const QColor * KrColorCache::getCurrentBackgroundColor(bool isActive) const
  {
!    const QColor * color = isActive?0:getColor("Inactive Current Background");
!    return color?color:getColor("Current Background");
  }
  
! const QColor * KrColorCache::getBackgroundColor(bool isActive) const
  {
!    const QColor * color = isActive?0:getColor("Inactive Background");
!    return color?color:getColor("Background");
  }
  
! const QColor * KrColorCache::getAlternateBackgroundColor(bool isActive) const
  {
!    const QColor * color = isActive?0:getColor("Inactive Alternate Background");
!    return color?color:getColor("Alternate Background");
  }
  
! const QColor * KrColorCache::getAlternateMarkedBackgroundColor(bool isActive) const
  {
!    const QColor * color = isActive?0:getColor("Inactive Alternate Marked Background");
!    return color?color:getColor("Alternate Marked Background");
  }
  

Index: listpanel.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** listpanel.cpp	7 Mar 2004 23:15:51 -0000	1.56
--- listpanel.cpp	29 Mar 2004 21:00:45 -0000	1.57
***************
*** 336,339 ****
--- 336,343 ----
  
    func->refreshActions();
+   KrDetailedView * v = dynamic_cast<KrDetailedView *>(view);
+   if (v) v->refreshColors();
+   v = dynamic_cast<KrDetailedView *>(otherPanel->view);
+   if (v) v->refreshColors();
  }
  

Index: krdetailedview.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedview.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** krdetailedview.h	24 Mar 2004 06:33:54 -0000	1.23
--- krdetailedview.h	29 Mar 2004 21:00:45 -0000	1.24
***************
*** 121,124 ****
--- 121,126 ----
       */
      void slotMouseClicked( int button, QListViewItem * item, const QPoint & pos, int c );
+   
+   public slots:
      void refreshColors();
  

Index: krdetailedview.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedview.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** krdetailedview.cpp	26 Mar 2004 08:11:52 -0000	1.68
--- krdetailedview.cpp	29 Mar 2004 21:00:45 -0000	1.69
***************
*** 956,962 ****
    {
      // KDE deafult is not choosen: set the background color (as this paints the empty areas) and the alternate color
!     const QColor * color = KrColorCache::getColorCache().getBackgroundColor();
      setPaletteBackgroundColor(color?*color:KGlobalSettings::baseColor());
!     color = KrColorCache::getColorCache().getAlternateBackgroundColor();
      setAlternateBackground(color?*color:KGlobalSettings::alternateBackgroundColor());
    }
--- 956,965 ----
    {
      // KDE deafult is not choosen: set the background color (as this paints the empty areas) and the alternate color
!     bool isActive = hasFocus();
!     if (krApp->mainView && krApp->mainView->activePanel && krApp->mainView->activePanel->view)
!        isActive = (dynamic_cast<KrView *>(this) == krApp->mainView->activePanel->view);
!     const QColor * color = KrColorCache::getColorCache().getBackgroundColor(isActive);
      setPaletteBackgroundColor(color?*color:KGlobalSettings::baseColor());
!     color = KrColorCache::getColorCache().getAlternateBackgroundColor(isActive);
      setAlternateBackground(color?*color:KGlobalSettings::alternateBackgroundColor());
    }

Index: krdetailedviewitem.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedviewitem.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** krdetailedviewitem.cpp	29 Mar 2004 08:01:03 -0000	1.24
--- krdetailedviewitem.cpp	29 Mar 2004 21:00:45 -0000	1.25
***************
*** 32,38 ****
--- 32,40 ----
  #include "../defaults.h"
  #include "../kicons.h"
+ #include "../krusaderview.h"
  #include "krdetailedviewitem.h"
  #include "krdetailedview.h"
  #include "krcolorcache.h"
+ #include "listpanel.h"
  #include "../VFS/krpermhandler.h"
  #include <sys/types.h>
***************
*** 197,201 ****
    if (!KrColorCache::getColorCache().isKDEDefault())
    {
!     bool hasFocus = listView()->hasFocus();
      bool isCurrent = listView()->currentItem() == this;
      
--- 199,203 ----
    if (!KrColorCache::getColorCache().isKDEDefault())
    {
!     bool isActive = (dynamic_cast<KrView *>(listView()) == krApp->mainView->activePanel->view);
      bool isCurrent = listView()->currentItem() == this;
      
***************
*** 215,231 ****
      
      // First calculate fore and background. Th eKDe deafult is not taken into account here
!     SETCOLOR(background, isAlternate()?KrColorCache::getColorCache().getAlternateBackgroundColor():KrColorCache::getColorCache().getBackgroundColor())
!     SETCOLOR(foreground, KrColorCache::getColorCache().getForegroundColor())
      if (isSymLink())
      {
         if (_vf->vfile_getMime() == "Broken Link !" )
!           SETCOLOR(foreground, KrColorCache::getColorCache().getInvalidSymlinkForegroundColor())
         else
!           SETCOLOR(foreground, KrColorCache::getColorCache().getSymlinkForegroundColor())
      }
      else if (isDir())
!        SETCOLOR(foreground, KrColorCache::getColorCache().getDirectoryForegroundColor())
      else if (isExecutable())
!        SETCOLOR(foreground, KrColorCache::getColorCache().getExecutableForegroundColor())
         
      // set the background color
--- 217,233 ----
      
      // First calculate fore and background. Th eKDe deafult is not taken into account here
!     SETCOLOR(background, isAlternate()?KrColorCache::getColorCache().getAlternateBackgroundColor(isActive):KrColorCache::getColorCache().getBackgroundColor(isActive))
!     SETCOLOR(foreground, KrColorCache::getColorCache().getForegroundColor(isActive))
      if (isSymLink())
      {
         if (_vf->vfile_getMime() == "Broken Link !" )
!           SETCOLOR(foreground, KrColorCache::getColorCache().getInvalidSymlinkForegroundColor(isActive))
         else
!           SETCOLOR(foreground, KrColorCache::getColorCache().getSymlinkForegroundColor(isActive))
      }
      else if (isDir())
!        SETCOLOR(foreground, KrColorCache::getColorCache().getDirectoryForegroundColor(isActive))
      else if (isExecutable())
!        SETCOLOR(foreground, KrColorCache::getColorCache().getExecutableForegroundColor(isActive))
         
      // set the background color
***************
*** 240,244 ****
  
      // Seek the correct background color. Set it as marked background, if it is defined.
!     SETCOLOR(markedBackground, KrColorCache::getColorCache().getMarkedBackgroundColor())
         
      if (isAlternate())
--- 242,246 ----
  
      // Seek the correct background color. Set it as marked background, if it is defined.
!     SETCOLOR(markedBackground, KrColorCache::getColorCache().getMarkedBackgroundColor(isActive))
         
      if (isAlternate())
***************
*** 246,250 ****
         // Now set it as alternate marked background, if it is defined. As the result the alternate marked background
         // has a higher priority than the marked background, which has a higher priority than the KDe default.
!        SETCOLOR(markedBackground, KrColorCache::getColorCache().getAlternateMarkedBackgroundColor())
      }
      // set it in the color group (different group color than normal background!)
--- 248,252 ----
         // Now set it as alternate marked background, if it is defined. As the result the alternate marked background
         // has a higher priority than the marked background, which has a higher priority than the KDe default.
!        SETCOLOR(markedBackground, KrColorCache::getColorCache().getAlternateMarkedBackgroundColor(isActive))
      }
      // set it in the color group (different group color than normal background!)
***************
*** 254,258 ****
         markedForeground = setColorIfContrastIsSufficient(markedBackground, foreground, background);
      else
!        SETCOLOR(markedForeground, KrColorCache::getColorCache().getMarkedForegroundColor())
        // set it in the color group (different group color than normal foreground!)
      _cg.setColor(QColorGroup::HighlightedText, *markedForeground);
--- 256,260 ----
         markedForeground = setColorIfContrastIsSufficient(markedBackground, foreground, background);
      else
!        SETCOLOR(markedForeground, KrColorCache::getColorCache().getMarkedForegroundColor(isActive))
        // set it in the color group (different group color than normal foreground!)
      _cg.setColor(QColorGroup::HighlightedText, *markedForeground);
***************
*** 266,274 ****
  
      // finally the current item
!     if (isCurrent && (markCurrentAlways || hasFocus))
      {
         // if this is the current item AND the panels has tho focus OR the current should be marked always
         const QColor * currentBackground = background;
!        SETCOLOR(currentBackground, KrColorCache::getColorCache().getCurrentBackgroundColor())
         // set the background, if defined
         _cg.setColor(QColorGroup::Highlight, *currentBackground);
--- 268,276 ----
  
      // finally the current item
!     if (isCurrent && (markCurrentAlways || isActive))
      {
         // if this is the current item AND the panels has tho focus OR the current should be marked always
         const QColor * currentBackground = background;
!        SETCOLOR(currentBackground, KrColorCache::getColorCache().getCurrentBackgroundColor(isActive))
         // set the background, if defined
         _cg.setColor(QColorGroup::Highlight, *currentBackground);
***************
*** 276,280 ****
         _cg.setColor(QColorGroup::Background, *currentBackground);
  
!        color = KrColorCache::getColorCache().getCurrentForegroundColor();
         if (color)
         {
--- 278,282 ----
         _cg.setColor(QColorGroup::Background, *currentBackground);
  
!        color = KrColorCache::getColorCache().getCurrentForegroundColor(isActive);
         if (color)
         {

Index: krcolorcache.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krcolorcache.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** krcolorcache.h	26 Mar 2004 08:11:52 -0000	1.2
--- krcolorcache.h	29 Mar 2004 21:00:45 -0000	1.3
***************
*** 17,32 ****
    const QString & getTextValue(const QString & textName) const;
    const QColor * getColor(const QString & colorName) const;
!   const QColor * getForegroundColor() const;
!   const QColor * getDirectoryForegroundColor() const;
!   const QColor * getExecutableForegroundColor() const;
!   const QColor * getSymlinkForegroundColor() const;
!   const QColor * getInvalidSymlinkForegroundColor() const;
!   const QColor * getMarkedForegroundColor() const;
!   const QColor * getMarkedBackgroundColor() const;
!   const QColor * getCurrentForegroundColor() const;
!   const QColor * getCurrentBackgroundColor() const;
!   const QColor * getBackgroundColor() const;
!   const QColor * getAlternateBackgroundColor() const;
!   const QColor * getAlternateMarkedBackgroundColor() const;
    bool isKDEDefault() const {return kdeDefault;}
    bool isAlternateBackgroundEnabled() const {return alternateBackgroundEnabled;}
--- 17,32 ----
    const QString & getTextValue(const QString & textName) const;
    const QColor * getColor(const QString & colorName) const;
!   const QColor * getForegroundColor(bool isActive) const;
!   const QColor * getDirectoryForegroundColor(bool isActive) const;
!   const QColor * getExecutableForegroundColor(bool isActive) const;
!   const QColor * getSymlinkForegroundColor(bool isActive) const;
!   const QColor * getInvalidSymlinkForegroundColor(bool isActive) const;
!   const QColor * getMarkedForegroundColor(bool isActive) const;
!   const QColor * getMarkedBackgroundColor(bool isActive) const;
!   const QColor * getCurrentForegroundColor(bool isActive) const;
!   const QColor * getCurrentBackgroundColor(bool isActive) const;
!   const QColor * getBackgroundColor(bool isActive) const;
!   const QColor * getAlternateBackgroundColor(bool isActive) const;
!   const QColor * getAlternateMarkedBackgroundColor(bool isActive) const;
    bool isKDEDefault() const {return kdeDefault;}
    bool isAlternateBackgroundEnabled() const {return alternateBackgroundEnabled;}

[Krusader-commits] krusader_kde3/doc krusader.1,1.4,1.5

[Frank S. <cod...@us...>]

Update of /cvsroot/krusader/krusader_kde3/doc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1354/doc

Modified Files:
	krusader.1 
Log Message:
heiner

Index: krusader.1
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/doc/krusader.1,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** krusader.1	13 Feb 2004 13:44:30 -0000	1.4
--- krusader.1	29 Mar 2004 19:47:03 -0000	1.5
***************
*** 133,139 ****
  Krusader supports the at this moment following languages:
  
! .I English, Czech, Danish, Dutch, French, German, Hungarian, Italian,
  
! .I Japanese, Polish, Russian, Slovak, Spanish, Swedish.
  
  Read the Krusader translation howto if you want translate Krusader in your native language.
--- 133,139 ----
  Krusader supports the at this moment following languages:
  
! .I Bulgarian, English, Czech, Danish, Dutch, French, German, Hungarian,
  
! .I Italian, Japanese, Polish, Russian, Slovak, Spanish, Swedish.
  
  Read the Krusader translation howto if you want translate Krusader in your native language.
***************
*** 159,162 ****
--- 159,164 ----
  Csaba Karai, Developer <ck...@us...>
  
+ Heiner Eichmann, Developer <h.e...@gm...>
+ 
  Frank Schoolmeesters, Documentation coordinator <cod...@us...>
  

[Krusader-commits] krusader_kde3/doc ChangeLog,1.10,1.11

[Frank S. <cod...@us...>]

Update of /cvsroot/krusader/krusader_kde3/doc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1177/doc

Modified Files:
	ChangeLog 
Log Message:
Handbook 1.40.00-beta1

Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/doc/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ChangeLog	4 Mar 2004 20:34:33 -0000	1.10
--- ChangeLog	29 Mar 2004 19:46:07 -0000	1.11
***************
*** 2,14 ****
  -------------------------------
  
  
! 
! 1.31.01
! ======================
! Date: xx.xx.2004
! 
  ADDED:   locate (using-krusader.sgml) - Thanks to Karai Csaba
  ADDED:   Right click menu (using-krusader.sgml)
! UPDATED: FAQ's "krusaderrc.ui" file issue, - Thanks to Karai Csaba
  UPDATED-FIXED: manny small issues
  
--- 2,14 ----
  -------------------------------
  
+ 1.40.00-beta1  Date: 29/03/2004
+ ADDED:   configuring the colors of the panel - Thanks to Heiner Eichmann
+ ADDED:   Quickmode for MountMan - Thanks to Shie Erlich
+ UPDATED: Konfigurator screenschots
  
! 1.31.01  Date: 04/03/2004
  ADDED:   locate (using-krusader.sgml) - Thanks to Karai Csaba
  ADDED:   Right click menu (using-krusader.sgml)
! UPDATED: FAQ's "krusaderui.rc" file issue, - Thanks to Karai Csaba
  UPDATED-FIXED: manny small issues
  

[Krusader-commits] krusader_kde3/doc/pics kgadvanced.png,1.1.1.1,1.2 kgarchives.png,1.1.1.1,1.2 kggeneral.png,1.1.1.1,1.2 kglookfeel.png,1.1.1.1,1.2 kgstartup.png,1.1.1.1,1.2 krusader1.png,1.2,1.3

[Frank S. <cod...@us...>]

Update of /cvsroot/krusader/krusader_kde3/doc/pics
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32091/doc/pics

Modified Files:
	kgadvanced.png kgarchives.png kggeneral.png kglookfeel.png 
	kgstartup.png krusader1.png 
Log Message:
Handbook 1.40.00-beta1

Index: kgadvanced.png
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/doc/pics/kgadvanced.png,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsqE4gJl and /tmp/cvs2PmwGN differ

Index: kgarchives.png
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/doc/pics/kgarchives.png,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
Binary files /tmp/cvs3P9epw and /tmp/cvs62mLsY differ

Index: kggeneral.png
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/doc/pics/kggeneral.png,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsQoibIy and /tmp/cvsdQn5x1 differ

Index: kgstartup.png
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/doc/pics/kgstartup.png,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
Binary files /tmp/cvs1u8oGp and /tmp/cvszyAybT differ

Index: krusader1.png
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/doc/pics/krusader1.png,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
Binary files /tmp/cvsWb6W7z and /tmp/cvsjUJNI3 differ

Index: kglookfeel.png
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/doc/pics/kglookfeel.png,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsNI3OVF and /tmp/cvsFcC8F9 differ

[Krusader-commits] krusader_kde3/doc/en commands.sgml,1.8,1.9 credits.sgml,1.9,1.10 faq.sgml,1.8,1.9 index.docbook,1.9,1.10 installation.sgml,1.8,1.9 introduction.sgml,1.9,1.10 konfigurator.sgml,1.6,1.7 krusader-tools.sgml,1.8,1.9 using-krusader.sgml,1.9,1.10

[Frank S. <cod...@us...>]

Update of /cvsroot/krusader/krusader_kde3/doc/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31312/doc/en

Modified Files:
	commands.sgml credits.sgml faq.sgml index.docbook 
	installation.sgml introduction.sgml konfigurator.sgml 
	krusader-tools.sgml using-krusader.sgml 
Log Message:
Handbook 1.40.00-beta1

Index: credits.sgml
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/doc/en/credits.sgml,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** credits.sgml	4 Mar 2004 20:34:33 -0000	1.9
--- credits.sgml	29 Mar 2004 19:36:39 -0000	1.10
***************
*** 42,45 ****
--- 42,47 ----
              <email>ck...@us...</email></para>
              </listitem>
+  <listitem><para>Heiner Eichmann, developer <email>h.e...@gm...</email></para>
+ 	    </listitem>            
   <listitem><para>Frank Schoolmeesters, documentation coordinator
              <email>cod...@us...</email></para>
***************
*** 48,57 ****
              <email>mar...@ya...</email> <!-- ko...@us... -->
              </para></listitem>
!  </itemizedlist> 
   The project is written using <application>KDevelop</application> and <application>&Qt; Designer</application>.
  </para>
  
  <para>We would especially like to thank Dirk Eschler the &krusader; web master.
!       If you'll visit the &kruwebsite_url; you'll appreciate as much as we do the hard work and effort that 
        Dirk has put into the site.</para>
  
--- 50,59 ----
              <email>mar...@ya...</email> <!-- ko...@us... -->
              </para></listitem>
!  </itemizedlist>
   The project is written using <application>KDevelop</application> and <application>&Qt; Designer</application>.
  </para>
  
  <para>We would especially like to thank Dirk Eschler the &krusader; web master.
!       If you'll visit the &kruwebsite_url; you'll appreciate as much as we do the hard work and effort that
        Dirk has put into the site.</para>
  
***************
*** 62,67 ****
  <para>Special thanks to:
          <itemizedlist>
!  	<listitem><para>Heiner Eichmann <email>h.e...@gm...</email>
! 	                The 6th Beatle: FreeBSD port, patches and general help</para>
  	          </listitem>
  	<listitem><para>Jan Halasa <email>jan...@us...</email>
--- 64,76 ----
  <para>Special thanks to:
          <itemizedlist>
! 		  <listitem><para>David Harel <email>har...@er...</email>
! 	                panel toolbar buttons</para>
! 	          </listitem>
! 		  <listitem><para>Jan Willem
! 	                icons for &krusader;</para>
! 	          </listitem>
! 
! 		  <listitem><para>Hans Loffler
! 	                directory history list</para>
  	          </listitem>
  	<listitem><para>Jan Halasa <email>jan...@us...</email>
***************
*** 85,88 ****
--- 94,99 ----
  <para>Thanks to the translators:
  	<itemizedlist>
+  	<listitem><para>Bulgarian translation: Milen Ivanov <email>ke...@ma...</email></para>
+ 	</listitem>	
   	<listitem><para>Czech translation: Mitek <email>mi...@em...</email></para>
  	</listitem>

Index: introduction.sgml
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/doc/en/introduction.sgml,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** introduction.sgml	4 Mar 2004 20:34:33 -0000	1.9
--- introduction.sgml	29 Mar 2004 19:36:39 -0000	1.10
***************
*** 133,139 ****
  	</listitem>
          <listitem>
- 	    <para>&usermenu_lnk;.</para>
- 	</listitem>
- 	        <listitem>
  	    <para>New &quick_search_lnk;.</para>
  	</listitem>
--- 133,136 ----
***************
*** 144,147 ****
--- 141,154 ----
  	    <para>&locate_lnk;.</para>
          </listitem>
+ 	<listitem>
+ 	    <para><link linkend="konfig-color">Color support</link>.</para>
+         </listitem>
+ 	<listitem>
+ 	    <para><link linkend="mount-man">Quickmode for MountMan</link>.</para>
+         </listitem>
+ 	<listitem>
+ 	    <para>&usermenu_lnk;  NOTE: the User Menu will NOT supported officially in &krusader; 1.40 stable,
+ 	           but is there, hidden.</para>
+ 	</listitem>
  </itemizedlist>
  </para>
***************
*** 149,158 ****
  <screenshot>
  	<screeninfo>&krusader; screenshot</screeninfo>
! 	<mediaobject>
  		<imageobject><imagedata fileref="krusader1.png" format="PNG"/></imageobject>
  	        <imageobject><imagedata fileref="krusader1.eps" format="EPS"/></imageobject>
  	  <textobject><phrase>&krusader; screenshot</phrase></textobject>
! 	  <caption><para>Here's a screenshot of &krusader;.</para></caption>
  	</mediaobject>
  </screenshot>
  </chapter>
--- 156,167 ----
  <screenshot>
  	<screeninfo>&krusader; screenshot</screeninfo>
! 	<mediaobject id="krusader_screenshot">
  		<imageobject><imagedata fileref="krusader1.png" format="PNG"/></imageobject>
  	        <imageobject><imagedata fileref="krusader1.eps" format="EPS"/></imageobject>
  	  <textobject><phrase>&krusader; screenshot</phrase></textobject>
! 	  <caption><para>Here's a screenshot of &krusader; with the panel toolbar buttons '=','..','~','/'
! 	                  and <link linkend="konfig-color">colors</link>.</para></caption>
  	</mediaobject>
  </screenshot>
  </chapter>
+ 

Index: konfigurator.sgml
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/doc/en/konfigurator.sgml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** konfigurator.sgml	4 Mar 2004 20:34:33 -0000	1.6
--- konfigurator.sgml	29 Mar 2004 19:36:39 -0000	1.7
***************
*** 22,27 ****
  <title>Konfigurator: &krusader;'s configuration center</title>
  
- &rwfeaturenote;
- 
  <para>Konfigurator is &krusader;'s configuration center. Here you can modify the way &krusader; does
  things and customize it to your own needs. At all times, pressing the <guibutton>"Apply"</guibutton> button
--- 22,25 ----
***************
*** 43,48 ****
  </screenshot>
  
- <para><emphasis role="bold">NOTE:</emphasis> at this moment the Konfigurator screenshots are not yet updated,
-        so they will contain some obsolete settings.</para>
  
  <para>The startup page determines the way that &krusader; looks (and works) when it is launched.
--- 41,44 ----
***************
*** 129,134 ****
  </screenshot>
  
- <para><emphasis role="bold">NOTE:</emphasis> at this moment the Konfigurator screenshots are not yet updated,
-        so they will contain some obsolete settings.</para>
  
  <para>Here you can determine the look &amp; feel of things - which basically means fine-tuning the
--- 125,128 ----
***************
*** 236,240 ****
  <title>Toolbar</title>
  <para>Here you can configure the &toolbar_lnk; the way you want.
!        Add the icons of your favorite functions to the Toolbar.</para>
  
  </sect2>
--- 230,234 ----
  <title>Toolbar</title>
  <para>Here you can configure the &toolbar_lnk; the way you want.
!        Add the action buttons of your favorite functions to the Toolbar.</para>
  
  </sect2>
***************
*** 247,250 ****
--- 241,330 ----
  </sect2>
  
+ 
+ <sect2 id="konfig-looknfeel-ptoolbar">
+ <title>Panel Toolbar</title>
+ <para><guilabel>"Panel Toolbar visible"</guilabel>: if checked, &krusader; will display the Panel Toolbar.</para>
+ 
+ <para>Panel Toolbar buttons can be made visible/unvisible
+ <itemizedlist>
+ 	<listitem><para><guilabel>"Open"</guilabel> button (un)visible</para>
+ 	           </listitem>
+ 	<listitem><para><guilabel>"Equal (=)"</guilabel> button (un)visible</para>
+ 	           </listitem>
+ 	<listitem><para><guilabel>"Up (..)"</guilabel> button (un)visible</para>
+ 	           </listitem>
+ 	<listitem><para><guilabel>"Home (~)"</guilabel> button (un)visible</para>
+ 	           </listitem>
+ 	<listitem><para><guilabel>"Root (/)"</guilabel> button (un)visible</para>
+ 	           </listitem>
+ </itemizedlist>
+ </para>
+ 
+ </sect2>
+ 
+ </sect1>
+ 
+ 
+ <sect1 id="konfig-color">
+ <title>Colors page</title>
+ 
+ &newfeaturenote;
+ 
+ <para>This page configures the <link linkend="krusader_screenshot">colors</link> in the list panel.</para>
+ 
+ <variablelist>
+  <varlistentry><term><guilabel>General</guilabel></term>
+   <listitem>
+   <itemizedlist>
+ 	<listitem><para><guilabel>"Use the KDE default colors"</guilabel>:
+ 	                   this is the default color configuration of &krusader;.</para>
+ 		    </listitem>
+ 	<listitem><para><guilabel>"Use alternate background color"</guilabel>:
+ 	                   If checked, the <guilabel>"Background"</guilabel> color and the
+ 	                   <guilabel>"Alternate background"</guilabel> color alternates line by line.
+ 			   </para>
+ 		    </listitem>
+ 	<listitem><para><guilabel>"Show current item even if not focussed"</guilabel>:
+ 	                  If checked, show the latest cursor position in the non active list panel.</para>
+ 		    </listitem>
+   </itemizedlist>
+   </listitem>
+  </varlistentry>
+ 
+  <varlistentry><term><guilabel>Colors</guilabel></term>
+   <listitem><para>Configures the colors the way you like,
+ 	     if <guilabel>"Use the KDE default colors"</guilabel> is unchecked.</para>
+   <itemizedlist>
+          <listitem><para><guilabel>"Active"</guilabel> tab: color settings for the active panel
+ 	                              (the panel who has the focus).</para></listitem>
+          <listitem><para><guilabel>"Inactive"</guilabel> tab: color settings for the inactive panel
+ 	                              (the panel who does not have the focus).</para></listitem>
+ 	<listitem><para><guilabel>"Foreground"</guilabel>: general foreground color.</para></listitem>
+ 	<listitem><para><guilabel>"Directory foreground"</guilabel>: directory color.</para></listitem>
+ 	<listitem><para><guilabel>"Executable foreground"</guilabel>: executable color.</para></listitem>
+ 	<listitem><para><guilabel>"Symbolic link foreground"</guilabel>: symbolic link color.</para></listitem>
+ 	<listitem><para><guilabel>"Invalid symlink foreground"</guilabel>:
+ 	                              invalid symlink color.</para></listitem>
+ 	<listitem><para><guilabel>"Background"</guilabel>: general background color.</para></listitem>
+ 	<listitem><para><guilabel>"Alternate background"</guilabel>:
+ 	                              general alternate background color.</para></listitem>
+ 	<listitem><para><guilabel>"Marked foreground"</guilabel>: marked color.</para></listitem>
+ 	<listitem><para><guilabel>"Marked background"</guilabel>: marked background color.</para></listitem>
+ 	<listitem><para><guilabel>"Alternate marked background"</guilabel>:
+ 	                              alternate marked background color.</para></listitem>
+ 	<listitem><para><guilabel>"Current foreground"</guilabel>:
+ 	                              cursor position foreground color in the active list panel.</para></listitem>
+ 	<listitem><para><guilabel>"Current background"</guilabel>:
+ 	                              cursor position background color in the active list panel.</para></listitem>
+   </itemizedlist>
+   </listitem>
+  </varlistentry>
+ 
+  <varlistentry><term><guilabel>Preview</guilabel></term>
+ 	<listitem><para>Here you see a preview of the configured colors.</para>
+ 	</listitem></varlistentry>
+  </variablelist>
+ 
+ 
  </sect1>
  
***************
*** 261,267 ****
  </screenshot>
  
- <para><emphasis role="bold">NOTE:</emphasis> at this moment the Konfigurator screenshots are not yet updated,
-        so they will contain some obsolete settings.</para>
- 
  <para>The following options determine basic aspects of operation:
  
--- 341,344 ----
***************
*** 303,309 ****
  </screenshot>
  
- <para><emphasis role="bold">NOTE:</emphasis> at this moment the Konfigurator screenshots are not yet updated,
-        so they will contain some obsolete settings.</para>
- 
  <para>This page handles more advanced issues, so you should double-check what you do here, since modifying
         things around here <remark>makes &krusader; a more powerful AND dangerous tool.</remark></para>
--- 380,383 ----
***************
*** 339,342 ****
--- 413,419 ----
  		  icons and further speed operations, but the memory footprint of &krusader; will be
  		  bigger.</para></listitem>
+ 	<listitem><para><guilabel>"Arguments of updatedb"</guilabel>: sets additional arguments for
+ 	                  <command>updatedb</command>, please read
+ 			  <command>man updatedb</command>.</para></listitem>
  	</itemizedlist>
  	</listitem></varlistentry>
***************
*** 357,363 ****
  </screenshot>
  
- <para><emphasis role="bold">NOTE:</emphasis> at this moment the Konfigurator screenshots are not yet updated,
-        so they will contain some obsolete settings.</para>
- 
  <para>This page handles the way &krusader; works with archives. In the <guilabel>General</guilabel> section
  you'll see a list of archive formats. Some are checked and some are grayed-out. The ones that are available
--- 434,437 ----
***************
*** 391,398 ****
  <title>Dependencies page</title>
  
! &newfeaturenote;
! 
! <para>Here you can configure the full path of the external applications. It is even possible to configure
!       the full path of &krusader;!</para>
  
  
--- 465,470 ----
  <title>Dependencies page</title>
  
! <para>This page configures the full path of the external applications.
!        It is even possible to configure the full path of &krusader;!</para>
  
  

Index: commands.sgml
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/doc/en/commands.sgml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** commands.sgml	4 Mar 2004 20:34:33 -0000	1.8
--- commands.sgml	29 Mar 2004 19:36:39 -0000	1.9
***************
*** 390,394 ****
   <varlistentry>
  	<term><menuchoice>
! 	<shortcut><keycombo action="simul">&Ctrl;<keycap>foo</keycap></keycombo></shortcut>
  	<guimenu>Commands</guimenu>
  	<guimenuitem>User Menu</guimenuitem>
--- 390,394 ----
   <varlistentry>
  	<term><menuchoice>
! 	<shortcut><keycombo action="simul">&Ctrl;<keycap>`</keycap></keycombo></shortcut>
  	<guimenu>Commands</guimenu>
  	<guimenuitem>User Menu</guimenuitem>

Index: faq.sgml
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/doc/en/faq.sgml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** faq.sgml	4 Mar 2004 20:34:33 -0000	1.8
--- faq.sgml	29 Mar 2004 19:36:39 -0000	1.9
***************
*** 24,36 ****
  	&updating.documentation; -->
  
! <para>If you have problems with &krusader; please check the
!        <link linkend="installation">installation procedure</link>,
         maybe your problem is caused by a bad installation.</para>
  
  <para>The &FAQ;'s are devided in three sections:
    <itemizedlist>
!      <listitem><para><link linkend="faq_installation">installation &FAQ;'s</link> (this page)</para></listitem>
!      <listitem><para><link linkend="faq_usage">&krusader; usage &FAQ;'s</link></para></listitem>
!      <listitem><para><link linkend="faq_general">General &FAQ;'s</link></para></listitem>
    </itemizedlist>
    If you have the feeling that a &FAQ; question is missing or if something is not clear to you,
--- 24,37 ----
  	&updating.documentation; -->
  
! <para>If you have problems with &krusader; please check the &install_proc_lnk;,
         maybe your problem is caused by a bad installation.</para>
  
  <para>The &FAQ;'s are devided in three sections:
    <itemizedlist>
!      <listitem><para><link linkend="faq_installation">Installation &FAQ;'s</link> (this page)</para></listitem>
!      <listitem><para><link linkend="faq_usage">Usage &FAQ;'s</link>
!                       (issues when running/using &krusader;)</para></listitem>
!      <listitem><para><link linkend="faq_general">General &FAQ;'s</link> 
!                      (bug reports, forum, mailing list, ...)</para></listitem>
    </itemizedlist>
    If you have the feeling that a &FAQ; question is missing or if something is not clear to you,
***************
*** 73,76 ****
--- 74,78 ----
  		 Or use <command>apt-cache search <replaceable>foo</replaceable></command> to find the
  		 corresponding package for Debian based distributions.</para></tip></para>
+       <para> </para> <!-- Empty line to make it more readable -->
     </answer>
     </qandaentry>
***************
*** 96,99 ****
--- 98,102 ----
           <screen><prompt>$</prompt> <userinput><command>export</command>  PATH=$PATH:<replaceable>/usr/local/bin</replaceable></userinput></screen></para></listitem>
      </itemizedlist></para>
+     <para> </para> <!-- Empty line to make it more readable -->
     </answer>
     </qandaentry>
***************
*** 111,114 ****
--- 114,118 ----
              <screen><prompt>$</prompt> <userinput><command>su -c 'rpm</command> <option>-ivh</option>  <replaceable>&lt;/path/to/filename&gt;</replaceable>'</userinput></screen>You will be asked to enter your root password.</para></listitem>
      </itemizedlist></para>
+     <para> </para> <!-- Empty line to make it more readable -->
     </answer>
     </qandaentry>
***************
*** 116,132 ****
     <qandaentry>
     <question id="binary">
!    <para>I'm trying to install binary foo, but it fails. What's wrong?</para>
     </question>
     <answer>
!    <para><itemizedlist>
!           <listitem><para>Since we only provide (and use) the source, we don't know.
!                           Feel free to post a &help_request_lnk;.
!           </para></listitem>
!    </itemizedlist></para>
     </answer>
     </qandaentry>
  
     <qandaentry>
!    <question id="krusaderrc_ui">
     <para>I've installed &krusader;, but when I start it, only the <guimenu>"Help"</guimenu>
  	 menu appears. Why?</para></question>
--- 120,140 ----
     <qandaentry>
     <question id="binary">
!    <para>I'm trying to install binary foo (RPM or DEB package), but it fails. What's wrong?</para>
     </question>
     <answer>
!    <para>Since we only provide (and use) the source, we don't know.
!    Try to find an other binary at &Linux; software archives such as &freshmeat_url; or &kde_apps_url;.
!    If you can't find a RPM package for your &Linux; distribution, we recommend searching for it with
!    &rpmfind_url; or &rpmpbone_url;.
!    Or better, please try to compile the &krusader; sourcecode.
!    We provide a verry detailled &install_proc_lnk; if you have never done a compilation before.
!    Feel free to post a &help_request_lnk; if you encounter problems.
!    </para>
!    <para> </para> <!-- Empty line to make it more readable -->
     </answer>
     </qandaentry>
  
     <qandaentry>
!    <question id="krusaderui_rc">
     <para>I've installed &krusader;, but when I start it, only the <guimenu>"Help"</guimenu>
  	 menu appears. Why?</para></question>
***************
*** 134,146 ****
     <para>In this case only the <guimenu>"Help"</guimenu> menu is visible and all the other menu items
     like &eg; <guimenu>"File"</guimenu> and <guimenu>"Mark"</guimenu> are gone.
!    This is because some distributions put the <filename>krusaderrc.ui</filename> file in a wrong directory.
!    To solve the problem, just copy the <filename>krusaderrc.ui</filename> file
!    from the package <filename>krusader_kde3/krusader/krusaderrc.ui</filename> to
!    <filename>$KDEDIR/share/apps/krusader/krusaderrc.ui</filename>
!    and <filename>~/.kde/share/apps/krusader/krusaderrc.ui</filename> and re-run &krusader;.
     If you have compiled &krusader; from sources this is often caused when the
!    &kdeqtdir_lnk; enviroment variables are not right set, the result is that the 
!    <filename>krusaderrc.ui</filename> file is installed in a wrong directory.
     Please read also the next question.</para>
     </answer>
     </qandaentry>
--- 142,155 ----
     <para>In this case only the <guimenu>"Help"</guimenu> menu is visible and all the other menu items
     like &eg; <guimenu>"File"</guimenu> and <guimenu>"Mark"</guimenu> are gone.
!    This is because some distributions put the <filename>krusaderui.rc</filename> file in a wrong directory.
!    To solve the problem, just copy the <filename>krusaderui.rc</filename> file
!    from the package <filename>krusader_kde3/krusader/krusaderui.rc</filename> to
!    <filename>$KDEDIR/share/apps/krusader/krusaderui.rc</filename>
!    and <filename>~/.kde/share/apps/krusader/krusaderui.rc</filename> and re-run &krusader;.
     If you have compiled &krusader; from sources this is often caused when the
!    &kdeqtdir_lnk; enviroment variables are not right set, the result is that the
!    <filename>krusaderui.rc</filename> file is installed in a wrong directory.
     Please read also the next question.</para>
+    <para> </para> <!-- Empty line to make it more readable -->
     </answer>
     </qandaentry>
***************
*** 151,174 ****
    </question>
    <answer>
!   <para>The <filename>krusaderrc.ui</filename> file is stored in
!        <filename>$KDEDIR/share/apps/krusader/krusaderrc.ui</filename>.
         When you change the <guilabel>"Toolbar"</guilabel>, &kde; makes a copy of that file in the home directory at
!        <filename>~/.kde/share/apps/krusader/krusaderrc.ui</filename>.
!        When updating to a newer &krusader; version the
!        <filename>~/.kde/share/apps/krusader/krusaderrc.ui</filename> file must be updated to, this was not always the
!        case in the past (see the Note) and it is recommended to check this mannualy if you install a
!        <link linkend="krusader_cvs">CVS build</link> of &krusader;.
!        If the <filename>~/.kde/share/apps/krusader/krusaderrc.ui</filename> file is too old,
!        then the new menu elements will not be shown.
!        Read the previous question to know howto update the <filename>krusaderrc.ui</filename> file.
  
!      <note><para>if &krusader; is correctly installed, then the <filename>krusaderrc.ui</filename> file will be
!            automaticly updated in <filename>~/.kde/share/apps/krusader/krusaderrc.ui</filename> when starting
! 	   &krusader;, in the past this was not the case due to a bug,
! 	   this bug was resolved since "krusader-cvs-2004-02-24".</para></note>
  
!        If <filename>krusaderrc.ui</filename> is missing or in a wrong directory,
!        only the <guimenu>"Help"</guimenu> menu appears, please read the previous question.
    </para>
    </answer>
    </qandaentry>
--- 160,186 ----
    </question>
    <answer>
!   <para>The <filename>krusaderui.rc</filename> file is stored in
!        <filename>$KDEDIR/share/apps/krusader/krusaderui.rc</filename>.
         When you change the <guilabel>"Toolbar"</guilabel>, &kde; makes a copy of that file in the home directory at
!        <filename>~/.kde/share/apps/krusader/krusaderui.rc</filename>.
!        If Krusader was previously installed on your computer, and you install a newer &krusader; version the
!        <filename>~/.kde/share/apps/krusader/krusaderui.rc</filename> file must be replaced with the newer version.
!        </para>
  
!   <para>The first line of <filename>krusaderui.rc</filename> contains the version number.
!         After installing a newer &krusader; stable version, &kde; will replace automatiqly the old
!         <filename>~/.kde/share/apps/krusader/krusaderui.rc</filename> with the newer version when starting the
!         new &krusader; stable for the first time (&kde; will detect the newer version number in the first line).
!         In the past this was not the case due to a bug, this bug was resolved since "krusader-cvs-2004-02-24".
!         When you install a Krusader cvs or beta version you will have to replace the
!         <filename>~/.kde/share/apps/krusader/krusaderui.rc</filename> manually.</para>
  
!   <para>If the <filename>~/.kde/share/apps/krusader/krusaderui.rc</filename> file is too old,
!         then the new menu elements will not be shown.
!         Read the previous question to know howto update the <filename>krusaderui.rc</filename> file.
!         If <filename>krusaderui.rc</filename> is missing or in a wrong directory,
!         only the <guimenu>"Help"</guimenu> menu appears, please read the previous question.
    </para>
+   <para> </para> <!-- Empty line to make it more readable -->
    </answer>
    </qandaentry>
***************
*** 181,185 ****
    <para>The <command>./configure</command> script does not check for the presence of
  	<filename>libfam.la</filename>, and <command>make</command> needs <filename>libfam.la</filename>
! 	to compile &krusader;. If you know how this can be solved, please let us know. 
  	Install <filename>libfam0-devel-foo.rpm</filename>.
  	Note: when you install <application>Mandrake 9.1</application> with the default settings, this
--- 193,197 ----
    <para>The <command>./configure</command> script does not check for the presence of
  	<filename>libfam.la</filename>, and <command>make</command> needs <filename>libfam.la</filename>
! 	to compile &krusader;. If you know how this can be solved, please let us know.
  	Install <filename>libfam0-devel-foo.rpm</filename>.
  	Note: when you install <application>Mandrake 9.1</application> with the default settings, this
***************
*** 187,190 ****
--- 199,203 ----
  	If you need more information take a look at &missing_libs_lnk;.
     </para>
+    <para> </para> <!-- Empty line to make it more readable -->
     </answer>
     </qandaentry>
***************
*** 220,232 ****
        </para>
        <para>Thanks for your cooperation!</para>
    </answer>
    </qandaentry>
  
  </qandaset>
! </sect1> 
  
  
  <sect1 id="faq_usage">
! <title>&krusader; Usage &FAQ;'s</title>
  <qandaset>
  
--- 233,246 ----
        </para>
        <para>Thanks for your cooperation!</para>
+       <para> </para> <!-- Empty line to make it more readable -->
    </answer>
    </qandaentry>
  
  </qandaset>
! </sect1>
  
  
  <sect1 id="faq_usage">
! <title>Usage &FAQ;'s</title>
  <qandaset>
  
***************
*** 236,248 ****
     </question>
     <answer>
!    <para>In versions prior to 0.75, we supported changing some of the colors
!           in &krusader;. After some debates in the &kde; mailing-list regarding the matter, we decided
!           that &krusader;'s colors will match &kde;'s current color-scheme. This makes &krusader; more
!           compatible and coherent. As a result, we don't support changing colors inside the program.
!           Sorry.
!           Note: We are planning to write code to use "Colorize files by type" (request id. 735649).
! 	  btw. the &krusader; Krew is experimenting at this moment to (re)introduce color support,
! 	  so there is hope ;-)
     </para>
     </answer>
     </qandaentry>
--- 250,259 ----
     </question>
     <answer>
!    <para>In versions prior to 0.75, we supported changing some of the colors in &krusader;.
!           After some debates in the &kde; mailing-list regarding the matter, we decided
!           that &krusader;'s colors will match &kde;'s current color-scheme.
!           Since krusader-cvs-2004-03-24 (&krusader; 1.40 stable) we reintroduced color support. 
     </para>
+    <para> </para> <!-- Empty line to make it more readable -->
     </answer>
     </qandaentry>
***************
*** 254,260 ****
    </question>
    <answer>
!   <para>Supermount is a daemon which handles mounting/unmounting of removable filesystems for you. 
!        Just insert a floppy, and do 
!        <userinput><command>cd</command> <option><replaceable>/mnt/floppy</replaceable></option></userinput> 
         supermount will do the mount for you automatically and transparently. All this is great, however,
         supermount manipulates the system into thinking that the <hardware>floppy/cdrom</hardware> is mounted
--- 265,271 ----
    </question>
    <answer>
!   <para>Supermount is a daemon which handles mounting/unmounting of removable filesystems for you.
!        Just insert a floppy, and do
!        <userinput><command>cd</command> <option><replaceable>/mnt/floppy</replaceable></option></userinput>
         supermount will do the mount for you automatically and transparently. All this is great, however,
         supermount manipulates the system into thinking that the <hardware>floppy/cdrom</hardware> is mounted
***************
*** 264,267 ****
--- 275,279 ----
         Feel free to write a patch for it ;-).
    </para>
+   <para> </para> <!-- Empty line to make it more readable -->
    </answer>
    </qandaentry>
***************
*** 279,282 ****
--- 291,295 ----
        and you'll be able to resize &krusader; to your liking.
    </para>
+   <para> </para> <!-- Empty line to make it more readable -->
    </answer>
    </qandaentry>
***************
*** 288,297 ****
     </question>
     <answer>
!    <para>The bad news is that we're not sure why, but seems that <command>fam</command> 
!       (file alteration monitor)doesn't always 
        seem to work for us. Feel free to write a patch for it ;-).
        We've tried the same source code on two different Gentoo installation: one worked,
!       the other did not. The good news is that if you disable <application>fam</application>, &krusader; will 
!       automatically revert to its internal mechanism (which is less efficient, but works) without needing to 
        recompile.
        You can disable <application>fam</application> with:
--- 301,310 ----
     </question>
     <answer>
!    <para>The bad news is that we're not sure why, but seems that <command>fam</command>
!       (file alteration monitor)doesn't always
        seem to work for us. Feel free to write a patch for it ;-).
        We've tried the same source code on two different Gentoo installation: one worked,
!       the other did not. The good news is that if you disable <application>fam</application>, &krusader; will
!       automatically revert to its internal mechanism (which is less efficient, but works) without needing to
        recompile.
        You can disable <application>fam</application> with:
***************
*** 299,302 ****
--- 312,316 ----
        Look at the manpages for more information about <application>fam</application>.
    </para>
+   <para> </para> <!-- Empty line to make it more readable -->
    </answer>
    </qandaentry>
***************
*** 305,309 ****
    <qandaentry>
    <question id="samba_codepage">
!   <para><application>Samba</application> ISO 8859-x codepage / What to do if &krusader; does not read shared 
          directories containing national characters?</para>
    </question>
--- 319,323 ----
    <qandaentry>
    <question id="samba_codepage">
!   <para><application>Samba</application> ISO 8859-x codepage / What to do if &krusader; does not read shared
          directories containing national characters?</para>
    </question>
***************
*** 321,324 ****
--- 335,339 ----
       this step must be done with a text editor.
    </para>
+   <para> </para> <!-- Empty line to make it more readable -->
    </answer>
    </qandaentry>
***************
*** 337,340 ****
--- 352,356 ----
          <para>or the directory where the KIO slaves are placed in your &Linux; distribution.
    </para>
+   <para> </para> <!-- Empty line to make it more readable -->
    </answer>
    </qandaentry>
***************
*** 353,359 ****
--- 369,392 ----
        <guilabel>Enable Passive Mode (PASV)</guilabel> has to be checked.
    </para>
+   <para> </para> <!-- Empty line to make it more readable -->
+   </answer>
+   </qandaentry>
+ 
+   <!-- Thanks to Karai Csaba -->
+   <qandaentry>
+   <question id="ftp_http_proxy">
+   <para>I get <errorcode>"FTP protocol not supported by &krusader;"</errorcode> error at trying to open
+         a remote &FTP; directory.</para>
+   </question>
+   <answer>
+   <para>The reason of this error is that '&FTP; via &HTTP; proxy' feature is not yet supported by &krusader;.
+         This error can occur at misconfiguring the proxy settings in &kde; (Control Center).
+         Modify the proxy setting to not use &HTTP; proxy and &FTP; will work.
+   </para>
+   <para> </para> <!-- Empty line to make it more readable -->
    </answer>
    </qandaentry>
  
+ 
  </qandaset>
  </sect1>
***************
*** 377,380 ****
--- 410,414 ----
        or drop us a note in our <link linkend="faqq_kru_forum">&krusader; Forum</link>.
    </para>
+   <para> </para> <!-- Empty line to make it more readable -->
    </answer>
    </qandaentry>
***************
*** 404,407 ****
--- 438,442 ----
      <note><para><remark>If you've got bugs to report please do not use &kde;'s bugzilla http://bugs.kde.org/,
      &kde;'s Bug Tracking System.</remark></para></note>
+     <para> </para> <!-- Empty line to make it more readable -->
    </answer>
    </qandaentry>
***************
*** 422,425 ****
--- 457,461 ----
        To see the collection of prior CVS commits visit the &krucommitsarch_url;.
    </para>
+   <para> </para> <!-- Empty line to make it more readable -->
    </answer>
    </qandaentry>
***************
*** 459,462 ****
--- 495,499 ----
    </para>
    <para>Thanks for your cooperation!</para>
+   <para> </para> <!-- Empty line to make it more readable -->
    </answer>
    </qandaentry>

Index: krusader-tools.sgml
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/doc/en/krusader-tools.sgml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** krusader-tools.sgml	4 Mar 2004 20:34:33 -0000	1.8
--- krusader-tools.sgml	29 Mar 2004 19:36:39 -0000	1.9
***************
*** 87,91 ****
  	</itemizedlist>
  	<note><para>We plan to expand MountMan in the next evolution of &krusader;. It will be able to format floppies,
! 	edit <filename class="directory">/etc/fstab</filename>, create new filesystems and more...</para></note>
  </sect1>
  
--- 87,111 ----
  	</itemizedlist>
  	<note><para>We plan to expand MountMan in the next evolution of &krusader;. It will be able to format floppies,
! 	edit <filename class="directory">/etc/fstab</filename>, create new filesystems and more...
! 	btw. we have started working on it, see "Quickmode for MountMan"</para></note>
! 
! <para><emphasis role="bold">Quickmode for MountMan</emphasis></para>
! 
! <note><para>This new feature will be the future MountMan, but for now it is still under development and not
!             finished yet. &hesbugreport_lnk;
!             If you have a good idea, don&apos;t hesitate to send us
!             <link linkend="faqq_wish_patch">User feedback</link>.</para></note>
! 
! <para>Quickmode for MountMan is only available on &kde; 3.2 - earlier versions will see no difference.</para>
! 
! <para>To activate Quickmode for MountMan, click AND HOLD the MountMan button on the &toolbar_lnk;</para>
! 
! <para>General idea: display a list of all possible mountpoints.
!       Each time the menu is displayed, it determines if a mountpoint is mounted or not and associated the correct
!       action (mount or umount). This offers a quick interface to MountMan. 
!       It is working, and currently uses KMountMan::mount and unmount, we think that it can make the "old"
!       MountMan extinct. It uses the new &kde; services for fstab-reading and this will enable us to remove A LOT of code
!       from the "old" MountMan.</para>
! 
  </sect1>
  
***************
*** 338,341 ****
--- 358,364 ----
  	start &krusader;'s internal editor (which is basically the same application).
    </para>
+   
+   <para>btw. the embedded viewer is not written by us, it is supplied via &kde; (libs) and we 
+         cannot change it (read: we don't want to change it because it works fine).</para>
  </sect2>
  
***************
*** 1219,1226 ****
  	           delete X3 files ( Y3 bytes )
                     enable / disable the left side deleting.</para></listitem>
      </itemizedlist></listitem>
      </varlistentry>
  
!     <varlistentry><term>Below the checkboxes, there are three status labels</term>
      <listitem>
      <itemizedlist>
--- 1242,1253 ----
  	           delete X3 files ( Y3 bytes )
                     enable / disable the left side deleting.</para></listitem>
+ 	<listitem><para><guilabel>"Confirm overwrites"</guilabel>:
+ 	           By switching this option on, Krusader will show the well know
+                    <guibutton>"rename, skip, overwrite, skip all, overwrite all"</guibutton> dialog box,
+                    before overwriting the file.</para></listitem>  
      </itemizedlist></listitem>
      </varlistentry>
  
!     <varlistentry><term>Status labels</term>
      <listitem>
      <itemizedlist>
***************
*** 1231,1238 ****
      	<listitem><para><guilabel>"Progress bar"</guilabel>:
  	           Shows the progress on the synchronization (based on bytes).</para></listitem>
- 	<listitem><para><guilabel>"Confirm overwrites"</guilabel>:
- 	           By switching this option on, Krusader will show the well know
-                    <guibutton>"rename, skip, overwrite, skip all, overwrite all"</guibutton> dialog box,
-                    before overwriting the file.</para></listitem>
      </itemizedlist></listitem>
      </varlistentry>
--- 1258,1261 ----

Index: using-krusader.sgml
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/doc/en/using-krusader.sgml,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** using-krusader.sgml	4 Mar 2004 20:34:33 -0000	1.9
--- using-krusader.sgml	29 Mar 2004 19:36:39 -0000	1.10
***************
*** 141,146 ****
  		 Down arrow = z to a sorting).
  		 The width <guilabel>Column Headers</guilabel> can be changed with the mouse.
! 		 Several more <guilabel>Column Headers</guilabel> are
! 		 <link linkend="konfig-looknfeel-panel">available</link></para></listitem>
        <listitem><para><emphasis><guilabel>File List</guilabel></emphasis> : displays the files and directories
                   in the browsed directory. The &quick_search_lnk; allows to search for
--- 141,146 ----
  		 Down arrow = z to a sorting).
  		 The width <guilabel>Column Headers</guilabel> can be changed with the mouse.
! 		 Several more optional <guilabel>Column Headers</guilabel> are
! 		 <link linkend="konfig-looknfeel-panel">available</link>.</para></listitem>
        <listitem><para><emphasis><guilabel>File List</guilabel></emphasis> : displays the files and directories
                   in the browsed directory. The &quick_search_lnk; allows to search for
***************
*** 183,189 ****
  
  
  <sect3 id="folderhistory">
  <title>Folder history</title>
! &newfeaturenote;
  <para>Both panels rembers the last visited folders and stores them in the Folder history menu.
        Click on the <guibutton>"Folder history"</guibutton> button ("watch" symbol) to open this menu.
--- 183,210 ----
  
  
+ <sect3 id="paneltoolbar">
+ <title>Panel toolbar</title>
+ 
+ <para>Both panels have a <link linkend="konfig-looknfeel-ptoolbar">configurable</link> Panel Toolbar.
+        The complete Panel Toolbar can be visible/unvisible, or some buttons of it can be made visible/unvisible.
+ <itemizedlist>
+ 	<listitem><para><guibutton>"OpenDir Button"</guibutton>: opens the directory browser.</para>
+ 		   </listitem>
+ 	<listitem><para><guibutton>"Equal Button (=)"</guibutton>: changes the panel directory to the
+ 	                  other panel directory.</para>
+ 	           </listitem>
+ 	<listitem><para><guibutton>"Up Button (..)"</guibutton>: the panel steps into the parent directory.
+ 	                  </para></listitem>
+ 	<listitem><para><guibutton>"Home Button (~)"</guibutton>: the panel steps into the home directory</para>
+ 	            </listitem>
+ 	<listitem><para><guibutton>"Root Button (/)"</guibutton>: the panel steps into the root directory.</para>
+ 		    </listitem>
+ </itemizedlist>
+ </para>
+ </sect3>
+ 
  <sect3 id="folderhistory">
  <title>Folder history</title>
! 
  <para>Both panels rembers the last visited folders and stores them in the Folder history menu.
        Click on the <guibutton>"Folder history"</guibutton> button ("watch" symbol) to open this menu.
***************
*** 218,246 ****
        this path is where your command will be executed. Typing
        <userinput><command>cd </command><replaceable>&lt;directory&gt;</replaceable></userinput>
!       in the command line will also cause that the active panel points to this directory.</para>
! 
! <para>Command line &keybindigs_lnk; overview:
! <itemizedlist>
!     <listitem><para><keycap>Up arrow</keycap> and <keycap>Down arrow</keycap>
!               to scroll through previously typed commands.</para>
!               </listitem>
!     <listitem><para><keycombo action="simul">&Ctrl;<keycap>/</keycap></keycombo> or press and hold the
!               <guibutton>"History"</guibutton> button opens the command line history list.</para>
!               </listitem>
!     <listitem><para><keycombo action="simul">&Ctrl;<keycap>Up arrow</keycap></keycombo>
!                will take you back to the active panel.</para>
!                </listitem>
!     <listitem><para><keycombo action="simul">&Ctrl;<keycap>Down arrow</keycap></keycombo>
!               will take you from the panel to the command line.</para>
!               </listitem>
!     <listitem><para><keycombo action="simul">&Ctrl;<keycap>Enter</keycap></keycombo>
!               will insert current file / directory name without path to current command line position.</para>
!               </listitem>
!     <listitem><para><keycombo action="simul">&Ctrl;&Shift;<keycap>Enter</keycap></keycombo>
!               insert current file / directory with full path name to current command line position.</para>
!               </listitem>
! </itemizedlist>
! </para>
! <!--  "Backspace" key in terminal, /* Shortcut disabled because of the Terminal Emulator bug. */ krusader.cpp -->
  
  <screenshot><screeninfo>Terminal emulator</screeninfo><mediaobject>
--- 239,244 ----
        this path is where your command will be executed. Typing
        <userinput><command>cd </command><replaceable>&lt;directory&gt;</replaceable></userinput>
!       in the command line will also cause that the active panel points to this directory.
!       Cick <link linkend="cmdline_keybindings">here</link> to view the command line keybindings.</para>
  
  <screenshot><screeninfo>Terminal emulator</screeninfo><mediaobject>
***************
*** 257,261 ****
        When you drag a file from the <interface>"List Panel"</interface>, you will get to choose between:
        "Paste", <command>cd</command>, <command>mv</command> and <command>ln</command>.
!       If you drag multiple files - then will cd not be available..
        You can close the emulator by typing <userinput><command>exit</command></userinput>.</para>
        <para>You can choose your mode of operation (command line, emulator, both or none)
--- 255,259 ----
        When you drag a file from the <interface>"List Panel"</interface>, you will get to choose between:
        "Paste", <command>cd</command>, <command>mv</command> and <command>ln</command>.
!       If you drag multiple files - then will cd not be available.
        You can close the emulator by typing <userinput><command>exit</command></userinput>.</para>
        <para>You can choose your mode of operation (command line, emulator, both or none)
***************
*** 467,471 ****
  <title>Quick search</title>
  <!-- Thanks to Heiner Eichmann -->
- &newfeaturenote;
  
  <para>This feature will do a quick search for the file name in the active list panel.</para>
--- 465,468 ----
***************
*** 510,513 ****
--- 507,511 ----
  	  <listitem><para>&mountman_lnk; (unmount, format, ...)</para></listitem>
  	  <listitem><para>&syncdirs_lnk; File List</para></listitem>
+ 	  <listitem><para>...</para></listitem>
  </itemizedlist>
  </para>
***************
*** 697,701 ****
  <title>Calculate occupied space</title>
  <!-- Thanks to Heiner Eichmann -->
! &rwfeaturenote;
  <para>There are two ways to calculate the occupied space of files/directories.
    <itemizedlist>
--- 695,699 ----
  <title>Calculate occupied space</title>
  <!-- Thanks to Heiner Eichmann -->
! 
  <para>There are two ways to calculate the occupied space of files/directories.
    <itemizedlist>
***************
*** 785,790 ****
  <title>Split file</title>
  
- &betafeaturenote;
- 
  <para>
      Choose
--- 783,786 ----
***************
*** 827,832 ****
  <title>Combine files</title>
  
- &betafeaturenote;
- 
  <para>This function combines multiple files to one file after the &splitfile_lnk;
        function was used. Select a partial file <filename>foo.xxx</filename> and choose
--- 823,826 ----
***************
*** 848,854 ****
--- 842,911 ----
  
  
+ <sect2 id="locate">
+ <title>Locate &GUI; frontend</title>
+ 
+ <para>&krusader; has a &GUI; frontend for the <command>locate</command> command (findutils).
+       Locate is used for fast file searching. It does not search from a directory, but from a database.
+       The package contains two files <command>locate</command> and <command>updatedb</command>.
+       Updatedb walks through on the local filesystem and stores the file entries in the database.
+       Often <command>cron</command> will call <command>updatedb</command> every night.
+       Choose <emphasis role="bold"><menuchoice><guimenu>Commands</guimenu>
+       <guimenuitem>Locate</guimenuitem></menuchoice></emphasis>
+       or
+       <keycombo action="simul">&Ctrl;<keycap>L</keycap></keycombo> to start this feature.
+       <link linkend="konfig-advanced">Konfigurator</link> can set additional arguments for
+       <command>updatedb</command>.
+       </para>
+ 
+ <para>Checkbox options
+ <itemizedlist>
+      <listitem><para><guilabel>"Show only the existing files"</guilabel>:
+ 	             if the database contains entries which do not exist any more (deleted, moved since the
+ 	             last <command>updatedb</command>), <command>locate</command> will not list them.
+ 	             It checks the existence of each file before listing in the results window (slow).</para>
+ 	       </listitem>
+      <listitem><para><guilabel>"Case sensitive"</guilabel>:
+ 	             unchecking it will allow lower and upper case search.</para>
+ 	       </listitem>
+ </itemizedlist></para>
+ 
+ <para>Action buttons
+ <itemizedlist>
+     	<listitem><para><guibutton>"Locate"</guibutton>:
+ 	           executes <command>locate <replaceable>foo foo</replaceable></command>
+ 		   and places its output into the results window.</para></listitem>
+ 	<listitem><para><guibutton>"Stop"</guibutton>:
+ 	           stops the locate process.</para></listitem>
+     	<listitem><para><guibutton>"UpdateDB"</guibutton>:
+ 	           starts <command>updatedb</command> for updating the locate database after
+ 		   entering the root password.</para></listitem>
+ 	<listitem><para><guibutton>"Close"</guibutton>:
+ 	           closes the locate window.</para></listitem>
+ </itemizedlist>
+ </para>
+ 
+ <para>Results window
+ <itemizedlist>
+     	<listitem><para>double click on an item: steps to its directory, makes the item
+                           visible and closes the locate dialog.</para></listitem>
+     	<listitem><para><keycap>F3</keycap>: views the current item.</para></listitem>
+ 	<listitem><para><keycap>F4</keycap>: edit the current item.</para></listitem>
+ 	<listitem><para>right click: edit/view/find menu.</para></listitem>
+ </itemizedlist>
+ 
+ </para>
+ 
+ </sect2>
+ 
+ 
  <sect2  id="user_menu">
  <title>User Menu</title>
  
+ <note><para>The User Menu will NOT supported officially in &krusader; 1.40 stable, but is there, hidden.
+             It is work in progress and is unfinished, it would delay the the release of 1.40 much to long
+             if we want to complete it.
+             If you have some nice ideas for the User Menu, please let us know.
+             It will be an official feature in &krusader; 1.50</para></note>
+ 
  &newfeaturenote;
  
***************
*** 858,862 ****
      </emphasis>
      or
!     <keycombo action="simul">&Ctrl;<keycap>foo</keycap></keycombo>
      opens the <guimenuitem>User Menu</guimenuitem>, here you can create and use your own often used commands.
      It can run things via terminal, via an output-collection window or just run it.
--- 915,919 ----
      </emphasis>
      or
!     <keycombo action="simul">&Ctrl;<keycap>`</keycap></keycombo>
      opens the <guimenuitem>User Menu</guimenuitem>, here you can create and use your own often used commands.
      It can run things via terminal, via an output-collection window or just run it.
***************
*** 934,937 ****
--- 991,996 ----
  </para>
  
+ <para>Deleting and editing an entry is not yet written.</para>
+ 
  <para>The user menu configuration is stored in
        <filename>~/.kde/share/apps/krusader/krusermenu.dat</filename></para>
***************
*** 940,983 ****
  
  
- <sect2 id="locate">
- <title>Locate &GUI; frontend</title>
- 
- &newfeaturenote;
- 
- <para>&krusader; has a &GUI; frontend for the <command>locate</command> command (findutils).
-       This allows you to do a fast file searching on your system via the indexed
-       <command>locate</command> database.
-       Choose <emphasis role="bold"><menuchoice><guimenu>Commands</guimenu>
-       <guimenuitem>Locate</guimenuitem></menuchoice></emphasis>
-       or
-       <keycombo action="simul">&Ctrl;<keycap>L</keycap></keycombo> to start this feature.
-       </para>
- 
- <para>Checkbox options
- <itemizedlist>
-      <listitem><para><guilabel>"Show only the existing files"</guilabel>:
- 	             ?????.</para>
- 	       </listitem>
-      <listitem><para><guilabel>"Case sensitive"</guilabel>:
- 	             unchecking it will allow lower and upper case search.</para>
- 	       </listitem>
- </itemizedlist></para>
- 
- <para>Action buttons
- <itemizedlist>
-     	<listitem><para><guibutton>"Locate"</guibutton>:
- 	           executes `locate xy` and places its output into the results window.</para></listitem>
-     	<listitem><para><guibutton>"UpdateDB"</guibutton>:
- 	           starts <command>updatedb</command> for locate db update.</para></listitem>
- 	<listitem><para><guibutton>"Stop"</guibutton>:
- 	           cancel the updatedb process.</para></listitem>
- 	<listitem><para><guibutton>"Close"</guibutton>:
- 	           closes the locate window.</para></listitem>
- </itemizedlist>
- </para>
- 
- </sect2>
- 
- 
  </sect1>
  
--- 999,1002 ----
***************
*** 1095,1098 ****
--- 1114,1120 ----
  <entry><para><link linkend="mount-man">MountMan</link></para></entry></row>
  <row>
+ <entry><para><keycombo action="simul">&Alt;<keycap>`</keycap></keycombo></para></entry>
+ <entry><para>&usermenu_lnk;</para></entry></row>
+ <row>
  <entry><para><keycombo action="simul">&Alt;<keycap>Left Arrow</keycap></keycombo></para></entry>
  <entry><para><link linkend="bookman">Left bookmarks</link></para></entry></row>
***************
*** 1128,1134 ****
  <tbody>
  <row>
- <entry><para><keycombo action="simul">&Ctrl;<keycap>foo</keycap></keycombo></para></entry>
- <entry><para>&usermenu_lnk;</para></entry></row>
- <row>
  <entry><para><keycombo action="simul">&Ctrl;<keycap>+</keycap></keycombo></para></entry>
  <entry><para><link linkend="mark-menu">Select Group</link></para></entry></row>
--- 1150,1153 ----
***************
*** 1261,1268 ****
  
  
! <para><emphasis role="bold">Other Key-bindings:</emphasis></para>
! <para><link linkend="krviewer">KrViewer</link>,
!       <link linkend="cmdline">command line / terminal emulator</link>
!       and &kde; Control center -> Accessibility -> Keyboard Shortcuts.</para>
  
  </sect1>
--- 1280,1321 ----
  
  
! <para id="cmdline_keybindings"><emphasis role="bold">&cmdline_lnk;</emphasis></para>
! <informaltable>
! <tgroup cols="2">
! <tbody>
! <row>
! <entry><para><keycap>Up arrow</keycap> and <keycap>Down arrow</keycap></para></entry>
! <entry><para>scroll through previously typed commands.</para></entry></row>
! <row>
! <entry><para><keycombo action="simul">&Ctrl;<keycap>/</keycap></keycombo></para></entry>
! <entry><para>opens the command line history list.</para></entry></row>
! <row>
! <entry><para><keycombo action="simul">&Ctrl;<keycap>Up arrow</keycap></keycombo></para></entry>
! <entry><para>jumps from the command line to the active panel.</para></entry></row>
! <row>
! <entry><para><keycombo action="simul">&Ctrl;<keycap>Down arrow</keycap></keycombo></para></entry>
! <entry><para>jumps from the active panel to the command line.</para></entry></row>
! <row>
! <entry><para><keycombo action="simul">&Ctrl;<keycap>Enter</keycap></keycombo></para></entry>
! <entry><para>inserts current file / directory name without path to current command line position.</para>
! </entry></row>
! <row>
! <entry><para><keycombo action="simul">&Ctrl;&Shift;<keycap>Enter</keycap></keycombo></para></entry>
! <entry><para>inserts current file / directory with full path name to current command line position.</para></entry></row>
! <!--  "Backspace" key in terminal, /* Shortcut disabled because of the Terminal Emulator bug. */ krusader.cpp -->
! </tbody>
! </tgroup>
! </informaltable>
! 
! 
! <itemizedlist>
! <title>Other Key-bindings</title>
! 	<listitem>
! 	   <para><link linkend="krviewer">KrViewer</link>.</para>
! 	</listitem>
! 	<listitem>
! 	   <para>&kde; Control center -> Accessibility -> Keyboard Shortcuts.</para>
! 	</listitem>
! </itemizedlist>
  
  </sect1>

Index: index.docbook
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/doc/en/index.docbook,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** index.docbook	4 Mar 2004 20:34:33 -0000	1.9
--- index.docbook	29 Mar 2004 19:36:39 -0000	1.10
***************
*** 101,104 ****
--- 101,105 ----
  <!ENTITY termemu_lnk ' <link linkend="cmdline">Terminal emulator</link>'>
  <!ENTITY missing_libs_lnk '<link linkend="faqq_missing_libs">&FAQ; missing libs or headers</link>'>
+ <!ENTITY install_proc_lnk '<link linkend="installation">installation procedure</link>'>
  <!ENTITY disablenote '<note><para>This feature is temporarily disabled and will be rewritten, sorry.</para></note>'>
  <!ENTITY faqbugreports_lnk '<link linkend="faqq_bug_report">bug reports</link>'>
***************
*** 112,116 ****
                           functionality can change during the development. &hesbugreport_lnk;
  			 <link linkend="faqq_wish_patch">User feedback</link> is always welcome!</para></note>'>
! <!ENTITY krusaderrc_ui_text '<para>When you install a &krusader; cvs version and if &krusader; was previously installed on your computer, there is a possibility that you have to update the <filename>krusaderrc.ui</filename> file, click <link linkend="krusaderrc_ui">here</link> for more info.</para>'>
  
  <!-- other ENTITIES -->
--- 113,119 ----
                           functionality can change during the development. &hesbugreport_lnk;
  			 <link linkend="faqq_wish_patch">User feedback</link> is always welcome!</para></note>'>
! <!ENTITY krusaderui_rc_text '<para>When you install a &krusader; cvs or beta version and if &krusader; was previously
!          installed on your computer, there is a possibility that you will have to update the
!          <filename>krusaderui.rc</filename> file, click <link linkend="krusaderui_rc">here</link> for more info.</para>'>
  
  <!-- other ENTITIES -->
***************
*** 159,162 ****
--- 162,170 ----
          <affiliation><address><email>ck...@us...</email></address></affiliation>
          </othercredit>
+ 	<othercredit role="developer">
+         <firstname>Heiner</firstname><surname>Eichmann</surname>
+         <contrib>Developer</contrib>
+         <affiliation><address><email>h.e...@gm...</email></address></affiliation>
+         </othercredit>        
  	<author>
          <firstname>Frank</firstname>
***************
*** 193,198 ****
  
  	<legalnotice>&FDLNotice;</legalnotice>
! 	<date>22/02/2004</date>
! 	<releaseinfo>1.31.01</releaseinfo>
  
     <abstract>
--- 201,206 ----
  
  	<legalnotice>&FDLNotice;</legalnotice>
! 	<date>29/03/2004</date>
! 	<releaseinfo>1.40.00-beta1</releaseinfo>
  
     <abstract>
***************
*** 287,291 ****
  
     <para>The Handbook "releaseinfo" matches the &krusader; version number.
!          &eg; "&krusader; Handbook revision 1.31.xx" describes "&krusader; version 1.31"</para>
  
     <para>Please read the the &online_docchangelog_url; file or the <filename>krusader_kde3/doc/ChangeLog</filename> 
--- 295,299 ----
  
     <para>The Handbook "releaseinfo" matches the &krusader; version number.
!          &eg; "&krusader; Handbook revision 1.40.xx" describes "&krusader; version 1.40"</para>
  
     <para>Please read the the &online_docchangelog_url; file or the <filename>krusader_kde3/doc/ChangeLog</filename> 

Index: installation.sgml
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/doc/en/installation.sgml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** installation.sgml	4 Mar 2004 20:34:33 -0000	1.8
--- installation.sgml	29 Mar 2004 19:36:39 -0000	1.9
***************
*** 175,179 ****
  <prompt>$</prompt> <userinput><command>su -c 'make</command> <option>install'</option></userinput></screen>
  
! &krusaderrc_ui_text;
  
  <para>Since &krusader; uses <command>autoconf</command> and
--- 175,179 ----
  <prompt>$</prompt> <userinput><command>su -c 'make</command> <option>install'</option></userinput></screen>
  
! &krusaderui_rc_text;
  
  <para>Since &krusader; uses <command>autoconf</command> and
***************
*** 436,440 ****
  
  <listitem>
!   &krusaderrc_ui_text;
    <para></para> <!-- Empty line to make it more readable -->
  </listitem>
--- 436,440 ----
  
  <listitem>
!   &krusaderui_rc_text;
    <para></para> <!-- Empty line to make it more readable -->
  </listitem>
***************
*** 465,469 ****
  
  
! <para>If you encounter problems with installing &krusader; please read first the &faq_lnk;,
        If this installation procedure and the FAQ's does not solve the problem,
        feel free to ask for help with an &help_request_lnk;.</para>
--- 465,469 ----
  
  
! <para>If you encounter problems with installing &krusader; please read first the &faq_lnk;.
        If this installation procedure and the FAQ's does not solve the problem,
        feel free to ask for help with an &help_request_lnk;.</para>
***************
*** 563,567 ****
  <para><emphasis role="bold">krusaderui.rc</emphasis></para>
  <para>This file stores the users toolbar settings and the menu structure.
!       Tip: read also the <link linkend="krusaderrc_ui">&FAQ;'s</link>.</para>
  <para>Location: <filename>$KDEDIR/share/apps/krusader/krusaderui.rc</filename> or
        <filename>~/.kde/share/apps/krusader/krusaderui.rc</filename></para>
--- 563,567 ----
  <para><emphasis role="bold">krusaderui.rc</emphasis></para>
  <para>This file stores the users toolbar settings and the menu structure.
!       Tip: read also the <link linkend="krusaderui_rc">&FAQ;'s</link>.</para>
  <para>Location: <filename>$KDEDIR/share/apps/krusader/krusaderui.rc</filename> or
        <filename>~/.kde/share/apps/krusader/krusaderui.rc</filename></para>

[Krusader-commits] krusader_kde3/po krusader.pot,1.10,1.11 nl.po,1.8,1.9

[Frank S. <cod...@us...>]

Update of /cvsroot/krusader/krusader_kde3/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30793/po

Modified Files:
	krusader.pot nl.po 
Log Message:
krusader-cvs-2004-03-29

Index: krusader.pot
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/po/krusader.pot,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** krusader.pot	2 Mar 2004 21:19:25 -0000	1.10
--- krusader.pot	29 Mar 2004 19:34:03 -0000	1.11
***************
*** 8,13 ****
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
! "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2004-03-02 23:27+0200\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
--- 8,12 ----
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
! "POT-Creation-Date: 2004-03-29 20:37+0000\n"
[...6468 lines suppressed...]
  
! #: rc.cpp:2
! msgid "&Mark"
  msgstr ""
  
! #: rc.cpp:3
! msgid "&Commands"
  msgstr ""
  
! #: _translatorinfo.cpp:1
! msgid ""
! "_: NAME OF TRANSLATORS\n"
! "Your names"
  msgstr ""
  
! #: _translatorinfo.cpp:3
! msgid ""
! "_: EMAIL OF TRANSLATORS\n"
! "Your emails"
  msgstr ""

Index: nl.po
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/po/nl.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** nl.po	30 Dec 2003 20:21:43 -0000	1.8
--- nl.po	29 Mar 2004 19:34:03 -0000	1.9
***************
*** 1,13 ****
  # translation of krusader.pot to DUTCH (nl.po)
  # Dutch (Nederlands) translation for Krusader
! # Copyright (C) 2001,2003 Free Software Foundation, Inc.
! # FIRST AUTHOR Frank Schoolmeesters <fra...@ya...>, 2003
  #
  msgid ""
  msgstr ""
! "Project-Id-Version: nl\n"
! "POT-Creation-Date: 2003-12-29 13:28+0000\n"
! "PO-Revision-Date: 2003-12-30 08:47+0000\n"
[...5357 lines suppressed...]
! #~ msgid "Choose a terminal"
! #~ msgstr "Kies een terminal"
! 
! #~ msgid "Choose a temporary directory"
! #~ msgstr "Kies een tijdelijke directory"
  
  #~ msgid "Can't re-enter archive. Going to the nearest path"
***************
*** 3227,3231 ****
  
  #~ msgid "Edit Bookmark"
! #~ msgstr "Edit Bladwijzer"
  
  #~ msgid "Name:"
--- 3793,3797 ----
  
  #~ msgid "Edit Bookmark"
! #~ msgstr "Bladwijzer bewerken"
  
  #~ msgid "Name:"

[Krusader-commits] krusader_kde3 README,1.14,1.15

[Frank S. <cod...@us...>]

Update of /cvsroot/krusader/krusader_kde3
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30154

Modified Files:
	README 
Log Message:


Index: README
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/README,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** README	13 Feb 2004 13:49:45 -0000	1.14
--- README	29 Mar 2004 19:31:04 -0000	1.15
***************
*** 1,6 ****
! krusader-cvs-2004-02-11 - Unstable
! ==============
  A list of new features compared to the latest stable (which was 1.30):
  
  * new konfigurator with many new configuration options - thanks to Csaba
  * new quicksearch (like TC) - thanks to Heiner
--- 1,7 ----
! krusader-cvs-Unstable
! =====================
  A list of new features compared to the latest stable (which was 1.30):
  
+ * panel level toolbar ('..', '/', '~', '=' buttons), thanks to David Harel 
  * new konfigurator with many new configuration options - thanks to Csaba
  * new quicksearch (like TC) - thanks to Heiner
***************
*** 26,30 ****
  
  +--------------------------------------------------------------------------------+
! | To learn what's new, read the Changelog.                                       |
  | For bug reports, fixes, patches and comments: please read first the            |
  | FAQ section of the Krusader Handbook.                                          |
--- 27,31 ----
  
  +--------------------------------------------------------------------------------+
! | To learn what's new, read the Changelog file.                                  |
  | For bug reports, fixes, patches and comments: please read first the            |
  | FAQ section of the Krusader Handbook.                                          |
***************
*** 40,45 ****
  
  Unpack the tarball and go to the Krusader source directory.
! If you have done a download from CVS you will have to run the following command to create
! the "./configure" script:
  $ make -f  Makefile.cvs
  
--- 41,46 ----
  
  Unpack the tarball and go to the Krusader source directory.
! If you have done a download from CVS you will have to run the following command to
! create the "./configure" script:
  $ make -f  Makefile.cvs
  
***************
*** 49,62 ****
  $ su -c 'make install'
  
! If Krusader is upgraded then upgrade the krusader_source_dir\krusader\krusaderrc.ui file in
! $KDEDIR/share/apps/krusader and ~/.kde/share/apps/krusader
  
- For general KDE install notes, read the INSTALL file.
  
  Need more help?
! A detailed install procedure is available at:
! http://krusader.sourceforge.net/handbook/compilation.html
! The FAQ's are available at:
! http://krusader.sourceforge.net/handbook/faq.html
  
  
--- 50,62 ----
  $ su -c 'make install'
  
! When you install a Krusader cvs or beta version and if Krusader was previously
! installed on your computer, there is a possibility that you will have to update
! the krusaderui.rc file. please read the faq's for more info.
  
  
  Need more help?
! For detailled installation instructions, please read the INSTALL file. 
! Or read it on-line at: http://krusader.sourceforge.net/handbook/installation.html
! The FAQ's are available at: http://krusader.sourceforge.net/handbook/faq.html
  
  
***************
*** 95,115 ****
                   If you like to write code at a regular base, maybe you like to join the Krusader Krew.
  
! - Translators    Krusader is currently available in 15 languages:
                   English (done by the Krusader Krew),
!                  Czech, Danish, Dutch, French, German, Hungarian, Italian,
                   2x Japanese, Polish, Russian, Slovak, Spanish, Swedish.
                   Some of these translations can use an update, please read the
                   "Krusader translation howto" for the latest information.
                   If you have a new or updated translation, please send it to Dirk.
  
  - Documentation  Krusader is in need of documentation.
!                  We've started working on it, but help is always welcome.
                   Please contact Frank.
  
  - Faq            If you have a question you want to add to the FAQ's, please let us know.
  
! - Krusader2      As we're "closing in" on version 1.x, we're thinking about Krusader II.
!                  This is a good time to hand in your suggestions, thoughts and wishes - hopefully,
!                  they'll make it into the next generation of file management.
                   Please use our "Krusader 2" forum.
  
--- 95,114 ----
                   If you like to write code at a regular base, maybe you like to join the Krusader Krew.
  
! - Translators    Krusader is currently available in 16 languages:
                   English (done by the Krusader Krew),
!                  Bulgarian, Czech, Danish, Dutch, French, German, Hungarian, Italian,
                   2x Japanese, Polish, Russian, Slovak, Spanish, Swedish.
                   Some of these translations can use an update, please read the
                   "Krusader translation howto" for the latest information.
                   If you have a new or updated translation, please send it to Dirk.
+                  Please read "For Translators" further below in this file.
  
  - Documentation  Krusader is in need of documentation.
!                  Help is always welcome.
                   Please contact Frank.
  
  - Faq            If you have a question you want to add to the FAQ's, please let us know.
  
! - Krusader2      Discussions about new features for future Krusader versions.
                   Please use our "Krusader 2" forum.
  
***************
*** 120,131 ****
  For Translators
  ===============
! To extract a .pot file, go to krusader_kde3/
! and do: make -f admin/Makefile.common package-messages
  
! We have a verry detailed "Krusader translation howto", this allows that even
! beginners or non-programmers can translate Krusader to their native language.
! Look at  http://krusader.sourceforge.net/phpBB/viewtopic.php?t=389
  If you have a new or updated translation, please send it to Dirk.
  
  
  
--- 119,168 ----
  For Translators
  ===============
! 1.
! Download the latest available version of Krusader with a checkout from CVS.
! Or if you are not familiar with CVS, download the latest Krusader CVS
! sourcecode snapshot (nightly tarball) from
! http://krusader.sourceforge.net/index.php?nav=cvs.php
  
! 2.
! Update krusader.pot (translation template file)
! (extracting all the English text from the sourcecode)
! Please don't forget to do this step, otherwise you will translate obsolete messages.
! $ make -f admin/Makefile.common package-messages
! 
! 3.
! Update foo.po (in the po directory), for existing translations only
! ./po/$ msgmerge foo.po krusader.pot --output-file=foo.po
! 
! 4.
! translate foo.po with Kbabel (Kbabel is easy to use)
! 
! 5.
! compile foo.po (in the po directory)
! ./po/$ msgfmt foo.po --statistics -c -v --output-file=foo.gmo
! 
! 6.
  If you have a new or updated translation, please send it to Dirk.
  
+ TIP
+ We have a verry detailed "Krusader translation howto" if you need more info,
+ this allows that even beginners or non-programmers can translate Krusader to
+ their native language. Please look at
+ http://krusader.sourceforge.net/phpBB/viewtopic.php?t=389
+ 
+ 
+ 
+ URL's
+ =====
+ Homepage       http://krusader.sourceforge.net 
+ Installation   http://krusader.sourceforge.net/handbook/installation.html
+ FAQ's          http://krusader.sourceforge.net/handbook/faq.html
+ Documentation  http://krusader.sourceforge.net/handbook/index.html
+ Todolist       http://sourceforge.net/tracker/?atid=560746&group_id=6488&func=browse
+ Buglist        http://sourceforge.net/tracker/?atid=106488&group_id=6488&func=browse
+ Forum          http://krusader.sourceforge.net/phpBB/index.php
+ ChangeLog      http://krusader.sourceforge.net/index.php?nav=text.php&note=cvs.changelog&path=dev
+ Downloadpages  http://krusader.sourceforge.net/index.php?nav=down.php
+                http://sourceforge.net/project/showfiles.php?group_id=6488
  
  
***************
*** 137,140 ****
--- 174,178 ----
  - Dirk Eschler, webmaster and i18n coordinator <des...@us...>
  - Csaba Karai,  developer <ck...@us...>
+ - Heiner Eichmann, developer <h.e...@gm...>
  - Frank Schoolmeesters, documentation coordinator <cod...@us...>
  - Mark Eatough, Krusader handbook proof reader <mar...@ya...>
***************
*** 142,147 ****
  
  
! Package Description:
! ====================
  Krusader is an advanced twin-panel (commander-style) file-manager for KDE 3.x
  (similar to Midnight or Total Commander) but with many extras.
--- 180,185 ----
  
  
! Package Description
! ===================
  Krusader is an advanced twin-panel (commander-style) file-manager for KDE 3.x
  (similar to Midnight or Total Commander) but with many extras.

[Krusader-commits] krusader_kde3 INSTALL,1.1.1.1,1.2

[Frank S. <cod...@us...>]

Update of /cvsroot/krusader/krusader_kde3
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29874

Modified Files:
	INSTALL 
Log Message:
Handbook 1.40.00-beta1

Index: INSTALL
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/INSTALL,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** INSTALL	15 Apr 2002 18:36:38 -0000	1.1.1.1
--- INSTALL	29 Mar 2004 19:29:59 -0000	1.2
***************
*** 1,2 ****
--- 1,278 ----
+ Compilation and installation
+ ============================
+ 
+ This text is extracted from Krusader Handbook version 1.40.00 (29/03/2004)
+ The Krusader Handbook is available in the Help menu of Krusader
+ (after installing Krusader).
+ 
+ For the HTML version look at
+ http://krusader.sourceforge.net/handbook/installation.html 
+ 
+ The FAQ's can be found at:
+ http://krusader.sourceforge.net/handbook/faq.html
+ 
+ After the Krusader installation instructions you will find generic
+ installation instructions for KDE applications.
+ 
+ 
+ I have downloaded the Sources for Krusader. What now?
+ =====================================================
+ 
+ Check the environment variables KDEDIR - QTDIR.
+ 
+ Unpack the tarball and go to the Krusader source directory.
+ If you have done a download from CVS you will have to run the following
+ command to create the "./configure" script:
+ $ make -f  Makefile.cvs
+ 
+ In order to compile and install Krusader on your system, type the following
+ in the base directory of the Krusader package:
+ 
+ $ ./configure
+ $ make
+ $ su -c 'make install'
+ 
+ When you install a Krusader cvs or beta version and if Krusader was previously
+ installed on your computer, there is a possibility that you will have to update
+ the krusaderui.rc file. Please read the faq's for more info.
+ 
+ Since Krusader uses autoconf and automake you should have no trouble compiling it.
+ Should you run into problems please read the detailed installation instructions below.
+ 
+ 
+ Detailed installation instructions
+ ==================================
+ 
+ The next procedure will explain step by step in detail how to install Krusader.
+ This question has been asked many times and especially users new to Linux often
+ have problems compiling software from source. Therefore we are trying to keep
+ the explanations as detailed as possible even if they are mostly not Krusader
+ specific. Experienced users may easily skip most of the steps.
+ 
+ 
+ If you encounter problems with installing Krusader, please read first this
+ installation procedure and the FAQ's, if this does not solve the problem then
+ feel free to ask for help with an help request.
+ Please read the FAQ's if you don't know how to send a help request.
+ 
+ 
+ 1. Open your favourite terminal emulator (e.g. konsole).
+ 
+ 2. We recommend to create a separate directory to keep all the sources you
+    compile in. This will give you a better overview of installed programs and
+    makes it easier to uninstall them later.
+ 
+    $ mkdir ~/source
+    The chosen directory is just an example, any other will work.
+ 
+ 3. Copy the sources to the ~/source directory and unpack them.
+ 
+    $ cp /"your_dir"/krusader-x.xx.tar.gz ~/source
+    $ cd ~/source
+    $ tar -xzvf krusader-x.xx.tar.gz
+ 
+ 
+ 4. Optional step: the tarball is no longer needed at this point, you can
+    delete it if you want.
+ 
+    $ rm  krusader-x.xx.tar.gz
+ 
+ 
+ 5. Change to the directory containing the sources.
+ 
+    $ cd  krusader-x.xx
+ 
+ 
+ 6. Check the environment variables QTDIR and KDEDIR.
+    Krusader's ./configure script needs to know where the Qt and
+    KDE directories are.
+ 
+    QTDIR : <path to your Qt installation> e.g. /usr/lib/qt3 or /usr/qt3
+    KDEDIR : <path to your KDE installation> e.g. /usr or /opt/kde3
+ 
+   Normally your distribution will set them for you, but experience has shown
+   that some don't. You can easily check the values with the echo command.
+ 
+   $ echo $QTDIR
+   /usr/lib/qt3
+   $ echo $KDEDIR
+   /usr
+   $
+   If both commands give an output, the enviroment variables are set (the above
+   example are the settings of Mandrake). In case you just receive empty lines,
+   the variables are not set and you have to set them it manually. To check the
+   values of the variables use the find command or ask your distributor.
+ 
+   $ find /usr /opt -name qtconfig -type f -perm +111
+   /usr/lib/qt3/bin/qtconfig
+   $ find  /usr /opt -name startkde -type f -perm +111
+   /usr/bin/startkde
+   $
+ 
+   In this case /usr/lib/qt3 is your QTDIR and /usr is your KDEDIR. The
+   installed binaries will go to /usr/bin. Now we will set the enviroment
+   variables with the export command.
+ 
+   $ export QTDIR=<replace with your QTDIR>
+   $ export KDEDIR=<replace with your KDEDIR>
+ 
+   Note
+   These enviroment variables are only set for the lifetime of your current
+   shell. if you close your terminal and open a new one they will be gone.
+   Assuming Krusader is not the only Qt/KDE program you want to compile,
+   we recommend to make these settings permanent (e.g. append both export
+   commands to your /etc/profile) file.
+ 
+ 
+ 7. If you have download a stable version "krusader-x.xx.tar.gz"" or a beta
+    version "krusader-x.xx-betax.tar.gz", you can skip this step, in this case
+    the ./configure script is provided.
+ 
+    If you have download a CVS build or nightly tarball
+    "krusader-cvs-yyyy-mm-dd.tar.gz", you will have to run the following
+    command to create the ./configure script:
+ 
+    $ make -f  Makefile.cvs
+ 
+    If everything is ok you will see the following output on your screen:
+ 
+    $ make -f  Makefile.cvs
+    This Makefile is only for the CVS repository
+    This will be deleted before making the distribution
+    *** Creating acinclude.m4
+    *** Creating list of subdirectories
+    *** Creating configure.in
+    *** Creating aclocal.m4
+    *** Creating configure
+    *** Creating config.h template
+    *** Creating Makefile templates
+    *** Postprocessing Makefile templates
+    *** Creating date/time stamp
+    *** Finished
+    Don't forget to run ./configure
+    If you haven't done so in a while, run ./configure --help
+    $
+ 
+    Note
+    You will need to have: autoconf 2.52, 2.53 or 2.54 and automake 1.6
+    (or higher) to run the make -f Makefile.cvs command
+ 
+    Tip
+    If you encounter problems with this command, Krusader provides 2 nightly
+    builds (snapshots) one with a ./configure script and one without. Look at:
+    http://krusader.sourceforge.net/index.php?nav=cvs.php
+ 
+ 
+ 7. Now you are ready to run the ./configure script.
+ 
+    $ ./configure
+ 
+    This will take about 1 minute, if everything goes well it will e.g. end
+    with the following messages:
+ 
+    foo
+    Krusader Project:
+    -----------------
+    Source code location: .
+    C Compiler:           gcc
+    C Compiler flags:     -ansi -W -Wall -pedantic -Wchar-subscripts -Wshadow
+    -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500
+    -D_BSD_SOURCE -O2 -Wformat-security -Wmissing-format-attribute
+    C++ Compiler:         g++
+    prefix:               /usr
+    kde_libraries:        /usr/include
+    kde_includes:         /usr/lib
+    kde_locale:           /usr/share/locale
+    qt_libraries:         /usr/lib/qt3/lib
+    qt_includes:          /usr/lib/qt3/include
+    KDEDIR:               /usr
+    QTDIR:                /usr/lib/qt3
+    Install path:         /usr/bin
+    krusader version:     1.30
+    krusader binary:      /usr/bin/krusader     (after 'make install')
+    Thank you for using Krusader
+ 
+    Good - your configure finished. Start make now
+    $
+ 
+    This is the output for Mandrake 9.1, other distributions may give a
+    different output.
+ 
+    Tip
+    At the end of the ./configure script you will find a summary of the most
+    important settings, e.g. where the Krusader binary will be installed
+    (after the 'make install' command).
+ 
+    Usually the Krusader binary will be installed in the KDEDIR/bin directory.
+    If you prefer to install Krusader in an other directory, you can do this
+    with te following command: ./configure --prefix=/usr/local. In this case
+    the Krusader binary will be installed in the /usr/local/bin directory.
+ 
+    This part will also display a warning if the environment variables
+    KDEDIR - QTDIR are empty.
+ 
+    Use ./configure --help to see more options or read the INSTALL file in the
+    Krusader sources.
+ 
+    If ./configure fails, take a look at FAQ "missing libs or headers".
+ 
+ 
+ 9.  Start the compilation process with the make command.
+ 
+     $ make
+     This will take about 5 minutes, if everything goes well it will e.g. end
+     with the following messages:
+ 
+     foo
+     make[2]: Leaving directory `/foo/krusader-cvs-YYYY-MM-DD/krArc'
+     make[2]: Entering directory `/foo/krusader-cvs-YYYY-MM-DD'
+     make[2]: Nothing to be done for `all-am'.
+     make[2]: Leaving directory `/foo/krusader-cvs-YYYY-MM-DD'
+     make[1]: Leaving directory `/foo/krusader-cvs-YYYY-MM-DD'
+     $
+ 
+    If ./configure was successful and make failed for some reason, continue to
+    read this page. If you can't find any solution for your problem then feel
+    free to post a help request at our Krusader Forum.
+ 
+ 
+ 10. If nothing went wrong, you can now install Krusader.
+ 
+     $ su -c 'make install'
+ 
+     You will be asked to enter your root password.
+ 
+ 
+ 11. When you install a Krusader cvs or beta version and if Krusader was
+     previously installed on your computer, there is a possibility that you
+     will have to update the krusaderui.rc file.
+     Please read the faq's for more info.
+ 
+ 
+ 12. Optional step: if you want you can clean up to save some diskspace.
+     Note: in this case all the compiled files created with the make command
+     will be deleted.
+ 
+     $ make clean
+ 
+ 13. If you ever want to uninstall Krusader, just use
+ 
+     $ su -c 'make uninstall'
+ 
+     You will be asked to enter your root password.
+ 
+     If you encounter problems with installing Krusader please read first the
+     FAQ's. If this installation procedure and the FAQ's does not solve the
+     problem, feel free to ask for help with an help request.
+ 
+ 
+ ----------------------------------------------------------------------------
+ 
+ 
+ The following text are generic installation instructions for KDE applications 
+ (normally you will not need it). The following text is not written by us,
+ but is automaticly generated by Kdevelop.
+ 
+ 
  Basic Installation
  ==================
***************
*** 41,45 ****
  
    4. You can remove the program binaries and object files from the
!      source code directory by typing `make clean'.  
  
  Compilers and Options
--- 317,321 ----
  
    4. You can remove the program binaries and object files from the
!      source code directory by typing `make clean'.
  
  Compilers and Options

[Krusader-commits] krusader_kde3/krusader/Panel krdetailedviewitem.cpp,1.23,1.24

[Shie E. <er...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24031

Modified Files:
	krdetailedviewitem.cpp 
Log Message:
removed a static to allow compilation on gentoo


Index: krdetailedviewitem.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedviewitem.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** krdetailedviewitem.cpp	26 Mar 2004 08:11:53 -0000	1.23
--- krdetailedviewitem.cpp	29 Mar 2004 08:01:03 -0000	1.24
***************
*** 306,310 ****
  }
  
! static const QColor * KrDetailedViewItem::setColorIfContrastIsSufficient(const QColor * background, const QColor * color1, const QColor * color2)
  {
     #define sqr(x) ((x)*(x))
--- 306,310 ----
  }
  
! const QColor * KrDetailedViewItem::setColorIfContrastIsSufficient(const QColor * background, const QColor * color1, const QColor * color2)
  {
     #define sqr(x) ((x)*(x))

[Krusader-commits] krusader_kde3/krusader/Konfigurator kgcolors.cpp,1.10,1.11 kgcolors.h,1.6,1.7

[Karai C. <ck...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/Konfigurator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8111/krusader_kde3/krusader/Konfigurator

Modified Files:
	kgcolors.cpp kgcolors.h 
Log Message:

FIXED: inactive GUI patches


Index: kgcolors.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Konfigurator/kgcolors.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** kgcolors.cpp	28 Mar 2004 12:18:46 -0000	1.10
--- kgcolors.cpp	29 Mar 2004 06:22:58 -0000	1.11
***************
*** 57,61 ****
      {{"Colors","KDE Default",                 _KDEDefaultColors,    i18n( "Use the default KDE colors" ),     false,  "" },
       {"Colors","Enable Alternate Background", _AlternateBackground, i18n( "Use alternate backround color" ),  false,  "" },
!      {"Colors","Show Current Item Always", _ShowCurrentItemAlways, i18n( "Show current item even if not focussed" ),  false,  "" }};
  
    generals = createCheckBoxGroup( 0, 2, generalSettings, sizeof(generalSettings)/sizeof(generalSettings[0]), generalGrp );
--- 57,61 ----
      {{"Colors","KDE Default",                 _KDEDefaultColors,    i18n( "Use the default KDE colors" ),     false,  "" },
       {"Colors","Enable Alternate Background", _AlternateBackground, i18n( "Use alternate backround color" ),  false,  "" },
!      {"Colors","Show Current Item Always", _ShowCurrentItemAlways, i18n( "Show current item even if not focused" ),  false,  "" }};
  
    generals = createCheckBoxGroup( 0, 2, generalSettings, sizeof(generalSettings)/sizeof(generalSettings[0]), generalGrp );
***************
*** 66,69 ****
--- 66,70 ----
    connect( generals->find( "KDE Default" ), SIGNAL( stateChanged( int ) ), this, SLOT( slotDisable() ) );
    connect( generals->find( "Enable Alternate Background" ), SIGNAL( stateChanged( int ) ), this, SLOT( generatePreview() ) );
+   connect( generals->find( "Show Current Item Always" ), SIGNAL( stateChanged( int ) ), this, SLOT( slotDisableCurrent() ) );
  
    kgColorsLayout->addWidget( generalGrp, 0 ,0 );
***************
*** 159,162 ****
--- 160,164 ----
    kgColorsLayout->addWidget( hbox, 1 ,0 );
    slotDisable();
+   slotDisableCurrent();
  } 
  
***************
*** 223,226 ****
--- 225,238 ----
  }
  
+ void KgColors::slotDisableCurrent()
+ {
+   bool enabled = generals->find( "Show Current Item Always" )->isChecked();
+ 
+   getColorSelector( "Inactive Current Foreground" )->setEnabled( enabled );
+   getColorSelector( "Inactive Current Background" )->setEnabled( enabled );
+ 
+   generatePreview();
+ }
+ 
  void KgColors::slotActiveChanged()
  {
***************
*** 315,321 ****
      pwCurrent->setColor( currentFore, currentBck );
  
!     QColor markFore = getColorSelector( prefix + "Marked Foreground" )->getColor();    
!     if( getColorSelector( prefix + "Marked Foreground" )->currentItem() == 2 )
!       markFore = currentFore;    
      pwMark1->setColor( markFore, getColorSelector( prefix + "Marked Background" )->getColor() );
      pwMark2->setColor( markFore, getColorSelector( prefix + "Alternate Marked Background" )->getColor() );
--- 327,336 ----
      pwCurrent->setColor( currentFore, currentBck );
  
!     QColor markFore = getColorSelector( prefix + "Marked Foreground" )->getColor();
! 
!     if( !isInactive || getColorSelector( "Inactive Marked Foreground" )->currentItem() == 1 )
!       if( getColorSelector( "Marked Foreground" )->currentItem() == 2 )
!         markFore = currentFore;
!     
      pwMark1->setColor( markFore, getColorSelector( prefix + "Marked Background" )->getColor() );
      pwMark2->setColor( markFore, getColorSelector( prefix + "Alternate Marked Background" )->getColor() );

Index: kgcolors.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Konfigurator/kgcolors.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** kgcolors.h	28 Mar 2004 12:04:30 -0000	1.6
--- kgcolors.h	29 Mar 2004 06:22:58 -0000	1.7
***************
*** 51,54 ****
--- 51,55 ----
    void slotActiveChanged();
    void slotMarkedBackgroundChanged();
+   void slotDisableCurrent();
    void generatePreview();
  

[Krusader-commits] krusader_kde3/krusader/Konfigurator kgcolors.cpp,1.9,1.10

[Karai C. <ck...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/Konfigurator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26620/krusader_kde3/krusader/Konfigurator

Modified Files:
	kgcolors.cpp 
Log Message:

FIXED: inactive color combo size


Index: kgcolors.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Konfigurator/kgcolors.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** kgcolors.cpp	28 Mar 2004 12:04:30 -0000	1.9
--- kgcolors.cpp	28 Mar 2004 12:18:46 -0000	1.10
***************
*** 173,179 ****
  
    connect( chooser, SIGNAL( colorChanged() ), this, SLOT( generatePreview() ) );
- 
    if( !offset )
      connect( chooser, SIGNAL( colorChanged() ), this, SLOT( slotActiveChanged() ) );
    
    itemList.append( chooser );
--- 173,180 ----
  
    connect( chooser, SIGNAL( colorChanged() ), this, SLOT( generatePreview() ) );
    if( !offset )
      connect( chooser, SIGNAL( colorChanged() ), this, SLOT( slotActiveChanged() ) );
+ 
+   chooser->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum );   
    
    itemList.append( chooser );

[Krusader-commits] krusader_kde3/krusader/Konfigurator kgcolors.cpp,1.8,1.9 kgcolors.h,1.5,1.6

[Karai C. <ck...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/Konfigurator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23877/krusader_kde3/krusader/Konfigurator

Modified Files:
	kgcolors.cpp kgcolors.h 
Log Message:

ADDED: inactive panel color configuration


Index: kgcolors.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Konfigurator/kgcolors.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** kgcolors.cpp	26 Mar 2004 08:11:51 -0000	1.8
--- kgcolors.cpp	28 Mar 2004 12:04:30 -0000	1.9
***************
*** 36,42 ****
  #include <qhbox.h>
  #include <qheader.h>
  
  KgColors::KgColors( bool first, QWidget* parent,  const char* name ) :
!       KonfiguratorPage( first, parent, name )
  {
    QGridLayout *kgColorsLayout = new QGridLayout( parent );
--- 36,43 ----
  #include <qhbox.h>
  #include <qheader.h>
+ #include <qtabwidget.h>
  
  KgColors::KgColors( bool first, QWidget* parent,  const char* name ) :
!       KonfiguratorPage( first, parent, name ), offset( 0 )
  {
    QGridLayout *kgColorsLayout = new QGridLayout( parent );
***************
*** 49,52 ****
--- 50,56 ----
    QGridLayout *generalGrid = createGridLayout( generalGrp->layout() );
  
+   generalGrid->setSpacing( 0 );
+   generalGrid->setMargin( 5 );
+ 
    KONFIGURATOR_CHECKBOX_PARAM generalSettings[] =
    //  cfg_class  cfg_name                     default               text                                      restart tooltip
***************
*** 58,61 ****
--- 62,67 ----
    generalGrid->addWidget( generals, 1, 0 );
  
+   generals->layout()->setSpacing( 5 );
+   
    connect( generals->find( "KDE Default" ), SIGNAL( stateChanged( int ) ), this, SLOT( slotDisable() ) );
    connect( generals->find( "Enable Alternate Background" ), SIGNAL( stateChanged( int ) ), this, SLOT( generatePreview() ) );
***************
*** 66,74 ****
    //  -------------------------- COLORS GROUPBOX ----------------------------------
    
!   colorsGrp = createFrame( i18n( "Colors" ), hbox, "kgColorsColorsGrp" );
!   colorsGrid = createGridLayout( colorsGrp->layout() );
  
    colorsGrid->setSpacing( 0 );
!   colorsGrid->setMargin( 5 );
  
    ADDITIONAL_COLOR transparent = { i18n("Transparent"), Qt::white, "transparent" };
--- 72,90 ----
    //  -------------------------- COLORS GROUPBOX ----------------------------------
    
!   QGroupBox *colorsFrameGrp = createFrame( i18n( "Colors" ), hbox, "kgColorsColorsGrp" );
!   QGridLayout *colorsFrameGrid = createGridLayout( colorsFrameGrp->layout() );
!   colorsFrameGrid->setSpacing( 0 );
!   colorsFrameGrid->setMargin( 3 );
! 
!   colorTabWidget = new QTabWidget( colorsFrameGrp, "colorTabWidget" );
! 
!   connect( colorTabWidget, SIGNAL( currentChanged ( QWidget * ) ), this, SLOT( generatePreview() ) );
!   
!   colorsGrp = new QWidget( colorTabWidget, "colorTab" );
!   colorTabWidget->insertTab( colorsGrp, i18n( "Active" ) );
  
+   colorsGrid = new QGridLayout( colorsGrp );
    colorsGrid->setSpacing( 0 );
!   colorsGrid->setMargin( 2 );
  
    ADDITIONAL_COLOR transparent = { i18n("Transparent"), Qt::white, "transparent" };
***************
*** 90,93 ****
--- 106,133 ----
    connect( getColorSelector( "Marked Background" ), SIGNAL( colorChanged() ), this, SLOT( slotMarkedBackgroundChanged() ) );
  
+   colorsGrp = new QWidget( colorTabWidget, "colorTab" );
+   colorTabWidget->insertTab( colorsGrp, i18n( "Inactive" ) );
+ 
+   colorsGrid = new QGridLayout( colorsGrp );
+   colorsGrid->setSpacing( 0 );
+   colorsGrid->setMargin( 2 );
+ 
+   offset = itemList.count();
+   
+   addColorSelector( "Inactive Foreground",                  i18n( "Foreground:" ),                  getColorSelector( "Foreground" )->getColor(), i18n( "Same as active" ) );
+   addColorSelector( "Inactive Directory Foreground",        i18n( "Directory foreground:" ),        getColorSelector( "Directory Foreground" )->getColor(), i18n( "Same as active" ) );
+   addColorSelector( "Inactive Executable Foreground",       i18n( "Executable foreground:" ),       getColorSelector( "Executable Foreground" )->getColor(), i18n( "Same as active" ) );
+   addColorSelector( "Inactive Symlink Foreground",          i18n( "Symbolic link foreground:" ),    getColorSelector( "Symlink Foreground" )->getColor(), i18n( "Same as active" ) );
+   addColorSelector( "Inactive Invalid Symlink Foreground",  i18n( "Invalid symlink foreground:" ),  getColorSelector( "Invalid Symlink Foreground" )->getColor(), i18n( "Same as active" ) );
+   addColorSelector( "Inactive Background",                  i18n( "Background:" ),                  getColorSelector( "Background" )->getColor(), i18n( "Same as active" ) );
+   addColorSelector( "Inactive Alternate Background",        i18n( "Alternate background:" ),        getColorSelector( "Alternate Background" )->getColor(), i18n( "Same as active" ) );
+   addColorSelector( "Inactive Marked Foreground",           i18n( "Marked foreground:" ),           getColorSelector( "Marked Foreground" )->getColor(), i18n( "Same as active" ), &transparent, 1 );
+   addColorSelector( "Inactive Marked Background",           i18n( "Marked background:" ),           getColorSelector( "Marked Background" )->getColor(), i18n( "Same as active" ) );
+   addColorSelector( "Inactive Alternate Marked Background", i18n( "Alternate marked background:" ), getColorSelector( "Alternate Marked Background" )->getColor(), i18n( "Same as active" )  );
+   addColorSelector( "Inactive Current Foreground",          i18n( "Current foreground:" ),          getColorSelector( "Current Foreground" )->getColor(), i18n( "Same as active" ) );
+   addColorSelector( "Inactive Current Background",          i18n( "Current background:" ),          getColorSelector( "Current Background" )->getColor(), i18n( "Same as active" ) );
+ 
+   colorsFrameGrid->addWidget( colorTabWidget, 0, 0 );
+   
    //  -------------------------- PREVIEW GROUPBOX ----------------------------------
  
***************
*** 124,128 ****
                                  ADDITIONAL_COLOR *addColor, int addColNum )
  {
!   int index = itemList.count();
  
    labelList.append( addLabel( colorsGrid, index, 0, name, colorsGrp, QString( "ColorsLabel%1" ).arg( index ).ascii() ) );
--- 164,168 ----
                                  ADDITIONAL_COLOR *addColor, int addColNum )
  {
!   int index = itemList.count() - offset;
  
    labelList.append( addLabel( colorsGrid, index, 0, name, colorsGrp, QString( "ColorsLabel%1" ).arg( index ).ascii() ) );
***************
*** 133,136 ****
--- 173,179 ----
  
    connect( chooser, SIGNAL( colorChanged() ), this, SLOT( generatePreview() ) );
+ 
+   if( !offset )
+     connect( chooser, SIGNAL( colorChanged() ), this, SLOT( slotActiveChanged() ) );
    
    itemList.append( chooser );
***************
*** 179,182 ****
--- 222,231 ----
  }
  
+ void KgColors::slotActiveChanged()
+ {
+   for( int i = 0; i != offset; i++ )
+      itemList.at( offset + i )->setDefaultColor( itemList.at( i )->getColor() );
+ }
+ 
  void KgColors::slotForegroundChanged()
  {
***************
*** 217,244 ****
    else
    {
!     QColor  bck   = getColorSelector( "Background" )->getColor();
!     QColor altBck = getColorSelector( "Alternate Background" )->getColor();
  
      QColor currentFore;
      QColor currentBck = altBck;
  
!     pwFile->setColor( currentFore = getColorSelector( "Foreground" )->getColor(), altBck );
!     pwDir->setColor( getColorSelector( "Directory Foreground" )->getColor(), bck );
!     pwApp->setColor( getColorSelector( "Executable Foreground" )->getColor(), bck );
!     pwSymLink->setColor( getColorSelector( "Symlink Foreground" )->getColor(), altBck );
!     pwInvLink->setColor( getColorSelector( "Invalid Symlink Foreground" )->getColor(), bck );
  
!     if( getColorSelector( "Current Foreground" )->currentItem() != 1 )
!       currentFore = getColorSelector( "Current Foreground" )->getColor();
!     if( getColorSelector( "Current Background" )->currentItem() != 1 )
!       currentBck = getColorSelector( "Current Background" )->getColor();
        
      pwCurrent->setColor( currentFore, currentBck );
  
!     QColor markFore = getColorSelector( "Marked Foreground" )->getColor();    
!     if( getColorSelector( "Marked Foreground" )->currentItem() == 2 )
        markFore = currentFore;    
!     pwMark1->setColor( markFore, getColorSelector( "Marked Background" )->getColor() );
!     pwMark2->setColor( markFore, getColorSelector( "Alternate Marked Background" )->getColor() );
    }
  }
--- 266,322 ----
    else
    {
!     bool isInactive = colorTabWidget->currentPageIndex() == 1;
!     QString prefix="";
! 
!     if( isInactive )
!       prefix = "Inactive ";
!     
!     QColor  bck   = getColorSelector( prefix + "Background" )->getColor();
!     QColor altBck = getColorSelector( prefix + "Alternate Background" )->getColor();
  
      QColor currentFore;
      QColor currentBck = altBck;
  
!     pwFile->setColor( currentFore = getColorSelector( prefix + "Foreground" )->getColor(), altBck );
!     pwDir->setColor( getColorSelector( prefix + "Directory Foreground" )->getColor(), bck );
!     pwApp->setColor( getColorSelector( prefix + "Executable Foreground" )->getColor(), bck );
!     pwSymLink->setColor( getColorSelector( prefix + "Symlink Foreground" )->getColor(), altBck );
!     pwInvLink->setColor( getColorSelector( prefix + "Invalid Symlink Foreground" )->getColor(), bck );
  
!     if( isInactive )
!     {
!       if( generals->find( "Show Current Item Always" )->isChecked() )
!       {
!         if( getColorSelector( "Inactive Current Foreground" )->currentItem() != 1 )
!           currentFore = getColorSelector( "Inactive Current Foreground" )->getColor();
!         else
!         {
!           if( getColorSelector( "Current Foreground" )->currentItem() != 1 )
!             currentFore = getColorSelector( "Current Foreground" )->getColor();
!         }
!         if( getColorSelector( "Inactive Current Background" )->currentItem() != 1 )
!           currentBck = getColorSelector( "Inactive Current Background" )->getColor();
!         else
!         {
!           if( getColorSelector( "Current Background" )->currentItem() != 1 )
!             currentBck = getColorSelector( "Current Background" )->getColor();
!         }
!       }
!     }
!     else
!     {    
!       if( getColorSelector( "Current Foreground" )->currentItem() != 1 )
!         currentFore = getColorSelector( "Current Foreground" )->getColor();
!       if( getColorSelector( "Current Background" )->currentItem() != 1 )
!         currentBck = getColorSelector( "Current Background" )->getColor();
!     }
        
      pwCurrent->setColor( currentFore, currentBck );
  
!     QColor markFore = getColorSelector( prefix + "Marked Foreground" )->getColor();    
!     if( getColorSelector( prefix + "Marked Foreground" )->currentItem() == 2 )
        markFore = currentFore;    
!     pwMark1->setColor( markFore, getColorSelector( prefix + "Marked Background" )->getColor() );
!     pwMark2->setColor( markFore, getColorSelector( prefix + "Alternate Marked Background" )->getColor() );
    }
  }

Index: kgcolors.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Konfigurator/kgcolors.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** kgcolors.h	26 Mar 2004 08:11:52 -0000	1.5
--- kgcolors.h	28 Mar 2004 12:04:30 -0000	1.6
***************
*** 49,52 ****
--- 49,53 ----
    void slotDisable();
    void slotForegroundChanged();
+   void slotActiveChanged();
    void slotMarkedBackgroundChanged();
    void generatePreview();
***************
*** 59,67 ****
    
  private:
!   QGroupBox                          *colorsGrp;
    QGridLayout                        *colorsGrid;
    
    QGroupBox                          *previewGrp;
    QGridLayout                        *previewGrid;
  
    KonfiguratorCheckBoxGroup          *generals;
--- 60,70 ----
    
  private:
!   QWidget                            *colorsGrp;
    QGridLayout                        *colorsGrid;
+   int                                 offset;
    
    QGroupBox                          *previewGrp;
    QGridLayout                        *previewGrid;
+   QTabWidget                         *colorTabWidget;
  
    KonfiguratorCheckBoxGroup          *generals;

[Krusader-commits] krusader_kde3/krusader/Panel krdetailedviewitem.h,1.13,1.14

[Karai C. <ck...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28802/krusader_kde3/krusader/Panel

Modified Files:
	krdetailedviewitem.h 
Log Message:

FIXED: '..' is not marked as a dir


Index: krdetailedviewitem.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedviewitem.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** krdetailedviewitem.h	26 Mar 2004 08:11:53 -0000	1.13
--- krdetailedviewitem.h	26 Mar 2004 08:17:18 -0000	1.14
***************
*** 51,55 ****
    QString name() const;
    QString description() const; // for status bar
!   bool isDir() const { return (_vf ? _vf->vfile_isDir() : false); }
    bool isExecutable() const { return (_vf ? _vf->vfile_isExecutable() : false); }
    KIO::filesize_t size() const { return (_vf ? _vf->vfile_getSize() : 0); }
--- 51,55 ----
    QString name() const;
    QString description() const; // for status bar
!   bool isDir() const { return (_vf ? _vf->vfile_isDir() : true); }
    bool isExecutable() const { return (_vf ? _vf->vfile_isExecutable() : false); }
    KIO::filesize_t size() const { return (_vf ? _vf->vfile_getSize() : 0); }

[Krusader-commits] krusader_kde3/krusader/Panel krcolorcache.cpp,1.1,1.2 krcolorcache.h,1.1,1.2 krdetailedview.cpp,1.67,1.68 krdetailedviewitem.cpp,1.22,1.23 krdetailedviewitem.h,1.12,1.13

[Karai C. <ck...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27011/krusader_kde3/krusader/Panel

Modified Files:
	krcolorcache.cpp krcolorcache.h krdetailedview.cpp 
	krdetailedviewitem.cpp krdetailedviewitem.h 
Log Message:

FIXED: color chooser final


Index: krdetailedviewitem.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedviewitem.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** krdetailedviewitem.cpp	24 Mar 2004 06:33:54 -0000	1.22
--- krdetailedviewitem.cpp	26 Mar 2004 08:11:53 -0000	1.23
***************
*** 200,212 ****
      bool isCurrent = listView()->currentItem() == this;
      
-     // These two pointers will take the fore and background color. Color is a temp variable
-     const QColor * foreground = 0, * background = 0, * color;
-     
      // As i deal with pointers here, the KDE default colors have to be stored here so that I can make
      // a pointer out of it
      QColor defaultForeground = KGlobalSettings::textColor(), defaultBackground = KGlobalSettings::alternateBackgroundColor(),
             defaultMarkedForeground = KGlobalSettings::highlightedTextColor(), defaultMarkedBackground = KGlobalSettings::highlightColor();
      if (isAlternate() || !defaultBackground.isValid())
        defaultBackground = KGlobalSettings::baseColor();
      // Macro: set target = col, if col is not zero
      #define SETCOLOR(target, col) { color = col; if (color) target = color; }
--- 200,214 ----
      bool isCurrent = listView()->currentItem() == this;
      
      // As i deal with pointers here, the KDE default colors have to be stored here so that I can make
      // a pointer out of it
      QColor defaultForeground = KGlobalSettings::textColor(), defaultBackground = KGlobalSettings::alternateBackgroundColor(),
             defaultMarkedForeground = KGlobalSettings::highlightedTextColor(), defaultMarkedBackground = KGlobalSettings::highlightColor();
+     
+     // These two pointers will take the fore and background color. Color is a temp variable
+     const QColor * foreground = & defaultForeground, * background = & defaultBackground, * color;
+     
      if (isAlternate() || !defaultBackground.isValid())
        defaultBackground = KGlobalSettings::baseColor();
+ 
      // Macro: set target = col, if col is not zero
      #define SETCOLOR(target, col) { color = col; if (color) target = color; }
***************
*** 226,279 ****
      else if (isExecutable())
         SETCOLOR(foreground, KrColorCache::getColorCache().getExecutableForegroundColor())
!     if (background)
!     {
!        // if a background color has been set, set it int the color group
!        _cg.setColor(QColorGroup::Base, *background);
!        _cg.setColor(QColorGroup::Background, *background);
!     }
!     else
!       // otherwise leave the colorgroup untouched (KDE default). Just set the background variable
!       // for the contrast calculation below
!       background = &defaultBackground;
        
!     if (foreground)
!        // if a foreground color has been set, set it int the color group
!       _cg.setColor(QColorGroup::Text, *foreground);
!     else
!       // otherwise leave the colorgroup untouched (KDE default). Just set the foreground variable
!       // for the contrast calculation below
!       foreground = &defaultForeground;
  
      // now the color of a marked item
!     const QColor * markedForeground = KrColorCache::getColorCache().getMarkedForegroundColor(), * markedBackground = 0;
!     if (markedForeground)
!       // set it in the color group (different group color than normal foreground!) if defined (otherwise the
!       // KDE default remains)
!       _cg.setColor(QColorGroup::HighlightedText, *markedForeground);
!     else
!       markedForeground = &defaultMarkedForeground;
  
      if (isAlternate())
      {
!        // Seek the correct background color
!        markedBackground = KrColorCache::getColorCache().getAlternateMarkedBackgroundColor();
!        if (!markedBackground)
!           markedBackground = KrColorCache::getColorCache().getMarkedBackgroundColor();
      }
!     else
!        markedBackground = KrColorCache::getColorCache().getMarkedBackgroundColor();
!     if (markedBackground)
!        // set it in the color group (different group color than normal background!) if defined (otherwise the
!        // KDE default remains)
!        _cg.setColor(QColorGroup::Highlight, *markedBackground);
!     else
!       markedBackground = &defaultMarkedBackground;
  
      // In case the current item is a selected one, set the fore- and background colors for the contrast calculation below
      if (isSelected())
      {
-       if (markedBackground)
          background = markedBackground;
-       if (markedForeground)
          foreground = markedForeground;
      }
--- 228,265 ----
      else if (isExecutable())
         SETCOLOR(foreground, KrColorCache::getColorCache().getExecutableForegroundColor())
!        
!     // set the background color
!     _cg.setColor(QColorGroup::Base, *background);
!     _cg.setColor(QColorGroup::Background, *background);
        
!     // set the foreground color
!     _cg.setColor(QColorGroup::Text, *foreground);
  
      // now the color of a marked item
!     const QColor * markedForeground = &defaultMarkedForeground, * markedBackground = &defaultMarkedBackground;
  
+     // Seek the correct background color. Set it as marked background, if it is defined.
+     SETCOLOR(markedBackground, KrColorCache::getColorCache().getMarkedBackgroundColor())
+        
      if (isAlternate())
      {
!        // Now set it as alternate marked background, if it is defined. As the result the alternate marked background
!        // has a higher priority than the marked background, which has a higher priority than the KDe default.
!        SETCOLOR(markedBackground, KrColorCache::getColorCache().getAlternateMarkedBackgroundColor())
      }
!     // set it in the color group (different group color than normal background!)
!     _cg.setColor(QColorGroup::Highlight, *markedBackground);
  
+     if (KrColorCache::getColorCache().getTextValue("Marked Foreground") == "transparent")
+        markedForeground = setColorIfContrastIsSufficient(markedBackground, foreground, background);
+     else
+        SETCOLOR(markedForeground, KrColorCache::getColorCache().getMarkedForegroundColor())
+       // set it in the color group (different group color than normal foreground!)
+     _cg.setColor(QColorGroup::HighlightedText, *markedForeground);
+     
      // In case the current item is a selected one, set the fore- and background colors for the contrast calculation below
      if (isSelected())
      {
          background = markedBackground;
          foreground = markedForeground;
      }
***************
*** 283,304 ****
      {
         // if this is the current item AND the panels has tho focus OR the current should be marked always
!        const QColor * currentBackground = KrColorCache::getColorCache().getCurrentBackgroundColor();
!        if (currentBackground)
!        {
!          // set the background, if set
!          _cg.setColor(QColorGroup::Highlight, *currentBackground);
!          _cg.setColor(QColorGroup::Base, *currentBackground);
!          _cg.setColor(QColorGroup::Background, *currentBackground);
!        }
!        else
!          // make sure, that the currentBackground variable in any cse reflects the background color for the contrast calculation below
!          currentBackground = background;
  
         color = KrColorCache::getColorCache().getCurrentForegroundColor();
         if (color)
         {
! //         if (markedForeground && isSelected())
! //            color = markedForeground;
!          // set the foreground, if set
           _cg.setColor(QColorGroup::Text, *color);
           _cg.setColor(QColorGroup::HighlightedText, *color);
--- 269,283 ----
      {
         // if this is the current item AND the panels has tho focus OR the current should be marked always
!        const QColor * currentBackground = background;
!        SETCOLOR(currentBackground, KrColorCache::getColorCache().getCurrentBackgroundColor())
!        // set the background, if defined
!        _cg.setColor(QColorGroup::Highlight, *currentBackground);
!        _cg.setColor(QColorGroup::Base, *currentBackground);
!        _cg.setColor(QColorGroup::Background, *currentBackground);
  
         color = KrColorCache::getColorCache().getCurrentForegroundColor();
         if (color)
         {
!          // set the foreground, if defined
           _cg.setColor(QColorGroup::Text, *color);
           _cg.setColor(QColorGroup::HighlightedText, *color);
***************
*** 309,320 ****
           // 'invisible' color, if the foreground color calulated above and the background color of the current
           // item are very similar. Calulate the contrast to identify such a problem.
!          #define sqr(x) ((x)*(x))
!          color = foreground;
!          int contrast = sqr(color->red() - currentBackground->red()) + sqr(color->green() - currentBackground->green()) + sqr(color->blue() - currentBackground->blue());
! 
!          // if the contrst is too small, take the background of the not current item as its foreground in the hope, 
!          // that this increases teh contrast.
!          if (contrast < 1000)
!             color = background;
           _cg.setColor(QColorGroup::Text, *color);
           _cg.setColor(QColorGroup::HighlightedText, *color);
--- 288,292 ----
           // 'invisible' color, if the foreground color calulated above and the background color of the current
           // item are very similar. Calulate the contrast to identify such a problem.
!          color = setColorIfContrastIsSufficient(currentBackground, foreground, background);
           _cg.setColor(QColorGroup::Text, *color);
           _cg.setColor(QColorGroup::HighlightedText, *color);
***************
*** 334,337 ****
--- 306,321 ----
  }
  
+ static const QColor * KrDetailedViewItem::setColorIfContrastIsSufficient(const QColor * background, const QColor * color1, const QColor * color2)
+ {
+    #define sqr(x) ((x)*(x))
+    int contrast = sqr(color1->red() - background->red()) + sqr(color1->green() - background->green()) + sqr(color1->blue() - background->blue());
+ 
+    // if the contrst is too small, take the background of the not current item as its foreground in the hope, 
+    // that this increases teh contrast.
+    if (contrast < 1000)
+       return color2;
+    return color1;
+ }
+ 
  
  QPixmap& KrDetailedViewItem::icon() {

Index: krdetailedviewitem.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedviewitem.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** krdetailedviewitem.h	28 Jan 2004 22:49:33 -0000	1.12
--- krdetailedviewitem.h	26 Mar 2004 08:11:53 -0000	1.13
***************
*** 82,85 ****
--- 82,86 ----
    // used INTERNALLY when calculation of dir size changes the displayed size of the item
    inline void setSize(KIO::filesize_t size) { _vf->vfile_setSize(size); }
+   static const QColor * setColorIfContrastIsSufficient(const QColor * background, const QColor * color1, const QColor * color2);
  
    QGuardedPtr<vfile> _vf;

Index: krcolorcache.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krcolorcache.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** krcolorcache.cpp	24 Mar 2004 06:33:54 -0000	1.1
--- krcolorcache.cpp	26 Mar 2004 08:11:52 -0000	1.2
***************
*** 50,53 ****
--- 50,68 ----
  }
  
+ const QString & KrColorCache::getTextValue(const QString & textName) const
+ {
+    QString * text = textCache.find(textName);
+    if (!text)
+    {
+       krConfig->setGroup("Colors");
+       text = new QString("");
+       *text = krConfig->readEntry(textName, "");
+       ((KrColorCache *)this)->textCache.replace(textName, text);
+       if (textCache.count() >= textCache.size())
+          ((KrColorCache *)this)->textCache.resize(textCache.count()*2+1);
+    }
+    return *text;
+ }
+ 
  const QColor * KrColorCache::getColor(const QString & colorName) const
  {
***************
*** 130,133 ****
--- 145,149 ----
  {
     colorCache.clear();
+    textCache.clear();
     krConfig->setGroup("Colors");
     kdeDefault = krConfig->readBoolEntry("KDE Default", _KDEDefaultColors);

Index: krcolorcache.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krcolorcache.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** krcolorcache.h	24 Mar 2004 06:33:54 -0000	1.1
--- krcolorcache.h	26 Mar 2004 08:11:52 -0000	1.2
***************
*** 11,17 ****
--- 11,19 ----
    static KrColorCache * instance;
    QDict<QColor> colorCache;
+   QDict<QString> textCache;
    bool kdeDefault, alternateBackgroundEnabled, showCurrentItemAlways;
  public:
    static KrColorCache & getColorCache();
+   const QString & getTextValue(const QString & textName) const;
    const QColor * getColor(const QString & colorName) const;
    const QColor * getForegroundColor() const;

Index: krdetailedview.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedview.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** krdetailedview.cpp	24 Mar 2004 06:33:54 -0000	1.67
--- krdetailedview.cpp	26 Mar 2004 08:11:52 -0000	1.68
***************
*** 395,413 ****
    if ( !item ) return ;
  
-     { // stop quick search in case a mouse click occured
-     KConfigGroupSaver grpSvr( _config, "Look&Feel" );
-     if ( _config->readBoolEntry( "New Style Quicksearch", _NewStyleQuicksearch ) ) {
-       if ( krApp->mainView ) {
-         if ( krApp->mainView->activePanel ) {
-           if ( krApp->mainView->activePanel->quickSearch ) {
-             if ( krApp->mainView->activePanel->quickSearch->isShown() ) {
-               stopQuickSearch( 0 );
-               }
-             }
-           }
-         }
-       }
-     }
- 
    KConfigGroupSaver grpSvr( _config, nameInKConfig() );
    QString tmp = dynamic_cast<KrViewItem*>( item ) ->name();
--- 395,398 ----
***************
*** 485,488 ****
--- 470,487 ----
  
  void KrDetailedView::contentsMousePressEvent( QMouseEvent * e ) {
+     // stop quick search in case a mouse click occured
+     KConfigGroupSaver grpSvr( _config, "Look&Feel" );
+     if ( _config->readBoolEntry( "New Style Quicksearch", _NewStyleQuicksearch ) ) {
+       if ( krApp->mainView ) {
+         if ( krApp->mainView->activePanel ) {
+           if ( krApp->mainView->activePanel->quickSearch ) {
+             if ( krApp->mainView->activePanel->quickSearch->isShown() ) {
+               stopQuickSearch( 0 );
+               }
+             }
+           }
+         }
+       }
+ 
    if ( !_focused )
      emit needFocus();
***************
*** 490,494 ****
     if (e->state() & ShiftButton || e->state() & ControlButton || e->state() & AltButton)
     {
!      KListView::contentsMousePressEvent( e );
       return;
     }
--- 489,523 ----
     if (e->state() & ShiftButton || e->state() & ControlButton || e->state() & AltButton)
     {
!     QListViewItem *oldCurrent = currentItem();
!     QListViewItem *newCurrent = itemAt( contentsToViewport( e->pos() ) );
!     if ( oldCurrent && newCurrent && oldCurrent != newCurrent && e->state() & ShiftButton ) {
!       int oldPos    = oldCurrent->itemPos();
!       int newPos    = newCurrent->itemPos();
!       QListViewItem *top = 0, *bottom = 0;
!       if ( oldPos > newPos ) {
!           top = newCurrent;
!           bottom = oldCurrent;
!         } else {
!           top = oldCurrent;
!           bottom = newCurrent;
!         }
!       QListViewItemIterator it( top );
!       bool changed = false;
!       for ( ; it.current(); ++it ) {
!         if ( !it.current()->isSelected() ) {
!           it.current()->setSelected( true );
!           changed = true;
!           }
!         if ( it.current() == bottom )
!           break;
!         }
!       if (changed){
!         emit selectionChanged();
!         triggerUpdate();
!         }
!       QListView::setCurrentItem(newCurrent);
!       }
!       else
!         KListView::contentsMousePressEvent( e );
       return;
     }
***************
*** 756,760 ****
          }
        // if the key is A..Z or 1..0 do quick search otherwise...
!       if ( e->text().length() > 0 && e->text() [ 0 ].isPrint() )      // better choice. Otherwise non-ascii characters like Ö can not be the first character of a filename
          /*         if ( ( e->key() >= Key_A && e->key() <= Key_Z ) ||
                         ( e->key() >= Key_0 && e->key() <= Key_9 ) ||
--- 785,789 ----
          }
        // if the key is A..Z or 1..0 do quick search otherwise...
!       if ( e->text().length() > 0 && e->text() [ 0 ].isPrint() )      // better choice. Otherwise non-ascii characters like  can not be the first character of a filename
          /*         if ( ( e->key() >= Key_A && e->key() <= Key_Z ) ||
                         ( e->key() >= Key_0 && e->key() <= Key_9 ) ||

[Krusader-commits] krusader_kde3/krusader/Konfigurator kgcolors.cpp,1.7,1.8 kgcolors.h,1.4,1.5 konfiguratoritems.cpp,1.9,1.10 konfiguratoritems.h,1.6,1.7 konfiguratorpage.cpp,1.6,1.7 konfiguratorpage.h,1.5,1.6

[Karai C. <ck...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/Konfigurator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27011/krusader_kde3/krusader/Konfigurator

Modified Files:
	kgcolors.cpp kgcolors.h konfiguratoritems.cpp 
	konfiguratoritems.h konfiguratorpage.cpp konfiguratorpage.h 
Log Message:

FIXED: color chooser final


Index: kgcolors.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Konfigurator/kgcolors.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** kgcolors.cpp	24 Mar 2004 06:33:53 -0000	1.7
--- kgcolors.cpp	26 Mar 2004 08:11:51 -0000	1.8
***************
*** 72,75 ****
--- 72,77 ----
    colorsGrid->setMargin( 5 );
  
+   ADDITIONAL_COLOR transparent = { i18n("Transparent"), Qt::white, "transparent" };
+ 
    addColorSelector( "Foreground",                 i18n( "Foreground:" ),                  KGlobalSettings::textColor()                                                );
    addColorSelector( "Directory Foreground",       i18n( "Directory foreground:" ),        getColorSelector( "Foreground" )->getColor(), i18n( "Same as foreground" )  );
***************
*** 79,83 ****
    addColorSelector( "Background",                 i18n( "Background:" ),                  KGlobalSettings::baseColor()                                                );
    addColorSelector( "Alternate Background",       i18n( "Alternate background:" ),        KGlobalSettings::alternateBackgroundColor()                                 );
!   addColorSelector( "Marked Foreground",          i18n( "Marked foreground:" ),           KGlobalSettings::highlightedTextColor()                                     );
    addColorSelector( "Marked Background",          i18n( "Marked background:" ),           KGlobalSettings::highlightColor()                                           );
    addColorSelector( "Alternate Marked Background",i18n( "Alternate marked background:" ), getColorSelector( "Marked Background" )->getColor(), i18n( "Same as marked background" )  );
--- 81,85 ----
    addColorSelector( "Background",                 i18n( "Background:" ),                  KGlobalSettings::baseColor()                                                );
    addColorSelector( "Alternate Background",       i18n( "Alternate background:" ),        KGlobalSettings::alternateBackgroundColor()                                 );
!   addColorSelector( "Marked Foreground",          i18n( "Marked foreground:" ),           KGlobalSettings::highlightedTextColor(), "", &transparent, 1                );
    addColorSelector( "Marked Background",          i18n( "Marked background:" ),           KGlobalSettings::highlightColor()                                           );
    addColorSelector( "Alternate Marked Background",i18n( "Alternate marked background:" ), getColorSelector( "Marked Background" )->getColor(), i18n( "Same as marked background" )  );
***************
*** 119,128 ****
  } 
  
! int KgColors::addColorSelector( QString cfgName, QString name, QColor dflt, QString dfltName )
  {
    int index = itemList.count();
  
    labelList.append( addLabel( colorsGrid, index, 0, name, colorsGrp, QString( "ColorsLabel%1" ).arg( index ).ascii() ) );
!   KonfiguratorColorChooser *chooser = createColorChooser( "Colors", cfgName, dflt, colorsGrp, false );
    if( !dfltName.isEmpty() )
      chooser->setDefaultText( dfltName );
--- 121,131 ----
  } 
  
! int KgColors::addColorSelector( QString cfgName, QString name, QColor dflt, QString dfltName,
!                                 ADDITIONAL_COLOR *addColor, int addColNum )
  {
    int index = itemList.count();
  
    labelList.append( addLabel( colorsGrid, index, 0, name, colorsGrp, QString( "ColorsLabel%1" ).arg( index ).ascii() ) );
!   KonfiguratorColorChooser *chooser = createColorChooser( "Colors", cfgName, dflt, colorsGrp, false, addColor, addColNum );
    if( !dfltName.isEmpty() )
      chooser->setDefaultText( dfltName );
***************
*** 233,237 ****
      pwCurrent->setColor( currentFore, currentBck );
  
!     QColor markFore = getColorSelector( "Marked Foreground" )->getColor();
      pwMark1->setColor( markFore, getColorSelector( "Marked Background" )->getColor() );
      pwMark2->setColor( markFore, getColorSelector( "Alternate Marked Background" )->getColor() );
--- 236,242 ----
      pwCurrent->setColor( currentFore, currentBck );
  
!     QColor markFore = getColorSelector( "Marked Foreground" )->getColor();    
!     if( getColorSelector( "Marked Foreground" )->currentItem() == 2 )
!       markFore = currentFore;    
      pwMark1->setColor( markFore, getColorSelector( "Marked Background" )->getColor() );
      pwMark2->setColor( markFore, getColorSelector( "Alternate Marked Background" )->getColor() );

Index: konfiguratoritems.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Konfigurator/konfiguratoritems.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** konfiguratoritems.h	20 Mar 2004 21:55:57 -0000	1.6
--- konfiguratoritems.h	26 Mar 2004 08:11:52 -0000	1.7
***************
*** 317,320 ****
--- 317,327 ----
  ///////////////////////////////
  
+ typedef struct
+ {
+   QString name;
+   QColor  color;
+   QString value;
+ } ADDITIONAL_COLOR;
+ 
  class KonfiguratorColorChooser : public QComboBox
  {
***************
*** 323,327 ****
  public:
    KonfiguratorColorChooser( QString cls, QString name, QColor dflt,
!                             QWidget *parent=0, const char *widgetName=0, bool rst=false );
    ~KonfiguratorColorChooser();
  
--- 330,335 ----
  public:
    KonfiguratorColorChooser( QString cls, QString name, QColor dflt,
!                             QWidget *parent=0, const char *widgetName=0, bool rst=false,
!                             ADDITIONAL_COLOR *addColPtr = 0, int addColNum = 0 );
    ~KonfiguratorColorChooser();
  
***************
*** 331,334 ****
--- 339,343 ----
    void          setDefaultText( QString text );
    QColor        getColor();
+   void          changeAdditionalColor( unsigned num, QColor color );
  
  public slots:
***************
*** 346,354 ****
    
  protected:
!   QColor                        defaultValue;
!   QColor                        customValue;
!   QValueVector<QColor>          palette;
!   KonfiguratorExtension        *ext;
!   bool                          disableColorChooser;
  };
  
--- 355,364 ----
    
  protected:
!   QColor                          defaultValue;
!   QColor                          customValue;
!   QValueVector<QColor>            palette;
!   QValueVector<ADDITIONAL_COLOR>  additionalColors;
!   KonfiguratorExtension          *ext;
!   bool                            disableColorChooser;
  };
  

Index: kgcolors.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Konfigurator/kgcolors.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** kgcolors.h	22 Mar 2004 06:15:47 -0000	1.4
--- kgcolors.h	26 Mar 2004 08:11:52 -0000	1.5
***************
*** 53,57 ****
  
  private:
!   int                        addColorSelector( QString cfgName, QString name, QColor dflt, QString dfltName = QString::null);
    KonfiguratorColorChooser  *getColorSelector( QString name );
    QLabel                    *getSelectorLabel( QString name );
--- 53,58 ----
  
  private:
!   int                        addColorSelector( QString cfgName, QString name, QColor dflt, QString dfltName = QString::null,
!                                                ADDITIONAL_COLOR *addColor = 0, int addColNum = 0);
    KonfiguratorColorChooser  *getColorSelector( QString name );
    QLabel                    *getSelectorLabel( QString name );

Index: konfiguratoritems.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Konfigurator/konfiguratoritems.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** konfiguratoritems.cpp	22 Mar 2004 06:15:47 -0000	1.9
--- konfiguratoritems.cpp	26 Mar 2004 08:11:52 -0000	1.10
***************
*** 597,601 ****
  
  KonfiguratorColorChooser::KonfiguratorColorChooser( QString cls, QString name, QColor dflt,
!     QWidget *parent, const char *widgetName, bool rst ) : QComboBox ( parent, widgetName ),
      defaultValue( dflt ), disableColorChooser( true )
  {
--- 597,602 ----
  
  KonfiguratorColorChooser::KonfiguratorColorChooser( QString cls, QString name, QColor dflt,
!     QWidget *parent, const char *widgetName, bool rst, ADDITIONAL_COLOR *addColPtr,
!     int addColNum ) : QComboBox ( parent, widgetName ),
      defaultValue( dflt ), disableColorChooser( true )
  {
***************
*** 608,611 ****
--- 609,619 ----
    addColor( i18n("Custom color" ),  QColor( 255, 255, 255 ) );
    addColor( i18n("Default" ),       defaultValue );
+ 
+   for( int i=0; i != addColNum; i++ )
+   {
+     additionalColors.push_back( addColPtr[i] );
+     addColor( addColPtr[i].name, addColPtr[i].color );
+   }
+   
    addColor( i18n("Red" ),           Qt::red );
    addColor( i18n("Green" ),         Qt::green );
***************
*** 676,689 ****
    else
    {
!     QColor color = krConfig->readColorEntry( ext->getCfgName(), &defaultValue );
!     customValue = color;
! 
!     setCurrentItem( 0 );
!     for( int i=2; i != palette.size(); i++ )
!       if( palette[i] == color )
        {
!         setCurrentItem( i );
          break;
        }
    }
  
--- 684,710 ----
    else
    {
!     bool found = false;
!     
!     for( unsigned j=0; j != additionalColors.size(); j++ )
!       if( additionalColors[j].value == selected )
        {
!         setCurrentItem( 2 + j );
!         found = true;
          break;
        }
+ 
+     if( ! found )
+     {
+       QColor color = krConfig->readColorEntry( ext->getCfgName(), &defaultValue );
+       customValue = color;
+ 
+       setCurrentItem( 0 );
+       for( unsigned i= 2+additionalColors.size(); i != palette.size(); i++ )
+         if( palette[i] == color )
+         {
+           setCurrentItem( i );
+           break;
+         }
+     }
    }
  
***************
*** 706,709 ****
--- 727,743 ----
  }
  
+ void KonfiguratorColorChooser::changeAdditionalColor( unsigned num, QColor color )
+ {
+   if( num < additionalColors.size() )
+   {
+     palette[2+num] = color;
+     additionalColors[num].color = color;
+     changeItem( createPixmap( color ), text( 2+num ), 2+num );
+ 
+     if( currentItem() == 2+num )
+       emit colorChanged();
+   }
+ }
+ 
  void KonfiguratorColorChooser::setDefaultText( QString text )
  {
***************
*** 718,721 ****
--- 752,757 ----
    if( currentItem() == 1 )    /* it's the default value? */
      krConfig->writeEntry( name, "" );   /* set nothing */
+   else if( currentItem() >= 2 && (unsigned)currentItem() < 2 + additionalColors.size() )
+     krConfig->writeEntry( name, additionalColors[ currentItem() - 2 ].value );
    else
      krConfig->writeEntry( name, color );

Index: konfiguratorpage.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Konfigurator/konfiguratorpage.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** konfiguratorpage.cpp	17 Mar 2004 20:47:37 -0000	1.6
--- konfiguratorpage.cpp	26 Mar 2004 08:11:52 -0000	1.7
***************
*** 307,314 ****
  
  KonfiguratorColorChooser *KonfiguratorPage::createColorChooser( QString cls, QString name, QColor dflt,
!                                                                 QWidget *parent, bool rst )
  {
    KonfiguratorColorChooser *colorChooser = new KonfiguratorColorChooser( cls, name, dflt,  parent,
!                                         QString(cls + "/" + name).ascii(), rst );
  
    registerObject( colorChooser->extension() );
--- 307,315 ----
  
  KonfiguratorColorChooser *KonfiguratorPage::createColorChooser( QString cls, QString name, QColor dflt,
!                                                                 QWidget *parent, bool rst,
!                                                                 ADDITIONAL_COLOR *addColPtr, int addColNum )
  {
    KonfiguratorColorChooser *colorChooser = new KonfiguratorColorChooser( cls, name, dflt,  parent,
!                                         QString(cls + "/" + name).ascii(), rst, addColPtr, addColNum );
  
    registerObject( colorChooser->extension() );

Index: konfiguratorpage.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Konfigurator/konfiguratorpage.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** konfiguratorpage.h	17 Mar 2004 20:47:37 -0000	1.5
--- konfiguratorpage.h	26 Mar 2004 08:11:52 -0000	1.6
***************
*** 429,437 ****
      * @param  parent      Reference to the parent widget
      * @param  rst         The change of this parameter requires Krusader restart
      *
      * @return             reference to the newly created combobox
      */
    KonfiguratorColorChooser *createColorChooser(  QString cls, QString name, QColor dflt,
!                                                  QWidget *parent=0, bool rst=false );
  signals:
    /**
--- 429,440 ----
      * @param  parent      Reference to the parent widget
      * @param  rst         The change of this parameter requires Krusader restart
+     * @param  addColPtr   The additional color values
+     * @param  rst         Number of additional colors
      *
      * @return             reference to the newly created combobox
      */
    KonfiguratorColorChooser *createColorChooser(  QString cls, QString name, QColor dflt,
!                                                  QWidget *parent=0, bool rst=false,
!                                                  ADDITIONAL_COLOR *addColPtr = 0, int addColNum = 0  );
  signals:
    /**

[Krusader-commits] krusader_kde3/krusader/Panel krcolorcache.cpp,NONE,1.1 krcolorcache.h,NONE,1.1 Makefile.am,1.6,1.7 krdetailedview.cpp,1.66,1.67 krdetailedview.h,1.22,1.23 krdetailedviewitem.cpp,1.21,1.22

[Karai C. <ck...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11859/krusader_kde3/krusader/Panel

Modified Files:
	Makefile.am krdetailedview.cpp krdetailedview.h 
	krdetailedviewitem.cpp 
Added Files:
	krcolorcache.cpp krcolorcache.h 
Log Message:

ADDED: configuring the colors


Index: Makefile.am
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile.am	3 Jan 2004 13:36:24 -0000	1.6
--- Makefile.am	24 Mar 2004 06:33:54 -0000	1.7
***************
*** 6,13 ****
  libPanel_a_METASOURCES = AUTO
  
! libPanel_a_SOURCES = krcalcspacedialog.cpp krpopupmenu.cpp krpreviewpopup.cpp krview.cpp krdetailedviewitem.cpp krdetailedview.cpp panelfunc.cpp listpanel.cpp 
  
  
! EXTRA_DIST = listpanel.cpp panelfunc.cpp panelfunc.h listpanel.h krdetailedview.cpp krdetailedview.h krdetailedviewitem.cpp krdetailedviewitem.h krview.cpp krview.h krviewitem.h krpreviewpopup.cpp krpreviewpopup.h krpopupmenu.cpp krpopupmenu.h krcalcspacedialog.cpp krcalcspacedialog.h 
  
  ####### kdevelop will overwrite this part!!! (end)############
--- 6,13 ----
  libPanel_a_METASOURCES = AUTO
  
! libPanel_a_SOURCES = krcolorcache.cpp krcalcspacedialog.cpp krpopupmenu.cpp krpreviewpopup.cpp krview.cpp krdetailedviewitem.cpp krdetailedview.cpp panelfunc.cpp listpanel.cpp 
  
  
! EXTRA_DIST = listpanel.cpp panelfunc.cpp panelfunc.h listpanel.h krdetailedview.cpp krdetailedview.h krdetailedviewitem.cpp krdetailedviewitem.h krview.cpp krview.h krviewitem.h krpreviewpopup.cpp krpreviewpopup.h krpopupmenu.cpp krpopupmenu.h krcalcspacedialog.cpp krcalcspacedialog.h krcolorcache.cpp krcolorcache.h 
  
  ####### kdevelop will overwrite this part!!! (end)############

--- NEW FILE: krcolorcache.cpp ---
/***************************************************************************
                   krcolorcache.cpp
                  -------------------
copyright            : (C) 2000-2002 by Shie Erlich & Rafi Yanai
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 "krcolorcache.h"
#include "../krusader.h"
#include "../defaults.h"


KrColorCache * KrColorCache::instance = 0;

KrColorCache::KrColorCache() : colorCache(23)
{
   colorCache.setAutoDelete(true);
}

KrColorCache & KrColorCache::getColorCache()
{
   if (!instance)
   {
      instance = new KrColorCache();
      instance->refreshColors();
   }
   return *instance;
}

const QColor * KrColorCache::getColor(const QString & colorName) const
{
   QColor * color = colorCache.find(colorName);
   if (!color)
   {
      krConfig->setGroup("Colors");
      color = new QColor();
      *color = krConfig->readColorEntry(colorName);
      ((KrColorCache *)this)->colorCache.replace(colorName, color);
      if (colorCache.count() >= colorCache.size())
         ((KrColorCache *)this)->colorCache.resize(colorCache.count()*2+1);
   }
   if (color->isValid())
      return color;
   return 0;
}

const QColor * KrColorCache::getForegroundColor() const
{
   return getColor("Foreground");
}

const QColor * KrColorCache::getDirectoryForegroundColor() const
{
   return getColor("Directory Foreground");
}

const QColor * KrColorCache::getExecutableForegroundColor() const
{
   return getColor("Executable Foreground");
}

const QColor * KrColorCache::getSymlinkForegroundColor() const
{
   return getColor("Symlink Foreground");
}

const QColor * KrColorCache::getInvalidSymlinkForegroundColor() const
{
   return getColor("Invalid Symlink Foreground");
}

const QColor * KrColorCache::getMarkedForegroundColor() const
{
   return getColor("Marked Foreground");
}

const QColor * KrColorCache::getMarkedBackgroundColor() const
{
   return getColor("Marked Background");
}

const QColor * KrColorCache::getCurrentForegroundColor() const
{
   return getColor("Current Foreground");
}

const QColor * KrColorCache::getCurrentBackgroundColor() const
{
   return getColor("Current Background");
}

const QColor * KrColorCache::getBackgroundColor() const
{
   return getColor("Background");
}

const QColor * KrColorCache::getAlternateBackgroundColor() const
{
   return getColor("Alternate Background");
}

const QColor * KrColorCache::getAlternateMarkedBackgroundColor() const
{
   return getColor("Alternate Marked Background");
}

void KrColorCache::refreshColors()
{
   colorCache.clear();
   krConfig->setGroup("Colors");
   kdeDefault = krConfig->readBoolEntry("KDE Default", _KDEDefaultColors);
   alternateBackgroundEnabled = krConfig->readBoolEntry("Enable Alternate Background", _AlternateBackground);
   showCurrentItemAlways = krConfig->readBoolEntry("Show Current Item Always", _ShowCurrentItemAlways);
   colorsRefreshed();
}

Index: krdetailedview.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedview.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** krdetailedview.h	15 Mar 2004 14:40:29 -0000	1.22
--- krdetailedview.h	24 Mar 2004 06:33:54 -0000	1.23
***************
*** 121,124 ****
--- 121,125 ----
       */
      void slotMouseClicked( int button, QListViewItem * item, const QPoint & pos, int c );
+     void refreshColors();
  
    private:

Index: krdetailedview.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedview.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** krdetailedview.cpp	15 Mar 2004 14:40:29 -0000	1.66
--- krdetailedview.cpp	24 Mar 2004 06:33:54 -0000	1.67
***************
*** 30,33 ****
--- 30,34 ----
  #include "krdetailedview.h"
  #include "krdetailedviewitem.h"
+ #include "krcolorcache.h"
  #include "../kicons.h"
  #include "../defaults.h"
***************
*** 120,123 ****
--- 121,125 ----
      connect( this, SIGNAL( mouseButtonClicked ( int, QListViewItem *, const QPoint &, int ) ),
               this, SLOT( slotMouseClicked ( int, QListViewItem *, const QPoint &, int ) ) );
+     connect( &KrColorCache::getColorCache(), SIGNAL( colorsRefreshed() ), this, SLOT( refreshColors() ) );
      }
  
***************
*** 206,209 ****
--- 208,212 ----
    setFocusPolicy( StrongFocus );
    restoreSettings();
+   refreshColors();
    }
  
***************
*** 490,494 ****
       return;
     }
!    QListViewItem * i = itemAt( contentsToViewport( e->pos() ) );
     KListView::contentsMousePressEvent( e );
  //   if (i != 0) // comment in, if click sould NOT select
--- 493,497 ----
       return;
     }
! //   QListViewItem * i = itemAt( contentsToViewport( e->pos() ) );
     KListView::contentsMousePressEvent( e );
  //   if (i != 0) // comment in, if click sould NOT select
***************
*** 918,919 ****
--- 921,941 ----
      emit middleButtonClicked( item );
    }
+ 
+ void KrDetailedView::refreshColors()
+ {
+   if (!KrColorCache::getColorCache().isKDEDefault())
+   {
+     // KDE deafult is not choosen: set the background color (as this paints the empty areas) and the alternate color
+     const QColor * color = KrColorCache::getColorCache().getBackgroundColor();
+     setPaletteBackgroundColor(color?*color:KGlobalSettings::baseColor());
+     color = KrColorCache::getColorCache().getAlternateBackgroundColor();
+     setAlternateBackground(color?*color:KGlobalSettings::alternateBackgroundColor());
+   }
+   else
+   {
+     // KDE deaful tis choosen: set back the background color
+     setPaletteBackgroundColor(KGlobalSettings::baseColor());
+     // Set the alternate color to its default or to an invalid color, to turn alternate the background off.
+     setAlternateBackground(KrColorCache::getColorCache().isAlternateBackgroundEnabled()?KGlobalSettings::alternateBackgroundColor():QColor());
+   }
+ }

Index: krdetailedviewitem.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedviewitem.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** krdetailedviewitem.cpp	30 Jan 2004 23:24:40 -0000	1.21
--- krdetailedviewitem.cpp	24 Mar 2004 06:33:54 -0000	1.22
***************
*** 34,37 ****
--- 34,38 ----
  #include "krdetailedviewitem.h"
  #include "krdetailedview.h"
+ #include "krcolorcache.h"
  #include "../VFS/krpermhandler.h"
  #include <sys/types.h>
***************
*** 44,47 ****
--- 45,49 ----
  #include <kdebug.h>
  #include <kmimetype.h>
+ #include <kglobalsettings.h> 
  
  KrDetailedViewItem::KrDetailedViewItem(KrDetailedView *parent, QListViewItem *after, vfile *vf):
***************
*** 166,177 ****
    }
  *****************************************************************************/
    // center the <DIR> thing if needed
    if(column != _view->column(KrDetailedView::Size))
!    KListViewItem::paintCell(p, _cg, column, width, align);
    else if (_vf) {
      if (_vf->vfile_isDir() && _vf->vfile_getSize()<=0)
!       KListViewItem::paintCell(p, _cg, column, width, Qt::AlignHCenter);
!     else KListViewItem::paintCell(p, _cg, column, width, align); // size
!   } else KListViewItem::paintCell(p, _cg, column, width, Qt::AlignHCenter); // updir
  }
  
--- 168,335 ----
    }
  *****************************************************************************/
+ 
+    // This is ugly! I had to dublicate KListViewItem::paintCell() code, as the
+    // KListViewItem::paintCell() overwrites my color settings. So KrDetailedViewItem::paintCell
+    // must dublicate the KListViewItem::paintCell() code, do the required color settings
+    // and call QListViewItem::paintCell() afterwards (the base class of KListViewItem).
+    // This tabooed in the object oriented heaven, but necessary here. Blame the KDE team for
+    // this really poor paintCell implementation!
+    
+    const QPixmap *pm = listView()->viewport()->backgroundPixmap();
+    if (pm && !pm->isNull())
+    {
+          _cg.setBrush(QColorGroup::Base, QBrush(backgroundColor(), *pm));
+          p->setBrushOrigin( -listView()->contentsX(), -listView()->contentsY() );
+    }
+    else if (isAlternate())
+         if (listView()->viewport()->backgroundMode()==Qt::FixedColor)
+              _cg.setColor(QColorGroup::Background, static_cast< KListView* >(listView())->alternateBackground());
+        else
+              _cg.setColor(QColorGroup::Base, static_cast< KListView* >(listView())->alternateBackground());
+ 
+   // end of uglyness
+ 
+   
+   // begin of custom color calculation
+   bool markCurrentAlways = KrColorCache::getColorCache().isShowCurrentItemAlways();
+   
+   // if KDE deafault: do not touch color group!
+   if (!KrColorCache::getColorCache().isKDEDefault())
+   {
+     bool hasFocus = listView()->hasFocus();
+     bool isCurrent = listView()->currentItem() == this;
+     
+     // These two pointers will take the fore and background color. Color is a temp variable
+     const QColor * foreground = 0, * background = 0, * color;
+     
+     // As i deal with pointers here, the KDE default colors have to be stored here so that I can make
+     // a pointer out of it
+     QColor defaultForeground = KGlobalSettings::textColor(), defaultBackground = KGlobalSettings::alternateBackgroundColor(),
+            defaultMarkedForeground = KGlobalSettings::highlightedTextColor(), defaultMarkedBackground = KGlobalSettings::highlightColor();
+     if (isAlternate() || !defaultBackground.isValid())
+       defaultBackground = KGlobalSettings::baseColor();
+     // Macro: set target = col, if col is not zero
+     #define SETCOLOR(target, col) { color = col; if (color) target = color; }
+     
+     // First calculate fore and background. Th eKDe deafult is not taken into account here
+     SETCOLOR(background, isAlternate()?KrColorCache::getColorCache().getAlternateBackgroundColor():KrColorCache::getColorCache().getBackgroundColor())
+     SETCOLOR(foreground, KrColorCache::getColorCache().getForegroundColor())
+     if (isSymLink())
+     {
+        if (_vf->vfile_getMime() == "Broken Link !" )
+           SETCOLOR(foreground, KrColorCache::getColorCache().getInvalidSymlinkForegroundColor())
+        else
+           SETCOLOR(foreground, KrColorCache::getColorCache().getSymlinkForegroundColor())
+     }
+     else if (isDir())
+        SETCOLOR(foreground, KrColorCache::getColorCache().getDirectoryForegroundColor())
+     else if (isExecutable())
+        SETCOLOR(foreground, KrColorCache::getColorCache().getExecutableForegroundColor())
+     if (background)
+     {
+        // if a background color has been set, set it int the color group
+        _cg.setColor(QColorGroup::Base, *background);
+        _cg.setColor(QColorGroup::Background, *background);
+     }
+     else
+       // otherwise leave the colorgroup untouched (KDE default). Just set the background variable
+       // for the contrast calculation below
+       background = &defaultBackground;
+       
+     if (foreground)
+        // if a foreground color has been set, set it int the color group
+       _cg.setColor(QColorGroup::Text, *foreground);
+     else
+       // otherwise leave the colorgroup untouched (KDE default). Just set the foreground variable
+       // for the contrast calculation below
+       foreground = &defaultForeground;
+ 
+     // now the color of a marked item
+     const QColor * markedForeground = KrColorCache::getColorCache().getMarkedForegroundColor(), * markedBackground = 0;
+     if (markedForeground)
+       // set it in the color group (different group color than normal foreground!) if defined (otherwise the
+       // KDE default remains)
+       _cg.setColor(QColorGroup::HighlightedText, *markedForeground);
+     else
+       markedForeground = &defaultMarkedForeground;
+ 
+     if (isAlternate())
+     {
+        // Seek the correct background color
+        markedBackground = KrColorCache::getColorCache().getAlternateMarkedBackgroundColor();
+        if (!markedBackground)
+           markedBackground = KrColorCache::getColorCache().getMarkedBackgroundColor();
+     }
+     else
+        markedBackground = KrColorCache::getColorCache().getMarkedBackgroundColor();
+     if (markedBackground)
+        // set it in the color group (different group color than normal background!) if defined (otherwise the
+        // KDE default remains)
+        _cg.setColor(QColorGroup::Highlight, *markedBackground);
+     else
+       markedBackground = &defaultMarkedBackground;
+ 
+     // In case the current item is a selected one, set the fore- and background colors for the contrast calculation below
+     if (isSelected())
+     {
+       if (markedBackground)
+         background = markedBackground;
+       if (markedForeground)
+         foreground = markedForeground;
+     }
+ 
+     // finally the current item
+     if (isCurrent && (markCurrentAlways || hasFocus))
+     {
+        // if this is the current item AND the panels has tho focus OR the current should be marked always
+        const QColor * currentBackground = KrColorCache::getColorCache().getCurrentBackgroundColor();
+        if (currentBackground)
+        {
+          // set the background, if set
+          _cg.setColor(QColorGroup::Highlight, *currentBackground);
+          _cg.setColor(QColorGroup::Base, *currentBackground);
+          _cg.setColor(QColorGroup::Background, *currentBackground);
+        }
+        else
+          // make sure, that the currentBackground variable in any cse reflects the background color for the contrast calculation below
+          currentBackground = background;
+ 
+        color = KrColorCache::getColorCache().getCurrentForegroundColor();
+        if (color)
+        {
+ //         if (markedForeground && isSelected())
+ //            color = markedForeground;
+          // set the foreground, if set
+          _cg.setColor(QColorGroup::Text, *color);
+          _cg.setColor(QColorGroup::HighlightedText, *color);
+        }
+        else
+        {
+          // if no foreground color is set, the foreground color calculated above is used. This might give an
+          // 'invisible' color, if the foreground color calulated above and the background color of the current
+          // item are very similar. Calulate the contrast to identify such a problem.
+          #define sqr(x) ((x)*(x))
+          color = foreground;
+          int contrast = sqr(color->red() - currentBackground->red()) + sqr(color->green() - currentBackground->green()) + sqr(color->blue() - currentBackground->blue());
+ 
+          // if the contrst is too small, take the background of the not current item as its foreground in the hope, 
+          // that this increases teh contrast.
+          if (contrast < 1000)
+             color = background;
+          _cg.setColor(QColorGroup::Text, *color);
+          _cg.setColor(QColorGroup::HighlightedText, *color);
+        }
+     }
+ 
+   }
+ 
    // center the <DIR> thing if needed
    if(column != _view->column(KrDetailedView::Size))
!    QListViewItem::paintCell(p, _cg, column, width, align);
    else if (_vf) {
      if (_vf->vfile_isDir() && _vf->vfile_getSize()<=0)
!       QListViewItem::paintCell(p, _cg, column, width, Qt::AlignHCenter);
!     else QListViewItem::paintCell(p, _cg, column, width, align); // size
!   } else QListViewItem::paintCell(p, _cg, column, width, Qt::AlignHCenter); // updir
  }
  
***************
*** 282,283 ****
--- 440,442 ----
     return KGlobal::locale()->formatDateTime(tmp);
  }
+ 

--- NEW FILE: krcolorcache.h ---
#ifndef KRCOLORCACHE_H
#define KRCOLORCACHE_H

#include <qobject.h>
#include <qdict.h>

class KrColorCache : public QObject
{
  Q_OBJECT
  KrColorCache();
  static KrColorCache * instance;
  QDict<QColor> colorCache;
  bool kdeDefault, alternateBackgroundEnabled, showCurrentItemAlways;
public:
  static KrColorCache & getColorCache();
  const QColor * getColor(const QString & colorName) const;
  const QColor * getForegroundColor() const;
  const QColor * getDirectoryForegroundColor() const;
  const QColor * getExecutableForegroundColor() const;
  const QColor * getSymlinkForegroundColor() const;
  const QColor * getInvalidSymlinkForegroundColor() const;
  const QColor * getMarkedForegroundColor() const;
  const QColor * getMarkedBackgroundColor() const;
  const QColor * getCurrentForegroundColor() const;
  const QColor * getCurrentBackgroundColor() const;
  const QColor * getBackgroundColor() const;
  const QColor * getAlternateBackgroundColor() const;
  const QColor * getAlternateMarkedBackgroundColor() const;
  bool isKDEDefault() const {return kdeDefault;}
  bool isAlternateBackgroundEnabled() const {return alternateBackgroundEnabled;}
  bool isShowCurrentItemAlways() const {return showCurrentItemAlways;}
  
public slots:
  void refreshColors();
signals:
  void colorsRefreshed();
};

#endif

[Krusader-commits] krusader_kde3/krusader/Konfigurator kgcolors.cpp,1.6,1.7

[Karai C. <ck...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/Konfigurator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11859/krusader_kde3/krusader/Konfigurator

Modified Files:
	kgcolors.cpp 
Log Message:

ADDED: configuring the colors


Index: kgcolors.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Konfigurator/kgcolors.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** kgcolors.cpp	23 Mar 2004 06:33:00 -0000	1.6
--- kgcolors.cpp	24 Mar 2004 06:33:53 -0000	1.7
***************
*** 31,34 ****
--- 31,35 ----
  #include "kgcolors.h"
  #include "../defaults.h"
+ #include "../Panel/krcolorcache.h"
  #include <klocale.h>
  #include <kglobalsettings.h>
***************
*** 241,245 ****
  {
    bool result = KonfiguratorPage::apply();
!   /* TODO delete the color cache */
    return result;
  }
--- 242,246 ----
  {
    bool result = KonfiguratorPage::apply();
!   KrColorCache::getColorCache().refreshColors();
    return result;
  }

[Krusader-commits] krusader_kde3 ChangeLog,1.198,1.199 krusader.kdevprj,1.52,1.53

[Karai C. <ck...@us...>]

Update of /cvsroot/krusader/krusader_kde3
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11859/krusader_kde3

Modified Files:
	ChangeLog krusader.kdevprj 
Log Message:

ADDED: configuring the colors


Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.198
retrieving revision 1.199
diff -C2 -d -r1.198 -r1.199
*** ChangeLog	20 Mar 2004 12:36:21 -0000	1.198
--- ChangeLog	24 Mar 2004 06:33:53 -0000	1.199
***************
*** 1,6 ****
!     ADDED: (a bug fix really) ability to "not test archives before unpacking" 
! 		ADDED: new icons (thanks to adios for providing them)
! 		ADDED: quickmode for mountman. press and HOLD the mountman icon for new functionality
! 		ADDED: Bulgarian translation (thanks to Milen Ivanov)
      ADDED: krusader restart is not necessary from now after changing the configuration
      ADDED: ability to give arguments for the terminal
--- 1,7 ----
!     ADDED: configuring the colors of the panel
!     ADDED: (a bug fix really) ability to "not test archives before unpacking"
!     ADDED: new icons (thanks to adios for providing them)
!     ADDED: quickmode for mountman. press and HOLD the mountman icon for new functionality
!     ADDED: Bulgarian translation (thanks to Milen Ivanov)
      ADDED: krusader restart is not necessary from now after changing the configuration
      ADDED: ability to give arguments for the terminal
***************
*** 24,30 ****
      ADDED: file splitter
      ADDED: a missing credit for Frank in the about box
! 		FIXED: bug [ 906386 ] regarding refreshes of dirwatch with fam enabled
! 		FIXED: bug [ 906538 ] which now makes a faster unpacking process
! 		FIXED: bug [ 894771 ] regarding over-expanding window due to long command line
      FIXED: edit new file on KDE 3.2
      FIXED: permission handling for FTP URL-s
--- 25,31 ----
      ADDED: file splitter
      ADDED: a missing credit for Frank in the about box
!     FIXED: bug [ 906386 ] regarding refreshes of dirwatch with fam enabled
!     FIXED: bug [ 906538 ] which now makes a faster unpacking process
!     FIXED: bug [ 894771 ] regarding over-expanding window due to long command line
      FIXED: edit new file on KDE 3.2
      FIXED: permission handling for FTP URL-s

Index: krusader.kdevprj
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader.kdevprj,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** krusader.kdevprj	20 Mar 2004 09:27:23 -0000	1.52
--- krusader.kdevprj	24 Mar 2004 06:33:53 -0000	1.53
***************
*** 856,860 ****
  
  [krusader/Panel/Makefile.am]
! files=krusader/Panel/listpanel.cpp,krusader/Panel/panelfunc.cpp,krusader/Panel/panelfunc.h,krusader/Panel/listpanel.h,krusader/Panel/krdetailedview.cpp,krusader/Panel/krdetailedview.h,krusader/Panel/krdetailedviewitem.cpp,krusader/Panel/krdetailedviewitem.h,krusader/Panel/krview.cpp,krusader/Panel/krview.h,krusader/Panel/krviewitem.h,krusader/Panel/krpreviewpopup.cpp,krusader/Panel/krpreviewpopup.h,krusader/Panel/krpopupmenu.cpp,krusader/Panel/krpopupmenu.h,krusader/Panel/krcalcspacedialog.cpp,krusader/Panel/krcalcspacedialog.h
  sharedlib_LDFLAGS=-version-info 0:0:0
  sharedlib_rootname=Panel
--- 856,860 ----
  
  [krusader/Panel/Makefile.am]
! files=krusader/Panel/listpanel.cpp,krusader/Panel/panelfunc.cpp,krusader/Panel/panelfunc.h,krusader/Panel/listpanel.h,krusader/Panel/krdetailedview.cpp,krusader/Panel/krdetailedview.h,krusader/Panel/krdetailedviewitem.cpp,krusader/Panel/krdetailedviewitem.h,krusader/Panel/krview.cpp,krusader/Panel/krview.h,krusader/Panel/krviewitem.h,krusader/Panel/krpreviewpopup.cpp,krusader/Panel/krpreviewpopup.h,krusader/Panel/krpopupmenu.cpp,krusader/Panel/krpopupmenu.h,krusader/Panel/krcalcspacedialog.cpp,krusader/Panel/krcalcspacedialog.h,krusader/Panel/krcolorcache.cpp,krusader/Panel/krcolorcache.h
  sharedlib_LDFLAGS=-version-info 0:0:0
  sharedlib_rootname=Panel
***************
*** 874,877 ****
--- 874,889 ----
  type=HEADER
  
+ [krusader/Panel/krcolorcache.cpp]
+ dist=true
+ install=false
+ install_location=
+ type=SOURCE
+ 
+ [krusader/Panel/krcolorcache.h]
+ dist=true
+ install=false
+ install_location=
+ type=HEADER
+ 
  [krusader/Panel/krdetailedview.cpp]
  dist=true

[Krusader-commits] krusader_kde3/krusader/Konfigurator kgcolors.cpp,1.5,1.6

[Karai C. <ck...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/Konfigurator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6114/krusader_kde3/krusader/Konfigurator

Modified Files:
	kgcolors.cpp 
Log Message:

FIXED: preview alternate colors


Index: kgcolors.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Konfigurator/kgcolors.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** kgcolors.cpp	22 Mar 2004 08:42:47 -0000	1.5
--- kgcolors.cpp	23 Mar 2004 06:33:00 -0000	1.6
***************
*** 80,84 ****
    addColorSelector( "Marked Foreground",          i18n( "Marked foreground:" ),           KGlobalSettings::highlightedTextColor()                                     );
    addColorSelector( "Marked Background",          i18n( "Marked background:" ),           KGlobalSettings::highlightColor()                                           );
!   addColorSelector( "Alternate Marked Background",i18n( "Alternate marked background:" ), getColorSelector( "Marked Background" )->getColor(), i18n( "Same as alternate background" )  );
    addColorSelector( "Current Foreground",         i18n( "Current foreground:" ),          Qt::white,                                    i18n( "Not used" )            );
    addColorSelector( "Current Background",         i18n( "Current background:" ),          Qt::white,                                    i18n( "Not used" )            );
--- 80,84 ----
    addColorSelector( "Marked Foreground",          i18n( "Marked foreground:" ),           KGlobalSettings::highlightedTextColor()                                     );
    addColorSelector( "Marked Background",          i18n( "Marked background:" ),           KGlobalSettings::highlightColor()                                           );
!   addColorSelector( "Alternate Marked Background",i18n( "Alternate marked background:" ), getColorSelector( "Marked Background" )->getColor(), i18n( "Same as marked background" )  );
    addColorSelector( "Current Foreground",         i18n( "Current foreground:" ),          Qt::white,                                    i18n( "Not used" )            );
    addColorSelector( "Current Background",         i18n( "Current background:" ),          Qt::white,                                    i18n( "Not used" )            );
***************
*** 202,207 ****
      QColor fore   = KGlobalSettings::textColor();
  
!     pwFile->setColor( fore, bck );    
!     pwDir->setColor( fore, altBck );
      pwApp->setColor( fore, bck );
      pwSymLink->setColor( fore, altBck );
--- 202,207 ----
      QColor fore   = KGlobalSettings::textColor();
  
!     pwFile->setColor( fore, altBck );
!     pwDir->setColor( fore, bck );
      pwApp->setColor( fore, bck );
      pwSymLink->setColor( fore, altBck );
***************
*** 219,224 ****
      QColor currentBck = altBck;
  
!     pwFile->setColor( currentFore = getColorSelector( "Foreground" )->getColor(), bck );
!     pwDir->setColor( getColorSelector( "Directory Foreground" )->getColor(), altBck );
      pwApp->setColor( getColorSelector( "Executable Foreground" )->getColor(), bck );
      pwSymLink->setColor( getColorSelector( "Symlink Foreground" )->getColor(), altBck );
--- 219,224 ----
      QColor currentBck = altBck;
  
!     pwFile->setColor( currentFore = getColorSelector( "Foreground" )->getColor(), altBck );
!     pwDir->setColor( getColorSelector( "Directory Foreground" )->getColor(), bck );
      pwApp->setColor( getColorSelector( "Executable Foreground" )->getColor(), bck );
      pwSymLink->setColor( getColorSelector( "Symlink Foreground" )->getColor(), altBck );

[Krusader-commits] krusader_kde3/krusader/Konfigurator kgcolors.cpp,1.4,1.5

[Karai C. <ck...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/Konfigurator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19488/krusader_kde3/krusader/Konfigurator

Modified Files:
	kgcolors.cpp 
Log Message:

FIXED: preview color fix 


Index: kgcolors.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Konfigurator/kgcolors.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** kgcolors.cpp	22 Mar 2004 06:15:47 -0000	1.4
--- kgcolors.cpp	22 Mar 2004 08:42:47 -0000	1.5
***************
*** 202,207 ****
      QColor fore   = KGlobalSettings::textColor();
  
!     pwDir->setColor( fore, bck );    
!     pwFile->setColor( fore, altBck );
      pwApp->setColor( fore, bck );
      pwSymLink->setColor( fore, altBck );
--- 202,207 ----
      QColor fore   = KGlobalSettings::textColor();
  
!     pwFile->setColor( fore, bck );    
!     pwDir->setColor( fore, altBck );
      pwApp->setColor( fore, bck );
      pwSymLink->setColor( fore, altBck );
***************
*** 219,224 ****
      QColor currentBck = altBck;
  
!     pwDir->setColor( currentFore = getColorSelector( "Foreground" )->getColor(), bck );
!     pwFile->setColor( getColorSelector( "Directory Foreground" )->getColor(), altBck );
      pwApp->setColor( getColorSelector( "Executable Foreground" )->getColor(), bck );
      pwSymLink->setColor( getColorSelector( "Symlink Foreground" )->getColor(), altBck );
--- 219,224 ----
      QColor currentBck = altBck;
  
!     pwFile->setColor( currentFore = getColorSelector( "Foreground" )->getColor(), bck );
!     pwDir->setColor( getColorSelector( "Directory Foreground" )->getColor(), altBck );
      pwApp->setColor( getColorSelector( "Executable Foreground" )->getColor(), bck );
      pwSymLink->setColor( getColorSelector( "Symlink Foreground" )->getColor(), altBck );

[Krusader-commits] krusader_kde3/krusader defaults.h,1.11,1.12

[Karai C. <ck...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27680/krusader_kde3/krusader

Modified Files:
	defaults.h 
Log Message:

FINISHED: konfigurator color page


Index: defaults.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/defaults.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** defaults.h	20 Mar 2004 12:15:39 -0000	1.11
--- defaults.h	22 Mar 2004 06:15:47 -0000	1.12
***************
*** 99,102 ****
--- 99,104 ----
  // Enable Alternate Background colors
  #define _AlternateBackground  true
+ // Show current item even if not focussed
+ #define _ShowCurrentItemAlways false
  
  /////////////////////// [General]

[Krusader-commits] krusader_kde3/krusader/Konfigurator kgcolors.cpp,1.3,1.4 kgcolors.h,1.3,1.4 konfiguratoritems.cpp,1.8,1.9

[Karai C. <ck...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/Konfigurator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27680/krusader_kde3/krusader/Konfigurator

Modified Files:
	kgcolors.cpp kgcolors.h konfiguratoritems.cpp 
Log Message:

FINISHED: konfigurator color page


Index: konfiguratoritems.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Konfigurator/konfiguratoritems.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** konfiguratoritems.cpp	20 Mar 2004 21:55:57 -0000	1.8
--- konfiguratoritems.cpp	22 Mar 2004 06:15:47 -0000	1.9
***************
*** 692,695 ****
--- 692,696 ----
        
    ext->setChanged( false );
+   emit colorChanged();
    disableColorChooser = false;
  }

Index: kgcolors.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Konfigurator/kgcolors.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** kgcolors.cpp	20 Mar 2004 21:55:57 -0000	1.3
--- kgcolors.cpp	22 Mar 2004 06:15:47 -0000	1.4
***************
*** 34,37 ****
--- 34,38 ----
  #include <kglobalsettings.h>
  #include <qhbox.h>
+ #include <qheader.h>
  
  KgColors::KgColors( bool first, QWidget* parent,  const char* name ) :
***************
*** 49,60 ****
    KONFIGURATOR_CHECKBOX_PARAM generalSettings[] =
    //  cfg_class  cfg_name                     default               text                                      restart tooltip
!     {{"Colors","KDE Default",                 _KDEDefaultColors,    i18n( "Use the default KDE colors" ),     true ,  "" },
!      {"Colors","Enable Alternate Background", _AlternateBackground, i18n( "Use alternate backround color" ),  true ,  "" }};
  
!   generals = createCheckBoxGroup( 1, 0, generalSettings, 2, generalGrp );
    generalGrid->addWidget( generals, 1, 0 );
  
    connect( generals->find( "KDE Default" ), SIGNAL( stateChanged( int ) ), this, SLOT( slotDisable() ) );
!   connect( generals->find( "Enable Alternate Background" ), SIGNAL( stateChanged( int ) ), this, SLOT( slotDisable() ) );
  
    kgColorsLayout->addWidget( generalGrp, 0 ,0 );
--- 50,62 ----
    KONFIGURATOR_CHECKBOX_PARAM generalSettings[] =
    //  cfg_class  cfg_name                     default               text                                      restart tooltip
!     {{"Colors","KDE Default",                 _KDEDefaultColors,    i18n( "Use the default KDE colors" ),     false,  "" },
!      {"Colors","Enable Alternate Background", _AlternateBackground, i18n( "Use alternate backround color" ),  false,  "" },
!      {"Colors","Show Current Item Always", _ShowCurrentItemAlways, i18n( "Show current item even if not focussed" ),  false,  "" }};
  
!   generals = createCheckBoxGroup( 0, 2, generalSettings, sizeof(generalSettings)/sizeof(generalSettings[0]), generalGrp );
    generalGrid->addWidget( generals, 1, 0 );
  
    connect( generals->find( "KDE Default" ), SIGNAL( stateChanged( int ) ), this, SLOT( slotDisable() ) );
!   connect( generals->find( "Enable Alternate Background" ), SIGNAL( stateChanged( int ) ), this, SLOT( generatePreview() ) );
  
    kgColorsLayout->addWidget( generalGrp, 0 ,0 );
***************
*** 74,84 ****
    addColorSelector( "Symlink Foreground",         i18n( "Symbolic link foreground:" ),    getColorSelector( "Foreground" )->getColor(), i18n( "Same as foreground" )  );
    addColorSelector( "Invalid Symlink Foreground", i18n( "Invalid symlink foreground:" ),  getColorSelector( "Foreground" )->getColor(), i18n( "Same as foreground" )  );
    addColorSelector( "Marked Foreground",          i18n( "Marked foreground:" ),           KGlobalSettings::highlightedTextColor()                                     );
    addColorSelector( "Marked Background",          i18n( "Marked background:" ),           KGlobalSettings::highlightColor()                                           );
!   addColorSelector( "Alternate Marked Background",i18n( "Alternate marked background:" ), getColorSelector( "Marked Background" )->getColor(), i18n( "Same as marked background" )  );
    addColorSelector( "Current Foreground",         i18n( "Current foreground:" ),          Qt::white,                                    i18n( "Not used" )            );
    addColorSelector( "Current Background",         i18n( "Current background:" ),          Qt::white,                                    i18n( "Not used" )            );
-   addColorSelector( "Background",                 i18n( "Background:" ),                  KGlobalSettings::baseColor()                                                );
-   addColorSelector( "Alternate Background",       i18n( "Alternate background:" ),        KGlobalSettings::alternateBackgroundColor()                                 );
  
    connect( getColorSelector( "Foreground" ), SIGNAL( colorChanged() ), this, SLOT( slotForegroundChanged() ) );
--- 76,86 ----
    addColorSelector( "Symlink Foreground",         i18n( "Symbolic link foreground:" ),    getColorSelector( "Foreground" )->getColor(), i18n( "Same as foreground" )  );
    addColorSelector( "Invalid Symlink Foreground", i18n( "Invalid symlink foreground:" ),  getColorSelector( "Foreground" )->getColor(), i18n( "Same as foreground" )  );
+   addColorSelector( "Background",                 i18n( "Background:" ),                  KGlobalSettings::baseColor()                                                );
+   addColorSelector( "Alternate Background",       i18n( "Alternate background:" ),        KGlobalSettings::alternateBackgroundColor()                                 );
    addColorSelector( "Marked Foreground",          i18n( "Marked foreground:" ),           KGlobalSettings::highlightedTextColor()                                     );
    addColorSelector( "Marked Background",          i18n( "Marked background:" ),           KGlobalSettings::highlightColor()                                           );
!   addColorSelector( "Alternate Marked Background",i18n( "Alternate marked background:" ), getColorSelector( "Marked Background" )->getColor(), i18n( "Same as alternate background" )  );
    addColorSelector( "Current Foreground",         i18n( "Current foreground:" ),          Qt::white,                                    i18n( "Not used" )            );
    addColorSelector( "Current Background",         i18n( "Current background:" ),          Qt::white,                                    i18n( "Not used" )            );
  
    connect( getColorSelector( "Foreground" ), SIGNAL( colorChanged() ), this, SLOT( slotForegroundChanged() ) );
***************
*** 90,96 ****
    previewGrid = createGridLayout( previewGrp->layout() );
  
!   /* TODO TODO TODO TODO TODO */
    
    kgColorsLayout->addWidget( hbox, 1 ,0 );
  } 
  
--- 92,119 ----
    previewGrid = createGridLayout( previewGrp->layout() );
  
!   preview = new QListView( previewGrp, "colorPreView" );
!   
!   preview->setShowSortIndicator(false);
!   preview->setSorting(-1);
!   preview->setEnabled( false );
! 
!   preview->addColumn( i18n("Colors") );
!   preview->header()->setStretchEnabled( true, 0 );
! 
!   pwMark2   = new PreviewItem( preview, i18n( "Marked 2" ) );
!   pwMark1   = new PreviewItem( preview, i18n( "Marked 1" ) );
!   pwCurrent = new PreviewItem( preview, i18n( "Current" ) );
!   pwInvLink = new PreviewItem( preview, i18n( "Invalid symlink" ) );
!   pwSymLink = new PreviewItem( preview, i18n( "Symbolic link" ) );
!   pwApp     = new PreviewItem( preview, i18n( "Application" ) );
!   pwFile    = new PreviewItem( preview, i18n( "File" ) );
!   pwDir     = new PreviewItem( preview, i18n( "Directory" ) );
!   
!   generatePreview();
! 
!   previewGrid->addWidget( preview, 0 ,0 );
    
    kgColorsLayout->addWidget( hbox, 1 ,0 );
+   slotDisable();
  } 
  
***************
*** 100,110 ****
  
    labelList.append( addLabel( colorsGrid, index, 0, name, colorsGrp, QString( "ColorsLabel%1" ).arg( index ).ascii() ) );
!   KonfiguratorColorChooser *chooser = createColorChooser( "Colors", cfgName, dflt, colorsGrp, true );
    if( !dfltName.isEmpty() )
      chooser->setDefaultText( dfltName );
    colorsGrid->addWidget( chooser, index, 1 );
  
    itemList.append( chooser );
    itemNames.append( cfgName );
  }
  
--- 123,137 ----
  
    labelList.append( addLabel( colorsGrid, index, 0, name, colorsGrp, QString( "ColorsLabel%1" ).arg( index ).ascii() ) );
!   KonfiguratorColorChooser *chooser = createColorChooser( "Colors", cfgName, dflt, colorsGrp, false );
    if( !dfltName.isEmpty() )
      chooser->setDefaultText( dfltName );
    colorsGrid->addWidget( chooser, index, 1 );
  
+   connect( chooser, SIGNAL( colorChanged() ), this, SLOT( generatePreview() ) );
+   
    itemList.append( chooser );
    itemNames.append( cfgName );
+ 
+   return index;
  }
  
***************
*** 136,151 ****
  {
    bool enabled = generals->find( "KDE Default" )->isChecked();
-   bool alternateEnabled = enabled && generals->find( "Enable Alternate Background" )->isChecked();
    
    for( int i = 0; labelList.at( i ); i++ )
!     labelList.at( i )->setEnabled( enabled );
  
    for( int j = 0; itemList.at( j ); j++ )
!     itemList.at( j )->setEnabled( enabled );
  
!   getColorSelector( "Alternate Background" )->setEnabled( alternateEnabled );
!   getSelectorLabel( "Alternate Background" )->setEnabled( alternateEnabled );
!   getColorSelector( "Alternate Marked Background" )->setEnabled( alternateEnabled );
!   getSelectorLabel( "Alternate Marked Background" )->setEnabled( alternateEnabled );
  }
  
--- 163,176 ----
  {
    bool enabled = generals->find( "KDE Default" )->isChecked();
    
    for( int i = 0; labelList.at( i ); i++ )
!     labelList.at( i )->setEnabled( !enabled );
  
    for( int j = 0; itemList.at( j ); j++ )
!     itemList.at( j )->setEnabled( !enabled );
  
!   generals->find("Enable Alternate Background")->setEnabled( enabled );
!   generals->find("Show Current Item Always")->setEnabled( !enabled );
!   generatePreview();
  }
  
***************
*** 167,170 ****
--- 192,248 ----
  }
  
+ void KgColors::generatePreview()
+ {
+   if( generals->find( "KDE Default" )->isChecked() )
+   {
+     QColor bck    = KGlobalSettings::baseColor();
+     QColor altBck = KGlobalSettings::alternateBackgroundColor();
+     if( !generals->find("Enable Alternate Background")->isChecked() )
+       altBck = bck;
+     QColor fore   = KGlobalSettings::textColor();
+ 
+     pwDir->setColor( fore, bck );    
+     pwFile->setColor( fore, altBck );
+     pwApp->setColor( fore, bck );
+     pwSymLink->setColor( fore, altBck );
+     pwInvLink->setColor( fore, bck );
+     pwCurrent->setColor( fore, altBck );
+     pwMark1->setColor( KGlobalSettings::highlightedTextColor(), KGlobalSettings::highlightColor() );
+     pwMark2->setColor( KGlobalSettings::highlightedTextColor(), KGlobalSettings::highlightColor() );
+   }
+   else
+   {
+     QColor  bck   = getColorSelector( "Background" )->getColor();
+     QColor altBck = getColorSelector( "Alternate Background" )->getColor();
+ 
+     QColor currentFore;
+     QColor currentBck = altBck;
+ 
+     pwDir->setColor( currentFore = getColorSelector( "Foreground" )->getColor(), bck );
+     pwFile->setColor( getColorSelector( "Directory Foreground" )->getColor(), altBck );
+     pwApp->setColor( getColorSelector( "Executable Foreground" )->getColor(), bck );
+     pwSymLink->setColor( getColorSelector( "Symlink Foreground" )->getColor(), altBck );
+     pwInvLink->setColor( getColorSelector( "Invalid Symlink Foreground" )->getColor(), bck );
+ 
+     if( getColorSelector( "Current Foreground" )->currentItem() != 1 )
+       currentFore = getColorSelector( "Current Foreground" )->getColor();
+     if( getColorSelector( "Current Background" )->currentItem() != 1 )
+       currentBck = getColorSelector( "Current Background" )->getColor();
+       
+     pwCurrent->setColor( currentFore, currentBck );
+ 
+     QColor markFore = getColorSelector( "Marked Foreground" )->getColor();
+     pwMark1->setColor( markFore, getColorSelector( "Marked Background" )->getColor() );
+     pwMark2->setColor( markFore, getColorSelector( "Alternate Marked Background" )->getColor() );
+   }
+ }
+ 
+ bool KgColors::apply()
+ {
+   bool result = KonfiguratorPage::apply();
+   /* TODO delete the color cache */
+   return result;
+ }
+ 
  #include "kgcolors.moc"
  

Index: kgcolors.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Konfigurator/kgcolors.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** kgcolors.h	20 Mar 2004 21:55:57 -0000	1.3
--- kgcolors.h	22 Mar 2004 06:15:47 -0000	1.4
***************
*** 35,38 ****
--- 35,39 ----
  #include <qptrlist.h>
  #include <qvaluelist.h>
+ #include <qlistview.h>
  
  class KgColors : public KonfiguratorPage
***************
*** 43,50 ****
--- 44,54 ----
    KgColors( bool first, QWidget* parent=0,  const char* name=0 );
  
+   bool apply();
+ 
  public slots:
    void slotDisable();
    void slotForegroundChanged();
    void slotMarkedBackgroundChanged();
+   void generatePreview();
  
  private:
***************
*** 65,69 ****
    QPtrList<KonfiguratorColorChooser>  itemList;
    QValueList<QString>                 itemNames;
- };
  
  #endif /* __KGCOLORS_H__ */
--- 69,110 ----
    QPtrList<KonfiguratorColorChooser>  itemList;
    QValueList<QString>                 itemNames;
  
+   QListView                          *preview;
+ 
+   class PreviewItem : public QListViewItem
+   {
+   private:
+     QColor  defaultBackground;
+     QColor  defaultForeground;
+     QString label;
+     
+   public:
+     PreviewItem( QListView * parent, QString name ) : QListViewItem( parent, name )
+     {
+       defaultBackground = QColor( 255, 255, 255 );
+       defaultForeground = QColor( 0, 0, 0 );
+       label = name;
+     }
+ 
+     void setColor( QColor foregnd, QColor backgnd )
+     {
+       defaultForeground = foregnd;
+       defaultBackground = backgnd;
+       listView()->repaintItem( this );
+     }
+ 
+     QString text()
+     {
+       return label;
+     }
+ 
+     void paintCell ( QPainter * p, const QColorGroup & cg, int column, int width, int align )
+     {
+       QColorGroup _cg( cg );
+       _cg.setColor( QColorGroup::Base, defaultBackground );
+       _cg.setColor( QColorGroup::Text, defaultForeground );
+       QListViewItem::paintCell(p, _cg, column, width, align);
+     }
+   } *pwDir, *pwFile, *pwApp, *pwSymLink, *pwInvLink, *pwCurrent, *pwMark1, *pwMark2;
+ };
  #endif /* __KGCOLORS_H__ */

[Krusader-commits] krusader_kde3/krusader/Konfigurator konfigurator.cpp,1.10,1.11

[Karai C. <ck...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/Konfigurator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30548/krusader_kde3/krusader/Konfigurator

Modified Files:
	konfigurator.cpp 
Log Message:

FIXED: missing icon for look and feel on some linux versions


Index: konfigurator.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Konfigurator/konfigurator.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** konfigurator.cpp	19 Mar 2004 22:57:57 -0000	1.10
--- konfigurator.cpp	21 Mar 2004 07:26:17 -0000	1.11
***************
*** 91,95 ****
    // look n' feel
    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"),
--- 91,95 ----
    // look n' feel
    newContent(new KgLookFeel(firstTime, widget->addPage(i18n("Look & Feel"),
!     i18n("Look & Feel"),QPixmap(krLoader->loadIcon("looknfeel",KIcon::Desktop,32)))));
    // colors
    newContent(new KgColors(firstTime, widget->addPage(i18n("Colors"),