From 6fb658daa4b31c93643b34a96361b0033f821a52 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Thu, 30 Jul 2015 11:49:24 +0200
Subject: [PATCH] replaced State_Compiling (not requried anymore) with
 State_Merging

(cherry picked from commit 6a9218ee07a81c9ca56faf8661c9d38e84ba3028)
---
 apps/opencs/model/doc/state.hpp    | 2 +-
 apps/opencs/view/doc/operation.cpp | 3 ++-
 apps/opencs/view/doc/view.cpp      | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/opencs/model/doc/state.hpp b/apps/opencs/model/doc/state.hpp
index 78f4681010..7352b4b999 100644
--- a/apps/opencs/model/doc/state.hpp
+++ b/apps/opencs/model/doc/state.hpp
@@ -12,7 +12,7 @@ namespace CSMDoc
 
         State_Saving = 16,
         State_Verifying = 32,
-        State_Compiling = 64, // not implemented yet
+        State_Merging = 64,
         State_Searching = 128,
         State_Loading = 256   // pseudo-state; can not be encountered in a loaded document
     };
diff --git a/apps/opencs/view/doc/operation.cpp b/apps/opencs/view/doc/operation.cpp
index 95cbf012d6..e5c1e7b89e 100644
--- a/apps/opencs/view/doc/operation.cpp
+++ b/apps/opencs/view/doc/operation.cpp
@@ -19,6 +19,7 @@ void CSVDoc::Operation::updateLabel (int threads)
             case CSMDoc::State_Saving: name = "saving"; break;
             case CSMDoc::State_Verifying: name = "verifying"; break;
             case CSMDoc::State_Searching: name = "searching"; break;
+            case CSMDoc::State_Merging: name = "merging"; break;
         }
 
         std::ostringstream stream;
@@ -122,7 +123,7 @@ void CSVDoc::Operation::setBarColor (int type)
         bottomColor = "#9ECB2D";  //green gloss
         break;
 
-    case CSMDoc::State_Compiling:
+    case CSMDoc::State_Merging:
 
         topColor = "#F3E2C7";
         midTopColor = "#C19E67";
diff --git a/apps/opencs/view/doc/view.cpp b/apps/opencs/view/doc/view.cpp
index 173a78e9de..bf92ccf28a 100644
--- a/apps/opencs/view/doc/view.cpp
+++ b/apps/opencs/view/doc/view.cpp
@@ -510,6 +510,7 @@ void CSVDoc::View::updateDocumentState()
     static const int operations[] =
     {
         CSMDoc::State_Saving, CSMDoc::State_Verifying, CSMDoc::State_Searching,
+        CSMDoc::State_Merging,
         -1 // end marker
     };