diff options
Diffstat (limited to 'kbabel/catalogmanager')
-rw-r--r-- | kbabel/catalogmanager/catalogmanager.cpp | 230 | ||||
-rw-r--r-- | kbabel/catalogmanager/catalogmanager.h | 8 | ||||
-rw-r--r-- | kbabel/catalogmanager/main.cpp | 2 | ||||
-rw-r--r-- | kbabel/catalogmanager/validateprogress.cpp | 2 | ||||
-rw-r--r-- | kbabel/catalogmanager/validateprogress.h | 4 |
5 files changed, 123 insertions, 123 deletions
diff --git a/kbabel/catalogmanager/catalogmanager.cpp b/kbabel/catalogmanager/catalogmanager.cpp index 41c18005..d18f59d2 100644 --- a/kbabel/catalogmanager/catalogmanager.cpp +++ b/kbabel/catalogmanager/catalogmanager.cpp @@ -90,7 +90,7 @@ TQStringList CatalogManager::_foundFilesList; TQStringList CatalogManager::_toBeSearched; CatalogManager::CatalogManager(TQString configFile ) - :KMainWindow(0,0) + :TDEMainWindow(0,0) { if ( configFile.isEmpty() ) configFile = KBabel::ProjectManager::defaultProjectName(); @@ -216,16 +216,16 @@ void CatalogManager::setupActions() { TDEGlobal::iconLoader()->addAppDir("kbabel"); - KAction *action; + TDEAction *action; // the file menu - action = new KAction( i18n("&Open"), CTRL+Key_O, TQT_TQOBJECT(_catalogManager), + action = new TDEAction( i18n("&Open"), CTRL+Key_O, TQT_TQOBJECT(_catalogManager), TQT_SLOT(slotOpenFile()),actionCollection(), "open"); action->setEnabled(false); - action = new KAction(i18n("&Open Template"),Key_Space,TQT_TQOBJECT(_catalogManager), + action = new TDEAction(i18n("&Open Template"),Key_Space,TQT_TQOBJECT(_catalogManager), TQT_SLOT(slotOpenTemplate()),actionCollection(), "open_template"); action->setEnabled(false); - action = new KAction(i18n("Open in &New Window"),CTRL+SHIFT+Key_O,TQT_TQOBJECT(_catalogManager), + action = new TDEAction(i18n("Open in &New Window"),CTRL+SHIFT+Key_O,TQT_TQOBJECT(_catalogManager), TQT_SLOT(slotOpenFileInNewWindow()),actionCollection(), "open_new_window"); action->setEnabled(false); @@ -234,45 +234,45 @@ void CatalogManager::setupActions() actionMap["open_template"] = NEEDS_POT; // the edit menu - action = new KAction( i18n("Fi&nd in Files..."), CTRL+Key_F, TQT_TQOBJECT(this), + action = new TDEAction( i18n("Fi&nd in Files..."), CTRL+Key_F, TQT_TQOBJECT(this), TQT_SLOT(find()), actionCollection(), "find_in_files"); action->setEnabled(false); - action = new KAction( i18n("Re&place in Files..."), CTRL+Key_R, TQT_TQOBJECT(this), + action = new TDEAction( i18n("Re&place in Files..."), CTRL+Key_R, TQT_TQOBJECT(this), TQT_SLOT(replace()), actionCollection(), "replace_in_files"); action->setEnabled(false); - action = new KAction( i18n("&Stop Searching"), "stop", Key_Escape, TQT_TQOBJECT(this), + action = new TDEAction( i18n("&Stop Searching"), "stop", Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(stopSearching()), actionCollection(), "stop_search"); action->setEnabled(false); - action = new KAction( i18n("&Reload"), "reload", KStdAccel::reload(), TQT_TQOBJECT(_catalogManager), + action = new TDEAction( i18n("&Reload"), "reload", TDEStdAccel::reload(), TQT_TQOBJECT(_catalogManager), TQT_SLOT(updateCurrent()), actionCollection(), "reload"); action->setEnabled(false); // the marking menu - action = new KAction( i18n("&Toggle Marking"), CTRL+Key_M, TQT_TQOBJECT(_catalogManager), + action = new TDEAction( i18n("&Toggle Marking"), CTRL+Key_M, TQT_TQOBJECT(_catalogManager), TQT_SLOT(toggleMark()), actionCollection(), "toggle_marking"); action->setEnabled(false); - action = new KAction( i18n("Remove Marking"), 0, TQT_TQOBJECT(_catalogManager), + action = new TDEAction( i18n("Remove Marking"), 0, TQT_TQOBJECT(_catalogManager), TQT_SLOT(slotClearMarksInDir()), actionCollection(), "remove_marking"); action->setEnabled(false); - action = new KAction( i18n("Toggle All Markings"), 0, TQT_TQOBJECT(_catalogManager), + action = new TDEAction( i18n("Toggle All Markings"), 0, TQT_TQOBJECT(_catalogManager), TQT_SLOT(toggleAllMarks()), actionCollection(), "toggle_all_marking"); action->setEnabled(false); - action = new KAction( i18n("Remove All Markings"), 0, TQT_TQOBJECT(_catalogManager), + action = new TDEAction( i18n("Remove All Markings"), 0, TQT_TQOBJECT(_catalogManager), TQT_SLOT(clearAllMarks()), actionCollection(), "remove_all_marking"); action->setEnabled(false); - action = new KAction( i18n("Mark Modified Files"), 0, TQT_TQOBJECT(_catalogManager), + action = new TDEAction( i18n("Mark Modified Files"), 0, TQT_TQOBJECT(_catalogManager), TQT_SLOT(markModifiedFiles()), actionCollection(), "mark_modified_files"); // fixme to enabling this when loading is done using updateFinished() signal action->setEnabled(true); - action = new KAction( i18n("&Load Markings..."), 0, TQT_TQOBJECT(_catalogManager), + action = new TDEAction( i18n("&Load Markings..."), 0, TQT_TQOBJECT(_catalogManager), TQT_SLOT(loadMarks()), actionCollection(), "load_marking"); action->setEnabled(false); - action = new KAction( i18n("&Save Markings..."), 0, TQT_TQOBJECT(_catalogManager), + action = new TDEAction( i18n("&Save Markings..."), 0, TQT_TQOBJECT(_catalogManager), TQT_SLOT(saveMarks()), actionCollection(), "save_marking"); action->setEnabled(false); - (void)new KAction(i18n("&Mark Files..."), 0, TQT_TQOBJECT(_catalogManager), + (void)new TDEAction(i18n("&Mark Files..."), 0, TQT_TQOBJECT(_catalogManager), TQT_SLOT(slotMarkPattern()), actionCollection(), "mark_pattern"); - (void)new KAction(i18n("&Unmark Files..."), 0, TQT_TQOBJECT(_catalogManager), + (void)new TDEAction(i18n("&Unmark Files..."), 0, TQT_TQOBJECT(_catalogManager), TQT_SLOT(slotUnmarkPattern()), actionCollection(), "unmark_pattern"); actionMap["remove_marking"] = NEEDS_MARK; @@ -281,103 +281,103 @@ void CatalogManager::setupActions() actionMap["unmark_pattern"] = NEEDS_DIR | NEEDS_MARK; // go menu - action = new KAction(i18n("Nex&t Untranslated"), "nextuntranslated", ALT+Key_Next, + action = new TDEAction(i18n("Nex&t Untranslated"), "nextuntranslated", ALT+Key_Next, TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoNextUntranslated()),actionCollection(), "go_next_untrans"); action->setEnabled(false); - action = new KAction(i18n("Prev&ious Untranslated"), "prevuntranslated", ALT+Key_Prior, + action = new TDEAction(i18n("Prev&ious Untranslated"), "prevuntranslated", ALT+Key_Prior, TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoPreviousUntranslated()),actionCollection(), "go_prev_untrans"); action->setEnabled(false); - action = new KAction(i18n("Ne&xt Fuzzy"), "nextfuzzy", CTRL+Key_Next, + action = new TDEAction(i18n("Ne&xt Fuzzy"), "nextfuzzy", CTRL+Key_Next, TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoNextFuzzy()),actionCollection(), "go_next_fuzzy"); action->setEnabled(false); - action = new KAction(i18n("Pre&vious Fuzzy"), "prevfuzzy", CTRL+Key_Prior, + action = new TDEAction(i18n("Pre&vious Fuzzy"), "prevfuzzy", CTRL+Key_Prior, TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoPreviousFuzzy()),actionCollection(), "go_prev_fuzzy"); action->setEnabled(false); - action = new KAction(i18n("N&ext Fuzzy or Untranslated"), "nextfuzzyuntrans", CTRL+SHIFT+Key_Next, + action = new TDEAction(i18n("N&ext Fuzzy or Untranslated"), "nextfuzzyuntrans", CTRL+SHIFT+Key_Next, TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoNextFuzzyOrUntranslated()),actionCollection(), "go_next_fuzzyUntr"); action->setEnabled(false); - action = new KAction(i18n("P&revious Fuzzy or Untranslated"), "prevfuzzyuntrans", CTRL+SHIFT+Key_Prior, + action = new TDEAction(i18n("P&revious Fuzzy or Untranslated"), "prevfuzzyuntrans", CTRL+SHIFT+Key_Prior, TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoPreviousFuzzyOrUntranslated()),actionCollection(), "go_prev_fuzzyUntr"); action->setEnabled(false); - action = new KAction(i18n("Next Err&or"), "nexterror", ALT+SHIFT+Key_Next, + action = new TDEAction(i18n("Next Err&or"), "nexterror", ALT+SHIFT+Key_Next, TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoNextError()),actionCollection(), "go_next_error"); action->setEnabled(false); - action = new KAction(i18n("Previo&us Error"), "preverror", ALT+SHIFT+Key_Prior, + action = new TDEAction(i18n("Previo&us Error"), "preverror", ALT+SHIFT+Key_Prior, TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoPreviousError()),actionCollection(), "go_prev_error"); action->setEnabled(false); - action = new KAction(i18n("Next Te&mplate Only"), "nexttemplate", CTRL+Key_Down, + action = new TDEAction(i18n("Next Te&mplate Only"), "nexttemplate", CTRL+Key_Down, TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoNextTemplate()),actionCollection(), "go_next_template"); action->setEnabled(false); - action = new KAction(i18n("Previous Temp&late Only"), "prevtemplate", CTRL+Key_Up, + action = new TDEAction(i18n("Previous Temp&late Only"), "prevtemplate", CTRL+Key_Up, TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoPreviousTemplate()),actionCollection(), "go_prev_template"); action->setEnabled(false); - action = new KAction(i18n("Next Tran&slation Exists"), "nextpo", ALT+Key_Down, + action = new TDEAction(i18n("Next Tran&slation Exists"), "nextpo", ALT+Key_Down, TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoNextPo()),actionCollection(), "go_next_po"); action->setEnabled(false); - action = new KAction(i18n("Previous Transl&ation Exists"), "prevpo", ALT+Key_Up, + action = new TDEAction(i18n("Previous Transl&ation Exists"), "prevpo", ALT+Key_Up, TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoPreviousPo()),actionCollection(), "go_prev_po"); action->setEnabled(false); - action = new KAction(i18n("Previous Marke&d"), "prevmarked", SHIFT+Key_Up, + action = new TDEAction(i18n("Previous Marke&d"), "prevmarked", SHIFT+Key_Up, TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoPreviousMarked()),actionCollection(), "go_prev_marked"); action->setEnabled(false); - action = new KAction(i18n("Next &Marked"), "nextmarked", SHIFT+Key_Down, + action = new TDEAction(i18n("Next &Marked"), "nextmarked", SHIFT+Key_Down, TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoNextMarked()),actionCollection(), "go_next_marked"); action->setEnabled(false); // project menu // the project menu - action = new KAction(i18n("&New..."), "filenew" + action = new TDEAction(i18n("&New..."), "filenew" , TQT_TQOBJECT(this), TQT_SLOT(projectNew()),actionCollection() ,"project_new"); - action = new KAction(i18n("&Open..."), "fileopen" + action = new TDEAction(i18n("&Open..."), "fileopen" , TQT_TQOBJECT(this), TQT_SLOT(projectOpen()),actionCollection() ,"project_open"); - action = new KAction(i18n("C&lose"), "fileclose" + action = new TDEAction(i18n("C&lose"), "fileclose" , TQT_TQOBJECT(this), TQT_SLOT(projectClose()),actionCollection() ,"project_close"); action->setEnabled (_project->filename() != KBabel::ProjectManager::defaultProjectName() ); - action = new KAction(i18n("&Configure..."), "configure" + action = new TDEAction(i18n("&Configure..."), "configure" , TQT_TQOBJECT(this), TQT_SLOT(projectConfigure()),actionCollection() ,"project_settings"); // tools menu - action = new KAction( i18n("&Statistics"), "statistics", CTRL+Key_S, + action = new TDEAction( i18n("&Statistics"), "statistics", CTRL+Key_S, TQT_TQOBJECT(_catalogManager), TQT_SLOT(statistics()), actionCollection(), "statistics"); action->setEnabled(false); - action = new KAction( i18n("S&tatistics in Marked"), "statistics", CTRL+ALT+Key_S, + action = new TDEAction( i18n("S&tatistics in Marked"), "statistics", CTRL+ALT+Key_S, TQT_TQOBJECT(_catalogManager), TQT_SLOT(markedStatistics()), actionCollection(), "statistics_marked"); action->setEnabled(false); - action = new KAction( i18n("Check S&yntax"), "syntax", CTRL+Key_Y, + action = new TDEAction( i18n("Check S&yntax"), "syntax", CTRL+Key_Y, TQT_TQOBJECT(_catalogManager), TQT_SLOT(checkSyntax()), actionCollection(), "syntax"); action->setEnabled(false); - action = new KAction( i18n("S&pell Check"), "spellcheck", CTRL+Key_I, + action = new TDEAction( i18n("S&pell Check"), "spellcheck", CTRL+Key_I, TQT_TQOBJECT(this), TQT_SLOT(spellcheck()), actionCollection(), "spellcheck"); action->setEnabled(false); - action = new KAction( i18n("Spell Check in &Marked"), "spellcheck", CTRL+ALT+Key_I, + action = new TDEAction( i18n("Spell Check in &Marked"), "spellcheck", CTRL+ALT+Key_I, TQT_TQOBJECT(this), TQT_SLOT(markedSpellcheck()), actionCollection(), "spellcheck_marked"); action->setEnabled(false); - action = new KAction( i18n("&Rough Translation"), CTRL+Key_T, + action = new TDEAction( i18n("&Rough Translation"), CTRL+Key_T, TQT_TQOBJECT(_catalogManager), TQT_SLOT(roughTranslation()), actionCollection(), "rough_translation"); action->setEnabled(false); - action = new KAction( i18n("Rough Translation in M&arked"), CTRL+ALT+Key_T, + action = new TDEAction( i18n("Rough Translation in M&arked"), CTRL+ALT+Key_T, TQT_TQOBJECT(_catalogManager), TQT_SLOT(markedRoughTranslation()), actionCollection(), "rough_translation_marked"); action->setEnabled(false); - action = new KAction( i18n("Mai&l"), "mail_send", CTRL+Key_A, + action = new TDEAction( i18n("Mai&l"), "mail_send", CTRL+Key_A, TQT_TQOBJECT(_catalogManager), TQT_SLOT(mailFiles()), actionCollection(), "mail_file"); action->setEnabled(false); - action = new KAction( i18n("Mail Mar&ked"), "mail_send", CTRL+ALT+Key_A, + action = new TDEAction( i18n("Mail Mar&ked"), "mail_send", CTRL+ALT+Key_A, TQT_TQOBJECT(_catalogManager), TQT_SLOT(mailMarkedFiles()), actionCollection(), "mail_file_marked"); action->setEnabled(false); - action = new KAction( i18n("&Pack"), "tar", CTRL+Key_B, + action = new TDEAction( i18n("&Pack"), "tar", CTRL+Key_B, TQT_TQOBJECT(_catalogManager), TQT_SLOT(packageFiles()), actionCollection(), "package_file"); - action = new KAction( i18n("Pack &Marked"), "tar", CTRL+ALT+Key_B, TQT_TQOBJECT(_catalogManager), TQT_SLOT(packageMarkedFiles()), actionCollection(), "package_file_marked"); + action = new TDEAction( i18n("Pack &Marked"), "tar", CTRL+ALT+Key_B, TQT_TQOBJECT(_catalogManager), TQT_SLOT(packageMarkedFiles()), actionCollection(), "package_file_marked"); action->setEnabled(false); actionMap["statistics_marked"] = NEEDS_DIR | NEEDS_MARK; @@ -392,14 +392,14 @@ void CatalogManager::setupActions() // dynamic tools TQValueList<KDataToolInfo> tools = ToolAction::validationTools(); - TQPtrList<KAction> actions = ToolAction::dataToolActionList( + TQPtrList<TDEAction> actions = ToolAction::dataToolActionList( tools, TQT_TQOBJECT(_catalogManager), TQT_SLOT(validateUsingTool( const KDataToolInfo &, const TQString& )) ,"validate", false, actionCollection() ); - KActionMenu* m_menu = new KActionMenu(i18n("&Validation"), actionCollection(), + TDEActionMenu* m_menu = new TDEActionMenu(i18n("&Validation"), actionCollection(), "dynamic_validation"); - KAction*ac; + TDEAction*ac; for(ac = actions.first(); ac ; ac = actions.next() ) { @@ -409,7 +409,7 @@ void CatalogManager::setupActions() actions = ToolAction::dataToolActionList( tools, TQT_TQOBJECT(_catalogManager), TQT_SLOT(validateMarkedUsingTool( const KDataToolInfo &, const TQString& )) ,"validate", false, actionCollection(), "marked_" ); - m_menu = new KActionMenu(i18n("V&alidation Marked"), actionCollection(), + m_menu = new TDEActionMenu(i18n("V&alidation Marked"), actionCollection(), "dynamic_validation_marked"); for( ac = actions.first(); ac ; ac = actions.next() ) @@ -422,19 +422,19 @@ void CatalogManager::setupActions() // CVS submenu // Actions for PO files - (void)new KAction( i18n( "Update" ), "down", 0, TQT_TQOBJECT(_catalogManager), + (void)new TDEAction( i18n( "Update" ), "down", 0, TQT_TQOBJECT(_catalogManager), TQT_SLOT( cvsUpdate( ) ), actionCollection( ), "cvs_update" ); - (void)new KAction( i18n( "Update Marked" ), 0, TQT_TQOBJECT(_catalogManager), + (void)new TDEAction( i18n( "Update Marked" ), 0, TQT_TQOBJECT(_catalogManager), TQT_SLOT( cvsUpdateMarked( ) ), actionCollection( ), "cvs_update_marked" ); - (void)new KAction( i18n( "Commit" ), "up", 0, TQT_TQOBJECT(_catalogManager), + (void)new TDEAction( i18n( "Commit" ), "up", 0, TQT_TQOBJECT(_catalogManager), TQT_SLOT( cvsCommit( ) ), actionCollection( ), "cvs_commit" ); - (void)new KAction( i18n( "Commit Marked" ), 0, TQT_TQOBJECT(_catalogManager), + (void)new TDEAction( i18n( "Commit Marked" ), 0, TQT_TQOBJECT(_catalogManager), TQT_SLOT( cvsCommitMarked( ) ), actionCollection( ), "cvs_commit_marked" ); - (void)new KAction( i18n( "Status" ), 0, TQT_TQOBJECT(_catalogManager), + (void)new TDEAction( i18n( "Status" ), 0, TQT_TQOBJECT(_catalogManager), TQT_SLOT( cvsStatus( ) ), actionCollection( ), "cvs_status" ); - (void)new KAction( i18n( "Status for Marked" ), 0, TQT_TQOBJECT(_catalogManager), + (void)new TDEAction( i18n( "Status for Marked" ), 0, TQT_TQOBJECT(_catalogManager), TQT_SLOT( cvsStatusMarked( ) ), actionCollection( ), "cvs_status_marked" ); - (void)new KAction( i18n( "Show Diff" ), 0, TQT_TQOBJECT(_catalogManager), + (void)new TDEAction( i18n( "Show Diff" ), 0, TQT_TQOBJECT(_catalogManager), TQT_SLOT( cvsDiff( ) ), actionCollection( ), "cvs_diff" ); // CVS @@ -448,27 +448,27 @@ void CatalogManager::setupActions() // SVN submenu // Actions for PO files - (void)new KAction( i18n( "Update" ), "down", 0, TQT_TQOBJECT(_catalogManager), + (void)new TDEAction( i18n( "Update" ), "down", 0, TQT_TQOBJECT(_catalogManager), TQT_SLOT( svnUpdate( ) ), actionCollection( ), "svn_update" ); - (void)new KAction( i18n( "Update Marked" ), 0, TQT_TQOBJECT(_catalogManager), + (void)new TDEAction( i18n( "Update Marked" ), 0, TQT_TQOBJECT(_catalogManager), TQT_SLOT( svnUpdateMarked( ) ), actionCollection( ), "svn_update_marked" ); - (void)new KAction( i18n( "Commit" ), "up", 0, TQT_TQOBJECT(_catalogManager), + (void)new TDEAction( i18n( "Commit" ), "up", 0, TQT_TQOBJECT(_catalogManager), TQT_SLOT( svnCommit( ) ), actionCollection( ), "svn_commit" ); - (void)new KAction( i18n( "Commit Marked" ), 0, TQT_TQOBJECT(_catalogManager), + (void)new TDEAction( i18n( "Commit Marked" ), 0, TQT_TQOBJECT(_catalogManager), TQT_SLOT( svnCommitMarked( ) ), actionCollection( ), "svn_commit_marked" ); - (void)new KAction( i18n( "Status (Local)" ), 0, TQT_TQOBJECT(_catalogManager), + (void)new TDEAction( i18n( "Status (Local)" ), 0, TQT_TQOBJECT(_catalogManager), TQT_SLOT( svnStatusLocal() ), actionCollection( ), "svn_status_local" ); - (void)new KAction( i18n( "Status (Local) for Marked" ), 0, TQT_TQOBJECT(_catalogManager), + (void)new TDEAction( i18n( "Status (Local) for Marked" ), 0, TQT_TQOBJECT(_catalogManager), TQT_SLOT( svnStatusLocalMarked() ), actionCollection( ), "svn_status_local_marked" ); - (void)new KAction( i18n( "Status (Remote)" ), 0, TQT_TQOBJECT(_catalogManager), + (void)new TDEAction( i18n( "Status (Remote)" ), 0, TQT_TQOBJECT(_catalogManager), TQT_SLOT( svnStatusRemote() ), actionCollection( ), "svn_status_remote" ); - (void)new KAction( i18n( "Status (Remote) for Marked" ), 0, TQT_TQOBJECT(_catalogManager), + (void)new TDEAction( i18n( "Status (Remote) for Marked" ), 0, TQT_TQOBJECT(_catalogManager), TQT_SLOT( svnStatusRemoteMarked() ), actionCollection( ), "svn_status_remote_marked" ); - (void)new KAction( i18n( "Show Diff" ), 0, TQT_TQOBJECT(_catalogManager), + (void)new TDEAction( i18n( "Show Diff" ), 0, TQT_TQOBJECT(_catalogManager), TQT_SLOT( svnDiff( ) ), actionCollection( ), "svn_diff" ); - (void)new KAction( i18n( "Show Information" ), 0, TQT_TQOBJECT(_catalogManager), + (void)new TDEAction( i18n( "Show Information" ), 0, TQT_TQOBJECT(_catalogManager), TQT_SLOT( svnInfo() ), actionCollection( ), "svn_info" ); - (void)new KAction( i18n( "Show Information for Marked" ), 0, TQT_TQOBJECT(_catalogManager), + (void)new TDEAction( i18n( "Show Information for Marked" ), 0, TQT_TQOBJECT(_catalogManager), TQT_SLOT( svnInfoMarked() ), actionCollection( ), "svn_info_marked" ); // SVN @@ -485,13 +485,13 @@ void CatalogManager::setupActions() actionMap["svn_info_marked"] = NEEDS_PO | NEEDS_PO_SVN | NEEDS_MARK; // CVS Actions for POT files - (void)new KAction( i18n( "Update Templates" ), 0, TQT_TQOBJECT(_catalogManager), + (void)new TDEAction( i18n( "Update Templates" ), 0, TQT_TQOBJECT(_catalogManager), TQT_SLOT( cvsUpdateTemplate( ) ), actionCollection( ), "cvs_update_template" ); - (void)new KAction( i18n( "Update Marked Templates" ), 0, TQT_TQOBJECT(_catalogManager), + (void)new TDEAction( i18n( "Update Marked Templates" ), 0, TQT_TQOBJECT(_catalogManager), TQT_SLOT( cvsUpdateMarkedTemplate( ) ), actionCollection( ), "cvs_update_marked_template" ); - (void)new KAction( i18n( "Commit Templates" ), 0, TQT_TQOBJECT(_catalogManager), + (void)new TDEAction( i18n( "Commit Templates" ), 0, TQT_TQOBJECT(_catalogManager), TQT_SLOT( cvsCommitTemplate( ) ), actionCollection( ), "cvs_commit_template" ); - (void)new KAction( i18n( "Commit Marked Templates" ), 0, TQT_TQOBJECT(_catalogManager), + (void)new TDEAction( i18n( "Commit Marked Templates" ), 0, TQT_TQOBJECT(_catalogManager), TQT_SLOT( cvsCommitMarkedTemplate( ) ), actionCollection( ), "cvs_commit_marked_template" ); actionMap["cvs_update_template"] = NEEDS_POT | NEEDS_POT_CVS; @@ -500,13 +500,13 @@ void CatalogManager::setupActions() actionMap["cvs_commit_marked_template"] = NEEDS_POT | NEEDS_POT_CVS | NEEDS_MARK; // SVN Actions for POT files - (void)new KAction( i18n( "Update Templates" ), 0, TQT_TQOBJECT(_catalogManager), + (void)new TDEAction( i18n( "Update Templates" ), 0, TQT_TQOBJECT(_catalogManager), TQT_SLOT( svnUpdateTemplate( ) ), actionCollection( ), "svn_update_template" ); - (void)new KAction( i18n( "Update Marked Templates" ), 0, TQT_TQOBJECT(_catalogManager), + (void)new TDEAction( i18n( "Update Marked Templates" ), 0, TQT_TQOBJECT(_catalogManager), TQT_SLOT( svnUpdateMarkedTemplate( ) ), actionCollection( ), "svn_update_marked_template" ); - (void)new KAction( i18n( "Commit Templates" ), 0, TQT_TQOBJECT(_catalogManager), + (void)new TDEAction( i18n( "Commit Templates" ), 0, TQT_TQOBJECT(_catalogManager), TQT_SLOT( svnCommitTemplate( ) ), actionCollection( ), "svn_commit_template" ); - (void)new KAction( i18n( "Commit Marked Templates" ), 0, TQT_TQOBJECT(_catalogManager), + (void)new TDEAction( i18n( "Commit Marked Templates" ), 0, TQT_TQOBJECT(_catalogManager), TQT_SLOT( svnCommitMarkedTemplate( ) ), actionCollection( ), "svn_commit_marked_template" ); actionMap["svn_update_template"] = NEEDS_POT | NEEDS_POT_SVN; @@ -522,15 +522,15 @@ void CatalogManager::setupActions() setStandardToolBarMenuEnabled ( true ); // commands menus - KActionMenu* actionMenu=new KActionMenu(i18n("Commands"), 0, + TDEActionMenu* actionMenu=new TDEActionMenu(i18n("Commands"), 0, actionCollection(), "dir_commands"); _catalogManager->setDirCommandsMenu( actionMenu->popupMenu()); - actionMenu=new KActionMenu(i18n("Commands"), 0, + actionMenu=new TDEActionMenu(i18n("Commands"), 0, actionCollection(), "file_commands"); _catalogManager->setFileCommandsMenu( actionMenu->popupMenu()); - action = new KAction(i18n("&Delete"),Key_Delete,TQT_TQOBJECT(_catalogManager),TQT_SLOT(slotDeleteFile()),actionCollection(), "delete"); + action = new TDEAction(i18n("&Delete"),Key_Delete,TQT_TQOBJECT(_catalogManager),TQT_SLOT(slotDeleteFile()),actionCollection(), "delete"); action->setEnabled(false); #if KDE_IS_VERSION( 3, 2, 90 ) @@ -572,7 +572,7 @@ void CatalogManager::selectedChanged(uint actionValue) { TQMap<TQString,uint>::Iterator it; for (it = actionMap.begin( ); it != actionMap.end( ); ++it) { - KAction * action = actionCollection()->action(it.key( ).latin1( )); + TDEAction * action = actionCollection()->action(it.key( ).latin1( )); if (action) action->setEnabled((actionValue & it.data( )) == it.data( )); } } @@ -855,7 +855,7 @@ bool CatalogManager::startKBabel() TQString url = ""; if( kapp->startServiceByDesktopName(app,url, &result, &service)) { - KMessageBox::error( this, i18n("Unable to use KLauncher to start KBabel.\n" + KMessageBox::error( this, i18n("Unable to use TDELauncher to start KBabel.\n" "You should check the installation of TDE.\n" "Please start KBabel manually.")); return false; @@ -940,7 +940,7 @@ void CatalogManager::find() prepareStatusProgressBar(i18n("Searching"),1); // just show the progress bar // enable stop action to stop searching - KAction *action = (KAction*)actionCollection()->action("stop_search"); + TDEAction *action = (TDEAction*)actionCollection()->action("stop_search"); action->setEnabled(true); _findOptions = _findDialog->findOpts(); @@ -1024,7 +1024,7 @@ void CatalogManager::replace() prepareStatusProgressBar(i18n("Searching"),1); // just show the progress bar // enable stop action to stop searching - KAction *action = (KAction*)actionCollection()->action("stop_search"); + TDEAction *action = (TDEAction*)actionCollection()->action("stop_search"); action->setEnabled(true); ReplaceOptions options = _replaceDialog->replaceOpts(); @@ -1131,7 +1131,7 @@ void CatalogManager::stopSearching() // fake that we are over (fake, because findNextFile can still be running for the last file clearStatusProgressBar(); // clear the status bar, we are finished // disable stop action as well - KAction *action = (KAction*)actionCollection()->action("stop_search"); + TDEAction *action = (TDEAction*)actionCollection()->action("stop_search"); action->setEnabled(false); } @@ -1177,7 +1177,7 @@ void CatalogManager::restoreView() { applyMainWindowSettings( TDEGlobal::config(), "View"); - KToggleAction * toggle = (KToggleAction*)actionCollection()-> + TDEToggleAction * toggle = (TDEToggleAction*)actionCollection()-> action(KStdAction::stdName(KStdAction::ShowStatusbar)); toggle->setChecked(!statusBar()->isHidden() ); } @@ -1254,7 +1254,7 @@ void CatalogManager::changeProjectActions(const TQString& project) { bool def = ( project == KBabel::ProjectManager::defaultProjectName() ) ; - KAction* saveAction=(KAction*)actionCollection()->action( "project_close" ); + TDEAction* saveAction=(TDEAction*)actionCollection()->action( "project_close" ); saveAction->setEnabled( ! def ); } @@ -1283,88 +1283,88 @@ void CatalogManager::disableActions() void CatalogManager::enableActions(bool enable) { - KAction* action; + TDEAction* action; // the file menu - action = (KAction*)actionCollection()->action( "open" ); + action = (TDEAction*)actionCollection()->action( "open" ); action->setEnabled(enable); - action = (KAction*)actionCollection()->action( "open_new_window" ); + action = (TDEAction*)actionCollection()->action( "open_new_window" ); action->setEnabled(enable); - action = (KAction*)actionCollection()->action( "find_in_files" ); + action = (TDEAction*)actionCollection()->action( "find_in_files" ); action->setEnabled(enable); - action = (KAction*)actionCollection()->action( "replace_in_files" ); + action = (TDEAction*)actionCollection()->action( "replace_in_files" ); action->setEnabled(enable); - action = (KAction*)actionCollection()->action( "reload" ); + action = (TDEAction*)actionCollection()->action( "reload" ); action->setEnabled(enable); - action = (KAction*)actionCollection()->action( "toggle_marking" ); + action = (TDEAction*)actionCollection()->action( "toggle_marking" ); action->setEnabled(enable); - action = (KAction*)actionCollection()->action( "toggle_all_marking" ); + action = (TDEAction*)actionCollection()->action( "toggle_all_marking" ); action->setEnabled(enable); - action = (KAction*)actionCollection()->action( "mark_modified_files" ); + action = (TDEAction*)actionCollection()->action( "mark_modified_files" ); action->setEnabled(enable); - action = (KAction*)actionCollection()->action( "load_marking" ); + action = (TDEAction*)actionCollection()->action( "load_marking" ); action->setEnabled(enable); - action = (KAction*)actionCollection()->action( "save_marking" ); + action = (TDEAction*)actionCollection()->action( "save_marking" ); action->setEnabled(enable); - action = (KAction*)actionCollection()->action( "go_next_untrans" ); + action = (TDEAction*)actionCollection()->action( "go_next_untrans" ); action->setEnabled(enable); - action = (KAction*)actionCollection()->action( "go_prev_untrans" ); + action = (TDEAction*)actionCollection()->action( "go_prev_untrans" ); action->setEnabled(enable); - action = (KAction*)actionCollection()->action( "go_next_fuzzy" ); + action = (TDEAction*)actionCollection()->action( "go_next_fuzzy" ); action->setEnabled(enable); - action = (KAction*)actionCollection()->action( "go_prev_fuzzy" ); + action = (TDEAction*)actionCollection()->action( "go_prev_fuzzy" ); action->setEnabled(enable); - action = (KAction*)actionCollection()->action( "go_next_fuzzyUntr" ); + action = (TDEAction*)actionCollection()->action( "go_next_fuzzyUntr" ); action->setEnabled(enable); - action = (KAction*)actionCollection()->action( "go_prev_fuzzyUntr" ); + action = (TDEAction*)actionCollection()->action( "go_prev_fuzzyUntr" ); action->setEnabled(enable); - action = (KAction*)actionCollection()->action( "go_next_error" ); + action = (TDEAction*)actionCollection()->action( "go_next_error" ); action->setEnabled(enable); - action = (KAction*)actionCollection()->action( "go_prev_error" ); + action = (TDEAction*)actionCollection()->action( "go_prev_error" ); action->setEnabled(enable); - action = (KAction*)actionCollection()->action( "go_next_template" ); + action = (TDEAction*)actionCollection()->action( "go_next_template" ); action->setEnabled(enable); - action = (KAction*)actionCollection()->action( "go_prev_template" ); + action = (TDEAction*)actionCollection()->action( "go_prev_template" ); action->setEnabled(enable); - action = (KAction*)actionCollection()->action( "go_next_po" ); + action = (TDEAction*)actionCollection()->action( "go_next_po" ); action->setEnabled(enable); - action = (KAction*)actionCollection()->action( "go_prev_po" ); + action = (TDEAction*)actionCollection()->action( "go_prev_po" ); action->setEnabled(enable); - action = (KAction*)actionCollection()->action( "go_next_marked" ); + action = (TDEAction*)actionCollection()->action( "go_next_marked" ); action->setEnabled(enable); - action = (KAction*)actionCollection()->action( "go_prev_marked" ); + action = (TDEAction*)actionCollection()->action( "go_prev_marked" ); action->setEnabled(enable); - action = (KAction*)actionCollection()->action( "statistics" ); + action = (TDEAction*)actionCollection()->action( "statistics" ); action->setEnabled(enable); - action = (KAction*)actionCollection()->action( "package_file" ); + action = (TDEAction*)actionCollection()->action( "package_file" ); action->setEnabled(enable); - action = (KAction*)actionCollection()->action( "rough_translation" ); + action = (TDEAction*)actionCollection()->action( "rough_translation" ); action->setEnabled(enable); } diff --git a/kbabel/catalogmanager/catalogmanager.h b/kbabel/catalogmanager/catalogmanager.h index d7cd467e..8a0fe6fd 100644 --- a/kbabel/catalogmanager/catalogmanager.h +++ b/kbabel/catalogmanager/catalogmanager.h @@ -57,7 +57,7 @@ class TQPixmap; class TQPopupMenu; class TQTimer; class KProgress; -class KAction; +class TDEAction; class TDEConfig; class FindInFilesDialog; @@ -67,7 +67,7 @@ namespace KBabel class ProjectDialog; } -class CatalogManager : public KMainWindow +class CatalogManager : public TDEMainWindow { Q_OBJECT @@ -149,7 +149,7 @@ private slots: /** * calls @ref KBabel::open where as preferred windos _preferredWindow * is used. If this is deleted meanwhile, the first window in - * @ref KMainWindow::memberList is used. + * @ref TDEMainWindow::memberList is used. */ void openFile(TQString filename,TQString package); void openFile(TQString filename,TQString package, int msgid); @@ -157,7 +157,7 @@ private slots: /** * calls @ref KBabel::openTemplate where as preferred windos _preferredWindow * is used. If this is deleted meanwhile, the first window in - * @ref KMainWindow::memberList is used. + * @ref TDEMainWindow::memberList is used. */ void openTemplate(TQString openFilename,TQString saveFileName,TQString package); void openTemplateInNewWindow(TQString openFilename,TQString saveFileName,TQString package); diff --git a/kbabel/catalogmanager/main.cpp b/kbabel/catalogmanager/main.cpp index d28425a6..9c321b71 100644 --- a/kbabel/catalogmanager/main.cpp +++ b/kbabel/catalogmanager/main.cpp @@ -114,7 +114,7 @@ int CatalogManagerApp::newInstance() if( isRestored() ) { int n = 1; - while (KMainWindow::canBeRestored(n)){ + while (TDEMainWindow::canBeRestored(n)){ CatalogManager* cm = new CatalogManager(); cm->restore(n); n++; diff --git a/kbabel/catalogmanager/validateprogress.cpp b/kbabel/catalogmanager/validateprogress.cpp index 8ac02c0d..e01585f3 100644 --- a/kbabel/catalogmanager/validateprogress.cpp +++ b/kbabel/catalogmanager/validateprogress.cpp @@ -68,7 +68,7 @@ ValidateProgressDialog::ValidateProgressDialog(const TQString& ignoreURL, TQWidg readIgnores(); - _errorMenu = new KPopupMenu(this); + _errorMenu = new TDEPopupMenu(this); _errorMenu->insertItem(i18n("&Open"),ID_ERROR_OPEN); _errorMenu->insertItem(i18n("&Ignore"),ID_ERROR_IGNORE); diff --git a/kbabel/catalogmanager/validateprogress.h b/kbabel/catalogmanager/validateprogress.h index 6910723d..06cd1175 100644 --- a/kbabel/catalogmanager/validateprogress.h +++ b/kbabel/catalogmanager/validateprogress.h @@ -42,7 +42,7 @@ class CatManListItem; class ValidateProgressWidget; class KDataToolInfo; class KDataTool; -class KPopupMenu; +class TDEPopupMenu; struct IgnoreItem { @@ -98,7 +98,7 @@ private: TQString _toolID; TQPtrList<CatManListItem> _files; bool _stopped; - KPopupMenu* _errorMenu; + TDEPopupMenu* _errorMenu; bool _ignoreFuzzy; bool _setAsFuzzy; |