-rw-r--r-- | noncore/graphics/opie-eye/gui/iconview.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/noncore/graphics/opie-eye/gui/iconview.cpp b/noncore/graphics/opie-eye/gui/iconview.cpp index c07a1e5..7e4164b 100644 --- a/noncore/graphics/opie-eye/gui/iconview.cpp +++ b/noncore/graphics/opie-eye/gui/iconview.cpp | |||
@@ -118,24 +118,26 @@ PIconView::PIconView( QWidget* wid, Opie::Core::OConfig* cfg ) | |||
118 | 118 | ||
119 | QHBox *hbox = new QHBox( this ); | 119 | QHBox *hbox = new QHBox( this ); |
120 | QLabel* lbl = new QLabel( hbox ); | 120 | QLabel* lbl = new QLabel( hbox ); |
121 | lbl->setText( tr("View as" ) ); | 121 | lbl->setText( tr("View as" ) ); |
122 | 122 | ||
123 | m_views = new QComboBox( hbox, "View As" ); | 123 | m_views = new QComboBox( hbox, "View As" ); |
124 | connect( m_views, SIGNAL(activated(int)), | 124 | connect( m_views, SIGNAL(activated(int)), |
125 | this, SLOT(slotViewChanged(int)) ); | 125 | this, SLOT(slotViewChanged(int)) ); |
126 | 126 | ||
127 | m_view= new QIconView( this ); | 127 | m_view= new QIconView( this ); |
128 | connect(m_view, SIGNAL(clicked(QIconViewItem*) ), | 128 | connect(m_view, SIGNAL(clicked(QIconViewItem*) ), |
129 | this, SLOT(slotClicked(QIconViewItem*)) ); | 129 | this, SLOT(slotClicked(QIconViewItem*)) ); |
130 | connect(m_view, SIGNAL(returnPressed(QIconViewItem*)), | ||
131 | this, SLOT(slotClicked(QIconViewItem*)) ); | ||
130 | 132 | ||
131 | m_view->setArrangement( QIconView::LeftToRight ); | 133 | m_view->setArrangement( QIconView::LeftToRight ); |
132 | m_view->setItemTextPos( QIconView::Right ); | 134 | m_view->setItemTextPos( QIconView::Right ); |
133 | 135 | ||
134 | int dw = QApplication::desktop()->width(); | 136 | int dw = QApplication::desktop()->width(); |
135 | int viewerWidth = dw-style().scrollBarExtent().width(); | 137 | int viewerWidth = dw-style().scrollBarExtent().width(); |
136 | m_view->setGridX( viewerWidth-3*m_view->spacing()); | 138 | m_view->setGridX( viewerWidth-3*m_view->spacing()); |
137 | m_view->setGridY( fontMetrics().height()*2+40 ); | 139 | m_view->setGridY( fontMetrics().height()*2+40 ); |
138 | 140 | ||
139 | 141 | ||
140 | initKeys(); | 142 | initKeys(); |
141 | 143 | ||
@@ -402,25 +404,24 @@ void PIconView::slotRename() { | |||
402 | * BEAM the current file | 404 | * BEAM the current file |
403 | */ | 405 | */ |
404 | void PIconView::slotBeam() { | 406 | void PIconView::slotBeam() { |
405 | bool isDir; | 407 | bool isDir; |
406 | QString pa = currentFileName( isDir ); | 408 | QString pa = currentFileName( isDir ); |
407 | if ( isDir && pa.isEmpty() ) | 409 | if ( isDir && pa.isEmpty() ) |
408 | return; | 410 | return; |
409 | 411 | ||
410 | Ir* ir = new Ir( this ); | 412 | Ir* ir = new Ir( this ); |
411 | connect( ir, SIGNAL(done(Ir*)), | 413 | connect( ir, SIGNAL(done(Ir*)), |
412 | this, SLOT(slotBeamDone(Ir*))); | 414 | this, SLOT(slotBeamDone(Ir*))); |
413 | ir->send(pa, tr( "Image" ) ); | 415 | ir->send(pa, tr( "Image" ) ); |
414 | |||
415 | } | 416 | } |
416 | 417 | ||
417 | /* | 418 | /* |
418 | * BEAM done clean up | 419 | * BEAM done clean up |
419 | */ | 420 | */ |
420 | void PIconView::slotBeamDone( Ir* ir) { | 421 | void PIconView::slotBeamDone( Ir* ir) { |
421 | delete ir; | 422 | delete ir; |
422 | } | 423 | } |
423 | 424 | ||
424 | void PIconView::slotStart() { | 425 | void PIconView::slotStart() { |
425 | m_view->viewport()->setUpdatesEnabled( false ); | 426 | m_view->viewport()->setUpdatesEnabled( false ); |
426 | } | 427 | } |