diff options
Diffstat (limited to 'src/bnpview.cpp')
| -rw-r--r-- | src/bnpview.cpp | 49 |
1 files changed, 4 insertions, 45 deletions
diff --git a/src/bnpview.cpp b/src/bnpview.cpp index c98f063..c44a2de 100644 --- a/src/bnpview.cpp +++ b/src/bnpview.cpp @@ -485,11 +485,7 @@ void BNPView::setupActions() this, TQ_SLOT(moveNoteDown()), actionCollection(), "note_move_down" ); m_actMoveOnBottom = new TDEAction( i18n("Move on &Bottom"), "2downarrow", "Ctrl+Shift+End", this, TQ_SLOT(moveOnBottom()), actionCollection(), "note_move_bottom" ); -#if KDE_IS_VERSION( 3, 1, 90 ) // KDE 3.2.x m_actPaste = KStdAction::pasteText( this, TQ_SLOT(pasteInCurrentBasket()), actionCollection() ); -#else - m_actPaste = KStdAction::paste( this, TQ_SLOT(pasteInCurrentBasket()), actionCollection() ); -#endif /** Insert : **************************************************************/ @@ -1710,12 +1706,8 @@ void BNPView::delBasket() int really = KMessageBox::questionYesNo( this, i18n("<qt>Do you really want to remove the basket <b>%1</b> and its contents?</qt>") .arg(Tools::textToHTMLWithoutP(basket->basketName())), - i18n("Remove Basket") -#if KDE_IS_VERSION( 3, 2, 90 ) // KDE 3.3.x - , KGuiItem(i18n("&Remove Basket"), "edit-delete"), KStdGuiItem::cancel()); -#else - ); -#endif + i18n("Remove Basket"), + KGuiItem(i18n("&Remove Basket"), "edit-delete"), KStdGuiItem::cancel()); if (really == KMessageBox::No) return; @@ -1726,12 +1718,8 @@ void BNPView::delBasket() i18n("<qt><b>%1</b> have the following children baskets.<br>Do you want to remove them too?</qt>") .arg(Tools::textToHTMLWithoutP(basket->basketName())), basketsList, - i18n("Remove Children Baskets") -#if KDE_IS_VERSION( 3, 2, 90 ) // KDE 3.3.x - , KGuiItem(i18n("&Remove Children Baskets"), "edit-delete")); -#else - ); -#endif + i18n("Remove Children Baskets"), + KGuiItem(i18n("&Remove Children Baskets"), "edit-delete")); if (deleteChilds == KMessageBox::No) listViewItemForBasket(basket)->moveChildsBaskets(); @@ -2078,40 +2066,11 @@ void BNPView::setActive(bool active) if(!win) return; -#if KDE_IS_VERSION( 3, 2, 90 ) // KDE 3.3.x if (active) { tdeApp->updateUserTimestamp(); // If "activate on mouse hovering systray", or "on drag throught systray" Global::systemTray->setActive(); // FIXME: add this in the places it need } else Global::systemTray->setInactive(); -#elif KDE_IS_VERSION( 3, 1, 90 ) // KDE 3.2.x - // Code from Kopete (that seem to work, in waiting KSystemTray make puplic the toggleSHown) : - if (active) { - win->show(); - //raise() and show() should normaly deIconify the window. but it doesn't do here due - // to a bug in TQt or in KDE (qt3.1.x or KDE 3.1.x) then, i have to call KWin's method - if (win->isMinimized()) - KWin::deIconifyWindow(winId()); - - if ( ! KWin::windowInfo(winId(), NET::WMDesktop).onAllDesktops() ) - KWin::setOnDesktop(winId(), KWin::currentDesktop()); - win->raise(); - // Code from me: expected and correct behavviour: - tdeApp->updateUserTimestamp(); // If "activate on mouse hovering systray", or "on drag throught systray" - KWin::activateWindow(win->winId()); - } else - win->hide(); -#else // KDE 3.1.x and lower - if (win->active) { - if (win->isMinimized()) - win->hide(); // If minimized, show() doesn't work ! - win->show(); // Show it - // showNormal(); // If it was minimized - win->raise(); // Raise it on top - win->setActiveWindow(); // And set it the active window - } else - win->hide(); -#endif } void BNPView::hideOnEscape() |