[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeutils/ark
From:       Helio Chissini de Castro <helio () conectiva ! com ! br>
Date:       2003-08-16 19:34:00
[Download RAW message or body]

CVS commit by helio: 

- Fix #62486 on behalf of Henrique Pinto


  M +4 -2      arkwidget.cpp   1.54
  M +3 -3      extractdlg.cpp   1.22
  M +2 -2      extractdlg.h   1.27


--- kdeutils/ark/arkwidget.cpp  #1.53:1.54
@@ -42,4 +42,5 @@
 #include <ktempfile.h>
 #include <kmimemagic.h>
+#include <kmimetype.h>
 #include <kstandarddirs.h>
 #include <ktempdir.h>
@@ -1482,5 +1483,5 @@ ArkWidget::action_extract()
     }
 
-    ExtractDlg *dlg = new ExtractDlg(m_settings);
+    ExtractDlg *dlg = new ExtractDlg(m_settings, this);
 
     // if they choose pattern, we have to tell arkwidget to select
@@ -2109,5 +2110,6 @@ Arch * ArkWidget::getNewArchive( const Q
     Arch * newArch = 0;
 
-    ArchType archtype = ArchiveFormatInfo::self()->archTypeByExtension(_fileName);
+    QString type = KMimeType::findByFileContent( _fileName )->name();
+    ArchType archtype = ArchiveFormatInfo::self()->archTypeForMimeType(_fileName);
     kdDebug( 1601 ) << "archtype is recognised as: " << archtype << endl;
     if(0 == (newArch = Arch::archFactory(archtype, m_settings, this,

--- kdeutils/ark/extractdlg.cpp  #1.21:1.22
@@ -53,6 +53,6 @@ Foundation, Inc., 59 Temple Place - Suit
 #define FIRST_PAGE_WIDTH  390
 
-ExtractDlg::ExtractDlg( ArkSettings *_settings )
-    : KDialogBase( KDialogBase::Plain, i18n("Extract"), Ok | Cancel, Ok ),
+ExtractDlg::ExtractDlg( ArkSettings *_settings, QWidget *parent, const char *name )
+    : KDialogBase( KDialogBase::Plain, i18n("Extract"), Ok | Cancel, Ok, parent, name ),
 m_settings( _settings )
 {

--- kdeutils/ark/extractdlg.h  #1.26:1.27
@@ -57,5 +57,5 @@ class ExtractDlg : public KDialogBase
   Q_OBJECT
 public:
-  ExtractDlg(ArkSettings *_settings);
+  ExtractDlg(ArkSettings *_settings, QWidget *parent=0, const char *name=0);
   ~ExtractDlg();
   enum ExtractOp{ All, Selected, Current, Pattern };


[prev in list] [next in list] [prev in thread] [next in thread]