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: Karai C. <ck...@us...> - 2004-08-31 20:51:39
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Synchronizer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11675/krusader_kde3/krusader/Synchronizer Modified Files: synchronizergui.cpp synchronizergui.h Log Message: FIXED: compare content error at remote URL-s (problem with sleep 2) Index: synchronizergui.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Synchronizer/synchronizergui.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** synchronizergui.h 17 Aug 2004 12:31:17 -0000 1.11 --- synchronizergui.h 31 Aug 2004 20:51:29 -0000 1.12 *************** *** 118,123 **** void saveProfile( QString, int ); - void rightMenuCompareFiles( KURL url1, KURL url2 ); - protected: virtual void keyPressEvent( QKeyEvent * ); --- 118,121 ---- Index: synchronizergui.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Synchronizer/synchronizergui.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** synchronizergui.cpp 18 Aug 2004 11:35:35 -0000 1.20 --- synchronizergui.cpp 31 Aug 2004 20:51:29 -0000 1.21 *************** *** 36,39 **** --- 36,40 ---- #include "../Dialogs/krspwidgets.h" #include "../krservices.h" + #include "../krslots.h" #include "synchronizedialog.h" #include <qlayout.h> *************** *** 1640,1644 **** break; case COMPARE_FILES_ID: ! rightMenuCompareFiles( leftURL, rightURL ); break; case SELECT_ITEMS_ID: --- 1641,1645 ---- break; case COMPARE_FILES_ID: ! SLOTS->compareContent( leftURL, rightURL ); break; case SELECT_ITEMS_ID: *************** *** 1967,2009 **** } - void SynchronizerGUI::rightMenuCompareFiles( KURL url1, KURL url2 ) - { - QString diffProg; - QStringList lst = Krusader::supportedTools(); - if (lst.contains("DIFF")) diffProg=lst[lst.findIndex("DIFF") + 1]; - else { - KMessageBox::error(0,i18n("Krusader can't find any of the supported diff-frontends. Please install one to your path. Hint: Krusader supports kdiff and xxdiff.")); - return; - } - - // else implied: all ok, let's call kdiff - // but if one of the files isn't local, download them first - - QString tmp1 = QString::null, tmp2 = QString::null; - if (!url1.isLocalFile()) { - if( !KIO::NetAccess::download( url1, tmp1 ) ){ - KMessageBox::sorry(krApp,i18n("Krusader is unable to download: ")+url1.prettyURL(0,KURL::StripFileProtocol)); - return; - } - } else tmp1 = url1.path(); - if (!url2.isLocalFile()) { - if( !KIO::NetAccess::download( url2, tmp2 ) ){ - KMessageBox::sorry(krApp,i18n("Krusader is unable to download: ")+url2.prettyURL(0,KURL::StripFileProtocol)); - return; - } - } else tmp2 = url2.path(); - - KProcess p; - p << diffProg << tmp1 << tmp2; - if (!p.start(KProcess::DontCare)) - KMessageBox::error(0,i18n("Error executing ")+diffProg+" !"); - else - p.detach(); - sleep(3); - - if( tmp1 != url1.path() ) KIO::NetAccess::removeTempFile( tmp1 ); - if( tmp2 != url2.path() ) KIO::NetAccess::removeTempFile( tmp2 ); - } - void SynchronizerGUI::swapSides() { --- 1968,1971 ---- |
|
From: Karai C. <ck...@us...> - 2004-08-31 20:51:39
|
Update of /cvsroot/krusader/krusader_kde3/krusader In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11675/krusader_kde3/krusader Modified Files: krslots.cpp krslots.h Log Message: FIXED: compare content error at remote URL-s (problem with sleep 2) Index: krslots.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/krslots.cpp,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** krslots.cpp 30 Aug 2004 20:37:38 -0000 1.59 --- krslots.cpp 31 Aug 2004 20:51:29 -0000 1.60 *************** *** 141,152 **** void KRslots::compareContent() { - QString diffProg; - QStringList lst = Krusader::supportedTools(); - if (lst.contains("DIFF")) diffProg=lst[lst.findIndex("DIFF") + 1]; - else { - KMessageBox::error(0,i18n("Krusader can't find any of the supported diff-frontends. Please install one to your path. Hint: Krusader supports kdiff and xxdiff.")); - return; - } - QStringList lst1, lst2; QString name1, name2; --- 141,144 ---- *************** *** 169,200 **** // else implied: all ok, let's call kdiff ! // but if one of the files isn't local, download them first ! KURL url1 = MAIN_VIEW->left->func->files()->vfs_getFile(name1); ! KURL url2 = MAIN_VIEW->right->func->files()->vfs_getFile(name2); ! QString tmp1 = QString::null, tmp2 = QString::null; if (!url1.isLocalFile()) { ! if( !KIO::NetAccess::download( url1, tmp1 ) ){ ! KMessageBox::sorry(krApp,i18n("Krusader is unable to download: ")+name1); return; } ! } else tmp1 = url1.path(); if (!url2.isLocalFile()) { ! if( !KIO::NetAccess::download( url2, tmp2 ) ){ ! KMessageBox::sorry(krApp,i18n("Krusader is unable to download: ")+name1); return; } ! } else tmp2 = url2.path(); ! KProcess p; ! p << diffProg << tmp1 << tmp2; ! if (!p.start(KProcess::DontCare)) KMessageBox::error(0,i18n("Error executing ")+diffProg+" !"); - else - p.detach(); - sleep(2); - - if( tmp1 != url1.path() ) KIO::NetAccess::removeTempFile( tmp1 ); - if( tmp2 != url2.path() ) KIO::NetAccess::removeTempFile( tmp2 ); } --- 161,222 ---- // else implied: all ok, let's call kdiff ! // but if one of the files isn't local, download them first ! compareContent( MAIN_VIEW->left->func->files()->vfs_getFile(name1), ! MAIN_VIEW->right->func->files()->vfs_getFile(name2) ); ! } ! class KrProcess: public KProcess ! { ! QString tmp1, tmp2; ! ! public: ! KrProcess( QString in1, QString in2 ) ! { ! tmp1 = in1; ! tmp2 = in2; ! } ! ! virtual void processHasExited (int ) ! { ! if( !tmp1.isEmpty() ) ! KIO::NetAccess::removeTempFile( tmp1 ); ! if( !tmp2.isEmpty() ) ! KIO::NetAccess::removeTempFile( tmp2 ); ! delete this; ! } ! }; ! ! void KRslots::compareContent( KURL url1, KURL url2 ) ! { ! QString diffProg; ! QStringList lst = Krusader::supportedTools(); ! if (lst.contains("DIFF")) diffProg=lst[lst.findIndex("DIFF") + 1]; ! else { ! KMessageBox::error(0,i18n("Krusader can't find any of the supported diff-frontends. Please install one to your path. Hint: Krusader supports kdiff and xxdiff.")); ! return; ! } ! ! QString tmp1 = QString::null, tmp2 = QString::null; ! if (!url1.isLocalFile()) { ! if( !KIO::NetAccess::download( url1, tmp1, 0 ) ){ ! KMessageBox::sorry(krApp,i18n("Krusader is unable to download: ")+url1.fileName()); return; } ! } else tmp1 = url1.path(); if (!url2.isLocalFile()) { ! if( !KIO::NetAccess::download( url2, tmp2, 0 ) ){ ! KMessageBox::sorry(krApp,i18n("Krusader is unable to download: ")+url2.fileName()); ! if( tmp1 != url1.path() ) ! KIO::NetAccess::removeTempFile( tmp1 ); return; } ! } else tmp2 = url2.path(); ! KrProcess *p = new KrProcess( tmp1 != url1.path() ? tmp1 : QString::null, ! tmp2 != url2.path() ? tmp2 : QString::null ); ! *p << diffProg << tmp1 << tmp2; ! if (!p->start(KProcess::DontCare)) KMessageBox::error(0,i18n("Error executing ")+diffProg+" !"); } Index: krslots.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/krslots.h,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** krslots.h 30 Aug 2004 20:37:38 -0000 1.27 --- krslots.h 31 Aug 2004 20:51:29 -0000 1.28 *************** *** 44,47 **** --- 44,48 ---- class ListPanel; + class KURL; class KRslots : public QObject { *************** *** 59,62 **** --- 60,64 ---- void sendFileByEmail( QString filename ); void compareContent(); + void compareContent( KURL, KURL ); void rightclickMenu(); void insertFileName(bool full_path); |
|
From: Karai C. <ck...@us...> - 2004-08-31 19:35:42
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Konfigurator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29756/krusader_kde3/krusader/Konfigurator Modified Files: kglookfeel.cpp Log Message: ADDED: short tab names Index: kglookfeel.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Konfigurator/kglookfeel.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** kglookfeel.cpp 27 Jul 2004 21:26:29 -0000 1.15 --- kglookfeel.cpp 31 Aug 2004 19:35:33 -0000 1.16 *************** *** 63,66 **** --- 63,67 ---- {"Look&Feel","Mark Dirs", _MarkDirs, i18n( "Automark directories" ), false, ""}, {"Look&Feel","Case Sensative Sort", _CaseSensativeSort, i18n( "Case sensitive sorting" ), false, ""}, + {"Look&Feel","Fullpath Tab Names", _FullPathTabNames, i18n( "Use fullpath tab names" ), true , ""}, //{"Look&Feel","Single Click Selects", false, i18n( "Single click executes" ), false, ""}, {"Look&Feel","New Style Quicksearch", _NewStyleQuicksearch, i18n( "New style quicksearch" ), false, ""}, *************** *** 68,72 **** }; ! cbs = createCheckBoxGroup( 2, 0, settings, 7/*8*/, lookFeelGrp ); lookFeelGrid->addWidget( cbs, 0, 0 ); connect( cbs->find( "New Style Quicksearch" ), SIGNAL( stateChanged( int ) ), this, SLOT( slotDisable() ) ); --- 69,73 ---- }; ! cbs = createCheckBoxGroup( 2, 0, settings, 8/*9*/, lookFeelGrp ); lookFeelGrid->addWidget( cbs, 0, 0 ); connect( cbs->find( "New Style Quicksearch" ), SIGNAL( stateChanged( int ) ), this, SLOT( slotDisable() ) ); |
|
From: Karai C. <ck...@us...> - 2004-08-31 19:35:42
|
Update of /cvsroot/krusader/krusader_kde3/krusader In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29756/krusader_kde3/krusader Modified Files: defaults.h paneltabbar.cpp Log Message: ADDED: short tab names Index: paneltabbar.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/paneltabbar.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** paneltabbar.cpp 28 Aug 2004 21:51:07 -0000 1.9 --- paneltabbar.cpp 31 Aug 2004 19:35:33 -0000 1.10 *************** *** 20,23 **** --- 20,24 ---- #include "krusaderview.h" #include "krslots.h" + #include "defaults.h" #include <kaction.h> #include <klocale.h> *************** *** 135,138 **** --- 136,169 ---- QString PanelTabBar::squeeze(QString text, int index) { + QString originalText = text; + + QString lastGroup = krConfig->group(); + krConfig->setGroup( "Look&Feel" ); + bool longNames = krConfig->readBoolEntry( "Fullpath Tab Names", _FullPathTabNames ); + krConfig->setGroup( lastGroup ); + + if( !longNames ) + { + while( text.endsWith( "/" ) ) + text.truncate( text.length() -1 ); + if( text.isEmpty() || text.endsWith(":") ) + text += "/"; + else + { + QString shortName; + + if( text.contains( ":/" ) ) + shortName = text.left( text.find( ":/" ) ) + ":"; + + shortName += text.mid( text.findRev( "/" ) + 1 ); + text = shortName; + } + + if( index >= 0 ) + setToolTip( index, originalText ); + + index = -1; + } + QFontMetrics fm(fontMetrics()); *************** *** 176,180 **** if( index >= 0 ) ! setToolTip( tabAt(index)->identifier(), text ); if (letters < 5) { --- 207,211 ---- if( index >= 0 ) ! setToolTip( index, originalText ); if (letters < 5) { *************** *** 187,191 **** } else { if( index >= 0 ) ! removeToolTip( tabAt(index)->identifier() ); return text; --- 218,222 ---- } else { if( index >= 0 ) ! removeToolTip( index ); return text; Index: defaults.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/defaults.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** defaults.h 20 Aug 2004 18:47:57 -0000 1.15 --- defaults.h 31 Aug 2004 19:35:33 -0000 1.16 *************** *** 88,91 **** --- 88,93 ---- // Mouse Selection ///// #define _MouseSelection 0 // 0 - normal (shift+click, ctrl+click), 1 - left click, 2 - right click + // Use fullpath tab names ///// + #define _FullPathTabNames false // Panel Toolbar Checkboxes |
|
From: Karai C. <ck...@us...> - 2004-08-31 19:35:41
|
Update of /cvsroot/krusader/krusader_kde3 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29756/krusader_kde3 Modified Files: ChangeLog Log Message: ADDED: short tab names Index: ChangeLog =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v retrieving revision 1.292 retrieving revision 1.293 diff -C2 -d -r1.292 -r1.293 *** ChangeLog 30 Aug 2004 20:37:37 -0000 1.292 --- ChangeLog 31 Aug 2004 19:35:32 -0000 1.293 *************** *** 1,3 **** --- 1,4 ---- ====================== + ADDED: short tab names ADDED: compare directories (mark menu) ADDED: shift+left/right changes tabs (thanks to Dmitry Suzdalev) |
|
From: Dirk E. <des...@us...> - 2004-08-30 21:08:05
|
Update of /cvsroot/krusader/krusader_kde3/po In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26781/po Modified Files: hu.po Log Message: krusader-1.50-cvs Index: hu.po =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/po/hu.po,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** hu.po 7 Aug 2004 13:48:31 -0000 1.9 --- hu.po 30 Aug 2004 21:07:54 -0000 1.10 *************** *** 12,27 **** "Project-Id-Version: krusader-1.50-cvs\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2004-08-07 15:42+0200\n" ! "PO-Revision-Date: 2003-10-19 19:19+0200\n" ! "Last-Translator: Zoltan Kukk <kuk...@fr...>\n" "Language-Team: Hungarian\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" ! "X-Generator: KBabel 1.0.2\n" [...4255 lines suppressed...] - #~ msgstr "Lista, Gyorsnézet" - - #~ msgid "Tree, List" - #~ msgstr "Fa, Lista" - - #~ msgid "Quickview, List" - #~ msgstr "Gyorsnézet, Lista" - - #~ msgid "Panel types (left,right):" - #~ msgstr "Panel tÃpusa (bal, jobb):" - - #~ msgid "Choose an editor" - #~ msgstr "Válasszon egy szerkesztÅt" - - #~ msgid "Choose a terminal" - #~ msgstr "Válasszon egy terminált" - - #~ msgid "Choose a temporary directory" - #~ msgstr "Adjon meg egy átmeneti könyvtárat" --- 4283,4284 ---- |
|
From: Karai C. <ck...@us...> - 2004-08-30 20:37:51
|
Update of /cvsroot/krusader/krusader_kde3 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20614/krusader_kde3 Modified Files: ChangeLog Log Message: ADDED: compare directories in mark menu Index: ChangeLog =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v retrieving revision 1.291 retrieving revision 1.292 diff -C2 -d -r1.291 -r1.292 *** ChangeLog 28 Aug 2004 21:51:07 -0000 1.291 --- ChangeLog 30 Aug 2004 20:37:37 -0000 1.292 *************** *** 1,3 **** --- 1,4 ---- ====================== + ADDED: compare directories (mark menu) ADDED: shift+left/right changes tabs (thanks to Dmitry Suzdalev) ADDED: linking mimes and protocols |
|
From: Karai C. <ck...@us...> - 2004-08-30 20:37:50
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Locate In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20614/krusader_kde3/krusader/Locate Modified Files: locate.cpp Log Message: ADDED: compare directories in mark menu Index: locate.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Locate/locate.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** locate.cpp 26 Aug 2004 15:21:01 -0000 1.6 --- locate.cpp 30 Aug 2004 20:37:38 -0000 1.7 *************** *** 216,220 **** collectedErr = ""; bool result = !locateProc.start( KProcess::Block, KProcess::AllOutput ); ! if( !collectedErr.isEmpty() ) { KMessageBox::error( krApp, i18n( "Locate produced the following error message:\n\n" ) + collectedErr ); --- 216,220 ---- collectedErr = ""; bool result = !locateProc.start( KProcess::Block, KProcess::AllOutput ); ! if( !collectedErr.isEmpty() && ( !locateProc.normalExit() || locateProc.exitStatus() ) ) { KMessageBox::error( krApp, i18n( "Locate produced the following error message:\n\n" ) + collectedErr ); *************** *** 222,228 **** { KMessageBox::error( krApp, i18n( "Error during the start of `locate` process!" ) ); - }else if ( !locateProc.normalExit() || locateProc.exitStatus() ) - { - KMessageBox::error( krApp, i18n( "Error occured during the execution of `locate` process!" ) ); } enableButton( KDialogBase::User3, true ); /* enable the locate button */ --- 222,225 ---- |
|
From: Karai C. <ck...@us...> - 2004-08-30 20:37:48
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20614/krusader_kde3/krusader/Panel Modified Files: listpanel.cpp listpanel.h Log Message: ADDED: compare directories in mark menu Index: listpanel.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.h,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** listpanel.h 31 Jul 2004 22:51:41 -0000 1.25 --- listpanel.h 30 Aug 2004 20:37:38 -0000 1.26 *************** *** 94,97 **** --- 94,98 ---- void select( bool, bool ); // see doc in ListPanel void invertSelection(); // see doc in ListPanel + void compareDirs(); void slotFocusOnMe(); // give this VFS the focus (the path bar) void slotUpdate(); // when the vfs finish to update... Index: listpanel.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.cpp,v retrieving revision 1.85 retrieving revision 1.86 diff -C2 -d -r1.85 -r1.86 *** listpanel.cpp 10 Aug 2004 21:21:06 -0000 1.85 --- listpanel.cpp 30 Aug 2004 20:37:38 -0000 1.86 *************** *** 374,377 **** --- 374,431 ---- } + void ListPanel::compareDirs() { + krConfig->setGroup( "Private" ); + int compareMode = krConfig->readNumEntry( "Compare Mode", 0 ); + krConfig->setGroup( "Look&Feel" ); + bool selectDirs = krConfig->readBoolEntry( "Mark Dirs", false ); + + KrViewItem *item, *otherItem; + + for( item = view->getFirst(); item != 0; item = view->getNext( item ) ) + { + if( item->name() == ".." ) + continue; + + for( otherItem = otherPanel->view->getFirst(); otherItem != 0 && otherItem->name() != item->name() ; + otherItem = otherPanel->view->getNext( otherItem ) ); + + bool isSingle = ( otherItem == 0 ), isDifferent = false, isNewer = false; + + if( item->isDir() && !selectDirs ) + { + item->setSelected( false ); + continue; + } + + if( otherItem ) + { + if( !item->isDir() ) + isDifferent = otherItem->size() != item->size(); + isNewer = item->getTime_t() > otherItem->getTime_t(); + } + + switch( compareMode ) + { + case 0: + item->setSelected( isNewer || isSingle ); + break; + case 1: + item->setSelected( isNewer ); + break; + case 2: + item->setSelected( isSingle ); + break; + case 3: + item->setSelected( isDifferent || isSingle ); + break; + case 4: + item->setSelected( isDifferent ); + break; + } + } + + view->updateView(); + } + void ListPanel::slotFocusOnMe() { // give this VFS the focus (the path bar) |
|
From: Karai C. <ck...@us...> - 2004-08-30 20:37:48
|
Update of /cvsroot/krusader/krusader_kde3/krusader In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20614/krusader_kde3/krusader Modified Files: krslots.cpp krslots.h krusader.cpp krusader.h krusaderui.rc Log Message: ADDED: compare directories in mark menu Index: krusader.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.h,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** krusader.h 28 Aug 2004 21:51:07 -0000 1.23 --- krusader.h 30 Aug 2004 20:37:38 -0000 1.24 *************** *** 99,103 **** static KAction *actProperties, *actPack, *actUnpack, *actTest, *actCompare, *actCmdlinePopup; static KAction *actCalculate, *actSelect, *actUnselect, *actSelectAll, *actLocate; ! static KAction *actUnselectAll, *actInvert, *actSync, *actSavePosition; static KAction *actHomeTerminal, *actFTPConnect, *actFTPNewConnect, *actFTPDisconnect; static KAction *actExecFilter, *actCustomFilter, *actMountMan, *actNewTool, *actSwapPanels; --- 99,103 ---- static KAction *actProperties, *actPack, *actUnpack, *actTest, *actCompare, *actCmdlinePopup; static KAction *actCalculate, *actSelect, *actUnselect, *actSelectAll, *actLocate; ! static KAction *actUnselectAll, *actInvert, *actSync, *actSavePosition, *actCompDirs; static KAction *actHomeTerminal, *actFTPConnect, *actFTPNewConnect, *actFTPDisconnect; static KAction *actExecFilter, *actCustomFilter, *actMountMan, *actNewTool, *actSwapPanels; *************** *** 107,113 **** --- 107,117 ---- static KAction *actCombine, *actUserMenu, *actSyncDirs; static KToggleAction *actToggleTerminal; + static KRadioAction *actMarkNewerAndSingle, *actMarkNewer, *actMarkSingle, + *actMarkDifferentAndSingle, *actMarkDifferent; KToggleAction *actToggleFnkeys, *actToggleCmdline, *actShowToolBar, *actShowStatusBar, *actToggleHidden, *actCompareDirs; + static KRadioAction **compareArray[]; + // return a path to a temp dir or file we can use. QString getTempDir(); Index: krslots.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/krslots.cpp,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** krslots.cpp 28 Aug 2004 21:51:07 -0000 1.58 --- krslots.cpp 30 Aug 2004 20:37:38 -0000 1.59 *************** *** 773,775 **** --- 773,792 ---- } + void KRslots::compareDirs() + { + ACTIVE_PANEL->compareDirs(); + ACTIVE_PANEL->otherPanel->compareDirs(); + } + + void KRslots::compareSetup() + { + for( int i=0; Krusader::compareArray[i] != 0; i++ ) + if( (*Krusader::compareArray[i])->isChecked() ) + { + krConfig->setGroup( "Private" ); + krConfig->writeEntry( "Compare Mode", i ); + break; + } + } + #include "krslots.moc" Index: krusader.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.cpp,v retrieving revision 1.83 retrieving revision 1.84 diff -C2 -d -r1.83 -r1.84 *** krusader.cpp 28 Aug 2004 21:51:07 -0000 1.83 --- krusader.cpp 30 Aug 2004 20:37:38 -0000 1.84 *************** *** 94,97 **** --- 94,98 ---- KAction *Krusader::actUnselectAll = 0; KAction *Krusader::actInvert = 0; + KAction *Krusader::actCompDirs = 0; KAction *Krusader::actSync = 0; KAction *Krusader::actHomeTerminal = 0; *************** *** 129,132 **** --- 130,140 ---- KAction *Krusader::actSyncDirs = 0; KToggleAction *Krusader::actToggleTerminal = 0; + KRadioAction *Krusader::actMarkNewerAndSingle = 0; + KRadioAction *Krusader::actMarkSingle = 0; + KRadioAction *Krusader::actMarkNewer = 0; + KRadioAction *Krusader::actMarkDifferentAndSingle = 0; + KRadioAction *Krusader::actMarkDifferent = 0; + KRadioAction **Krusader::compareArray[] = {&actMarkNewerAndSingle, &actMarkNewer, &actMarkSingle, + &actMarkDifferentAndSingle, &actMarkDifferent, 0}; UserAction *Krusader::userAction = 0; UserMenu *Krusader::userMenu = 0; *************** *** 391,394 **** --- 399,405 ---- //KStdAction::up( SLOTS, SLOT( dirUp() ), actionCollection(), "std_up" )->setShortcut(Key_Backspace); /* Shortcut disabled because of the Terminal Emulator bug. */ + krConfig->setGroup( "Private" ); + int compareMode = krConfig->readNumEntry( "Compare Mode", 0 ); + KStdAction::home( SLOTS, SLOT( home() ), actionCollection(), "std_home" ); /*->setShortcut(Key_QuoteLeft);*/ KAction *actRedisplay = KStdAction::redisplay( SLOTS, SLOT( refresh() ), actionCollection(), "std_redisplay" ); *************** *** 455,458 **** --- 466,488 ---- actUnselectAll = new KAction( i18n( "U&nselect All" ), "kr_unselectall", ALT + Key_Minus, SLOTS, SLOT( unmarkAll() ), actionCollection(), "unselect all" ); + actCompDirs = new KAction( i18n( "&Compare Directories" ), "view_left_right", 0, + SLOTS, SLOT( compareDirs() ), actionCollection(), "compare dirs" ); + actMarkNewerAndSingle = new KRadioAction( i18n( "&Mark Newer And Single" ), 0, + SLOTS, SLOT( compareSetup() ), actionCollection(), "mark_newer_and_single" ); + actMarkNewer = new KRadioAction( i18n( "Mark &Newer" ), 0, + SLOTS, SLOT( compareSetup() ), actionCollection(), "mark_newer" ); + actMarkSingle = new KRadioAction( i18n( "Mark &Single" ), 0, + SLOTS, SLOT( compareSetup() ), actionCollection(), "mark_single" ); + actMarkDifferentAndSingle = new KRadioAction( i18n( "Mark Different &And Single" ), 0, + SLOTS, SLOT( compareSetup() ), actionCollection(), "mark_different_and_single" ); + actMarkDifferent = new KRadioAction( i18n( "Mark &Different" ), 0, + SLOTS, SLOT( compareSetup() ), actionCollection(), "mark_different" ); + actMarkNewerAndSingle->setExclusiveGroup( "mark group" ); + actMarkNewer->setExclusiveGroup( "mark group" ); + actMarkSingle->setExclusiveGroup( "mark group" ); + actMarkDifferentAndSingle->setExclusiveGroup( "mark group" ); + actMarkDifferent->setExclusiveGroup( "mark group" ); + if( compareMode < (int)( sizeof( compareArray ) / sizeof( KRadioAction ** ) ) -1 ) + (*compareArray[ compareMode ])->setChecked( true ); actHomeTerminal = new KAction( i18n( "&Terminal" ), "konsole", 0, SLOTS, SLOT( homeTerminal() ), actionCollection(), "terminal@home" ); Index: krslots.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/krslots.h,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** krslots.h 28 Aug 2004 21:51:07 -0000 1.26 --- krslots.h 30 Aug 2004 20:37:38 -0000 1.27 *************** *** 78,81 **** --- 78,83 ---- void unmarkGroup(); void invert(); + void compareDirs(); + void compareSetup(); void refresh(); void refresh( const KURL& u ); Index: krusaderui.rc =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusaderui.rc,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** krusaderui.rc 12 Feb 2004 08:11:31 -0000 1.18 --- krusaderui.rc 30 Aug 2004 20:37:38 -0000 1.19 *************** *** 1,3 **** ! <!DOCTYPE kpartgui ><kpartgui version="2" name="krusader" > <MenuBar> <Menu name="file" > --- 1,3 ---- ! <!DOCTYPE kpartgui ><kpartgui version="3" name="krusader" > <MenuBar> <Menu name="file" > *************** *** 27,30 **** --- 27,40 ---- <Action name="unselect all" /> <Action name="invert" /> + <Separator/> + <Action name="compare dirs" /> + <Menu name="compare setup"> + <text>Compare Se&tup</text> + <Action name="mark_newer_and_single" /> + <Action name="mark_single" /> + <Action name="mark_newer" /> + <Action name="mark_different_and_single" /> + <Action name="mark_different" /> + </Menu> </Menu> <Menu name="commands" > |
|
From: Rafi Y. <ya...@us...> - 2004-08-30 15:35:23
|
Update of /cvsroot/krusader/krusader_kde3/krusader/VFS In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22543/krusader/VFS Modified Files: vfs.cpp Log Message: removed debug messages... Index: vfs.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/vfs.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** vfs.cpp 30 Aug 2004 09:39:49 -0000 1.13 --- vfs.cpp 30 Aug 2004 15:35:14 -0000 1.14 *************** *** 116,121 **** vfs_filesP->setAutoDelete(true); - kdDebug() << "vfs_refresh: " << vfs_origin.url() << endl; - // and populate it krConfig->setGroup("Look&Feel"); --- 116,119 ---- *************** *** 134,137 **** --- 132,136 ---- emit deletedVfile(name); vfs_searchP->remove(name); + // the remove() advance our iterator ! vf = vfileIterator->current(); } else { *************** *** 143,147 **** vf=vfs_getNextFile(); } ! removeFromList(name); } // everything thats left is a new file --- 142,146 ---- vf=vfs_getNextFile(); } ! removeFromList(name); } // everything thats left is a new file *************** *** 154,158 **** *newVf = *vf; vfs_searchP->insert(newVf->vfile_getName(),newVf); - kdDebug() << "emit addedVfile: "<< vf->vfile_getName() << endl; emit addedVfile(newVf); } --- 153,156 ---- |
|
From: Rafi Y. <ya...@us...> - 2004-08-30 09:40:11
|
Update of /cvsroot/krusader/krusader_kde3/krusader/VFS In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25493/krusader/VFS Modified Files: vfs.cpp Log Message: Fixed a doubling the file after delete on refresh() Index: vfs.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/vfs.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** vfs.cpp 28 Aug 2004 20:28:17 -0000 1.12 --- vfs.cpp 30 Aug 2004 09:39:49 -0000 1.13 *************** *** 116,119 **** --- 116,121 ---- vfs_filesP->setAutoDelete(true); + kdDebug() << "vfs_refresh: " << vfs_origin.url() << endl; + // and populate it krConfig->setGroup("Look&Feel"); *************** *** 121,146 **** bool res = populateVfsList(vfs_getOrigin(),showHidden); if( res ){ // compare the two list emiting signals when needed;; ! for( vfile* vf = vfs_getFirstFile(); vf ; vf=vfs_getNextFile() ){ ! QString name = vf->vfile_getName(); vfile* newVf = (*vfs_filesP)[name]; if( !newVf ){ // the file was deleted.. emit deletedVfile(name); vfs_searchP->remove(name); ! } else if( *vf != *newVf ){ ! // the file was changed.. ! *vf = *newVf; ! emit updatedVfile(vf); } ! removeFromList(name); } // everything thats left is a new file QDictIterator<vfile> it(*vfs_filesP); for(vfile* vf=it.toFirst(); vf; vf=(++it)){ vfile* newVf = new vfile(); *newVf = *vf; vfs_searchP->insert(newVf->vfile_getName(),newVf); emit addedVfile(newVf); } --- 123,158 ---- bool res = populateVfsList(vfs_getOrigin(),showHidden); + QString name; if( res ){ // compare the two list emiting signals when needed;; ! for( vfile* vf = vfs_getFirstFile(); vf ; ){ ! name = vf->vfile_getName(); vfile* newVf = (*vfs_filesP)[name]; + if( !newVf ){ // the file was deleted.. emit deletedVfile(name); vfs_searchP->remove(name); ! vf = vfileIterator->current(); ! } else { ! if( *vf != *newVf ){ ! // the file was changed.. ! *vf = *newVf; ! emit updatedVfile(vf); ! } ! vf=vfs_getNextFile(); } ! removeFromList(name); } // everything thats left is a new file QDictIterator<vfile> it(*vfs_filesP); for(vfile* vf=it.toFirst(); vf; vf=(++it)){ + // sanity checking + //if( !vf || (*vfs_searchP)[vf->vfile_getName()] ) continue; + vfile* newVf = new vfile(); *newVf = *vf; vfs_searchP->insert(newVf->vfile_getName(),newVf); + kdDebug() << "emit addedVfile: "<< vf->vfile_getName() << endl; emit addedVfile(newVf); } |
|
From: Shie E. <er...@us...> - 2004-08-28 23:04:11
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30519/krusader/Panel Modified Files: panelpopup.h Log Message: alpha support for dropping on the tree widget -> buggy! Index: panelpopup.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelpopup.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** panelpopup.h 7 Aug 2004 11:18:40 -0000 1.5 --- panelpopup.h 28 Aug 2004 23:04:02 -0000 1.6 *************** *** 8,12 **** #include <qguardedptr.h> #include <kio/previewjob.h> ! class QButtonGroup; --- 8,12 ---- #include <qguardedptr.h> #include <kio/previewjob.h> ! #include <kurl.h> class QButtonGroup; *************** *** 39,42 **** --- 39,43 ---- void tabSelected(int id); void treeSelection(QListViewItem*); + void slotDroppedOnTree(KURL::List &lst, KURL &url); void quickSelect(); |
|
From: Shie E. <er...@us...> - 2004-08-28 23:03:45
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30418/krusader/Panel Modified Files: panelpopup.cpp Log Message: alpha support for dropping on the tree widget -> buggy! Index: panelpopup.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelpopup.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** panelpopup.cpp 7 Aug 2004 11:52:12 -0000 1.8 --- panelpopup.cpp 28 Aug 2004 23:03:36 -0000 1.9 *************** *** 15,18 **** --- 15,19 ---- #include <krviewitem.h> #include <klineedit.h> + #include <kio/jobclasses.h> #include <kdebug.h> *************** *** 71,79 **** // create the tree part ---------- ! tree = new KFileTreeView( stack ); stack->addWidget( tree, Tree ); tree->addColumn( "" ); tree->addBranch( "/", i18n( "Root Folder" ) ); tree->setDirOnlyMode( tree->branch( i18n( "Root Folder" ) ), true ); tree->branch( i18n( "Root Folder" ) ) ->setChildRecurse(false); --- 72,83 ---- // create the tree part ---------- ! tree = new KFileTreeView( stack ); ! tree->setAcceptDrops(true); ! connect(tree, SIGNAL(dropped (KURL::List &, KURL &)), this, SLOT(slotDroppedOnTree(KURL::List&, KURL& ))); stack->addWidget( tree, Tree ); tree->addColumn( "" ); tree->addBranch( "/", i18n( "Root Folder" ) ); tree->setDirOnlyMode( tree->branch( i18n( "Root Folder" ) ), true ); + tree->setShowFolderOpenPixmap(true); tree->branch( i18n( "Root Folder" ) ) ->setChildRecurse(false); *************** *** 235,236 **** --- 239,249 ---- krConfig->writeEntry( "Predefined Selections", lst ); } + + void PanelPopup::slotDroppedOnTree(KURL::List &lst, KURL &url) { + kdWarning() << "dest: " << url.url() << endl; + for (KURL::List::Iterator it = lst.begin(); it!=lst.end(); ++it) { + kdWarning() << (*it).url() << endl; + } + + KIO::CopyJob *job = KIO::copy(lst, url, true); + } |
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(); |
|
From: Shie E. <er...@us...> - 2004-08-28 21:51:17
|
Update of /cvsroot/krusader/krusader_kde3 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18529 Modified Files: CVSNEWS ChangeLog Log Message: shift+left/right changes tabs (thanks to Dmitry Suzdalev) Index: CVSNEWS =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/CVSNEWS,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** CVSNEWS 28 Aug 2004 20:28:17 -0000 1.11 --- CVSNEWS 28 Aug 2004 21:51:07 -0000 1.12 *************** *** 3,6 **** --- 3,8 ---- in some way an extension to the changelog. ------------------------------------------------------ + shift+left/right changes tabs (thanks to Dmitry Suzdalev) + New vfs_refresh() function only update changes when you re-read a panel and changes the content without the annying full redraw effect. Index: ChangeLog =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v retrieving revision 1.290 retrieving revision 1.291 diff -C2 -d -r1.290 -r1.291 *** ChangeLog 28 Aug 2004 21:22:48 -0000 1.290 --- ChangeLog 28 Aug 2004 21:51:07 -0000 1.291 *************** *** 1,3 **** --- 1,4 ---- ====================== + ADDED: shift+left/right changes tabs (thanks to Dmitry Suzdalev) ADDED: linking mimes and protocols ADDED: new delete dialog box: lists the file names to be deleted (thanks to dirk for the idea) |
|
From: Shie E. <er...@us...> - 2004-08-28 21:23:00
|
Update of /cvsroot/krusader/krusader_kde3 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14463 Modified Files: ChangeLog Log Message: Index: ChangeLog =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v retrieving revision 1.289 retrieving revision 1.290 diff -C2 -d -r1.289 -r1.290 *** ChangeLog 26 Aug 2004 15:47:56 -0000 1.289 --- ChangeLog 28 Aug 2004 21:22:48 -0000 1.290 *************** *** 31,34 **** --- 31,35 ---- REACTIVATED: usermenu (now using the new useraction-system) + FIXED: totals bar didn't update when an incremental refresh happened FIXED: locate doesn't report the errors occured during the search FIXED: the viewer size is forgotten in maximized mode (KDE hack) |
|
From: Shie E. <er...@us...> - 2004-08-28 21:22:18
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14357/krusader/Panel Modified Files: krdetailedview.cpp Log Message: fix: totals bar didn't update when an incremental refresh happened Index: krdetailedview.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedview.cpp,v retrieving revision 1.90 retrieving revision 1.91 diff -C2 -d -r1.90 -r1.91 *** krdetailedview.cpp 24 Aug 2004 08:06:05 -0000 1.90 --- krdetailedview.cpp 28 Aug 2004 21:22:08 -0000 1.91 *************** *** 277,287 **** ++_count; ensureItemVisible( currentItem() ); } void KrDetailedView::delItem( const QString &name ) { KrDetailedViewItem * it = dict[ name ]; ! if ( !it ) kdWarning() << "got signal deletedVfile(" << name << ") but can't find KrViewItem" << endl; ! else delete it; } --- 277,297 ---- ++_count; ensureItemVisible( currentItem() ); + emit selectionChanged(); } void KrDetailedView::delItem( const QString &name ) { KrDetailedViewItem * it = dict[ name ]; ! if ( !it ) { kdWarning() << "got signal deletedVfile(" << name << ") but can't find KrViewItem" << endl; ! return; ! } ! if (it->isDir()) { ! --_numDirs; ! } else { ! --_count; ! _countSize -= it->size(); ! } ! delete it; ! emit selectionChanged(); } *************** *** 302,305 **** --- 312,316 ---- setCurrentItem( vf->vfile_getName() ); } + emit selectionChanged(); } |
Update of /cvsroot/krusader/krusader_kde3/krusader/VFS In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7244/krusader/VFS Modified Files: ftp_vfs.cpp ftp_vfs.h normal_vfs.cpp normal_vfs.h vfile.cpp vfile.h vfs.cpp vfs.h Log Message: New vfs_refresh() function only update changes when you re-read a panel and changes the content without the annying full redraw effect. Index: vfile.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/vfile.h,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** vfile.h 25 Jul 2004 21:00:01 -0000 1.14 --- vfile.h 28 Aug 2004 20:28:16 -0000 1.15 *************** *** 48,51 **** --- 48,53 ---- public: + vfile(){} + /** * Use this constructor when you know the following files properties: \n *************** *** 75,78 **** --- 77,84 ---- const mode_t mode); + bool operator==(const vfile& vf) const; + vfile& operator= (const vfile& vf); + inline bool operator!=(const vfile& vf){ return !((*this)==vf); } + // following functions give-out file details inline const QString& vfile_getName() const { return vfile_name; } Index: vfs.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/vfs.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** vfs.h 30 Jul 2004 14:16:17 -0000 1.15 --- vfs.h 28 Aug 2004 20:28:17 -0000 1.16 *************** *** 80,84 **** virtual bool vfs_isWritable() { return isWritable; } /// Return vfile* or 0 if not found ! inline vfile* vfs_search(const QString& name){ return (*vfs_filesP)[name]; } /// The total size of all the files in the VFS, --- 80,84 ---- virtual bool vfs_isWritable() { return isWritable; } /// Return vfile* or 0 if not found ! inline vfile* vfs_search(const QString& name){ return (*vfs_searchP)[name]; } /// The total size of all the files in the VFS, *************** *** 100,108 **** public slots: /// Re-reads files and stats and fills the vfile list ! virtual bool vfs_refresh(const KURL& origin)=0; /// Used to refresh the VFS when a job finishs. it calls the refresh() slot /// or display a error message if the job fails virtual bool vfs_refresh(KIO::Job* job); ! virtual bool vfs_refresh(){ return vfs_refresh(vfs_getOrigin()); } virtual void vfs_setQuiet(bool beQuiet){ quietMode=beQuiet; } --- 100,108 ---- public slots: /// Re-reads files and stats and fills the vfile list ! virtual bool vfs_refresh(const KURL& origin); /// Used to refresh the VFS when a job finishs. it calls the refresh() slot /// or display a error message if the job fails virtual bool vfs_refresh(KIO::Job* job); ! virtual bool vfs_refresh(); virtual void vfs_setQuiet(bool beQuiet){ quietMode=beQuiet; } *************** *** 114,117 **** --- 114,119 ---- protected: + /// Feel the vfs dictionary with vfiles, must be implemented for each vfs + virtual bool populateVfsList(const KURL& origin, bool showHidden) = 0L; /// Set the vfile list pointer void setVfsFilesP(QDict<vfile>* dict); *************** *** 130,133 **** --- 132,136 ---- private: QDict<vfile>* vfs_filesP; //< Point to a lists of virtual files (vfile). + QDict<vfile>* vfs_searchP; //< Searches are preformed in this dictionary (usualy points to vfs_files) QDictIterator<vfile>* vfileIterator; //< Point to a dictionary of virtual files (vfile). }; Index: normal_vfs.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/normal_vfs.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** normal_vfs.h 11 Aug 2004 01:30:12 -0000 1.17 --- normal_vfs.h 28 Aug 2004 20:28:16 -0000 1.18 *************** *** 71,77 **** public slots: - /// Re-reads files and stats and fills the vfile list - virtual bool vfs_refresh(const KURL& origin); - void vfs_slotDirty(const QString& path); void vfs_slotCreated(const QString& path); --- 71,74 ---- *************** *** 80,86 **** protected: ! QDict<vfile> vfs_files; //< List of pointers to vfile ! KDirWatch *watcher; //< The internal dir watcher - use to detect changes in directories ! bool dirty; //< true if a watcher signal arrived while in quiet mode. vfile* vfileFromName(const QString& name,bool mimeTypeMagic); }; --- 77,86 ---- protected: ! /// Re-reads files and stats and fills the vfile list ! virtual bool populateVfsList(const KURL& origin, bool showHidden); ! ! QDict<vfile> vfs_files; //< Dictionary of pointers to vfile ! KDirWatch *watcher; //< The internal dir watcher - use to detect changes in directories ! bool dirty; //< true if a watcher signal arrived while in quiet mode. vfile* vfileFromName(const QString& name,bool mimeTypeMagic); }; Index: normal_vfs.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/normal_vfs.cpp,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** normal_vfs.cpp 17 Aug 2004 17:38:57 -0000 1.37 --- normal_vfs.cpp 28 Aug 2004 20:28:16 -0000 1.38 *************** *** 63,67 **** } ! bool normal_vfs::vfs_refresh(const KURL& origin){ QString path = origin.path(-1); --- 63,67 ---- } ! bool normal_vfs::populateVfsList(const KURL& origin, bool showHidden){ QString path = origin.path(-1); *************** *** 79,84 **** isWritable = true; - krConfig->setGroup("Look&Feel"); - bool hidden = krConfig->readBoolEntry("Show Hidden",_ShowHidden); krConfig->setGroup("General"); bool mtm = krConfig->readBoolEntry("Mimetype Magic",_MimetypeMagic); --- 79,82 ---- *************** *** 88,93 **** vfs_origin.setProtocol("file"); // do not remove ! vfs_origin.cleanPath(); - // clear the the list - clear(); DIR* dir = opendir(path.local8Bit()); --- 86,89 ---- *************** *** 107,111 **** // show hidden files ? ! if ( !hidden && name.left(1) == "." ) continue ; // we dont need the ".",".." enteries if (name=="." || name == "..") continue; --- 103,107 ---- // show hidden files ? ! if ( !showHidden && name.left(1) == "." ) continue ; // we dont need the ".",".." enteries if (name=="." || name == "..") continue; *************** *** 117,122 **** closedir(dir); - if (!quietMode) emit startUpdate(); - watcher = new KDirWatch(); // connect the watcher --- 113,116 ---- Index: ftp_vfs.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/ftp_vfs.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** ftp_vfs.cpp 13 Aug 2004 16:37:05 -0000 1.34 --- ftp_vfs.cpp 28 Aug 2004 20:28:16 -0000 1.35 *************** *** 125,160 **** if ( !quietMode ) job->showErrorDialog(krApp); } - else { - // if we got so far - so good - // tell the panel to refresh - if (!quietMode) { - emit startUpdate(); - } - } busy = false; } ! void ftp_vfs::startLister() { ! // Open the directory marked by origin ! krConfig->setGroup("Look&Feel"); ! //vfs_origin.adjustPath(+1); ! KIO::Job *job = KIO::listDir(vfs_origin,false, ! krConfig->readBoolEntry("Show Hidden",_ShowHidden)); ! connect(job,SIGNAL(entries(KIO::Job*,const KIO::UDSEntryList&)), ! this,SLOT(slotAddFiles(KIO::Job*,const KIO::UDSEntryList&))); ! connect(job,SIGNAL(redirection(KIO::Job*,const KURL&)), ! this,SLOT(slotRedirection(KIO::Job*,const KURL&))); ! connect(job,SIGNAL(permanentRedirection(KIO::Job*,const KURL&,const KURL&)), ! this,SLOT(slotPermanentRedirection(KIO::Job*,const KURL&,const KURL&))); ! ! connect(job,SIGNAL(result(KIO::Job*)), ! this,SLOT(slotListResult(KIO::Job*))); ! ! job->setWindow(krApp); ! ! if( !quietMode ) new KrProgress(job); ! } ! ! bool ftp_vfs::vfs_refresh(const KURL& origin) { QString errorMsg = QString::null; if ( !origin.isValid() ) --- 125,132 ---- if ( !quietMode ) job->showErrorDialog(krApp); } busy = false; } ! bool ftp_vfs::populateVfsList(const KURL& origin,bool showHidden) { QString errorMsg = QString::null; if ( !origin.isValid() ) *************** *** 170,180 **** busy = true; - // clear the the list and back up out current situation - clear(); vfs_origin = origin; //QTimer::singleShot( 0,this,SLOT(startLister()) ); listError = false; ! startLister(); while( busy ){ --- 142,166 ---- busy = true; vfs_origin = origin; //QTimer::singleShot( 0,this,SLOT(startLister()) ); listError = false; ! // Open the directory marked by origin ! krConfig->setGroup("Look&Feel"); ! //vfs_origin.adjustPath(+1); ! KIO::Job *job = KIO::listDir(vfs_origin,false,showHidden); ! connect(job,SIGNAL(entries(KIO::Job*,const KIO::UDSEntryList&)), ! this,SLOT(slotAddFiles(KIO::Job*,const KIO::UDSEntryList&))); ! connect(job,SIGNAL(redirection(KIO::Job*,const KURL&)), ! this,SLOT(slotRedirection(KIO::Job*,const KURL&))); ! connect(job,SIGNAL(permanentRedirection(KIO::Job*,const KURL&,const KURL&)), ! this,SLOT(slotPermanentRedirection(KIO::Job*,const KURL&,const KURL&))); ! ! connect(job,SIGNAL(result(KIO::Job*)), ! this,SLOT(slotListResult(KIO::Job*))); ! ! job->setWindow(krApp); ! ! if( !quietMode ) new KrProgress(job); while( busy ){ Index: ftp_vfs.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/ftp_vfs.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ftp_vfs.h 23 Jul 2004 17:28:36 -0000 1.11 --- ftp_vfs.h 28 Aug 2004 20:28:16 -0000 1.12 *************** *** 73,79 **** void slotListResult(KIO::Job *job); /// Active the dir listing job ! bool vfs_refresh(const KURL& origin); ! ! void startLister(); protected: --- 73,77 ---- void slotListResult(KIO::Job *job); /// Active the dir listing job ! bool populateVfsList(const KURL& origin, bool showHidden); protected: Index: vfile.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/vfile.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** vfile.cpp 25 Jul 2004 21:00:01 -0000 1.12 --- vfile.cpp 28 Aug 2004 20:28:16 -0000 1.13 *************** *** 178,180 **** --- 178,212 ---- } + bool vfile::operator==(const vfile& vf) const{ + bool equal; + + equal = (vfile_name == vf.vfile_getName() ) && + (vfile_size == vf.vfile_getSize() ) && + (vfile_perm == vf.vfile_getPerm() ) && + (vfile_time_t == vf.vfile_getTime_t() ) && + (vfile_ownerId == vf.vfile_getUid() ) && + (vfile_groupId == vf.vfile_getGid() ) ; + + return equal; + } + + vfile& vfile::operator= (const vfile& vf){ + vfile_name = vf.vfile_name ; + vfile_size = vf.vfile_size ; + vfile_mode = vf.vfile_mode ; + vfile_ownerId = vf.vfile_ownerId ; + vfile_groupId = vf.vfile_groupId ; + vfile_owner = vf.vfile_owner ; + vfile_group = vf.vfile_group ; + vfile_userName = vf.vfile_userName ; + vfile_perm = vf.vfile_perm ; + vfile_time_t = vf.vfile_time_t ; + vfile_symLink = vf.vfile_symLink ; + vfile_mimeType = vf.vfile_mimeType ; + vfile_symDest = vf.vfile_symDest ; + vfile_url = vf.vfile_url ; + + return (*this); + } + #include "vfile.moc" Index: vfs.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/vfs.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** vfs.cpp 23 Jul 2004 17:28:36 -0000 1.11 --- vfs.cpp 28 Aug 2004 20:28:17 -0000 1.12 *************** *** 34,39 **** --- 34,41 ---- #include "vfs.h" #include <kapplication.h> + #include <kdebug.h> #include <time.h> #include "../krusader.h" + #include "../defaults.h" vfs::vfs(QObject* panel, bool quiet): quietMode(quiet),vfileIterator(0){ *************** *** 104,110 **** --- 106,173 ---- void vfs::setVfsFilesP(QDict<vfile>* dict){ vfs_filesP=dict; + vfs_searchP = dict; if( vfileIterator ) delete vfileIterator; vfileIterator = new QDictIterator<vfile>(*dict); } + bool vfs::vfs_refresh(){ + // point the vfs_filesP to a NEW (empty) dictionary + vfs_filesP = new QDict<vfile>(); + vfs_filesP->setAutoDelete(true); + + // and populate it + krConfig->setGroup("Look&Feel"); + bool showHidden = krConfig->readBoolEntry("Show Hidden",_ShowHidden); + bool res = populateVfsList(vfs_getOrigin(),showHidden); + + if( res ){ + // compare the two list emiting signals when needed;; + for( vfile* vf = vfs_getFirstFile(); vf ; vf=vfs_getNextFile() ){ + QString name = vf->vfile_getName(); + vfile* newVf = (*vfs_filesP)[name]; + if( !newVf ){ + // the file was deleted.. + emit deletedVfile(name); + vfs_searchP->remove(name); + } else if( *vf != *newVf ){ + // the file was changed.. + *vf = *newVf; + emit updatedVfile(vf); + } + removeFromList(name); + } + // everything thats left is a new file + QDictIterator<vfile> it(*vfs_filesP); + for(vfile* vf=it.toFirst(); vf; vf=(++it)){ + vfile* newVf = new vfile(); + *newVf = *vf; + vfs_searchP->insert(newVf->vfile_getName(),newVf); + emit addedVfile(newVf); + } + } + + // delete the needed temporary vfs_filesP + // and make the vfs_searchP the primary list again + QDict<vfile> *temp = vfs_filesP; + vfs_filesP = vfs_searchP; + delete temp; + + return res; + } + + bool vfs::vfs_refresh(const KURL& origin){ + if( origin.equals(vfs_getOrigin(),true) ) return vfs_refresh(); + + krConfig->setGroup("Look&Feel"); + bool showHidden = krConfig->readBoolEntry("Show Hidden",_ShowHidden); + + // clear the the list + clear(); + // and re-populate it + if (!populateVfsList(origin,showHidden) ) return false; + + if (!quietMode) emit startUpdate(); + return true; + } + #include "vfs.moc" |
|
From: Rafi Y. <ya...@us...> - 2004-08-28 20:28:27
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7244/krusader/Panel Modified Files: panelfunc.cpp Log Message: New vfs_refresh() function only update changes when you re-read a panel and changes the content without the annying full redraw effect. Index: panelfunc.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelfunc.cpp,v retrieving revision 1.81 retrieving revision 1.82 diff -C2 -d -r1.81 -r1.82 *** panelfunc.cpp 26 Aug 2004 16:12:01 -0000 1.81 --- panelfunc.cpp 28 Aug 2004 20:28:16 -0000 1.82 *************** *** 116,126 **** return; } ! // change the cursor to busy ! krApp->setCursor( KCursor::waitCursor() ); ! ! panel->slotFocusOnMe(); ! ! // clear the view - to avoid a repaint crash ! panel->view->clear(); if( !nameToMakeCurrent.isEmpty() ){ --- 116,129 ---- return; } ! ! panel->slotFocusOnMe(); ! ! // if we are not refreshing to current URL ! if( !files()->vfs_getOrigin().equals(url,true) ){ ! // change the cursor to busy ! krApp->setCursor( KCursor::waitCursor() ); ! // clear the view - to avoid a repaint crash ! panel->view->clear(); ! } if( !nameToMakeCurrent.isEmpty() ){ |
|
From: Rafi Y. <ya...@us...> - 2004-08-28 20:28:26
|
Update of /cvsroot/krusader/krusader_kde3 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7244 Modified Files: CVSNEWS Log Message: New vfs_refresh() function only update changes when you re-read a panel and changes the content without the annying full redraw effect. Index: CVSNEWS =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/CVSNEWS,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** CVSNEWS 18 Aug 2004 11:50:16 -0000 1.10 --- CVSNEWS 28 Aug 2004 20:28:17 -0000 1.11 *************** *** 3,6 **** --- 3,9 ---- in some way an extension to the changelog. ------------------------------------------------------ + New vfs_refresh() function only update changes when you re-read a panel and changes + the content without the annying full redraw effect. + When closing krusader, the tabs are saved and restored |
|
From: Karai C. <ck...@us...> - 2004-08-26 16:12:12
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1764/krusader_kde3/krusader/Panel Modified Files: panelfunc.cpp Log Message: Fix. Index: panelfunc.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelfunc.cpp,v retrieving revision 1.80 retrieving revision 1.81 diff -C2 -d -r1.80 -r1.81 *** panelfunc.cpp 26 Aug 2004 16:04:56 -0000 1.80 --- panelfunc.cpp 26 Aug 2004 16:12:01 -0000 1.81 *************** *** 571,578 **** QString protocol = KrServices::registerdProtocol(vf->vfile_getMime()); ! QString type = vf->vfile_getMime().right( 4 ); ! if ( vf->vfile_getMime().contains( "-rar" ) ) type = "-rar"; ! if ( !KRarcHandler::arcHandled( type ) ) // if the specified archive is disabled delete the protocol ! protocol = ""; if ( vf->vfile_isDir() ) { --- 571,581 ---- QString protocol = KrServices::registerdProtocol(vf->vfile_getMime()); ! if( protocol == "tar" || protocol == "krarc" ) ! { ! QString type = vf->vfile_getMime().right( 4 ); ! if ( vf->vfile_getMime().contains( "-rar" ) ) type = "-rar"; ! if ( !KRarcHandler::arcHandled( type ) ) // if the specified archive is disabled delete the protocol ! protocol = ""; ! } if ( vf->vfile_isDir() ) { |
|
From: Karai C. <ck...@us...> - 2004-08-26 16:05:07
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32760/krusader_kde3/krusader/Panel Modified Files: panelfunc.cpp Log Message: FIXED: supported archives menuitems are ignored Index: panelfunc.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelfunc.cpp,v retrieving revision 1.79 retrieving revision 1.80 diff -C2 -d -r1.79 -r1.80 *** panelfunc.cpp 26 Aug 2004 10:55:50 -0000 1.79 --- panelfunc.cpp 26 Aug 2004 16:04:56 -0000 1.80 *************** *** 569,577 **** KURL origin = files() ->vfs_getOrigin(); ! // QString type = vf->vfile_getMime().right( 4 ); ! // if ( vf->vfile_getMime().contains( "-rar" ) ) type = "-rar"; - QString protocol = KrServices::registerdProtocol(vf->vfile_getMime()); - if ( vf->vfile_isDir() ) { //origin.addPath(name); --- 569,579 ---- KURL origin = files() ->vfs_getOrigin(); ! QString protocol = KrServices::registerdProtocol(vf->vfile_getMime()); ! ! QString type = vf->vfile_getMime().right( 4 ); ! if ( vf->vfile_getMime().contains( "-rar" ) ) type = "-rar"; ! if ( !KRarcHandler::arcHandled( type ) ) // if the specified archive is disabled delete the protocol ! protocol = ""; if ( vf->vfile_isDir() ) { //origin.addPath(name); *************** *** 583,594 **** path.setProtocol(protocol); openUrl( path ); - // } else if ( KRarcHandler::arcHandled( type ) && origin.isLocalFile() ) { - // KURL path = files()->vfs_getFile(vf->vfile_getName()); - // if ( type == "-tbz" || type == "-tgz" || type == "tarz" || type == "-tar" ){ - // path.setProtocol("tar"); - // } else { - // path.setProtocol("krarc"); - // } - // openUrl( path ); } else { KURL url = files()->vfs_getFile( name ); --- 585,588 ---- |
|
From: Karai C. <ck...@us...> - 2004-08-26 15:48:07
|
Update of /cvsroot/krusader/krusader_kde3 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29170/krusader_kde3 Modified Files: ChangeLog Log Message: Final smoothing on protocols and mimes Index: ChangeLog =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v retrieving revision 1.288 retrieving revision 1.289 diff -C2 -d -r1.288 -r1.289 *** ChangeLog 26 Aug 2004 15:21:01 -0000 1.288 --- ChangeLog 26 Aug 2004 15:47:56 -0000 1.289 *************** *** 1,3 **** --- 1,4 ---- ====================== + ADDED: linking mimes and protocols ADDED: new delete dialog box: lists the file names to be deleted (thanks to dirk for the idea) ADDED: iso protocol for viewing .iso cd/dvd images |
|
From: Karai C. <ck...@us...> - 2004-08-26 15:48:07
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Konfigurator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29170/krusader_kde3/krusader/Konfigurator Modified Files: kgprotocols.cpp Log Message: Final smoothing on protocols and mimes Index: kgprotocols.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Konfigurator/kgprotocols.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** kgprotocols.cpp 26 Aug 2004 10:54:30 -0000 1.2 --- kgprotocols.cpp 26 Aug 2004 15:47:57 -0000 1.3 *************** *** 31,34 **** --- 31,35 ---- #include "kgprotocols.h" #include "../krusader.h" + #include "../krservices.h" #include <klocale.h> #include <kprotocolinfo.h> *************** *** 321,324 **** --- 322,330 ---- for( QStringList::Iterator it = krarcMimes.begin(); it != krarcMimes.end(); it++ ) addMime( *it, "krarc" ); + + addProtocol( "tar" ); + QStringList tarMimes = QStringList::split( ',', defaultTarMimes ); + for( QStringList::Iterator it = tarMimes.begin(); it != tarMimes.end(); it++ ) + addMime( *it, "tar" ); slotDisableButtons(); *************** *** 385,388 **** --- 391,396 ---- krConfig->sync(); + KrServices::clearProtocolCache(); + emit sigChanged(); return false; |
7 messages has been excluded from this view by a project administrator.
