1 files changed, 37 insertions, 34 deletions

diff --git a/tdefilereplace/tdefilereplacepart.cpp b/tdefilereplace/tdefilereplacepart.cpp
index 766366f..c193573 100644
--- a/tdefilereplace/tdefilereplacepart.cpp
+++ b/tdefilereplace/tdefilereplacepart.cpp
@@ -102,7 +102,7 @@ TDEFileReplacePart::~TDEFileReplacePart()
 void TDEFileReplacePart::slotSetNewParameters()
 {
   launchNewProjectDialog(KURL());
-  m_view->changeView(m_option->m_searchingOnlyMode);
+  m_view->changeViews(m_option->m_searchingOnlyMode);
   emit setStatusBarText(i18n("Ready."));
 }
 
@@ -388,28 +388,28 @@ void TDEFileReplacePart::reportBug()
 
 void TDEFileReplacePart::updateGUI()
 {
-  TDEListView* rv = m_view->getResultsView(),
-           * sv = m_view->getStringsView();
+  TDEListView *rv = m_view->getResultsView();
+  TDEListView *sv = m_view->getStringsView();
 
-  bool hasItems = (sv->firstChild() != 0),
-       searchOnlyMode = m_option->m_searchingOnlyMode;
+  bool hasResults = (rv->firstChild() != 0);
+  bool hasStrings = (sv->firstChild() != 0);
+  bool searchOnlyMode = m_option->m_searchingOnlyMode;
 
   // File
   actionCollection()->action("new_project")->setEnabled(true);
-  actionCollection()->action("search")->setEnabled(hasItems && searchOnlyMode);
-  actionCollection()->action("file_simulate")->setEnabled(hasItems && !searchOnlyMode);
-  actionCollection()->action("replace")->setEnabled(hasItems && !searchOnlyMode);
-  actionCollection()->action("save_results")->setEnabled(hasItems);
+  actionCollection()->action("search")->setEnabled(hasStrings && searchOnlyMode);
+  actionCollection()->action("file_simulate")->setEnabled(hasStrings && !searchOnlyMode);
+  actionCollection()->action("replace")->setEnabled(hasStrings && !searchOnlyMode);
   actionCollection()->action("stop")->setEnabled(false);
 
   // Strings
   actionCollection()->action("strings_add")->setEnabled(true);
-  actionCollection()->action("strings_del")->setEnabled(hasItems);
-  actionCollection()->action("strings_empty")->setEnabled(hasItems);
-  actionCollection()->action("strings_save")->setEnabled(hasItems);
+  actionCollection()->action("strings_del")->setEnabled(hasStrings);
+  actionCollection()->action("strings_empty")->setEnabled(hasStrings);
+  actionCollection()->action("strings_save")->setEnabled(hasStrings);
   actionCollection()->action("strings_load")->setEnabled(true);
-  actionCollection()->action("strings_invert")->setEnabled(hasItems && !searchOnlyMode);
-  actionCollection()->action("strings_invert_all")->setEnabled(hasItems && !searchOnlyMode);
+  actionCollection()->action("strings_invert")->setEnabled(hasStrings && !searchOnlyMode);
+  actionCollection()->action("strings_invert_all")->setEnabled(hasStrings && !searchOnlyMode);
 
   // Options
   actionCollection()->action("options_recursive")->setEnabled(true);
@@ -419,34 +419,35 @@ void TDEFileReplacePart::updateGUI()
   actionCollection()->action("options_regularexpressions")->setEnabled(true);
   actionCollection()->action("configure_tdefilereplace")->setEnabled(true);
 
-  hasItems = (rv->firstChild() != 0);
-
   // Results
-  actionCollection()->action("results_infos")->setEnabled(hasItems);
-  actionCollection()->action("results_openfile")->setEnabled(hasItems);
-  actionCollection()->action("results_openfilewith")->setEnabled(hasItems);
+  actionCollection()->action("results_infos")->setEnabled(hasResults);
+  actionCollection()->action("results_openfile")->setEnabled(hasResults);
+  actionCollection()->action("results_openfilewith")->setEnabled(hasResults);
   if (actionCollection()->action("results_editfile"))
   {
-      actionCollection()->action("results_editfile")->setEnabled(hasItems);
+      actionCollection()->action("results_editfile")->setEnabled(hasResults);
   }
-  actionCollection()->action("results_opendir")->setEnabled(hasItems);
-  actionCollection()->action("results_removeentry")->setEnabled(hasItems);
-  actionCollection()->action("results_delete")->setEnabled(hasItems);
-  actionCollection()->action("results_treeexpand")->setEnabled(hasItems);
-  actionCollection()->action("results_treereduce")->setEnabled(hasItems);
+  actionCollection()->action("results_opendir")->setEnabled(hasResults);
+  actionCollection()->action("results_removeentry")->setEnabled(hasResults);
+  actionCollection()->action("results_delete")->setEnabled(hasResults);
+  actionCollection()->action("results_treeexpand")->setEnabled(hasResults);
+  actionCollection()->action("results_treereduce")->setEnabled(hasResults);
+  actionCollection()->action("results_create_report")->setEnabled(hasResults);
+  actionCollection()->action("results_save")->setEnabled(hasResults);
+  actionCollection()->action("results_load")->setEnabled(true);
 
   // Updates menus and toolbar
-  ((TDEToggleAction* ) actionCollection()->action("options_recursive"))->setChecked(m_option->m_recursive);
-  ((TDEToggleAction* ) actionCollection()->action("options_backup"))->setChecked(m_option->m_backup && !searchOnlyMode);
-  ((TDEToggleAction* ) actionCollection()->action("options_case"))->setChecked(m_option->m_caseSensitive);
-  ((TDEToggleAction* ) actionCollection()->action("options_var"))->setChecked(m_option->m_variables && !searchOnlyMode);
-  ((TDEToggleAction* ) actionCollection()->action("options_regularexpressions"))->setChecked(m_option->m_regularExpressions);
+  ((TDEToggleAction*) actionCollection()->action("options_recursive"))->setChecked(m_option->m_recursive);
+  ((TDEToggleAction*) actionCollection()->action("options_backup"))->setChecked(m_option->m_backup && !searchOnlyMode);
+  ((TDEToggleAction*) actionCollection()->action("options_case"))->setChecked(m_option->m_caseSensitive);
+  ((TDEToggleAction*) actionCollection()->action("options_var"))->setChecked(m_option->m_variables && !searchOnlyMode);
+  ((TDEToggleAction*) actionCollection()->action("options_regularexpressions"))->setChecked(m_option->m_regularExpressions);
 }
 
 //PUBLIC METHODS
 TDEAboutData* TDEFileReplacePart::createAboutData()
 {
-  TDEAboutData * aboutData = new TDEAboutData("tdefilereplacepart",
+  TDEAboutData *aboutData = new TDEAboutData("tdefilereplacepart",
                                           I18N_NOOP("TDEFileReplacePart"),
                                           KFR_VERSION,
                                           I18N_NOOP( "Batch search and replace tool."),
@@ -513,7 +514,9 @@ void TDEFileReplacePart::initGUI()
   (void)new TDEAction(i18n("S&imulate"), "filesimulate", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSimulatingOperation()), actionCollection(), "file_simulate");
   (void)new TDEAction(i18n("&Replace"),  "filereplace", 0, TQT_TQOBJECT(this), TQT_SLOT(slotReplacingOperation()), actionCollection(), "replace");
   (void)new TDEAction(i18n("Sto&p"), "process-stop", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStop()), actionCollection(), "stop");
-  (void)new TDEAction(i18n("Cre&ate Report File..."), "document-save-as", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCreateReport()), actionCollection(), "save_results");
+  (void)new TDEAction(i18n("Cre&ate Report File..."), "document-save-as", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCreateReport()), actionCollection(), "results_create_report");
+  (void)new TDEAction(i18n("&Save Results List to File..."), "document-save-as", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultSave()), actionCollection(), "results_save");
+  (void)new TDEAction(i18n("&Load Results List From File..."), "unsortedList", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultLoad()), actionCollection(), "results_load");
 
   // Strings
   (void)new TDEAction(i18n("&Add String..."), "editadd", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotStringsAdd()), actionCollection(), "strings_add");
