ECTL_GETINFO: в перечисление EDITOR_OPTIONS добавлены флаги EOPT_SHOW…

…TITLEBAR и EOPT_SHOWKEYBAR.
FarGroup · Mar 21, 2016 · e6e544f · e6e544f
1 parent 3192320
commit e6e544f
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 3 deletions.
diff --git a/enc/enc_rus3.work/meta/structures/editorinfo.html b/enc/enc_rus3.work/meta/structures/editorinfo.html
@@ -116,6 +116,10 @@ <h1>EditorInfo</h1>
     <tr class="cont"><td class="cont" width="40%"><a name="EOPT_SHOWLINEBREAK">EOPT_SHOWLINEBREAK</a></td>
     <td class="cont" width="60%">Âêëþ÷åíà îïöèÿ &quot;Ïðîáåëüíûå ñèìâîëû&quot; â òðåòüåì ðåæèìå [?].<br>
     Ýòîò ïàðàìåòð ìîæíî èçìåíèòü èñïîëüçóÿ êîìàíäó <a href="../service_functions/editorcontrol.html#ECTL_SETPARAM">ECTL_SETPARAM</a> (<a href="editorsetparameter.html#ESPT_SHOWWHITESPACE">ESPT_SHOWWHITESPACE</a>).</td></tr>
+    <tr class="cont"><td class="cont" width="40%"><a name="EOPT_SHOWTITLEBAR">EOPT_SHOWTITLEBAR</a></td>
+    <td class="cont" width="60%">Ïîêàçàíà ñòàòóñíàÿ ñòðîêà.<br>
+    <tr class="cont"><td class="cont" width="40%"><a name="EOPT_SHOWKEYBAR">EOPT_SHOWKEYBAR</a></td>
+    <td class="cont" width="60%">Ïîêàçàíà ëèíåéêà ôóíêöèîíàëüíûõ êëàâèø.<br>
     </table>
     </div>
   <div class=dfn>TabSize</div>

diff --git a/far/changelog b/far/changelog
@@ -1,4 +1,8 @@
-drkns 21.03.2016 15:31:02 +0200 - build 4586
+shmuel 21.03.2016 16:05:35 +0200 - build 4587
+
+1. ECTL_GETINFO: в перечисление EDITOR_OPTIONS добавлены флаги EOPT_SHOWTITLEBAR и EOPT_SHOWKEYBAR.
+
+drkns 21.03.2016 15:31:02 +0200 - build 4586
 
 1. Продолжение 4584.
 

diff --git a/far/editor.cpp b/far/editor.cpp
@@ -5696,6 +5696,12 @@ int Editor::EditorControl(int Command, intptr_t Param1, void *Param2)
 						Info->Options|=EOPT_SHOWLINEBREAK;
 				}
 
+				if (Global->Opt->EdOpt.ShowTitleBar)
+					Info->Options|=EOPT_SHOWTITLEBAR;
+
+				if (Global->Opt->EdOpt.ShowKeyBar)
+					Info->Options|=EOPT_SHOWKEYBAR;
+
 				Info->TabSize=EdOpt.TabSize;
 				Info->BookmarkCount=BOOKMARK_COUNT;
 				Info->SessionBookmarkCount=GetSessionBookmarks(nullptr);
@@ -7038,7 +7044,7 @@ void Editor::SetCacheParams(EditorPosCache &pc, bool count_bom)
 			{
 				TotalSize += SaveStr.size();
 			}
-			
+
 			TotalSize += wcslen(EndSeq);
 
 			if (static_cast<int>(TotalSize) > StartChar)

diff --git a/far/plugin.hpp b/far/plugin.hpp
@@ -1701,6 +1701,8 @@ enum EDITOR_OPTIONS
 	EOPT_SHOWWHITESPACE    = 0x00000100,
 	EOPT_BOM               = 0x00000200,
 	EOPT_SHOWLINEBREAK     = 0x00000400,
+	EOPT_SHOWTITLEBAR      = 0x00000800,
+	EOPT_SHOWKEYBAR        = 0x00001000,
 };
 
 

diff --git a/far/vbuild.m4 b/far/vbuild.m4
@@ -1 +1 @@
-m4_define(BUILD,4586)m4_dnl
+m4_define(BUILD,4587)m4_dnl