author | zecke <zecke> | 2004-09-18 19:43:37 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-09-18 19:43:37 (UTC) |
commit | af0d773a9991dec27d25c2ad6859ee2abe23c73a (patch) (unidiff) | |
tree | db35921190287e0c0b19c6207e8d87f679c513ee | |
parent | 3f56f22d205a7f2a60262aa026542e9dc844810f (diff) | |
download | opie-af0d773a9991dec27d25c2ad6859ee2abe23c73a.zip opie-af0d773a9991dec27d25c2ad6859ee2abe23c73a.tar.gz opie-af0d773a9991dec27d25c2ad6859ee2abe23c73a.tar.bz2 |
-Killl Magic Numbers and introduce an enum
-Split the Command Line on Creation, this way we do not need to
split the command afterwards
-rw-r--r-- | core/applets/cardmon/cardmon.cpp | 57 | ||||
-rw-r--r-- | core/applets/cardmon/cardmon.h | 8 |
2 files changed, 38 insertions, 27 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp index 43ccce2..fb140fe 100644 --- a/core/applets/cardmon/cardmon.cpp +++ b/core/applets/cardmon/cardmon.cpp | |||
@@ -87,84 +87,90 @@ void CardMonitor::popUp( QString message, QString icon ) { | |||
87 | } | 87 | } |
88 | 88 | ||
89 | popupMenu->clear(); | 89 | popupMenu->clear(); |
90 | if ( icon.isEmpty() ) { | 90 | if ( icon.isEmpty() ) { |
91 | popupMenu->insertItem( message, 0 ); | 91 | popupMenu->insertItem( message, 0 ); |
92 | } else { | 92 | } else { |
93 | popupMenu->insertItem( QIconSet( Resource::loadPixmap( icon ) ), | 93 | popupMenu->insertItem( QIconSet( Resource::loadPixmap( icon ) ), |
94 | message, 0 ); | 94 | message, 0 ); |
95 | } | 95 | } |
96 | 96 | ||
97 | QPoint p = mapToGlobal( QPoint( 0, 0 ) ); | 97 | QPoint p = mapToGlobal( QPoint( 0, 0 ) ); |
98 | QSize s = popupMenu->sizeHint(); | 98 | QSize s = popupMenu->sizeHint(); |
99 | popupMenu->popup( QPoint( p.x() + ( width() / 2 ) - ( s.width() / 2 ), | 99 | popupMenu->popup( QPoint( p.x() + ( width() / 2 ) - ( s.width() / 2 ), |
100 | p.y() - s.height() ), 0 ); | 100 | p.y() - s.height() ), 0 ); |
101 | 101 | ||
102 | QTimer::singleShot( 2000, this, SLOT( popupTimeout() ) ); | 102 | QTimer::singleShot( 2000, this, SLOT( popupTimeout() ) ); |
103 | } | 103 | } |
104 | 104 | ||
105 | void CardMonitor::popupTimeout() { | 105 | void CardMonitor::popupTimeout() { |
106 | popupMenu->hide(); | 106 | popupMenu->hide(); |
107 | } | 107 | } |
108 | 108 | ||
109 | void CardMonitor::mousePressEvent( QMouseEvent * ) { | 109 | void CardMonitor::mousePressEvent( QMouseEvent * ) { |
110 | QPopupMenu * menu = new QPopupMenu( this ); | 110 | QPopupMenu * menu = new QPopupMenu( this ); |
111 | QString cmd; | 111 | QStringList cmd; |
112 | bool execute = true; | ||
112 | 113 | ||
113 | if ( cardInSd ) { | 114 | if ( cardInSd ) { |
114 | menu->insertItem( QIconSet( Resource::loadPixmap( "cardmon/ide" ) ), | 115 | menu->insertItem( QIconSet( Resource::loadPixmap( "cardmon/ide" ) ), |
115 | tr( "Eject SD/MMC card" ), 0 ); | 116 | tr( "Eject SD/MMC card" ), 0 ); |
116 | } | 117 | } |
117 | 118 | ||
118 | if ( cardInPcmcia0 ) { | 119 | if ( cardInPcmcia0 ) { |
119 | menu-> | 120 | menu-> |
120 | insertItem( QIconSet | 121 | insertItem( QIconSet |
121 | ( Resource::loadPixmap( "cardmon/" + cardInPcmcia0Type ) ), | 122 | ( Resource::loadPixmap( "cardmon/" + cardInPcmcia0Type ) ), |
122 | tr( "Eject card 0: %1" ).arg( cardInPcmcia0Name ), 1 ); | 123 | tr( "Eject card 0: %1" ).arg( cardInPcmcia0Name ), 1 ); |
123 | } | 124 | } |
124 | 125 | ||
125 | if ( cardInPcmcia1 ) { | 126 | if ( cardInPcmcia1 ) { |
126 | menu-> | 127 | menu-> |
127 | insertItem( QIconSet | 128 | insertItem( QIconSet |
128 | ( Resource::loadPixmap( "cardmon/" + cardInPcmcia1Type ) ), | 129 | ( Resource::loadPixmap( "cardmon/" + cardInPcmcia1Type ) ), |
129 | tr( "Eject card 1: %1" ).arg( cardInPcmcia1Name ), 2 ); | 130 | tr( "Eject card 1: %1" ).arg( cardInPcmcia1Name ), 2 ); |
130 | } | 131 | } |
131 | 132 | ||
132 | QPoint p = mapToGlobal( QPoint( 0, 0 ) ); | 133 | QPoint p = mapToGlobal( QPoint( 0, 0 ) ); |
133 | QSize s = menu->sizeHint(); | 134 | QSize s = menu->sizeHint(); |
134 | int opt = menu->exec( QPoint( p.x() + ( width() / 2 ) - ( s.width() / 2 ), | 135 | int opt = menu->exec( QPoint( p.x() + ( width() / 2 ) - ( s.width() / 2 ), |
135 | p.y() - s.height() ), 0 ); | 136 | p.y() - s.height() ), 0 ); |
136 | 137 | ||
137 | if ( opt == 1 ) { | 138 | if ( opt == 1 ) { |
138 | m_commandOrig = 1; | 139 | m_commandOrig = PCMCIA_Socket1; |
139 | execCommand("/sbin/cardctl eject 0"); | 140 | cmd << "/sbin/cardctl" << "eject" << "0"; |
140 | } else if ( opt == 0 ) { | 141 | } else if ( opt == 0 ) { |
141 | m_commandOrig = 2; | 142 | m_commandOrig = MMC_Socket; |
142 | execCommand( QString("umount %1").arg(cardSdName)); | 143 | cmd << "umount" << cardSdName; |
143 | } else if ( opt == 2 ) { | 144 | } else if ( opt == 2 ) { |
144 | m_commandOrig = 3; | 145 | m_commandOrig = PCMCIA_Socket2; |
145 | execCommand( "/sbin/cardctl eject 1" ); | 146 | cmd << "/sbin/cardctl" << "eject" << "1"; |
146 | } | 147 | }else |
148 | execute = false; | ||
149 | |||
150 | if ( execute ) | ||
151 | execCommand( cmd ); | ||
152 | |||
147 | delete menu; | 153 | delete menu; |
148 | } | 154 | } |
149 | 155 | ||
150 | 156 | ||
151 | void CardMonitor::cardMessage( const QCString & msg, const QByteArray & ) { | 157 | void CardMonitor::cardMessage( const QCString & msg, const QByteArray & ) { |
152 | if ( msg == "stabChanged()" ) { | 158 | if ( msg == "stabChanged()" ) { |
153 | // odebug << "Pcmcia: stabchanged" << oendl; | 159 | // odebug << "Pcmcia: stabchanged" << oendl; |
154 | getStatusPcmcia(); | 160 | getStatusPcmcia(); |
155 | } else if ( msg == "mtabChanged()" ) { | 161 | } else if ( msg == "mtabChanged()" ) { |
156 | // odebug << "CARDMONAPPLET: mtabchanged" << oendl; | 162 | // odebug << "CARDMONAPPLET: mtabchanged" << oendl; |
157 | getStatusSd(); | 163 | getStatusSd(); |
158 | } | 164 | } |
159 | } | 165 | } |
160 | 166 | ||
161 | bool CardMonitor::getStatusPcmcia( int showPopUp ) { | 167 | bool CardMonitor::getStatusPcmcia( int showPopUp ) { |
162 | 168 | ||
163 | bool cardWas0 = cardInPcmcia0; // remember last state | 169 | bool cardWas0 = cardInPcmcia0; // remember last state |
164 | bool cardWas1 = cardInPcmcia1; | 170 | bool cardWas1 = cardInPcmcia1; |
165 | 171 | ||
166 | QString fileName; | 172 | QString fileName; |
167 | 173 | ||
168 | // one of these 3 files should exist | 174 | // one of these 3 files should exist |
169 | if ( QFile::exists( "/var/run/stab" ) ) { | 175 | if ( QFile::exists( "/var/run/stab" ) ) { |
170 | fileName = "/var/run/stab"; | 176 | fileName = "/var/run/stab"; |
@@ -312,64 +318,63 @@ bool CardMonitor::getStatusSd( int showPopUp ) { | |||
312 | #else | 318 | #else |
313 | #error "Not on Linux" | 319 | #error "Not on Linux" |
314 | #endif | 320 | #endif |
315 | repaint( FALSE ); | 321 | repaint( FALSE ); |
316 | return ( ( cardWas == cardInSd ) ? FALSE : TRUE ); | 322 | return ( ( cardWas == cardInSd ) ? FALSE : TRUE ); |
317 | } | 323 | } |
318 | 324 | ||
319 | void CardMonitor::paintEvent( QPaintEvent * ) { | 325 | void CardMonitor::paintEvent( QPaintEvent * ) { |
320 | 326 | ||
321 | QPainter p( this ); | 327 | QPainter p( this ); |
322 | 328 | ||
323 | if ( cardInPcmcia0 || cardInPcmcia1 || cardInSd ) { | 329 | if ( cardInPcmcia0 || cardInPcmcia1 || cardInSd ) { |
324 | p.drawPixmap( 0, 0, pm ); | 330 | p.drawPixmap( 0, 0, pm ); |
325 | show(); | 331 | show(); |
326 | } else { | 332 | } else { |
327 | //p.eraseRect(rect()); | 333 | //p.eraseRect(rect()); |
328 | hide(); | 334 | hide(); |
329 | } | 335 | } |
330 | } | 336 | } |
331 | 337 | ||
332 | int CardMonitor::position() { | 338 | int CardMonitor::position() { |
333 | return 7; | 339 | return 7; |
334 | } | 340 | } |
335 | 341 | ||
336 | void CardMonitor::execCommand( const QString &command ) { | 342 | void CardMonitor::execCommand( const QStringList &strList ) { |
337 | delete m_process; | 343 | delete m_process; |
338 | m_process = 0; | 344 | m_process = 0; |
339 | 345 | ||
340 | if ( m_process == 0 ) { | 346 | if ( m_process == 0 ) { |
341 | m_process = new OProcess(); | 347 | m_process = new OProcess(); |
342 | QStringList strList = QStringList::split( " ", command ); | ||
343 | 348 | ||
344 | for ( QStringList::Iterator it = strList.begin(); it != strList.end(); ++it ) { | ||
345 | *m_process << *it; | ||
346 | } | ||
347 | 349 | ||
348 | connect(m_process, SIGNAL( processExited(Opie::Core::OProcess*) ), | 350 | for ( QStringList::ConstIterator it = strList.begin(); it != strList.end(); ++it ) { |
349 | this, SLOT( slotExited(Opie::Core::OProcess* ) ) ); | 351 | *m_process << *it; |
352 | } | ||
353 | |||
354 | connect(m_process, SIGNAL(processExited(Opie::Core::OProcess*)), | ||
355 | this, SLOT( slotExited(Opie::Core::OProcess*))); | ||
350 | 356 | ||
351 | if(!m_process->start(OProcess::NotifyOnExit, OProcess::AllOutput ) ) { | 357 | if(!m_process->start(OProcess::NotifyOnExit, OProcess::AllOutput ) ) { |
352 | delete m_process; | 358 | delete m_process; |
353 | m_process = 0; | 359 | m_process = 0; |
354 | } | 360 | } |
355 | } | 361 | } |
356 | } | 362 | } |
357 | 363 | ||
358 | void CardMonitor::slotExited( OProcess* ) { | 364 | void CardMonitor::slotExited( OProcess* ) { |
359 | 365 | ||
360 | if( m_process->normalExit() ) { | 366 | if( m_process->normalExit() ) { |
361 | int ret = m_process->exitStatus(); | 367 | int ret = m_process->exitStatus(); |
362 | if( ret != 0 ) { | 368 | if( ret != 0 ) { |
363 | if ( m_commandOrig == 1 ) { | 369 | if ( m_commandOrig == PCMCIA_Socket1 || |
364 | popUp( tr( "CF/PCMCIA card eject failed!" ) ); | 370 | m_commandOrig == PCMCIA_Socket2 ) { |
365 | } else if ( m_commandOrig == 2 ) { | 371 | popUp( tr( "CF/PCMCIA card eject failed!" ) ); |
366 | popUp( tr( "SD/MMC card eject failed!" ) ); | 372 | } else if ( m_commandOrig == MMC_Socket ) { |
367 | } else if ( m_commandOrig == 3 ) { | 373 | popUp( tr( "SD/MMC card eject failed!" ) ); |
368 | popUp( tr( "CF/PCMCIA card eject failed!" ) ); | 374 | } |
369 | } | 375 | } |
370 | } | 376 | } |
371 | } | ||
372 | } | 377 | } |
373 | 378 | ||
374 | EXPORT_OPIE_APPLET_v1( CardMonitor ) | 379 | EXPORT_OPIE_APPLET_v1( CardMonitor ) |
375 | 380 | ||
diff --git a/core/applets/cardmon/cardmon.h b/core/applets/cardmon/cardmon.h index b02c8b1..400f5ae 100644 --- a/core/applets/cardmon/cardmon.h +++ b/core/applets/cardmon/cardmon.h | |||
@@ -11,60 +11,66 @@ | |||
11 | * * | 11 | * * |
12 | * This program is free software; you can redistribute it and/or modify * | 12 | * This program is free software; you can redistribute it and/or modify * |
13 | * it under the terms of the GNU General Public License as published by * | 13 | * it under the terms of the GNU General Public License as published by * |
14 | * the Free Software Foundation; either version 2 of the License, or * | 14 | * the Free Software Foundation; either version 2 of the License, or * |
15 | * (at your option) any later version. * | 15 | * (at your option) any later version. * |
16 | * * | 16 | * * |
17 | ***************************************************************************/ | 17 | ***************************************************************************/ |
18 | 18 | ||
19 | #ifndef CARDMON_H | 19 | #ifndef CARDMON_H |
20 | #define CARDMON_H | 20 | #define CARDMON_H |
21 | 21 | ||
22 | #include <qwidget.h> | 22 | #include <qwidget.h> |
23 | #include <qpixmap.h> | 23 | #include <qpixmap.h> |
24 | #include <qpopupmenu.h> | 24 | #include <qpopupmenu.h> |
25 | 25 | ||
26 | namespace Opie { | 26 | namespace Opie { |
27 | namespace Core { | 27 | namespace Core { |
28 | class OProcess; | 28 | class OProcess; |
29 | } | 29 | } |
30 | } | 30 | } |
31 | 31 | ||
32 | class CardMonitor : public QWidget { | 32 | class CardMonitor : public QWidget { |
33 | Q_OBJECT | 33 | Q_OBJECT |
34 | public: | 34 | public: |
35 | enum { | ||
36 | PCMCIA_Socket1, | ||
37 | PCMCIA_Socket2, | ||
38 | MMC_Socket | ||
39 | }; | ||
40 | |||
35 | CardMonitor( QWidget *parent = 0 ); | 41 | CardMonitor( QWidget *parent = 0 ); |
36 | ~CardMonitor(); | 42 | ~CardMonitor(); |
37 | bool getStatusPcmcia( int showPopUp = FALSE ); | 43 | bool getStatusPcmcia( int showPopUp = FALSE ); |
38 | bool getStatusSd( int showPopUp = FALSE ); | 44 | bool getStatusSd( int showPopUp = FALSE ); |
39 | static int position(); | 45 | static int position(); |
40 | private slots: | 46 | private slots: |
41 | void cardMessage( const QCString &msg, const QByteArray & ); | 47 | void cardMessage( const QCString &msg, const QByteArray & ); |
42 | void slotExited( Opie::Core::OProcess* proc ); | 48 | void slotExited( Opie::Core::OProcess* proc ); |
43 | void popupTimeout(); | 49 | void popupTimeout(); |
44 | 50 | ||
45 | protected: | 51 | protected: |
46 | void paintEvent( QPaintEvent* ); | 52 | void paintEvent( QPaintEvent* ); |
47 | void mousePressEvent( QMouseEvent * ); | 53 | void mousePressEvent( QMouseEvent * ); |
48 | 54 | ||
49 | private: | 55 | private: |
50 | void execCommand( const QString &command ); | 56 | void execCommand( const QStringList &command ); |
51 | int m_commandOrig; | 57 | int m_commandOrig; |
52 | QPixmap pm; | 58 | QPixmap pm; |
53 | // pcmcia socket 0 | 59 | // pcmcia socket 0 |
54 | bool cardInPcmcia0; | 60 | bool cardInPcmcia0; |
55 | QString cardInPcmcia0Name; | 61 | QString cardInPcmcia0Name; |
56 | QString cardInPcmcia0Type; | 62 | QString cardInPcmcia0Type; |
57 | // pcmcia socket 1 | 63 | // pcmcia socket 1 |
58 | bool cardInPcmcia1; | 64 | bool cardInPcmcia1; |
59 | QString cardInPcmcia1Name; | 65 | QString cardInPcmcia1Name; |
60 | QString cardInPcmcia1Type; | 66 | QString cardInPcmcia1Type; |
61 | bool cardInSd; | 67 | bool cardInSd; |
62 | QString cardSdName; // the device which is mounted | 68 | QString cardSdName; // the device which is mounted |
63 | void iconShow(); | 69 | void iconShow(); |
64 | QPopupMenu *popupMenu; | 70 | QPopupMenu *popupMenu; |
65 | void popUp(QString message, QString icon = QString::null ); | 71 | void popUp(QString message, QString icon = QString::null ); |
66 | Opie::Core::OProcess* m_process; | 72 | Opie::Core::OProcess* m_process; |
67 | }; | 73 | }; |
68 | 74 | ||
69 | #endif | 75 | #endif |
70 | 76 | ||