-rw-r--r-- | core/apps/embeddedkonsole/TEWidget.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/apps/embeddedkonsole/TEWidget.cpp b/core/apps/embeddedkonsole/TEWidget.cpp index 2e3e0f5..de5e585 100644 --- a/core/apps/embeddedkonsole/TEWidget.cpp +++ b/core/apps/embeddedkonsole/TEWidget.cpp | |||
@@ -1165,129 +1165,129 @@ bool TEWidget::eventFilter( QObject *obj, QEvent *e ) | |||
1165 | } | 1165 | } |
1166 | return QFrame::eventFilter( obj, e ); | 1166 | return QFrame::eventFilter( obj, e ); |
1167 | } | 1167 | } |
1168 | 1168 | ||
1169 | /* ------------------------------------------------------------------------- */ | 1169 | /* ------------------------------------------------------------------------- */ |
1170 | /* */ | 1170 | /* */ |
1171 | /* Frame */ | 1171 | /* Frame */ |
1172 | /* */ | 1172 | /* */ |
1173 | /* ------------------------------------------------------------------------- */ | 1173 | /* ------------------------------------------------------------------------- */ |
1174 | 1174 | ||
1175 | void TEWidget::frameChanged() | 1175 | void TEWidget::frameChanged() |
1176 | { | 1176 | { |
1177 | propagateSize(); | 1177 | propagateSize(); |
1178 | update(); | 1178 | update(); |
1179 | } | 1179 | } |
1180 | /* ------------------------------------------------------------------------- */ | 1180 | /* ------------------------------------------------------------------------- */ |
1181 | /* */ | 1181 | /* */ |
1182 | /* Sound */ | 1182 | /* Sound */ |
1183 | /* */ | 1183 | /* */ |
1184 | /* ------------------------------------------------------------------------- */ | 1184 | /* ------------------------------------------------------------------------- */ |
1185 | 1185 | ||
1186 | void TEWidget::Bell() | 1186 | void TEWidget::Bell() |
1187 | { | 1187 | { |
1188 | //#ifdef QT_QWS_SL5XXX | 1188 | //#ifdef QT_QWS_SL5XXX |
1189 | //# ifndef QT_NO_COP | 1189 | //# ifndef QT_NO_COP |
1190 | if(useBeep) | 1190 | if(useBeep) |
1191 | QCopEnvelope( "QPE/TaskBar", "soundAlarm()" ); | 1191 | QCopEnvelope( "QPE/TaskBar", "soundAlarm()" ); |
1192 | 1192 | ||
1193 | //# endif | 1193 | //# endif |
1194 | //#else | 1194 | //#else |
1195 | //# ifndef QT_NO_SOUND | 1195 | //# ifndef QT_NO_SOUND |
1196 | // QSound::play(Resource::findSound("alarm")); | 1196 | // QSound::play(Resource::findSound("alarm")); |
1197 | //# endif | 1197 | //# endif |
1198 | //#endif | 1198 | //#endif |
1199 | 1199 | ||
1200 | // QApplication::beep(); | 1200 | // QApplication::beep(); |
1201 | } | 1201 | } |
1202 | 1202 | ||
1203 | /* ------------------------------------------------------------------------- */ | 1203 | /* ------------------------------------------------------------------------- */ |
1204 | /* */ | 1204 | /* */ |
1205 | /* Auxiluary */ | 1205 | /* Auxiluary */ |
1206 | /* */ | 1206 | /* */ |
1207 | /* ------------------------------------------------------------------------- */ | 1207 | /* ------------------------------------------------------------------------- */ |
1208 | 1208 | ||
1209 | void TEWidget::clearImage() | 1209 | void TEWidget::clearImage() |
1210 | // initialize the image | 1210 | // initialize the image |
1211 | // for internal use only | 1211 | // for internal use only |
1212 | { | 1212 | { |
1213 | for (int y = 0; y < lines; y++) | 1213 | for (int y = 0; y < lines; y++) |
1214 | for (int x = 0; x < columns; x++) | 1214 | for (int x = 0; x < columns; x++) |
1215 | { | 1215 | { |
1216 | image[loc(x,y)].c = 0xff; //' '; | 1216 | image[loc(x,y)].c = 0xff; //' '; |
1217 | image[loc(x,y)].f = 0xff; //DEFAULT_FORE_COLOR; | 1217 | image[loc(x,y)].f = 0xff; //DEFAULT_FORE_COLOR; |
1218 | image[loc(x,y)].b = 0xff; //DEFAULT_BACK_COLOR; | 1218 | image[loc(x,y)].b = 0xff; //DEFAULT_BACK_COLOR; |
1219 | image[loc(x,y)].r = 0xff; //DEFAULT_RENDITION; | 1219 | image[loc(x,y)].r = 0xff; //DEFAULT_RENDITION; |
1220 | } | 1220 | } |
1221 | } | 1221 | } |
1222 | 1222 | ||
1223 | // Create Image /////////////////////////////////////////////////////// | 1223 | // Create Image /////////////////////////////////////////////////////// |
1224 | 1224 | ||
1225 | void TEWidget::calcGeometry() | 1225 | void TEWidget::calcGeometry() |
1226 | { | 1226 | { |
1227 | int showhscrollbar = 1; | 1227 | int showhscrollbar = 1; |
1228 | int hwidth = 0; | 1228 | int hwidth = 0; |
1229 | int dcolumns; | 1229 | int dcolumns = 0; |
1230 | Config cfg( "Konsole" ); | 1230 | Config cfg( "Konsole" ); |
1231 | cfg.setGroup("ScrollBar"); | 1231 | cfg.setGroup("ScrollBar"); |
1232 | useHorzScroll=cfg.readBoolEntry("HorzScroll",0); | 1232 | useHorzScroll=cfg.readBoolEntry("HorzScroll",0); |
1233 | 1233 | ||
1234 | if(vcolumns == 0) showhscrollbar = 0; | 1234 | if(vcolumns == 0) showhscrollbar = 0; |
1235 | if(showhscrollbar == 1) hwidth = QApplication::style().scrollBarExtent().width(); | 1235 | if(showhscrollbar == 1) hwidth = QApplication::style().scrollBarExtent().width(); |
1236 | 1236 | ||
1237 | scrollbar->resize(QApplication::style().scrollBarExtent().width(), | 1237 | scrollbar->resize(QApplication::style().scrollBarExtent().width(), |
1238 | contentsRect().height() - hwidth); | 1238 | contentsRect().height() - hwidth); |
1239 | 1239 | ||
1240 | switch(scrollLoc) { | 1240 | switch(scrollLoc) { |
1241 | case SCRNONE : | 1241 | case SCRNONE : |
1242 | columns = ( contentsRect().width() - 2 * rimX ) / font_w; | 1242 | columns = ( contentsRect().width() - 2 * rimX ) / font_w; |
1243 | dcolumns = columns; | 1243 | dcolumns = columns; |
1244 | if(vcolumns) columns = vcolumns; | 1244 | if(vcolumns) columns = vcolumns; |
1245 | blX = (contentsRect().width() - (columns*font_w) ) / 2; | 1245 | blX = (contentsRect().width() - (columns*font_w) ) / 2; |
1246 | if(showhscrollbar) | 1246 | if(showhscrollbar) |
1247 | blX = -hposition * font_w; | 1247 | blX = -hposition * font_w; |
1248 | brX = blX; | 1248 | brX = blX; |
1249 | scrollbar->hide(); | 1249 | scrollbar->hide(); |
1250 | break; | 1250 | break; |
1251 | case SCRLEFT : | 1251 | case SCRLEFT : |
1252 | columns = ( contentsRect().width() - 2 * rimX - scrollbar->width()) / font_w; | 1252 | columns = ( contentsRect().width() - 2 * rimX - scrollbar->width()) / font_w; |
1253 | dcolumns = columns; | 1253 | dcolumns = columns; |
1254 | if(vcolumns) columns = vcolumns; | 1254 | if(vcolumns) columns = vcolumns; |
1255 | brX = (contentsRect().width() - (columns*font_w) - scrollbar->width() ) / 2; | 1255 | brX = (contentsRect().width() - (columns*font_w) - scrollbar->width() ) / 2; |
1256 | if(showhscrollbar) | 1256 | if(showhscrollbar) |
1257 | brX = -hposition * font_w; | 1257 | brX = -hposition * font_w; |
1258 | blX = brX + scrollbar->width(); | 1258 | blX = brX + scrollbar->width(); |
1259 | scrollbar->move(contentsRect().topLeft()); | 1259 | scrollbar->move(contentsRect().topLeft()); |
1260 | scrollbar->show(); | 1260 | scrollbar->show(); |
1261 | break; | 1261 | break; |
1262 | case SCRRIGHT: | 1262 | case SCRRIGHT: |
1263 | columns = ( contentsRect().width() - 2 * rimX - scrollbar->width()) / font_w; | 1263 | columns = ( contentsRect().width() - 2 * rimX - scrollbar->width()) / font_w; |
1264 | dcolumns = columns; | 1264 | dcolumns = columns; |
1265 | if(vcolumns) columns = vcolumns; | 1265 | if(vcolumns) columns = vcolumns; |
1266 | blX = (contentsRect().width() - (columns*font_w) - scrollbar->width() ) / 2; | 1266 | blX = (contentsRect().width() - (columns*font_w) - scrollbar->width() ) / 2; |
1267 | if(showhscrollbar) | 1267 | if(showhscrollbar) |
1268 | blX = -hposition * font_w; | 1268 | blX = -hposition * font_w; |
1269 | brX = blX; | 1269 | brX = blX; |
1270 | scrollbar->move(contentsRect().topRight() - QPoint(scrollbar->width()-1,0)); | 1270 | scrollbar->move(contentsRect().topRight() - QPoint(scrollbar->width()-1,0)); |
1271 | scrollbar->show(); | 1271 | scrollbar->show(); |
1272 | break; | 1272 | break; |
1273 | } | 1273 | } |
1274 | //FIXME: support 'rounding' styles | 1274 | //FIXME: support 'rounding' styles |
1275 | lines = ( contentsRect().height() - 2 * rimY ) / font_h; | 1275 | lines = ( contentsRect().height() - 2 * rimY ) / font_h; |
1276 | bY = (contentsRect().height() - (lines *font_h)) / 2; | 1276 | bY = (contentsRect().height() - (lines *font_h)) / 2; |
1277 | 1277 | ||
1278 | if(showhscrollbar == 1) { | 1278 | if(showhscrollbar == 1) { |
1279 | hScrollbar->resize(contentsRect().width() - hwidth, hwidth); | 1279 | hScrollbar->resize(contentsRect().width() - hwidth, hwidth); |
1280 | hScrollbar->setRange(0, vcolumns - dcolumns); | 1280 | hScrollbar->setRange(0, vcolumns - dcolumns); |
1281 | 1281 | ||
1282 | QPoint p = contentsRect().bottomLeft(); | 1282 | QPoint p = contentsRect().bottomLeft(); |
1283 | if(scrollLoc == SCRLEFT) | 1283 | if(scrollLoc == SCRLEFT) |
1284 | hScrollbar->move(QPoint(p.x()+hwidth, p.y() - hwidth)); | 1284 | hScrollbar->move(QPoint(p.x()+hwidth, p.y() - hwidth)); |
1285 | else | 1285 | else |
1286 | hScrollbar->move(QPoint(p.x(), p.y() - hwidth)); | 1286 | hScrollbar->move(QPoint(p.x(), p.y() - hwidth)); |
1287 | 1287 | ||
1288 | hScrollbar->show(); | 1288 | hScrollbar->show(); |
1289 | } | 1289 | } |
1290 | else hScrollbar->hide(); | 1290 | else hScrollbar->hide(); |
1291 | 1291 | ||
1292 | if(showhscrollbar == 1) { | 1292 | if(showhscrollbar == 1) { |
1293 | lines = lines - (hwidth / font_h) - 1; | 1293 | lines = lines - (hwidth / font_h) - 1; |