diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/bookmarkssettingspage.cpp | 2 | ||||
-rw-r--r-- | src/bookmarkssettingspage.h | 4 | ||||
-rw-r--r-- | src/detailsviewsettingspage.cpp | 2 | ||||
-rw-r--r-- | src/detailsviewsettingspage.h | 4 | ||||
-rw-r--r-- | src/dolphin.cpp | 134 | ||||
-rw-r--r-- | src/dolphin.h | 16 | ||||
-rw-r--r-- | src/dolphincontextmenu.cpp | 52 | ||||
-rw-r--r-- | src/dolphincontextmenu.h | 8 | ||||
-rw-r--r-- | src/dolphiniconsview.cpp | 4 | ||||
-rw-r--r-- | src/iconsviewsettingspage.cpp | 2 | ||||
-rw-r--r-- | src/iconsviewsettingspage.h | 4 | ||||
-rw-r--r-- | src/main.cpp | 2 |
12 files changed, 117 insertions, 117 deletions
diff --git a/src/bookmarkssettingspage.cpp b/src/bookmarkssettingspage.cpp index 42c8973..5f773fd 100644 --- a/src/bookmarkssettingspage.cpp +++ b/src/bookmarkssettingspage.cpp @@ -53,7 +53,7 @@ BookmarksSettingsPage::BookmarksSettingsPage(TQWidget*parent) : hBox->setSpacing(spacing); hBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Ignored); - m_listView = new KListView(hBox); + m_listView = new TDEListView(hBox); m_listView->addColumn(i18n("Icon")); m_listView->addColumn(i18n("Name")); m_listView->addColumn(i18n("Location")); diff --git a/src/bookmarkssettingspage.h b/src/bookmarkssettingspage.h index 4a68ec2..1f1dcea 100644 --- a/src/bookmarkssettingspage.h +++ b/src/bookmarkssettingspage.h @@ -24,7 +24,7 @@ #include <settingspagebase.h> #include <tqvaluelist.h> -class KListView; +class TDEListView; class KPushButton; class TQListViewItem; @@ -71,7 +71,7 @@ private: IconIdx = 3 }; - KListView* m_listView; + TDEListView* m_listView; KPushButton* m_addButton; KPushButton* m_editButton; KPushButton* m_removeButton; diff --git a/src/detailsviewsettingspage.cpp b/src/detailsviewsettingspage.cpp index f5e2bd7..f99478a 100644 --- a/src/detailsviewsettingspage.cpp +++ b/src/detailsviewsettingspage.cpp @@ -107,7 +107,7 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(TQWidget *parent) : textGroup->setMargin(margin); new TQLabel(i18n("Font family:"), textGroup); - m_fontFamilyBox = new KFontCombo(textGroup); + m_fontFamilyBox = new TDEFontCombo(textGroup); m_fontFamilyBox->setCurrentFont(settings->fontFamily()); new TQLabel(i18n("Font size:"), textGroup); diff --git a/src/detailsviewsettingspage.h b/src/detailsviewsettingspage.h index d899fe9..e3fbeb3 100644 --- a/src/detailsviewsettingspage.h +++ b/src/detailsviewsettingspage.h @@ -23,7 +23,7 @@ #include <tqvbox.h> class TQCheckBox; -class KFontCombo; +class TDEFontCombo; class TQSpinBox; class TQComboBox; class TQRadioButton; @@ -59,7 +59,7 @@ private: TQRadioButton* m_mediumIconSize; TQRadioButton* m_largeIconSize; - KFontCombo* m_fontFamilyBox; + TDEFontCombo* m_fontFamilyBox; TQSpinBox* m_fontSizeBox; }; diff --git a/src/dolphin.cpp b/src/dolphin.cpp index bd9a46a..98abe71 100644 --- a/src/dolphin.cpp +++ b/src/dolphin.cpp @@ -123,7 +123,7 @@ void Dolphin::dropURLs(const KURL::List& urls, } else { // no shortcut is used, hence open a popup menu - KPopupMenu popup(this); + TDEPopupMenu popup(this); popup.insertItem(SmallIcon("goto"), i18n("&Move Here") + "\t" + KKey::modFlagLabel(KKey::SHIFT), 0); popup.insertItem(SmallIcon("editcopy"), i18n( "&Copy Here" ) + "\t" + KKey::modFlagLabel(KKey::CTRL), 1); @@ -232,21 +232,21 @@ void Dolphin::slotViewModeChanged() void Dolphin::slotShowHiddenFilesChanged() { - KToggleAction* showHiddenFilesAction = - static_cast<KToggleAction*>(actionCollection()->action("show_hidden_files")); + TDEToggleAction* showHiddenFilesAction = + static_cast<TDEToggleAction*>(actionCollection()->action("show_hidden_files")); showHiddenFilesAction->setChecked(m_activeView->isShowHiddenFilesEnabled()); } void Dolphin::slotShowFilterBarChanged() { - KToggleAction* showFilterBarAction = - static_cast<KToggleAction*>(actionCollection()->action("show_filter_bar")); + TDEToggleAction* showFilterBarAction = + static_cast<TDEToggleAction*>(actionCollection()->action("show_filter_bar")); showFilterBarAction->setChecked(m_activeView->isFilterBarVisible()); } void Dolphin::slotSortingChanged(DolphinView::Sorting sorting) { - KAction* action = 0; + TDEAction* action = 0; switch (sorting) { case DolphinView::SortByName: action = actionCollection()->action("by_name"); @@ -262,14 +262,14 @@ void Dolphin::slotSortingChanged(DolphinView::Sorting sorting) } if (action != 0) { - KToggleAction* toggleAction = static_cast<KToggleAction*>(action); + TDEToggleAction* toggleAction = static_cast<TDEToggleAction*>(action); toggleAction->setChecked(true); } } void Dolphin::slotSortOrderChanged(TQt::SortOrder order) { - KToggleAction* descending = static_cast<KToggleAction*>(actionCollection()->action("descending")); + TDEToggleAction* descending = static_cast<TDEToggleAction*>(actionCollection()->action("descending")); const bool sortDescending = (order == TQt::Descending); descending->setChecked(sortDescending); } @@ -284,7 +284,7 @@ void Dolphin::slotSelectionChanged() selectedURLsCount += m_view[SecondaryIdx]->selectedURLs().count(); } - KAction* compareFilesAction = actionCollection()->action("compare_files"); + TDEAction* compareFilesAction = actionCollection()->action("compare_files"); compareFilesAction->setEnabled(selectedURLsCount == 2); m_activeView->updateStatusBar(); @@ -317,7 +317,7 @@ void Dolphin::closeEvent(TQCloseEvent* event) settings.save(); config->sync(); - KMainWindow::closeEvent(event); + TDEMainWindow::closeEvent(event); } void Dolphin::saveProperties(TDEConfig* config) @@ -607,7 +607,7 @@ void Dolphin::slotDeleteFileFinished(TDEIO::Job* job) void Dolphin::slotUndoAvailable(bool available) { - KAction* undoAction = actionCollection()->action(KStdAction::stdName(KStdAction::Undo)); + TDEAction* undoAction = actionCollection()->action(KStdAction::stdName(KStdAction::Undo)); if (undoAction != 0) { undoAction->setEnabled(available); } @@ -615,7 +615,7 @@ void Dolphin::slotUndoAvailable(bool available) void Dolphin::slotUndoTextChanged(const TQString& text) { - KAction* undoAction = actionCollection()->action(KStdAction::stdName(KStdAction::Undo)); + TDEAction* undoAction = actionCollection()->action(KStdAction::stdName(KStdAction::Undo)); if (undoAction != 0) { undoAction->setText(text); } @@ -623,7 +623,7 @@ void Dolphin::slotUndoTextChanged(const TQString& text) void Dolphin::slotRedoAvailable(bool available) { - KAction* redoAction = actionCollection()->action(KStdAction::stdName(KStdAction::Redo)); + TDEAction* redoAction = actionCollection()->action(KStdAction::stdName(KStdAction::Redo)); if (redoAction != 0) { redoAction->setEnabled(available); } @@ -631,7 +631,7 @@ void Dolphin::slotRedoAvailable(bool available) void Dolphin::slotRedoTextChanged(const TQString& text) { - KAction* redoAction = actionCollection()->action(KStdAction::stdName(KStdAction::Redo)); + TDEAction* redoAction = actionCollection()->action(KStdAction::stdName(KStdAction::Redo)); if (redoAction != 0) { redoAction->setText(text); } @@ -697,7 +697,7 @@ void Dolphin::paste() void Dolphin::updatePasteAction() { - KAction* pasteAction = actionCollection()->action(KStdAction::stdName(KStdAction::Paste)); + TDEAction* pasteAction = actionCollection()->action(KStdAction::stdName(KStdAction::Paste)); if (pasteAction == 0) { return; } @@ -851,16 +851,16 @@ void Dolphin::showHiddenFiles() { clearStatusBar(); - const KToggleAction* showHiddenFilesAction = - static_cast<KToggleAction*>(actionCollection()->action("show_hidden_files")); + const TDEToggleAction* showHiddenFilesAction = + static_cast<TDEToggleAction*>(actionCollection()->action("show_hidden_files")); const bool show = showHiddenFilesAction->isChecked(); m_activeView->setShowHiddenFilesEnabled(show); } void Dolphin::showFilterBar() { - const KToggleAction* showFilterBarAction = - static_cast<KToggleAction*>(actionCollection()->action("show_filter_bar")); + const TDEToggleAction* showFilterBarAction = + static_cast<TDEToggleAction*>(actionCollection()->action("show_filter_bar")); const bool show = showFilterBarAction->isChecked(); m_activeView->slotShowFilterBar(show); } @@ -1066,7 +1066,7 @@ void Dolphin::addUndoOperation(TDEIO::Job* job) } Dolphin::Dolphin() : - KMainWindow(0, "D3lphin"), + TDEMainWindow(0, "D3lphin"), m_splitter(0), m_leftsidebar(0), m_rightsidebar(0), @@ -1164,7 +1164,7 @@ void Dolphin::loadSettings() { DolphinSettings& settings = DolphinSettings::instance(); - KToggleAction* splitAction = static_cast<KToggleAction*>(actionCollection()->action("split_view")); + TDEToggleAction* splitAction = static_cast<TDEToggleAction*>(actionCollection()->action("split_view")); if (settings.isViewSplit()) { splitAction->setChecked(true); toggleSplitView(); @@ -1176,26 +1176,26 @@ void Dolphin::loadSettings() void Dolphin::setupActions() { // setup 'File' menu - KAction* createFolder = new KAction(i18n("Folder..."), "Ctrl+N", + TDEAction* createFolder = new TDEAction(i18n("Folder..."), "Ctrl+N", TQT_TQOBJECT(this), TQT_SLOT(createFolder()), actionCollection(), "create_folder"); createFolder->setIcon("folder"); - new KAction(i18n("Rename"), KKey(Key_F2), + new TDEAction(i18n("Rename"), KKey(Key_F2), TQT_TQOBJECT(this), TQT_SLOT(rename()), actionCollection(), "rename"); - KAction* moveToTrashAction = new KAction(i18n("Move to Trash"), KKey(Key_Delete), + TDEAction* moveToTrashAction = new TDEAction(i18n("Move to Trash"), KKey(Key_Delete), TQT_TQOBJECT(this), TQT_SLOT(moveToTrash()), actionCollection(), "move_to_trash"); moveToTrashAction->setIcon("edittrash"); - KAction* deleteAction = new KAction(i18n("Delete"), "Shift+Delete", + TDEAction* deleteAction = new TDEAction(i18n("Delete"), "Shift+Delete", TQT_TQOBJECT(this), TQT_SLOT(deleteItems()), actionCollection(), "delete"); deleteAction->setIcon("editdelete"); - new KAction(i18n("Propert&ies"), "Alt+Return", + new TDEAction(i18n("Propert&ies"), "Alt+Return", TQT_TQOBJECT(this), TQT_SLOT(properties()), actionCollection(), "properties"); @@ -1223,11 +1223,11 @@ void Dolphin::setupActions() KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copy()), actionCollection()); KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(paste()), actionCollection()); - new KAction(i18n("Select All"), "Ctrl+A", + new TDEAction(i18n("Select All"), "Ctrl+A", TQT_TQOBJECT(this), TQT_SLOT(selectAll()), actionCollection(), "select_all"); - new KAction(i18n("Invert Selection"), "Ctrl+Shift+A", + new TDEAction(i18n("Invert Selection"), "Ctrl+Shift+A", TQT_TQOBJECT(this), TQT_SLOT(invertSelection()), actionCollection(), "invert_selection"); @@ -1240,78 +1240,78 @@ void Dolphin::setupActions() TQT_SLOT(zoomOut()), actionCollection()); - KRadioAction* iconsView = new KRadioAction(i18n("Icons"), "Ctrl+1", + TDERadioAction* iconsView = new TDERadioAction(i18n("Icons"), "Ctrl+1", TQT_TQOBJECT(this), TQT_SLOT(setIconsView()), actionCollection(), "icons"); iconsView->setExclusiveGroup("view_mode"); iconsView->setIcon("view_icon"); - KRadioAction* detailsView = new KRadioAction(i18n("Details"), "Ctrl+2", + TDERadioAction* detailsView = new TDERadioAction(i18n("Details"), "Ctrl+2", TQT_TQOBJECT(this), TQT_SLOT(setDetailsView()), actionCollection(), "details"); detailsView->setExclusiveGroup("view_mode"); detailsView->setIcon("view_text"); - KRadioAction* previewsView = new KRadioAction(i18n("Previews"), "Ctrl+3", + TDERadioAction* previewsView = new TDERadioAction(i18n("Previews"), "Ctrl+3", TQT_TQOBJECT(this), TQT_SLOT(setPreviewsView()), actionCollection(), "previews"); previewsView->setExclusiveGroup("view_mode"); previewsView->setIcon("gvdirpart"); - KRadioAction* sortByName = new KRadioAction(i18n("By Name"), 0, + TDERadioAction* sortByName = new TDERadioAction(i18n("By Name"), 0, TQT_TQOBJECT(this), TQT_SLOT(sortByName()), actionCollection(), "by_name"); sortByName->setExclusiveGroup("sort"); - KRadioAction* sortBySize = new KRadioAction(i18n("By Size"), 0, + TDERadioAction* sortBySize = new TDERadioAction(i18n("By Size"), 0, TQT_TQOBJECT(this), TQT_SLOT(sortBySize()), actionCollection(), "by_size"); sortBySize->setExclusiveGroup("sort"); - KRadioAction* sortByDate = new KRadioAction(i18n("By Date"), 0, + TDERadioAction* sortByDate = new TDERadioAction(i18n("By Date"), 0, TQT_TQOBJECT(this), TQT_SLOT(sortByDate()), actionCollection(), "by_date"); sortByDate->setExclusiveGroup("sort"); - new KToggleAction(i18n("Descending"), 0, TQT_TQOBJECT(this), TQT_SLOT(toggleSortOrder()), + new TDEToggleAction(i18n("Descending"), 0, TQT_TQOBJECT(this), TQT_SLOT(toggleSortOrder()), actionCollection(), "descending"); - new KToggleAction(i18n("Show Hidden Files"), "Alt+.", + new TDEToggleAction(i18n("Show Hidden Files"), "Alt+.", TQT_TQOBJECT(this), TQT_SLOT(showHiddenFiles()), actionCollection(), "show_hidden_files"); - KToggleAction* splitAction = new KToggleAction(i18n("Split View"), "F10", + TDEToggleAction* splitAction = new TDEToggleAction(i18n("Split View"), "F10", TQT_TQOBJECT(this), TQT_SLOT(toggleSplitView()), actionCollection(), "split_view"); splitAction->setIcon("view_left_right"); - KAction* reloadAction = new KAction(i18n("Reload"), "F5", + TDEAction* reloadAction = new TDEAction(i18n("Reload"), "F5", TQT_TQOBJECT(this), TQT_SLOT(reloadView()), actionCollection(), "reload"); reloadAction->setIcon("reload"); - KAction* stopAction = new KAction(i18n("Stop"), 0, + TDEAction* stopAction = new TDEAction(i18n("Stop"), 0, TQT_TQOBJECT(this), TQT_SLOT(stopLoading()), actionCollection(), "stop"); stopAction->setIcon("stop"); - new KAction(i18n("Edit Location"), "Ctrl+L", + new TDEAction(i18n("Edit Location"), "Ctrl+L", TQT_TQOBJECT(this), TQT_SLOT(editLocation()), actionCollection(), "edit_location"); - new KAction(i18n("Browse"), "Ctrl+B", + new TDEAction(i18n("Browse"), "Ctrl+B", TQT_TQOBJECT(this), TQT_SLOT(browse()), actionCollection(), "browse"); - new KToggleAction(i18n("Left Sidebar"), "F8", + new TDEToggleAction(i18n("Left Sidebar"), "F8", TQT_TQOBJECT(this), TQT_SLOT(toggleleftSidebar()), actionCollection(), "leftsidebar"); - new KToggleAction(i18n("Right Sidebar"), "F9", + new TDEToggleAction(i18n("Right Sidebar"), "F9", TQT_TQOBJECT(this), TQT_SLOT(togglerightSidebar()), actionCollection(), "rightsidebar"); - new KAction(i18n("Adjust View Properties..."), 0, + new TDEAction(i18n("Adjust View Properties..."), 0, TQT_TQOBJECT(this), TQT_SLOT(adjustViewProperties()), actionCollection(), "view_properties"); @@ -1322,21 +1322,21 @@ void Dolphin::setupActions() KStdAction::home(TQT_TQOBJECT(this), TQT_SLOT(goHome()), actionCollection()); // setup 'Tools' menu - KAction* openTerminalAction = new KAction(i18n("Open Terminal"), "F4", + TDEAction* openTerminalAction = new TDEAction(i18n("Open Terminal"), "F4", TQT_TQOBJECT(this), TQT_SLOT(openTerminal()), actionCollection(), "open_terminal"); openTerminalAction->setIcon("konsole"); - KAction* findFileAction = new KAction(i18n("Find File..."), "Ctrl+F", + TDEAction* findFileAction = new TDEAction(i18n("Find File..."), "Ctrl+F", TQT_TQOBJECT(this), TQT_SLOT(findFile()), actionCollection(), "find_file"); findFileAction->setIcon("filefind"); - new KToggleAction(i18n("Show Filter Bar"), "filter", "/", + new TDEToggleAction(i18n("Show Filter Bar"), "filter", "/", TQT_TQOBJECT(this), TQT_SLOT(showFilterBar()), actionCollection(), "show_filter_bar"); - KAction* compareFilesAction = new KAction(i18n("Compare Files"), 0, + TDEAction* compareFilesAction = new TDEAction(i18n("Compare Files"), 0, TQT_TQOBJECT(this), TQT_SLOT(compareFiles()), actionCollection(), "compare_files"); compareFilesAction->setIcon("kompare"); @@ -1408,7 +1408,7 @@ void Dolphin::setupCreateNewMenuActions() KSortableValueList<CreateFileEntry, TQString>::ConstIterator end = m_createFileTemplates.end(); while (it != end) { CreateFileEntry entry = (*it).value(); - KAction* action = new KAction(entry.name); + TDEAction* action = new TDEAction(entry.name); action->setIcon(entry.icon); action->setName((*it).index().ascii()); connect(action, TQT_SIGNAL(activated()), @@ -1452,12 +1452,12 @@ void Dolphin::updateHistory() int index = 0; const TQValueList<URLNavigator::HistoryElem> list = m_activeView->urlHistory(index); - KAction* backAction = actionCollection()->action("go_back"); + TDEAction* backAction = actionCollection()->action("go_back"); if (backAction != 0) { backAction->setEnabled(index < static_cast<int>(list.count()) - 1); } - KAction* forwardAction = actionCollection()->action("go_forward"); + TDEAction* forwardAction = actionCollection()->action("go_forward"); if (forwardAction != 0) { forwardAction->setEnabled(index > 0); } @@ -1472,7 +1472,7 @@ void Dolphin::updateEditActions() else { stateChanged("has_selection"); - KAction* renameAction = actionCollection()->action("rename"); + TDEAction* renameAction = actionCollection()->action("rename"); if (renameAction != 0) { renameAction->setEnabled(list->count() >= 1); } @@ -1490,7 +1490,7 @@ void Dolphin::updateEditActions() ++it; } - KAction* moveToTrashAction = actionCollection()->action("move_to_trash"); + TDEAction* moveToTrashAction = actionCollection()->action("move_to_trash"); moveToTrashAction->setEnabled(enableMoveToTrash); } updatePasteAction(); @@ -1498,17 +1498,17 @@ void Dolphin::updateEditActions() void Dolphin::updateViewActions() { - KAction* zoomInAction = actionCollection()->action(KStdAction::stdName(KStdAction::ZoomIn)); + TDEAction* zoomInAction = actionCollection()->action(KStdAction::stdName(KStdAction::ZoomIn)); if (zoomInAction != 0) { zoomInAction->setEnabled(m_activeView->isZoomInPossible()); } - KAction* zoomOutAction = actionCollection()->action(KStdAction::stdName(KStdAction::ZoomOut)); + TDEAction* zoomOutAction = actionCollection()->action(KStdAction::stdName(KStdAction::ZoomOut)); if (zoomOutAction != 0) { zoomOutAction->setEnabled(m_activeView->isZoomOutPossible()); } - KAction* action = 0; + TDEAction* action = 0; switch (m_activeView->mode()) { case DolphinView::IconsView: action = actionCollection()->action("icons"); @@ -1524,34 +1524,34 @@ void Dolphin::updateViewActions() } if (action != 0) { - KToggleAction* toggleAction = static_cast<KToggleAction*>(action); + TDEToggleAction* toggleAction = static_cast<TDEToggleAction*>(action); toggleAction->setChecked(true); } slotSortingChanged(m_activeView->sorting()); slotSortOrderChanged(m_activeView->sortOrder()); - KToggleAction* showFilterBarAction = - static_cast<KToggleAction*>(actionCollection()->action("show_filter_bar")); + TDEToggleAction* showFilterBarAction = + static_cast<TDEToggleAction*>(actionCollection()->action("show_filter_bar")); showFilterBarAction->setChecked(m_activeView->isFilterBarVisible()); - KToggleAction* showHiddenFilesAction = - static_cast<KToggleAction*>(actionCollection()->action("show_hidden_files")); + TDEToggleAction* showHiddenFilesAction = + static_cast<TDEToggleAction*>(actionCollection()->action("show_hidden_files")); showHiddenFilesAction->setChecked(m_activeView->isShowHiddenFilesEnabled()); - KToggleAction* splitAction = static_cast<KToggleAction*>(actionCollection()->action("split_view")); + TDEToggleAction* splitAction = static_cast<TDEToggleAction*>(actionCollection()->action("split_view")); splitAction->setChecked(m_view[SecondaryIdx] != 0); - KToggleAction* leftsidebarAction = static_cast<KToggleAction*>(actionCollection()->action("leftsidebar")); + TDEToggleAction* leftsidebarAction = static_cast<TDEToggleAction*>(actionCollection()->action("leftsidebar")); leftsidebarAction->setChecked(m_leftsidebar != 0); - KToggleAction* rightsidebarAction = static_cast<KToggleAction*>(actionCollection()->action("rightsidebar")); + TDEToggleAction* rightsidebarAction = static_cast<TDEToggleAction*>(actionCollection()->action("rightsidebar")); rightsidebarAction->setChecked(m_rightsidebar != 0); } void Dolphin::updateGoActions() { - KAction* goUpAction = actionCollection()->action(KStdAction::stdName(KStdAction::Up)); + TDEAction* goUpAction = actionCollection()->action(KStdAction::stdName(KStdAction::Up)); const KURL& currentURL = m_activeView->url(); goUpAction->setEnabled(currentURL.upURL() != currentURL); } @@ -1691,7 +1691,7 @@ void Dolphin::toggleleftSidebar() closeleftSidebar(); } - KToggleAction* leftsidebarAction = static_cast<KToggleAction*>(actionCollection()->action("leftsidebar")); + TDEToggleAction* leftsidebarAction = static_cast<TDEToggleAction*>(actionCollection()->action("leftsidebar")); leftsidebarAction->setChecked(m_leftsidebar != 0); } @@ -1704,7 +1704,7 @@ void Dolphin::togglerightSidebar() closerightSidebar(); } - KToggleAction* rightsidebarAction = static_cast<KToggleAction*>(actionCollection()->action("rightsidebar")); + TDEToggleAction* rightsidebarAction = static_cast<TDEToggleAction*>(actionCollection()->action("rightsidebar")); rightsidebarAction->setChecked(m_rightsidebar != 0); } diff --git a/src/dolphin.h b/src/dolphin.h index 779b5d7..ea7d081 100644 --- a/src/dolphin.h +++ b/src/dolphin.h @@ -43,7 +43,7 @@ class KFileIconView; class TQHBox; class TQIconViewItem; class TQSplitter; -class KAction; +class TDEAction; class URLNavigator; class leftSidebar; class rightSidebar; @@ -55,7 +55,7 @@ class rightSidebar; * * @author Peter Penz <[email protected]> */ -class Dolphin : public KMainWindow +class Dolphin : public TDEMainWindow { Q_OBJECT @@ -108,9 +108,9 @@ public: * of the 'Create New...' sub menu. Usually the list contains actions * for creating folders, text files, HTML files etc. */ - const TQPtrList<KAction>& fileGroupActions() const { return m_fileGroupActions; } - //const TQPtrList<KAction>& linkGroupActions() const { return m_linkGroupActions; } - //const TQPtrList<KAction>& linkToDeviceActions() const { return m_linkToDeviceActions; } + const TQPtrList<TDEAction>& fileGroupActions() const { return m_fileGroupActions; } + //const TQPtrList<TDEAction>& linkGroupActions() const { return m_linkGroupActions; } + //const TQPtrList<TDEAction>& linkToDeviceActions() const { return m_linkToDeviceActions; } /** * Refreshs the views of the main window by recreating them dependent from @@ -444,13 +444,13 @@ private: TQString comment; }; - TQPtrList<KAction> m_fileGroupActions; + TQPtrList<TDEAction> m_fileGroupActions; KSortableValueList<CreateFileEntry,TQString> m_createFileTemplates; // TODO: not used yet. See documentation of Dolphin::linkGroupActions() // and Dolphin::linkToDeviceActions() in for details. - //TQPtrList<KAction> m_linkGroupActions; - //TQPtrList<KAction> m_linkToDeviceActions; + //TQPtrList<TDEAction> m_linkGroupActions; + //TQPtrList<TDEAction> m_linkToDeviceActions; }; #endif // _DOLPHIN_H_ diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index a814a2a..6589962 100644 --- a/src/dolphincontextmenu.cpp +++ b/src/dolphincontextmenu.cpp @@ -78,22 +78,22 @@ void DolphinContextMenu::openViewportContextMenu() const int propertiesID = 100; const int bookmarkID = 101; - KPopupMenu* popup = new KPopupMenu(m_dolphinView); + TDEPopupMenu* popup = new TDEPopupMenu(m_dolphinView); Dolphin& dolphin = Dolphin::mainWin(); // setup 'Create New' menu - KPopupMenu* createNewMenu = new KPopupMenu(); + TDEPopupMenu* createNewMenu = new TDEPopupMenu(); - KAction* createFolderAction = dolphin.actionCollection()->action("create_folder"); + TDEAction* createFolderAction = dolphin.actionCollection()->action("create_folder"); if (createFolderAction != 0) { createFolderAction->plug(createNewMenu); } createNewMenu->insertSeparator(); - KAction* action = 0; + TDEAction* action = 0; - TQPtrListIterator<KAction> fileGrouptIt(dolphin.fileGroupActions()); + TQPtrListIterator<TDEAction> fileGrouptIt(dolphin.fileGroupActions()); while ((action = fileGrouptIt.current()) != 0) { action->plug(createNewMenu); ++fileGrouptIt; @@ -104,14 +104,14 @@ void DolphinContextMenu::openViewportContextMenu() // //createNewMenu->insertSeparator(); // - //TQPtrListIterator<KAction> linkGroupIt(dolphin.linkGroupActions()); + //TQPtrListIterator<TDEAction> linkGroupIt(dolphin.linkGroupActions()); //while ((action = linkGroupIt.current()) != 0) { // action->plug(createNewMenu); // ++linkGroupIt; //} // - //KPopupMenu* linkToDeviceMenu = new KPopupMenu(); - //TQPtrListIterator<KAction> linkToDeviceIt(dolphin.linkToDeviceActions()); + //TDEPopupMenu* linkToDeviceMenu = new TDEPopupMenu(); + //TQPtrListIterator<TDEAction> linkToDeviceIt(dolphin.linkToDeviceActions()); //while ((action = linkToDeviceIt.current()) != 0) { // action->plug(linkToDeviceMenu); // ++linkToDeviceIt; @@ -130,19 +130,19 @@ void DolphinContextMenu::openViewportContextMenu() } popup->insertSeparator(); - KAction* pasteAction = dolphin.actionCollection()->action(KStdAction::stdName(KStdAction::Paste)); + TDEAction* pasteAction = dolphin.actionCollection()->action(KStdAction::stdName(KStdAction::Paste)); pasteAction->plug(popup); // setup 'View Mode' menu - KPopupMenu* viewModeMenu = new KPopupMenu(); + TDEPopupMenu* viewModeMenu = new TDEPopupMenu(); - KAction* iconsMode = dolphin.actionCollection()->action("icons"); + TDEAction* iconsMode = dolphin.actionCollection()->action("icons"); iconsMode->plug(viewModeMenu); - KAction* detailsMode = dolphin.actionCollection()->action("details"); + TDEAction* detailsMode = dolphin.actionCollection()->action("details"); detailsMode->plug(viewModeMenu); - KAction* previewsMode = dolphin.actionCollection()->action("previews"); + TDEAction* previewsMode = dolphin.actionCollection()->action("previews"); previewsMode->plug(viewModeMenu); popup->insertItem(i18n("View Mode"), viewModeMenu); @@ -186,7 +186,7 @@ void DolphinContextMenu::openItemContextMenu() assert(m_fileInfo != 0); - KPopupMenu* popup = new KPopupMenu(m_dolphinView); + TDEPopupMenu* popup = new TDEPopupMenu(m_dolphinView); Dolphin& dolphin = Dolphin::mainWin(); const KURL::List urls = m_dolphinView->selectedURLs(); @@ -200,7 +200,7 @@ void DolphinContextMenu::openItemContextMenu() const KStdAction::StdAction actionNames[] = { KStdAction::Cut, KStdAction::Copy, KStdAction::Paste }; const int count = sizeof(actionNames) / sizeof(KStdAction::StdAction); for (int i = 0; i < count; ++i) { - KAction* action = dolphin.actionCollection()->action(KStdAction::stdName(actionNames[i])); + TDEAction* action = dolphin.actionCollection()->action(KStdAction::stdName(actionNames[i])); if (action != 0) { action->plug(popup); } @@ -208,16 +208,16 @@ void DolphinContextMenu::openItemContextMenu() popup->insertSeparator(); // insert 'Rename' - KAction* renameAction = dolphin.actionCollection()->action("rename"); + TDEAction* renameAction = dolphin.actionCollection()->action("rename"); renameAction->plug(popup); // insert 'Move to Trash' for local URLs, otherwise insert 'Delete' if (url.isLocalFile()) { - KAction* moveToTrashAction = dolphin.actionCollection()->action("move_to_trash"); + TDEAction* moveToTrashAction = dolphin.actionCollection()->action("move_to_trash"); moveToTrashAction->plug(popup); } else { - KAction* deleteAction = dolphin.actionCollection()->action("delete"); + TDEAction* deleteAction = dolphin.actionCollection()->action("delete"); deleteAction->plug(popup); } @@ -240,7 +240,7 @@ void DolphinContextMenu::openItemContextMenu() // insert 'Properties...' entry popup->insertSeparator(); - KAction* propertiesAction = dolphin.actionCollection()->action("properties"); + TDEAction* propertiesAction = dolphin.actionCollection()->action("properties"); propertiesAction->plug(popup); int id = popup->exec(m_pos); @@ -282,7 +282,7 @@ void DolphinContextMenu::openItemContextMenu() popup->deleteLater(); } -int DolphinContextMenu::insertOpenWithItems(KPopupMenu* popup, +int DolphinContextMenu::insertOpenWithItems(TDEPopupMenu* popup, TQValueVector<KService::Ptr>& openWithVector) { // Prepare 'Open With' sub menu. Usually a sub menu is created, where all applications @@ -311,7 +311,7 @@ int DolphinContextMenu::insertOpenWithItems(KPopupMenu* popup, int index = openWithIDStart; if (offers.count() > 0) { TDETrader::OfferList::Iterator it; - KPopupMenu* openWithMenu = new KPopupMenu(); + TDEPopupMenu* openWithMenu = new TDEPopupMenu(); for(it = offers.begin(); it != offers.end(); ++it) { // The offer list from the TDETrader returns duplicate // application entries. Although this seems to be a configuration @@ -350,16 +350,16 @@ int DolphinContextMenu::insertOpenWithItems(KPopupMenu* popup, return openWithID; } -void DolphinContextMenu::insertActionItems(KPopupMenu* popup, +void DolphinContextMenu::insertActionItems(TDEPopupMenu* popup, TQValueVector<KDEDesktopMimeType::Service>& actionsVector) { - KPopupMenu* actionsMenu = new KPopupMenu(); + TDEPopupMenu* actionsMenu = new TDEPopupMenu(); int actionsIndex = 0; TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "d3lphin/servicemenus/"); - KPopupMenu* menu = 0; + TDEPopupMenu* menu = 0; for (TQStringList::ConstIterator dirIt = dirs.begin(); dirIt != dirs.end(); ++dirIt) { TQDir dir(*dirIt); TQStringList entries = dir.entryList("*.desktop", TQDir::Files); @@ -415,7 +415,7 @@ void DolphinContextMenu::insertActionItems(KPopupMenu* popup, const TQString submenuName = cfg.readEntry( "X-TDE-Submenu" ); if (!submenuName.isEmpty()) { - menu = new KPopupMenu(); + menu = new TDEPopupMenu(); actionsMenu->insertItem(submenuName, menu, submenuID); } @@ -477,7 +477,7 @@ void DolphinContextMenu::insertActionItems(KPopupMenu* popup, } } -bool DolphinContextMenu::containsEntry(const KPopupMenu* menu, +bool DolphinContextMenu::containsEntry(const TDEPopupMenu* menu, const TQString& entryName) const { assert(menu != 0); diff --git a/src/dolphincontextmenu.h b/src/dolphincontextmenu.h index 52e6897..8ca0bc7 100644 --- a/src/dolphincontextmenu.h +++ b/src/dolphincontextmenu.h @@ -30,7 +30,7 @@ #include <kservice.h> #include <kpropertiesdialog.h> -class KPopupMenu; +class TDEPopupMenu; class KFileItem; class TQPoint; class TQWidget; @@ -84,7 +84,7 @@ private: * All succeeding identifiers have an increased value of 1 * to the predecessor. */ - int insertOpenWithItems(KPopupMenu* popup, + int insertOpenWithItems(TDEPopupMenu* popup, TQValueVector<KService::Ptr>& openWithVector); /** @@ -94,14 +94,14 @@ private: * @param openWithVector Output parameter which contains all 'Actions...' * services. */ - void insertActionItems(KPopupMenu* popup, + void insertActionItems(TDEPopupMenu* popup, TQValueVector<KDEDesktopMimeType::Service>& actionsVector); /** * Returns true, if 'menu' contains already * an entry with the name 'entryName'. */ - bool containsEntry(const KPopupMenu* menu, + bool containsEntry(const TDEPopupMenu* menu, const TQString& entryName) const; enum { diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp index 66acb5f..98c1d3d 100644 --- a/src/dolphiniconsview.cpp +++ b/src/dolphiniconsview.cpp @@ -71,11 +71,11 @@ DolphinIconsView::DolphinIconsView(DolphinView* parent, LayoutMode layoutMode) : // KFileIconView creates two actions for zooming, which are directly connected to the // slots KFileIconView::zoomIn() and KFileIconView::zoomOut(). As this behavior is not // wanted and the slots are not virtual, the actions are disabled here. - KAction* zoomInAction = actionCollection()->action("zoomIn"); + TDEAction* zoomInAction = actionCollection()->action("zoomIn"); assert(zoomInAction != 0); zoomInAction->setEnabled(false); - KAction* zoomOutAction = actionCollection()->action("zoomOut"); + TDEAction* zoomOutAction = actionCollection()->action("zoomOut"); assert(zoomOutAction != 0); zoomOutAction->setEnabled(false); diff --git a/src/iconsviewsettingspage.cpp b/src/iconsviewsettingspage.cpp index 02a6ec1..9614042 100644 --- a/src/iconsviewsettingspage.cpp +++ b/src/iconsviewsettingspage.cpp @@ -117,7 +117,7 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinIconsView::LayoutMode mode, textGroup->setMargin(margin); new TQLabel(i18n("Font family:"), textGroup); - m_fontFamilyBox = new KFontCombo(textGroup); + m_fontFamilyBox = new TDEFontCombo(textGroup); m_fontFamilyBox->setCurrentFont(settings->fontFamily()); new TQLabel(i18n("Font size:"), textGroup); diff --git a/src/iconsviewsettingspage.h b/src/iconsviewsettingspage.h index 1fae4c1..20d16a3 100644 --- a/src/iconsviewsettingspage.h +++ b/src/iconsviewsettingspage.h @@ -29,7 +29,7 @@ class TQComboBox; class TQCheckBox; class TQPushButton; class TQSpinBox; -class KFontCombo; +class TDEFontCombo; class PixmapViewer; /** @@ -79,7 +79,7 @@ private: PixmapViewer* m_previewSizeViewer; TQComboBox* m_textWidthBox; TQComboBox* m_gridSpacingBox; - KFontCombo* m_fontFamilyBox; + TDEFontCombo* m_fontFamilyBox; TQSpinBox* m_fontSizeBox; TQSpinBox* m_textlinesCountBox; TQComboBox* m_arrangementBox; diff --git a/src/main.cpp b/src/main.cpp index 01290f4..d9006e0 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -62,7 +62,7 @@ int main(int argc, char **argv) if (app.isRestored()) { int n = 1; - while (KMainWindow::canBeRestored(n)){ + while (TDEMainWindow::canBeRestored(n)){ Dolphin::mainWin().restore(n); ++n; } |