2 files changed, 26 insertions, 34 deletions
diff --git a/libopie2/opieui/fileselector/ofiledialog.cpp b/libopie2/opieui/fileselector/ofiledialog.cpp
index 2d38961..11a9e33 100644
--- a/libopie2/opieui/fileselector/ofiledialog.cpp
+++ b/libopie2/opieui/fileselector/ofiledialog.cpp
@@ -3,14 +3,14 @@
 � � � � � � �.=l.            Copyright (C) Holger Freyther <freyther@handhelds.org>
 � � � � � �.>+-=
 �_;:, � � .> � �:=|.         This library is free software; you can
 .> <`_, � > �. � <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.-- � :           the terms of the GNU Library General Public
 .="- .-=="i, � � .._         License as published by the Free Software
-�- . � .-<_> � � .<>         Foundation; either version 2 of the License,
+�- . � .-<_> � � .<>         Foundation; version 2 of the License.
-� � �._= =} � � � :          or (at your option) any later version.
+� � �._= =} � � � :
 � � .%`+i> � � � _;_.
 � � .i_,=:_. � � �-<s.       This library is distributed in the hope that
 � � �+ �. �-:. � � � =       it will be useful,  but WITHOUT ANY WARRANTY;
 � � : .. � �.:, � � . . .    without even the implied warranty of
 � � =_ � � � �+ � � =;=|`    MERCHANTABILITY or FITNESS FOR A
 � _.=:. � � � : � �:=>`:     PARTICULAR PURPOSE. See the GNU
diff --git a/libopie2/opieui/fileselector/ofileselector.cpp b/libopie2/opieui/fileselector/ofileselector.cpp
index 02404e5..5b5dc2f 100644
--- a/libopie2/opieui/fileselector/ofileselector.cpp
+++ b/libopie2/opieui/fileselector/ofileselector.cpp
@@ -1,34 +1,32 @@
 /*
-                             This file is part of the Opie Project
+� � � � � � � �=.            This file is part of the OPIE Project
+� � � � � � �.=l.            Copyright (C) Holger Freyther <freyther@handhelds.org>
-                             Copyright (C) 2002,2003 Holger Freyther <zecke@handhelds.org>
+� � � � � �.>+-=
-              =.
+�_;:, � � .> � �:=|.         This library is free software; you can
-            .=l.
+.> <`_, � > �. � <=          redistribute it and/or  modify it under
-           .>+-=
+    :`=1 )Y*s>-.-- � :       the terms of the GNU Library General Public
- _;:,     .>    :=|.         This program is free software; you can
+.="- .-=="i, � � .._         License as published by the Free Software
-.> <`_,   >  .   <=          redistribute it and/or  modify it under
+�- . � .-<_> � � .<>         Foundation; version 2 of the License.
-:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+� � �._= =} � � � :
-.="- .-=="i,     .._         License as published by the Free Software
+� � .%`+i> � � � _;_.
- - .   .-<_>     .<>         Foundation; either version 2 of the License,
+� � .i_,=:_. � � �-<s.       This library is distributed in the hope that
-     ._= =}       :          or (at your option) any later version.
+� � �+ �. �-:. � � � =       it will be useful,  but WITHOUT ANY WARRANTY;
-    .%`+i>       _;_.
+    : .. � �.:, � � . . .    without even the implied warranty of
-    .i_,=:_.      -<s.       This program is distributed in the hope that
+� � =_ � � � �+ � � =;=|`    MERCHANTABILITY or FITNESS FOR A
-     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
+� _.=:. � � � : � �:=>`:     PARTICULAR PURPOSE. See the GNU
-    : ..    .:,     . . .    without even the implied warranty of
+..}^=.= � � � = � � � ;      Library General Public License for more
-    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
++= � -. � � .` � � .:       details.
-  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
+    : � � = �...= . :.=-
-..}^=.=       =       ;      Library General Public License for more
+�-. � .:....=;==+<;          You should have received a copy of the GNU
-++=   -.     .`     .:       details.
+� -_. . . � )=. �=           Library General Public License along with
-    :     =  ...= . :.=-
+� � -- � � � �:-=`           this library; see the file COPYING.LIB.
- -.   .:....=;==+<;          You should have received a copy of the GNU
-  -_. . .   )=.  =           Library General Public License along with
-    --        :-=`           this library; see the file COPYING.LIB.
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 /* hacky but we need to get FileSelector::filter */
 #define private public
 #include <qpe/fileselector.h>
 #undef private
@@ -628,31 +626,25 @@ void OFileViewFileListView::addFile( QFileInfo* info, bool symlink )
    MimeType type( info->absFilePath() );
    if (!compliesMime( type.id() ) )
        return;
    QPixmap pix = type.pixmap();
    QString dir, name; bool locked;
