Menu
▾
▴
krusader-commits
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(98) |
Sep
(138) |
Oct
(100) |
Nov
(49) |
Dec
(131) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(94) |
Feb
(65) |
Mar
(100) |
Apr
(83) |
May
(72) |
Jun
(29) |
Jul
(167) |
Aug
(127) |
Sep
(131) |
Oct
(269) |
Nov
(122) |
Dec
(100) |
| 2005 |
Jan
(228) |
Feb
(266) |
Mar
(63) |
Apr
(135) |
May
(157) |
Jun
(52) |
Jul
(25) |
Aug
(49) |
Sep
(184) |
Oct
(159) |
Nov
(75) |
Dec
(37) |
| 2006 |
Jan
(60) |
Feb
(129) |
Mar
(110) |
Apr
(34) |
May
(31) |
Jun
(42) |
Jul
(72) |
Aug
(90) |
Sep
(57) |
Oct
(66) |
Nov
(42) |
Dec
(90) |
| 2007 |
Jan
(106) |
Feb
(54) |
Mar
(93) |
Apr
(27) |
May
(21) |
Jun
(17) |
Jul
(19) |
Aug
(22) |
Sep
(25) |
Oct
(2) |
Nov
(1) |
Dec
(1) |
| 2008 |
Jan
(65) |
Feb
(70) |
Mar
(29) |
Apr
(45) |
May
(91) |
Jun
(20) |
Jul
(11) |
Aug
(24) |
Sep
(23) |
Oct
(13) |
Nov
(23) |
Dec
(39) |
| 2009 |
Jan
(23) |
Feb
(39) |
Mar
(15) |
Apr
(56) |
May
(5) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <vac...@us...> - 2008-06-21 12:55:33
|
Revision: 6036
http://krusader.svn.sourceforge.net/krusader/?rev=6036&view=rev
Author: vaclavjuza
Date: 2008-06-20 13:51:27 -0700 (Fri, 20 Jun 2008)
Log Message:
-----------
Fixed missing word
Modified Paths:
--------------
trunk/krusader_kde4/INSTALL
Modified: trunk/krusader_kde4/INSTALL
===================================================================
--- trunk/krusader_kde4/INSTALL 2008-06-20 20:06:56 UTC (rev 6035)
+++ trunk/krusader_kde4/INSTALL 2008-06-20 20:51:27 UTC (rev 6036)
@@ -172,7 +172,7 @@
C:\MinGW\bin\mingw32-make.exe install
- Known severe run-time problems on windows at the moment (19 Jun 2008):
- + Konfigurator (launched even in the first run)
+ + Konfigurator crashes (launched even in the first run)
+ Slow start before the splashscreen appears
+ If C: is put to the location bar, you get incorrect content of panel.
Using file:///C:/ is more reliable
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ck...@us...> - 2008-06-21 12:49:54
|
Revision: 6035
http://krusader.svn.sourceforge.net/krusader/?rev=6035&view=rev
Author: ckarai
Date: 2008-06-20 13:06:56 -0700 (Fri, 20 Jun 2008)
Log Message:
-----------
FIXED: [ 1506205 ] krviewer crash at urls with non-existing redirection
Modified Paths:
--------------
trunk/krusader_kde4/ChangeLog
trunk/krusader_kde4/krusader/KViewer/krviewer.cpp
trunk/krusader_kde4/krusader/KViewer/krviewer.h
trunk/krusader_kde4/krusader/KViewer/panelviewer.cpp
trunk/krusader_kde4/krusader/KViewer/panelviewer.h
Modified: trunk/krusader_kde4/ChangeLog
===================================================================
--- trunk/krusader_kde4/ChangeLog 2008-06-20 15:22:46 UTC (rev 6034)
+++ trunk/krusader_kde4/ChangeLog 2008-06-20 20:06:56 UTC (rev 6035)
@@ -14,6 +14,7 @@
ADDED: new synchronizer shortcuts for modifying the synchronizer tasks
ADDED: credit for Václav in the about box
+ FIXED: [ 1506205 ] krviewer crash at urls with non-existing redirection
FIXED: [ 1854760 ] [ 1516619 ] inconsistent search
FIXED: [ 1920084 ] kdiff3 is allowed to handle remote URL-s
FIXED: [ 1638817 ] toolbar loses orientation when modified
Modified: trunk/krusader_kde4/krusader/KViewer/krviewer.cpp
===================================================================
--- trunk/krusader_kde4/krusader/KViewer/krviewer.cpp 2008-06-20 15:22:46 UTC (rev 6034)
+++ trunk/krusader_kde4/krusader/KViewer/krviewer.cpp 2008-06-20 20:06:56 UTC (rev 6035)
@@ -127,7 +127,6 @@
this, SLOT( slotSetStatusBarText( const QString& ) ) );
KParts::MainWindow::createGUI( part );
- toolBar()->addSeparator();
PanelViewerBase *pvb = getPanelViewerBase( part );
if( pvb )
@@ -313,7 +312,8 @@
QIcon icon = QIcon(krLoader->loadIcon(iconName,KIconLoader::Small));
manager.addPart( part, this );
- manager.setActivePart( part );
+ if( isValidPart( part ) )
+ manager.setActivePart( part );
tabBar.addTab(pvb,icon,url.fileName()+"("+msg+")");
tabBar.setCurrentIndex(tabBar.indexOf(pvb));
tabBar.setTabToolTip(tabBar.indexOf( pvb ),msg+": " + url.prettyUrl());
@@ -345,7 +345,8 @@
if( w == 0 )
return;
- manager.setActivePart( static_cast<PanelViewerBase*>(w)->part() );
+ if( isValidPart( static_cast<PanelViewerBase*>(w)->part() ) )
+ manager.setActivePart( static_cast<PanelViewerBase*>(w)->part() );
if( static_cast<PanelViewerBase*>(w) != returnFocusTab ) {
returnFocusTo = 0;
@@ -367,7 +368,8 @@
if( !pvb->queryClose() )
return;
- manager.removePart(pvb->part());
+ if( pvb->part() && isValidPart( pvb->part() ) )
+ manager.removePart(pvb->part());
pvb->closeUrl();
@@ -457,7 +459,7 @@
QTimer::singleShot( 1000, this, SLOT(checkModified()) );
PanelViewerBase* pvb = static_cast<PanelViewerBase*>( tabBar.currentWidget() );
- if( !pvb ) return;
+ if( !pvb || !pvb->part() ) return;
if( !pvb->part()->url().equals( pvb->url(), KUrl::CompareWithoutTrailingSlash ) ) {
pvb->setUrl( pvb->part()->url() );
@@ -506,7 +508,8 @@
KrViewer* viewer = getViewer(true);
- manager.removePart(pvb->part());
+ if( pvb->part() && isValidPart( pvb->part() ) )
+ manager.removePart(pvb->part());
tabBar.removePage(pvb);
if( tabBar.count() == 1 ) {
@@ -530,7 +533,7 @@
void KrViewer::print() {
PanelViewerBase* pvb = static_cast<PanelViewerBase*>( tabBar.currentWidget() );
- if( !pvb ) return;
+ if( !pvb || !pvb->part() ) return;
KParts::BrowserExtension * ext = KParts::BrowserExtension::childObject( pvb->part() );
if( ext && ext->isActionEnabled( "print" ) )
@@ -539,7 +542,7 @@
void KrViewer::copy() {
PanelViewerBase* pvb = static_cast<PanelViewerBase*>( tabBar.currentWidget() );
- if( !pvb ) return;
+ if( !pvb || !pvb->part() ) return;
KParts::BrowserExtension * ext = KParts::BrowserExtension::childObject( pvb->part() );
if( ext && ext->isActionEnabled( "copy" ) )
@@ -570,6 +573,14 @@
toolBar()->addAction( copyAction->icon(), copyAction->text(), this, SLOT( copy() ) );
}
+bool KrViewer::isValidPart( KParts::Part* part) {
+ return manager.parts().contains( part );
+}
+
+void KrViewer::partDestroyed( PanelViewerBase * pvb ) {
+ /* not yet used */
+}
+
#if 0
bool KrViewer::editGeneric( QString mimetype, KUrl _url ) {
KParts::ReadWritePart * kedit_part = 0L;
Modified: trunk/krusader_kde4/krusader/KViewer/krviewer.h
===================================================================
--- trunk/krusader_kde4/krusader/KViewer/krviewer.h 2008-06-20 15:22:46 UTC (rev 6034)
+++ trunk/krusader_kde4/krusader/KViewer/krviewer.h 2008-06-20 20:06:56 UTC (rev 6035)
@@ -68,6 +68,7 @@
void tabURLChanged( PanelViewerBase * pvb, const KUrl &url );
void tabCloseRequest(QWidget *w);
void tabCloseRequest();
+ void partDestroyed( PanelViewerBase * );
void nextTab();
void prevTab();
@@ -87,6 +88,7 @@
void addTab(PanelViewerBase* pvb, QString msg,QString iconName, KParts::Part* part);
PanelViewerBase * getPanelViewerBase( KParts::Part* part);
void updateActions( PanelViewerBase * base );
+ bool isValidPart( KParts::Part* part);
static KrViewer* getViewer(bool new_window);
Modified: trunk/krusader_kde4/krusader/KViewer/panelviewer.cpp
===================================================================
--- trunk/krusader_kde4/krusader/KViewer/panelviewer.cpp 2008-06-20 15:22:46 UTC (rev 6034)
+++ trunk/krusader_kde4/krusader/KViewer/panelviewer.cpp 2008-06-20 20:06:56 UTC (rev 6035)
@@ -28,7 +28,7 @@
QStackedWidget( parent ), mimes( 0 ), cpart( 0 ) {
setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Ignored ) );
- mimes = new QHash<QString, KParts::ReadOnlyPart *>();
+ mimes = new QHash<QString, QPointer<KParts::ReadOnlyPart> >();
cpart = 0;
fallback = new QLabel( i18n( "No file selected or selected file can't be displayed." ), this );
fallback->setAlignment( Qt::Alignment( QFlag( Qt::AlignCenter | Qt::TextExpandTabs ) ) );
@@ -40,9 +40,12 @@
PanelViewerBase::~PanelViewerBase() {
// cpart->queryClose();
closeUrl();
- QHashIterator< QString, KParts::ReadOnlyPart *> lit( *mimes );
- while( lit.hasNext() )
- delete lit.next().value();
+ QHashIterator< QString, QPointer<KParts::ReadOnlyPart> > lit( *mimes );
+ while( lit.hasNext() ) {
+ QPointer<KParts::ReadOnlyPart> p = lit.next().value();
+ if( p )
+ delete p;
+ }
mimes->clear();
delete mimes;
delete fallback;
@@ -89,6 +92,7 @@
}
if ( cpart && cpart->openUrl( curl ) ){
curl = url; /* needed because of the oldHexViewer */
+ connect( cpart, SIGNAL( destroyed() ), this, SLOT( slotCPartDestroyed() ) );
return cpart;
}
else {
@@ -253,23 +257,29 @@
}
if( create ){
- if( static_cast<KParts::ReadWritePart *>(cpart)->saveAs( curl ) ) return cpart;
+ if( static_cast<KParts::ReadWritePart *>(cpart.data())->saveAs( curl ) ) {
+ connect( cpart, SIGNAL( destroyed() ), this, SLOT( slotCPartDestroyed() ) );
+ return cpart;
+ }
}
else {
- if ( cpart->openUrl( curl ) ) return cpart;
+ if ( cpart->openUrl( curl ) ) {
+ connect( cpart, SIGNAL( destroyed() ), this, SLOT( slotCPartDestroyed() ) );
+ return cpart;
+ }
}
return 0;
}
bool PanelEditor::queryClose() {
if ( !cpart ) return true;
- return static_cast<KParts::ReadWritePart *>(cpart)->queryClose();
+ return static_cast<KParts::ReadWritePart *>(cpart.data())->queryClose();
}
bool PanelEditor::closeUrl() {
if ( !cpart ) return false;
- static_cast<KParts::ReadWritePart *>(cpart)->closeUrl( false );
+ static_cast<KParts::ReadWritePart *>(cpart.data())->closeUrl( false );
setCurrentWidget( fallback );
cpart = 0;
@@ -314,7 +324,7 @@
}
bool PanelEditor::isModified(){
- return static_cast<KParts::ReadWritePart *>(cpart)->isModified();
+ return static_cast<KParts::ReadWritePart *>(cpart.data())->isModified();
}
#include "panelviewer.moc"
Modified: trunk/krusader_kde4/krusader/KViewer/panelviewer.h
===================================================================
--- trunk/krusader_kde4/krusader/KViewer/panelviewer.h 2008-06-20 15:22:46 UTC (rev 6034)
+++ trunk/krusader_kde4/krusader/KViewer/panelviewer.h 2008-06-20 20:06:56 UTC (rev 6035)
@@ -33,10 +33,14 @@
signals:
void openUrlRequest( const KUrl &url );
void urlChanged( PanelViewerBase *, const KUrl & );
+ void partDestroyed( PanelViewerBase * );
+protected slots:
+ void slotCPartDestroyed() { emit partDestroyed( this ); }
+
protected:
- QHash<QString, KParts::ReadOnlyPart*> *mimes;
- KParts::ReadOnlyPart *cpart;
+ QHash<QString, QPointer<KParts::ReadOnlyPart> > *mimes;
+ QPointer<KParts::ReadOnlyPart> cpart;
QString cmimetype;
KUrl curl;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cod...@us...> - 2008-06-20 15:22:40
|
Revision: 6034
http://krusader.svn.sourceforge.net/krusader/?rev=6034&view=rev
Author: codeknight
Date: 2008-06-20 08:22:46 -0700 (Fri, 20 Jun 2008)
Log Message:
-----------
Features update for the krusader-2.0.0-beta1 release
Modified Paths:
--------------
trunk/krusader_kde4/doc/en/features.docbook
Modified: trunk/krusader_kde4/doc/en/features.docbook
===================================================================
--- trunk/krusader_kde4/doc/en/features.docbook 2008-06-19 20:46:17 UTC (rev 6033)
+++ trunk/krusader_kde4/doc/en/features.docbook 2008-06-20 15:22:46 UTC (rev 6034)
@@ -280,7 +280,7 @@
</para>
<para>
<itemizedlist>
- <title>New features in the &krusader;-1.80.0
+ <title>New features in the &krusader;-1.80.0 "Final 3rd Stone"
release</title>
<listitem>
<para>Archive improvements
@@ -379,10 +379,48 @@
<listitem>
<para>Many bug fixes.</para>
</listitem>
+ </itemizedlist>
+</para>
+
+<para>
+ <itemizedlist>
+ <title>New features in the &krusader;-1.90.0 "Power Stone"
+ release</title>
<listitem>
+ <para>Last release for KDE3.x with a
+ <ulink url="http://www.krusader.org/phpBB/viewtopic.php?t=2061"> big collection of Useractions</ulink>.
+ </para>
+ </listitem>
+ </itemizedlist>
+</para>
+
+
+<para>
+ <itemizedlist>
+ <title>New features in the &krusader;-2.0.0 "Apollo"
+ release</title>
+ <listitem>
+ <para>The first release for the KDE4.x series
+ </para>
+ </listitem>
+ <listitem>
+ <para>Works on &Windows;! (But not so useful and powerful yet as under &Linux;)
+ </para>
+ </listitem>
+ <listitem>
+ <para>Our first goal was to make Krusader-2.0.0 stable after prorting from KDE3 to KDE4.
+ New features will follow, though small improvements are already added in this
+ release (check the README file).
+ </para>
+ </listitem>
+ <listitem>
<para>For more features, please read the
&changelog-url; and
&svnnews-url;.</para>
</listitem>
</itemizedlist>
-</para>&dev-svn-note;</chapter>
+</para>
+
+
+
+<para>&dev-svn-note;</para></chapter>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cod...@us...> - 2008-06-19 20:46:09
|
Revision: 6033
http://krusader.svn.sourceforge.net/krusader/?rev=6033&view=rev
Author: codeknight
Date: 2008-06-19 13:46:17 -0700 (Thu, 19 Jun 2008)
Log Message:
-----------
Krusader on Windows install instructions
Modified Paths:
--------------
trunk/krusader_kde4/doc/ChangeLog
trunk/krusader_kde4/doc/en/installation.docbook
Modified: trunk/krusader_kde4/doc/ChangeLog
===================================================================
--- trunk/krusader_kde4/doc/ChangeLog 2008-06-19 19:55:17 UTC (rev 6032)
+++ trunk/krusader_kde4/doc/ChangeLog 2008-06-19 20:46:17 UTC (rev 6033)
@@ -6,6 +6,8 @@
==================================
Date:
+ ADDED: Windows installation instructions
+ ADDED: KDE4.x installation instructions
ADDED: synchronizer_keybindings
ADDED: compilation requirements for KDE4
ADDED: credits for Václav Jůza
@@ -13,7 +15,6 @@
UPDATED: Handbook update from CVS krusader_kde3 to SVN krusader_kde4 at 18 january 2008
- ADDED: KDE4.0 installation instructions
ADDED: Howto executing jar files (and not enter the jar archive)?
ADDED: FAQ How don't add ".part" suffix when copying files via ftp?
ADDED: FAQ Where is Konfigurator?
Modified: trunk/krusader_kde4/doc/en/installation.docbook
===================================================================
--- trunk/krusader_kde4/doc/en/installation.docbook 2008-06-19 19:55:17 UTC (rev 6032)
+++ trunk/krusader_kde4/doc/en/installation.docbook 2008-06-19 20:46:17 UTC (rev 6033)
@@ -436,7 +436,7 @@
<title>Installation on KDE4.x</title> -->
<sect1 id="compilation">
- <title>Krusader installation instructions on KDE4.0</title>
+ <title>Krusader installation instructions on KDE4.x</title>
<note>
<para>From version &krusader;-2.0.0 and higher is &kde;-4 only.</para>
</note>
@@ -454,32 +454,7 @@
<para>You can download the latest available krusader-2.x <link linkend="krusader_svn">from SVN</link>.</para>
-<sect2>
-<title>Compilation requirements</title>
-<para>The next packages are needed for compiling Krusader,
-if you only run a Krusader binary you don't need these packages.</para>
-<para>
- <itemizedlist>
- <listitem>
- <para>gcc</para>
- </listitem>
- <listitem>
- <para>cmake</para>
- </listitem>
- <listitem>
- <para>gettext (contains msgfmt)</para>
- </listitem>
- <listitem>
- <para>kdelibs5-dev (installs many development libraries for KDE4)</para>
- </listitem>
- <listitem>
- <para>libphonon-dev</para>
- </listitem>
- </itemizedlist>
-</para>
-</sect2>
-
<sect2>
<title>Krusader dependencies</title>
<para>The next packages are needed to run the Krusader binary.</para>
@@ -489,15 +464,12 @@
<para>c libraries</para>
</listitem>
<listitem>
- <para>zlib1g-dev: library for implementing the deflate compression method found in gzip and PKZIP</para>
+ <para>kdelibs5 (KDE4 core libraries and binaries for all KDE4 applications)</para>
</listitem>
<listitem>
- <para>kdelibs5: KDE4 core libraries and binaries for all KDE4 applications</para>
+ <para>libkjsembed1 (Embedded JavaScript library)
+ (for the the optional Javascripting function in Krusader)</para>
</listitem>
- <listitem>
- <para>libkjsembed1 Embedded JavaScript library
- (for the the optional Javascripting function in Krusader) </para>
- </listitem>
</itemizedlist>
</para>
</sect2>
@@ -593,6 +565,39 @@
</sect2>
+<sect2>
+<title>Compilation requirements</title>
+<para>The next packages are needed for compiling Krusader,
+if you only run a Krusader binary you don't need these packages.</para>
+<para>
+ <itemizedlist>
+ <listitem>
+ <para>gcc (The GNU C compiler)</para>
+ </listitem>
+ <listitem>
+ <para>g++ (The GNU C++ compiler)</para>
+ </listitem>
+ <listitem>
+ <para>cmake (A cross-platform, open-source make system)</para>
+ </listitem>
+ <listitem>
+ <para>zlib1g-dev: (library for implementing the deflate compression method found in gzip and PKZIP)</para>
+ </listitem>
+ <listitem>
+ <para>gettext (contains msgfmt)</para>
+ </listitem>
+ <listitem>
+ <para>kdelibs5-dev (installs many development libraries for KDE4)</para>
+ </listitem>
+ <listitem>
+ <para>libphonon-dev (libphonon-dev cross-platform multimedia framework development)</para>
+ </listitem>
+ </itemizedlist>
+</para>
+</sect2>
+
+
+
</sect1>
<sect1 id="kde4_lin_install">
@@ -621,15 +626,96 @@
<sect1 id="kde4_mac_install">
<title>Installing on the MAC platform</title>
-<para>FIXME</para>
+<para><link linkend="mac-port">KDE3 install instructions</link> (FIXME)</para>
</sect1>
<sect1 id="kde4_win_install">
<title>Installing on the Windows platform</title>
-<para>Please read the INSTALL file of the Krusader source tarball (FIXME).</para>
+<para>Tested on &Windows; XP, not yet tested on &Windows; Vista but it should work.</para>
+<para>
+ <itemizedlist>
+ <listitem>
+ <para>Install the <ulink url="http://winkde.org/pub/kde/ports/win32/installer/">KDE installer</ulink>,
+ See also <ulink url="http://windows.kde.org/">windows.kde.org</ulink> ,
+ During install, choose the following option:</para>
+ <itemizedlist>
+ <listitem>
+ <para>installation path in this example was <filename>c:\kde4</filename></para>
+ </listitem>
+ <listitem>
+ <para>install mode: developer installation</para>
+ </listitem>
+ <listitem>
+ <para>compiler mode: mingw</para>
+ </listitem>
+ <listitem>
+ <para>select installation of binary and developement files of the following
+ packages (Note that some packages are not in any category and one
+ needs to view all to find them): mingw, gcc (including g++), cmake, dbus,
+ qt4, kdelibs, kdebase, (TODO: check if this list is complete).</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ <listitem>
+ <para>Create the source directory for krusader and checked out svn
+ (you can use <ulink url="http://tortoisesvn.net/">TortoiseSVN</ulink> for that )
+ In this example, <filename>c:/kde4/src/krusader_kde4</filename> was used.</para>
+ </listitem>
+ <listitem>
+ <para>Create the directory for generated files and cd to it
+ In this example, <filename>c:/kde4/build/krusader_kde4</filename> was used.</para>
+ </listitem>
+ <listitem>
+ <para>Open the windows terminal (cmd.exe) and go to the build directory
+ <filename>c:</filename>
+ <filename>cd \kde4\build\krusader_kde4</filename></para>
+ </listitem>
+ <listitem>
+ <para>So as to avoid a cmake error, that it can't find some kde library which is for sure installed,
+ it is necessary to make the following fix:
+ There is a strange problem, that in cmake modules
+ <filename>c:\kde4\share\apps\cmake\modules\KDELibsDependencies.cmake</filename>
+ and
+ <filename>c:\kde4\share\apps\cmake\modules\KDEPimLibsDependencies.cmake</filename>
+ there are wrong hardcoded paths to the installation directory (<filename>D:/kde/kde-mingw</filename>),
+ it is necessary to replace it manually to <filename>c:/kde4</filename>.</para>
+ </listitem>
+ <listitem>
+ <para>Run cmake in the build directory with the following parameters:
+ <filename>c:\kde4\bin\cmake.exe -G "MinGW Makefiles" c:/kde4/src/krusader_kde4 -DCMAKE_INSTALL_PREFIX=c:/kde4 -DCMAKE_INCLUDE_PATH=c:/kde4/include -DCMAKE_LIBRARY_PATH=c:/kde4/lib -DKDEWIN_DIR:PATH=c:/kde4 -DCMAKE_BUILD_TYPE=debugful</filename></para>
+ </listitem>
+ <listitem>
+ <para>Run make from mingw:
+ <filename>C:\MinGW\bin\mingw32-make.exe install</filename></para>
+ </listitem>
+ <listitem>
+ <para>Known severe run-time problems on windows at the moment (19 Jun 2008):
+ <itemizedlist>
+ <listitem>
+ <para>Konfigurator (launched even in the first run)</para>
+ </listitem>
+ <listitem>
+ <para>Slow start before the splashscreen appears</para>
+ </listitem>
+ <listitem>
+ <para>If <filename>C:</filename> is put to the location bar, you get incorrect content of panel.
+ Using file:<filename>///C:/</filename> is more reliable</para>
+ </listitem>
+ <listitem>
+ <para>Not possible to navigate inside ftp</para>
+ </listitem>
+ <listitem>
+ <para>...</para>
+ </listitem>
+ </itemizedlist>
+ </para>
+ </listitem>
+ </itemizedlist>
+</para>
+
</sect1>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cod...@us...> - 2008-06-19 19:55:10
|
Revision: 6032
http://krusader.svn.sourceforge.net/krusader/?rev=6032&view=rev
Author: codeknight
Date: 2008-06-19 12:55:17 -0700 (Thu, 19 Jun 2008)
Log Message:
-----------
minor updates
Modified Paths:
--------------
trunk/krusader_kde4/INSTALL
Modified: trunk/krusader_kde4/INSTALL
===================================================================
--- trunk/krusader_kde4/INSTALL 2008-06-19 16:45:59 UTC (rev 6031)
+++ trunk/krusader_kde4/INSTALL 2008-06-19 19:55:17 UTC (rev 6032)
@@ -15,7 +15,7 @@
---------
* All POSIX (Linux®/BSD/UNIX®-like OSes), Solaris™
* All BSD Platforms (FreeBSD®/NetBSD®/OpenBSD®/Mac® OS)
-* Windows XP™ (not tested on Vista yet bu should probably work)
+* Windows XP® (not yet tested on Vista but it should work)
Installing on Linux® and BSD platforms
@@ -24,9 +24,8 @@
Krusader dependencies
---------------------
- c libraries
-- zlib1g-dev library for implementing the deflate compression method found in gzip and PKZIP
-- kdelibs5 KDE4 core libraries and binaries for all KDE4 applications
-- libkjsembed1 Embedded JavaScript library
+- kdelibs5 (KDE4 core libraries and binaries for all KDE4 applications)
+- libkjsembed1 (Embedded JavaScript library)
(for the the optional Javascripting function in Krusader)
@@ -72,11 +71,13 @@
------------------------
The next packages are needed for compiling the Krusader sourcecode,
if you only run the Krusader binary you don't need to install these packages.
-- gcc
-- cmake
+- gcc (The GNU C compiler)
+- g++ (The GNU C++ compiler)
+- cmake (A cross-platform, open-source make system)
+- zlib1g-dev (library for implementing the deflate compression method found in gzip and PKZIP)
- gettext (contains msgfmt)
- kdelibs5-dev (installs many development libraries for KDE4)
-- libphonon-dev
+- libphonon-dev (libphonon-dev cross-platform multimedia framework development)
cmake options
@@ -108,6 +109,8 @@
$ make
$ su -c "make install"
+or
+$ sudo make install
Uninstall
@@ -120,7 +123,7 @@
http://www.krusader.org/handbook/mac-port.html
-Installation on Windows™
+Installation on Windows®
========================
http://groups.google.com/group/krusader-devel/browse_thread/thread/3507c5dc7b866845
@@ -182,11 +185,7 @@
-------------------
This is the cmake output on Kubuntu 8.04 (KDE 4 Remix)
-frank@frank-kubuntu:~/krusader_kde4$ cmake -DCMAKE_INSTALL_PREFIX=/usr/ -DQT_INCLUDES=/usr/share/qt4/include
--- Check for working C compiler: /usr/bin/gcc
--- Check for working C compiler: /usr/bin/gcc -- works
--- Check size of void*
--- Check size of void* - done
+frank@kubuntu:~/krusader_kde4$ cmake -DCMAKE_INSTALL_PREFIX=/usr -DQT_INCLUDES=/usr/share/qt4/include
-- Check for working CXX compiler: /usr/bin/c++
-- Check for working CXX compiler: /usr/bin/c++ -- works
-- Looking for Q_WS_X11
@@ -240,9 +239,12 @@
-- Configuring done
-- Generating done
-- Build files have been written to: /home/frank/krusader_kde4
-frank@frank-kubuntu:~/krusader_kde4$
+frank@kubuntu:~/krusader_kde4$
+
+
+
FYI
The output of make (partial)
----------------------------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cod...@us...> - 2008-06-19 16:45:50
|
Revision: 6031
http://krusader.svn.sourceforge.net/krusader/?rev=6031&view=rev
Author: codeknight
Date: 2008-06-19 09:45:59 -0700 (Thu, 19 Jun 2008)
Log Message:
-----------
minor update
Modified Paths:
--------------
trunk/krusader_kde4/INSTALL
Modified: trunk/krusader_kde4/INSTALL
===================================================================
--- trunk/krusader_kde4/INSTALL 2008-06-19 09:28:05 UTC (rev 6030)
+++ trunk/krusader_kde4/INSTALL 2008-06-19 16:45:59 UTC (rev 6031)
@@ -15,7 +15,7 @@
---------
* All POSIX (Linux®/BSD/UNIX®-like OSes), Solaris™
* All BSD Platforms (FreeBSD®/NetBSD®/OpenBSD®/Mac® OS)
-* Windows™
+* Windows XP™ (not tested on Vista yet bu should probably work)
Installing on Linux® and BSD platforms
@@ -90,6 +90,18 @@
$ cmake -DCMAKE_INSTALL_PREFIX=/usr/ -DQT_INCLUDES=/usr/share/qt4/include
+Note:
+We had a problem with cmake-2.4 on Kubuntu 8.04 and probably other distro's as well.
+------------
+CMake Error: CPack welcome resource file:
+"/usr/share/cmake/Templates/CPack.GenericWelcome.txt" could not be found.
+------------
+To fix the error:
+$ sudo mkdir /usr/share/cmake/
+$ sudo ln -s /usr/share/cmake-2.4/Templates /usr/share/cmake/Templates
+
+
+
Compilation and installation
----------------------------
Compilation will take about 5 to 10 minutes depending on your CPU speed.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vac...@us...> - 2008-06-19 09:27:59
|
Revision: 6030
http://krusader.svn.sourceforge.net/krusader/?rev=6030&view=rev
Author: vaclavjuza
Date: 2008-06-19 02:28:05 -0700 (Thu, 19 Jun 2008)
Log Message:
-----------
Update the INSTALL doc for windows
Modified Paths:
--------------
trunk/krusader_kde4/INSTALL
trunk/krusader_kde4/krusader/VFS/preserveattrcopyjob.cpp
Modified: trunk/krusader_kde4/INSTALL
===================================================================
--- trunk/krusader_kde4/INSTALL 2008-06-18 23:01:27 UTC (rev 6029)
+++ trunk/krusader_kde4/INSTALL 2008-06-19 09:28:05 UTC (rev 6030)
@@ -115,13 +115,14 @@
- Install the KDE installer http://winkde.org/pub/kde/ports/win32/installer/
(tested with version 0.9.2). See also http://windows.kde.org/
During install, choose the following option:
- + developer installation
- + version compiled by mingw
+ installation path in this example was c:\kde4
- + select installation of binary and developement files of at the following
+ + install mode: developer installation
+ + compiler mode: mingw
+ + select installation of binary and developement files of the following
packages (Note that some packages are not in any category and one
needs to view all to find them):
* mingw
+ * gcc (including g++)
* cmake
* dbus
* qt4
@@ -140,16 +141,18 @@
c:
cd \kde4\build\krusader_kde4
+- So as to avoid a cmake error, that it can't find some kde library which is for sure installed,
+ it is necessary to make the following fix:
+ There is a strange problem, that in cmake modules
+ c:\kde4\share\apps\cmake\modules\KDELibsDependencies.cmake
+ and
+ c:\kde4\share\apps\cmake\modules\KDEPimLibsDependencies.cmake
+ there are wrong hardcoded paths to the installation directory (D:/kde/kde-mingw),
+ it is necessary to replace it manually to c:/kde4.
+
- Run cmake in the build directory with the following parameters:
c:\kde4\bin\cmake.exe -G "MinGW Makefiles" c:/kde4/src/krusader_kde4 -DCMAKE_INSTALL_PREFIX=c:/kde4 -DCMAKE_INCLUDE_PATH=c:/kde4/include -DCMAKE_LIBRARY_PATH=c:/kde4/lib -DKDEWIN_DIR:PATH=c:/kde4 -DCMAKE_BUILD_TYPE=debugful
-- If you get a cmake error, that it can find some Qt library which is for sure installed
- (TODO: describe properly the bug and put url),
- there was a strange problem, that in some cmake modules for qt and kde,
- there were wrong hardcoded paths to the installation directory, it is necessary
- to change them manually.
- After fixing, clean up the build directory and run cmake again.
-
- Run make from mingw:
C:\MinGW\bin\mingw32-make.exe install
Modified: trunk/krusader_kde4/krusader/VFS/preserveattrcopyjob.cpp
===================================================================
--- trunk/krusader_kde4/krusader/VFS/preserveattrcopyjob.cpp 2008-06-18 23:01:27 UTC (rev 6029)
+++ trunk/krusader_kde4/krusader/VFS/preserveattrcopyjob.cpp 2008-06-19 09:28:05 UTC (rev 6030)
@@ -44,7 +44,7 @@
#include <ktemporaryfile.h>
#include <kuiserverjobtracker.h>
-#if defined(Q_OS_UNIX) || defined(Q_OS_WIN32)
+#if defined(Q_OS_UNIX) || defined(Q_WS_WIN)
#include <utime.h>
#endif
#include <assert.h>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vac...@us...> - 2008-06-18 23:01:21
|
Revision: 6029
http://krusader.svn.sourceforge.net/krusader/?rev=6029&view=rev
Author: vaclavjuza
Date: 2008-06-18 16:01:27 -0700 (Wed, 18 Jun 2008)
Log Message:
-----------
Rephrase the installation instructions for windows
Modified Paths:
--------------
trunk/krusader_kde4/INSTALL
Modified: trunk/krusader_kde4/INSTALL
===================================================================
--- trunk/krusader_kde4/INSTALL 2008-06-18 21:18:39 UTC (rev 6028)
+++ trunk/krusader_kde4/INSTALL 2008-06-18 23:01:27 UTC (rev 6029)
@@ -112,37 +112,56 @@
========================
http://groups.google.com/group/krusader-devel/browse_thread/thread/3507c5dc7b866845
-- Installed KDE installer http://winkde.org/pub/kde/ports/win32/installer/
- (version 0.9.2). During install, Chose developer installation using
- mingw and c:\kde4 as the installation directory. For all the necessary
- packages (mingw, dbus, qt4, kdelibs, ...) Check the developer files
- to be installed. Note that some packages are not in any category and on
- eneeds to view all to find them.
+- Install the KDE installer http://winkde.org/pub/kde/ports/win32/installer/
+ (tested with version 0.9.2). See also http://windows.kde.org/
+ During install, choose the following option:
+ + developer installation
+ + version compiled by mingw
+ + installation path in this example was c:\kde4
+ + select installation of binary and developement files of at the following
+ packages (Note that some packages are not in any category and one
+ needs to view all to find them):
+ * mingw
+ * cmake
+ * dbus
+ * qt4
+ * kdelibs
+ * kdebase
+ * ... (TODO: check if this list is complete)
-- created the source directory for krusader and checked out svn
- (c:/kde4/src/krusader_kde4)
+- Create the source directory for krusader and checked out svn
+ (you can use TortoiseSVN for that http://tortoisesvn.net/)
+ In this example, c:/kde4/src/krusader_kde4 was used.
-- created the build directory and cd to it
- (c:/kde4/build/krusader_kde4)
+- Create the directory for generated files and cd to it
+ In this example, c:/kde4/build/krusader_kde4 was used
-- run cmake (the following should be on one line) in the build directory:
- c:\kde4\bin\cmake.exe -G "MinGW Makefiles" c:/kde4/src/krusader_kde4
+- Open the windows terminal (cmd.exe) and go to the build directory
+ c:
+ cd \kde4\build\krusader_kde4
--DCMAKE_INSTALL_PREFIX=c:/kde4 -DCMAKE_INCLUDE_PATH=c:/kde4/include
-
--DCMAKE_LIBRARY_PATH=c:/kde4/lib -DKDEWIN_DIR:PATH=c:/kde4
+- Run cmake in the build directory with the following parameters:
+ c:\kde4\bin\cmake.exe -G "MinGW Makefiles" c:/kde4/src/krusader_kde4 -DCMAKE_INSTALL_PREFIX=c:/kde4 -DCMAKE_INCLUDE_PATH=c:/kde4/include -DCMAKE_LIBRARY_PATH=c:/kde4/lib -DKDEWIN_DIR:PATH=c:/kde4 -DCMAKE_BUILD_TYPE=debugful
--DCMAKE_BUILD_TYPE=debugful
+- If you get a cmake error, that it can find some Qt library which is for sure installed
+ (TODO: describe properly the bug and put url),
+ there was a strange problem, that in some cmake modules for qt and kde,
+ there were wrong hardcoded paths to the installation directory, it is necessary
+ to change them manually.
+ After fixing, clean up the build directory and run cmake again.
-- There was a strange problem, that in some cmake modules for qt and kde,
- there were wrong hardcoded paths to the installation directory, we had to
- change them manually. Check that, if the cmake cannot
- find some library which is surely installed.
+- Run make from mingw:
+ C:\MinGW\bin\mingw32-make.exe install
-- C:\MinGW\bin\mingw32-make.exe install
+- Known severe run-time problems on windows at the moment (19 Jun 2008):
+ + Konfigurator (launched even in the first run)
+ + Slow start before the splashscreen appears
+ + If C: is put to the location bar, you get incorrect content of panel.
+ Using file:///C:/ is more reliable
+ + Not possible to navigate inside ftp
+ + ...
-
FYI
The output of cmake
-------------------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cod...@us...> - 2008-06-18 21:18:32
|
Revision: 6028
http://krusader.svn.sourceforge.net/krusader/?rev=6028&view=rev
Author: codeknight
Date: 2008-06-18 14:18:39 -0700 (Wed, 18 Jun 2008)
Log Message:
-----------
krusader2-x for kde4 installation instructions
Modified Paths:
--------------
trunk/krusader_kde4/doc/en/faq.docbook
trunk/krusader_kde4/doc/en/help.docbook
trunk/krusader_kde4/doc/en/index.docbook
trunk/krusader_kde4/doc/en/installation.docbook
trunk/krusader_kde4/doc/en/release-overview.docbook
Modified: trunk/krusader_kde4/doc/en/faq.docbook
===================================================================
--- trunk/krusader_kde4/doc/en/faq.docbook 2008-06-18 21:16:48 UTC (rev 6027)
+++ trunk/krusader_kde4/doc/en/faq.docbook 2008-06-18 21:18:39 UTC (rev 6028)
@@ -1784,10 +1784,9 @@
<para>Is there a &Windows; port?</para>
</question>
<answer>
- <para>No, but this might change in the future. Please
- <link linkend="help_krusader">help us</link> with this
- project, contributions are greatly appreciated. A
- recommended native file manager for &Windows;
+ <para>Yes since 18 June 2008, Krusader-2.x compiles on Windows,
+ but several libraries need to be installed before it can be used.
+ A recommended native file manager for &Windows;
is &tcmd-url; (shareware).</para>
<para></para>
<!-- Empty line to make it more readable -->
Modified: trunk/krusader_kde4/doc/en/help.docbook
===================================================================
--- trunk/krusader_kde4/doc/en/help.docbook 2008-06-18 21:16:48 UTC (rev 6027)
+++ trunk/krusader_kde4/doc/en/help.docbook 2008-06-18 21:18:39 UTC (rev 6028)
@@ -130,14 +130,9 @@
<emphasis role="bold">Porting &krusader; to
&Windows;</emphasis>
</para>
- <para>&krusader; is written using &Qt; as
- well as &kde;libs. As long as &kde;libs
- does not run on &Windows;, porting
- &krusader; is not an option. However, we do believe
- that once &Qt;4-GPL is released, efforts will be made
- to port &kde;libs to &Windows;, and if that
- happens, we're in business and then we need a maintainer for
- porting &krusader; to &Windows;.</para>
+ <para>&krusader;-2.x is ported to &Windows; since 18 June 2008.
+ It needs &Qt; as and &kde;libs to run.
+ All feedback is welcome.</para>
<para>
<emphasis role="bold">FAQ</emphasis>
</para>
Modified: trunk/krusader_kde4/doc/en/index.docbook
===================================================================
--- trunk/krusader_kde4/doc/en/index.docbook 2008-06-18 21:16:48 UTC (rev 6027)
+++ trunk/krusader_kde4/doc/en/index.docbook 2008-06-18 21:18:39 UTC (rev 6028)
@@ -304,6 +304,7 @@
<!ENTITY openlx '<trademark>OpenLX</trademark>'>
<!ENTITY appleipod '<trademark>Apple ipod</trademark>'>
+
<!-- (R) Registered ENTITIES -->
<!ENTITY freebsd '<trademark class="registered">FreeBSD</trademark>'>
<!ENTITY debian '<trademark class="registered">Debian</trademark>'>
@@ -330,7 +331,8 @@
<!ENTITY ccuxlinux '<trademark class="registered">CCux Linux</trademark>'>
<!ENTITY qilinux '<trademark class="registered">QiLinux</trademark>'>
<!ENTITY rocklinux '<trademark class="registered">ROCK Linux</trademark>'>
-
+
+
<!ENTITY nvidia '<trademark class="registered">NVIDIA</trademark>'>
<!ENTITY nc '<trademark class="registered">Norton Commander</trademark>'>
<!ENTITY openoffice '<trademark class="registered">OpenOffice</trademark>'>
@@ -549,7 +551,7 @@
Back-Cover Texts. A copy of the license is included in the
&krusader; sources.</para>
</legalnotice>
- <date>2008-05-21</date>
+ <date>2008-06-18</date>
<releaseinfo>2.0.0-beta1 "Phoenix Egg"</releaseinfo>
<abstract>
<para>&krusader; is an advanced, twin-panel
Modified: trunk/krusader_kde4/doc/en/installation.docbook
===================================================================
--- trunk/krusader_kde4/doc/en/installation.docbook 2008-06-18 21:16:48 UTC (rev 6027)
+++ trunk/krusader_kde4/doc/en/installation.docbook 2008-06-18 21:18:39 UTC (rev 6028)
@@ -27,7 +27,7 @@
<title>Requirements</title>
<para>In order to successfully use the most recent
&krusader;, you need &kde;libs
- >= 4.0</para>
+ >= 4.x</para>
<para>Required &kde; version:
<itemizedlist>
<listitem>
@@ -65,7 +65,7 @@
&kde; 3.5</para>
</listitem>
<listitem>
- <para>&krusader; v2.x.x: &kde; 4</para>
+ <para>&krusader; v2.x.x: &kde; 4.x</para>
</listitem>
</itemizedlist>
NOTE: for installation instructions for &krusader;-1.x for &kde; 2 click
@@ -81,6 +81,9 @@
<para>All BSD Platforms
(&freebsd;/&netbsd;/&openbsd;/&MacOS;)</para>
</listitem>
+ <listitem>
+ <para>&Windows; XP and Vista</para>
+ </listitem>
</itemizedlist></para>
<para>In order to handle archives, checksums and other utilities they must be configured in our
<link linkend="konfig-dependencies">configuration tool</link>.
@@ -428,9 +431,416 @@
page.</para>
</sect2>
</sect1>
- <sect1 id="compilation">
- <title>Compiling and Installing</title>
- <sect2 id="sourcedownload">
+
+<!-- <chapter id="krusader_kde4_install">
+<title>Installation on KDE4.x</title> -->
+
+<sect1 id="compilation">
+ <title>Krusader installation instructions on KDE4.0</title>
+ <note>
+ <para>From version &krusader;-2.0.0 and higher is &kde;-4 only.</para>
+ </note>
+
+ <note>
+ <para>At moment of writing &krusader;-2.0.0 is still under development, though it works :)</para>
+ </note>
+
+ <note>
+ <para>Even more details about Krusader compilation-installation can be found in the INSTALL
+ file of the Krusader source tarball.</para>
+ </note>
+
+<para>"krusader_kde4.tar.gz" is the supposed name of the krusader tarball (it will be probably a different one ;)</para>
+
+<para>You can download the latest available krusader-2.x <link linkend="krusader_svn">from SVN</link>.</para>
+
+<sect2>
+<title>Compilation requirements</title>
+<para>The next packages are needed for compiling Krusader,
+if you only run a Krusader binary you don't need these packages.</para>
+<para>
+ <itemizedlist>
+ <listitem>
+ <para>gcc</para>
+ </listitem>
+ <listitem>
+ <para>cmake</para>
+ </listitem>
+ <listitem>
+ <para>gettext (contains msgfmt)</para>
+ </listitem>
+ <listitem>
+ <para>kdelibs5-dev (installs many development libraries for KDE4)</para>
+ </listitem>
+ <listitem>
+ <para>libphonon-dev</para>
+ </listitem>
+ </itemizedlist>
+</para>
+</sect2>
+
+
+<sect2>
+<title>Krusader dependencies</title>
+<para>The next packages are needed to run the Krusader binary.</para>
+<para>
+ <itemizedlist>
+ <listitem>
+ <para>c libraries</para>
+ </listitem>
+ <listitem>
+ <para>zlib1g-dev: library for implementing the deflate compression method found in gzip and PKZIP</para>
+ </listitem>
+ <listitem>
+ <para>kdelibs5: KDE4 core libraries and binaries for all KDE4 applications</para>
+ </listitem>
+ <listitem>
+ <para>libkjsembed1 Embedded JavaScript library
+ (for the the optional Javascripting function in Krusader) </para>
+ </listitem>
+ </itemizedlist>
+</para>
+</sect2>
+
+<sect2>
+<title>Suggested packages</title>
+<para>These packages are optional but they will make Krusader much more powerful and useful.</para>
+
+<para>The next packages are the names that Debian/Ubuntu uses, other Linux
+distros will probably use similar names.</para>
+<para>
+ <itemizedlist>
+ <listitem>
+ <para>arj: archiver for .arj files </para>
+ </listitem>
+ <listitem>
+ <para>ark: graphical archiving tool for KDE</para>
+ </listitem>
+ <listitem>
+ <para>bzip2: high-quality block-sorting file compressor - utilities</para>
+ </listitem>
+ <listitem>
+ <para>cpio: GNU cpio -- a program to manage archives of files</para>
+ </listitem>
+ <listitem>
+ <para>kdebase-bin: core binaries for the KDE base module</para>
+ </listitem>
+ <listitem>
+ <para>kdebase-bin: core binaries for the KDE base module</para>
+ </listitem>
+ <listitem>
+ <para>kdiff3: compares and merges 2 or 3 files or directories</para>
+ </listitem>
+ <listitem>
+ <para>OR kompare: a KDE GUI for viewing differences between files </para>
+ </listitem>
+ <listitem>
+ <para>OR kompare: a KDE GUI for viewing differences between files </para>
+ </listitem>
+ <listitem>
+ <para>kompare: a KDE GUI for viewing differences between files </para>
+ </listitem>
+ <listitem>
+ <para>khexedit: KDE hex editor</para>
+ </listitem>
+ <listitem>
+ <para>kmail: KDE Email client</para>
+ </listitem>
+ <listitem>
+ <para>khexedit: KDE hex editor</para>
+ </listitem>
+ <listitem>
+ <para>konsole: X terminal emulator for KDE </para>
+ </listitem>
+ <listitem>
+ <para>krename: Powerful batch renamer for KDE</para>
+ </listitem>
+ <listitem>
+ <para>lha: lzh archiver</para>
+ </listitem>
+ <listitem>
+ <para>md5deep: versatile file checksum creator and verifier</para>
+ </listitem>
+ <listitem>
+ <para>cfv: versatile file checksum creator and verifier</para>
+ </listitem>
+ <listitem>
+ <para>p7zip: 7zr file archiver with high compression ratio</para>
+ </listitem>
+ <listitem>
+ <para>rpm: Red Hat package manager</para>
+ </listitem>
+ <listitem>
+ <para>unace: extract, test and view .ace archives</para>
+ </listitem>
+ <listitem>
+ <para>unrar: Unarchiver for .rar files (non-free version)</para>
+ </listitem>
+ <listitem>
+ <para>OR unrar-free: Unarchiver for .rar files</para>
+ </listitem>
+ <listitem>
+ <para>OR rar: Archiver for .rar files</para>
+ </listitem>
+ <listitem>
+ <para>unzip: De-archiver for .zip files</para>
+ </listitem>
+ <listitem>
+ <para>zip: Archiver for .zip files</para>
+ </listitem>
+ </itemizedlist>
+</para>
+</sect2>
+
+
+</sect1>
+
+<sect1 id="kde4_lin_install">
+ <title>Installing on Linux and BSD platforms</title>
+
+<para><command>DCMAKE_INSTALL_PREFIX</command> is the location of the KDE DQT_INCLUDES</para>
+<para>
+ <screen>
+ <prompt>$</prompt> <userinput><command>tar -xzvf</command> <option>krusader_kde4.tar.gz</option></userinput>
+ <prompt>$</prompt> <userinput><command>cd </command> <option>krusader_kde4</option></userinput>
+ <prompt>$</prompt> <userinput><command>cmake </command> <option>-DCMAKE_INSTALL_PREFIX=/usr/ -DQT_INCLUDES=/usr/share/qt4/include</option></userinput>
+ <prompt>$</prompt> <userinput><command>make</command></userinput>
+ <prompt>$</prompt> <userinput><command>su -c </command> <option>"make install"</option></userinput>
+ </screen>
+</para>
+
+<para>Uninstall</para>
+<para>
+ <screen>
+ <prompt>$</prompt> <userinput><command>su -c "make uninstall"</command></userinput>
+ </screen>
+</para>
+
+</sect1>
+
+<sect1 id="kde4_mac_install">
+ <title>Installing on the MAC platform</title>
+
+<para>FIXME</para>
+
+</sect1>
+
+<sect1 id="kde4_win_install">
+ <title>Installing on the Windows platform</title>
+
+<para>Please read the INSTALL file of the Krusader source tarball (FIXME).</para>
+
+</sect1>
+
+
+
+ <sect1 id="starting-krusader">
+ <title>Starting &krusader;</title>
+ <para>Type
+ <userinput>
+ <command>krusader</command>
+ </userinput> (lower case) at a command prompt. You can create
+ shortcut on your desktop or create an entry in the
+ (&kde;) menu. Read the previous page and the
+ &faq-lnk; if &krusader; doesn't
+ start.</para>
+ <para>When &krusader; is started from the
+ command line, various options can be specified to modify its
+ behavior.</para>
+ <screen>
+ <prompt>$</prompt> <userinput><command>krusader</command></userinput>
+ WARNING: Mt.Man: Born, looking around to get familiar. foo</screen>
+ <note>
+ <para>Do not worry about the messages you get in the
+ &konsole;. These messages are log messages that
+ can be used for debugging &krusader;.</para>
+ </note>
+ <para>You can also use
+ <keycombo action="simul">&Alt;
+ <keycap>F2</keycap></keycombo> to open the Run Command dialog
+ box, type
+ <userinput>
+ <command>krusader</command>
+ </userinput> (lower case) and press &Enter; or click
+ on the
+ <guibutton>Run</guibutton> button.</para>
+ <para>If &krusader; is installed by an RPM or DEB
+ package then usually &krusader; can be started from
+ the &kmenu;. ⪚ on
+ &Mandrake;-&Linux; 10.0 click on the
+ &kicon; button and choose
+ <emphasis role="bold">
+ <menuchoice>
+ <guimenuitem>Applications</guimenuitem>
+ <guimenuitem>File tools</guimenuitem>
+ <guimenuitem>&krusader;</guimenuitem>
+ </menuchoice>
+ </emphasis>.</para>
+ <variablelist>
+ <title>Command-line options:</title>
+ <varlistentry>
+ <term>
+ <option>--left</option>
+ <replaceable>
+ <path></replaceable>
+ </term>
+ <listitem>
+ <para>
+ <action>start left panel at
+ <path></action>
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <option>--right</option>
+ <replaceable>
+ <path></replaceable>
+ </term>
+ <listitem>
+ <para>
+ <action>start right panel at
+ <path></action>
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <option>--left</option>
+ <replaceable>
+ <path1>,<path2>,<path3></replaceable>
+ </term>
+ <listitem>
+ <para>
+ <action>start left panel at
+ <path1>,<path2>,<path3>,
+ with tabs.</action>
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <option>--profile</option>
+ <replaceable>
+ <panel-profile></replaceable>
+ </term>
+ <listitem>
+ <para>
+ <action>load a
+ <link linkend="panel_profiles">panel-profile</link> on
+ startup (this overrides the
+ <link linkend="konfig-startup">default startup
+ profile</link>).</action>
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ <para>Examples:
+ <screen><prompt>$</prompt> <userinput><command>krusader</command> <replaceable>--left=<path> --right=<path></replaceable></userinput></screen>
+ <screen><prompt>$</prompt> <userinput><command>krusader</command> <replaceable>--left=/mnt/cdrom --right=ftp://dow...@my...</replaceable></userinput></screen>
+ <screen><prompt>$</prompt> <userinput><command>krusader</command> <replaceable>--left=<path1>,<path2> --right=<path1>,<path2>,<path3></replaceable></userinput></screen>
+ <screen><prompt>$</prompt> <userinput><command>krusader</command><replaceable>--profile <panel-profile></replaceable></userinput></screen>
+ <screen><prompt>$</prompt> <userinput><command>krusader</command> <replaceable>--profile ftp-managment</replaceable></userinput></screen>
+ </para>
+ <para>The standard &Qt; and &kde;
+ command-line options are available, and can be listed by
+ entering
+ <userinput>
+ <command>krusader</command>
+ <option>--help</option>
+ </userinput>.</para>
+ <variablelist>
+ <title>Other command-line options:</title>
+ <varlistentry>
+ <term>
+ <option>--help-qt</option>
+ </term>
+ <listitem>
+ <para>
+ <action>List Qt-specific options</action>
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <option>--help-kde</option>
+ </term>
+ <listitem>
+ <para>
+ <action>List KDE-specific options</action>
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <option>--help-all</option>
+ </term>
+ <listitem>
+ <para>
+ <action>List all options</action>
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <option>--author</option>
+ </term>
+ <listitem>
+ <para>
+ <action>Show the authors names</action>
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <option>-v,--version</option>
+ </term>
+ <listitem>
+ <para>
+ <action>Show the version number</action>
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <option>--license</option>
+ </term>
+ <listitem>
+ <para>
+ <action>Show license information</action>
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </sect1>
+ <sect1 id="configuration">
+ <title>Configuring &krusader;</title>
+ <para>When you run &krusader; for the first time,
+ the &krusader; configuration module
+ <link linkend="konfigurator">Konfigurator</link> will show up
+ and allow you to configure &krusader; as well as
+ detect installed packers and tools. You can always run
+ Konfigurator again from the
+ &settingsmenu-lnk;.</para>
+ </sect1>
+ <sect1 id="default-file-manager">
+ <title>Making &krusader; the default file
+ manager</title>
+ <para>To make &krusader; the default file manager in
+ Gnome, <ulink url="http://psychocats.net/ubuntu/nonautilusplease">click here</ulink> for more information.
+ </para>
+ <para>To make &krusader; the default file manager in
+ &kde;, <ulink url="http://groups.google.com/group/krusader-devel/browse_thread/thread/8209d785d3ba0ac6">click here</ulink> for more information.
+ </para>
+ </sect1>
+</chapter>
+
+
+<chapter id="krusader_kde3_install">
+<title>Installation on KDE3.x</title>
+ <sect1 id="kde3_compilation">
+ <title>Compiling and Installing Krusader-1.x on KDE3.x</title>
+ <sect2>
<title>Compiling &krusader;. What now?</title>
<para>Check the environment variables
&kdeqtdir-lnk;.</para>
@@ -942,8 +1352,9 @@
&help-request-lnk; to ask for help.</para>
</sect2>
</sect1>
+
<sect1 id="mac-port">
- <title>Installing on &MacOS;-X</title>
+ <title>Installing on Krusader-1.x on &MacOS;-X with KDE3.x</title>
<indexterm>
<primary>&MacOS;-X port</primary>
</indexterm>
@@ -1047,258 +1458,6 @@
</orderedlist>
Thanks to <ulink url="http://hritcu.wordpress.com/2006/08/10/krusader-on-intel-mac/">Catalin Hritcu </ulink> for these install instructions.
</para>
+</sect1>
-
- </sect1>
- <sect1 id="starting-krusader">
- <title>Starting &krusader;</title>
- <para>Type
- <userinput>
- <command>krusader</command>
- </userinput> (lower case) at a command prompt. You can create
- shortcut on your desktop or create an entry in the
- (&kde;) menu. Read the previous page and the
- &faq-lnk; if &krusader; doesn't
- start.</para>
- <para>When &krusader; is started from the
- command line, various options can be specified to modify its
- behavior.</para>
- <screen>
- <prompt>$</prompt> <userinput><command>krusader</command></userinput>
- WARNING: Mt.Man: Born, looking around to get familiar. foo</screen>
- <note>
- <para>Do not worry about the messages you get in the
- &konsole;. These messages are log messages that
- can be used for debugging &krusader;.</para>
- </note>
- <para>You can also use
- <keycombo action="simul">&Alt;
- <keycap>F2</keycap></keycombo> to open the Run Command dialog
- box, type
- <userinput>
- <command>krusader</command>
- </userinput> (lower case) and press &Enter; or click
- on the
- <guibutton>Run</guibutton> button.</para>
- <para>If &krusader; is installed by an RPM or DEB
- package then usually &krusader; can be started from
- the &kmenu;. ⪚ on
- &Mandrake;-&Linux; 10.0 click on the
- &kicon; button and choose
- <emphasis role="bold">
- <menuchoice>
- <guimenuitem>Applications</guimenuitem>
- <guimenuitem>File tools</guimenuitem>
- <guimenuitem>&krusader;</guimenuitem>
- </menuchoice>
- </emphasis>.</para>
- <variablelist>
- <title>Command-line options:</title>
- <varlistentry>
- <term>
- <option>--left</option>
- <replaceable>
- <path></replaceable>
- </term>
- <listitem>
- <para>
- <action>start left panel at
- <path></action>
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>
- <option>--right</option>
- <replaceable>
- <path></replaceable>
- </term>
- <listitem>
- <para>
- <action>start right panel at
- <path></action>
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>
- <option>--left</option>
- <replaceable>
- <path1>,<path2>,<path3></replaceable>
- </term>
- <listitem>
- <para>
- <action>start left panel at
- <path1>,<path2>,<path3>,
- with tabs.</action>
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>
- <option>--profile</option>
- <replaceable>
- <panel-profile></replaceable>
- </term>
- <listitem>
- <para>
- <action>load a
- <link linkend="panel_profiles">panel-profile</link> on
- startup (this overrides the
- <link linkend="konfig-startup">default startup
- profile</link>).</action>
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- <para>Examples:
- <screen><prompt>$</prompt> <userinput><command>krusader</command> <replaceable>--left=<path> --right=<path></replaceable></userinput></screen>
- <screen><prompt>$</prompt> <userinput><command>krusader</command> <replaceable>--left=/mnt/cdrom --right=ftp://dow...@my...</replaceable></userinput></screen>
- <screen><prompt>$</prompt> <userinput><command>krusader</command> <replaceable>--left=<path1>,<path2> --right=<path1>,<path2>,<path3></replaceable></userinput></screen>
- <screen><prompt>$</prompt> <userinput><command>krusader</command><replaceable>--profile <panel-profile></replaceable></userinput></screen>
- <screen><prompt>$</prompt> <userinput><command>krusader</command> <replaceable>--profile ftp-managment</replaceable></userinput></screen>
- </para>
- <para>The standard &Qt; and &kde;
- command-line options are available, and can be listed by
- entering
- <userinput>
- <command>krusader</command>
- <option>--help</option>
- </userinput>.</para>
- <variablelist>
- <title>Other command-line options:</title>
- <varlistentry>
- <term>
- <option>--help-qt</option>
- </term>
- <listitem>
- <para>
- <action>List Qt-specific options</action>
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>
- <option>--help-kde</option>
- </term>
- <listitem>
- <para>
- <action>List KDE-specific options</action>
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>
- <option>--help-all</option>
- </term>
- <listitem>
- <para>
- <action>List all options</action>
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>
- <option>--author</option>
- </term>
- <listitem>
- <para>
- <action>Show the authors names</action>
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>
- <option>-v,--version</option>
- </term>
- <listitem>
- <para>
- <action>Show the version number</action>
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>
- <option>--license</option>
- </term>
- <listitem>
- <para>
- <action>Show license information</action>
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </sect1>
- <sect1 id="configuration">
- <title>Configuring &krusader;</title>
- <para>When you run &krusader; for the first time,
- the &krusader; configuration module
- <link linkend="konfigurator">Konfigurator</link> will show up
- and allow you to configure &krusader; as well as
- detect installed packers and tools. You can always run
- Konfigurator again from the
- &settingsmenu-lnk;.</para>
- </sect1>
- <sect1 id="default-file-manager">
- <title>Making &krusader; the default file
- manager</title>
- <para>To make &krusader; the default file manager in
- Gnome, <ulink url="http://psychocats.net/ubuntu/nonautilusplease">click here</ulink> for more information.
- </para>
- <para>To make &krusader; the default file manager in
- &kde;, <ulink url="http://groups.google.com/group/krusader-devel/browse_thread/thread/8209d785d3ba0ac6">click here</ulink> for more information.
- </para>
- </sect1>
-</chapter>
-
-<chapter id="krusader_kde4_install">
-<title>Installation on KDE4.x</title>
-<sect1 id="kde4_install">
- <title>Krusader installation instructions on KDE4.0</title>
- <note>
- <para>From version &krusader;-2.0.0 and higher is &kde;-4 only.</para>
- </note>
- <note>
- <para>At moment of writing &krusader;-2.0.0 is still under development, though it works :)</para>
- </note>
-
-<para>"krusader_kde4.tar.gz" is the supposed name of the krusader tarball (it will be probably a different one ;)</para>
-
-<para>You can download the latest available krusader-2.x <link linkend="krusader_svn">from SVN</link>.</para>
-
-<para>Compilation requirements</para>
-<para>The next packages are needed for compiling Krusader,
-if you only run a Krusader binary you don't need these packages.</para>
-<para>
- <itemizedlist>
- <listitem>
- <para>gcc</para>
- </listitem>
- <listitem>
- <para>cmake</para>
- </listitem>
- <listitem>
- <para>gettext (contains msgfmt)</para>
- </listitem>
- <listitem>
- <para>kdelibs5-dev (installs many development libraries for KDE4)</para>
- </listitem>
- <listitem>
- <para>libphonon-dev</para>
- </listitem>
- </itemizedlist>
-</para>
-
-<para><command>DCMAKE_INSTALL_PREFIX</command> is the location of the KDE DQT_INCLUDES</para>
-<para>
- <screen>
- <prompt>$</prompt> <userinput><command>tar -xzvf</command> <option>krusader_kde4.tar.gz</option></userinput>
- <prompt>$</prompt> <userinput><command>cd </command> <option>krusader_kde4</option></userinput>
- <prompt>$</prompt> <userinput><command>cmake </command> <option>-DCMAKE_INSTALL_PREFIX=/usr/ -DQT_INCLUDES=/usr/share/qt4/include</option></userinput>
- <prompt>$</prompt> <userinput><command>make</command></userinput>
- <prompt>$</prompt> <userinput><command>su -c </command> <option>"make install"</option></userinput>
- </screen>
-</para>
-
- </sect1>
</chapter>
\ No newline at end of file
Modified: trunk/krusader_kde4/doc/en/release-overview.docbook
===================================================================
--- trunk/krusader_kde4/doc/en/release-overview.docbook 2008-06-18 21:16:48 UTC (rev 6027)
+++ trunk/krusader_kde4/doc/en/release-overview.docbook 2008-06-18 21:18:39 UTC (rev 6028)
@@ -50,7 +50,7 @@
<para>2008-??-?? under construction</para>
</entry>
<entry>
- <para>&kde; 4</para>
+ <para>&kde; 4.0 - 4.1</para>
</entry>
</row>
<row>
@@ -61,7 +61,7 @@
<para>2008-??-?? under construction</para>
</entry>
<entry>
- <para>&kde; 4</para>
+ <para>&kde; 4.0 - 4.1</para>
</entry>
</row>
<row>
@@ -72,7 +72,7 @@
<para>2008-??-?? under construction</para>
</entry>
<entry>
- <para>&kde; 4</para>
+ <para>&kde; 4.0 - 4.1</para>
</entry>
</row>
<row>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cod...@us...> - 2008-06-18 21:16:39
|
Revision: 6027
http://krusader.svn.sourceforge.net/krusader/?rev=6027&view=rev
Author: codeknight
Date: 2008-06-18 14:16:48 -0700 (Wed, 18 Jun 2008)
Log Message:
-----------
kde4 updates + vaclav added
Modified Paths:
--------------
trunk/krusader_kde4/doc/krusader.1
Modified: trunk/krusader_kde4/doc/krusader.1
===================================================================
--- trunk/krusader_kde4/doc/krusader.1 2008-06-18 21:15:12 UTC (rev 6026)
+++ trunk/krusader_kde4/doc/krusader.1 2008-06-18 21:16:48 UTC (rev 6027)
@@ -1,4 +1,4 @@
-.TH krusader 1 "08 May 2006" Linux "Krusader Manpage"
+.TH krusader 1 "18 June 2008" Linux "Krusader Manpage"
.SH "NAME"
krusader \- advanced twin-panel file manager and ftp client for KDE
.SH "USAGE"
@@ -74,10 +74,6 @@
.I KDE 3.x
-The latest version of Krusader can be found at the Krusader website.
-
-Note:
-
Krusader v1.01 needs KDElibs 2
Krusader v1.02 - 1.40 needs KDElibs 3
@@ -90,8 +86,12 @@
Krusader 1.70.x-1.80.x: KDE 3.4 - KDE 3.5
-Krusader 2.xx.x: KDE 4 the future Krusader
+.I KDE 3.x
+Krusader 2.xx.x: KDE 4
+
+The latest version of Krusader can be found at the Krusader website.
+
.SH "FEATURES"
OFM filemanager features.
@@ -163,6 +163,8 @@
Jonas Baehr, Developer [jonas.baehr {*} web.de]
+Vaclav Juza, Developer [vaclavjuza {*} seznam {.} cz]
+
Frank Schoolmeesters, Documentation & Marketing Coordinator [frank_schoolmeesters {*} yahoo {.} com]
Richard Holt, Documentation & Proofing [richard {.} holt {*} gmail {.} com]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cod...@us...> - 2008-06-18 21:15:05
|
Revision: 6026
http://krusader.svn.sourceforge.net/krusader/?rev=6026&view=rev
Author: codeknight
Date: 2008-06-18 14:15:12 -0700 (Wed, 18 Jun 2008)
Log Message:
-----------
new release note + kde4 updates (feel free to modify)
Modified Paths:
--------------
trunk/krusader_kde4/README
Modified: trunk/krusader_kde4/README
===================================================================
--- trunk/krusader_kde4/README 2008-06-18 18:33:09 UTC (rev 6025)
+++ trunk/krusader_kde4/README 2008-06-18 21:15:12 UTC (rev 6026)
@@ -1,64 +1,53 @@
-Krusader 1.80.0-beta2 "Last Unstable Stone"
-===========================================
+Krusader-2.0.0-beta1 "Phoenix Egg"
+==================================
Well, here we are!
-The Krew is finally bringing you the _last_ release of Krusader the
-file manager. In this release you can expect many new enhancements and
-features oriented to both experts and basic users, finalizing many
-requests, that we owed and many that were sitting on our todo list. We
-would like to thank all of the community for keeping us sharp all these
-years till the end and start of our final release cycle.
+The Krew is happy to present the first release of the Krusader2 series for KDE4.x.
+We have left the solid third stone and have landed on the fourth stone
+to start exploring new possibilties.
+And the first big possibility is already available, this tarball can
+be compiled and installed on Windows!
-IMPORTANT: Crashes in Krusader caused by Qt 3.3.5
-------------------------------------------------------------------------
-We've been getting a lot of emails and bug reports regarding random
-crashes in Krusader, especially during some file operations (copy/move
-etc.). These crashes are related to Qt 3.3.5 and NOT Krusader.
-It seems that Qt 3.3.5 introduced a serious bug which is now causing
-random crashes in many KDE applications including Konqueror. You can
-google for it to find out more.
+This release is ustable and contains some bugs. Though it works! and
+hard work is done to improve it.
+Other bugs are caused by kde4libs and qt4libs where we can't do much
+about it, except generate bug reports.
-As far as we know, Debian and SUSE already posted new Qt binaries that
-fix the problem, and Gentoo has masked Qt 3.3.5 completely.
-As for now, you either need Qt 3.3.4 or a fixed Qt 3.3.5, depending on
-your distribution. For more information is available on our website at
-http://krusader.sourceforge.net/phpBB/viewtopic.php?t=1407
-------------------------------------------------------------------------
+Please send in bug reports and patches to hunt the Krusader bugs down.
-Krusader 1.80.0-beta2 contains plenty of changes, bug fixes and updates
-in response to reports and requests from our users. The highlights are:
+Our first goal is to make Krusader-2.0 stable. New features are for
+afterwards, though small improvements are already added in this
+release.
-- 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 the filename, without extension
-- Numerous archive enhancements like handling packing and unpacking in
- the background, encryption support, multiple volume archives, compress
- level
-- Complete list of changes and enhancements is in the ChangeLog
-- Next cycle with all our energy and efforts begins for Krusader on
- KDE4
+Many thanks to everyone who has helped to port Krusader from KDE3 to KDE4.
-Changes since Krusader 1.80.0-beta1 (but not limited to):
+New features in this release:
+# ported to Windows!
-- Added the long-awaited brief view!
-- A GUI to configure the atomic extensions introduced in beta1
-- ACL and documentation related compile fixes
-- More usability and feature enhancements in the synchronizer, search
- and locate modules
-- Bugfixes all over the place
+# Krusader is able to send e-mails by thunderbird
+- one can set up thunderbird as an e-mail sender in the dependencies
+- from now more than one file can be sent in an attachment
-Enjoy!
- Krusader Krew
+# For content searching (searcher, advanced selection, synchronizer),
+ the content encoding can be given.
+# Select remote encoding for krarc
+- the file name encoding for zip, rar, arj, lha can be set from now
+- as 7z always uses UTF-16, remote encoding will not work for 7z
+- it's imporant because zip files that were created on Windows can
+have different encoding
+
+# New synchronizer shortcuts
+- CTRL + W : reverse direction
+- ALT + Down : exclude
+- ALT + Up : restore original task
+- ALT + Left : copy to left
+- ALT + Right : copy to right
+- ALT + Delete : mark for delete
+
+
Notice: if you've got bugs to report, please do so using Krusader's
- website, and not using KDE's bugzilla (bugs.kde.org).
+ website, and not using KDE's bugzilla (bugs.kde.org).
as always, enjoy
Krusader Krew.
@@ -77,19 +66,9 @@
Installation
============
-Check the environment variables KDEDIR - QTDIR.
+Please read the INSTALL file for detailed installation instructions.
-Unpack the tarball and go to the Krusader source directory.
-If you have done a download from CVS you will have to run the following
-command to create the "./configure" script:
-$ make -f Makefile.cvs
-
-Installation procedure:
-$ ./configure
-$ make
-$ su -c 'make install'
-
-When you install a Krusader cvs or beta version and if Krusader was
+When you install a Krusader svn or beta version and if Krusader was
previously installed on your computer, there is a possibility that you
will have to update the krusaderui.rc file. please read the FAQ for more
info.
@@ -98,27 +77,20 @@
Need more help?
For detailed installation instructions, please read the INSTALL and FAQ
file. Or read it online at:
-http://krusader.sourceforge.net/handbook/installation.html
+http://krusader.org/handbook/installation.html
The FAQ are available at:
-http://krusader.sourceforge.net/handbook/faq.html
+http://krusader.org/handbook/faq.html
-To checkout the Krusader KDE3 version from cvs:
+To checkout the Krusader-2.x for KDE4 from svn:
===============================================
-$ cvs -d:pserver:ano...@kr...:/cvsroot/krusader login
-$ cvs -z3 -d:pserver:ano...@kr...:/cvsroot/krusader \
- co krusader_kde3
+$ svn co https://krusader.svn.sourceforge.net/svnroot/krusader/trunk/krusader_kde4
-(Note: updates from within the modules directory do not need the -d
-parameter)
-Or download the nightly tarball from:
-http://krusader.sourceforge.net/cvs.php
-
-Klik Krusader
-=============
+Klik Krusader (currently only for Krusader-1.x)
+===============================================
If you want to find out if Krusader is right for you and don't want to
go through the whole installation-compilation process. Thanks to the
guys at http://klik.atekon.de/ this is possible. After installing the
@@ -136,12 +108,12 @@
Documentation, detailed install procedure, FAQ, ...
The Krusader Handbook is available in the Help menu of Krusader.
Or read it online at:
-http://krusader.sourceforge.net/handbook/index.html
+http://krusader.org/handbook/index.html
Help Krusader
=============
-http://krusader.sourceforge.net/help.php
+http://krusader.org/help.php
Here you get a chance to contribute to the Krusader project. From time
to time we'll post things that need to be done, but can't be done by us.
If you feel you can help, click the appropriate link on the website.
@@ -153,7 +125,7 @@
Krusader is currently available in about 27 languages:
Some of these translations can use an update, please read the next url
for more information.
-http://krusader.sourceforge.net/i18n.php
+http://krusader.org/i18n.php
Documentation Translators
-------------------------
@@ -224,7 +196,7 @@
With i18n_status and ViewCVS to see the live translation status of
Krusader!
-http://krusader.sourceforge.net/i18n.php
+http://krusader.org/i18n.php
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/krusader/krusader_kde3/po/
The latest news about the Krusader translations can be in the LATEST
NEWS section of the "Krusader translation howto".
@@ -242,17 +214,17 @@
help. The latest news about the Krusader translations can be in the
LATEST NEWS section. This allows that even beginners or non-programmers
can translate Krusader to their native language. Please have a look at
-http://krusader.sourceforge.net/phpBB/viewtopic.php?t=389
+http://krusader.org/phpBB/viewtopic.php?t=389
-Quickstart procedure for translators updating existing translations
--------------------------------------------------------------------
+Quickstart procedure for translators updating existing translations (kde3)
+--------------------------------------------------------------------------
1.
Run KDE in your native language.
2.
Checkout the latest available version of Krusader from CVS. Or if you
are not familiar with CVS, download the latest Krusader CVS snapshot
-(nightly tarball) from http://krusader.sourceforge.net/cvs.php, and run:
+(nightly tarball) from http://krusader.org/cvs.php, and run:
$ make -f Makefile.cvs
$ ./configure
$ make
@@ -282,37 +254,37 @@
=====
- Homepage
http://www.krusader.org
- http://krusader.sourceforge.net
+ http://krusader.org
- Installation
- http://krusader.sourceforge.net/handbook/installation.html
+ http://krusader.org/handbook/installation.html
- FAQ
- http://krusader.sourceforge.net/handbook/faq.html
+ http://krusader.org/handbook/faq.html
- Documentation
- http://krusader.sourceforge.net/handbook/index.html
+ http://krusader.org/handbook/index.html
- Todolist
- http://krusader.sourceforge.net/phpBB/viewforum.php?f=10
+ http://krusader.org/phpBB/viewforum.php?f=10
- Buglist
http://sourceforge.net/tracker/?atid=106488&group_id=6488&func=browse
- Forum
- http://krusader.sourceforge.net/phpBB/index.php
+ http://krusader.org/phpBB/index.php
- ChangeLog
- http://krusader.sourceforge.net/text.php?t=cvs.changelog
+ http://krusader.org/text.php?t=cvs.changelog
- CVSNEWS
- http://krusader.sourceforge.net/text.php?t=cvs.news
+ http://krusader.org/text.php?t=cvs.news
- Mailing lists
- http://krusader.sourceforge.net/lists.php
+ http://krusader.org/lists.php
- Donations
http://sourceforge.net/project/project_donations.php?group_id=6488
- Translations
- http://krusader.sourceforge.net/i18n.php
+ http://krusader.org/i18n.php
- Help Krusader
- http://krusader.sourceforge.net/help.php
+ http://krusader.org/help.php
- Krusader Extensions
http://www.kde-files.org/index.php?xcontentmode=660x661x662x663
- Krusader meets OpenUsability
http://openusability.org/projects/krusader/
- Download pages
- http://krusader.sourceforge.net/down.php
+ http://krusader.org/down.php
http://sourceforge.net/project/showfiles.php?group_id=6488
@@ -332,6 +304,8 @@
[h.eichmann * gmx de]
- Jonas Baehr, developer
[jonas baehr * users web de]
+- Vaclav Juza
+ [vaclavjuza * seznam.cz]
- Frank Schoolmeesters, documentation and marketing coordinator
[frank_schoolmeesters * yahoo com]
- Richard Holt, documentation
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cod...@us...> - 2008-06-18 18:33:04
|
Revision: 6025
http://krusader.svn.sourceforge.net/krusader/?rev=6025&view=rev
Author: codeknight
Date: 2008-06-18 11:33:09 -0700 (Wed, 18 Jun 2008)
Log Message:
-----------
Windows installation instructions (feel free to fix Vaclav)
Modified Paths:
--------------
trunk/krusader_kde4/INSTALL
Modified: trunk/krusader_kde4/INSTALL
===================================================================
--- trunk/krusader_kde4/INSTALL 2008-06-18 16:58:32 UTC (rev 6024)
+++ trunk/krusader_kde4/INSTALL 2008-06-18 18:33:09 UTC (rev 6025)
@@ -1,19 +1,26 @@
-Krusader installation instructions for KDE 4.0
+Krusader installation instructions for KDE 4.x
----------------------------------------------
Note
----
-Krusader-2.0.0 version and higher for KDE 4 only and will not work on KDE 3.
+Krusader-2.0 versions and higher are for KDE 4 only and will not work anymore on KDE 3.
+
SVN development download
------------------------
You can download the latest available krusader-2.x from SVN with the next command:
$ svn co https://krusader.svn.sourceforge.net/svnroot/krusader/trunk/krusader_kde4
+Platforms
+---------
+* All POSIX (Linux®/BSD/UNIX®-like OSes), Solaris™
+* All BSD Platforms (FreeBSD®/NetBSD®/OpenBSD®/Mac® OS)
+* Windows™
-The next packages are the names that Debian/Ubuntu uses, other Linux
-distros will probably use similar names.
+Installing on Linux® and BSD platforms
+======================================
+
Krusader dependencies
---------------------
- c libraries
@@ -25,8 +32,11 @@
Suggested packages
------------------
-These packages are optional but they will make Krusaer much more powerful and useful.
+These packages are optional but they will make Krusader much more powerful and useful.
+The next packages are the names that Debian/Ubuntu uses, other Linux
+distros will probably use similar names.
+
- arj archiver for .arj files
- ark graphical archiving tool for KDE
- bzip2 high-quality block-sorting file compressor - utilities
@@ -93,7 +103,46 @@
$ su -c "make uninstall"
+Installing on Mac® OS-X
+=======================
+http://www.krusader.org/handbook/mac-port.html
+
+Installation on Windows™
+========================
+http://groups.google.com/group/krusader-devel/browse_thread/thread/3507c5dc7b866845
+
+- Installed KDE installer http://winkde.org/pub/kde/ports/win32/installer/
+ (version 0.9.2). During install, Chose developer installation using
+ mingw and c:\kde4 as the installation directory. For all the necessary
+ packages (mingw, dbus, qt4, kdelibs, ...) Check the developer files
+ to be installed. Note that some packages are not in any category and on
+ eneeds to view all to find them.
+
+- created the source directory for krusader and checked out svn
+ (c:/kde4/src/krusader_kde4)
+
+- created the build directory and cd to it
+ (c:/kde4/build/krusader_kde4)
+
+- run cmake (the following should be on one line) in the build directory:
+ c:\kde4\bin\cmake.exe -G "MinGW Makefiles" c:/kde4/src/krusader_kde4
+
+-DCMAKE_INSTALL_PREFIX=c:/kde4 -DCMAKE_INCLUDE_PATH=c:/kde4/include
+
+-DCMAKE_LIBRARY_PATH=c:/kde4/lib -DKDEWIN_DIR:PATH=c:/kde4
+
+-DCMAKE_BUILD_TYPE=debugful
+
+- There was a strange problem, that in some cmake modules for qt and kde,
+ there were wrong hardcoded paths to the installation directory, we had to
+ change them manually. Check that, if the cmake cannot
+ find some library which is surely installed.
+
+- C:\MinGW\bin\mingw32-make.exe install
+
+
+
FYI
The output of cmake
-------------------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vac...@us...> - 2008-06-18 16:58:27
|
Revision: 6024
http://krusader.svn.sourceforge.net/krusader/?rev=6024&view=rev
Author: vaclavjuza
Date: 2008-06-18 09:58:32 -0700 (Wed, 18 Jun 2008)
Log Message:
-----------
Make it compilable under windows using mingw.
Modified Paths:
--------------
trunk/krusader_kde4/iso/CMakeLists.txt
trunk/krusader_kde4/iso/iso.cpp
trunk/krusader_kde4/iso/libisofs/iso_fs.h
trunk/krusader_kde4/krArc/krarc.cpp
trunk/krusader_kde4/krusader/CMakeLists.txt
trunk/krusader_kde4/krusader/Panel/krpopupmenu.cpp
trunk/krusader_kde4/krusader/Panel/listpanel.cpp
trunk/krusader_kde4/krusader/Panel/panelfunc.cpp
trunk/krusader_kde4/krusader/Synchronizer/synchronizerdirlist.cpp
trunk/krusader_kde4/krusader/UserAction/expander.cpp
trunk/krusader_kde4/krusader/UserAction/expander.h
trunk/krusader_kde4/krusader/VFS/ftp_vfs.cpp
trunk/krusader_kde4/krusader/VFS/krvfshandler.cpp
trunk/krusader_kde4/krusader/VFS/normal_vfs.cpp
trunk/krusader_kde4/krusader/VFS/preserveattrcopyjob.cpp
trunk/krusader_kde4/krusader/VFS/preserveattrcopyjob.h
trunk/krusader_kde4/krusader/VFS/vfs.cpp
trunk/krusader_kde4/krusader/VFS/vfs.h
trunk/krusader_kde4/krusader/VFS/virt_vfs.cpp
Modified: trunk/krusader_kde4/iso/CMakeLists.txt
===================================================================
--- trunk/krusader_kde4/iso/CMakeLists.txt 2008-06-14 09:22:53 UTC (rev 6023)
+++ trunk/krusader_kde4/iso/CMakeLists.txt 2008-06-18 16:58:32 UTC (rev 6024)
@@ -2,7 +2,7 @@
include( libisofs/CMakeLists.txt )
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+include_directories( ${KDE4_INCLUDES} ${QT_INCLUDES} )
########### next target ###############
Modified: trunk/krusader_kde4/iso/iso.cpp
===================================================================
--- trunk/krusader_kde4/iso/iso.cpp 2008-06-14 09:22:53 UTC (rev 6023)
+++ trunk/krusader_kde4/iso/iso.cpp 2008-06-18 16:58:32 UTC (rev 6024)
@@ -144,7 +144,7 @@
bool isFile = true;
if( S_ISLNK( statbuf.st_mode) ) {
char symDest[256];
- bzero(symDest,256);
+ memset(symDest,0,256);
int endOfName=readlink( QFile::encodeName(tryPath),symDest,256);
if ( endOfName != -1 ){
if ( QDir(QString::fromLocal8Bit( symDest ) ).exists() )
Modified: trunk/krusader_kde4/iso/libisofs/iso_fs.h
===================================================================
--- trunk/krusader_kde4/iso/libisofs/iso_fs.h 2008-06-14 09:22:53 UTC (rev 6023)
+++ trunk/krusader_kde4/iso/libisofs/iso_fs.h 2008-06-18 16:58:32 UTC (rev 6024)
@@ -159,57 +159,56 @@
};
/* 8 bit numbers */
-__inline unsigned char isonum_711(char *p);
-__inline char isonum_712(char *p);
+static __inline unsigned char isonum_711(char *p);
+static __inline char isonum_712(char *p);
/* 16 bit numbers */
-__inline unsigned short isonum_721(char *p);
-__inline unsigned short isonum_722(char *p);
-__inline unsigned short isonum_723(char *p);
+static __inline unsigned short isonum_721(char *p);
+static __inline unsigned short isonum_722(char *p);
+static __inline unsigned short isonum_723(char *p);
/* 32 bit numbers */
-__inline unsigned int isonum_731(char *p);
-__inline unsigned int isonum_732(char *p);
-__inline unsigned int isonum_733(char *p);
+static __inline unsigned int isonum_731(char *p);
+static __inline unsigned int isonum_732(char *p);
+static __inline unsigned int isonum_733(char *p);
-
/* 8 bit numbers */
-__inline unsigned char isonum_711(char *p)
+static __inline unsigned char isonum_711(char *p)
{
return *(unsigned char *)p;
}
-__inline char isonum_712(char *p)
+static __inline char isonum_712(char *p)
{
return *p;
}
/* 16 bit numbers */
-__inline unsigned short isonum_721(char *p)
+static __inline unsigned short isonum_721(char *p)
{
return le2me_16(*(unsigned short *)p);
}
-__inline unsigned short isonum_722(char *p)
+static __inline unsigned short isonum_722(char *p)
{
return be2me_16(*(unsigned short *)p);
}
-__inline unsigned short isonum_723(char *p)
+static __inline unsigned short isonum_723(char *p)
{
/* Ignore bigendian datum due to broken mastering programs */
return le2me_16(*(unsigned short *)p);
}
/* 32 bit numbers */
-__inline unsigned int isonum_731(char *p)
+static __inline unsigned int isonum_731(char *p)
{
return le2me_32(*(unsigned int *)p);
}
-__inline unsigned int isonum_732(char *p)
+static __inline unsigned int isonum_732(char *p)
{
return be2me_32(*(unsigned int *)p);
}
-__inline unsigned int isonum_733(char *p)
+static __inline unsigned int isonum_733(char *p)
{
/* Ignore bigendian datum due to broken mastering programs */
return le2me_32(*(unsigned int *)p);
Modified: trunk/krusader_kde4/krArc/krarc.cpp
===================================================================
--- trunk/krusader_kde4/krArc/krarc.cpp 2008-06-14 09:22:53 UTC (rev 6023)
+++ trunk/krusader_kde4/krArc/krarc.cpp 2008-06-18 16:58:32 UTC (rev 6024)
@@ -203,7 +203,7 @@
for( int i=0;i<tempDir.length() && i >= 0; i=tempDir.indexOf("/",i+1)){
QByteArray newDirs = encodeString( tempDir.left( i ) );
newDirs.prepend(arcTempDirEnc);
- ::mkdir( newDirs, permissions);
+ KDE_mkdir( newDirs, permissions);
}
if( tempDir.endsWith( "/" ) )
@@ -271,7 +271,7 @@
for( int i=0;i<tempDir.length() && i >= 0; i=tempDir.indexOf("/",i+1)){
QByteArray newDirs = encodeString( tempDir.left( i ) );
newDirs.prepend(arcTempDirEnc);
- ::mkdir( newDirs, 0755 );
+ KDE_mkdir( newDirs, 0755 );
}
int fd;
@@ -993,12 +993,15 @@
mode_t mode=0;
// file type
if(perm[0] == 'd') mode |= S_IFDIR;
+#ifndef Q_WS_WIN
if(perm[0] == 'l') mode |= S_IFLNK;
+#endif
if(perm[0] == '-') mode |= S_IFREG;
// owner permissions
if(perm[1] != '-') mode |= S_IRUSR;
if(perm[2] != '-') mode |= S_IWUSR;
if(perm[3] != '-') mode |= S_IXUSR;
+#ifndef Q_WS_WIN
// group permissions
if(perm[4] != '-') mode |= S_IRGRP;
if(perm[5] != '-') mode |= S_IWGRP;
@@ -1007,7 +1010,7 @@
if(perm[7] != '-') mode |= S_IROTH;
if(perm[8] != '-') mode |= S_IWOTH;
if(perm[9] != '-') mode |= S_IXOTH;
-
+#endif
return mode;
}
@@ -1147,11 +1150,13 @@
owner = nextWord(line);
group = nextWord(line);
// symlink destination
+#ifndef Q_WS_WIN
if( S_ISLNK(mode) ){
// ignore the next 3 fields
nextWord(line); nextWord(line); nextWord(line);
symlinkDest = nextWord(line);
}
+#endif
}
if( arcType == "gzip" ){
if( !lineNo ) return; //ignore the first line
Modified: trunk/krusader_kde4/krusader/CMakeLists.txt
===================================================================
--- trunk/krusader_kde4/krusader/CMakeLists.txt 2008-06-14 09:22:53 UTC (rev 6023)
+++ trunk/krusader_kde4/krusader/CMakeLists.txt 2008-06-18 16:58:32 UTC (rev 6024)
@@ -1,3 +1,5 @@
+include_directories( ${KDE4_INCLUDES} )
+
add_subdirectory( ActionMan )
add_subdirectory( BookMan )
add_subdirectory( Dialogs )
@@ -19,7 +21,6 @@
add_subdirectory( VFS )
message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: skipped subdir $(KRJSDIR)")
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
########### next target ###############
Modified: trunk/krusader_kde4/krusader/Panel/krpopupmenu.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Panel/krpopupmenu.cpp 2008-06-14 09:22:53 UTC (rev 6023)
+++ trunk/krusader_kde4/krusader/Panel/krpopupmenu.cpp 2008-06-18 16:58:32 UTC (rev 6024)
@@ -78,7 +78,7 @@
}
// ------------- Preview - normal vfs only ?
- if ( panel->func->files()->vfs_getType() == vfs::NORMAL ) {
+ if ( panel->func->files()->vfs_getType() == vfs::VFS_NORMAL ) {
// create the preview popup
QStringList names;
panel->getSelectedNames( &names );
@@ -157,14 +157,14 @@
// -------- DELETE
addAction( i18n( "Delete" ) )->setData( QVariant( DELETE_ID ) );
// -------- SHRED - only one file
-/* if ( panel->func->files() ->vfs_getType() == vfs::NORMAL &&
+/* if ( panel->func->files() ->vfs_getType() == vfs::VFS_NORMAL &&
!vf->vfile_isDir() && !multipleSelections )
addAction( i18n( "Shred" ) )->setData( QVariant( SHRED_ID ) );*/
}
// ---------- link handling
// create new shortcut or redirect links - only on local directories:
- if ( panel->func->files() ->vfs_getType() == vfs::NORMAL ) {
+ if ( panel->func->files() ->vfs_getType() == vfs::VFS_NORMAL ) {
addSeparator();
linkPopup.addAction( i18n( "New Symlink..." ) )->setData( QVariant( NEW_SYMLINK_ID ) );
linkPopup.addAction( i18n( "New Hardlink..." ) )->setData( QVariant( NEW_LINK_ID ) );
@@ -177,11 +177,11 @@
addSeparator();
// ---------- calculate space
- if ( panel->func->files() ->vfs_getType() == vfs::NORMAL && ( vf->vfile_isDir() || multipleSelections ) )
+ if ( panel->func->files() ->vfs_getType() == vfs::VFS_NORMAL && ( vf->vfile_isDir() || multipleSelections ) )
addAction( krCalculate );
// ---------- mount/umount/eject
- if ( panel->func->files() ->vfs_getType() == vfs::NORMAL && vf->vfile_isDir() && !multipleSelections ) {
+ if ( panel->func->files() ->vfs_getType() == vfs::VFS_NORMAL && vf->vfile_isDir() && !multipleSelections ) {
if ( krMtMan.getStatus( panel->func->files() ->vfs_getFile( item->name() ).path( KUrl::RemoveTrailingSlash ) ) == KMountMan::MOUNTED )
addAction( i18n( "Unmount" ) )->setData( QVariant( UNMOUNT_ID ) );
else if ( krMtMan.getStatus( panel->func->files() ->vfs_getFile( item->name() ).path( KUrl::RemoveTrailingSlash ) ) == KMountMan::NOT_MOUNTED )
Modified: trunk/krusader_kde4/krusader/Panel/listpanel.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Panel/listpanel.cpp 2008-06-14 09:22:53 UTC (rev 6023)
+++ trunk/krusader_kde4/krusader/Panel/listpanel.cpp 2008-06-18 16:58:32 UTC (rev 6024)
@@ -620,7 +620,7 @@
setCursor( Qt::BusyCursor );
view->clear();
- if ( func->files() ->vfs_getType() == vfs::NORMAL )
+ if ( func->files() ->vfs_getType() == vfs::VFS_NORMAL )
_realPath = virtualPath();
this->origin->setUrl( virtualPath().pathOrUrl() );
emit pathChanged( this );
@@ -644,7 +644,7 @@
bool isFtp = ( protocol == "ftp" || protocol == "smb" || protocol == "sftp" || protocol == "fish" );
QString origin = virtualPath().prettyUrl(KUrl::RemoveTrailingSlash);
- if ( origin.right( 1 ) != "/" && !( ( func->files() ->vfs_getType() == vfs::FTP ) && isFtp &&
+ if ( origin.right( 1 ) != "/" && !( ( func->files() ->vfs_getType() == vfs::VFS_FTP ) && isFtp &&
origin.indexOf( '/', origin.indexOf( ":/" ) + 3 ) == -1 ) ) {
view->addItems( func->files() );
} else
@@ -793,7 +793,7 @@
act = popup.addAction( i18n( "Move Here" ) );
act->setData( QVariant( 2 ) );
}
- if ( func->files() ->vfs_getType() == vfs::NORMAL && isLocal ) {
+ if ( func->files() ->vfs_getType() == vfs::VFS_NORMAL && isLocal ) {
act = popup.addAction( i18n( "Link Here" ) );
act->setData( QVariant( 3 ) );
}
Modified: trunk/krusader_kde4/krusader/Panel/panelfunc.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Panel/panelfunc.cpp 2008-06-14 09:22:53 UTC (rev 6023)
+++ trunk/krusader_kde4/krusader/Panel/panelfunc.cpp 2008-06-18 16:58:32 UTC (rev 6024)
@@ -205,7 +205,7 @@
panel, SLOT( slotCleared() ) );
// on local file system change the working directory
- if ( files() ->vfs_getType() == vfs::NORMAL )
+ if ( files() ->vfs_getType() == vfs::VFS_NORMAL )
QDir::setCurrent( files() ->vfs_getOrigin().path() );
// see if the open url operation failed, and if so,
@@ -272,7 +272,7 @@
}
void ListPanelFunc::redirectLink() {
- if ( files() ->vfs_getType() != vfs::NORMAL ) {
+ if ( files() ->vfs_getType() != vfs::VFS_NORMAL ) {
KMessageBox::sorry( krApp, i18n( "You can edit links only on local file systems" ) );
return ;
}
@@ -310,7 +310,7 @@
}
void ListPanelFunc::krlink( bool sym ) {
- if ( files() ->vfs_getType() != vfs::NORMAL ) {
+ if ( files() ->vfs_getType() != vfs::VFS_NORMAL ) {
KMessageBox::sorry( krApp, i18n( "You can create links only on local file systems" ) );
return ;
}
@@ -516,7 +516,7 @@
}
KUrl ListPanelFunc::getVirtualBaseURL() {
- if( files()->vfs_getType() != vfs::VIRT || otherFunc()->files()->vfs_getType() == vfs::VIRT )
+ if( files()->vfs_getType() != vfs::VFS_VIRT || otherFunc()->files()->vfs_getType() == vfs::VFS_VIRT )
return KUrl();
QStringList fileNames;
@@ -633,13 +633,13 @@
if ( group.readEntry( "Confirm Delete", _ConfirmDelete ) ) {
QString s, b;
- if ( !reallyDelete && trash && files() ->vfs_getType() == vfs::NORMAL ) {
+ if ( !reallyDelete && trash && files() ->vfs_getType() == vfs::VFS_NORMAL ) {
s = i18np( "Do you really want to move this item to the trash?", "Do you really want to move these %1 items to the trash?", fileNames.count() );
b = i18n( "&Trash" );
- } else if( files() ->vfs_getType() == vfs::VIRT && files()->vfs_getOrigin().equals( KUrl("virt:/"), KUrl::CompareWithoutTrailingSlash ) ) {
+ } else if( files() ->vfs_getType() == vfs::VFS_VIRT && files()->vfs_getOrigin().equals( KUrl("virt:/"), KUrl::CompareWithoutTrailingSlash ) ) {
s = i18np( "Do you really want to delete this virtual item (physical files stay untouched)?", "Do you really want to delete these %1 virtual items (physical files stay untouched)?", fileNames.count() );
b = i18n( "&Delete" );
- } else if( files() ->vfs_getType() == vfs::VIRT ) {
+ } else if( files() ->vfs_getType() == vfs::VFS_VIRT ) {
s = i18np( "<qt>Do you really want to delete this item <b>physically</b> (not just removing it from the virtual items)?</qt>", "<qt>Do you really want to delete these %1 items <b>physically</b> (not just removing them from the virtual items)?</qt>", fileNames.count() );
b = i18n( "&Delete" );
} else {
@@ -656,7 +656,7 @@
//we want to warn the user about non empty dir
// and files he don't have permission to delete
bool emptyDirVerify = group.readEntry( "Confirm Unempty Dir", _ConfirmUnemptyDir );
- emptyDirVerify = ( ( emptyDirVerify ) && ( files() ->vfs_getType() == vfs::NORMAL ) );
+ emptyDirVerify = ( ( emptyDirVerify ) && ( files() ->vfs_getType() == vfs::VFS_NORMAL ) );
QDir dir;
for ( QStringList::Iterator name = fileNames.begin(); name != fileNames.end(); ) {
@@ -1077,7 +1077,7 @@
void ListPanelFunc::FTPDisconnect() {
// you can disconnect only if connected !
- if ( files() ->vfs_getType() == vfs::FTP ) {
+ if ( files() ->vfs_getType() == vfs::VFS_FTP ) {
krFTPDiss->setEnabled( false );
panel->view->setNameToMakeCurrent( QString() );
openUrl( panel->realPath() ); // open the last local URL
@@ -1126,10 +1126,10 @@
vfs::VFS_TYPE vfsType = files() ->vfs_getType();
// set up actions
- //krMultiRename->setEnabled( vfsType == vfs::NORMAL ); // batch rename
- //krProperties ->setEnabled( vfsType == vfs::NORMAL || vfsType == vfs::FTP ); // file properties
- krFTPDiss ->setEnabled( vfsType == vfs::FTP ); // disconnect an FTP session
- krCreateCS->setEnabled( vfsType == vfs::NORMAL );
+ //krMultiRename->setEnabled( vfsType == vfs::VFS_NORMAL ); // batch rename
+ //krProperties ->setEnabled( vfsType == vfs::VFS_NORMAL || vfsType == vfs::VFS_FTP ); // file properties
+ krFTPDiss ->setEnabled( vfsType == vfs::VFS_FTP ); // disconnect an FTP session
+ krCreateCS->setEnabled( vfsType == vfs::VFS_NORMAL );
QString protocol = files()->vfs_getOrigin().protocol();
krRemoteEncoding->setEnabled( protocol == "ftp" || protocol == "sftp" || protocol == "fish" || protocol == "krarc" );
@@ -1194,7 +1194,7 @@
QApplication::clipboard()->setMimeData( mimeData, QClipboard::Clipboard );
- if( move && files()->vfs_getType() == vfs::VIRT )
+ if( move && files()->vfs_getType() == vfs::VFS_VIRT )
( static_cast<virt_vfs*>( files() ) )->vfs_removeFiles( &fileNames );
delete fileUrls;
Modified: trunk/krusader_kde4/krusader/Synchronizer/synchronizerdirlist.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Synchronizer/synchronizerdirlist.cpp 2008-06-14 09:22:53 UTC (rev 6023)
+++ trunk/krusader_kde4/krusader/Synchronizer/synchronizerdirlist.cpp 2008-06-18 16:58:32 UTC (rev 6024)
@@ -40,6 +40,7 @@
#include <qdir.h>
#include <kdeversion.h>
#include <kio/jobuidelegate.h>
+#include <string.h>
#if defined( HAVE_POSIX_ACL )
@@ -143,7 +144,7 @@
if( symLink ){ // who the link is pointing to ?
char symDest[256];
- bzero(symDest,256);
+ memset(symDest,0,256);
int endOfName=0;
endOfName=readlink(fullName.toLocal8Bit(),symDest,256);
if ( endOfName != -1 ) {
Modified: trunk/krusader_kde4/krusader/UserAction/expander.cpp
===================================================================
--- trunk/krusader_kde4/krusader/UserAction/expander.cpp 2008-06-14 09:22:53 UTC (rev 6023)
+++ trunk/krusader_kde4/krusader/UserAction/expander.cpp 2008-06-18 16:58:32 UTC (rev 6024)
@@ -55,7 +55,7 @@
void exp_placeholder::panelMissingError(const QString &s, Expander& exp)
{
- exp.setError( Error(Error::S_FATAL,Error::C_ARGUMENT,i18n("Needed panel specification missing in expander %1", s)) );
+ exp.setError( Error(Error::exp_S_FATAL,Error::exp_C_ARGUMENT,i18n("Needed panel specification missing in expander %1", s)) );
}
QStringList exp_placeholder::fileList(const ListPanel* const panel,const QString& type,const QString& mask,const bool ommitPath,const bool useUrl,Expander& exp,const QString& error)
@@ -70,7 +70,7 @@
else if ( type == "selected" )
panel->view->getSelectedItems( &items );
else {
- setError(exp, Error(Error::S_FATAL,Error::C_ARGUMENT,i18n("Expander: Bad argument to %1: %2 is not valid item specifier", error,type) ) );
+ setError(exp, Error(Error::exp_S_FATAL,Error::exp_C_ARGUMENT,i18n("Expander: Bad argument to %1: %2 is not valid item specifier", error,type) ) );
return QStringList();
}
if ( !ommitPath ) { // add the current path
@@ -398,7 +398,7 @@
else if ( parameter[ 0 ].toLower() == "selected" )
n = panel->view->numSelected();
else {
- setError(exp, Error(Error::S_FATAL,Error::C_ARGUMENT,i18n("Expander: Bad argument to Count: %1 is not valid item specifier", parameter[0]) ));
+ setError(exp, Error(Error::exp_S_FATAL,Error::exp_C_ARGUMENT,i18n("Expander: Bad argument to Count: %1 is not valid item specifier", parameter[0]) ));
return QString();
}
@@ -506,7 +506,7 @@
tmpFile.setSuffix(".itemlist");
if (!tmpFile.open()) {
- setError(exp, Error(Error::S_FATAL,Error::C_WORLD, i18n("Expander: tempfile couldn't be opened (%1)", tmpFile.errorString()) ));
+ setError(exp, Error(Error::exp_S_FATAL,Error::exp_C_WORLD, i18n("Expander: tempfile couldn't be opened (%1)", tmpFile.errorString()) ));
return QString();
}
@@ -569,7 +569,7 @@
newTab = true;
if ( parameter.count() == 0 ) {
- setError(exp, Error(Error::S_FATAL,Error::C_ARGUMENT, i18n("Expander: at least 1 parameter is required for Goto!" ) ));
+ setError(exp, Error(Error::exp_S_FATAL,Error::exp_C_ARGUMENT, i18n("Expander: at least 1 parameter is required for Goto!" ) ));
return QString();
}
@@ -611,7 +611,7 @@
QString caption, preset, result;
if ( parameter.count() == 0 ) {
- setError(exp, Error(Error::S_FATAL,Error::C_ARGUMENT, i18n("Expander: at least 1 parameter is required for Ask!" ) ));
+ setError(exp, Error(Error::exp_S_FATAL,Error::exp_C_ARGUMENT, i18n("Expander: at least 1 parameter is required for Ask!" ) ));
return QString();
}
@@ -634,7 +634,7 @@
if (ok)
return result;
else {
- setError(exp, Error(Error::S_ERROR,Error::C_USER,"User cancelled") );
+ setError(exp, Error(Error::exp_S_ERROR,Error::exp_C_USER,"User cancelled") );
return QString();
}
}
@@ -650,13 +650,13 @@
TagString exp_Clipboard::expFunc( const ListPanel*, const TagStringList& parameter, const bool&, Expander& exp ) const {
// kDebug() << "Expander::exp_Clipboard, parameter[0]: '" << parameter[0] << "', Clipboard: " << KApplication::clipboard()->text() << endl;
if ( parameter.count() == 0 ) {
- setError(exp, Error(Error::S_FATAL,Error::C_ARGUMENT, i18n("Expander: at least 1 parameter is required for Clipboard!" ) ));
+ setError(exp, Error(Error::exp_S_FATAL,Error::exp_C_ARGUMENT, i18n("Expander: at least 1 parameter is required for Clipboard!" ) ));
return QString();
}
QStringList lst=splitEach(parameter[0]);
if( parameter.count() > 1 && !parameter[1].isSimple()) {
- setError(exp,Error(Error::S_FATAL,Error::C_SYNTAX,i18n("Expander: %Each% may not be in the second argument of %Clipboard%")));
+ setError(exp,Error(Error::exp_S_FATAL,Error::exp_C_SYNTAX,i18n("Expander: %Each% may not be in the second argument of %Clipboard%")));
return QString();
}
if ( parameter.count() <= 1 || parameter[1].string().isEmpty() || KApplication::clipboard()->text().isEmpty() )
@@ -677,14 +677,14 @@
}
TagString exp_Copy::expFunc( const ListPanel*, const TagStringList& parameter, const bool&, Expander& exp ) const {
if ( parameter.count() < 2 ) {
- setError(exp, Error(Error::S_FATAL,Error::C_ARGUMENT, i18n("Expander: at least 2 parameter is required for Copy!" ) ));
+ setError(exp, Error(Error::exp_S_FATAL,Error::exp_C_ARGUMENT, i18n("Expander: at least 2 parameter is required for Copy!" ) ));
return QString();
}
// basically the parameter can already be used as URL, but since KUrl has problems with ftp-proxy-urls (like ftp://username@proxyusername@url...) this is neccesary:
QStringList lst=splitEach( parameter[0] );
if(!parameter[1].isSimple()) {
- setError(exp,Error(Error::S_FATAL,Error::C_SYNTAX,i18n("Expander: %Each% may not be in the second argument of %Copy%")));
+ setError(exp,Error(Error::exp_S_FATAL,Error::exp_C_SYNTAX,i18n("Expander: %Each% may not be in the second argument of %Copy%")));
return QString();
}
KUrl::List src;
@@ -694,7 +694,7 @@
KUrl dest = KUrl( parameter[1].string() );
if ( !dest.isValid() || find_if(src.constBegin(),src.constEnd(),not1(mem_fun_ref(&KUrl::isValid) ))!=src.end()) {
- setError(exp, Error(Error::S_FATAL,Error::C_ARGUMENT,i18n("Expander: invalid URL's in %_Copy(\"src\", \"dest\")%") ));
+ setError(exp, Error(Error::exp_S_FATAL,Error::exp_C_ARGUMENT,i18n("Expander: invalid URL's in %_Copy(\"src\", \"dest\")%") ));
return QString();
}
@@ -713,14 +713,14 @@
}
TagString exp_Move::expFunc( const ListPanel*, const TagStringList& parameter, const bool& , Expander& exp ) const {
if ( parameter.count() < 2 ) {
- setError(exp, Error(Error::S_FATAL,Error::C_ARGUMENT, i18n("Expander: at least 2 parameter is required for Move!" ) ));
+ setError(exp, Error(Error::exp_S_FATAL,Error::exp_C_ARGUMENT, i18n("Expander: at least 2 parameter is required for Move!" ) ));
return QString();
}
// basically the parameter can already be used as URL, but since KUrl has problems with ftp-proxy-urls (like ftp://username@proxyusername@url...) this is neccesary:
QStringList lst=splitEach( parameter[0] );
if(!parameter[1].isSimple()) {
- setError(exp,Error(Error::S_FATAL,Error::C_SYNTAX,i18n("%Each% may not be in the second argument of %Move%")));
+ setError(exp,Error(Error::exp_S_FATAL,Error::exp_C_SYNTAX,i18n("%Each% may not be in the second argument of %Move%")));
return QString();
}
KUrl::List src;
@@ -730,7 +730,7 @@
KUrl dest = KUrl( parameter[1].string() );
if ( !dest.isValid() || find_if(src.constBegin(),src.constEnd(),not1(mem_fun_ref(&KUrl::isValid) ))!=src.end()) {
- setError(exp, Error(Error::S_FATAL,Error::C_ARGUMENT,i18n("Expander: invalid URL's in %_Move(\"src\", \"dest\")%") ));
+ setError(exp, Error(Error::exp_S_FATAL,Error::exp_C_ARGUMENT,i18n("Expander: invalid URL's in %_Move(\"src\", \"dest\")%") ));
return QString();
}
@@ -748,7 +748,7 @@
}
TagString exp_Sync::expFunc( const ListPanel*, const QStringList& parameter, const bool&, Expander& exp ) const {
if ( parameter.count() == 0 || parameter[0].isEmpty() ) {
- setError(exp, Error(Error::S_FATAL,Error::C_ARGUMENT,i18n("Expander: no profile specified for %_Sync(profile)%") ));
+ setError(exp, Error(Error::exp_S_FATAL,Error::exp_C_ARGUMENT,i18n("Expander: no profile specified for %_Sync(profile)%") ));
return QString();
}
@@ -766,7 +766,7 @@
}
TagString exp_NewSearch::expFunc( const ListPanel*, const QStringList& parameter, const bool&, Expander& exp ) const {
if ( parameter.count() == 0 || parameter[0].isEmpty() ) {
- setError(exp, Error(Error::S_FATAL,Error::C_ARGUMENT,i18n("Expander: no profile specified for %_NewSearch(profile)%") ));
+ setError(exp, Error(Error::exp_S_FATAL,Error::exp_C_ARGUMENT,i18n("Expander: no profile specified for %_NewSearch(profile)%") ));
return QString();
}
@@ -784,7 +784,7 @@
}
TagString exp_Profile::expFunc( const ListPanel*, const QStringList& parameter, const bool&, Expander& exp ) const {
if ( parameter.count() == 0 || parameter[0].isEmpty() ) {
- setError(exp, Error(Error::S_FATAL,Error::C_ARGUMENT,i18n("Expander: no profile specified for %_Profile(profile)%; abort...") ));
+ setError(exp, Error(Error::exp_S_FATAL,Error::exp_C_ARGUMENT,i18n("Expander: no profile specified for %_Profile(profile)%; abort...") ));
return QString();
}
@@ -837,7 +837,7 @@
NEED_PANEL
if ( parameter.count() == 0 || parameter[0].isEmpty() ) {
- setError(exp, Error(Error::S_FATAL,Error::C_ARGUMENT,i18n("Expander: no column specified for %_ColSort(column)%") ));
+ setError(exp, Error(Error::exp_S_FATAL,Error::exp_C_ARGUMENT,i18n("Expander: no column specified for %_ColSort(column)%") ));
return QString();
}
@@ -909,7 +909,7 @@
if ( parameter[0].toLower() == "group" ) {
mode |= KrViewProperties::Group;
} else {
- setError(exp, Error(Error::S_WARNING,Error::C_ARGUMENT,i18n("Expander: unknown column specified for %_ColSort(%1)%", parameter[0]) ));
+ setError(exp, Error(Error::exp_S_WARNING,Error::exp_C_ARGUMENT,i18n("Expander: unknown column specified for %_ColSort(%1)%", parameter[0]) ));
return QString();
}
@@ -936,7 +936,7 @@
newSize = parameter[0].toInt();
if ( newSize < 0 || newSize > 100 ) {
- setError(exp, Error(Error::S_FATAL,Error::C_ARGUMENT,i18n("Expander: Value %1 out of range for %_PanelSize(percent)%. The first parameter has to be >0 and <100", newSize)) );
+ setError(exp, Error(Error::exp_S_FATAL,Error::exp_C_ARGUMENT,i18n("Expander: Value %1 out of range for %_PanelSize(percent)%. The first parameter has to be >0 and <100", newSize)) );
return QString();
}
@@ -968,7 +968,7 @@
}
TagString exp_Script::expFunc( const ListPanel*, const QStringList& parameter, const bool&, Expander& exp ) const {
if ( parameter.count() == 0 || parameter[0].isEmpty() ) {
- setError(exp, Error(Error::S_FATAL,Error::C_ARGUMENT,i18n("Expander: no script specified for %_Script(script)%")) );
+ setError(exp, Error(Error::exp_S_FATAL,Error::exp_C_ARGUMENT,i18n("Expander: no script specified for %_Script(script)%")) );
return QString();
}
@@ -1021,7 +1021,7 @@
}
TagString exp_View::expFunc( const ListPanel*, const QStringList& parameter, const bool&, Expander& exp ) const {
if ( parameter.count() == 0 || parameter[0].isEmpty() ) {
- setError(exp, Error(Error::S_FATAL,Error::C_ARGUMENT,i18n("Expander: no file to view in %_View(filename)%")) );
+ setError(exp, Error(Error::exp_S_FATAL,Error::exp_C_ARGUMENT,i18n("Expander: no file to view in %_View(filename)%")) );
return QString();
}
@@ -1058,7 +1058,7 @@
if((*it).isSimple())
lst.push_back((*it).string());
else {
- setError(exp,Error(Error::S_FATAL,Error::C_SYNTAX,i18n("%Each% is not allowed in parameter to %1", description())));
+ setError(exp,Error(Error::exp_S_FATAL,Error::exp_C_SYNTAX,i18n("%Each% is not allowed in parameter to %1", description())));
return QString();
}
return expFunc(p,lst,useUrl,exp);
@@ -1079,7 +1079,7 @@
case '_':
return 0;
default:
- exp.setError(Error(Error::S_FATAL,Error::C_SYNTAX,i18n("Expander: Bad panel specifier %1 in placeholder %2", panelIndicator, pl->description())));
+ exp.setError(Error(Error::exp_S_FATAL,Error::exp_C_SYNTAX,i18n("Expander: Bad panel specifier %1 in placeholder %2", panelIndicator, pl->description())));
return 0;
}
}
@@ -1108,7 +1108,7 @@
while ( idx < stringToExpand.length() ) {
if ( ( begin = stringToExpand.indexOf( '%', idx ) ) == -1 ) break;
if ( ( end = findEnd( stringToExpand, begin ) ) == -1 ) {
- setError(Error(Error::S_FATAL,Error::C_SYNTAX,i18n("Error: unterminated % in Expander::expandCurrent")) );
+ setError(Error(Error::exp_S_FATAL,Error::exp_C_SYNTAX,i18n("Error: unterminated % in Expander::expandCurrent")) );
return QString();
}
@@ -1138,7 +1138,7 @@
break;
}
if ( i == placeholderCount() ) { // didn't find an expander
- setError(Error(Error::S_FATAL,Error::C_SYNTAX,i18n("Error: unrecognized %%%1%2%% in Expander::expand", panelIndicator, exp)) );
+ setError(Error(Error::exp_S_FATAL,Error::exp_C_SYNTAX,i18n("Error: unrecognized %%%1%2%% in Expander::expand", panelIndicator, exp)) );
return QString();
}
} //else
@@ -1176,7 +1176,7 @@
int begin, end;
if ( ( begin = exp->indexOf( '(' ) ) != -1 ) {
if ( ( end = exp->lastIndexOf( ')' ) ) == -1 ) {
- setError(Error(Error::S_FATAL,Error::C_SYNTAX,i18n("Error: missing ')' in Expander::separateParameter") ));
+ setError(Error(Error::exp_S_FATAL,Error::exp_C_SYNTAX,i18n("Error: missing ')' in Expander::separateParameter") ));
return TagStringList();
}
result = exp->mid( begin + 1, end - begin - 1 );
Modified: trunk/krusader_kde4/krusader/UserAction/expander.h
===================================================================
--- trunk/krusader_kde4/krusader/UserAction/expander.h 2008-06-14 09:22:53 UTC (rev 6023)
+++ trunk/krusader_kde4/krusader/UserAction/expander.h 2008-06-18 16:58:32 UTC (rev 6024)
@@ -91,15 +91,15 @@
class Error {
public:
enum Cause {
- C_USER, C_SYNTAX, C_WORLD, C_ARGUMENT
+ exp_C_USER, exp_C_SYNTAX, exp_C_WORLD, exp_C_ARGUMENT
};
enum Severity {
- S_OK, S_WARNING, S_ERROR, S_FATAL
+ exp_S_OK, exp_S_WARNING, exp_S_ERROR, exp_S_FATAL
};
- Error() : s_(S_OK) {}
+ Error() : s_(exp_S_OK) {}
Error(Severity s,Cause c,QString d) : s_(s), c_(c), desc_(d) {}
Cause cause() const { return c_; }
- operator bool() const { return s_!=S_OK; }
+ operator bool() const { return s_!=exp_S_OK; }
const QString& what() const { return desc_; }
private:
Severity s_;
Modified: trunk/krusader_kde4/krusader/VFS/ftp_vfs.cpp
===================================================================
--- trunk/krusader_kde4/krusader/VFS/ftp_vfs.cpp 2008-06-14 09:22:53 UTC (rev 6023)
+++ trunk/krusader_kde4/krusader/VFS/ftp_vfs.cpp 2008-06-18 16:58:32 UTC (rev 6024)
@@ -60,7 +60,7 @@
ftp_vfs::ftp_vfs( QObject* panel ) : vfs( panel ), busy( false ) {
// set the writable attribute
isWritable = true;
- vfs_type = FTP;
+ vfs_type = VFS_FTP;
}
ftp_vfs::~ftp_vfs() {
Modified: trunk/krusader_kde4/krusader/VFS/krvfshandler.cpp
===================================================================
--- trunk/krusader_kde4/krusader/VFS/krvfshandler.cpp 2008-06-14 09:22:53 UTC (rev 6023)
+++ trunk/krusader_kde4/krusader/VFS/krvfshandler.cpp 2008-06-18 16:58:32 UTC (rev 6024)
@@ -35,20 +35,20 @@
if( ( protocol == "krarc" || protocol == "tar" || protocol == "zip" ) &&
QDir(url.path(KUrl::RemoveTrailingSlash)).exists() )
- return vfs::NORMAL;
+ return vfs::VFS_NORMAL;
if( url.isLocalFile() ){
- return vfs::NORMAL;
+ return vfs::VFS_NORMAL;
}
else{
- if(url.protocol() == "virt") return vfs::VIRT;
- else return vfs::FTP;
+ if(url.protocol() == "virt") return vfs::VFS_VIRT;
+ else return vfs::VFS_FTP;
}
- return vfs::ERROR;
+ return vfs::VFS_ERROR;
}
vfs* KrVfsHandler::getVfs(const KUrl& url,QObject* parent,vfs* oldVfs){
- vfs::VFS_TYPE newType,oldType = vfs::ERROR;
+ vfs::VFS_TYPE newType,oldType = vfs::VFS_ERROR;
if(oldVfs) oldType = oldVfs->vfs_getType();
newType = getVfsType(url);
@@ -58,10 +58,10 @@
if( oldType != newType ){
switch( newType ){
- case (vfs::NORMAL) : newVfs = new normal_vfs(parent); break;
- case (vfs::FTP ) : newVfs = new ftp_vfs(parent) ; break;
- case (vfs::VIRT ) : newVfs = new virt_vfs(parent) ; break;
- case (vfs::ERROR ) : newVfs = 0 ; break;
+ case (vfs::VFS_NORMAL) : newVfs = new normal_vfs(parent); break;
+ case (vfs::VFS_FTP ) : newVfs = new ftp_vfs(parent) ; break;
+ case (vfs::VFS_VIRT ) : newVfs = new virt_vfs(parent) ; break;
+ case (vfs::VFS_ERROR ) : newVfs = 0 ; break;
}
}
Modified: trunk/krusader_kde4/krusader/VFS/normal_vfs.cpp
===================================================================
--- trunk/krusader_kde4/krusader/VFS/normal_vfs.cpp 2008-06-14 09:22:53 UTC (rev 6023)
+++ trunk/krusader_kde4/krusader/VFS/normal_vfs.cpp 2008-06-18 16:58:32 UTC (rev 6024)
@@ -27,7 +27,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
-#include <strings.h>
+#include <string.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
@@ -66,7 +66,7 @@
#endif
normal_vfs::normal_vfs(QObject* panel):vfs(panel), watcher(0) {
- vfs_type=NORMAL;
+ vfs_type=VFS_NORMAL;
}
bool normal_vfs::populateVfsList(const KUrl& origin, bool showHidden){
@@ -251,7 +251,7 @@
QString mime=QString();
char symDest[256];
- bzero(symDest,256);
+ memset(symDest,0,256);
if( S_ISLNK(stat_p.st_mode) ){ // who the link is pointing to ?
int endOfName=0;
endOfName=readlink(fileName.data(),symDest,256);
Modified: trunk/krusader_kde4/krusader/VFS/preserveattrcopyjob.cpp
===================================================================
--- trunk/krusader_kde4/krusader/VFS/preserveattrcopyjob.cpp 2008-06-14 09:22:53 UTC (rev 6023)
+++ trunk/krusader_kde4/krusader/VFS/preserveattrcopyjob.cpp 2008-06-18 16:58:32 UTC (rev 6024)
@@ -44,7 +44,7 @@
#include <ktemporaryfile.h>
#include <kuiserverjobtracker.h>
-#ifdef Q_OS_UNIX
+#if defined(Q_OS_UNIX) || defined(Q_OS_WIN32)
#include <utime.h>
#endif
#include <assert.h>
@@ -52,6 +52,7 @@
#include <QtCore/QTimer>
#include <QtCore/QFile>
#include <sys/stat.h> // mode_t
+#include <sys/types.h>
#include <QPointer>
#include <pwd.h>
Modified: trunk/krusader_kde4/krusader/VFS/preserveattrcopyjob.h
===================================================================
--- trunk/krusader_kde4/krusader/VFS/preserveattrcopyjob.h 2008-06-14 09:22:53 UTC (rev 6023)
+++ trunk/krusader_kde4/krusader/VFS/preserveattrcopyjob.h 2008-06-18 16:58:32 UTC (rev 6024)
@@ -101,7 +101,7 @@
* @see KIO::link()
* @see KIO::linkAs()
*/
- class KIO_EXPORT PreserveAttrCopyJob : public Job {
+ class PreserveAttrCopyJob : public Job {
Q_OBJECT
Modified: trunk/krusader_kde4/krusader/VFS/vfs.cpp
===================================================================
--- trunk/krusader_kde4/krusader/VFS/vfs.cpp 2008-06-14 09:22:53 UTC (rev 6023)
+++ trunk/krusader_kde4/krusader/VFS/vfs.cpp 2008-06-18 16:58:32 UTC (rev 6024)
@@ -228,7 +228,7 @@
}
void vfs::vfs_enableRefresh(bool enable){
- if (vfs_type != NORMAL) return;
+ if (vfs_type != VFS_NORMAL) return;
if (disableRefresh == !enable) return; // if gets called twice by mistake
disableRefresh = quietMode = !enable;
if( enable && !postponedRefreshURL.isEmpty() ) vfs_refresh( postponedRefreshURL );
Modified: trunk/krusader_kde4/krusader/VFS/vfs.h
===================================================================
--- trunk/krusader_kde4/krusader/VFS/vfs.h 2008-06-14 09:22:53 UTC (rev 6023)
+++ trunk/krusader_kde4/krusader/VFS/vfs.h 2008-06-18 16:58:32 UTC (rev 6024)
@@ -52,7 +52,7 @@
Q_OBJECT
public:
typedef QHash<QString, vfile *> vfileDict;
- enum VFS_TYPE{ERROR=0,NORMAL,FTP,VIRT};
+ enum VFS_TYPE{VFS_ERROR=0,VFS_NORMAL,VFS_FTP,VFS_VIRT};
/**
* Creates a vfs.
Modified: trunk/krusader_kde4/krusader/VFS/virt_vfs.cpp
===================================================================
--- trunk/krusader_kde4/krusader/VFS/virt_vfs.cpp 2008-06-14 09:22:53 UTC (rev 6023)
+++ trunk/krusader_kde4/krusader/VFS/virt_vfs.cpp 2008-06-18 16:58:32 UTC (rev 6024)
@@ -46,7 +46,7 @@
restore();
}
- vfs_type = VIRT;
+ vfs_type = VFS_VIRT;
}
virt_vfs::~virt_vfs() {}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <des...@us...> - 2008-06-14 09:22:46
|
Revision: 6023
http://krusader.svn.sourceforge.net/krusader/?rev=6023&view=rev
Author: deschler
Date: 2008-06-14 02:22:53 -0700 (Sat, 14 Jun 2008)
Log Message:
-----------
Updated header information
Modified Paths:
--------------
trunk/krusader_kde4/po/bg.po
trunk/krusader_kde4/po/bs.po
trunk/krusader_kde4/po/ca.po
trunk/krusader_kde4/po/cs.po
trunk/krusader_kde4/po/da.po
trunk/krusader_kde4/po/de.po
trunk/krusader_kde4/po/el.po
trunk/krusader_kde4/po/es.po
trunk/krusader_kde4/po/fr.po
trunk/krusader_kde4/po/hu.po
trunk/krusader_kde4/po/it.po
trunk/krusader_kde4/po/ja.po
trunk/krusader_kde4/po/lt.po
trunk/krusader_kde4/po/nl.po
trunk/krusader_kde4/po/pl.po
trunk/krusader_kde4/po/pt.po
trunk/krusader_kde4/po/pt_BR.po
trunk/krusader_kde4/po/ru.po
trunk/krusader_kde4/po/sk.po
trunk/krusader_kde4/po/sl.po
trunk/krusader_kde4/po/sr.po
trunk/krusader_kde4/po/sr@Latn.po
trunk/krusader_kde4/po/sv.po
trunk/krusader_kde4/po/tr.po
trunk/krusader_kde4/po/uk.po
trunk/krusader_kde4/po/zh_CN.po
Modified: trunk/krusader_kde4/po/bg.po
===================================================================
--- trunk/krusader_kde4/po/bg.po 2008-06-14 09:01:45 UTC (rev 6022)
+++ trunk/krusader_kde4/po/bg.po 2008-06-14 09:22:53 UTC (rev 6023)
@@ -1,18 +1,19 @@
# Translation of krusader.pot to Bulgarian
#
# Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
-# Copyright (C) 2004-2007, Krusader Krew
+# Copyright (C) 2004-2008, Krusader Krew
# This file is distributed under the same license as the Krusader package
-# Milen Ivanov <mil...@gm...>, 2004, 2005, 2006, 2007.
#
+# Milen Ivanov <mil...@gm...>, 2004, 2005, 2006, 2007, 2008.
+#
msgid ""
msgstr ""
-"Project-Id-Version: krusader-1.80.0\n"
-"Report-Msgid-Bugs-To: kru...@go...\n"
+"Project-Id-Version: krusader-2.0.0-beta1\n"
+"Report-Msgid-Bugs-To: krusader-i18n <kru...@go...>\n"
"POT-Creation-Date: 2008-04-19 02:33+0200\n"
"PO-Revision-Date: 2005-12-04 10:30+0200\n"
"Last-Translator: Milen Ivanov <mil...@gm...>\n"
-"Language-Team: krusader-i18n <kru...@go...>\n"
+"Language-Team: Bulgarian <kru...@go...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
Modified: trunk/krusader_kde4/po/bs.po
===================================================================
--- trunk/krusader_kde4/po/bs.po 2008-06-14 09:01:45 UTC (rev 6022)
+++ trunk/krusader_kde4/po/bs.po 2008-06-14 09:22:53 UTC (rev 6023)
@@ -1,18 +1,19 @@
# Translation of krusader.pot to Bosnian
#
# Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
-# Copyright (C) 2004-2007, Krusader Krew
+# Copyright (C) 2004-2008, Krusader Krew
# This file is distributed under the same license as the Krusader package
+#
# Asim Husanovic <as...@me...>, 2004.
#
msgid ""
msgstr ""
-"Project-Id-Version: krusader-1.80.0-beta2\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"Project-Id-Version: krusader-2.0.0-beta1\n"
+"Report-Msgid-Bugs-To: krusader-i18n <kru...@go...>\n"
"POT-Creation-Date: 2008-04-16 22:49+0200\n"
"PO-Revision-Date: 2004-10-13 23:06+0200\n"
"Last-Translator: Asim Husanovic <as...@me...>\n"
-"Language-Team: Bosnian\n"
+"Language-Team: Bosnian <kru...@go...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
Modified: trunk/krusader_kde4/po/ca.po
===================================================================
--- trunk/krusader_kde4/po/ca.po 2008-06-14 09:01:45 UTC (rev 6022)
+++ trunk/krusader_kde4/po/ca.po 2008-06-14 09:22:53 UTC (rev 6023)
@@ -1,20 +1,21 @@
# Translation of krusader.pot to Catalan
#
# Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
-# Copyright (C) 2004-2007, Krusader Krew
+# Copyright (C) 2004-2008, Krusader Krew
# This file is distributed under the same license as the Krusader package
#
# Rafael Munoz Rodriguez <raf...@ne...>, 2003.
# Quim Perez Noguer <no...@os...>, 2004, 2005.
# Joaquim Perez <no...@gm...>, 2008.
+#
msgid ""
msgstr ""
-"Project-Id-Version: krusader-1.80.0\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"Project-Id-Version: krusader-2.0.0-beta1\n"
+"Report-Msgid-Bugs-To: krusader-i18n <kru...@go...>\n"
"POT-Creation-Date: 2008-04-16 22:49+0200\n"
"PO-Revision-Date: 2008-01-13 15:37+0100\n"
"Last-Translator: Joaquim Perez <no...@gm...>\n"
-"Language-Team: Catalan <gi...@ll...>\n"
+"Language-Team: Catalan <kru...@go...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
Modified: trunk/krusader_kde4/po/cs.po
===================================================================
--- trunk/krusader_kde4/po/cs.po 2008-06-14 09:01:45 UTC (rev 6022)
+++ trunk/krusader_kde4/po/cs.po 2008-06-14 09:22:53 UTC (rev 6023)
@@ -1,19 +1,20 @@
# Translation of krusader.pot to Czech
-
+#
# Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
-# Copyright (C) 2004-2007, Krusader Krew
+# Copyright (C) 2004-2008, Krusader Krew
# This file is distributed under the same license as the Krusader package
-
+#
# Martin Sixta <luk...@se...>, 2003, 2004.
# Václav Jůza <vac...@se...>, 2005, 2006, 2007, 2008.
+#
msgid ""
msgstr ""
-"Project-Id-Version: krusader-kde4\n"
+"Project-Id-Version: krusader-2.0.0-beta1\n"
"Report-Msgid-Bugs-To: krusader-i18n <kru...@go...>\n"
"POT-Creation-Date: 2008-04-16 22:49+0200\n"
"PO-Revision-Date: 2008-04-17 13:12+0200\n"
"Last-Translator: Václav Jůza <vac...@se...>\n"
-"Language-Team: krusader-i18n <kru...@go...>\n"
+"Language-Team: Czech <kru...@go...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
Modified: trunk/krusader_kde4/po/da.po
===================================================================
--- trunk/krusader_kde4/po/da.po 2008-06-14 09:01:45 UTC (rev 6022)
+++ trunk/krusader_kde4/po/da.po 2008-06-14 09:22:53 UTC (rev 6023)
@@ -1,20 +1,21 @@
# Translation of krusader.pot to Danish
#
# Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
-# Copyright (C) 2004-2007, Krusader Krew
+# Copyright (C) 2004-2008, Krusader Krew
# This file is distributed under the same license as the Krusader package
#
# Proofread by Christian Sonne <fre...@ge...>, 2004.
# Anders Bruun Olsen <an...@br...>, 2001, 2004.
# Peter H.S. <pe...@sk...>, 2006.
+#
msgid ""
msgstr ""
-"Project-Id-Version: krusader-1.80.0-beta2\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"Project-Id-Version: krusader-2.0.0-beta1\n"
+"Report-Msgid-Bugs-To: krusader-i18n <kru...@go...>\n"
"POT-Creation-Date: 2008-04-16 22:49+0200\n"
"PO-Revision-Date: 2006-02-08 18:17+0100\n"
"Last-Translator: Peter H.S. <pe...@sk...>\n"
-"Language-Team: Danish\n"
+"Language-Team: Danish <kru...@go...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
Modified: trunk/krusader_kde4/po/de.po
===================================================================
--- trunk/krusader_kde4/po/de.po 2008-06-14 09:01:45 UTC (rev 6022)
+++ trunk/krusader_kde4/po/de.po 2008-06-14 09:22:53 UTC (rev 6023)
@@ -1,19 +1,20 @@
# Translation of krusader.pot to German
#
# Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
-# Copyright (C) 2004-2007, Krusader Krew
+# Copyright (C) 2004-2008, Krusader Krew
# This file is distributed under the same license as the Krusader package
#
# Christoph Thielecke <cri...@gm...>, 2003.
-# Dirk Eschler <des...@us...>, 2003, 2004, 2005, 2006, 2007.
+# Dirk Eschler <des...@us...>, 2003, 2004, 2005, 2006, 2007, 2008.
+#
msgid ""
msgstr ""
-"Project-Id-Version: krusader-1.80.0-beta2\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"Project-Id-Version: krusader-2.0.0-beta1\n"
+"Report-Msgid-Bugs-To: krusader-i18n <kru...@go...>\n"
"POT-Creation-Date: 2008-04-16 22:49+0200\n"
"PO-Revision-Date: 2007-03-27 16:13+0200\n"
"Last-Translator: Dirk Eschler <des...@us...>\n"
-"Language-Team: krusader-i18n <kru...@go...>\n"
+"Language-Team: German <kru...@go...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
Modified: trunk/krusader_kde4/po/el.po
===================================================================
--- trunk/krusader_kde4/po/el.po 2008-06-14 09:01:45 UTC (rev 6022)
+++ trunk/krusader_kde4/po/el.po 2008-06-14 09:22:53 UTC (rev 6023)
@@ -1,19 +1,20 @@
# Translation of krusader.pot to Greek
#
# Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
-# Copyright (C) 2004-2007, Krusader Krew
+# Copyright (C) 2004-2008, Krusader Krew
# This file is distributed under the same license as the Krusader package
#
# Spiros Georgaras <sng...@ot...>, 2005, 2006, 2007.
# Spiros Georgaras <sn...@he...>, 2007.
+#
msgid ""
msgstr ""
-"Project-Id-Version: krusader-1.80.0\n"
-"Report-Msgid-Bugs-To: kru...@go...\n"
+"Project-Id-Version: krusader-2.0.0-beta1\n"
+"Report-Msgid-Bugs-To: krusader-i18n <kru...@go...>\n"
"POT-Creation-Date: 2008-04-19 02:33+0200\n"
"PO-Revision-Date: 2007-05-22 15:49+0300\n"
"Last-Translator: Spiros Georgaras <sn...@he...>\n"
-"Language-Team: krusader-i18n <kru...@go...>\n"
+"Language-Team: Greek <kru...@go...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
Modified: trunk/krusader_kde4/po/es.po
===================================================================
--- trunk/krusader_kde4/po/es.po 2008-06-14 09:01:45 UTC (rev 6022)
+++ trunk/krusader_kde4/po/es.po 2008-06-14 09:22:53 UTC (rev 6023)
@@ -1,20 +1,21 @@
# Translation of krusader.pot to Spanish
#
# Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
-# Copyright (C) 2004-2007, Krusader Krew
+# Copyright (C) 2004-2008, Krusader Krew
# This file is distributed under the same license as the Krusader package
#
# Rafael Munoz Rodriguez <raf...@ne...>, 2003, 2004.
# Alejandro Araiza Alvarado <meb...@gm...>, 2005, 2006.
# Alex Araiza <meb...@gm...>, 2005.
+#
msgid ""
msgstr ""
-"Project-Id-Version: krusader-1.80.0-beta2\n"
-"Report-Msgid-Bugs-To: kru...@go...\n"
+"Project-Id-Version: krusader-2.0.0-beta1\n"
+"Report-Msgid-Bugs-To: krusader-i18n <kru...@go...>\n"
"POT-Creation-Date: 2008-04-19 02:33+0200\n"
"PO-Revision-Date: 2006-10-24 21:22-0500\n"
"Last-Translator: Alejandro Araiza Alvarado <meb...@gm...>\n"
-"Language-Team: krusader-i18n <<kru...@go...>\n"
+"Language-Team: Spanish <kru...@go...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
Modified: trunk/krusader_kde4/po/fr.po
===================================================================
--- trunk/krusader_kde4/po/fr.po 2008-06-14 09:01:45 UTC (rev 6022)
+++ trunk/krusader_kde4/po/fr.po 2008-06-14 09:22:53 UTC (rev 6023)
@@ -8,14 +8,15 @@
# Frank Schoolmeesters <fra...@fa...>, 2004.
# Guillerm David <dgu...@gm...>, 2005, 2006.
# Tourneur Henry-Nicolas <hen...@to...>, 2007, 2008.
+#
msgid ""
msgstr ""
-"Project-Id-Version: krusader-1.90.0\n"
-"Report-Msgid-Bugs-To: kru...@go...\n"
+"Project-Id-Version: krusader-2.0.0-beta1\n"
+"Report-Msgid-Bugs-To: krusader-i18n <kru...@go...>\n"
"POT-Creation-Date: 2008-04-19 02:33+0200\n"
"PO-Revision-Date: 2008-04-18 17:20+0200\n"
"Last-Translator: Tourneur Henry-Nicolas <hen...@to...>\n"
-"Language-Team: krusader-i18n <kru...@go...>\n"
+"Language-Team: French <kru...@go...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
Modified: trunk/krusader_kde4/po/hu.po
===================================================================
--- trunk/krusader_kde4/po/hu.po 2008-06-14 09:01:45 UTC (rev 6022)
+++ trunk/krusader_kde4/po/hu.po 2008-06-14 09:22:53 UTC (rev 6023)
@@ -1,8 +1,7 @@
-# translation of hu.po to Hungarian
# Translation of krusader.pot to Hungarian
#
# Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
-# Copyright (C) 2004-2007, Krusader Krew
+# Copyright (C) 2004-2008, Krusader Krew
# This file is distributed under the same license as the Krusader package
#
# Marcel Hilzinger <hi...@su...>, 2003.
@@ -10,14 +9,15 @@
# Zoltan Kukk <kuk...@fr...>, 2004.
# Arpad Biro <bir...@ya...>, 2004, 2005, 2006.
# Karai Csaba <cs...@fr...>, 2006, 2007.
+#
msgid ""
msgstr ""
-"Project-Id-Version: hu\n"
-"Report-Msgid-Bugs-To: kru...@go...\n"
+"Project-Id-Version: krusader-2.0.0-beta1\n"
+"Report-Msgid-Bugs-To: krusader-i18n <kru...@go...>\n"
"POT-Creation-Date: 2008-04-19 02:33+0200\n"
"PO-Revision-Date: 2007-06-25 19:00+0200\n"
"Last-Translator: Karai Csaba <cs...@fr...>\n"
-"Language-Team: Hungarian <hu...@li...>\n"
+"Language-Team: Hungarian <kru...@go...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
Modified: trunk/krusader_kde4/po/it.po
===================================================================
--- trunk/krusader_kde4/po/it.po 2008-06-14 09:01:45 UTC (rev 6022)
+++ trunk/krusader_kde4/po/it.po 2008-06-14 09:22:53 UTC (rev 6023)
@@ -1,19 +1,20 @@
# Translation of krusader.pot to Italian
#
# Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
-# Copyright (C) 2004-2007, Krusader Krew
+# Copyright (C) 2004-2008, Krusader Krew
# This file is distributed under the same license as the Krusader package
#
# Luigi Curzi <lui...@ya...>, 2006.
# Giuseppe Bordoni <ge...@ge...>, 2003, 2004, 2005, 2006, 2007.
+#
msgid ""
msgstr ""
-"Project-Id-Version: krusader-1.80.0\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"Project-Id-Version: krusader-2.0.0-beta1\n"
+"Report-Msgid-Bugs-To: krusader-i18n <kru...@go...>\n"
"POT-Creation-Date: 2008-04-16 22:49+0200\n"
"PO-Revision-Date: 2007-04-05 14:23+0200\n"
"Last-Translator: Giuseppe Bordoni <ge...@ge...>\n"
-"Language-Team: krusader-i18n <kru...@go...>\n"
+"Language-Team: Italian <kru...@go...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
Modified: trunk/krusader_kde4/po/ja.po
===================================================================
--- trunk/krusader_kde4/po/ja.po 2008-06-14 09:01:45 UTC (rev 6022)
+++ trunk/krusader_kde4/po/ja.po 2008-06-14 09:22:53 UTC (rev 6023)
@@ -1,15 +1,16 @@
# Translation of krusader.pot to Japanese
#
# Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
-# Copyright (C) 2004-2007, Krusader Krew
+# Copyright (C) 2004-2008, Krusader Krew
# This file is distributed under the same license as the Krusader package
#
# UTUMI Hirosi <utu...@ya...>, 2003, 2004.
# Hideki Kimura <han...@gm...>, 2006.
+#
msgid ""
msgstr ""
-"Project-Id-Version: krusader-1.80.0-beta2\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"Project-Id-Version: krusader-2.0.0-beta1\n"
+"Report-Msgid-Bugs-To: krusader-i18n <kru...@go...>\n"
"POT-Creation-Date: 2008-04-16 22:49+0200\n"
"PO-Revision-Date: 2006-10-11 03:54+0900\n"
"Last-Translator: Hideki Kimura <han...@gm...>\n"
Modified: trunk/krusader_kde4/po/lt.po
===================================================================
--- trunk/krusader_kde4/po/lt.po 2008-06-14 09:01:45 UTC (rev 6022)
+++ trunk/krusader_kde4/po/lt.po 2008-06-14 09:22:53 UTC (rev 6023)
@@ -1,14 +1,15 @@
# Translation of krusader.pot to Lithuanian
#
# Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
-# Copyright (C) 2004-2007, Krusader Krew
+# Copyright (C) 2004-2008, Krusader Krew
# This file is distributed under the same license as the Krusader package
#
# Dovydas Sankauskas <la...@gm...>, 2005, 2006, 2007.
+#
msgid ""
msgstr ""
-"Project-Id-Version: krusader-1.80.0\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"Project-Id-Version: krusader-2.0.0-beta1\n"
+"Report-Msgid-Bugs-To: krusader-i18n <kru...@go...>\n"
"POT-Creation-Date: 2008-04-16 22:49+0200\n"
"PO-Revision-Date: 2007-04-20 23:10+0100\n"
"Last-Translator: Dovydas Sankauskas <la...@gm...>\n"
Modified: trunk/krusader_kde4/po/nl.po
===================================================================
--- trunk/krusader_kde4/po/nl.po 2008-06-14 09:01:45 UTC (rev 6022)
+++ trunk/krusader_kde4/po/nl.po 2008-06-14 09:22:53 UTC (rev 6023)
@@ -1,19 +1,20 @@
# Translation of krusader.pot to Dutch
#
# Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
-# Copyright (C) 2004-2007, Krusader Krew
+# Copyright (C) 2004-2008, Krusader Krew
# This file is distributed under the same license as the Krusader package.
#
# Frank Schoolmeesters [frank_schoolmeesters {*} yahoo {.} com] 2003-2007.
# Proofread and fixes by Monkey 9 <mo...@ia...>, 2005.
+#
msgid ""
msgstr ""
-"Project-Id-Version: krusader-1.80.0-beta2\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"Project-Id-Version: krusader-2.0.0-beta1\n"
+"Report-Msgid-Bugs-To: krusader-i18n <kru...@go...>\n"
"POT-Creation-Date: 2008-04-16 22:49+0200\n"
"PO-Revision-Date: 2007-04-10 23:11+0200\n"
"Last-Translator: Frank Schoolmeesters <fra...@ya...>\n"
-"Language-Team: Nederlands <kru...@go...>\n"
+"Language-Team: Dutch <kru...@go...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
Modified: trunk/krusader_kde4/po/pl.po
===================================================================
--- trunk/krusader_kde4/po/pl.po 2008-06-14 09:01:45 UTC (rev 6022)
+++ trunk/krusader_kde4/po/pl.po 2008-06-14 09:22:53 UTC (rev 6023)
@@ -1,7 +1,7 @@
# Translation of krusader.pot to Polish
#
# Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
-# Copyright (C) 2004-2007, Krusader Krew
+# Copyright (C) 2004-2008, Krusader Krew
# This file is distributed under the same license as the Krusader package
#
# Marcin Szafran <jm...@po...>, 2002, 2003.
@@ -9,14 +9,15 @@
# Marcin Garski <mg...@po...>, 2004, 2006.
# Pawel Salawa <bo...@my...>, 2005.
# Tomek Grzejszczyk <tg...@on...>, 2006, 2007.
+#
msgid ""
msgstr ""
-"Project-Id-Version: krusader-1.80.0\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"Project-Id-Version: krusader-2.0.0-beta1\n"
+"Report-Msgid-Bugs-To: krusader-i18n <kru...@go...>\n"
"POT-Creation-Date: 2008-04-16 22:49+0200\n"
"PO-Revision-Date: 2007-04-10 00:11+0200\n"
"Last-Translator: Tomek Grzejszczyk <tg...@on...>\n"
-"Language-Team: krusader-i18n <kru...@go...>\n"
+"Language-Team: Polish <kru...@go...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
Modified: trunk/krusader_kde4/po/pt.po
===================================================================
--- trunk/krusader_kde4/po/pt.po 2008-06-14 09:01:45 UTC (rev 6022)
+++ trunk/krusader_kde4/po/pt.po 2008-06-14 09:22:53 UTC (rev 6023)
@@ -1,20 +1,21 @@
# Translation of krusader.pot to Portuguese
#
# Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
-# Copyright (C) 2004-2007, Krusader Krew
+# Copyright (C) 2004-2008, Krusader Krew
# This file is distributed under the same license as the Krusader package
#
# Bruno Queiros <bru...@po...>, 2004, 2005.
# Bruno Miguel Queirós <bru...@po...>, 2006.
# Bruno Queiros <bru...@sa...>, 2007.
+#
msgid ""
msgstr ""
-"Project-Id-Version: krusader-1.80.0\n"
-"Report-Msgid-Bugs-To: kru...@go...\n"
+"Project-Id-Version: krusader-2.0.0-beta1\n"
+"Report-Msgid-Bugs-To: krusader-i18n <kru...@go...>\n"
"POT-Creation-Date: 2008-04-19 02:33+0200\n"
"PO-Revision-Date: 2007-06-10 00:15+0100\n"
"Last-Translator: Bruno Queiros <bru...@sa...>\n"
-"Language-Team: krusader-i18n <kru...@go...>\n"
+"Language-Team: Brazilian Portuguese <kru...@go...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
Modified: trunk/krusader_kde4/po/pt_BR.po
===================================================================
--- trunk/krusader_kde4/po/pt_BR.po 2008-06-14 09:01:45 UTC (rev 6022)
+++ trunk/krusader_kde4/po/pt_BR.po 2008-06-14 09:22:53 UTC (rev 6023)
@@ -1,18 +1,19 @@
# Translation of krusader.pot to Brazilian Portuguese
#
# Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
-# Copyright (C) 2004-2007, Krusader Krew
+# Copyright (C) 2004-2008, Krusader Krew
# This file is distributed under the same license as the Krusader package
#
# Doutor Zero <dou...@gm...>, 2005, 2006, 2007.
+#
msgid ""
msgstr ""
-"Project-Id-Version: krusader-1.80.0\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"Project-Id-Version: krusader-2.0.0-beta1\n"
+"Report-Msgid-Bugs-To: krusader-i18n <kru...@go...>\n"
"POT-Creation-Date: 2008-04-16 22:49+0200\n"
"PO-Revision-Date: 2007-04-01 19:45-0300\n"
"Last-Translator: Doutor.Zero <doutor.zero@gmail..com>\n"
-"Language-Team: krusader-i18n <kru...@go...>\n"
+"Language-Team: Brazilian Portuguese <kru...@go...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
Modified: trunk/krusader_kde4/po/ru.po
===================================================================
--- trunk/krusader_kde4/po/ru.po 2008-06-14 09:01:45 UTC (rev 6022)
+++ trunk/krusader_kde4/po/ru.po 2008-06-14 09:22:53 UTC (rev 6023)
@@ -1,21 +1,22 @@
# Translation of krusader.pot to Russian
#
# Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
-# Copyright (C) 2004-2007, Krusader Krew
+# Copyright (C) 2004-2008, Krusader Krew
# This file is distributed under the same license as the Krusader package
#
# Dmitry V. Chernyak <dv...@ma...>, 2003, 2005.
# Denis Koryavov <dko...@ra...>, 2005.
# Nick Shaforostoff <sh...@uk...>, 2005.
# Dmitry A. Bugay <sa...@vh...>, 2006, 2007.
+#
msgid ""
msgstr ""
-"Project-Id-Version: krusader-1.80.0-beta2\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"Project-Id-Version: krusader-2.0.0-beta1\n"
+"Report-Msgid-Bugs-To: krusader-i18n <kru...@go...>\n"
"POT-Creation-Date: 2008-04-16 22:49+0200\n"
"PO-Revision-Date: 2007-01-31 08:34+0600\n"
"Last-Translator: Dmitry A. Bugay <sa...@vh...>\n"
-"Language-Team: krusader-i18n <kru...@go...>\n"
+"Language-Team: Russian <kru...@go...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
Modified: trunk/krusader_kde4/po/sk.po
===================================================================
--- trunk/krusader_kde4/po/sk.po 2008-06-14 09:01:45 UTC (rev 6022)
+++ trunk/krusader_kde4/po/sk.po 2008-06-14 09:22:53 UTC (rev 6023)
@@ -1,18 +1,19 @@
# Translation of krusader.pot to Slovak
#
# Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
-# Copyright (C) 2004-2007, Krusader Krew
+# Copyright (C) 2004-2008, Krusader Krew
# This file is distributed under the same license as the Krusader package
#
# Zdenko Podobny <zd...@gm...>, 2004,2005,2006,2007
+#
msgid ""
msgstr ""
-"Project-Id-Version: krusader-1.80.0-beta2\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"Project-Id-Version: krusader-2.0.0-beta1\n"
+"Report-Msgid-Bugs-To: krusader-i18n <kru...@go...>\n"
"POT-Creation-Date: 2008-04-16 22:49+0200\n"
"PO-Revision-Date: 2007-02-22 14:59+0100\n"
"Last-Translator: Zdenko Podobny <zd...@gm...>\n"
-"Language-Team: krusaer-i18n <kru...@go...>\n"
+"Language-Team: Slovak <kru...@go...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
Modified: trunk/krusader_kde4/po/sl.po
===================================================================
--- trunk/krusader_kde4/po/sl.po 2008-06-14 09:01:45 UTC (rev 6022)
+++ trunk/krusader_kde4/po/sl.po 2008-06-14 09:22:53 UTC (rev 6023)
@@ -1,14 +1,15 @@
# Translation of krusader.pot to Slovenian
#
# Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
-# Copyright (C) 2004-2007, Krusader Krew
+# Copyright (C) 2004-2008, Krusader Krew
# This file is distributed under the same license as the Krusader package
#
# Matej Urbancic <mat...@gm...>, 2005, 2006, 2007.
+#
msgid ""
msgstr ""
-"Project-Id-Version: krusader-1.80.0\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"Project-Id-Version: krusader-2.0.0-beta1\n"
+"Report-Msgid-Bugs-To: krusader-i18n <kru...@go...>\n"
"POT-Creation-Date: 2008-04-16 22:49+0200\n"
"PO-Revision-Date: 2007-04-04 15:43+0100\n"
"Last-Translator: Matej Urbancic <mat...@gm...>\n"
Modified: trunk/krusader_kde4/po/sr.po
===================================================================
--- trunk/krusader_kde4/po/sr.po 2008-06-14 09:01:45 UTC (rev 6022)
+++ trunk/krusader_kde4/po/sr.po 2008-06-14 09:22:53 UTC (rev 6023)
@@ -1,20 +1,21 @@
# Translation of krusader.pot to Serbian
#
# Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
-# Copyright (C) 2004-2007, Krusader Krew
+# Copyright (C) 2004-2008, Krusader Krew
# This file is distributed under the same license as the Krusader package
#
# Proofread by: Chusslove Illich <cas...@gm...>, 2005.
# Sasa Tomic <to...@gm...>, 2006, 2007.
# Sasa Tomic <sas...@gm...>, 2007.
+#
msgid ""
msgstr ""
-"Project-Id-Version: krusader-1.80.0\n"
-"Report-Msgid-Bugs-To: kru...@go...\n"
+"Project-Id-Version: krusader-2.0.0-beta1\n"
+"Report-Msgid-Bugs-To: krusader-i18n <kru...@go...>\n"
"POT-Creation-Date: 2008-04-19 02:33+0200\n"
"PO-Revision-Date: 2007-06-30 23:59+0200\n"
"Last-Translator: Sasa Tomic <to...@gm...>\n"
-"Language-Team: krusader-i18n <kru...@go...>\n"
+"Language-Team: Serbian <kru...@go...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
Modified: trunk/krusader_kde4/po/sr@Latn.po
===================================================================
--- trunk/krusader_kde4/po/sr@Latn.po 2008-06-14 09:01:45 UTC (rev 6022)
+++ trunk/krusader_kde4/po/sr@Latn.po 2008-06-14 09:22:53 UTC (rev 6023)
@@ -1,20 +1,21 @@
# Translation of krusader.pot to Serbian
#
# Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
-# Copyright (C) 2004-2007, Krusader Krew
+# Copyright (C) 2004-2008, Krusader Krew
# This file is distributed under the same license as the Krusader package
#
# Proofread by: Chusslove Illich <cas...@gm...>, 2005.
# Sasa Tomic <to...@gm...>, 2006, 2007.
# Sasa Tomic <sas...@gm...>, 2007.
+#
msgid ""
msgstr ""
-"Project-Id-Version: krusader-1.80.0\n"
-"Report-Msgid-Bugs-To: kru...@go...\n"
+"Project-Id-Version: krusader-2.0.0-beta1\n"
+"Report-Msgid-Bugs-To: krusader-i18n <kru...@go...>\n"
"POT-Creation-Date: 2008-04-19 02:33+0200\n"
"PO-Revision-Date: 2007-06-30 23:59+0200\n"
"Last-Translator: Sasa Tomic <to...@gm...>\n"
-"Language-Team: krusader-i18n <kru...@go...>\n"
+"Language-Team: Serbian <kru...@go...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
Modified: trunk/krusader_kde4/po/sv.po
===================================================================
--- trunk/krusader_kde4/po/sv.po 2008-06-14 09:01:45 UTC (rev 6022)
+++ trunk/krusader_kde4/po/sv.po 2008-06-14 09:22:53 UTC (rev 6023)
@@ -1,20 +1,21 @@
# Translation of krusader.pot to Swedish
#
# Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
-# Copyright (C) 2004-2007, Krusader Krew
+# Copyright (C) 2004-2008, Krusader Krew
# This file is distributed under the same license as the Krusader package
#
# Erik Johansson <er...@te...>, 2001.
# Anders Lindén <con...@gm...>, 2004.
# Peter Landgren <pet...@te...>, 2005, 2006, 2007.
+#
msgid ""
msgstr ""
-"Project-Id-Version: krusader-1.80.0\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"Project-Id-Version: krusader-2.0.0-beta1\n"
+"Report-Msgid-Bugs-To: krusader-i18n <kru...@go...>\n"
"POT-Creation-Date: 2008-04-16 22:49+0200\n"
"PO-Revision-Date: 2007-04-03 09:33+0200\n"
"Last-Translator: Peter Landgren <pet...@te...>\n"
-"Language-Team: krusader-i18n <kru...@go...>\n"
+"Language-Team: Swedish <kru...@go...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
Modified: trunk/krusader_kde4/po/tr.po
===================================================================
--- trunk/krusader_kde4/po/tr.po 2008-06-14 09:01:45 UTC (rev 6022)
+++ trunk/krusader_kde4/po/tr.po 2008-06-14 09:22:53 UTC (rev 6023)
@@ -1,19 +1,20 @@
# Translation of krusader.po to Turkish
#
# Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
-# Copyright (C) 2004-2007, Krusader Krew
+# Copyright (C) 2004-2008, Krusader Krew
# This file is distributed under the same license as the Krusader package
#
# Bekir SONAT <bek...@kd...>, 2006.
# Mertcan Mi'ma Bekir <bek...@kd...>, 2007.
+#
msgid ""
msgstr ""
-"Project-Id-Version: krusader-1.80.0\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"Project-Id-Version: krusader-2.0.0-beta1\n"
+"Report-Msgid-Bugs-To: krusader-i18n <kru...@go...>\n"
"POT-Creation-Date: 2008-04-16 22:49+0200\n"
"PO-Revision-Date: 2007-05-07 14:53+0300\n"
"Last-Translator: Mertcan Mi'ma Bekir <bek...@kd...>\n"
-"Language-Team: krusader-i18n <kru...@go...>\n"
+"Language-Team: Turkish <kru...@go...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
Modified: trunk/krusader_kde4/po/uk.po
===================================================================
--- trunk/krusader_kde4/po/uk.po 2008-06-14 09:01:45 UTC (rev 6022)
+++ trunk/krusader_kde4/po/uk.po 2008-06-14 09:22:53 UTC (rev 6023)
@@ -6,14 +6,15 @@
#
# Ivan Petrouchtchak <ii...@te...>, 2004, 2005.
# Yuri Chornoivan <yu...@uk...>, 2007, 2008.
+#
msgid ""
msgstr ""
-"Project-Id-Version: krusader-1.90.0\n"
-"Report-Msgid-Bugs-To: kru...@go...\n"
+"Project-Id-Version: krusader-2.0.0-beta1\n"
+"Report-Msgid-Bugs-To: krusader-i18n <kru...@go...>\n"
"POT-Creation-Date: 2008-05-03 14:14+0200\n"
"PO-Revision-Date: 2008-01-05 21:02+0200\n"
"Last-Translator: Yuri Chornoivan <yu...@uk...>\n"
-"Language-Team: krusader-i18n <kru...@go...>\n"
+"Language-Team: Ukrainian <kru...@go...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
Modified: trunk/krusader_kde4/po/zh_CN.po
===================================================================
--- trunk/krusader_kde4/po/zh_CN.po 2008-06-14 09:01:45 UTC (rev 6022)
+++ trunk/krusader_kde4/po/zh_CN.po 2008-06-14 09:22:53 UTC (rev 6023)
@@ -1,18 +1,19 @@
# Translation of krusader.pot to Chinese Simplified
#
# Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
-# Copyright (C) 2004-2007, Krusader Krew
+# Copyright (C) 2004-2008, Krusader Krew
# This file is distributed under the same license as the Krusader package
+#
# Jinghua Luo <luo...@ms...>, 2004, 2005.
#
msgid ""
msgstr ""
-"Project-Id-Version: krusader-1.80.0-beta2\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"Project-Id-Version: krusader-2.0.0-beta1\n"
+"Report-Msgid-Bugs-To: krusader-i18n <kru...@go...>\n"
"POT-Creation-Date: 2008-04-16 22:49+0200\n"
"PO-Revision-Date: 2005-08-19 08:18+0800\n"
"Last-Translator: Jinghua Luo <luo...@ms...>\n"
-"Language-Team: Chinese Simplified\n"
+"Language-Team: Chinese Simplified <kru...@go...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <des...@us...> - 2008-06-14 09:01:37
|
Revision: 6022
http://krusader.svn.sourceforge.net/krusader/?rev=6022&view=rev
Author: deschler
Date: 2008-06-14 02:01:45 -0700 (Sat, 14 Jun 2008)
Log Message:
-----------
Use default package name
Modified Paths:
--------------
trunk/krusader_kde4/createdist.sh
Modified: trunk/krusader_kde4/createdist.sh
===================================================================
--- trunk/krusader_kde4/createdist.sh 2008-06-06 20:13:31 UTC (rev 6021)
+++ trunk/krusader_kde4/createdist.sh 2008-06-14 09:01:45 UTC (rev 6022)
@@ -1,7 +1,7 @@
#!/bin/bash
VERSION=`cat CMakeLists.txt | grep add_definitions | grep 'DVERSION' | awk -F '"' '{print $2; }'`
-DIST_NAME="krusader-kde4-${VERSION}"
+DIST_NAME="krusader-${VERSION}"
OUTPUT_FILE_NAME="${DIST_NAME}.tar.gz"
rm -rf __KrDist__
@@ -21,7 +21,7 @@
fi
if [ -z "$FILES" ]; then
- echo "Something whent wrong! Can't find version controlled source files"
+ echo "Something went wrong! Can't find version controlled source files"
exit 1
fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Cod...@us...> - 2008-06-06 20:13:27
|
Revision: 6021
http://krusader.svn.sourceforge.net/krusader/?rev=6021&view=rev
Author: Codeknight
Date: 2008-06-06 13:13:31 -0700 (Fri, 06 Jun 2008)
Log Message:
-----------
fixing dead urls
cvs is dead, svn is alive
work in progres
Modified Paths:
--------------
trunk/krusader_kde4/doc/en/editors-note.docbook
trunk/krusader_kde4/doc/en/features.docbook
trunk/krusader_kde4/doc/en/index.docbook
trunk/krusader_kde4/doc/en/installation.docbook
Modified: trunk/krusader_kde4/doc/en/editors-note.docbook
===================================================================
--- trunk/krusader_kde4/doc/en/editors-note.docbook 2008-05-31 20:28:12 UTC (rev 6020)
+++ trunk/krusader_kde4/doc/en/editors-note.docbook 2008-06-06 20:13:31 UTC (rev 6021)
@@ -66,7 +66,7 @@
or the &onlinehandbook-url;.
</para>
-&dev-cvs-note;
+&dev-svn-note;
<para>All mentioned Trademarks and Copyrights in this handbook belong to their respective owners.</para>
Modified: trunk/krusader_kde4/doc/en/features.docbook
===================================================================
--- trunk/krusader_kde4/doc/en/features.docbook 2008-05-31 20:28:12 UTC (rev 6020)
+++ trunk/krusader_kde4/doc/en/features.docbook 2008-06-06 20:13:31 UTC (rev 6021)
@@ -382,7 +382,7 @@
<listitem>
<para>For more features, please read the
&changelog-url; and
- &cvsnews-url;.</para>
+ &svnnews-url;.</para>
</listitem>
</itemizedlist>
-</para>&dev-cvs-note;</chapter>
+</para>&dev-svn-note;</chapter>
Modified: trunk/krusader_kde4/doc/en/index.docbook
===================================================================
--- trunk/krusader_kde4/doc/en/index.docbook 2008-05-31 20:28:12 UTC (rev 6020)
+++ trunk/krusader_kde4/doc/en/index.docbook 2008-06-06 20:13:31 UTC (rev 6021)
@@ -81,8 +81,8 @@
<!ENTITY sfmirrors-url '<ulink url="http://sourceforge.net/project/showfiles.php?group_id=6488">Sourceforge mirrors</ulink>'>
<!ENTITY changelog-url
'<ulink url="http://www.krusader.org/text.php?t=cvs.changelog"><filename>ChangeLog</filename></ulink>'>
-<!ENTITY cvsnews-url
-'<ulink url="http://www.krusader.org/text.php?t=cvs.news"><filename>CVSNEWS</filename></ulink>'>
+<!ENTITY svnnews-url
+'<ulink url="http://krusader.svn.sourceforge.net/viewvc/krusader/trunk/krusader_kde4/SVNNEWS?view=markup"><filename>SVNNEWS</filename></ulink>'>
<!ENTITY docchangelog-url '<ulink url="http://cvs.sourceforge.net/viewcvs.py/krusader/krusader_kde3/doc/ChangeLog?view=markup">Documentation ChangeLog</ulink>'>
<!ENTITY i18n-page-url '<ulink url="http://www.krusader.org/i18n.php">i18n page</ulink>'>
@@ -111,7 +111,7 @@
<!ENTITY subversion-url '<ulink url="http://sourceforge.net/svn/?group_id=6488">Subversion</ulink>'>
-<!ENTITY browse-svn-repo-url '<ulink url="http://svn.sourceforge.net/krusader">Browse the Subversion Repository</ulink>'>
+<!ENTITY browse-svn-repo-url '<ulink url="http://krusader.svn.sourceforge.net/viewvc/krusader/">Browse the Subversion Repository</ulink>'>
<!ENTITY fhs-url '<ulink url="http://www.pathname.com/fhs/">Filesystem Hierarchy Standard (FHS)</ulink>'>
@@ -120,22 +120,22 @@
<!ENTITY gentoo-life-ebuild-url '<ulink url="http://www.krusader.org/data/krusader-cvs-1.ebuild">&gentoo; Live Ebuild</ulink>'>
<!ENTITY fedora-download-url '<ulink url="https://admin.fedoraproject.org/pkgdb/packages/name/krusader">&fedora;</ulink>'>
-<!ENTITY gentoo-download-url '<ulink url="http://packages.gentoo.org/search/?sstring=krusader">&gentoo;</ulink>'>
+<!ENTITY gentoo-download-url '<ulink url="http://packages.gentoo.org/package/kde-misc/krusader">&gentoo;</ulink>'>
<!ENTITY suse-download-url '<ulink url="http://search.novell.com/qfsearch/SearchServlet?bbshow=true&query0=krusader&operator0=0&collection=Novell&date=&numhits=10&template=ResultListTemplate.html&submit+search=Search">&SuSE;</ulink>'>
<!ENTITY mandriva-download-url '<ulink url="http://www.mandrivaclub.com/xwiki/bin/view/rpms/Application/krusader">&mandriva;</ulink>'>
<!ENTITY freebsd-download-url '<ulink url="http://www.freebsd.org/cgi/ports.cgi?query=krusader&stype=all">&freebsd;</ulink>'>
<!ENTITY debian-download-url '<ulink url="http://packages.debian.org/krusader">&debian;</ulink>'>
<!ENTITY netbsd-download-url '<ulink url="http://pkgsrc.se/sysutils/krusader">&netbsd;</ulink>'>
-<!ENTITY yoper-download-url '<ulink url="http://ftp.belnet.be/linux/yoper/devel/yoper-3.0/RPMS.chris/">&yoper;</ulink>'>
+<!ENTITY yoper-download-url '<ulink url="http://www5.frugalware.org/mirror/yoper.com/yoper-3.0/SRPMS.rocketfuel/">&yoper;</ulink>'>
<!ENTITY macosx-port-url '<ulink url="http://pdb.finkproject.org/pdb/package.php/krusader">&MacOS;-X port</ulink>'>
<!ENTITY ubuntu-kubuntu-download-url '<ulink url="http://packages.ubuntu.com/krusader">&ubuntu;/&kubuntu;</ulink>'>
<!ENTITY linspire-freespire-download-url '<ulink url="http://www.cnr.com/product/productOverview.seam?conversationId=94000">&linspire;/&freespire;</ulink>'>
-<!ENTITY archlinux-download-url '<ulink url="http://www.archlinux.org/packages.php?id=793">&archlinux;</ulink>'>
+<!ENTITY archlinux-download-url '<ulink url="http://www.archlinux.org/packages/3490/">&archlinux;</ulink>'>
<!ENTITY frugalware-linux-download-url '<ulink url="http://frugalware.org/packages.php?id=280">&frugalware-linux;</ulink>'>
-<!ENTITY pclinuxos-download-url '<ulink url="http://www.pclinuxonline.com/pclos/html/package_list.html">&pclinuxos;</ulink>'>
-<!ENTITY altlinux-download-url '<ulink url="http://www.altlinux.com/index.php?module=sisyphus&package=krusader">&altlinux;</ulink>'>
+<!ENTITY pclinuxos-download-url '<ulink url="http://ftp.heanet.ie/pub/pclinuxos/apt/pclinuxos/2007/RPMS.kde/">&pclinuxos;</ulink>'>
+<!ENTITY altlinux-download-url '<ulink url="www.altlinux.com/">&altlinux;</ulink>'>
<!ENTITY ccuxlinux-download-url '<ulink url="http://packages.ccux-linux.de/index.php?pdetail=154">&ccuxlinux;</ulink>'>
-<!ENTITY lunarlinux-download-url '<ulink url="http://modules.lunar-linux.org/index.php?option=module&module=krusader">&lunarlinux;</ulink>'>
+<!ENTITY lunarlinux-download-url '<ulink url="http://www.lunar-linux.org/">&lunarlinux;</ulink>'>
<!ENTITY qilinux-download-url '<ulink url="http://www.qilinux.org/modules.php?op=modload&name=distromatic&file=index&tag=devel&pkg=krusader.source">&qilinux;</ulink>'>
<!ENTITY rocklinux-download-url '<ulink url="http://www.rocklinux.net/packages/krusader.html">&rocklinux;</ulink>'>
@@ -152,7 +152,7 @@
<!ENTITY dag-wiers-download-url '<ulink url="http://dag.wieers.com/packages/krusader/">dag.wieers.com</ulink>'>
<!ENTITY dries-verachtert-download-url '<ulink url="http://dries.ulyssis.org/rpm/packages/krusader/info.html">Dries Verachtert RPM Repository</ulink>'>
<!ENTITY portpkg-url '<ulink url="http://portpkg.berlios.de/">Portpkg</ulink>'>
-<!ENTITY kru-slackbuild-url '<ulink url="http://cvs.berlios.de/cgi-bin/viewcvs.cgi/portpkg/ports/open/krusader/Attic/">&krusader; SlackBuild</ulink>'>
+<!ENTITY kru-slackbuild-url '<ulink url="http://cvs.berlios.de/cgi-bin/viewcvs.cgi/portpkg/ports/kde/krusader/">&krusader; SlackBuild</ulink>'>
<!ENTITY freshmeat-url '<ulink url="http://freshmeat.net/projects/krusader/">freshmeat.net</ulink>'>
<!ENTITY rpmfind-url '<ulink url="http://rpmfind.net/linux/rpm2html/search.php?query=krusader&submit=Search+...">rpmfind</ulink>'>
@@ -270,13 +270,13 @@
<!ENTITY gpl-lnk '<link linkend="credits">&GNU; General Public License (GPL)</link>'>
-<!ENTITY dev-cvs-note '<note><para>
+<!ENTITY dev-svn-note '<note><para>
If you are using a <link linkend="krusader_devel">development</link> or
- <link linkend="krusader_cvs">CVS</link> version, it is possible that the latest
+ <link linkend="krusader_svn">SVN</link> version, it is possible that the latest
new features are not yet in the "The Krusader Handbook".
Please read the &changelog-url; file online or in the &krusader;
sources to find out more about the new features.
- For a brief description, please read the &cvsnews-url; file online
+ For a brief description, please read the &svnnews-url; file online
or in the &krusader; sources.
<link linkend="faqg_wish">User feedback</link> and
<link linkend="faqg_bug_report">Bug reports</link> are always welcome!
Modified: trunk/krusader_kde4/doc/en/installation.docbook
===================================================================
--- trunk/krusader_kde4/doc/en/installation.docbook 2008-05-31 20:28:12 UTC (rev 6020)
+++ trunk/krusader_kde4/doc/en/installation.docbook 2008-06-06 20:13:31 UTC (rev 6021)
@@ -27,7 +27,7 @@
<title>Requirements</title>
<para>In order to successfully use the most recent
&krusader;, you need &kde;libs
- >= 3.5</para>
+ >= 4.0</para>
<para>Required &kde; version:
<itemizedlist>
<listitem>
@@ -65,7 +65,7 @@
&kde; 3.5</para>
</listitem>
<listitem>
- <para>&krusader; v2.x.x: &kde; 4 - &Qt; </para>
+ <para>&krusader; v2.x.x: &kde; 4</para>
</listitem>
</itemizedlist>
NOTE: for installation instructions for &krusader;-1.x for &kde; 2 click
@@ -272,7 +272,7 @@
<warning>
<para>These releases are beta releases and will probably
contain some bugs.</para>
- </warning>&dev-cvs-note;
+ </warning>&dev-svn-note;
<para>The beta release has 3 goals:
<itemizedlist>
<listitem>
@@ -290,6 +290,8 @@
&i18n-page-url;.</para>
</listitem>
</itemizedlist></para></sect2>
+
+<!-- OUTDATED CVS is DEACTIVATED
<sect2 id="krusader_cvs">
<title>CVS Builds</title>
<para>
@@ -374,19 +376,49 @@
<para>We also provide &viewcvs-url; to browse the
CVS repository.</para>
</sect2>
+
+-->
+
+
<sect2 id="krusader_svn">
<title>Subversion</title>
- <para>&subversion-url; is used for
- the &krusader; 2.x series for &kde;4.
- it is also possible to
- &browse-svn-repo-url;.</para>
+
+ <para>&subversion-url; is used for our sourcecode repository.
+ It is also possible to &browse-svn-repo-url;.</para>
+
+ <para>Currently, there are four module options:
+ <itemizedlist>
+ <listitem>
+ <para>krusader_kde2: the &kde;2 branch, stable
+ but it is basically v1.01 and there are no planned
+ changes</para>
+ </listitem>
+ <listitem>
+ <para>krusader_kde3: the &kde;3 branch, stable
+ but it is basically v1.90.0 and there are no planned
+ changes</para>
+ </listitem>
+ <listitem>
+ <para>krusader_kde4: the &kde;4 branch that we
+ currently use</para>
+ </listitem>
+ <listitem>
+ <para>trunc: the &kde;4 the development version</para>
+ </listitem>
+ </itemizedlist></para>
+
+
<para>To check out the latest &krusader; 1.x for
- &kde; 3 from SVN: (NOTE: at moment of writing use CVS for krusader_kde3, since krusader_kde3
- is developed in CVS and NOT in SVN, currently you will get an old version in SVN)
- <screen><prompt>$</prompt> <userinput><command>svn</command> <option>co https://krusader.svn.sourceforge.net/svnroot/krusader/trunk/krusader_kde3</option></userinput></screen>
- To check out the latest &krusader; 2.x
+ &kde; 3 from SVN:
+ <screen><prompt>$</prompt> <userinput><command>svn</command> <option>co https://krusader.svn.sourceforge.net/svnroot/krusader/branches/krusader_kde3/</option></userinput></screen>
+
+ To check out the latest &krusader; 2.x for
+ &kde; 4 from SVN:
+ <screen><prompt>$</prompt> <userinput><command>svn</command> <option>co https://krusader.svn.sourceforge.net/svnroot/krusader/branches/krusader_kde4/</option></userinput></screen>
+
+ To check out the latest developement &krusader; 2.x
for &kde; 4 from SVN:
- <screen><prompt>$</prompt> <userinput><command>svn</command> <option>co https://krusader.svn.sourceforge.net/svnroot/krusader/trunk/krusader_kde4</option></userinput></screen>
+ <screen><prompt>$</prompt> <userinput><command>svn</command> <option>co http://krusader.svn.sourceforge.net/svnroot/krusader/trunk/krusader_kde4</option></userinput></screen>
</para>
</sect2>
<sect2 id="krusader_old">
@@ -705,7 +737,7 @@
</note>
<tip>
<para>If you encounter problems with this command click
- <link linkend="krusader_cvs">here</link>.
+ <link linkend="krusader_svn">here</link>.
&krusader; provides two nightly builds
(snapshots) one with a
<filename>./configure</filename> script and one
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cod...@us...> - 2008-05-31 20:28:06
|
Revision: 6020
http://krusader.svn.sourceforge.net/krusader/?rev=6020&view=rev
Author: codeknight
Date: 2008-05-31 13:28:12 -0700 (Sat, 31 May 2008)
Log Message:
-----------
rewriting installation chapter for kde4, work in progres
Modified Paths:
--------------
trunk/krusader_kde4/doc/en/index.docbook
trunk/krusader_kde4/doc/en/installation.docbook
Modified: trunk/krusader_kde4/doc/en/index.docbook
===================================================================
--- trunk/krusader_kde4/doc/en/index.docbook 2008-05-31 20:23:24 UTC (rev 6019)
+++ trunk/krusader_kde4/doc/en/index.docbook 2008-05-31 20:28:12 UTC (rev 6020)
@@ -119,16 +119,17 @@
<!ENTITY krudownload-url '<ulink url="http://www.krusader.org/down.php">&krusader; downloadpage</ulink>'>
<!ENTITY gentoo-life-ebuild-url '<ulink url="http://www.krusader.org/data/krusader-cvs-1.ebuild">&gentoo; Live Ebuild</ulink>'>
+<!ENTITY fedora-download-url '<ulink url="https://admin.fedoraproject.org/pkgdb/packages/name/krusader">&fedora;</ulink>'>
<!ENTITY gentoo-download-url '<ulink url="http://packages.gentoo.org/search/?sstring=krusader">&gentoo;</ulink>'>
<!ENTITY suse-download-url '<ulink url="http://search.novell.com/qfsearch/SearchServlet?bbshow=true&query0=krusader&operator0=0&collection=Novell&date=&numhits=10&template=ResultListTemplate.html&submit+search=Search">&SuSE;</ulink>'>
-<!ENTITY mandriva-download-url '<ulink url="http://search.belnet.be/packages/mandrake/current/i586/media/contrib/">&mandriva;</ulink>'>
+<!ENTITY mandriva-download-url '<ulink url="http://www.mandrivaclub.com/xwiki/bin/view/rpms/Application/krusader">&mandriva;</ulink>'>
<!ENTITY freebsd-download-url '<ulink url="http://www.freebsd.org/cgi/ports.cgi?query=krusader&stype=all">&freebsd;</ulink>'>
<!ENTITY debian-download-url '<ulink url="http://packages.debian.org/krusader">&debian;</ulink>'>
<!ENTITY netbsd-download-url '<ulink url="http://pkgsrc.se/sysutils/krusader">&netbsd;</ulink>'>
<!ENTITY yoper-download-url '<ulink url="http://ftp.belnet.be/linux/yoper/devel/yoper-3.0/RPMS.chris/">&yoper;</ulink>'>
<!ENTITY macosx-port-url '<ulink url="http://pdb.finkproject.org/pdb/package.php/krusader">&MacOS;-X port</ulink>'>
<!ENTITY ubuntu-kubuntu-download-url '<ulink url="http://packages.ubuntu.com/krusader">&ubuntu;/&kubuntu;</ulink>'>
-<!ENTITY linspire-download-url '<ulink url="http://www.linspire.com/lindows_products_details.php?product_id=3160&pg=specs">&linspire;</ulink>'>
+<!ENTITY linspire-freespire-download-url '<ulink url="http://www.cnr.com/product/productOverview.seam?conversationId=94000">&linspire;/&freespire;</ulink>'>
<!ENTITY archlinux-download-url '<ulink url="http://www.archlinux.org/packages.php?id=793">&archlinux;</ulink>'>
<!ENTITY frugalware-linux-download-url '<ulink url="http://frugalware.org/packages.php?id=280">&frugalware-linux;</ulink>'>
<!ENTITY pclinuxos-download-url '<ulink url="http://www.pclinuxonline.com/pclos/html/package_list.html">&pclinuxos;</ulink>'>
@@ -146,10 +147,8 @@
<!ENTITY klik-stable-krusader-url '<ulink url="http://klik.atekon.de/details.php?section=utils&package=krusader-latest">stable &krusader;</ulink>'>
<!ENTITY klik-cvs-krusader-url '<ulink url="http://klik.atekon.de/details.php?section=utils&package=krusader-cvs">cvs snapshot of &krusader;</ulink>'>
+<!ENTITY distrowatch-com-url '<ulink url="http://distrowatch.com/search.php?pkg=krusader&pkgver=1.90.0">Distrowatch.com</ulink>'>
-<!ENTITY fedora-extras-url '<ulink url="http://fedoraproject.org/wiki/Extras/UsingExtras ">&fedora; Extras</ulink>'>
-<!ENTITY distrowatch-com-url '<ulink url="http://distrowatch.com/search.php?pkg=krusader&pkgver=1.70.0">Distrowatch.com</ulink>'>
-
<!ENTITY dag-wiers-download-url '<ulink url="http://dag.wieers.com/packages/krusader/">dag.wieers.com</ulink>'>
<!ENTITY dries-verachtert-download-url '<ulink url="http://dries.ulyssis.org/rpm/packages/krusader/info.html">Dries Verachtert RPM Repository</ulink>'>
<!ENTITY portpkg-url '<ulink url="http://portpkg.berlios.de/">Portpkg</ulink>'>
@@ -314,6 +313,7 @@
<!ENTITY ubuntu '<trademark class="registered">Ubuntu</trademark>'>
<!ENTITY kubuntu '<trademark class="registered">Kubuntu</trademark>'>
<!ENTITY linspire '<trademark class="registered">Linspire</trademark>'>
+<!ENTITY freespire '<trademark class="registered">Freespire</trademark>'>
<!ENTITY xandros '<trademark class="registered">Xandros</trademark>'>
<!ENTITY slackware '<trademark class="registered">Slackware</trademark>'>
<!ENTITY arklinux '<trademark class="registered">Ark Linux</trademark>'>
Modified: trunk/krusader_kde4/doc/en/installation.docbook
===================================================================
--- trunk/krusader_kde4/doc/en/installation.docbook 2008-05-31 20:23:24 UTC (rev 6019)
+++ trunk/krusader_kde4/doc/en/installation.docbook 2008-05-31 20:28:12 UTC (rev 6020)
@@ -19,7 +19,7 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, *
* MA 02111-1307, USA. *
*********************************************************************** -->
- <title>Installation on KDE3.x</title>
+ <title>Installation of Krusader on KDE4.x</title>
<indexterm>
<primary>Installation</primary>
</indexterm>
@@ -27,7 +27,7 @@
<title>Requirements</title>
<para>In order to successfully use the most recent
&krusader;, you need &kde;libs
- >= 3.4</para>
+ >= 3.5</para>
<para>Required &kde; version:
<itemizedlist>
<listitem>
@@ -61,13 +61,15 @@
&kde; 3.5</para>
</listitem>
<listitem>
- <para>&krusader; v2.xx.x: &kde; 4 -
- &Qt; 4 The big challenge, a first release in
- 2008</para>
+ <para>&krusader; 1.90.0: &kde; 3.2 -
+ &kde; 3.5</para>
</listitem>
+ <listitem>
+ <para>&krusader; v2.x.x: &kde; 4 - &Qt; </para>
+ </listitem>
</itemizedlist>
- NOTE: there are no installation instructions for &kde;4 yet available since at moment of writing &krusader;
- was not ported yet to &kde;4.</para>
+ NOTE: for installation instructions for &krusader;-1.x for &kde; 2 click
+ <link linkend="kde3_install">here</link>.</para>
<para>Platforms:
<itemizedlist>
<listitem>
@@ -80,12 +82,11 @@
(&freebsd;/&netbsd;/&openbsd;/&MacOS;)</para>
</listitem>
</itemizedlist></para>
- <para>&krusader; uses about 3-4 Mbyte of memory to
- run and about 15 Mbyte of shared memory, which is also used by
- other processes, but this may vary depending on your platform
- and configuration. In order to handle archives the archivers
- must be configured
- <link linkend="konfig-dependencies">here</link>.</para>
+ <para>In order to handle archives, checksums and other utilities they must be configured in our
+ <link linkend="konfig-dependencies">configuration tool</link>.
+ When running &krusader; for the first time the available utilities will be autodetected, and
+ a report will be shown in the first lanch wizard. Afterwards additional utilities can be
+ <link linkend="konfig-dependencies">added/removed/changed</link>.</para>
<para>A package of popular (un)packers, &krusader;
itself and add-ons can be found on the
&krudownload-url;.</para>
@@ -98,7 +99,7 @@
found on the &kruwebsite-url; .</para>
<sect2 id="krusader-download">
<title>&krusader; Downloads</title>
- <para>it is recommended to use the &krusader; package
+ <para>It is recommended to use the &krusader; package
that is provided by your distribution.
&distrowatch-com-url; is a great resource to check
the availability. If your distribution does not offer
@@ -114,14 +115,10 @@
<para>Distributions who provide &krusader;:
<itemizedlist>
<listitem>
- <para>&suse-download-url; >=
- 9.3, Note: please use &krusader;-1.60.0
- instead of &krusader;-1.51 (might be unstable
- on &SuSE;9.3-&kde;3.4).</para>
+ <para>&suse-download-url;</para>
</listitem>
<listitem>
- <para>&fedora; via
- &fedora-extras-url;
+ <para>&fedora-download-url; via
<command># yum install krusader</command> will do the job,
thanks to Marcin Garski. &RedHat; RPM packages
can usually found on the &krudownload-url; or
@@ -136,7 +133,7 @@
&debian;", and some of these provide their own
(incompatible) packages.
&ubuntu-kubuntu-download-url;,
- &linspire-download-url;, &knoppix;
+ &linspire-freespire-download-url;, &knoppix;
4.x DVD, &kanotix;, etc.</para>
</listitem>
<listitem>
@@ -510,9 +507,11 @@
</sect3>
</sect2>
+
+<!-- install_tutorial -->
- <sect2 id="install_tutorial">
- <title>Detailed Installation Tutorial</title>
+ <sect2 id="kde3_install">
+ <title>Detailed Installation Tutorial for Krusader on KDE3.</title>
<para>The next section will explain how to install
&krusader; step by step. Questions about the
installation process have been asked many times and
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cod...@us...> - 2008-05-31 20:23:17
|
Revision: 6019
http://krusader.svn.sourceforge.net/krusader/?rev=6019&view=rev
Author: codeknight
Date: 2008-05-31 13:23:24 -0700 (Sat, 31 May 2008)
Log Message:
-----------
Krusader spec file for building rpm packages
ftp://ftp.nluug.nl/pub/os/Linux/distr/Mandrakelinux/devel/cooker/SRPMS/contrib/release/krusader-2.0-0.svn6014.1mdv2009.0.src.rpm
http://sophie.zarb.org/viewrpm/3b83b9314a85c96045a94c982e583109
Spec file for Mandriva Linux, krusader-2.0-0.svn6014
Modified Paths:
--------------
trunk/krusader_kde4/krusader.spec
Modified: trunk/krusader_kde4/krusader.spec
===================================================================
--- trunk/krusader_kde4/krusader.spec 2008-05-31 14:49:14 UTC (rev 6018)
+++ trunk/krusader_kde4/krusader.spec 2008-05-31 20:23:24 UTC (rev 6019)
@@ -1,186 +1,218 @@
-# Spec file for Krusader-1.80.0 on Fedora 7 by Marcin Garski <mgarski[AT]post.pl>
-# http://cvs.fedoraproject.org/viewcvs/rpms/krusader/devel/?root=extras
-# http://download.fedoraproject.org/pub/fedora/linux/extras/development/SRPMS/repoview/krusader.html
-# http://download.fedoraproject.org/pub/fedora/linux/extras/development/i386/repoview/krusader.html
-Name: krusader
-Version: 1.80.0
-Release: 1%{?dist}
-Summary: An advanced twin-panel (commander-style) file-manager for KDE
+%define name krusader
+%define version 2.0
+%define snapshot 6014
+%define rel 1
-Group: Applications/File
-License: GPL
-URL: http://krusader.sourceforge.net/
-Source0: http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if %snapshot
+%define release %mkrel 0.svn%snapshot.%rel
+%else
+%define release %mkrel %rel
+%endif
-BuildRequires: kdelibs-devel kdebase-devel kdebindings-devel
-BuildRequires: libpng-devel gamin-devel libacl-devel
-BuildRequires: desktop-file-utils automake gettext
+Summary: Advanced KDE twin-panel file-manager
+Name: %{name}
+Version: %{version}
+Release: %{release}
+%if %snapshot
+# http://krusader.svn.sourceforge.net/svnroot/krusader/trunk/krusader_kde4
+Source: %{name}-%{snapshot}.tar.bz2
+%else
+Source: http://downloads.sourceforge.net/krusader/%{name}-%{version}.tar.gz
+%endif
+License: GPL
+Group: File tools
+BuildRoot: %{_tmppath}/%{name}-buildroot
+URL: http://krusader.sourceforge.net/
+Epoch: 3
+BuildRequires: kdelibs4-devel
+Obsoletes: kde3-krusader < 2:1.02-4
+Provides: kde3-krusader
+# crystalsvg:
+Requires(post): kdelibs-common
+Requires(postun): kdelibs-common
%description
-Krusader is an advanced twin-panel (commander-style) file-manager for KDE
-(similar to Midnight or Total Commander) but with many extras.
-It provides all the file-management features you could possibly want.
-Plus: extensive archive handling, mounted filesystem support, FTP, advanced
-search module, viewer/editor, directory synchronisation, file content
-comparisons, powerful batch renaming and much much more.
-It supports the following archive formats: tar, zip, bzip2, gzip, rar, ace,
-arj and rpm and can handle other KIOSlaves such as smb:// or fish://
-It is (almost) completely customizable, very user friendly, fast and looks
-great on your desktop! :-)
+Krusader is an advanced twin panel (commander style) file manager
+for KDE and other desktops in the *nix world, similar to Midnight or
+Total Commander. It provides all the file management features you
+could possibly want.
-You should give it a try.
+Plus: extensive archive handling, mounted filesystem support, FTP,
+advanced search module, an internal viewer/editor, directory
+synchronisation, file content comparisons, powerful batch renaming
+and much much more. It supports a wide variety of archive formats
+and can handle other KIO slaves such as smb or fish.
%prep
+%if %snapshot
+%setup -q -n %name-%snapshot
+%else
%setup -q
+%endif
%build
-unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh
+%cmake_kde4
+%make
-%configure \
- --disable-rpath \
- --disable-debug \
- --disable-dependency-tracking
-make %{?_smp_mflags}
+%install
+rm -rf %{buildroot}
+%makeinstall_std -Cbuild
-%install
+%find_lang krusader
+
+%clean
rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-desktop-file-install --vendor fedora --delete-original \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
- $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
+%post
+%update_menus
+%update_desktop_database
+%update_icon_cache hicolor
-# Make symlink relative
-pushd $RPM_BUILD_ROOT%{_docdir}/HTML/en/krusader/
-ln -sf ../common
-popd
+%postun
+%clean_menus
+%clean_icon_cache hicolor
+%clean_desktop_database
-# Fix FAQ encoding
-iconv -f ISO-8859-1 -t UTF-8 < FAQ > FAQ.tmp
-mv -f FAQ.tmp FAQ
+%files -f krusader.lang
+%defattr(-,root,root)
+%doc README AUTHORS ChangeLog TODO COPYING krusader.lsm
+%doc %{_kde_datadir}/doc/HTML/en/*
+%{_kde_bindir}/krusader
+%{_kde_datadir}/applications/kde4/krusader*.desktop
+%{_kde_datadir}/apps/krusader
+%{_kde_datadir}/kde4/services/*.protocol
+%{_kde_datadir}/config/kio_isorc
+%{_kde_iconsdir}/hicolor/*/apps/krusader*.png
+%{_kde_iconsdir}/locolor/*/apps/krusader*.png
+%{_kde_libdir}/kde4/*.so
-%find_lang %{name}
-%post
-update-desktop-database &> /dev/null ||:
-touch --no-create %{_datadir}/icons/crystalsvg || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
-fi
+%changelog
+* Thu May 29 2008 Anssi Hannula <an...@ma...> 3:2.0-0.svn6014.1mdv2009.0
++ Revision: 212845
+- new snapshot
-touch --no-create %{_datadir}/icons/locolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/locolor || :
-fi
+* Sun May 04 2008 Anssi Hannula <an...@ma...> 3:2.0-0.svn2779.1mdv2009.0
++ Revision: 200809
+- new snapshot from KDE4 branch
-%postun
-update-desktop-database &> /dev/null ||:
+* Mon Apr 28 2008 Anssi Hannula <an...@ma...> 3:1.90.0-1mdv2009.0
++ Revision: 197851
+- new version
+- versionize obsoletes
+- buildrequires acl-devel
+- require kdelibs-common for crystalsvg for rpm scripts
-touch --no-create %{_datadir}/icons/crystalsvg || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
-fi
+* Wed Jan 02 2008 Olivier Blin <ob...@ma...> 3:1.80.0-2mdv2008.1
++ Revision: 140918
+- restore BuildRoot
-touch --no-create %{_datadir}/icons/locolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/locolor || :
-fi
+ + Thierry Vignaud <tvi...@ma...>
+ - kill re-definition of %%buildroot on Pixel's request
-%clean
-rm -rf $RPM_BUILD_ROOT
+* Sat Aug 25 2007 Anssi Hannula <an...@ma...> 3:1.80.0-2mdv2008.0
++ Revision: 71406
+- rebuild for new kdelibs
-%files -f %name.lang
-%defattr(-,root,root,-)
-%doc doc/actions_tutorial.txt AUTHORS ChangeLog COPYING CVSNEWS FAQ README TODO
-%{_bindir}/krusader
-%{_libdir}/kde3/kio_*.*
-%{_datadir}/applications/kde/*krusader*.desktop
-%{_datadir}/apps/konqueror/servicemenus/isoservice.desktop
-%{_datadir}/apps/krusader/
-%{_datadir}/config/kio_isorc
-%{_docdir}/HTML/*/krusader/
-%{_datadir}/icons/crystalsvg/*/apps/*
-%{_datadir}/icons/locolor/*/apps/*
-%{_mandir}/man1/krusader.1*
-%{_datadir}/services/*.protocol
+* Wed Jul 25 2007 Anssi Hannula <an...@ma...> 3:1.80.0-1mdv2008.0
++ Revision: 55271
+- 1.80.0 final
+- use proper configure macro
+- better description and summary
+- clean .spec
+- do not call update_icon_cache for non-existing theme locolor
-%changelog
-* Thu May 03 2007 Marcin Garski <mgarski[AT]post.pl> 1.80.0-1
-- Updated to version 1.80.0
-* Fri Apr 20 2007 Marcin Garski <mgarski[AT]post.pl> 1.80.0-0.1.beta2
-- Updated to version 1.80.0-beta2
-- Drop X-Fedora category
+* Wed Apr 04 2007 Laurent Montel <lm...@ma...> 1.80.0-0.beta2.1mdv2007.1
++ Revision: 150492
+- 1.80.0-beta2
+- Import krusader
-* Fri Sep 01 2006 Marcin Garski <mgarski[AT]post.pl> 1.70.1-2
-- Rebuild for Fedora Core 6
-- Spec tweak
+* Tue Sep 05 2006 Anssi Hannula <an...@ma...> 3:1.70.1-1mdv2007.0
+- 1.70.1
+- add missing clean_desktop_database
+- fix icons and legacy menu
+- drop cleaning buildroot in prep section
-* Sat Jul 29 2006 Marcin Garski <mgarski[AT]post.pl> 1.70.1-1
-- Updated to version 1.70.1 which fix CVE-2006-3816 (#200323)
+* Mon Jul 03 2006 Nicolas L\xE9cureuil <neo...@ma...> 3:1.70.0-6mdv2007.0
+- Rebuild for new menu and extensions
+- Use macros for icons
-* Mon Feb 13 2006 Marcin Garski <mgarski[AT]post.pl> 1.70.0-1
-- Remove all patches (merged upstream)
-- Updated to version 1.70.0
+* Mon May 22 2006 Laurent MONTEL <lm...@ma...> 1.70.0-5
+- Rebuild
-* Mon Jan 16 2006 Marcin Garski <mgarski[AT]post.pl> 1.60.1-6
-- Remove --enable-final
+* Thu May 11 2006 Nicolas L\xE9cureuil <neo...@ma...> 3:1.70.0-4mdk
+- Remove redundant BuildRequires
-* Mon Jan 16 2006 Marcin Garski <mgarski[AT]post.pl> 1.60.1-5
-- Remove --disable-dependency-tracking
+* Wed May 10 2006 Nicolas L\xE9cureuil <neo...@ma...> 3:1.70.0-3mdk
+- Fix BuildRequires
-* Sun Jan 15 2006 Marcin Garski <mgarski[AT]post.pl> 1.60.1-4
-- Change "/etc/profile.d/qt.sh" to "%%{_sysconfdir}/profile.d/qt.sh"
-- Add --disable-debug --disable-dependency-tracking & --enable-final
+* Tue May 09 2006 Laurent MONTEL <lm...@ma...> 1.70.0-2
+- Rebuild to generate category
-* Wed Dec 14 2005 Marcin Garski <mgarski[AT]post.pl> 1.60.1-3
-- Add to BR libacl-devel
+* Mon Feb 13 2006 Nicolas L\xE9cureuil <neo...@ma...> 1.70.0-1mdk
+- 1.70
-* Tue Dec 13 2005 Marcin Garski <mgarski[AT]post.pl> 1.60.1-2
-- Fix for modular X.Org
+* Wed Dec 14 2005 Laurent MONTEL <lm...@ma...> 1.70.0-beta2.2
+- Use patch from Anssi Hannula <ans...@gm...> to fixing build
+on x86_64 and use mkrel
-* Mon Dec 12 2005 Marcin Garski <mgarski[AT]post.pl> 1.60.1-1
-- Updated to version 1.60.1 which fix CVE-2005-3856
+* Sun Nov 06 2005 Laurent MONTEL <lm...@ma...> 1.70.0-beta2.1mdk
+- beta2
-* Sun Oct 23 2005 Marcin Garski <mgarski[AT]post.pl> 1.60.0-4
-- Added update-mime-database and gtk-update-icon-cache (bug #171547)
+* Sat Oct 29 2005 Nicolas L\xE9cureuil <neo...@ma...> 1.70.0-beta1.5mdk
+- Add BuildRequires
-* Thu Aug 25 2005 Marcin Garski <mgarski[AT]post.pl> 1.60.0-3
-- Include .la files
-- Include actions_tutorial.txt
-- Fix krusader_root-mode.desktop file to show only in KDE and under System
- category
-- Fix compile warnings
+* Sat Oct 29 2005 Nicolas L\xE9cureuil <neo...@ma...> 1.70.0-beta1.4mdk
+- Fix conflict
-* Fri Aug 12 2005 Marcin Garski <mgarski[AT]post.pl> 1.60.0-2
-- Spec improvements for Fedora Extras
+* Thu Oct 20 2005 Nicolas L\xE9cureuil <neo...@ma...> 1.70.0-beta1.3mdk
+- Fix conflict
-* Wed Aug 10 2005 Marcin Garski <mgarski[AT]post.pl> 1.60.0-1
-- Updated to version 1.60.0 & clean up for Fedora Extras
+* Tue Oct 18 2005 Nicolas L\xE9cureuil <neo...@ma...> 1.70.0-beta1.2mdk
+- Fix BuildRequires
-* Fri Dec 17 2004 Marcin Garski <mgarski[AT]post.pl> 1.51.fc2kde331
-- Updated to version 1.51
+* Tue Oct 18 2005 Laurent MONTEL <lm...@ma...> 1.70.0-beta1.1mdk
+- 1.70.beta1
-* Sat Nov 11 2004 Marcin Garski <mgarski[AT]post.pl> 1.50.fc2kde331
-- Added Requires:
+* Tue May 03 2005 Laurent MONTEL <lm...@ma...> 1.60.0-2mdk
+- Fix x64 build fix bug #15728
-* Tue Nov 02 2004 Marcin Garski <mgarski[AT]post.pl> 1.50.fc2
-- Updated to version 1.50 & spec cleanup
+* Tue Apr 12 2005 Lenny Cartier <le...@ma...> 1.60.0-1mdk
+- 1.60.0
-* Fri Aug 06 2004 Marcin Garski <mgarski[AT]post.pl> 1.40-1.fc2
-- Updated to version 1.40
+* Tue Mar 22 2005 Laurent MONTEL <lm...@ma...> 1.60-0.beta2.1mdk
+- 1.60 beta2
-* Wed Jun 23 2004 Marcin Garski <mgarski[AT]post.pl> 1.40-beta2.fc2
-- Updated to version 1.40-beta2
+* Fri Mar 04 2005 Laurent MONTEL <lm...@ma...> 1.60-0.beta1.1mdk
+- 1.60 beta1
-* Wed Jun 02 2004 Marcin Garski <mgarski[AT]post.pl> 1.40-beta1.fc2
-- Rebuild for Fedora Core 2 & huge spec cleanup
+* Wed Dec 15 2004 Laurent MONTEL <lm...@ma...> 1.51-1mdk
+- 1.51
-* Mon Nov 17 2003 11:05:00 Marian POPESCU <softexpert[AT]libertysurf.fr> [1.30]
-- Updated to 1.30 release + changed description to match the official one
+* Tue Nov 02 2004 Laurent MONTEL <lm...@ma...> 1.50-2mdk
+- Add patch3: fix potential crash
-* Tue Jul 03 2003 17:00:00 Marcin Garski <mgarski[AT]post.pl> [1.20]
-- Initial specfile
+* Mon Nov 01 2004 Laurent MONTEL <lm...@ma...> 1.50-1mdk
+- 1.50
+
+* Fri Jul 23 2004 Lenny Cartier <le...@ma...> 1.40-1mdk
+- 1.40
+
+* Tue Jun 29 2004 Laurent MONTEL <lm...@ma...> 1.40-0.beta2.1mdk
+- beta2
+
+* Mon Jun 07 2004 Angelo Naselli <ran...@ya...> 1.40-0.beta1.4mdk
+- Fix icon position
+
+* Sat Jun 05 2004 Laurent MONTEL <lm...@ma...> 1.40-0.beta1.3mdk
+- Rebuild
+
+* Thu May 06 2004 Laurent MONTEL <lm...@ma...> 1.40-0.beta1.2mdk
+- Update description (patch give by fra...@fa...)
+
+* Thu Apr 22 2004 Laurent MONTEL <lm...@ma...> 1.40-0.beta1.1mdk
+- 1.40beta1
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <er...@us...> - 2008-05-29 21:00:11
|
Revision: 6016
http://krusader.svn.sourceforge.net/krusader/?rev=6016&view=rev
Author: erlich
Date: 2008-05-29 14:00:15 -0700 (Thu, 29 May 2008)
Log Message:
-----------
added preliminary code for mvc view. don't look, it is just a bunch of ugly hacks
Modified Paths:
--------------
trunk/krusader_kde4/krusader/Panel/CMakeLists.txt
trunk/krusader_kde4/krusader/Panel/krinterview.cpp
trunk/krusader_kde4/krusader/Panel/krinterview.h
trunk/krusader_kde4/krusader/Panel/krview.cpp
trunk/krusader_kde4/krusader/Panel/krviewfactory.cpp
trunk/krusader_kde4/krusader/Panel/krviewitem.h
Added Paths:
-----------
trunk/krusader_kde4/krusader/Panel/krvfsmodel.cpp
trunk/krusader_kde4/krusader/Panel/krvfsmodel.h
Removed Paths:
-------------
trunk/krusader_kde4/CPackConfig.cmake
Deleted: trunk/krusader_kde4/CPackConfig.cmake
===================================================================
--- trunk/krusader_kde4/CPackConfig.cmake 2008-05-29 17:39:32 UTC (rev 6015)
+++ trunk/krusader_kde4/CPackConfig.cmake 2008-05-29 21:00:15 UTC (rev 6016)
@@ -1,54 +0,0 @@
-# This file will be configured to contain variables for CPack. These variables
-# should be set in the CMake list file of the project before CPack module is
-# included. Example variables are:
-# CPACK_GENERATOR - Generator used to create package
-# CPACK_INSTALL_CMAKE_PROJECTS - For each project (path, name, component)
-# CPACK_CMAKE_GENERATOR - CMake Generator used for the projects
-# CPACK_INSTALL_COMMANDS - Extra commands to install components
-# CPACK_INSTALL_DIRECTORIES - Extra directories to install
-# CPACK_PACKAGE_DESCRIPTION_FILE - Description file for the package
-# CPACK_PACKAGE_DESCRIPTION_SUMMARY - Summary of the package
-# CPACK_PACKAGE_EXECUTABLES - List of pairs of executables and labels
-# CPACK_PACKAGE_FILE_NAME - Name of the package generated
-# CPACK_PACKAGE_ICON - Icon used for the package
-# CPACK_PACKAGE_INSTALL_DIRECTORY - Name of directory for the installer
-# CPACK_PACKAGE_NAME - Package project name
-# CPACK_PACKAGE_VENDOR - Package project vendor
-# CPACK_PACKAGE_VERSION - Package project version
-# CPACK_PACKAGE_VERSION_MAJOR - Package project version (major)
-# CPACK_PACKAGE_VERSION_MINOR - Package project version (minor)
-# CPACK_PACKAGE_VERSION_PATCH - Package project version (patch)
-
-# There are certain generator specific ones
-
-# NSIS Generator:
-# CPACK_PACKAGE_INSTALL_REGISTRY_KEY - Name of the registry key for the installer
-# CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS - Extra commands used during uninstall
-# CPACK_NSIS_EXTRA_INSTALL_COMMANDS - Extra commands used during install
-
-
-SET(CPACK_CMAKE_GENERATOR "Unix Makefiles")
-SET(CPACK_GENERATOR "STGZ;TGZ;TZ")
-SET(CPACK_INSTALL_CMAKE_PROJECTS "/home/dirk/krusader_kde4;Project;ALL;/")
-SET(CPACK_MODULE_PATH "")
-SET(CPACK_NSIS_DISPLAY_NAME "Project 0.1.1")
-SET(CPACK_OUTPUT_CONFIG_FILE "/home/dirk/krusader_kde4/CPackConfig.cmake")
-SET(CPACK_PACKAGE_DESCRIPTION_FILE "/usr/share/cmake/Templates/CPack.GenericDescription.txt")
-SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Project built using CMake")
-SET(CPACK_PACKAGE_FILE_NAME "Project-0.1.1-Linux")
-SET(CPACK_PACKAGE_INSTALL_DIRECTORY "Project 0.1.1")
-SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "Project 0.1.1")
-SET(CPACK_PACKAGE_NAME "Project")
-SET(CPACK_PACKAGE_RELOCATABLE "false")
-SET(CPACK_PACKAGE_VENDOR "Humanity")
-SET(CPACK_PACKAGE_VERSION "0.1.1")
-SET(CPACK_PACKAGE_VERSION_MAJOR "0")
-SET(CPACK_PACKAGE_VERSION_MINOR "1")
-SET(CPACK_PACKAGE_VERSION_PATCH "1")
-SET(CPACK_RESOURCE_FILE_LICENSE "/usr/share/cmake/Templates/CPack.GenericLicense.txt")
-SET(CPACK_RESOURCE_FILE_README "/usr/share/cmake/Templates/CPack.GenericDescription.txt")
-SET(CPACK_RESOURCE_FILE_WELCOME "/usr/share/cmake/Templates/CPack.GenericWelcome.txt")
-SET(CPACK_SOURCE_GENERATOR "TGZ;TZ")
-SET(CPACK_SOURCE_OUTPUT_CONFIG_FILE "/home/dirk/krusader_kde4/CPackSourceConfig.cmake")
-SET(CPACK_SYSTEM_NAME "Linux")
-SET(CPACK_TOPLEVEL_TAG "Linux")
Modified: trunk/krusader_kde4/krusader/Panel/CMakeLists.txt
===================================================================
--- trunk/krusader_kde4/krusader/Panel/CMakeLists.txt 2008-05-29 17:39:32 UTC (rev 6015)
+++ trunk/krusader_kde4/krusader/Panel/CMakeLists.txt 2008-05-29 21:00:15 UTC (rev 6016)
@@ -19,6 +19,7 @@
krdetailedview.cpp
krbriefview.cpp
krbriefviewitem.cpp
+ krvfsmodel.cpp
krinterview.cpp
krviewfactory.cpp )
Modified: trunk/krusader_kde4/krusader/Panel/krinterview.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Panel/krinterview.cpp 2008-05-29 17:39:32 UTC (rev 6015)
+++ trunk/krusader_kde4/krusader/Panel/krinterview.cpp 2008-05-29 21:00:15 UTC (rev 6016)
@@ -1,16 +1,55 @@
#include "krviewfactory.h"
#include "krinterview.h"
#include "krviewitem.h"
+#include "krvfsmodel.h"
+#include "../VFS/krpermhandler.h"
#include <klocale.h>
-
+#include <kdirlister.h>
+#include <QDir>
#include <QDirModel>
// dummy. remove this class when no longer needed
class KrInterViewItem: public KrViewItem
{
public:
+ KrInterViewItem(KrInterView *parent, QModelIndex index): KrViewItem(NULL, parent->properties()), _pIndex(index) {
+ // create a vfile from our persistent index
+ _vfile = new vfile(
+ _pIndex.data().toString(),
+ 0,
+ "rwxrwxrwx",
+ 0,
+ false,
+ 0,
+ 0,
+ "",
+ "",
+ 0,
+ -1);
+
+ setVfile(_vfile);
+ }
+
+ const QString& name(bool withExtension=true) const {
+ return _vfile->vfile_getName();
+ }
+ //virtual inline bool hasExtension() const { return _hasExtension; }
+ //virtual inline const QString& extension() const { return _extension; }
+ //virtual QString dateTime() const;
+ //virtual QString description() const;
+ bool isSelected() const {
+ return false;
+ }
+ void setSelected( bool s ) {}
+ //virtual QPixmap icon();
+ QRect itemRect() const {
+ return QRect();
+ }
static void itemHeightChanged() {} // force the items to resize when icon/font size change
+private:
+ QPersistentModelIndex _pIndex;
+ vfile *_vfile;
};
// code used to register the view
@@ -21,46 +60,56 @@
KrInterView::KrInterView( QWidget *parent, bool &left, KConfig *cfg ):
KrView(cfg),
- QListView(parent)
+ QTreeView(parent)
{
setWidget( this );
_nameInKConfig=QString( "KrInterView" ) + QString( ( left ? "Left" : "Right" ) ) ;
KConfigGroup group( krConfig, "Private" );
-
-
- // dummy code
- QDirModel *model = new QDirModel;
- //QTreeView *tree = new QTreeView(this);
- this->setModel(model);
- this->setRootIndex(model->index(QDir::currentPath()));
- //setWidget(tree);
- //tree->show();
+
+ _model = new KrVfsModel;
+ this->setModel(_model);
+ this->setRootIsDecorated(false);
}
KrInterView::~KrInterView()
{
- delete _properties; _properties = 0;
- delete _operator; _operator = 0;
+ delete _properties;
+ _properties = 0;
+ delete _operator;
+ _operator = 0;
+ delete _model;
}
KrViewItem* KrInterView::findItemByName(const QString &name)
{
- return 0;
+ if (!_model->ready())
+ return 0;
+
+ return 0; // TODO
}
QString KrInterView::getCurrentItem() const
{
- return QString();
+ if (!_model->ready())
+ return QString();
+
+ return currentIndex().data().toString();
}
KrViewItem* KrInterView::getCurrentKrViewItem()
{
- return 0;
+ if (!_model->ready())
+ return 0;
+
+ return new KrInterViewItem(this, currentIndex());
}
KrViewItem* KrInterView::getFirst()
{
- return 0;
+ if (!_model->ready())
+ return 0;
+
+ return new KrInterViewItem(this, _model->index(0, 0, QModelIndex()));
}
KrViewItem* KrInterView::getKrViewItemAt(const QPoint &vp)
@@ -70,7 +119,10 @@
KrViewItem* KrInterView::getLast()
{
- return 0;
+ if (!_model->ready())
+ return 0;
+
+ return new KrInterViewItem(this, _model->index(_model->rowCount()-1, 0, QModelIndex()));
}
KrViewItem* KrInterView::getNext(KrViewItem *current)
@@ -131,6 +183,81 @@
void KrInterView::addItems(vfs* v, bool addUpDir)
{
+ _model->setVfs(v);
+ this->setCurrentIndex(_model->index(0, 0));
+
+#if 0
+ Q3ListViewItem * item = firstChild();
+ Q3ListViewItem *currentItem = item;
+ QString size, name;
+
+ // add the up-dir arrow if needed
+ if ( addUpDir ) {
+ new KrDetailedViewItem( this, ( Q3ListViewItem* ) 0L, ( vfile* ) 0L );
+ }
+
+ // text for updating the status bar
+ QString statusText = QString("%1/ ").arg( v->vfs_getOrigin().fileName() ) + i18n("Directory");
+
+ int cnt = 0;
+ int cl = columnSorted();
+ bool as = ascendingSort();
+ setSorting( -1 ); // disable sorting
+
+ for ( vfile * vf = v->vfs_getFirstFile(); vf != 0 ; vf = v->vfs_getNextFile() ) {
+ size = KRpermHandler::parseSize( vf->vfile_getSize() );
+ name = vf->vfile_getName();
+ bool isDir = vf->vfile_isDir();
+ if ( !isDir || ( isDir && ( _properties->filter & KrViewProperties::ApplyToDirs ) ) ) {
+ switch ( _properties->filter ) {
+ case KrViewProperties::All :
+ break;
+ case KrViewProperties::Custom :
+ if ( !_properties->filterMask.match( vf ) )
+ continue;
+ break;
+ case KrViewProperties::Dirs:
+ if ( !vf->vfile_isDir() )
+ continue;
+ break;
+ case KrViewProperties::Files:
+ if ( vf->vfile_isDir() )
+ continue;
+ break;
+
+ case KrViewProperties::ApplyToDirs :
+ break; // no-op, stop compiler complaints
+ }
+ }
+
+ KrDetailedViewItem *dvitem = new KrDetailedViewItem( this, item, vf );
+ _dict.insert( vf->vfile_getName(), dvitem );
+ if ( isDir )
+ ++_numDirs;
+ else
+ _countSize += dvitem->VF->vfile_getSize();
+ ++_count;
+ // if the item should be current - make it so
+ if ( dvitem->name() == nameToMakeCurrent() ) {
+ currentItem = static_cast<Q3ListViewItem*>(dvitem);
+ statusText = dvitem->description();
+ }
+
+ cnt++;
+ }
+
+
+ // re-enable sorting
+ setSorting( cl, as );
+ sort();
+
+ if ( !currentItem )
+ currentItem = firstChild();
+ K3ListView::setCurrentItem( currentItem );
+ ensureItemVisible( currentItem );
+
+ op()->emitItemDescription( statusText );
+#endif
}
void KrInterView::setup()
Modified: trunk/krusader_kde4/krusader/Panel/krinterview.h
===================================================================
--- trunk/krusader_kde4/krusader/Panel/krinterview.h 2008-05-29 17:39:32 UTC (rev 6015)
+++ trunk/krusader_kde4/krusader/Panel/krinterview.h 2008-05-29 21:00:15 UTC (rev 6016)
@@ -3,10 +3,14 @@
#include "krview.h"
-#include <QListView>
+#include <QTreeView>
+#include <QVector>
-class KrInterView : public KrView, public QListView {
+class KrVfsModel;
+class KrInterViewItem;
+class KrInterView : public KrView, public QTreeView {
+
public:
KrInterView( QWidget *parent, bool &left, KConfig *cfg = krConfig );
virtual ~KrInterView();
@@ -39,5 +43,9 @@
virtual void setup();
virtual void initProperties();
virtual void initOperator();
+
+private:
+ KrVfsModel *_model;
+ QVector<KrInterViewItem*> _items;
};
#endif // __krinterview__
Added: trunk/krusader_kde4/krusader/Panel/krvfsmodel.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Panel/krvfsmodel.cpp (rev 0)
+++ trunk/krusader_kde4/krusader/Panel/krvfsmodel.cpp 2008-05-29 21:00:15 UTC (rev 6016)
@@ -0,0 +1,74 @@
+#include "krvfsmodel.h"
+#include "../VFS/vfs.h"
+#include "../VFS/vfile.h"
+#include <QtDebug>
+
+KrVfsModel::KrVfsModel(): QAbstractListModel(0), _vfs(0) {}
+
+void KrVfsModel::setVfs(vfs* v)
+{
+ emit layoutAboutToBeChanged();
+
+ _vfs = v;
+
+ vfile *vf = _vfs->vfs_getFirstFile();
+ while (vf) {
+ _vfiles.append(vf);
+ vf = _vfs->vfs_getNextFile();
+ }
+ // TODO: connect all addedVfile/deleteVfile and friends signals
+ // TODO: make a more efficient implementation that this dummy one :-)
+
+ emit dataChanged(index(0, 0), index(_vfs->vfs_noOfFiles()-1, 0));
+ emit layoutChanged();
+}
+
+KrVfsModel::~KrVfsModel()
+{
+}
+
+int KrVfsModel::rowCount(const QModelIndex& parent) const
+{
+ if (!_vfs) return 0;
+
+ // simply return the number of items in the vfs
+ return _vfs->vfs_noOfFiles();
+}
+
+
+int KrVfsModel::columnCount(const QModelIndex &parent) const {
+ return 3;
+}
+
+QVariant KrVfsModel::data(const QModelIndex& index, int role) const
+{
+ if (!index.isValid() || !_vfs)
+ return QVariant();
+
+ if (index.row() >= rowCount())
+ return QVariant();
+
+ if (role != Qt::DisplayRole)
+ return QVariant();
+
+ switch (index.column()) {
+ case 0: return (_vfiles.at(index.row()))->vfile_getName();
+ case 1: return ("<ext>");
+ case 2: return (_vfiles.at(index.row()))->vfile_getSize();
+ default: return QString();
+ }
+}
+
+QVariant KrVfsModel::headerData(int section, Qt::Orientation orientation, int role) const
+{
+ // ignore anything that's not display, and not horizontal
+ if (role != Qt::DisplayRole || orientation != Qt::Horizontal)
+ return QVariant();
+
+ switch (section) {
+ case 0: return "Name";
+ case 1: return "Ext";
+ case 2: return "Size";
+ }
+ return QString();
+}
Added: trunk/krusader_kde4/krusader/Panel/krvfsmodel.h
===================================================================
--- trunk/krusader_kde4/krusader/Panel/krvfsmodel.h (rev 0)
+++ trunk/krusader_kde4/krusader/Panel/krvfsmodel.h 2008-05-29 21:00:15 UTC (rev 6016)
@@ -0,0 +1,30 @@
+#ifndef __krvfsmodel__
+#define __krvfsmodel__
+
+#include <QAbstractListModel>
+#include <QVector>
+
+class vfs;
+class vfile;
+
+class KrVfsModel: public QAbstractListModel {
+ Q_OBJECT
+
+public:
+ KrVfsModel();
+ virtual ~KrVfsModel();
+
+ inline bool ready() const { return _vfs != 0; }
+ void setVfs(vfs* v);
+
+ int rowCount(const QModelIndex &parent = QModelIndex()) const;
+ int columnCount(const QModelIndex &parent = QModelIndex()) const;
+ QVariant data(const QModelIndex &index, int role) const;
+ QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
+
+
+protected:
+ vfs *_vfs;
+ QVector<vfile*> _vfiles;
+};
+#endif // __krvfsmodel__
Modified: trunk/krusader_kde4/krusader/Panel/krview.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Panel/krview.cpp 2008-05-29 17:39:32 UTC (rev 6015)
+++ trunk/krusader_kde4/krusader/Panel/krview.cpp 2008-05-29 21:00:15 UTC (rev 6016)
@@ -47,39 +47,45 @@
// ----------------------------- operator
-KrViewOperator::KrViewOperator(KrView *view, QWidget *widget): _view(view), _widget(widget) {
+KrViewOperator::KrViewOperator(KrView *view, QWidget *widget): _view(view), _widget(widget)
+{
}
-KrViewOperator::~KrViewOperator() {
+KrViewOperator::~KrViewOperator()
+{
}
-void KrViewOperator::startDrag() {
- QStringList items;
- _view->getSelectedItems( &items );
- if ( items.empty() )
- return ; // don't drag an empty thing
- QPixmap px;
- if ( items.count() > 1 )
- px = FL_LOADICON( "queue" ); // how much are we dragging
- else
- px = _view->getCurrentKrViewItem() ->icon();
- emit letsDrag( items, px );
+void KrViewOperator::startDrag()
+{
+ QStringList items;
+ _view->getSelectedItems( &items );
+ if ( items.empty() )
+ return ; // don't drag an empty thing
+ QPixmap px;
+ if ( items.count() > 1 )
+ px = FL_LOADICON( "queue" ); // how much are we dragging
+ else
+ px = _view->getCurrentKrViewItem() ->icon();
+ emit letsDrag( items, px );
}
// ----------------------------- krview
KrView::KrView( KConfig *cfg ) : _config( cfg ), _widget(0), _nameToMakeCurrent( QString() ), _nameToMakeCurrentIfAdded( QString() ),
-_numSelected( 0 ), _count( 0 ), _numDirs( 0 ), _countSize( 0 ), _selectedSize( 0 ), _properties(0), _focused( false ), _nameInKConfig(QString()) {
+ _numSelected( 0 ), _count( 0 ), _numDirs( 0 ), _countSize( 0 ), _selectedSize( 0 ), _properties(0), _focused( false ), _nameInKConfig(QString())
+{
}
-KrView::~KrView() {
+KrView::~KrView()
+{
if (_properties)
qFatal("A class inheriting KrView didn't delete _properties!");
- if (_operator)
+ if (_operator)
qFatal("A class inheriting KrView didn't delete _operator!");
}
-void KrView::init() {
+void KrView::init()
+{
// sanity checks:
if (_nameInKConfig.isEmpty())
qFatal("_nameInKConfig must be set during construction of KrView inheritors");
@@ -91,158 +97,167 @@
setup();
}
-QPixmap KrView::getIcon( vfile *vf /*, KRListItem::cmpColor color*/ ) {
- // KConfigGroup ag( krConfig, "Advanced");
- //////////////////////////////
- QPixmap icon;
- QString icon_name = vf->vfile_getIcon();
- //QPixmapCache::setCacheLimit( ag.readEntry("Icon Cache Size",_IconCacheSize) );
+QPixmap KrView::getIcon( vfile *vf /*, KRListItem::cmpColor color*/ )
+{
+ // KConfigGroup ag( krConfig, "Advanced");
+ //////////////////////////////
+ QPixmap icon;
+ QString icon_name = vf->vfile_getIcon();
+ //QPixmapCache::setCacheLimit( ag.readEntry("Icon Cache Size",_IconCacheSize) );
- if( icon_name.isNull() )
- icon_name="";
-
- // first try the cache
- if ( !QPixmapCache::find( icon_name, icon ) ) {
- icon = FL_LOADICON( icon_name );
- // insert it into the cache
- QPixmapCache::insert( icon_name, icon );
- }
- // if it's a symlink - add an arrow overlay
- if ( vf->vfile_isSymLink() ) {
- QPixmap link( link_xpm );
- // bitBlt ( &icon, 0, icon.height() - 11, &link, 0, 21, 10, 11, Qt::CopyROP, false );
- QPainter( &icon ).drawPixmap( 0, icon.height() - 11, link, 0, 21, 10, 11 );
- icon.setMask( icon.createHeuristicMask( false ) );
- }
+ if ( icon_name.isNull() )
+ icon_name="";
- return icon;
+ // first try the cache
+ if ( !QPixmapCache::find( icon_name, icon ) ) {
+ icon = FL_LOADICON( icon_name );
+ // insert it into the cache
+ QPixmapCache::insert( icon_name, icon );
+ }
+ // if it's a symlink - add an arrow overlay
+ if ( vf->vfile_isSymLink() ) {
+ QPixmap link( link_xpm );
+ // bitBlt ( &icon, 0, icon.height() - 11, &link, 0, 21, 10, 11, Qt::CopyROP, false );
+ QPainter( &icon ).drawPixmap( 0, icon.height() - 11, link, 0, 21, 10, 11 );
+ icon.setMask( icon.createHeuristicMask( false ) );
+ }
+
+ return icon;
}
/**
* this function ADDs a list of selected item names into 'names'.
* it assumes the list is ready and doesn't initialize it, or clears it
*/
-void KrView::getItemsByMask( QString mask, QStringList* names, bool dirs, bool files ) {
- for ( KrViewItem * it = getFirst(); it != 0; it = getNext( it ) ) {
- if ( ( it->name() == ".." ) || !QDir::match( mask, it->name() ) ) continue;
- // if we got here, than the item fits the mask
- if ( it->getVfile()->vfile_isDir() && !dirs ) continue; // do we need to skip folders?
- if ( !it->getVfile()->vfile_isDir() && !files ) continue; // do we need to skip files
- names->append( it->name() );
- }
+void KrView::getItemsByMask( QString mask, QStringList* names, bool dirs, bool files )
+{
+ for ( KrViewItem * it = getFirst(); it != 0; it = getNext( it ) ) {
+ if ( ( it->name() == ".." ) || !QDir::match( mask, it->name() ) ) continue;
+ // if we got here, than the item fits the mask
+ if ( it->getVfile()->vfile_isDir() && !dirs ) continue; // do we need to skip folders?
+ if ( !it->getVfile()->vfile_isDir() && !files ) continue; // do we need to skip files
+ names->append( it->name() );
+ }
}
/**
* this function ADDs a list of selected item names into 'names'.
* it assumes the list is ready and doesn't initialize it, or clears it
*/
-void KrView::getSelectedItems( QStringList *names ) {
- for ( KrViewItem * it = getFirst(); it != 0; it = getNext( it ) )
- if ( it->isSelected() && ( it->name() != ".." ) ) names->append( it->name() );
+void KrView::getSelectedItems( QStringList *names )
+{
+ for ( KrViewItem * it = getFirst(); it != 0; it = getNext( it ) )
+ if ( it->isSelected() && ( it->name() != ".." ) ) names->append( it->name() );
- // if all else fails, take the current item
+ // if all else fails, take the current item
QString item = getCurrentItem();
- if ( names->empty() && item!=QString() && item!=".." ) names->append( item );
+ if ( names->empty() && item!=QString() && item!=".." ) names->append( item );
}
-void KrView::getSelectedKrViewItems( KrViewItemList *items ) {
- for ( KrViewItem * it = getFirst(); it != 0; it = getNext( it ) )
- if ( it->isSelected() && ( it->name() != ".." ) ) items->append( it );
+void KrView::getSelectedKrViewItems( KrViewItemList *items )
+{
+ for ( KrViewItem * it = getFirst(); it != 0; it = getNext( it ) )
+ if ( it->isSelected() && ( it->name() != ".." ) ) items->append( it );
- // if all else fails, take the current item
+ // if all else fails, take the current item
QString item = getCurrentItem();
- if ( items->empty() && item!=QString() && item!=".." ) items->append( getCurrentKrViewItem() );
+ if ( items->empty() && item!=QString() && item!=".." ) items->append( getCurrentKrViewItem() );
}
-QString KrView::statistics() {
- _countSize = _numSelected = _selectedSize = 0;
+QString KrView::statistics()
+{
+ _countSize = _numSelected = _selectedSize = 0;
- for ( KrViewItem * it = getFirst(); it != 0; it = getNext( it ) ){
- if ( it->isSelected() ) {
- ++_numSelected;
- _selectedSize += it->getVfile()->vfile_getSize();
- }
- if (it->getVfile()->vfile_getSize() > 0)
- _countSize += it->getVfile()->vfile_getSize();
- }
- QString tmp = QString(i18n("%1 out of %2, %3 (%4) out of %5 (%6)",
- _numSelected, _count, KIO::convertSize( _selectedSize ),
- KRpermHandler::parseSize(_selectedSize),
- KIO::convertSize( _countSize ),
- KRpermHandler::parseSize(_countSize) ) );
+ for ( KrViewItem * it = getFirst(); it != 0; it = getNext( it ) ) {
+ if ( it->isSelected() ) {
+ ++_numSelected;
+ _selectedSize += it->getVfile()->vfile_getSize();
+ }
+ if (it->getVfile()->vfile_getSize() > 0)
+ _countSize += it->getVfile()->vfile_getSize();
+ }
+ QString tmp = QString(i18n("%1 out of %2, %3 (%4) out of %5 (%6)",
+ _numSelected, _count, KIO::convertSize( _selectedSize ),
+ KRpermHandler::parseSize(_selectedSize),
+ KIO::convertSize( _countSize ),
+ KRpermHandler::parseSize(_countSize) ) );
// notify if we're running a filtered view
if (filter() != KrViewProperties::All)
tmp = ">> [ " + filterMask().nameFilter() + " ] "+tmp;
- return tmp;
+ return tmp;
}
-void KrView::changeSelection( const KRQuery& filter, bool select, bool includeDirs ) {
- KConfigGroup grpSvr( _config, "Look&Feel" );
- bool markDirs = grpSvr.readEntry( "Mark Dirs", _MarkDirs ) || includeDirs;
+void KrView::changeSelection( const KRQuery& filter, bool select, bool includeDirs )
+{
+ KConfigGroup grpSvr( _config, "Look&Feel" );
+ bool markDirs = grpSvr.readEntry( "Mark Dirs", _MarkDirs ) || includeDirs;
- KrViewItem *temp = getCurrentKrViewItem();
- for ( KrViewItem * it = getFirst(); it != 0; it = getNext( it ) ) {
- if ( it->name() == ".." ) continue;
- if ( it->getVfile()->vfile_isDir() && !markDirs ) continue;
-
- vfile * file = it->getMutableVfile(); // filter::match calls getMimetype which isn't const
- if( file == 0 ) continue;
-
- if( filter.match( file ) ) {
- // we're increasing/decreasing the number of selected files
- if ( select ) {
- if ( !it->isSelected() ) {
- ++_numSelected;
- _selectedSize += it->getVfile()->vfile_getSize();
- }
- } else {
- if ( it->isSelected() ) {
- --_numSelected;
- _selectedSize -= it->getVfile()->vfile_getSize();
- }
- }
- it->setSelected( select );
- }
- }
- updateView();
- makeItemVisible( temp );
+ KrViewItem *temp = getCurrentKrViewItem();
+ for ( KrViewItem * it = getFirst(); it != 0; it = getNext( it ) ) {
+ if ( it->name() == ".." ) continue;
+ if ( it->getVfile()->vfile_isDir() && !markDirs ) continue;
+
+ vfile * file = it->getMutableVfile(); // filter::match calls getMimetype which isn't const
+ if ( file == 0 ) continue;
+
+ if ( filter.match( file ) ) {
+ // we're increasing/decreasing the number of selected files
+ if ( select ) {
+ if ( !it->isSelected() ) {
+ ++_numSelected;
+ _selectedSize += it->getVfile()->vfile_getSize();
+ }
+ } else {
+ if ( it->isSelected() ) {
+ --_numSelected;
+ _selectedSize -= it->getVfile()->vfile_getSize();
+ }
+ }
+ it->setSelected( select );
+ }
+ }
+ updateView();
+ makeItemVisible( temp );
}
-void KrView::invertSelection() {
- KConfigGroup grpSvr( _config, "Look&Feel" );
- bool markDirs = grpSvr.readEntry( "Mark Dirs", _MarkDirs );
+void KrView::invertSelection()
+{
+ KConfigGroup grpSvr( _config, "Look&Feel" );
+ bool markDirs = grpSvr.readEntry( "Mark Dirs", _MarkDirs );
- KrViewItem *temp = getCurrentKrViewItem();
- for ( KrViewItem * it = getFirst(); it != 0; it = getNext( it ) ) {
- if ( it->name() == ".." ) continue;
- if ( it->getVfile()->vfile_isDir() && !markDirs && !it->isSelected() ) continue;
- if ( it->isSelected() ) {
- --_numSelected;
- _selectedSize -= it->getVfile()->vfile_getSize();
- } else {
- ++_numSelected;
- _selectedSize += it->getVfile()->vfile_getSize();
- }
- it->setSelected( !it->isSelected() );
- }
- updateView();
- makeItemVisible( temp );
+ KrViewItem *temp = getCurrentKrViewItem();
+ for ( KrViewItem * it = getFirst(); it != 0; it = getNext( it ) ) {
+ if ( it->name() == ".." ) continue;
+ if ( it->getVfile()->vfile_isDir() && !markDirs && !it->isSelected() ) continue;
+ if ( it->isSelected() ) {
+ --_numSelected;
+ _selectedSize -= it->getVfile()->vfile_getSize();
+ } else {
+ ++_numSelected;
+ _selectedSize += it->getVfile()->vfile_getSize();
+ }
+ it->setSelected( !it->isSelected() );
+ }
+ updateView();
+ makeItemVisible( temp );
}
-QString KrView::firstUnmarkedBelowCurrent() {
- KrViewItem * iterator = getNext( getCurrentKrViewItem() );
- while ( iterator && iterator->isSelected() )
- iterator = getNext( iterator );
- if ( !iterator ) {
- iterator = getPrev( getCurrentKrViewItem() );
- while ( iterator && iterator->isSelected() )
- iterator = getPrev( iterator );
- }
- if ( !iterator ) return QString();
- return iterator->name();
+QString KrView::firstUnmarkedBelowCurrent()
+{
+ KrViewItem * iterator = getNext( getCurrentKrViewItem() );
+ while ( iterator && iterator->isSelected() )
+ iterator = getNext( iterator );
+ if ( !iterator ) {
+ iterator = getPrev( getCurrentKrViewItem() );
+ while ( iterator && iterator->isSelected() )
+ iterator = getPrev( iterator );
+ }
+ if ( !iterator ) return QString();
+ return iterator->name();
}
-void KrView::delItem(const QString &name) {
+void KrView::delItem(const QString &name)
+{
QHash<QString, KrViewItem*>::iterator itr = _dict.find( name );
if ( itr == _dict.end() ) {
krOut << "got signal deletedVfile(" << name << ") but can't find KrViewItem" << endl;
@@ -251,89 +266,92 @@
KrViewItem * it = *itr;
if (!preDelItem(it)) return; // do not delete this after all
-
+
// remove from dict
if (it->VF->vfile_isDir()) {
--_numDirs;
} else {
_countSize -= it->VF->vfile_getSize();
}
- --_count;
+ --_count;
_dict.remove( name );
delete it;
op()->emitSelectionChanged();
}
-KrViewItem *KrView::addItem( vfile *vf ) {
+KrViewItem *KrView::addItem( vfile *vf )
+{
KrViewItem *item = preAddItem(vf);
if (!item) return 0; // don't add it after all
-
+
// add to dictionary
- _dict.insert( vf->vfile_getName(), item );
- if ( vf->vfile_isDir() )
- ++_numDirs;
- else _countSize += vf->vfile_getSize();
- ++_count;
-
+ _dict.insert( vf->vfile_getName(), item );
+ if ( vf->vfile_isDir() )
+ ++_numDirs;
+ else _countSize += vf->vfile_getSize();
+ ++_count;
+
if (item->name() == nameToMakeCurrent() ) {
- setCurrentItem(item->name()); // dictionary based - quick
+ setCurrentItem(item->name()); // dictionary based - quick
makeItemVisible( item );
}
- if (item->name() == nameToMakeCurrentIfAdded() ) {
+ if (item->name() == nameToMakeCurrentIfAdded() ) {
setCurrentItem(item->name());
setNameToMakeCurrentIfAdded(QString());
makeItemVisible( item );
}
-
- op()->emitSelectionChanged();
+
+ op()->emitSelectionChanged();
return item;
}
-void KrView::updateItem(vfile *vf) {
- // since we're deleting the item, make sure we keep
- // it's properties first and repair it later
- QHash<QString, KrViewItem*>::iterator itr = _dict.find( vf->vfile_getName() );
- if ( itr == _dict.end() ) {
- krOut << "got signal updatedVfile(" << vf->vfile_getName() << ") but can't find KrViewItem" << endl;
- } else {
- KrViewItem * it = *itr;
- bool selected = it->isSelected();
- bool current = ( getCurrentKrViewItem() == it );
- delItem( vf->vfile_getName() );
- KrViewItem *updatedItem = addItem( vf );
- // restore settings
- ( _dict[ vf->vfile_getName() ] ) ->setSelected( selected );
+void KrView::updateItem(vfile *vf)
+{
+ // since we're deleting the item, make sure we keep
+ // it's properties first and repair it later
+ QHash<QString, KrViewItem*>::iterator itr = _dict.find( vf->vfile_getName() );
+ if ( itr == _dict.end() ) {
+ krOut << "got signal updatedVfile(" << vf->vfile_getName() << ") but can't find KrViewItem" << endl;
+ } else {
+ KrViewItem * it = *itr;
+ bool selected = it->isSelected();
+ bool current = ( getCurrentKrViewItem() == it );
+ delItem( vf->vfile_getName() );
+ KrViewItem *updatedItem = addItem( vf );
+ // restore settings
+ ( _dict[ vf->vfile_getName() ] ) ->setSelected( selected );
if ( current ) {
- setCurrentItem( vf->vfile_getName() );
+ setCurrentItem( vf->vfile_getName() );
makeItemVisible( updatedItem );
}
- }
+ }
op()->emitSelectionChanged();
}
-void KrView::clear() {
- _count = _numSelected = _numDirs = _selectedSize = _countSize = 0;
- _dict.clear();
+void KrView::clear()
+{
+ _count = _numSelected = _numDirs = _selectedSize = _countSize = 0;
+ _dict.clear();
}
// good old dialog box
-void KrView::renameCurrentItem() {
- QString newName, fileName;
+void KrView::renameCurrentItem()
+{
+ QString newName, fileName;
- KrViewItem *it = getCurrentKrViewItem();
- if ( it ) fileName = it->name();
- else return ; // quit if no current item available
-
- // don't allow anyone to rename ..
- if ( fileName == ".." ) return ;
+ KrViewItem *it = getCurrentKrViewItem();
+ if ( it ) fileName = it->name();
+ else return ; // quit if no current item available
+ // don't allow anyone to rename ..
+ if ( fileName == ".." ) return ;
+
bool ok = false;
newName = KInputDialog::getText( i18n( "Rename" ), i18n( "Rename " ) + fileName + i18n( " to:" ),
- fileName, &ok, krApp );
+ fileName, &ok, krApp );
// if the user canceled - quit
if ( !ok || newName == fileName )
return ;
op()->emitRenameItem(it->name(), newName);
}
-
Modified: trunk/krusader_kde4/krusader/Panel/krviewfactory.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Panel/krviewfactory.cpp 2008-05-29 17:39:32 UTC (rev 6015)
+++ trunk/krusader_kde4/krusader/Panel/krviewfactory.cpp 2008-05-29 21:00:15 UTC (rev 6016)
@@ -85,5 +85,5 @@
{
KrViewFactory::registerView( &detailedView );
KrViewFactory::registerView( &briefView );
-// KrViewFactory::registerView( &interView );
+ KrViewFactory::registerView( &interView );
}
Modified: trunk/krusader_kde4/krusader/Panel/krviewitem.h
===================================================================
--- trunk/krusader_kde4/krusader/Panel/krviewitem.h 2008-05-29 17:39:32 UTC (rev 6015)
+++ trunk/krusader_kde4/krusader/Panel/krviewitem.h 2008-05-29 21:00:15 UTC (rev 6016)
@@ -59,6 +59,7 @@
// DON'T USE THOSE OUTSIDE THE VIEWS!!!
inline const vfile* getVfile() const { return _vf; }
+ inline void setVfile(vfile *vf) { _vf = vf; }
inline vfile* getMutableVfile() { return _vf; }
inline bool isDummy() const { return dummyVfile; }
inline bool isHidden() const { return _hidden; }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cod...@us...> - 2008-05-29 17:48:29
|
Revision: 6015
http://krusader.svn.sourceforge.net/krusader/?rev=6015&view=rev
Author: codeknight
Date: 2008-05-29 10:39:32 -0700 (Thu, 29 May 2008)
Log Message:
-----------
all cmake options added + url
Modified Paths:
--------------
trunk/krusader_kde4/INSTALL
Modified: trunk/krusader_kde4/INSTALL
===================================================================
--- trunk/krusader_kde4/INSTALL 2008-05-27 19:16:31 UTC (rev 6014)
+++ trunk/krusader_kde4/INSTALL 2008-05-29 17:39:32 UTC (rev 6015)
@@ -204,3 +204,216 @@
/usr/bin/cmake -E cmake_progress_start /home/frank/krusader_kde4/CMakeFiles 0
frank@frank-kubuntu:~/krusader_kde4$
+
+--------------------------------------------------------------------------
+CMAKE OPTIONS
+http://websvn.kde.org/trunk/KDE/kdelibs/cmake/modules/FindKDE4Internal.cmake?view=markup
+
+# - Find the KDE4 include and library dirs, KDE preprocessors and define a some macros
+#
+# This module defines the following variables:
+#
+# KDE4_FOUND - set to TRUE if everything required for building KDE software has been found
+#
+# KDE4_DEFINITIONS - compiler definitions required for compiling KDE software
+# KDE4_INCLUDE_DIR - the KDE 4 include directory
+# KDE4_INCLUDES - all include directories required for KDE, i.e.
+# KDE4_INCLUDE_DIR, but also the Qt4 include directories
+# and other platform specific include directories
+# KDE4_LIB_DIR - the directory where the KDE libraries are installed,
+# intended to be used with LINK_DIRECTORIES()
+#
+# The following variables are defined for the various tools required to
+# compile KDE software:
+#
+# KDE4_KCFGC_EXECUTABLE - the kconfig_compiler executable
+# KDE4_AUTOMOC_EXECUTABLE - the kde4automoc executable
+# KDE4_MEINPROC_EXECUTABLE - the meinproc4 executable
+# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets executable
+#
+# The following variables point to the location of the KDE libraries,
+# but shouldn't be used directly:
+#
+# KDE4_KDECORE_LIBRARY - the kdecore library
+# KDE4_KDEUI_LIBRARY - the kdeui library
+# KDE4_KIO_LIBRARY - the kio library
+# KDE4_KPARTS_LIBRARY - the kparts library
+# KDE4_KUTILS_LIBRARY - the kutils library
+# KDE4_KDE3SUPPORT_LIBRARY - the kde3support library
+# KDE4_KFILE_LIBRARY - the kfile library
+# KDE4_KHTML_LIBRARY - the khtml library
+# KDE4_KJS_LIBRARY - the kjs library
+# KDE4_KJSAPI_LIBRARY - the kjs public api library
+# KDE4_KNEWSTUFF2_LIBRARY - the knewstuff2 library
+# KDE4_KDNSSD_LIBRARY - the kdnssd library
+# KDE4_PHONON_LIBRARY - the phonon library
+# KDE4_THREADWEAVER_LIBRARY- the threadweaver library
+# KDE4_SOLID_LIBRARY - the solid library
+# KDE4_KNOTIFYCONFIG_LIBRARY- the knotifyconfig library
+# KDE4_KROSSCORE_LIBRARY - the krosscore library
+# KDE4_KTEXTEDITOR_LIBRARY - the ktexteditor library
+# KDE4_KNEPOMUK_LIBRARY - the knepomuk library
+# KDE4_KMETADATA_LIBRARY - the kmetadata library
+#
+# Compared to the variables above, the following variables
+# also contain all of the depending libraries, so the variables below
+# should be used instead of the ones above:
+#
+# KDE4_KDECORE_LIBS - the kdecore library and all depending libraries
+# KDE4_KDEUI_LIBS - the kdeui library and all depending libraries
+# KDE4_KIO_LIBS - the kio library and all depending libraries
+# KDE4_KPARTS_LIBS - the kparts library and all depending libraries
+# KDE4_KUTILS_LIBS - the kutils library and all depending libraries
+# KDE4_KDE3SUPPORT_LIBS - the kde3support library and all depending libraries
+# KDE4_KFILE_LIBS - the kfile library and all depending libraries
+# KDE4_KHTML_LIBS - the khtml library and all depending libraries
+# KDE4_KJS_LIBS - the kjs library and all depending libraries
+# KDE4_KJSAPI_LIBS - the kjs public api library and all depending libraries
+# KDE4_KNEWSTUFF2_LIBS - the knewstuff2 library and all depending libraries
+# KDE4_KDNSSD_LIBS - the kdnssd library and all depending libraries
+# KDE4_KDESU_LIBS - the kdesu library and all depending libraries
+# KDE4_KPTY_LIBS - the kpty library and all depending libraries
+# KDE4_PHONON_LIBS - the phonon library and all depending librairies
+# KDE4_THREADWEAVER_LIBRARIES- the threadweaver library and all depending libraries
+# KDE4_SOLID_LIBS - the solid library and all depending libraries
+# KDE4_KNOTIFYCONFIG_LIBS - the knotify config library and all depending libraries
+# KDE4_KROSSCORE_LIBS - the kross core library and all depending libraries
+# KDE4_KROSSUI_LIBS - the kross ui library which includes core and all depending libraries
+# KDE4_KTEXTEDITOR_LIBS - the ktexteditor library and all depending libraries
+# KDE4_KNEPOMUK_LIBS - the knepomuk library and all depending libraries
+# KDE4_KMETADATA_LIBS - the kmetadata library and all depending libraries
+#
+# This module defines a bunch of variables used as locations for install directories.
+# They can be relative (to CMAKE_INSTALL_PREFIX) or absolute.
+# Under Windows they are always relative.
+#
+# BIN_INSTALL_DIR - the directory where executables will be installed (default is prefix/bin)
+# BUNDLE_INSTALL_DIR - Mac only: the directory where application bundles will be installed (default is /Applications/KDE4 )
+# SBIN_INSTALL_DIR - the directory where system executables will be installed (default is prefix/sbin)
+# LIB_INSTALL_DIR - the directory where libraries will be installed (default is prefix/lib)
+# CONFIG_INSTALL_DIR - the config file install dir
+# DATA_INSTALL_DIR - the parent directory where applications can install their data
+# HTML_INSTALL_DIR - the HTML install dir for documentation
+# ICON_INSTALL_DIR - the icon install dir (default prefix/share/icons/)
+# INFO_INSTALL_DIR - the kde info install dir (default prefix/info)
+# KCFG_INSTALL_DIR - the install dir for kconfig files
+# LOCALE_INSTALL_DIR - the install dir for translations
+# MAN_INSTALL_DIR - the kde man page install dir (default prefix/man/)
+# MIME_INSTALL_DIR - the install dir for the mimetype desktop files
+# PLUGIN_INSTALL_DIR - the subdirectory relative to the install prefix where plugins will be installed (default is ${KDE4_LIB_INSTALL_DIR}/kde4)
+# SERVICES_INSTALL_DIR - the install dir for service (desktop, protocol, ...) files
+# SERVICETYPES_INSTALL_DIR - the install dir for servicestypes desktop files
+# SOUND_INSTALL_DIR - the install dir for sound files
+# TEMPLATES_INSTALL_DIR - the install dir for templates (Create new file...)
+# WALLPAPER_INSTALL_DIR - the install dir for wallpapers
+# DEMO_INSTALL_DIR - the install dir for demos
+# KCONF_UPDATE_INSTALL_DIR - the kconf_update install dir
+# XDG_APPS_INSTALL_DIR - the XDG apps dir
+# XDG_DIRECTORY_INSTALL_DIR- the XDG directory
+# XDG_MIME_INSTALL_DIR - the XDG mimetypes install dir
+# DBUS_INTERFACES_INSTALL_DIR - the directory where dbus interfaces be installed (default is prefix/share/dbus-1/interfaces)
+# DBUS_SERVICES_INSTALL_DIR - the directory where dbus services be installed (default is prefix/share/dbus-1/services )
+#
+# The following variable is provided, but seem to be unused:
+# LIBS_HTML_INSTALL_DIR /share/doc/HTML CACHE STRING "Is this still used ?")
+#
+# The following user adjustable options are provided:
+#
+# KDE4_ENABLE_FINAL - enable KDE-style enable-final all-in-one-compilation
+# KDE4_BUILD_TESTS - enable this to build the testcases
+# KDE4_ENABLE_FPIE - enable it to use gcc Position Independent Executables feature
+#
+# It also adds the following macros (from KDE4Macros.cmake)
+# KDE4_ADD_UI_FILES (SRCS_VAR file1.ui ... fileN.ui)
+# Use this to add Qt designer ui files to your application/library.
+#
+# KDE4_ADD_UI3_FILES (SRCS_VAR file1.ui ... fileN.ui)
+# Use this to add Qt designer ui files from Qt version 3 to your application/library.
+#
+# KDE4_ADD_KCFG_FILES (SRCS_VAR [GENERATE_MOC] file1.kcfgc ... fileN.kcfgc)
+# Use this to add KDE config compiler files to your application/library.
+# Use optional GENERATE_MOC to generate moc if you use signals in your kcfg files.
+#
+# KDE4_ADD_WIDGET_FILES (SRCS_VAR file1.widgets ... fileN.widgets)
+# Use this to add widget description files for the makekdewidgets code generator
+# for Qt Designer plugins.
+#
+# KDE4_CREATE_FINAL_FILES (filename_CXX filename_C file1 ... fileN)
+# This macro is intended mainly for internal uses.
+# It is used for enable-final. It will generate two source files,
+# one for the C files and one for the C++ files.
+# These files will have the names given in filename_CXX and filename_C.
+#
+# KDE4_ADD_PLUGIN ( name [WITH_PREFIX] file1 ... fileN )
+# Create a KDE plugin (KPart, kioslave, etc.) from the given source files.
+# It supports KDE4_ENABLE_FINAL.
+# If WITH_PREFIX is given, the resulting plugin will have the prefix "lib", otherwise it won't.
+# It creates and installs an appropriate libtool la-file.
+#
+# KDE4_ADD_KDEINIT_EXECUTABLE (name [NOGUI] [RUN_UNINSTALLED] file1 ... fileN)
+# Create a KDE application in the form of a module loadable via kdeinit.
+# A library named kdeinit_<name> will be created and a small executable which links to it.
+# It supports KDE4_ENABLE_FINAL
+# If the executable has to be run from the buildtree (e.g. unit tests and code generators
+# used later on when compiling), set the option RUN_UNINSTALLED.
+# If the executable doesn't have a GUI, use the option NOGUI. By default on OS X
+# application bundles are created, with the NOGUI option no bundles but simple executables
+# are created. Currently it doesn't have any effect on other platforms.
+#
+# KDE4_ADD_EXECUTABLE (name [NOGUI] [RUN_UNINSTALLED] file1 ... fileN)
+# Equivalent to ADD_EXECUTABLE(), but additionally adds some more features:
+# -support for KDE4_ENABLE_FINAL
+# -support for automoc
+# -automatic RPATH handling
+# If the executable has to be run from the buildtree (e.g. unit tests and code generators
+# used later on when compiling), set the option RUN_UNINSTALLED.
+# If the executable doesn't have a GUI, use the option NOGUI. By default on OS X
+# application bundles are created, with the NOGUI option no bundles but simple executables
+# are created. Currently it doesn't have any effect on other platforms.
+#
+# KDE4_ADD_LIBRARY (name [STATIC | SHARED | MODULE ] file1 ... fileN)
+# Equivalent to ADD_LIBRARY(), but additionally it supports KDE4_ENABLE_FINAL
+# and under Windows it adds a -DMAKE_<name>_LIB definition to the compilation.
+#
+# KDE4_ADD_UNIT_TEST (testname [TESTNAME targetname] file1 ... fileN)
+# add a unit test, which is executed when running make test
+# it will be built with RPATH poiting to the build dir
+# The targets are always created, but only built for the "all"
+# target if the option KDE4_BUILD_TESTS is enabled. Otherwise the rules for the target
+# are created but not built by default. You can build them by manually building the target.
+# The name of the target can be specified using TESTNAME <targetname>, if it is not given
+# the macro will default to the <testname>
+#
+# KDE4_ADD_TEST_EXECUTABLE (name file1 ... fileN)
+# add an test executable
+# it will be built with RPATH poiting to the build dir
+# The targets are always created, but only built for the "all"
+# target if the option KDE4_BUILD_TESTS is enabled. Otherwise the rules for the target
+# are created but not built by default. You can build them by manually building the target.
+# KDESRCDIR is set to the source directory of the test, this can be used with
+# KGlobal::dirs()->addResourceDir( "data", KDESRCDIR ); to be able to use xmlgui
+# and other things in the test, that normally require installation
+#
+# KDE4_UPDATE_ICONCACHE()
+# Notifies the icon cache that new icons have been installed by updating
+# mtime of ${ICON_INSTALL_DIR}/hicolor directory.
+#
+# KDE4_INSTALL_ICONS( path theme)
+# Installs all png and svgz files in the current directory to the icon
+# directoy given in path, in the subdirectory for the given icon theme.
+#
+# KDE4_CREATE_HANDBOOK( docbookfile [INSTALL_DESTINATION installdest] [SUBDIR subdir])
+# Create the handbook from the docbookfile (using meinproc4)
+# The resulting handbook will be installed to <installdest> when using
+# INSTALL_DESTINATION <installdest>, or to <installdest>/<subdir> if
+# SUBDIR <subdir> is specified.
+#
+# KDE4_CREATE_MANPAGE( docbookfile section )
+# Create the manpage for the specified section from the docbookfile (using meinproc4)
+# The resulting manpage will be installed to <installdest> when using
+# INSTALL_DESTINATION <installdest>, or to <installdest>/<subdir> if
+# SUBDIR <subdir> is specified.
+
+
+# _KDE4_PLATFORM_INCLUDE_DIRS is used only internally
+# _KDE4_PLATFORM_DEFINITIONS is used only internally
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ck...@us...> - 2008-05-27 19:16:28
|
Revision: 6014
http://krusader.svn.sourceforge.net/krusader/?rev=6014&view=rev
Author: ckarai
Date: 2008-05-27 12:16:31 -0700 (Tue, 27 May 2008)
Log Message:
-----------
FIXED: [ 1854760 ] [ 1516619 ] inconsistent search
Modified Paths:
--------------
trunk/krusader_kde4/ChangeLog
trunk/krusader_kde4/krusader/Dialogs/kurllistrequester.cpp
trunk/krusader_kde4/krusader/Dialogs/kurllistrequester.h
trunk/krusader_kde4/krusader/Filter/generalfilter.cpp
trunk/krusader_kde4/krusader/Filter/generalfilter.h
Modified: trunk/krusader_kde4/ChangeLog
===================================================================
--- trunk/krusader_kde4/ChangeLog 2008-05-26 01:46:40 UTC (rev 6013)
+++ trunk/krusader_kde4/ChangeLog 2008-05-27 19:16:31 UTC (rev 6014)
@@ -14,6 +14,7 @@
ADDED: new synchronizer shortcuts for modifying the synchronizer tasks
ADDED: credit for Václav in the about box
+ FIXED: [ 1854760 ] [ 1516619 ] inconsistent search
FIXED: [ 1920084 ] kdiff3 is allowed to handle remote URL-s
FIXED: [ 1638817 ] toolbar loses orientation when modified
FIXED: [ 1578310 ] can't open ISO image by symbolic link
Modified: trunk/krusader_kde4/krusader/Dialogs/kurllistrequester.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Dialogs/kurllistrequester.cpp 2008-05-26 01:46:40 UTC (rev 6013)
+++ trunk/krusader_kde4/krusader/Dialogs/kurllistrequester.cpp 2008-05-27 19:16:31 UTC (rev 6014)
@@ -84,6 +84,7 @@
connect( urlLineEdit, SIGNAL( returnPressed(const QString&) ), this, SLOT( slotAdd() ) );
connect( urlListBox, SIGNAL( itemRightClicked( QListWidgetItem *, const QPoint & ) ), this,
SLOT( slotRightClicked( QListWidgetItem *, const QPoint & ) ) );
+ connect( urlLineEdit, SIGNAL( textChanged ( const QString & ) ), this, SIGNAL( changed() ) );
}
void KURLListRequester::slotAdd()
@@ -100,6 +101,7 @@
{
urlListBox->addItem( text );
urlLineEdit->clear();
+ emit changed();
}
}
}
@@ -131,6 +133,7 @@
QList<QListWidgetItem *> delList = urlListBox->selectedItems();
for( int i=0; i != delList.count(); i++ )
delete delList[ i ];
+ emit changed();
}
void KURLListRequester::slotRightClicked( QListWidgetItem *item, const QPoint &pos )
@@ -145,8 +148,10 @@
{
if( item->isSelected() )
deleteSelectedItems();
- else
+ else {
delete item;
+ emit changed();
+ }
}
}
@@ -187,6 +192,8 @@
for ( it = urlList.begin(); it != urlList.end(); ++it )
urlListBox->addItem( it->pathOrUrl() );
+
+ emit changed();
}
#include "kurllistrequester.moc"
Modified: trunk/krusader_kde4/krusader/Dialogs/kurllistrequester.h
===================================================================
--- trunk/krusader_kde4/krusader/Dialogs/kurllistrequester.h 2008-05-26 01:46:40 UTC (rev 6013)
+++ trunk/krusader_kde4/krusader/Dialogs/kurllistrequester.h 2008-05-27 19:16:31 UTC (rev 6014)
@@ -56,6 +56,7 @@
signals:
void checkValidity( QString &text, QString &error );
+ void changed();
protected slots:
void slotAdd();
Modified: trunk/krusader_kde4/krusader/Filter/generalfilter.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Filter/generalfilter.cpp 2008-05-26 01:46:40 UTC (rev 6013)
+++ trunk/krusader_kde4/krusader/Filter/generalfilter.cpp 2008-05-27 19:16:31 UTC (rev 6014)
@@ -145,6 +145,7 @@
ofType->addItem ( i18n ( "Text Files" ) );
ofType->addItem ( i18n ( "Video Files" ) );
ofType->addItem ( i18n ( "Audio Files" ) );
+ connect( ofType, SIGNAL( currentIndexChanged(int) ), this, SLOT( slotDisable() ) );
nameGroupLayout->addWidget ( ofType, 1, 1 );
filterLayout->addWidget ( nameGroup, 0, 0 );
@@ -205,6 +206,7 @@
searchIn = new KURLListRequester ( searchInGroup );
searchInLayout->addWidget ( searchIn, 0, 0 );
+ connect( searchIn, SIGNAL( changed() ), this, SLOT( slotDisable() ) );
middleLayout->addWidget ( searchInGroup );
}
@@ -241,7 +243,7 @@
containsTextLayout->setSpacing ( 6 );
containsTextLayout->setContentsMargins ( 0, 0, 0, 0 );
- QLabel *containsLabel = new QLabel ( containsGroup );
+ containsLabel = new QLabel ( containsGroup );
QSizePolicy containsLabelPolicy( QSizePolicy::Fixed, QSizePolicy::Minimum );
containsLabelPolicy.setHeightForWidth( containsLabel->sizePolicy().hasHeightForWidth() );
containsLabel->setSizePolicy ( containsLabelPolicy );
@@ -268,7 +270,7 @@
patterns->addAction(new RegExpAction(patterns, i18n(items[i].description),
items[i].regExp, items[i].cursorAdjustment));
}
- connect( containsRegExp, SIGNAL( toggled( bool ) ), this, SLOT( slotRegExpToggled( bool ) ) );
+ connect( containsRegExp, SIGNAL( toggled( bool ) ), this, SLOT( slotDisable() ) );
connect( containsRegExp, SIGNAL( triggered( QAction * ) ), this, SLOT( slotRegExpTriggered( QAction * ) ) );
containsRegExp->setMenu( patterns );
patterns->setEnabled( false );
@@ -281,7 +283,7 @@
containsCbsLayout->setSpacing ( 6 );
containsCbsLayout->setContentsMargins ( 0, 0, 0, 0 );
- QLabel *encLabel = new QLabel( i18n( "Encoding:" ), containsGroup );
+ encLabel = new QLabel( i18n( "Encoding:" ), containsGroup );
containsCbsLayout->addWidget ( encLabel );
contentEncoding = new QComboBox( containsGroup );
contentEncoding->setEditable( false );
@@ -378,6 +380,8 @@
setTabOrder ( searchFor, containsText ); // search for -> content
setTabOrder ( containsText, searchType ); // content -> search type
+
+ slotDisable();
}
GeneralFilter::~GeneralFilter()
@@ -626,9 +630,31 @@
profileManager->loadProfile ( item->text() );
}
-void GeneralFilter::slotRegExpToggled( bool state ) {
- containsWholeWord->setEnabled( !state );
- containsRegExp->menu()->setEnabled( state );
+void GeneralFilter::slotDisable() {
+ bool state = containsRegExp->isChecked();
+ bool global = ofType->currentText() !=i18n ( "Directories" );
+ bool remoteOnly = false;
+ if ( properties & FilterTabs::HasSearchIn )
+ {
+ KUrl::List urlList = searchIn->urlList();
+ remoteOnly = urlList.count() != 0;
+ foreach( KUrl url, urlList )
+ if( url.protocol() == "file" )
+ remoteOnly = false;
+ }
+
+ containsWholeWord->setEnabled( !state && global );
+ containsRegExp->menu()->setEnabled( state && global );
+ encLabel->setEnabled( global );
+ contentEncoding->setEnabled( global );
+ containsTextCase->setEnabled( global );
+ containsRegExp->setEnabled( global );
+ if ( properties & FilterTabs::HasRemoteContentSearch )
+ remoteContentSearch->setEnabled( global );
+ if ( properties & FilterTabs::HasRecurseOptions )
+ searchInArchives->setEnabled( global && !remoteOnly );
+ containsLabel->setEnabled( global );
+ containsText->setEnabled( global );
}
void GeneralFilter::slotRegExpTriggered( QAction * act ) {
Modified: trunk/krusader_kde4/krusader/Filter/generalfilter.h
===================================================================
--- trunk/krusader_kde4/krusader/Filter/generalfilter.h 2008-05-26 01:46:40 UTC (rev 6013)
+++ trunk/krusader_kde4/krusader/Filter/generalfilter.h 2008-05-27 19:16:31 UTC (rev 6014)
@@ -67,7 +67,7 @@
void slotLoadBtnClicked();
void slotOverwriteBtnClicked();
void slotRemoveBtnClicked();
- void slotRegExpToggled( bool );
+ void slotDisable();
void slotRegExpTriggered( QAction * act );
void slotProfileDoubleClicked( QListWidgetItem * );
void refreshProfileListBox();
@@ -92,6 +92,9 @@
KComboBox* ofType;
+ QLabel *encLabel;
+ QLabel *containsLabel;
+
KShellCompletion completion;
KrListWidget *profileListBox;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ck...@us...> - 2008-05-26 01:46:31
|
Revision: 6013
http://krusader.svn.sourceforge.net/krusader/?rev=6013&view=rev
Author: ckarai
Date: 2008-05-25 18:46:40 -0700 (Sun, 25 May 2008)
Log Message:
-----------
FIXED: viewer crash
Modified Paths:
--------------
trunk/krusader_kde4/krusader/KViewer/krviewer.cpp
Modified: trunk/krusader_kde4/krusader/KViewer/krviewer.cpp
===================================================================
--- trunk/krusader_kde4/krusader/KViewer/krviewer.cpp 2008-05-25 12:30:41 UTC (rev 6012)
+++ trunk/krusader_kde4/krusader/KViewer/krviewer.cpp 2008-05-26 01:46:40 UTC (rev 6013)
@@ -96,9 +96,7 @@
detachAction->setEnabled(false);
viewerMenu->addSeparator();
viewerMenu->addAction( printAction->icon(), printAction->text(), this, SLOT( print() ))->setShortcut( printAction->shortcut().primary() );
- toolBar()->addAction( printAction->icon(), printAction->text(), this, SLOT( print() ));
viewerMenu->addAction( copyAction->icon(), copyAction->text(), this, SLOT( copy() ))->setShortcut( copyAction->shortcut().primary() );
- toolBar()->addAction( copyAction->icon(), copyAction->text(), this, SLOT( copy() ) );
viewerMenu->addSeparator();
( tabClose = viewerMenu->addAction( i18n( "&Close current tab" ), this, SLOT( tabCloseRequest() )))->setShortcut( Qt::Key_Escape );
( closeAct = viewerMenu->addAction( i18n( "&Quit" ), this, SLOT( close() )))->setShortcut( Qt::CTRL + Qt::Key_Q );
@@ -384,7 +382,7 @@
krApp->raise();
krApp->activateWindow();
}
- delete this;
+ this->deleteLater();
return;
} else if( tabBar.count() == 1 ){
//no point in detaching only one tab..
@@ -558,16 +556,18 @@
}
void KrViewer::updateActions( PanelViewerBase * pvb ) {
- if( pvb->isEditor() ) {
- printAction->setVisible(false);
- copyAction->setVisible(false);
+ QList<QAction *> actList = toolBar()->actions();
+ bool hasPrint = false, hasCopy = false;
+ foreach( QAction *a, actList ) {
+ if( a->text() == printAction->text() )
+ hasPrint = true;
+ if( a->text() == copyAction->text() )
+ hasCopy = true;
}
- else {
- if( !printAction->isVisible() )
- printAction->setVisible( true );
- if( !copyAction->isVisible() )
- copyAction->setVisible( true );
- }
+ if( !hasPrint )
+ toolBar()->addAction( printAction->icon(), printAction->text(), this, SLOT( print() ));
+ if( !hasCopy )
+ toolBar()->addAction( copyAction->icon(), copyAction->text(), this, SLOT( copy() ) );
}
#if 0
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cod...@us...> - 2008-05-25 12:30:35
|
Revision: 6012
http://krusader.svn.sourceforge.net/krusader/?rev=6012&view=rev
Author: codeknight
Date: 2008-05-25 05:30:41 -0700 (Sun, 25 May 2008)
Log Message:
-----------
more details added
Modified Paths:
--------------
trunk/krusader_kde4/INSTALL
Modified: trunk/krusader_kde4/INSTALL
===================================================================
--- trunk/krusader_kde4/INSTALL 2008-05-23 12:53:25 UTC (rev 6011)
+++ trunk/krusader_kde4/INSTALL 2008-05-25 12:30:41 UTC (rev 6012)
@@ -69,12 +69,138 @@
- libphonon-dev
-Optional instructions
----------------------
-DCMAKE_INSTALL_PREFIX is the location of the KDE DQT_INCLUDES
+cmake options
+-------------
+-DCMAKE_INSTALL_PREFIX is the location of the KDE DQT_INCLUDES
+-DCMAKE_INSTALL_PREFIX=/usr/ is the location where Krusader will be
+ installed with the make command
$ tar -xzvf krusader_kde4.tar.gz
$ cd krusader_kde4
$ cmake -DCMAKE_INSTALL_PREFIX=/usr/ -DQT_INCLUDES=/usr/share/qt4/include
+
+
+Compilation and installation
+----------------------------
+Compilation will take about 5 to 10 minutes depending on your CPU speed.
+
$ make
$ su -c "make install"
+
+
+Uninstall
+---------
+$ su -c "make uninstall"
+
+
+
+FYI
+The output of cmake
+-------------------
+This is the cmake output on Kubuntu 8.04 (KDE 4 Remix)
+
+frank@frank-kubuntu:~/krusader_kde4$ cmake -DCMAKE_INSTALL_PREFIX=/usr/ -DQT_INCLUDES=/usr/share/qt4/include
+-- Check for working C compiler: /usr/bin/gcc
+-- Check for working C compiler: /usr/bin/gcc -- works
+-- Check size of void*
+-- Check size of void* - done
+-- Check for working CXX compiler: /usr/bin/c++
+-- Check for working CXX compiler: /usr/bin/c++ -- works
+-- Looking for Q_WS_X11
+-- Looking for Q_WS_X11 - found
+-- Looking for Q_WS_WIN
+-- Looking for Q_WS_WIN - not found.
+-- Looking for Q_WS_QWS
+-- Looking for Q_WS_QWS - not found.
+-- Looking for Q_WS_MAC
+-- Looking for Q_WS_MAC - not found.
+-- Found Qt-Version 4.3.4 (using /usr/bin/qmake)
+-- Looking for XOpenDisplay in /usr/lib/libX11.so;/usr/lib/libXext.so;/usr/lib/libXft.so;/usr/lib/libXau.so;/usr/lib/libXdmcp.so
+-- Looking for XOpenDisplay in /usr/lib/libX11.so;/usr/lib/libXext.so;/usr/lib/libXft.so;/usr/lib/libXau.so;/usr/lib/libXdmcp.so - found
+-- Looking for gethostbyname
+-- Looking for gethostbyname - found
+-- Looking for connect
+-- Looking for connect - found
+-- Looking for remove
+-- Looking for remove - found
+-- Looking for shmat
+-- Looking for shmat - found
+-- Looking for IceConnectionNumber in ICE
+-- Looking for IceConnectionNumber in ICE - found
+-- Found X11: /usr/lib/libX11.so
+-- Looking for pthread.h
+-- Looking for pthread.h - found
+-- Looking for pthread_create in pthreads
+-- Looking for pthread_create in pthreads - not found
+-- Looking for pthread_create in pthread
+-- Looking for pthread_create in pthread - found
+-- Performing Test HAVE_FPIE_SUPPORT
+-- Performing Test HAVE_FPIE_SUPPORT - Success
+-- Performing Test __KDE_HAVE_NO_THREADSAFE_STATICS
+-- Performing Test __KDE_HAVE_NO_THREADSAFE_STATICS - Success
+-- Performing Test __KDE_HAVE_W_OVERLOADED_VIRTUAL
+-- Performing Test __KDE_HAVE_W_OVERLOADED_VIRTUAL - Success
+-- Performing Test __KDE_HAVE_GCC_VISIBILITY
+-- Performing Test __KDE_HAVE_GCC_VISIBILITY - Success
+-- Found KDE 4.0 include dir: /usr/lib/kde4/include
+-- Found KDE 4 library dir: /usr/lib/kde4/lib
+-- Found KDE4 kconfig_compiler preprocessor: /usr/lib/kde4/bin/kconfig_compiler
+-- Found KDE4 automoc: /usr/lib/kde4/bin/kde4automoc
+-- /home/frank/krusader_kde4/krusader: skipped subdir $(KRJSDIR)
+-- Looking for include files HAVE_LIBINTL_H
+-- Looking for include files HAVE_LIBINTL_H - found
+-- Looking for dgettext
+-- Looking for dgettext - found
+-- Found Gettext: built in libc
+-- Found ZLIB: /usr/lib/libz.so
+-- /home/frank/krusader_kde4: skipped subdir $(TARDIR)
+-- Configuring done
+-- Generating done
+-- Build files have been written to: /home/frank/krusader_kde4
+frank@frank-kubuntu:~/krusader_kde4$
+
+
+FYI
+The output of make (partial)
+----------------------------
+frank@frank-kubuntu:~/krusader_kde4$ make
+/usr/bin/cmake -H/home/frank/krusader_kde4 -B/home/frank/krusader_kde4 --check-build-system CMakeFiles/Makefile.cmake 0
+/usr/bin/cmake -E cmake_progress_start /home/frank/krusader_kde4/CMakeFiles 100
+make -f CMakeFiles/Makefile2 all
+make[1]: Entering directory `/home/frank/krusader_kde4'
+make -f krusader/Filter/CMakeFiles/Filter.dir/build.make krusader/Filter/CMakeFiles/Filter.dir/depend
+make[2]: Entering directory `/home/frank/krusader_kde4'
+/usr/bin/cmake -E cmake_progress_report /home/frank/krusader_kde4/CMakeFiles 30
+[ 1%] Generating Filter_automoc.cpp
+cd /home/frank/krusader_kde4/krusader/Filter && /usr/lib/kde4/bin/kde4automoc /home/frank/krusader_kde4/krusader/Filter/Filter_automoc.cpp /home/frank/krusader_kde4/krusader/Filter /home/frank/krusader_kde4/krusader/Filter /usr/bin/moc-qt4
+Generating filterdialog.moc
+Generating filtertabs.moc
+Generating advancedfilter.moc
+Generating generalfilter.moc
+Scanning dependencies of target Filter
+cd /home/frank/krusader_kde4 && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /home/frank/krusader_kde4 /home/frank/krusader_kde4/krusader/Filter /home/frank/krusader_kde4 /home/frank/krusader_kde4/krusader/Filter /home/frank/krusader_kde4/krusader/Filter/CMakeFiles/Filter.dir/DependInfo.cmake
+make[2]: Leaving directory `/home/frank/krusader_kde4'
+make -f krusader/Filter/CMakeFiles/Filter.dir/build.make krusader/Filter/CMakeFiles/Filter.dir/build
+make[2]: Entering directory `/home/frank/krusader_kde4'
+/usr/bin/cmake -E cmake_progress_report /home/frank/krusader_kde4/CMakeFiles 28
+[ 2%] Building CXX object krusader/Filter/CMakeFiles/Filter.dir/Filter_automoc.o
+/usr/bin/c++ -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-exceptions -fno-check-new -fno-common -Woverloaded-virtual -fvisibility=hidden -fvisibility-inlines-hidden -O2 -g -I/home/frank/krusader_kde4/krusader/Filter -I/usr/lib/kde4/include -I/usr/include/qt4/QtDBus -I/usr/include/qt4/QtTest -I/usr/include/qt4/QtUiTools -I/usr/include/qt4/QtScript -I/usr/include/qt4/QtSvg -I/usr/include/qt4/QtXml -I/usr/include/qt4/QtSql -I/usr/include/qt4/QtOpenGL -I/usr/include/qt4/QtNetwork -I/usr/include/qt4/QtDesigner -I/usr/include/qt4/QtAssistant -I/usr/include/qt4/Qt3Support -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtCore -I/usr/include/qt4/Qt -I/usr/share/qt4/mkspecs/default -I/usr/include/qt4 -D_BSD_SOURCE -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_GNU_SOURCE -DQT_NO_STL -DQT_NO_CAST_TO_ASCII -D_REENTRANT -DKDE_DEPRECATED_WARNINGS -DVERSION='"2.0.0-beta1"' -DRELEASE_NAME='"Phoenix` Egg"' -o krusader/Filter/CMakeFiles/Filter.dir/Filter_automoc.o -c /home/frank/krusader_kde4/krusader/Filter/Filter_automoc.cpp
+/usr/bin/cmake -E cmake_progress_report /home/frank/krusader_kde4/CMakeFiles
+[ 2%] Building CXX object krusader/Filter/CMakeFiles/Filter.dir/advancedfilter.o
+/usr/bin/c++ -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-exceptions -fno-check-new -fno-common -Woverloaded-virtual -fvisibility=hidden -fvisibility-inlines-hidden -O2 -g -I/home/frank/krusader_kde4/krusader/Filter -I/usr/lib/kde4/include -I/usr/include/qt4/QtDBus -I/usr/include/qt4/QtTest -I/usr/include/qt4/QtUiTools -I/usr/include/qt4/QtScript -I/usr/include/qt4/QtSvg -I/usr/include/qt4/QtXml -I/usr/include/qt4/QtSql -I/usr/include/qt4/QtOpenGL -I/usr/include/qt4/QtNetwork -I/usr/include/qt4/QtDesigner -I/usr/include/qt4/QtAssistant -I/usr/include/qt4/Qt3Support -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtCore -I/usr/include/qt4/Qt -I/usr/share/qt4/mkspecs/default -I/usr/include/qt4 -D_BSD_SOURCE -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_GNU_SOURCE -DQT_NO_STL -DQT_NO_CAST_TO_ASCII -D_REENTRANT -DKDE_DEPRECATED_WARNINGS -DVERSION='"2.0.0-beta1"' -DRELEASE_NAME='"Phoenix` Egg"' -o krusader/Filter/CMakeFiles/Filter.dir/advancedfilter.o -c /home/frank/krusader_kde4/krusader/Filter/advancedfilter.cpp
+...
+...
+...
+[100%] Building C object iso/CMakeFiles/kio_iso.dir/libisofs/isofs.o
+/usr/bin/gcc -Dkio_iso_EXPORTS -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common -O2 -g -fPIC -I/home/frank/krusader_kde4/iso -I/usr/lib/kde4/include -I/usr/include/qt4/QtDBus -I/usr/include/qt4/QtTest -I/usr/include/qt4/QtUiTools -I/usr/include/qt4/QtScript -I/usr/include/qt4/QtSvg -I/usr/include/qt4/QtXml -I/usr/include/qt4/QtSql -I/usr/include/qt4/QtOpenGL -I/usr/include/qt4/QtNetwork -I/usr/include/qt4/QtDesigner -I/usr/include/qt4/QtAssistant -I/usr/include/qt4/Qt3Support -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtCore -I/usr/include/qt4/Qt -I/usr/share/qt4/mkspecs/default -I/usr/include/qt4 -D_BSD_SOURCE -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_GNU_SOURCE -DQT_NO_STL -DQT_NO_CAST_TO_ASCII -D_REENTRANT -DKDE_DEPRECATED_WARNINGS -DVERSION='"2.0.0-beta1"' -DRELEASE_NAME='"Phoenix` Egg"' -o iso/CMakeFiles/kio_iso.dir/libisofs/isofs.o -c /home/frank/krusader_kde4/iso/libisofs/isofs.c
+Linking CXX shared module ../lib/kio_iso.so
+cd /home/frank/krusader_kde4/iso && /usr/bin/cmake -P CMakeFiles/kio_iso.dir/cmake_clean_target.cmake
+cd /home/frank/krusader_kde4/iso && /usr/bin/cmake -E cmake_link_script CMakeFiles/kio_iso.dir/link.txt --verbose=1
+/usr/bin/c++ -fPIC -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-exceptions -fno-check-new -fno-common -Woverloaded-virtual -fvisibility=hidden -fvisibility-inlines-hidden -O2 -g -Wl,--enable-new-dtags -Wl,--fatal-warnings -Wl,--no-undefined -lc -shared -Wl,-soname,kio_iso.so -o ../lib/kio_iso.so "CMakeFiles/kio_iso.dir/kio_iso_automoc.o" "CMakeFiles/kio_iso.dir/kisodirectory.o" "CMakeFiles/kio_iso.dir/kisofile.o" "CMakeFiles/kio_iso.dir/qfilehack.o" "CMakeFiles/kio_iso.dir/kiso.o" "CMakeFiles/kio_iso.dir/iso.o" "CMakeFiles/kio_iso.dir/libisofs/isofs.o" -L/usr/lib/kde4/lib -lQtCore -lpthread -lQtNetwork -lQtDBus -lQtXml -lz -lbz2 -lresolv -lkdecore -lQtCore -lpthread -lkdecore -lkdeui -lz -lstreamanalyzer -lstreams -lQtCore -lpthread -lkdecore -lsolid -lXrender -lkio -lz -lQtSvg -lSM -lICE -lX11 -lXext -lXft -lXau -lXdmcp -lXtst -lXcursor -lXfixes -lQtNetwork -lbz2 -lresolv -lQtCore -lpthread -lQtDBus -lQtXml -lQtGui
+make[2]: Leaving directory `/home/frank/krusader_kde4'
+/usr/bin/cmake -E cmake_progress_report /home/frank/krusader_kde4/CMakeFiles 97 98 99 100
+[100%] Built target kio_iso
+make[1]: Leaving directory `/home/frank/krusader_kde4'
+/usr/bin/cmake -E cmake_progress_start /home/frank/krusader_kde4/CMakeFiles 0
+frank@frank-kubuntu:~/krusader_kde4$
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Frank S. <fra...@gm...> - 2008-05-23 12:56:24
|
Committed. Thanks! Once there is a link like this http://packages.debian.org/sid/krusader for krusader-2-kde4 i can use this url and add some more missing packages ;) bye, Frank On Fri, May 23, 2008 at 8:00 AM, Fathi Boudra <fb...@gm...> wrote: > Hi, > > On Wednesday 21 May 2008 23:32:12 cod...@us... wrote: >> ADDED: KDE4.0 installation instructions > > you need zlib development files too (zlib1g-dev on Debian/Ubuntu). > > cheers, > > Fathi > > ------------------------------------------------------------------------- > This SF.net email is sponsored by: Microsoft > Defy all challenges. Microsoft(R) Visual Studio 2008. > http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ > _______________________________________________ > Krusader-commits mailing list > Kru...@li... > https://lists.sourceforge.net/lists/listinfo/krusader-commits > |
|
From: <cod...@us...> - 2008-05-23 12:53:17
|
Revision: 6011
http://krusader.svn.sourceforge.net/krusader/?rev=6011&view=rev
Author: codeknight
Date: 2008-05-23 05:53:25 -0700 (Fri, 23 May 2008)
Log Message:
-----------
added zlib1g-dev, thanks Fathi !
Modified Paths:
--------------
trunk/krusader_kde4/INSTALL
Modified: trunk/krusader_kde4/INSTALL
===================================================================
--- trunk/krusader_kde4/INSTALL 2008-05-22 20:00:43 UTC (rev 6010)
+++ trunk/krusader_kde4/INSTALL 2008-05-23 12:53:25 UTC (rev 6011)
@@ -17,6 +17,7 @@
Krusader dependencies
---------------------
- c libraries
+- zlib1g-dev library for implementing the deflate compression method found in gzip and PKZIP
- kdelibs5 KDE4 core libraries and binaries for all KDE4 applications
- libkjsembed1 Embedded JavaScript library
(for the the optional Javascripting function in Krusader)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
7 messages has been excluded from this view by a project administrator.
