summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-07-03 21:12:58 (UTC)
committer mickeyl <mickeyl>2005-07-03 21:12:58 (UTC)
commit47011752d4457a1055894479e5bf855e100fddac (patch) (unidiff)
treed986b103f0023b990c02c208fc527d90f7c79ce3
parent27bee477e2689d9b37d2d4cabce05c8d55295ebd (diff)
downloadopie-47011752d4457a1055894479e5bf855e100fddac.zip
opie-47011752d4457a1055894479e5bf855e100fddac.tar.gz
opie-47011752d4457a1055894479e5bf855e100fddac.tar.bz2
remove hard coded scaling of 'UnknownDocument' icon (and restore header, btw.)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opieui/fileselector/ofiledialog.cpp4
-rw-r--r--libopie2/opieui/fileselector/ofileselector.cpp56
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
@@ -6,8 +6,8 @@
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;
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,31 +1,29 @@
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 */
@@ -631,13 +629,7 @@ void OFileViewFileListView::addFile( QFileInfo* info, bool symlink )
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 )
@@ -649,7 +641,7 @@ void OFileViewFileListView::addFile( QFileInfo* info, bool symlink )
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,