Menu
▾
▴
[Krusader-commits] krusader_kde3/krusader/Konfigurator kgarchives.cpp,1.17,1.18 kgdependencies.cpp,1.20,1.21 kgdependencies.h,1.3,1.4 kgprotocols.cpp,1.6,1.7 krresulttable.cpp,1.7,1.8
|
From: Karai C. <ck...@us...> - 2006-03-17 07:47:44
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Konfigurator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12294/krusader_kde3/krusader/Konfigurator Modified Files: kgarchives.cpp kgdependencies.cpp kgdependencies.h kgprotocols.cpp krresulttable.cpp Log Message: ADDED: krarc, 7z, 7za handling Index: kgarchives.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Konfigurator/kgarchives.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** kgarchives.cpp 19 Nov 2005 13:45:43 -0000 1.17 --- kgarchives.cpp 17 Mar 2006 07:47:37 -0000 1.18 *************** *** 67,74 **** {"Archives","Do UnAce", _DoUnAce, i18n( "Ace" ), false, ""}, {"Archives","Do Lha", _DoLha, i18n( "Lha" ), false, ""}, ! {"Archives","Do DEB", _DoDEB, i18n( "Deb" ), false, ""} }; ! cbs = createCheckBoxGroup( 3, 0, packers, 10, generalGrp ); generalGrid->addWidget( cbs, 1, 0 ); --- 67,75 ---- {"Archives","Do UnAce", _DoUnAce, i18n( "Ace" ), false, ""}, {"Archives","Do Lha", _DoLha, i18n( "Lha" ), false, ""}, ! {"Archives","Do DEB", _DoDEB, i18n( "Deb" ), false, ""}, ! {"Archives","Do 7z", _Do7z, i18n( "7zip" ), false, ""} }; ! cbs = createCheckBoxGroup( 3, 0, packers, 11, generalGrp ); generalGrid->addWidget( cbs, 1, 0 ); *************** *** 133,136 **** --- 134,138 ---- cbs->find( "Do Unarj" )->setEnabled(PS("unarj") || PS("arj") ); cbs->find( "Do DEB" )->setEnabled(PS("dpkg") && PS("tar") ); + cbs->find( "Do 7z" )->setEnabled( PS("7z") ); krConfig->setGroup( "Archives" ); Index: kgdependencies.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Konfigurator/kgdependencies.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** kgdependencies.cpp 31 Jan 2006 13:15:34 -0000 1.20 --- kgdependencies.cpp 17 Mar 2006 07:47:37 -0000 1.21 *************** *** 81,97 **** archGrid1->setAlignment( Qt::AlignTop ); ! addApplication( "arj", archGrid1, 0, packers_tab, PAGE_PACKERS ); ! addApplication( "bzip2", archGrid1, 1, packers_tab, PAGE_PACKERS ); ! addApplication( "cpio", archGrid1, 2, packers_tab, PAGE_PACKERS ); ! addApplication( "dpkg", archGrid1, 3, packers_tab, PAGE_PACKERS ); ! addApplication( "gzip", archGrid1, 4, packers_tab, PAGE_PACKERS ); ! addApplication( "lha", archGrid1, 5, packers_tab, PAGE_PACKERS ); ! addApplication( "rar", archGrid1, 6, packers_tab, PAGE_PACKERS ); ! addApplication( "tar", archGrid1, 7, packers_tab, PAGE_PACKERS ); ! addApplication( "unace", archGrid1, 8, packers_tab, PAGE_PACKERS ); ! addApplication( "unarj", archGrid1, 9, packers_tab, PAGE_PACKERS ); ! addApplication( "unrar", archGrid1,10, packers_tab, PAGE_PACKERS ); ! addApplication( "unzip", archGrid1,11, packers_tab, PAGE_PACKERS ); ! addApplication( "zip", archGrid1,12, packers_tab, PAGE_PACKERS ); // ---------------------------- CHECKSUM TAB ------------------------------------- --- 81,98 ---- archGrid1->setAlignment( Qt::AlignTop ); ! addApplication( "7z", archGrid1, 0, packers_tab, PAGE_PACKERS, "7za" ); ! addApplication( "arj", archGrid1, 1, packers_tab, PAGE_PACKERS ); ! addApplication( "bzip2", archGrid1, 2, packers_tab, PAGE_PACKERS ); ! addApplication( "cpio", archGrid1, 3, packers_tab, PAGE_PACKERS ); ! addApplication( "dpkg", archGrid1, 4, packers_tab, PAGE_PACKERS ); ! addApplication( "gzip", archGrid1, 5, packers_tab, PAGE_PACKERS ); ! addApplication( "lha", archGrid1, 6, packers_tab, PAGE_PACKERS ); ! addApplication( "rar", archGrid1, 7, packers_tab, PAGE_PACKERS ); ! addApplication( "tar", archGrid1, 8, packers_tab, PAGE_PACKERS ); ! addApplication( "unace", archGrid1, 9, packers_tab, PAGE_PACKERS ); ! addApplication( "unarj", archGrid1,10, packers_tab, PAGE_PACKERS ); ! addApplication( "unrar", archGrid1,11, packers_tab, PAGE_PACKERS ); ! addApplication( "unzip", archGrid1,12, packers_tab, PAGE_PACKERS ); ! addApplication( "zip", archGrid1,13, packers_tab, PAGE_PACKERS ); // ---------------------------- CHECKSUM TAB ------------------------------------- *************** *** 116,122 **** } ! void KgDependencies::addApplication( QString name, QGridLayout *grid, int row, QWidget *parent, int page ) { QString dflt = KrServices::fullPathName( name ); /* try to autodetect the full path name */ addLabel( grid, row, 0, name, parent, (QString( "label:" )+name).ascii() ); --- 117,133 ---- } ! void KgDependencies::addApplication( QString name, QGridLayout *grid, int row, QWidget *parent, int page, QString additionalList ) { QString dflt = KrServices::fullPathName( name ); /* try to autodetect the full path name */ + + if( dflt.isEmpty() ) { + QStringList list = QStringList::split( ',', additionalList ); + for( int i=0; i != list.count(); i++ ) + if( !KrServices::fullPathName( list[ i ] ).isEmpty() ) { + dflt = KrServices::fullPathName( list[ i ] ); + break; + } + } + addLabel( grid, row, 0, name, parent, (QString( "label:" )+name).ascii() ); Index: kgprotocols.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Konfigurator/kgprotocols.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** kgprotocols.cpp 15 Sep 2005 19:37:52 -0000 1.6 --- kgprotocols.cpp 17 Mar 2006 07:47:37 -0000 1.7 *************** *** 42,47 **** QString KgProtocols::defaultProtocols = "krarc,iso,tar"; QString KgProtocols::defaultIsoMimes = "application/x-iso"; ! QString KgProtocols::defaultKrarcMimes = "application/x-ace,application/x-arj," ! "application/x-bzip2,application/x-cpio," "application/x-gzip,application/x-jar," "application/x-lha,application/x-rar," --- 42,49 ---- QString KgProtocols::defaultProtocols = "krarc,iso,tar"; QString KgProtocols::defaultIsoMimes = "application/x-iso"; ! QString KgProtocols::defaultKrarcMimes = "application/x-7z,application/x-ace," ! "application/x-arj,application/x-bzip2," ! "application/x-cpio,application/x-deb," ! "application/x-debian-package," "application/x-gzip,application/x-jar," "application/x-lha,application/x-rar," Index: krresulttable.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Konfigurator/krresulttable.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** krresulttable.cpp 19 Nov 2005 13:45:43 -0000 1.7 --- krresulttable.cpp 17 Mar 2006 07:47:37 -0000 1.8 *************** *** 113,116 **** --- 113,117 ---- Archiver* rpm = new Archiver("rpm", "http://www.gnu.org", PS("rpm"), false, true); Archiver* dpkg = new Archiver("dpkg", "http://www.dpkg.org", PS("dpkg"), false, true); + Archiver* _7z = new Archiver("7z", "http://www.7-zip.org", PS("7z"), false, true); // Special case: arj can unpack, but unarj is prefered *************** *** 148,151 **** --- 149,153 ---- addRow(rpm, _grid); addRow(dpkg, _grid); + addRow(_7z, _grid); delete tar; *************** *** 162,165 **** --- 164,168 ---- delete rpm; delete dpkg; + delete _7z; } Index: kgdependencies.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Konfigurator/kgdependencies.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** kgdependencies.h 29 Jan 2006 21:46:50 -0000 1.3 --- kgdependencies.h 17 Mar 2006 07:47:37 -0000 1.4 *************** *** 47,51 **** private: ! void addApplication( QString name, QGridLayout *grid, int row, QWidget *parent, int page ); public slots: --- 47,51 ---- private: ! void addApplication( QString name, QGridLayout *grid, int row, QWidget *parent, int page, QString additionalList=QString::null ); public slots: |