summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-10-20 21:29:48 (UTC)
committer llornkcor <llornkcor>2002-10-20 21:29:48 (UTC)
commitcc00f1d3ecf6f6419cf2452df22c14d34a176207 (patch) (unidiff)
tree8d34b9203e5623fd9b4dd46b7ec1647852212639
parent5696ac7a408c826c1e62f2200f6209a2c3d95119 (diff)
downloadopie-cc00f1d3ecf6f6419cf2452df22c14d34a176207.zip
opie-cc00f1d3ecf6f6419cf2452df22c14d34a176207.tar.gz
opie-cc00f1d3ecf6f6419cf2452df22c14d34a176207.tar.bz2
remove repaint(), as its holding up everything on resume
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/cardmon/cardmon.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp
index 74e8837..815c993 100644
--- a/core/applets/cardmon/cardmon.cpp
+++ b/core/applets/cardmon/cardmon.cpp
@@ -98,135 +98,133 @@ void CardMonitor::popupTimeout() {
98} 98}
99 99
100void CardMonitor::mousePressEvent( QMouseEvent * ) { 100void CardMonitor::mousePressEvent( QMouseEvent * ) {
101 QPopupMenu *menu = new QPopupMenu(); 101 QPopupMenu *menu = new QPopupMenu();
102 QString cmd; 102 QString cmd;
103 int err=0; 103 int err=0;
104 104
105 if ( cardInSd ) { 105 if ( cardInSd ) {
106 menu->insertItem( tr("Eject SD/MMC card"), 0 ); 106 menu->insertItem( tr("Eject SD/MMC card"), 0 );
107 } 107 }
108 108
109 if ( cardInPcmcia0 ) { 109 if ( cardInPcmcia0 ) {
110 menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia0Type ) ), 110 menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia0Type ) ),
111 tr( "Eject card 0: %1" ).arg(cardInPcmcia0Name ), 1 ); 111 tr( "Eject card 0: %1" ).arg(cardInPcmcia0Name ), 1 );
112 } 112 }
113 113
114 if ( cardInPcmcia1 ) { 114 if ( cardInPcmcia1 ) {
115 menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia1Type ) ), 115 menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia1Type ) ),
116 tr( "Eject card 1: %1" ).arg( cardInPcmcia1Name ), 2 ); 116 tr( "Eject card 1: %1" ).arg( cardInPcmcia1Name ), 2 );
117 } 117 }
118 118
119 QPoint p = mapToGlobal ( QPoint ( 0, 0 ) ); 119 QPoint p = mapToGlobal ( QPoint ( 0, 0 ) );
120 QSize s = menu->sizeHint (); 120 QSize s = menu->sizeHint ();
121 int opt = menu->exec( QPoint ( 121 int opt = menu->exec( QPoint (
122 p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), 122 p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ),
123 p. y ( ) - s. height ( ) ), 0); 123 p. y ( ) - s. height ( ) ), 0);
124 124
125 if ( opt == 1 ) { 125 if ( opt == 1 ) {
126 cmd = "/sbin/cardctl eject 0"; 126 cmd = "/sbin/cardctl eject 0";
127 err = system( ( const char * ) cmd ); 127 err = system( ( const char * ) cmd );
128 if ( ( err == 127 ) || ( err < 0 ) ) { 128 if ( ( err == 127 ) || ( err < 0 ) ) {
129 qDebug( "Could not execute `/sbin/cardctl eject 0'! err=%d", err ); 129 qDebug( "Could not execute `/sbin/cardctl eject 0'! err=%d", err );
130 popUp( tr( "CF/PCMCIA card eject failed!" ) ); 130 popUp( tr( "CF/PCMCIA card eject failed!" ) );
131 } 131 }
132 } else if ( opt == 0 ) { 132 } else if ( opt == 0 ) {
133 if ( ODevice::inst()->system() == System_Familiar ) { 133 if ( ODevice::inst()->system() == System_Familiar ) {
134 cmd = "umount /dev/mmc/part1"; 134 cmd = "umount /dev/mmc/part1";
135 err = system( ( const char *) cmd ); 135 err = system( ( const char *) cmd );
136 if ( ( err != 0 ) ) { 136 if ( ( err != 0 ) ) {
137 popUp( tr("SD/MMC card eject failed!") ); 137 popUp( tr("SD/MMC card eject failed!") );
138 } 138 }
139 } else { 139 } else {
140 cmd = "/etc/sdcontrol compeject"; 140 cmd = "/etc/sdcontrol compeject";
141 err = system( ( const char *) cmd ); 141 err = system( ( const char *) cmd );
142 if ( ( err != 0 ) ) { 142 if ( ( err != 0 ) ) {
143 qDebug( "Could not execute `/etc/sdcontrol comeject'! err=%d", err ); 143 qDebug( "Could not execute `/etc/sdcontrol comeject'! err=%d", err );
144 popUp( tr("SD/MMC card eject failed!") ); 144 popUp( tr("SD/MMC card eject failed!") );
145 } 145 }
146 } 146 }
147 } else if ( opt == 2 ) { 147 } else if ( opt == 2 ) {
148 cmd = "/sbin/cardctl eject 1"; 148 cmd = "/sbin/cardctl eject 1";
149 err = system( ( const char *) cmd ); 149 err = system( ( const char *) cmd );
150 if ( ( err == 127 ) || ( err < 0 ) ) { 150 if ( ( err == 127 ) || ( err < 0 ) ) {
151 qDebug( "Could not execute `/sbin/cardctl eject 1'! err=%d", err ); 151 qDebug( "Could not execute `/sbin/cardctl eject 1'! err=%d", err );
152 popUp( tr( "CF/PCMCIA card eject failed!" ) ); 152 popUp( tr( "CF/PCMCIA card eject failed!" ) );
153 } 153 }
154 } 154 }
155 delete menu; 155 delete menu;
156} 156}
157 157
158 158
159void CardMonitor::cardMessage( const QCString &msg, const QByteArray & ) { 159void CardMonitor::cardMessage( const QCString &msg, const QByteArray & ) {
160 if ( msg == "stabChanged()" ) { 160 if ( msg == "stabChanged()" ) {
161 // qDebug("Pcmcia: stabchanged"); 161 // qDebug("Pcmcia: stabchanged");
162 if ( getStatusPcmcia() ) { 162 getStatusPcmcia();
163 repaint( FALSE );
164 } 163 }
165 } else if ( msg == "mtabChanged()" ) { 164 } else if ( msg == "mtabChanged()" ) {
166 qDebug("CARDMONAPPLET: mtabchanged"); 165 qDebug("CARDMONAPPLET: mtabchanged");
167 if ( getStatusSd() ) { 166 getStatusSd();
168 repaint( FALSE );
169 } 167 }
170 } 168 }
171} 169}
172 170
173bool CardMonitor::getStatusPcmcia( int showPopUp ) { 171bool CardMonitor::getStatusPcmcia( int showPopUp ) {
174 172
175 bool cardWas0 = cardInPcmcia0; // remember last state 173 bool cardWas0 = cardInPcmcia0; // remember last state
176 bool cardWas1 = cardInPcmcia1; 174 bool cardWas1 = cardInPcmcia1;
177 175
178 QString fileName; 176 QString fileName;
179 177
180 // one of these 3 files should exist 178 // one of these 3 files should exist
181 if ( QFile::exists( "/var/run/stab" ) ) { 179 if ( QFile::exists( "/var/run/stab" ) ) {
182 fileName = "/var/run/stab"; 180 fileName = "/var/run/stab";
183 } else if (QFile::exists( "/var/state/pcmcia/stab" ) ) { 181 } else if (QFile::exists( "/var/state/pcmcia/stab" ) ) {
184 fileName = "/var/state/pcmcia/stab"; 182 fileName = "/var/state/pcmcia/stab";
185 } else { 183 } else {
186 fileName = "/var/lib/pcmcia/stab"; 184 fileName = "/var/lib/pcmcia/stab";
187 } 185 }
188 186
189 QFile f( fileName ); 187 QFile f( fileName );
190 188
191 if ( f.open( IO_ReadOnly ) ) { 189 if ( f.open( IO_ReadOnly ) ) {
192 QStringList list; 190 QStringList list;
193 QTextStream stream ( &f ); 191 QTextStream stream ( &f );
194 QString streamIn; 192 QString streamIn;
195 streamIn = stream.read(); 193 streamIn = stream.read();
196 list = QStringList::split( "\n", streamIn ); 194 list = QStringList::split( "\n", streamIn );
197 for( QStringList::Iterator line=list.begin(); line!=list.end(); line++ ) { 195 for( QStringList::Iterator line=list.begin(); line!=list.end(); line++ ) {
198 if( (*line).startsWith( "Socket 0:" ) ){ 196 if( (*line).startsWith( "Socket 0:" ) ){
199 if( (*line).startsWith( "Socket 0: empty" ) && cardInPcmcia0 ){ 197 if( (*line).startsWith( "Socket 0: empty" ) && cardInPcmcia0 ){
200 cardInPcmcia0 = FALSE; 198 cardInPcmcia0 = FALSE;
201 } else if ( !(*line).startsWith( "Socket 0: empty" ) && !cardInPcmcia0 ){ 199 } else if ( !(*line).startsWith( "Socket 0: empty" ) && !cardInPcmcia0 ){
202 cardInPcmcia0Name = (*line).mid( ( (*line).find( ':' ) + 1 ), (*line).length() - 9 ); 200 cardInPcmcia0Name = (*line).mid( ( (*line).find( ':' ) + 1 ), (*line).length() - 9 );
203 cardInPcmcia0Name.stripWhiteSpace(); 201 cardInPcmcia0Name.stripWhiteSpace();
204 cardInPcmcia0 = TRUE; 202 cardInPcmcia0 = TRUE;
205 show(); 203 show();
206 line++; 204 line++;
207 int pos=(*line).find('\t' ) + 1; 205 int pos=(*line).find('\t' ) + 1;
208 cardInPcmcia0Type = (*line).mid( pos, (*line).find( "\t" , pos) - pos ); 206 cardInPcmcia0Type = (*line).mid( pos, (*line).find( "\t" , pos) - pos );
209 } 207 }
210 } else if( (*line).startsWith( "Socket 1:" ) ){ 208 } else if( (*line).startsWith( "Socket 1:" ) ){
211 if( (*line).startsWith( "Socket 1: empty" ) && cardInPcmcia1 ) { 209 if( (*line).startsWith( "Socket 1: empty" ) && cardInPcmcia1 ) {
212 cardInPcmcia1 = FALSE; 210 cardInPcmcia1 = FALSE;
213 } else if ( !(*line).startsWith( "Socket 1: empty" ) && !cardInPcmcia1 ) { 211 } else if ( !(*line).startsWith( "Socket 1: empty" ) && !cardInPcmcia1 ) {
214 cardInPcmcia1Name = (*line).mid(((*line).find(':') + 1), (*line).length() - 9 ); 212 cardInPcmcia1Name = (*line).mid(((*line).find(':') + 1), (*line).length() - 9 );
215 cardInPcmcia1Name.stripWhiteSpace(); 213 cardInPcmcia1Name.stripWhiteSpace();
216 cardInPcmcia1 = TRUE; 214 cardInPcmcia1 = TRUE;
217 show(); 215 show();
218 line++; 216 line++;
219 int pos=(*line).find('\t') + 1; 217 int pos=(*line).find('\t') + 1;
220 cardInPcmcia1Type = (*line).mid( pos, (*line).find("\t", pos) - pos ); 218 cardInPcmcia1Type = (*line).mid( pos, (*line).find("\t", pos) - pos );
221 } 219 }
222 } 220 }
223 } 221 }
224 f.close(); 222 f.close();
225 223
226 if( !showPopUp && (cardWas0 != cardInPcmcia0 || cardWas1 != cardInPcmcia1) ) { 224 if( !showPopUp && (cardWas0 != cardInPcmcia0 || cardWas1 != cardInPcmcia1) ) {
227 QString text = QString::null; 225 QString text = QString::null;
228 QString what = QString::null; 226 QString what = QString::null;
229 if(cardWas0 != cardInPcmcia0) { 227 if(cardWas0 != cardInPcmcia0) {
230 if(cardInPcmcia0) { 228 if(cardInPcmcia0) {
231 text += tr( "New card: " ); 229 text += tr( "New card: " );
232 what="on"; 230 what="on";