mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 21:53:51 +00:00
Code Issues Releases Wiki Activity

replaced State_Compiling (not requried anymore) with State_Merging

Browse source
This commit is contained in:
Marc Zinnschlag 2015-07-30 11:49:24 +02:00
parent d310753e0f
commit 6a9218ee07
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/opencs/model/doc/state.hpp
View file

@ -12,7 +12,7 @@ namespace CSMDoc
State_Saving = 16, State_Saving = 16,
State_Verifying = 32, State_Verifying = 32,
State_Compiling = 64, // not implemented yet State_Merging = 64,
State_Searching = 128, State_Searching = 128,
State_Loading = 256 // pseudo-state; can not be encountered in a loaded document State_Loading = 256 // pseudo-state; can not be encountered in a loaded document
}; };

3
apps/opencs/view/doc/operation.cpp
View file

@ -19,6 +19,7 @@ void CSVDoc::Operation::updateLabel (int threads)
case CSMDoc::State_Saving: name = "saving"; break; case CSMDoc::State_Saving: name = "saving"; break;
case CSMDoc::State_Verifying: name = "verifying"; break; case CSMDoc::State_Verifying: name = "verifying"; break;
case CSMDoc::State_Searching: name = "searching"; break; case CSMDoc::State_Searching: name = "searching"; break;
case CSMDoc::State_Merging: name = "merging"; break;
} }
std::ostringstream stream; std::ostringstream stream;
@ -122,7 +123,7 @@ void CSVDoc::Operation::setBarColor (int type)
bottomColor = "#9ECB2D"; //green gloss bottomColor = "#9ECB2D"; //green gloss
break; break;
case CSMDoc::State_Compiling: case CSMDoc::State_Merging:
topColor = "#F3E2C7"; topColor = "#F3E2C7";
midTopColor = "#C19E67"; midTopColor = "#C19E67";

1
apps/opencs/view/doc/view.cpp
View file

@ -471,6 +471,7 @@ void CSVDoc::View::updateDocumentState()
static const int operations[] = static const int operations[] =
{ {
CSMDoc::State_Saving, CSMDoc::State_Verifying, CSMDoc::State_Searching, CSMDoc::State_Saving, CSMDoc::State_Verifying, CSMDoc::State_Searching,
CSMDoc::State_Merging,
-1 // end marker -1 // end marker
}; };