krusader-commits

[Krusader-commits] krusader_kde3/krusader/Panel panelpopup.cpp,1.4,1.5

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

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

Modified Files:
	panelpopup.cpp 
Log Message:
add: 3rd page to the 3rd hand. quick select 

Index: panelpopup.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelpopup.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** panelpopup.cpp	31 Jul 2004 21:58:38 -0000	1.4
--- panelpopup.cpp	31 Jul 2004 22:53:34 -0000	1.5
***************
*** 1,9 ****
  #include "panelpopup.h"
! #include "listpanel.h"
! 
! #include <kdebug.h>
! 
! 
  #include <qbuttongroup.h>
  #include <kfiletreeview.h>
  #include <klocale.h>
--- 1,9 ----
  #include "panelpopup.h"
! #include "../kicons.h"
! #include "../Dialogs/krsqueezedtextlabel.h"
! #include "../defaults.h"
! #include "../krslots.h"
  #include <qbuttongroup.h>
+ #include <qtoolbutton.h>
  #include <kfiletreeview.h>
  #include <klocale.h>
***************
*** 14,21 ****
  #include <krviewitem.h>
  #include <qwidgetstack.h>
! #include <kmultitabbar.h>
! #include "../kicons.h"
! #include "../Dialogs/krsqueezedtextlabel.h"
! #include "../defaults.h"
  
  PanelPopup::PanelPopup( QWidget *parent ) : QWidget( parent ), stack( 0 ), viewer( 0 ), pjob( 0 ) {
--- 14,21 ----
  #include <krviewitem.h>
  #include <qwidgetstack.h>
! #include <klineedit.h>
! 
! #include <kdebug.h>
! 
  
  PanelPopup::PanelPopup( QWidget *parent ) : QWidget( parent ), stack( 0 ), viewer( 0 ), pjob( 0 ) {
***************
*** 56,64 ****
  	btns->insert(previewBtn, Preview);
  	
  	layout->addWidget(dataLine,0,0);
  	layout->addWidget(treeBtn,0,1);
  	layout->addWidget(previewBtn,0,2);
  	
!    // create a widget stack on which to put the parts
     stack = new QWidgetStack( this );
  
--- 56,71 ----
  	btns->insert(previewBtn, Preview);
  	
+ 	quickBtn = new QToolButton(this);
+ 	quickBtn->setPixmap(krLoader->loadIcon( "kr_select", KIcon::Toolbar, 16 ));
+ 	quickBtn->setFixedSize(20, 20);
+ 	quickBtn->setToggleButton(true);
+ 	btns->insert(quickBtn, QuickPanel);
+ 	
  	layout->addWidget(dataLine,0,0);
  	layout->addWidget(treeBtn,0,1);
  	layout->addWidget(previewBtn,0,2);
+ 	layout->addWidget(quickBtn,0,3);
  	
! 	// create a widget stack on which to put the parts
     stack = new QWidgetStack( this );
  
***************
*** 81,85 ****
     stack->addWidget( viewer, Preview );
  
! 	layout->addMultiCellWidget(stack,1,1,0,2);
  	
     // raise the tree part
--- 88,112 ----
     stack->addWidget( viewer, Preview );
  
! 	// create the quick-panel part ----
! 	
! 	QWidget *quickPanel = new QWidget(stack);
! 	QGridLayout *qlayout = new QGridLayout(quickPanel);	
! 	// --- quick select
! 	QLabel *selectLabel = new QLabel(i18n("Quick Select"), quickPanel);
! 	quickSelectEdit = new KLineEdit(quickPanel);
! 	connect(quickSelectEdit, SIGNAL(returnPressed(const QString& )),
! 		this, SLOT(quickSelect(const QString& )));
! 	
! 	QToolButton *qselectBtn = new QToolButton(quickPanel);
! 	qselectBtn->setText("Go");
! 	connect(qselectBtn, SIGNAL(clicked()), this, SLOT(quickSelect()));
! 
! 	qlayout->addWidget(selectLabel,0,0);
! 	qlayout->addWidget(quickSelectEdit,0,1);
! 	qlayout->addWidget(qselectBtn,0,2);
! 	stack->addWidget(quickPanel, QuickPanel);
! 	
! 	// -------- finish the layout (General one)
! 	layout->addMultiCellWidget(stack,1,1,0,3);
  	
     // raise the tree part
***************
*** 97,100 ****
--- 124,133 ----
  			dataLine->setText("Tree:");
  			break;
+ 		case Preview:
+ 			dataLine->setText("Preview:");
+ 			break;
+ 		case QuickPanel:
+ 			dataLine->setText("Quick Select:");
+ 			break;
  	}
  }
***************
*** 131,134 ****
--- 164,169 ----
  }
  
+ // ------------------ preview
+ 
  // called when the preview job got something for us
  void PanelPopup::view( const KFileItem *kfi, const QPixmap& pix ) {
***************
*** 139,148 ****
  // preview job failed here...
  void PanelPopup::failedToView( const KFileItem* ) {
! 	dataLine->setText("");
     dynamic_cast<QLabel*>( stack->widget( Preview ) ) ->setText( i18n( "No preview available" ) );
  }
  
  void PanelPopup::treeSelection(QListViewItem*) {
  	emit selection(tree->currentURL());
  	//emit hideMe();
  }
--- 174,195 ----
  // preview job failed here...
  void PanelPopup::failedToView( const KFileItem* ) {
! 	dataLine->setText("Preview:");
     dynamic_cast<QLabel*>( stack->widget( Preview ) ) ->setText( i18n( "No preview available" ) );
  }
  
+ // ------------------- tree
+ 
  void PanelPopup::treeSelection(QListViewItem*) {
  	emit selection(tree->currentURL());
  	//emit hideMe();
  }
+ 
+ // ------------------- quick panel
+ 
+ void PanelPopup::quickSelect() {
+ 	SLOTS->markGroup(quickSelectEdit->text(), true);
+ }
+ 
+ void PanelPopup::quickSelect(const QString &mask) {
+ 	SLOTS->markGroup(mask, true);
+ }

[Krusader-commits] krusader_kde3 ChangeLog,1.270,1.271

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

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

Modified Files:
	ChangeLog 
Log Message:
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.270
retrieving revision 1.271
diff -C2 -d -r1.270 -r1.271
*** ChangeLog	31 Jul 2004 21:59:19 -0000	1.270
--- ChangeLog	31 Jul 2004 22:53:03 -0000	1.271
***************
*** 1,6 ****
  ======================
      ADDED: 3rd hand: look n feel changed to fit krusader
! 	 ADDED: credit for jonas in the about box
! 	 ADDED: panels now save the tabs at shutdown (thanks to Donat Martin)
      ADDED: dropping URL-s onto the status / totals line
      ADDED: Bosnian translation
--- 1,7 ----
  ======================
+     ADDED: 3rd hand: new panel that does quick selection
      ADDED: 3rd hand: look n feel changed to fit krusader
!     ADDED: credit for jonas in the about box
!     ADDED: panels now save the tabs at shutdown (thanks to Donat Martin)
      ADDED: dropping URL-s onto the status / totals line
      ADDED: Bosnian translation

[Krusader-commits] krusader_kde3/krusader krslots.cpp,1.56,1.57

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

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

Modified Files:
	krslots.cpp 
Log Message:
add: support for quick selection of files without dialog 

Index: krslots.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krslots.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** krslots.cpp	27 Jul 2004 22:33:22 -0000	1.56
--- krslots.cpp	31 Jul 2004 22:52:39 -0000	1.57
***************
*** 272,275 ****
--- 272,276 ----
  void KRslots::unmarkAll()       { ACTIVE_PANEL->select(false,true);          }
  void KRslots::markGroup()       { ACTIVE_PANEL->select(true,false);          }
+ void KRslots::markGroup(const QString& mask, bool select) { ACTIVE_PANEL->select(mask, select); }
  void KRslots::unmarkGroup()     { ACTIVE_PANEL->select(false,false);         }
  void KRslots::invert()          { ACTIVE_PANEL->invertSelection();           }

[Krusader-commits] krusader_kde3/krusader/Panel listpanel.cpp,1.82,1.83

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

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

Modified Files:
	listpanel.cpp 
Log Message:
add: support for quick selection of files without dialog 

Index: listpanel.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.cpp,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -d -r1.82 -r1.83
*** listpanel.cpp	31 Jul 2004 21:58:59 -0000	1.82
--- listpanel.cpp	31 Jul 2004 22:52:00 -0000	1.83
***************
*** 343,346 ****
--- 343,355 ----
  }
  
