TDE
/
yakuake
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/yakuake
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename a number of classes to enhance compatibility with KDE4

Browse Source
pull/1/head
Timothy Pearson 11 years ago
parent cf10da9dd1
commit 23494e0357
14 changed files with 99 additions and 99 deletions
Show Stats Download Patch File Download Diff File

10
yakuake/src/first_run_dialog.cpp
Unescape View File

@ -21,25 +21,25 @@
FirstRunDialog::FirstRunDialog(TQWidget* parent, const char* name) FirstRunDialog::FirstRunDialog(TQWidget* parent, const char* name)
: FirstRunDialogUI(parent, name) : FirstRunDialogUI(parent, name)
{ {
connect(key_button, TQT_SIGNAL(capturedShortcut(const KShortcut&)), connect(key_button, TQT_SIGNAL(capturedShortcut(const TDEShortcut&)),
this, TQT_SLOT(validateShortcut(const KShortcut&))); this, TQT_SLOT(validateShortcut(const TDEShortcut&)));
} }
FirstRunDialog::~FirstRunDialog() FirstRunDialog::~FirstRunDialog()
{ {
} }
KShortcut FirstRunDialog::shortcut() TDEShortcut FirstRunDialog::shortcut()
{ {
return key_button->shortcut(); return key_button->shortcut();
} }
void FirstRunDialog::setShortcut(const KShortcut& shortcut) void FirstRunDialog::setShortcut(const TDEShortcut& shortcut)
{ {
key_button->setShortcut(shortcut, false); key_button->setShortcut(shortcut, false);
} }
void FirstRunDialog::validateShortcut(const KShortcut& shortcut) void FirstRunDialog::validateShortcut(const TDEShortcut& shortcut)
{ {
if (!KKeyChooser::checkGlobalShortcutsConflict(shortcut, true, this) if (!KKeyChooser::checkGlobalShortcutsConflict(shortcut, true, this)
&& !KKeyChooser::KKeyChooser::checkStandardShortcutsConflict(shortcut, true, this)) && !KKeyChooser::KKeyChooser::checkStandardShortcutsConflict(shortcut, true, this))

8
yakuake/src/first_run_dialog.h
Unescape View File

@ -17,7 +17,7 @@
#include "first_run_dialog_ui.h" #include "first_run_dialog_ui.h"
class KShortcut; class TDEShortcut;
class FirstRunDialog : public FirstRunDialogUI class FirstRunDialog : public FirstRunDialogUI
{ {
@ -28,15 +28,15 @@ class FirstRunDialog : public FirstRunDialogUI
explicit FirstRunDialog(TQWidget* parent, const char* name=NULL); explicit FirstRunDialog(TQWidget* parent, const char* name=NULL);
~FirstRunDialog(); ~FirstRunDialog();
KShortcut shortcut(); TDEShortcut shortcut();
public slots: public slots:
void setShortcut(const KShortcut& shortcut); void setShortcut(const TDEShortcut& shortcut);
private slots: private slots:
void validateShortcut(const KShortcut& shortcut); void validateShortcut(const TDEShortcut& shortcut);
}; };

100
yakuake/src/main_window.cpp
Unescape View File

@ -32,7 +32,7 @@
MainWindow::MainWindow(TQWidget * parent, const char * name) : MainWindow::MainWindow(TQWidget * parent, const char * name) :
DCOPObject("DCOPInterface"), DCOPObject("DCOPInterface"),
KMainWindow(parent, name, TQt::WStyle_Customize | TQt::WStyle_NoBorder), TDEMainWindow(parent, name, TQt::WStyle_Customize | TQt::WStyle_NoBorder),
step(0) step(0)
{ {
first_run_dialog = 0; first_run_dialog = 0;
@ -77,65 +77,65 @@ MainWindow::MainWindow(TQWidget * parent, const char * name) :
// Initialize shortcuts. // Initialize shortcuts.
KAction* action; TDEAction* action;
KShortcut shortcut(TQt::CTRL+TQt::ALT+TQt::Key_N); TDEShortcut shortcut(TQt::CTRL+TQt::ALT+TQt::Key_N);
shortcut.append(KShortcut(TQt::CTRL+TQt::SHIFT+TQt::Key_N)); shortcut.append(TDEShortcut(TQt::CTRL+TQt::SHIFT+TQt::Key_N));
action = new KAction(i18n("New Session"), SmallIcon("tab_new"), shortcut, action = new TDEAction(i18n("New Session"), SmallIcon("tab_new"), shortcut,
TQT_TQOBJECT(this), TQT_SLOT(slotAddSession()), TQT_TQOBJECT(this), TQT_SLOT(slotAddSession()),
actionCollection(), "add_tab"); actionCollection(), "add_tab");
action = new KAction(i18n("Two Terminals,Qt::Horizontal"), SmallIcon("tab_new"), action = new TDEAction(i18n("Two Terminals,Qt::Horizontal"), SmallIcon("tab_new"),
0, TQT_TQOBJECT(this), TQT_SLOT(slotAddSessionTwoVertical()), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddSessionTwoVertical()),
actionCollection(), "add_tab_twohorizontal"); actionCollection(), "add_tab_twohorizontal");
action = new KAction(i18n("Two Terminals,Qt::Vertical"), SmallIcon("tab_new"), action = new TDEAction(i18n("Two Terminals,Qt::Vertical"), SmallIcon("tab_new"),
0, TQT_TQOBJECT(this), TQT_SLOT(slotAddSessionTwoHorizontal()), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddSessionTwoHorizontal()),
actionCollection(), "add_tab_twovertical"); actionCollection(), "add_tab_twovertical");
action = new KAction(i18n("Four Terminals, Quad"), SmallIcon("tab_new"), action = new TDEAction(i18n("Four Terminals, Quad"), SmallIcon("tab_new"),
0, TQT_TQOBJECT(this), TQT_SLOT(slotAddSessionQuad()), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddSessionQuad()),
actionCollection(), "add_tab_quad"); actionCollection(), "add_tab_quad");
action = new KAction(i18n("Go to Next Terminal"), SmallIcon("next"), action = new TDEAction(i18n("Go to Next Terminal"), SmallIcon("next"),
"Ctrl+Shift+Up", TQT_TQOBJECT(this), TQT_SLOT(slotFocusNextSplit()), "Ctrl+Shift+Up", TQT_TQOBJECT(this), TQT_SLOT(slotFocusNextSplit()),
actionCollection(), "focus_next_terminal"); actionCollection(), "focus_next_terminal");
action = new KAction(i18n("Go to Previous Terminal"), SmallIcon("previous"), action = new TDEAction(i18n("Go to Previous Terminal"), SmallIcon("previous"),
"Ctrl+Shift+Down", TQT_TQOBJECT(this), TQT_SLOT(slotFocusPreviousSplit()), "Ctrl+Shift+Down", TQT_TQOBJECT(this), TQT_SLOT(slotFocusPreviousSplit()),
actionCollection(), "focus_previous_terminal"); actionCollection(), "focus_previous_terminal");
action = new KAction(i18n("Paste"), SmallIcon("editpaste"), SHIFT+Key_Insert, action = new TDEAction(i18n("Paste"), SmallIcon("editpaste"), SHIFT+Key_Insert,
TQT_TQOBJECT(this), TQT_SLOT(slotPasteClipboard()), TQT_TQOBJECT(this), TQT_SLOT(slotPasteClipboard()),
actionCollection(), "paste_clipboard"); actionCollection(), "paste_clipboard");
action = new KAction(i18n("Paste Selection"), SmallIcon("editpaste"), action = new TDEAction(i18n("Paste Selection"), SmallIcon("editpaste"),
CTRL+SHIFT+Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotPasteSelection()), CTRL+SHIFT+Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotPasteSelection()),
actionCollection(), "paste_selection"); actionCollection(), "paste_selection");
action = new KAction(i18n("Rename Session..."), SmallIcon("edit"), action = new TDEAction(i18n("Rename Session..."), SmallIcon("edit"),
"Alt+Ctrl+S", TQT_TQOBJECT(this), TQT_SLOT(slotInteractiveRename()), "Alt+Ctrl+S", TQT_TQOBJECT(this), TQT_SLOT(slotInteractiveRename()),
actionCollection(), "edit_name"); actionCollection(), "edit_name");
action = new KAction(i18n("Increase Width"), SmallIcon("viewmag+"), action = new TDEAction(i18n("Increase Width"), SmallIcon("viewmag+"),
"Alt+Shift+Right", TQT_TQOBJECT(this), TQT_SLOT(slotIncreaseSizeW()), "Alt+Shift+Right", TQT_TQOBJECT(this), TQT_SLOT(slotIncreaseSizeW()),
actionCollection(), "increasew"); actionCollection(), "increasew");
action = new KAction(i18n("Decrease Width"), SmallIcon("viewmag-"), action = new TDEAction(i18n("Decrease Width"), SmallIcon("viewmag-"),
"Alt+Shift+Left", TQT_TQOBJECT(this), TQT_SLOT(slotDecreaseSizeW()), "Alt+Shift+Left", TQT_TQOBJECT(this), TQT_SLOT(slotDecreaseSizeW()),
actionCollection(), "decreasew"); actionCollection(), "decreasew");
action = new KAction(i18n("Increase Height"), SmallIcon("viewmag+"), action = new TDEAction(i18n("Increase Height"), SmallIcon("viewmag+"),
"Alt+Shift+Down", TQT_TQOBJECT(this), TQT_SLOT(slotIncreaseSizeH()), "Alt+Shift+Down", TQT_TQOBJECT(this), TQT_SLOT(slotIncreaseSizeH()),
actionCollection(), "increaseh"); actionCollection(), "increaseh");
action = new KAction(i18n("Decrease Height"), SmallIcon("viewmag-"), action = new TDEAction(i18n("Decrease Height"), SmallIcon("viewmag-"),
"Alt+Shift+Up", TQT_TQOBJECT(this), TQT_SLOT(slotDecreaseSizeH()), "Alt+Shift+Up", TQT_TQOBJECT(this), TQT_SLOT(slotDecreaseSizeH()),
actionCollection(), "decreaseh"); actionCollection(), "decreaseh");
action = new KAction(i18n("Configure Global Shortcuts..."), action = new TDEAction(i18n("Configure Global Shortcuts..."),
SmallIcon("configure_shortcuts"), 0, SmallIcon("configure_shortcuts"), 0,
TQT_TQOBJECT(this), TQT_SLOT(slotSetAccessKey()), TQT_TQOBJECT(this), TQT_SLOT(slotSetAccessKey()),
actionCollection(), "global_shortcuts"); actionCollection(), "global_shortcuts");
action = new KAction(i18n("Quit"), SmallIcon("exit"), 0, TQT_TQOBJECT(this), action = new TDEAction(i18n("Quit"), SmallIcon("exit"), 0, TQT_TQOBJECT(this),
TQT_SLOT(close()), actionCollection(), "quit"); TQT_SLOT(close()), actionCollection(), "quit");
KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotSetControlKeys()), actionCollection()); KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotSetControlKeys()), actionCollection());
@ -152,47 +152,47 @@ MainWindow::MainWindow(TQWidget * parent, const char * name) :
createTitleBar(); createTitleBar();
createTabsBar(); createTabsBar();
action = new KAction(i18n("Go to Next Session"), SmallIcon("next"), action = new TDEAction(i18n("Go to Next Session"), SmallIcon("next"),
"Shift+Right", TQT_TQOBJECT(tab_bar), TQT_SLOT(slotSelectNextItem()), "Shift+Right", TQT_TQOBJECT(tab_bar), TQT_SLOT(slotSelectNextItem()),
actionCollection(), "next_tab"); actionCollection(), "next_tab");
action = new KAction(i18n("Go to Previous Session"), SmallIcon("previous"), action = new TDEAction(i18n("Go to Previous Session"), SmallIcon("previous"),
"Shift+Left", TQT_TQOBJECT(tab_bar), TQT_SLOT(slotSelectPreviousItem()), "Shift+Left", TQT_TQOBJECT(tab_bar), TQT_SLOT(slotSelectPreviousItem()),
actionCollection(), "previous_tab"); actionCollection(), "previous_tab");
action = new KAction(i18n("Move Session Left"), SmallIcon("back"), action = new TDEAction(i18n("Move Session Left"), SmallIcon("back"),
"Ctrl+Shift+Left", TQT_TQOBJECT(tab_bar), TQT_SLOT(slotMoveItemLeft()), "Ctrl+Shift+Left", TQT_TQOBJECT(tab_bar), TQT_SLOT(slotMoveItemLeft()),
actionCollection(), "move_tab_left"); actionCollection(), "move_tab_left");
action = new KAction(i18n("Move Session Right"), SmallIcon("forward"), action = new TDEAction(i18n("Move Session Right"), SmallIcon("forward"),
"Ctrl+Shift+Right", TQT_TQOBJECT(tab_bar), TQT_SLOT(slotMoveItemRight()), "Ctrl+Shift+Right", TQT_TQOBJECT(tab_bar), TQT_SLOT(slotMoveItemRight()),
actionCollection(), "move_tab_right"); actionCollection(), "move_tab_right");
remove_tab_action = new KAction(i18n("Close Session"), SmallIcon("fileclose"), 0, remove_tab_action = new TDEAction(i18n("Close Session"), SmallIcon("fileclose"), 0,
TQT_TQOBJECT(this), 0, actionCollection(), "remove_tab"); TQT_TQOBJECT(this), 0, actionCollection(), "remove_tab");
connect(remove_tab_action, TQT_SIGNAL(activated(KAction::ActivationReason, TQt::ButtonState)), connect(remove_tab_action, TQT_SIGNAL(activated(TDEAction::ActivationReason, TQt::ButtonState)),
TQT_TQOBJECT(this), TQT_SLOT(slotHandleRemoveSession(KAction::ActivationReason, TQt::ButtonState))); TQT_TQOBJECT(this), TQT_SLOT(slotHandleRemoveSession(TDEAction::ActivationReason, TQt::ButtonState)));
split_horiz_action = new KAction(i18n("Split TerminalQt::Horizontally"), SmallIcon("view_top_bottom"), split_horiz_action = new TDEAction(i18n("Split TerminalQt::Horizontally"), SmallIcon("view_top_bottom"),
CTRL+SHIFT+Key_T, TQT_TQOBJECT(this), 0, actionCollection(), "split_horizontally"); CTRL+SHIFT+Key_T, TQT_TQOBJECT(this), 0, actionCollection(), "split_horizontally");
connect(split_horiz_action, TQT_SIGNAL(activated(KAction::ActivationReason, TQt::ButtonState)), connect(split_horiz_action, TQT_SIGNAL(activated(TDEAction::ActivationReason, TQt::ButtonState)),
TQT_TQOBJECT(this), TQT_SLOT(slotHandleVerticalSplit(KAction::ActivationReason, TQt::ButtonState))); TQT_TQOBJECT(this), TQT_SLOT(slotHandleVerticalSplit(TDEAction::ActivationReason, TQt::ButtonState)));
split_vert_action = new KAction(i18n("Split TerminalQt::Vertically"), SmallIcon("view_left_right"), split_vert_action = new TDEAction(i18n("Split TerminalQt::Vertically"), SmallIcon("view_left_right"),
CTRL+SHIFT+Key_L, TQT_TQOBJECT(this), 0, actionCollection(), "split_vertically"); CTRL+SHIFT+Key_L, TQT_TQOBJECT(this), 0, actionCollection(), "split_vertically");
connect(split_vert_action, TQT_SIGNAL(activated(KAction::ActivationReason, TQt::ButtonState)), connect(split_vert_action, TQT_SIGNAL(activated(TDEAction::ActivationReason, TQt::ButtonState)),
TQT_TQOBJECT(this), TQT_SLOT(slotHandleHorizontalSplit(KAction::ActivationReason, TQt::ButtonState))); TQT_TQOBJECT(this), TQT_SLOT(slotHandleHorizontalSplit(TDEAction::ActivationReason, TQt::ButtonState)));
remove_term_action = new KAction(i18n("Close Terminal"), SmallIcon("view_remove"), remove_term_action = new TDEAction(i18n("Close Terminal"), SmallIcon("view_remove"),
CTRL+SHIFT+Key_R, TQT_TQOBJECT(this), 0, actionCollection(), "remove_terminal"); CTRL+SHIFT+Key_R, TQT_TQOBJECT(this), 0, actionCollection(), "remove_terminal");
connect(remove_term_action, TQT_SIGNAL(activated(KAction::ActivationReason, TQt::ButtonState)), connect(remove_term_action, TQT_SIGNAL(activated(TDEAction::ActivationReason, TQt::ButtonState)),
TQT_TQOBJECT(this), TQT_SLOT(slotHandleRemoveTerminal(KAction::ActivationReason, TQt::ButtonState))); TQT_TQOBJECT(this), TQT_SLOT(slotHandleRemoveTerminal(TDEAction::ActivationReason, TQt::ButtonState)));
TQSignalMapper* tab_selection_mapper = new TQSignalMapper(TQT_TQOBJECT(this)); TQSignalMapper* tab_selection_mapper = new TQSignalMapper(TQT_TQOBJECT(this));
connect(tab_selection_mapper, TQT_SIGNAL(mapped(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSelectTabPosition(int))); connect(tab_selection_mapper, TQT_SIGNAL(mapped(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSelectTabPosition(int)));
for (uint i = 1; i <= 12; ++i) for (uint i = 1; i <= 12; ++i)
{ {
KAction* tab_selection_action = new KAction(i18n("Switch to Session %1").arg(i), 0, 0, TDEAction* tab_selection_action = new TDEAction(i18n("Switch to Session %1").arg(i), 0, 0,
tab_selection_mapper, TQT_SLOT(map()), actionCollection(), TQString("go_to_tab_%1").arg(i).local8Bit()); tab_selection_mapper, TQT_SLOT(map()), actionCollection(), TQString("go_to_tab_%1").arg(i).local8Bit());
tab_selection_mapper->setMapping(tab_selection_action, i-1); tab_selection_mapper->setMapping(tab_selection_action, i-1);
} }
@ -377,9 +377,9 @@ void MainWindow::slotRemoveSession(int session_id)
sessions_stack[session_id]->deleteLater(); sessions_stack[session_id]->deleteLater();
} }
void MainWindow::slotHandleRemoveSession(KAction::ActivationReason reason, TQt::ButtonState /* state */) void MainWindow::slotHandleRemoveSession(TDEAction::ActivationReason reason, TQt::ButtonState /* state */)
{ {
if (reason == KAction::PopupMenuActivation if (reason == TDEAction::PopupMenuActivation
&& tab_bar->pressedPosition() != -1) && tab_bar->pressedPosition() != -1)
{ {
slotRemoveSession(tab_bar->sessionIdForTabPosition(tab_bar->pressedPosition())); slotRemoveSession(tab_bar->sessionIdForTabPosition(tab_bar->pressedPosition()));
@ -650,9 +650,9 @@ void MainWindow::windowActivationChange(bool old_active)
slotToggleState(); slotToggleState();
} }
void MainWindow::slotHandleHorizontalSplit(KAction::ActivationReason reason, TQt::ButtonState /* state */) void MainWindow::slotHandleHorizontalSplit(TDEAction::ActivationReason reason, TQt::ButtonState /* state */)
{ {
if (reason == KAction::PopupMenuActivation if (reason == TDEAction::PopupMenuActivation
&& tab_bar->pressedPosition() != -1) && tab_bar->pressedPosition() != -1)
{ {
slotSplitHorizontally(tab_bar->sessionIdForTabPosition(tab_bar->pressedPosition())); slotSplitHorizontally(tab_bar->sessionIdForTabPosition(tab_bar->pressedPosition()));
@ -662,9 +662,9 @@ void MainWindow::slotHandleHorizontalSplit(KAction::ActivationReason reason, TQt
slotSplitHorizontally(); slotSplitHorizontally();
} }
void MainWindow::slotHandleVerticalSplit(KAction::ActivationReason reason, TQt::ButtonState /* state */) void MainWindow::slotHandleVerticalSplit(TDEAction::ActivationReason reason, TQt::ButtonState /* state */)
{ {
if (reason == KAction::PopupMenuActivation if (reason == TDEAction::PopupMenuActivation
&& tab_bar->pressedPosition() != -1) && tab_bar->pressedPosition() != -1)
{ {
slotSplitVertically(tab_bar->sessionIdForTabPosition(tab_bar->pressedPosition())); slotSplitVertically(tab_bar->sessionIdForTabPosition(tab_bar->pressedPosition()));
@ -675,9 +675,9 @@ void MainWindow::slotHandleVerticalSplit(KAction::ActivationReason reason, TQt::
} }
void MainWindow::slotHandleRemoveTerminal(KAction::ActivationReason reason, TQt::ButtonState /* state */) void MainWindow::slotHandleRemoveTerminal(TDEAction::ActivationReason reason, TQt::ButtonState /* state */)
{ {
if (reason == KAction::PopupMenuActivation if (reason == TDEAction::PopupMenuActivation
&& tab_bar->pressedPosition() != -1) && tab_bar->pressedPosition() != -1)
{ {
slotRemoveTerminal(tab_bar->sessionIdForTabPosition(tab_bar->pressedPosition())); slotRemoveTerminal(tab_bar->sessionIdForTabPosition(tab_bar->pressedPosition()));
@ -765,7 +765,7 @@ void MainWindow::createMenu()
{ {
/* Creates the main menu. */ /* Creates the main menu. */
menu = new KPopupMenu(); menu = new TDEPopupMenu();
menu->insertTitle(i18n("Help")); menu->insertTitle(i18n("Help"));
@ -777,7 +777,7 @@ void MainWindow::createMenu()
actionCollection()->action(KStdAction::stdName(KStdAction::FullScreen))->plug(menu); actionCollection()->action(KStdAction::stdName(KStdAction::FullScreen))->plug(menu);
screen_menu = new KPopupMenu(menu); screen_menu = new TDEPopupMenu(menu);
if (TQApplication::desktop()->numScreens() > 1) if (TQApplication::desktop()->numScreens() > 1)
{ {
@ -785,11 +785,11 @@ void MainWindow::createMenu()
connect(screen_menu, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSetScreen(int))); connect(screen_menu, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSetScreen(int)));
} }
width_menu = new KPopupMenu(menu); width_menu = new TDEPopupMenu(menu);
menu->insertItem(i18n("Width"), width_menu); menu->insertItem(i18n("Width"), width_menu);
connect(width_menu, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSetWidth(int))); connect(width_menu, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSetWidth(int)));
height_menu = new KPopupMenu(menu); height_menu = new TDEPopupMenu(menu);
menu->insertItem(i18n("Height"), height_menu); menu->insertItem(i18n("Height"), height_menu);
connect(height_menu, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSetHeight(int))); connect(height_menu, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSetHeight(int)));
@ -828,7 +828,7 @@ void MainWindow::updateScreenMenu()
void MainWindow::createSessionMenu() void MainWindow::createSessionMenu()
{ {
session_menu = new KPopupMenu(); session_menu = new TDEPopupMenu();
actionCollection()->action("add_tab")->plug(session_menu); actionCollection()->action("add_tab")->plug(session_menu);
actionCollection()->action("add_tab_twohorizontal")->plug(session_menu); actionCollection()->action("add_tab_twohorizontal")->plug(session_menu);
@ -1071,7 +1071,7 @@ void MainWindow::moveEvent(TQMoveEvent* e)
slotUpdateSize(); slotUpdateSize();
} }
KMainWindow::moveEvent(e); TDEMainWindow::moveEvent(e);
} }
void MainWindow::slotSetFullScreen(bool state) void MainWindow::slotSetFullScreen(bool state)

30
yakuake/src/main_window.h
Unescape View File

@ -48,7 +48,7 @@
class KAboutApplication; class KAboutApplication;
class KAboutKDE; class KAboutKDE;
class MainWindow : public KMainWindow, virtual public DCOPInterface class MainWindow : public TDEMainWindow, virtual public DCOPInterface
{ {
Q_OBJECT Q_OBJECT
@ -183,11 +183,11 @@ class MainWindow : public KMainWindow, virtual public DCOPInterface
KWinModule desk_info; KWinModule desk_info;
/* Main menu. */ /* Main menu. */
KPopupMenu* menu; TDEPopupMenu* menu;
KPopupMenu* session_menu; TDEPopupMenu* session_menu;
KPopupMenu* screen_menu; TDEPopupMenu* screen_menu;
KPopupMenu* width_menu; TDEPopupMenu* width_menu;
KPopupMenu* height_menu; TDEPopupMenu* height_menu;
/* Global Key shortcut. */ /* Global Key shortcut. */
TDEGlobalAccel* global_key; TDEGlobalAccel* global_key;
@ -209,11 +209,11 @@ class MainWindow : public KMainWindow, virtual public DCOPInterface
enum PopupIDs { Focus }; enum PopupIDs { Focus };
KAction* remove_tab_action; TDEAction* remove_tab_action;
KAction* split_horiz_action; TDEAction* split_horiz_action;
KAction* split_vert_action; TDEAction* split_vert_action;
KAction* remove_term_action; TDEAction* remove_term_action;
KToggleFullScreenAction* full_screen_action; TDEToggleFullScreenAction* full_screen_action;
KDialogBase* first_run_dialog; KDialogBase* first_run_dialog;
@ -222,10 +222,10 @@ class MainWindow : public KMainWindow, virtual public DCOPInterface
private slots: private slots:
void slotHandleRemoveSession(KAction::ActivationReason, TQt::ButtonState); void slotHandleRemoveSession(TDEAction::ActivationReason, TQt::ButtonState);
void slotHandleHorizontalSplit(KAction::ActivationReason, TQt::ButtonState); void slotHandleHorizontalSplit(TDEAction::ActivationReason, TQt::ButtonState);
void slotHandleVerticalSplit(KAction::ActivationReason, TQt::ButtonState); void slotHandleVerticalSplit(TDEAction::ActivationReason, TQt::ButtonState);
void slotHandleRemoveTerminal(KAction::ActivationReason, TQt::ButtonState); void slotHandleRemoveTerminal(TDEAction::ActivationReason, TQt::ButtonState);
void slotInitSkin(); void slotInitSkin();
void slotUpdateSize(); void slotUpdateSize();

4
yakuake/src/skin_list_item.cpp
Unescape View File

@ -22,9 +22,9 @@
#include <klocale.h> #include <klocale.h>
SkinListItem::SkinListItem(KListView* parent, const TQString& fancy_name, SkinListItem::SkinListItem(TDEListView* parent, const TQString& fancy_name,
const TQString& author, const TQPixmap& icon, const TQString& name, const TQString& dir) const TQString& author, const TQPixmap& icon, const TQString& name, const TQString& dir)
: KListViewItem(parent, fancy_name) : TDEListViewItem(parent, fancy_name)
{ {
setName(name); setName(name);
setAuthor(author); setAuthor(author);

4
yakuake/src/skin_list_item.h
Unescape View File

@ -22,10 +22,10 @@
class TQSimpleRichText; class TQSimpleRichText;
class SkinListItem : public KListViewItem class SkinListItem : public TDEListViewItem
{ {
public: public:
explicit SkinListItem(KListView* parent, const TQString& fancy_name, explicit SkinListItem(TDEListView* parent, const TQString& fancy_name,
const TQString& author, const TQPixmap& icon, const TQString& name, const TQString& dir); const TQString& author, const TQPixmap& icon, const TQString& name, const TQString& dir);
~SkinListItem(); ~SkinListItem();

4
yakuake/src/skin_settings.cpp
Unescape View File

@ -55,8 +55,8 @@ SkinSettings::SkinSettings(TQWidget* parent, const char* name, bool translucency
skinbglayout->invalidate(); skinbglayout->invalidate();
skins_list->header()->hide(); skins_list->header()->hide();
skins_list->setSelectionModeExt(KListView::Single); skins_list->setSelectionModeExt(TDEListView::Single);
skins_list->setResizeMode(KListView::LastColumn); skins_list->setResizeMode(TDEListView::LastColumn);
skins_list->setRootIsDecorated(false); skins_list->setRootIsDecorated(false);
skins_list->setDragEnabled(false); skins_list->setDragEnabled(false);
skins_list->setAcceptDrops(false); skins_list->setAcceptDrops(false);

2
yakuake/src/skin_settings_ui.ui
Unescape View File

@ -95,7 +95,7 @@
</spacer> </spacer>
</hbox> </hbox>
</widget> </widget>
<widget class="KListView" row="1" column="0" rowspan="1" colspan="2"> <widget class="TDEListView" row="1" column="0" rowspan="1" colspan="2">
<column> <column>
<property name="text"> <property name="text">
<string>Skin</string> <string>Skin</string>

2
yakuake/src/tab_bar.cpp
Unescape View File

@ -236,7 +236,7 @@ void TabBar::setPixmaps(const TQString& skin)
minus_button->setDownPixmap(url.dirPath() + config.readEntry("down_image", "")); minus_button->setDownPixmap(url.dirPath() + config.readEntry("down_image", ""));
} }
void TabBar::setSessionMenu(KPopupMenu* menu) void TabBar::setSessionMenu(TDEPopupMenu* menu)
{ {
plus_button->setPopupMenu(menu); plus_button->setPopupMenu(menu);
} }

2
yakuake/src/tab_bar.h
Unescape View File

@ -40,7 +40,7 @@ class TabBar : public TranslucentWidget
bool translucency = false, const TQString& skin = "default"); bool translucency = false, const TQString& skin = "default");
~TabBar(); ~TabBar();
void setSessionMenu(KPopupMenu* menu); void setSessionMenu(TDEPopupMenu* menu);
int pressedPosition(); int pressedPosition();
void resetPressedPosition(); void resetPressedPosition();

24
yakuake/src/tabbed_widget.cpp
Unescape View File

@ -66,28 +66,28 @@ int TabbedWidget::pressedPosition()
void TabbedWidget::createContextMenu() void TabbedWidget::createContextMenu()
{ {
context_menu = new KPopupMenu(); context_menu = new TDEPopupMenu();
static_cast<KMainWindow*>(TQT_TQWIDGET(parent()->parent()))->actionCollection()-> static_cast<TDEMainWindow*>(TQT_TQWIDGET(parent()->parent()))->actionCollection()->
action("split_horizontally")->plug(context_menu); action("split_horizontally")->plug(context_menu);
static_cast<KMainWindow*>(TQT_TQWIDGET(parent()->parent()))->actionCollection()-> static_cast<TDEMainWindow*>(TQT_TQWIDGET(parent()->parent()))->actionCollection()->
action("split_vertically")->plug(context_menu); action("split_vertically")->plug(context_menu);
static_cast<KMainWindow*>(TQT_TQWIDGET(parent()->parent()))->actionCollection()-> static_cast<TDEMainWindow*>(TQT_TQWIDGET(parent()->parent()))->actionCollection()->
action("remove_terminal")->plug(context_menu); action("remove_terminal")->plug(context_menu);
context_menu->insertSeparator(); context_menu->insertSeparator();
static_cast<KMainWindow*>(TQT_TQWIDGET(parent()->parent()))->actionCollection()-> static_cast<TDEMainWindow*>(TQT_TQWIDGET(parent()->parent()))->actionCollection()->
action("move_tab_left")->plug(context_menu); action("move_tab_left")->plug(context_menu);
static_cast<KMainWindow*>(TQT_TQWIDGET(parent()->parent()))->actionCollection()-> static_cast<TDEMainWindow*>(TQT_TQWIDGET(parent()->parent()))->actionCollection()->
action("move_tab_right")->plug(context_menu); action("move_tab_right")->plug(context_menu);
context_menu->insertSeparator(); context_menu->insertSeparator();
static_cast<KMainWindow*>(TQT_TQWIDGET(parent()->parent()))->actionCollection()-> static_cast<TDEMainWindow*>(TQT_TQWIDGET(parent()->parent()))->actionCollection()->
action("edit_name")->plug(context_menu); action("edit_name")->plug(context_menu);
static_cast<KMainWindow*>(TQT_TQWIDGET(parent()->parent()))->actionCollection()-> static_cast<TDEMainWindow*>(TQT_TQWIDGET(parent()->parent()))->actionCollection()->
action("remove_tab")->plug(context_menu); action("remove_tab")->plug(context_menu);
} }
@ -452,16 +452,16 @@ void TabbedWidget::mousePressEvent(TQMouseEvent* e)
if (!context_menu) createContextMenu(); if (!context_menu) createContextMenu();
static_cast<KMainWindow*>(TQT_TQWIDGET(parent()->parent()))->actionCollection()-> static_cast<TDEMainWindow*>(TQT_TQWIDGET(parent()->parent()))->actionCollection()->
action("move_tab_left")->setEnabled((position - 1 > 0)); action("move_tab_left")->setEnabled((position - 1 > 0));
static_cast<KMainWindow*>(TQT_TQWIDGET(parent()->parent()))->actionCollection()-> static_cast<TDEMainWindow*>(TQT_TQWIDGET(parent()->parent()))->actionCollection()->
action("move_tab_right")->setEnabled((position - 1 < int(items.count()) - 1)); action("move_tab_right")->setEnabled((position - 1 < int(items.count()) - 1));
context_menu->exec(TQCursor::pos()); context_menu->exec(TQCursor::pos());
static_cast<KMainWindow*>(TQT_TQWIDGET(parent()->parent()))->actionCollection()-> static_cast<TDEMainWindow*>(TQT_TQWIDGET(parent()->parent()))->actionCollection()->
action("move_tab_left")->setEnabled(true); action("move_tab_left")->setEnabled(true);
static_cast<KMainWindow*>(TQT_TQWIDGET(parent()->parent()))->actionCollection()-> static_cast<TDEMainWindow*>(TQT_TQWIDGET(parent()->parent()))->actionCollection()->
action("move_tab_right")->setEnabled(true); action("move_tab_right")->setEnabled(true);
} }
} }

4
yakuake/src/tabbed_widget.h
Unescape View File

@ -31,7 +31,7 @@
#include <kinputdialog.h> #include <kinputdialog.h>
class KPopupMenu; class TDEPopupMenu;
class TabbedWidget : public TranslucentWidget class TabbedWidget : public TranslucentWidget
{ {
@ -138,7 +138,7 @@ class TabbedWidget : public TranslucentWidget
TQValueList<int> areas; TQValueList<int> areas;
TQValueList<TQString> captions; TQValueList<TQString> captions;
KPopupMenu* context_menu; TDEPopupMenu* context_menu;
private slots: private slots:

2
yakuake/src/title_bar.cpp
Unescape View File

@ -56,7 +56,7 @@ void TitleBar::setFocusButtonEnabled(bool enable)
focus_button->setToggled(enable); focus_button->setToggled(enable);
} }
void TitleBar::setConfigurationMenu(KPopupMenu* menu) void TitleBar::setConfigurationMenu(TDEPopupMenu* menu)
{ {
config_button->setPopupMenu(menu); config_button->setPopupMenu(menu);
} }

2
yakuake/src/title_bar.h
Unescape View File

@ -47,7 +47,7 @@ class TitleBar : public TQWidget
void setFocusButtonEnabled(bool enable); void setFocusButtonEnabled(bool enable);
void setConfigurationMenu(KPopupMenu* menu); void setConfigurationMenu(TDEPopupMenu* menu);
void reloadSkin(const TQString& skin); void reloadSkin(const TQString& skin);

Write Preview
Loading…
Cancel
Save