Menu
▾
▴
krusader-commits
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(98) |
Sep
(138) |
Oct
(100) |
Nov
(49) |
Dec
(131) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(94) |
Feb
(65) |
Mar
(100) |
Apr
(83) |
May
(72) |
Jun
(29) |
Jul
(167) |
Aug
(127) |
Sep
(131) |
Oct
(269) |
Nov
(122) |
Dec
(100) |
| 2005 |
Jan
(228) |
Feb
(266) |
Mar
(63) |
Apr
(135) |
May
(157) |
Jun
(52) |
Jul
(25) |
Aug
(49) |
Sep
(184) |
Oct
(159) |
Nov
(75) |
Dec
(37) |
| 2006 |
Jan
(60) |
Feb
(129) |
Mar
(110) |
Apr
(34) |
May
(31) |
Jun
(42) |
Jul
(72) |
Aug
(90) |
Sep
(57) |
Oct
(66) |
Nov
(42) |
Dec
(90) |
| 2007 |
Jan
(106) |
Feb
(54) |
Mar
(93) |
Apr
(27) |
May
(21) |
Jun
(17) |
Jul
(19) |
Aug
(22) |
Sep
(25) |
Oct
(2) |
Nov
(1) |
Dec
(1) |
| 2008 |
Jan
(65) |
Feb
(70) |
Mar
(29) |
Apr
(45) |
May
(91) |
Jun
(20) |
Jul
(11) |
Aug
(24) |
Sep
(23) |
Oct
(13) |
Nov
(23) |
Dec
(39) |
| 2009 |
Jan
(23) |
Feb
(39) |
Mar
(15) |
Apr
(56) |
May
(5) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Jonas B. <jb...@us...> - 2004-10-07 20:57:52
|
Update of /cvsroot/krusader/krusader_kde3/krusader/GUI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27550/krusader/GUI Modified Files: addplaceholderpopup.cpp addplaceholderpopup.h Log Message: useractions: added the base for %_Profiles("panel-profile")% see Mailing-list "panelprofiles and useractions" Index: addplaceholderpopup.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/GUI/addplaceholderpopup.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** addplaceholderpopup.cpp 7 Oct 2004 20:00:35 -0000 1.7 --- addplaceholderpopup.cpp 7 Oct 2004 20:57:25 -0000 1.8 *************** *** 155,160 **** else if ( currentPlaceholder->parameter( i )->preset() == "__syncprofile" ) _parameter.append( new ParameterSyncprofile( currentPlaceholder->parameter( i ), plainPage() ) ); ! else if ( currentPlaceholder->parameter( i )->preset() == "__search" ) _parameter.append( new ParameterSearch( currentPlaceholder->parameter( i ), plainPage() ) ); else _parameter.append( new ParameterText( currentPlaceholder->parameter( i ), plainPage() ) ); --- 155,162 ---- else if ( currentPlaceholder->parameter( i )->preset() == "__syncprofile" ) _parameter.append( new ParameterSyncprofile( currentPlaceholder->parameter( i ), plainPage() ) ); ! else if ( currentPlaceholder->parameter( i )->preset() == "__searchprofile" ) _parameter.append( new ParameterSearch( currentPlaceholder->parameter( i ), plainPage() ) ); + else if ( currentPlaceholder->parameter( i )->preset() == "__panelprofile" ) + _parameter.append( new ParameterPanelprofile( currentPlaceholder->parameter( i ), plainPage() ) ); else _parameter.append( new ParameterText( currentPlaceholder->parameter( i ), plainPage() ) ); *************** *** 509,510 **** --- 511,538 ---- return true; } + + ///////////// ParameterPanelprofile + ParameterPanelprofile::ParameterPanelprofile( exp_parameter* parameter, QWidget* parent ) : ParameterBase( parameter, parent ) { + QVBoxLayout* layout = new QVBoxLayout( this ); + layout->setAutoAdd( true ); + layout->setSpacing( 6 ); + + new QLabel( parameter->description(), this ); + _combobox = new KComboBox( this ); + + _combobox->insertStringList( ProfileManager::availableProfiles("Panel") ); + } + + QString ParameterPanelprofile::text() { + return _combobox->currentText(); + } + QString ParameterPanelprofile::preset() { + return _combobox->text( 0 ); + } + void ParameterPanelprofile::reset() { + _combobox->setCurrentItem( 0 ); + } + bool ParameterPanelprofile::valid() { + return true; + } + Index: addplaceholderpopup.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/GUI/addplaceholderpopup.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** addplaceholderpopup.h 7 Oct 2004 20:00:35 -0000 1.5 --- addplaceholderpopup.h 7 Oct 2004 20:57:25 -0000 1.6 *************** *** 242,247 **** /** * A ComboBox with all profiles available for the Searchmodule ! * used with default = "__search" */ class ParameterSearch : public ParameterBase { --- 242,262 ---- /** + * A ComboBox with all profiles available for the panels + * used with default = "__panelprofile" + */ + class ParameterPanelprofile : public ParameterBase { + public: + ParameterPanelprofile( exp_parameter* parameter, QWidget* parent ); + QString text(); + QString preset(); + void reset(); + bool valid(); + private: + KComboBox * _combobox; + }; + + /** * A ComboBox with all profiles available for the Searchmodule ! * used with default = "__searchprofile" */ class ParameterSearch : public ParameterBase { |
|
From: Jonas B. <jb...@us...> - 2004-10-07 20:57:39
|
Update of /cvsroot/krusader/krusader_kde3/krusader/UserAction In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27550/krusader/UserAction Modified Files: expander.cpp expander.h Log Message: useractions: added the base for %_Profiles("panel-profile")% see Mailing-list "panelprofiles and useractions" Index: expander.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserAction/expander.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** expander.h 7 Oct 2004 20:00:51 -0000 1.6 --- expander.h 7 Oct 2004 20:57:26 -0000 1.7 *************** *** 188,191 **** --- 188,200 ---- }; + /** + * This loads the panel-profile with a given name + */ + class exp_Profile : public exp_placeholder { + public: + exp_Profile(); + EXP_FUNC; + }; + /** Index: expander.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserAction/expander.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** expander.cpp 7 Oct 2004 20:00:50 -0000 1.10 --- expander.cpp 7 Oct 2004 20:57:25 -0000 1.11 *************** *** 11,15 **** // ! #include <expander.h> #include "../krusader.h" --- 11,15 ---- // ! #include "expander.h" #include "../krusader.h" *************** *** 20,23 **** --- 20,24 ---- #include "../Synchronizer/synchronizergui.h" #include "../Search/krsearchdialog.h" + #include "../GUI/profilemanager.h" #include <kdebug.h> *************** *** 244,249 **** _needPanel = true; ! addParameter( new exp_parameter( i18n("please choose the bookmark"), "__bookmark", true ) ); ! addParameter( new exp_parameter( i18n("open the bookmark in a new tab"), "__no", false ) ); } QString exp_Goto::expFunc( const ListPanel* panel, const QStringList& parameter, const bool&, const int& ) { --- 245,250 ---- _needPanel = true; ! addParameter( new exp_parameter( i18n("please choose a path"), "__goto", true ) ); ! addParameter( new exp_parameter( i18n("open the location in a new tab"), "__no", false ) ); } QString exp_Goto::expFunc( const ListPanel* panel, const QStringList& parameter, const bool&, const int& ) { *************** *** 272,276 **** _needPanel = true; ! addParameter( new exp_parameter( i18n("please choose the setting"), "__search", true ) ); //TODO: add this action as soon as the search supports saving search-settings addParameter( new exp_parameter( i18n("open the search in a new tab"), "__yes", false ) ); //TODO: add this also to panel-dependent as soon as vfs support the display of search-results } --- 273,277 ---- _needPanel = true; ! addParameter( new exp_parameter( i18n("please choose the setting"), "__searchprofile", true ) ); addParameter( new exp_parameter( i18n("open the search in a new tab"), "__yes", false ) ); //TODO: add this also to panel-dependent as soon as vfs support the display of search-results } *************** *** 343,347 **** exp_Sync::exp_Sync() { _expression = "Sync"; ! _description = i18n("Opens a synchronizer-profile"); _needPanel = false; --- 344,348 ---- exp_Sync::exp_Sync() { _expression = "Sync"; ! _description = i18n("Open a synchronizer-profile"); _needPanel = false; *************** *** 361,368 **** exp_NewSearch::exp_NewSearch() { _expression = "NewSearch"; ! _description = i18n("Opens a searchmodule-profile"); _needPanel = false; ! addParameter( new exp_parameter( i18n("Choose a profile"), "__search", true ) ); } QString exp_NewSearch::expFunc( const ListPanel*, const QStringList& parameter, const bool&, const int& ) { --- 362,369 ---- exp_NewSearch::exp_NewSearch() { _expression = "NewSearch"; ! _description = i18n("Open a searchmodule-profile"); _needPanel = false; ! addParameter( new exp_parameter( i18n("Choose a profile"), "__searchprofile", true ) ); } QString exp_NewSearch::expFunc( const ListPanel*, const QStringList& parameter, const bool&, const int& ) { *************** *** 377,380 **** --- 378,400 ---- } + exp_Profile::exp_Profile() { + _expression = "Profile"; + _description = i18n("Load a panel-profile"); + _needPanel = false; + + addParameter( new exp_parameter( i18n("Choose a profile"), "__panelprofile", true ) ); + } + QString exp_Profile::expFunc( const ListPanel*, const QStringList& parameter, const bool&, const int& ) { + if ( parameter[0].isEmpty() ) { + kdWarning() << "Expander: no profile specified for %_Profile(profile)%; ignoring..." << endl; + return QString::null; + } + + kdDebug() << "Panelprofiles are not working yet through UserActions." << endl; + // krProfileManager->loadByName( parameter[0] ); + + return QString::null; // this doesn't return everything, that's normal! + } + ///////////////////////////////////////////////////////////////////////////////////////////////// *************** *** 399,402 **** --- 419,423 ---- addPlaceholder( new exp_Sync() ); addPlaceholder( new exp_NewSearch() ); + addPlaceholder( new exp_Profile() ); // addPlaceholder( new exp_Run() ); } |
|
From: Jonas B. <jb...@us...> - 2004-10-07 20:01:31
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Search In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11858/krusader/Search Modified Files: krsearchdialog.cpp krsearchdialog.h Log Message: ADDED: useraction: new Placeholder %_NewSearch("search-profile")% Index: krsearchdialog.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Search/krsearchdialog.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** krsearchdialog.cpp 7 Oct 2004 13:23:08 -0000 1.31 --- krsearchdialog.cpp 7 Oct 2004 20:00:35 -0000 1.32 *************** *** 61,65 **** // class starts here ///////////////////////////////////////// ! KrSearchDialog::KrSearchDialog( QWidget* parent, const char* name, bool modal, WFlags fl ) : QDialog( parent, name, modal, fl ), query(0), searcher(0) { --- 61,65 ---- // class starts here ///////////////////////////////////////// ! KrSearchDialog::KrSearchDialog( QString profile, QWidget* parent, const char* name, bool modal, WFlags fl ) : QDialog( parent, name, modal, fl ), query(0), searcher(0) { *************** *** 108,122 **** searcherTabs->insertTab( advancedFilter, i18n( "&Advanced" ) ); - // load the last used values - generalFilter->searchFor->setEditText( lastSearchText ); - generalFilter->searchFor->lineEdit()->selectAll(); - generalFilter->ofType->setCurrentItem( lastSearchType ); - generalFilter->searchForCase->setChecked( lastSearchForCase ); - generalFilter->containsWholeWord->setChecked( lastContainsWholeWord ); - generalFilter->containsTextCase->setChecked( lastContainsWithCase ); - generalFilter->searchInDirs->setChecked( lastSearchInSubDirs ); - generalFilter->searchInArchives->setChecked( lastSearchInArchives ); - generalFilter->followLinks->setChecked( lastFollowSymLinks ); - resultTab = new QWidget( searcherTabs, "resultTab" ); resultLayout = new QGridLayout( resultTab ); --- 108,111 ---- *************** *** 204,212 **** setTabOrder( mainStopBtn, searcherTabs ); setTabOrder( searcherTabs, resultsList ); ! ! // the path in the active panel should be the default search location ! QString path = ACTIVE_PANEL->getPath(); ! generalFilter->searchInEdit->setText(path); ! krConfig->setGroup( "Search" ); int sx = krConfig->readNumEntry( "Window Width", -1 ); --- 193,197 ---- setTabOrder( mainStopBtn, searcherTabs ); setTabOrder( searcherTabs, resultsList ); ! krConfig->setGroup( "Search" ); int sx = krConfig->readNumEntry( "Window Width", -1 ); *************** *** 226,229 **** --- 211,233 ---- isSearching = closed = false; + + // finaly, load a profile of apply defaults: + + if ( profile.isEmpty() ) { + // load the last used values + generalFilter->searchFor->setEditText( lastSearchText ); + generalFilter->searchFor->lineEdit()->selectAll(); + generalFilter->ofType->setCurrentItem( lastSearchType ); + generalFilter->searchForCase->setChecked( lastSearchForCase ); + generalFilter->containsWholeWord->setChecked( lastContainsWholeWord ); + generalFilter->containsTextCase->setChecked( lastContainsWithCase ); + generalFilter->searchInDirs->setChecked( lastSearchInSubDirs ); + generalFilter->searchInArchives->setChecked( lastSearchInArchives ); + generalFilter->followLinks->setChecked( lastFollowSymLinks ); + generalFilter->searchInEdit->setText( ACTIVE_PANEL->getPath() ); // the path in the active panel should be the default search location + } + else + profileManager->loadByName( profile ); // important: call this _after_ you've connected profileManager ot the loadFromProfile!! + } Index: krsearchdialog.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Search/krsearchdialog.h,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** krsearchdialog.h 2 Oct 2004 16:05:42 -0000 1.14 --- krsearchdialog.h 7 Oct 2004 20:00:50 -0000 1.15 *************** *** 53,57 **** Q_OBJECT public: ! KrSearchDialog(QWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); void prepareGUI(); --- 53,57 ---- Q_OBJECT public: ! KrSearchDialog(QString profile = 0, QWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); void prepareGUI(); |
|
From: Jonas B. <jb...@us...> - 2004-10-07 20:01:19
|
Update of /cvsroot/krusader/krusader_kde3/krusader/GUI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11858/krusader/GUI Modified Files: addplaceholderpopup.cpp addplaceholderpopup.h Log Message: ADDED: useraction: new Placeholder %_NewSearch("search-profile")% Index: addplaceholderpopup.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/GUI/addplaceholderpopup.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** addplaceholderpopup.cpp 7 Oct 2004 17:00:57 -0000 1.6 --- addplaceholderpopup.cpp 7 Oct 2004 20:00:35 -0000 1.7 *************** *** 152,158 **** _parameter.append( new ParameterSelect( currentPlaceholder->parameter( i ), plainPage() ) ); else if ( currentPlaceholder->parameter( i )->preset() == "__bookmark" ) ! _parameter.append( new ParameterBookmark( currentPlaceholder->parameter( i ), plainPage() ) ); else if ( currentPlaceholder->parameter( i )->preset() == "__syncprofile" ) _parameter.append( new ParameterSyncprofile( currentPlaceholder->parameter( i ), plainPage() ) ); else _parameter.append( new ParameterText( currentPlaceholder->parameter( i ), plainPage() ) ); --- 152,160 ---- _parameter.append( new ParameterSelect( currentPlaceholder->parameter( i ), plainPage() ) ); else if ( currentPlaceholder->parameter( i )->preset() == "__bookmark" ) ! _parameter.append( new ParameterGoto( currentPlaceholder->parameter( i ), plainPage() ) ); else if ( currentPlaceholder->parameter( i )->preset() == "__syncprofile" ) _parameter.append( new ParameterSyncprofile( currentPlaceholder->parameter( i ), plainPage() ) ); + else if ( currentPlaceholder->parameter( i )->preset() == "__search" ) + _parameter.append( new ParameterSearch( currentPlaceholder->parameter( i ), plainPage() ) ); else _parameter.append( new ParameterText( currentPlaceholder->parameter( i ), plainPage() ) ); *************** *** 416,421 **** } ! ///////////// ParameterBookmark ! ParameterBookmark::ParameterBookmark( exp_parameter* parameter, QWidget* parent ) : ParameterBase( parameter, parent ) { QVBoxLayout* layout = new QVBoxLayout( this ); layout->setAutoAdd( true ); --- 418,423 ---- } ! ///////////// ParameterGoto ! ParameterGoto::ParameterGoto( exp_parameter* parameter, QWidget* parent ) : ParameterBase( parameter, parent ) { QVBoxLayout* layout = new QVBoxLayout( this ); layout->setAutoAdd( true ); *************** *** 435,448 **** } ! QString ParameterBookmark::text() { return _lineEdit->text(); } ! QString ParameterBookmark::preset() { return QString::null; } ! void ParameterBookmark::reset() { _lineEdit->setText( QString::null ); } ! bool ParameterBookmark::valid() { if ( _lineEdit->text().isEmpty() ) return false; --- 437,450 ---- } ! QString ParameterGoto::text() { return _lineEdit->text(); } ! QString ParameterGoto::preset() { return QString::null; } ! void ParameterGoto::reset() { _lineEdit->setText( QString::null ); } ! bool ParameterGoto::valid() { if ( _lineEdit->text().isEmpty() ) return false; *************** *** 450,458 **** return true; } ! void ParameterBookmark::setDir() { QString folder = KFileDialog::getExistingDirectory(QString::null, this); _lineEdit->setText( folder ); } ! void ParameterBookmark::setBookmark( const KURL& url ) { _lineEdit->setText( url.url() ); } --- 452,460 ---- return true; } ! void ParameterGoto::setDir() { QString folder = KFileDialog::getExistingDirectory(QString::null, this); _lineEdit->setText( folder ); } ! void ParameterGoto::setBookmark( const KURL& url ) { _lineEdit->setText( url.url() ); } *************** *** 483,484 **** --- 485,510 ---- } + ///////////// ParameterSearch + ParameterSearch::ParameterSearch( exp_parameter* parameter, QWidget* parent ) : ParameterBase( parameter, parent ) { + QVBoxLayout* layout = new QVBoxLayout( this ); + layout->setAutoAdd( true ); + layout->setSpacing( 6 ); + + new QLabel( parameter->description(), this ); + _combobox = new KComboBox( this ); + + _combobox->insertStringList( ProfileManager::availableProfiles("SearcherProfile") ); + } + + QString ParameterSearch::text() { + return _combobox->currentText(); + } + QString ParameterSearch::preset() { + return _combobox->text( 0 ); + } + void ParameterSearch::reset() { + _combobox->setCurrentItem( 0 ); + } + bool ParameterSearch::valid() { + return true; + } Index: addplaceholderpopup.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/GUI/addplaceholderpopup.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** addplaceholderpopup.h 7 Oct 2004 12:40:14 -0000 1.4 --- addplaceholderpopup.h 7 Oct 2004 20:00:35 -0000 1.5 *************** *** 207,216 **** /** * A line-edit with a "choose dir"- and a bookmark-button ! * used with default = "__bookmark" */ ! class ParameterBookmark : public ParameterBase { Q_OBJECT public: ! ParameterBookmark( exp_parameter* parameter, QWidget* parent ); QString text(); QString preset(); --- 207,216 ---- /** * A line-edit with a "choose dir"- and a bookmark-button ! * used with default = "__goto" */ ! class ParameterGoto : public ParameterBase { Q_OBJECT public: ! ParameterGoto( exp_parameter* parameter, QWidget* parent ); QString text(); QString preset(); *************** *** 241,244 **** --- 241,259 ---- }; + /** + * A ComboBox with all profiles available for the Searchmodule + * used with default = "__search" + */ + class ParameterSearch : public ParameterBase { + public: + ParameterSearch( exp_parameter* parameter, QWidget* parent ); + QString text(); + QString preset(); + void reset(); + bool valid(); + private: + KComboBox * _combobox; + }; + //////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////// ParameterDialog //////////////////////////////////// |
|
From: Jonas B. <jb...@us...> - 2004-10-07 20:01:05
|
Update of /cvsroot/krusader/krusader_kde3 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11858 Modified Files: ChangeLog Log Message: ADDED: useraction: new Placeholder %_NewSearch("search-profile")% Index: ChangeLog =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v retrieving revision 1.318 retrieving revision 1.319 diff -C2 -d -r1.318 -r1.319 *** ChangeLog 7 Oct 2004 13:53:39 -0000 1.318 --- ChangeLog 7 Oct 2004 20:00:52 -0000 1.319 *************** *** 1,3 **** --- 1,4 ---- ====================== + ADDED: useraction: new Placeholder %_NewSearch("search-profile")% ADDED: useraction: run as different user ADDED: alt-O now sync the panels (like ctrl-left/right arrows) |
|
From: Jonas B. <jb...@us...> - 2004-10-07 20:01:05
|
Update of /cvsroot/krusader/krusader_kde3/krusader/UserAction In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11858/krusader/UserAction Modified Files: expander.cpp expander.h Log Message: ADDED: useraction: new Placeholder %_NewSearch("search-profile")% Index: expander.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserAction/expander.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** expander.h 6 Oct 2004 13:48:23 -0000 1.5 --- expander.h 7 Oct 2004 20:00:51 -0000 1.6 *************** *** 179,182 **** --- 179,191 ---- }; + /** + * This opens the searchmodule with a given profile + */ + class exp_NewSearch : public exp_placeholder { + public: + exp_NewSearch(); + EXP_FUNC; + }; + /** Index: expander.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserAction/expander.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** expander.cpp 7 Oct 2004 13:23:08 -0000 1.9 --- expander.cpp 7 Oct 2004 20:00:50 -0000 1.10 *************** *** 19,22 **** --- 19,23 ---- #include "../Panel/panelfunc.h" #include "../Synchronizer/synchronizergui.h" + #include "../Search/krsearchdialog.h" #include <kdebug.h> *************** *** 353,360 **** } ! SynchronizerGUI *sync = new SynchronizerGUI( MAIN_VIEW, parameter[0] ); ! // do the sync: ! sync->wasSynchronization(); ! delete sync; return QString::null; // this doesn't return everything, that's normal! --- 354,376 ---- } ! new SynchronizerGUI( MAIN_VIEW, parameter[0] ); ! ! return QString::null; // this doesn't return everything, that's normal! ! } ! ! exp_NewSearch::exp_NewSearch() { ! _expression = "NewSearch"; ! _description = i18n("Opens a searchmodule-profile"); ! _needPanel = false; ! ! addParameter( new exp_parameter( i18n("Choose a profile"), "__search", true ) ); ! } ! QString exp_NewSearch::expFunc( const ListPanel*, const QStringList& parameter, const bool&, const int& ) { ! if ( parameter[0].isEmpty() ) { ! kdWarning() << "Expander: no profile specified for %_NewSearch(profile)%; ignoring..." << endl; ! return QString::null; ! } ! ! new KrSearchDialog( parameter[0] ); return QString::null; // this doesn't return everything, that's normal! *************** *** 382,387 **** addPlaceholder( new exp_Copy() ); addPlaceholder( new exp_Sync() ); // addPlaceholder( new exp_Run() ); - // addPlaceholder( new exp_SearchExt() ); } --- 398,403 ---- addPlaceholder( new exp_Copy() ); addPlaceholder( new exp_Sync() ); + addPlaceholder( new exp_NewSearch() ); // addPlaceholder( new exp_Run() ); } |
|
From: Jonas B. <jb...@us...> - 2004-10-07 19:58:21
|
Update of /cvsroot/krusader/krusader_kde3/krusader/GUI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11223/krusader/GUI Modified Files: actionpropertybase.ui Log Message: should compile again with QT 3.2 + some tooltip Index: actionpropertybase.ui =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/GUI/actionpropertybase.ui,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** actionpropertybase.ui 7 Oct 2004 13:53:38 -0000 1.3 --- actionpropertybase.ui 7 Oct 2004 19:58:10 -0000 1.4 *************** *** 1110,1113 **** --- 1110,1116 ---- <string>Run as different user</string> </property> + <property name="toolTip" stdset="0"> + <string>execute the command under an other user-id</string> + </property> </widget> <widget class="KLineEdit" row="3" column="1"> |
|
From: Jonas B. <jb...@us...> - 2004-10-07 19:57:30
|
Update of /cvsroot/krusader/krusader_kde3/krusader/GUI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11085/krusader/GUI Modified Files: profilemanager.h Log Message: doxygen for the function I added Index: profilemanager.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/GUI/profilemanager.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** profilemanager.h 7 Oct 2004 17:00:57 -0000 1.2 --- profilemanager.h 7 Oct 2004 19:57:17 -0000 1.3 *************** *** 44,47 **** --- 44,51 ---- bool loadByName( QString name ); + /** + * @param profileType Type of the profile (sync, search, ...) + * @return A list of all available profile-names + */ static QStringList availableProfiles( QString profileType ); |
|
From: Jonas B. <jb...@us...> - 2004-10-07 17:01:09
|
Update of /cvsroot/krusader/krusader_kde3/krusader/GUI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30901/krusader/GUI Modified Files: addplaceholderpopup.cpp profilemanager.cpp profilemanager.h Log Message: ported parameter-dialog for %_Sync("profile")% to the new profilemanager Index: addplaceholderpopup.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/GUI/addplaceholderpopup.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** addplaceholderpopup.cpp 7 Oct 2004 12:40:14 -0000 1.5 --- addplaceholderpopup.cpp 7 Oct 2004 17:00:57 -0000 1.6 *************** *** 22,25 **** --- 22,26 ---- #include "../krusader.h" // for konfig-access #include "../BookMan/krbookmarkbutton.h" + #include "profilemanager.h" #include <qlayout.h> *************** *** 466,475 **** _combobox = new KComboBox( this ); ! krConfig->setGroup("Synchronize"); ! ! int profileNum = krConfig->readNumEntry( "Profile Number", 0 ); ! int i; ! for( i = 0; i != profileNum; i++ ) ! _combobox->insertItem( (krConfig->readListEntry(QString("Profile%1").arg(i+1)))[0] ); } --- 467,471 ---- _combobox = new KComboBox( this ); ! _combobox->insertStringList( ProfileManager::availableProfiles("SynchronizerProfile") ); } Index: profilemanager.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/GUI/profilemanager.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** profilemanager.h 27 Sep 2004 17:18:54 -0000 1.1 --- profilemanager.h 7 Oct 2004 17:00:57 -0000 1.2 *************** *** 44,47 **** --- 44,49 ---- bool loadByName( QString name ); + static QStringList availableProfiles( QString profileType ); + public slots: void profilePopup(); Index: profilemanager.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/GUI/profilemanager.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** profilemanager.cpp 5 Oct 2004 00:39:47 -0000 1.2 --- profilemanager.cpp 7 Oct 2004 17:00:57 -0000 1.3 *************** *** 143,145 **** --- 143,158 ---- } + QStringList ProfileManager::availableProfiles( QString profileType ) { + krConfig->setGroup("Private"); + QStringList profiles = krConfig->readListEntry( profileType ); + QStringList profileNames; + + for( unsigned i=0; i != profiles.count() ; i++ ) { + krConfig->setGroup( profileType + " - " + profiles[ i ] ); + profileNames.append( krConfig->readEntry("Name") ); + } + + return profileNames; + } + #include "profilemanager.moc" |
|
From: Jonas B. <jb...@us...> - 2004-10-07 13:56:04
|
Update of /cvsroot/krusader/krusader_kde3 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20614 Modified Files: ChangeLog Log Message: ADDED: useraction: run as different user Index: ChangeLog =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v retrieving revision 1.317 retrieving revision 1.318 diff -C2 -d -r1.317 -r1.318 *** ChangeLog 7 Oct 2004 13:23:06 -0000 1.317 --- ChangeLog 7 Oct 2004 13:53:39 -0000 1.318 *************** *** 1,6 **** ====================== ADDED: alt-O now sync the panels (like ctrl-left/right arrows) ADDED: new shortcut (ctrl-d) to open bookmarks on current panel ! ADDED: panel costum colors: new Current Marked Foreground ADDED: compare by content: the action is now smarter in finding the right files ADDED: profiles for the panels --- 1,7 ---- ====================== + ADDED: useraction: run as different user ADDED: alt-O now sync the panels (like ctrl-left/right arrows) ADDED: new shortcut (ctrl-d) to open bookmarks on current panel ! ADDED: panel costum colors: new Current Marked Foreground ADDED: compare by content: the action is now smarter in finding the right files ADDED: profiles for the panels *************** *** 50,53 **** --- 51,55 ---- REACTIVATED: usermenu (now using the new useraction-system) + FIXED: useraction: startpath is now working FIXED: useraction: i18n is now working in the add-placeholder-menu FIXED: searcher corrupts international characters |
Update of /cvsroot/krusader/krusader_kde3/krusader/UserAction In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20614/krusader/UserAction Modified Files: kraction.cpp useraction.cpp useractionproperties.cpp useractionproperties.h useractionxml.cpp useractionxml.h Log Message: ADDED: useraction: run as different user Index: useraction.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserAction/useraction.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** useraction.cpp 7 Oct 2004 13:23:08 -0000 1.2 --- useraction.cpp 7 Oct 2004 13:53:38 -0000 1.3 *************** *** 30,38 **** UserAction::UserAction() { kdDebug() << "Initialisising useractions..." << endl; ! _xml = new UserActionXML; ! QStringList actionNames = _xml->getActionNames(); ! for ( QStringList::Iterator it = actionNames.begin(); it != actionNames.end(); ++it ) ! addKrAction( _xml->readAction(*it) ); ! kdDebug() << _actions.count() << " useractions read." << endl; } --- 30,40 ---- UserAction::UserAction() { kdDebug() << "Initialisising useractions..." << endl; ! _xml = new UserActionXML(); ! if ( _xml != 0 ) { ! QStringList actionNames = _xml->getActionNames(); ! for ( QStringList::Iterator it = actionNames.begin(); it != actionNames.end(); ++it ) ! addKrAction( _xml->readAction(*it) ); ! kdDebug() << _actions.count() << " useractions read." << endl; ! } } Index: useractionproperties.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserAction/useractionproperties.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** useractionproperties.cpp 23 Jul 2004 00:03:19 -0000 1.1 --- useractionproperties.cpp 7 Oct 2004 13:53:38 -0000 1.2 *************** *** 34,37 **** --- 34,38 ---- _command = *from->command(); _startpath = *from->startpath(); + _user = *from->user(); _showonlyProtocol = *from->showonlyProtocol(); _showonlyPath = *from->showonlyPath(); *************** *** 74,77 **** --- 75,81 ---- void UserActionProperties::setStartpath(const QString& startpath) { _startpath = startpath;} + QString* UserActionProperties::user() { return &_user; } + void UserActionProperties::setUser(const QString& user) { _user = user; } + QStringList* UserActionProperties::showonlyProtocol() { return &_showonlyProtocol; } void UserActionProperties::setShowonlyProtocol(const QStringList& showonlyProtocol) { _showonlyProtocol = showonlyProtocol;} Index: kraction.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserAction/kraction.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** kraction.cpp 7 Oct 2004 12:34:00 -0000 1.6 --- kraction.cpp 7 Oct 2004 13:53:38 -0000 1.7 *************** *** 93,100 **** _proc->clearArguments(); QString cmd; ! ! if (!_properties->startpath()->isEmpty()) ! _proc->setWorkingDirectory(*_properties->startpath()); ! if ( _properties->execType() == UserActionProperties::Terminal && cmdLineList.count() > 1) KMessageBox::sorry( 0, "Support for more then one command don't work in a terminal. Only the first is executed in the terminal" ); --- 93,100 ---- _proc->clearArguments(); QString cmd; ! ! if ( ! _properties->startpath()->isEmpty() ) ! _proc->setWorkingDirectory( *_properties->startpath() ); ! if ( _properties->execType() == UserActionProperties::Terminal && cmdLineList.count() > 1) KMessageBox::sorry( 0, "Support for more then one command don't work in a terminal. Only the first is executed in the terminal" ); *************** *** 110,117 **** if ( _properties->execType() == UserActionProperties::Terminal ) { // TODO read terminal-setting from config ! // ( *_proc ) << "konsole" << "--noclose" << "-e" << "\""+cmd+"\""; ! ( *_proc ) << "konsole" << "--noclose" << "-e" << cmd; } else { // no terminal, no output collection ! ( *_proc ) << cmd; } _proc->start( KProcess::NotifyOnExit, ( KProcess::Communication ) ( KProcess::Stdout | KProcess::Stderr ) ); --- 110,123 ---- if ( _properties->execType() == UserActionProperties::Terminal ) { // TODO read terminal-setting from config ! if ( _properties->user()->isEmpty() ) ! ( *_proc ) << "konsole" << "--noclose" << "-e" << cmd; ! else ! // ( *_proc ) << "kdesu" << "-u" << *_properties->user() << "-c" << KProcess::quote("konsole --noclose -e " + KProcess::quote(cmd) ); ! ( *_proc ) << "kdesu" << "-u" << *_properties->user() << "-c" << KProcess::quote("konsole --noclose -e " + cmd ); } else { // no terminal, no output collection ! if ( _properties->user()->isEmpty() ) ! ( *_proc ) << cmd; ! else ! ( *_proc ) << "kdesu" << "-u" << *_properties->user() << "-c" << KProcess::quote(cmd); } _proc->start( KProcess::NotifyOnExit, ( KProcess::Communication ) ( KProcess::Stdout | KProcess::Stderr ) ); *************** *** 132,136 **** cmd += *it; } ! ( *_proc ) << cmd; _proc->start( KProcess::NotifyOnExit, ( KProcess::Communication ) ( KProcess::Stdout | KProcess::Stderr ) ); } --- 138,146 ---- cmd += *it; } ! if ( _properties->user()->isEmpty() ) ! ( *_proc ) << cmd; ! else ! // "-t" is nessesary that kdesu displays the terminal-output of the command ! ( *_proc ) << "kdesu" << "-t" << "-u" << *_properties->user() << "-c" << KProcess::quote(cmd); _proc->start( KProcess::NotifyOnExit, ( KProcess::Communication ) ( KProcess::Stdout | KProcess::Stderr ) ); } Index: useractionxml.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserAction/useractionxml.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** useractionxml.cpp 27 Sep 2004 00:51:26 -0000 1.2 --- useractionxml.cpp 7 Oct 2004 13:53:38 -0000 1.3 *************** *** 171,174 **** --- 171,179 ---- property.setAttributeNode( attribute ); } + if ( ! prop->user()->isEmpty() ) { + attribute = _doc->createAttribute( "run_as" ); + attribute.setValue( *prop->user() ); + property.setAttributeNode( attribute ); + } property.appendChild( _doc->createTextNode( *prop->command() ) ); action.appendChild( property ); *************** *** 409,412 **** --- 414,419 ---- else prop->setConfirmExecution( true ); + + prop->setUser( e.attribute( "run_as", QString::null ) ); } // </command> else Index: useractionxml.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserAction/useractionxml.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** useractionxml.h 23 Jul 2004 00:03:19 -0000 1.1 --- useractionxml.h 7 Oct 2004 13:53:38 -0000 1.2 *************** *** 66,70 **** public: /** ! * This constructor reads the action-file in KDE's local data */ UserActionXML(); --- 66,70 ---- public: /** ! * This constructor reads the action-file in KDE's local or global data */ UserActionXML(); Index: useractionproperties.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserAction/useractionproperties.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** useractionproperties.h 23 Jul 2004 00:03:19 -0000 1.1 --- useractionproperties.h 7 Oct 2004 13:53:38 -0000 1.2 *************** *** 86,89 **** --- 86,95 ---- void setStartpath(const QString& startpath); /** + * Run the command as different user + * @return The user under which the command should be executed + */ + QString* user(); + void setUser(const QString& user); + /** * A list of protocols for which the action should be available * @return The protocol-list *************** *** 156,159 **** --- 162,166 ---- QString _command; QString _startpath; + QString _user; QStringList _showonlyProtocol; QStringList _showonlyPath; |
|
From: Jonas B. <jb...@us...> - 2004-10-07 13:55:34
|
Update of /cvsroot/krusader/krusader_kde3/krusader/GUI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20614/krusader/GUI Modified Files: actionproperty.cpp actionproperty.h actionpropertybase.ui Log Message: ADDED: useraction: run as different user Index: actionproperty.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/GUI/actionproperty.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** actionproperty.cpp 25 Jul 2004 19:41:32 -0000 1.2 --- actionproperty.cpp 7 Oct 2004 13:53:38 -0000 1.3 *************** *** 80,83 **** --- 80,85 ---- connect( chkConfirmExecution, SIGNAL( toggled(bool) ), this, SLOT( changedConfirmExecution() ) ); connect( KeyButtonShortcut, SIGNAL( capturedShortcut(const KShortcut&) ), this, SLOT( changedShortcut(const KShortcut&) ) ); + connect( leDifferentUser, SIGNAL( textChanged(const QString&) ), this, SLOT( changedUser() ) ); + connect( chkDifferentUser, SIGNAL( toggled(bool) ), this, SLOT( changedUser() ) ); } *************** *** 138,141 **** --- 140,148 ---- ButtonIcon->resetIcon(); + leDifferentUser->setText( *properties->user() ); + if ( properties->user()->isEmpty() ) + chkDifferentUser->setChecked(false); + else + chkDifferentUser->setChecked(true); // these functions are updating the internal _properties *************** *** 149,152 **** --- 156,160 ---- changedCommand(); changedStartpath(); + changedUser(); changedExecType(); changedAccept(); *************** *** 395,398 **** --- 403,412 ---- _properties->setStartpath( leStartpath->text().stripWhiteSpace() ); } + void ActionProperty::changedUser() { + if ( chkDifferentUser->isChecked() ) + _properties->setUser( leDifferentUser->text().stripWhiteSpace() ); + else + _properties->setUser( QString::null ); + } void ActionProperty::changedExecType() { _properties->setSeparateStderr( chkSeparateStdError->isChecked() ); Index: actionproperty.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/GUI/actionproperty.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** actionproperty.h 25 Jul 2004 19:41:32 -0000 1.2 --- actionproperty.h 7 Oct 2004 13:53:38 -0000 1.3 *************** *** 165,168 **** --- 165,173 ---- void changedStartpath(); /** + * keeps the startpath in the internal _properties up to date. + * !! don't forget to call them also at the end of updateGUI !! + */ + void changedUser(); + /** * keeps the execution-type in the internal _properties up to date. * !! don't forget to call them also at the end of updateGUI !! Index: actionpropertybase.ui =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/GUI/actionpropertybase.ui,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** actionpropertybase.ui 25 Jul 2004 19:41:32 -0000 1.2 --- actionpropertybase.ui 7 Oct 2004 13:53:38 -0000 1.3 *************** *** 1,3 **** ! <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>ActionPropertyBase</class> <widget class="QWidget"> --- 1,3 ---- ! <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ActionPropertyBase</class> <widget class="QWidget"> *************** *** 526,530 **** <cstring>unnamed</cstring> </property> ! <widget class="QGroupBox" row="0" column="0"> <property name="name"> <cstring>gbShowonly</cstring> --- 526,530 ---- <cstring>unnamed</cstring> </property> ! <widget class="QGroupBox" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>gbShowonly</cstring> *************** *** 1046,1050 **** </grid> </widget> ! <widget class="QLayoutWidget" row="1" column="0"> <property name="name"> <cstring>layout4</cstring> --- 1046,1050 ---- </grid> </widget> ! <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>layout4</cstring> *************** *** 1092,1096 **** </hbox> </widget> ! <spacer row="3" column="0"> <property name="name"> <cstring>spacer3</cstring> --- 1092,1123 ---- </hbox> </widget> ! <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2"> ! <property name="name"> ! <cstring>chkConfirmExecution</cstring> ! </property> ! <property name="text"> ! <string>Confirm each programmcall separately</string> ! </property> ! <property name="toolTip" stdset="0"> ! <string>This allows you to tweak the commandline before beeing executed</string> ! </property> ! </widget> ! <widget class="QCheckBox" row="3" column="0"> ! <property name="name"> ! <cstring>chkDifferentUser</cstring> ! </property> ! <property name="text"> ! <string>Run as different user</string> ! </property> ! </widget> ! <widget class="KLineEdit" row="3" column="1"> ! <property name="name"> ! <cstring>leDifferentUser</cstring> ! </property> ! <property name="enabled"> ! <bool>false</bool> ! </property> ! </widget> ! <spacer row="4" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>spacer3</cstring> *************** *** 1105,1123 **** <size> <width>161</width> ! <height>90</height> </size> </property> </spacer> - <widget class="QCheckBox" row="2" column="0"> - <property name="name"> - <cstring>chkConfirmExecution</cstring> - </property> - <property name="text"> - <string>Confirm each programmcall separately</string> - </property> - <property name="toolTip" stdset="0"> - <string>This allows you to tweak the commandline before beeing executed</string> - </property> - </widget> </grid> </widget> --- 1132,1139 ---- <size> <width>161</width> ! <height>84</height> </size> </property> </spacer> </grid> </widget> *************** *** 1138,1141 **** --- 1154,1163 ---- <slot>setDisabled(bool)</slot> </connection> + <connection> + <sender>chkDifferentUser</sender> + <signal>toggled(bool)</signal> + <receiver>leDifferentUser</receiver> + <slot>setEnabled(bool)</slot> + </connection> </connections> <layoutdefaults spacing="6" margin="11"/> *************** *** 1155,1158 **** --- 1177,1181 ---- <includehint>klistbox.h</includehint> <includehint>kkeybutton.h</includehint> + <includehint>klineedit.h</includehint> </includehints> </UI> |
|
From: Shie E. <er...@us...> - 2004-10-07 13:23:49
|
Update of /cvsroot/krusader/krusader_kde3/krusader/UserAction In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14060/krusader/UserAction Modified Files: expander.cpp useraction.cpp Log Message: 1) code cleanup 2) alt-o syncs the panels in place (like ctrl-left/right) Index: useraction.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserAction/useraction.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** useraction.cpp 23 Jul 2004 00:03:19 -0000 1.1 --- useraction.cpp 7 Oct 2004 13:23:08 -0000 1.2 *************** *** 73,77 **** void UserAction::setAvailability() { ! setAvailability( krApp->mainView->activePanel->func->files()->vfs_getFile( krApp->mainView->activePanel->view->getCurrentItem() ) ); } --- 73,77 ---- void UserAction::setAvailability() { ! setAvailability( ACTIVE_FUNC->files()->vfs_getFile( ACTIVE_PANEL->view->getCurrentItem() ) ); } Index: expander.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserAction/expander.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** expander.cpp 6 Oct 2004 13:48:23 -0000 1.8 --- expander.cpp 7 Oct 2004 13:23:08 -0000 1.9 *************** *** 254,258 **** if ( newTab ) { ! if ( panel == krApp->mainView->left ) krApp->mainView->leftMng->slotNewTab( parameter[0] ); else --- 254,258 ---- if ( newTab ) { ! if ( panel == LEFT_PANEL) krApp->mainView->leftMng->slotNewTab( parameter[0] ); else *************** *** 353,357 **** } ! SynchronizerGUI *sync = new SynchronizerGUI( krApp->mainView, parameter[0] ); // do the sync: sync->wasSynchronization(); --- 353,357 ---- } ! SynchronizerGUI *sync = new SynchronizerGUI( MAIN_VIEW, parameter[0] ); // do the sync: sync->wasSynchronization(); *************** *** 394,404 **** switch ( panelIndicator ) { case 'a': ! return krApp->mainView->activePanel; case 'o': ! return krApp->mainView->activePanel->otherPanel; case 'l': ! return krApp->mainView->left; case 'r': ! return krApp->mainView->right; case '_': return 0; --- 394,404 ---- switch ( panelIndicator ) { case 'a': ! return ACTIVE_PANEL; case 'o': ! return OTHER_PANEL; case 'l': ! return LEFT_PANEL; case 'r': ! return RIGHT_PANEL; case '_': return 0; |
|
From: Shie E. <er...@us...> - 2004-10-07 13:23:46
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14060/krusader/Panel Modified Files: krdetailedview.cpp krdetailedviewitem.cpp listpanel.cpp Log Message: 1) code cleanup 2) alt-o syncs the panels in place (like ctrl-left/right) Index: krdetailedviewitem.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedviewitem.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** krdetailedviewitem.cpp 6 Oct 2004 22:57:20 -0000 1.31 --- krdetailedviewitem.cpp 7 Oct 2004 13:23:07 -0000 1.32 *************** *** 198,202 **** { bool markCurrentAlways = KrColorCache::getColorCache().isShowCurrentItemAlways(); ! bool isActive = (dynamic_cast<KrView *>(listView()) == krApp->mainView->activePanel->view); bool isCurrent = listView()->currentItem() == this; --- 198,202 ---- { bool markCurrentAlways = KrColorCache::getColorCache().isShowCurrentItemAlways(); ! bool isActive = (dynamic_cast<KrView *>(listView()) == ACTIVE_PANEL->view); bool isCurrent = listView()->currentItem() == this; Index: listpanel.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.cpp,v retrieving revision 1.95 retrieving revision 1.96 diff -C2 -d -r1.95 -r1.96 *** listpanel.cpp 7 Oct 2004 12:40:14 -0000 1.95 --- listpanel.cpp 7 Oct 2004 13:23:07 -0000 1.96 *************** *** 864,868 **** case OPEN_TAB_ID : // Open/Run // assuming only 1 file is selected (otherwise we won't get here) ! ( krApp->mainView->activePanel == krApp->mainView->left ? krApp->mainView->leftMng : krApp->mainView->rightMng ) ->slotNewTab( func->files() ->vfs_getFile( item->name() ).url() ); break; --- 864,868 ---- case OPEN_TAB_ID : // Open/Run // assuming only 1 file is selected (otherwise we won't get here) ! ( ACTIVE_PANEL == LEFT_PANEL ? krApp->mainView->leftMng : krApp->mainView->rightMng ) ->slotNewTab( func->files() ->vfs_getFile( item->name() ).url() ); break; *************** *** 987,991 **** if ( e->state() & ControlButton ) { SLOTS->insertFileName( ( e->state() & ShiftButton ) != 0 ); ! krApp->mainView->cmdLine->setFocus(); } else e->ignore(); --- 987,991 ---- if ( e->state() & ControlButton ) { SLOTS->insertFileName( ( e->state() & ShiftButton ) != 0 ); ! MAIN_VIEW->cmdLine->setFocus(); } else e->ignore(); *************** *** 1017,1024 **** case Key_Down : if ( e->state() == ControlButton ) { // give the keyboard focus to the command line ! if ( krApp->mainView->cmdLine->isVisible() ) ! krApp->mainView->cmdLineFocus(); ! else if ( krApp->mainView->terminal_dock->isVisible() ) ! krApp->mainView->terminal_dock->setFocus(); return ; } else --- 1017,1024 ---- case Key_Down : if ( e->state() == ControlButton ) { // give the keyboard focus to the command line ! if ( MAIN_VIEW->cmdLine->isVisible() ) ! MAIN_VIEW->cmdLineFocus(); ! else if ( MAIN_VIEW->terminal_dock->isVisible() ) ! MAIN_VIEW->terminal_dock->setFocus(); return ; } else *************** *** 1030,1034 **** // the quick search thing, so send the characters to the commandline, if normal key if ( e->state() == NoButton ) ! krApp->mainView->cmdLine->addText( e->text() ); //e->ignore(); --- 1030,1034 ---- // the quick search thing, so send the characters to the commandline, if normal key if ( e->state() == NoButton ) ! MAIN_VIEW->cmdLine->addText( e->text() ); //e->ignore(); Index: krdetailedview.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedview.cpp,v retrieving revision 1.95 retrieving revision 1.96 diff -C2 -d -r1.95 -r1.96 *** krdetailedview.cpp 20 Sep 2004 13:23:55 -0000 1.95 --- krdetailedview.cpp 7 Oct 2004 13:23:07 -0000 1.96 *************** *** 516,523 **** 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 ); } --- 516,523 ---- KConfigGroupSaver grpSvr( _config, "Look&Feel" ); if ( _config->readBoolEntry( "New Style Quicksearch", _NewStyleQuicksearch ) ) { ! if ( MAIN_VIEW ) { ! if ( ACTIVE_PANEL ) { ! if ( ACTIVE_PANEL->quickSearch ) { ! if ( ACTIVE_PANEL->quickSearch->isShown() ) { stopQuickSearch( 0 ); } *************** *** 573,580 **** 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 ); } --- 573,580 ---- KConfigGroupSaver grpSvr( _config, "Look&Feel" ); if ( _config->readBoolEntry( "New Style Quicksearch", _NewStyleQuicksearch ) ) { ! if ( MAIN_VIEW ) { ! if ( ACTIVE_PANEL ) { ! if ( ACTIVE_PANEL->quickSearch ) { ! if ( ACTIVE_PANEL->quickSearch->isShown() ) { stopQuickSearch( 0 ); } *************** *** 625,636 **** // setSelected(i, FALSE); ! if ( krApp->mainView->activePanel->quickSearch->isShown() ) { ! krApp->mainView->activePanel->quickSearch->hide(); ! krApp->mainView->activePanel->quickSearch->clear(); krDirUp->setEnabled( true ); } ! if ( krApp->mainView->activePanel->otherPanel->quickSearch->isShown() ) { ! krApp->mainView->activePanel->otherPanel->quickSearch->hide(); ! krApp->mainView->activePanel->otherPanel->quickSearch->clear(); krDirUp->setEnabled( true ); } --- 625,636 ---- // setSelected(i, FALSE); ! if ( ACTIVE_PANEL->quickSearch->isShown() ) { ! ACTIVE_PANEL->quickSearch->hide(); ! ACTIVE_PANEL->quickSearch->clear(); krDirUp->setEnabled( true ); } ! if ( OTHER_PANEL->quickSearch->isShown() ) { ! OTHER_PANEL->quickSearch->hide(); ! OTHER_PANEL->quickSearch->clear(); krDirUp->setEnabled( true ); } *************** *** 724,729 **** if ( !e || !firstChild() ) return ; // subclass bug ! if ( krApp->mainView->activePanel->quickSearch->isShown() ) { ! krApp->mainView->activePanel->quickSearch->myKeyPressEvent( e ); return ; } --- 724,729 ---- if ( !e || !firstChild() ) return ; // subclass bug ! if ( ACTIVE_PANEL->quickSearch->isShown() ) { ! ACTIVE_PANEL->quickSearch->myKeyPressEvent( e ); return ; } *************** *** 882,886 **** QStringList items; items.push_back( viewItem->name() ); ! if ( krApp->mainView->activePanel->func->calcSpace( items, totalSize, totalFiles, totalDirs ) ) { // did we succeed to calcSpace? we'll fail if we don't have permissions if ( totalSize == 0 ) { // just mark it, and bail out --- 882,886 ---- QStringList items; items.push_back( viewItem->name() ); ! if ( ACTIVE_PANEL->func->calcSpace( items, totalSize, totalFiles, totalDirs ) ) { // did we succeed to calcSpace? we'll fail if we don't have permissions if ( totalSize == 0 ) { // just mark it, and bail out *************** *** 919,936 **** else { // first, show the quicksearch if its hidden ! if ( krApp->mainView->activePanel->quickSearch->isHidden() ) { ! krApp->mainView->activePanel->quickSearch->show(); // second, we need to disable the dirup action - hack! krDirUp->setEnabled( false ); } // now, send the key to the quicksearch ! krApp->mainView->activePanel->quickSearch->myKeyPressEvent( e ); } } else e->ignore(); // send to panel } else { ! if ( krApp->mainView->activePanel->quickSearch->isShown() ) { ! krApp->mainView->activePanel->quickSearch->hide(); ! krApp->mainView->activePanel->quickSearch->clear(); krDirUp->setEnabled( true ); } --- 919,936 ---- else { // first, show the quicksearch if its hidden ! if ( ACTIVE_PANEL->quickSearch->isHidden() ) { ! ACTIVE_PANEL->quickSearch->show(); // second, we need to disable the dirup action - hack! krDirUp->setEnabled( false ); } // now, send the key to the quicksearch ! ACTIVE_PANEL->quickSearch->myKeyPressEvent( e ); } } else e->ignore(); // send to panel } else { ! if ( ACTIVE_PANEL->quickSearch->isShown() ) { ! ACTIVE_PANEL->quickSearch->hide(); ! ACTIVE_PANEL->quickSearch->clear(); krDirUp->setEnabled( true ); } *************** *** 1046,1051 **** void KrDetailedView::stopQuickSearch( QKeyEvent * e ) { ! krApp->mainView->activePanel->quickSearch->hide(); ! krApp->mainView->activePanel->quickSearch->clear(); krDirUp->setEnabled( true ); if ( e ) --- 1046,1051 ---- void KrDetailedView::stopQuickSearch( QKeyEvent * e ) { ! ACTIVE_PANEL->quickSearch->hide(); ! ACTIVE_PANEL->quickSearch->clear(); krDirUp->setEnabled( true ); if ( e ) *************** *** 1073,1078 **** // 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 ); QColor color = KrColorCache::getColorCache().getBackgroundColor( isActive ); setPaletteBackgroundColor( color ); --- 1073,1078 ---- // KDE deafult is not choosen: set the background color (as this paints the empty areas) and the alternate color bool isActive = hasFocus(); ! if ( MAIN_VIEW && ACTIVE_PANEL && ACTIVE_PANEL->view ) ! isActive = ( dynamic_cast<KrView *>( this ) == ACTIVE_PANEL->view ); QColor color = KrColorCache::getColorCache().getBackgroundColor( isActive ); setPaletteBackgroundColor( color ); |
|
From: Shie E. <er...@us...> - 2004-10-07 13:23:46
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Search In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14060/krusader/Search Modified Files: krsearchdialog.cpp Log Message: 1) code cleanup 2) alt-o syncs the panels in place (like ctrl-left/right) Index: krsearchdialog.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Search/krsearchdialog.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** krsearchdialog.cpp 4 Oct 2004 20:36:06 -0000 1.30 --- krsearchdialog.cpp 7 Oct 2004 13:23:08 -0000 1.31 *************** *** 206,210 **** // the path in the active panel should be the default search location ! QString path = krApp->mainView->activePanel->getPath(); generalFilter->searchInEdit->setText(path); --- 206,210 ---- // the path in the active panel should be the default search location ! QString path = ACTIVE_PANEL->getPath(); generalFilter->searchInEdit->setText(path); *************** *** 371,375 **** void KrSearchDialog::resultClicked(QListViewItem* i) { ! krApp->mainView->activePanel->func->openUrl(vfs::fromPathOrURL(i->text(1)),i->text(0)); showMinimized(); } --- 371,375 ---- void KrSearchDialog::resultClicked(QListViewItem* i) { ! ACTIVE_FUNC->openUrl(vfs::fromPathOrURL(i->text(1)),i->text(0)); showMinimized(); } |
|
From: Shie E. <er...@us...> - 2004-10-07 13:23:44
|
Update of /cvsroot/krusader/krusader_kde3/krusader In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14060/krusader Modified Files: krslots.h krusader.cpp krusader.h Log Message: 1) code cleanup 2) alt-o syncs the panels in place (like ctrl-left/right) Index: krusader.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.h,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** krusader.h 7 Oct 2004 12:40:14 -0000 1.32 --- krusader.h 7 Oct 2004 13:23:06 -0000 1.33 *************** *** 150,158 **** #define SLOTS Krusader::App->slot #define krLoader Krusader::App->iconLoader ! #define ACTIVE_PANEL (krApp->mainView->activePanel) ! #define ACTIVE_FUNC (krApp->mainView->activePanel->func) ! #define LEFT_PANEL (krApp->mainView->left) ! #define RIGHT_PANEL (krApp->mainView->right) #define MAIN_VIEW (krApp->mainView) // krusader's actions - things krusader can do! --- 150,163 ---- #define SLOTS Krusader::App->slot #define krLoader Krusader::App->iconLoader ! #define MAIN_VIEW (krApp->mainView) + #define ACTIVE_PANEL (MAIN_VIEW->activePanel) + #define ACTIVE_FUNC (ACTIVE_PANEL->func) + #define OTHER_PANEL (ACTIVE_PANEL->otherPanel) + #define OTHER_FUNC (OTHER_PANEL->func) + #define LEFT_PANEL (MAIN_VIEW->left) + #define LEFT_FUNC (LEFT_PANEL->func) + #define RIGHT_PANEL (MAIN_VIEW->right) + #define RIGHT_FUNC (RIGHT_PANEL->func) // krusader's actions - things krusader can do! Index: krusader.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.cpp,v retrieving revision 1.94 retrieving revision 1.95 diff -C2 -d -r1.94 -r1.95 *** krusader.cpp 7 Oct 2004 12:40:14 -0000 1.94 --- krusader.cpp 7 Oct 2004 13:23:06 -0000 1.95 *************** *** 518,522 **** actUnselect = new KAction( i18n( "&Unselect Group" ), "kr_unselect", CTRL + Key_Minus, SLOTS, SLOT( unmarkGroup() ), actionCollection(), "unselect group" ); ! actKonfigurator = new KAction( i18n( "&Konfigurator" ), "configure", 0, SLOTS, SLOT( startKonfigurator() ), actionCollection(), "konfigurator" ); actBack = new KAction( i18n( "Back" ), "back", 0, --- 518,522 ---- actUnselect = new KAction( i18n( "&Unselect Group" ), "kr_unselect", CTRL + Key_Minus, SLOTS, SLOT( unmarkGroup() ), actionCollection(), "unselect group" ); ! actKonfigurator = new KAction( i18n( "Configure &Krusader" ), "configure", 0, SLOTS, SLOT( startKonfigurator() ), actionCollection(), "konfigurator" ); actBack = new KAction( i18n( "Back" ), "back", 0, *************** *** 544,547 **** --- 544,549 ---- new KAction( i18n( "Bookmarks" ), CTRL + Key_D, SLOTS, SLOT( openBookmarks() ), actionCollection(), "bookmarks" ); + new KAction( i18n( "Sync Panels" ), ALT + Key_O, + SLOTS, SLOT( syncPanels() ), actionCollection(), "sync panels"); new KAction( i18n( "Left history" ), ALT + CTRL + Key_Left, SLOTS, SLOT( openLeftHistory() ), actionCollection(), "left history" ); *************** *** 668,672 **** //delete krApp->mainView->right->func; saveSettings(); ! delete krApp->mainView; return true; } else return false; --- 670,674 ---- //delete krApp->mainView->right->func; saveSettings(); ! delete MAIN_VIEW; return true; } else return false; Index: krslots.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/krslots.h,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** krslots.h 7 Oct 2004 12:40:14 -0000 1.31 --- krslots.h 7 Oct 2004 13:23:06 -0000 1.32 *************** *** 39,42 **** --- 39,43 ---- #include "krusaderview.h" #include "Panel/listpanel.h" + #include "Panel/panelfunc.h" #include "BookMan/krbookmarkbutton.h" #include "GUI/kcmdline.h" *************** *** 113,117 **** void openLeftHistory() { LEFT_PANEL->historyButton->openPopup(); } void openRightHistory() { RIGHT_PANEL->historyButton->openPopup(); } ! void cmdlinePopup() { krApp->mainView->cmdLine->popup(); } void duplicateTab(); void newTab(); --- 114,123 ---- void openLeftHistory() { LEFT_PANEL->historyButton->openPopup(); } void openRightHistory() { RIGHT_PANEL->historyButton->openPopup(); } ! void syncPanels() { ! ListPanel *t = ACTIVE_PANEL; ! OTHER_FUNC->openUrl(ACTIVE_PANEL->virtualPath); ! t->slotFocusOnMe(); ! } ! void cmdlinePopup() { MAIN_VIEW->cmdLine->popup(); } void duplicateTab(); void newTab(); *************** *** 147,152 **** // ugly stubs, remove later ? ! void slotCurrentChanged( QString p ) { krApp->mainView->slotCurrentChanged( p ); } ! void slotSetActivePanel( ListPanel *p ) { krApp->mainView->slotSetActivePanel( p ); } void loadPanelProfiles( QString group ); --- 153,158 ---- // ugly stubs, remove later ? ! void slotCurrentChanged( QString p ) { MAIN_VIEW->slotCurrentChanged( p ); } ! void slotSetActivePanel( ListPanel *p ) { MAIN_VIEW->slotSetActivePanel( p ); } void loadPanelProfiles( QString group ); |
|
From: Shie E. <er...@us...> - 2004-10-07 13:23:44
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Locate In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14060/krusader/Locate Modified Files: locate.cpp Log Message: 1) code cleanup 2) alt-o syncs the panels in place (like ctrl-left/right) Index: locate.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Locate/locate.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** locate.cpp 3 Oct 2004 08:35:50 -0000 1.9 --- locate.cpp 7 Oct 2004 13:23:06 -0000 1.10 *************** *** 335,339 **** dirName.truncate( dirName.findRev( '/' ) ); ! krApp->mainView->activePanel->func->delayedOpenUrl(vfs::fromPathOrURL( dirName ) ); KDialogBase::accept(); } --- 335,339 ---- dirName.truncate( dirName.findRev( '/' ) ); ! ACTIVE_FUNC->delayedOpenUrl(vfs::fromPathOrURL( dirName ) ); KDialogBase::accept(); } |
|
From: Shie E. <er...@us...> - 2004-10-07 13:23:44
|
Update of /cvsroot/krusader/krusader_kde3 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14060 Modified Files: ChangeLog Log Message: 1) code cleanup 2) alt-o syncs the panels in place (like ctrl-left/right) Index: ChangeLog =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v retrieving revision 1.316 retrieving revision 1.317 diff -C2 -d -r1.316 -r1.317 *** ChangeLog 7 Oct 2004 12:49:04 -0000 1.316 --- ChangeLog 7 Oct 2004 13:23:06 -0000 1.317 *************** *** 1,3 **** --- 1,4 ---- ====================== + ADDED: alt-O now sync the panels (like ctrl-left/right arrows) ADDED: new shortcut (ctrl-d) to open bookmarks on current panel ADDED: panel costum colors: new Current Marked Foreground |
|
From: Shie E. <er...@us...> - 2004-10-07 12:49:17
|
Update of /cvsroot/krusader/krusader_kde3 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6083 Modified Files: ChangeLog Log Message: Index: ChangeLog =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v retrieving revision 1.315 retrieving revision 1.316 diff -C2 -d -r1.315 -r1.316 *** ChangeLog 6 Oct 2004 22:57:21 -0000 1.315 --- ChangeLog 7 Oct 2004 12:49:04 -0000 1.316 *************** *** 1,4 **** ====================== ! ADDED: panel costum colors: new Current Marked Foreground ADDED: compare by content: the action is now smarter in finding the right files ADDED: profiles for the panels --- 1,5 ---- ====================== ! ADDED: new shortcut (ctrl-d) to open bookmarks on current panel ! ADDED: panel costum colors: new Current Marked Foreground ADDED: compare by content: the action is now smarter in finding the right files ADDED: profiles for the panels |
|
From: Shie E. <er...@us...> - 2004-10-07 12:40:32
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3673/Panel Modified Files: listpanel.cpp listpanel.h Log Message: 1) old bookmark code removed 2) alt-left/right is working again 3) new shortcut ctrl-d to open bookmarks wherever you are (TC style) 4) synchronizer hotkey is now ctrl-y since i wanted ctrl-d to be like TC 5) modifications to make it play nice with the user menu /actions Index: listpanel.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.h,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** listpanel.h 5 Oct 2004 00:39:47 -0000 1.28 --- listpanel.h 7 Oct 2004 12:40:15 -0000 1.29 *************** *** 159,164 **** QToolButton *popupBtn; PanelPopup *popup; ! BookmarksButton *bookmarksButton; ! KrBookmarkButton *bmb; DirHistoryQueue* dirHistoryQueue; DirHistoryButton* historyButton; --- 159,163 ---- QToolButton *popupBtn; PanelPopup *popup; ! KrBookmarkButton *bookmarksButton; DirHistoryQueue* dirHistoryQueue; DirHistoryButton* historyButton; Index: listpanel.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.cpp,v retrieving revision 1.94 retrieving revision 1.95 diff -C2 -d -r1.94 -r1.95 *** listpanel.cpp 6 Oct 2004 14:42:27 -0000 1.94 --- listpanel.cpp 7 Oct 2004 12:40:14 -0000 1.95 *************** *** 78,82 **** #include "../MountMan/kmountman.h" #include "../Dialogs/krdialogs.h" ! #include "../BookMan/bookmarksbutton.h" #include "../Dialogs/krspwidgets.h" #include "../Dialogs/krspecialwidgets.h" --- 78,82 ---- #include "../MountMan/kmountman.h" #include "../Dialogs/krdialogs.h" ! #include "../BookMan/krbookmarkbutton.h" #include "../Dialogs/krspwidgets.h" #include "../Dialogs/krspecialwidgets.h" *************** *** 92,101 **** typedef QValueList<KServiceOffer> OfferList; - - #define BOOKMAN2 - #ifdef BOOKMAN2 - #include "../BookMan/krbookmarkbutton.h" - #endif // BOOKMAN2 - ///////////////////////////////////////////////////// // The list panel constructor // --- 92,95 ---- *************** *** 131,153 **** connect( historyButton, SIGNAL( pressed() ), this, SLOT( slotFocusOnMe() ) ); connect( historyButton, SIGNAL( openUrl( const KURL& ) ), func, SLOT( delayedOpenUrl( const KURL& ) ) ); ! #ifndef BOOKMAN2 ! // ... create the bookmark list ! bookmarksButton = new BookmarksButton( this ); ! connect( bookmarksButton, SIGNAL( pressed() ), this, SLOT( slotFocusOnMe() ) ); connect( bookmarksButton, SIGNAL( openUrl( const KURL& ) ), func, SLOT( delayedOpenUrl( const KURL& ) ) ); - QWhatsThis::add - ( bookmarksButton, i18n( "Open menu with bookmarks. You can also add " - "current location to the list, edit bookmarks " - "or add subfolder to the list." ) ); - #endif - #ifdef BOOKMAN2 - bmb = new KrBookmarkButton(this); - connect( bmb, SIGNAL( pressed() ), this, SLOT( slotFocusOnMe() ) ); - connect( bmb, SIGNAL( openUrl( const KURL& ) ), func, SLOT( delayedOpenUrl( const KURL& ) ) ); QWhatsThis::add ! ( bmb, i18n( "Open menu with bookmarks. You can also add " "current location to the list, edit bookmarks " "or add subfolder to the list." ) ); - #endif // BOOKMAN2 QHBoxLayout *totalsLayout = new QHBoxLayout(this); --- 125,136 ---- connect( historyButton, SIGNAL( pressed() ), this, SLOT( slotFocusOnMe() ) ); connect( historyButton, SIGNAL( openUrl( const KURL& ) ), func, SLOT( delayedOpenUrl( const KURL& ) ) ); ! ! bookmarksButton = new KrBookmarkButton(this); ! connect( bookmarksButton, SIGNAL( pressed() ), this, SLOT( slotFocusOnMe() ) ); connect( bookmarksButton, SIGNAL( openUrl( const KURL& ) ), func, SLOT( delayedOpenUrl( const KURL& ) ) ); QWhatsThis::add ! ( bookmarksButton, i18n( "Open menu with bookmarks. You can also add " "current location to the list, edit bookmarks " "or add subfolder to the list." ) ); QHBoxLayout *totalsLayout = new QHBoxLayout(this); *************** *** 253,266 **** // finish the layout - #ifdef BOOKMAN2 - layout->addMultiCellWidget( hbox, 0, 0, 0, 2 ); - layout->addWidget( status, 1, 0 ); - layout->addWidget( historyButton, 1, 1 ); - layout->addWidget( bmb, 1, 2 ); - layout->addMultiCellWidget( splt, 2, 2, 0, 2 ); - layout->addMultiCellWidget( quickSearch, 3, 3, 0, 2 ); - quickSearch->hide(); - layout->addMultiCellLayout( totalsLayout, 4, 4, 0, 2 ); - #else layout->addMultiCellWidget( hbox, 0, 0, 0, 2 ); layout->addWidget( status, 1, 0 ); --- 236,239 ---- *************** *** 271,275 **** quickSearch->hide(); layout->addMultiCellLayout( totalsLayout, 4, 4, 0, 2 ); - #endif // BOOKMAN2 //filter = ALL; } --- 244,247 ---- *************** *** 279,285 **** delete view; delete status; - #ifndef BOOKMAN2 delete bookmarksButton; - #endif delete totals; delete quickSearch; --- 251,255 ---- |
|
From: Shie E. <er...@us...> - 2004-10-07 12:40:31
|
Update of /cvsroot/krusader/krusader_kde3/krusader/BookMan In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3673/BookMan Modified Files: krbookmarkbutton.cpp krbookmarkbutton.h Log Message: 1) old bookmark code removed 2) alt-left/right is working again 3) new shortcut ctrl-d to open bookmarks wherever you are (TC style) 4) synchronizer hotkey is now ctrl-y since i wanted ctrl-d to be like TC 5) modifications to make it play nice with the user menu /actions Index: krbookmarkbutton.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/BookMan/krbookmarkbutton.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** krbookmarkbutton.cpp 5 Oct 2004 15:07:32 -0000 1.5 --- krbookmarkbutton.cpp 7 Oct 2004 12:40:14 -0000 1.6 *************** *** 29,30 **** --- 29,38 ---- krBookMan->populate(static_cast<KPopupMenu*>(popup())); } + + void KrBookmarkButton::openPopup() { + populate(); + popup()->exec(mapToGlobal(QPoint(0, height()))); + kdWarning() << "here" << endl; + //emit pressed(); + + } Index: krbookmarkbutton.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/BookMan/krbookmarkbutton.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** krbookmarkbutton.h 5 Oct 2004 15:07:32 -0000 1.4 --- krbookmarkbutton.h 7 Oct 2004 12:40:14 -0000 1.5 *************** *** 9,12 **** --- 9,13 ---- public: KrBookmarkButton(QWidget *parent); + void openPopup(); signals: |
|
From: Shie E. <er...@us...> - 2004-10-07 12:40:31
|
Update of /cvsroot/krusader/krusader_kde3/krusader In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3673 Modified Files: krslots.h krusader.cpp krusader.h Log Message: 1) old bookmark code removed 2) alt-left/right is working again 3) new shortcut ctrl-d to open bookmarks wherever you are (TC style) 4) synchronizer hotkey is now ctrl-y since i wanted ctrl-d to be like TC 5) modifications to make it play nice with the user menu /actions Index: krusader.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.h,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** krusader.h 5 Oct 2004 00:39:47 -0000 1.31 --- krusader.h 7 Oct 2004 12:40:14 -0000 1.32 *************** *** 152,155 **** --- 152,157 ---- #define ACTIVE_PANEL (krApp->mainView->activePanel) #define ACTIVE_FUNC (krApp->mainView->activePanel->func) + #define LEFT_PANEL (krApp->mainView->left) + #define RIGHT_PANEL (krApp->mainView->right) #define MAIN_VIEW (krApp->mainView) Index: krusader.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.cpp,v retrieving revision 1.93 retrieving revision 1.94 diff -C2 -d -r1.93 -r1.94 *** krusader.cpp 5 Oct 2004 09:29:44 -0000 1.93 --- krusader.cpp 7 Oct 2004 12:40:14 -0000 1.94 *************** *** 512,516 **** actLocate = new KAction( i18n( "&Locate" ), "find", CTRL + Key_L, SLOTS, SLOT( locate() ), actionCollection(), "locate" ); ! actSyncDirs = new KAction( i18n( "Synchronize &Directories" ), "kr_syncdirs", CTRL + Key_D, SLOTS, SLOT( slotSynchronizeDirs() ), actionCollection(), "sync dirs" ); actInvert = new KAction( i18n( "&Invert Selection" ), "kr_invert", ALT + Key_Asterisk, --- 512,516 ---- actLocate = new KAction( i18n( "&Locate" ), "find", CTRL + Key_L, SLOTS, SLOT( locate() ), actionCollection(), "locate" ); ! actSyncDirs = new KAction( i18n( "Synchronize &Directories" ), "kr_syncdirs", CTRL + Key_Y, SLOTS, SLOT( slotSynchronizeDirs() ), actionCollection(), "sync dirs" ); actInvert = new KAction( i18n( "&Invert Selection" ), "kr_invert", ALT + Key_Asterisk, *************** *** 542,545 **** --- 542,547 ---- new KAction( i18n( "Left bookmarks" ), ALT + Key_Left, SLOTS, SLOT( openLeftBookmarks() ), actionCollection(), "left bookmarks" ); + new KAction( i18n( "Bookmarks" ), CTRL + Key_D, + SLOTS, SLOT( openBookmarks() ), actionCollection(), "bookmarks" ); new KAction( i18n( "Left history" ), ALT + CTRL + Key_Left, SLOTS, SLOT( openLeftHistory() ), actionCollection(), "left history" ); Index: krslots.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/krslots.h,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** krslots.h 5 Oct 2004 00:39:47 -0000 1.30 --- krslots.h 7 Oct 2004 12:40:14 -0000 1.31 *************** *** 39,43 **** #include "krusaderview.h" #include "Panel/listpanel.h" ! #include "BookMan/bookmarksbutton.h" #include "GUI/kcmdline.h" #include "GUI/dirhistorybutton.h" --- 39,43 ---- #include "krusaderview.h" #include "Panel/listpanel.h" ! #include "BookMan/krbookmarkbutton.h" #include "GUI/kcmdline.h" #include "GUI/dirhistorybutton.h" *************** *** 108,115 **** void showAboutApplication(); void multiRename(); ! void openRightBookmarks() { krApp->mainView->right->bookmarksButton->openPopup(); } ! void openLeftBookmarks() { krApp->mainView->left->bookmarksButton->openPopup(); } ! void openLeftHistory() { krApp->mainView->left->historyButton->openPopup(); } ! void openRightHistory() { krApp->mainView->right->historyButton->openPopup(); } void cmdlinePopup() { krApp->mainView->cmdLine->popup(); } void duplicateTab(); --- 108,116 ---- void showAboutApplication(); void multiRename(); ! void openRightBookmarks() { RIGHT_PANEL->slotFocusOnMe(); RIGHT_PANEL->bookmarksButton->openPopup(); } ! void openLeftBookmarks() { LEFT_PANEL->slotFocusOnMe(); LEFT_PANEL->bookmarksButton->openPopup(); } ! void openBookmarks() { ACTIVE_PANEL->bookmarksButton->openPopup(); } ! void openLeftHistory() { LEFT_PANEL->historyButton->openPopup(); } ! void openRightHistory() { RIGHT_PANEL->historyButton->openPopup(); } void cmdlinePopup() { krApp->mainView->cmdLine->popup(); } void duplicateTab(); |
|
From: Shie E. <er...@us...> - 2004-10-07 12:40:31
|
Update of /cvsroot/krusader/krusader_kde3/krusader/GUI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3673/GUI Modified Files: addplaceholderpopup.cpp addplaceholderpopup.h Log Message: 1) old bookmark code removed 2) alt-left/right is working again 3) new shortcut ctrl-d to open bookmarks wherever you are (TC style) 4) synchronizer hotkey is now ctrl-y since i wanted ctrl-d to be like TC 5) modifications to make it play nice with the user menu /actions Index: addplaceholderpopup.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/GUI/addplaceholderpopup.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** addplaceholderpopup.cpp 26 Sep 2004 21:57:56 -0000 1.4 --- addplaceholderpopup.cpp 7 Oct 2004 12:40:14 -0000 1.5 *************** *** 21,25 **** // for ParameterDialog #include "../krusader.h" // for konfig-access ! #include "../BookMan/bookmarksbutton.h" #include <qlayout.h> --- 21,25 ---- // for ParameterDialog #include "../krusader.h" // for konfig-access ! #include "../BookMan/krbookmarkbutton.h" #include <qlayout.h> *************** *** 430,434 **** _dirButton->setPixmap( iconLoader->loadIcon( "fileopen", KIcon::Toolbar, 16 ) ); connect( _dirButton, SIGNAL(clicked()), this, SLOT(setDir()) ); ! _bookmarkButton = new BookmarksButton( hbox ); connect( _bookmarkButton, SIGNAL(openUrl(const KURL &)), this, SLOT(setBookmark(const KURL &)) ); } --- 430,434 ---- _dirButton->setPixmap( iconLoader->loadIcon( "fileopen", KIcon::Toolbar, 16 ) ); connect( _dirButton, SIGNAL(clicked()), this, SLOT(setDir()) ); ! _bookmarkButton = new KrBookmarkButton( hbox ); connect( _bookmarkButton, SIGNAL(openUrl(const KURL &)), this, SLOT(setBookmark(const KURL &)) ); } Index: addplaceholderpopup.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/GUI/addplaceholderpopup.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** addplaceholderpopup.h 26 Sep 2004 21:57:56 -0000 1.3 --- addplaceholderpopup.h 7 Oct 2004 12:40:14 -0000 1.4 *************** *** 23,27 **** class QCheckBox; class KComboBox; ! class BookmarksButton; class KURL; --- 23,27 ---- class QCheckBox; class KComboBox; ! class KrBookmarkButton; class KURL; *************** *** 220,224 **** KLineEdit * _lineEdit; QToolButton* _dirButton; ! BookmarksButton* _bookmarkButton; private slots: void setDir(); --- 220,224 ---- KLineEdit * _lineEdit; QToolButton* _dirButton; ! KrBookmarkButton* _bookmarkButton; private slots: void setDir(); |
|
From: Shie E. <er...@us...> - 2004-10-07 12:34:11
|
Update of /cvsroot/krusader/krusader_kde3/krusader/UserAction In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3144/krusader/UserAction Modified Files: kraction.cpp Log Message: fixed: working folder Index: kraction.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserAction/kraction.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** kraction.cpp 26 Sep 2004 21:57:57 -0000 1.5 --- kraction.cpp 7 Oct 2004 12:34:00 -0000 1.6 *************** *** 93,97 **** _proc->clearArguments(); QString cmd; ! if ( _properties->execType() == UserActionProperties::Terminal && cmdLineList.count() > 1) KMessageBox::sorry( 0, "Support for more then one command don't work in a terminal. Only the first is executed in the terminal" ); --- 93,100 ---- _proc->clearArguments(); QString cmd; ! ! if (!_properties->startpath()->isEmpty()) ! _proc->setWorkingDirectory(*_properties->startpath()); ! if ( _properties->execType() == UserActionProperties::Terminal && cmdLineList.count() > 1) KMessageBox::sorry( 0, "Support for more then one command don't work in a terminal. Only the first is executed in the terminal" ); |
|
From: Shie E. <er...@us...> - 2004-10-07 11:51:06
|
Update of /cvsroot/krusader/krusader_kde3/krusader/BookMan In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26284/krusader/BookMan Modified Files: krbookmark.cpp Log Message: jonas' patch: use krusader's action collection Index: krbookmark.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/BookMan/krbookmark.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** krbookmark.cpp 6 Oct 2004 14:42:26 -0000 1.6 --- krbookmark.cpp 7 Oct 2004 11:50:43 -0000 1.7 *************** *** 10,14 **** KAction(name, 0, 0, 0, parent), _url(url), _folder(false) { connect(this, SIGNAL(activated()), this, SLOT(activatedProxy())); ! // what kind of a url is it? if (_url.isLocalFile()) { --- 10,14 ---- KAction(name, 0, 0, 0, parent), _url(url), _folder(false) { connect(this, SIGNAL(activated()), this, SLOT(activatedProxy())); ! setName(QString("Bookmark:"+name).latin1()); // what kind of a url is it? if (_url.isLocalFile()) { |
7 messages has been excluded from this view by a project administrator.