-    if ( pix.isNull() )
+    if ( pix.isNull() ) pix = Opie::Core::OResource::loadPixmap( "UnknownDocument", Opie::Core::OResource::SmallIcon );
-    {
-        QWMatrix matrix;
-        QPixmap pixer( Opie::Core::OResource::loadPixmap( "UnknownDocument" ) );
-        matrix.scale( .4, .4 );
-        pix = pixer.xForm( matrix );
-    }
    dir = info->dirPath( true );
    locked = false;
    if ( symlink )
        name = info->fileName() + " -> " + createNewPath(info->dirPath(),info->readLink());
    else
    {
        name = info->fileName();
        if ( ( (selector()->mode() == OFileSelector::Open)&& !info->isReadable() ) ||
                ( (selector()->mode() == OFileSelector::Save)&& !info->isWritable() ) )
        {
            locked = true;
-            pix = Opie::Core::OResource::loadPixmap( "locked" );
+            pix = Opie::Core::OResource::loadPixmap( "locked", Opie::Core::OResource::SmallIcon );
        }
    }
    (void)new OFileSelectorItem( m_view, pix, name,
                                 info->lastModified().toString(), QString::number( info->size() ),
                                 dir, locked );
 }

diff --git a/libopie2/opieui/fileselector/ofiledialog.cpp b/libopie2/opieui/fileselector/ofiledialog.cpp index 2d38961..11a9e33 100644 --- a/libopie2/opieui/fileselector/ofiledialog.cpp +++ b/libopie2/opieui/fileselector/ofiledialog.cpp
@@ -3,14 +3,14 @@
3	� � � � � � �.=l. Copyright (C) Holger Freyther <freyther@handhelds.org>	3	� � � � � � �.=l. Copyright (C) Holger Freyther <freyther@handhelds.org>
4	� � � � � �.>+-=	4	� � � � � �.>+-=
5	�_;:, � � .> � �:=\|. This library is free software; you can	5	�_;:, � � .> � �:=\|. This library is free software; you can
6	.> <`_, � > �. � <= redistribute it and/or modify it under	6	.> <`_, � > �. � <= redistribute it and/or modify it under
7	:`=1 )Y*s>-.-- � : the terms of the GNU Library General Public	7	:`=1 )Y*s>-.-- � : the terms of the GNU Library General Public
8	.="- .-=="i, � � .._ License as published by the Free Software	8	.="- .-=="i, � � .._ License as published by the Free Software
9	�- . � .-<_> � � .<> Foundation; either version 2 of the License,	9	�- . � .-<_> � � .<> Foundation; version 2 of the License.
10	� � �._= =} � � � : or (at your option) any later version.	10	� � �._= =} � � � :
11	� � .%`+i> � � � _;_.	11	� � .%`+i> � � � _;_.
12	� � .i_,=:_. � � �-<s. This library is distributed in the hope that	12	� � .i_,=:_. � � �-<s. This library is distributed in the hope that
13	� � �+ �. �-:. � � � = it will be useful, but WITHOUT ANY WARRANTY;	13	� � �+ �. �-:. � � � = it will be useful, but WITHOUT ANY WARRANTY;
14	� � : .. � �.:, � � . . . without even the implied warranty of	14	� � : .. � �.:, � � . . . without even the implied warranty of
15	� � =_ � � � �+ � � =;=\|` MERCHANTABILITY or FITNESS FOR A	15	� � =_ � � � �+ � � =;=\|` MERCHANTABILITY or FITNESS FOR A
16	� _.=:. � � � : � �:=>`: PARTICULAR PURPOSE. See the GNU	16	� _.=:. � � � : � �:=>`: PARTICULAR PURPOSE. See the GNU


