forked from pool/krusader
This commit is contained in:
parent
16bfa8d3ec
commit
db793ff1e9
@ -1,11 +0,0 @@
|
|||||||
--- krusader/VFS/preservingcopyjob.h 2006/09/08 09:58:04 1.1
|
|
||||||
+++ krusader/VFS/preservingcopyjob.h 2006/09/08 09:58:11
|
|
||||||
@@ -51,7 +51,7 @@
|
|
||||||
|
|
||||||
PreservingCopyJob( const KURL::List& src, const KURL& dest, CopyMode mode, bool asMethod, bool showProgressInfo );
|
|
||||||
|
|
||||||
- static KIO::CopyJob *createCopyJob( PreserveMode mode, const KURL::List& src, const KURL& dest, CopyMode mode, bool asMethod, bool showProgressInfo );
|
|
||||||
+ static KIO::CopyJob *createCopyJob( PreserveMode pmode, const KURL::List& src, const KURL& dest, CopyMode mode, bool asMethod, bool showProgressInfo );
|
|
||||||
|
|
||||||
public slots:
|
|
||||||
void slotAboutToCreate (KIO::Job *, const QValueList< KIO::CopyInfo > &);
|
|
@ -1,170 +0,0 @@
|
|||||||
--- krusader/Panel/panelpopup.h 2006/12/01 15:44:03 1.1
|
|
||||||
+++ krusader/Panel/panelpopup.h 2006/12/01 15:44:40
|
|
||||||
@@ -17,7 +17,7 @@
|
|
||||||
class KrSqueezedTextLabel;
|
|
||||||
class KLineEdit;
|
|
||||||
class KComboBox;
|
|
||||||
-class KImageFilePreview;
|
|
||||||
+class KrusaderImageFilePreview;
|
|
||||||
class PanelViewer;
|
|
||||||
class DiskUsageViewer;
|
|
||||||
|
|
||||||
@@ -49,7 +49,7 @@
|
|
||||||
|
|
||||||
protected:
|
|
||||||
QWidgetStack *stack;
|
|
||||||
- KImageFilePreview *viewer;
|
|
||||||
+ KrusaderImageFilePreview *viewer;
|
|
||||||
KrSqueezedTextLabel *dataLine;
|
|
||||||
QGuardedPtr<KIO::PreviewJob> pjob;
|
|
||||||
KFileTreeView *tree;
|
|
||||||
--- krusader/Panel/panelpopup.cpp 2006/12/01 15:44:05 1.1
|
|
||||||
+++ krusader/Panel/panelpopup.cpp 2006/12/01 15:44:54
|
|
||||||
@@ -117,7 +117,7 @@
|
|
||||||
tree->branch( i18n( "Home" ) ) ->root();
|
|
||||||
|
|
||||||
// create the quickview part ------
|
|
||||||
- viewer = new KImageFilePreview(stack);
|
|
||||||
+ viewer = new KrusaderImageFilePreview(stack);
|
|
||||||
stack->addWidget( viewer, Preview );
|
|
||||||
|
|
||||||
// create the panelview
|
|
||||||
--- krusader/KViewer/kimagefilepreview.h 2006/12/01 15:45:07 1.1
|
|
||||||
+++ krusader/KViewer/kimagefilepreview.h 2006/12/01 15:45:26
|
|
||||||
@@ -10,8 +10,8 @@
|
|
||||||
* License. See the file "COPYING" for the exact licensing terms.
|
|
||||||
*/
|
|
||||||
|
|
||||||
-#ifndef KIMAGEFILEPREVIEW_H
|
|
||||||
-#define KIMAGEFILEPREVIEW_H
|
|
||||||
+#ifndef KrusaderImageFilePreview_H
|
|
||||||
+#define KrusaderImageFilePreview_H
|
|
||||||
|
|
||||||
#include <qpixmap.h>
|
|
||||||
|
|
||||||
@@ -26,12 +26,12 @@
|
|
||||||
class KFileDialog;
|
|
||||||
class KFileItem;
|
|
||||||
|
|
||||||
-class KImageFilePreview : public KPreviewWidgetBase {
|
|
||||||
+class KrusaderImageFilePreview : public KPreviewWidgetBase {
|
|
||||||
Q_OBJECT
|
|
||||||
|
|
||||||
public:
|
|
||||||
- KImageFilePreview( QWidget *parent );
|
|
||||||
- ~KImageFilePreview();
|
|
||||||
+ KrusaderImageFilePreview( QWidget *parent );
|
|
||||||
+ ~KrusaderImageFilePreview();
|
|
||||||
|
|
||||||
virtual QSize sizeHint() const;
|
|
||||||
|
|
||||||
@@ -63,8 +63,8 @@
|
|
||||||
protected:
|
|
||||||
virtual void virtual_hook( int id, void* data );
|
|
||||||
private:
|
|
||||||
- class KImageFilePreviewPrivate;
|
|
||||||
- KImageFilePreviewPrivate *d;
|
|
||||||
+ class KrusaderImageFilePreviewPrivate;
|
|
||||||
+ KrusaderImageFilePreviewPrivate *d;
|
|
||||||
};
|
|
||||||
|
|
||||||
-#endif // KIMAGEFILEPREVIEW_H
|
|
||||||
+#endif // KrusaderImageFilePreview_H
|
|
||||||
--- krusader/KViewer/kimagefilepreview.cpp 2006/12/01 15:45:09 1.1
|
|
||||||
+++ krusader/KViewer/kimagefilepreview.cpp 2006/12/01 15:48:12
|
|
||||||
@@ -27,9 +27,9 @@
|
|
||||||
|
|
||||||
#include "kimagefilepreview.h"
|
|
||||||
|
|
||||||
-/**** KImageFilePreview ****/
|
|
||||||
+/**** KrusaderImageFilePreview ****/
|
|
||||||
|
|
||||||
-KImageFilePreview::KImageFilePreview( QWidget *parent )
|
|
||||||
+KrusaderImageFilePreview::KrusaderImageFilePreview( QWidget *parent )
|
|
||||||
: KPreviewWidgetBase( parent ),
|
|
||||||
m_job( 0L ) {
|
|
||||||
QVBoxLayout *vb = new QVBoxLayout( this, KDialog::marginHint() );
|
|
||||||
@@ -46,23 +46,23 @@
|
|
||||||
setSupportedMimeTypes( KIO::PreviewJob::supportedMimeTypes() );
|
|
||||||
}
|
|
||||||
|
|
||||||
-KImageFilePreview::~KImageFilePreview() {
|
|
||||||
+KrusaderImageFilePreview::~KrusaderImageFilePreview() {
|
|
||||||
if ( m_job )
|
|
||||||
m_job->kill();
|
|
||||||
}
|
|
||||||
|
|
||||||
-void KImageFilePreview::showPreview() {
|
|
||||||
+void KrusaderImageFilePreview::showPreview() {
|
|
||||||
// Pass a copy since clearPreview() will clear currentURL
|
|
||||||
KURL url = currentURL;
|
|
||||||
showPreview( url, true );
|
|
||||||
}
|
|
||||||
|
|
||||||
// called via KPreviewWidgetBase interface
|
|
||||||
-void KImageFilePreview::showPreview( const KURL& url ) {
|
|
||||||
+void KrusaderImageFilePreview::showPreview( const KURL& url ) {
|
|
||||||
showPreview( url, false );
|
|
||||||
}
|
|
||||||
|
|
||||||
-void KImageFilePreview::showPreview( const KURL &url, bool force ) {
|
|
||||||
+void KrusaderImageFilePreview::showPreview( const KURL &url, bool force ) {
|
|
||||||
if ( !url.isValid() ) {
|
|
||||||
clearPreview();
|
|
||||||
return ;
|
|
||||||
@@ -87,26 +87,26 @@
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
-void KImageFilePreview::resizeEvent( QResizeEvent * ) {
|
|
||||||
+void KrusaderImageFilePreview::resizeEvent( QResizeEvent * ) {
|
|
||||||
timer->start( 100, true ); // forces a new preview
|
|
||||||
}
|
|
||||||
|
|
||||||
-QSize KImageFilePreview::sizeHint() const {
|
|
||||||
+QSize KrusaderImageFilePreview::sizeHint() const {
|
|
||||||
return QSize( 20, 200 ); // otherwise it ends up huge???
|
|
||||||
}
|
|
||||||
|
|
||||||
-KIO::PreviewJob * KImageFilePreview::createJob( const KURL& url, int w, int h ) {
|
|
||||||
+KIO::PreviewJob * KrusaderImageFilePreview::createJob( const KURL& url, int w, int h ) {
|
|
||||||
KURL::List urls;
|
|
||||||
urls.append( url );
|
|
||||||
return KIO::filePreview( urls, w, h, 0, 0, true, false );
|
|
||||||
}
|
|
||||||
|
|
||||||
-void KImageFilePreview::gotPreview( const KFileItem* item, const QPixmap& pm ) {
|
|
||||||
+void KrusaderImageFilePreview::gotPreview( const KFileItem* item, const QPixmap& pm ) {
|
|
||||||
if ( item->url() == currentURL ) // should always be the case
|
|
||||||
imageLabel->setPixmap( pm );
|
|
||||||
}
|
|
||||||
|
|
||||||
-void KImageFilePreview::slotFailed( const KFileItem* item ) {
|
|
||||||
+void KrusaderImageFilePreview::slotFailed( const KFileItem* item ) {
|
|
||||||
if ( item->isDir() )
|
|
||||||
imageLabel->clear();
|
|
||||||
else if ( item->url() == currentURL ) // should always be the case
|
|
||||||
@@ -114,12 +114,12 @@
|
|
||||||
KIcon::DisabledState ) );
|
|
||||||
}
|
|
||||||
|
|
||||||
-void KImageFilePreview::slotResult( KIO::Job *job ) {
|
|
||||||
+void KrusaderImageFilePreview::slotResult( KIO::Job *job ) {
|
|
||||||
if ( job == m_job )
|
|
||||||
m_job = 0L;
|
|
||||||
}
|
|
||||||
|
|
||||||
-void KImageFilePreview::clearPreview() {
|
|
||||||
+void KrusaderImageFilePreview::clearPreview() {
|
|
||||||
if ( m_job ) {
|
|
||||||
m_job->kill();
|
|
||||||
m_job = 0L;
|
|
||||||
@@ -129,7 +129,7 @@
|
|
||||||
currentURL = KURL();
|
|
||||||
}
|
|
||||||
|
|
||||||
-void KImageFilePreview::virtual_hook( int id, void* data ) {
|
|
||||||
+void KrusaderImageFilePreview::virtual_hook( int id, void* data ) {
|
|
||||||
KPreviewWidgetBase::virtual_hook( id, data );
|
|
||||||
}
|
|
||||||
|
|
@ -1,24 +1,26 @@
|
|||||||
--- krusader/DiskUsage/radialMap/map.cpp
|
--- krusader/Konfigurator/kgcolors.cpp 2007/07/22 10:36:24 1.1
|
||||||
+++ krusader/DiskUsage/radialMap/map.cpp
|
+++ krusader/Konfigurator/kgcolors.cpp 2007/07/22 10:38:04
|
||||||
@@ -172,7 +172,7 @@
|
@@ -613,8 +613,10 @@
|
||||||
{
|
|
||||||
case 2000: //HACK for summary view
|
|
||||||
|
|
||||||
- if( (*it)->file()->name() == "Used" ) {
|
|
||||||
+ if( !strcmp((*it)->file()->name(), "Used") ) {
|
|
||||||
cb = QApplication::palette().active().color( QColorGroup::Highlight );
|
|
||||||
cb.hsv( &h, &s1, &v1 );
|
|
||||||
|
|
||||||
--- krusader/Konfigurator/kgcolors.cpp 2007/01/09 09:54:28 1.1
|
|
||||||
+++ krusader/Konfigurator/kgcolors.cpp 2007/01/09 09:56:34
|
|
||||||
@@ -586,7 +586,9 @@
|
|
||||||
void KgColors::serializeItem(class QDataStream & stream, const char * name)
|
void KgColors::serializeItem(class QDataStream & stream, const char * name)
|
||||||
{
|
{
|
||||||
stream << QString(name);
|
stream << QString(name);
|
||||||
- if( name == "KDE Default" || name == "Enable Alternate Background" || name == "Show Current Item Always" )
|
- if( name == "KDE Default" || name == "Enable Alternate Background" ||
|
||||||
|
- name == "Show Current Item Always" || name == "Dim Inactive Colors" )
|
||||||
+ if( (strcmp( name, "KDE Default") == 0)
|
+ if( (strcmp( name, "KDE Default") == 0)
|
||||||
+ || (strcmp( name, "Enable Alternate Background") == 0)
|
+ || (strcmp( name, "Enable Alternate Background") == 0)
|
||||||
+ || (strcmp( name, "Show Current Item Always") == 0) )
|
+ || (strcmp( name, "Show Current Item Always") == 0)
|
||||||
|
+ || (strcmp( name, "Dim Inactive Colors") == 0) )
|
||||||
{
|
{
|
||||||
bool bValue = generals->find( name )->isChecked();
|
bool bValue = generals->find( name )->isChecked();
|
||||||
stream << QString( bValue ? "true" : "false" );
|
stream << QString( bValue ? "true" : "false" );
|
||||||
|
--- krusader/Konfigurator/kgcolors.cpp 2007/07/22 10:47:35 1.5
|
||||||
|
+++ krusader/Konfigurator/kgcolors.cpp 2007/07/22 10:48:45
|
||||||
|
@@ -621,7 +621,7 @@
|
||||||
|
bool bValue = generals->find( name )->isChecked();
|
||||||
|
stream << QString( bValue ? "true" : "false" );
|
||||||
|
}
|
||||||
|
- else if( name == "Dim Factor" )
|
||||||
|
+ else if( strcmp( name, "Dim Factor") == 0 )
|
||||||
|
stream << QString::number(dimFactor->value());
|
||||||
|
else
|
||||||
|
{
|
||||||
|
@ -1,43 +0,0 @@
|
|||||||
Index: krusader/Panel/krbriefview.h
|
|
||||||
================================================================================
|
|
||||||
--- krusader/Panel/krbriefview.h
|
|
||||||
+++ krusader/Panel/krbriefview.h
|
|
||||||
@@ -19,7 +19,7 @@
|
|
||||||
virtual KrViewItem *getKrViewItemAt(const QPoint &vp);
|
|
||||||
virtual inline KrViewItem *findItemByName(const QString &name) { return dynamic_cast<KrViewItem*>( findItem( name, Qt::ExactMatch ) ); }
|
|
||||||
virtual void addItems(vfs* v, bool addUpDir = true) {}
|
|
||||||
- virtual KrViewItem *addItem(vfile *vf) {}
|
|
||||||
+ virtual KrViewItem *addItem(vfile *vf) = 0;
|
|
||||||
virtual void delItem(const QString &name) {}
|
|
||||||
virtual void updateItem(vfile *vf) {}
|
|
||||||
virtual QString getCurrentItem() const;
|
|
||||||
@@ -33,15 +33,15 @@
|
|
||||||
virtual void restoreSettings() {}
|
|
||||||
virtual void prepareForActive() {}
|
|
||||||
virtual void prepareForPassive() {}
|
|
||||||
- virtual QString nameInKConfig() {}
|
|
||||||
+ virtual QString nameInKConfig() = 0;
|
|
||||||
virtual void renameCurrentItem() {}
|
|
||||||
|
|
||||||
protected:
|
|
||||||
virtual void setup();
|
|
||||||
virtual void initProperties();
|
|
||||||
virtual void initOperator();
|
|
||||||
- virtual KrViewItem *preAddItem(vfile *vf) {}
|
|
||||||
- virtual bool preDelItem(KrViewItem *item) {}
|
|
||||||
+ virtual KrViewItem *preAddItem(vfile *vf) = 0;
|
|
||||||
+ virtual bool preDelItem(KrViewItem *item) = 0;
|
|
||||||
|
|
||||||
|
|
||||||
signals:
|
|
||||||
--- krusader/VFS/vfs.h
|
|
||||||
+++ krusader/VFS/vfs.h
|
|
||||||
@@ -134,7 +134,7 @@
|
|
||||||
|
|
||||||
protected:
|
|
||||||
/// Feel the vfs dictionary with vfiles, must be implemented for each vfs
|
|
||||||
- virtual bool populateVfsList(const KURL& origin, bool showHidden) = 0L;
|
|
||||||
+ virtual bool populateVfsList(const KURL& origin, bool showHidden) = 0;
|
|
||||||
/// Set the vfile list pointer
|
|
||||||
void setVfsFilesP(vfileDict* dict);
|
|
||||||
/// clear and delete all current vfiles
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:32a11980e0e7ac77b5435caf8aba5aa73e7fe2d8531d2db375b92913ef8dd5f2
|
|
||||||
size 4144314
|
|
3
krusader-1.80.0.tar.gz
Normal file
3
krusader-1.80.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:326d088ae3fb00b741681123d84752a80ea4d9bfce86dc14432cd7f02352686d
|
||||||
|
size 4722571
|
@ -1,3 +1,20 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun Jul 22 12:12:47 CEST 2007 - stbinner@suse.de
|
||||||
|
|
||||||
|
- update to version 1.80.0:
|
||||||
|
* Full support for ACL permissions like properties, preserve
|
||||||
|
attributes, synchronizer and other
|
||||||
|
* Many terminal emulator enhancements bringing new functions,
|
||||||
|
new usages and new look
|
||||||
|
* Many improvements of the UserAction system
|
||||||
|
* Countless usability enhancements, especially in Konfigurator
|
||||||
|
and the heavily reordered menubar
|
||||||
|
* Comparing in the synchronizer interface and parallel threading
|
||||||
|
over slower servers
|
||||||
|
* Atomic extensions and ability to rename filename, w/o extension
|
||||||
|
* Many archive enhancements like handling packing in background,
|
||||||
|
encryption support, multiple volume archives, compress level
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Jun 1 08:20:57 CEST 2007 - coolo@suse.de
|
Fri Jun 1 08:20:57 CEST 2007 - coolo@suse.de
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# spec file for package krusader (Version 1.70.1)
|
# spec file for package krusader (Version 1.80.0)
|
||||||
#
|
#
|
||||||
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
# This file and all modifications and additions to the pristine
|
# This file and all modifications and additions to the pristine
|
||||||
@ -17,17 +17,14 @@ BuildRequires: update-desktop-files
|
|||||||
%endif
|
%endif
|
||||||
Requires: kio_iso
|
Requires: kio_iso
|
||||||
URL: http://krusader.sourceforge.net/
|
URL: http://krusader.sourceforge.net/
|
||||||
License: GNU General Public License (GPL)
|
License: GPL v2 or later
|
||||||
Group: Productivity/File utilities
|
Group: Productivity/File utilities
|
||||||
Summary: A File Manager
|
Summary: A File Manager
|
||||||
Version: 1.70.1
|
Version: 1.80.0
|
||||||
Release: 81
|
Release: 1
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
Source0: krusader-%{version}.tar.gz
|
Source0: krusader-%{version}.tar.gz
|
||||||
Patch0: krusader-1.70.0_compilerwarnings.patch
|
|
||||||
Patch1: fix-duplicate-parameter.diff
|
|
||||||
Patch2: fix-isoservice-desktop.diff
|
Patch2: fix-isoservice-desktop.diff
|
||||||
Patch3: fix-preview-crash.diff
|
|
||||||
Patch4: fix-string-comparison.diff
|
Patch4: fix-string-comparison.diff
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -55,10 +52,7 @@ Authors:
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup
|
%setup
|
||||||
%patch
|
|
||||||
%patch1
|
|
||||||
%patch2
|
%patch2
|
||||||
%patch3
|
|
||||||
%patch4
|
%patch4
|
||||||
. /etc/opt/kde3/common_options
|
. /etc/opt/kde3/common_options
|
||||||
update_admin
|
update_admin
|
||||||
@ -85,6 +79,8 @@ kde_post_install
|
|||||||
/opt/kde3/share/icons/??color/??x??
|
/opt/kde3/share/icons/??color/??x??
|
||||||
/opt/kde3/%_lib/kde3/kio_krarc.*
|
/opt/kde3/%_lib/kde3/kio_krarc.*
|
||||||
/opt/kde3/share/services/krarc.protocol
|
/opt/kde3/share/services/krarc.protocol
|
||||||
|
/opt/kde3/%_lib/kde3/kio_virt.*
|
||||||
|
/opt/kde3/share/services/virt.protocol
|
||||||
%_mandir/man1/*
|
%_mandir/man1/*
|
||||||
|
|
||||||
%files -n kio_iso
|
%files -n kio_iso
|
||||||
@ -95,6 +91,20 @@ kde_post_install
|
|||||||
/opt/kde3/share/apps/konqueror
|
/opt/kde3/share/apps/konqueror
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun Jul 22 2007 - stbinner@suse.de
|
||||||
|
- update to version 1.80.0:
|
||||||
|
* Full support for ACL permissions like properties, preserve
|
||||||
|
attributes, synchronizer and other
|
||||||
|
* Many terminal emulator enhancements bringing new functions,
|
||||||
|
new usages and new look
|
||||||
|
* Many improvements of the UserAction system
|
||||||
|
* Countless usability enhancements, especially in Konfigurator
|
||||||
|
and the heavily reordered menubar
|
||||||
|
* Comparing in the synchronizer interface and parallel threading
|
||||||
|
over slower servers
|
||||||
|
* Atomic extensions and ability to rename filename, w/o extension
|
||||||
|
* Many archive enhancements like handling packing in background,
|
||||||
|
encryption support, multiple volume archives, compress level
|
||||||
* Fri Jun 01 2007 - coolo@suse.de
|
* Fri Jun 01 2007 - coolo@suse.de
|
||||||
- move kde_post_install
|
- move kde_post_install
|
||||||
* Fri Mar 09 2007 - stbinner@suse.de
|
* Fri Mar 09 2007 - stbinner@suse.de
|
||||||
|
Loading…
Reference in New Issue
Block a user