#3490, #3491, folder shortcuts refactoring

FarGroup · Sep 14, 2017 · b413200 · b413200
1 parent cec3d40
commit b413200
Show file tree

Hide file tree

Showing 10 changed files with 344 additions and 381 deletions.
diff --git a/far/changelog b/far/changelog
@@ -1,3 +1,11 @@
+drkns 15.09.2017 00:48:00 +0100 - build 5030
+
+1. 0003490: Падение при нажатии F4 в пустом подменю
+
+2. 0003491: Нелогичное создание подменю после отменённого редактирования
+
+3. Folder shortcuts в целом упрощён и частично переделан.
+
 drkns 13.09.2017 20:19:28 +0100 - build 5029
 
 1. Откат 5027.2 и 5028.1.

diff --git a/far/clipboard.cpp b/far/clipboard.cpp
@@ -253,7 +253,7 @@ class internal_clipboard: public clipboard, public singleton<internal_clipboard>
 //-----------------------------------------------------------------------------
 static thread_local clipboard* OverridenInternalClipboard;
 
-void clipboard_restorer::operator()(clipboard* Clip) const
+void clipboard_restorer::operator()(const clipboard* Clip) const
 {
 	OverridenInternalClipboard = nullptr;
 	delete Clip;
@@ -492,4 +492,3 @@ bool CopyData(const clipboard_accessor& From, const clipboard_accessor& To)
 
 	return false;
 }
-
diff --git a/far/clipboard.hpp b/far/clipboard.hpp
@@ -108,7 +108,7 @@ bool CopyData(const clipboard_accessor& From, const clipboard_accessor& To);
 
 struct clipboard_restorer
 {
-	void operator()(clipboard* Clip) const;
+	void operator()(const clipboard* Clip) const;
 };
 
 std::unique_ptr<clipboard, clipboard_restorer> OverrideClipboard();

diff --git a/far/far.vc14.sln b/far/far.vc14.sln
@@ -1,9 +1,9 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.21730.1
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "far", "far.vcxproj", "{62F794C9-5F4C-40F6-B358-5DC1A9D6D2CB}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Far", "far.vcxproj", "{62F794C9-5F4C-40F6-B358-5DC1A9D6D2CB}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/far/farlang.templ.m4 b/far/farlang.templ.m4
@@ -6302,16 +6302,16 @@ l:
 "Посилання на папки"
 
 MFolderShortcutBottom
-"Редактирование: Del,Ins,Shift+Ins,F4"
-"Edit: Del,Ins,Shift+Ins,F4"
-"Změnit: Del,Ins,Shift+Ins,F4"
-"Bearb.: Entf,Einf,Shift+Einf,F4"
-"Szerk.: Del,Ins,Shift+Ins,F4"
-"Edycja: Del,Ins,Shift+Ins,F4"
-"Editar: Del,Ins,Shift+Ins,F4"
-"Upraviť: Del,Ins,ShiftIns,F4"
-"Edita: [DEL] [INS] [SHIFT-INS] [F4]"
-"Редагування: Del,Ins,Shift+Ins,F4"
+"Редактирование: Del,Ins,F4"
+"Edit: Del,Ins,F4"
+"Změnit: Del,Ins,F4"
+"Bearb.: Entf,Einf,F4"
+"Szerk.: Del,Ins,F4"
+"Edycja: Del,Ins,F4"
+"Editar: Del,Ins,F4"
+"Upraviť: Del,Ins,F4"
+"Edita: [DEL] [INS] [F4]"
+"Редагування: Del,Ins,F4"
 
 MFolderShortcutBottomSub
 "Редактирование: Del,Ins,F4"

diff --git a/far/panel.cpp b/far/panel.cpp
@@ -1321,12 +1321,12 @@ int Panel::ProcessShortcutFolder(int Key,bool ProcTreePanel)
 }
 */
 
-bool Panel::ExecShortcutFolder(int Pos, bool raw)
+bool Panel::ExecShortcutFolder(int Pos)
 {
 	string strShortcutFolder,strPluginFile,strPluginData;
 	GUID PluginGuid;
 
-	if (Shortcuts().Get(Pos,&strShortcutFolder, &PluginGuid, &strPluginFile, &strPluginData, raw))
+	if (Shortcuts().Get(Pos,&strShortcutFolder, &PluginGuid, &strPluginFile, &strPluginData))
 	{
 		return ExecShortcutFolder(strShortcutFolder,PluginGuid,strPluginFile,strPluginData,true);
 	}

diff --git a/far/panel.hpp b/far/panel.hpp
@@ -249,7 +249,7 @@ class Panel: public ScreenObject, public std::enable_shared_from_this<Panel>
 	bool GetShowShortNamesMode() const { return m_ShowShortNames; }
 	void SetShowShortNamesMode(bool Mode) {m_ShowShortNames=Mode;}
 	void InitCurDir(const string& CurDir);
-	bool ExecShortcutFolder(int Pos, bool raw=false);
+	bool ExecShortcutFolder(int Pos);
 	bool ExecShortcutFolder(string& strShortcutFolder, const GUID& PluginGuid, const string& strPluginFile, const string& strPluginData, bool CheckType, bool TryClosest = true, bool Silent = false);
 	bool SaveShortcutFolder(int Pos, bool Add) const;
 	int SetPluginCommand(int Command,int Param1,void* Param2);