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

List:       kde-commits
Subject:    kdelibs/kio
From:       Jaroslaw Staniek <js () iidea ! pl>
Date:       2004-12-02 13:17:04
Message-ID: 20041202131704.F254E19FFA () office ! kde ! org
[Download RAW message or body]

CVS commit by staniek: 

kio
- KFileDialog::getExistingDirectory() wrapped
  using QFileDialog::getExistingDirectory()
- KFilePropsPlugin: 'configure' button hidden for win32
- KFileItem: unix-like info about permissions
  and ownership hidden for win32

reviewed by dfaure


  M +6 -0      kfile/kfiledialog.cpp   1.383
  M +6 -0      kfile/kpropertiesdialog.cpp   1.328
  M +8 -5      kio/kfileitem.cpp   1.171


--- kdelibs/kio/kfile/kfiledialog.cpp  #1.382:1.383
@@ -41,4 +41,5 @@
 #include <qtimer.h>
 #include <qwhatsthis.h>
+#include <qfiledialog.h>
 
 #include <kaccel.h>
@@ -1406,4 +1407,8 @@ QString KFileDialog::getExistingDirector
                                           const QString& caption)
 {
+#ifdef Q_WS_WIN
+    return QFileDialog::getExistingDirectory(startDir, parent, "getExistingDirectory", 
+                                             caption, true, true);
+#else
     KURL url = KDirSelectDialog::selectDirectory(startDir, true, parent,
                                                  caption);
@@ -1412,4 +1417,5 @@ QString KFileDialog::getExistingDirector
 
     return QString::null;
+#endif
 }
 

--- kdelibs/kio/kfile/kpropertiesdialog.cpp  #1.327:1.328
@@ -848,4 +848,6 @@ KFilePropsPlugin::KFilePropsPlugin( KPro
     l = new QLabel(mimeComment, box );
 
+#ifdef Q_WS_X11
+    //TODO: wrap for win32 or mac?
     QPushButton *button = new QPushButton(box);
 
@@ -860,4 +862,5 @@ KFilePropsPlugin::KFilePropsPlugin( KPro
     if (!kapp->authorizeKAction("editfiletype"))
        button->hide();
+#endif
 
     grid->addWidget(box, curRow++, 2);
@@ -1021,4 +1024,6 @@ void KFilePropsPlugin::setFileNameReadOn
 void KFilePropsPlugin::slotEditFileType()
 {
+#ifdef Q_WS_X11
+    //TODO: wrap for win32 or mac?
   QString keditfiletype = QString::fromLatin1("keditfiletype");
   KRun::runCommand( keditfiletype
@@ -1026,4 +1031,5 @@ void KFilePropsPlugin::slotEditFileType(
                     + " " + KProcess::quote(d->mimeType),
                     keditfiletype, keditfiletype /*unused*/);
+#endif
 }
 

--- kdelibs/kio/kio/kfileitem.cpp  #1.170:1.171
@@ -699,8 +699,11 @@ QString KFileItem::getToolTipText(int ma
 
   tip += start + i18n("Modified:") + mid +
-         timeString( KIO::UDS_MODIFICATION_TIME) + end +
-         start + i18n("Owner:") + mid + user() + " - " + group() + end +
+         timeString( KIO::UDS_MODIFICATION_TIME) + end
+#ifndef Q_WS_WIN //TODO: show win32-specific permissions
+         +start + i18n("Owner:") + mid + user() + " - " + group() + end +
          start + i18n("Permissions:") + mid +
-         parsePermissions(m_permissions) + end;
+         parsePermissions(m_permissions) + end
+#endif
+                                 ;
 
   if (info.isValid() && !info.isEmpty() )
@@ -734,6 +737,6 @@ QString KFileItem::getToolTipText(int ma
       }
     }
-    tip += "</table>";
   }
+  tip += "</table>";
 
   //kdDebug() << "making this the tool tip rich text:\n";


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