diff options
Diffstat (limited to 'kbabel')
34 files changed, 355 insertions, 355 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; diff --git a/kbabel/commonui/context.h b/kbabel/commonui/context.h index 512bd741..9cddcd67 100644 --- a/kbabel/commonui/context.h +++ b/kbabel/commonui/context.h @@ -44,7 +44,7 @@ class TQComboBox; class TQVBoxLayout; class TQLineEdit; -class KListEditor; +class TDEListEditor; class TDEConfig; class KURL; diff --git a/kbabel/commonui/kactionselector.cpp b/kbabel/commonui/kactionselector.cpp index 9e5d3e79..c2638ff5 100644 --- a/kbabel/commonui/kactionselector.cpp +++ b/kbabel/commonui/kactionselector.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - KActionSelector.cpp + TDEActionSelector.cpp A widget for selecting and arranging actions/objects ------------------- begin : Mon June 3 2002 @@ -43,24 +43,24 @@ #include <tqwhatsthis.h> #include <tqapplication.h> -class KActionSelectorPrivate { +class TDEActionSelectorPrivate { public: TQListBox *availableListBox, *selectedListBox; TQToolButton *btnAdd, *btnRemove, *btnUp, *btnDown; TQLabel *lAvailable, *lSelected; bool moveOnDoubleClick, keyboardEnabled; - KActionSelector::ButtonIconSize iconSize; + TDEActionSelector::ButtonIconSize iconSize; TQString addIcon, removeIcon, upIcon, downIcon; - KActionSelector::InsertionPolicy availableInsertionPolicy, selectedInsertionPolicy; + TDEActionSelector::InsertionPolicy availableInsertionPolicy, selectedInsertionPolicy; bool showUpDownButtons; }; //BEGIN Constructor/destructor -KActionSelector::KActionSelector( TQWidget *parent, const char *name ) +TDEActionSelector::TDEActionSelector( TQWidget *parent, const char *name ) : TQWidget( parent, name ) { - d = new KActionSelectorPrivate(); + d = new TDEActionSelectorPrivate(); d->moveOnDoubleClick = true; d->keyboardEnabled = true; d->iconSize = SmallIcon; @@ -126,7 +126,7 @@ KActionSelector::KActionSelector( TQWidget *parent, const char *name ) d->selectedListBox->installEventFilter( this ); } -KActionSelector::~KActionSelector() +TDEActionSelector::~TDEActionSelector() { delete d; } @@ -135,17 +135,17 @@ KActionSelector::~KActionSelector() //BEGIN Public Methods -TQListBox *KActionSelector::availableListBox() +TQListBox *TDEActionSelector::availableListBox() { return d->availableListBox; } -TQListBox *KActionSelector::selectedListBox() +TQListBox *TDEActionSelector::selectedListBox() { return d->selectedListBox; } -void KActionSelector::setButtonIcon( const TQString &icon, MoveButton button ) +void TDEActionSelector::setButtonIcon( const TQString &icon, MoveButton button ) { int isz; if ( d->iconSize == SmallIcon ) isz = IconSize( KIcon::Small ); @@ -173,11 +173,11 @@ void KActionSelector::setButtonIcon( const TQString &icon, MoveButton button ) d->btnDown->setIconSet( SmallIconSet( icon, isz ) ); break; default: - kdDebug(KBABEL)<<"KActionSelector::setButtonIcon: DAINBREAD!"<<endl; + kdDebug(KBABEL)<<"TDEActionSelector::setButtonIcon: DAINBREAD!"<<endl; } } -void KActionSelector::setButtonIconSet( const TQIconSet &iconset, MoveButton button ) +void TDEActionSelector::setButtonIconSet( const TQIconSet &iconset, MoveButton button ) { switch ( button ) { @@ -194,11 +194,11 @@ void KActionSelector::setButtonIconSet( const TQIconSet &iconset, MoveButton but d->btnDown->setIconSet( iconset ); break; default: - kdDebug(KBABEL)<<"KActionSelector::setButtonIconSet: DAINBREAD!"<<endl; + kdDebug(KBABEL)<<"TDEActionSelector::setButtonIconSet: DAINBREAD!"<<endl; } } -void KActionSelector::setButtonTooltip( const TQString &tip, MoveButton button ) +void TDEActionSelector::setButtonTooltip( const TQString &tip, MoveButton button ) { switch ( button ) { @@ -215,11 +215,11 @@ void KActionSelector::setButtonTooltip( const TQString &tip, MoveButton button ) d->btnDown->setTextLabel( tip ); break; default: - kdDebug(KBABEL)<<"KActionSelector::setButtonToolTip: DAINBREAD!"<<endl; + kdDebug(KBABEL)<<"TDEActionSelector::setButtonToolTip: DAINBREAD!"<<endl; } } -void KActionSelector::setButtonWhatsThis( const TQString &text, MoveButton button ) +void TDEActionSelector::setButtonWhatsThis( const TQString &text, MoveButton button ) { switch ( button ) { @@ -236,11 +236,11 @@ void KActionSelector::setButtonWhatsThis( const TQString &text, MoveButton butto TQWhatsThis::add( d->btnDown, text ); break; default: - kdDebug(KBABEL)<<"KActionSelector::setButtonWhatsThis: DAINBREAD!"<<endl; + kdDebug(KBABEL)<<"TDEActionSelector::setButtonWhatsThis: DAINBREAD!"<<endl; } } -void KActionSelector::setButtonsEnabled() +void TDEActionSelector::setButtonsEnabled() { d->btnAdd->setEnabled( d->availableListBox->currentItem() > -1 ); d->btnRemove->setEnabled( d->selectedListBox->currentItem() > -1 ); @@ -253,84 +253,84 @@ void KActionSelector::setButtonsEnabled() //BEGIN Properties -bool KActionSelector::moveOnDoubleClick() const +bool TDEActionSelector::moveOnDoubleClick() const { return d->moveOnDoubleClick; } -void KActionSelector::setMoveOnDoubleClick( bool b ) +void TDEActionSelector::setMoveOnDoubleClick( bool b ) { d->moveOnDoubleClick = b; } -bool KActionSelector::keyboardEnabled() const +bool TDEActionSelector::keyboardEnabled() const { return d->keyboardEnabled; } -void KActionSelector::setKeyboardEnabled( bool b ) +void TDEActionSelector::setKeyboardEnabled( bool b ) { d->keyboardEnabled = b; } -TQString KActionSelector::availableLabel() const +TQString TDEActionSelector::availableLabel() const { return d->lAvailable->text(); } -void KActionSelector::setAvailableLabel( const TQString &text ) +void TDEActionSelector::setAvailableLabel( const TQString &text ) { d->lAvailable->setText( text ); } -TQString KActionSelector::selectedLabel() const +TQString TDEActionSelector::selectedLabel() const { return d->lSelected->text(); } -void KActionSelector::setSelectedLabel( const TQString &text ) +void TDEActionSelector::setSelectedLabel( const TQString &text ) { d->lSelected->setText( text ); } -KActionSelector::ButtonIconSize KActionSelector::buttonIconSize() const +TDEActionSelector::ButtonIconSize TDEActionSelector::buttonIconSize() const { return d->iconSize; } -void KActionSelector::setButtonIconSize( ButtonIconSize size ) +void TDEActionSelector::setButtonIconSize( ButtonIconSize size ) { d->iconSize = size; // reload icons loadIcons(); } -KActionSelector::InsertionPolicy KActionSelector::availableInsertionPolicy() +TDEActionSelector::InsertionPolicy TDEActionSelector::availableInsertionPolicy() { return d->availableInsertionPolicy; } -void KActionSelector::setAvailableInsertionPolicy( InsertionPolicy p ) +void TDEActionSelector::setAvailableInsertionPolicy( InsertionPolicy p ) { d->availableInsertionPolicy = p; } -KActionSelector::InsertionPolicy KActionSelector::selectedInsertionPolicy() +TDEActionSelector::InsertionPolicy TDEActionSelector::selectedInsertionPolicy() { return d->selectedInsertionPolicy; } -void KActionSelector::setSelectedInsertionPolicy( InsertionPolicy p ) +void TDEActionSelector::setSelectedInsertionPolicy( InsertionPolicy p ) { d->selectedInsertionPolicy = p; } -bool KActionSelector::showUpDownButtons() +bool TDEActionSelector::showUpDownButtons() { return d->showUpDownButtons; } -void KActionSelector::setShowUpDownButtons( bool show ) +void TDEActionSelector::setShowUpDownButtons( bool show ) { d->showUpDownButtons = show; if ( show ) @@ -349,7 +349,7 @@ void KActionSelector::setShowUpDownButtons( bool show ) //BEGIN Public Slots -void KActionSelector::polish() +void TDEActionSelector::polish() { setButtonsEnabled(); } @@ -357,7 +357,7 @@ void KActionSelector::polish() //END Public Slots //BEGIN Protected -void KActionSelector::keyPressEvent( TQKeyEvent *e ) +void TDEActionSelector::keyPressEvent( TQKeyEvent *e ) { if ( ! d->keyboardEnabled ) return; if ( (e->state() & TQt::ControlButton) ) @@ -383,7 +383,7 @@ void KActionSelector::keyPressEvent( TQKeyEvent *e ) } } -bool KActionSelector::eventFilter( TQObject *o, TQEvent *e ) +bool TDEActionSelector::eventFilter( TQObject *o, TQEvent *e ) { if ( d->keyboardEnabled && e->type() == TQEvent::KeyPress ) { @@ -430,7 +430,7 @@ bool KActionSelector::eventFilter( TQObject *o, TQEvent *e ) //BEGIN Private Slots -void KActionSelector::buttonAddClicked() +void TDEActionSelector::buttonAddClicked() { // move all selected items from available to selected listbox TQListBoxItem *item = d->availableListBox->firstItem(); @@ -448,7 +448,7 @@ void KActionSelector::buttonAddClicked() d->selectedListBox->setFocus(); } -void KActionSelector::buttonRemoveClicked() +void TDEActionSelector::buttonRemoveClicked() { // move all selected items from selected to available listbox TQListBoxItem *item = d->selectedListBox->firstItem(); @@ -466,7 +466,7 @@ void KActionSelector::buttonRemoveClicked() d->availableListBox->setFocus(); } -void KActionSelector::buttonUpClicked() +void TDEActionSelector::buttonUpClicked() { int c = d->selectedListBox->currentItem(); if ( c < 0 ) return; @@ -477,7 +477,7 @@ void KActionSelector::buttonUpClicked() emit movedUp( item ); } -void KActionSelector::buttonDownClicked() +void TDEActionSelector::buttonDownClicked() { int c = d->selectedListBox->currentItem(); if ( c < 0 ) return; @@ -488,7 +488,7 @@ void KActionSelector::buttonDownClicked() emit movedDown( item ); } -void KActionSelector::itemDoubleClicked( TQListBoxItem *item ) +void TDEActionSelector::itemDoubleClicked( TQListBoxItem *item ) { if ( d->moveOnDoubleClick ) moveItem( item ); @@ -498,7 +498,7 @@ void KActionSelector::itemDoubleClicked( TQListBoxItem *item ) //BEGIN Private Methods -void KActionSelector::loadIcons() +void TDEActionSelector::loadIcons() { int isz; if ( d->iconSize == SmallIcon ) isz = IconSize( KIcon::Small ); @@ -513,7 +513,7 @@ void KActionSelector::loadIcons() d->btnDown->setIconSet( SmallIconSet( d->downIcon, isz ) ); } -void KActionSelector::moveItem( TQListBoxItem *item ) +void TDEActionSelector::moveItem( TQListBoxItem *item ) { TQListBox *lbFrom = item->listBox(); TQListBox *lbTo; @@ -540,7 +540,7 @@ void KActionSelector::moveItem( TQListBoxItem *item ) emit removed( item ); } -int KActionSelector::insertionIndex( TQListBox *lb, InsertionPolicy policy ) +int TDEActionSelector::insertionIndex( TQListBox *lb, InsertionPolicy policy ) { int index; switch ( policy ) diff --git a/kbabel/commonui/kactionselector.h b/kbabel/commonui/kactionselector.h index 3a13303b..eaa1ab72 100644 --- a/kbabel/commonui/kactionselector.h +++ b/kbabel/commonui/kactionselector.h @@ -1,5 +1,5 @@ /*************************************************************************** - KActionSelector.h + TDEActionSelector.h A widget for selecting and arranging actions/objects ------------------- begin : Mon June 3 2002 @@ -38,7 +38,7 @@ class TQKeyEvent; class TQEvent; class TQIconSet; -class KActionSelectorPrivate; +class TDEActionSelectorPrivate; /** @short A widget for selecting and arranging actions/objects @@ -84,7 +84,7 @@ class KActionSelectorPrivate; @author Anders Lund <anders@alweb.dk> */ -class KActionSelector : public TQWidget { +class TDEActionSelector : public TQWidget { Q_OBJECT TQ_ENUMS( ButtonIconSize InsertionPolicy ) @@ -98,8 +98,8 @@ class KActionSelector : public TQWidget { TQ_PROPERTY( bool showUpDownButtons READ showUpDownButtons WRITE setShowUpDownButtons ) public: - KActionSelector( TQWidget *parent=0, const char *name=0 ); - ~KActionSelector(); + TDEActionSelector( TQWidget *parent=0, const char *name=0 ); + ~TDEActionSelector(); /** @return The TQListBox holding the available actions @@ -405,7 +405,7 @@ private: /** @private Private data storage */ - KActionSelectorPrivate *d; + TDEActionSelectorPrivate *d; }; #endif // _KACTION_SELECTOR_H_ diff --git a/kbabel/commonui/klisteditor.ui b/kbabel/commonui/klisteditor.ui index 4b7eeb0d..5f0f8ce1 100644 --- a/kbabel/commonui/klisteditor.ui +++ b/kbabel/commonui/klisteditor.ui @@ -1,8 +1,8 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> -<class>KListEditor</class> +<class>TDEListEditor</class> <widget class="TQWidget"> <property name="name"> - <cstring>KListEditor</cstring> + <cstring>TDEListEditor</cstring> </property> <property name="geometry"> <rect> @@ -193,43 +193,43 @@ <connection> <sender>_addButton</sender> <signal>pressed()</signal> - <receiver>KListEditor</receiver> + <receiver>TDEListEditor</receiver> <slot>addToList()</slot> </connection> <connection> <sender>_removeButton</sender> <signal>pressed()</signal> - <receiver>KListEditor</receiver> + <receiver>TDEListEditor</receiver> <slot>removeFromList()</slot> </connection> <connection> <sender>_upButton</sender> <signal>pressed()</signal> - <receiver>KListEditor</receiver> + <receiver>TDEListEditor</receiver> <slot>upInList()</slot> </connection> <connection> <sender>_downButton</sender> <signal>pressed()</signal> - <receiver>KListEditor</receiver> + <receiver>TDEListEditor</receiver> <slot>downInList()</slot> </connection> <connection> <sender>_edit</sender> <signal>returnPressed()</signal> - <receiver>KListEditor</receiver> + <receiver>TDEListEditor</receiver> <slot>updateList()</slot> </connection> <connection> <sender>_edit</sender> <signal>textChanged(const TQString&)</signal> - <receiver>KListEditor</receiver> + <receiver>TDEListEditor</receiver> <slot>editChanged(const TQString&)</slot> </connection> <connection> <sender>_list</sender> <signal>highlighted(int)</signal> - <receiver>KListEditor</receiver> + <receiver>TDEListEditor</receiver> <slot>updateButtons(int)</slot> </connection> <connection> diff --git a/kbabel/commonui/klisteditor.ui.h b/kbabel/commonui/klisteditor.ui.h index 1845943c..30978506 100644 --- a/kbabel/commonui/klisteditor.ui.h +++ b/kbabel/commonui/klisteditor.ui.h @@ -38,7 +38,7 @@ *****************************************************************************/ -void KListEditor::addToList() +void TDEListEditor::addToList() { _list->insertItem(_edit->text()); _edit->clear(); @@ -46,7 +46,7 @@ void KListEditor::addToList() emit itemsChanged(); } -void KListEditor::downInList() +void TDEListEditor::downInList() { int i=_list->currentItem(); if( i< (int)_list->count()-1 ) { @@ -58,7 +58,7 @@ void KListEditor::downInList() emit itemsChanged(); } -void KListEditor::removeFromList() +void TDEListEditor::removeFromList() { _list->removeItem(_list->currentItem()); if( _list->count()==0 ) _edit->clear(); @@ -66,7 +66,7 @@ void KListEditor::removeFromList() emit itemsChanged(); } -void KListEditor::upInList() +void TDEListEditor::upInList() { int i=_list->currentItem(); if( i>0 ) { @@ -78,21 +78,21 @@ void KListEditor::upInList() emit itemsChanged(); } -void KListEditor::updateButtons( int newIndex ) +void TDEListEditor::updateButtons( int newIndex ) { _upButton->setEnabled(newIndex>0); _downButton->setEnabled(newIndex+1 != (int)_list->count()); _removeButton->setEnabled(true); } -void KListEditor::updateList() +void TDEListEditor::updateList() { int i=_list->currentItem(); if( i==-1 ) addToList(); else _list->changeItem(_edit->text(), i ); } -void KListEditor::setList( TQStringList contents ) +void TDEListEditor::setList( TQStringList contents ) { _list->clear(); _list->insertStringList(contents); @@ -101,19 +101,19 @@ void KListEditor::setList( TQStringList contents ) } -void KListEditor::editChanged( const TQString &s ) +void TDEListEditor::editChanged( const TQString &s ) { _addButton->setEnabled(!s.isEmpty()); } -void KListEditor::setTitle( const TQString &s ) +void TDEListEditor::setTitle( const TQString &s ) { _frame->setTitle(s); } -TQStringList KListEditor::list() +TQStringList TDEListEditor::list() { TQStringList result; for( uint i=0; i<_list->count() ; i++ ) diff --git a/kbabel/commonui/projectprefwidgets.cpp b/kbabel/commonui/projectprefwidgets.cpp index 530d8a95..04c845c9 100644 --- a/kbabel/commonui/projectprefwidgets.cpp +++ b/kbabel/commonui/projectprefwidgets.cpp @@ -1164,7 +1164,7 @@ SourceContextPreferences::SourceContextPreferences(TQWidget* parent): TQWidget(p layout->addWidget(box); // FIXME: use TDEConfigXT - _pathsEditor = new KListEditor(page); + _pathsEditor = new TDEListEditor(page); _pathsEditor->setTitle(i18n("Path Patterns")); layout->addWidget(_pathsEditor); diff --git a/kbabel/commonui/projectprefwidgets.h b/kbabel/commonui/projectprefwidgets.h index f3a29a58..4d93326a 100644 --- a/kbabel/commonui/projectprefwidgets.h +++ b/kbabel/commonui/projectprefwidgets.h @@ -48,14 +48,14 @@ class TQListBox; class TQRadioButton; class TQSpinBox; class CmdEdit; -class KFontChooser; +class TDEFontChooser; class KColorButton; class KComboBox; class KSpellConfig; class KURLRequester; class TQPushButton; class TQGroupBox; -class KListEditor; +class TDEListEditor; class ToolSelectionWidget; class KIntNumInput; class KURLRequester; @@ -288,7 +288,7 @@ signals: private: KURLRequester* _coderootEdit; - KListEditor* _pathsEditor; + TDEListEditor* _pathsEditor; }; #endif // PROJECTPREFWIDGETS_H diff --git a/kbabel/commonui/toolaction.cpp b/kbabel/commonui/toolaction.cpp index 48650231..6e594834 100644 --- a/kbabel/commonui/toolaction.cpp +++ b/kbabel/commonui/toolaction.cpp @@ -33,9 +33,9 @@ #include <kdebug.h> -ToolAction::ToolAction( const TQString & text, const KShortcut& cut, const KDataToolInfo & info, const TQString & command, +ToolAction::ToolAction( const TQString & text, const TDEShortcut& cut, const KDataToolInfo & info, const TQString & command, TQObject * parent, const char * name ) - : KAction( text, info.iconName() == "unknown" ? TQString() : info.iconName(), cut, parent, name ), + : TDEAction( text, info.iconName() == "unknown" ? TQString() : info.iconName(), cut, parent, name ), m_command( command ), m_info( info ) { @@ -46,9 +46,9 @@ void ToolAction::slotActivated() emit toolActivated( m_info, m_command ); } -TQPtrList<KAction> ToolAction::dataToolActionList( const TQValueList<KDataToolInfo> & tools, const TQObject *receiver, const char* slot, const TQStringList& command, bool excludeCommand, KActionCollection* parent, const TQString& namePrefix ) +TQPtrList<TDEAction> ToolAction::dataToolActionList( const TQValueList<KDataToolInfo> & tools, const TQObject *receiver, const char* slot, const TQStringList& command, bool excludeCommand, TDEActionCollection* parent, const TQString& namePrefix ) { - TQPtrList<KAction> actionList; + TQPtrList<TDEAction> actionList; if ( tools.isEmpty() ) return actionList; diff --git a/kbabel/commonui/toolaction.h b/kbabel/commonui/toolaction.h index 764b9493..1d785309 100644 --- a/kbabel/commonui/toolaction.h +++ b/kbabel/commonui/toolaction.h @@ -36,22 +36,22 @@ #include <kaction.h> #include <kdatatool.h> -class KShortcut; -class KActionCollection; +class TDEShortcut; +class TDEActionCollection; -class KDE_EXPORT ToolAction : public KAction +class KDE_EXPORT ToolAction : public TDEAction { Q_OBJECT public: - ToolAction( const TQString & text, const KShortcut& cut, const KDataToolInfo & info, const TQString & command, TQObject * parent = 0, const char * name = 0); + ToolAction( const TQString & text, const TDEShortcut& cut, const KDataToolInfo & info, const TQString & command, TQObject * parent = 0, const char * name = 0); /** - * return the list of KActions created for a list of tools. @ref command + * return the list of TDEActions created for a list of tools. @ref command * allows to specify rescriction of commands, for which the list should * or shouldn't be created according to the @ref excludeCommand flag. */ - static TQPtrList<KAction> dataToolActionList( const TQValueList<KDataToolInfo> & tools, const TQObject *receiver, const char* slot, const TQStringList& command, bool excludeCommand, KActionCollection* parent=0, const TQString& namePrefix=TQString() ); + static TQPtrList<TDEAction> dataToolActionList( const TQValueList<KDataToolInfo> & tools, const TQObject *receiver, const char* slot, const TQStringList& command, bool excludeCommand, TDEActionCollection* parent=0, const TQString& namePrefix=TQString() ); /** * returns information about all available validation tools (KDataTools with support for CatalogItem diff --git a/kbabel/commonui/toolselectionwidget.cpp b/kbabel/commonui/toolselectionwidget.cpp index 55a46f93..2e47ae2d 100644 --- a/kbabel/commonui/toolselectionwidget.cpp +++ b/kbabel/commonui/toolselectionwidget.cpp @@ -37,7 +37,7 @@ #include <tqlistbox.h> ToolSelectionWidget::ToolSelectionWidget( TQWidget * parent, const char * name ) - : KActionSelector( parent, name ) + : TDEActionSelector( parent, name ) { } diff --git a/kbabel/commonui/toolselectionwidget.h b/kbabel/commonui/toolselectionwidget.h index 622717f8..d0c8ee3a 100644 --- a/kbabel/commonui/toolselectionwidget.h +++ b/kbabel/commonui/toolselectionwidget.h @@ -37,7 +37,7 @@ class KDataToolInfo; -class KDE_EXPORT ToolSelectionWidget : public KActionSelector +class KDE_EXPORT ToolSelectionWidget : public TDEActionSelector { Q_OBJECT diff --git a/kbabel/kbabel/fontpreferences.ui b/kbabel/kbabel/fontpreferences.ui index 22b49455..4befa080 100644 --- a/kbabel/kbabel/fontpreferences.ui +++ b/kbabel/kbabel/fontpreferences.ui @@ -36,7 +36,7 @@ <string>&Show only fixed font</string> </property> </widget> - <widget class="KFontChooser"> + <widget class="TDEFontChooser"> <property name="name"> <cstring>kcfg_MsgFont</cstring> </property> diff --git a/kbabel/kbabel/kbabel.cpp b/kbabel/kbabel/kbabel.cpp index 262e47ab..eea5f60b 100644 --- a/kbabel/kbabel/kbabel.cpp +++ b/kbabel/kbabel/kbabel.cpp @@ -293,8 +293,8 @@ void KBabelMW::init(KBCatalog* catalog) mailer = new KBabelMailer( this, _project ); bmHandler = new KBabelBookmarkHandler((TQPopupMenu*)factory()->container("bookmark", this)); - // the earlier created KAction for "clear_bookmarks" is now reconnected - KAction* action = actionCollection()->action("clear_bookmarks"); + // the earlier created TDEAction for "clear_bookmarks" is now reconnected + TDEAction* action = actionCollection()->action("clear_bookmarks"); if (action) { action->disconnect(TQT_SIGNAL(activated())); connect(action, TQT_SIGNAL(activated()), @@ -401,7 +401,7 @@ void KBabelMW::updateSettings() void KBabelMW::setupActions() { - KAction* action; + TDEAction* action; // the file menu action = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection()); @@ -412,19 +412,19 @@ void KBabelMW::setupActions() action = KStdAction::revert(TQT_TQOBJECT(m_view),TQT_SLOT(revertToSaved()),actionCollection()); action=KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(fileSave()), actionCollection()); action = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(fileSaveAs()), actionCollection()); - action = new KAction(i18n("Save Sp&ecial..."), 0, TQT_TQOBJECT(this), TQT_SLOT(fileSaveSpecial()), + action = new TDEAction(i18n("Save Sp&ecial..."), 0, TQT_TQOBJECT(this), TQT_SLOT(fileSaveSpecial()), actionCollection(), "save_special" ); - action = new KAction(i18n("Set &Package..."), 0, TQT_TQOBJECT(m_view), TQT_SLOT(setFilePackage()), + action = new TDEAction(i18n("Set &Package..."), 0, TQT_TQOBJECT(m_view), TQT_SLOT(setFilePackage()), actionCollection(), "set_package" ); action = KStdAction::mail(TQT_TQOBJECT(this), TQT_SLOT(fileMail()), actionCollection()); - action = new KAction(i18n("&New View"), 0, TQT_TQOBJECT(this), TQT_SLOT(fileNewView()), + action = new TDEAction(i18n("&New View"), 0, TQT_TQOBJECT(this), TQT_SLOT(fileNewView()), actionCollection(), "file_new_view"); - action = new KAction(i18n("New &Window"), 0, TQT_TQOBJECT(this), TQT_SLOT(fileNewWindow()), + action = new TDEAction(i18n("New &Window"), 0, TQT_TQOBJECT(this), TQT_SLOT(fileNewWindow()), actionCollection(), "file_new_window"); - action->setShortcut( KStdAccel::openNew() ); + action->setShortcut( TDEStdAccel::openNew() ); action = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(quit()), actionCollection()); @@ -444,66 +444,66 @@ void KBabelMW::setupActions() action = KStdAction::clear( TQT_TQOBJECT(m_view), TQT_SLOT(clear()), actionCollection(), "clear" ); - action = new KAction(i18n("Cop&y Msgid to Msgstr"), "msgid2msgstr", CTRL+Key_Space, TQT_TQOBJECT(m_view) + action = new TDEAction(i18n("Cop&y Msgid to Msgstr"), "msgid2msgstr", CTRL+Key_Space, TQT_TQOBJECT(m_view) ,TQT_SLOT(msgid2msgstr()), actionCollection(), "msgid2msgstr"); - action = new KAction(i18n("Copy Searc&h Result to Msgstr"), "search2msgstr", + action = new TDEAction(i18n("Copy Searc&h Result to Msgstr"), "search2msgstr", CTRL+ALT+Key_Space, TQT_TQOBJECT(m_view), TQT_SLOT(search2msgstr()), actionCollection(), "search2msgstr"); - action = new KAction(i18n("Copy Msgstr to Other &Plurals"), Key_F11, TQT_TQOBJECT(m_view) + action = new TDEAction(i18n("Copy Msgstr to Other &Plurals"), Key_F11, TQT_TQOBJECT(m_view) ,TQT_SLOT(plural2msgstr()), actionCollection(), "plural2msgstr"); - action = new KAction(i18n("Copy Selected Character to Msgstr"), Key_F10, TQT_TQOBJECT(m_charselectorview) + action = new TDEAction(i18n("Copy Selected Character to Msgstr"), Key_F10, TQT_TQOBJECT(m_charselectorview) ,TQT_SLOT(emitChar()), actionCollection(), "char2msgstr"); - a_unsetFuzzy = new KAction(i18n("To&ggle Fuzzy Status"), "togglefuzzy", CTRL+Key_U, TQT_TQOBJECT(m_view) + a_unsetFuzzy = new TDEAction(i18n("To&ggle Fuzzy Status"), "togglefuzzy", CTRL+Key_U, TQT_TQOBJECT(m_view) , TQT_SLOT(removeFuzzyStatus()), actionCollection(), "edit_toggle_fuzzy"); - action = new KAction(i18n("&Edit Header..."), 0, TQT_TQOBJECT(m_view), TQT_SLOT(editHeader()), + action = new TDEAction(i18n("&Edit Header..."), 0, TQT_TQOBJECT(m_view), TQT_SLOT(editHeader()), actionCollection(), "edit_edit_header"); - action = new KAction(i18n("&Insert Next Tag"), "insert_tag", CTRL+ALT+Key_N + action = new TDEAction(i18n("&Insert Next Tag"), "insert_tag", CTRL+ALT+Key_N , TQT_TQOBJECT(m_view), TQT_SLOT(insertNextTag()) , actionCollection(),"insert_next_tag"); connect(m_view,TQT_SIGNAL(signalNextTagAvailable(bool)),action ,TQT_SLOT(setEnabled(bool))); - action = new KAction(i18n("Insert Next Tag From Msgid P&osition"), "insert_tag", CTRL+Key_M + action = new TDEAction(i18n("Insert Next Tag From Msgid P&osition"), "insert_tag", CTRL+Key_M , TQT_TQOBJECT(m_view), TQT_SLOT(insertNextTagMsgid()) , actionCollection(),"insert_next_tag_msgid"); connect(m_view,TQT_SIGNAL(signalNextTagAvailable(bool)),action ,TQT_SLOT(setEnabled(bool))); - KActionMenu *actionMenu= new KActionMenu(i18n("Inser&t Tag"), "insert_tag" + TDEActionMenu *actionMenu= new TDEActionMenu(i18n("Inser&t Tag"), "insert_tag" , actionCollection(),"insert_tag"); m_view->setTagsMenu(actionMenu->popupMenu()); connect(m_view,TQT_SIGNAL(signalTagsAvailable(bool)),actionMenu ,TQT_SLOT(setEnabled(bool))); connect(actionMenu,TQT_SIGNAL(activated()),m_view,TQT_SLOT(insertNextTag())); - action = new KAction(i18n("Show Tags Menu"),CTRL+Key_Less + action = new TDEAction(i18n("Show Tags Menu"),CTRL+Key_Less , TQT_TQOBJECT(m_view), TQT_SLOT(showTagsMenu()), actionCollection(),"show_tags_menu"); action->setEnabled(false); connect(m_view,TQT_SIGNAL(signalTagsAvailable(bool)),action ,TQT_SLOT(setEnabled(bool))); - action = new KAction(i18n("Move to Next Tag"), 0, CTRL+ALT+Key_M + action = new TDEAction(i18n("Move to Next Tag"), 0, CTRL+ALT+Key_M , TQT_TQOBJECT(m_view), TQT_SLOT(skipToNextTag()) , actionCollection(),"move_to_next_tag"); - action = new KAction(i18n("Move to Previous Tag"), 0, CTRL+ALT+Key_B + action = new TDEAction(i18n("Move to Previous Tag"), 0, CTRL+ALT+Key_B , TQT_TQOBJECT(m_view), TQT_SLOT(skipToPreviousTag()) , actionCollection(),"move_to_prev_tag"); - action = new KAction(i18n("Insert Next Argument"), "insert_arg", CTRL+ALT+Key_G + action = new TDEAction(i18n("Insert Next Argument"), "insert_arg", CTRL+ALT+Key_G , TQT_TQOBJECT(m_view), TQT_SLOT(insertNextArg()) , actionCollection(),"insert_next_arg"); connect(m_view,TQT_SIGNAL(signalNextArgAvailable(bool)),action ,TQT_SLOT(setEnabled(bool))); - actionMenu= new KActionMenu(i18n("Inser&t Argument"), "insert_arg" + actionMenu= new TDEActionMenu(i18n("Inser&t Argument"), "insert_arg" , actionCollection(),"insert_arg"); m_view->setArgsMenu(actionMenu->popupMenu()); connect(m_view,TQT_SIGNAL(signalArgsAvailable(bool)),actionMenu ,TQT_SLOT(setEnabled(bool))); connect(actionMenu,TQT_SIGNAL(activated()),m_view,TQT_SLOT(insertNextArg())); - action = new KAction(i18n("Show Arguments Menu"),CTRL+Key_Percent + action = new TDEAction(i18n("Show Arguments Menu"),CTRL+Key_Percent , TQT_TQOBJECT(m_view), TQT_SLOT(showArgsMenu()), actionCollection(),"show_args_menu"); action->setEnabled(false); @@ -511,78 +511,78 @@ void KBabelMW::setupActions() ,TQT_SLOT(setEnabled(bool))); // next, the go-menu - action = new KAction(i18n("&Previous"), "previous", - KStdAccel::shortcut(KStdAccel::Prior), TQT_TQOBJECT(m_view) , TQT_SLOT(gotoPrev()), + action = new TDEAction(i18n("&Previous"), "previous", + TDEStdAccel::shortcut(TDEStdAccel::Prior), TQT_TQOBJECT(m_view) , TQT_SLOT(gotoPrev()), actionCollection(),"go_prev_entry"); - action = new KAction(i18n("&Next"), "next", - KStdAccel::shortcut(KStdAccel::Next), TQT_TQOBJECT(m_view) , TQT_SLOT(gotoNext()), + action = new TDEAction(i18n("&Next"), "next", + TDEStdAccel::shortcut(TDEStdAccel::Next), TQT_TQOBJECT(m_view) , TQT_SLOT(gotoNext()), actionCollection(),"go_next_entry"); action = KStdAction::goTo(TQT_TQOBJECT(m_view), TQT_SLOT(gotoEntry()), actionCollection()); - action->setShortcut( KStdAccel::gotoLine()); + action->setShortcut( TDEStdAccel::gotoLine()); action = KStdAction::firstPage(TQT_TQOBJECT(m_view), TQT_SLOT(gotoFirst()),actionCollection()); action->setText(i18n("&First Entry")); action->setShortcut(CTRL+ALT+Key_Home); action = KStdAction::lastPage(TQT_TQOBJECT(m_view), TQT_SLOT(gotoLast()),actionCollection()); action->setText(i18n("&Last Entry")); action->setShortcut(CTRL+ALT+Key_End); - a_prevFoU = new KAction(i18n("P&revious Fuzzy or Untranslated"),"prevfuzzyuntrans", + a_prevFoU = new TDEAction(i18n("P&revious Fuzzy or Untranslated"),"prevfuzzyuntrans", CTRL+SHIFT+Key_Prior, TQT_TQOBJECT(m_view), TQT_SLOT(gotoPrevFuzzyOrUntrans()),actionCollection(), "go_prev_fuzzyUntr"); - a_nextFoU = new KAction(i18n("N&ext Fuzzy or Untranslated"),"nextfuzzyuntrans", + a_nextFoU = new TDEAction(i18n("N&ext Fuzzy or Untranslated"),"nextfuzzyuntrans", CTRL+SHIFT+Key_Next, TQT_TQOBJECT(m_view), TQT_SLOT(gotoNextFuzzyOrUntrans()),actionCollection(), "go_next_fuzzyUntr"); - a_prevFuzzy = new KAction(i18n("Pre&vious Fuzzy"),"prevfuzzy", + a_prevFuzzy = new TDEAction(i18n("Pre&vious Fuzzy"),"prevfuzzy", CTRL+Key_Prior, TQT_TQOBJECT(m_view), TQT_SLOT(gotoPrevFuzzy()),actionCollection(), "go_prev_fuzzy"); - a_nextFuzzy = new KAction(i18n("Ne&xt Fuzzy"), "nextfuzzy", + a_nextFuzzy = new TDEAction(i18n("Ne&xt Fuzzy"), "nextfuzzy", CTRL+Key_Next, TQT_TQOBJECT(m_view), TQT_SLOT(gotoNextFuzzy()),actionCollection(), "go_next_fuzzy"); - a_prevUntrans = new KAction(i18n("Prev&ious Untranslated"), "prevuntranslated", + a_prevUntrans = new TDEAction(i18n("Prev&ious Untranslated"), "prevuntranslated", ALT+Key_Prior, TQT_TQOBJECT(m_view), TQT_SLOT(gotoPrevUntranslated()),actionCollection(), "go_prev_untrans"); - a_nextUntrans = new KAction(i18n("Nex&t Untranslated"), "nextuntranslated", + a_nextUntrans = new TDEAction(i18n("Nex&t Untranslated"), "nextuntranslated", ALT+Key_Next, TQT_TQOBJECT(m_view), TQT_SLOT(gotoNextUntranslated()),actionCollection(), "go_next_untrans"); - action = new KAction(i18n("Previo&us Error"), "preverror", + action = new TDEAction(i18n("Previo&us Error"), "preverror", SHIFT+Key_Prior, TQT_TQOBJECT(m_view), TQT_SLOT(gotoPrevError()),actionCollection(), "go_prev_error"); - action = new KAction(i18n("Next Err&or"), "nexterror", + action = new TDEAction(i18n("Next Err&or"), "nexterror", SHIFT+Key_Next, TQT_TQOBJECT(m_view), TQT_SLOT(gotoNextError()),actionCollection(), "go_next_error"); - action = new KAction(i18n("&Back in History"), "back", ALT+Key_Left, TQT_TQOBJECT(m_view), + action = new TDEAction(i18n("&Back in History"), "back", ALT+Key_Left, TQT_TQOBJECT(m_view), TQT_SLOT(backHistory()),actionCollection(), "go_back_history"); - action = new KAction(i18n("For&ward in History"), "forward", ALT+Key_Right, TQT_TQOBJECT(m_view), + action = new TDEAction(i18n("For&ward in History"), "forward", ALT+Key_Right, TQT_TQOBJECT(m_view), TQT_SLOT(forwardHistory()),actionCollection(), "go_forward_history"); // the search menu - actionMenu=new KActionMenu(i18n("&Find Text"), + actionMenu=new TDEActionMenu(i18n("&Find Text"), "transsearch",actionCollection(),"dict_search_all"); connect(actionMenu,TQT_SIGNAL(activated()),m_view,TQT_SLOT(startSearch())); dictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),TQT_TQOBJECT(this)); connect(dictMenu,TQT_SIGNAL(activated(const TQString)), TQT_TQOBJECT(m_view) , TQT_SLOT(startSearch(const TQString))); - actionMenu=new KActionMenu(i18n("F&ind Selected Text"), + actionMenu=new TDEActionMenu(i18n("F&ind Selected Text"), "transsearch",actionCollection(),"dict_search_selected"); connect(actionMenu,TQT_SIGNAL(activated()),m_view,TQT_SLOT(startSelectionSearch())); selectionDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),TQT_TQOBJECT(this)); connect(selectionDictMenu,TQT_SIGNAL(activated(const TQString)), TQT_TQOBJECT(m_view) , TQT_SLOT(startSelectionSearch(const TQString))); - actionMenu=new KActionMenu(i18n("&Edit Dictionary"), + actionMenu=new TDEActionMenu(i18n("&Edit Dictionary"), "transsearch",actionCollection(),"dict_edit"); editDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),TQT_TQOBJECT(this)); connect(editDictMenu,TQT_SIGNAL(activated(const TQString)), TQT_TQOBJECT(m_view) , TQT_SLOT(editDictionary(const TQString))); - actionMenu=new KActionMenu(i18n("Con&figure Dictionary"), + actionMenu=new TDEActionMenu(i18n("Con&figure Dictionary"), "transsearch",actionCollection(),"dict_configure"); configDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),TQT_TQOBJECT(this)); connect(configDictMenu,TQT_SIGNAL(activated(const TQString)), TQT_TQOBJECT(m_view) , TQT_SLOT(configureDictionary(const TQString))); - actionMenu=new KActionMenu(i18n("About Dictionary"), "transsearch", + actionMenu=new TDEActionMenu(i18n("About Dictionary"), "transsearch", actionCollection(), "dict_about"); aboutDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),TQT_TQOBJECT(this)); connect(aboutDictMenu,TQT_SIGNAL(activated(const TQString)), TQT_TQOBJECT(m_view) @@ -591,75 +591,75 @@ void KBabelMW::setupActions() buildDictMenus(); // 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"); - a_recentprojects = new KRecentFilesAction(i18n("Open &Recent"), 0, TQT_TQOBJECT(this), TQT_SLOT(projectOpenRecent(const KURL&)), actionCollection(), "recent_projects"); + a_recentprojects = new TDERecentFilesAction(i18n("Open &Recent"), 0, TQT_TQOBJECT(this), TQT_SLOT(projectOpenRecent(const KURL&)), actionCollection(), "recent_projects"); // the tools menu - action = new KAction(i18n("&Spell Check..."), "spellcheck", CTRL+Key_I + action = new TDEAction(i18n("&Spell Check..."), "spellcheck", CTRL+Key_I , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckCommon()),actionCollection() ,"spellcheck_common"); - action = new KAction(i18n("&Check All..."), "spellcheck_all", 0 + action = new TDEAction(i18n("&Check All..."), "spellcheck_all", 0 , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckAll()),actionCollection() ,"spellcheck_all"); - action = new KAction(i18n("C&heck From Cursor Position..."), "spellcheck_from_cursor", 0 + action = new TDEAction(i18n("C&heck From Cursor Position..."), "spellcheck_from_cursor", 0 , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckFromCursor()),actionCollection() ,"spellcheck_from_cursor"); - action = new KAction(i18n("Ch&eck Current..."), "spellcheck_actual", 0 + action = new TDEAction(i18n("Ch&eck Current..."), "spellcheck_actual", 0 , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckCurrent()),actionCollection() ,"spellcheck_current"); - action = new KAction(i18n("Check Fro&m Current to End of File..."), 0 + action = new TDEAction(i18n("Check Fro&m Current to End of File..."), 0 , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckFromCurrent()),actionCollection() ,"spellcheck_from_current"); - action = new KAction(i18n("Chec&k Selected Text..."), "spellcheck_selected", 0 + action = new TDEAction(i18n("Chec&k Selected Text..."), "spellcheck_selected", 0 , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckMarked()),actionCollection() ,"spellcheck_marked"); - KToggleAction *toggleAction; + TDEToggleAction *toggleAction; - toggleAction = new KToggleAction(i18n("&Diffmode"), "autodiff", 0 + toggleAction = new TDEToggleAction(i18n("&Diffmode"), "autodiff", 0 ,actionCollection(), "diff_toggleDiff"); connect(toggleAction,TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(m_view), TQT_SLOT(toggleAutoDiff(bool))); connect(m_view,TQT_SIGNAL(signalDiffEnabled(bool)), toggleAction , TQT_SLOT(setChecked(bool))); toggleAction->setChecked(m_view->autoDiffEnabled()); - action = new KAction(i18n("&Show Diff"), "diff", Key_F5 + action = new TDEAction(i18n("&Show Diff"), "diff", Key_F5 , TQT_TQOBJECT(m_view), TQT_SLOT(diff()),actionCollection() ,"diff_diff"); - action = new KAction(i18n("S&how Original Text"), "contents", Key_F6 + action = new TDEAction(i18n("S&how Original Text"), "contents", Key_F6 , TQT_TQOBJECT(m_view), TQT_SLOT(diffShowOrig()),actionCollection() ,"diff_showOrig"); - action = new KAction(i18n("&Open File for Diff"), "fileopen" ,0 + action = new TDEAction(i18n("&Open File for Diff"), "fileopen" ,0 , TQT_TQOBJECT(m_view), TQT_SLOT(openDiffFile()),actionCollection() ,"diff_openFile"); - action = new KAction(i18n("&Rough Translation..."), 0 + action = new TDEAction(i18n("&Rough Translation..."), 0 , TQT_TQOBJECT(m_view), TQT_SLOT(roughTranslation()),actionCollection() ,"rough_translation"); - action = new KAction(i18n("&Catalog Manager..."),"catalogmanager", 0 , TQT_TQOBJECT(this), + action = new TDEAction(i18n("&Catalog Manager..."),"catalogmanager", 0 , TQT_TQOBJECT(this), TQT_SLOT(openCatalogManager()),actionCollection(), "open_catalog_manager"); - new KAction( i18n("Toggle Edit Mode"), 0, Key_Insert,TQT_TQOBJECT(this),TQT_SLOT(toggleEditMode()), actionCollection(), "toggle_insert_mode"); + new TDEAction( i18n("Toggle Edit Mode"), 0, Key_Insert,TQT_TQOBJECT(this),TQT_SLOT(toggleEditMode()), actionCollection(), "toggle_insert_mode"); - new KAction( i18n("&Word Count"), 0, TQT_TQOBJECT(m_view), TQT_SLOT(wordCount()), actionCollection(), "word_count"); + new TDEAction( i18n("&Word Count"), 0, TQT_TQOBJECT(m_view), TQT_SLOT(wordCount()), actionCollection(), "word_count"); // next, the settings menu createStandardStatusBarAction(); @@ -671,11 +671,11 @@ void KBabelMW::setupActions() setStandardToolBarMenuEnabled ( true ); - action = new KAction(i18n("&Stop Searching"), "stop",Key_Escape, TQT_TQOBJECT(m_view), + action = new TDEAction(i18n("&Stop Searching"), "stop",Key_Escape, TQT_TQOBJECT(m_view), TQT_SLOT(stopSearch()),actionCollection(), "stop_search"); action->setEnabled(false); - new KAction(i18n("&Gettext Info"), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("&Gettext Info"), 0, TQT_TQOBJECT(this), TQT_SLOT(gettextHelp()), actionCollection(), "help_gettext"); @@ -686,7 +686,7 @@ void KBabelMW::setupActions() action->setEnabled(false); // this action is now connected to dummySlot(), and later reconnected // to bmHandler after that object actually is created - new KAction(i18n("Clear Bookmarks"), 0, TQT_TQOBJECT(this), TQT_SLOT(dummySlot()), + new TDEAction(i18n("Clear Bookmarks"), 0, TQT_TQOBJECT(this), TQT_SLOT(dummySlot()), actionCollection(), "clear_bookmarks"); setupDynamicActions(); @@ -758,20 +758,20 @@ void KBabelMW::setupDynamicActions() // dynamic validation tools TQValueList<KDataToolInfo> tools = ToolAction::validationTools(); - TQPtrList<KAction> actions = ToolAction::dataToolActionList( + TQPtrList<TDEAction> actions = ToolAction::dataToolActionList( tools, TQT_TQOBJECT(m_view), TQT_SLOT(validateUsingTool( const KDataToolInfo &, const TQString & )), "validate", false, actionCollection() ); - KActionMenu* m_menu = new KActionMenu(i18n("&Validation"), actionCollection(), "dynamic_validation_tools"); + TDEActionMenu* m_menu = new TDEActionMenu(i18n("&Validation"), actionCollection(), "dynamic_validation_tools"); - KAction* ac = new KAction(i18n("Perform &All Checks"), CTRL+Key_E , TQT_TQOBJECT(m_view), + TDEAction* ac = new TDEAction(i18n("Perform &All Checks"), CTRL+Key_E , TQT_TQOBJECT(m_view), TQT_SLOT(checkAll()),actionCollection(), "check_all"); ac->setEnabled(false); m_menu->insert(ac); - m_menu->insert( new KActionSeparator() ); + m_menu->insert( new TDEActionSeparator() ); - ac = new KAction(i18n("C&heck Syntax"), CTRL+Key_T , TQT_TQOBJECT(m_view), + ac = new TDEAction(i18n("C&heck Syntax"), CTRL+Key_T , TQT_TQOBJECT(m_view), TQT_SLOT(checkSyntax()),actionCollection(), "check_syntax"); ac->setEnabled(false); m_menu->insert(ac); @@ -811,7 +811,7 @@ void KBabelMW::setupDynamicActions() } // insert tools - m_menu = new KActionMenu(i18n("&Modify"), actionCollection(), "dynamic_modify_tools"); + m_menu = new TDEActionMenu(i18n("&Modify"), actionCollection(), "dynamic_modify_tools"); for( ac = actions.first(); ac ; ac = actions.next() ) { m_menu->insert(ac); @@ -848,7 +848,7 @@ void KBabelMW::setupDynamicActions() "validate", true, actionCollection() ); // insert tools - m_menu = new KActionMenu(i18n("&Modify"), actionCollection(), "dynamic_modify_tools"); + m_menu = new TDEActionMenu(i18n("&Modify"), actionCollection(), "dynamic_modify_tools"); for( ac = actions.first(); ac ; ac = actions.next() ) { m_menu->insert(ac); @@ -1083,7 +1083,7 @@ void KBabelMW::fileSave_internal() else { // disable save - KAction* saveAction=(KAction*)actionCollection()->action( KStdAction::name( KStdAction::Save) ); + TDEAction* saveAction=(TDEAction*)actionCollection()->action( KStdAction::name( KStdAction::Save) ); saveAction->setEnabled(false); m_view->saveFile(); @@ -1263,7 +1263,7 @@ void KBabelMW::openCatalogManager() TQString url = ""; if( kapp->startServiceByDesktopName(prog,url, &result,&service)) { - KMessageBox::error(this, i18n("Unable to use KLauncher to start " + KMessageBox::error(this, i18n("Unable to use TDELauncher to start " "Catalog Manager. You should check the installation of TDE.\n" "Please start Catalog Manager manually.")); return; @@ -1281,8 +1281,8 @@ void KBabelMW::openCatalogManager() void KBabelMW::firstEntryDisplayed(bool firstEntry, bool firstForm) { - KAction* firstAction=(KAction*)actionCollection()->action(KStdAction::stdName(KStdAction::FirstPage)); - KAction* prevAction=(KAction*)actionCollection()->action("go_prev_entry"); + TDEAction* firstAction=(TDEAction*)actionCollection()->action(KStdAction::stdName(KStdAction::FirstPage)); + TDEAction* prevAction=(TDEAction*)actionCollection()->action("go_prev_entry"); firstAction->setEnabled(!firstEntry); prevAction->setEnabled(!(firstEntry && firstForm)); @@ -1291,8 +1291,8 @@ void KBabelMW::firstEntryDisplayed(bool firstEntry, bool firstForm) void KBabelMW::lastEntryDisplayed(bool lastEntry, bool lastForm) { - KAction* lastAction=(KAction*)actionCollection()->action(KStdAction::stdName(KStdAction::LastPage)); - KAction* nextAction=(KAction*)actionCollection()->action("go_next_entry"); + TDEAction* lastAction=(TDEAction*)actionCollection()->action(KStdAction::stdName(KStdAction::LastPage)); + TDEAction* nextAction=(TDEAction*)actionCollection()->action("go_next_entry"); lastAction->setEnabled(!lastEntry); nextAction->setEnabled(!(lastEntry && lastForm)); @@ -1323,7 +1323,7 @@ void KBabelMW::untranslatedDisplayed(bool flag) return; // do not allow fuzzy toggle for untranslated - KAction *action=actionCollection()->action("edit_toggle_fuzzy"); + TDEAction *action=actionCollection()->action("edit_toggle_fuzzy"); if(action) action->setEnabled(!flag); @@ -1445,26 +1445,26 @@ void KBabelMW::hasUntranslatedInFront(bool flag) void KBabelMW::hasErrorAfterwards(bool flag) { - KAction* action=actionCollection()->action("go_next_error"); + TDEAction* action=actionCollection()->action("go_next_error"); action->setEnabled(flag); } void KBabelMW::hasErrorInFront(bool flag) { - KAction* action=actionCollection()->action("go_prev_error"); + TDEAction* action=actionCollection()->action("go_prev_error"); action->setEnabled(flag); } void KBabelMW::enableBackHistory(bool on) { - KAction* action=actionCollection()->action("go_back_history"); + TDEAction* action=actionCollection()->action("go_back_history"); action->setEnabled(on); } void KBabelMW::enableForwardHistory(bool on) { - KAction* action=actionCollection()->action("go_forward_history"); + TDEAction* action=actionCollection()->action("go_forward_history"); action->setEnabled(on); } @@ -1519,7 +1519,7 @@ void KBabelMW::showModified(bool on) // display the text on the caption setCaption(m_view->catalog()->package(),on); - KAction *action=actionCollection()->action( + TDEAction *action=actionCollection()->action( KStdAction::stdName(KStdAction::Save)); action->setEnabled(on); @@ -1541,19 +1541,19 @@ void KBabelMW::enableDefaults(bool readOnly) void KBabelMW::enableUndo(bool on) { - KAction* action=actionCollection()->action(KStdAction::stdName(KStdAction::Undo)); + TDEAction* action=actionCollection()->action(KStdAction::stdName(KStdAction::Undo)); action->setEnabled(on); } void KBabelMW::enableRedo(bool on) { - KAction* action=actionCollection()->action(KStdAction::stdName(KStdAction::Redo)); + TDEAction* action=actionCollection()->action(KStdAction::stdName(KStdAction::Redo)); action->setEnabled(on); } void KBabelMW::enableStop(bool flag) { - KAction* action=(KAction*)actionCollection()->action("stop_search"); + TDEAction* action=(TDEAction*)actionCollection()->action("stop_search"); action->setEnabled(flag); } @@ -1771,7 +1771,7 @@ void KBabelMW::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 ); if (!def) diff --git a/kbabel/kbabel/kbabel.h b/kbabel/kbabel/kbabel.h index 7e6b4913..9d6b6bd4 100644 --- a/kbabel/kbabel/kbabel.h +++ b/kbabel/kbabel/kbabel.h @@ -49,8 +49,8 @@ #include "kbabelview.h" #include "kbproject.h" -class KAction; -class KRecentFilesAction; +class TDEAction; +class TDERecentFilesAction; class KLed; class KProgress; class TQHBox; @@ -293,16 +293,16 @@ private: // frequently used actions - KAction* a_unsetFuzzy; - KAction* a_prevFoU; - KAction* a_nextFoU; - KAction* a_prevFuzzy; - KAction* a_nextFuzzy; - KAction* a_prevUntrans; - KAction* a_nextUntrans; + TDEAction* a_unsetFuzzy; + TDEAction* a_prevFoU; + TDEAction* a_nextFoU; + TDEAction* a_prevFuzzy; + TDEAction* a_nextFuzzy; + TDEAction* a_prevUntrans; + TDEAction* a_nextUntrans; - KRecentFilesAction* a_recent; - KRecentFilesAction* a_recentprojects; + TDERecentFilesAction* a_recent; + TDERecentFilesAction* a_recentprojects; DictionaryMenu *dictMenu; DictionaryMenu *selectionDictMenu; diff --git a/kbabel/kbabel/kbabelview.cpp b/kbabel/kbabel/kbabelview.cpp index 8cf98335..5755a3e3 100644 --- a/kbabel/kbabel/kbabelview.cpp +++ b/kbabel/kbabel/kbabelview.cpp @@ -3460,12 +3460,12 @@ bool KBabelView::eventFilter( TQObject* object, TQEvent* event) gotoLast(); return true; } - else if( KShortcut(KKey(ke)) == KStdAccel::undo() ) + else if( TDEShortcut(KKey(ke)) == TDEStdAccel::undo() ) { undo(); return true; } - else if( KShortcut(KKey(ke)) == KStdAccel::redo() ) + else if( TDEShortcut(KKey(ke)) == TDEStdAccel::redo() ) { redo(); return true; diff --git a/kbabel/kbabel/kbabelview.h b/kbabel/kbabel/kbabelview.h index 28766458..b9b286ea 100644 --- a/kbabel/kbabel/kbabelview.h +++ b/kbabel/kbabel/kbabelview.h @@ -54,7 +54,7 @@ namespace KBabel class TQListBoxItem; class TQTextView; class TQTabWidget; -class KListBox; +class TDEListBox; class KSpell; class KSpellConfig; class KBabelDictBox; diff --git a/kbabel/kbabel/kbcataloglistview.cpp b/kbabel/kbabel/kbcataloglistview.cpp index aace2c10..d05f135c 100644 --- a/kbabel/kbabel/kbcataloglistview.cpp +++ b/kbabel/kbabel/kbcataloglistview.cpp @@ -40,7 +40,7 @@ KBCatalogListView::KBCatalogListView(KBCatalog* catalog, TQWidget *parent, KBabe m_catalog= catalog; TQVBoxLayout* layout=new TQVBoxLayout(this); - m_listview = new KListView(this, "catalogListView"); + m_listview = new TDEListView(this, "catalogListView"); m_listview->addColumn(i18n("Id")); m_listview->addColumn(i18n("Original String")); m_listview->addColumn(i18n("Translated String")); diff --git a/kbabel/kbabel/kbcataloglistview.h b/kbabel/kbabel/kbcataloglistview.h index c1fcd005..92f08603 100644 --- a/kbabel/kbabel/kbcataloglistview.h +++ b/kbabel/kbabel/kbcataloglistview.h @@ -41,7 +41,7 @@ namespace KBabel{ class KBabelMW; class KBCatalog; -class KListView; +class TDEListView; /** @@ -72,7 +72,7 @@ public slots: void msgstrChanged(const TQString&); private: - KListView * m_listview; + TDEListView * m_listview; KBCatalog* m_catalog; TQPtrVector<KBCatalogListViewItem>* m_items; diff --git a/kbabel/kbabel/kbcataloglistviewitem.cpp b/kbabel/kbabel/kbcataloglistviewitem.cpp index 4bbc3049..92eb158b 100644 --- a/kbabel/kbabel/kbcataloglistviewitem.cpp +++ b/kbabel/kbabel/kbcataloglistviewitem.cpp @@ -23,7 +23,7 @@ #include "kbcataloglistviewitem.h" #include <assert.h> -KBCatalogListViewItem::KBCatalogListViewItem(KListView* lv, KListViewItem* parent, uint id, TQString msgid, TQString msgstr) +KBCatalogListViewItem::KBCatalogListViewItem(TDEListView* lv, TDEListViewItem* parent, uint id, TQString msgid, TQString msgstr) : Super(lv, parent, "","",""), m_id(id), m_msgid(msgid), m_msgstr(msgstr) { setText(0,TQString::number(id)); diff --git a/kbabel/kbabel/kbcataloglistviewitem.h b/kbabel/kbabel/kbcataloglistviewitem.h index 4a24c159..89c0e859 100644 --- a/kbabel/kbabel/kbcataloglistviewitem.h +++ b/kbabel/kbabel/kbcataloglistviewitem.h @@ -30,11 +30,11 @@ /** @author */ -class KBCatalogListViewItem : public KListViewItem +class KBCatalogListViewItem : public TDEListViewItem { - typedef KListViewItem Super; + typedef TDEListViewItem Super; public: - KBCatalogListViewItem(KListView* lv, KListViewItem* parent, uint id, TQString msgid, TQString msgstr); + KBCatalogListViewItem(TDEListView* lv, TDEListViewItem* parent, uint id, TQString msgid, TQString msgstr); ~KBCatalogListViewItem(); diff --git a/kbabel/kbabel/main.cpp b/kbabel/kbabel/main.cpp index 1ecea9ed..2ed2cba1 100644 --- a/kbabel/kbabel/main.cpp +++ b/kbabel/kbabel/main.cpp @@ -246,9 +246,9 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int } else { - KMainWindow *mw = 0; - if(KMainWindow::memberList && !KMainWindow::memberList->isEmpty()) - mw=KMainWindow::memberList->first(); + TDEMainWindow *mw = 0; + if(TDEMainWindow::memberList && !TDEMainWindow::memberList->isEmpty()) + mw=TDEMainWindow::memberList->first(); // first, try to lookup correct winid while( mw ) { @@ -263,7 +263,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int return ; } - mw = KMainWindow::memberList->next(); + mw = TDEMainWindow::memberList->next(); } // now, the empty window @@ -282,8 +282,8 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int return; } - if(KMainWindow::memberList && !KMainWindow::memberList->isEmpty()) - mw=KMainWindow::memberList->first(); + if(TDEMainWindow::memberList && !TDEMainWindow::memberList->isEmpty()) + mw=TDEMainWindow::memberList->first(); while( mw ) { if( mw->inherits("KBabelMW") && static_cast<KBabelMW*>(mw)->project()==project) @@ -297,7 +297,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int return ; } - mw = KMainWindow::memberList->next(); + mw = TDEMainWindow::memberList->next(); } if( !mw ) @@ -335,9 +335,9 @@ void KBabelInterface::openTemplate(TQCString openFilename, TQCString saveFilenam } else { - KMainWindow *mw = 0; - if(KMainWindow::memberList && !KMainWindow::memberList->isEmpty()) - mw=KMainWindow::memberList->first(); + TDEMainWindow *mw = 0; + if(TDEMainWindow::memberList && !TDEMainWindow::memberList->isEmpty()) + mw=TDEMainWindow::memberList->first(); if(mw && mw->inherits("KBabelMW") && static_cast<KBabelMW*>(mw)->project()==project) { diff --git a/kbabel/kbabel/taglistview.cpp b/kbabel/kbabel/taglistview.cpp index 11d0905e..0fdd8183 100644 --- a/kbabel/kbabel/taglistview.cpp +++ b/kbabel/kbabel/taglistview.cpp @@ -50,7 +50,7 @@ TagListView::TagListView(KBCatalog* catalog,TQWidget *parent, Project::Ptr proje TQVBoxLayout* layout = new TQVBoxLayout( this ); layout->setResizeMode( TQLayout::Minimum ); - _tagBox = new KListBox (this, "taglist textview"); + _tagBox = new TDEListBox (this, "taglist textview"); layout->addWidget (_tagBox); diff --git a/kbabel/kbabel/taglistview.h b/kbabel/kbabel/taglistview.h index d8c8dd11..c936435d 100644 --- a/kbabel/kbabel/taglistview.h +++ b/kbabel/kbabel/taglistview.h @@ -35,7 +35,7 @@ #include "kbcatalogview.h" -class KListBox; +class TDEListBox; class TagListView : public KBCatalogView { @@ -56,7 +56,7 @@ signals: void signalTagSelected (const TQString& tag); private: - KListBox* _tagBox; + TDEListBox* _tagBox; }; #endif // TAGLISTVIEW_H diff --git a/kbabel/kbabeldict/dictchooser.cpp b/kbabel/kbabeldict/dictchooser.cpp index a7803320..3ac386e5 100644 --- a/kbabel/kbabeldict/dictchooser.cpp +++ b/kbabel/kbabeldict/dictchooser.cpp @@ -62,7 +62,7 @@ DictChooser::DictChooser(KBabelDictBox*b, TQStringList selected label = new TQLabel(i18n("dictionary to use","Use:"),this); layout->addWidget(label,0,2); - unselectedBox = new KListBox(this,"unselectedBox"); + unselectedBox = new TDEListBox(this,"unselectedBox"); layout->addWidget(unselectedBox,1,0); @@ -76,7 +76,7 @@ DictChooser::DictChooser(KBabelDictBox*b, TQStringList selected bLayout->addStretch(); layout->addLayout(bLayout,1,1); - selectedBox = new KListBox(this,"selectedBox"); + selectedBox = new TDEListBox(this,"selectedBox"); layout->addWidget(selectedBox,1,2); diff --git a/kbabel/kbabeldict/dictchooser.h b/kbabel/kbabeldict/dictchooser.h index b2f80240..37cc0e28 100644 --- a/kbabel/kbabeldict/dictchooser.h +++ b/kbabel/kbabeldict/dictchooser.h @@ -40,7 +40,7 @@ #include <tqwidget.h> #include <kbabeldictbox.h> -class KListBox; +class TDEListBox; class KTempFile; class TQPushButton; @@ -80,8 +80,8 @@ private: KBabelDictBox* box; TQPtrList<ModuleInfo> dictList; - KListBox *selectedBox; - KListBox *unselectedBox; + TDEListBox *selectedBox; + TDEListBox *unselectedBox; TQPushButton *selectBtn; TQPushButton *unselectBtn; diff --git a/kbabel/kbabeldict/dictionarymenu.cpp b/kbabel/kbabeldict/dictionarymenu.cpp index 759468c9..57b7d9d7 100644 --- a/kbabel/kbabeldict/dictionarymenu.cpp +++ b/kbabel/kbabeldict/dictionarymenu.cpp @@ -38,7 +38,7 @@ #include <tqsignalmapper.h> -DictionaryMenu::DictionaryMenu(KPopupMenu *popupMenu, KActionCollection *collection +DictionaryMenu::DictionaryMenu(TDEPopupMenu *popupMenu, TDEActionCollection *collection , TQObject *parent) : TQObject(parent, "dictionarymenu") , popup(popupMenu) @@ -89,7 +89,7 @@ void DictionaryMenu::add(const TQString& name, const TQString& moduleId) { if(popup) { - KAction* dictionaryAction = new KAction( name, 0, dictionaryMapper, TQT_SLOT(map()), actionCollection, moduleId.utf8() ); + TDEAction* dictionaryAction = new TDEAction( name, 0, dictionaryMapper, TQT_SLOT(map()), actionCollection, moduleId.utf8() ); uint id = maxId++; dictionaryAction->plug(popup, id); @@ -114,9 +114,9 @@ void DictionaryMenu::add(const TQString& n, const TQString& moduleId { keyString=key.arg(accel2id.count()+1); } - KShortcut k(keyString); + TDEShortcut k(keyString); - KAction* dictionaryAction = new KAction( name, k, dictionaryMapper, TQT_SLOT(map()), actionCollection, key.arg(moduleId).utf8() ); + TDEAction* dictionaryAction = new TDEAction( name, k, dictionaryMapper, TQT_SLOT(map()), actionCollection, key.arg(moduleId).utf8() ); uint id = maxId++; dictionaryAction->plug(popup,id); diff --git a/kbabel/kbabeldict/dictionarymenu.h b/kbabel/kbabeldict/dictionarymenu.h index 913ef79a..26729c7e 100644 --- a/kbabel/kbabeldict/dictionarymenu.h +++ b/kbabel/kbabeldict/dictionarymenu.h @@ -40,8 +40,8 @@ #include <kdemacros.h> class TQSignalMapper; -class KPopupMenu; -class KActionCollection; +class TDEPopupMenu; +class TDEActionCollection; class KDE_EXPORT DictionaryMenu : public TQObject { @@ -49,7 +49,7 @@ class KDE_EXPORT DictionaryMenu : public TQObject public: - DictionaryMenu(KPopupMenu *menu, KActionCollection *collection, TQObject *parent=0); + DictionaryMenu(TDEPopupMenu *menu, TDEActionCollection *collection, TQObject *parent=0); ~DictionaryMenu(); void add(const TQString& name,const TQString& id); @@ -69,8 +69,8 @@ private slots: void activated(int); private: - TQGuardedPtr<KPopupMenu> popup; - TQGuardedPtr<KActionCollection> actionCollection; + TQGuardedPtr<TDEPopupMenu> popup; + TQGuardedPtr<TDEActionCollection> actionCollection; TQIntDict<TQString> num2id; TQIntDict<TQString> accel2id; TQSignalMapper* dictionaryMapper; diff --git a/kbabel/kbabeldict/kbabeldictbox.cpp b/kbabel/kbabeldict/kbabeldictbox.cpp index b56f38e3..d62cb176 100644 --- a/kbabel/kbabeldict/kbabeldictbox.cpp +++ b/kbabel/kbabeldict/kbabeldictbox.cpp @@ -282,7 +282,7 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent, const char* name, WFlags fl ) vbox->addWidget(translationView); viewContainer->setMinimumSize(1,1); - resultListView = new KListView( resultSplitter, "resultListView" ); + resultListView = new TDEListView( resultSplitter, "resultListView" ); resultListView->setMinimumSize(1,1); resultListView->addColumn( i18n( "Score" ) ); resultListView->addColumn( i18n( "Original" ) ); @@ -296,9 +296,9 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent, const char* name, WFlags fl ) connect(resultListView, TQT_SIGNAL(returnPressed(TQListViewItem *)) , this, TQT_SLOT(editFile())); connect(resultListView - , TQT_SIGNAL(contextMenu(KListView *,TQListViewItem *,const TQPoint&)) + , TQT_SIGNAL(contextMenu(TDEListView *,TQListViewItem *,const TQPoint&)) , this - , TQT_SLOT(showContextMenu(KListView *,TQListViewItem *,const TQPoint&))); + , TQT_SLOT(showContextMenu(TDEListView *,TQListViewItem *,const TQPoint&))); resultSplitter->setResizeMode(viewContainer,TQSplitter::KeepSize); TQValueList<int> sizes; @@ -1717,7 +1717,7 @@ void KBabelDictBox::editFile() } } -void KBabelDictBox::showContextMenu(KListView *,TQListViewItem *,const TQPoint& p) +void KBabelDictBox::showContextMenu(TDEListView *,TQListViewItem *,const TQPoint& p) { if(rmbPopup) { diff --git a/kbabel/kbabeldict/kbabeldictbox.h b/kbabel/kbabeldict/kbabeldictbox.h index 5f6fc885..7a71eb06 100644 --- a/kbabel/kbabeldict/kbabeldictbox.h +++ b/kbabel/kbabeldict/kbabeldictbox.h @@ -42,7 +42,7 @@ #include <tqptrlist.h> #include <tqstringlist.h> -class KListView; +class TDEListView; class TQLabel; class TQListViewItem; class TQPopupMenu; @@ -223,7 +223,7 @@ protected slots: void showListOnly(); void clearModuleResults(); void editFile(); - void showContextMenu(KListView *, TQListViewItem *, const TQPoint&); + void showContextMenu(TDEListView *, TQListViewItem *, const TQPoint&); /** * This slots gets connected to a SearchEngine's searchStopped() signal, @@ -270,7 +270,7 @@ private: TQTextView *origView; TQTextView *translationView; TQSplitter *viewContainer; - KListView *resultListView; + TDEListView *resultListView; TQSplitter *resultSplitter; TQToolButton *listButton; |