summaryrefslogtreecommitdiff
path: root/noncore/graphics
authorar <ar>2004-05-31 15:26:50 (UTC)
committer ar <ar>2004-05-31 15:26:50 (UTC)
commit27dfc34d411dee76f09f5e516c60b0a64eb35948 (patch) (unidiff)
treeb7f7259497630390e352a1257cac5dc59f5399a6 /noncore/graphics
parent27b09fe4f930b96e82cea9fb0eb1a9b87f7ec062 (diff)
downloadopie-27dfc34d411dee76f09f5e516c60b0a64eb35948.zip
opie-27dfc34d411dee76f09f5e516c60b0a64eb35948.tar.gz
opie-27dfc34d411dee76f09f5e516c60b0a64eb35948.tar.bz2
- convert qWarning to owarn
Diffstat (limited to 'noncore/graphics') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/graphics/opie-eye/gui/iconview.cpp6
-rw-r--r--noncore/graphics/opie-eye/gui/viewmodebutton.cpp5
2 files changed, 7 insertions, 4 deletions
diff --git a/noncore/graphics/opie-eye/gui/iconview.cpp b/noncore/graphics/opie-eye/gui/iconview.cpp
index 6c5f5ea..211314b 100644
--- a/noncore/graphics/opie-eye/gui/iconview.cpp
+++ b/noncore/graphics/opie-eye/gui/iconview.cpp
@@ -101,27 +101,27 @@ namespace {
101 inline void IconViewItem::setPixmap( const QPixmap & icon, bool recalc, bool redraw) 101 inline void IconViewItem::setPixmap( const QPixmap & icon, bool recalc, bool redraw)
102 { 102 {
103 m_Pixset = true; 103 m_Pixset = true;
104 calcRect(text()); 104 calcRect(text());
105 } 105 }
106 inline void IconViewItem::setPixmap( const QPixmap & icon) 106 inline void IconViewItem::setPixmap( const QPixmap & icon)
107 { 107 {
108 m_Pixset = true; 108 m_Pixset = true;
109 calcRect(text()); 109 calcRect(text());
110 } 110 }
111 111
112 inline QPixmap* IconViewItem::pixmap()const { 112 inline QPixmap* IconViewItem::pixmap()const {
113// qWarning( "Name is " + m_path.right( 15 ) + " rect is %d %d %d %d | %d %d", 113// owarn << "Name is " << m_path.right( 15 ) << " rect is " << rect().x() << " " << rect().y()
114// rect().x(),rect().y(),rect().width(),rect().height(), 114// << " " << rect().width() << " " << rect().height() << " | " << iconView()->contentsX()
115// iconView()->contentsX(), iconView()->contentsY()); 115// << " " << iconView()->contentsY() << oendl;
116 116
117 if (textOnly()&&!m_isDir) { 117 if (textOnly()&&!m_isDir) {
118 if (!_emptyPix) _emptyPix = new QPixmap(0,0,1); 118 if (!_emptyPix) _emptyPix = new QPixmap(0,0,1);
119 return _emptyPix; 119 return _emptyPix;
120 } 120 }
121 if ( m_isDir ) 121 if ( m_isDir )
122 return _dirPix; 122 return _dirPix;
123 else{ 123 else{
124 if (!m_noInfo && !g_stringInf.contains( m_path ) ) { 124 if (!m_noInfo && !g_stringInf.contains( m_path ) ) {
125 currentView()->dirLister()->imageInfo( m_path ); 125 currentView()->dirLister()->imageInfo( m_path );
126 g_stringInf.insert( m_path, const_cast<IconViewItem*>(this)); 126 g_stringInf.insert( m_path, const_cast<IconViewItem*>(this));
127 } 127 }
diff --git a/noncore/graphics/opie-eye/gui/viewmodebutton.cpp b/noncore/graphics/opie-eye/gui/viewmodebutton.cpp
index 36e5dcf..aa15d31 100644
--- a/noncore/graphics/opie-eye/gui/viewmodebutton.cpp
+++ b/noncore/graphics/opie-eye/gui/viewmodebutton.cpp
@@ -1,16 +1,19 @@
1#include "viewmodebutton.h" 1#include "viewmodebutton.h"
2 2
3/* OPIE */
3#include <opie2/odebug.h> 4#include <opie2/odebug.h>
5using namespace Opie::Core;
4 6
7/* QT */
5#include <qtoolbar.h> 8#include <qtoolbar.h>
6#include <qpopupmenu.h> 9#include <qpopupmenu.h>
7 10
8ViewModeButton::ViewModeButton( QToolBar* bar,int def ) 11ViewModeButton::ViewModeButton( QToolBar* bar,int def )
9 : QToolButton( bar ) 12 : QToolButton( bar )
10{ 13{
11 slotChange( def ); 14 slotChange( def );
12 QPopupMenu *pop= new QPopupMenu( this ); 15 QPopupMenu *pop= new QPopupMenu( this );
13 pop->setCheckable( true ); 16 pop->setCheckable( true );
14 pop->insertItem( tr("Thumbnail and Imageinfo"), 1 ); 17 pop->insertItem( tr("Thumbnail and Imageinfo"), 1 );
15 pop->insertItem( tr("Thumbnail and Name" ), 2 ); 18 pop->insertItem( tr("Thumbnail and Name" ), 2 );
16 pop->insertItem( tr("Name Only" ), 3 ); 19 pop->insertItem( tr("Name Only" ), 3 );
@@ -31,15 +34,15 @@ void ViewModeButton::slotChange( int i ) {
31 switch( i ) { 34 switch( i ) {
32 case 1: 35 case 1:
33 name = "opie-eye/opie-eye-thumb"; 36 name = "opie-eye/opie-eye-thumb";
34 break; 37 break;
35 case 2: 38 case 2:
36 name = "opie-eye/opie-eye-thumbonly"; 39 name = "opie-eye/opie-eye-thumbonly";
37 break; 40 break;
38 case 3: 41 case 3:
39 name = "opie-eye/opie-eye-textview"; 42 name = "opie-eye/opie-eye-textview";
40 break; 43 break;
41 } 44 }
42 45
43 qWarning("foo %d" +name, i ); 46 owarn << "foo " << name << oendl;
44 setIconSet( Resource::loadIconSet( name ) ); 47 setIconSet( Resource::loadIconSet( name ) );
45} 48}