+ void ListPanel::select(QString mask, bool select) {
+ 	if (mask != QString::null) {
+ 		if ( select )
+          view->select( mask );
+       else
+          view->unselect( mask );
+ 	}
+ }
+ 
  void ListPanel::select( bool select, bool all ) {
     if ( all )

[Krusader-commits] krusader_kde3/krusader/Panel listpanel.h,1.24,1.25

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

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

Modified Files:
	listpanel.h 
Log Message:
add: support for quick selection of files without dialog 

Index: listpanel.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** listpanel.h	29 Jul 2004 22:03:39 -0000	1.24
--- listpanel.h	31 Jul 2004 22:51:41 -0000	1.25
***************
*** 91,95 ****
     void gotStats( const QString &mountPoint, unsigned long kBSize, unsigned long kBUsed, unsigned long kBAvail); // displays filesystem status
     void popRightClickMenu( const QPoint& );
!    void select( bool, bool );      // see doc in ListPanel
     void invertSelection();       // see doc in ListPanel
     void slotFocusOnMe(); // give this VFS the focus (the path bar)
--- 91,96 ----
     void gotStats( const QString &mountPoint, unsigned long kBSize, unsigned long kBUsed, unsigned long kBAvail); // displays filesystem status
     void popRightClickMenu( const QPoint& );
!    void select(QString mask, bool select);
! 	void select( bool, bool );      // see doc in ListPanel
     void invertSelection();       // see doc in ListPanel
     void slotFocusOnMe(); // give this VFS the focus (the path bar)

[Krusader-commits] krusader_kde3/krusader krslots.h,1.24,1.25

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

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

Modified Files:
	krslots.h 
Log Message:
add: support for quick selection without dialog 

Index: krslots.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krslots.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** krslots.h	23 Jul 2004 23:41:18 -0000	1.24
--- krslots.h	31 Jul 2004 22:51:05 -0000	1.25
***************
*** 75,78 ****
--- 75,79 ----
      void unmarkAll();
      void markGroup();
+ 	 void markGroup(const QString &, bool select);
      void unmarkGroup();
      void invert();

[Krusader-commits] krusader_kde3 ChangeLog,1.269,1.270

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

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

Modified Files:
	ChangeLog 
Log Message:
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.269
retrieving revision 1.270
diff -C2 -d -r1.269 -r1.270
*** ChangeLog	29 Jul 2004 20:51:00 -0000	1.269
--- ChangeLog	31 Jul 2004 21:59:19 -0000	1.270
***************
*** 1,4 ****
  ======================
!     ADDED: credit for jonas in the about box
  	 ADDED: panels now save the tabs at shutdown (thanks to Donat Martin)
      ADDED: dropping URL-s onto the status / totals line
--- 1,5 ----
  ======================
!     ADDED: 3rd hand: look n feel changed to fit krusader
! 	 ADDED: credit for jonas in the about box
  	 ADDED: panels now save the tabs at shutdown (thanks to Donat Martin)
      ADDED: dropping URL-s onto the status / totals line

[Krusader-commits] krusader_kde3/krusader/Panel listpanel.cpp,1.81,1.82

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

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

Modified Files:
	listpanel.cpp 
Log Message:
 

Index: listpanel.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.cpp,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -d -r1.81 -r1.82
*** listpanel.cpp	31 Jul 2004 21:01:07 -0000	1.81
--- listpanel.cpp	31 Jul 2004 21:58:59 -0000	1.82
***************
*** 269,278 ****
  			dynamic_cast<QSplitter*>(popup->parent())->setSizes(popupSizes);
  		popup->show();
! 		popupBtn->setPixmap(krLoader->loadIcon("down", KIcon::Panel));
  	} else {
  		popupSizes.clear();
  		popupSizes = dynamic_cast<QSplitter*>(popup->parent())->sizes();
  		popup->hide();
! 		popupBtn->setPixmap(krLoader->loadIcon("up", KIcon::Panel));
  		// ugly hack. resize the splitter since it won't do so itself
  		QValueList<int> lst;
--- 269,278 ----
  			dynamic_cast<QSplitter*>(popup->parent())->setSizes(popupSizes);
  		popup->show();
! 		popupBtn->setPixmap(krLoader->loadIcon("down", KIcon::Toolbar, 16));
  	} else {
  		popupSizes.clear();
  		popupSizes = dynamic_cast<QSplitter*>(popup->parent())->sizes();
  		popup->hide();
! 		popupBtn->setPixmap(krLoader->loadIcon("up", KIcon::Toolbar, 16));
  		// ugly hack. resize the splitter since it won't do so itself
  		QValueList<int> lst;

[Krusader-commits] krusader_kde3/krusader/Panel panelpopup.cpp,1.3,1.4

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

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

Modified Files:
	panelpopup.cpp 
Log Message:
3rd hand: look n feel changed to fit krusader 

Index: panelpopup.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelpopup.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** panelpopup.cpp	27 Jul 2004 22:34:43 -0000	1.3
--- panelpopup.cpp	31 Jul 2004 21:58:38 -0000	1.4
***************
*** 4,7 ****
--- 4,9 ----
  #include <kdebug.h>
  
+ 
+ #include <qbuttongroup.h>
  #include <kfiletreeview.h>
  #include <klocale.h>
***************
*** 14,29 ****
  #include <kmultitabbar.h>
  #include "../kicons.h"
! 
  
  PanelPopup::PanelPopup( QWidget *parent ) : QWidget( parent ), stack( 0 ), viewer( 0 ), pjob( 0 ) {
!    QVBoxLayout * layout = new QVBoxLayout( this );
! 
!    // create the button bar
!    tabbar = new KMultiTabBar( KMultiTabBar::Horizontal, this );
!    tabbar->appendTab( krLoader->loadIcon( "view_tree", KIcon::Panel ), Tree, "Tree" );
!    connect( tabbar->tab( Tree ), SIGNAL( clicked( int ) ), this, SLOT( tabSelected( int ) ) );
!    tabbar->appendTab( krLoader->loadIcon( "folder_image", KIcon::Panel ), Preview, "Preview" );
!    connect( tabbar->tab( Preview ), SIGNAL( clicked( int ) ), this, SLOT( tabSelected( int ) ) );
! 
     // create a widget stack on which to put the parts
     stack = new QWidgetStack( this );
--- 16,63 ----
  #include <kmultitabbar.h>
  #include "../kicons.h"
! #include "../Dialogs/krsqueezedtextlabel.h"
! #include "../defaults.h"
  
  PanelPopup::PanelPopup( QWidget *parent ) : QWidget( parent ), stack( 0 ), viewer( 0 ), pjob( 0 ) {
!    QGridLayout * layout = new QGridLayout(this, 1, 1);
! 	
! 	// create the label+buttons setup
! 	dataLine = new KrSqueezedTextLabel(this);
! 	dataLine->setText("blah blah");
! 	krConfig->setGroup( "Look&Feel" );
!    dataLine->setFont( krConfig->readFontEntry( "Filelist Font", _FilelistFont ) );
!    // --- hack: setup colors to be the same as an inactive panel
! 	dataLine->setBackgroundMode( PaletteBackground );
! 	QPalette q( dataLine->palette() );
!    q.setColor( QColorGroup::Foreground, KGlobalSettings::textColor() );
!    q.setColor( QColorGroup::Background, KGlobalSettings::baseColor() );
!    dataLine->setPalette( q );
!    dataLine->setFrameStyle( QFrame::Box | QFrame::Raised );
!    dataLine->setLineWidth( 1 );		// a nice 3D touch :-)
!    int sheight = QFontMetrics( dataLine->font() ).height() + 4;
!    dataLine->setMaximumHeight( sheight );
! 	
! 	btns = new QButtonGroup(this);
! 	btns->setExclusive(true);
! 	btns->hide();	// it should be invisible
! 	connect(btns, SIGNAL(clicked(int)), this, SLOT(tabSelected(int)));
! 	
! 	treeBtn = new QToolButton(this);
! 	treeBtn->setPixmap(krLoader->loadIcon( "view_tree", KIcon::Toolbar, 16 ));
! 	treeBtn->setFixedSize(20, 20);
! 	treeBtn->setToggleButton(true);
! 	btns->insert(treeBtn, Tree);
! 	
! 	
! 	previewBtn = new QToolButton(this);
! 	previewBtn->setPixmap(krLoader->loadIcon( "folder_image", KIcon::Toolbar, 16 ));
! 	previewBtn->setFixedSize(20, 20);
! 	previewBtn->setToggleButton(true);
! 	btns->insert(previewBtn, Preview);
! 	
! 	layout->addWidget(dataLine,0,0);
! 	layout->addWidget(treeBtn,0,1);
! 	layout->addWidget(previewBtn,0,2);
! 	
     // create a widget stack on which to put the parts
     stack = new QWidgetStack( this );
***************
*** 47,56 ****
     stack->addWidget( viewer, Preview );
  
!    layout->addWidget( tabbar );
!    layout->addWidget( stack );
! 
     // raise the tree part
!    tabbar->setTab( Tree, true );
!    stack->raiseWidget( Tree );
  }
  
--- 81,89 ----
     stack->addWidget( viewer, Preview );
  
! 	layout->addMultiCellWidget(stack,1,1,0,2);
! 	
     // raise the tree part
! 	treeBtn->setOn(true);
! 	tabSelected(Tree);
  }
  
***************
*** 58,65 ****
  
  void PanelPopup::tabSelected( int id ) {
- 	// unraise all tabs except selected one and raise the widget
-    for ( int i = Tree; i < Last; ++i )
-       tabbar->setTab( i, ( i == id ) );
     stack->raiseWidget( id );
  }
  
--- 91,101 ----
  
  void PanelPopup::tabSelected( int id ) {
     stack->raiseWidget( id );
+ 	// if tab is tree, set something logical in the data line
+ 	switch (id) {
+ 		case Tree:
+ 			dataLine->setText("Tree:");
+ 			break;
+ 	}
  }
  
***************
*** 82,85 ****
--- 118,122 ----
           if ( pjob ) // stop running jobs
              delete pjob;
+ 			dynamic_cast<QLabel*>( stack->widget( Preview ) ) ->setText( i18n( "Please wait..." ) );
           pjob = new KIO::PreviewJob( lst, stack->width(), stack->height(), stack->width(), 1, true, true, 0 );
           connect( pjob, SIGNAL( gotPreview( const KFileItem*, const QPixmap& ) ),
***************
*** 95,104 ****
  
  // called when the preview job got something for us
! void PanelPopup::view( const KFileItem*, const QPixmap& pix ) {
!    dynamic_cast<QLabel*>( stack->widget( Preview ) ) ->setPixmap( pix );
  }
  
  // preview job failed here...
  void PanelPopup::failedToView( const KFileItem* ) {
     dynamic_cast<QLabel*>( stack->widget( Preview ) ) ->setText( i18n( "No preview available" ) );
  }
--- 132,143 ----
  
  // called when the preview job got something for us
! void PanelPopup::view( const KFileItem *kfi, const QPixmap& pix ) {
!    dataLine->setText(i18n("Preview: ") + kfi->name());
! 	dynamic_cast<QLabel*>( stack->widget( Preview ) ) ->setPixmap( pix );
  }
  
  // preview job failed here...
  void PanelPopup::failedToView( const KFileItem* ) {
+ 	dataLine->setText("");
     dynamic_cast<QLabel*>( stack->widget( Preview ) ) ->setText( i18n( "No preview available" ) );
  }

[Krusader-commits] krusader_kde3/krusader/Panel panelpopup.h,1.1,1.2

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

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

Modified Files:
	panelpopup.h 
Log Message:
3rd hand: look n feel changed to fit krusader 

Index: panelpopup.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelpopup.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** panelpopup.h	23 Jul 2004 23:40:39 -0000	1.1
--- panelpopup.h	31 Jul 2004 21:58:13 -0000	1.2
***************
*** 9,17 ****
  
  
  class QLabel;
  class QWidgetStack;
  class QListViewItem;
- class KMultiTabBar;
  class KFileTreeView;
  
  class PanelPopup: public QWidget {
--- 9,19 ----
  
  
+ class QButtonGroup;
  class QLabel;
  class QWidgetStack;
  class QListViewItem;
  class KFileTreeView;
+ class QToolButton;
+ class KrSqueezedTextLabel;
  
  class PanelPopup: public QWidget {
***************
*** 38,44 ****
     QWidgetStack *stack;
  	QLabel *viewer;
  	QGuardedPtr<KIO::PreviewJob> pjob;
- 	KMultiTabBar *tabbar;
  	KFileTreeView *tree;
  };
  
--- 40,48 ----
     QWidgetStack *stack;
  	QLabel *viewer;
+ 	KrSqueezedTextLabel *dataLine;
  	QGuardedPtr<KIO::PreviewJob> pjob;
  	KFileTreeView *tree;
+ 	QToolButton *treeBtn, *previewBtn;
+ 	QButtonGroup *btns;
  };
  

[Krusader-commits] krusader_kde3/krusader/Panel listpanel.cpp,1.80,1.81

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

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

Modified Files:
	listpanel.cpp 
Log Message:
look'n'feel updates 

Index: listpanel.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.cpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -d -r1.80 -r1.81
*** listpanel.cpp	29 Jul 2004 22:04:19 -0000	1.80
--- listpanel.cpp	31 Jul 2004 21:01:07 -0000	1.81
***************
*** 150,155 ****
  	// a quick button to open the popup panel
  	popupBtn = new QToolButton( this, "popupbtn" );
!    popupBtn->setFixedSize( 20, totals ->height() );
! 	popupBtn->setPixmap(krLoader->loadIcon("up", KIcon::Panel));
  	connect(popupBtn, SIGNAL(clicked()), this, SLOT(togglePanelPopup()));
  	QToolTip::add(  popupBtn, i18n( "Open the popup panel" ) );
--- 150,155 ----
  	// a quick button to open the popup panel
  	popupBtn = new QToolButton( this, "popupbtn" );
!    popupBtn->setFixedSize( 20, 20 );
! 	popupBtn->setPixmap(krLoader->loadIcon("up", KIcon::Toolbar, 16));
  	connect(popupBtn, SIGNAL(clicked()), this, SLOT(togglePanelPopup()));
  	QToolTip::add(  popupBtn, i18n( "Open the popup panel" ) );

[Krusader-commits] krusader_kde3/krusader/VFS normal_vfs.cpp,1.29,1.30 normal_vfs.h,1.14,1.15 vfs.h,1.14,1.15

[Rafi Y. <ya...@us...>]

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

Modified Files:
	normal_vfs.cpp normal_vfs.h vfs.h 
Log Message:
added vfs_setQuiet(bool) API

Index: normal_vfs.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/normal_vfs.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** normal_vfs.cpp	30 Jul 2004 11:05:40 -0000	1.29
--- normal_vfs.cpp	30 Jul 2004 14:16:17 -0000	1.30
***************
*** 69,79 ****
  
  bool normal_vfs::vfs_refresh(const KURL& origin){
!   QString path = origin.path(-1);
  	
  	// check that the new origin exists
  	if ( !QDir(path).exists() ) return false;
      
!   krConfig->setGroup("Advanced");
!   if (krConfig->readBoolEntry("AutoMount",_AutoMount)) krMtMan.autoMount(path);
     	
  	watcher.stopScan(); //stop watching the old dir
--- 69,79 ----
  
  bool normal_vfs::vfs_refresh(const KURL& origin){
! 	QString path = origin.path(-1);
  	
  	// check that the new origin exists
  	if ( !QDir(path).exists() ) return false;
      
! 	krConfig->setGroup("Advanced");
! 	if (krConfig->readBoolEntry("AutoMount",_AutoMount)) krMtMan.autoMount(path);
     	
  	watcher.stopScan(); //stop watching the old dir
***************
*** 86,90 ****
  	isWritable = true;
  	
!  	krConfig->setGroup("Look&Feel");
  	bool hidden = krConfig->readBoolEntry("Show Hidden",_ShowHidden);
  	krConfig->setGroup("General");
--- 86,90 ----
  	isWritable = true;
  	
! 	krConfig->setGroup("Look&Feel");
  	bool hidden = krConfig->readBoolEntry("Show Hidden",_ShowHidden);
  	krConfig->setGroup("General");
***************
*** 93,97 ****
  	// set the origin...
    vfs_origin = origin;
!   vfs_origin.setProtocol("file"); // do not remove !
  	vfs_origin.cleanPath();
    // clear the the list
--- 93,97 ----
  	// set the origin...
    vfs_origin = origin;
! 	vfs_origin.setProtocol("file"); // do not remove !
  	vfs_origin.cleanPath();
    // clear the the list
***************
*** 99,109 ****
  	
  	DIR* dir = opendir(path.local8Bit());
!   if(!dir) return false;
  
    // change directory to the new directory
!   if (chdir(path.local8Bit()) != 0) {
!   		KMessageBox::error(krApp, i18n("Access denied to")+path, i18n("Error"));
  		return false;
!   }
  
  	struct dirent* dirEnt;
--- 99,109 ----
  	
  	DIR* dir = opendir(path.local8Bit());
! 	if(!dir) return false;
  
    // change directory to the new directory
! 	if (chdir(path.local8Bit()) != 0) {
! 		if( !quietMode ) KMessageBox::error(krApp, i18n("Access denied to")+path, i18n("Error"));
  		return false;
! 	}
  
  	struct dirent* dirEnt;
***************
*** 270,273 ****
--- 270,278 ----
  
  void normal_vfs::vfs_slotDirty(const QString& path){ 
+ 	if( quietMode ){
+ 		dirty = true;
+ 		return;
+ 	}
+ 	
  	KURL url = fromPathOrURL(path);
  	if( url.equals(vfs_getOrigin()) ){
***************
*** 290,293 ****
--- 295,303 ----
  
  void normal_vfs::vfs_slotCreated(const QString& path){  
+ 	if( quietMode ){
+ 		dirty = true;
+ 		return;
+ 	}	
+ 	
  	KURL url = fromPathOrURL(path);
  	QString name = url.fileName();	
***************
*** 302,305 ****
--- 312,320 ----
  
  void normal_vfs::vfs_slotDeleted(const QString& path){ 
+ 	if( quietMode ){
+ 		dirty = true;
+ 		return;
+ 	}
+ 	
  	KURL url = fromPathOrURL(path);
  	QString name = url.fileName();
***************
*** 312,314 ****
--- 327,339 ----
  }
  
+ void normal_vfs::vfs_setQuiet(bool beQuiet){ 
+ 	if( beQuiet ){
+ 		dirty = false;
+ 		quietMode=beQuiet;
+ 	} else {
+ 		quietMode=beQuiet;
+ 		if( dirty ) vfs::vfs_refresh();
+ 	} 
+ }
+ 
  #include "normal_vfs.moc"

Index: normal_vfs.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/normal_vfs.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** normal_vfs.h	25 Jul 2004 21:01:13 -0000	1.14
--- normal_vfs.h	30 Jul 2004 14:16:17 -0000	1.15
***************
*** 77,84 ****
--- 77,86 ----
  	void vfs_slotCreated(const QString& path);
  	void vfs_slotDeleted(const QString& path);
+ 	void vfs_setQuiet(bool beQuiet);
  
  protected:
  	QDict<vfile>  vfs_files;    //< List of pointers to vfile	
  	KDirWatch watcher;          //< The internal dir watcher - use to detect changes in directories
+ 	bool dirty;                 //< true if a watcher signal arrived while in quiet mode.
  	vfile* vfileFromName(const QString& name,bool mimeTypeMagic);
  };

Index: vfs.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/vfs.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** vfs.h	25 Jul 2004 22:59:12 -0000	1.14
--- vfs.h	30 Jul 2004 14:16:17 -0000	1.15
***************
*** 105,108 ****
--- 105,109 ----
  	virtual bool vfs_refresh(KIO::Job* job);
  	virtual bool vfs_refresh(){ return vfs_refresh(vfs_getOrigin()); }
+ 	virtual void vfs_setQuiet(bool beQuiet){ quietMode=beQuiet; }
  
  signals: 	

[Krusader-commits] krusader_kde3 Krusader.kdevelop,1.21,1.22

[Rafi Y. <ya...@us...>]

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

Modified Files:
	Krusader.kdevelop 
Log Message:
added vfs_setQuiet(bool) API

Index: Krusader.kdevelop
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/Krusader.kdevelop,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Krusader.kdevelop	23 Jul 2004 23:41:18 -0000	1.21
--- Krusader.kdevelop	30 Jul 2004 14:16:18 -0000	1.22
***************
*** 151,158 ****
        <headerCompletionDelay>250</headerCompletionDelay>
      </codecompletion>
!     <references>
!       <pcs>Qt</pcs>
!       <pcs>KDElibs</pcs>
!     </references>
    </kdevcppsupport>
    <kdevcvsservice>
--- 151,155 ----
        <headerCompletionDelay>250</headerCompletionDelay>
      </codecompletion>
!     <references/>
    </kdevcppsupport>
    <kdevcvsservice>

[Krusader-commits] krusader_kde3/krusader/VFS normal_vfs.cpp,1.28,1.29

[Rafi Y. <ya...@us...>]

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

Modified Files:
	normal_vfs.cpp 
Log Message:
Fix: double files in slotCreated()

Index: normal_vfs.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/normal_vfs.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** normal_vfs.cpp	25 Jul 2004 21:01:13 -0000	1.28
--- normal_vfs.cpp	30 Jul 2004 11:05:40 -0000	1.29
***************
*** 292,295 ****
--- 292,299 ----
  	KURL url = fromPathOrURL(path);
  	QString name = url.fileName();	
+ 	// if it's in the CVS - it's an update not new file
+ 	if( vfs_search(name) )
+ 		return vfs_slotDirty(path);
+ 	
  	vfile* vf = vfileFromName(name,true);
  	addToList(vf);
***************
*** 301,304 ****
--- 305,309 ----
  	QString name = url.fileName();
  	
+ 	// if it's not in the CVS - do nothing
  	if( vfs_search(name) ){
  		emit deletedVfile(name);

[Krusader-commits] krusader_kde3/krusader/Panel listpanel.cpp,1.79,1.80

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

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

Modified Files:
	listpanel.cpp 
Log Message:
fix: splitter doesn't resize the view when popup is hidden 

Index: listpanel.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** listpanel.cpp	29 Jul 2004 20:50:12 -0000	1.79
--- listpanel.cpp	29 Jul 2004 22:04:19 -0000	1.80
***************
*** 227,240 ****
     connect( this, SIGNAL( cmdLineUpdate( QString ) ), SLOTS, SLOT( slotCurrentChanged( QString ) ) );
     connect( this, SIGNAL( activePanelChanged( ListPanel * ) ), SLOTS, SLOT( slotSetActivePanel( ListPanel * ) ) );
! 
  	// add a popup
  	popup = new PanelPopup(splt);
- #if 0	
- 	// set initial size to be 1/3 of the panel's height
- 	QValueList<int> sizes;
- 	sizes.append(height()/2); sizes.append(height()/2);
- 	kdWarning()<<sizes[0]<<"--"<<sizes[1]<<"--"<<this->height()<<endl;
- 	splt->setSizes(sizes); 
- #endif	
  	connect(popup, SIGNAL(selection(const KURL&)), SLOTS, SLOT(refresh(const KURL&)));
  	connect(popup, SIGNAL(hideMe()), this, SLOT(togglePanelPopup()));
--- 227,233 ----
     connect( this, SIGNAL( cmdLineUpdate( QString ) ), SLOTS, SLOT( slotCurrentChanged( QString ) ) );
     connect( this, SIGNAL( activePanelChanged( ListPanel * ) ), SLOTS, SLOT( slotSetActivePanel( ListPanel * ) ) );
! 	
  	// add a popup
  	popup = new PanelPopup(splt);
  	connect(popup, SIGNAL(selection(const KURL&)), SLOTS, SLOT(refresh(const KURL&)));
  	connect(popup, SIGNAL(hideMe()), this, SLOT(togglePanelPopup()));
***************
*** 272,280 ****
--- 265,282 ----
  void ListPanel::togglePanelPopup() {
  	if (popup->isHidden()) {
+ 		// ugly hack. resize the splitter since it won't do so itself
+ 		if (popupSizes.count() > 0)
+ 			dynamic_cast<QSplitter*>(popup->parent())->setSizes(popupSizes);
  		popup->show();
  		popupBtn->setPixmap(krLoader->loadIcon("down", KIcon::Panel));
  	} else {
+ 		popupSizes.clear();
+ 		popupSizes = dynamic_cast<QSplitter*>(popup->parent())->sizes();
  		popup->hide();
  		popupBtn->setPixmap(krLoader->loadIcon("up", KIcon::Panel));
+ 		// ugly hack. resize the splitter since it won't do so itself
+ 		QValueList<int> lst;
+ 		lst << height() << 0;
+ 		dynamic_cast<QSplitter*>(popup->parent())->setSizes(lst);
  	}
  }

[Krusader-commits] krusader_kde3/krusader/Panel listpanel.h,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-serv5836/krusader/Panel

Modified Files:
	listpanel.h 
Log Message:
fix: splitter doesn't resize the view when popup is hidden 

Index: listpanel.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** listpanel.h	29 Jul 2004 17:08:06 -0000	1.23
--- listpanel.h	29 Jul 2004 22:03:39 -0000	1.24
***************
*** 162,165 ****
--- 162,166 ----
  private:
     bool &_left;
+ 	QValueList<int> popupSizes;
  };
  

[Krusader-commits] krusader_kde3/krusader main.cpp,1.30,1.31

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

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

Modified Files:
	main.cpp 
Log Message:
credit for jonas 

Index: main.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/main.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** main.cpp	29 Jul 2004 17:18:48 -0000	1.30
--- main.cpp	29 Jul 2004 20:54:18 -0000	1.31
***************
*** 64,69 ****
    aboutData.addAuthor("Karai Csaba", "Developer", "ck...@us...", 0);
    aboutData.addAuthor("Heiner Eichmann","Developer", "h.e...@gm...", 0);  
    aboutData.addAuthor("Dirk Eschler", "Webmaster and i18n coordinator", "des...@us...", 0);
! 	aboutData.addAuthor("Frank Schoolmeesters", "Documentation Manager", "fra...@fa...", 0);
    aboutData.addCredit("Jan Halasa", "Bookmark Module", "xh...@fi...", 0);
    aboutData.addCredit("Hans Loeffler", "Dir history button", 0, 0);
--- 64,70 ----
    aboutData.addAuthor("Karai Csaba", "Developer", "ck...@us...", 0);
    aboutData.addAuthor("Heiner Eichmann","Developer", "h.e...@gm...", 0);  
+   aboutData.addAuthor("Jonas Baehr", "Developer", "jon...@we...", 0);
    aboutData.addAuthor("Dirk Eschler", "Webmaster and i18n coordinator", "des...@us...", 0);
!   aboutData.addAuthor("Frank Schoolmeesters", "Documentation Manager", "fra...@fa...", 0);
    aboutData.addCredit("Jan Halasa", "Bookmark Module", "xh...@fi...", 0);
    aboutData.addCredit("Hans Loeffler", "Dir history button", 0, 0);

[Krusader-commits] krusader_kde3/krusader krusader.cpp,1.76,1.77

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

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

Modified Files:
	krusader.cpp 
Log Message:
tabs are saved on shutdown 

Index: krusader.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** krusader.cpp	27 Jul 2004 22:37:02 -0000	1.76
--- krusader.cpp	29 Jul 2004 20:53:05 -0000	1.77
***************
*** 1,8 ****
  /***************************************************************************
!                              krusader.cpp
!                           -------------------
!  copyright            : (C) 2000 by Shie Erlich & Rafi Yanai
!  e-mail               : kru...@us...
!  web site             : http://krusader.sourceforge.net
  ---------------------------------------------------------------------------
  Description 
--- 1,8 ----
  /***************************************************************************
[...1294 lines suppressed...]
!    if ( ! QDir( tmpDir ).exists() ) {
!       for ( int i = 1 ; i != -1 ; i = tmpDir.find( '/', i + 1 ) )
!          QDir().mkdir( tmpDir.left( i ) );
!       QDir().mkdir( tmpDir );
!       chmod( tmpDir.local8Bit(), 0777 );
!    }
  
!    // add a secure sub dir under the user UID
!    QString uid;
!    uid.sprintf( "%d", getuid() );
!    QDir( tmpDir ).mkdir( uid );
!    tmpDir = tmpDir + "/" + uid + "/";
!    chmod( tmpDir.local8Bit(), S_IRUSR | S_IWUSR | S_IXUSR );
! 
!    while ( QDir().exists( tmpDir ) )
!       tmpDir = tmpDir + kapp->randomString( 8 );
!    return tmpDir;
! }
  
  

[Krusader-commits] krusader_kde3/krusader panelmanager.cpp,1.12,1.13

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

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

Modified Files:
	panelmanager.cpp 
Log Message:
tabs are saved on shutdown 

Index: panelmanager.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/panelmanager.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** panelmanager.cpp	19 Jul 2004 13:36:29 -0000	1.12
--- panelmanager.cpp	29 Jul 2004 20:52:32 -0000	1.13
***************
*** 4,7 ****
--- 4,8 ----
  #include <qimage.h>
  #include <kdebug.h>
+ #include <kconfig.h>
  #include <kiconloader.h>
  #include "panelmanager.h"
***************
*** 16,159 ****
  PanelManager::PanelManager( QWidget *parent, bool left, ListPanel* &self, ListPanel* &other, ListPanel* &active ) :
  QWidget( parent ), _layout( 0 ), _left( left ), _self( self ), _other( other ), _active( active ) {
!   _layout = new QGridLayout( this, 1, 1 );
!   _stack = new QWidgetStack( this );
  
!   // new tab button
!   _newTab = new QToolButton( this );
!   _newTab->setFixedSize( 22, 22 );
!   _newTab->setTextLabel( i18n( "Open a new tab in home" ) );
!   QImage im = krLoader->loadIcon( "favorites", KIcon::Panel ).convertToImage();
!   _newTab->setPixmap( im.scale( _newTab->height() - 5, _newTab->height() - 5 ) );
!   connect( _newTab, SIGNAL( clicked() ), this, SLOT( slotNewTab() ) );
  
!   // close tab button
!   _closeTab = new QToolButton( this );
!   _closeTab->setFixedSize( 22, 22 );
!   _closeTab->setTextLabel( i18n( "Close current tab" ) );
!   im = krLoader->loadIcon( "cancel", KIcon::Panel ).convertToImage();
!   _closeTab->setPixmap( im.scale( _closeTab->height() - 5, _closeTab->height() - 5 ) );
!   connect( _closeTab, SIGNAL( clicked() ), this, SLOT( slotCloseTab() ) );
!   _closeTab->setEnabled( false ); // disabled when there's only 1 tab
  
!   // tab-bar
!   _tabbar = new PanelTabBar( this );
!   connect( _tabbar, SIGNAL( changePanel( ListPanel* ) ), this, SLOT( slotChangePanel( ListPanel * ) ) );
!   connect( _tabbar, SIGNAL( closeCurrentTab() ), this, SLOT( slotCloseTab() ) );
!   connect( _tabbar, SIGNAL( newTab(QString) ), this, SLOT( slotNewTab(QString) ) );
  
! #if QT_VERSION >= 0x030300
! //#if 0
!   _layout->addMultiCellWidget( _stack, 0, 0, 0, 3 );  // KDE 3.2 bug the tab widget 
!   _layout->addWidget( _newTab, 1, 0 );                // is left justified. A spacer is 
!   _layout->addWidget( _tabbar, 1, 1 );                // inserted to solve the problem.
!   _layout->addItem( new QSpacerItem( 0,0, QSizePolicy::Expanding, QSizePolicy::Minimum), 1, 2 );
!   _layout->addWidget( _closeTab, 1, 3 );
  #else
!   _layout->addMultiCellWidget( _stack, 0, 0, 0, 2 );  // KDE 3.1.1 bug the spacer cannot be
!   _layout->addWidget( _newTab, 1, 0 );                // inserted because it shrinks the tab
!   _layout->addWidget( _tabbar, 1, 1 );                // widget into half size, which is ugly.
!   _layout->addWidget( _closeTab, 1, 2 );              // Does anybody know a universal solution?
  #endif
  
!   if (HIDE_ON_SINGLE_TAB) HIDE
!   else SHOW
! }
  
  void PanelManager::slotChangePanel( ListPanel *p ) {
!   _self = p;
!   _self->otherPanel = _other;
!   _other->otherPanel = _self;
  
!   _stack->raiseWidget( _self );
!   kapp->processEvents();
!   _self->slotFocusOnMe();
  }
  
  ListPanel* PanelManager::createPanel() {
!   // create the panel and add it into the widgetstack
!   ListPanel * p = new ListPanel( _stack, _left );
!   _stack->addWidget( p );
  
!   // now, create the corrosponding tab
!   _tabbar->addPanel( p );
  
!   // allow close button if more than 1 tab
!   if ( _tabbar->count() > 1 ) {
!     _closeTab->setEnabled( true );
!     SHOW // needed if we were hidden
!   }
!   _stack->raiseWidget( p );
  
!   // connect the activePanelChanged signal to enable/disable actions
!   connect(p, SIGNAL(activePanelChanged(ListPanel* )), this, SLOT(slotRefreshActions()));
!   return p;
  }
  
  void PanelManager::startPanel( ListPanel *panel, QString path ) {
!   panel->start( path );
  }
  
  void PanelManager::slotNewTab() {
!   slotNewTab(QDir::home().absPath());
  }
  
! void PanelManager::slotNewTab(QString path) {
!   _self = createPanel();
!   // update left/right pointers
!   _self->otherPanel = _other;
!   _other->otherPanel = _self;
  
!   startPanel( _self, path );
  }
  
  void PanelManager::slotCloseTab() {
!   if ( _tabbar->count() <= 1 ) /* if this is the last tab don't close it */
!     return;
!   
!   // setup current one
!   ListPanel * oldp;
!   _self = _tabbar->removeCurrentPanel( oldp );
!   _stack->raiseWidget( _self );
!   _stack->removeWidget( oldp );
!   delete oldp;
  
!   // setup pointers
!   _self->otherPanel = _other;
!   _other->otherPanel = _self;
!   _self->slotFocusOnMe();
  
!   // disable close button if only 1 tab is left
!   if ( _tabbar->count() == 1 ) {
!     _closeTab->setEnabled( false );
!     if (HIDE_ON_SINGLE_TAB) HIDE
!   }
  }
  
  void PanelManager::slotRefreshActions() {
!   krCloseTab->setEnabled(_tabbar->count() > 1);
  }
  
  void PanelManager::recreatePanels() {
!   int panelCount = _tabbar->count(), identifier = 0;
!   ListPanel *oldCurrent = _self, *newCurrent = 0;
!   
!   while( panelCount -- )
!   {
!     ListPanel *panel = dynamic_cast<PanelTab*>( _tabbar->tabAt( 0 ) )->panel;
!     slotNewTab( panel->virtualPath );
  
!     if( panel == oldCurrent )
!       newCurrent = _self, identifier = _tabbar->currentTab();
  
!     _tabbar->setCurrentTab( _tabbar->tabAt( 0 ) );
!     slotChangePanel( panel );
  
!     slotCloseTab();
!   }
  
!   if( newCurrent )
!   {
!     _tabbar->setCurrentTab( identifier );
!     slotChangePanel( newCurrent );
!   }
  }
--- 17,173 ----
  PanelManager::PanelManager( QWidget *parent, bool left, ListPanel* &self, ListPanel* &other, ListPanel* &active ) :
  QWidget( parent ), _layout( 0 ), _left( left ), _self( self ), _other( other ), _active( active ) {
!    _layout = new QGridLayout( this, 1, 1 );
!    _stack = new QWidgetStack( this );
  
!    // new tab button
!    _newTab = new QToolButton( this );
!    _newTab->setFixedSize( 22, 22 );
!    _newTab->setTextLabel( i18n( "Open a new tab in home" ) );
!    QImage im = krLoader->loadIcon( "favorites", KIcon::Panel ).convertToImage();
!    _newTab->setPixmap( im.scale( _newTab->height() - 5, _newTab->height() - 5 ) );
!    connect( _newTab, SIGNAL( clicked() ), this, SLOT( slotNewTab() ) );
  
!    // close tab button
!    _closeTab = new QToolButton( this );
!    _closeTab->setFixedSize( 22, 22 );
!    _closeTab->setTextLabel( i18n( "Close current tab" ) );
!    im = krLoader->loadIcon( "cancel", KIcon::Panel ).convertToImage();
!    _closeTab->setPixmap( im.scale( _closeTab->height() - 5, _closeTab->height() - 5 ) );
!    connect( _closeTab, SIGNAL( clicked() ), this, SLOT( slotCloseTab() ) );
!    _closeTab->setEnabled( false ); // disabled when there's only 1 tab
  
!    // tab-bar
!    _tabbar = new PanelTabBar( this );
!    connect( _tabbar, SIGNAL( changePanel( ListPanel* ) ), this, SLOT( slotChangePanel( ListPanel * ) ) );
!    connect( _tabbar, SIGNAL( closeCurrentTab() ), this, SLOT( slotCloseTab() ) );
!    connect( _tabbar, SIGNAL( newTab( QString ) ), this, SLOT( slotNewTab( QString ) ) );
  
! #if QT_VERSION >= 0x030300 
!    //#if 0
!    _layout->addMultiCellWidget( _stack, 0, 0, 0, 3 );  // KDE 3.2 bug the tab widget
!    _layout->addWidget( _newTab, 1, 0 );                // is left justified. A spacer is
!    _layout->addWidget( _tabbar, 1, 1 );                // inserted to solve the problem.
!    _layout->addItem( new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum ), 1, 2 );
!    _layout->addWidget( _closeTab, 1, 3 );
  #else
!    _layout->addMultiCellWidget( _stack, 0, 0, 0, 2 );  // KDE 3.1.1 bug the spacer cannot be
!    _layout->addWidget( _newTab, 1, 0 );                // inserted because it shrinks the tab
!    _layout->addWidget( _tabbar, 1, 1 );                // widget into half size, which is ugly.
!    _layout->addWidget( _closeTab, 1, 2 );              // Does anybody know a universal solution?
  #endif
  
!    if ( HIDE_ON_SINGLE_TAB ) HIDE
!       else SHOW
!       }
  
  void PanelManager::slotChangePanel( ListPanel *p ) {
!    _self = p;
!    _self->otherPanel = _other;
!    _other->otherPanel = _self;
  
!    _stack->raiseWidget( _self );
!    kapp->processEvents();
!    _self->slotFocusOnMe();
  }
  
  ListPanel* PanelManager::createPanel() {
!    // create the panel and add it into the widgetstack
!    ListPanel * p = new ListPanel( _stack, _left );
!    _stack->addWidget( p );
  
!    // now, create the corrosponding tab
!    _tabbar->addPanel( p );
  
!    // allow close button if more than 1 tab
!    if ( _tabbar->count() > 1 ) {
!       _closeTab->setEnabled( true );
!       SHOW // needed if we were hidden
!    }
!    _stack->raiseWidget( p );
  
!    // connect the activePanelChanged signal to enable/disable actions
!    connect( p, SIGNAL( activePanelChanged( ListPanel* ) ), this, SLOT( slotRefreshActions() ) );
!    return p;
  }
  
  void PanelManager::startPanel( ListPanel *panel, QString path ) {
!    panel->start( path );
  }
  
+ void PanelManager::saveSettings( KConfig *config, const QString& key ) {
+    QStringList l;
+    int i=0, cnt=0;
+ 	while (cnt < _tabbar->count()) {
+ 		PanelTab *t = dynamic_cast<PanelTab*>(_tabbar->tabAt(i));
+ 		if (t && t->panel) {
+ 			l << t->panel->realPath;
+ 			++cnt;
+ 		}
+ 		++i;
+ 	}
+    config->writePathEntry( key, l );
+ }
+ 
+ 
  void PanelManager::slotNewTab() {
!    slotNewTab( QDir::home().absPath() );
  }
  
! void PanelManager::slotNewTab( QString path ) {
!    _self = createPanel();
!    // update left/right pointers
!    _self->otherPanel = _other;
!    _other->otherPanel = _self;
  
!    startPanel( _self, path );
  }
  
  void PanelManager::slotCloseTab() {
!    if ( _tabbar->count() <= 1 )  /* if this is the last tab don't close it */
!       return ;
  
!    // setup current one
!    ListPanel * oldp;
!    _self = _tabbar->removeCurrentPanel( oldp );
!    _stack->raiseWidget( _self );
!    _stack->removeWidget( oldp );
!    delete oldp;
  
!    // setup pointers
!    _self->otherPanel = _other;
!    _other->otherPanel = _self;
!    _self->slotFocusOnMe();
! 
!    // disable close button if only 1 tab is left
!    if ( _tabbar->count() == 1 ) {
!       _closeTab->setEnabled( false );
!       if ( HIDE_ON_SINGLE_TAB ) HIDE
!       }
  }
  
  void PanelManager::slotRefreshActions() {
!    krCloseTab->setEnabled( _tabbar->count() > 1 );
  }
  
  void PanelManager::recreatePanels() {
!    int panelCount = _tabbar->count(), identifier = 0;
!    ListPanel *oldCurrent = _self, *newCurrent = 0;
  
!    while ( panelCount -- ) {
!       ListPanel * panel = dynamic_cast<PanelTab*>( _tabbar->tabAt( 0 ) ) ->panel;
!       slotNewTab( panel->virtualPath );
  
!       if ( panel == oldCurrent )
!          newCurrent = _self, identifier = _tabbar->currentTab();
  
!       _tabbar->setCurrentTab( _tabbar->tabAt( 0 ) );
!       slotChangePanel( panel );
  
!       slotCloseTab();
!    }
! 
!    if ( newCurrent ) {
!       _tabbar->setCurrentTab( identifier );
!       slotChangePanel( newCurrent );
!    }
  }

[Krusader-commits] krusader_kde3/krusader panelmanager.h,1.7,1.8

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

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

Modified Files:
	panelmanager.h 
Log Message:
tabs are saved on shutdown 

Index: panelmanager.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/panelmanager.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** panelmanager.h	18 Apr 2004 19:25:55 -0000	1.7
--- panelmanager.h	29 Jul 2004 20:51:30 -0000	1.8
***************
*** 6,9 ****
--- 6,10 ----
  #include "paneltabbar.h"
  
+ class KConfig;
  class ListPanel;
  class QWidgetStack;
***************
*** 41,44 ****
--- 42,46 ----
       */
      void swapPanels()             {_left = !_left;}
+ 	 void saveSettings(KConfig *config, const QString& key);
  
    public slots:

[Krusader-commits] krusader_kde3 ChangeLog,1.268,1.269

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

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

Modified Files:
	ChangeLog 
Log Message:
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.268
retrieving revision 1.269
diff -C2 -d -r1.268 -r1.269
*** ChangeLog	29 Jul 2004 17:08:06 -0000	1.268
--- ChangeLog	29 Jul 2004 20:51:00 -0000	1.269
***************
*** 1,3 ****
--- 1,5 ----
  ======================
+     ADDED: credit for jonas in the about box
+ 	 ADDED: panels now save the tabs at shutdown (thanks to Donat Martin)
      ADDED: dropping URL-s onto the status / totals line
      ADDED: Bosnian translation

[Krusader-commits] krusader_kde3/krusader/Panel listpanel.cpp,1.78,1.79

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

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

Modified Files:
	listpanel.cpp 
Log Message:
tabs are saved on shutdown 

Index: listpanel.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** listpanel.cpp	29 Jul 2004 20:05:42 -0000	1.78
--- listpanel.cpp	29 Jul 2004 20:50:12 -0000	1.79
***************
*** 411,415 ****
              virtualPath = krConfig->readEntry( "Left Panel Homepage", _LeftHomepage );
           else if ( krConfig->readEntry( "Left Panel Origin" ) == i18n( "the last place it was" ) )
!             virtualPath = krConfig->readEntry( "lastHomeLeft", "/" );
           else
              virtualPath = getcwd( 0, 0 ); //get_current_dir_name();
--- 411,416 ----
              virtualPath = krConfig->readEntry( "Left Panel Homepage", _LeftHomepage );
           else if ( krConfig->readEntry( "Left Panel Origin" ) == i18n( "the last place it was" ) )
! 				// read the first of the tabbar. lastHomeLeft is obsolete!
! 				virtualPath = (krConfig->readPathListEntry( "LeftTabBar" ))[0];
           else
              virtualPath = getcwd( 0, 0 ); //get_current_dir_name();
***************
*** 418,422 ****
              virtualPath = krConfig->readEntry( "Right Panel Homepage", _RightHomepage );
           else if ( krConfig->readEntry( "Right Panel Origin" ) == i18n( "the last place it was" ) )
!             virtualPath = krConfig->readEntry( "lastHomeRight", "/" );
           else
              virtualPath = getcwd( 0, 0 );
--- 419,424 ----
              virtualPath = krConfig->readEntry( "Right Panel Homepage", _RightHomepage );
           else if ( krConfig->readEntry( "Right Panel Origin" ) == i18n( "the last place it was" ) )
! 				// read the first of the tabbar. lastHomeLeft is obsolete!
! 				virtualPath = (krConfig->readPathListEntry( "RightTabBar" ))[0];
           else
              virtualPath = getcwd( 0, 0 );

[Krusader-commits] krusader_kde3 CVSNEWS,1.4,1.5

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

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

Modified Files:
	CVSNEWS 
Log Message:
 

Index: CVSNEWS
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/CVSNEWS,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CVSNEWS	29 Jul 2004 17:08:05 -0000	1.4
--- CVSNEWS	29 Jul 2004 20:49:33 -0000	1.5
***************
*** 2,5 ****
--- 2,7 ----
  It should contain a brief description of new features;
  in some way an extension to the changelog.
+ ------------------------------------------------------
+ When closing krusader, the tabs are saved and restored
  
  Dropping URL-s onto the status / totals line:

[Krusader-commits] krusader_kde3/krusader/Synchronizer synchronizergui.cpp,1.14,1.15

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

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

Modified Files:
	synchronizergui.cpp 
Log Message:

FIXED: define maximum size of history combos and disabling duplicates


Index: synchronizergui.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Synchronizer/synchronizergui.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** synchronizergui.cpp	26 Jul 2004 18:49:57 -0000	1.14
--- synchronizergui.cpp	29 Jul 2004 20:31:04 -0000	1.15
***************
*** 795,798 ****
--- 795,800 ----
    
    leftLocation = new KHistoryCombo(false, compareDirs, "SynchronizerHistoryLeft");
+   leftLocation->setMaxCount(25);  // remember 25 items
+   leftLocation->setDuplicatesEnabled( false );
    leftLocation->setEditable( true );
    leftLocation->setSizePolicy(QSizePolicy::Ignored,QSizePolicy::Fixed);
***************
*** 807,810 ****
--- 809,814 ----
  
    fileFilter = new KHistoryCombo(false, compareDirs, "SynchronizerFilter");
+   fileFilter->setMaxCount(25);  // remember 25 items
+   fileFilter->setDuplicatesEnabled( false );
    fileFilter->setMinimumWidth( 100 );
    fileFilter->setMaximumWidth( 100 );
***************
*** 817,820 ****
--- 821,826 ----
  
    rightLocation = new KHistoryCombo(compareDirs, "SynchronizerHistoryRight");
+   rightLocation->setMaxCount(25);  // remember 25 items
+   rightLocation->setDuplicatesEnabled( false );
    rightLocation->setEditable( true );
    rightLocation->setSizePolicy(QSizePolicy::Ignored,QSizePolicy::Fixed);

[Krusader-commits] krusader_kde3/krusader/GUI kcmdline.cpp,1.21,1.22

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

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

Modified Files:
	kcmdline.cpp 
Log Message:

FIXED: define maximum size of history combos and disabling duplicates


Index: kcmdline.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/GUI/kcmdline.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** kcmdline.cpp	5 Apr 2004 07:08:47 -0000	1.21
--- kcmdline.cpp	29 Jul 2004 20:31:04 -0000	1.22
***************
*** 73,76 ****
--- 73,77 ----
    cmdLine = new KrHistoryCombo( this );
    cmdLine->setMaxCount(100);  // remember 100 commands
+   cmdLine->setDuplicatesEnabled( false );
    cmdLine->setFont( KGlobalSettings::generalFont() );
    cmdLine->setMaximumHeight( height );