@@ -1392,7 +1395,7 @@ void TDEFileReplacePart::search(const TQString& currentDir, const TQString& file
               else
                 capturedText = line.mid(pos,strKey.length());
 
-	      msg = i18n(" Line:%2, Col:%3 - \"%1\"").arg(capturedText).arg(TQString::number(lineNumber,10)).arg(TQString::number(columnNumber,10));
+	      msg = i18n("Line:%2, Col:%3 - \"%1\"").arg(capturedText).arg(TQString::number(lineNumber,10)).arg(TQString::number(columnNumber,10));
               tempItem->setMultiLinesEnabled(true);
               tempItem->setText(0,msg);
               occurrence = 1;
@@ -1432,7 +1435,7 @@ void TDEFileReplacePart::search(const TQString& currentDir, const TQString& file
                   pos = line.find(strKey,pos+strKey.length());
                 }
 
-              msg = i18n(" Line:%2, Col:%3 - \"%1\"").arg(capturedText).arg(TQString::number(lineNumber,10)).arg(TQString::number(columnNumber,10));
+              msg = i18n("Line:%2, Col:%3 - \"%1\"").arg(capturedText).arg(TQString::number(lineNumber,10)).arg(TQString::number(columnNumber,10));
 
               if(!item)
                  item = new TDEListViewItem(rv);