diff options
Diffstat (limited to 'konsole')
39 files changed, 968 insertions, 767 deletions
diff --git a/konsole/README.konsole_kiosk b/konsole/README.konsole_kiosk index f769d5baf..c2d6525e9 100644 --- a/konsole/README.konsole_kiosk +++ b/konsole/README.konsole_kiosk @@ -50,7 +50,7 @@ action/scrollbar action/keyboard -So if you don't want the user to toggle his scrollbar settings, you would add: +So if you don't want the user to toggle their scrollbar settings, you would add: [KDE Action Restrictions] action/scrollbar=false diff --git a/konsole/konsole/TEPty.cpp b/konsole/konsole/TEPty.cpp index 2148ec03c..fbb152289 100644 --- a/konsole/konsole/TEPty.cpp +++ b/konsole/konsole/TEPty.cpp @@ -171,12 +171,12 @@ void TEPty::setWriteable(bool writeable) TEPty::TEPty() { m_bufferFull = false; - connect(this, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )), - this, TQT_SLOT(dataReceived(TDEProcess *,char *, int))); - connect(this, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(donePty())); - connect(this, TQT_SIGNAL(wroteStdin(TDEProcess *)), - this, TQT_SLOT(writeReady())); + connect(this, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int )), + this, TQ_SLOT(dataReceived(TDEProcess *,char *, int))); + connect(this, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(donePty())); + connect(this, TQ_SIGNAL(wroteStdin(TDEProcess *)), + this, TQ_SLOT(writeReady())); setUsePty(All, false); // utmp will be overridden later } diff --git a/konsole/konsole/TEPty.h b/konsole/konsole/TEPty.h index 21ea3ff94..05a453f31 100644 --- a/konsole/konsole/TEPty.h +++ b/konsole/konsole/TEPty.h @@ -31,7 +31,7 @@ class TEPty: public TDEProcess { -Q_OBJECT +TQ_OBJECT public: diff --git a/konsole/konsole/TEScreen.cpp b/konsole/konsole/TEScreen.cpp index 9bd62ff4d..8f2473e31 100644 --- a/konsole/konsole/TEScreen.cpp +++ b/konsole/konsole/TEScreen.cpp @@ -81,7 +81,8 @@ TEScreen::TEScreen(int l, int c) ef_fg(cacol()), ef_bg(cacol()), ef_re(0), sa_cuX(0), sa_cuY(0), sa_cu_re(0), sa_cu_fg(cacol()), sa_cu_bg(cacol()), - lastPos(-1) + lastPos(-1), + lastDrawnChar(0) { /* this->lines = lines; @@ -175,7 +176,7 @@ void TEScreen::cursorLeft(int n) } /*! - Move the cursor left. + Move the cursor right. The cursor will not move beyond the rightmost column. */ @@ -188,6 +189,50 @@ void TEScreen::cursorRight(int n) } /*! + Move the cursor at most n lines next +*/ + +void TEScreen::cursorNextLine(int n) +//=CNL +{ + if (n == 0) + { + n = 1; // Default + } + cuX = 0; + while (n > 0) + { + if (cuY < lines - 1) + { + cuY += 1; + } + n--; + } +} + +/*! + Move the cursor at most n lines previous +*/ + +void TEScreen::cursorPrevLine(int n) +//=CPL +{ + if (n == 0) + { + n = 1; // Default + } + cuX = 0; + while (n > 0) + { + if (cuY > 0) + { + cuY -= 1; + } + n--; + } +} + +/*! Set top and bottom margin. */ @@ -300,6 +345,26 @@ void TEScreen::insertChars(int n) clearImage(loc(cuX,cuY),loc(q-1,cuY),' '); } +void TEScreen::repeatChars(int n) +{ + if (n == 0) + { + n = 1; // Default + } + + // From ECMA-48 version 5, section 8.3.103: + // "If the character preceding REP is a control function or part of a + // control function, the effect of REP is not defined by this Standard." + // + // So, a "normal" program should always use REP immediately after a visible + // character (those other than escape sequences). So, lastDrawnChar can be + // safely used. + for (int i = 0; i < n; i++) + { + ShowCharacter(lastDrawnChar); + } +} + /*! delete `n' lines starting from (including) the cursor position. The cursor is not moved by the operation. @@ -762,6 +827,8 @@ void TEScreen::ShowCharacter(unsigned short c) lastPos = i; + lastDrawnChar = c; + cuX += w--; while(w) @@ -802,10 +869,22 @@ void TEScreen::scrollUp(int n) void TEScreen::scrollUp(int from, int n) { - if (n <= 0 || from + n > bmargin) return; - //FIXME: make sure `tmargin', `bmargin', `from', `n' is in bounds. - moveImage(loc(0,from),loc(0,from+n),loc(columns-1,bmargin)); - clearImage(loc(0,bmargin-n+1),loc(columns-1,bmargin),' '); + if (n <= 0) + { + return; + } + if (from > bmargin) + { + return; + } + if ((from + n) > bmargin) + { + n = bmargin + 1 - from; + } + + //FIXME: make sure `tmargin', `bmargin', `from', `n' is in bounds. + moveImage(loc(0, from), loc(0, from+n), loc(columns, bmargin)); + clearImage(loc(0, bmargin-n+1), loc(columns-1, bmargin), ' '); } void TEScreen::scrollDown(int n) @@ -1013,12 +1092,6 @@ void TEScreen::clearToBeginOfScreen() void TEScreen::clearEntireScreen() { - // Add entire screen to history - for (int i = 0; i < (lines-1); i++) - { - addHistLine(); scrollUp(0,1); - } - clearImage(loc(0,0),loc(columns-1,lines-1),' '); } diff --git a/konsole/konsole/TEScreen.h b/konsole/konsole/TEScreen.h index 9797b53ab..a28aab949 100644 --- a/konsole/konsole/TEScreen.h +++ b/konsole/konsole/TEScreen.h @@ -52,14 +52,16 @@ public: // these are all `Screen' operations // // Cursor Movement // - void cursorUp (int n); - void cursorDown (int n); - void cursorLeft (int n); - void cursorRight (int n); - void setCursorY (int y); - void setCursorX (int x); - void setCursorYX (int y, int x); - void setMargins (int t, int b); + void cursorUp (int n); + void cursorDown (int n); + void cursorLeft (int n); + void cursorRight (int n); + void cursorNextLine(int n); + void cursorPrevLine(int n); + void setCursorY (int y); + void setCursorX (int x); + void setCursorYX (int y, int x); + void setMargins (int t, int b); // // Cursor Movement with Scrolling // @@ -83,6 +85,7 @@ public: // these are all `Screen' operations void eraseChars (int n); void deleteChars (int n); void insertChars (int n); + void repeatChars (int n); void deleteLines (int n); void insertLines (int n); // @@ -271,6 +274,9 @@ private: // helper // last position where we added a character int lastPos; + // used in REP (repeating char) + unsigned short lastDrawnChar; + // modes ScreenParm saveParm; diff --git a/konsole/konsole/TEWidget.cpp b/konsole/konsole/TEWidget.cpp index 52cd1236b..33dcf7f79 100644 --- a/konsole/konsole/TEWidget.cpp +++ b/konsole/konsole/TEWidget.cpp @@ -308,6 +308,19 @@ void TEWidget::fontChange(const TQFont &) update(); } +void TEWidget::biggerFont(void) { + TQFont f = getVTFont(); + f.setPointSize( f.pointSize() + 1 ); + setVTFont( f ); +} + +void TEWidget::smallerFont(void) { + TQFont f = getVTFont(); + if ( f.pointSize() < 6 ) return; // A minimum size + f.setPointSize( f.pointSize() - 1 ); + setVTFont( f ); +} + void TEWidget::setVTFont(const TQFont& f) { TQFont font = f; @@ -397,17 +410,17 @@ TEWidget::TEWidget(TQWidget *parent, const char *name) bY = bX = 1; cb = TQApplication::clipboard(); - TQObject::connect( (TQObject*)cb, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(onClearSelection()) ); + TQObject::connect( (TQObject*)cb, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(onClearSelection()) ); scrollbar = new TQScrollBar(this); - scrollbar->setCursor( tqarrowCursor ); - connect(scrollbar, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(scrollChanged(int))); + scrollbar->setCursor( TQt::arrowCursor ); + connect(scrollbar, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(scrollChanged(int))); blinkT = new TQTimer(this); - connect(blinkT, TQT_SIGNAL(timeout()), this, TQT_SLOT(blinkEvent())); + connect(blinkT, TQ_SIGNAL(timeout()), this, TQ_SLOT(blinkEvent())); blinkCursorT = new TQTimer(this); - connect(blinkCursorT, TQT_SIGNAL(timeout()), this, TQT_SLOT(blinkCursorEvent())); + connect(blinkCursorT, TQ_SIGNAL(timeout()), this, TQ_SLOT(blinkCursorEvent())); setMouseMarks(true); setColorTable(base_color_table); // init color table @@ -419,7 +432,7 @@ TEWidget::TEWidget(TQWidget *parent, const char *name) setAcceptDrops(true); // attempt dragInfo.state = diNone; - setFocusPolicy( TQ_WheelFocus ); + setFocusPolicy( TQWidget::WheelFocus ); // im setInputMethodEnabled(true); @@ -594,7 +607,7 @@ void TEWidget::drawTextFixed(TQPainter &paint, int x, int y, } } - paint.drawText(x,y, w, font_h, Qt::AlignHCenter | TQt::DontClip, drawstr, -1); + paint.drawText(x,y, w, font_h, TQt::AlignHCenter | TQt::DontClip, drawstr, -1); x += w; } } @@ -608,7 +621,7 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect, TQString& str, const ca *attr, bool pm, bool clear) { int a = font_a + m_lineSpacing / 2; - TQColor fColor = printerFriendly ? Qt::black : attr->f.color(color_table); + TQColor fColor = printerFriendly ? TQt::black : attr->f.color(color_table); TQColor bColor = attr->b.color(color_table); TQString drawstr; @@ -621,13 +634,9 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect, if (attr->isTransparent(color_table)) { if (pm) - paint.setBackgroundMode( Qt::TransparentMode ); + paint.setBackgroundMode( TQt::TransparentMode ); if (clear || (blinking && (attr->r & RE_BLINK))) { -#ifdef USE_QT4 - paint.eraseRect(rect); -#else // USE_QT4 erase(rect); -#endif // USE_QT4 } } else @@ -638,7 +647,7 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect, // draw background colors with 75% opacity if ( draw_translucent_background_colors && argb_visual && tqAlpha(blend_color) < 0xff ) { - QRgb col = bColor.rgb(); + TQRgb col = bColor.rgb(); TQ_UINT8 salpha = 192; TQ_UINT8 dalpha = 255 - salpha; @@ -667,7 +676,7 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect, tmpRect.setWidth( tmpRect.width() + font_w ); } - paint.fillRect( tmpRect, Qt::darkCyan ); // currently use hard code color + paint.fillRect( tmpRect, TQt::darkCyan ); // currently use hard code color } if ( m_isIMSel && !tmpStr.isEmpty() ) { // imput method selection background color @@ -682,13 +691,13 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect, tmpRect.setWidth( tmpRect.width() + font_w ); } - paint.fillRect( tmpRect, Qt::darkGray ); // currently use hard code color + paint.fillRect( tmpRect, TQt::darkGray ); // currently use hard code color } } // Paint cursor if ((attr->r & RE_CURSOR) && !isPrinting) { - paint.setBackgroundMode( Qt::TransparentMode ); + paint.setBackgroundMode( TQt::TransparentMode ); int h = font_h - m_lineSpacing; TQRect r(rect.x(),rect.y()+m_lineSpacing/2,rect.width(),h); if (hasFocus()) @@ -731,7 +740,7 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect, int y = rect.y(); // top of rect if ( shadow ) { - paint.setPen( Qt::black ); + paint.setPen( TQt::black ); drawTextFixed(paint, x+1, y+1, str, attr); paint.setPen(fColor); } @@ -744,7 +753,7 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect, int y = rect.y()+a; // baseline if ( shadow ) { - paint.setPen( Qt::black ); + paint.setPen( TQt::black ); paint.drawText(x+1,y+1, str, -1, bidiEnabled ? TQPainter::Auto : TQPainter::LTR ); paint.setPen(fColor); } @@ -762,7 +771,7 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect, { paint.setClipRect(rect); // On screen we use overstrike for bold - paint.setBackgroundMode( Qt::TransparentMode ); + paint.setBackgroundMode( TQt::TransparentMode ); int x = rect.x()+1; if(!fixed_font) { @@ -968,7 +977,7 @@ void TEWidget::setImage(const ca* const newimg, int lines, int columns) mResizeWidget->setMinimumWidth(mResizeLabel->fontMetrics().width(i18n("Size: XXX x XXX"))+20); mResizeWidget->setMinimumHeight(mResizeLabel->sizeHint().height()+20); mResizeTimer = new TQTimer(this); - connect(mResizeTimer, TQT_SIGNAL(timeout()), mResizeWidget, TQT_SLOT(hide())); + connect(mResizeTimer, TQ_SIGNAL(timeout()), mResizeWidget, TQ_SLOT(hide())); } TQString sizeStr = i18n("Size: %1 x %2").arg(columns).arg(lines); mResizeLabel->setText(sizeStr); @@ -1007,7 +1016,7 @@ void TEWidget::paintEvent( TQPaintEvent* pe ) TQPainter paint; setUpdatesEnabled(false); paint.begin( this ); - paint.setBackgroundMode( Qt::TransparentMode ); + paint.setBackgroundMode( TQt::TransparentMode ); // Note that the actual widget size can be slightly larger // that the image (the size is truncated towards the smaller @@ -1084,7 +1093,7 @@ void TEWidget::print(TQPainter &paint, bool friendly, bool exact) pm.fill(); TQPainter pm_paint; - pm_paint.begin(&pm, TQT_TQWIDGET(this)); + pm_paint.begin(&pm, this); paintContents(pm_paint, contentsRect(), true); pm_paint.end(); paint.drawPixmap(0, 0, pm); @@ -1245,13 +1254,13 @@ void TEWidget::scrollChanged(int) void TEWidget::setScroll(int cursor, int slines) { //kdDebug(1211)<<"TEWidget::setScroll() disconnect()"<<endl; - disconnect(scrollbar, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(scrollChanged(int))); + disconnect(scrollbar, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(scrollChanged(int))); //kdDebug(1211)<<"TEWidget::setScroll() setRange()"<<endl; scrollbar->setRange(0,slines); //kdDebug(1211)<<"TEWidget::setScroll() setSteps()"<<endl; scrollbar->setSteps(1,lines); scrollbar->setValue(cursor); - connect(scrollbar, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(scrollChanged(int))); + connect(scrollbar, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(scrollChanged(int))); //kdDebug(1211)<<"TEWidget::setScroll() done"<<endl; } @@ -1302,7 +1311,7 @@ void TEWidget::mousePressEvent(TQMouseEvent* ev) { //printf("press [%d,%d] %d\n",ev->x()/font_w,ev->y()/font_h,ev->button()); - if ( possibleTripleClick && (ev->button()==Qt::LeftButton) ) { + if ( possibleTripleClick && (ev->button()==TQt::LeftButton) ) { mouseTripleClickEvent(ev); return; } @@ -1315,7 +1324,7 @@ void TEWidget::mousePressEvent(TQMouseEvent* ev) TQPoint pos = TQPoint((ev->x()-tLx-bX+(font_w/2))/font_w,(ev->y()-tLy-bY)/font_h); //printf("press top left [%d,%d] by=%d\n",tLx,tLy, bY); - if ( ev->button() == Qt::LeftButton) + if ( ev->button() == TQt::LeftButton) { line_selection_mode = false; word_selection_mode = false; @@ -1352,14 +1361,14 @@ void TEWidget::mousePressEvent(TQMouseEvent* ev) } } } - else if ( ev->button() == Qt::MidButton ) + else if ( ev->button() == TQt::MidButton ) { if ( mouse_marks || (!mouse_marks && (ev->state() & ShiftButton)) ) emitSelection(true,ev->state() & ControlButton); else emit mouseSignal( 1, (ev->x()-tLx-bX)/font_w +1, (ev->y()-tLy-bY)/font_h +1 +scrollbar->value() -scrollbar->maxValue() ); } - else if ( ev->button() == Qt::RightButton ) + else if ( ev->button() == TQt::RightButton ) { if (mouse_marks || (ev->state() & ShiftButton)) { configureRequestPoint = TQPoint( ev->x(), ev->y() ); @@ -1373,7 +1382,7 @@ void TEWidget::mousePressEvent(TQMouseEvent* ev) void TEWidget::mouseMoveEvent(TQMouseEvent* ev) { // for auto-hiding the cursor, we need mouseTracking - if (ev->state() == Qt::NoButton ) return; + if (ev->state() == TQt::NoButton ) return; if (dragInfo.state == diPending) { // we had a mouse down, but haven't confirmed a drag yet @@ -1397,7 +1406,7 @@ void TEWidget::mouseMoveEvent(TQMouseEvent* ev) if (actSel == 0) return; // don't extend selection while pasting - if (ev->state() & Qt::MidButton) return; + if (ev->state() & TQt::MidButton) return; extendSelection( ev->pos() ); } @@ -1591,7 +1600,7 @@ void TEWidget::extendSelection( TQPoint pos ) void TEWidget::mouseReleaseEvent(TQMouseEvent* ev) { //printf("release [%d,%d] %d\n",ev->x()/font_w,ev->y()/font_h,ev->button()); - if ( ev->button() == Qt::LeftButton) + if ( ev->button() == TQt::LeftButton) { emit isBusySelecting(false); // Ok.. we can breath again. if(dragInfo.state == diPending) @@ -1621,8 +1630,8 @@ void TEWidget::mouseReleaseEvent(TQMouseEvent* ev) } dragInfo.state = diNone; } - if ( !mouse_marks && ((ev->button() == Qt::RightButton && !(ev->state() & ShiftButton)) - || ev->button() == Qt::MidButton) ) { + if ( !mouse_marks && ((ev->button() == TQt::RightButton && !(ev->state() & ShiftButton)) + || ev->button() == TQt::MidButton) ) { TQPoint tL = contentsRect().topLeft(); int tLx = tL.x(); int tLy = tL.y(); @@ -1634,7 +1643,7 @@ void TEWidget::mouseReleaseEvent(TQMouseEvent* ev) void TEWidget::mouseDoubleClickEvent(TQMouseEvent* ev) { - if ( ev->button() != Qt::LeftButton) return; + if ( ev->button() != TQt::LeftButton) return; TQPoint tL = contentsRect().topLeft(); int tLx = tL.x(); @@ -1687,14 +1696,25 @@ void TEWidget::mouseDoubleClickEvent(TQMouseEvent* ev) } possibleTripleClick=true; - TQTimer::singleShot(TQApplication::doubleClickInterval(),this,TQT_SLOT(tripleClickTimeout())); + TQTimer::singleShot(TQApplication::doubleClickInterval(),this,TQ_SLOT(tripleClickTimeout())); } void TEWidget::wheelEvent( TQWheelEvent* ev ) { - if (ev->orientation() != Qt::Vertical) + if (ev->orientation() != TQt::Vertical) return; + if (ev->state() & ControlButton) { + if (ev->delta() > 0) { + biggerFont(); + } + else { + smallerFont(); + } + ev->accept(); + return; + } + if ( mouse_marks ) { if (!screen || screen->hasScroll() || (scrollbar->maxValue() == 0 && screen_num == 0)) @@ -1810,7 +1830,7 @@ void TEWidget::setWordCharacters(TQString wc) void TEWidget::setMouseMarks(bool on) { mouse_marks = on; - setCursor( mouse_marks ? tqibeamCursor : tqarrowCursor ); + setCursor( mouse_marks ? TQt::ibeamCursor : TQt::arrowCursor ); } /* ------------------------------------------------------------------------- */ @@ -1850,15 +1870,15 @@ void TEWidget::setSelection(const TQString& t) { // Disconnect signal while WE set the clipboard TQClipboard *cb = TQApplication::clipboard(); - TQObject::disconnect( cb, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(onClearSelection()) ); + TQObject::disconnect( cb, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(onClearSelection()) ); cb->setSelectionMode( true ); cb->setText(t); cb->setSelectionMode( false ); - TQObject::connect( cb, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(onClearSelection()) ); + TQObject::connect( cb, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(onClearSelection()) ); } void TEWidget::copyClipboard() @@ -1911,14 +1931,14 @@ bool TEWidget::eventFilter( TQObject *obj, TQEvent *e ) if ( (e->type() == TQEvent::Accel || e->type() == TQEvent::AccelAvailable ) && tqApp->focusWidget() == this ) { - TQT_TQKEYEVENT( e )->ignore(); + static_cast<TQKeyEvent*>( e )->ignore(); return false; } - if ( TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(this) /* when embedded */ && TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(parent()) /* when standalone */ ) + if ( obj != this /* when embedded */ && obj != parent() /* when standalone */ ) return false; // not us if ( e->type() == TQEvent::KeyPress ) { - TQKeyEvent *ke = TQT_TQKEYEVENT(e); + TQKeyEvent *ke = static_cast<TQKeyEvent*>(e); actSel=0; // Key stroke implies a screen update, so TEWidget won't // know where the current selection is. @@ -1936,13 +1956,13 @@ bool TEWidget::eventFilter( TQObject *obj, TQEvent *e ) } if ( e->type() == TQEvent::KeyRelease ) { - TQKeyEvent *ke = TQT_TQKEYEVENT(e); + TQKeyEvent *ke = static_cast<TQKeyEvent*>(e); emit keyReleasedSignal(ke); return true; } if ( e->type() == TQEvent::FocusIn ) { - TQFocusEvent *fe = TQT_TQFOCUSEVENT(e); + TQFocusEvent *fe = static_cast<TQFocusEvent*>(e); if (fe->gotFocus()) { emit focusInSignal(fe); @@ -1952,13 +1972,13 @@ bool TEWidget::eventFilter( TQObject *obj, TQEvent *e ) } if ( e->type() == TQEvent::Enter ) { - TQObject::disconnect( (TQObject*)cb, TQT_SIGNAL(dataChanged()), - this, TQT_SLOT(onClearSelection()) ); + TQObject::disconnect( (TQObject*)cb, TQ_SIGNAL(dataChanged()), + this, TQ_SLOT(onClearSelection()) ); } if ( e->type() == TQEvent::Leave ) { - TQObject::connect( (TQObject*)cb, TQT_SIGNAL(dataChanged()), - this, TQT_SLOT(onClearSelection()) ); + TQObject::connect( (TQObject*)cb, TQ_SIGNAL(dataChanged()), + this, TQ_SLOT(onClearSelection()) ); } return TQFrame::eventFilter( obj, e ); } @@ -2030,7 +2050,7 @@ bool TEWidget::event( TQEvent *e ) { if ( e->type() == TQEvent::AccelOverride ) { - TQKeyEvent *ke = TQT_TQKEYEVENT( e ); + TQKeyEvent *ke = static_cast<TQKeyEvent*>( e ); KKey key( ke ); int keyCodeQt = key.keyCodeQt(); @@ -2104,7 +2124,7 @@ void TEWidget::Bell(bool visibleSession, TQString message) bellTimer.start(BELLVISUAL_DELAY,true); swapColorTable(); - TQTimer::singleShot(200,this,TQT_SLOT(swapColorTable())); + TQTimer::singleShot(200,this,TQ_SLOT(swapColorTable())); } } @@ -2250,7 +2270,7 @@ void TEWidget::dropEvent(TQDropEvent* event) m_drop->insertItem( "cp", cp ); m_drop->insertItem( "ln", ln ); m_drop->insertItem( "mv", mv ); - connect(m_drop, TQT_SIGNAL(activated(int)), TQT_SLOT(drop_menu_activated(int))); + connect(m_drop, TQ_SIGNAL(activated(int)), TQ_SLOT(drop_menu_activated(int))); }; // The current behaviour when url(s) are dropped is // * if there is only ONE url and if it's a LOCAL one, ask for paste or cd/cp/ln/mv diff --git a/konsole/konsole/TEWidget.h b/konsole/konsole/TEWidget.h index 967896082..047c04b4b 100644 --- a/konsole/konsole/TEWidget.h +++ b/konsole/konsole/TEWidget.h @@ -44,7 +44,7 @@ class TQTimer; class TEWidget : public TQFrame // a widget representing attributed text { - Q_OBJECT + TQ_OBJECT friend class Konsole; @@ -53,7 +53,7 @@ public: TEWidget(TQWidget *parent=0, const char *name=0); virtual ~TEWidget(); - void setBlendColor(const QRgb color) { blend_color = color; } + void setBlendColor(const TQRgb color) { blend_color = color; } void setDefaultBackColor(const TQColor& color); TQColor getDefaultBackColor(); @@ -126,6 +126,10 @@ public: */ void setVTFont(const TQFont& font); + /** Changes font size by 1 point */ + void biggerFont(); + void smallerFont(); + void setMouseMarks(bool on); static void setAntialias( bool enable ) { s_antialias = enable; } static bool antialias() { return s_antialias; } @@ -335,7 +339,7 @@ private: bool m_isIMEdit; bool m_isIMSel; - QRgb blend_color; + TQRgb blend_color; private slots: void drop_menu_activated(int item); diff --git a/konsole/konsole/TEmuVt102.cpp b/konsole/konsole/TEmuVt102.cpp index e0efab745..1d303089d 100644 --- a/konsole/konsole/TEmuVt102.cpp +++ b/konsole/konsole/TEmuVt102.cpp @@ -81,10 +81,10 @@ TEmuVt102::TEmuVt102(TEWidget* gui) : TEmulation(gui) { //kdDebug(1211)<<"TEmuVt102 ctor() connecting"<<endl; - TQObject::connect(gui,TQT_SIGNAL(mouseSignal(int,int,int)), - this,TQT_SLOT(onMouse(int,int,int))); - TQObject::connect(gui, TQT_SIGNAL(sendStringToEmu(const char*)), - this, TQT_SLOT(sendString(const char*))); + TQObject::connect(gui,TQ_SIGNAL(mouseSignal(int,int,int)), + this,TQ_SLOT(onMouse(int,int,int))); + TQObject::connect(gui, TQ_SIGNAL(sendStringToEmu(const char*)), + this, TQ_SLOT(sendString(const char*))); //kdDebug(1211)<<"TEmuVt102 ctor() initToken..."<<endl; initTokenizer(); //kdDebug(1211)<<"TEmuVt102 ctor() reset()"<<endl; @@ -100,16 +100,16 @@ void TEmuVt102::changeGUI(TEWidget* newgui) if (static_cast<TEWidget *>( gui )==newgui) return; if ( gui ) { - TQObject::disconnect(gui,TQT_SIGNAL(mouseSignal(int,int,int)), - this,TQT_SLOT(onMouse(int,int,int))); - TQObject::disconnect(gui, TQT_SIGNAL(sendStringToEmu(const char*)), - this, TQT_SLOT(sendString(const char*))); + TQObject::disconnect(gui,TQ_SIGNAL(mouseSignal(int,int,int)), + this,TQ_SLOT(onMouse(int,int,int))); + TQObject::disconnect(gui, TQ_SIGNAL(sendStringToEmu(const char*)), + this, TQ_SLOT(sendString(const char*))); } TEmulation::changeGUI(newgui); - TQObject::connect(gui,TQT_SIGNAL(mouseSignal(int,int,int)), - this,TQT_SLOT(onMouse(int,int,int))); - TQObject::connect(gui, TQT_SIGNAL(sendStringToEmu(const char*)), - this, TQT_SLOT(sendString(const char*))); + TQObject::connect(gui,TQ_SIGNAL(mouseSignal(int,int,int)), + this,TQ_SLOT(onMouse(int,int,int))); + TQObject::connect(gui, TQ_SIGNAL(sendStringToEmu(const char*)), + this, TQ_SLOT(sendString(const char*))); } /*! @@ -172,7 +172,7 @@ void TEmuVt102::reset() // Tokens ------------------------------------------------------------------ -- /* - Since the tokens are the central notion if this section, we've put them + Since the tokens are the central notion in this section, we've put them in front. They provide the syntactical elements used to represent the terminals operations as byte sequences. @@ -267,7 +267,7 @@ void TEmuVt102::initTokenizer() for(i = 0; i < 256; i++) tbl[ i] = 0; for(i = 0; i < 32; i++) tbl[ i] |= CTL; for(i = 32; i < 256; i++) tbl[ i] |= CHR; - for(s = (UINT8*)"@ABCDGHILMPSTXZcdfry"; *s; s++) tbl[*s] |= CPN; + for(s = (UINT8*)"@ABCDEFGHILMPSTXZbcdfry"; *s; s++) tbl[*s] |= CPN; // resize = \e[8;<row>;<col>t for(s = (UINT8*)"t"; *s; s++) tbl[*s] |= CPS; for(s = (UINT8*)"0123456789" ; *s; s++) tbl[*s] |= DIG; @@ -621,6 +621,8 @@ switch( N ) case TY_CSI_PN('B' ) : scr->cursorDown (p ); break; //VT100 case TY_CSI_PN('C' ) : scr->cursorRight (p ); break; //VT100 case TY_CSI_PN('D' ) : scr->cursorLeft (p ); break; //VT100 + case TY_CSI_PN('E' ) : scr->cursorNextLine (p ); break; //VT100 + case TY_CSI_PN('F' ) : scr->cursorPrevLine (p ); break; //VT100 case TY_CSI_PN('G' ) : scr->setCursorX (p ); break; //LINUX case TY_CSI_PN('H' ) : scr->setCursorYX (p, q); break; //VT100 case TY_CSI_PN('I' ) : scr->Tabulate (p ); break; @@ -631,6 +633,7 @@ switch( N ) case TY_CSI_PN('T' ) : scr->scrollDown (p ); break; case TY_CSI_PN('X' ) : scr->eraseChars (p ); break; case TY_CSI_PN('Z' ) : scr->backTabulate (p ); break; + case TY_CSI_PN('b' ) : scr->repeatChars (p ); break; case TY_CSI_PN('c' ) : reportTerminalType ( ); break; //VT100 case TY_CSI_PN('d' ) : scr->setCursorY (p ); break; //LINUX case TY_CSI_PN('f' ) : scr->setCursorYX (p, q); break; //VT100 @@ -964,17 +967,17 @@ void TEmuVt102::doKeyPress( TQKeyEvent* ev ) { switch(ev->key()) { - case Qt::Key_Down : gui->doScroll(+1); return; - case Qt::Key_Up : gui->doScroll(-1); return; - case Qt::Key_PageUp : gui->doScroll(-gui->Lines()/2); return; - case Qt::Key_PageDown : gui->doScroll(gui->Lines()/2); return; + case TQt::Key_Down : gui->doScroll(+1); return; + case TQt::Key_Up : gui->doScroll(-1); return; + case TQt::Key_PageUp : gui->doScroll(-gui->Lines()/2); return; + case TQt::Key_PageDown : gui->doScroll(gui->Lines()/2); return; } } // revert to non-history when typing if (scr->getHistCursor() != scr->getHistLines() && (!ev->text().isEmpty() - || ev->key()==Qt::Key_Down || ev->key()==Qt::Key_Up || ev->key()==Qt::Key_Left || ev->key()==Qt::Key_Right - || ev->key()==Qt::Key_PageUp || ev->key()==Qt::Key_PageDown)) + || ev->key()==TQt::Key_Down || ev->key()==TQt::Key_Up || ev->key()==TQt::Key_Left || ev->key()==TQt::Key_Right + || ev->key()==TQt::Key_PageUp || ev->key()==TQt::Key_PageDown)) scr->setHistCursor(scr->getHistLines()); if (cmd==CMD_send) @@ -1201,8 +1204,8 @@ void TEmuVt102::setConnect(bool c) TEmulation::setConnect(c); if (gui) { - TQObject::disconnect(gui, TQT_SIGNAL(sendStringToEmu(const char*)), - this, TQT_SLOT(sendString(const char*))); + TQObject::disconnect(gui, TQ_SIGNAL(sendStringToEmu(const char*)), + this, TQ_SLOT(sendString(const char*))); } if (c) { // refresh mouse mode @@ -1216,8 +1219,8 @@ void TEmuVt102::setConnect(bool c) else scrolllock_set_off(); #endif - TQObject::connect(gui, TQT_SIGNAL(sendStringToEmu(const char*)), - this, TQT_SLOT(sendString(const char*))); + TQObject::connect(gui, TQ_SIGNAL(sendStringToEmu(const char*)), + this, TQ_SLOT(sendString(const char*))); } } @@ -1228,7 +1231,7 @@ char TEmuVt102::getErase() int len; bool metaspecified; - if (keytrans->findEntry(Qt::Key_Backspace, 0, &cmd, &txt, &len, + if (keytrans->findEntry(TQt::Key_Backspace, 0, &cmd, &txt, &len, &metaspecified) && (cmd==CMD_send) && (len == 1)) return txt[0]; diff --git a/konsole/konsole/TEmuVt102.h b/konsole/konsole/TEmuVt102.h index 8832a73d8..e77fa0ea9 100644 --- a/konsole/konsole/TEmuVt102.h +++ b/konsole/konsole/TEmuVt102.h @@ -52,7 +52,7 @@ struct CharCodes }; class TEmuVt102 : public TEmulation -{ Q_OBJECT +{ TQ_OBJECT public: diff --git a/konsole/konsole/TEmulation.cpp b/konsole/konsole/TEmulation.cpp index 943d2f205..4a4c709e4 100644 --- a/konsole/konsole/TEmulation.cpp +++ b/konsole/konsole/TEmulation.cpp @@ -110,8 +110,8 @@ TEmulation::TEmulation(TEWidget* w) screen[1] = new TEScreen(gui->Lines(),gui->Columns()); scr = screen[0]; - TQObject::connect(&bulk_timer1, TQT_SIGNAL(timeout()), this, TQT_SLOT(showBulk()) ); - TQObject::connect(&bulk_timer2, TQT_SIGNAL(timeout()), this, TQT_SLOT(showBulk()) ); + TQObject::connect(&bulk_timer1, TQ_SIGNAL(timeout()), this, TQ_SLOT(showBulk()) ); + TQObject::connect(&bulk_timer2, TQ_SIGNAL(timeout()), this, TQ_SLOT(showBulk()) ); connectGUI(); setKeymap(0); // Default keymap } @@ -121,28 +121,28 @@ TEmulation::TEmulation(TEWidget* w) void TEmulation::connectGUI() { - TQObject::connect(gui,TQT_SIGNAL(changedHistoryCursor(int)), - this,TQT_SLOT(onHistoryCursorChange(int))); - TQObject::connect(gui,TQT_SIGNAL(keyPressedSignal(TQKeyEvent*)), - this,TQT_SLOT(onKeyPress(TQKeyEvent*))); - TQObject::connect(gui,TQT_SIGNAL(keyReleasedSignal(TQKeyEvent*)), - this,TQT_SLOT(onKeyReleased(TQKeyEvent*))); - TQObject::connect(gui,TQT_SIGNAL(focusInSignal(TQFocusEvent*)), - this,TQT_SLOT(onFocusIn(TQFocusEvent*))); - TQObject::connect(gui,TQT_SIGNAL(beginSelectionSignal(const int,const int,const bool)), - this,TQT_SLOT(onSelectionBegin(const int,const int,const bool)) ); - TQObject::connect(gui,TQT_SIGNAL(extendSelectionSignal(const int,const int)), - this,TQT_SLOT(onSelectionExtend(const int,const int)) ); - TQObject::connect(gui,TQT_SIGNAL(endSelectionSignal(const bool)), - this,TQT_SLOT(setSelection(const bool)) ); - TQObject::connect(gui,TQT_SIGNAL(copySelectionSignal()), - this,TQT_SLOT(copySelection()) ); - TQObject::connect(gui,TQT_SIGNAL(clearSelectionSignal()), - this,TQT_SLOT(clearSelection()) ); - TQObject::connect(gui,TQT_SIGNAL(isBusySelecting(bool)), - this,TQT_SLOT(isBusySelecting(bool)) ); - TQObject::connect(gui,TQT_SIGNAL(testIsSelected(const int, const int, bool &)), - this,TQT_SLOT(testIsSelected(const int, const int, bool &)) ); + TQObject::connect(gui,TQ_SIGNAL(changedHistoryCursor(int)), + this,TQ_SLOT(onHistoryCursorChange(int))); + TQObject::connect(gui,TQ_SIGNAL(keyPressedSignal(TQKeyEvent*)), + this,TQ_SLOT(onKeyPress(TQKeyEvent*))); + TQObject::connect(gui,TQ_SIGNAL(keyReleasedSignal(TQKeyEvent*)), + this,TQ_SLOT(onKeyReleased(TQKeyEvent*))); + TQObject::connect(gui,TQ_SIGNAL(focusInSignal(TQFocusEvent*)), + this,TQ_SLOT(onFocusIn(TQFocusEvent*))); + TQObject::connect(gui,TQ_SIGNAL(beginSelectionSignal(const int,const int,const bool)), + this,TQ_SLOT(onSelectionBegin(const int,const int,const bool)) ); + TQObject::connect(gui,TQ_SIGNAL(extendSelectionSignal(const int,const int)), + this,TQ_SLOT(onSelectionExtend(const int,const int)) ); + TQObject::connect(gui,TQ_SIGNAL(endSelectionSignal(const bool)), + this,TQ_SLOT(setSelection(const bool)) ); + TQObject::connect(gui,TQ_SIGNAL(copySelectionSignal()), + this,TQ_SLOT(copySelection()) ); + TQObject::connect(gui,TQ_SIGNAL(clearSelectionSignal()), + this,TQ_SLOT(clearSelection()) ); + TQObject::connect(gui,TQ_SIGNAL(isBusySelecting(bool)), + this,TQ_SLOT(isBusySelecting(bool)) ); + TQObject::connect(gui,TQ_SIGNAL(testIsSelected(const int, const int, bool &)), + this,TQ_SLOT(testIsSelected(const int, const int, bool &)) ); } /*! @@ -153,28 +153,28 @@ void TEmulation::changeGUI(TEWidget* newgui) if (static_cast<TEWidget *>( gui )==newgui) return; if ( gui ) { - TQObject::disconnect(gui,TQT_SIGNAL(changedHistoryCursor(int)), - this,TQT_SLOT(onHistoryCursorChange(int))); - TQObject::disconnect(gui,TQT_SIGNAL(keyPressedSignal(TQKeyEvent*)), - this,TQT_SLOT(onKeyPress(TQKeyEvent*))); - TQObject::disconnect(gui,TQT_SIGNAL(keyReleasedSignal(TQKeyEvent*)), - this,TQT_SLOT(onKeyReleased(TQKeyEvent*))); - TQObject::disconnect(gui,TQT_SIGNAL(focusInSignal(TQFocusEvent*)), - this,TQT_SLOT(onFocusIn(TQFocusEvent*))); - TQObject::disconnect(gui,TQT_SIGNAL(beginSelectionSignal(const int,const int,const bool)), - this,TQT_SLOT(onSelectionBegin(const int,const int,const bool)) ); - TQObject::disconnect(gui,TQT_SIGNAL(extendSelectionSignal(const int,const int)), - this,TQT_SLOT(onSelectionExtend(const int,const int)) ); - TQObject::disconnect(gui,TQT_SIGNAL(endSelectionSignal(const bool)), - this,TQT_SLOT(setSelection(const bool)) ); - TQObject::disconnect(gui,TQT_SIGNAL(copySelectionSignal()), - this,TQT_SLOT(copySelection()) ); - TQObject::disconnect(gui,TQT_SIGNAL(clearSelectionSignal()), - this,TQT_SLOT(clearSelection()) ); - TQObject::disconnect(gui,TQT_SIGNAL(isBusySelecting(bool)), - this,TQT_SLOT(isBusySelecting(bool)) ); - TQObject::disconnect(gui,TQT_SIGNAL(testIsSelected(const int, const int, bool &)), - this,TQT_SLOT(testIsSelected(const int, const int, bool &)) ); + TQObject::disconnect(gui,TQ_SIGNAL(changedHistoryCursor(int)), + this,TQ_SLOT(onHistoryCursorChange(int))); + TQObject::disconnect(gui,TQ_SIGNAL(keyPressedSignal(TQKeyEvent*)), + this,TQ_SLOT(onKeyPress(TQKeyEvent*))); + TQObject::disconnect(gui,TQ_SIGNAL(keyReleasedSignal(TQKeyEvent*)), + this,TQ_SLOT(onKeyReleased(TQKeyEvent*))); + TQObject::disconnect(gui,TQ_SIGNAL(focusInSignal(TQFocusEvent*)), + this,TQ_SLOT(onFocusIn(TQFocusEvent*))); + TQObject::disconnect(gui,TQ_SIGNAL(beginSelectionSignal(const int,const int,const bool)), + this,TQ_SLOT(onSelectionBegin(const int,const int,const bool)) ); + TQObject::disconnect(gui,TQ_SIGNAL(extendSelectionSignal(const int,const int)), + this,TQ_SLOT(onSelectionExtend(const int,const int)) ); + TQObject::disconnect(gui,TQ_SIGNAL(endSelectionSignal(const bool)), + this,TQ_SLOT(setSelection(const bool)) ); + TQObject::disconnect(gui,TQ_SIGNAL(copySelectionSignal()), + this,TQ_SLOT(copySelection()) ); + TQObject::disconnect(gui,TQ_SIGNAL(clearSelectionSignal()), + this,TQ_SLOT(clearSelection()) ); + TQObject::disconnect(gui,TQ_SIGNAL(isBusySelecting(bool)), + this,TQ_SLOT(isBusySelecting(bool)) ); + TQObject::disconnect(gui,TQ_SIGNAL(testIsSelected(const int, const int, bool &)), + this,TQ_SLOT(testIsSelected(const int, const int, bool &)) ); } gui=newgui; connectGUI(); diff --git a/konsole/konsole/TEmulation.h b/konsole/konsole/TEmulation.h index 9ddc2a4c7..e6050a9da 100644 --- a/konsole/konsole/TEmulation.h +++ b/konsole/konsole/TEmulation.h @@ -31,8 +31,8 @@ enum { NOTIFYNORMAL=0, NOTIFYBELL=1, NOTIFYACTIVITY=2, NOTIFYSILENCE=3 }; -class TEmulation : public QObject -{ Q_OBJECT +class TEmulation : public TQObject +{ TQ_OBJECT public: diff --git a/konsole/konsole/fontembedder.cpp b/konsole/konsole/fontembedder.cpp index 8b6da6d70..e4ededa51 100644 --- a/konsole/konsole/fontembedder.cpp +++ b/konsole/konsole/fontembedder.cpp @@ -115,5 +115,3 @@ int main(int argc, char **argv) cout<<"};\n"; return 0; } - -//kate: indent-width 4; tab-width 4; space-indent on; diff --git a/konsole/konsole/keytrans.cpp b/konsole/konsole/keytrans.cpp index 3712bb0da..7a2b3f566 100644 --- a/konsole/konsole/keytrans.cpp +++ b/konsole/konsole/keytrans.cpp @@ -363,11 +363,11 @@ void KeyTrans::readConfig() TQBuffer* newbuf; newbuf = new TQBuffer(); newbuf->setBuffer(txt); - buf=TQT_TQIODEVICE(newbuf); + buf=newbuf; } else { - buf=TQT_TQIODEVICE(new TQFile(m_path)); + buf=new TQFile(m_path); }; KeytabReader ktr(m_path,*buf); ktr.parseTo(this); @@ -519,143 +519,143 @@ void KeyTransSymbols::defModSyms() void KeyTransSymbols::defKeySyms() { // Grey keys - defKeySym("Escape", Qt::Key_Escape ); - defKeySym("Tab", Qt::Key_Tab ); - defKeySym("Backtab", Qt::Key_Backtab ); - defKeySym("Backspace", Qt::Key_Backspace ); - defKeySym("Return", Qt::Key_Return ); - defKeySym("Enter", Qt::Key_Enter ); - defKeySym("Insert", Qt::Key_Insert ); - defKeySym("Delete", Qt::Key_Delete ); - defKeySym("Pause", Qt::Key_Pause ); - defKeySym("Print", Qt::Key_Print ); - defKeySym("SysReq", Qt::Key_SysReq ); - defKeySym("Home", Qt::Key_Home ); - defKeySym("End", Qt::Key_End ); - defKeySym("Left", Qt::Key_Left ); - defKeySym("Up", Qt::Key_Up ); - defKeySym("Right", Qt::Key_Right ); - defKeySym("Down", Qt::Key_Down ); + defKeySym("Escape", TQt::Key_Escape ); + defKeySym("Tab", TQt::Key_Tab ); + defKeySym("Backtab", TQt::Key_Backtab ); + defKeySym("Backspace", TQt::Key_Backspace ); + defKeySym("Return", TQt::Key_Return ); + defKeySym("Enter", TQt::Key_Enter ); + defKeySym("Insert", TQt::Key_Insert ); + defKeySym("Delete", TQt::Key_Delete ); + defKeySym("Pause", TQt::Key_Pause ); + defKeySym("Print", TQt::Key_Print ); + defKeySym("SysReq", TQt::Key_SysReq ); + defKeySym("Home", TQt::Key_Home ); + defKeySym("End", TQt::Key_End ); + defKeySym("Left", TQt::Key_Left ); + defKeySym("Up", TQt::Key_Up ); + defKeySym("Right", TQt::Key_Right ); + defKeySym("Down", TQt::Key_Down ); defKeySym("Prior", TQt::Key_Prior ); defKeySym("Next", TQt::Key_Next ); - defKeySym("Shift", Qt::Key_Shift ); - defKeySym("Control", Qt::Key_Control ); - defKeySym("Meta", Qt::Key_Meta ); - defKeySym("Alt", Qt::Key_Alt ); - defKeySym("CapsLock", Qt::Key_CapsLock ); - defKeySym("NumLock", Qt::Key_NumLock ); - defKeySym("ScrollLock", Qt::Key_ScrollLock ); - defKeySym("F1", Qt::Key_F1 ); - defKeySym("F2", Qt::Key_F2 ); - defKeySym("F3", Qt::Key_F3 ); - defKeySym("F4", Qt::Key_F4 ); - defKeySym("F5", Qt::Key_F5 ); - defKeySym("F6", Qt::Key_F6 ); - defKeySym("F7", Qt::Key_F7 ); - defKeySym("F8", Qt::Key_F8 ); - defKeySym("F9", Qt::Key_F9 ); - defKeySym("F10", Qt::Key_F10 ); - defKeySym("F11", Qt::Key_F11 ); - defKeySym("F12", Qt::Key_F12 ); - defKeySym("F13", Qt::Key_F13 ); - defKeySym("F14", Qt::Key_F14 ); - defKeySym("F15", Qt::Key_F15 ); - defKeySym("F16", Qt::Key_F16 ); - defKeySym("F17", Qt::Key_F17 ); - defKeySym("F18", Qt::Key_F18 ); - defKeySym("F19", Qt::Key_F19 ); - defKeySym("F20", Qt::Key_F20 ); - defKeySym("F21", Qt::Key_F21 ); - defKeySym("F22", Qt::Key_F22 ); - defKeySym("F23", Qt::Key_F23 ); - defKeySym("F24", Qt::Key_F24 ); - defKeySym("F25", Qt::Key_F25 ); - defKeySym("F26", Qt::Key_F26 ); - defKeySym("F27", Qt::Key_F27 ); - defKeySym("F28", Qt::Key_F28 ); - defKeySym("F29", Qt::Key_F29 ); - defKeySym("F30", Qt::Key_F30 ); - defKeySym("F31", Qt::Key_F31 ); - defKeySym("F32", Qt::Key_F32 ); - defKeySym("F33", Qt::Key_F33 ); - defKeySym("F34", Qt::Key_F34 ); - defKeySym("F35", Qt::Key_F35 ); - defKeySym("Super_L", Qt::Key_Super_L ); - defKeySym("Super_R", Qt::Key_Super_R ); - defKeySym("Menu", Qt::Key_Menu ); - defKeySym("Hyper_L", Qt::Key_Hyper_L ); - defKeySym("Hyper_R", Qt::Key_Hyper_R ); + defKeySym("Shift", TQt::Key_Shift ); + defKeySym("Control", TQt::Key_Control ); + defKeySym("Meta", TQt::Key_Meta ); + defKeySym("Alt", TQt::Key_Alt ); + defKeySym("CapsLock", TQt::Key_CapsLock ); + defKeySym("NumLock", TQt::Key_NumLock ); + defKeySym("ScrollLock", TQt::Key_ScrollLock ); + defKeySym("F1", TQt::Key_F1 ); + defKeySym("F2", TQt::Key_F2 ); + defKeySym("F3", TQt::Key_F3 ); + defKeySym("F4", TQt::Key_F4 ); + defKeySym("F5", TQt::Key_F5 ); + defKeySym("F6", TQt::Key_F6 ); + defKeySym("F7", TQt::Key_F7 ); + defKeySym("F8", TQt::Key_F8 ); + defKeySym("F9", TQt::Key_F9 ); + defKeySym("F10", TQt::Key_F10 ); + defKeySym("F11", TQt::Key_F11 ); + defKeySym("F12", TQt::Key_F12 ); + defKeySym("F13", TQt::Key_F13 ); + defKeySym("F14", TQt::Key_F14 ); + defKeySym("F15", TQt::Key_F15 ); + defKeySym("F16", TQt::Key_F16 ); + defKeySym("F17", TQt::Key_F17 ); + defKeySym("F18", TQt::Key_F18 ); + defKeySym("F19", TQt::Key_F19 ); + defKeySym("F20", TQt::Key_F20 ); + defKeySym("F21", TQt::Key_F21 ); + defKeySym("F22", TQt::Key_F22 ); + defKeySym("F23", TQt::Key_F23 ); + defKeySym("F24", TQt::Key_F24 ); + defKeySym("F25", TQt::Key_F25 ); + defKeySym("F26", TQt::Key_F26 ); + defKeySym("F27", TQt::Key_F27 ); + defKeySym("F28", TQt::Key_F28 ); + defKeySym("F29", TQt::Key_F29 ); + defKeySym("F30", TQt::Key_F30 ); + defKeySym("F31", TQt::Key_F31 ); + defKeySym("F32", TQt::Key_F32 ); + defKeySym("F33", TQt::Key_F33 ); + defKeySym("F34", TQt::Key_F34 ); + defKeySym("F35", TQt::Key_F35 ); + defKeySym("Super_L", TQt::Key_Super_L ); + defKeySym("Super_R", TQt::Key_Super_R ); + defKeySym("Menu", TQt::Key_Menu ); + defKeySym("Hyper_L", TQt::Key_Hyper_L ); + defKeySym("Hyper_R", TQt::Key_Hyper_R ); // Regular keys - defKeySym("Space", Qt::Key_Space ); - defKeySym("Exclam", Qt::Key_Exclam ); - defKeySym("QuoteDbl", Qt::Key_QuoteDbl ); - defKeySym("NumberSign", Qt::Key_NumberSign ); - defKeySym("Dollar", Qt::Key_Dollar ); - defKeySym("Percent", Qt::Key_Percent ); - defKeySym("Ampersand", Qt::Key_Ampersand ); - defKeySym("Apostrophe", Qt::Key_Apostrophe ); - defKeySym("ParenLeft", Qt::Key_ParenLeft ); - defKeySym("ParenRight", Qt::Key_ParenRight ); - defKeySym("Asterisk", Qt::Key_Asterisk ); - defKeySym("Plus", Qt::Key_Plus ); - defKeySym("Comma", Qt::Key_Comma ); - defKeySym("Minus", Qt::Key_Minus ); - defKeySym("Period", Qt::Key_Period ); - defKeySym("Slash", Qt::Key_Slash ); - defKeySym("0", Qt::Key_0 ); - defKeySym("1", Qt::Key_1 ); - defKeySym("2", Qt::Key_2 ); - defKeySym("3", Qt::Key_3 ); - defKeySym("4", Qt::Key_4 ); - defKeySym("5", Qt::Key_5 ); - defKeySym("6", Qt::Key_6 ); - defKeySym("7", Qt::Key_7 ); - defKeySym("8", Qt::Key_8 ); - defKeySym("9", Qt::Key_9 ); - defKeySym("Colon", Qt::Key_Colon ); - defKeySym("Semicolon", Qt::Key_Semicolon ); - defKeySym("Less", Qt::Key_Less ); - defKeySym("Equal", Qt::Key_Equal ); - defKeySym("Greater", Qt::Key_Greater ); - defKeySym("Question", Qt::Key_Question ); - defKeySym("At", Qt::Key_At ); - defKeySym("A", Qt::Key_A ); - defKeySym("B", Qt::Key_B ); - defKeySym("C", Qt::Key_C ); - defKeySym("D", Qt::Key_D ); - defKeySym("E", Qt::Key_E ); - defKeySym("F", Qt::Key_F ); - defKeySym("G", Qt::Key_G ); - defKeySym("H", Qt::Key_H ); - defKeySym("I", Qt::Key_I ); - defKeySym("J", Qt::Key_J ); - defKeySym("K", Qt::Key_K ); - defKeySym("L", Qt::Key_L ); - defKeySym("M", Qt::Key_M ); - defKeySym("N", Qt::Key_N ); - defKeySym("O", Qt::Key_O ); - defKeySym("P", Qt::Key_P ); - defKeySym("Q", Qt::Key_Q ); - defKeySym("R", Qt::Key_R ); - defKeySym("S", Qt::Key_S ); - defKeySym("T", Qt::Key_T ); - defKeySym("U", Qt::Key_U ); - defKeySym("V", Qt::Key_V ); - defKeySym("W", Qt::Key_W ); - defKeySym("X", Qt::Key_X ); - defKeySym("Y", Qt::Key_Y ); - defKeySym("Z", Qt::Key_Z ); - defKeySym("BracketLeft", Qt::Key_BracketLeft ); - defKeySym("Backslash", Qt::Key_Backslash ); - defKeySym("BracketRight", Qt::Key_BracketRight); - defKeySym("AsciiCircum", Qt::Key_AsciiCircum ); - defKeySym("Underscore", Qt::Key_Underscore ); - defKeySym("QuoteLeft", Qt::Key_QuoteLeft ); - defKeySym("BraceLeft", Qt::Key_BraceLeft ); - defKeySym("Bar", Qt::Key_Bar ); - defKeySym("BraceRight", Qt::Key_BraceRight ); - defKeySym("AsciiTilde", Qt::Key_AsciiTilde ); + defKeySym("Space", TQt::Key_Space ); + defKeySym("Exclam", TQt::Key_Exclam ); + defKeySym("QuoteDbl", TQt::Key_QuoteDbl ); + defKeySym("NumberSign", TQt::Key_NumberSign ); + defKeySym("Dollar", TQt::Key_Dollar ); + defKeySym("Percent", TQt::Key_Percent ); + defKeySym("Ampersand", TQt::Key_Ampersand ); + defKeySym("Apostrophe", TQt::Key_Apostrophe ); + defKeySym("ParenLeft", TQt::Key_ParenLeft ); + defKeySym("ParenRight", TQt::Key_ParenRight ); + defKeySym("Asterisk", TQt::Key_Asterisk ); + defKeySym("Plus", TQt::Key_Plus ); + defKeySym("Comma", TQt::Key_Comma ); + defKeySym("Minus", TQt::Key_Minus ); + defKeySym("Period", TQt::Key_Period ); + defKeySym("Slash", TQt::Key_Slash ); + defKeySym("0", TQt::Key_0 ); + defKeySym("1", TQt::Key_1 ); + defKeySym("2", TQt::Key_2 ); + defKeySym("3", TQt::Key_3 ); + defKeySym("4", TQt::Key_4 ); + defKeySym("5", TQt::Key_5 ); + defKeySym("6", TQt::Key_6 ); + defKeySym("7", TQt::Key_7 ); + defKeySym("8", TQt::Key_8 ); + defKeySym("9", TQt::Key_9 ); + defKeySym("Colon", TQt::Key_Colon ); + defKeySym("Semicolon", TQt::Key_Semicolon ); + defKeySym("Less", TQt::Key_Less ); + defKeySym("Equal", TQt::Key_Equal ); + defKeySym("Greater", TQt::Key_Greater ); + defKeySym("Question", TQt::Key_Question ); + defKeySym("At", TQt::Key_At ); + defKeySym("A", TQt::Key_A ); + defKeySym("B", TQt::Key_B ); + defKeySym("C", TQt::Key_C ); + defKeySym("D", TQt::Key_D ); + defKeySym("E", TQt::Key_E ); + defKeySym("F", TQt::Key_F ); + defKeySym("G", TQt::Key_G ); + defKeySym("H", TQt::Key_H ); + defKeySym("I", TQt::Key_I ); + defKeySym("J", TQt::Key_J ); + defKeySym("K", TQt::Key_K ); + defKeySym("L", TQt::Key_L ); + defKeySym("M", TQt::Key_M ); + defKeySym("N", TQt::Key_N ); + defKeySym("O", TQt::Key_O ); + defKeySym("P", TQt::Key_P ); + defKeySym("Q", TQt::Key_Q ); + defKeySym("R", TQt::Key_R ); + defKeySym("S", TQt::Key_S ); + defKeySym("T", TQt::Key_T ); + defKeySym("U", TQt::Key_U ); + defKeySym("V", TQt::Key_V ); + defKeySym("W", TQt::Key_W ); + defKeySym("X", TQt::Key_X ); + defKeySym("Y", TQt::Key_Y ); + defKeySym("Z", TQt::Key_Z ); + defKeySym("BracketLeft", TQt::Key_BracketLeft ); + defKeySym("Backslash", TQt::Key_Backslash ); + defKeySym("BracketRight", TQt::Key_BracketRight); + defKeySym("AsciiCircum", TQt::Key_AsciiCircum ); + defKeySym("Underscore", TQt::Key_Underscore ); + defKeySym("QuoteLeft", TQt::Key_QuoteLeft ); + defKeySym("BraceLeft", TQt::Key_BraceLeft ); + defKeySym("Bar", TQt::Key_Bar ); + defKeySym("BraceRight", TQt::Key_BraceRight ); + defKeySym("AsciiTilde", TQt::Key_AsciiTilde ); } KeyTransSymbols::KeyTransSymbols() diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp index 0101ecab3..dae5b834c 100644 --- a/konsole/konsole/konsole.cpp +++ b/konsole/konsole/konsole.cpp @@ -266,6 +266,7 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo ,b_installBitmapFonts(false) ,b_framevis(true) ,b_metaAsAlt(false) +,b_realTransparency(false) ,b_fullscreen(false) ,m_menuCreated(false) ,b_warnQuit(false) @@ -289,16 +290,16 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo ,m_filterData(0) { isRestored = b_inRestore; - connect( &m_closeTimeout, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCouldNotClose())); + connect( &m_closeTimeout, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotCouldNotClose())); no2command.setAutoDelete(true); menubar = menuBar(); TDEAcceleratorManager::setNoAccel( menubar ); - sessionNumberMapper = new TQSignalMapper( TQT_TQOBJECT(this) ); - connect( sessionNumberMapper, TQT_SIGNAL( mapped( int ) ), - this, TQT_SLOT( newSessionTabbar( int ) ) ); + sessionNumberMapper = new TQSignalMapper( this ); + connect( sessionNumberMapper, TQ_SIGNAL( mapped( int ) ), + this, TQ_SLOT( newSessionTabbar( int ) ) ); colors = new ColorSchemaList(); colors->checkSchemas(); @@ -358,14 +359,9 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo if (te) te->setScrollbarLocation(TEWidget::SCRNONE); } -// connect(kapp, TQT_SIGNAL(tdedisplayFontChanged()), this, TQT_SLOT(slotFontChanged())); +// connect(kapp, TQ_SIGNAL(tdedisplayFontChanged()), this, TQ_SLOT(slotFontChanged())); kapp->dcopClient()->setDefaultObject( "konsole" ); - - // Signal that we want to be transparent to the desktop, not to windows behind us... - Atom kde_wm_transparent_to_desktop; - kde_wm_transparent_to_desktop = XInternAtom(tqt_xdisplay(), "_TDE_TRANSPARENT_TO_DESKTOP", False); - XChangeProperty(tqt_xdisplay(), winId(), kde_wm_transparent_to_desktop, XA_INTEGER, 32, PropModeReplace, (unsigned char *) "TRUE", 1L); } @@ -480,29 +476,29 @@ void Konsole::makeGUI() if (m_menuCreated) return; if (m_tabbarSessionsCommands) - disconnect(m_tabbarSessionsCommands,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); - disconnect(m_session,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + disconnect(m_tabbarSessionsCommands,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); + disconnect(m_session,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_options) - disconnect(m_options,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + disconnect(m_options,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_help) - disconnect(m_help,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + disconnect(m_help,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_rightButton) - disconnect(m_rightButton,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); - disconnect(m_edit,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); - disconnect(m_view,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + disconnect(m_rightButton,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); + disconnect(m_edit,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); + disconnect(m_view,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_bookmarks) - disconnect(m_bookmarks,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + disconnect(m_bookmarks,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_bookmarksSession) - disconnect(m_bookmarksSession,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + disconnect(m_bookmarksSession,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_tabbarSessionsCommands) - connect(m_tabbarSessionsCommands,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(loadScreenSessions())); - connect(m_session,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(loadScreenSessions())); + connect(m_tabbarSessionsCommands,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(loadScreenSessions())); + connect(m_session,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(loadScreenSessions())); m_menuCreated=true; // Remove the empty separator Qt inserts if the menu is empty on popup, // not sure if this will be "fixed" in Qt, for now use this hack (malte) if(!(isRestored)) { - if (sender() && sender()->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) && + if (sender() && sender()->inherits("TQPopupMenu") && static_cast<const TQPopupMenu *>(sender())->count() == 1) const_cast<TQPopupMenu *>(static_cast<const TQPopupMenu *>(sender()))->removeItemAt(0); } @@ -521,7 +517,7 @@ void Konsole::makeGUI() m_signals->insertItem( i18n( "&Kill Task" ) + " (KILL)", SIGKILL); m_signals->insertItem( i18n( "User Signal &1") + " (USR1)", SIGUSR1); m_signals->insertItem( i18n( "User Signal &2") + " (USR2)", SIGUSR2); - connect(m_signals, TQT_SIGNAL(activated(int)), TQT_SLOT(sendSignal(int))); + connect(m_signals, TQ_SIGNAL(activated(int)), TQ_SLOT(sendSignal(int))); TDEAcceleratorManager::manage( m_signals ); } @@ -575,28 +571,28 @@ void Konsole::makeGUI() //bookmarks menu if (bookmarkHandler) - connect( bookmarkHandler, TQT_SIGNAL( openURL( const TQString&, const TQString& )), - TQT_SLOT( enterURL( const TQString&, const TQString& ))); + connect( bookmarkHandler, TQ_SIGNAL( openURL( const TQString&, const TQString& )), + TQ_SLOT( enterURL( const TQString&, const TQString& ))); if (bookmarkHandlerSession) - connect( bookmarkHandlerSession, TQT_SIGNAL( openURL( const TQString&, const TQString& )), - TQT_SLOT( newSession( const TQString&, const TQString& ))); + connect( bookmarkHandlerSession, TQ_SIGNAL( openURL( const TQString&, const TQString& )), + TQ_SLOT( newSession( const TQString&, const TQString& ))); if (m_bookmarks) - connect(m_bookmarks, TQT_SIGNAL(aboutToShow()), TQT_SLOT(bookmarks_menu_check())); + connect(m_bookmarks, TQ_SIGNAL(aboutToShow()), TQ_SLOT(bookmarks_menu_check())); if (m_bookmarksSession) - connect(m_bookmarksSession, TQT_SIGNAL(aboutToShow()), TQT_SLOT(bookmarks_menu_check())); + connect(m_bookmarksSession, TQ_SIGNAL(aboutToShow()), TQ_SLOT(bookmarks_menu_check())); // Schema Options Menu ----------------------------------------------------- m_schema = new TDEPopupMenu(this); m_schema->setCheckable(true); TDEAcceleratorManager::manage( m_schema ); - connect(m_schema, TQT_SIGNAL(activated(int)), TQT_SLOT(schema_menu_activated(int))); - connect(m_schema, TQT_SIGNAL(aboutToShow()), TQT_SLOT(schema_menu_check())); + connect(m_schema, TQ_SIGNAL(activated(int)), TQ_SLOT(schema_menu_activated(int))); + connect(m_schema, TQ_SIGNAL(aboutToShow()), TQ_SLOT(schema_menu_check())); // Keyboard Options Menu --------------------------------------------------- m_keytab = new TDEPopupMenu(this); m_keytab->setCheckable(true); TDEAcceleratorManager::manage( m_keytab ); - connect(m_keytab, TQT_SIGNAL(activated(int)), TQT_SLOT(keytab_menu_activated(int))); + connect(m_keytab, TQ_SIGNAL(activated(int)), TQ_SLOT(keytab_menu_activated(int))); //options menu if (m_options) @@ -605,16 +601,16 @@ void Konsole::makeGUI() showMenubar->plug ( m_options ); // Tabbar - selectTabbar = new TDESelectAction(i18n("&Tab Bar"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotSelectTabbar()), actions, "tabbar" ); + selectTabbar = new TDESelectAction(i18n("&Tab Bar"), 0, this, + TQ_SLOT(slotSelectTabbar()), actions, "tabbar" ); TQStringList tabbaritems; tabbaritems << i18n("&Hide") << i18n("&Top") << i18n("&Bottom"); selectTabbar->setItems(tabbaritems); selectTabbar->plug(m_options); // Scrollbar - selectScrollbar = new TDESelectAction(i18n("Sc&rollbar"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotSelectScrollbar()), actions, "scrollbar" ); + selectScrollbar = new TDESelectAction(i18n("Sc&rollbar"), 0, this, + TQ_SLOT(slotSelectScrollbar()), actions, "scrollbar" ); TQStringList scrollitems; scrollitems << i18n("&Hide") << i18n("&Left") << i18n("&Right"); selectScrollbar->setItems(scrollitems); @@ -629,8 +625,8 @@ void Konsole::makeGUI() } // Select Bell - selectBell = new TDESelectAction(i18n("&Bell"), SmallIconSet( "bell"), 0 , TQT_TQOBJECT(this), - TQT_SLOT(slotSelectBell()), actions, "bell"); + selectBell = new TDESelectAction(i18n("&Bell"), SmallIconSet( "bell"), 0 , this, + TQ_SLOT(slotSelectBell()), actions, "bell"); TQStringList bellitems; bellitems << i18n("System &Bell") << i18n("System &Notification") @@ -644,28 +640,28 @@ void Konsole::makeGUI() SmallIconSet( "text" ), actions, 0L ); m_fontsizes->insert( new TDEAction( i18n( "&Enlarge Font" ), - SmallIconSet( "fontsizeup" ), 0, TQT_TQOBJECT(this), - TQT_SLOT( biggerFont() ), actions, + SmallIconSet( "fontsizeup" ), 0, this, + TQ_SLOT( biggerFont() ), actions, "enlarge_font" ) ); m_fontsizes->insert( new TDEAction( i18n( "&Shrink Font" ), - SmallIconSet( "fontsizedown" ), 0, TQT_TQOBJECT(this), - TQT_SLOT( smallerFont() ), actions, + SmallIconSet( "fontsizedown" ), 0, this, + TQ_SLOT( smallerFont() ), actions, "shrink_font" ) ); m_fontsizes->insert( new TDEAction( i18n( "Se&lect..." ), - SmallIconSet( "font-x-generic" ), 0, TQT_TQOBJECT(this), - TQT_SLOT( slotSelectFont() ), actions, + SmallIconSet( "font-x-generic" ), 0, this, + TQ_SLOT( slotSelectFont() ), actions, "select_font" ) ); if ( b_installBitmapFonts ) { m_fontsizes->insert( new TDEAction( i18n( "&Install Bitmap..." ), - SmallIconSet( "font-x-generic" ), 0, TQT_TQOBJECT(this), - TQT_SLOT( slotInstallBitmapFonts() ), actions, + SmallIconSet( "font-x-generic" ), 0, this, + TQ_SLOT( slotInstallBitmapFonts() ), actions, "install_fonts" ) ); } m_fontsizes->plug(m_options); // encoding menu, start with default checked ! - selectSetEncoding = new TDESelectAction( i18n( "&Encoding" ), SmallIconSet( "charset" ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetEncoding()), actions, "set_encoding" ); + selectSetEncoding = new TDESelectAction( i18n( "&Encoding" ), SmallIconSet( "charset" ), 0, this, TQ_SLOT(slotSetEncoding()), actions, "set_encoding" ); TQStringList list = TDEGlobal::charsets()->descriptiveEncodingNames(); list.prepend( i18n( "Default" ) ); selectSetEncoding->setItems(list); @@ -682,8 +678,8 @@ void Konsole::makeGUI() // Select size if (!b_fixedSize) { - selectSize = new KonsoleFontSelectAction(i18n("S&ize"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotSelectSize()), actions, "size"); + selectSize = new KonsoleFontSelectAction(i18n("S&ize"), 0, this, + TQ_SLOT(slotSelectSize()), actions, "size"); TQStringList sizeitems; sizeitems << i18n("40x15 (&Small)") << i18n("80x24 (&VT100)") @@ -696,14 +692,14 @@ void Konsole::makeGUI() selectSize->plug(m_options); } - TDEAction *historyType = new TDEAction(i18n("Hist&ory..."), "history", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotHistoryType()), actions, "history"); + TDEAction *historyType = new TDEAction(i18n("Hist&ory..."), "history", 0, this, + TQ_SLOT(slotHistoryType()), actions, "history"); historyType->plug(m_options); m_options->insertSeparator(); - TDEAction *save_settings = new TDEAction(i18n("&Save as Default"), "document-save", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotSaveSettings()), actions, "save_default"); + TDEAction *save_settings = new TDEAction(i18n("&Save as Default"), "document-save", 0, this, + TQ_SLOT(slotSaveSettings()), actions, "save_default"); save_settings->plug(m_options); m_options->insertSeparator(); @@ -712,9 +708,9 @@ void Konsole::makeGUI() m_options->insertSeparator(); - KStdAction::configureNotifications(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureNotifications()), actionCollection())->plug(m_options); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureKeys()), actionCollection())->plug(m_options); - TDEAction *configure = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actions); + KStdAction::configureNotifications(this, TQ_SLOT(slotConfigureNotifications()), actionCollection())->plug(m_options); + KStdAction::keyBindings(this, TQ_SLOT(slotConfigureKeys()), actionCollection())->plug(m_options); + TDEAction *configure = KStdAction::preferences(this, TQ_SLOT(slotConfigure()), actions); configure->plug(m_options); if (TDEGlobalSettings::insertTearOffHandle()) @@ -726,21 +722,21 @@ void Konsole::makeGUI() { m_help->insertSeparator(1); m_help->insertItem(SmallIcon( "idea" ), i18n("&Tip of the Day"), - this, TQT_SLOT(showTip()), 0, -1, 2); + this, TQ_SLOT(showTip()), 0, -1, 2); } //the different session menus buildSessionMenus(); - connect(m_session, TQT_SIGNAL(activated(int)), TQT_SLOT(newSession(int))); + connect(m_session, TQ_SIGNAL(activated(int)), TQ_SLOT(newSession(int))); // Right mouse button menu if (m_rightButton) { updateRMBMenu(); // show menubar / exit fullscreen - TDEAction* selectionEnd = new TDEAction(i18n("Set Selection End"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotSetSelectionEnd()), actions, "selection_end"); + TDEAction* selectionEnd = new TDEAction(i18n("Set Selection End"), 0, this, + TQ_SLOT(slotSetSelectionEnd()), actions, "selection_end"); selectionEnd->plug(m_rightButton); m_copyClipboard->plug(m_rightButton); @@ -748,7 +744,7 @@ void Konsole::makeGUI() m_openSelection = new TDEPopupMenu(this); m_rightButton->insertItem( i18n("&Open.."), m_openSelection ); - connect(m_openSelection, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotOpenSelection())); + connect(m_openSelection, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotOpenSelection())); if (m_signals) m_rightButton->insertItem(i18n("&Send Signal"), m_signals); @@ -825,57 +821,58 @@ void Konsole::makeGUI() if (!m_detachSession) { - m_detachSession = new TDEAction(i18n("&Detach Session"), SmallIconSet("tab_breakoff"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotDetachSession()), m_shortcuts, "detach_session"); + m_detachSession = new TDEAction(i18n("&Detach Session"), SmallIconSet("tab_breakoff"), 0, this, + TQ_SLOT(slotDetachSession()), m_shortcuts, "detach_session"); } m_detachSession->plug(m_tabPopupMenu); - m_tabPopupMenu->insertItem( i18n("&Rename Session..."), TQT_TQOBJECT(this), - TQT_SLOT(slotTabRenameSession()) ); + m_tabPopupMenu->insertItem( i18n("&Rename Session..."), this, + TQ_SLOT(slotTabRenameSession()) ); m_tabPopupMenu->insertSeparator(); m_tabMonitorActivity = new TDEToggleAction ( i18n( "Monitor for &Activity" ), - SmallIconSet("activity"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotTabToggleMonitor() ), TQT_TQOBJECT(this) ); + SmallIconSet("activity"), 0, this, TQ_SLOT( slotTabToggleMonitor() ), this ); m_tabMonitorActivity->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Activity" ) ) ); m_tabMonitorActivity->plug(m_tabPopupMenu); m_tabMonitorSilence = new TDEToggleAction ( i18n( "Monitor for &Silence" ), - SmallIconSet("silence"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotTabToggleMonitor() ), TQT_TQOBJECT(this) ); + SmallIconSet("silence"), 0, this, TQ_SLOT( slotTabToggleMonitor() ), this ); m_tabMonitorSilence->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Silence" ) ) ); m_tabMonitorSilence->plug(m_tabPopupMenu); - m_tabMasterMode = new TDEToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, TQT_TQOBJECT(this), - TQT_SLOT( slotTabToggleMasterMode() ), TQT_TQOBJECT(this)); + m_tabMasterMode = new TDEToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, this, + TQ_SLOT( slotTabToggleMasterMode() ), this); m_tabMasterMode->plug(m_tabPopupMenu); m_tabPopupMenu->insertSeparator(); if (!m_moveSessionLeft) { m_moveSessionLeft = new TDEAction(i18n("&Move Session Left"), TQApplication::reverseLayout() ? "forward" : "back", - TQApplication::reverseLayout() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Right : Qt::CTRL+Qt::SHIFT+Qt::Key_Left, TQT_TQOBJECT(this), - TQT_SLOT(moveSessionLeft()), m_shortcuts, "move_session_left"); + TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Right : TQt::CTRL+TQt::SHIFT+TQt::Key_Left, this, + TQ_SLOT(moveSessionLeft()), m_shortcuts, "move_session_left"); } m_moveSessionLeft->plug(m_tabPopupMenu); if (!m_moveSessionRight) { m_moveSessionRight = new TDEAction(i18n("M&ove Session Right"), TQApplication::reverseLayout() ? "back" : "forward", - TQApplication::reverseLayout() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Left : Qt::CTRL+Qt::SHIFT+Qt::Key_Right, TQT_TQOBJECT(this), - TQT_SLOT(moveSessionRight()), m_shortcuts, "move_session_right"); + TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Left : TQt::CTRL+TQt::SHIFT+TQt::Key_Right, this, + TQ_SLOT(moveSessionRight()), m_shortcuts, "move_session_right"); } m_moveSessionRight->plug(m_tabPopupMenu); m_tabPopupMenu->insertSeparator(); - m_tabPopupMenu->insertItem( SmallIconSet("colors"), i18n("Select &Tab Color..."), TQT_TQOBJECT(this), TQT_SLOT(slotTabSelectColor()) ); + m_tabPopupMenu->insertItem( SmallIconSet("colors"), i18n("Select &Tab Color..."), this, TQ_SLOT(slotTabSelectColor()) ); + m_tabPopupMenu->insertItem( i18n("Reset Tab Color"), this, TQ_SLOT(slotTabResetColor()) ); m_tabPopupMenu->insertSeparator(); m_tabPopupTabsMenu = new TDEPopupMenu( m_tabPopupMenu ); m_tabPopupMenu->insertItem( i18n("Switch to Tab" ), m_tabPopupTabsMenu ); - connect( m_tabPopupTabsMenu, TQT_SIGNAL( activated ( int ) ), - TQT_SLOT( activateSession( int ) ) ); + connect( m_tabPopupTabsMenu, TQ_SIGNAL( activated ( int ) ), + TQ_SLOT( activateSession( int ) ) ); m_tabPopupMenu->insertSeparator(); - m_tabPopupMenu->insertItem( SmallIcon("window-close"), i18n("C&lose Session"), TQT_TQOBJECT(this), - TQT_SLOT(slotTabCloseSession()) ); + m_tabPopupMenu->insertItem( SmallIcon("window-close"), i18n("C&lose Session"), this, + TQ_SLOT(slotTabCloseSession()) ); if (m_options) { // Fill tab bar context menu @@ -883,23 +880,23 @@ void Konsole::makeGUI() TDEAcceleratorManager::manage( m_tabbarPopupMenu ); selectTabbar->plug(m_tabbarPopupMenu); - TDESelectAction *viewOptions = new TDESelectAction(TQT_TQOBJECT(this)); + TDESelectAction *viewOptions = new TDESelectAction(this); viewOptions->setText(i18n("Tab &Options")); TQStringList options; options << i18n("&Text && Icons") << i18n("Text &Only") << i18n("&Icons Only"); viewOptions->setItems(options); viewOptions->setCurrentItem(m_tabViewMode); viewOptions->plug(m_tabbarPopupMenu); - connect(viewOptions, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotTabSetViewOptions(int))); + connect(viewOptions, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotTabSetViewOptions(int))); slotTabSetViewOptions(m_tabViewMode); - TDEToggleAction *dynamicTabHideOption = new TDEToggleAction ( i18n( "&Dynamic Hide" ), 0, TQT_TQOBJECT(this), - TQT_SLOT( slotTabbarToggleDynamicHide() ), TQT_TQOBJECT(this)); + TDEToggleAction *dynamicTabHideOption = new TDEToggleAction ( i18n( "&Dynamic Hide" ), 0, this, + TQ_SLOT( slotTabbarToggleDynamicHide() ), this); dynamicTabHideOption->setChecked(b_dynamicTabHide); dynamicTabHideOption->plug(m_tabbarPopupMenu); TDEToggleAction *m_autoResizeTabs = new TDEToggleAction( i18n("&Auto Resize Tabs"), - 0, TQT_TQOBJECT(this), TQT_SLOT( slotToggleAutoResizeTabs() ), TQT_TQOBJECT(this)); + 0, this, TQ_SLOT( slotToggleAutoResizeTabs() ), this); m_autoResizeTabs->setChecked(b_autoResizeTabs); m_autoResizeTabs->plug(m_tabbarPopupMenu); } @@ -955,23 +952,23 @@ void Konsole::makeTabWidget() TDEAcceleratorManager::setNoAccel( tabwidget ); - connect(tabwidget, TQT_SIGNAL(movedTab(int,int)), TQT_SLOT(slotMovedTab(int,int))); - connect(tabwidget, TQT_SIGNAL(mouseDoubleClick(TQWidget*)), TQT_SLOT(slotRenameSession())); - connect(tabwidget, TQT_SIGNAL(currentChanged(TQWidget*)), TQT_SLOT(activateSession(TQWidget*))); - connect(tabwidget, TQT_SIGNAL(contextMenu(TQWidget*, const TQPoint &)), - TQT_SLOT(slotTabContextMenu(TQWidget*, const TQPoint &))); - connect(tabwidget, TQT_SIGNAL(contextMenu(const TQPoint &)), - TQT_SLOT(slotTabbarContextMenu(const TQPoint &))); + connect(tabwidget, TQ_SIGNAL(movedTab(int,int)), TQ_SLOT(slotMovedTab(int,int))); + connect(tabwidget, TQ_SIGNAL(mouseDoubleClick(TQWidget*)), TQ_SLOT(slotRenameSession())); + connect(tabwidget, TQ_SIGNAL(currentChanged(TQWidget*)), TQ_SLOT(activateSession(TQWidget*))); + connect(tabwidget, TQ_SIGNAL(contextMenu(TQWidget*, const TQPoint &)), + TQ_SLOT(slotTabContextMenu(TQWidget*, const TQPoint &))); + connect(tabwidget, TQ_SIGNAL(contextMenu(const TQPoint &)), + TQ_SLOT(slotTabbarContextMenu(const TQPoint &))); if (kapp->authorize("shell_access")) { - connect(tabwidget, TQT_SIGNAL(mouseDoubleClick()), TQT_SLOT(newSession())); + connect(tabwidget, TQ_SIGNAL(mouseDoubleClick()), TQ_SLOT(newSession())); m_newSessionButton = new TQToolButton( tabwidget ); TQToolTip::add(m_newSessionButton,i18n("Click for new standard session\nClick and hold for session menu")); m_newSessionButton->setIconSet( SmallIcon( "tab_new" ) ); m_newSessionButton->adjustSize(); m_newSessionButton->setPopup( m_tabbarSessionsCommands ); - connect(m_newSessionButton, TQT_SIGNAL(clicked()), TQT_SLOT(newSession())); + connect(m_newSessionButton, TQ_SIGNAL(clicked()), TQ_SLOT(newSession())); tabwidget->setCornerWidget( m_newSessionButton, BottomLeft ); m_newSessionButton->installEventFilter(this); @@ -980,7 +977,7 @@ void Konsole::makeTabWidget() m_removeSessionButton->setIconSet( SmallIconSet( "tab_remove" ) ); m_removeSessionButton->adjustSize(); m_removeSessionButton->setEnabled(false); - connect(m_removeSessionButton, TQT_SIGNAL(clicked()), TQT_SLOT(confirmCloseCurrentSession())); + connect(m_removeSessionButton, TQ_SIGNAL(clicked()), TQ_SLOT(confirmCloseCurrentSession())); tabwidget->setCornerWidget( m_removeSessionButton, BottomRight ); } @@ -988,18 +985,18 @@ void Konsole::makeTabWidget() bool Konsole::eventFilter( TQObject *o, TQEvent *ev ) { - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_newSessionButton)) + if (o == m_newSessionButton) { // Popup the menu when the left mousebutton is pressed and the mouse // is moved by a small distance. if (ev->type() == TQEvent::MouseButtonPress) { - TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev); + TQMouseEvent* mev = static_cast<TQMouseEvent*>(ev); m_newSessionButtonMousePressPos = mev->pos(); } else if (ev->type() == TQEvent::MouseMove) { - TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev); + TQMouseEvent* mev = static_cast<TQMouseEvent*>(ev); if ((mev->pos() - m_newSessionButtonMousePressPos).manhattanLength() > TDEGlobalSettings::dndEventDelay()) { @@ -1009,7 +1006,7 @@ bool Konsole::eventFilter( TQObject *o, TQEvent *ev ) } else if (ev->type() == TQEvent::ContextMenu) { - TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev); + TQMouseEvent* mev = static_cast<TQMouseEvent*>(ev); slotTabbarContextMenu(mev->globalPos()); return true; } @@ -1022,7 +1019,7 @@ void Konsole::makeBasicGUI() if (kapp->authorize("shell_access")) { m_tabbarSessionsCommands = new TDEPopupMenu( this ); TDEAcceleratorManager::manage( m_tabbarSessionsCommands ); - connect(m_tabbarSessionsCommands, TQT_SIGNAL(activated(int)), TQT_SLOT(newSessionTabbar(int))); + connect(m_tabbarSessionsCommands, TQ_SIGNAL(activated(int)), TQ_SLOT(newSessionTabbar(int))); } m_session = new TDEPopupMenu(this); @@ -1065,20 +1062,20 @@ void Konsole::makeBasicGUI() // programs. if (m_tabbarSessionsCommands) - connect(m_tabbarSessionsCommands,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); - connect(m_session,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + connect(m_tabbarSessionsCommands,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); + connect(m_session,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_options) - connect(m_options,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + connect(m_options,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_help) - connect(m_help,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + connect(m_help,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_rightButton) - connect(m_rightButton,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); - connect(m_edit,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); - connect(m_view,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + connect(m_rightButton,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); + connect(m_edit,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); + connect(m_view,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_bookmarks) - connect(m_bookmarks,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + connect(m_bookmarks,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_bookmarksSession) - connect(m_bookmarksSession,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + connect(m_bookmarksSession,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); m_session_id=menubar->insertItem(m_session_string , m_session); m_edit_id=menubar->insertItem(m_edit_string, m_edit); @@ -1092,79 +1089,79 @@ void Konsole::makeBasicGUI() m_shortcuts = new TDEActionCollection(this); - m_copyClipboard = new TDEAction(i18n("&Copy"), "edit-copy", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotCopyClipboard()), m_shortcuts, "edit_copy"); - m_pasteClipboard = new TDEAction(i18n("&Paste"), "edit-paste", Qt::SHIFT+Qt::Key_Insert, TQT_TQOBJECT(this), - TQT_SLOT(slotPasteClipboard()), m_shortcuts, "edit_paste"); - m_pasteSelection = new TDEAction(i18n("Paste Selection"), Qt::CTRL+Qt::SHIFT+Qt::Key_Insert, TQT_TQOBJECT(this), - TQT_SLOT(slotPasteSelection()), m_shortcuts, "pasteselection"); - - m_clearTerminal = new TDEAction(i18n("C&lear Terminal"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotClearTerminal()), m_shortcuts, "clear_terminal"); - m_resetClearTerminal = new TDEAction(i18n("&Reset && Clear Terminal"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotResetClearTerminal()), m_shortcuts, "reset_clear_terminal"); - m_findHistory = new TDEAction(i18n("&Find in History..."), "edit-find", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotFindHistory()), m_shortcuts, "find_history"); + m_copyClipboard = new TDEAction(i18n("&Copy"), "edit-copy", 0, this, + TQ_SLOT(slotCopyClipboard()), m_shortcuts, "edit_copy"); + m_pasteClipboard = new TDEAction(i18n("&Paste"), "edit-paste", TQt::SHIFT+TQt::Key_Insert, this, + TQ_SLOT(slotPasteClipboard()), m_shortcuts, "edit_paste"); + m_pasteSelection = new TDEAction(i18n("Paste Selection"), TQt::CTRL+TQt::SHIFT+TQt::Key_Insert, this, + TQ_SLOT(slotPasteSelection()), m_shortcuts, "pasteselection"); + + m_clearTerminal = new TDEAction(i18n("C&lear Terminal"), 0, this, + TQ_SLOT(slotClearTerminal()), m_shortcuts, "clear_terminal"); + m_resetClearTerminal = new TDEAction(i18n("&Reset && Clear Terminal"), 0, this, + TQ_SLOT(slotResetClearTerminal()), m_shortcuts, "reset_clear_terminal"); + m_findHistory = new TDEAction(i18n("&Find in History..."), "edit-find", 0, this, + TQ_SLOT(slotFindHistory()), m_shortcuts, "find_history"); m_findHistory->setEnabled(b_histEnabled); - m_findNext = new TDEAction(i18n("Find &Next"), "go-next", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotFindNext()), m_shortcuts, "find_next"); + m_findNext = new TDEAction(i18n("Find &Next"), "go-next", 0, this, + TQ_SLOT(slotFindNext()), m_shortcuts, "find_next"); m_findNext->setEnabled(b_histEnabled); - m_findPrevious = new TDEAction(i18n("Find Pre&vious"), "go-previous", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotFindPrevious()), m_shortcuts, "find_previous"); + m_findPrevious = new TDEAction(i18n("Find Pre&vious"), "go-previous", 0, this, + TQ_SLOT(slotFindPrevious()), m_shortcuts, "find_previous"); m_findPrevious->setEnabled( b_histEnabled ); - m_saveHistory = new TDEAction(i18n("S&ave History As..."), "document-save-as", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotSaveHistory()), m_shortcuts, "save_history"); + m_saveHistory = new TDEAction(i18n("S&ave History As..."), "document-save-as", 0, this, + TQ_SLOT(slotSaveHistory()), m_shortcuts, "save_history"); m_saveHistory->setEnabled(b_histEnabled ); - m_clearHistory = new TDEAction(i18n("Clear &History"), "history_clear", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotClearHistory()), m_shortcuts, "clear_history"); + m_clearHistory = new TDEAction(i18n("Clear &History"), "history_clear", 0, this, + TQ_SLOT(slotClearHistory()), m_shortcuts, "clear_history"); m_clearHistory->setEnabled(b_histEnabled); m_clearAllSessionHistories = new TDEAction(i18n("Clear All H&istories"), "history_clear", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotClearAllSessionHistories()), m_shortcuts, "clear_all_histories"); + this, TQ_SLOT(slotClearAllSessionHistories()), m_shortcuts, "clear_all_histories"); if (!m_detachSession) { - m_detachSession = new TDEAction(i18n("&Detach Session"), SmallIconSet("tab_breakoff"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotDetachSession()), m_shortcuts, "detach_session"); + m_detachSession = new TDEAction(i18n("&Detach Session"), SmallIconSet("tab_breakoff"), 0, this, + TQ_SLOT(slotDetachSession()), m_shortcuts, "detach_session"); } m_detachSession->setEnabled(false); - m_renameSession = new TDEAction(i18n("&Rename Session..."), Qt::CTRL+Qt::SHIFT+Qt::Key_R, TQT_TQOBJECT(this), - TQT_SLOT(slotRenameSession()), m_shortcuts, "rename_session"); + m_renameSession = new TDEAction(i18n("&Rename Session..."), TQt::CTRL+TQt::SHIFT+TQt::Key_R, this, + TQ_SLOT(slotRenameSession()), m_shortcuts, "rename_session"); if (kapp->authorizeTDEAction("zmodem_upload")) m_zmodemUpload = new TDEAction( i18n( "&ZModem Upload..." ), - Qt::CTRL+Qt::ALT+Qt::Key_U, TQT_TQOBJECT(this), - TQT_SLOT( slotZModemUpload() ), + TQt::CTRL+TQt::ALT+TQt::Key_U, this, + TQ_SLOT( slotZModemUpload() ), m_shortcuts, "zmodem_upload" ); monitorActivity = new TDEToggleAction ( i18n( "Monitor for &Activity" ), - SmallIconSet("activity"), 0, TQT_TQOBJECT(this), - TQT_SLOT( slotToggleMonitor() ), m_shortcuts, "monitor_activity" ); + SmallIconSet("activity"), 0, this, + TQ_SLOT( slotToggleMonitor() ), m_shortcuts, "monitor_activity" ); monitorActivity->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Activity" ) ) ); monitorSilence = new TDEToggleAction ( i18n( "Monitor for &Silence" ), - SmallIconSet("silence"), 0, TQT_TQOBJECT(this), - TQT_SLOT( slotToggleMonitor() ), m_shortcuts, "monitor_silence" ); + SmallIconSet("silence"), 0, this, + TQ_SLOT( slotToggleMonitor() ), m_shortcuts, "monitor_silence" ); monitorSilence->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Silence" ) ) ); - masterMode = new TDEToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, TQT_TQOBJECT(this), - TQT_SLOT( slotToggleMasterMode() ), m_shortcuts, "send_input_to_all_sessions" ); + masterMode = new TDEToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, this, + TQ_SLOT( slotToggleMasterMode() ), m_shortcuts, "send_input_to_all_sessions" ); - showMenubar = new TDEToggleAction ( i18n( "Show &Menubar" ), "showmenu", Qt::CTRL+Qt::SHIFT+Qt::ALT+Qt::Key_M, TQT_TQOBJECT(this), - TQT_SLOT( slotToggleMenubar() ), m_shortcuts, "show_menubar" ); + showMenubar = new TDEToggleAction ( i18n( "Show &Menubar" ), "showmenu", TQt::CTRL+TQt::SHIFT+TQt::ALT+TQt::Key_M, this, + TQ_SLOT( slotToggleMenubar() ), m_shortcuts, "show_menubar" ); showMenubar->setCheckedState( KGuiItem( i18n("Hide &Menubar"), "showmenu", TQString::null, TQString::null ) ); m_fullscreen = KStdAction::fullScreen(0, 0, m_shortcuts, this ); - connect( m_fullscreen,TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this),TQT_SLOT(updateFullScreen(bool))); + connect( m_fullscreen,TQ_SIGNAL(toggled(bool)), this,TQ_SLOT(updateFullScreen(bool))); m_fullscreen->setChecked(b_fullscreen); - m_saveProfile = new TDEAction( i18n( "Save Sessions &Profile..." ), SmallIconSet("document-save-as"), 0, TQT_TQOBJECT(this), - TQT_SLOT( slotSaveSessionsProfile() ), m_shortcuts, "save_sessions_profile" ); + m_saveProfile = new TDEAction( i18n( "Save Sessions &Profile..." ), SmallIconSet("document-save-as"), 0, this, + TQ_SLOT( slotSaveSessionsProfile() ), m_shortcuts, "save_sessions_profile" ); //help menu if (m_help) @@ -1172,43 +1169,43 @@ void Konsole::makeBasicGUI() // Don't steal F1 (handbook) accel (esp. since it not visible in // "Configure Shortcuts"). - m_closeSession = new TDEAction(i18n("C&lose Session"), "window-close", 0, TQT_TQOBJECT(this), - TQT_SLOT(confirmCloseCurrentSession()), m_shortcuts, "close_session"); - m_print = new TDEAction(i18n("&Print Screen..."), "document-print", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPrint() ), m_shortcuts, "file_print"); - m_quit = new TDEAction(i18n("&Quit"), "system-log-out", 0, TQT_TQOBJECT(this), TQT_SLOT( close() ), m_shortcuts, "file_quit"); + m_closeSession = new TDEAction(i18n("C&lose Session"), "window-close", 0, this, + TQ_SLOT(confirmCloseCurrentSession()), m_shortcuts, "close_session"); + m_print = new TDEAction(i18n("&Print Screen..."), "document-print", 0, this, TQ_SLOT( slotPrint() ), m_shortcuts, "file_print"); + m_quit = new TDEAction(i18n("&Quit"), "system-log-out", 0, this, TQ_SLOT( close() ), m_shortcuts, "file_quit"); - TDEShortcut shortcut(Qt::CTRL+Qt::ALT+Qt::Key_N); - shortcut.append(TDEShortcut(Qt::CTRL+Qt::SHIFT+Qt::Key_N)); - new TDEAction(i18n("New Session"), shortcut, TQT_TQOBJECT(this), TQT_SLOT(newSession()), m_shortcuts, "new_session"); - new TDEAction(i18n("Activate Menu"), Qt::CTRL+Qt::ALT+Qt::Key_M, TQT_TQOBJECT(this), TQT_SLOT(activateMenu()), m_shortcuts, "activate_menu"); - new TDEAction(i18n("List Sessions"), 0, TQT_TQOBJECT(this), TQT_SLOT(listSessions()), m_shortcuts, "list_sessions"); + TDEShortcut shortcut(TQt::CTRL+TQt::ALT+TQt::Key_N); + shortcut.append(TDEShortcut(TQt::CTRL+TQt::SHIFT+TQt::Key_N)); + new TDEAction(i18n("New Session"), shortcut, this, TQ_SLOT(newSession()), m_shortcuts, "new_session"); + new TDEAction(i18n("Activate Menu"), TQt::CTRL+TQt::ALT+TQt::Key_M, this, TQ_SLOT(activateMenu()), m_shortcuts, "activate_menu"); + new TDEAction(i18n("List Sessions"), 0, this, TQ_SLOT(listSessions()), m_shortcuts, "list_sessions"); if (!m_moveSessionLeft) { m_moveSessionLeft = new TDEAction(i18n("&Move Session Left"), TQApplication::reverseLayout() ? "forward" : "back", - TQApplication::reverseLayout() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Right : Qt::CTRL+Qt::SHIFT+Qt::Key_Left, TQT_TQOBJECT(this), - TQT_SLOT(moveSessionLeft()), m_shortcuts, "move_session_left"); + TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Right : TQt::CTRL+TQt::SHIFT+TQt::Key_Left, this, + TQ_SLOT(moveSessionLeft()), m_shortcuts, "move_session_left"); } if (!m_moveSessionRight) { m_moveSessionRight = new TDEAction(i18n("M&ove Session Right"), TQApplication::reverseLayout() ? "back" : "forward", - TQApplication::reverseLayout() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Left : Qt::CTRL+Qt::SHIFT+Qt::Key_Right, TQT_TQOBJECT(this), - TQT_SLOT(moveSessionRight()), m_shortcuts, "move_session_right"); + TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Left : TQt::CTRL+TQt::SHIFT+TQt::Key_Right, this, + TQ_SLOT(moveSessionRight()), m_shortcuts, "move_session_right"); } - new TDEAction(i18n("Go to Previous Session"), TQApplication::reverseLayout() ? Qt::SHIFT+Qt::Key_Right : Qt::SHIFT+Qt::Key_Left, - TQT_TQOBJECT(this), TQT_SLOT(prevSession()), m_shortcuts, "previous_session"); - new TDEAction(i18n("Go to Next Session"), TQApplication::reverseLayout() ? Qt::SHIFT+Qt::Key_Left : Qt::SHIFT+Qt::Key_Right, - TQT_TQOBJECT(this), TQT_SLOT(nextSession()), m_shortcuts, "next_session"); + new TDEAction(i18n("Go to Previous Session"), TQApplication::reverseLayout() ? TQt::SHIFT+TQt::Key_Right : TQt::SHIFT+TQt::Key_Left, + this, TQ_SLOT(prevSession()), m_shortcuts, "previous_session"); + new TDEAction(i18n("Go to Next Session"), TQApplication::reverseLayout() ? TQt::SHIFT+TQt::Key_Left : TQt::SHIFT+TQt::Key_Right, + this, TQ_SLOT(nextSession()), m_shortcuts, "next_session"); for (int i=1;i<13;i++) { // Due to 12 function keys? - new TDEAction(i18n("Switch to Session %1").arg(i), 0, TQT_TQOBJECT(this), TQT_SLOT(switchToSession()), m_shortcuts, TQString(TQString().sprintf("switch_to_session_%02d", i)).latin1()); + new TDEAction(i18n("Switch to Session %1").arg(i), 0, this, TQ_SLOT(switchToSession()), m_shortcuts, TQString(TQString().sprintf("switch_to_session_%02d", i)).latin1()); } - new TDEAction(i18n("Enlarge Font"), 0, TQT_TQOBJECT(this), TQT_SLOT(biggerFont()), m_shortcuts, "bigger_font"); - new TDEAction(i18n("Shrink Font"), 0, TQT_TQOBJECT(this), TQT_SLOT(smallerFont()), m_shortcuts, "smaller_font"); + new TDEAction(i18n("Enlarge Font"), 0, this, TQ_SLOT(biggerFont()), m_shortcuts, "bigger_font"); + new TDEAction(i18n("Shrink Font"), 0, this, TQ_SLOT(smallerFont()), m_shortcuts, "smaller_font"); - new TDEAction(i18n("Toggle Bidi"), Qt::CTRL+Qt::ALT+Qt::Key_B, TQT_TQOBJECT(this), TQT_SLOT(toggleBidi()), m_shortcuts, "toggle_bidi"); + new TDEAction(i18n("Toggle Bidi"), TQt::CTRL+TQt::ALT+TQt::Key_B, this, TQ_SLOT(toggleBidi()), m_shortcuts, "toggle_bidi"); // Should we load all *.desktop files now? Required for Session shortcuts. if ( TDEConfigGroup(TDEGlobal::config(), "General").readBoolEntry("SessionShortcutsEnabled", false) ) { @@ -1220,7 +1217,7 @@ void Konsole::makeBasicGUI() m_sessionList = new TDEPopupMenu(this); TDEAcceleratorManager::manage( m_sessionList ); - connect(m_sessionList, TQT_SIGNAL(activated(int)), TQT_SLOT(activateSession(int))); + connect(m_sessionList, TQ_SIGNAL(activated(int)), TQ_SLOT(activateSession(int))); } /** @@ -1383,10 +1380,16 @@ void Konsole::slotTabRenameSession() { void Konsole::slotTabSelectColor() { TQColor color = tabwidget->tabColor( m_contextMenuSession->widget() ); - int result = KColorDialog::getColor( color ); + int result = KColorDialog::getColor( color, tabwidget->colorGroup().foreground() ); - if ( result == KColorDialog::Accepted ) + if ( result == KColorDialog::Accepted ) { tabwidget->setTabColor(m_contextMenuSession->widget(), color); + } +} + +void Konsole::slotTabResetColor() +{ + tabwidget->resetTabColor(m_contextMenuSession->widget()); } void Konsole::slotTabToggleMonitor() @@ -1616,6 +1619,20 @@ void Konsole::readProperties(TDEConfig* config, const TQString &schema, bool glo s_word_seps= config->readEntry("wordseps",":@-./_~"); b_framevis = config->readBoolEntry("has frame",true); b_metaAsAlt = config->readBoolEntry("metaAsAltMode",false); + b_realTransparency = config->readBoolEntry("RealTransparency",false); + + Atom kde_wm_transparent_to_desktop; + kde_wm_transparent_to_desktop = XInternAtom(tqt_xdisplay(), "_TDE_TRANSPARENT_TO_DESKTOP", False); + if (b_realTransparency) + { + XDeleteProperty(tqt_xdisplay(), winId(), kde_wm_transparent_to_desktop); + } + else + { + // Signal that we want to be transparent to the desktop, not to windows behind us... + XChangeProperty(tqt_xdisplay(), winId(), kde_wm_transparent_to_desktop, XA_INTEGER, 32, PropModeReplace, (unsigned char *) "TRUE", 1L); + } + TQPtrList<TEWidget> tes = activeTEs(); for (TEWidget *_te = tes.first(); _te; _te = tes.next()) { _te->setWordCharacters(s_word_seps); @@ -1642,10 +1659,6 @@ void Konsole::readProperties(TDEConfig* config, const TQString &schema, bool glo config->setGroup("UTMP"); b_addToUtmp = config->readBoolEntry("AddToUtmp",true); config->setDesktopGroup(); - - // Do not set a default value; this allows the System-wide Scheme - // to set the tab text color. - m_tabColor = config->readColorEntry("TabColor"); } if (!globalConfigOnly) @@ -1720,7 +1733,7 @@ void Konsole::readProperties(TDEConfig* config, const TQString &schema, bool glo // profile scrollbar entry differs from the konsolerc scrollbar entry. TQPtrList<TEWidget> tes = activeTEs(); for (TEWidget *_te = tes.first(); _te; _te = tes.next()) { - if (_te->getScrollbarLocation() != n_scroll) + if (_te->getScrollbarLocation() != n_scroll) _te->setScrollbarLocation(n_scroll); } } @@ -1977,7 +1990,7 @@ void Konsole::slotToggleMenubar() { } if (!showMenubar->isChecked()) { setCaption(i18n("Use the right mouse button to bring back the menu")); - TQTimer::singleShot(5000,this,TQT_SLOT(updateTitle())); + TQTimer::singleShot(5000,this,TQ_SLOT(updateTitle())); } updateRMBMenu(); } @@ -2015,8 +2028,6 @@ void Konsole::createSessionTab(TEWidget *widget, const TQIconSet &iconSet, tabwidget->insertTab(widget, iconSet, TQString::null, index); break; } - if ( m_tabColor.isValid() ) - tabwidget->setTabColor(widget, m_tabColor); } TQIconSet Konsole::iconSetForSession(TESession *session) const @@ -2131,12 +2142,12 @@ void Konsole::reparseConfiguration() b_sessionShortcutsMapped = false; // Mappings may have to be changed...get a fresh mapper. - disconnect( sessionNumberMapper, TQT_SIGNAL( mapped( int ) ), - this, TQT_SLOT( newSessionTabbar( int ) ) ); + disconnect( sessionNumberMapper, TQ_SIGNAL( mapped( int ) ), + this, TQ_SLOT( newSessionTabbar( int ) ) ); delete sessionNumberMapper; - sessionNumberMapper = new TQSignalMapper( TQT_TQOBJECT(this) ); - connect( sessionNumberMapper, TQT_SIGNAL( mapped( int ) ), - this, TQT_SLOT( newSessionTabbar( int ) ) ); + sessionNumberMapper = new TQSignalMapper( this ); + connect( sessionNumberMapper, TQ_SIGNAL( mapped( int ) ), + this, TQ_SLOT( newSessionTabbar( int ) ) ); sl_sessionShortCuts.clear(); buildSessionMenus(); @@ -2287,7 +2298,7 @@ void Konsole::updateTitle(TESession* _se) TDERadioAction *ra = session2action.find(_se); if (ra && (ra->icon() != icon)) ra->setIcon(icon); - if (m_tabViewMode == ShowIconOnly) + if (m_tabViewMode == ShowIconOnly) tabwidget->changeTab( _se->widget(), TQString::null ); else if (b_matchTabWinTitle) tabwidget->setTabLabel( _se->widget(), _se->fullTitle().replace('&',"&&")); @@ -2369,12 +2380,12 @@ void Konsole::disableMasterModeConnections() TESession *to = to_it.current(); if (to!=from) { - disconnect(from->widget(), TQT_SIGNAL(keyPressedSignal(TQKeyEvent*)), - to->getEmulation(), TQT_SLOT(onKeyPress(TQKeyEvent*))); - disconnect(from->widget(), TQT_SIGNAL(keyReleasedSignal(TQKeyEvent*)), - to->getEmulation(), TQT_SLOT(onKeyReleased(TQKeyEvent*))); - disconnect(from->widget(), TQT_SIGNAL(focusInSignal(TQFocusEvent*)), - to->getEmulation(), TQT_SLOT(onFocusIn(TQFocusEvent*))); + disconnect(from->widget(), TQ_SIGNAL(keyPressedSignal(TQKeyEvent*)), + to->getEmulation(), TQ_SLOT(onKeyPress(TQKeyEvent*))); + disconnect(from->widget(), TQ_SIGNAL(keyReleasedSignal(TQKeyEvent*)), + to->getEmulation(), TQ_SLOT(onKeyReleased(TQKeyEvent*))); + disconnect(from->widget(), TQ_SIGNAL(focusInSignal(TQFocusEvent*)), + to->getEmulation(), TQ_SLOT(onFocusIn(TQFocusEvent*))); } } } @@ -2392,12 +2403,12 @@ void Konsole::enableMasterModeConnections() TESession *to = to_it.current(); if (to!=from) { - connect(from->widget(), TQT_SIGNAL(keyPressedSignal(TQKeyEvent*)), - to->getEmulation(), TQT_SLOT(onKeyPress(TQKeyEvent*))); - connect(from->widget(), TQT_SIGNAL(keyReleasedSignal(TQKeyEvent*)), - to->getEmulation(), TQT_SLOT(onKeyReleased(TQKeyEvent*))); - connect(from->widget(), TQT_SIGNAL(focusInSignal(TQFocusEvent*)), - to->getEmulation(), TQT_SLOT(onFocusIn(TQFocusEvent*))); + connect(from->widget(), TQ_SIGNAL(keyPressedSignal(TQKeyEvent*)), + to->getEmulation(), TQ_SLOT(onKeyPress(TQKeyEvent*))); + connect(from->widget(), TQ_SIGNAL(keyReleasedSignal(TQKeyEvent*)), + to->getEmulation(), TQ_SLOT(onKeyReleased(TQKeyEvent*))); + connect(from->widget(), TQ_SIGNAL(focusInSignal(TQFocusEvent*)), + to->getEmulation(), TQ_SLOT(onFocusIn(TQFocusEvent*))); } } } @@ -2492,7 +2503,7 @@ void Konsole::runSession(TESession* s) // give some time to get through the // resize events before starting up. - TQTimer::singleShot(100,s,TQT_SLOT(run())); + TQTimer::singleShot(100,s,TQ_SLOT(run())); } void Konsole::addSession(TESession* s) @@ -2525,8 +2536,8 @@ void Konsole::addSession(TESession* s) TDERadioAction *ra = new TDERadioAction(newTitle.replace('&',"&&"), s->IconName(), 0, - TQT_TQOBJECT(this), - TQT_SLOT(activateSession()), + this, + TQ_SLOT(activateSession()), m_shortcuts); ra->setExclusiveGroup("sessions"); ra->setChecked(true); @@ -2581,7 +2592,7 @@ void Konsole::listSessions() void Konsole::switchToSession() { - activateSession( TQString( TQT_TQOBJECT_CONST(sender())->name() ).right( 2 ).toInt() -1 ); + activateSession( TQString( sender()->name() ).right( 2 ).toInt() -1 ); } void Konsole::activateSession(int position) @@ -2654,8 +2665,8 @@ void Konsole::activateSession(TESession *s) pmPath = cs->imagePath(); n_render = cs->alignment(); -// BR 106464 temporary fix... -// only 2 sessions opened, 2nd session viewable, right-click on 1st tab and +// BR 106464 temporary fix... +// only 2 sessions opened, 2nd session viewable, right-click on 1st tab and // select 'Detach', close original Konsole window... crash // s is not set properly on original Konsole window TDERadioAction *ra = session2action.find(se); @@ -2665,7 +2676,7 @@ void Konsole::activateSession(TESession *s) } ra->setChecked(true); - TQTimer::singleShot(1,this,TQT_SLOT(allowPrevNext())); // hack, hack, hack + TQTimer::singleShot(1,this,TQ_SLOT(allowPrevNext())); // hack, hack, hack tabwidget->showPage( se->widget() ); te = se->widget(); @@ -2739,7 +2750,7 @@ void Konsole::setSessionEncoding( const TQString &encoding, TESession *session ) while ( it != encodingNames.end() && !found_encoding ) { - if ( TQString::compare( TDEGlobal::charsets()->encodingForName(*it), + if ( TQString::compare( TDEGlobal::charsets()->encodingForName(*it), t_encoding ) == 0 ) { found_encoding = true; } @@ -2942,8 +2953,8 @@ TQString Konsole::newSession(KSimpleConfig *co, TQString program, const TQStrLis TEWidget* te_old = te; te=new TEWidget(tabwidget); - connect( te, TQT_SIGNAL(configureRequest(TEWidget*, int, int, int)), - this, TQT_SLOT(configureRequest(TEWidget*,int,int,int)) ); + connect( te, TQ_SIGNAL(configureRequest(TEWidget*, int, int, int)), + this, TQ_SLOT(configureRequest(TEWidget*,int,int,int)) ); if (te_old) { initTEWidget(te, te_old); } @@ -2962,40 +2973,40 @@ TQString Konsole::newSession(KSimpleConfig *co, TQString program, const TQStrLis s->setMonitorSilenceSeconds(monitorSilenceSeconds); s->enableFullScripting(b_fullScripting); s->setMetaAsAltMode(b_metaAsAlt); - + // If you add any new signal-slot connection below, think about doing it in konsolePart too - connect( s,TQT_SIGNAL(done(TESession*)), - this,TQT_SLOT(doneSession(TESession*))); - connect( s, TQT_SIGNAL(updateTitle(TESession*)), - this, TQT_SLOT(updateTitle(TESession*))); - connect( s, TQT_SIGNAL(notifySessionState(TESession*, int)), - this, TQT_SLOT(notifySessionState(TESession*, int))); - connect( s, TQT_SIGNAL(disableMasterModeConnections()), - this, TQT_SLOT(disableMasterModeConnections())); - connect( s, TQT_SIGNAL(enableMasterModeConnections()), - this, TQT_SLOT(enableMasterModeConnections())); - connect( s, TQT_SIGNAL(renameSession(TESession*,const TQString&)), - this, TQT_SLOT(slotRenameSession(TESession*, const TQString&))); - connect( s->getEmulation(), TQT_SIGNAL(changeColumns(int)), - this, TQT_SLOT(changeColumns(int)) ); - connect( s->getEmulation(), TQT_SIGNAL(changeColLin(int,int)), - this, TQT_SLOT(changeColLin(int,int))); - connect( s->getEmulation(), TQT_SIGNAL(ImageSizeChanged(int,int)), - this, TQT_SLOT(notifySize(int,int))); - connect( s, TQT_SIGNAL(zmodemDetected(TESession*)), - this, TQT_SLOT(slotZModemDetected(TESession*))); - connect( s, TQT_SIGNAL(updateSessionConfig(TESession*)), - this, TQT_SLOT(slotUpdateSessionConfig(TESession*))); - connect( s, TQT_SIGNAL(resizeSession(TESession*, TQSize)), - this, TQT_SLOT(slotResizeSession(TESession*, TQSize))); - connect( s, TQT_SIGNAL(setSessionEncoding(TESession*, const TQString &)), - this, TQT_SLOT(slotSetSessionEncoding(TESession*, const TQString &))); - connect( s, TQT_SIGNAL(getSessionSchema(TESession*, TQString &)), - this, TQT_SLOT(slotGetSessionSchema(TESession*, TQString &))); - connect( s, TQT_SIGNAL(setSessionSchema(TESession*, const TQString &)), - this, TQT_SLOT(slotSetSessionSchema(TESession*, const TQString &))); - connect( s, TQT_SIGNAL(changeTabTextColor(TESession*, int)), - this,TQT_SLOT(changeTabTextColor(TESession*, int))); + connect( s,TQ_SIGNAL(done(TESession*)), + this,TQ_SLOT(doneSession(TESession*))); + connect( s, TQ_SIGNAL(updateTitle(TESession*)), + this, TQ_SLOT(updateTitle(TESession*))); + connect( s, TQ_SIGNAL(notifySessionState(TESession*, int)), + this, TQ_SLOT(notifySessionState(TESession*, int))); + connect( s, TQ_SIGNAL(disableMasterModeConnections()), + this, TQ_SLOT(disableMasterModeConnections())); + connect( s, TQ_SIGNAL(enableMasterModeConnections()), + this, TQ_SLOT(enableMasterModeConnections())); + connect( s, TQ_SIGNAL(renameSession(TESession*,const TQString&)), + this, TQ_SLOT(slotRenameSession(TESession*, const TQString&))); + connect( s->getEmulation(), TQ_SIGNAL(changeColumns(int)), + this, TQ_SLOT(changeColumns(int)) ); + connect( s->getEmulation(), TQ_SIGNAL(changeColLin(int,int)), + this, TQ_SLOT(changeColLin(int,int))); + connect( s->getEmulation(), TQ_SIGNAL(ImageSizeChanged(int,int)), + this, TQ_SLOT(notifySize(int,int))); + connect( s, TQ_SIGNAL(zmodemDetected(TESession*)), + this, TQ_SLOT(slotZModemDetected(TESession*))); + connect( s, TQ_SIGNAL(updateSessionConfig(TESession*)), + this, TQ_SLOT(slotUpdateSessionConfig(TESession*))); + connect( s, TQ_SIGNAL(resizeSession(TESession*, TQSize)), + this, TQ_SLOT(slotResizeSession(TESession*, TQSize))); + connect( s, TQ_SIGNAL(setSessionEncoding(TESession*, const TQString &)), + this, TQ_SLOT(slotSetSessionEncoding(TESession*, const TQString &))); + connect( s, TQ_SIGNAL(getSessionSchema(TESession*, TQString &)), + this, TQ_SLOT(slotGetSessionSchema(TESession*, TQString &))); + connect( s, TQ_SIGNAL(setSessionSchema(TESession*, const TQString &)), + this, TQ_SLOT(slotSetSessionSchema(TESession*, const TQString &))); + connect( s, TQ_SIGNAL(changeTabTextColor(TESession*, int)), + this,TQ_SLOT(changeTabTextColor(TESession*, int))); s->widget()->setVTFont(defaultFont);// Hack to set font again after newSession s->setSchemaNo(schmno); @@ -3138,7 +3149,7 @@ void Konsole::doneSession(TESession* s) // Since the timer approach only works at good weather, // the whole construction is not suited to what it // should do. Affected is the TEEmulation::setConnect. - TQTimer::singleShot(1,this,TQT_SLOT(activateSession())); + TQTimer::singleShot(1,this,TQ_SLOT(activateSession())); } else close(); @@ -3211,16 +3222,16 @@ void Konsole::moveSessionLeft() ra->plug(m_view,(m_view->count()-sessions.count()+1)+position-1); TQColor oldcolor = tabwidget->tabColor(se->widget()); - + tabwidget->blockSignals(true); tabwidget->removePage(se->widget()); tabwidget->blockSignals(false); TQString title = se->Title(); - createSessionTab(se->widget(), iconSetForSession(se), + createSessionTab(se->widget(), iconSetForSession(se), title.replace('&', "&&"), position-1); tabwidget->showPage(se->widget()); tabwidget->setTabColor(se->widget(),oldcolor); - + if (!m_menuCreated) makeGUI(); m_moveSessionLeft->setEnabled(position-1>0); @@ -3244,16 +3255,16 @@ void Konsole::moveSessionRight() ra->plug(m_view,(m_view->count()-sessions.count()+1)+position+1); TQColor oldcolor = tabwidget->tabColor(se->widget()); - + tabwidget->blockSignals(true); tabwidget->removePage(se->widget()); tabwidget->blockSignals(false); TQString title = se->Title(); - createSessionTab(se->widget(), iconSetForSession(se), + createSessionTab(se->widget(), iconSetForSession(se), title.replace('&', "&&"), position+1); tabwidget->showPage(se->widget()); tabwidget->setTabColor(se->widget(),oldcolor); - + if (!m_menuCreated) makeGUI(); m_moveSessionLeft->setEnabled(true); @@ -3434,6 +3445,7 @@ void Konsole::addSessionCommand(const TQString &path) // try to locate the binary TQString exec= co->readPathEntry("Exec"); exec.remove(TQRegExp("^(sudo )?su (- )?-c ?\'")); + exec.remove(TQRegExp("\'?$")); exec = KRun::binaryName(exec, false); exec = KShell::tildeExpand(exec); @@ -3468,9 +3480,9 @@ void Konsole::addSessionCommand(const TQString &path) if ( m_shortcuts->action( name.latin1() ) ) { sessionAction = m_shortcuts->action( name.latin1() ); } else { - sessionAction = new TDEAction( comment, 0, TQT_TQOBJECT(this), 0, m_shortcuts, name.latin1() ); + sessionAction = new TDEAction( comment, 0, this, 0, m_shortcuts, name.latin1() ); } - connect( sessionAction, TQT_SIGNAL( activated() ), sessionNumberMapper, TQT_SLOT( map() ) ); + connect( sessionAction, TQ_SIGNAL( activated() ), sessionNumberMapper, TQ_SLOT( map() ) ); sessionNumberMapper->setMapping( sessionAction, cmd_serial ); } @@ -3740,31 +3752,31 @@ void Konsole::detachSession(TESession* _se) { TESession *from = from_it.current(); if(from->isMasterMode()) { - disconnect(from->widget(), TQT_SIGNAL(keyPressedSignal(TQKeyEvent*)), - _se->getEmulation(), TQT_SLOT(onKeyPress(TQKeyEvent*))); - disconnect(from->widget(), TQT_SIGNAL(keyReleasedSignal(TQKeyEvent*)), - _se->getEmulation(), TQT_SLOT(onKeyReleased(TQKeyEvent*))); - disconnect(from->widget(), TQT_SIGNAL(focusInSignal(TQFocusEvent*)), - _se->getEmulation(), TQT_SLOT(onFocusIn(TQFocusEvent*))); + disconnect(from->widget(), TQ_SIGNAL(keyPressedSignal(TQKeyEvent*)), + _se->getEmulation(), TQ_SLOT(onKeyPress(TQKeyEvent*))); + disconnect(from->widget(), TQ_SIGNAL(keyReleasedSignal(TQKeyEvent*)), + _se->getEmulation(), TQ_SLOT(onKeyReleased(TQKeyEvent*))); + disconnect(from->widget(), TQ_SIGNAL(focusInSignal(TQFocusEvent*)), + _se->getEmulation(), TQ_SLOT(onFocusIn(TQFocusEvent*))); } } } TQColor se_tabtextcolor = tabwidget->tabColor( _se->widget() ); - disconnect( _se,TQT_SIGNAL(done(TESession*)), - this,TQT_SLOT(doneSession(TESession*)) ); + disconnect( _se,TQ_SIGNAL(done(TESession*)), + this,TQ_SLOT(doneSession(TESession*)) ); - disconnect( _se->getEmulation(),TQT_SIGNAL(ImageSizeChanged(int,int)), this,TQT_SLOT(notifySize(int,int))); - disconnect( _se->getEmulation(),TQT_SIGNAL(changeColLin(int, int)), this,TQT_SLOT(changeColLin(int,int)) ); - disconnect( _se->getEmulation(),TQT_SIGNAL(changeColumns(int)), this,TQT_SLOT(changeColumns(int)) ); - disconnect( _se, TQT_SIGNAL(changeTabTextColor(TESession*, int)), this, TQT_SLOT(changeTabTextColor(TESession*, int)) ); + disconnect( _se->getEmulation(),TQ_SIGNAL(ImageSizeChanged(int,int)), this,TQ_SLOT(notifySize(int,int))); + disconnect( _se->getEmulation(),TQ_SIGNAL(changeColLin(int, int)), this,TQ_SLOT(changeColLin(int,int)) ); + disconnect( _se->getEmulation(),TQ_SIGNAL(changeColumns(int)), this,TQ_SLOT(changeColumns(int)) ); + disconnect( _se, TQ_SIGNAL(changeTabTextColor(TESession*, int)), this, TQ_SLOT(changeTabTextColor(TESession*, int)) ); - disconnect( _se,TQT_SIGNAL(updateTitle(TESession*)), this,TQT_SLOT(updateTitle(TESession*)) ); - disconnect( _se,TQT_SIGNAL(notifySessionState(TESession*,int)), this,TQT_SLOT(notifySessionState(TESession*,int)) ); - disconnect( _se,TQT_SIGNAL(disableMasterModeConnections()), this,TQT_SLOT(disableMasterModeConnections()) ); - disconnect( _se,TQT_SIGNAL(enableMasterModeConnections()), this,TQT_SLOT(enableMasterModeConnections()) ); - disconnect( _se,TQT_SIGNAL(renameSession(TESession*,const TQString&)), this,TQT_SLOT(slotRenameSession(TESession*,const TQString&)) ); + disconnect( _se,TQ_SIGNAL(updateTitle(TESession*)), this,TQ_SLOT(updateTitle(TESession*)) ); + disconnect( _se,TQ_SIGNAL(notifySessionState(TESession*,int)), this,TQ_SLOT(notifySessionState(TESession*,int)) ); + disconnect( _se,TQ_SIGNAL(disableMasterModeConnections()), this,TQ_SLOT(disableMasterModeConnections()) ); + disconnect( _se,TQ_SIGNAL(enableMasterModeConnections()), this,TQ_SLOT(enableMasterModeConnections()) ); + disconnect( _se,TQ_SIGNAL(renameSession(TESession*,const TQString&)), this,TQ_SLOT(slotRenameSession(TESession*,const TQString&)) ); // TODO: "type" isn't passed properly Konsole* konsole = new Konsole(name(), b_histEnabled, !menubar->isHidden(), n_tabbar != TabNone, b_framevis, @@ -3788,7 +3800,7 @@ void Konsole::detachSession(TESession* _se) { else se = sessions.at(sessionIndex ? sessionIndex - 1 : 0); session2action.find(se)->setChecked(true); - TQTimer::singleShot(1,this,TQT_SLOT(activateSession())); + TQTimer::singleShot(1,this,TQ_SLOT(activateSession())); } if (sessions.count()==1) @@ -3816,8 +3828,8 @@ void Konsole::attachSession(TESession* session) te=new TEWidget(tabwidget); - connect( te, TQT_SIGNAL(configureRequest(TEWidget*, int, int, int)), - this, TQT_SLOT(configureRequest(TEWidget*,int,int,int)) ); + connect( te, TQ_SIGNAL(configureRequest(TEWidget*, int, int, int)), + this, TQ_SLOT(configureRequest(TEWidget*,int,int,int)) ); te->resize(se_widget->size()); te->setSize(se_widget->Columns(), se_widget->Lines()); @@ -3833,7 +3845,7 @@ void Konsole::attachSession(TESession* session) TQString title=session->Title(); TDERadioAction *ra = new TDERadioAction(title.replace('&',"&&"), session->IconName(), - 0, TQT_TQOBJECT(this), TQT_SLOT(activateSession()), m_shortcuts); + 0, this, TQ_SLOT(activateSession()), m_shortcuts); ra->setExclusiveGroup("sessions"); ra->setChecked(true); @@ -3847,20 +3859,20 @@ void Konsole::attachSession(TESession* session) if (m_menuCreated) ra->plug(m_view); - connect( session,TQT_SIGNAL(done(TESession*)), - this,TQT_SLOT(doneSession(TESession*)) ); + connect( session,TQ_SIGNAL(done(TESession*)), + this,TQ_SLOT(doneSession(TESession*)) ); - connect( session,TQT_SIGNAL(updateTitle(TESession*)), this,TQT_SLOT(updateTitle(TESession*)) ); - connect( session,TQT_SIGNAL(notifySessionState(TESession*,int)), this,TQT_SLOT(notifySessionState(TESession*,int)) ); + connect( session,TQ_SIGNAL(updateTitle(TESession*)), this,TQ_SLOT(updateTitle(TESession*)) ); + connect( session,TQ_SIGNAL(notifySessionState(TESession*,int)), this,TQ_SLOT(notifySessionState(TESession*,int)) ); - connect( session,TQT_SIGNAL(disableMasterModeConnections()), this,TQT_SLOT(disableMasterModeConnections()) ); - connect( session,TQT_SIGNAL(enableMasterModeConnections()), this,TQT_SLOT(enableMasterModeConnections()) ); - connect( session,TQT_SIGNAL(renameSession(TESession*,const TQString&)), this,TQT_SLOT(slotRenameSession(TESession*,const TQString&)) ); - connect( session->getEmulation(),TQT_SIGNAL(ImageSizeChanged(int,int)), this,TQT_SLOT(notifySize(int,int))); - connect( session->getEmulation(),TQT_SIGNAL(changeColumns(int)), this,TQT_SLOT(changeColumns(int)) ); - connect( session->getEmulation(),TQT_SIGNAL(changeColLin(int, int)), this,TQT_SLOT(changeColLin(int,int)) ); + connect( session,TQ_SIGNAL(disableMasterModeConnections()), this,TQ_SLOT(disableMasterModeConnections()) ); + connect( session,TQ_SIGNAL(enableMasterModeConnections()), this,TQ_SLOT(enableMasterModeConnections()) ); + connect( session,TQ_SIGNAL(renameSession(TESession*,const TQString&)), this,TQ_SLOT(slotRenameSession(TESession*,const TQString&)) ); + connect( session->getEmulation(),TQ_SIGNAL(ImageSizeChanged(int,int)), this,TQ_SLOT(notifySize(int,int))); + connect( session->getEmulation(),TQ_SIGNAL(changeColumns(int)), this,TQ_SLOT(changeColumns(int)) ); + connect( session->getEmulation(),TQ_SIGNAL(changeColLin(int, int)), this,TQ_SLOT(changeColLin(int,int)) ); - connect( session, TQT_SIGNAL(changeTabTextColor(TESession*, int)), this, TQT_SLOT(changeTabTextColor(TESession*, int)) ); + connect( session, TQ_SIGNAL(changeTabTextColor(TESession*, int)), this, TQ_SLOT(changeTabTextColor(TESession*, int)) ); activateSession(session); } @@ -3922,7 +3934,7 @@ HistoryTypeDialog::HistoryTypeDialog(const HistoryType& histType, TQHBoxLayout *hb = new TQHBoxLayout(mainFrame); m_btnEnable = new TQCheckBox(i18n("&Enable"), mainFrame); - connect(m_btnEnable, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotHistEnable(bool))); + connect(m_btnEnable, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotHistEnable(bool))); m_label = new TQLabel(i18n("&Number of lines: "), mainFrame); @@ -3933,7 +3945,7 @@ HistoryTypeDialog::HistoryTypeDialog(const HistoryType& histType, m_label->setBuddy( m_size ); m_setUnlimited = new TQPushButton(i18n("&Set Unlimited"), mainFrame); - connect( m_setUnlimited,TQT_SIGNAL(clicked()), this,TQT_SLOT(slotSetUnlimited()) ); + connect( m_setUnlimited,TQ_SIGNAL(clicked()), this,TQ_SLOT(slotSetUnlimited()) ); hb->addWidget(m_btnEnable); hb->addSpacing(10); @@ -4027,8 +4039,8 @@ void Konsole::slotFindHistory() { if( !m_finddialog ) { m_finddialog = new KonsoleFind( this, "konsolefind", false); - connect(m_finddialog,TQT_SIGNAL(search()),this,TQT_SLOT(slotFind())); - connect(m_finddialog,TQT_SIGNAL(done()),this,TQT_SLOT(slotFindDone())); + connect(m_finddialog,TQ_SIGNAL(search()),this,TQ_SLOT(slotFind())); + connect(m_finddialog,TQ_SIGNAL(done()),this,TQ_SLOT(slotFindDone())); } TQString string; @@ -4047,7 +4059,7 @@ void Konsole::slotOpenSelection() delete m_filterData; m_openSelection->clear(); - disconnect(m_openSelection, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotOpenURI(int))); + disconnect(m_openSelection, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotOpenURI(int))); TQString selection = se->getEmulation()->getSelection(); TQString curdir = baseURL().path(); @@ -4062,7 +4074,7 @@ void Konsole::slotOpenSelection() KURIFilter::self()->filterURI( *(m_filterData) ); m_openSelection->insertItem( SmallIconSet( m_filterData->iconName() ),i18n( "%1" ).arg(m_filterData->uri().url()), 1 ); - connect(m_openSelection, TQT_SIGNAL(activated(int)), TQT_SLOT(slotOpenURI(int))); + connect(m_openSelection, TQ_SIGNAL(activated(int)), TQ_SLOT(slotOpenURI(int))); } void Konsole::slotOpenURI(int) @@ -4333,8 +4345,8 @@ KonsoleFind::KonsoleFind( TQWidget *parent, const char *name, bool /*modal*/ ) if (!TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty()) { m_editRegExp = new TQPushButton( i18n("&Edit..."), row, "editRegExp" ); - connect( m_asRegExp, TQT_SIGNAL( toggled(bool) ), m_editRegExp, TQT_SLOT( setEnabled(bool) ) ); - connect( m_editRegExp, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotEditRegExp() ) ); + connect( m_asRegExp, TQ_SIGNAL( toggled(bool) ), m_editRegExp, TQ_SLOT( setEnabled(bool) ) ); + connect( m_editRegExp, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotEditRegExp() ) ); m_editRegExp->setEnabled( false ); } } @@ -4342,7 +4354,7 @@ KonsoleFind::KonsoleFind( TQWidget *parent, const char *name, bool /*modal*/ ) void KonsoleFind::slotEditRegExp() { if ( m_editorDialog == 0 ) - m_editorDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) ); + m_editorDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), this ); assert( m_editorDialog ); @@ -4376,20 +4388,13 @@ void Konsole::slotFontChanged() void Konsole::biggerFont(void) { if ( !se ) return; - - TQFont f = te->getVTFont(); - f.setPointSize( f.pointSize() + 1 ); - te->setVTFont( f ); + te->biggerFont(); activateSession(); } void Konsole::smallerFont(void) { if ( !se ) return; - - TQFont f = te->getVTFont(); - if ( f.pointSize() < 6 ) return; // A minimum size - f.setPointSize( f.pointSize() - 1 ); - te->setVTFont( f ); + te->smallerFont(); activateSession(); } @@ -4472,7 +4477,7 @@ void Konsole::setMenuAcceleratos() if (m_help) menubar->changeItem(m_help_id, m_help_string); } - else + else { menubar->changeItem(m_session_id, TQString(m_session_string).replace(TQRegExp("&([^&])"), "\\1")); menubar->changeItem(m_edit_id, TQString(m_edit_string).replace(TQRegExp("&([^&])"), "\\1")); @@ -4485,5 +4490,5 @@ void Konsole::setMenuAcceleratos() menubar->changeItem(m_help_id, TQString(m_help_string).replace(TQRegExp("&([^&])"), "\\1")); } } - + #include "konsole.moc" diff --git a/konsole/konsole/konsole.h b/konsole/konsole/konsole.h index 30ca6e5a1..b5e1f926b 100644 --- a/konsole/konsole/konsole.h +++ b/konsole/konsole/konsole.h @@ -68,7 +68,7 @@ const char *konsole_shell(TQStrList &args); class Konsole : public TDEMainWindow, virtual public KonsoleIface { - Q_OBJECT + TQ_OBJECT friend class KonsoleSessionManaged; public: @@ -245,6 +245,7 @@ private slots: void slotTabDetachSession(); void slotTabRenameSession(); void slotTabSelectColor(); + void slotTabResetColor(); void slotTabCloseSession(); void slotTabToggleMonitor(); void slotTabToggleMasterMode(); @@ -297,7 +298,7 @@ private: TQPtrDict<TDERadioAction> session2action; TQPtrList<TESession> sessions; - TQIntDict<KSimpleConfig> no2command; //QT4 - convert to QList + TQIntDict<KSimpleConfig> no2command; KSimpleConfig* m_defaultSession; TQString m_defaultSessionFilename; @@ -428,6 +429,7 @@ private: bool b_framevis:1; bool b_metaAsAlt:1; + bool b_realTransparency:1; bool b_fullscreen:1; bool m_menuCreated:1; bool b_warnQuit:1; @@ -468,7 +470,7 @@ class TQSpinBox; class HistoryTypeDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: HistoryTypeDialog(const HistoryType& histType, unsigned int histSize, @@ -492,7 +494,7 @@ protected: class SizeDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: SizeDialog(unsigned int const columns, unsigned int const lines, @@ -511,7 +513,7 @@ protected: class KonsoleFind : public KEdFind { - Q_OBJECT + TQ_OBJECT public: KonsoleFind( TQWidget *parent = 0, const char *name=0, bool modal=true ); bool reg_exp() const; diff --git a/konsole/konsole/konsole_part.cpp b/konsole/konsole/konsole_part.cpp index 64fdfb700..b5879d45c 100644 --- a/konsole/konsole/konsole_part.cpp +++ b/konsole/konsole/konsole_part.cpp @@ -151,10 +151,10 @@ konsolePart::konsolePart(TQWidget *_parentWidget, const char *widgetName, TQObje te = new TEWidget(parentWidget,widgetName); te->setMinimumSize(150,70); // allow resizing, cause resize in TEWidget - setWidget(TQT_TQWIDGET(te)); + setWidget(te); te->setFocus(); - connect( te,TQT_SIGNAL(configureRequest(TEWidget*,int,int,int)), - this,TQT_SLOT(configureRequest(TEWidget*,int,int,int)) ); + connect( te,TQ_SIGNAL(configureRequest(TEWidget*,int,int,int)), + this,TQ_SLOT(configureRequest(TEWidget*,int,int,int)) ); colors = new ColorSchemaList(); colors->checkSchemas(); @@ -214,7 +214,7 @@ konsolePart::konsolePart(TQWidget *_parentWidget, const char *widgetName, TQObje applySettingsToGUI(); - TQTimer::singleShot( 0, this, TQT_SLOT( autoShowShell() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( autoShowShell() ) ); } void konsolePart::autoShowShell() @@ -240,10 +240,10 @@ void konsolePart::doneSession(TESession*) if (se && b_autoDestroy) { // kdDebug(1211) << "doneSession - disconnecting done" << endl; - disconnect( se,TQT_SIGNAL(done(TESession*)), - this,TQT_SLOT(doneSession(TESession*)) ); + disconnect( se,TQ_SIGNAL(done(TESession*)), + this,TQ_SLOT(doneSession(TESession*)) ); se->setConnect(false); - //TQTimer::singleShot(100,se,TQT_SLOT(terminate())); + //TQTimer::singleShot(100,se,TQ_SLOT(terminate())); // kdDebug(1211) << "se->terminate()" << endl; se->terminate(); } @@ -252,7 +252,7 @@ void konsolePart::doneSession(TESession*) void konsolePart::sessionDestroyed() { // kdDebug(1211) << "sessionDestroyed()" << endl; - disconnect( se, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( sessionDestroyed() ) ); + disconnect( se, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( sessionDestroyed() ) ); se = 0; if (b_autoDestroy) delete this; @@ -275,7 +275,7 @@ konsolePart::~konsolePart() while(se && TDEProcessController::theTDEProcessController->waitForProcessExit(1)) ; - disconnect( se, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( sessionDestroyed() ) ); + disconnect( se, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( sessionDestroyed() ) ); // kdDebug(1211) << "Deleting se session" << endl; delete se; se=0; @@ -343,7 +343,7 @@ void konsolePart::makeGUI() m_signals->insertItem( i18n( "&Kill Task" ) + " (KILL)", SIGKILL); m_signals->insertItem( i18n( "User Signal &1") + " (USR1)", SIGUSR1); m_signals->insertItem( i18n( "User Signal &2") + " (USR2)", SIGUSR2); - connect(m_signals, TQT_SIGNAL(activated(int)), TQT_SLOT(sendSignal(int))); + connect(m_signals, TQ_SIGNAL(activated(int)), TQ_SLOT(sendSignal(int))); } // Settings Menu ---------------------------------------------------------------- @@ -353,7 +353,7 @@ void konsolePart::makeGUI() // Scrollbar selectScrollbar = new TDESelectAction(i18n("Sc&rollbar"), 0, this, - TQT_SLOT(slotSelectScrollbar()), settingsActions); + TQ_SLOT(slotSelectScrollbar()), settingsActions); TQStringList scrollitems; scrollitems << i18n("&Hide") << i18n("&Left") << i18n("&Right"); @@ -363,7 +363,7 @@ void konsolePart::makeGUI() // Select Bell m_options->insertSeparator(); selectBell = new TDESelectAction(i18n("&Bell"), SmallIconSet( "bell"), 0 , this, - TQT_SLOT(slotSelectBell()), settingsActions, "bell"); + TQ_SLOT(slotSelectBell()), settingsActions, "bell"); TQStringList bellitems; bellitems << i18n("System &Bell") @@ -374,13 +374,13 @@ void konsolePart::makeGUI() selectBell->plug(m_options); m_fontsizes = new TDEActionMenu( i18n( "Font" ), SmallIconSet( "text" ), settingsActions, 0L ); - m_fontsizes->insert( new TDEAction( i18n( "&Enlarge Font" ), SmallIconSet( "zoom-in" ), 0, this, TQT_SLOT( biggerFont() ), settingsActions, "enlarge_font" ) ); - m_fontsizes->insert( new TDEAction( i18n( "&Shrink Font" ), SmallIconSet( "zoom-out" ), 0, this, TQT_SLOT( smallerFont() ), settingsActions, "shrink_font" ) ); - m_fontsizes->insert( new TDEAction( i18n( "Se&lect..." ), SmallIconSet( "font-x-generic" ), 0, this, TQT_SLOT( slotSelectFont() ), settingsActions, "select_font" ) ); + m_fontsizes->insert( new TDEAction( i18n( "&Enlarge Font" ), SmallIconSet( "zoom-in" ), 0, this, TQ_SLOT( biggerFont() ), settingsActions, "enlarge_font" ) ); + m_fontsizes->insert( new TDEAction( i18n( "&Shrink Font" ), SmallIconSet( "zoom-out" ), 0, this, TQ_SLOT( smallerFont() ), settingsActions, "shrink_font" ) ); + m_fontsizes->insert( new TDEAction( i18n( "Se&lect..." ), SmallIconSet( "font-x-generic" ), 0, this, TQ_SLOT( slotSelectFont() ), settingsActions, "select_font" ) ); m_fontsizes->plug(m_options); // encoding menu, start with default checked ! - selectSetEncoding = new TDESelectAction( i18n( "&Encoding" ), SmallIconSet("charset" ), 0, this, TQT_SLOT(slotSetEncoding()), settingsActions, "set_encoding" ); + selectSetEncoding = new TDESelectAction( i18n( "&Encoding" ), SmallIconSet("charset" ), 0, this, TQ_SLOT(slotSetEncoding()), settingsActions, "set_encoding" ); TQStringList list = TDEGlobal::charsets()->descriptiveEncodingNames(); list.prepend( i18n( "Default" ) ); selectSetEncoding->setItems(list); @@ -392,7 +392,7 @@ void konsolePart::makeGUI() { m_keytab = new TDEPopupMenu((TDEMainWindow*)parentWidget); m_keytab->setCheckable(true); - connect(m_keytab, TQT_SIGNAL(activated(int)), TQT_SLOT(keytab_menu_activated(int))); + connect(m_keytab, TQ_SIGNAL(activated(int)), TQ_SLOT(keytab_menu_activated(int))); m_options->insertItem( SmallIconSet( "key_bindings" ), i18n( "&Keyboard" ), m_keytab ); } @@ -401,21 +401,21 @@ void konsolePart::makeGUI() { m_schema = new TDEPopupMenu((TDEMainWindow*)parentWidget); m_schema->setCheckable(true); - connect(m_schema, TQT_SIGNAL(activated(int)), TQT_SLOT(schema_menu_activated(int))); - connect(m_schema, TQT_SIGNAL(aboutToShow()), TQT_SLOT(schema_menu_check())); + connect(m_schema, TQ_SIGNAL(activated(int)), TQ_SLOT(schema_menu_activated(int))); + connect(m_schema, TQ_SIGNAL(aboutToShow()), TQ_SLOT(schema_menu_check())); m_options->insertItem( SmallIconSet( "colorize" ), i18n( "Sch&ema" ), m_schema); } TDEAction *historyType = new TDEAction(i18n("&History..."), "history", 0, this, - TQT_SLOT(slotHistoryType()), settingsActions, "history"); + TQ_SLOT(slotHistoryType()), settingsActions, "history"); historyType->plug(m_options); m_options->insertSeparator(); // Select line spacing selectLineSpacing = new TDESelectAction(i18n("Li&ne Spacing"), SmallIconSet("format-justify-left"), 0, this, - TQT_SLOT(slotSelectLineSpacing()), settingsActions ); + TQ_SLOT(slotSelectLineSpacing()), settingsActions ); TQStringList lineSpacingList; lineSpacingList @@ -433,35 +433,35 @@ void konsolePart::makeGUI() // Blinking Cursor blinkingCursor = new TDEToggleAction (i18n("Blinking &Cursor"), - 0, this,TQT_SLOT(slotBlinkingCursor()), settingsActions); + 0, this,TQ_SLOT(slotBlinkingCursor()), settingsActions); blinkingCursor->plug(m_options); // Frame on/off showFrame = new TDEToggleAction(i18n("Show Fr&ame"), 0, - this, TQT_SLOT(slotToggleFrame()), settingsActions); + this, TQ_SLOT(slotToggleFrame()), settingsActions); showFrame->setCheckedState(i18n("Hide Fr&ame")); showFrame->plug(m_options); // Meta key as Alt key metaAsAlt = new TDEToggleAction(i18n("Me&ta key as Alt key"), 0, - this, TQT_SLOT(slotToggleMetaAsAltMode()), settingsActions); + this, TQ_SLOT(slotToggleMetaAsAltMode()), settingsActions); metaAsAlt->plug(m_options); // Word Connectors TDEAction *WordSeps = new TDEAction(i18n("Wor&d Connectors..."), 0, this, - TQT_SLOT(slotWordSeps()), settingsActions); + TQ_SLOT(slotWordSeps()), settingsActions); WordSeps->plug(m_options); // Use Konsole's Settings m_options->insertSeparator(); m_useKonsoleSettings = new TDEToggleAction( i18n("&Use Konsole's Settings"), - 0, this, TQT_SLOT(slotUseKonsoleSettings()), 0, "use_konsole_settings" ); + 0, this, TQ_SLOT(slotUseKonsoleSettings()), 0, "use_konsole_settings" ); m_useKonsoleSettings->plug(m_options); // Save Settings m_options->insertSeparator(); TDEAction *saveSettings = new TDEAction(i18n("&Save as Default"), "document-save", 0, this, - TQT_SLOT(saveProperties()), actions, "save_default"); + TQ_SLOT(saveProperties()), actions, "save_default"); saveSettings->plug(m_options); if (TDEGlobalSettings::insertTearOffHandle()) m_options->insertTearOffHandle(); @@ -469,16 +469,16 @@ void konsolePart::makeGUI() // Popup Menu ------------------------------------------------------------------- m_popupMenu = new TDEPopupMenu((TDEMainWindow*)parentWidget); - TDEAction* selectionEnd = new TDEAction(i18n("Set Selection End"), 0, TQT_TQOBJECT(te), - TQT_SLOT(setSelectionEnd()), actions, "selection_end"); + TDEAction* selectionEnd = new TDEAction(i18n("Set Selection End"), 0, te, + TQ_SLOT(setSelectionEnd()), actions, "selection_end"); selectionEnd->plug(m_popupMenu); TDEAction *copyClipboard = new TDEAction(i18n("&Copy"), "edit-copy", 0, - TQT_TQOBJECT(te), TQT_SLOT(copyClipboard()), actions, "edit_copy"); + te, TQ_SLOT(copyClipboard()), actions, "edit_copy"); copyClipboard->plug(m_popupMenu); TDEAction *pasteClipboard = new TDEAction(i18n("&Paste"), "edit-paste", 0, - TQT_TQOBJECT(te), TQT_SLOT(pasteClipboard()), actions, "edit_paste"); + te, TQ_SLOT(pasteClipboard()), actions, "edit_paste"); pasteClipboard->plug(m_popupMenu); if (m_signals) @@ -494,7 +494,7 @@ void konsolePart::makeGUI() } TDEAction *closeSession = new TDEAction(i18n("&Close Terminal Emulator"), "window-close", 0, this, - TQT_SLOT(closeCurrentSession()), actions, "close_session"); + TQ_SLOT(closeCurrentSession()), actions, "close_session"); closeSession->plug(m_popupMenu); if (TDEGlobalSettings::insertTearOffHandle()) m_popupMenu->insertTearOffHandle(); @@ -608,7 +608,7 @@ void konsolePart::readProperties() if (sch->useTransparency()) { if (!argb_visual) { if (!rootxpm) - rootxpm = new KRootPixmap(TQT_TQWIDGET(te)); + rootxpm = new KRootPixmap(te); rootxpm->setFadeEffect(sch->tr_x(), TQColor(sch->tr_r(), sch->tr_g(), sch->tr_b())); rootxpm->start(); rootxpm->repaint(true); @@ -705,19 +705,12 @@ void konsolePart::slotSelectFont() { void konsolePart::biggerFont(void) { if ( !se ) return; - - TQFont f = te->getVTFont(); - f.setPointSize( f.pointSize() + 1 ); - te->setVTFont( f ); + te->biggerFont(); } void konsolePart::smallerFont(void) { if ( !se ) return; - - TQFont f = te->getVTFont(); - if ( f.pointSize() < 6 ) return; // A minimum size - f.setPointSize( f.pointSize() - 1 ); - te->setVTFont( f ); + te->smallerFont(); } void konsolePart::updateKeytabMenu() @@ -803,7 +796,7 @@ void konsolePart::setSchema(ColorSchema* s) if (s->useTransparency()) { if (!argb_visual) { if (!rootxpm) - rootxpm = new KRootPixmap(TQT_TQWIDGET(te)); + rootxpm = new KRootPixmap(te); rootxpm->setFadeEffect(s->tr_x(), TQColor(s->tr_r(), s->tr_g(), s->tr_b())); rootxpm->start(); rootxpm->repaint(true); @@ -1018,15 +1011,15 @@ HistoryTypeDialog::HistoryTypeDialog(const HistoryType& histType, m_btnEnable = new TQCheckBox(i18n("&Enable"), mainFrame); - TQObject::connect(m_btnEnable, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotHistEnable(bool))); + TQObject::connect(m_btnEnable, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotHistEnable(bool))); m_size = new TQSpinBox(0, 10 * 1000 * 1000, 100, mainFrame); m_size->setValue(histSize); m_size->setSpecialValueText(i18n("Unlimited (number of lines)", "Unlimited")); m_setUnlimited = new TQPushButton(i18n("&Set Unlimited"), mainFrame); - connect( m_setUnlimited,TQT_SIGNAL(clicked()), this,TQT_SLOT(slotSetUnlimited()) ); + connect( m_setUnlimited,TQ_SIGNAL(clicked()), this,TQ_SLOT(slotSetUnlimited()) ); hb->addWidget(m_btnEnable); hb->addSpacing(10); @@ -1128,42 +1121,42 @@ void konsolePart::newSession() { se = new TESession(te, "xterm", parentWidget->winId()); } - connect( se,TQT_SIGNAL(done(TESession*)), - this,TQT_SLOT(doneSession(TESession*)) ); - connect( se,TQT_SIGNAL(openURLRequest(const TQString &)), - this,TQT_SLOT(emitOpenURLRequest(const TQString &)) ); - connect( se, TQT_SIGNAL( updateTitle(TESession*) ), - this, TQT_SLOT( updateTitle(TESession*) ) ); - connect( se, TQT_SIGNAL(enableMasterModeConnections()), - this, TQT_SLOT(enableMasterModeConnections()) ); - connect( se, TQT_SIGNAL( processExited(TDEProcess *) ), - this, TQT_SIGNAL( processExited(TDEProcess *) ) ); - connect( se, TQT_SIGNAL( receivedData( const TQString& ) ), - this, TQT_SIGNAL( receivedData( const TQString& ) ) ); - connect( se, TQT_SIGNAL( forkedChild() ), - this, TQT_SIGNAL( forkedChild() )); - connect( se, TQT_SIGNAL(getSessionSchema(TESession*, TQString &)), - this, TQT_SLOT(slotGetSessionSchema(TESession*, TQString &))); - connect( se, TQT_SIGNAL(setSessionSchema(TESession*, const TQString &)), - this, TQT_SLOT(slotSetSessionSchema(TESession*, const TQString &))); - connect( se, TQT_SIGNAL(setSessionEncoding(TESession*, const TQString &)), - this, TQT_SLOT(slotSetSessionEncoding(TESession*, const TQString &))); - connect( se, TQT_SIGNAL(updateSessionKeytab(TESession *, const TQString &)), - this, TQT_SLOT(slotUpdateSessionKeytab(TESession *, const TQString &))); + connect( se,TQ_SIGNAL(done(TESession*)), + this,TQ_SLOT(doneSession(TESession*)) ); + connect( se,TQ_SIGNAL(openURLRequest(const TQString &)), + this,TQ_SLOT(emitOpenURLRequest(const TQString &)) ); + connect( se, TQ_SIGNAL( updateTitle(TESession*) ), + this, TQ_SLOT( updateTitle(TESession*) ) ); + connect( se, TQ_SIGNAL(enableMasterModeConnections()), + this, TQ_SLOT(enableMasterModeConnections()) ); + connect( se, TQ_SIGNAL( processExited(TDEProcess *) ), + this, TQ_SIGNAL( processExited(TDEProcess *) ) ); + connect( se, TQ_SIGNAL( receivedData( const TQString& ) ), + this, TQ_SIGNAL( receivedData( const TQString& ) ) ); + connect( se, TQ_SIGNAL( forkedChild() ), + this, TQ_SIGNAL( forkedChild() )); + connect( se, TQ_SIGNAL(getSessionSchema(TESession*, TQString &)), + this, TQ_SLOT(slotGetSessionSchema(TESession*, TQString &))); + connect( se, TQ_SIGNAL(setSessionSchema(TESession*, const TQString &)), + this, TQ_SLOT(slotSetSessionSchema(TESession*, const TQString &))); + connect( se, TQ_SIGNAL(setSessionEncoding(TESession*, const TQString &)), + this, TQ_SLOT(slotSetSessionEncoding(TESession*, const TQString &))); + connect( se, TQ_SIGNAL(updateSessionKeytab(TESession *, const TQString &)), + this, TQ_SLOT(slotUpdateSessionKeytab(TESession *, const TQString &))); // We ignore the following signals - //connect( se, TQT_SIGNAL(renameSession(TESession*,const TQString&)), - // this, TQT_SLOT(slotRenameSession(TESession*, const TQString&)) ); - //connect( se->getEmulation(), TQT_SIGNAL(changeColumns(int)), - // this, TQT_SLOT(changeColumns(int)) ); - //connect( se, TQT_SIGNAL(disableMasterModeConnections()), - // this, TQT_SLOT(disableMasterModeConnections()) ); + //connect( se, TQ_SIGNAL(renameSession(TESession*,const TQString&)), + // this, TQ_SLOT(slotRenameSession(TESession*, const TQString&)) ); + //connect( se->getEmulation(), TQ_SIGNAL(changeColumns(int)), + // this, TQ_SLOT(changeColumns(int)) ); + //connect( se, TQ_SIGNAL(disableMasterModeConnections()), + // this, TQ_SLOT(disableMasterModeConnections()) ); applyProperties(); se->setConnect(true); // se->run(); - connect( se, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( sessionDestroyed() ) ); + connect( se, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( sessionDestroyed() ) ); // setFont( n_font ); // we do this here, to make TEWidget recalculate // its geometry.. } diff --git a/konsole/konsole/konsole_part.h b/konsole/konsole/konsole_part.h index 39b037b67..aeb3ddca0 100644 --- a/konsole/konsole/konsole_part.h +++ b/konsole/konsole/konsole_part.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- +/* This file is part of the KDE system Copyright (C) 1999,2000 Boloni Laszlo <lboloni@cpe.ucf.edu> @@ -47,7 +47,7 @@ namespace KParts { class GUIActivateEvent; } class konsoleFactory : public KParts::Factory { - Q_OBJECT + TQ_OBJECT public: konsoleFactory(); virtual ~konsoleFactory(); @@ -68,7 +68,7 @@ public: class konsolePart: public KParts::ReadOnlyPart, public TerminalInterface, public ExtTerminalInterface { - Q_OBJECT + TQ_OBJECT public: konsolePart(TQWidget *parentWidget, const char *widgetName, TQObject * parent, const char *name, const char *classname = 0, const TQString &title = TQString::null); @@ -217,7 +217,7 @@ public: class HistoryTypeDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: HistoryTypeDialog(const HistoryType& histType, unsigned int histSize, @@ -241,7 +241,7 @@ protected: class konsoleBrowserExtension : public KParts::BrowserExtension { - Q_OBJECT + TQ_OBJECT friend class konsolePart; public: konsoleBrowserExtension(konsolePart *parent); diff --git a/konsole/konsole/konsolebookmarkhandler.cpp b/konsole/konsole/konsolebookmarkhandler.cpp index 13af12ca5..16f8afb63 100644 --- a/konsole/konsole/konsolebookmarkhandler.cpp +++ b/konsole/konsole/konsolebookmarkhandler.cpp @@ -59,8 +59,8 @@ KonsoleBookmarkHandler::KonsoleBookmarkHandler( Konsole *konsole, bool toplevel manager->setUpdate( true ); manager->setShowNSBookmarks( false ); - connect( manager, TQT_SIGNAL( changed(const TQString &, const TQString &) ), - TQT_SLOT( slotBookmarksChanged(const TQString &, const TQString &) ) ); + connect( manager, TQ_SIGNAL( changed(const TQString &, const TQString &) ), + TQ_SLOT( slotBookmarksChanged(const TQString &, const TQString &) ) ); if (toplevel) { m_bookmarkMenu = new KonsoleBookmarkMenu( manager, this, m_menu, diff --git a/konsole/konsole/konsolebookmarkhandler.h b/konsole/konsole/konsolebookmarkhandler.h index 66680e095..0837a2b87 100644 --- a/konsole/konsole/konsolebookmarkhandler.h +++ b/konsole/konsole/konsolebookmarkhandler.h @@ -30,7 +30,7 @@ class KBookmarkManager; class KonsoleBookmarkHandler : public TQObject, public KBookmarkOwner { - Q_OBJECT + TQ_OBJECT public: KonsoleBookmarkHandler( Konsole *konsole, bool toplevel ); diff --git a/konsole/konsole/konsolebookmarkmenu.cpp b/konsole/konsole/konsolebookmarkmenu.cpp index 0afe6a693..d199808df 100644 --- a/konsole/konsole/konsolebookmarkmenu.cpp +++ b/konsole/konsole/konsolebookmarkmenu.cpp @@ -36,14 +36,14 @@ KonsoleBookmarkMenu::KonsoleBookmarkMenu( KBookmarkManager* mgr, /* * First, we disconnect KBookmarkMenu::slotAboutToShow() * Then, we connect KonsoleBookmarkMenu::slotAboutToShow(). - * They are named differently because the TQT_SLOT() macro thinks we want + * They are named differently because the TQ_SLOT() macro thinks we want * KonsoleBookmarkMenu::KBookmarkMenu::slotAboutToShow() * Could this be solved if slotAboutToShow() is virtual in KBookmarMenu? */ - disconnect( _parentMenu, TQT_SIGNAL( aboutToShow() ), this, - TQT_SLOT( slotAboutToShow() ) ); - connect( _parentMenu, TQT_SIGNAL( aboutToShow() ), - TQT_SLOT( slotAboutToShow2() ) ); + disconnect( _parentMenu, TQ_SIGNAL( aboutToShow() ), this, + TQ_SLOT( slotAboutToShow() ) ); + connect( _parentMenu, TQ_SIGNAL( aboutToShow() ), + TQ_SLOT( slotAboutToShow2() ) ); } /* @@ -113,7 +113,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu() // kdDebug(1203) << "Creating URL bookmark menu item for " << bm.text() << endl; // create a normal URL item, with ID as a name TDEAction * action = new TDEAction( text, bm.icon(), 0, - this, TQT_SLOT( slotBookmarkSelected() ), + this, TQ_SLOT( slotBookmarkSelected() ), m_actionCollection, bm.url().url().utf8() ); action->setStatusText( bm.url().prettyURL() ); @@ -149,7 +149,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu() void KonsoleBookmarkMenu::slotBookmarkSelected() { if ( !m_pOwner ) return; // this view doesn't handle bookmarks... - m_kOwner->openBookmarkURL( TQString::fromUtf8(TQT_TQOBJECT_CONST(sender())->name()), /* URL */ + m_kOwner->openBookmarkURL( TQString::fromUtf8(sender()->name()), /* URL */ ( (TDEAction *)sender() )->text() /* Title */ ); } diff --git a/konsole/konsole/konsolebookmarkmenu.h b/konsole/konsole/konsolebookmarkmenu.h index e1dfdacba..547802fe8 100644 --- a/konsole/konsole/konsolebookmarkmenu.h +++ b/konsole/konsole/konsolebookmarkmenu.h @@ -38,7 +38,7 @@ class KonsoleBookmarkMenu; class KonsoleBookmarkMenu : public KBookmarkMenu { - Q_OBJECT + TQ_OBJECT public: KonsoleBookmarkMenu( KBookmarkManager* mgr, diff --git a/konsole/konsole/kwrited.cpp b/konsole/konsole/kwrited.cpp index 9eef57954..d3ccf6acc 100644 --- a/konsole/konsole/kwrited.cpp +++ b/konsole/konsole/kwrited.cpp @@ -72,15 +72,15 @@ KWrited::KWrited() : TQTextEdit() setMinimumWidth(pref_width); setMinimumHeight(pref_height); setReadOnly(true); - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); setWordWrap(TQTextEdit::WidgetWidth); setTextFormat(TQt::PlainText); pty = new KPty(); pty->open(); pty->login(KUser().loginName().local8Bit().data(), getenv("DISPLAY")); - TQSocketNotifier *sn = new TQSocketNotifier(pty->masterFd(), TQSocketNotifier::Read, TQT_TQOBJECT(this)); - connect(sn, TQT_SIGNAL(activated(int)), this, TQT_SLOT(block_in(int))); + TQSocketNotifier *sn = new TQSocketNotifier(pty->masterFd(), TQSocketNotifier::Read, this); + connect(sn, TQ_SIGNAL(activated(int)), this, TQ_SLOT(block_in(int))); TQString txt = i18n("KWrited - Listening on Device %1").arg(pty->ttyName()); setCaption(txt); @@ -116,7 +116,7 @@ TQPopupMenu *KWrited::createPopupMenu( const TQPoint &pos ) TQPopupMenu *menu = TQTextEdit::createPopupMenu( pos ); menu->insertItem( i18n( "Clear Messages" ), - this, TQT_SLOT( clearText() ), + this, TQ_SLOT( clearText() ), 0, -1, 0 ); return menu; @@ -136,7 +136,7 @@ KWritedModule::~KWritedModule() } extern "C" -KDE_EXPORT KDEDModule* create_kwrited( const TQCString& obj ) +TDE_EXPORT KDEDModule* create_kwrited( const TQCString& obj ) { return new KWritedModule( obj ); } diff --git a/konsole/konsole/kwrited.h b/konsole/konsole/kwrited.h index 7c051c51a..5021b04c3 100644 --- a/konsole/konsole/kwrited.h +++ b/konsole/konsole/kwrited.h @@ -29,7 +29,7 @@ class KPty; class KWrited : public TQTextEdit -{ Q_OBJECT +{ TQ_OBJECT public: KWrited(); ~KWrited(); @@ -44,7 +44,7 @@ private: class KWritedModule : public KDEDModule { - Q_OBJECT + TQ_OBJECT K_DCOP public: KWritedModule( const TQCString& obj ); diff --git a/konsole/konsole/main.cpp b/konsole/konsole/main.cpp index 4039362e3..9e5cca6de 100644 --- a/konsole/konsole/main.cpp +++ b/konsole/konsole/main.cpp @@ -46,7 +46,7 @@ #include "konsole.h" -#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300 +#if defined(TQ_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300 #define COMPOSITE #endif @@ -150,7 +150,7 @@ public: /* --| main |------------------------------------------------------ */ -extern "C" int KDE_EXPORT kdemain(int argc, char* argv[]) +extern "C" int TDE_EXPORT kdemain(int argc, char* argv[]) { setgid(getgid()); setuid(getuid()); // drop privileges diff --git a/konsole/konsole/printsettings.h b/konsole/konsole/printsettings.h index 1e5a0c23d..393d777d3 100644 --- a/konsole/konsole/printsettings.h +++ b/konsole/konsole/printsettings.h @@ -27,7 +27,7 @@ class TQCheckBox; class PrintSettings : public KPrintDialogPage { - Q_OBJECT + TQ_OBJECT public: PrintSettings(TQWidget *parent = 0, const char *name = 0); ~PrintSettings(); diff --git a/konsole/konsole/schema.h b/konsole/konsole/schema.h index 618683c17..c32f26221 100644 --- a/konsole/konsole/schema.h +++ b/konsole/konsole/schema.h @@ -187,10 +187,6 @@ public: uint count() const { return TQPtrList<ColorSchema>::count(); } ; const ColorSchema *at(unsigned int i) { return TQPtrList<ColorSchema>::at(i); } ; -#ifdef USE_QT4 - const ColorSchema *at(unsigned int i) - { return at(i); } ; -#endif // USE_QT4 void sort() {TQPtrList<ColorSchema>::sort();}; diff --git a/konsole/konsole/session.cpp b/konsole/konsole/session.cpp index dcfe9fee4..d613a23e4 100644 --- a/konsole/konsole/session.cpp +++ b/konsole/konsole/session.cpp @@ -78,10 +78,10 @@ TESession::TESession(TEWidget* _te, const TQString &_term, ulong _winId, const T em = new TEmuVt102(te); font_h = te-> fontHeight(); font_w = te-> fontWidth(); - TQObject::connect(te,TQT_SIGNAL(changedContentSizeSignal(int,int)), - this,TQT_SLOT(onContentSizeChange(int,int))); - TQObject::connect(te,TQT_SIGNAL(changedFontMetricSignal(int,int)), - this,TQT_SLOT(onFontMetricChange(int,int))); + TQObject::connect(te,TQ_SIGNAL(changedContentSizeSignal(int,int)), + this,TQ_SLOT(onContentSizeChange(int,int))); + TQObject::connect(te,TQ_SIGNAL(changedFontMetricSignal(int,int)), + this,TQ_SLOT(onFontMetricChange(int,int))); term = _term; winId = _winId; @@ -89,17 +89,17 @@ TESession::TESession(TEWidget* _te, const TQString &_term, ulong _winId, const T setPty( new TEPty() ); - connect( em, TQT_SIGNAL( changeTitle( int, const TQString & ) ), - this, TQT_SLOT( setUserTitle( int, const TQString & ) ) ); - connect( em, TQT_SIGNAL( notifySessionState(int) ), - this, TQT_SLOT( notifySessionState(int) ) ); + connect( em, TQ_SIGNAL( changeTitle( int, const TQString & ) ), + this, TQ_SLOT( setUserTitle( int, const TQString & ) ) ); + connect( em, TQ_SIGNAL( notifySessionState(int) ), + this, TQ_SLOT( notifySessionState(int) ) ); monitorTimer = new TQTimer(this); - connect(monitorTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(monitorTimerDone())); + connect(monitorTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(monitorTimerDone())); - connect( em, TQT_SIGNAL( zmodemDetected() ), this, TQT_SLOT(slotZModemDetected())); + connect( em, TQ_SIGNAL( zmodemDetected() ), this, TQ_SLOT(slotZModemDetected())); - connect( em, TQT_SIGNAL( changeTabTextColor( int ) ), - this, TQT_SLOT( changeTabTextColor( int ) ) ); + connect( em, TQ_SIGNAL( changeTabTextColor( int ) ), + this, TQ_SLOT( changeTabTextColor( int ) ) ); //kdDebug(1211)<<"TESession ctor() done"<<endl; } @@ -110,23 +110,23 @@ void TESession::setPty(TEPty *_sh) delete sh; } sh = _sh; - connect( sh, TQT_SIGNAL( forkedChild() ), - this, TQT_SIGNAL( forkedChild() )); + connect( sh, TQ_SIGNAL( forkedChild() ), + this, TQ_SIGNAL( forkedChild() )); //kdDebug(1211)<<"TESession ctor() sh->setSize()"<<endl; sh->setSize(te->Lines(),te->Columns()); // not absolutely nessesary sh->useUtf8(em->utf8()); //kdDebug(1211)<<"TESession ctor() connecting"<<endl; - connect( sh,TQT_SIGNAL(block_in(const char*,int)),this,TQT_SLOT(onRcvBlock(const char*,int)) ); + connect( sh,TQ_SIGNAL(block_in(const char*,int)),this,TQ_SLOT(onRcvBlock(const char*,int)) ); - connect( em,TQT_SIGNAL(sndBlock(const char*,int)),sh,TQT_SLOT(send_bytes(const char*,int)) ); - connect( em,TQT_SIGNAL(lockPty(bool)),sh,TQT_SLOT(lockPty(bool)) ); - connect( em,TQT_SIGNAL(useUtf8(bool)),sh,TQT_SLOT(useUtf8(bool)) ); + connect( em,TQ_SIGNAL(sndBlock(const char*,int)),sh,TQ_SLOT(send_bytes(const char*,int)) ); + connect( em,TQ_SIGNAL(lockPty(bool)),sh,TQ_SLOT(lockPty(bool)) ); + connect( em,TQ_SIGNAL(useUtf8(bool)),sh,TQ_SLOT(useUtf8(bool)) ); - connect( sh,TQT_SIGNAL(done(int)), this,TQT_SLOT(done(int)) ); + connect( sh,TQ_SIGNAL(done(int)), this,TQ_SLOT(done(int)) ); if (!sh->error().isEmpty()) - TQTimer::singleShot(0, this, TQT_SLOT(ptyError())); + TQTimer::singleShot(0, this, TQ_SLOT(ptyError())); } void TESession::ptyError() @@ -143,10 +143,10 @@ void TESession::ptyError() void TESession::changeWidget(TEWidget* w) { - TQObject::disconnect(te,TQT_SIGNAL(changedContentSizeSignal(int,int)), - this,TQT_SLOT(onContentSizeChange(int,int))); - TQObject::disconnect(te,TQT_SIGNAL(changedFontMetricSignal(int,int)), - this,TQT_SLOT(onFontMetricChange(int,int))); + TQObject::disconnect(te,TQ_SIGNAL(changedContentSizeSignal(int,int)), + this,TQ_SLOT(onContentSizeChange(int,int))); + TQObject::disconnect(te,TQ_SIGNAL(changedFontMetricSignal(int,int)), + this,TQ_SLOT(onFontMetricChange(int,int))); te=w; em->changeGUI(w); font_h = te->fontHeight(); @@ -155,10 +155,10 @@ void TESession::changeWidget(TEWidget* w) te->setDefaultBackColor(modifiedBackground); - TQObject::connect(te,TQT_SIGNAL(changedContentSizeSignal(int,int)), - this,TQT_SLOT(onContentSizeChange(int,int))); - TQObject::connect(te,TQT_SIGNAL(changedFontMetricSignal(int,int)), - this,TQT_SLOT(onFontMetricChange(int,int))); + TQObject::connect(te,TQ_SIGNAL(changedContentSizeSignal(int,int)), + this,TQ_SLOT(onContentSizeChange(int,int))); + TQObject::connect(te,TQ_SIGNAL(changedFontMetricSignal(int,int)), + this,TQ_SLOT(onFontMetricChange(int,int))); } void TESession::setProgram( const TQString &_pgm, const TQStrList &_args ) @@ -177,7 +177,7 @@ void TESession::run() TQString pexec = TDEGlobal::dirs()->findExe(exec); if ( pexec.isEmpty() ) { kdError()<<"can not execute "<<exec<<endl; - TQTimer::singleShot(1, this, TQT_SLOT(done())); + TQTimer::singleShot(1, this, TQ_SLOT(done())); return; } @@ -194,7 +194,7 @@ void TESession::run() ("DCOPRef("+appId+","+sessionId+")").latin1()); if (result < 0) { // Error in opening pseudo teletype kdWarning()<<"Unable to open a pseudo teletype!"<<endl; - TQTimer::singleShot(0, this, TQT_SLOT(ptyError())); + TQTimer::singleShot(0, this, TQ_SLOT(ptyError())); } sh->setErase(em->getErase()); @@ -311,7 +311,7 @@ bool TESession::closeSession() if (!sh->isRunning() || !sendSignal(SIGHUP)) { // Forced close. - TQTimer::singleShot(1, this, TQT_SLOT(done())); + TQTimer::singleShot(1, this, TQ_SLOT(done())); } return true; } @@ -341,8 +341,8 @@ void TESession::renameSession(const TQString &name) TESession::~TESession() { //kdDebug(1211) << "disconnnecting..." << endl; - TQObject::disconnect( sh, TQT_SIGNAL( done(int) ), - this, TQT_SLOT( done(int) ) ); + TQObject::disconnect( sh, TQ_SIGNAL( done(int) ), + this, TQ_SLOT( done(int) ) ); delete em; delete sh; @@ -605,7 +605,7 @@ void TESession::slotZModemDetected() { if (!zmodemBusy) { - TQTimer::singleShot(10, this, TQT_SLOT(emitZModemDetected())); + TQTimer::singleShot(10, this, TQ_SLOT(emitZModemDetected())); zmodemBusy = true; } } @@ -639,23 +639,23 @@ void TESession::startZModem(const TQString &zmodem, const TQString &dir, const T zmodemProc->start(KProcIO::NotifyOnExit, false); // Override the read-processing of KProcIO - disconnect(zmodemProc,TQT_SIGNAL (receivedStdout (TDEProcess *, char *, int)), 0, 0); - connect(zmodemProc,TQT_SIGNAL (receivedStdout (TDEProcess *, char *, int)), - this, TQT_SLOT(zmodemSendBlock(TDEProcess *, char *, int))); - connect(zmodemProc,TQT_SIGNAL (receivedStderr (TDEProcess *, char *, int)), - this, TQT_SLOT(zmodemStatus(TDEProcess *, char *, int))); - connect(zmodemProc,TQT_SIGNAL (processExited(TDEProcess *)), - this, TQT_SLOT(zmodemDone())); - - disconnect( sh,TQT_SIGNAL(block_in(const char*,int)), this, TQT_SLOT(onRcvBlock(const char*,int)) ); - connect( sh,TQT_SIGNAL(block_in(const char*,int)), this, TQT_SLOT(zmodemRcvBlock(const char*,int)) ); - connect( sh,TQT_SIGNAL(buffer_empty()), this, TQT_SLOT(zmodemContinue())); + disconnect(zmodemProc,TQ_SIGNAL (receivedStdout (TDEProcess *, char *, int)), 0, 0); + connect(zmodemProc,TQ_SIGNAL (receivedStdout (TDEProcess *, char *, int)), + this, TQ_SLOT(zmodemSendBlock(TDEProcess *, char *, int))); + connect(zmodemProc,TQ_SIGNAL (receivedStderr (TDEProcess *, char *, int)), + this, TQ_SLOT(zmodemStatus(TDEProcess *, char *, int))); + connect(zmodemProc,TQ_SIGNAL (processExited(TDEProcess *)), + this, TQ_SLOT(zmodemDone())); + + disconnect( sh,TQ_SIGNAL(block_in(const char*,int)), this, TQ_SLOT(onRcvBlock(const char*,int)) ); + connect( sh,TQ_SIGNAL(block_in(const char*,int)), this, TQ_SLOT(zmodemRcvBlock(const char*,int)) ); + connect( sh,TQ_SIGNAL(buffer_empty()), this, TQ_SLOT(zmodemContinue())); zmodemProgress = new ZModemDialog(te->topLevelWidget(), false, i18n("ZModem Progress")); - connect(zmodemProgress, TQT_SIGNAL(user1Clicked()), - this, TQT_SLOT(zmodemDone())); + connect(zmodemProgress, TQ_SIGNAL(user1Clicked()), + this, TQ_SLOT(zmodemDone())); zmodemProgress->show(); } @@ -720,9 +720,9 @@ void TESession::zmodemDone() zmodemProc = 0; zmodemBusy = false; - disconnect( sh,TQT_SIGNAL(block_in(const char*,int)), this ,TQT_SLOT(zmodemRcvBlock(const char*,int)) ); - disconnect( sh,TQT_SIGNAL(buffer_empty()), this, TQT_SLOT(zmodemContinue())); - connect( sh,TQT_SIGNAL(block_in(const char*,int)), this, TQT_SLOT(onRcvBlock(const char*,int)) ); + disconnect( sh,TQ_SIGNAL(block_in(const char*,int)), this ,TQ_SLOT(zmodemRcvBlock(const char*,int)) ); + disconnect( sh,TQ_SIGNAL(buffer_empty()), this, TQ_SLOT(zmodemContinue())); + connect( sh,TQ_SIGNAL(block_in(const char*,int)), this, TQ_SLOT(onRcvBlock(const char*,int)) ); sh->send_bytes("\030\030\030\030", 4); // Abort sh->send_bytes("\001\013\n", 3); // Try to get prompt back diff --git a/konsole/konsole/session.h b/konsole/konsole/session.h index 03b5941dd..3b5f211fa 100644 --- a/konsole/konsole/session.h +++ b/konsole/konsole/session.h @@ -36,7 +36,7 @@ class TDEProcess; class ZModemDialog; class TESession : public TQObject, virtual public SessionIface -{ Q_OBJECT +{ TQ_OBJECT public: @@ -208,7 +208,7 @@ private: bool xon_xoff; bool fullScripting; - QString stateIconName; + TQString stateIconName; TQString pgm; TQStrList args; diff --git a/konsole/konsole/zmodem_dialog.cpp b/konsole/konsole/zmodem_dialog.cpp index b4f16dd49..230fc7f9a 100644 --- a/konsole/konsole/zmodem_dialog.cpp +++ b/konsole/konsole/zmodem_dialog.cpp @@ -32,7 +32,7 @@ ZModemDialog::ZModemDialog(TQWidget *parent, bool modal, const TQString &caption textEdit = new TQTextEdit(this); textEdit->setMinimumSize(400, 100); setMainWidget(textEdit); - connect(this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotClose())); + connect(this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(slotClose())); } void ZModemDialog::addProgressText(const TQString &txt) diff --git a/konsole/konsole/zmodem_dialog.h b/konsole/konsole/zmodem_dialog.h index 5487fba50..93b50ee18 100644 --- a/konsole/konsole/zmodem_dialog.h +++ b/konsole/konsole/zmodem_dialog.h @@ -25,7 +25,7 @@ class TQTextEdit; class ZModemDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: ZModemDialog(TQWidget *parent, bool modal, const TQString &caption); diff --git a/konsole/other/CMakeLists.txt b/konsole/other/CMakeLists.txt index 564bf3504..39992673e 100644 --- a/konsole/other/CMakeLists.txt +++ b/konsole/other/CMakeLists.txt @@ -28,7 +28,8 @@ install( Linux.schema XTerm.schema vim.schema DarkPicture.schema LightPicture.schema Transparent.schema GreenTint.schema Transparent_MC.schema GreenTint_MC.schema Transparent_lightbg.schema - Transparent_darkbg.schema LightPaper.schema + Transparent_darkbg.schema LightPaper.schema Solarized.schema + SolarizedLight.schema linux.keytab vt100.keytab vt420pc.keytab x11r5.keytab solaris.keytab README.Schema README.KeyTab README.default.Keytab DESTINATION ${DATA_INSTALL_DIR}/konsole diff --git a/konsole/other/LICENSE.Solarized-themes b/konsole/other/LICENSE.Solarized-themes new file mode 100644 index 000000000..ee08d7e44 --- /dev/null +++ b/konsole/other/LICENSE.Solarized-themes @@ -0,0 +1,20 @@ +Copyright (c) 2011 Ethan Schoonover + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + diff --git a/konsole/other/README.KeyTab b/konsole/other/README.KeyTab index 75d6cfd79..4e23851bb 100644 --- a/konsole/other/README.KeyTab +++ b/konsole/other/README.KeyTab @@ -14,7 +14,7 @@ The syntax is that each entry has the form : "key" Keyname { ("+"|"-") Modename } ":" (String|Operation) Keynames are those defined in <qnamespace.h> with the -"Qt::Key_" prefix removed. +"TQt::Key_" prefix removed. Mode names are: diff --git a/konsole/other/Solarized.schema b/konsole/other/Solarized.schema new file mode 100644 index 000000000..ab98e4f06 --- /dev/null +++ b/konsole/other/Solarized.schema @@ -0,0 +1,40 @@ +# Solarized color scheme by Ethan Schoonover +# +# https://ethanschoonover.com/solarized/ + +title Solarized + +# foreground colors + +# note that the default background color is flagged +# to become transparent when an image is present. + +# slot transparent bold +# | | | +# V V--color--V V V + +color 0 131 148 150 0 0 # regular foreground color +color 1 0 43 54 1 0 # regular background color + +color 2 7 54 66 0 0 # regular color 0 Black +color 3 220 50 47 0 0 # regular color 1 Red +color 4 133 153 0 0 0 # regular color 2 Green +color 5 181 137 0 0 0 # regular color 3 Yellow +color 6 38 139 210 0 0 # regular color 4 Blue +color 7 211 54 130 0 0 # regular color 5 Magenta +color 8 42 161 152 0 0 # regular color 6 Cyan +color 9 238 232 213 0 0 # regular color 7 White + +# intensive colors + +color 10 147 161 161 0 0 # intensive foreground color +color 11 7 54 66 1 0 # intensive background color + +color 12 0 43 54 0 0 # intensive color 0 +color 13 203 75 22 0 0 # intensive color 1 +color 14 88 110 117 0 0 # intensive color 2 +color 15 101 123 131 0 0 # intensive color 3 +color 16 131 148 150 0 0 # intensive color 4 +color 17 108 113 196 0 0 # intensive color 5 +color 18 147 161 161 0 0 # intensive color 6 +color 19 253 246 227 0 0 # intensive color 7 diff --git a/konsole/other/SolarizedLight.schema b/konsole/other/SolarizedLight.schema new file mode 100644 index 000000000..61905f535 --- /dev/null +++ b/konsole/other/SolarizedLight.schema @@ -0,0 +1,40 @@ +# Solarized Light color scheme by Ethan Schoonover +# +# https://ethanschoonover.com/solarized/ + +title Solarized Light + +# foreground colors + +# note that the default background color is flagged +# to become transparent when an image is present. + +# slot transparent bold +# | | | +# V V--color--V V V + +color 0 101 123 131 0 0 # regular foreground color +color 1 253 246 227 1 0 # regular background color + +color 2 7 54 66 0 0 # regular color 0 Black +color 3 220 50 47 0 0 # regular color 1 Red +color 4 133 153 0 0 0 # regular color 2 Green +color 5 181 137 0 0 0 # regular color 3 Yellow +color 6 38 139 210 0 0 # regular color 4 Blue +color 7 211 54 130 0 0 # regular color 5 Magenta +color 8 42 161 152 0 0 # regular color 6 Cyan +color 9 238 232 213 0 0 # regular color 7 White + +# intensive colors + +color 10 88 110 117 0 0 # intensive foreground color +color 11 238 232 213 1 0 # intensive background color + +color 12 0 43 54 0 0 # intensive color 0 +color 13 203 75 22 0 0 # intensive color 1 +color 14 88 110 117 0 0 # intensive color 2 +color 15 101 123 131 0 0 # intensive color 3 +color 16 131 148 150 0 0 # intensive color 4 +color 17 108 113 196 0 0 # intensive color 5 +color 18 147 161 161 0 0 # intensive color 6 +color 19 253 246 227 0 0 # intensive color 7 diff --git a/konsole/other/linux.keytab b/konsole/other/linux.keytab index d5149c3c8..aafbdd97f 100644 --- a/konsole/other/linux.keytab +++ b/konsole/other/linux.keytab @@ -15,7 +15,7 @@ keyboard "linux console" # "key" Keyname { ("+"|"-") Modename } ":" (String|Operation) # # Keynames are those defined in <qnamespace.h> with the -# "Qt::Key_" removed. (We'd better insert the list here) +# "TQt::Key_" removed. (We'd better insert the list here) # # Mode names are : # diff --git a/konsole/other/solaris.keytab b/konsole/other/solaris.keytab index cb0626be9..e671cb13b 100644 --- a/konsole/other/solaris.keytab +++ b/konsole/other/solaris.keytab @@ -13,7 +13,7 @@ keyboard "Solaris" # "key" Keyname { ("+"|"-") Modename } ":" (String|Operation) # # Keynames are those defined in <qnamespace.h> with the -# "Qt::Key_" removed. (We'd better insert the list here) +# "TQt::Key_" removed. (We'd better insert the list here) # # Mode names are : # diff --git a/konsole/other/vt100.keytab b/konsole/other/vt100.keytab index dec49baac..fa57934bc 100644 --- a/konsole/other/vt100.keytab +++ b/konsole/other/vt100.keytab @@ -14,7 +14,7 @@ keyboard "vt100 (historical)" # "key" Keyname { ("+"|"-") Modename } ":" (String|Operation) # # Keynames are those defined in <qnamespace.h> with the -# "Qt::Key_" removed. (We'd better insert the list here) +# "TQt::Key_" removed. (We'd better insert the list here) # # Mode names are : # diff --git a/konsole/other/vt420pc.keytab b/konsole/other/vt420pc.keytab index d132797b1..376ce8d13 100644 --- a/konsole/other/vt420pc.keytab +++ b/konsole/other/vt420pc.keytab @@ -29,7 +29,7 @@ keyboard "VT420PC" # "key" Keyname { ("+"|"-") Modename } ":" (String|Operation) # # Keynames are those defined in <qnamespace.h> with the -# "Qt::Key_" removed. (We'd better insert the list here) +# "TQt::Key_" removed. (We'd better insert the list here) # # Mode names are : # |