From: Shie E. <er...@us...> - 2004-07-31 22:53:43
|
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); + } |