summaryrefslogtreecommitdiffstats
path: root/krusader/Konfigurator
diff options
context:
space:
mode:
Diffstat (limited to 'krusader/Konfigurator')
-rw-r--r--krusader/Konfigurator/kgarchives.cpp10
-rw-r--r--krusader/Konfigurator/kgdependencies.cpp3
-rw-r--r--krusader/Konfigurator/kggeneral.cpp9
-rw-r--r--krusader/Konfigurator/kgprotocols.cpp113
-rw-r--r--krusader/Konfigurator/krresulttable.cpp31
5 files changed, 87 insertions, 79 deletions
diff --git a/krusader/Konfigurator/kgarchives.cpp b/krusader/Konfigurator/kgarchives.cpp
index a4ea958..f31d719 100644
--- a/krusader/Konfigurator/kgarchives.cpp
+++ b/krusader/Konfigurator/kgarchives.cpp
@@ -66,10 +66,11 @@ KgArchives::KgArchives( bool first, TQWidget* parent, const char* name ) :
{"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, ""}
+ {"Archives","Do 7z", _Do7z, i18n( "7zip" ), false, ""},
+ {"Archives","Do Xz", _DoXz, i18n( "Xz" ), false, ""}
};
- cbs = createCheckBoxGroup( 3, 0, packers, 11, generalGrp );
+ cbs = createCheckBoxGroup( 3, 0, packers, 12, generalGrp );
generalGrid->addWidget( cbs, 1, 0 );
addLabel( generalGrid, 2, 0, i18n( "The archives that are \"greyed-out\" were unavailable on your\nsystem last time Krusader checked. If you wish Krusader to\nsearch again, click the 'Auto Configure' button." ),
@@ -81,7 +82,7 @@ KgArchives::KgArchives( bool first, TQWidget* parent, const char* name ) :
createSpacer( hbox, "spacer2" );
generalGrid->addWidget( hbox, 3, 0 );
connect( btnAutoConfigure, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAutoConfigure() ) );
-
+
kgArchivesLayout->addWidget( generalGrp, 0 ,0 );
// ------------------------ FINE-TUNING GROUPBOX --------------------------------
@@ -101,7 +102,7 @@ KgArchives::KgArchives( bool first, TQWidget* parent, const char* name ) :
fineTuneGrid->addWidget( finetunes, 1, 0 );
kgArchivesLayout->addWidget( fineTuneGrp, 1 ,0 );
-
+
if( first )
slotAutoConfigure();
@@ -133,6 +134,7 @@ void KgArchives::disableNonExistingPackers()
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") );
+ cbs->find( "Do Xz" )->setEnabled(PS("xz"));
krConfig->setGroup( "Archives" );
krConfig->writeEntry( "Supported Packers", lst );
diff --git a/krusader/Konfigurator/kgdependencies.cpp b/krusader/Konfigurator/kgdependencies.cpp
index 839b721..25da574 100644
--- a/krusader/Konfigurator/kgdependencies.cpp
+++ b/krusader/Konfigurator/kgdependencies.cpp
@@ -56,7 +56,7 @@ KgDependencies::KgDependencies( bool first, TQWidget* parent, const char* name
pathsGrid->setSpacing( 6 );
pathsGrid->setMargin( 11 );
pathsGrid->setAlignment( TQt::AlignTop );
-
+
addApplication( "df", pathsGrid, 0, general_tab, PAGE_GENERAL );
addApplication( "eject", pathsGrid, 1, general_tab, PAGE_GENERAL );
addApplication( "tdesu", pathsGrid, 2, general_tab, PAGE_GENERAL );
@@ -93,6 +93,7 @@ KgDependencies::KgDependencies( bool first, TQWidget* parent, const char* name
addApplication( "unrar", archGrid1,11, packers_tab, PAGE_PACKERS );
addApplication( "unzip", archGrid1,12, packers_tab, PAGE_PACKERS );
addApplication( "zip", archGrid1,13, packers_tab, PAGE_PACKERS );
+ addApplication( "xz", archGrid1,14, packers_tab, PAGE_PACKERS );
// ---------------------------- CHECKSUM TAB -------------------------------------
TQWidget *checksum_tab = new TQWidget( tabWidget, "tab_4" );
diff --git a/krusader/Konfigurator/kggeneral.cpp b/krusader/Konfigurator/kggeneral.cpp
index ba0429c..f2a9f36 100644
--- a/krusader/Konfigurator/kggeneral.cpp
+++ b/krusader/Konfigurator/kggeneral.cpp
@@ -44,7 +44,7 @@
KgGeneral::KgGeneral( bool first, TQWidget* parent, const char* name ) :
KonfiguratorPage( first, parent, name )
{
-if( first )
+if( first )
slotFindTools();
TQGridLayout *kgGeneralLayout = new TQGridLayout( parent );
@@ -91,11 +91,11 @@ TQFrame *line2 = createLine( generalGrp, "line2" );
TQVBox * vbox = new TQVBox( hbox2 );
new TQLabel( i18n("Default viewer mode:"), vbox);
-
+
KONFIGURATOR_NAME_VALUE_TIP viewMode[] =
// name value tooltip
{{ i18n( "Generic mode" ), "generic", i18n( "Use the system's default viewer" ) },
- { i18n( "Text mode" ), "text", i18n( "View the file in text-only mode" ) },
+ { i18n( "Text mode" ), "text", i18n( "View the file in text-only mode" ) },
{ i18n( "Hex mode" ), "hex", i18n( "View the file in hex-mode (better for binary files)" ) } };
createRadioButtonGroup( "General", "Default Viewer Mode",
"generic", 0, 3, viewMode, 3, vbox, "myRadio2", false );
@@ -132,8 +132,9 @@ TQFrame *line2 = createLine( generalGrp, "line2" );
defaultAtomicExtensions += ".tar.gz";
defaultAtomicExtensions += ".tar.bz2";
defaultAtomicExtensions += ".moc.cpp";
+ defaultAtomicExtensions += ".tar.xz";
- listBox = createListBox( "Look&Feel", "Atomic Extensions",
+ listBox = createListBox( "Look&Feel", "Atomic Extensions",
defaultAtomicExtensions, vbox2, true, false );
TQFrame *line3 = createLine( generalGrp, "line3" );
diff --git a/krusader/Konfigurator/kgprotocols.cpp b/krusader/Konfigurator/kgprotocols.cpp
index 2a5439e..fb3cd9f 100644
--- a/krusader/Konfigurator/kgprotocols.cpp
+++ b/krusader/Konfigurator/kgprotocols.cpp
@@ -51,10 +51,11 @@ TQString KgProtocols::defaultKrarcMimes = "application/x-7z,application/x-7z-com
"application/x-lha,application/x-lha-compressed,"
"application/x-rar,application/x-rar-compressed,"
"application/x-rpm,"
+ "application/x-xz,"
"application/x-zip,application/x-zip-compressed";
-TQString KgProtocols::defaultTarMimes = "application/x-tar,application/x-tarz,"
+TQString KgProtocols::defaultTarMimes = "application/x-tar,application/x-tarz,"
"application/x-compressed-tar,"
- "application/x-tbz,application/x-tgz";
+ "application/x-tbz,application/x-tgz,application/x-txz";
KgProtocols::KgProtocols( bool first, TQWidget* parent, const char* name ) :
KonfiguratorPage( first, parent, name )
@@ -63,22 +64,22 @@ KgProtocols::KgProtocols( bool first, TQWidget* parent, const char* name ) :
KgProtocolsLayout->setSpacing( 6 );
// -------------------------- LINK VIEW ----------------------------------
-
- TQGroupBox *linkGrp = createFrame( i18n( "Links" ), parent, "linkGrp" );
+
+ TQGroupBox *linkGrp = createFrame( i18n( "Links" ), parent, "linkGrp" );
TQGridLayout *linkGrid = createGridLayout( linkGrp->layout() );
-
+
linkList = new TQListView( linkGrp, "linkList" );
linkList->addColumn( i18n( "Defined Links" ) );
linkList->header()->setStretchEnabled( true, 0 );
linkList->setRootIsDecorated( true );
-
+
linkGrid->addWidget( linkList, 0, 0 );
KgProtocolsLayout->addMultiCellWidget( linkGrp, 0 ,1, 0, 0 );
// -------------------------- BUTTONS ----------------------------------
TQVBox *vbox1 = new TQVBox( parent, "vbox1" ) ;
-
+
addSpacer( vbox1 );
btnAddProtocol = new TQPushButton( vbox1, "btnAddProtocolButton" );
btnAddProtocol->setPixmap( krLoader->loadIcon( "1leftarrow", TDEIcon::Small ) );
@@ -87,11 +88,11 @@ KgProtocols::KgProtocols( bool first, TQWidget* parent, const char* name ) :
btnRemoveProtocol->setPixmap( krLoader->loadIcon( "1rightarrow", TDEIcon::Small ) );
TQWhatsThis::add( btnRemoveProtocol, i18n( "Remove protocol from the link list." ) );
addSpacer( vbox1 );
-
+
KgProtocolsLayout->addWidget( vbox1, 0 ,1 );
TQVBox *vbox2 = new TQVBox( parent, "vbox2" ) ;
-
+
addSpacer( vbox2 );
btnAddMime = new TQPushButton( vbox2, "btnAddMimeButton" );
btnAddMime->setPixmap( krLoader->loadIcon( "1leftarrow", TDEIcon::Small ) );
@@ -100,14 +101,14 @@ KgProtocols::KgProtocols( bool first, TQWidget* parent, const char* name ) :
btnRemoveMime->setPixmap( krLoader->loadIcon( "1rightarrow", TDEIcon::Small ) );
TQWhatsThis::add( btnRemoveMime, i18n( "Remove mime from the link list." ) );
addSpacer( vbox2 );
-
+
KgProtocolsLayout->addWidget( vbox2, 1 ,1 );
-
+
// -------------------------- PROTOCOLS LISTBOX ----------------------------------
- TQGroupBox *protocolGrp = createFrame( i18n( "Protocols" ), parent, "protocolGrp" );
+ TQGroupBox *protocolGrp = createFrame( i18n( "Protocols" ), parent, "protocolGrp" );
TQGridLayout *protocolGrid = createGridLayout( protocolGrp->layout() );
-
+
protocolList = new TQListBox( protocolGrp, "protocolList" );
loadListCapableProtocols();
protocolGrid->addWidget( protocolList, 0, 0 );
@@ -116,17 +117,17 @@ KgProtocols::KgProtocols( bool first, TQWidget* parent, const char* name ) :
// -------------------------- MIMES LISTBOX ----------------------------------
- TQGroupBox *mimeGrp = createFrame( i18n( "Mimes" ), parent, "mimeGrp" );
+ TQGroupBox *mimeGrp = createFrame( i18n( "Mimes" ), parent, "mimeGrp" );
TQGridLayout *mimeGrid = createGridLayout( mimeGrp->layout() );
-
+
mimeList = new TQListBox( mimeGrp, "protocolList" );
loadMimes();
mimeGrid->addWidget( mimeList, 0, 0 );
KgProtocolsLayout->addWidget( mimeGrp, 1 ,2 );
-
- // -------------------------- CONNECT TABLE ----------------------------------
-
+
+ // -------------------------- CONNECT TABLE ----------------------------------
+
connect( protocolList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotDisableButtons() ) );
connect( linkList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotDisableButtons() ) );
connect( mimeList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotDisableButtons() ) );
@@ -135,11 +136,11 @@ KgProtocols::KgProtocols( bool first, TQWidget* parent, const char* name ) :
connect( btnRemoveProtocol, TQT_SIGNAL( clicked() ) , this, TQT_SLOT( slotRemoveProtocol() ) );
connect( btnAddMime, TQT_SIGNAL( clicked() ) , this, TQT_SLOT( slotAddMime() ) );
connect( btnRemoveMime, TQT_SIGNAL( clicked() ) , this, TQT_SLOT( slotRemoveMime() ) );
-
+
loadInitialValues();
slotDisableButtons();
}
-
+
TQWidget* KgProtocols::addSpacer( TQWidget *parent, const char *widgetName )
{
TQWidget *widget = new TQWidget( parent, widgetName );
@@ -153,8 +154,8 @@ void KgProtocols::loadListCapableProtocols()
{
TQStringList protocols = KProtocolInfo::protocols();
protocols.sort();
-
- for ( TQStringList::Iterator it = protocols.begin(); it != protocols.end();)
+
+ for ( TQStringList::Iterator it = protocols.begin(); it != protocols.end();)
{
if( !KProtocolInfo::supportsListing( *it ) )
{
@@ -169,10 +170,10 @@ void KgProtocols::loadListCapableProtocols()
void KgProtocols::loadMimes()
{
KMimeType::List mimes = KMimeType::allMimeTypes();
-
+
for( TQValueListIterator<KMimeType::Ptr> it = mimes.begin(); it != mimes.end(); it++ )
mimeList->insertItem( (*it)->name() );
-
+
mimeList->sort();
}
@@ -184,7 +185,7 @@ void KgProtocols::slotDisableButtons()
btnRemoveProtocol->setEnabled( isProtocolSelected );
btnAddMime->setEnabled( listViewItem != 0 && mimeList->selectedItem() != 0 );
btnRemoveMime->setEnabled( listViewItem == 0 ? false : listViewItem->parent() != 0 );
-
+
if( linkList->currentItem() == 0 && linkList->firstChild() != 0 )
linkList->setCurrentItem( linkList->firstChild() );
if( linkList->selectedItem() == 0 && linkList->currentItem() != 0 )
@@ -210,7 +211,7 @@ void KgProtocols::addProtocol( TQString name, bool changeCurrent )
protocolList->removeItem( protocolList->index( item ) );
TQListViewItem *listViewItem = new TQListViewItem( linkList, name );
listViewItem->setPixmap( 0, krLoader->loadIcon( "application-x-executable", TDEIcon::Small ) );
-
+
if( changeCurrent )
linkList->setCurrentItem( listViewItem );
}
@@ -234,7 +235,7 @@ void KgProtocols::removeProtocol( TQString name )
{
while( item->childCount() != 0 )
removeMime( item->firstChild()->text( 0 ) );
-
+
linkList->takeItem( item );
protocolList->insertItem( name );
protocolList->sort();
@@ -249,7 +250,7 @@ void KgProtocols::slotAddMime()
TQListViewItem *itemToAdd = linkList->currentItem();
if( itemToAdd->parent() )
itemToAdd = itemToAdd->parent();
-
+
addMime( item->text(), itemToAdd->text( 0 ) );
slotDisableButtons();
emit sigChanged();
@@ -260,7 +261,7 @@ void KgProtocols::addMime( TQString name, TQString protocol )
{
TQListBoxItem *item = mimeList->findItem( name, ExactMatch );
TQListViewItem *currentListItem = linkList->findItem( protocol, 0 );
-
+
if( item && currentListItem && currentListItem->parent() == 0 )
{
mimeList->removeItem( mimeList->index( item ) );
@@ -284,7 +285,7 @@ void KgProtocols::slotRemoveMime()
void KgProtocols::removeMime( TQString name )
{
TQListViewItem *currentMimeItem = linkList->findItem( name, 0 );
-
+
if( currentMimeItem && currentMimeItem->parent() != 0 )
{
mimeList->insertItem( currentMimeItem->text( 0 ) );
@@ -297,20 +298,20 @@ void KgProtocols::loadInitialValues()
{
while( linkList->childCount() != 0 )
removeProtocol( linkList->firstChild()->text( 0 ) );
-
+
krConfig->setGroup( "Protocols" );
TQStringList protList = krConfig->readListEntry( "Handled Protocols" );
-
- for( TQStringList::Iterator it = protList.begin(); it != protList.end(); it++ )
+
+ for( TQStringList::Iterator it = protList.begin(); it != protList.end(); it++ )
{
addProtocol( *it );
-
+
TQStringList mimes = krConfig->readListEntry( TQString( "Mimes For %1" ).arg( *it ) );
-
+
for( TQStringList::Iterator it2 = mimes.begin(); it2 != mimes.end(); it2++ )
addMime( *it2, *it );
}
-
+
if( linkList->firstChild() != 0 )
linkList->setCurrentItem( linkList->firstChild() );
slotDisableButtons();
@@ -320,22 +321,22 @@ void KgProtocols::setDefaults()
{
while( linkList->childCount() != 0 )
removeProtocol( linkList->firstChild()->text( 0 ) );
-
+
addProtocol( "iso" );
addMime( "application/x-iso", "iso" );
-
+
addProtocol( "krarc" );
TQStringList krarcMimes = TQStringList::split( ',', defaultKrarcMimes );
for( TQStringList::Iterator it = krarcMimes.begin(); it != krarcMimes.end(); it++ )
addMime( *it, "krarc" );
-
+
addProtocol( "tar" );
TQStringList tarMimes = TQStringList::split( ',', defaultTarMimes );
for( TQStringList::Iterator it = tarMimes.begin(); it != tarMimes.end(); it++ )
addMime( *it, "tar" );
-
+
slotDisableButtons();
-
+
if( isChanged() )
emit sigChanged();
}
@@ -344,18 +345,18 @@ bool KgProtocols::isChanged()
{
krConfig->setGroup( "Protocols" );
TQStringList protList = krConfig->readListEntry( "Handled Protocols" );
-
+
if( (int)protList.count() != linkList->childCount() )
return true;
-
+
TQListViewItem *item = linkList->firstChild();
while( item )
{
if( !protList.contains( item->text( 0 ) ) )
return true;
-
+
TQStringList mimes = krConfig->readListEntry( TQString( "Mimes For %1" ).arg( item->text( 0 ) ) );
-
+
if( (int)mimes.count() != item->childCount() )
return true;
TQListViewItem *childs = item->firstChild();
@@ -365,24 +366,24 @@ bool KgProtocols::isChanged()
return true;
childs = childs->nextSibling();
}
-
+
item = item->nextSibling();
}
-
+
return false;
}
bool KgProtocols::apply()
{
krConfig->setGroup( "Protocols" );
-
+
TQStringList protocolList;
-
+
TQListViewItem *item = linkList->firstChild();
while( item )
{
protocolList.append( item->text( 0 ) );
-
+
TQStringList mimes;
TQListViewItem *childs = item->firstChild();
while( childs )
@@ -391,15 +392,15 @@ bool KgProtocols::apply()
childs = childs->nextSibling();
}
krConfig->writeEntry( TQString( "Mimes For %1" ).arg( item->text( 0 ) ), mimes );
-
+
item = item->nextSibling();
- }
+ }
krConfig->writeEntry( "Handled Protocols", protocolList );
- krConfig->sync();
-
+ krConfig->sync();
+
KrServices::clearProtocolCache();
-
- emit sigChanged();
+
+ emit sigChanged();
return false;
}
diff --git a/krusader/Konfigurator/krresulttable.cpp b/krusader/Konfigurator/krresulttable.cpp
index cc1ed23..0ab4280 100644
--- a/krusader/Konfigurator/krresulttable.cpp
+++ b/krusader/Konfigurator/krresulttable.cpp
@@ -99,20 +99,21 @@ KrArchiverResultTable::KrArchiverResultTable(TQWidget* parent)
{
_supported = KRarcHandler::supportedPackers(); // get list of available packers
- Archiver* tar = new Archiver("tar", "http://www.gnu.org", PS("tar"), true, true);
- Archiver* gzip = new Archiver("gzip", "http://www.gnu.org", PS("gzip"), true, true);
- Archiver* bzip2 = new Archiver("bzip2", "http://www.gnu.org", PS("bzip2"), true, true);
- Archiver* lha = new Archiver("lha", "http://www.gnu.org", PS("lha"), true, true);
- Archiver* zip = new Archiver("zip", "http://www.info-zip.org", PS("zip"), true, false);
- Archiver* unzip = new Archiver("unzip", "http://www.info-zip.org", PS("unzip"), false, true);
- Archiver* arj = new Archiver("arj", "http://www.arjsoftware.com", PS("arj"), true, true);
- Archiver* unarj = new Archiver("unarj", "http://www.arjsoftware.com", PS("unarj"), false, true);
- Archiver* unace = new Archiver("unace", "http://www.winace.com", PS("unace"), false, true);
- Archiver* rar = new Archiver("rar", "http://www.rarsoft.com", PS("rar"), true, true);
- Archiver* unrar = new Archiver("unrar", "http://www.rarsoft.com", PS("unrar"), false, true);
- 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"), true, true);
+ Archiver* tar = new Archiver("tar", "http://www.gnu.org", PS("tar"), true, true);
+ Archiver* gzip = new Archiver("gzip", "http://www.gnu.org", PS("gzip"), true, true);
+ Archiver* bzip2 = new Archiver("bzip2", "http://www.gnu.org", PS("bzip2"), true, true);
+ Archiver* lha = new Archiver("lha", "http://www.gnu.org", PS("lha"), true, true);
+ Archiver* zip = new Archiver("zip", "http://www.info-zip.org", PS("zip"), true, false);
+ Archiver* unzip = new Archiver("unzip", "http://www.info-zip.org", PS("unzip"), false, true);
+ Archiver* arj = new Archiver("arj", "http://www.arjsoftware.com", PS("arj"), true, true);
+ Archiver* unarj = new Archiver("unarj", "http://www.arjsoftware.com", PS("unarj"), false, true);
+ Archiver* unace = new Archiver("unace", "http://www.winace.com", PS("unace"), false, true);
+ Archiver* rar = new Archiver("rar", "http://www.rarsoft.com", PS("rar"), true, true);
+ Archiver* unrar = new Archiver("unrar", "http://www.rarsoft.com", PS("unrar"), false, true);
+ 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"), true, true);
+ Archiver* xz = new Archiver("xz", "http://www.tukaani.org/xz", PS("xz"), true, true);
// Special case: arj can unpack, but unarj is prefered
if(PS("arj") && PS("unarj"))
@@ -149,6 +150,7 @@ KrArchiverResultTable::KrArchiverResultTable(TQWidget* parent)
addRow(rpm, _grid);
addRow(dpkg, _grid);
addRow(_7z, _grid);
+ addRow(xz, _grid);
delete tar;
delete gzip;
@@ -164,6 +166,7 @@ KrArchiverResultTable::KrArchiverResultTable(TQWidget* parent)
delete rpm;
delete dpkg;
delete _7z;
+ delete xz;
}
KrArchiverResultTable::~KrArchiverResultTable()
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-11 14:52:09 +0000