find/replace kind of working

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@299 0fc631ac-6414-0410-93d0-97cfa31319b6

src/gui/control/card_editor.cpp

@@ -12,6 +12,7 @@
 #include <data/field.hpp>
 #include <data/stylesheet.hpp>
 #include <data/settings.hpp>
+#include <util/find_replace.hpp>
 #include <wx/caret.h>
 
 DECLARE_TYPEOF_COLLECTION(ValueViewerP);
@@ -133,6 +134,22 @@ void DataEditor::onInit() {
 	current_viewer = nullptr;
 	current_editor = nullptr;
 }
+// ----------------------------------------------------------------------------- : Search / replace
+
+bool DataEditor::search(FindInfo& find, bool from_start) {
+	bool include = from_start;
+	for (size_t i = 0 ; i < by_tab_index.size() ; ++i) {
+		ValueViewer& viewer = *by_tab_index[find.forward() ? i : by_tab_index.size() - i - 1];
+		if (&viewer == current_viewer) include = true;
+		if (include) {
+			ValueEditor* editor = viewer.getEditor();
+			if (editor && editor->search(find, from_start || &viewer != current_viewer)) {
+				return true; // done
+			}
+		}
+	}
+	return false; // not done
+}
 
 // ----------------------------------------------------------------------------- : Clipboard & Formatting
 

src/gui/control/card_editor.hpp

@@ -66,7 +66,7 @@ class DataEditor : public CardViewer {
 	/** If from_start == false: searches only from the current selection onward (or backward)
 	 *  If from_start == true:  searches everything
 	 *
-	 *  Returns true when more searching is needed.
+	 *  Returns true if we are done and searching should be ended.
 	 */
 	bool search(FindInfo& find, bool from_start);
 	

src/gui/control/card_list.hpp

@@ -69,11 +69,12 @@ class CardListBase : public ItemList, public SetView {
 	virtual void onAction(const Action&, bool undone);
 	
 	// --------------------------------------------------- : The cards
+  public:
+	/// Return the card at the given position in the sorted card list
+	inline CardP getCard(long pos) const { return static_pointer_cast<Card>(getItem(pos)); }
   protected:
 	/// Get a list of all cards
 	virtual void getItems(vector<VoidP>& out) const;
-	/// Return the card at the given position in the sorted card list
-	inline CardP getCard(long pos) const { return static_pointer_cast<Card>(getItem(pos)); }
 	
 	/// Rebuild the card list (clear all vectors and fill them again)
 	void rebuild();