@ -189,8 +189,8 @@ bool KdesvnFileListPrivate::reReadSettings()
_unknown ! = mdisp_unknown_files ) ;
_unknown ! = mdisp_unknown_files ) ;
}
}
tdesvnfilelist : : tdesvnfilelist ( K ActionCollection* aCollect , TQWidget * parent , const char * name )
tdesvnfilelist : : tdesvnfilelist ( TDE ActionCollection* aCollect , TQWidget * parent , const char * name )
: K ListView( parent , name ) , ItemDisplay ( ) , m_SvnWrapper ( new SvnActions ( this ) )
: TDE ListView( parent , name ) , ItemDisplay ( ) , m_SvnWrapper ( new SvnActions ( this ) )
{
{
m_SelectedItems = 0 ;
m_SelectedItems = 0 ;
m_pList = new KdesvnFileListPrivate ;
m_pList = new KdesvnFileListPrivate ;
@ -256,155 +256,155 @@ svn::Client*tdesvnfilelist::svnclient()
void tdesvnfilelist : : setupActions ( )
void tdesvnfilelist : : setupActions ( )
{
{
if ( ! m_filesAction ) return ;
if ( ! m_filesAction ) return ;
K Action* tmp_action ;
TDE Action* tmp_action ;
/* local and remote actions */
/* local and remote actions */
/* 1. actions on dirs AND files */
/* 1. actions on dirs AND files */
//new KAction(i18n("Log..."),"tdesvnlog",K Shortcut(SHIFT+CTRL+Key_L),this,TQT_SLOT(slotMakeRangeLog()),m_filesAction,"make_svn_log");
//new TDEAction(i18n("Log..."),"tdesvnlog",TDE Shortcut(SHIFT+CTRL+Key_L),this,TQT_SLOT(slotMakeRangeLog()),m_filesAction,"make_svn_log");
new K Action( i18n ( " Full Log " ) , " tdesvnlog " , K Shortcut( CTRL + Key_L ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotMakeLog ( ) ) , m_filesAction , " make_svn_log_full " ) ;
new TDE Action( i18n ( " Full Log " ) , " tdesvnlog " , TDE Shortcut( CTRL + Key_L ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotMakeLog ( ) ) , m_filesAction , " make_svn_log_full " ) ;
new K Action( i18n ( " Full revision tree " ) , " tdesvnlog " , K Shortcut( CTRL + Key_T ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotMakeTree ( ) ) , m_filesAction , " make_svn_tree " ) ;
new TDE Action( i18n ( " Full revision tree " ) , " tdesvnlog " , TDE Shortcut( CTRL + Key_T ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotMakeTree ( ) ) , m_filesAction , " make_svn_tree " ) ;
new K Action( i18n ( " Partial revision tree " ) , " tdesvnlog " , K Shortcut( SHIFT + CTRL + Key_T ) ,
new TDE Action( i18n ( " Partial revision tree " ) , " tdesvnlog " , TDE Shortcut( SHIFT + CTRL + Key_T ) ,
TQT_TQOBJECT ( this ) , TQT_SLOT ( slotMakePartTree ( ) ) , m_filesAction , " make_svn_partialtree " ) ;
TQT_TQOBJECT ( this ) , TQT_SLOT ( slotMakePartTree ( ) ) , m_filesAction , " make_svn_partialtree " ) ;
new K Action( i18n ( " Properties " ) , " edit " ,
new TDE Action( i18n ( " Properties " ) , " edit " ,
K Shortcut( CTRL + Key_P ) , m_SvnWrapper , TQT_SLOT ( slotProperties ( ) ) , m_filesAction , " make_svn_property " ) ;
TDE Shortcut( CTRL + Key_P ) , m_SvnWrapper , TQT_SLOT ( slotProperties ( ) ) , m_filesAction , " make_svn_property " ) ;
new K Action( i18n ( " Display Properties " ) , " edit " ,
new TDE Action( i18n ( " Display Properties " ) , " edit " ,
K Shortcut( SHIFT + CTRL + Key_P ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotDisplayProperties ( ) ) , m_filesAction , " get_svn_property " ) ;
TDE Shortcut( SHIFT + CTRL + Key_P ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotDisplayProperties ( ) ) , m_filesAction , " get_svn_property " ) ;
tmp_action = new K Action( i18n ( " Display last changes " ) , " tdesvndiff " ,
tmp_action = new TDE Action( i18n ( " Display last changes " ) , " tdesvndiff " ,
K Shortcut( ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotDisplayLastDiff ( ) ) , m_filesAction , " make_last_change " ) ;
TDE Shortcut( ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotDisplayLastDiff ( ) ) , m_filesAction , " make_last_change " ) ;
tmp_action - > setToolTip ( i18n ( " Display last changes as difference to previous commit. " ) ) ;
tmp_action - > setToolTip ( i18n ( " Display last changes as difference to previous commit. " ) ) ;
m_InfoAction = new K Action( i18n ( " Details " ) , " tdesvninfo " ,
m_InfoAction = new TDE Action( i18n ( " Details " ) , " tdesvninfo " ,
K Shortcut( CTRL + Key_I ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotInfo ( ) ) , m_filesAction , " make_svn_info " ) ;
TDE Shortcut( CTRL + Key_I ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotInfo ( ) ) , m_filesAction , " make_svn_info " ) ;
m_RenameAction = new K Action( i18n ( " Move " ) , " move " ,
m_RenameAction = new TDE Action( i18n ( " Move " ) , " move " ,
K Shortcut( Key_F2 ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotRename ( ) ) , m_filesAction , " make_svn_rename " ) ;
TDE Shortcut( Key_F2 ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotRename ( ) ) , m_filesAction , " make_svn_rename " ) ;
m_CopyAction = new K Action( i18n ( " Copy " ) , " tdesvncopy " ,
m_CopyAction = new TDE Action( i18n ( " Copy " ) , " tdesvncopy " ,
K Shortcut( CTRL + Key_C ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotCopy ( ) ) , m_filesAction , " make_svn_copy " ) ;
TDE Shortcut( CTRL + Key_C ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotCopy ( ) ) , m_filesAction , " make_svn_copy " ) ;
tmp_action = new K Action( i18n ( " Check for updates " ) , " tdesvncheckupdates " , K Shortcut( ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotCheckUpdates ( ) ) , m_filesAction , " make_check_updates " ) ;
tmp_action = new TDE Action( i18n ( " Check for updates " ) , " tdesvncheckupdates " , TDE Shortcut( ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotCheckUpdates ( ) ) , m_filesAction , " make_check_updates " ) ;
tmp_action - > setToolTip ( i18n ( " Check if current working copy has items with newer version in repository " ) ) ;
tmp_action - > setToolTip ( i18n ( " Check if current working copy has items with newer version in repository " ) ) ;
/* 2. actions only on files */
/* 2. actions only on files */
m_BlameAction = new K Action( i18n ( " Blame " ) , " tdesvnblame " ,
m_BlameAction = new TDE Action( i18n ( " Blame " ) , " tdesvnblame " ,
K Shortcut( ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotBlame ( ) ) , m_filesAction , " make_svn_blame " ) ;
TDE Shortcut( ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotBlame ( ) ) , m_filesAction , " make_svn_blame " ) ;
m_BlameAction - > setToolTip ( i18n ( " Output the content of specified files or URLs with revision and author information in-line. " ) ) ;
m_BlameAction - > setToolTip ( i18n ( " Output the content of specified files or URLs with revision and author information in-line. " ) ) ;
m_BlameRangeAction = new K Action( i18n ( " Blame range " ) , " tdesvnblame " ,
m_BlameRangeAction = new TDE Action( i18n ( " Blame range " ) , " tdesvnblame " ,
K Shortcut( ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotRangeBlame ( ) ) , m_filesAction , " make_svn_range_blame " ) ;
TDE Shortcut( ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotRangeBlame ( ) ) , m_filesAction , " make_svn_range_blame " ) ;
m_BlameRangeAction - > setToolTip ( i18n ( " Output the content of specified files or URLs with revision and author information in-line. " ) ) ;
m_BlameRangeAction - > setToolTip ( i18n ( " Output the content of specified files or URLs with revision and author information in-line. " ) ) ;
m_CatAction = new K Action( i18n ( " Cat head " ) , " tdesvncat " ,
m_CatAction = new TDE Action( i18n ( " Cat head " ) , " tdesvncat " ,
K Shortcut( ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotCat ( ) ) , m_filesAction , " make_svn_cat " ) ;
TDE Shortcut( ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotCat ( ) ) , m_filesAction , " make_svn_cat " ) ;
m_CatAction - > setToolTip ( i18n ( " Output the content of specified files or URLs. " ) ) ;
m_CatAction - > setToolTip ( i18n ( " Output the content of specified files or URLs. " ) ) ;
tmp_action = new K Action( i18n ( " Cat revision... " ) , " tdesvncat " ,
tmp_action = new TDE Action( i18n ( " Cat revision... " ) , " tdesvncat " ,
K Shortcut( ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotRevisionCat ( ) ) , m_filesAction , " make_revisions_cat " ) ;
TDE Shortcut( ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotRevisionCat ( ) ) , m_filesAction , " make_revisions_cat " ) ;
tmp_action - > setToolTip ( i18n ( " Output the content of specified files or URLs at specific revision. " ) ) ;
tmp_action - > setToolTip ( i18n ( " Output the content of specified files or URLs at specific revision. " ) ) ;
m_LockAction = new K Action( i18n ( " Lock current items " ) , " tdesvnlock " ,
m_LockAction = new TDE Action( i18n ( " Lock current items " ) , " tdesvnlock " ,
K Shortcut( ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotLock ( ) ) , m_filesAction , " make_svn_lock " ) ;
TDE Shortcut( ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotLock ( ) ) , m_filesAction , " make_svn_lock " ) ;
m_UnlockAction = new K Action( i18n ( " Unlock current items " ) , " tdesvnunlock " ,
m_UnlockAction = new TDE Action( i18n ( " Unlock current items " ) , " tdesvnunlock " ,
K Shortcut( ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotUnlock ( ) ) , m_filesAction , " make_svn_unlock " ) ;
TDE Shortcut( ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotUnlock ( ) ) , m_filesAction , " make_svn_unlock " ) ;
/* 3. actions only on dirs */
/* 3. actions only on dirs */
m_MkdirAction = new K Action( i18n ( " New folder " ) , " folder_new " ,
m_MkdirAction = new TDE Action( i18n ( " New folder " ) , " folder_new " ,
K Shortcut( ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotMkdir ( ) ) , m_filesAction , " make_svn_mkdir " ) ;
TDE Shortcut( ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotMkdir ( ) ) , m_filesAction , " make_svn_mkdir " ) ;
m_switchRepository = new K Action( i18n ( " Switch repository " ) , " tdesvnswitch " ,
m_switchRepository = new TDE Action( i18n ( " Switch repository " ) , " tdesvnswitch " ,
K Shortcut( ) , m_SvnWrapper , TQT_SLOT ( slotSwitch ( ) ) , m_filesAction , " make_svn_switch " ) ;
TDE Shortcut( ) , m_SvnWrapper , TQT_SLOT ( slotSwitch ( ) ) , m_filesAction , " make_svn_switch " ) ;
m_switchRepository - > setToolTip ( i18n ( " Switch repository path of current working copy path ( \" svn switch \" ) " ) ) ;
m_switchRepository - > setToolTip ( i18n ( " Switch repository path of current working copy path ( \" svn switch \" ) " ) ) ;
tmp_action = new K Action( i18n ( " Relocate current working copy url " ) , " tdesvnrelocate " , K Shortcut( ) ,
tmp_action = new TDE Action( i18n ( " Relocate current working copy url " ) , " tdesvnrelocate " , TDE Shortcut( ) ,
TQT_TQOBJECT ( this ) , TQT_SLOT ( slotRelocate ( ) ) , m_filesAction , " make_svn_relocate " ) ;
TQT_TQOBJECT ( this ) , TQT_SLOT ( slotRelocate ( ) ) , m_filesAction , " make_svn_relocate " ) ;
tmp_action - > setToolTip ( i18n ( " Relocate url of current working copy path to other url " ) ) ;
tmp_action - > setToolTip ( i18n ( " Relocate url of current working copy path to other url " ) ) ;
tmp_action = new K Action( i18n ( " Check for unversioned items " ) , " tdesvnaddrecursive " , K Shortcut( ) ,
tmp_action = new TDE Action( i18n ( " Check for unversioned items " ) , " tdesvnaddrecursive " , TDE Shortcut( ) ,
TQT_TQOBJECT ( this ) , TQT_SLOT ( slotCheckNewItems ( ) ) , m_filesAction , " make_check_unversioned " ) ;
TQT_TQOBJECT ( this ) , TQT_SLOT ( slotCheckNewItems ( ) ) , m_filesAction , " make_check_unversioned " ) ;
tmp_action - > setToolTip ( i18n ( " Browse folder for unversioned items and add them if wanted. " ) ) ;
tmp_action - > setToolTip ( i18n ( " Browse folder for unversioned items and add them if wanted. " ) ) ;
m_changeToRepository = new K Action( i18n ( " Open repository of working copy " ) , " gohome " , K Shortcut( ) ,
m_changeToRepository = new TDE Action( i18n ( " Open repository of working copy " ) , " gohome " , TDE Shortcut( ) ,
TQT_TQOBJECT ( this ) , TQT_SLOT ( slotChangeToRepository ( ) ) , m_filesAction , " make_switch_to_repo " ) ;
TQT_TQOBJECT ( this ) , TQT_SLOT ( slotChangeToRepository ( ) ) , m_filesAction , " make_switch_to_repo " ) ;
m_changeToRepository - > setToolTip ( i18n ( " Opens the repository the current working copy was checked out from " ) ) ;
m_changeToRepository - > setToolTip ( i18n ( " Opens the repository the current working copy was checked out from " ) ) ;
m_CleanupAction = new K Action( i18n ( " Cleanup " ) , " tdesvncleanup " ,
m_CleanupAction = new TDE Action( i18n ( " Cleanup " ) , " tdesvncleanup " ,
K Shortcut( ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotCleanupAction ( ) ) , m_filesAction , " make_cleanup " ) ;
TDE Shortcut( ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotCleanupAction ( ) ) , m_filesAction , " make_cleanup " ) ;
m_CleanupAction - > setToolTip ( i18n ( " Recursively clean up the working copy, removing locks, resuming unfinished operations, etc. " ) ) ;
m_CleanupAction - > setToolTip ( i18n ( " Recursively clean up the working copy, removing locks, resuming unfinished operations, etc. " ) ) ;
m_ImportDirsIntoCurrent = new K Action( i18n ( " Import folders into current " ) , " fileimport " , K Shortcut( ) ,
m_ImportDirsIntoCurrent = new TDE Action( i18n ( " Import folders into current " ) , " fileimport " , TDE Shortcut( ) ,
TQT_TQOBJECT ( this ) , TQT_SLOT ( slotImportDirsIntoCurrent ( ) ) , m_filesAction , " make_import_dirs_into_current " ) ;
TQT_TQOBJECT ( this ) , TQT_SLOT ( slotImportDirsIntoCurrent ( ) ) , m_filesAction , " make_import_dirs_into_current " ) ;
m_ImportDirsIntoCurrent - > setToolTip ( i18n ( " Import folder content into current url " ) ) ;
m_ImportDirsIntoCurrent - > setToolTip ( i18n ( " Import folder content into current url " ) ) ;
/* local only actions */
/* local only actions */
/* 1. actions on files AND dirs*/
/* 1. actions on files AND dirs*/
m_AddCurrent = new K Action( i18n ( " Add selected files/dirs " ) ,
m_AddCurrent = new TDE Action( i18n ( " Add selected files/dirs " ) ,
" tdesvnadd " , K Shortcut( Key_Insert ) , m_SvnWrapper , TQT_SLOT ( slotAdd ( ) ) , m_filesAction , " make_svn_add " ) ;
" tdesvnadd " , TDE Shortcut( Key_Insert ) , m_SvnWrapper , TQT_SLOT ( slotAdd ( ) ) , m_filesAction , " make_svn_add " ) ;
m_AddCurrent - > setToolTip ( i18n ( " Adding selected files and/or directories to repository " ) ) ;
m_AddCurrent - > setToolTip ( i18n ( " Adding selected files and/or directories to repository " ) ) ;
tmp_action = new K Action( " Add selected files/dirs recursive " ,
tmp_action = new TDE Action( " Add selected files/dirs recursive " ,
" tdesvnaddrecursive " , K Shortcut( CTRL + Key_Insert ) , m_SvnWrapper , TQT_SLOT ( slotAddRec ( ) ) , m_filesAction , " make_svn_addrec " ) ;
" tdesvnaddrecursive " , TDE Shortcut( CTRL + Key_Insert ) , m_SvnWrapper , TQT_SLOT ( slotAddRec ( ) ) , m_filesAction , " make_svn_addrec " ) ;
tmp_action - > setToolTip ( i18n ( " Adding selected files and/or directories to repository and all subitems of folders " ) ) ;
tmp_action - > setToolTip ( i18n ( " Adding selected files and/or directories to repository and all subitems of folders " ) ) ;
m_DelCurrent = new K Action( i18n ( " Delete selected files/dirs " ) , " tdesvndelete " ,
m_DelCurrent = new TDE Action( i18n ( " Delete selected files/dirs " ) , " tdesvndelete " ,
K Shortcut( Key_Delete ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotDelete ( ) ) , m_filesAction , " make_svn_remove " ) ;
TDE Shortcut( Key_Delete ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotDelete ( ) ) , m_filesAction , " make_svn_remove " ) ;
m_DelCurrent - > setToolTip ( i18n ( " Deleting selected files and/or directories from repository " ) ) ;
m_DelCurrent - > setToolTip ( i18n ( " Deleting selected files and/or directories from repository " ) ) ;
m_RevertAction = new K Action( i18n ( " Revert current changes " ) , " revert " ,
m_RevertAction = new TDE Action( i18n ( " Revert current changes " ) , " revert " ,
K Shortcut( ) , m_SvnWrapper , TQT_SLOT ( slotRevert ( ) ) , m_filesAction , " make_svn_revert " ) ;
TDE Shortcut( ) , m_SvnWrapper , TQT_SLOT ( slotRevert ( ) ) , m_filesAction , " make_svn_revert " ) ;
m_ResolvedAction = new K Action( i18n ( " Mark resolved " ) , K Shortcut( ) ,
m_ResolvedAction = new TDE Action( i18n ( " Mark resolved " ) , TDE Shortcut( ) ,
TQT_TQOBJECT ( this ) , TQT_SLOT ( slotResolved ( ) ) , m_filesAction , " make_resolved " ) ;
TQT_TQOBJECT ( this ) , TQT_SLOT ( slotResolved ( ) ) , m_filesAction , " make_resolved " ) ;
m_ResolvedAction - > setToolTip ( i18n ( " Marking files or dirs resolved " ) ) ;
m_ResolvedAction - > setToolTip ( i18n ( " Marking files or dirs resolved " ) ) ;
tmp_action = new K Action( i18n ( " Resolve conflicts " ) , K Shortcut( ) ,
tmp_action = new TDE Action( i18n ( " Resolve conflicts " ) , TDE Shortcut( ) ,
TQT_TQOBJECT ( this ) , TQT_SLOT ( slotTryResolve ( ) ) , m_filesAction , " make_try_resolve " ) ;
TQT_TQOBJECT ( this ) , TQT_SLOT ( slotTryResolve ( ) ) , m_filesAction , " make_try_resolve " ) ;
m_IgnoreAction = new K Action( i18n ( " Ignore/Unignore current item " ) , K Shortcut( ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotIgnore ( ) ) , m_filesAction , " make_svn_ignore " ) ;
m_IgnoreAction = new TDE Action( i18n ( " Ignore/Unignore current item " ) , TDE Shortcut( ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotIgnore ( ) ) , m_filesAction , " make_svn_ignore " ) ;
m_UpdateHead = new K Action( i18n ( " Update to head " ) , " tdesvnupdate " ,
m_UpdateHead = new TDE Action( i18n ( " Update to head " ) , " tdesvnupdate " ,
K Shortcut( ) , m_SvnWrapper , TQT_SLOT ( slotUpdateHeadRec ( ) ) , m_filesAction , " make_svn_headupdate " ) ;
TDE Shortcut( ) , m_SvnWrapper , TQT_SLOT ( slotUpdateHeadRec ( ) ) , m_filesAction , " make_svn_headupdate " ) ;
m_UpdateRev = new K Action( i18n ( " Update to revision... " ) , " tdesvnupdate " ,
m_UpdateRev = new TDE Action( i18n ( " Update to revision... " ) , " tdesvnupdate " ,
K Shortcut( ) , m_SvnWrapper , TQT_SLOT ( slotUpdateTo ( ) ) , m_filesAction , " make_svn_revupdate " ) ;
TDE Shortcut( ) , m_SvnWrapper , TQT_SLOT ( slotUpdateTo ( ) ) , m_filesAction , " make_svn_revupdate " ) ;
m_commitAction = new K Action( i18n ( " Commit " ) , " tdesvncommit " ,
m_commitAction = new TDE Action( i18n ( " Commit " ) , " tdesvncommit " ,
K Shortcut( " CTRL+# " ) , m_SvnWrapper , TQT_SLOT ( slotCommit ( ) ) , m_filesAction , " make_svn_commit " ) ;
TDE Shortcut( " CTRL+# " ) , m_SvnWrapper , TQT_SLOT ( slotCommit ( ) ) , m_filesAction , " make_svn_commit " ) ;
tmp_action = new K Action( i18n ( " Diff local changes " ) , " tdesvndiff " ,
tmp_action = new TDE Action( i18n ( " Diff local changes " ) , " tdesvndiff " ,
K Shortcut( CTRL + Key_D ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotSimpleBaseDiff ( ) ) , m_filesAction , " make_svn_basediff " ) ;
TDE Shortcut( CTRL + Key_D ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotSimpleBaseDiff ( ) ) , m_filesAction , " make_svn_basediff " ) ;
tmp_action - > setToolTip ( i18n ( " Diff working copy against BASE (last checked out version) - doesn't require access to repository " ) ) ;
tmp_action - > setToolTip ( i18n ( " Diff working copy against BASE (last checked out version) - doesn't require access to repository " ) ) ;
tmp_action = new K Action( i18n ( " Diff against HEAD " ) , " tdesvndiff " ,
tmp_action = new TDE Action( i18n ( " Diff against HEAD " ) , " tdesvndiff " ,
K Shortcut( CTRL + Key_H ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotSimpleHeadDiff ( ) ) , m_filesAction , " make_svn_headdiff " ) ;
TDE Shortcut( CTRL + Key_H ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotSimpleHeadDiff ( ) ) , m_filesAction , " make_svn_headdiff " ) ;
tmp_action - > setToolTip ( i18n ( " Diff working copy against HEAD (last checked in version)- requires access to repository " ) ) ;
tmp_action - > setToolTip ( i18n ( " Diff working copy against HEAD (last checked in version)- requires access to repository " ) ) ;
tmp_action = new K Action( i18n ( " Diff items " ) , " tdesvndiff " ,
tmp_action = new TDE Action( i18n ( " Diff items " ) , " tdesvndiff " ,
K Shortcut( ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotDiffPathes ( ) ) , m_filesAction , " make_svn_itemsdiff " ) ;
TDE Shortcut( ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotDiffPathes ( ) ) , m_filesAction , " make_svn_itemsdiff " ) ;
tmp_action - > setToolTip ( i18n ( " Diff two items " ) ) ;
tmp_action - > setToolTip ( i18n ( " Diff two items " ) ) ;
m_MergeRevisionAction = new K Action( i18n ( " Merge two revisions " ) , " tdesvnmerge " ,
m_MergeRevisionAction = new TDE Action( i18n ( " Merge two revisions " ) , " tdesvnmerge " ,
K Shortcut( ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotMergeRevisions ( ) ) , m_filesAction , " make_svn_merge_revisions " ) ;
TDE Shortcut( ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotMergeRevisions ( ) ) , m_filesAction , " make_svn_merge_revisions " ) ;
m_MergeRevisionAction - > setToolTip ( i18n ( " Merge two revisions of this entry into itself " ) ) ;
m_MergeRevisionAction - > setToolTip ( i18n ( " Merge two revisions of this entry into itself " ) ) ;
tmp_action = new K Action( i18n ( " Merge... " ) , " tdesvnmerge " ,
tmp_action = new TDE Action( i18n ( " Merge... " ) , " tdesvnmerge " ,
K Shortcut( ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotMerge ( ) ) , m_filesAction , " make_svn_merge " ) ;
TDE Shortcut( ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotMerge ( ) ) , m_filesAction , " make_svn_merge " ) ;
tmp_action - > setToolTip ( " Merge repository path into current worky copy path or current repository path into a target " ) ;
tmp_action - > setToolTip ( " Merge repository path into current worky copy path or current repository path into a target " ) ;
tmp_action = new K Action( i18n ( " Open With... " ) , 0 , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotOpenWith ( ) ) , m_filesAction , " openwith " ) ;
tmp_action = new TDE Action( i18n ( " Open With... " ) , 0 , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotOpenWith ( ) ) , m_filesAction , " openwith " ) ;
/* remote actions only */
/* remote actions only */
m_CheckoutCurrentAction = new K Action( i18n ( " Checkout current repository path " ) , " tdesvncheckout " , K Shortcut( ) ,
m_CheckoutCurrentAction = new TDE Action( i18n ( " Checkout current repository path " ) , " tdesvncheckout " , TDE Shortcut( ) ,
m_SvnWrapper , TQT_SLOT ( slotCheckoutCurrent ( ) ) , m_filesAction , " make_svn_checkout_current " ) ;
m_SvnWrapper , TQT_SLOT ( slotCheckoutCurrent ( ) ) , m_filesAction , " make_svn_checkout_current " ) ;
m_ExportCurrentAction = new K Action( i18n ( " Export current repository path " ) , " tdesvnexport " , K Shortcut( ) ,
m_ExportCurrentAction = new TDE Action( i18n ( " Export current repository path " ) , " tdesvnexport " , TDE Shortcut( ) ,
m_SvnWrapper , TQT_SLOT ( slotExportCurrent ( ) ) , m_filesAction , " make_svn_export_current " ) ;
m_SvnWrapper , TQT_SLOT ( slotExportCurrent ( ) ) , m_filesAction , " make_svn_export_current " ) ;
new K Action( i18n ( " Select browse revision " ) , K Shortcut( ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotSelectBrowsingRevision ( ) ) , m_filesAction , " switch_browse_revision " ) ;
new TDE Action( i18n ( " Select browse revision " ) , TDE Shortcut( ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotSelectBrowsingRevision ( ) ) , m_filesAction , " switch_browse_revision " ) ;
/* independe actions */
/* independe actions */
m_CheckoutAction = new K Action( i18n ( " Checkout a repository " ) , " tdesvncheckout " ,
m_CheckoutAction = new TDE Action( i18n ( " Checkout a repository " ) , " tdesvncheckout " ,
K Shortcut( ) , m_SvnWrapper , TQT_SLOT ( slotCheckout ( ) ) , m_filesAction , " make_svn_checkout " ) ;
TDE Shortcut( ) , m_SvnWrapper , TQT_SLOT ( slotCheckout ( ) ) , m_filesAction , " make_svn_checkout " ) ;
m_ExportAction = new K Action( i18n ( " Export a repository " ) , " tdesvnexport " ,
m_ExportAction = new TDE Action( i18n ( " Export a repository " ) , " tdesvnexport " ,
K Shortcut( ) , m_SvnWrapper , TQT_SLOT ( slotExport ( ) ) , m_filesAction , " make_svn_export " ) ;
TDE Shortcut( ) , m_SvnWrapper , TQT_SLOT ( slotExport ( ) ) , m_filesAction , " make_svn_export " ) ;
m_RefreshViewAction = new K Action( i18n ( " Refresh view " ) , " reload " , K Shortcut( Key_F5 ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( refreshCurrentTree ( ) ) , m_filesAction , " make_view_refresh " ) ;
m_RefreshViewAction = new TDE Action( i18n ( " Refresh view " ) , " reload " , TDE Shortcut( Key_F5 ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( refreshCurrentTree ( ) ) , m_filesAction , " make_view_refresh " ) ;
new K Action( i18n ( " Diff revisions " ) , " tdesvndiff " , K Shortcut( ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotDiffRevisions ( ) ) , m_filesAction , " make_revisions_diff " ) ;
new TDE Action( i18n ( " Diff revisions " ) , " tdesvndiff " , TDE Shortcut( ) , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotDiffRevisions ( ) ) , m_filesAction , " make_revisions_diff " ) ;
/* folding options */
/* folding options */
tmp_action = new K Action( i18n ( " Unfold File Tree " ) , 0 , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotUnfoldTree ( ) ) , m_filesAction , " view_unfold_tree " ) ;
tmp_action = new TDE Action( i18n ( " Unfold File Tree " ) , 0 , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotUnfoldTree ( ) ) , m_filesAction , " view_unfold_tree " ) ;
tmp_action - > setToolTip ( i18n ( " Opens all branches of the file tree " ) ) ;
tmp_action - > setToolTip ( i18n ( " Opens all branches of the file tree " ) ) ;
tmp_action = new K Action( i18n ( " Fold File Tree " ) , 0 , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotFoldTree ( ) ) , m_filesAction , " view_fold_tree " ) ;
tmp_action = new TDE Action( i18n ( " Fold File Tree " ) , 0 , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotFoldTree ( ) ) , m_filesAction , " view_fold_tree " ) ;
tmp_action - > setToolTip ( i18n ( " Closes all branches of the file tree " ) ) ;
tmp_action - > setToolTip ( i18n ( " Closes all branches of the file tree " ) ) ;
/* caching */
/* caching */
tmp_action = new K Action( i18n ( " Update log cache " ) , 0 , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotUpdateLogCache ( ) ) , m_filesAction , " update_log_cache " ) ;
tmp_action = new TDE Action( i18n ( " Update log cache " ) , 0 , TQT_TQOBJECT ( this ) , TQT_SLOT ( slotUpdateLogCache ( ) ) , m_filesAction , " update_log_cache " ) ;
tmp_action - > setToolTip ( i18n ( " Update the log cache for current repository " ) ) ;
tmp_action - > setToolTip ( i18n ( " Update the log cache for current repository " ) ) ;
/* tmp_action = new K Action( i18n("Stop update log cache"),0,this,TQT_SLOT(slotUpdateLogCache()),m_filesAction,"stop_update_log_cache" );
/* tmp_action = new TDE Action( i18n("Stop update log cache"),0,this,TQT_SLOT(slotUpdateLogCache()),m_filesAction,"stop_update_log_cache" );
tmp_action - > setToolTip ( i18n ( " Stop the update of the log cache " ) ) ;
tmp_action - > setToolTip ( i18n ( " Stop the update of the log cache " ) ) ;
*/
*/
@ -412,7 +412,7 @@ void tdesvnfilelist::setupActions()
m_filesAction - > setHighlightingEnabled ( true ) ;
m_filesAction - > setHighlightingEnabled ( true ) ;
}
}
K ActionCollection* tdesvnfilelist : : filesActions ( )
TDE ActionCollection* tdesvnfilelist : : filesActions ( )
{
{
return m_filesAction ;
return m_filesAction ;
}
}
@ -876,7 +876,7 @@ void tdesvnfilelist::enableActions()
}
}
bool conflicted = single & & allSelected ( ) - > at ( 0 ) - > isConflicted ( ) ;
bool conflicted = single & & allSelected ( ) - > at ( 0 ) - > isConflicted ( ) ;
K Action * temp = 0 ;
TDE Action * temp = 0 ;
/* local and remote actions */
/* local and remote actions */
/* 1. actions on dirs AND files */
/* 1. actions on dirs AND files */
temp = filesActions ( ) - > action ( " make_svn_log " ) ;
temp = filesActions ( ) - > action ( " make_svn_log " ) ;
@ -1003,7 +1003,7 @@ void tdesvnfilelist::enableActions()
}
}
temp = filesActions ( ) - > action ( " openwith " ) ;
temp = filesActions ( ) - > action ( " openwith " ) ;
if ( temp ) {
if ( temp ) {
temp - > setEnabled ( kapp - > authorize K Action( " openwith " ) & & single & & ! dir ) ;
temp - > setEnabled ( kapp - > authorize TDE Action( " openwith " ) & & single & & ! dir ) ;
}
}
temp = filesActions ( ) - > action ( " update_log_cache " ) ;
temp = filesActions ( ) - > action ( " update_log_cache " ) ;
@ -1491,7 +1491,7 @@ void tdesvnfilelist::slotContextMenuRequested(TQListViewItem */* _item */, const
TDETrader : : OfferList offers ;
TDETrader : : OfferList offers ;
OpenContextmenu * me = 0 ;
OpenContextmenu * me = 0 ;
K Action* temp = 0 ;
TDE Action* temp = 0 ;
int id = - 1 ;
int id = - 1 ;
@ -1670,7 +1670,7 @@ void tdesvnfilelist::contentsDragMoveEvent( TQDragMoveEvent* event)
void tdesvnfilelist : : viewportPaintEvent ( TQPaintEvent * ev )
void tdesvnfilelist : : viewportPaintEvent ( TQPaintEvent * ev )
{
{
K ListView: : viewportPaintEvent ( ev ) ;
TDE ListView: : viewportPaintEvent ( ev ) ;
if ( m_pList - > mOldDropHighlighter . isValid ( ) & & ev - > rect ( ) . intersects ( m_pList - > mOldDropHighlighter ) ) {
if ( m_pList - > mOldDropHighlighter . isValid ( ) & & ev - > rect ( ) . intersects ( m_pList - > mOldDropHighlighter ) ) {
TQPainter painter ( viewport ( ) ) ;
TQPainter painter ( viewport ( ) ) ;
style ( ) . tqdrawPrimitive ( TQStyle : : PE_FocusRect , & painter , m_pList - > mOldDropHighlighter , colorGroup ( ) ,
style ( ) . tqdrawPrimitive ( TQStyle : : PE_FocusRect , & painter , m_pList - > mOldDropHighlighter , colorGroup ( ) ,
@ -2707,12 +2707,12 @@ void tdesvnfilelist::contentsMouseMoveEvent( TQMouseEvent *e )
//beginDrag();
//beginDrag();
}
}
}
}
K ListView: : contentsMouseMoveEvent ( e ) ;
TDE ListView: : contentsMouseMoveEvent ( e ) ;
}
}
void tdesvnfilelist : : contentsMousePressEvent ( TQMouseEvent * e )
void tdesvnfilelist : : contentsMousePressEvent ( TQMouseEvent * e )
{
{
K ListView: : contentsMousePressEvent ( e ) ;
TDE ListView: : contentsMousePressEvent ( e ) ;
m_pList - > m_fileTip - > setItem ( 0 ) ;
m_pList - > m_fileTip - > setItem ( 0 ) ;
TQPoint p ( contentsToViewport ( e - > pos ( ) ) ) ;
TQPoint p ( contentsToViewport ( e - > pos ( ) ) ) ;
TQListViewItem * i = itemAt ( p ) ;
TQListViewItem * i = itemAt ( p ) ;
@ -2731,7 +2731,7 @@ void tdesvnfilelist::contentsMousePressEvent(TQMouseEvent*e)
void tdesvnfilelist : : contentsMouseReleaseEvent ( TQMouseEvent * e )
void tdesvnfilelist : : contentsMouseReleaseEvent ( TQMouseEvent * e )
{
{
K ListView: : contentsMouseReleaseEvent ( e ) ;
TDE ListView: : contentsMouseReleaseEvent ( e ) ;
m_pList - > mousePressed = false ;
m_pList - > mousePressed = false ;
}
}
@ -2742,13 +2742,13 @@ void tdesvnfilelist::contentsWheelEvent( TQWheelEvent * e )
{
{
// when scrolling with mousewheel, stop possible pending filetip
// when scrolling with mousewheel, stop possible pending filetip
m_pList - > m_fileTip - > setItem ( 0 ) ;
m_pList - > m_fileTip - > setItem ( 0 ) ;
K ListView: : contentsWheelEvent ( e ) ;
TDE ListView: : contentsWheelEvent ( e ) ;
}
}
void tdesvnfilelist : : leaveEvent ( TQEvent * e )
void tdesvnfilelist : : leaveEvent ( TQEvent * e )
{
{
m_pList - > m_fileTip - > setItem ( 0 ) ;
m_pList - > m_fileTip - > setItem ( 0 ) ;
K ListView: : leaveEvent ( e ) ;
TDE ListView: : leaveEvent ( e ) ;
}
}
void tdesvnfilelist : : slotSettingsChanged ( )
void tdesvnfilelist : : slotSettingsChanged ( )
@ -3141,7 +3141,7 @@ void tdesvnfilelist::slotChangeProperties(const svn::PropertiesMap&pm,const TQVa
void tdesvnfilelist : : slotUpdateLogCache ( )
void tdesvnfilelist : : slotUpdateLogCache ( )
{
{
if ( baseUri ( ) . length ( ) > 0 & & m_SvnWrapper - > doNetworking ( ) ) {
if ( baseUri ( ) . length ( ) > 0 & & m_SvnWrapper - > doNetworking ( ) ) {
K Action* temp = filesActions ( ) - > action ( " update_log_cache " ) ;
TDE Action* temp = filesActions ( ) - > action ( " update_log_cache " ) ;
if ( ! m_SvnWrapper - > threadRunning ( SvnActions : : fillcachethread ) ) {
if ( ! m_SvnWrapper - > threadRunning ( SvnActions : : fillcachethread ) ) {
m_SvnWrapper - > startFillCache ( baseUri ( ) ) ;
m_SvnWrapper - > startFillCache ( baseUri ( ) ) ;