Menu
▾
▴
[Krusader-commits] krusader_kde3/krusader krslots.cpp,1.57,1.58 krslots.h,1.25,1.26 krusader.cpp,1.82,1.83 krusader.h,1.22,1.23 panelmanager.cpp,1.14,1.15 panelmanager.h,1.9,1.10 paneltabbar.cpp,1.8,1.9
Update of /cvsroot/krusader/krusader_kde3/krusader In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18529/krusader Modified Files: krslots.cpp krslots.h krusader.cpp krusader.h panelmanager.cpp panelmanager.h paneltabbar.cpp Log Message: shift+left/right changes tabs (thanks to Dmitry Suzdalev) Index: paneltabbar.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/paneltabbar.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** paneltabbar.cpp 27 Jul 2004 19:22:42 -0000 1.8 --- paneltabbar.cpp 28 Aug 2004 21:51:07 -0000 1.9 *************** *** 35,38 **** --- 35,40 ---- insertAction(krNewTab); insertAction(krDupTab); + insertAction(krPreviousTab); + insertAction(krNextTab); insertAction(krCloseTab); krCloseTab->setEnabled(false); //can't close a single tab Index: krusader.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.h,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** krusader.h 23 Jul 2004 00:03:17 -0000 1.22 --- krusader.h 28 Aug 2004 21:51:07 -0000 1.23 *************** *** 104,108 **** static KAction *actKonfigurator, *actToolsSetup, *actBack, *actRoot, *actFind, *actDirUp; static KAction *actSelectColorMask, *actMultiRename, *actAllFilter, *actOpenLeftBm, *actOpenRightBm; ! static KAction *actNewTab, *actDupTab, *actCloseTab, *actSplit, *actCombine, *actUserMenu, *actSyncDirs; static KToggleAction *actToggleTerminal; KToggleAction *actToggleFnkeys, *actToggleCmdline, *actShowToolBar, --- 104,109 ---- static KAction *actKonfigurator, *actToolsSetup, *actBack, *actRoot, *actFind, *actDirUp; static KAction *actSelectColorMask, *actMultiRename, *actAllFilter, *actOpenLeftBm, *actOpenRightBm; ! static KAction *actNewTab, *actDupTab, *actCloseTab, *actPreviousTab, *actNextTab, *actSplit; ! static KAction *actCombine, *actUserMenu, *actSyncDirs; static KToggleAction *actToggleTerminal; KToggleAction *actToggleFnkeys, *actToggleCmdline, *actShowToolBar, *************** *** 178,181 **** --- 179,184 ---- #define krDupTab Krusader::App->actDupTab #define krCloseTab Krusader::App->actCloseTab + #define krNextTab Krusader::App->actNextTab + #define krPreviousTab Krusader::App->actPreviousTab #define krSplit Krusader::App->actSplit #define krCombine Krusader::App->actCombine Index: krslots.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/krslots.cpp,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** krslots.cpp 31 Jul 2004 22:52:39 -0000 1.57 --- krslots.cpp 28 Aug 2004 21:51:07 -0000 1.58 *************** *** 551,554 **** --- 551,562 ---- } + void KRslots::nextTab() { + ACTIVE_PANEL_MANAGER->slotNextTab(); + } + + void KRslots::previousTab() { + ACTIVE_PANEL_MANAGER->slotPreviousTab(); + } + void KRslots::newTab(QListViewItem *item) { if (!item) return; *************** *** 556,560 **** if (it->isDir()) { ACTIVE_PANEL_MANAGER->slotNewTab(ACTIVE_PANEL->virtualPath + "/" + it->name()); ! kdWarning() << ACTIVE_PANEL->virtualPath << it->name()<<endl; } } --- 564,568 ---- if (it->isDir()) { ACTIVE_PANEL_MANAGER->slotNewTab(ACTIVE_PANEL->virtualPath + "/" + it->name()); ! //kdWarning() << ACTIVE_PANEL->virtualPath << it->name()<<endl; } } Index: panelmanager.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/panelmanager.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** panelmanager.cpp 18 Aug 2004 15:20:46 -0000 1.14 --- panelmanager.cpp 28 Aug 2004 21:51:07 -0000 1.15 *************** *** 148,151 **** --- 148,153 ---- void PanelManager::slotRefreshActions() { krCloseTab->setEnabled( _tabbar->count() > 1 ); + krNextTab->setEnabled(_tabbar->count() > 1); + krPreviousTab->setEnabled(_tabbar->count() > 1); } *************** *** 186,187 **** --- 188,206 ---- } } + + void PanelManager::slotNextTab() { + int currTab = _tabbar->currentTab(); + int nextInd = (_tabbar->indexOf(currTab) == _tabbar->count()-1 ? 0 : _tabbar->indexOf(currTab)+1); + ListPanel *nextp = dynamic_cast<PanelTab*>(_tabbar->tabAt(nextInd))->panel; + _tabbar->setCurrentTab(_tabbar->tabAt(nextInd)); + slotChangePanel(nextp); + } + + + void PanelManager::slotPreviousTab() { + int currTab = _tabbar->currentTab(); + int nextInd = (_tabbar->indexOf(currTab) == 0 ? _tabbar->count()-1 : _tabbar->indexOf(currTab)-1); + ListPanel *nextp = dynamic_cast<PanelTab*>(_tabbar->tabAt(nextInd))->panel; + _tabbar->setCurrentTab(_tabbar->tabAt(nextInd)); + slotChangePanel(nextp); + } Index: krusader.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.cpp,v retrieving revision 1.82 retrieving revision 1.83 diff -C2 -d -r1.82 -r1.83 *** krusader.cpp 25 Aug 2004 18:30:56 -0000 1.82 --- krusader.cpp 28 Aug 2004 21:51:07 -0000 1.83 *************** *** 122,125 **** --- 122,127 ---- KAction *Krusader::actDupTab = 0; KAction *Krusader::actCloseTab = 0; + KAction *Krusader::actNextTab = 0; + KAction *Krusader::actPreviousTab = 0; KAction *Krusader::actSplit = 0; KAction *Krusader::actCombine = 0; *************** *** 511,514 **** --- 513,520 ---- actCloseTab = new KAction( i18n( "Close tab" ), ALT + CTRL + Key_C, SLOTS, SLOT( closeTab() ), actionCollection(), "close tab" ); + actNextTab = new KAction( i18n( "Next tab" ), SHIFT + Key_Right, SLOTS, + SLOT( nextTab() ), actionCollection(), "next tab" ); + actPreviousTab = new KAction( i18n( "Previous tab" ), SHIFT + Key_Left, SLOTS, + SLOT( previousTab() ), actionCollection(), "previous tab" ); actUserMenu = new KAction( i18n( "User Menu" ), ALT + Key_QuoteLeft, SLOTS, SLOT( userMenu() ), actionCollection(), "user menu" ); Index: krslots.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/krslots.h,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** krslots.h 31 Jul 2004 22:51:05 -0000 1.25 --- krslots.h 28 Aug 2004 21:51:07 -0000 1.26 *************** *** 114,117 **** --- 114,119 ---- void newTab(QListViewItem *item); void closeTab(); + void nextTab(); + void previousTab(); void slotSplit(); void slotCombine(); Index: panelmanager.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/panelmanager.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** panelmanager.h 18 Aug 2004 15:20:46 -0000 1.9 --- panelmanager.h 28 Aug 2004 21:51:07 -0000 1.10 *************** *** 54,57 **** --- 54,59 ---- void slotNewTab(QString path); void slotNewTab(); + void slotNextTab(); + void slotPreviousTab(); void slotCloseTab(); |