diff options
Diffstat (limited to 'ark')
-rw-r--r-- | ark/ChangeLog | 2 | ||||
-rw-r--r-- | ark/ark_part.cpp | 26 | ||||
-rw-r--r-- | ark/ark_part.h | 36 | ||||
-rw-r--r-- | ark/arkwidget.cpp | 2 | ||||
-rw-r--r-- | ark/arkwidget.h | 6 | ||||
-rw-r--r-- | ark/filelistview.cpp | 30 | ||||
-rw-r--r-- | ark/filelistview.h | 10 | ||||
-rw-r--r-- | ark/mainwindow.cpp | 6 | ||||
-rw-r--r-- | ark/mainwindow.h | 12 | ||||
-rw-r--r-- | ark/searchbar.cpp | 6 | ||||
-rw-r--r-- | ark/searchbar.h | 8 |
11 files changed, 72 insertions, 72 deletions
diff --git a/ark/ChangeLog b/ark/ChangeLog index 394ec6c..aa440bd 100644 --- a/ark/ChangeLog +++ b/ark/ChangeLog @@ -112,7 +112,7 @@ to extract a symlink??) 2000-04-06: Emily Ezust <[email protected]> - * Switched to KListView + * Switched to TDEListView * Some work on settings and archive-specific actions * Couldn't load LHA archives with files that were symlinks; fixed * Added more entries to the Settings and RMB menu. Toggle menu bar will diff --git a/ark/ark_part.cpp b/ark/ark_part.cpp index 6e3ff5f..062d1a3 100644 --- a/ark/ark_part.cpp +++ b/ark/ark_part.cpp @@ -116,47 +116,47 @@ ArkPart::~ArkPart() void ArkPart::setupActions() { - addFileAction = new KAction(i18n("Add &File..."), "ark_addfile", 0, TQT_TQOBJECT(awidget), + addFileAction = new TDEAction(i18n("Add &File..."), "ark_addfile", 0, TQT_TQOBJECT(awidget), TQT_SLOT(action_add()), actionCollection(), "addfile"); - addDirAction = new KAction(i18n("Add Folde&r..."), "ark_adddir", 0, TQT_TQOBJECT(awidget), + addDirAction = new TDEAction(i18n("Add Folde&r..."), "ark_adddir", 0, TQT_TQOBJECT(awidget), TQT_SLOT(action_add_dir()), actionCollection(), "adddir"); - extractAction = new KAction(i18n("E&xtract..."), "ark_extract", 0, TQT_TQOBJECT(awidget), + extractAction = new TDEAction(i18n("E&xtract..."), "ark_extract", 0, TQT_TQOBJECT(awidget), TQT_SLOT(action_extract()), actionCollection(), "extract"); - deleteAction = new KAction(i18n("De&lete"), "ark_delete", KShortcut(TQt::Key_Delete), TQT_TQOBJECT(awidget), + deleteAction = new TDEAction(i18n("De&lete"), "ark_delete", TDEShortcut(TQt::Key_Delete), TQT_TQOBJECT(awidget), TQT_SLOT(action_delete()), actionCollection(), "delete"); - viewAction = new KAction(i18n("to view something","&View"), "ark_view", 0, TQT_TQOBJECT(awidget), + viewAction = new TDEAction(i18n("to view something","&View"), "ark_view", 0, TQT_TQOBJECT(awidget), TQT_SLOT(action_view()), actionCollection(), "view"); - openWithAction = new KAction(i18n("&Open With..."), 0, TQT_TQOBJECT(awidget), + openWithAction = new TDEAction(i18n("&Open With..."), 0, TQT_TQOBJECT(awidget), TQT_SLOT(slotOpenWith()), actionCollection(), "open_with"); - editAction = new KAction(i18n("Edit &With..."), 0, TQT_TQOBJECT(awidget), + editAction = new TDEAction(i18n("Edit &With..."), 0, TQT_TQOBJECT(awidget), TQT_SLOT(action_edit()), actionCollection(), "edit"); - testAction = new KAction(i18n("&Test integrity"), 0, awidget, + testAction = new TDEAction(i18n("&Test integrity"), 0, awidget, TQT_SLOT(action_test()), actionCollection(), "test"); selectAllAction = KStdAction::selectAll(TQT_TQOBJECT(awidget->fileList()), TQT_SLOT(selectAll()), actionCollection(), "select_all"); - deselectAllAction = new KAction(i18n("&Unselect All"), 0, TQT_TQOBJECT(awidget->fileList()),TQT_SLOT(unselectAll()), actionCollection(), "deselect_all"); + deselectAllAction = new TDEAction(i18n("&Unselect All"), 0, TQT_TQOBJECT(awidget->fileList()),TQT_SLOT(unselectAll()), actionCollection(), "deselect_all"); - invertSelectionAction = new KAction(i18n("&Invert Selection"), 0, TQT_TQOBJECT(awidget->fileList()),TQT_SLOT(invertSelection()), actionCollection(), "invert_selection"); + invertSelectionAction = new TDEAction(i18n("&Invert Selection"), 0, TQT_TQOBJECT(awidget->fileList()),TQT_SLOT(invertSelection()), actionCollection(), "invert_selection"); saveAsAction = KStdAction::saveAs(this, TQT_SLOT(file_save_as()), actionCollection()); //KStdAction::preferences(awidget, TQT_SLOT(showSettings()), actionCollection()); - ( void ) new KAction( i18n( "Configure &Ark..." ), "configure" , 0, TQT_TQOBJECT(awidget), + ( void ) new TDEAction( i18n( "Configure &Ark..." ), "configure" , 0, TQT_TQOBJECT(awidget), TQT_SLOT( showSettings() ), actionCollection(), "options_configure_ark" ); - showSearchBar = new KToggleAction( i18n( "Show Search Bar" ), KShortcut(), actionCollection(), "options_show_search_bar" ); + showSearchBar = new TDEToggleAction( i18n( "Show Search Bar" ), TDEShortcut(), actionCollection(), "options_show_search_bar" ); showSearchBar->setCheckedState(i18n("Hide Search Bar")); showSearchBar->setChecked( ArkSettings::showSearchBar() ); @@ -319,7 +319,7 @@ bool ArkPart::closeURL() void ArkPart::slotFilePopup( const TQPoint &pPoint ) { if ( factory() ) - static_cast<KPopupMenu *>(factory()->container("file_popup", this))->popup(pPoint); + static_cast<TDEPopupMenu *>(factory()->container("file_popup", this))->popup(pPoint); } void ArkPart::transferStarted( TDEIO::Job *job ) diff --git a/ark/ark_part.h b/ark/ark_part.h index 1057395..3ea711e 100644 --- a/ark/ark_part.h +++ b/ark/ark_part.h @@ -127,24 +127,24 @@ private: ArkBrowserExtension *m_ext; ArkStatusBarExtension *m_bar; - KAction *saveAsAction; - KAction *addFileAction; - KAction *addDirAction; - KAction *extractAction; - KAction *deleteAction; - KAction *selectAllAction; - KAction *viewAction; - KAction *helpAction; - KAction *openWithAction; - KAction *deselectAllAction; - KAction *invertSelectionAction; - KAction *editAction; - KAction *testAction; - - // the following have different enable rules from the above KActions - KAction *popupViewAction; - KAction *popupOpenWithAction; - KToggleAction *showSearchBar; + TDEAction *saveAsAction; + TDEAction *addFileAction; + TDEAction *addDirAction; + TDEAction *extractAction; + TDEAction *deleteAction; + TDEAction *selectAllAction; + TDEAction *viewAction; + TDEAction *helpAction; + TDEAction *openWithAction; + TDEAction *deselectAllAction; + TDEAction *invertSelectionAction; + TDEAction *editAction; + TDEAction *testAction; + + // the following have different enable rules from the above TDEActions + TDEAction *popupViewAction; + TDEAction *popupOpenWithAction; + TDEToggleAction *showSearchBar; TDEIO::Job *m_job; }; diff --git a/ark/arkwidget.cpp b/ark/arkwidget.cpp index 33aa57f..9c5eec8 100644 --- a/ark/arkwidget.cpp +++ b/ark/arkwidget.cpp @@ -127,7 +127,7 @@ ArkWidget::ArkWidget( TQWidget *parent, const char *name ) m_tmpDir = NULL; } - m_searchToolBar = new KToolBar( this, "searchBar" ); + m_searchToolBar = new TDEToolBar( this, "searchBar" ); m_searchToolBar->boxLayout()->setSpacing( KDialog::spacingHint() ); TQLabel * l1 = new TQLabel( i18n( "&Search:" ), m_searchToolBar, "kde toolbar widget" ); diff --git a/ark/arkwidget.h b/ark/arkwidget.h index a0f2ab5..6d7bd5e 100644 --- a/ark/arkwidget.h +++ b/ark/arkwidget.h @@ -44,13 +44,13 @@ class TQListViewItem; class TQDragMoveEvent; class TQDropEvent; -class KPopupMenu; +class TDEPopupMenu; class TDEProcess; class KURL; class KRun; class KTempFile; class KTempDir; -class KToolBar; +class TDEToolBar; class FileListView; class SearchBar; @@ -292,7 +292,7 @@ private: // data bool m_modified; - KToolBar * m_searchToolBar; + TDEToolBar * m_searchToolBar; SearchBar * m_searchBar; Arch * arch; diff --git a/ark/filelistview.cpp b/ark/filelistview.cpp index 384a259..51e1704 100644 --- a/ark/filelistview.cpp +++ b/ark/filelistview.cpp @@ -45,15 +45,15 @@ // FileLVI implementation ///////////////////////////////////////////////////////////////////// -FileLVI::FileLVI( KListView* lv ) - : KListViewItem( lv ), m_fileSize( 0 ), m_packedFileSize( 0 ), +FileLVI::FileLVI( TDEListView* lv ) + : TDEListViewItem( lv ), m_fileSize( 0 ), m_packedFileSize( 0 ), m_ratio( 0 ), m_timeStamp( TQDateTime() ), m_entryName( TQString() ) { } -FileLVI::FileLVI( KListViewItem* lvi ) - : KListViewItem( lvi ), m_fileSize( 0 ), m_packedFileSize( 0 ), +FileLVI::FileLVI( TDEListViewItem* lvi ) + : TDEListViewItem( lvi ), m_fileSize( 0 ), m_packedFileSize( 0 ), m_ratio( 0 ), m_timeStamp( TQDateTime() ), m_entryName( TQString() ) { } @@ -77,7 +77,7 @@ int FileLVI::compare( TQListViewItem * i, int column, bool ascending ) const return 1; if ( column == 0 ) - return KListViewItem::compare( i, column, ascending ); + return TDEListViewItem::compare( i, column, ascending ); columnName colName = ( static_cast< FileListView * > ( listView() ) )->nameOfColumn( column ); switch ( colName ) @@ -115,7 +115,7 @@ int FileLVI::compare( TQListViewItem * i, int column, bool ascending ) const } default: - return KListViewItem::compare( i, column, ascending ); + return TDEListViewItem::compare( i, column, ascending ); } } @@ -170,7 +170,7 @@ void FileLVI::setText( int column, const TQString &text ) TQListViewItem::setText(column, text); } -static FileLVI* folderLVI( KListViewItem *parent, const TQString& name ) +static FileLVI* folderLVI( TDEListViewItem *parent, const TQString& name ) { FileLVI *folder = new FileLVI( parent ); @@ -181,7 +181,7 @@ static FileLVI* folderLVI( KListViewItem *parent, const TQString& name ) return folder; } -static FileLVI* folderLVI( KListView *parent, const TQString& name ) +static FileLVI* folderLVI( TDEListView *parent, const TQString& name ) { FileLVI *folder = new FileLVI( parent ); folder->setText( 0, name ); @@ -195,7 +195,7 @@ static FileLVI* folderLVI( KListView *parent, const TQString& name ) FileListView::FileListView(TQWidget *parent, const char* name) - : KListView(parent, name) + : TDEListView(parent, name) { TQWhatsThis::add( this, i18n( "This area is for displaying information about the files contained within an archive." ) @@ -214,7 +214,7 @@ FileListView::FileListView(TQWidget *parent, const char* name) int FileListView::addColumn ( const TQString & label, int width ) { - int index = KListView::addColumn( label, width ); + int index = TDEListView::addColumn( label, width ); if ( label == SIZE_COLUMN.first ) { m_columnMap[ index ] = sizeCol; @@ -246,7 +246,7 @@ void FileListView::removeColumn( int index ) } m_columnMap.remove( m_columnMap[ m_columnMap.count() - 1 ] ); - KListView::removeColumn( index ); + TDEListView::removeColumn( index ); } columnName FileListView::nameOfColumn( int index ) @@ -337,14 +337,14 @@ FileListView::contentsMousePressEvent(TQMouseEvent *e) m_presspos = e->pos(); } - KListView::contentsMousePressEvent(e); + TDEListView::contentsMousePressEvent(e); } void FileListView::contentsMouseReleaseEvent(TQMouseEvent *e) { m_pressed = false; - KListView::contentsMouseReleaseEvent(e); + TDEListView::contentsMouseReleaseEvent(e); } void @@ -352,7 +352,7 @@ FileListView::contentsMouseMoveEvent(TQMouseEvent *e) { if(!m_pressed) { - KListView::contentsMouseMoveEvent(e); + TDEListView::contentsMouseMoveEvent(e); } else if( ( m_presspos - e->pos() ).manhattanLength() > TDEGlobalSettings::dndEventDelay() ) { @@ -363,7 +363,7 @@ FileListView::contentsMouseMoveEvent(TQMouseEvent *e) } TQStringList dragFiles = selectedFilenames(); emit startDragRequest( dragFiles ); - KListView::contentsMouseMoveEvent(e); + TDEListView::contentsMouseMoveEvent(e); } } diff --git a/ark/filelistview.h b/ark/filelistview.h index 9c84e43..8cc5140 100644 --- a/ark/filelistview.h +++ b/ark/filelistview.h @@ -45,11 +45,11 @@ class TQPoint; enum columnName { sizeCol = 1 , packedStrCol, ratioStrCol, timeStampStrCol, otherCol }; -class FileLVI : public KListViewItem +class FileLVI : public TDEListViewItem { public: - FileLVI( KListView* lv ); - FileLVI( KListViewItem* lvi ); + FileLVI( TDEListView* lv ); + FileLVI( TDEListViewItem* lvi ); TQString fileName() const { return m_entryName; } TDEIO::filesize_t fileSize() const { return m_fileSize; } @@ -71,14 +71,14 @@ class FileLVI : public KListViewItem typedef TQValueList< TQPair< TQString, TQt::AlignmentFlags > > ColumnList; -class FileListView: public KListView +class FileListView: public TDEListView { Q_OBJECT public: FileListView( TQWidget *parent = 0, const char* name = 0 ); - FileLVI *currentItem() {return ((FileLVI *) KListView::currentItem());} + FileLVI *currentItem() {return ((FileLVI *) TDEListView::currentItem());} /** * Returns the full names of the selected files. diff --git a/ark/mainwindow.cpp b/ark/mainwindow.cpp index 1198562..40ccdae 100644 --- a/ark/mainwindow.cpp +++ b/ark/mainwindow.cpp @@ -109,13 +109,13 @@ MainWindow::~MainWindow() void MainWindow::setupActions() { - newWindowAction = new KAction(i18n("New &Window"), "window_new", KShortcut(), TQT_TQOBJECT(this), + newWindowAction = new TDEAction(i18n("New &Window"), "window_new", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(file_newWindow()), actionCollection(), "new_window"); newArchAction = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(file_new()), actionCollection()); openAction = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(file_open()), actionCollection()); - reloadAction = new KAction(i18n("Re&load"), "reload", KStdAccel::shortcut( KStdAccel::Reload ), TQT_TQOBJECT(this), + reloadAction = new TDEAction(i18n("Re&load"), "reload", TDEStdAccel::shortcut( TDEStdAccel::Reload ), TQT_TQOBJECT(this), TQT_SLOT(file_reload()), actionCollection(), "reload_arch"); closeAction = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(file_close()), actionCollection(), "file_close"); @@ -204,7 +204,7 @@ MainWindow::slotConfigureKeyBindings() void MainWindow::slotArchivePopup( const TQPoint &pPoint) { - static_cast<KPopupMenu *>(factory()->container("archive_popup", this))->popup(pPoint); + static_cast<TDEPopupMenu *>(factory()->container("archive_popup", this))->popup(pPoint); } // see if the ark is already open in another window diff --git a/ark/mainwindow.h b/ark/mainwindow.h index c878942..21952fd 100644 --- a/ark/mainwindow.h +++ b/ark/mainwindow.h @@ -98,12 +98,12 @@ private: // data KParts::ReadWritePart *m_part; ArkWidget *m_widget; //the parts widget - KAction *newWindowAction; - KAction *newArchAction; - KAction *openAction; - KAction *closeAction; - KAction *reloadAction; - KRecentFilesAction *recent; + TDEAction *newWindowAction; + TDEAction *newArchAction; + TDEAction *openAction; + TDEAction *closeAction; + TDEAction *reloadAction; + TDERecentFilesAction *recent; //progress dialog for konqs service menus / commmand line KProgressDialog *progressDialog; diff --git a/ark/searchbar.cpp b/ark/searchbar.cpp index 3efc79a..1d13a58 100644 --- a/ark/searchbar.cpp +++ b/ark/searchbar.cpp @@ -32,10 +32,10 @@ #include <tqapplication.h> #include <tqvaluelist.h> -SearchBar::SearchBar( TQWidget* parent, KActionCollection* aC, const char * name ) - : KListViewSearchLine( parent, 0, name ) +SearchBar::SearchBar( TQWidget* parent, TDEActionCollection* aC, const char * name ) + : TDEListViewSearchLine( parent, 0, name ) { - KAction *resetSearch = new KAction( i18n( "Reset Search" ), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, TQT_TQOBJECT(this), TQT_SLOT( clear() ), aC, "reset_search" ); + TDEAction *resetSearch = new TDEAction( i18n( "Reset Search" ), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, TQT_TQOBJECT(this), TQT_SLOT( clear() ), aC, "reset_search" ); resetSearch->plug( parent ); resetSearch->setWhatsThis( i18n( "Reset Search\n" diff --git a/ark/searchbar.h b/ark/searchbar.h index 1b9aa03..52a6d56 100644 --- a/ark/searchbar.h +++ b/ark/searchbar.h @@ -25,16 +25,16 @@ #include <tqwidget.h> -class KListView; +class TDEListView; class KComboBox; -class KActionCollection; +class TDEActionCollection; -class SearchBar: public KListViewSearchLine +class SearchBar: public TDEListViewSearchLine { Q_OBJECT public: - SearchBar( TQWidget* parent, KActionCollection* aC, const char * name = 0 ); + SearchBar( TQWidget* parent, TDEActionCollection* aC, const char * name = 0 ); ~SearchBar(); }; |