diff --git a/libopie2/opieui/fileselector/ofileselector.cpp b/libopie2/opieui/fileselector/ofileselector.cpp index 02404e5..5b5dc2f 100644 --- a/libopie2/opieui/fileselector/ofileselector.cpp +++ b/libopie2/opieui/fileselector/ofileselector.cpp
@@ -1,34 +1,32 @@
1	/*	1	/*
2	This file is part of the Opie Project	2	� � � � � � � �=. This file is part of the OPIE Project
3		3	� � � � � � �.=l. Copyright (C) Holger Freyther <freyther@handhelds.org>
4	Copyright (C) 2002,2003 Holger Freyther <zecke@handhelds.org>	4	� � � � � �.>+-=
5	=.	5	�_;:, � � .> � �:=\|. This library is free software; you can
6	.=l.	6	.> <`_, � > �. � <= redistribute it and/or modify it under
7	.>+-=	7	:`=1 )Y*s>-.-- � : the terms of the GNU Library General Public
8	_;:, .> :=\|. This program is free software; you can	8	.="- .-=="i, � � .._ License as published by the Free Software
9	.> <`_, > . <= redistribute it and/or modify it under	9	�- . � .-<_> � � .<> Foundation; version 2 of the License.
10	:`=1 )Y*s>-.-- : the terms of the GNU Library General Public	10	� � �._= =} � � � :
11	.="- .-=="i, .._ License as published by the Free Software	11	� � .%`+i> � � � _;_.
12	- . .-<_> .<> Foundation; either version 2 of the License,	12	� � .i_,=:_. � � �-<s. This library is distributed in the hope that
13	._= =} : or (at your option) any later version.	13	� � �+ �. �-:. � � � = it will be useful, but WITHOUT ANY WARRANTY;
14	.%`+i> _;_.	14	: .. � �.:, � � . . . without even the implied warranty of
15	.i_,=:_. -<s. This program is distributed in the hope that	15	� � =_ � � � �+ � � =;=\|` MERCHANTABILITY or FITNESS FOR A
16	+ . -:. = it will be useful, but WITHOUT ANY WARRANTY;	16	� _.=:. � � � : � �:=>`: PARTICULAR PURPOSE. See the GNU
17	: .. .:, . . . without even the implied warranty of	17	..}^=.= � � � = � � � ; Library General Public License for more
18	=_ + =;=\|` MERCHANTABILITY or FITNESS FOR A	18	++= � -. � � .` � � .: details.
19	_.=:. : :=>`: PARTICULAR PURPOSE. See the GNU	19	: � � = �...= . :.=-
20	..}^=.= = ; Library General Public License for more	20	�-. � .:....=;==+<; You should have received a copy of the GNU
21	++= -. .` .: details.	21	� -_. . . � )=. �= Library General Public License along with
22	: = ...= . :.=-	22	� � -- � � � �:-=` this library; see the file COPYING.LIB.
23	-. .:....=;==+<; You should have received a copy of the GNU
24	-_. . . )=. = Library General Public License along with
25	-- :-=` this library; see the file COPYING.LIB.
26	If not, write to the Free Software Foundation,	23	If not, write to the Free Software Foundation,
27	Inc., 59 Temple Place - Suite 330,	24	Inc., 59 Temple Place - Suite 330,
28	Boston, MA 02111-1307, USA.	25	Boston, MA 02111-1307, USA.
		26
29	*/	27	*/
30		28
31	/* hacky but we need to get FileSelector::filter */	29	/* hacky but we need to get FileSelector::filter */
32	#define private public	30	#define private public
33	#include <qpe/fileselector.h>	31	#include <qpe/fileselector.h>
34	#undef private	32	#undef private
@@ -628,31 +626,25 @@ void OFileViewFileListView::addFile( QFileInfo* info, bool symlink )
628	MimeType type( info->absFilePath() );	626	MimeType type( info->absFilePath() );
629	if (!compliesMime( type.id() ) )	627	if (!compliesMime( type.id() ) )
630	return;	628	return;
631		629
632	QPixmap pix = type.pixmap();	630	QPixmap pix = type.pixmap();
633	QString dir, name; bool locked;	631	QString dir, name; bool locked;
634	if ( pix.isNull() )	632	if ( pix.isNull() ) pix = Opie::Core::OResource::loadPixmap( "UnknownDocument", Opie::Core::OResource::SmallIcon );
635	{
636	QWMatrix matrix;
637	QPixmap pixer( Opie::Core::OResource::loadPixmap( "UnknownDocument" ) );
638	matrix.scale( .4, .4 );
639	pix = pixer.xForm( matrix );
640	}
641	dir = info->dirPath( true );	633	dir = info->dirPath( true );
642	locked = false;	634	locked = false;
643	if ( symlink )	635	if ( symlink )
644	name = info->fileName() + " -> " + createNewPath(info->dirPath(),info->readLink());	636	name = info->fileName() + " -> " + createNewPath(info->dirPath(),info->readLink());
645	else	637	else
646	{	638	{
647	name = info->fileName();	639	name = info->fileName();
648	if ( ( (selector()->mode() == OFileSelector::Open)&& !info->isReadable() ) \|\|	640	if ( ( (selector()->mode() == OFileSelector::Open)&& !info->isReadable() ) \|\|
649	( (selector()->mode() == OFileSelector::Save)&& !info->isWritable() ) )	641	( (selector()->mode() == OFileSelector::Save)&& !info->isWritable() ) )
650	{	642	{
651	locked = true;	643	locked = true;
652	pix = Opie::Core::OResource::loadPixmap( "locked" );	644	pix = Opie::Core::OResource::loadPixmap( "locked", Opie::Core::OResource::SmallIcon );
653	}	645	}
654	}	646	}
655	(void)new OFileSelectorItem( m_view, pix, name,	647	(void)new OFileSelectorItem( m_view, pix, name,
656	info->lastModified().toString(), QString::number( info->size() ),	648	info->lastModified().toString(), QString::number( info->size() ),
657	dir, locked );	649	dir, locked );
658	}	650	}