diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 15:04:16 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 15:04:16 -0600 |
commit | 41fe6262418d3042e5520aff108f8122fa601ed2 (patch) | |
tree | 0d1d3f9c4497c7483e4094c78d666c5a7aac8327 | |
parent | cbee2148d97ecbb4add07263eca856ff793d9e3d (diff) | |
download | krusader-41fe6262418d3042e5520aff108f8122fa601ed2.tar.gz krusader-41fe6262418d3042e5520aff108f8122fa601ed2.zip |
Rename a number of classes to enhance compatibility with KDE4
64 files changed, 432 insertions, 432 deletions
diff --git a/doc/en/commands.docbook b/doc/en/commands.docbook index 6e113e8..a174fb3 100644 --- a/doc/en/commands.docbook +++ b/doc/en/commands.docbook @@ -1666,7 +1666,7 @@ <!--<listitem>--> <!--<para>--> <!--Please use at this moment the <link linkend="useractions-menu">Useractions menu</link> instead.--> - <!--Our plans for the Usermenu are to make user-configurable KActionMenus.--> + <!--Our plans for the Usermenu are to make user-configurable TDEActionMenus.--> <!--With this one could make a UserMenu containing ⪚ all music-related actions and place--> <!--this in the button-bar.... (or anywhere else).--> <!--</para>--> diff --git a/doc/en/useractions.docbook b/doc/en/useractions.docbook index 4e5774e..c576129 100644 --- a/doc/en/useractions.docbook +++ b/doc/en/useractions.docbook @@ -43,7 +43,7 @@ in <filename> ~/.trinity/share/apps/krusader/useraction-examples.xml</filename>. - UserActions can appear nearly everywhere where "normal" KActions + UserActions can appear nearly everywhere where "normal" TDEActions can be placed. The actions integrate seamlessly into &kde; action system, which means that the standard Edit Toolbar and Edit Shortcut dialogs will show UserActions, diff --git a/doc/ru/commands.docbook b/doc/ru/commands.docbook index 538d2d7..9fc711f 100644 --- a/doc/ru/commands.docbook +++ b/doc/ru/commands.docbook @@ -1379,7 +1379,7 @@ <!--Please use at this moment the <link linkend="useractions-menu" >Useractions menu</link > instead.--> -<!--Our plans for the Usermenu are to make user-configurable KActionMenus.--> +<!--Our plans for the Usermenu are to make user-configurable TDEActionMenus.--> <!--With this one could make a UserMenu containing ⪚ all music-related actions and place--> <!--this in the button-bar.... (or anywhere else).--> <!--</para diff --git a/doc/ru/krusader-tools.docbook b/doc/ru/krusader-tools.docbook index bce65d7..9292487 100644 --- a/doc/ru/krusader-tools.docbook +++ b/doc/ru/krusader-tools.docbook @@ -3390,7 +3390,7 @@ >примеры</link > включены в документацию. UserActions редактируютсяt/добавляются/импортируются-/экспортируются в менеджере действий. UserActions по усолчанию находятся в файле <filename >~/.trinity/share/apps/krusader/useraction_examples.xml</filename ->. UserActions can appear nearly everywhere where "normal" KActions can be placed. They integrate seamless in the well knows Edit-(Toolbar,Shortcut) Dialogs from &kde;. It's even possible to place them in the menubar, but for that one has to manipulate the <filename +>. UserActions can appear nearly everywhere where "normal" TDEActions can be placed. They integrate seamless in the well knows Edit-(Toolbar,Shortcut) Dialogs from &kde;. It's even possible to place them in the menubar, but for that one has to manipulate the <filename >krusaderui.rc</filename > file with an editor. Some examples: <itemizedlist > <listitem diff --git a/krusader/ActionMan/actionproperty.cpp b/krusader/ActionMan/actionproperty.cpp index 6d8eafe..86fcc53 100644 --- a/krusader/ActionMan/actionproperty.cpp +++ b/krusader/ActionMan/actionproperty.cpp @@ -63,7 +63,7 @@ ActionProperty::ActionProperty( TQWidget *parent, const char *name, KrAction *ac connect( ButtonNewFile, TQT_SIGNAL( clicked() ), this, TQT_SLOT( newFile() ) ); connect( ButtonEditFile, TQT_SIGNAL( clicked() ), this, TQT_SLOT( editFile() ) ); connect( ButtonRemoveFile, TQT_SIGNAL( clicked() ), this, TQT_SLOT( removeFile() ) ); - connect( KeyButtonShortcut, TQT_SIGNAL( capturedShortcut(const KShortcut&) ), this, TQT_SLOT( changedShortcut(const KShortcut&) ) ); + connect( KeyButtonShortcut, TQT_SIGNAL( capturedShortcut(const TDEShortcut&) ), this, TQT_SLOT( changedShortcut(const TDEShortcut&) ) ); // track modifications: connect( leDistinctName, TQT_SIGNAL( textChanged(const TQString&) ), TQT_SLOT( setModified() ) ); connect( leTitle, TQT_SIGNAL( textChanged(const TQString&) ), TQT_SLOT( setModified() ) ); @@ -76,7 +76,7 @@ ActionProperty::ActionProperty( TQWidget *parent, const char *name, KrAction *ac connect( leStartpath, TQT_SIGNAL( textChanged(const TQString&) ), TQT_SLOT( setModified() ) ); connect( bgExecType, TQT_SIGNAL( clicked(int) ), TQT_SLOT( setModified() ) ); connect( bgAccept, TQT_SIGNAL( clicked(int) ), TQT_SLOT( setModified() ) ); - connect( KeyButtonShortcut, TQT_SIGNAL( capturedShortcut(const KShortcut&) ), TQT_SLOT( setModified() ) ); + connect( KeyButtonShortcut, TQT_SIGNAL( capturedShortcut(const TDEShortcut&) ), TQT_SLOT( setModified() ) ); connect( leDifferentUser, TQT_SIGNAL( textChanged(const TQString&) ), TQT_SLOT( setModified() ) ); connect( chkDifferentUser, TQT_SIGNAL( clicked() ), TQT_SLOT( setModified() ) ); connect( chkConfirmExecution, TQT_SIGNAL( clicked() ), TQT_SLOT( setModified() ) ); @@ -86,7 +86,7 @@ ActionProperty::ActionProperty( TQWidget *parent, const char *name, KrAction *ac ActionProperty::~ActionProperty() { } -void ActionProperty::changedShortcut( const KShortcut& shortcut ) { +void ActionProperty::changedShortcut( const TDEShortcut& shortcut ) { KeyButtonShortcut->setShortcut( shortcut, false ); } @@ -104,7 +104,7 @@ void ActionProperty::clear() { textDescription->clear(); leCommandline->clear(); leStartpath->clear(); - KeyButtonShortcut->setShortcut( KShortcut(), false ); + KeyButtonShortcut->setShortcut( TDEShortcut(), false ); lbShowonlyProtocol->clear(); lbShowonlyPath->clear(); diff --git a/krusader/ActionMan/actionproperty.h b/krusader/ActionMan/actionproperty.h index b51f71a..d5f7ac1 100644 --- a/krusader/ActionMan/actionproperty.h +++ b/krusader/ActionMan/actionproperty.h @@ -16,7 +16,7 @@ #include "actionpropertybase.h" class KrAction; -class KShortcut; +class TDEShortcut; /** * Use this widget where ever you need to manipulate a UserAction @@ -141,7 +141,7 @@ private slots: * This updates the ShortcutButton * @internal */ - void changedShortcut(const KShortcut& shortcut); + void changedShortcut(const TDEShortcut& shortcut); }; #endif diff --git a/krusader/ActionMan/actionpropertybase.cpp b/krusader/ActionMan/actionpropertybase.cpp index a73ee37..0bffa2f 100644 --- a/krusader/ActionMan/actionpropertybase.cpp +++ b/krusader/ActionMan/actionpropertybase.cpp @@ -241,7 +241,7 @@ ActionPropertyBase::ActionPropertyBase( TQWidget* parent, const char* name, WFla TabPageLayout->addWidget( ButtonRemoveProtocol, 2, 1 ); - lbShowonlyProtocol = new KListBox( TabPage, "lbShowonlyProtocol" ); + lbShowonlyProtocol = new TDEListBox( TabPage, "lbShowonlyProtocol" ); TabPageLayout->addMultiCellWidget( lbShowonlyProtocol, 0, 3, 0, 0 ); tabShowonly->insertTab( TabPage, TQString::fromLatin1("") ); @@ -249,7 +249,7 @@ ActionPropertyBase::ActionPropertyBase( TQWidget* parent, const char* name, WFla tab_3 = new TQWidget( tabShowonly, "tab_3" ); tabLayout_3 = new TQGridLayout( tab_3, 1, 1, 11, 6, "tabLayout_3"); - lbShowonlyPath = new KListBox( tab_3, "lbShowonlyPath" ); + lbShowonlyPath = new TDEListBox( tab_3, "lbShowonlyPath" ); tabLayout_3->addMultiCellWidget( lbShowonlyPath, 0, 3, 0, 0 ); @@ -280,7 +280,7 @@ ActionPropertyBase::ActionPropertyBase( TQWidget* parent, const char* name, WFla tab_4 = new TQWidget( tabShowonly, "tab_4" ); tabLayout_4 = new TQGridLayout( tab_4, 1, 1, 11, 6, "tabLayout_4"); - lbShowonlyMime = new KListBox( tab_4, "lbShowonlyMime" ); + lbShowonlyMime = new TDEListBox( tab_4, "lbShowonlyMime" ); tabLayout_4->addMultiCellWidget( lbShowonlyMime, 0, 3, 0, 0 ); @@ -311,7 +311,7 @@ ActionPropertyBase::ActionPropertyBase( TQWidget* parent, const char* name, WFla TabPage_2 = new TQWidget( tabShowonly, "TabPage_2" ); TabPageLayout_2 = new TQGridLayout( TabPage_2, 1, 1, 11, 6, "TabPageLayout_2"); - lbShowonlyFile = new KListBox( TabPage_2, "lbShowonlyFile" ); + lbShowonlyFile = new TDEListBox( TabPage_2, "lbShowonlyFile" ); TabPageLayout_2->addMultiCellWidget( lbShowonlyFile, 0, 3, 0, 0 ); diff --git a/krusader/ActionMan/actionpropertybase.ui b/krusader/ActionMan/actionpropertybase.ui index 9ecfd94..ff821d2 100644 --- a/krusader/ActionMan/actionpropertybase.ui +++ b/krusader/ActionMan/actionpropertybase.ui @@ -656,7 +656,7 @@ Please consult the handbook to learn more about the syntax.</string> <string>De&lete</string> </property> </widget> - <widget class="KListBox" row="0" column="0" rowspan="4" colspan="1"> + <widget class="TDEListBox" row="0" column="0" rowspan="4" colspan="1"> <property name="name"> <cstring>lbShowonlyProtocol</cstring> </property> @@ -677,7 +677,7 @@ Please consult the handbook to learn more about the syntax.</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="KListBox" row="0" column="0" rowspan="4" colspan="1"> + <widget class="TDEListBox" row="0" column="0" rowspan="4" colspan="1"> <property name="name"> <cstring>lbShowonlyPath</cstring> </property> @@ -799,7 +799,7 @@ Please consult the handbook to learn more about the syntax.</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="KListBox" row="0" column="0" rowspan="4" colspan="1"> + <widget class="TDEListBox" row="0" column="0" rowspan="4" colspan="1"> <property name="name"> <cstring>lbShowonlyMime</cstring> </property> @@ -921,7 +921,7 @@ Please consult the handbook to learn more about the syntax.</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="KListBox" row="0" column="0" rowspan="4" colspan="1"> + <widget class="TDEListBox" row="0" column="0" rowspan="4" colspan="1"> <property name="name"> <cstring>lbShowonlyFile</cstring> </property> diff --git a/krusader/ActionMan/addplaceholderpopup.cpp b/krusader/ActionMan/addplaceholderpopup.cpp index efdb0cc..1806702 100644 --- a/krusader/ActionMan/addplaceholderpopup.cpp +++ b/krusader/ActionMan/addplaceholderpopup.cpp @@ -44,13 +44,13 @@ #define EXECUTABLE_ID 0xFFFF -AddPlaceholderPopup::AddPlaceholderPopup( TQWidget *parent ) : KPopupMenu( parent ) { +AddPlaceholderPopup::AddPlaceholderPopup( TQWidget *parent ) : TDEPopupMenu( parent ) { - _activeSub = new KPopupMenu( this ); - _otherSub = new KPopupMenu( this ); - _leftSub = new KPopupMenu( this ); - _rightSub = new KPopupMenu( this ); - _independentSub = new KPopupMenu( this ); + _activeSub = new TDEPopupMenu( this ); + _otherSub = new TDEPopupMenu( this ); + _leftSub = new TDEPopupMenu( this ); + _rightSub = new TDEPopupMenu( this ); + _independentSub = new TDEPopupMenu( this ); insertItem( i18n( "Active panel" ), _activeSub ); insertItem( i18n( "Other panel" ), _otherSub ); diff --git a/krusader/ActionMan/addplaceholderpopup.h b/krusader/ActionMan/addplaceholderpopup.h index 9173663..604db3b 100644 --- a/krusader/ActionMan/addplaceholderpopup.h +++ b/krusader/ActionMan/addplaceholderpopup.h @@ -31,7 +31,7 @@ class KIntSpinBox; * This reads Expander::placeholder[] and fills a popup for easy access to the UserAction Placeholder * @author Jonas Bhr (http://www.jonas-baehr.de), Shie Erlich */ -class AddPlaceholderPopup : public KPopupMenu { +class AddPlaceholderPopup : public TDEPopupMenu { public: AddPlaceholderPopup( TQWidget *parent ); @@ -52,7 +52,7 @@ protected: TQString getParameter( exp_placeholder* currentPlaceholder ); private: - KPopupMenu *_activeSub, *_otherSub, *_leftSub, *_rightSub, *_independentSub; + TDEPopupMenu *_activeSub, *_otherSub, *_leftSub, *_rightSub, *_independentSub; }; diff --git a/krusader/ActionMan/useractionlistview.cpp b/krusader/ActionMan/useractionlistview.cpp index f9c7a39..6eb7b11 100644 --- a/krusader/ActionMan/useractionlistview.cpp +++ b/krusader/ActionMan/useractionlistview.cpp @@ -29,7 +29,7 @@ ////////////////////////////////////////////////////////////////////////////////////////////////////// UserActionListView::UserActionListView( TQWidget * parent, const char * name ) - : KListView( parent, name ) + : TDEListView( parent, name ) { addColumn( i18n("Title") ); //addColumn( i18n("Identifier") ); @@ -85,7 +85,7 @@ UserActionListViewItem* UserActionListView::insertAction( KrAction* action ) { else { TQListViewItem* categoryItem = findCategoryItem( action->category() ); if ( ! categoryItem ) { - categoryItem = new KListViewItem( this, action->category() ); // create the new category item it not already present + categoryItem = new TDEListViewItem( this, action->category() ); // create the new category item it not already present categoryItem->setSelectable( false ); } item = new UserActionListViewItem( categoryItem, action ); @@ -177,13 +177,13 @@ void UserActionListView::removeSelectedActions() { ////////////////////////////////////////////////////////////////////////////////////////////////////// UserActionListViewItem::UserActionListViewItem( TQListView* view, KrAction* action ) - : KListViewItem( view ) + : TDEListViewItem( view ) { setAction( action ); } UserActionListViewItem::UserActionListViewItem( TQListViewItem* item, KrAction * action ) - : KListViewItem( item ) + : TDEListViewItem( item ) { setAction( action ); } diff --git a/krusader/ActionMan/useractionlistview.h b/krusader/ActionMan/useractionlistview.h index 2fc0f94..35d31d7 100644 --- a/krusader/ActionMan/useractionlistview.h +++ b/krusader/ActionMan/useractionlistview.h @@ -22,7 +22,7 @@ class TQDomDocument; /** * @author Jonas Bähr */ -class UserActionListView : public KListView { +class UserActionListView : public TDEListView { public: UserActionListView( TQWidget* parent = 0, const char* name = 0 ); ~UserActionListView(); @@ -58,7 +58,7 @@ protected: /** * @author Jonas Bähr */ -class UserActionListViewItem : public KListViewItem { +class UserActionListViewItem : public TDEListViewItem { public: UserActionListViewItem( TQListView* view, KrAction* action ); UserActionListViewItem( TQListViewItem* item, KrAction* action ); diff --git a/krusader/BookMan/kraddbookmarkdlg.cpp b/krusader/BookMan/kraddbookmarkdlg.cpp index 47ac377..84d4d17 100644 --- a/krusader/BookMan/kraddbookmarkdlg.cpp +++ b/krusader/BookMan/kraddbookmarkdlg.cpp @@ -62,13 +62,13 @@ void KrAddBookmarkDlg::toggleCreateIn(bool show) { // creates the widget that lets you decide where to put the new bookmark TQWidget *KrAddBookmarkDlg::createInWidget() { - _createIn = new KListView(this); + _createIn = new TDEListView(this); _createIn->addColumn("Folders"); _createIn->header()->hide(); _createIn->setRootIsDecorated(true); _createIn->setAlternateBackground(TQColor()); // disable alternate coloring - KListViewItem *item = new KListViewItem(_createIn, i18n("Bookmarks")); + TDEListViewItem *item = new TDEListViewItem(_createIn, i18n("Bookmarks")); item->setOpen(true); item->setSelected(true); _xr[item] = krBookMan->_root; @@ -83,14 +83,14 @@ TQWidget *KrAddBookmarkDlg::createInWidget() { void KrAddBookmarkDlg::createInSelection(TQListViewItem *item) { if (item) { - _folder->setText(_xr[static_cast<KListViewItem*>(item)]->text()); + _folder->setText(_xr[static_cast<TDEListViewItem*>(item)]->text()); } } -void KrAddBookmarkDlg::populateCreateInWidget(KrBookmark *root, KListViewItem *parent) { +void KrAddBookmarkDlg::populateCreateInWidget(KrBookmark *root, TDEListViewItem *parent) { for (KrBookmark *bm = root->children().first(); bm; bm = root->children().next()) { if (bm->isFolder()) { - KListViewItem *item = new KListViewItem(parent, bm->text()); + TDEListViewItem *item = new TDEListViewItem(parent, bm->text()); item->setOpen(true); _xr[item] = bm; populateCreateInWidget(bm, item); @@ -105,9 +105,9 @@ void KrAddBookmarkDlg::newFolder() { return; // add to the list in bookman KrBookmark *bm = new KrBookmark(newFolder); - krBookMan->addBookmark(bm, _xr[static_cast<KListViewItem*>(_createIn->selectedItem())]); + krBookMan->addBookmark(bm, _xr[static_cast<TDEListViewItem*>(_createIn->selectedItem())]); // fix the gui - KListViewItem *item = new KListViewItem(_createIn->selectedItem(), bm->text()); + TDEListViewItem *item = new TDEListViewItem(_createIn->selectedItem(), bm->text()); _xr[item] = bm; _createIn->setCurrentItem(item); diff --git a/krusader/BookMan/kraddbookmarkdlg.h b/krusader/BookMan/kraddbookmarkdlg.h index cb89172..023cb52 100644 --- a/krusader/BookMan/kraddbookmarkdlg.h +++ b/krusader/BookMan/kraddbookmarkdlg.h @@ -17,11 +17,11 @@ public: KrAddBookmarkDlg(TQWidget *parent, KURL url = 0); KURL url() const { return vfs::fromPathOrURL(_url->text()); } TQString name() const { return _name->text(); } - KrBookmark *folder() const { return _xr[static_cast<KListViewItem*>(_createIn->selectedItem())]; } + KrBookmark *folder() const { return _xr[static_cast<TDEListViewItem*>(_createIn->selectedItem())]; } protected: TQWidget *createInWidget(); - void populateCreateInWidget(KrBookmark *root, KListViewItem *parent); + void populateCreateInWidget(KrBookmark *root, TDEListViewItem *parent); protected slots: void toggleCreateIn(bool show); @@ -32,8 +32,8 @@ private: KLineEdit *_name; KLineEdit *_url; KLineEdit *_folder; - KListView *_createIn; - TQMap<KListViewItem*, KrBookmark*> _xr; + TDEListView *_createIn; + TQMap<TDEListViewItem*, KrBookmark*> _xr; TQToolButton *_createInBtn; }; diff --git a/krusader/BookMan/krbookmark.cpp b/krusader/BookMan/krbookmark.cpp index 6a05606..85ad561 100644 --- a/krusader/BookMan/krbookmark.cpp +++ b/krusader/BookMan/krbookmark.cpp @@ -16,8 +16,8 @@ static const char* NAME_DEVICES = I18N_NOOP("Devices"); static const char* NAME_VIRTUAL = I18N_NOOP("Virtual Filesystem"); static const char* NAME_LAN = I18N_NOOP("Local Network"); -KrBookmark::KrBookmark(TQString name, KURL url, KActionCollection *parent, TQString icon, TQString actionName ): - KAction(name, 0, 0, 0, parent, actionName.isNull() ? BM_NAME(name).latin1() : BM_NAME(actionName).latin1()), +KrBookmark::KrBookmark(TQString name, KURL url, TDEActionCollection *parent, TQString icon, TQString actionName ): + TDEAction(name, 0, 0, 0, parent, actionName.isNull() ? BM_NAME(name).latin1() : BM_NAME(actionName).latin1()), _url(url), _folder(false), _separator(false) { connect(this, TQT_SIGNAL(activated()), this, TQT_SLOT(activatedProxy())); // do we have an icon? @@ -38,15 +38,15 @@ KrBookmark::KrBookmark(TQString name, KURL url, KActionCollection *parent, TQStr } KrBookmark::KrBookmark(TQString name, TQString icon): - KAction(name, 0, 0, 0, 0), _folder(true), _separator(false) { + TDEAction(name, 0, 0, 0, 0), _folder(true), _separator(false) { setIcon(icon=="" ? "folder" : icon); } -KrBookmark* KrBookmark::getExistingBookmark(TQString actionName, KActionCollection *collection) { +KrBookmark* KrBookmark::getExistingBookmark(TQString actionName, TDEActionCollection *collection) { return static_cast<KrBookmark*>(collection->action(BM_NAME(actionName).latin1())); } -KrBookmark* KrBookmark::devices(KActionCollection *collection) { +KrBookmark* KrBookmark::devices(TDEActionCollection *collection) { KrBookmark *bm = getExistingBookmark(i18n(NAME_DEVICES), collection); if (!bm) { #if KDE_IS_VERSION(3,4,0) @@ -59,7 +59,7 @@ KrBookmark* KrBookmark::devices(KActionCollection *collection) { return bm; } -KrBookmark* KrBookmark::virt(KActionCollection *collection) { +KrBookmark* KrBookmark::virt(TDEActionCollection *collection) { KrBookmark *bm = getExistingBookmark(i18n(NAME_VIRTUAL), collection); if (!bm) { bm = new KrBookmark(i18n(NAME_VIRTUAL), "virt:/", collection); @@ -68,7 +68,7 @@ KrBookmark* KrBookmark::virt(KActionCollection *collection) { return bm; } -KrBookmark* KrBookmark::lan(KActionCollection *collection) { +KrBookmark* KrBookmark::lan(TDEActionCollection *collection) { KrBookmark *bm = getExistingBookmark(i18n(NAME_LAN), collection); if (!bm) { bm = new KrBookmark(i18n(NAME_LAN), "lan:/", collection); diff --git a/krusader/BookMan/krbookmark.h b/krusader/BookMan/krbookmark.h index 09d5cf8..d192417 100644 --- a/krusader/BookMan/krbookmark.h +++ b/krusader/BookMan/krbookmark.h @@ -5,13 +5,13 @@ #include <tqptrlist.h> #include <kurl.h> -class KActionCollection; +class TDEActionCollection; -class KrBookmark: public KAction { +class KrBookmark: public TDEAction { Q_OBJECT public: - KrBookmark(TQString name, KURL url, KActionCollection *parent, TQString icon = "", TQString actionName = TQString() ); + KrBookmark(TQString name, KURL url, TDEActionCollection *parent, TQString icon = "", TQString actionName = TQString() ); KrBookmark(TQString name, TQString icon = ""); // creates a folder // text() and setText() to change the name of the bookmark // icon() and setIcon() to change icons (by name) @@ -21,11 +21,11 @@ public: inline bool isSeparator() const { return _separator; } TQPtrList<KrBookmark>& children() { return _children; } - static KrBookmark* getExistingBookmark(TQString actionName, KActionCollection *collection); + static KrBookmark* getExistingBookmark(TQString actionName, TDEActionCollection *collection); // ----- special bookmarks - static KrBookmark* devices(KActionCollection *collection); - static KrBookmark* virt(KActionCollection *collection); - static KrBookmark* lan(KActionCollection *collection); + static KrBookmark* devices(TDEActionCollection *collection); + static KrBookmark* virt(TDEActionCollection *collection); + static KrBookmark* lan(TDEActionCollection *collection); static KrBookmark* separator(); signals: diff --git a/krusader/BookMan/krbookmarkbutton.cpp b/krusader/BookMan/krbookmarkbutton.cpp index 913cf85..b0ce824 100644 --- a/krusader/BookMan/krbookmarkbutton.cpp +++ b/krusader/BookMan/krbookmarkbutton.cpp @@ -16,7 +16,7 @@ KrBookmarkButton::KrBookmarkButton(TQWidget *parent): TQToolButton(parent) { setPopupDelay(10); // 0.01 seconds press setAcceptDrops(false); - acmBookmarks = new KActionMenu(i18n("Bookmarks"), "bookmark", 0, 0); + acmBookmarks = new TDEActionMenu(i18n("Bookmarks"), "bookmark", 0, 0); acmBookmarks->setDelayed(false); acmBookmarks->popupMenu()->setKeyboardShortcutsEnabled(true); acmBookmarks->popupMenu()->setKeyboardShortcutsExecute(true); @@ -27,7 +27,7 @@ KrBookmarkButton::KrBookmarkButton(TQWidget *parent): TQToolButton(parent) { } void KrBookmarkButton::populate() { - krBookMan->populate(static_cast<KPopupMenu*>(popup())); + krBookMan->populate(static_cast<TDEPopupMenu*>(popup())); } void KrBookmarkButton::openPopup() { diff --git a/krusader/BookMan/krbookmarkbutton.h b/krusader/BookMan/krbookmarkbutton.h index 5f527e2..6cf59aa 100644 --- a/krusader/BookMan/krbookmarkbutton.h +++ b/krusader/BookMan/krbookmarkbutton.h @@ -18,7 +18,7 @@ protected slots: void populate(); private: - KActionMenu *acmBookmarks; + TDEActionMenu *acmBookmarks; }; #endif // KRBOOKMARK_BUTTON_H diff --git a/krusader/BookMan/krbookmarkhandler.cpp b/krusader/BookMan/krbookmarkhandler.cpp index 980f049..a08d9af 100644 --- a/krusader/BookMan/krbookmarkhandler.cpp +++ b/krusader/BookMan/krbookmarkhandler.cpp @@ -23,7 +23,7 @@ KrBookmarkHandler::KrBookmarkHandler(): TQObject(0), _middleClick(false), _mainBookmarkPopup( 0 ), _specialBookmarkIDs(), _bookmarkIDTable() { // create our own action collection and make the shortcuts apply only to parent - _privateCollection = new KActionCollection(krApp, "private collection"); + _privateCollection = new TDEActionCollection(krApp, "private collection"); _collection = krApp->actionCollection(); // create _root: father of all bookmarks. it is a dummy bookmark and never shown @@ -271,7 +271,7 @@ SUCCESS: file.close(); } -void KrBookmarkHandler::populate(KPopupMenu *menu) { +void KrBookmarkHandler::populate(TDEPopupMenu *menu) { _mainBookmarkPopup = menu; menu->clear(); _bookmarkIDTable.clear(); @@ -279,14 +279,14 @@ void KrBookmarkHandler::populate(KPopupMenu *menu) { buildMenu(_root, menu); } -void KrBookmarkHandler::buildMenu(KrBookmark *parent, KPopupMenu *menu) { +void KrBookmarkHandler::buildMenu(KrBookmark *parent, TDEPopupMenu *menu) { static int inSecondaryMenu = 0; // used to know if we're on the top menu // run the loop twice, in order to put the folders on top. stupid but easy :-) // note: this code drops the separators put there by the user for (KrBookmark *bm = parent->children().first(); bm; bm = parent->children().next()) { if (!bm->isFolder()) continue; - KPopupMenu *newMenu = new KPopupMenu(menu); + TDEPopupMenu *newMenu = new TDEPopupMenu(menu); int id = menu->insertItem(TQIconSet(krLoader->loadIcon(bm->icon(), KIcon::Small)), bm->text(), newMenu, -1 /* dummy id */, -1 /* end of list */); @@ -327,7 +327,7 @@ void KrBookmarkHandler::buildMenu(KrBookmark *parent, KPopupMenu *menu) { menu->insertSeparator(); // add the popular links submenu - KPopupMenu *newMenu = new KPopupMenu(menu); + TDEPopupMenu *newMenu = new TDEPopupMenu(menu); itemIndex = menu->insertItem(TQIconSet(krLoader->loadIcon("bookmark_folder", KIcon::Small)), i18n("Popular URLs"), newMenu, -1 /* dummy id */, -1 /* end of list */); _specialBookmarkIDs.append( itemIndex ); @@ -565,7 +565,7 @@ void KrBookmarkHandler::rightClicked( TQPopupMenu *menu, int /*id*/, KrBookmark // used to monitor middle clicks. if mid is found, then the // bookmark is opened in a new tab. ugly, but easier than overloading -// KAction and KActionCollection. +// TDEAction and TDEActionCollection. void KrBookmarkHandler::slotActivated(const KURL& url) { if (_middleClick) SLOTS->newTab(url); diff --git a/krusader/BookMan/krbookmarkhandler.h b/krusader/BookMan/krbookmarkhandler.h index 5761e46..d9480c8 100644 --- a/krusader/BookMan/krbookmarkhandler.h +++ b/krusader/BookMan/krbookmarkhandler.h @@ -11,7 +11,7 @@ #include <tqdom.h> #include <tqmap.h> -class KActionCollection; +class TDEActionCollection; class KBookmarkManager; class KrBookmarkHandler: public TQObject { @@ -22,7 +22,7 @@ class KrBookmarkHandler: public TQObject { public: KrBookmarkHandler(); ~KrBookmarkHandler(); - void populate(KPopupMenu *menu); + void populate(TDEPopupMenu *menu); void addBookmark(KrBookmark *bm, KrBookmark *parent = 0); void bookmarkCurrent(KURL url); @@ -35,7 +35,7 @@ protected: void exportToFileFolder(TQDomDocument &doc, TQDomElement &parent, KrBookmark *folder); void exportToFileBookmark(TQDomDocument &doc, TQDomElement &where, KrBookmark *bm); void clearBookmarks(KrBookmark *root); - void buildMenu(KrBookmark *parent, KPopupMenu *menu); + void buildMenu(KrBookmark *parent, TDEPopupMenu *menu); bool eventFilter( TQObject *obj, TQEvent *ev ); @@ -50,13 +50,13 @@ protected slots: void slotActivated(const KURL& url); private: - KActionCollection *_collection, *_privateCollection; + TDEActionCollection *_collection, *_privateCollection; KrBookmark *_root; // the whole KBookmarkManager is an ugly hack. use it until we have our own KBookmarkManager *manager; bool _middleClick; // if true, the user clicked the middle button to open the bookmark - TQGuardedPtr<KPopupMenu> _mainBookmarkPopup; // main bookmark popup menu + TQGuardedPtr<TDEPopupMenu> _mainBookmarkPopup; // main bookmark popup menu TQValueList<int> _specialBookmarkIDs; // the ID list of the special bookmarks TQPtrDict<TQMap<int,KrBookmark*> > _bookmarkIDTable; // the IDs of the bookmarks }; diff --git a/krusader/Dialogs/checksumdlg.cpp b/krusader/Dialogs/checksumdlg.cpp index 1916d76..28006e5 100644 --- a/krusader/Dialogs/checksumdlg.cpp +++ b/krusader/Dialogs/checksumdlg.cpp @@ -239,7 +239,7 @@ CreateChecksumDlg::CreateChecksumDlg(const TQStringList& files, bool containFold ++row; // file list - KListBox *lb = new KListBox(plainPage()); + TDEListBox *lb = new TDEListBox(plainPage()); lb->insertStringList(files); layout->addMultiCellWidget(lb, row, row, 0, 1); ++row; @@ -340,7 +340,7 @@ MatchChecksumDlg::MatchChecksumDlg(const TQStringList& files, bool containFolder ++row; // file list - KListBox *lb = new KListBox(plainPage()); + TDEListBox *lb = new TDEListBox(plainPage()); lb->insertStringList(files); layout->addMultiCellWidget(lb, row, row, 0, 1); ++row; @@ -450,7 +450,7 @@ VerifyResultDlg::VerifyResultDlg(const TQStringList& failed): TQLabel *l3 = new TQLabel(i18n("The following files have failed:"), plainPage()); layout->addMultiCellWidget(l3, row, row, 0, 1); ++row; - KListBox *lb2 = new KListBox(plainPage()); + TDEListBox *lb2 = new TDEListBox(plainPage()); lb2->insertStringList(failed); layout->addMultiCellWidget(lb2, row, row, 0, 1); ++row; @@ -490,7 +490,7 @@ ChecksumResultsDlg::ChecksumResultsDlg(const TQStringList& stdOut, const TQStrin layout->addMultiCellWidget(l2, row, row, 0, 1); ++row; } - KListView *lv = new KListView(plainPage()); + TDEListView *lv = new TDEListView(plainPage()); if(standardFormat){ lv->addColumn(i18n("Hash")); lv->addColumn(i18n("File")); @@ -502,9 +502,9 @@ ChecksumResultsDlg::ChecksumResultsDlg(const TQStringList& stdOut, const TQStrin TQString line = (*it); if(standardFormat) { int space = line.find(' '); - new KListViewItem(lv, line.left(space), line.mid(space+2)); + new TDEListViewItem(lv, line.left(space), line.mid(space+2)); } else { - new KListViewItem(lv, line); + new TDEListViewItem(lv, line); } } layout->addMultiCellWidget(lv, row, row, 0, 1); @@ -522,7 +522,7 @@ ChecksumResultsDlg::ChecksumResultsDlg(const TQStringList& stdOut, const TQStrin TQLabel *l3 = new TQLabel(i18n("Here are the errors received:"), plainPage()); layout->addMultiCellWidget(l3, row, row, 0, 1); ++row; - KListBox *lb = new KListBox(plainPage()); + TDEListBox *lb = new TDEListBox(plainPage()); lb->insertStringList(stdErr); layout->addMultiCellWidget(lb, row, row, 0, 1); ++row; diff --git a/krusader/Dialogs/krdialogs.cpp b/krusader/Dialogs/krdialogs.cpp index 2687c54..7590fad 100644 --- a/krusader/Dialogs/krdialogs.cpp +++ b/krusader/Dialogs/krdialogs.cpp @@ -211,7 +211,7 @@ KURL KURLRequesterDlgForCopy::selectedURL() const { if ( result() == TQDialog::Accepted ) { KURL url = KURL::fromPathOrURL( urlRequester_->url() ); if( url.isValid() ) - KRecentDocument::add(url); + TDERecentDocument::add(url); return url; } else diff --git a/krusader/Dialogs/krkeydialog.cpp b/krusader/Dialogs/krkeydialog.cpp index bc8df72..0a5e763 100644 --- a/krusader/Dialogs/krkeydialog.cpp +++ b/krusader/Dialogs/krkeydialog.cpp @@ -105,7 +105,7 @@ void KrKeyDialog::importLegacyShortcuts( const TQString& file ) { char *actionName; TQDataStream stream(&f); int key; - KAction *action; + TDEAction *action; while (!stream.atEnd()) { stream >> actionName >> key; action = krApp->actionCollection()->action(actionName); @@ -148,9 +148,9 @@ void KrKeyDialog::slotExportShortcuts() { // unfortunately we can't use this function since it only writes the actions which are different from default. //krApp->actionCollection()->writeShortcutSettings( "Shortcuts", &conf ); - KActionShortcutList list( krApp->actionCollection() ); + TDEActionShortcutList list( krApp->actionCollection() ); list.writeSettings( "Shortcuts", &conf, true /* write all actions */ ); - // That does KActionShortcutList::writeSettings for us + // That does TDEActionShortcutList::writeSettings for us //conf.sync(); // write back all changes } diff --git a/krusader/Dialogs/kurllistrequester.cpp b/krusader/Dialogs/kurllistrequester.cpp index 8eba338..da2a296 100644 --- a/krusader/Dialogs/kurllistrequester.cpp +++ b/krusader/Dialogs/kurllistrequester.cpp @@ -145,7 +145,7 @@ void KURLListRequester::slotRightClicked( TQListBoxItem *item ) if( item == 0 ) return; - KPopupMenu popupMenu( this ); + TDEPopupMenu popupMenu( this ); popupMenu.insertItem( i18n( "Delete" ), DELETE_ITEM_ID ); switch( popupMenu.exec( TQCursor::pos() ) ) diff --git a/krusader/Dialogs/popularurls.cpp b/krusader/Dialogs/popularurls.cpp index 528e748..e6a0635 100644 --- a/krusader/Dialogs/popularurls.cpp +++ b/krusader/Dialogs/popularurls.cpp @@ -231,7 +231,7 @@ PopularUrlsDlg::PopularUrlsDlg(): TQGridLayout *layout = new TQGridLayout( plainPage(), 0, KDialog::spacingHint() ); // listview to contain the urls - urls = new KListView(plainPage()); + urls = new TDEListView(plainPage()); urls->header()->hide(); urls->addColumn(""); urls->setSorting(-1); @@ -240,7 +240,7 @@ PopularUrlsDlg::PopularUrlsDlg(): // quick search TQToolButton *btn = new TQToolButton(plainPage()); btn->setIconSet(SmallIcon("locationbar_erase")); - search = new KListViewSearchLine(plainPage(), urls); + search = new TDEListViewSearchLine(plainPage(), urls); search->setTrapReturnKey(true); TQLabel *lbl = new TQLabel(search, i18n(" &Search: "), plainPage()); @@ -290,7 +290,7 @@ void PopularUrlsDlg::run(KURL::List list) { urls->clear(); KURL::List::Iterator it; for (it = list.begin(); it!=list.end(); ++it) { - KListViewItem *item = new KListViewItem(urls, urls->lastItem()); + TDEListViewItem *item = new TDEListViewItem(urls, urls->lastItem()); item->setText(0, (*it).isLocalFile() ? (*it).path() : (*it).prettyURL()); item->setPixmap(0, (*it).isLocalFile() ? SmallIcon("folder") : SmallIcon("folder_html")); } diff --git a/krusader/Dialogs/popularurls.h b/krusader/Dialogs/popularurls.h index 1acccc5..86d5451 100644 --- a/krusader/Dialogs/popularurls.h +++ b/krusader/Dialogs/popularurls.h @@ -59,8 +59,8 @@ private: PopularUrlsDlg *dlg; }; -class KListView; -class KListViewSearchLine; +class TDEListView; +class TDEListViewSearchLine; class PopularUrlsDlg: public KDialogBase { Q_OBJECT @@ -77,8 +77,8 @@ protected slots: void slotItemSelected(TQListViewItem *it); private: - KListView *urls; - KListViewSearchLine *search; + TDEListView *urls; + TDEListViewSearchLine *search; int selection; }; diff --git a/krusader/DiskUsage/diskusage.cpp b/krusader/DiskUsage/diskusage.cpp index 63292cc..98bf019 100644 --- a/krusader/DiskUsage/diskusage.cpp +++ b/krusader/DiskUsage/diskusage.cpp @@ -746,9 +746,9 @@ Directory* DiskUsage::getCurrentDir() return currentDirectory; } -void DiskUsage::rightClickMenu( File *fileItem, KPopupMenu *addPopup, TQString addPopupName ) +void DiskUsage::rightClickMenu( File *fileItem, TDEPopupMenu *addPopup, TQString addPopupName ) { - KPopupMenu popup( this ); + TDEPopupMenu popup( this ); popup.insertTitle( i18n("Disk Usage")); @@ -780,7 +780,7 @@ void DiskUsage::rightClickMenu( File *fileItem, KPopupMenu *addPopup, TQString a popup.changeItem( ADDITIONAL_POPUP_ID, addPopupName ); } - KPopupMenu viewPopup; + TDEPopupMenu viewPopup; viewPopup.insertItem(i18n("Lines"), LINES_VIEW_ID); viewPopup.setAccel( CTRL + Key_L, LINES_VIEW_ID ); viewPopup.insertItem(i18n("Detailed"), DETAILED_VIEW_ID); diff --git a/krusader/DiskUsage/diskusage.h b/krusader/DiskUsage/diskusage.h index 102a5d7..44be72c 100644 --- a/krusader/DiskUsage/diskusage.h +++ b/krusader/DiskUsage/diskusage.h @@ -57,7 +57,7 @@ typedef TQDict<void> Properties; class DUListView; class DULines; class DUFilelight; -class KPopupMenu; +class TDEPopupMenu; class LoaderWidget; class DiskUsage : public TQWidgetStack @@ -93,7 +93,7 @@ public: TQString getToolTip( File * ); - void rightClickMenu( File *, KPopupMenu * = 0, TQString = TQString() ); + void rightClickMenu( File *, TDEPopupMenu * = 0, TQString = TQString() ); void changeDirectory( Directory *dir ); diff --git a/krusader/DiskUsage/dufilelight.cpp b/krusader/DiskUsage/dufilelight.cpp index 62e61e8..869e81c 100644 --- a/krusader/DiskUsage/dufilelight.cpp +++ b/krusader/DiskUsage/dufilelight.cpp @@ -92,11 +92,11 @@ void DUFilelight::mousePressEvent( TQMouseEvent *event ) if( focus && !focus->isFake() && focus->file() != currentDir ) file = (File *)focus->file(); - KPopupMenu filelightPopup; + TDEPopupMenu filelightPopup; filelightPopup.insertItem( i18n("Zoom In"), this, TQT_SLOT( zoomIn() ), Key_Plus ); filelightPopup.insertItem( i18n("Zoom Out"), this, TQT_SLOT( zoomOut() ), Key_Minus ); - KPopupMenu schemePopup; + TDEPopupMenu schemePopup; schemePopup.insertItem( i18n("Rainbow"), this, TQT_SLOT( schemeRainbow() ) ); schemePopup.insertItem( i18n("High Contrast"), this, TQT_SLOT( schemeHighContrast() ) ); schemePopup.insertItem( i18n("KDE"), this, TQT_SLOT( schemeKDE() ) ); diff --git a/krusader/DiskUsage/dulines.cpp b/krusader/DiskUsage/dulines.cpp index 0ed0c67..cf176fe 100644 --- a/krusader/DiskUsage/dulines.cpp +++ b/krusader/DiskUsage/dulines.cpp @@ -456,7 +456,7 @@ void DULines::slotRightClicked( TQListViewItem *item ) if ( item && item->text( 0 ) != ".." ) file = ((DULinesItem *)item)->getFile(); - KPopupMenu linesPopup; + TDEPopupMenu linesPopup; int lid = linesPopup.insertItem( i18n("Show file sizes"), this, TQT_SLOT( slotShowFileSizes() ) ); linesPopup.setItemChecked( lid, showFileSize ); diff --git a/krusader/DiskUsage/radialMap/widgetEvents.cpp b/krusader/DiskUsage/radialMap/widgetEvents.cpp index 53e4c99..47bcf23 100644 --- a/krusader/DiskUsage/radialMap/widgetEvents.cpp +++ b/krusader/DiskUsage/radialMap/widgetEvents.cpp @@ -151,7 +151,7 @@ RadialMap::Widget::mousePressEvent( TQMouseEvent *e ) if( e->button() == Qt::RightButton ) { - KPopupMenu popup; + TDEPopupMenu popup; popup.insertTitle( m_focus->file()->fullPath( m_tree ) ); if( isDir ) diff --git a/krusader/GUI/kcmdmodebutton.cpp b/krusader/GUI/kcmdmodebutton.cpp index dc5a69a..d2a8220 100644 --- a/krusader/GUI/kcmdmodebutton.cpp +++ b/krusader/GUI/kcmdmodebutton.cpp @@ -44,7 +44,7 @@ KCMDModeButton::KCMDModeButton( TQWidget *parent, const char *name ) : TQToolBut */ setIconSet( SmallIcon( "konsole" ) ); adjustSize(); - action = new KActionMenu( i18n("Execution mode") ); + action = new TDEActionMenu( i18n("Execution mode") ); TQ_CHECK_PTR( action ); for( int i=0; Krusader::execTypeArray[i] != 0; i++ ) { diff --git a/krusader/GUI/kcmdmodebutton.h b/krusader/GUI/kcmdmodebutton.h index 70b0a72..824e0cb 100644 --- a/krusader/GUI/kcmdmodebutton.h +++ b/krusader/GUI/kcmdmodebutton.h @@ -25,7 +25,7 @@ #include <tqtoolbutton.h> -class KActionMenu; +class TDEActionMenu; /** * @author Vaclav Juza @@ -47,7 +47,7 @@ public: private: /** The menu containing the actions for switching the mode */ - KActionMenu *action; + TDEActionMenu *action; }; #endif diff --git a/krusader/GUI/krremoteencodingmenu.cpp b/krusader/GUI/krremoteencodingmenu.cpp index 76af521..0dc21ee 100644 --- a/krusader/GUI/krremoteencodingmenu.cpp +++ b/krusader/GUI/krremoteencodingmenu.cpp @@ -44,7 +44,7 @@ #define DATA_KEY TQString::fromLatin1("Charset") KrRemoteEncodingMenu::KrRemoteEncodingMenu(const TQString &text, const TQString &icon, TQObject *parent, const char *name) : - KActionMenu( text, icon, parent, name ), settingsLoaded( false ) + TDEActionMenu( text, icon, parent, name ), settingsLoaded( false ) { connect(popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotAboutToShow())); } @@ -85,7 +85,7 @@ void KrRemoteEncodingMenu::loadSettings() settingsLoaded = true; encodingNames = TDEGlobal::charsets()->descriptiveEncodingNames(); - KPopupMenu *menu = popupMenu(); + TDEPopupMenu *menu = popupMenu(); menu->clear(); TQStringList::ConstIterator it; @@ -107,7 +107,7 @@ int KrRemoteEncodingMenu::plug( TQWidget *widget, int index ) slotCheckEnabled(); } - return KActionMenu::plug( widget, index ); + return TDEActionMenu::plug( widget, index ); } void KrRemoteEncodingMenu::slotCheckEnabled() diff --git a/krusader/GUI/krremoteencodingmenu.h b/krusader/GUI/krremoteencodingmenu.h index da5a975..df6a9d5 100644 --- a/krusader/GUI/krremoteencodingmenu.h +++ b/krusader/GUI/krremoteencodingmenu.h @@ -37,7 +37,7 @@ #include <klibloader.h> #include <kaction.h> -class KrRemoteEncodingMenu: public KActionMenu +class KrRemoteEncodingMenu: public TDEActionMenu { Q_OBJECT diff --git a/krusader/GUI/profilemanager.cpp b/krusader/GUI/profilemanager.cpp index 7387ba9..caa405d 100644 --- a/krusader/GUI/profilemanager.cpp +++ b/krusader/GUI/profilemanager.cpp @@ -63,7 +63,7 @@ void ProfileManager::profilePopup() #define OVERWRITE_ENTRY_ID 4000 // create the menu - KPopupMenu popup, removePopup, overwritePopup; + TDEPopupMenu popup, removePopup, overwritePopup; popup.insertTitle(i18n("Profiles")); for( unsigned i=0; i != profileList.count() ; i++ ) diff --git a/krusader/KViewer/krviewer.h b/krusader/KViewer/krviewer.h index 99e7175..83144f3 100644 --- a/krusader/KViewer/krviewer.h +++ b/krusader/KViewer/krviewer.h @@ -99,8 +99,8 @@ private: int detachActionIndex; - KAction *printAction; - KAction *copyAction; + TDEAction *printAction; + TDEAction *copyAction; int tabCloseID; int closeID; diff --git a/krusader/Konfigurator/konfiguratoritems.cpp b/krusader/Konfigurator/konfiguratoritems.cpp index 13e0fb2..c6cf45d 100644 --- a/krusader/Konfigurator/konfiguratoritems.cpp +++ b/krusader/Konfigurator/konfiguratoritems.cpp @@ -436,7 +436,7 @@ void KonfiguratorFontChooser::slotSetDefaults(TQObject *) void KonfiguratorFontChooser::slotBrowseFont() { - int ok=KFontDialog::getFont( font ); + int ok=TDEFontDialog::getFont( font ); if (ok!=1) return; // cancelled by the user ext->setChanged(); setFont(); diff --git a/krusader/Locate/locate.cpp b/krusader/Locate/locate.cpp index 8cdfce7..8f566ad 100755 --- a/krusader/Locate/locate.cpp +++ b/krusader/Locate/locate.cpp @@ -65,10 +65,10 @@ #define COPY_SELECTED_TO_CLIPBOARD 95 ////////////////////////////////////////////////////////// -class LocateListView : public KListView +class LocateListView : public TDEListView { public: - LocateListView( TQWidget * parent, const char * name = 0 ) : KListView( parent, name ) + LocateListView( TQWidget * parent, const char * name = 0 ) : TDEListView( parent, name ) { } @@ -321,9 +321,9 @@ void LocateDlg::processStdout(TDEProcess *proc, char *buffer, int length) } if( lastItem ) - lastItem = new KListViewItem( resultList, lastItem, *it ); + lastItem = new TDEListViewItem( resultList, lastItem, *it ); else - lastItem = new KListViewItem( resultList, *it ); + lastItem = new TDEListViewItem( resultList, *it ); lastItem->setDragEnabled( true ); } @@ -351,7 +351,7 @@ void LocateDlg::slotRightClick(TQListViewItem *item) return; // create the menu - KPopupMenu popup; + TDEPopupMenu popup; popup.insertTitle(i18n("Locate")); popup.insertItem(i18n("View (F3)"), VIEW_ID); @@ -479,7 +479,7 @@ void LocateDlg::operate( TQListViewItem *item, int task ) resultList->setCurrentItem( ( findOptions & KFindDialog::FindBackwards ) ? resultList->lastItem() : resultList->firstChild() ); - findCurrentItem = (KListViewItem *)resultList->currentItem(); + findCurrentItem = (TDEListViewItem *)resultList->currentItem(); if( find() && findCurrentItem ) resultList->setCurrentItem( findCurrentItem ); @@ -495,7 +495,7 @@ void LocateDlg::operate( TQListViewItem *item, int task ) if( task == FIND_PREV_ID ) findOptions ^= KFindDialog::FindBackwards; - findCurrentItem = (KListViewItem *)resultList->currentItem(); + findCurrentItem = (TDEListViewItem *)resultList->currentItem(); nextLine(); if( find() && findCurrentItem ) @@ -536,9 +536,9 @@ void LocateDlg::operate( TQListViewItem *item, int task ) void LocateDlg::nextLine() { if( findOptions & KFindDialog::FindBackwards ) - findCurrentItem = (KListViewItem *)findCurrentItem->itemAbove(); + findCurrentItem = (TDEListViewItem *)findCurrentItem->itemAbove(); else - findCurrentItem = (KListViewItem *)findCurrentItem->itemBelow(); + findCurrentItem = (TDEListViewItem *)findCurrentItem->itemBelow(); } bool LocateDlg::find() diff --git a/krusader/Locate/locate.h b/krusader/Locate/locate.h index e7f65a9..fd1d46f 100755 --- a/krusader/Locate/locate.h +++ b/krusader/Locate/locate.h @@ -81,15 +81,15 @@ private: TQString pattern; KHistoryCombo *locateSearchFor; - KListView *resultList; + TDEListView *resultList; TQString remaining; - KListViewItem *lastItem; + TDEListViewItem *lastItem; TQString collectedErr; long findOptions; TQString findPattern; - KListViewItem *findCurrentItem; + TDEListViewItem *findCurrentItem; TQCheckBox *dontSearchInPath; TQCheckBox *existingFiles; diff --git a/krusader/MountMan/kmountman.cpp b/krusader/MountMan/kmountman.cpp index e322717..4e1d930 100644 --- a/krusader/MountMan/kmountman.cpp +++ b/krusader/MountMan/kmountman.cpp @@ -252,7 +252,7 @@ void KMountMan::quickList() { } // clear the popup menu - ( ( KToolBarPopupAction* ) krMountMan ) ->popupMenu() ->clear(); + ( ( TDEToolBarPopupAction* ) krMountMan ) ->popupMenu() ->clear(); // create lists of current and possible mount points KMountPoint::List current = KMountPoint::currentMountPoints(); @@ -288,9 +288,9 @@ void KMountMan::quickList() { " (" + m->mountedFrom() + ")"; - ( ( KToolBarPopupAction* ) krMountMan ) ->popupMenu() ->insertItem( text, idx ); + ( ( TDEToolBarPopupAction* ) krMountMan ) ->popupMenu() ->insertItem( text, idx ); } - connect( ( ( KToolBarPopupAction* ) krMountMan ) ->popupMenu(), TQT_SIGNAL( activated( int ) ), + connect( ( ( TDEToolBarPopupAction* ) krMountMan ) ->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( delayedPerformAction( int ) ) ); } @@ -321,7 +321,7 @@ void KMountMan::performAction( int idx ) { // free memory delete[] _actions; _actions = 0L; - disconnect( ( ( KToolBarPopupAction* ) krMountMan ) ->popupMenu(), TQT_SIGNAL( activated( int ) ), 0, 0 ); + disconnect( ( ( TDEToolBarPopupAction* ) krMountMan ) ->popupMenu(), TQT_SIGNAL( activated( int ) ), 0, 0 ); } #include "kmountman.moc" diff --git a/krusader/MountMan/kmountmangui.cpp b/krusader/MountMan/kmountmangui.cpp index f3f013f..ef36fc0 100644 --- a/krusader/MountMan/kmountmangui.cpp +++ b/krusader/MountMan/kmountmangui.cpp @@ -327,7 +327,7 @@ void KMountManGUI::clicked( TQListViewItem *item, const TQPoint& pos, int /* col exit( 0 ); } // create the menu - KPopupMenu popup; + TDEPopupMenu popup; popup.insertTitle( i18n( "MountMan" ) ); if ( !system->mounted() ) { popup.insertItem( i18n( "Mount" ), MOUNT_ID ); diff --git a/krusader/Panel/krbriefview.cpp b/krusader/Panel/krbriefview.cpp index aadd05f..3b24c70 100644 --- a/krusader/Panel/krbriefview.cpp +++ b/krusader/Panel/krbriefview.cpp @@ -1345,7 +1345,7 @@ void KrBriefView::initProperties() { void KrBriefView::setColumnNr() { - KPopupMenu popup( this ); + TDEPopupMenu popup( this ); popup.insertTitle( i18n("Columns")); int COL_ID = 14700; diff --git a/krusader/Panel/krdetailedview.cpp b/krusader/Panel/krdetailedview.cpp index 0400f82..e5d68a7 100644 --- a/krusader/Panel/krdetailedview.cpp +++ b/krusader/Panel/krdetailedview.cpp @@ -88,7 +88,7 @@ YP YD 88 YD ~Y8888P' `8888Y' YP YP Y8888D' Y88888P 88 YD TQString KrDetailedView::ColumnName[ KrDetailedViewProperties::MAX_COLUMNS ]; KrDetailedView::KrDetailedView( TQWidget *parent, bool &left, TDEConfig *cfg, const char *name ) : - KListView( parent, name ), KrView( cfg ), _currDragItem( 0L ), currentlyRenamedItem( 0 ), + TDEListView( parent, name ), KrView( cfg ), _currDragItem( 0L ), currentlyRenamedItem( 0 ), pressedItem( 0 ) { setWidget( this ); _nameInTDEConfig=TQString( "KrDetailedView" ) + TQString( ( left ? "Left" : "Right" ) ) ; @@ -193,7 +193,7 @@ void KrDetailedView::setup() { setTooltipColumn( COLUMN(Name) ); setDropVisualizer(false); setDropHighlighter(true); - setSelectionModeExt( KListView::FileManager ); + setSelectionModeExt( TDEListView::FileManager ); setAllColumnsShowFocus( true ); setShowSortIndicator( true ); header() ->setStretchEnabled( true, COLUMN(Name) ); @@ -357,7 +357,7 @@ void KrDetailedView::addItems( vfs *v, bool addUpDir ) { if ( !currentItem ) currentItem = firstChild(); - KListView::setCurrentItem( currentItem ); + TDEListView::setCurrentItem( currentItem ); ensureItemVisible( currentItem ); op()->emitItemDescription( statusText ); @@ -374,7 +374,7 @@ TQString KrDetailedView::getCurrentItem() const { void KrDetailedView::setCurrentItem( const TQString& name ) { KrDetailedViewItem * it = dynamic_cast<KrDetailedViewItem*>(_dict[ name ]); if ( it ) - KListView::setCurrentItem( it ); + TDEListView::setCurrentItem( it ); } void KrDetailedView::clear() { @@ -388,7 +388,7 @@ void KrDetailedView::clear() { /* KDE HACK END */ op()->emitSelectionChanged(); /* to avoid rename crash at refresh */ - KListView::clear(); + TDEListView::clear(); KrView::clear(); } @@ -423,7 +423,7 @@ void KrDetailedView::setSortMode( KrViewProperties::SortSpec mode ) { if ( mode & KrViewProperties::Group ) cl = COLUMN( Group ); setSorting( cl, ascending ); - KListView::sort(); + TDEListView::sort(); } void KrDetailedView::slotClicked( TQListViewItem *item ) { @@ -497,7 +497,7 @@ void KrDetailedView::handleQuickSearchEvent( TQKeyEvent * e ) { case Key_Insert: { TQKeyEvent ev = TQKeyEvent( TQKeyEvent::KeyPress, Key_Space, 0, 0 ); - KListView::keyPressEvent( & ev ); + TDEListView::keyPressEvent( & ev ); ev = TQKeyEvent( TQKeyEvent::KeyPress, Key_Down, 0, 0 ); keyPressEvent( & ev ); break; @@ -680,7 +680,7 @@ void KrDetailedView::contentsMousePressEvent( TQMouseEvent * e ) { if( newCurrent ) // save the name of the file name = static_cast<KrDetailedViewItem*>( newCurrent ) ->name(); - KListView::contentsMousePressEvent( e ); + TDEListView::contentsMousePressEvent( e ); if( name.isEmpty() || _dict.find( name ) == 0 ) // is the file still valid? newCurrent = 0; // if not, don't do any crash... @@ -717,7 +717,7 @@ void KrDetailedView::contentsMousePressEvent( TQMouseEvent * e ) { void KrDetailedView::contentsMouseReleaseEvent( TQMouseEvent * e ) { if (e->button() == Qt::RightButton) contextMenuTimer.stop(); - KListView::contentsMouseReleaseEvent( e ); + TDEListView::contentsMouseReleaseEvent( e ); if( pressedItem ) { TQPoint vp = contentsToViewport( e->pos() ); @@ -788,13 +788,13 @@ void KrDetailedView::contentsMouseMoveEvent ( TQMouseEvent * e ) { emit onViewport(); } else - KListView::contentsMouseMoveEvent( e ); + TDEListView::contentsMouseMoveEvent( e ); } void KrDetailedView::contentsWheelEvent( TQWheelEvent * e ) { if ( !_focused ) op()->emitNeedFocus(); - KListView::contentsWheelEvent( e ); + TDEListView::contentsWheelEvent( e ); } void KrDetailedView::handleContextMenu( TQListViewItem * it, const TQPoint & pos, int ) { @@ -821,7 +821,7 @@ void KrDetailedView::showContextMenu() } KrViewItem *KrDetailedView::getKrViewItemAt( const TQPoint & vp ) { - return dynamic_cast<KrViewItem*>( KListView::itemAt( vp ) ); + return dynamic_cast<KrViewItem*>( TDEListView::itemAt( vp ) ); } bool KrDetailedView::acceptDrag( TQDropEvent* ) const { @@ -845,7 +845,7 @@ void KrDetailedView::contentsDropEvent( TQDropEvent * e ) { e->setPoint( contentsToViewport( e->pos() ) ); op()->emitGotDrop(e); e->ignore(); - KListView::contentsDropEvent( e ); + TDEListView::contentsDropEvent( e ); } void KrDetailedView::contentsDragMoveEvent( TQDragMoveEvent * e ) { @@ -853,7 +853,7 @@ void KrDetailedView::contentsDragMoveEvent( TQDragMoveEvent * e ) { if( _currDragItem && !_currDragItem->VF->vfile_isDir() ) _currDragItem = 0; - KListView::contentsDragMoveEvent( e ); + TDEListView::contentsDragMoveEvent( e ); } void KrDetailedView::imStartEvent(TQIMEvent* e) @@ -864,7 +864,7 @@ void KrDetailedView::imStartEvent(TQIMEvent* e) }else { TDEConfigGroupSaver grpSvr( _config, "Look&Feel" ); if ( !_config->readBoolEntry( "New Style Quicksearch", _NewStyleQuicksearch ) ) - KListView::imStartEvent( e ); + TDEListView::imStartEvent( e ); else { // first, show the quicksearch if its hidden if ( ACTIVE_PANEL->quickSearch->isHidden() ) { @@ -921,7 +921,7 @@ void KrDetailedView::keyPressEvent( TQKeyEvent * e ) { TQListView::setCurrentItem( i ); TQListView::ensureItemVisible( i ); } - } else KListView::keyPressEvent(e); + } else TDEListView::keyPressEvent(e); break; case Key_Down : if ( e->state() == ControlButton || e->state() == ( ControlButton | ShiftButton ) ) { // let the panel handle it - jump to command line @@ -933,7 +933,7 @@ void KrDetailedView::keyPressEvent( TQKeyEvent * e ) { if ( e->state() == ShiftButton ) setSelected( i, !i->isSelected() ); i = i->itemBelow(); if ( i ) {TQListView::setCurrentItem( i ); TQListView::ensureItemVisible( i ); } - } else KListView::keyPressEvent(e); + } else TDEListView::keyPressEvent(e); break; case Key_Next: if (!KrSelectionMode::getSelectionHandler()->useTQTSelection()){ TQListViewItem * i = currentItem(), *j; @@ -943,7 +943,7 @@ void KrDetailedView::keyPressEvent( TQKeyEvent * e ) { for ( int page = visibleHeight() / r.height() - 1; page > 0 && ( j = i->itemBelow() ); --page ) i = j; if ( i ) {TQListView::setCurrentItem( i ); TQListView::ensureItemVisible( i ); } - } else KListView::keyPressEvent(e); + } else TDEListView::keyPressEvent(e); break; case Key_Prior: if (!KrSelectionMode::getSelectionHandler()->useTQTSelection()){ TQListViewItem * i = currentItem(), *j; @@ -953,13 +953,13 @@ void KrDetailedView::keyPressEvent( TQKeyEvent * e ) { for ( int page = visibleHeight() / r.height() - 1; page > 0 && ( j = i->itemAbove() ); --page ) i = j; if ( i ) {TQListView::setCurrentItem( i ); TQListView::ensureItemVisible( i ); } - } else KListView::keyPressEvent(e); + } else TDEListView::keyPressEvent(e); break; case Key_Home: if (!KrSelectionMode::getSelectionHandler()->useTQTSelection()){ if ( e->state() & ShiftButton ) /* Shift+Home */ { clearSelection(); - KListView::keyPressEvent( e ); + TDEListView::keyPressEvent( e ); op()->emitSelectionChanged(); triggerUpdate(); break; @@ -967,13 +967,13 @@ void KrDetailedView::keyPressEvent( TQKeyEvent * e ) { TQListViewItem * i = firstChild(); if ( i ) {TQListView::setCurrentItem( i ); TQListView::ensureItemVisible( i ); } } - } else KListView::keyPressEvent(e); + } else TDEListView::keyPressEvent(e); break; case Key_End: if (!KrSelectionMode::getSelectionHandler()->useTQTSelection()){ if ( e->state() & ShiftButton ) /* Shift+End */ { clearSelection(); - KListView::keyPressEvent( e ); + TDEListView::keyPressEvent( e ); op()->emitSelectionChanged(); triggerUpdate(); break; @@ -986,7 +986,7 @@ void KrDetailedView::keyPressEvent( TQKeyEvent * e ) { if ( i ) {TQListView::setCurrentItem( i ); TQListView::ensureItemVisible( i ); } break; } - } else KListView::keyPressEvent(e); + } else TDEListView::keyPressEvent(e); break; case Key_Enter : case Key_Return : { @@ -1048,7 +1048,7 @@ void KrDetailedView::keyPressEvent( TQKeyEvent * e ) { return ; // safety } //case Key_Up : - //KListView::keyPressEvent( e ); + //TDEListView::keyPressEvent( e ); //break; /*#ifndef _newSelectionHandling case Key_Down : @@ -1056,7 +1056,7 @@ void KrDetailedView::keyPressEvent( TQKeyEvent * e ) { e->ignore(); break; } else - KListView::keyPressEvent( e ); + TDEListView::keyPressEvent( e ); break; #endif*/ case Key_Delete : // kill file @@ -1065,11 +1065,11 @@ void KrDetailedView::keyPressEvent( TQKeyEvent * e ) { break ; case Key_Insert : { if (KrSelectionMode::getSelectionHandler()->insertMovesDown()) - KListView::keyPressEvent( e ); + TDEListView::keyPressEvent( e ); else { TQKeyEvent ev = TQKeyEvent( TQKeyEvent::KeyPress, Key_Space, 0, 0 ); - KListView::keyPressEvent( & ev ); + TDEListView::keyPressEvent( & ev ); } break ; } @@ -1079,10 +1079,10 @@ void KrDetailedView::keyPressEvent( TQKeyEvent * e ) { if (KrSelectionMode::getSelectionHandler()->spaceMovesDown()) { TQKeyEvent ev = TQKeyEvent( TQKeyEvent::KeyPress, Key_Insert, 0, 0 ); - KListView::keyPressEvent( & ev ); + TDEListView::keyPressEvent( & ev ); } else - KListView::keyPressEvent( e ); + TDEListView::keyPressEvent( e ); break ; } if ( viewItem->VF->vfile_isDir() && viewItem->VF->vfile_getSize() <= 0 && @@ -1108,15 +1108,15 @@ void KrDetailedView::keyPressEvent( TQKeyEvent * e ) { mark: if (KrSelectionMode::getSelectionHandler()->spaceMovesDown()) { TQKeyEvent ev = TQKeyEvent( TQKeyEvent::KeyPress, Key_Insert, 0, 0 ); - KListView::keyPressEvent( & ev ); + TDEListView::keyPressEvent( & ev ); } else - KListView::keyPressEvent( e ); + TDEListView::keyPressEvent( e ); } break; case Key_A : // mark all if ( e->state() == ControlButton ) { - KListView::keyPressEvent( e ); + TDEListView::keyPressEvent( e ); updateView(); break; } @@ -1137,7 +1137,7 @@ mark: if (KrSelectionMode::getSelectionHandler()->spaceMovesDown()) { TDEConfigGroupSaver grpSvr( _config, "Look&Feel" ); if ( !_config->readBoolEntry( "New Style Quicksearch", _NewStyleQuicksearch ) ) - KListView::keyPressEvent( e ); + TDEListView::keyPressEvent( e ); else { // first, show the quicksearch if its hidden if ( ACTIVE_PANEL->quickSearch->isHidden() ) { @@ -1162,7 +1162,7 @@ mark: if (KrSelectionMode::getSelectionHandler()->spaceMovesDown()) ACTIVE_PANEL->quickSearch->clear(); krDirUp->setEnabled( true ); } - KListView::keyPressEvent( e ); + TDEListView::keyPressEvent( e ); } } // emit the new item description @@ -1183,7 +1183,7 @@ void KrDetailedView::rename( TQListViewItem * item, int c ) { renameLineEdit()->setBackgroundMode(TQt::FixedColor); renameLineEdit()->setPaletteBackgroundColor(TQt::white); renameLineEdit()->setPaletteForegroundColor(TQt::black); - KListView::rename( item, c ); + TDEListView::rename( item, c ); renameLineEdit() ->selectAll(); } @@ -1351,7 +1351,7 @@ bool KrDetailedView::event( TQEvent *e ) { default: CANCEL_TWO_CLICK_RENAME; } - return KListView::event( e ); + return TDEListView::event( e ); } bool KrDetailedView::eventFilter( TQObject * watched, TQEvent * e ) @@ -1380,7 +1380,7 @@ bool KrDetailedView::eventFilter( TQObject * watched, TQEvent * e ) } return FALSE; } - return KListView::eventFilter( watched, e ); + return TDEListView::eventFilter( watched, e ); } void KrDetailedView::makeItemVisible( const KrViewItem *item ) { @@ -1433,7 +1433,7 @@ void KrDetailedView::initProperties() { void KrDetailedView::selectColumns() { - KPopupMenu popup( this ); + TDEPopupMenu popup( this ); popup.insertTitle( i18n("Columns")); bool refresh = false; diff --git a/krusader/Panel/krdetailedview.h b/krusader/Panel/krdetailedview.h index 8fa02c9..a12dd45 100644 --- a/krusader/Panel/krdetailedview.h +++ b/krusader/Panel/krdetailedview.h @@ -64,12 +64,12 @@ class KrDetailedViewItem; /** * KrDetailedView implements everthing and anything regarding a detailed view in a filemananger. - * IT MUST USE KrViewItem as the children to it's *KListView. KrDetailedView and KrViewItem are + * IT MUST USE KrViewItem as the children to it's *TDEListView. KrDetailedView and KrViewItem are * tightly coupled and the view will not work with other kinds of items. * Apart from this, the view is self-reliant and you can use the vast interface to get whatever * information is necessery from it. */ -class KrDetailedView : public KListView, public KrView { +class KrDetailedView : public TDEListView, public KrView { Q_OBJECT friend class KrDetailedViewItem; @@ -80,8 +80,8 @@ public: virtual int column( KrDetailedViewProperties::ColumnType type ); virtual inline KrViewItem *getFirst() { return dynamic_cast<KrViewItem*>( firstChild() ); } virtual inline KrViewItem *getLast() { return dynamic_cast<KrViewItem*>( lastChild() ); } - virtual inline KrViewItem *getNext( KrViewItem *current ) { return dynamic_cast<KrViewItem*>( dynamic_cast<KListViewItem*>( current ) ->itemBelow() ); } - virtual inline KrViewItem *getPrev( KrViewItem *current ) { return dynamic_cast<KrViewItem*>( dynamic_cast<KListViewItem*>( current ) ->itemAbove() ); } + virtual inline KrViewItem *getNext( KrViewItem *current ) { return dynamic_cast<KrViewItem*>( dynamic_cast<TDEListViewItem*>( current ) ->itemBelow() ); } + virtual inline KrViewItem *getPrev( KrViewItem *current ) { return dynamic_cast<KrViewItem*>( dynamic_cast<TDEListViewItem*>( current ) ->itemAbove() ); } virtual inline KrViewItem *getCurrentKrViewItem() { return dynamic_cast<KrViewItem*>( currentItem() ); } virtual KrViewItem *getKrViewItemAt( const TQPoint &vp ); virtual inline KrViewItem *findItemByName( const TQString &name ) { return dynamic_cast<KrViewItem*>( findItem( name, 0 ) ); } @@ -92,12 +92,12 @@ public: virtual void updateView(); virtual void updateItem(KrViewItem* item); virtual void clear(); - virtual void sort() { KListView::sort(); } + virtual void sort() { TDEListView::sort(); } virtual void setSortMode( KrViewProperties::SortSpec mode ); virtual void prepareForActive(); virtual void prepareForPassive(); - virtual inline void saveSettings() { KListView::saveLayout( _config, nameInTDEConfig() ); } - virtual inline void restoreSettings() { KListView::restoreLayout( _config, nameInTDEConfig() ); } + virtual inline void saveSettings() { TDEListView::saveLayout( _config, nameInTDEConfig() ); } + virtual inline void restoreSettings() { TDEListView::restoreLayout( _config, nameInTDEConfig() ); } signals: void middleButtonClicked( KrViewItem *item ); diff --git a/krusader/Panel/krdetailedviewitem.cpp b/krusader/Panel/krdetailedviewitem.cpp index 2c17c9f..9ef3183 100644 --- a/krusader/Panel/krdetailedviewitem.cpp +++ b/krusader/Panel/krdetailedviewitem.cpp @@ -58,7 +58,7 @@ int KrDetailedViewItem::expHeight = 0; #endif // FASTER KrDetailedViewItem::KrDetailedViewItem(KrDetailedView *parent, TQListViewItem *after, vfile *vf): - KListViewItem(parent, after), KrViewItem(vf, parent->properties()) { + TDEListViewItem(parent, after), KrViewItem(vf, parent->properties()) { #ifdef FASTER initiated = false; // get the expected height of an item - should be done only once @@ -92,7 +92,7 @@ void KrDetailedViewItem::setup() { // idea: when not having pixmaps in the first place, the height of the item is smaller then with // the pixmap. when the pixmap is inserted, the item resizes, thereby making ensureItemVisible() // become 'confused' and stop working. therefore, we set the correct height here and avoid the issue - KListViewItem::setup(); + TDEListViewItem::setup(); setHeight(expHeight); } #endif @@ -179,10 +179,10 @@ void KrDetailedViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int col TQColorGroup _cg(cg); - // This is ugly! I had to dublicate KListViewItem::paintCell() code, as the - // KListViewItem::paintCell() overwrites my color settings. So KrDetailedViewItem::paintCell - // must dublicate the KListViewItem::paintCell() code, do the required color settings - // and call TQListViewItem::paintCell() afterwards (the base class of KListViewItem). + // This is ugly! I had to dublicate TDEListViewItem::paintCell() code, as the + // TDEListViewItem::paintCell() overwrites my color settings. So KrDetailedViewItem::paintCell + // must dublicate the TDEListViewItem::paintCell() code, do the required color settings + // and call TQListViewItem::paintCell() afterwards (the base class of TDEListViewItem). // This tabooed in the object oriented heaven, but necessary here. Blame the KDE team for // this really poor paintCell implementation! @@ -194,9 +194,9 @@ void KrDetailedViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int col } else if (isAlternate()) if (listView()->viewport()->backgroundMode()==TQt::FixedColor) - _cg.setColor(TQColorGroup::Background, static_cast< KListView* >(listView())->alternateBackground()); + _cg.setColor(TQColorGroup::Background, static_cast< TDEListView* >(listView())->alternateBackground()); else - _cg.setColor(TQColorGroup::Base, static_cast< KListView* >(listView())->alternateBackground()); + _cg.setColor(TQColorGroup::Base, static_cast< TDEListView* >(listView())->alternateBackground()); // end of uglyness diff --git a/krusader/Panel/krdetailedviewitem.h b/krusader/Panel/krdetailedviewitem.h index 07ee45b..a689baf 100644 --- a/krusader/Panel/krdetailedviewitem.h +++ b/krusader/Panel/krdetailedviewitem.h @@ -42,13 +42,13 @@ class TQPixmap; class KrDetailedView; -class KrDetailedViewItem : public KListViewItem, public KrViewItem { +class KrDetailedViewItem : public TDEListViewItem, public KrViewItem { friend class KrDetailedView; friend class KrCalcSpaceDialog; public: KrDetailedViewItem(KrDetailedView *parent, TQListViewItem *after, vfile *vf); - inline bool isSelected() const { return KListViewItem::isSelected(); } - inline void setSelected(bool s) { KListViewItem::setSelected(s); } + inline bool isSelected() const { return TDEListViewItem::isSelected(); } + inline void setSelected(bool s) { TDEListViewItem::setSelected(s); } int compare(TQListViewItem *i,int col,bool ascending ) const; void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align); void repaintItem(); @@ -60,7 +60,7 @@ public: protected: // text() was made protected in order to catch every place where text(x) is used // to gain unlawful information on the object - virtual inline TQString text(int column) const { return KListViewItem::text(column); } + virtual inline TQString text(int column) const { return TDEListViewItem::text(column); } private: static const TQColor & setColorIfContrastIsSufficient(const TQColor & background, const TQColor & color1, const TQColor & color2); diff --git a/krusader/Panel/krpopupmenu.cpp b/krusader/Panel/krpopupmenu.cpp index cd323b0..d6ab5c0 100644 --- a/krusader/Panel/krpopupmenu.cpp +++ b/krusader/Panel/krpopupmenu.cpp @@ -38,7 +38,7 @@ void KrPopupMenu::run(const TQPoint &pos, ListPanel *panel) { menu.performAction(result); } -KrPopupMenu::KrPopupMenu(ListPanel *thePanel, TQWidget *parent) : KPopupMenu(parent), panel(thePanel), empty(false), +KrPopupMenu::KrPopupMenu(ListPanel *thePanel, TQWidget *parent) : TDEPopupMenu(parent), panel(thePanel), empty(false), multipleSelections(false),actions(0) { #ifdef __LIBKONTQ__ konqMenu = 0; @@ -116,7 +116,7 @@ KrPopupMenu::KrPopupMenu(ListPanel *thePanel, TQWidget *parent) : KPopupMenu(par #ifdef __LIBKONTQ__ // -------------- konqueror menu - actions = new KActionCollection(this); + actions = new TDEActionCollection(this); konqMenu = new KonqPopupMenu( KonqBookmarkManager::self(), _items, panel->func->files()->vfs_getOrigin(), *actions, 0, this, KonqPopupMenu::NoFlags, KParts::BrowserExtension::DefaultPopupItems ); insertItem( TQPixmap(), konqMenu, KONTQ_MENU_ID ); diff --git a/krusader/Panel/krpopupmenu.h b/krusader/Panel/krpopupmenu.h index 0b40aaa..16cc515 100644 --- a/krusader/Panel/krpopupmenu.h +++ b/krusader/Panel/krpopupmenu.h @@ -13,7 +13,7 @@ #endif // should be renamed to KrContextMenu or similar -class KrPopupMenu : public KPopupMenu { +class KrPopupMenu : public TDEPopupMenu { Q_OBJECT public: @@ -63,9 +63,9 @@ protected: private: ListPanel *panel; bool empty, multipleSelections; - KPopupMenu openWith, linkPopup, createNewPopup; + TDEPopupMenu openWith, linkPopup, createNewPopup; KrPreviewPopup preview; - KActionCollection *actions; + TDEActionCollection *actions; KrViewItemList items; // list of selected items KrViewItem *item; // the (first) selected item KFileItemList _items; diff --git a/krusader/Search/krsearchdialog.cpp b/krusader/Search/krsearchdialog.cpp index 4d4a2e7..67c1bc4 100644 --- a/krusader/Search/krsearchdialog.cpp +++ b/krusader/Search/krsearchdialog.cpp @@ -533,7 +533,7 @@ void KrSearchDialog::rightClickMenu(TQListViewItem *item, const TQPoint&, int) return; // create the menu - KPopupMenu popup; + TDEPopupMenu popup; popup.insertTitle(i18n("Krusader Search")); popup.insertItem(i18n("View File (F3)"), VIEW_FILE_ID); diff --git a/krusader/Synchronizer/synchronizergui.cpp b/krusader/Synchronizer/synchronizergui.cpp index e3e2656..bab6e0f 100755 --- a/krusader/Synchronizer/synchronizergui.cpp +++ b/krusader/Synchronizer/synchronizergui.cpp @@ -1684,7 +1684,7 @@ void SynchronizerGUI::rightMouseClicked(TQListViewItem *itemIn) KURL rightURL = vfs::fromPathOrURL( synchronizer.rightBaseDirectory() + rightDirName + item->rightName() ); // create the menu - KPopupMenu popup; + TDEPopupMenu popup; popup.insertTitle(i18n("Synchronize Directories")); popup.insertItem(i18n("E&xclude"),EXCLUDE_ID); diff --git a/krusader/UserAction/kraction.cpp b/krusader/UserAction/kraction.cpp index 67b426d..b487b8e 100644 --- a/krusader/UserAction/kraction.cpp +++ b/krusader/UserAction/kraction.cpp @@ -280,7 +280,7 @@ void KrActionProc::processExited( TDEProcess * ) { /////////////////////////////////////// KrAction /////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////// -KrAction::KrAction( KActionCollection *parent, const char* name ) : KAction( parent, name ) { +KrAction::KrAction( TDEActionCollection *parent, const char* name ) : TDEAction( parent, name ) { connect(this, TQT_SIGNAL(activated()), this, TQT_SLOT(exec()) ); } @@ -399,7 +399,7 @@ bool KrAction::xmlRead( const TQDomElement& element ) { readAvailability( e ); else if ( e.tagName() == "defaultshortcut" ) - setShortcut( KShortcut( e.text() ) ); + setShortcut( TDEShortcut( e.text() ) ); else // unknown but not empty diff --git a/krusader/UserAction/kraction.h b/krusader/UserAction/kraction.h index b6157a7..32a206f 100644 --- a/krusader/UserAction/kraction.h +++ b/krusader/UserAction/kraction.h @@ -20,19 +20,19 @@ class UserActionProperties; class TQTextEdit; -class KActionCollection; +class TDEActionCollection; class TQDomElement; class TQDomDocument; /** - * This subclass of KAction extends it with an individual executor and a struct UserActionProperties. It is used to integrate useractions into KDE's KAction-System + * This subclass of TDEAction extends it with an individual executor and a struct UserActionProperties. It is used to integrate useractions into KDE's TDEAction-System * @author Jonas Bähr (http://www.jonas-baehr.de) */ -class KrAction: public KAction, public KrActionBase { +class KrAction: public TDEAction, public KrActionBase { Q_OBJECT public: - KrAction( KActionCollection *parent, const char* name ); + KrAction( TDEActionCollection *parent, const char* name ); ~KrAction(); /** @@ -85,7 +85,7 @@ class KrAction: public KAction, public KrActionBase { } TQString text() const { - return KAction::text(); + return TDEAction::text(); } public slots: diff --git a/krusader/UserAction/useraction.cpp b/krusader/UserAction/useraction.cpp index c6d2963..cd4f034 100644 --- a/krusader/UserAction/useraction.cpp +++ b/krusader/UserAction/useraction.cpp @@ -29,14 +29,14 @@ UserAction::UserAction() { - _actions.setAutoDelete( false ); // the actions are "owned" by Krusader's KActionCollection, so they should not be deleted + _actions.setAutoDelete( false ); // the actions are "owned" by Krusader's TDEActionCollection, so they should not be deleted krOut << "Initialisising useractions..." << endl; readAllFiles(); krOut << _actions.count() << " useractions read." << endl; } UserAction::~UserAction() { - // KrActions are deleted by Krusader's KActionCollection + // KrActions are deleted by Krusader's TDEActionCollection } void UserAction::setAvailability() { @@ -50,7 +50,7 @@ void UserAction::setAvailability( const KURL& currentURL ) { action->setEnabled( action->isAvailable( currentURL ) ); } -void UserAction::populateMenu( KPopupMenu* menu ) { +void UserAction::populateMenu( TDEPopupMenu* menu ) { for ( KrAction* action = _actions.first(); action; action = _actions.next() ) if ( ! action->isPlugged( menu ) ) action->plug( menu ); diff --git a/krusader/UserAction/useraction.h b/krusader/UserAction/useraction.h index 8cd5691..11ed68c 100644 --- a/krusader/UserAction/useraction.h +++ b/krusader/UserAction/useraction.h @@ -21,7 +21,7 @@ class TQString; class TQStringList; class KrAction; class KURL; -class KPopupMenu; +class TDEPopupMenu; /** * Useractions are Krusaders backend for user-defined actions on current/selected files in its panels @@ -86,10 +86,10 @@ public: void setAvailability(const KURL& currentURL); /** - * Fills a KPopupMenu with all available UserActions in the list + * Fills a TDEPopupMenu with all available UserActions in the list * @param popupmenu to populate */ - void populateMenu(KPopupMenu* menu); + void populateMenu(TDEPopupMenu* menu); TQStringList allCategories(); TQStringList allNames(); diff --git a/krusader/UserAction/useractionpopupmenu.cpp b/krusader/UserAction/useractionpopupmenu.cpp index 46c7688..c100992 100644 --- a/krusader/UserAction/useractionpopupmenu.cpp +++ b/krusader/UserAction/useractionpopupmenu.cpp @@ -18,7 +18,7 @@ #include "useraction.h" #include "kraction.h" -UserActionPopupMenu::UserActionPopupMenu( KURL currentURL, TQWidget *parent ) : KPopupMenu( parent, "useraction popupmenu" ) { +UserActionPopupMenu::UserActionPopupMenu( KURL currentURL, TQWidget *parent ) : TDEPopupMenu( parent, "useraction popupmenu" ) { UserAction::KrActionList list = krUserAction->actionList(); for ( KrAction* action = list.first(); action; action = list.next() ) if ( action->isAvailable( currentURL ) ) diff --git a/krusader/UserAction/useractionpopupmenu.h b/krusader/UserAction/useractionpopupmenu.h index 8410ca0..999b3f7 100644 --- a/krusader/UserAction/useractionpopupmenu.h +++ b/krusader/UserAction/useractionpopupmenu.h @@ -17,7 +17,7 @@ class KURL; -class UserActionPopupMenu : public KPopupMenu { +class UserActionPopupMenu : public TDEPopupMenu { public: UserActionPopupMenu( KURL currentURL, TQWidget *parent = 0 ); }; diff --git a/krusader/UserMenu/usermenu.cpp b/krusader/UserMenu/usermenu.cpp index 1ae7f4b..d4957e2 100644 --- a/krusader/UserMenu/usermenu.cpp +++ b/krusader/UserMenu/usermenu.cpp @@ -41,7 +41,7 @@ void UserMenu::update() { ////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////// -UserMenuGui::UserMenuGui( UserMenu *, TQWidget * parent ) : KPopupMenu( parent ) { +UserMenuGui::UserMenuGui( UserMenu *, TQWidget * parent ) : TDEPopupMenu( parent ) { createMenu(); } diff --git a/krusader/UserMenu/usermenu.h b/krusader/UserMenu/usermenu.h index 755f468..b7a493d 100644 --- a/krusader/UserMenu/usermenu.h +++ b/krusader/UserMenu/usermenu.h @@ -23,7 +23,7 @@ email : class TQWidget; class UserMenu; -class UserMenuGui: public KPopupMenu { +class UserMenuGui: public TDEPopupMenu { public: UserMenuGui( UserMenu* menu, TQWidget *parent = 0 ); void run(); diff --git a/krusader/krslots.cpp b/krusader/krslots.cpp index b475204..e388ac9 100644 --- a/krusader/krslots.cpp +++ b/krusader/krslots.cpp @@ -219,7 +219,7 @@ void KRslots::rightclickMenu() { { ACTIVE_PANEL->popRightClickMenu( ACTIVE_PANEL->mapToGlobal( - dynamic_cast<KListView*>(ACTIVE_PANEL->view)->itemRect( currentItem ).topLeft() + dynamic_cast<TDEListView*>(ACTIVE_PANEL->view)->itemRect( currentItem ).topLeft() ) ); } diff --git a/krusader/krusader.cpp b/krusader/krusader.cpp index 9418396..c7771e4 100644 --- a/krusader/krusader.cpp +++ b/krusader/krusader.cpp @@ -102,97 +102,97 @@ YP YD 88 YD ~Y8888P' `8888Y' YP YP Y8888D' Y88888P 88 YD // define the static members Krusader *Krusader::App = 0; -KAction *Krusader::actProperties = 0; -KAction *Krusader::actPack = 0; -KAction *Krusader::actUnpack = 0; -KAction *Krusader::actTest = 0; -KAction *Krusader::actCopy = 0; -KAction *Krusader::actPaste = 0; -KAction *Krusader::actCompare = 0; -KAction *Krusader::actCalculate = 0; -KAction *Krusader::actCreateChecksum = 0; -KAction *Krusader::actMatchChecksum = 0; -KAction *Krusader::actSelect = 0; -KAction *Krusader::actSelectAll = 0; -KAction *Krusader::actUnselect = 0; -KAction *Krusader::actUnselectAll = 0; -KAction *Krusader::actInvert = 0; -KAction *Krusader::actCompDirs = 0; -KAction *Krusader::actSync = 0; -KAction *Krusader::actDiskUsage = 0; -KAction *Krusader::actHomeTerminal = 0; -KAction *Krusader::actFTPConnect = 0; -KAction *Krusader::actFTPNewConnect = 0; -KAction *Krusader::actFTPDisconnect = 0; -KAction *Krusader::actProfiles = 0; -KAction *Krusader::actMultiRename = 0; -KAction *Krusader::actAllFilter = 0; -KAction *Krusader::actExecFilter = 0; -KAction *Krusader::actCustomFilter = 0; -KAction *Krusader::actMountMan = 0; -KAction *Krusader::actNewTool = 0; -KAction *Krusader::actKonfigurator = 0; -KAction *Krusader::actToolsSetup = 0; -KAction *Krusader::actSwapPanels = 0; -KAction *Krusader::actSwapSides = 0; -KAction *Krusader::actBack = 0; -KAction *Krusader::actRoot = 0; -KAction *Krusader::actFind = 0; -KAction *Krusader::actLocate = 0; -KAction *Krusader::actSwitchFullScreenTE = 0; -//KAction *Krusader::actAddBookmark = 0; -KAction *Krusader::actSavePosition = 0; -KAction *Krusader::actSelectColorMask = 0; -KAction *Krusader::actOpenLeftBm = 0; -KAction *Krusader::actOpenRightBm = 0; -KAction *Krusader::actDirUp = 0; -KAction *Krusader::actCmdlinePopup = 0; -KAction *Krusader::actNewTab = 0; -KAction *Krusader::actDupTab = 0; -KAction *Krusader::actCloseTab = 0; -KAction *Krusader::actNextTab = 0; -KAction *Krusader::actPreviousTab = 0; -KAction *Krusader::actSplit = 0; -KAction *Krusader::actCombine = 0; -KAction *Krusader::actUserMenu = 0; -KAction *Krusader::actManageUseractions = 0; -KAction *Krusader::actSyncDirs = 0; -KAction *Krusader::actSyncBrowse = 0; -KAction *Krusader::actF2 = 0; -KAction *Krusader::actF3 = 0; -KAction *Krusader::actF4 = 0; -KAction *Krusader::actF5 = 0; -KAction *Krusader::actF6 = 0; -KAction *Krusader::actF7 = 0; -KAction *Krusader::actF8 = 0; -KAction *Krusader::actF9 = 0; -KAction *Krusader::actF10 = 0; -KAction *Krusader::actLocationBar = 0; -KAction *Krusader::actPopularUrls = 0; -KAction *Krusader::actJumpBack = 0; -KAction *Krusader::actSetJumpBack = 0; -KAction *Krusader::actDetailedView = 0; -KAction *Krusader::actBriefView = 0; - -KToggleAction *Krusader::actToggleTerminal = 0; -KToggleAction *Krusader::actVerticalMode = 0; -KRadioAction *Krusader::actSelectNewerAndSingle = 0; -KRadioAction *Krusader::actSelectSingle = 0; -KRadioAction *Krusader::actSelectNewer = 0; -KRadioAction *Krusader::actSelectDifferentAndSingle = 0; -KRadioAction *Krusader::actSelectDifferent = 0; -KRadioAction **Krusader::compareArray[] = {&actSelectNewerAndSingle, &actSelectNewer, &actSelectSingle, +TDEAction *Krusader::actProperties = 0; +TDEAction *Krusader::actPack = 0; +TDEAction *Krusader::actUnpack = 0; +TDEAction *Krusader::actTest = 0; +TDEAction *Krusader::actCopy = 0; +TDEAction *Krusader::actPaste = 0; +TDEAction *Krusader::actCompare = 0; +TDEAction *Krusader::actCalculate = 0; +TDEAction *Krusader::actCreateChecksum = 0; +TDEAction *Krusader::actMatchChecksum = 0; +TDEAction *Krusader::actSelect = 0; +TDEAction *Krusader::actSelectAll = 0; +TDEAction *Krusader::actUnselect = 0; +TDEAction *Krusader::actUnselectAll = 0; +TDEAction *Krusader::actInvert = 0; +TDEAction *Krusader::actCompDirs = 0; +TDEAction *Krusader::actSync = 0; +TDEAction *Krusader::actDiskUsage = 0; +TDEAction *Krusader::actHomeTerminal = 0; +TDEAction *Krusader::actFTPConnect = 0; +TDEAction *Krusader::actFTPNewConnect = 0; +TDEAction *Krusader::actFTPDisconnect = 0; +TDEAction *Krusader::actProfiles = 0; +TDEAction *Krusader::actMultiRename = 0; +TDEAction *Krusader::actAllFilter = 0; +TDEAction *Krusader::actExecFilter = 0; +TDEAction *Krusader::actCustomFilter = 0; +TDEAction *Krusader::actMountMan = 0; +TDEAction *Krusader::actNewTool = 0; +TDEAction *Krusader::actKonfigurator = 0; +TDEAction *Krusader::actToolsSetup = 0; +TDEAction *Krusader::actSwapPanels = 0; +TDEAction *Krusader::actSwapSides = 0; +TDEAction *Krusader::actBack = 0; +TDEAction *Krusader::actRoot = 0; +TDEAction *Krusader::actFind = 0; +TDEAction *Krusader::actLocate = 0; +TDEAction *Krusader::actSwitchFullScreenTE = 0; +//TDEAction *Krusader::actAddBookmark = 0; +TDEAction *Krusader::actSavePosition = 0; +TDEAction *Krusader::actSelectColorMask = 0; +TDEAction *Krusader::actOpenLeftBm = 0; +TDEAction *Krusader::actOpenRightBm = 0; +TDEAction *Krusader::actDirUp = 0; +TDEAction *Krusader::actCmdlinePopup = 0; +TDEAction *Krusader::actNewTab = 0; +TDEAction *Krusader::actDupTab = 0; +TDEAction *Krusader::actCloseTab = 0; +TDEAction *Krusader::actNextTab = 0; +TDEAction *Krusader::actPreviousTab = 0; +TDEAction *Krusader::actSplit = 0; +TDEAction *Krusader::actCombine = 0; +TDEAction *Krusader::actUserMenu = 0; +TDEAction *Krusader::actManageUseractions = 0; +TDEAction *Krusader::actSyncDirs = 0; +TDEAction *Krusader::actSyncBrowse = 0; +TDEAction *Krusader::actF2 = 0; +TDEAction *Krusader::actF3 = 0; +TDEAction *Krusader::actF4 = 0; +TDEAction *Krusader::actF5 = 0; +TDEAction *Krusader::actF6 = 0; +TDEAction *Krusader::actF7 = 0; +TDEAction *Krusader::actF8 = 0; +TDEAction *Krusader::actF9 = 0; +TDEAction *Krusader::actF10 = 0; +TDEAction *Krusader::actLocationBar = 0; +TDEAction *Krusader::actPopularUrls = 0; +TDEAction *Krusader::actJumpBack = 0; +TDEAction *Krusader::actSetJumpBack = 0; +TDEAction *Krusader::actDetailedView = 0; +TDEAction *Krusader::actBriefView = 0; + +TDEToggleAction *Krusader::actToggleTerminal = 0; +TDEToggleAction *Krusader::actVerticalMode = 0; +TDERadioAction *Krusader::actSelectNewerAndSingle = 0; +TDERadioAction *Krusader::actSelectSingle = 0; +TDERadioAction *Krusader::actSelectNewer = 0; +TDERadioAction *Krusader::actSelectDifferentAndSingle = 0; +TDERadioAction *Krusader::actSelectDifferent = 0; +TDERadioAction **Krusader::compareArray[] = {&actSelectNewerAndSingle, &actSelectNewer, &actSelectSingle, &actSelectDifferentAndSingle, &actSelectDifferent, 0}; -KRadioAction *Krusader::actExecStartAndForget = 0; -KRadioAction *Krusader::actExecCollectSeparate = 0; -KRadioAction *Krusader::actExecCollectTogether = 0; -KRadioAction *Krusader::actExecTerminalExternal = 0; -KRadioAction *Krusader::actExecTerminalEmbedded = 0; -KRadioAction **Krusader::execTypeArray[] = +TDERadioAction *Krusader::actExecStartAndForget = 0; +TDERadioAction *Krusader::actExecCollectSeparate = 0; +TDERadioAction *Krusader::actExecCollectTogether = 0; +TDERadioAction *Krusader::actExecTerminalExternal = 0; +TDERadioAction *Krusader::actExecTerminalEmbedded = 0; +TDERadioAction **Krusader::execTypeArray[] = {&actExecStartAndForget, &actExecCollectSeparate, &actExecCollectTogether, &actExecTerminalExternal, &actExecTerminalEmbedded, 0}; -KPopupMenu *Krusader::userActionMenu = 0; +TDEPopupMenu *Krusader::userActionMenu = 0; UserAction *Krusader::userAction = 0; UserMenu *Krusader::userMenu = 0; KrBookmarkHandler *Krusader::bookman = 0; @@ -200,7 +200,7 @@ KrBookmarkHandler *Krusader::bookman = 0; #ifdef __KJSEMBED__ KrJS *Krusader::js = 0; -KAction *Krusader::actShowJSConsole = 0; +TDEAction *Krusader::actShowJSConsole = 0; #endif // construct the views, statusbar and menu bars and prepare Krusader to start @@ -386,7 +386,7 @@ Krusader::Krusader() : KParts::MainWindow(0,0,WType_TopLevel|WDestructiveClose|T // manage our keyboard short-cuts - //KAcceleratorManager::manage(this,true); + //TDEAcceleratorManager::manage(this,true); setCursor( KCursor::arrowCursor() ); @@ -518,7 +518,7 @@ void Krusader::resizeEvent ( TQResizeEvent *e ) { } void Krusader::setupAccels() { - accels = new KAccel( this ); + accels = new TDEAccel( this ); // SHIFT+F3 accels->insert( "F3_ViewDlg", i18n( "F3 View Dialog" ), TQString(), SHIFT + Key_F3, SLOTS, TQT_SLOT( viewDlg() ) ); @@ -531,9 +531,9 @@ void Krusader::setupAccels() { // <patch> Moving from Pixmap actions to generic filenames - thanks to Carsten Pfeiffer void Krusader::setupActions() { // first come the TODO actions - //actSync = 0;//new KAction(i18n("S&yncronize Dirs"), 0, this, 0, actionCollection(), "sync dirs"); - //actNewTool = 0;//new KAction(i18n("&Add a new tool"), 0, this, 0, actionCollection(), "add tool"); - //actToolsSetup = 0;//new KAction(i18n("&Tools Menu Setup"), 0, 0, this, 0, actionCollection(), "tools setup"); + //actSync = 0;//new TDEAction(i18n("S&yncronize Dirs"), 0, this, 0, actionCollection(), "sync dirs"); + //actNewTool = 0;//new TDEAction(i18n("&Add a new tool"), 0, this, 0, actionCollection(), "add tool"); + //actToolsSetup = 0;//new TDEAction(i18n("&Tools Menu Setup"), 0, 0, this, 0, actionCollection(), "tools setup"); //KStdAction::print(SLOTS, 0,actionCollection(),"std_print"); //KStdAction::showMenubar( SLOTS, TQT_SLOT( showMenubar() ), actionCollection(), "std_menubar" ); @@ -546,9 +546,9 @@ void Krusader::setupActions() { int cmdExecMode = krConfig->readNumEntry( "Command Execution Mode", 0 ); KStdAction::home( SLOTS, TQT_SLOT( home() ), actionCollection(), "std_home" )->setText( i18n("Home") ); /*->setShortcut(Key_QuoteLeft);*/ - new KAction( i18n( "&Reload" ), "reload", CTRL + Key_R, SLOTS, TQT_SLOT( refresh() ), actionCollection(), "std_redisplay" ); + new TDEAction( i18n( "&Reload" ), "reload", CTRL + Key_R, SLOTS, TQT_SLOT( refresh() ), actionCollection(), "std_redisplay" ); actShowToolBar = KStdAction::showToolbar( SLOTS, TQT_SLOT( toggleToolbar() ), actionCollection(), "std_toolbar" ); - new KToggleAction( i18n("Show Actions Toolbar"), 0, SLOTS, TQT_SLOT( toggleActionsToolbar() ), + new TDEToggleAction( i18n("Show Actions Toolbar"), 0, SLOTS, TQT_SLOT( toggleActionsToolbar() ), actionCollection(), "toggle actions toolbar" ); actShowStatusBar = KStdAction::showStatusbar( SLOTS, TQT_SLOT( toggleStatusbar() ), actionCollection(), "std_statusbar" ); KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( slotClose() ), actionCollection(), "std_quit" ); @@ -560,109 +560,109 @@ void Krusader::setupActions() { (actPaste = KStdAction::paste( SLOTS, TQT_SLOT( paste() ), actionCollection(), "std_paste" ))->setText( i18n("Paste from Clipboard") ); // the toggle actions - actToggleFnkeys = new KToggleAction( i18n( "Show &FN Keys Bar" ), 0, SLOTS, + actToggleFnkeys = new TDEToggleAction( i18n( "Show &FN Keys Bar" ), 0, SLOTS, TQT_SLOT( toggleFnkeys() ), actionCollection(), "toggle fn bar" ); actToggleFnkeys->setChecked( true ); - actToggleCmdline = new KToggleAction( i18n( "Show &Command Line" ), 0, SLOTS, + actToggleCmdline = new TDEToggleAction( i18n( "Show &Command Line" ), 0, SLOTS, TQT_SLOT( toggleCmdline() ), actionCollection(), "toggle command line" ); actToggleCmdline->setChecked( true ); - actToggleTerminal = new KToggleAction( i18n( "Show Terminal &Emulator" ), ALT + CTRL + Key_T, SLOTS, + actToggleTerminal = new TDEToggleAction( i18n( "Show Terminal &Emulator" ), ALT + CTRL + Key_T, SLOTS, TQT_SLOT( toggleTerminal() ), actionCollection(), "toggle terminal emulator" ); actToggleTerminal->setChecked( false ); - actDetailedView = new KAction( i18n( "&Detailed View" ), ALT + SHIFT + Key_D, SLOTS, + actDetailedView = new TDEAction( i18n( "&Detailed View" ), ALT + SHIFT + Key_D, SLOTS, TQT_SLOT( setDetailedView() ), actionCollection(), "detailed_view" ); - actBriefView = new KAction( i18n( "&Brief View" ), ALT + SHIFT + Key_B, SLOTS, + actBriefView = new TDEAction( i18n( "&Brief View" ), ALT + SHIFT + Key_B, SLOTS, TQT_SLOT( setBriefView() ), actionCollection(), "brief_view" ); - actToggleHidden = new KToggleAction( i18n( "Show &Hidden Files" ), CTRL + Key_Period, SLOTS, + actToggleHidden = new TDEToggleAction( i18n( "Show &Hidden Files" ), CTRL + Key_Period, SLOTS, TQT_SLOT( toggleHidden() ), actionCollection(), "toggle hidden files" ); - actSwapPanels = new KAction( i18n( "S&wap Panels" ), CTRL + Key_U, SLOTS, + actSwapPanels = new TDEAction( i18n( "S&wap Panels" ), CTRL + Key_U, SLOTS, TQT_SLOT( swapPanels() ), actionCollection(), "swap panels" ); - actSwapSides = new KAction( i18n( "Sw&ap Sides" ), CTRL + SHIFT + Key_U, SLOTS, + actSwapSides = new TDEAction( i18n( "Sw&ap Sides" ), CTRL + SHIFT + Key_U, SLOTS, TQT_SLOT( toggleSwapSides() ), actionCollection(), "toggle swap sides" ); krConfig->setGroup( "Look&Feel" ); actToggleHidden->setChecked( krConfig->readBoolEntry( "Show Hidden", _ShowHidden ) ); // and then the DONE actions - actCmdlinePopup = new KAction( i18n( "popup cmdline" ), 0, CTRL + Key_Slash, SLOTS, + actCmdlinePopup = new TDEAction( i18n( "popup cmdline" ), 0, CTRL + Key_Slash, SLOTS, TQT_SLOT( cmdlinePopup() ), actionCollection(), "cmdline popup" ); /* Shortcut disabled because of the Terminal Emulator bug. */ - actDirUp = new KAction( i18n( "Up" ), "up", CTRL+Key_PageUp /*Key_Backspace*/, SLOTS, TQT_SLOT( dirUp() ), actionCollection(), "dirUp" ); - new KAction( i18n( "&New Text File..." ), "filenew", SHIFT + Key_F4, SLOTS, TQT_SLOT( editDlg() ), actionCollection(), "edit_new_file" ); - new KAction( i18n( "Start &Root Mode Krusader" ), "krusader_root", ALT + Key_K, SLOTS, TQT_SLOT( rootKrusader() ), actionCollection(), "root krusader" ); + actDirUp = new TDEAction( i18n( "Up" ), "up", CTRL+Key_PageUp /*Key_Backspace*/, SLOTS, TQT_SLOT( dirUp() ), actionCollection(), "dirUp" ); + new TDEAction( i18n( "&New Text File..." ), "filenew", SHIFT + Key_F4, SLOTS, TQT_SLOT( editDlg() ), actionCollection(), "edit_new_file" ); + new TDEAction( i18n( "Start &Root Mode Krusader" ), "krusader_root", ALT + Key_K, SLOTS, TQT_SLOT( rootKrusader() ), actionCollection(), "root krusader" ); - actTest = new KAction( i18n( "T&est Archive" ), "ark", ALT + Key_E, + actTest = new TDEAction( i18n( "T&est Archive" ), "ark", ALT + Key_E, SLOTS, TQT_SLOT( testArchive() ), actionCollection(), "test archives" ); - //actFTPConnect = new KAction( i18n( "&Net Connections" ), "domtreeviewer", 0, + //actFTPConnect = new TDEAction( i18n( "&Net Connections" ), "domtreeviewer", 0, // SLOTS, TQT_SLOT( runRemoteMan() ), actionCollection(), "ftp connect" ); - actFTPNewConnect = new KAction( i18n( "New Net &Connection..." ), "connect_creating", CTRL + Key_N, + actFTPNewConnect = new TDEAction( i18n( "New Net &Connection..." ), "connect_creating", CTRL + Key_N, SLOTS, TQT_SLOT( newFTPconnection() ), actionCollection(), "ftp new connection" ); - actProfiles = new KAction( i18n( "Pro&files" ), "kr_profile", ALT + Key_L, + actProfiles = new TDEAction( i18n( "Pro&files" ), "kr_profile", ALT + Key_L, TQT_TQOBJECT(MAIN_VIEW), TQT_SLOT( profiles() ), actionCollection(), "profile" ); - actCalculate = new KAction( i18n( "Calculate &Occupied Space" ), "kcalc", 0, + actCalculate = new TDEAction( i18n( "Calculate &Occupied Space" ), "kcalc", 0, SLOTS, TQT_SLOT( calcSpace() ), actionCollection(), "calculate" ); - actCreateChecksum = new KAction( i18n( "Create Checksum..." ), "binary", 0, + actCreateChecksum = new TDEAction( i18n( "Create Checksum..." ), "binary", 0, SLOTS, TQT_SLOT( createChecksum() ), actionCollection(), "create checksum" ); - actMatchChecksum = new KAction( i18n( "Verify Checksum..." ), "match_checksum", 0, + actMatchChecksum = new TDEAction( i18n( "Verify Checksum..." ), "match_checksum", 0, SLOTS, TQT_SLOT( matchChecksum() ), actionCollection(), "match checksum" ); - actProperties = new KAction( i18n( "&Properties..." ), 0, ALT+Key_Enter, + actProperties = new TDEAction( i18n( "&Properties..." ), 0, ALT+Key_Enter, SLOTS, TQT_SLOT( properties() ), actionCollection(), "properties" ); - actPack = new KAction( i18n( "Pac&k..." ), "kr_arc_pack", ALT + Key_P, + actPack = new TDEAction( i18n( "Pac&k..." ), "kr_arc_pack", ALT + Key_P, SLOTS, TQT_SLOT( slotPack() ), actionCollection(), "pack" ); - actUnpack = new KAction( i18n( "&Unpack..." ), "kr_arc_unpack", ALT + Key_U, + actUnpack = new TDEAction( i18n( "&Unpack..." ), "kr_arc_unpack", ALT + Key_U, SLOTS, TQT_SLOT( slotUnpack() ), actionCollection() , "unpack" ); - actSplit = new KAction( i18n( "Sp&lit File..." ), "kr_split", CTRL + Key_P, + actSplit = new TDEAction( i18n( "Sp&lit File..." ), "kr_split", CTRL + Key_P, SLOTS, TQT_SLOT( slotSplit() ), actionCollection(), "split" ); - actCombine = new KAction( i18n( "Com&bine Files..." ), "kr_combine", CTRL + Key_B, + actCombine = new TDEAction( i18n( "Com&bine Files..." ), "kr_combine", CTRL + Key_B, SLOTS, TQT_SLOT( slotCombine() ), actionCollection() , "combine" ); - actSelect = new KAction( i18n( "Select &Group..." ), "kr_select", CTRL + Key_Plus, + actSelect = new TDEAction( i18n( "Select &Group..." ), "kr_select", CTRL + Key_Plus, SLOTS, TQT_SLOT( markGroup() ), actionCollection(), "select group" ); - actSelectAll = new KAction( i18n( "&Select All" ), "kr_selectall", ALT + Key_Plus, + actSelectAll = new TDEAction( i18n( "&Select All" ), "kr_selectall", ALT + Key_Plus, SLOTS, TQT_SLOT( markAll() ), actionCollection(), "select all" ); - actUnselect = new KAction( i18n( "&Unselect Group..." ), "kr_unselect", CTRL + Key_Minus, + actUnselect = new TDEAction( i18n( "&Unselect Group..." ), "kr_unselect", CTRL + Key_Minus, SLOTS, TQT_SLOT( unmarkGroup() ), actionCollection(), "unselect group" ); - actUnselectAll = new KAction( i18n( "U&nselect All" ), "kr_unselectall", ALT + Key_Minus, + actUnselectAll = new TDEAction( i18n( "U&nselect All" ), "kr_unselectall", ALT + Key_Minus, SLOTS, TQT_SLOT( unmarkAll() ), actionCollection(), "unselect all" ); - actInvert = new KAction( i18n( "&Invert Selection" ), "kr_invert", ALT + Key_Asterisk, + actInvert = new TDEAction( i18n( "&Invert Selection" ), "kr_invert", ALT + Key_Asterisk, SLOTS, TQT_SLOT( invert() ), actionCollection(), "invert" ); - actCompDirs = new KAction( i18n( "&Compare Directories" ), "view_left_right", ALT + Key_C, + actCompDirs = new TDEAction( i18n( "&Compare Directories" ), "view_left_right", ALT + Key_C, SLOTS, TQT_SLOT( compareDirs() ), actionCollection(), "compare dirs" ); - actSelectNewerAndSingle = new KRadioAction( i18n( "&Select Newer and Single" ), 0, + actSelectNewerAndSingle = new TDERadioAction( i18n( "&Select Newer and Single" ), 0, SLOTS, TQT_SLOT( compareSetup() ), actionCollection(), "select_newer_and_single" ); - actSelectNewer = new KRadioAction( i18n( "Select &Newer" ), 0, + actSelectNewer = new TDERadioAction( i18n( "Select &Newer" ), 0, SLOTS, TQT_SLOT( compareSetup() ), actionCollection(), "select_newer" ); - actSelectSingle = new KRadioAction( i18n( "Select &Single" ), 0, + actSelectSingle = new TDERadioAction( i18n( "Select &Single" ), 0, SLOTS, TQT_SLOT( compareSetup() ), actionCollection(), "select_single" ); - actSelectDifferentAndSingle = new KRadioAction( i18n( "Select Different &and Single" ), 0, + actSelectDifferentAndSingle = new TDERadioAction( i18n( "Select Different &and Single" ), 0, SLOTS, TQT_SLOT( compareSetup() ), actionCollection(), "select_different_and_single" ); - actSelectDifferent = new KRadioAction( i18n( "Select &Different" ), 0, + actSelectDifferent = new TDERadioAction( i18n( "Select &Different" ), 0, SLOTS, TQT_SLOT( compareSetup() ), actionCollection(), "select_different" ); actSelectNewerAndSingle->setExclusiveGroup( "the_select_group" ); actSelectNewer->setExclusiveGroup( "the_select_group" ); actSelectSingle->setExclusiveGroup( "the_select_group" ); actSelectDifferentAndSingle->setExclusiveGroup( "the_select_group" ); actSelectDifferent->setExclusiveGroup( "the_select_group" ); - if( compareMode < (int)( sizeof( compareArray ) / sizeof( KRadioAction ** ) ) -1 ) + if( compareMode < (int)( sizeof( compareArray ) / sizeof( TDERadioAction ** ) ) -1 ) (*compareArray[ compareMode ])->setChecked( true ); - actExecStartAndForget = new KRadioAction( + actExecStartAndForget = new TDERadioAction( i18n( "Start and &Forget" ), 0, SLOTS, TQT_SLOT( execTypeSetup() ), actionCollection(), "exec_start_and_forget" ); - actExecCollectSeparate = new KRadioAction( + actExecCollectSeparate = new TDERadioAction( i18n( "Display &Separated Standard and Error Output" ), 0, SLOTS, TQT_SLOT( execTypeSetup() ), actionCollection(), "exec_collect_separate" ); - actExecCollectTogether = new KRadioAction( + actExecCollectTogether = new TDERadioAction( i18n( "Display &Mixed Standard and Error Output" ), 0, SLOTS, TQT_SLOT( execTypeSetup() ), actionCollection(), "exec_collect_together" ); - actExecTerminalExternal = new KRadioAction( + actExecTerminalExternal = new TDERadioAction( i18n( "Start in &New Terminal" ), 0, SLOTS, TQT_SLOT( execTypeSetup() ), actionCollection(), "exec_terminal_external" ); - actExecTerminalEmbedded = new KRadioAction( + actExecTerminalEmbedded = new TDERadioAction( i18n( "Send to &Embedded Terminal Emulator" ), 0, SLOTS, TQT_SLOT( execTypeSetup() ), actionCollection(), "exec_terminal_embedded" ); @@ -671,128 +671,128 @@ void Krusader::setupActions() { actExecCollectTogether->setExclusiveGroup("the_exec_type_group"); actExecTerminalExternal->setExclusiveGroup("the_exec_type_group"); actExecTerminalEmbedded->setExclusiveGroup("the_exec_type_group"); - if( cmdExecMode < (int)( sizeof( execTypeArray ) / sizeof( KRadioAction ** ) ) -1 ) + if( cmdExecMode < (int)( sizeof( execTypeArray ) / sizeof( TDERadioAction ** ) ) -1 ) (*execTypeArray[ cmdExecMode ])->setChecked( true ); - actHomeTerminal = new KAction( i18n( "Start &Terminal" ), "terminal", 0, + actHomeTerminal = new TDEAction( i18n( "Start &Terminal" ), "terminal", 0, SLOTS, TQT_SLOT( homeTerminal() ), actionCollection(), "terminal@home" ); - actFTPDisconnect = new KAction( i18n( "Disconnect &from Net" ), "kr_ftp_disconnect", SHIFT + CTRL + Key_F, + actFTPDisconnect = new TDEAction( i18n( "Disconnect &from Net" ), "kr_ftp_disconnect", SHIFT + CTRL + Key_F, SLOTS, TQT_SLOT( FTPDisconnect() ), actionCollection(), "ftp disconnect" ); #if KDE_IS_VERSION(3,2,0) /* new mountman feature is available in kde 3.2 only! */ - actMountMan = new KToolBarPopupAction( i18n( "&MountMan..." ), "kr_mountman", ALT + Key_Slash, + actMountMan = new TDEToolBarPopupAction( i18n( "&MountMan..." ), "kr_mountman", ALT + Key_Slash, SLOTS, TQT_SLOT( runMountMan() ), actionCollection(), "mountman" ); - connect( ( ( KToolBarPopupAction* ) actMountMan ) ->popupMenu(), TQT_SIGNAL( aboutToShow() ), + connect( ( ( TDEToolBarPopupAction* ) actMountMan ) ->popupMenu(), TQT_SIGNAL( aboutToShow() ), mountMan, TQT_SLOT( quickList() ) ); #else - actMountMan = new KAction( i18n( "&MountMan..." ), "kr_mountman", ALT + Key_Slash, + actMountMan = new TDEAction( i18n( "&MountMan..." ), "kr_mountman", ALT + Key_Slash, SLOTS, TQT_SLOT( runMountMan() ), actionCollection(), "mountman" ); #endif /* KDE 3.2 */ - actFind = new KAction( i18n( "&Search..." ), "filefind", CTRL + Key_S, + actFind = new TDEAction( i18n( "&Search..." ), "filefind", CTRL + Key_S, SLOTS, TQT_SLOT( search() ), actionCollection(), "find" ); - actLocate = new KAction( i18n( "&Locate..." ), "find", SHIFT+CTRL + Key_L, + actLocate = new TDEAction( i18n( "&Locate..." ), "find", SHIFT+CTRL + Key_L, SLOTS, TQT_SLOT( locate() ), actionCollection(), "locate" ); - actSyncDirs = new KAction( i18n( "Synchronize &Directories..." ), "kr_syncdirs", CTRL + Key_Y, + actSyncDirs = new TDEAction( i18n( "Synchronize &Directories..." ), "kr_syncdirs", CTRL + Key_Y, SLOTS, TQT_SLOT( slotSynchronizeDirs() ), actionCollection(), "sync dirs" ); - actSyncBrowse = new KAction( i18n( "S&ynchron Directory Changes" ), "kr_syncbrowse_off", ALT + Key_Y, + actSyncBrowse = new TDEAction( i18n( "S&ynchron Directory Changes" ), "kr_syncbrowse_off", ALT + Key_Y, SLOTS, TQT_SLOT( slotSyncBrowse() ), actionCollection(), "sync browse" ); - actDiskUsage = new KAction( i18n( "D&isk Usage..." ), "kr_diskusage", ALT + Key_D, + actDiskUsage = new TDEAction( i18n( "D&isk Usage..." ), "kr_diskusage", ALT + Key_D, SLOTS, TQT_SLOT( slotDiskUsage() ), actionCollection(), "disk usage" ); - actKonfigurator = new KAction( i18n( "Configure &Krusader..." ), "configure", 0, + actKonfigurator = new TDEAction( i18n( "Configure &Krusader..." ), "configure", 0, SLOTS, TQT_SLOT( startKonfigurator() ), actionCollection(), "konfigurator" ); - actBack = new KAction( i18n( "Back" ), "back", 0, + actBack = new TDEAction( i18n( "Back" ), "back", 0, SLOTS, TQT_SLOT( back() ), actionCollection(), "back" ); - actRoot = new KAction( i18n( "Root" ), "top", CTRL + Key_Backspace, + actRoot = new TDEAction( i18n( "Root" ), "top", CTRL + Key_Backspace, SLOTS, TQT_SLOT( root() ), actionCollection(), "root" ); - actSavePosition = new KAction( i18n( "Save &Position" ), 0, + actSavePosition = new TDEAction( i18n( "Save &Position" ), 0, TQT_TQOBJECT(krApp), TQT_SLOT( savePosition() ), actionCollection(), "save position" ); - actAllFilter = new KAction( i18n( "&All Files" ), SHIFT + Key_F10, + actAllFilter = new TDEAction( i18n( "&All Files" ), SHIFT + Key_F10, SLOTS, TQT_SLOT( allFilter() ), actionCollection(), "all files" ); - //actExecFilter = new KAction( i18n( "&Executables" ), SHIFT + Key_F11, + //actExecFilter = new TDEAction( i18n( "&Executables" ), SHIFT + Key_F11, // SLOTS, TQT_SLOT( execFilter() ), actionCollection(), "exec files" ); - actCustomFilter = new KAction( i18n( "&Custom" ), SHIFT + Key_F12, + actCustomFilter = new TDEAction( i18n( "&Custom" ), SHIFT + Key_F12, SLOTS, TQT_SLOT( customFilter() ), actionCollection(), "custom files" ); - actCompare = new KAction( i18n( "Compare b&y Content..." ), "tdemultiple", 0, + actCompare = new TDEAction( i18n( "Compare b&y Content..." ), "tdemultiple", 0, SLOTS, TQT_SLOT( compareContent() ), actionCollection(), "compare" ); - actMultiRename = new KAction( i18n( "Multi &Rename..." ), "krename", SHIFT + Key_F9, + actMultiRename = new TDEAction( i18n( "Multi &Rename..." ), "krename", SHIFT + Key_F9, SLOTS, TQT_SLOT( multiRename() ), actionCollection(), "multirename" ); - new KAction( i18n( "Right-click Menu" ), Key_Menu, + new TDEAction( i18n( "Right-click Menu" ), Key_Menu, SLOTS, TQT_SLOT( rightclickMenu() ), actionCollection(), "rightclick menu" ); - new KAction( i18n( "Right Bookmarks" ), ALT + Key_Right, + new TDEAction( i18n( "Right Bookmarks" ), ALT + Key_Right, SLOTS, TQT_SLOT( openRightBookmarks() ), actionCollection(), "right bookmarks" ); - new KAction( i18n( "Left Bookmarks" ), ALT + Key_Left, + new TDEAction( i18n( "Left Bookmarks" ), ALT + Key_Left, SLOTS, TQT_SLOT( openLeftBookmarks() ), actionCollection(), "left bookmarks" ); - new KAction( i18n( "Bookmarks" ), CTRL + Key_D, + new TDEAction( i18n( "Bookmarks" ), CTRL + Key_D, SLOTS, TQT_SLOT( openBookmarks() ), actionCollection(), "bookmarks" ); - new KAction( i18n( "Bookmark Current" ), CTRL + SHIFT + Key_D, + new TDEAction( i18n( "Bookmark Current" ), CTRL + SHIFT + Key_D, SLOTS, TQT_SLOT( bookmarkCurrent() ), actionCollection(), "bookmark current" ); - new KAction( i18n( "History" ), CTRL + Key_H, + new TDEAction( i18n( "History" ), CTRL + Key_H, SLOTS, TQT_SLOT( openHistory() ), actionCollection(), "history" ); - new KAction( i18n( "Sync Panels" ), ALT + Key_O, + new TDEAction( i18n( "Sync Panels" ), ALT + Key_O, SLOTS, TQT_SLOT( syncPanels() ), actionCollection(), "sync panels"); - new KAction( i18n( "Left History" ), ALT + CTRL + Key_Left, + new TDEAction( i18n( "Left History" ), ALT + CTRL + Key_Left, SLOTS, TQT_SLOT( openLeftHistory() ), actionCollection(), "left history" ); - new KAction( i18n( "Right History" ), ALT + CTRL + Key_Right, + new TDEAction( i18n( "Right History" ), ALT + CTRL + Key_Right, SLOTS, TQT_SLOT( openRightHistory() ), actionCollection(), "right history" ); - new KAction( i18n( "Media" ), CTRL + Key_M, + new TDEAction( i18n( "Media" ), CTRL + Key_M, SLOTS, TQT_SLOT( openMedia() ), actionCollection(), "media" ); - new KAction( i18n( "Left Media" ), CTRL + SHIFT + Key_Left, + new TDEAction( i18n( "Left Media" ), CTRL + SHIFT + Key_Left, SLOTS, TQT_SLOT( openLeftMedia() ), actionCollection(), "left media" ); - new KAction( i18n( "Right Media" ), CTRL + SHIFT + Key_Right, + new TDEAction( i18n( "Right Media" ), CTRL + SHIFT + Key_Right, SLOTS, TQT_SLOT( openRightMedia() ), actionCollection(), "right media" ); - new KAction( i18n( "New Symlink..." ), CTRL + ALT + Key_S, + new TDEAction( i18n( "New Symlink..." ), CTRL + ALT + Key_S, SLOTS, TQT_SLOT( newSymlink() ), actionCollection(), "new symlink"); - new KToggleAction( i18n( "Toggle Popup Panel" ), ALT + Key_Down, SLOTS, + new TDEToggleAction( i18n( "Toggle Popup Panel" ), ALT + Key_Down, SLOTS, TQT_SLOT( togglePopupPanel() ), actionCollection(), "toggle popup panel" ); - actVerticalMode = new KToggleAction( i18n( "Vertical Mode" ), "view_top_bottom", ALT + CTRL + Key_R, TQT_TQOBJECT(MAIN_VIEW), + actVerticalMode = new TDEToggleAction( i18n( "Vertical Mode" ), "view_top_bottom", ALT + CTRL + Key_R, TQT_TQOBJECT(MAIN_VIEW), TQT_SLOT( toggleVerticalMode() ), actionCollection(), "toggle vertical mode" ); - actNewTab = new KAction( i18n( "New Tab" ), "tab_new", ALT + CTRL + Key_N, SLOTS, + actNewTab = new TDEAction( i18n( "New Tab" ), "tab_new", ALT + CTRL + Key_N, SLOTS, TQT_SLOT( newTab() ), actionCollection(), "new tab" ); - actDupTab = new KAction( i18n( "Duplicate Current Tab" ), "tab_duplicate", ALT + CTRL + SHIFT + Key_N, SLOTS, + actDupTab = new TDEAction( i18n( "Duplicate Current Tab" ), "tab_duplicate", ALT + CTRL + SHIFT + Key_N, SLOTS, TQT_SLOT( duplicateTab() ), actionCollection(), "duplicate tab" ); - actCloseTab = new KAction( i18n( "Close Current Tab" ), "tab_remove", CTRL + Key_W, SLOTS, + actCloseTab = new TDEAction( i18n( "Close Current Tab" ), "tab_remove", CTRL + Key_W, SLOTS, TQT_SLOT( closeTab() ), actionCollection(), "close tab" ); - actNextTab = new KAction( i18n( "Next Tab" ), SHIFT + Key_Right, SLOTS, + actNextTab = new TDEAction( i18n( "Next Tab" ), SHIFT + Key_Right, SLOTS, TQT_SLOT( nextTab() ), actionCollection(), "next tab" ); - actPreviousTab = new KAction( i18n( "Previous Tab" ), SHIFT + Key_Left, SLOTS, + actPreviousTab = new TDEAction( i18n( "Previous Tab" ), SHIFT + Key_Left, SLOTS, TQT_SLOT( previousTab() ), actionCollection(), "previous tab" ); /* - actUserMenu = new KAction( i18n( "User Menu" ), ALT + Key_QuoteLeft, SLOTS, + actUserMenu = new TDEAction( i18n( "User Menu" ), ALT + Key_QuoteLeft, SLOTS, TQT_SLOT( userMenu() ), actionCollection(), "user menu" ); */ - actManageUseractions = new KAction( i18n( "Manage User Actions..." ), 0, SLOTS, + actManageUseractions = new TDEAction( i18n( "Manage User Actions..." ), 0, SLOTS, TQT_SLOT( manageUseractions() ), actionCollection(), "manage useractions" ); new KrRemoteEncodingMenu(i18n("Select Remote Charset"), "charset", actionCollection(), "changeremoteencoding"); // setup the Fn keys - actF2 = new KAction( i18n( "Start Terminal Here" ), "terminal", Key_F2, + actF2 = new TDEAction( i18n( "Start Terminal Here" ), "terminal", Key_F2, SLOTS, TQT_SLOT( terminal() ) , actionCollection(), "F2_Terminal" ); - actF3 = new KAction( i18n( "View File" ), Key_F3, + actF3 = new TDEAction( i18n( "View File" ), Key_F3, SLOTS, TQT_SLOT( view() ) , actionCollection(), "F3_View" ); - actF4 = new KAction( i18n( "Edit File" ), Key_F4, + actF4 = new TDEAction( i18n( "Edit File" ), Key_F4, SLOTS, TQT_SLOT( edit() ) , actionCollection(), "F4_Edit" ); - actF5 = new KAction( i18n( "Copy..." ), Key_F5, + actF5 = new TDEAction( i18n( "Copy..." ), Key_F5, SLOTS, TQT_SLOT( copyFiles() ) , actionCollection(), "F5_Copy" ); - actF6 = new KAction( i18n( "Move..." ), Key_F6, + actF6 = new TDEAction( i18n( "Move..." ), Key_F6, SLOTS, TQT_SLOT( moveFiles() ) , actionCollection(), "F6_Move" ); - actF7 = new KAction( i18n( "New Directory..." ), "folder_new", Key_F7, + actF7 = new TDEAction( i18n( "New Directory..." ), "folder_new", Key_F7, SLOTS, TQT_SLOT( mkdir() ) , actionCollection(), "F7_Mkdir" ); - actF8 = new KAction( i18n( "Delete" ), "editdelete", Key_F8, + actF8 = new TDEAction( i18n( "Delete" ), "editdelete", Key_F8, SLOTS, TQT_SLOT( deleteFiles() ) , actionCollection(), "F8_Delete" ); - actF9 = new KAction( i18n( "Rename" ), Key_F9, + actF9 = new TDEAction( i18n( "Rename" ), Key_F9, SLOTS, TQT_SLOT( rename() ) , actionCollection(), "F9_Rename" ); - actF10 = new KAction( i18n( "Quit" ), Key_F10, + actF10 = new TDEAction( i18n( "Quit" ), Key_F10, TQT_TQOBJECT(this), TQT_SLOT( slotClose() ) , actionCollection(), "F10_Quit" ); - actPopularUrls = new KAction( i18n("Popular URLs..."), CTRL+Key_Z, + actPopularUrls = new TDEAction( i18n("Popular URLs..."), CTRL+Key_Z, popularUrls, TQT_SLOT( showDialog() ), actionCollection(), "Popular_Urls"); - actLocationBar = new KAction( i18n("Go to Location Bar"), CTRL+Key_L, + actLocationBar = new TDEAction( i18n("Go to Location Bar"), CTRL+Key_L, SLOTS, TQT_SLOT( slotLocationBar() ), actionCollection(), "location_bar"); - actJumpBack = new KAction( i18n("Jump Back"), "kr_jumpback", CTRL+Key_J, + actJumpBack = new TDEAction( i18n("Jump Back"), "kr_jumpback", CTRL+Key_J, SLOTS, TQT_SLOT( slotJumpBack() ), actionCollection(), "jump_back"); - actSetJumpBack = new KAction( i18n("Set Jump Back Point"), "kr_setjumpback", CTRL+SHIFT+Key_J, + actSetJumpBack = new TDEAction( i18n("Set Jump Back Point"), "kr_setjumpback", CTRL+SHIFT+Key_J, SLOTS, TQT_SLOT( slotSetJumpBack() ), actionCollection(), "set_jump_back"); - actSwitchFullScreenTE = new KAction( i18n( "Toggle Fullwidget Terminal Emulator" ), 0, CTRL + Key_F, + actSwitchFullScreenTE = new TDEAction( i18n( "Toggle Fullwidget Terminal Emulator" ), 0, CTRL + Key_F, TQT_TQOBJECT(MAIN_VIEW), TQT_SLOT( switchFullScreenTE() ), actionCollection(), "switch_fullscreen_te" ); // and at last we can set the tool-tips @@ -808,7 +808,7 @@ void Krusader::setupActions() { userAction = new UserAction(); #ifdef __KJSEMBED__ - actShowJSConsole = new KAction( i18n( "JavaScript Console..." ), ALT + CTRL + Key_J, SLOTS, TQT_SLOT( jsConsole() ), actionCollection(), "JS_Console" ); + actShowJSConsole = new TDEAction( i18n( "JavaScript Console..." ), ALT + CTRL + Key_J, SLOTS, TQT_SLOT( jsConsole() ), actionCollection(), "JS_Console" ); #endif } @@ -1041,14 +1041,14 @@ void Krusader::updateGUI( bool enforce ) { createGUI( mainView->konsole_part ); // this needs to be called AFTER createGUI() !!! - userActionMenu = (KPopupMenu*) guiFactory()->container( "useractionmenu", this ); + userActionMenu = (TDEPopupMenu*) guiFactory()->container( "useractionmenu", this ); if ( userActionMenu ) userAction->populateMenu( userActionMenu ); toolBar() ->applySettings( krConfig, "Private" ); toolBar("actionsToolBar") ->applySettings( krConfig, "Actions Toolbar" ); - static_cast<KToggleAction*>(actionCollection()->action("toggle actions toolbar"))-> + static_cast<TDEToggleAction*>(actionCollection()->action("toggle actions toolbar"))-> setChecked(toolBar("actionsToolBar")->isVisible()); if ( enforce ) { diff --git a/krusader/krusader.h b/krusader/krusader.h index c0e7602..27c6224 100644 --- a/krusader/krusader.h +++ b/krusader/krusader.h @@ -123,31 +123,31 @@ class Krusader : public KParts::MainWindow, public DCOPObject { PopularUrls *popularUrls; // holds a sorted list of the most popular urls visited QueueManager *queueManager; // Actions - static KAction *actProperties, *actPack, *actUnpack, *actTest, *actCompare, *actCmdlinePopup; - static KAction *actCalculate, *actSelect, *actUnselect, *actSelectAll, *actLocate, *actSwitchFullScreenTE; - static KAction *actUnselectAll, *actInvert, *actSync, *actDiskUsage, *actSavePosition, *actCompDirs; - static KAction *actHomeTerminal, *actFTPConnect, *actFTPNewConnect, *actFTPDisconnect, *actProfiles; - static KAction *actExecFilter, *actCustomFilter, *actMountMan, *actNewTool, *actSwapPanels, *actSwapSides; - static KAction *actKonfigurator, *actToolsSetup, *actBack, *actRoot, *actFind, *actDirUp; - static KAction *actSelectColorMask, *actMultiRename, *actAllFilter, *actOpenLeftBm, *actOpenRightBm; - static KAction *actNewTab, *actDupTab, *actCloseTab, *actPreviousTab, *actNextTab, *actSplit; - static KAction *actCombine, *actUserMenu, *actManageUseractions, *actSyncDirs, *actSyncBrowse; - static KAction *actF2, *actF3, *actF4, *actF5, *actF6, *actF7, *actF8, *actF9, *actF10; - static KAction *actPopularUrls, *actLocationBar, *actJumpBack, *actSetJumpBack, *actCreateChecksum, *actMatchChecksum; - static KAction *actDetailedView, *actBriefView, *actCopy, *actPaste; - static KToggleAction *actToggleTerminal, *actVerticalMode; - static KRadioAction *actSelectNewerAndSingle, *actSelectNewer, *actSelectSingle, + static TDEAction *actProperties, *actPack, *actUnpack, *actTest, *actCompare, *actCmdlinePopup; + static TDEAction *actCalculate, *actSelect, *actUnselect, *actSelectAll, *actLocate, *actSwitchFullScreenTE; + static TDEAction *actUnselectAll, *actInvert, *actSync, *actDiskUsage, *actSavePosition, *actCompDirs; + static TDEAction *actHomeTerminal, *actFTPConnect, *actFTPNewConnect, *actFTPDisconnect, *actProfiles; + static TDEAction *actExecFilter, *actCustomFilter, *actMountMan, *actNewTool, *actSwapPanels, *actSwapSides; + static TDEAction *actKonfigurator, *actToolsSetup, *actBack, *actRoot, *actFind, *actDirUp; + static TDEAction *actSelectColorMask, *actMultiRename, *actAllFilter, *actOpenLeftBm, *actOpenRightBm; + static TDEAction *actNewTab, *actDupTab, *actCloseTab, *actPreviousTab, *actNextTab, *actSplit; + static TDEAction *actCombine, *actUserMenu, *actManageUseractions, *actSyncDirs, *actSyncBrowse; + static TDEAction *actF2, *actF3, *actF4, *actF5, *actF6, *actF7, *actF8, *actF9, *actF10; + static TDEAction *actPopularUrls, *actLocationBar, *actJumpBack, *actSetJumpBack, *actCreateChecksum, *actMatchChecksum; + static TDEAction *actDetailedView, *actBriefView, *actCopy, *actPaste; + static TDEToggleAction *actToggleTerminal, *actVerticalMode; + static TDERadioAction *actSelectNewerAndSingle, *actSelectNewer, *actSelectSingle, *actSelectDifferentAndSingle, *actSelectDifferent; /** actions for setting the execution mode of commands from commanddline */ - static KRadioAction *actExecStartAndForget, + static TDERadioAction *actExecStartAndForget, *actExecCollectSeparate,*actExecCollectTogether, *actExecTerminalExternal,*actExecTerminalEmbedded; - KToggleAction *actToggleFnkeys, *actToggleCmdline, *actShowToolBar, + TDEToggleAction *actToggleFnkeys, *actToggleCmdline, *actShowToolBar, *actShowStatusBar, *actToggleHidden, *actCompareDirs; - static KRadioAction **compareArray[]; + static TDERadioAction **compareArray[]; /** actions for setting the execution mode of commands from commanddline */ - static KRadioAction **execTypeArray[]; + static TDERadioAction **execTypeArray[]; // return a path to a temp dir or file we can use. TQString getTempDir(); @@ -161,16 +161,16 @@ class Krusader : public KParts::MainWindow, public DCOPObject { KrusaderStatus *status; KRslots *slot; - KAccel *accels; // global accelerators + TDEAccel *accels; // global accelerators - static KPopupMenu *userActionMenu; + static TDEPopupMenu *userActionMenu; static UserMenu *userMenu; static UserAction *userAction; static KrBookmarkHandler *bookman; #ifdef __KJSEMBED__ static KrJS *js; - static KAction *actShowJSConsole; + static TDEAction *actShowJSConsole; #endif signals: diff --git a/krusader/paneltabbar.cpp b/krusader/paneltabbar.cpp index f691dc6..d4df4f4 100644 --- a/krusader/paneltabbar.cpp +++ b/krusader/paneltabbar.cpp @@ -32,7 +32,7 @@ #define DISPLAY(X) (X.isLocalFile() ? X.path() : X.prettyURL()) PanelTabBar::PanelTabBar(TQWidget *parent): TQTabBar(parent), _maxTabLength(0) { - _panelActionMenu = new KActionMenu( i18n("Panel"), TQT_TQOBJECT(this) ); + _panelActionMenu = new TDEActionMenu( i18n("Panel"), TQT_TQOBJECT(this) ); setAcceptDrops(true); insertAction(krNewTab); @@ -71,7 +71,7 @@ void PanelTabBar::mousePressEvent( TQMouseEvent* e ) { TQTabBar::mousePressEvent(e); } -void PanelTabBar::insertAction( KAction* action ) { +void PanelTabBar::insertAction( TDEAction* action ) { _panelActionMenu->insert( action ); } diff --git a/krusader/paneltabbar.h b/krusader/paneltabbar.h index 4836477..bb9538d 100644 --- a/krusader/paneltabbar.h +++ b/krusader/paneltabbar.h @@ -22,8 +22,8 @@ #include <tqvaluelist.h> class TQMouseEvent; -class KAction; -class KActionMenu; +class TDEAction; +class TDEActionMenu; class ListPanel; /** @@ -81,7 +81,7 @@ signals: protected: void mousePressEvent( TQMouseEvent* ); - void insertAction( KAction* ); + void insertAction( TDEAction* ); TQString squeeze(TQString text, int index=-1); virtual void dragEnterEvent(TQDragEnterEvent *); virtual void dragMoveEvent(TQDragMoveEvent *); @@ -92,7 +92,7 @@ protected slots: void duplicateTab(); private: - KActionMenu *_panelActionMenu; + TDEActionMenu *_panelActionMenu; bool _left; int _maxTabLength; }; |