author | mickeyl <mickeyl> | 2005-06-24 12:51:12 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-06-24 12:51:12 (UTC) |
commit | 0fa3d7e26d0c1571e27cd05916043c72dc254077 (patch) (unidiff) | |
tree | 561ddc2d965411f9ca629b912e522f9f481c90d4 /noncore/graphics/opie-eye | |
parent | fac3dd32424a22ae6ded78a8d9eaaaf318aae2f3 (diff) | |
download | opie-0fa3d7e26d0c1571e27cd05916043c72dc254077.zip opie-0fa3d7e26d0c1571e27cd05916043c72dc254077.tar.gz opie-0fa3d7e26d0c1571e27cd05916043c72dc254077.tar.bz2 |
s,cardmon/pcmcia,pcmcia,
-rw-r--r-- | noncore/graphics/opie-eye/gui/filesystem.cpp | 2 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/gui/mainwindow.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/noncore/graphics/opie-eye/gui/filesystem.cpp b/noncore/graphics/opie-eye/gui/filesystem.cpp index d84e9f8..9448843 100644 --- a/noncore/graphics/opie-eye/gui/filesystem.cpp +++ b/noncore/graphics/opie-eye/gui/filesystem.cpp | |||
@@ -7,25 +7,25 @@ | |||
7 | #include <qtoolbar.h> | 7 | #include <qtoolbar.h> |
8 | 8 | ||
9 | #include <opie2/oresource.h> | 9 | #include <opie2/oresource.h> |
10 | 10 | ||
11 | #include <qpe/storage.h> | 11 | #include <qpe/storage.h> |
12 | 12 | ||
13 | 13 | ||
14 | #include "filesystem.h" | 14 | #include "filesystem.h" |
15 | 15 | ||
16 | PFileSystem::PFileSystem( QToolBar* bar) | 16 | PFileSystem::PFileSystem( QToolBar* bar) |
17 | : QToolButton( bar ) | 17 | : QToolButton( bar ) |
18 | { | 18 | { |
19 | setIconSet( Opie::Core::OResource::loadPixmap( "cardmon/pcmcia", Opie::Core::OResource::SmallIcon ) ); | 19 | setIconSet( Opie::Core::OResource::loadPixmap( "pcmcia", Opie::Core::OResource::SmallIcon ) ); |
20 | 20 | ||
21 | m_pop = new QPopupMenu( this ); | 21 | m_pop = new QPopupMenu( this ); |
22 | connect( m_pop, SIGNAL( activated( int ) ), | 22 | connect( m_pop, SIGNAL( activated( int ) ), |
23 | this, SLOT(slotSelectDir( int ) ) ); | 23 | this, SLOT(slotSelectDir( int ) ) ); |
24 | 24 | ||
25 | m_storage = new StorageInfo(); | 25 | m_storage = new StorageInfo(); |
26 | connect(m_storage, SIGNAL(disksChanged() ), | 26 | connect(m_storage, SIGNAL(disksChanged() ), |
27 | this, SLOT( changed() ) ); | 27 | this, SLOT( changed() ) ); |
28 | changed(); | 28 | changed(); |
29 | 29 | ||
30 | connect(this,SIGNAL(pressed()),SLOT(slotPopUp())); | 30 | connect(this,SIGNAL(pressed()),SLOT(slotPopUp())); |
31 | } | 31 | } |
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp index d4c5b42..2cf687b 100644 --- a/noncore/graphics/opie-eye/gui/mainwindow.cpp +++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp | |||
@@ -736,25 +736,25 @@ void PMainWindow::setupMenu() | |||
736 | menuBar()->insertItem( tr( "Show" ), dispMenu ); | 736 | menuBar()->insertItem( tr( "Show" ), dispMenu ); |
737 | settingsMenu = new QPopupMenu( menuBar() ); | 737 | settingsMenu = new QPopupMenu( menuBar() ); |
738 | menuBar()->insertItem( tr( "Settings" ), settingsMenu ); | 738 | menuBar()->insertItem( tr( "Settings" ), settingsMenu ); |
739 | 739 | ||
740 | m_aViewfile->addTo(fileMenu); | 740 | m_aViewfile->addTo(fileMenu); |
741 | m_aShowInfo->addTo(fileMenu); | 741 | m_aShowInfo->addTo(fileMenu); |
742 | m_aStartSlide->addTo(fileMenu); | 742 | m_aStartSlide->addTo(fileMenu); |
743 | 743 | ||
744 | fileMenu->insertSeparator(); | 744 | fileMenu->insertSeparator(); |
745 | m_aDirUp->addTo( fileMenu ); | 745 | m_aDirUp->addTo( fileMenu ); |
746 | 746 | ||
747 | fsMenu = new QPopupMenu(fileMenu); | 747 | fsMenu = new QPopupMenu(fileMenu); |
748 | fileMenu->insertItem(Opie::Core::OResource::loadPixmap( "cardmon/pcmcia", Opie::Core::OResource::SmallIcon ), | 748 | fileMenu->insertItem(Opie::Core::OResource::loadPixmap( "pcmcia", Opie::Core::OResource::SmallIcon ), |
749 | tr("Select filesystem"),fsMenu); | 749 | tr("Select filesystem"),fsMenu); |
750 | connect( fsMenu, SIGNAL( activated( int ) ), this, SLOT(slotSelectDir( int ) ) ); | 750 | connect( fsMenu, SIGNAL( activated( int ) ), this, SLOT(slotSelectDir( int ) ) ); |
751 | dirChanged(); | 751 | dirChanged(); |
752 | 752 | ||
753 | if ( m_aBeam ) { | 753 | if ( m_aBeam ) { |
754 | fileMenu->insertSeparator(); | 754 | fileMenu->insertSeparator(); |
755 | m_aBeam->addTo( fileMenu ); | 755 | m_aBeam->addTo( fileMenu ); |
756 | } | 756 | } |
757 | fileMenu->insertSeparator(); | 757 | fileMenu->insertSeparator(); |
758 | m_aTrash->addTo(fileMenu); | 758 | m_aTrash->addTo(fileMenu); |
759 | 759 | ||
760 | listviewMenu = new QPopupMenu(dispMenu); | 760 | listviewMenu = new QPopupMenu(dispMenu); |