Revert moved "New Map" button

SpaiR · Jun 14, 2022 · a9639af · a9639af
1 parent c1a733d
commit a9639af
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/src/CHANGELOG.md b/src/CHANGELOG.md
@@ -1,3 +1,6 @@
+# v2.6.1.alpha
+
+ * Revert: renamed "New Map" button to "Create Map" and moved to the "Edit" menu;
  * When selecting multiple maps to open in the available maps pane, open button will show in the tooltip only a part of those maps.
 
 # v2.6.0.alpha

diff --git a/src/app/action_user.go b/src/app/action_user.go
@@ -89,8 +89,8 @@ func (a *app) DoCloseEnvironment() {
 	})
 }
 
-// DoCreateMap opens dialog window to create a new map file.
-func (a *app) DoCreateMap() {
+// DoNewMap opens dialog window to create a new map file.
+func (a *app) DoNewMap() {
 	log.Println("[app] opening create map...")
 	a.layout.WsArea.OpenCreateMap()
 }

diff --git a/src/app/ui/cpwsarea/wsempty/wsempty.go b/src/app/ui/cpwsarea/wsempty/wsempty.go
@@ -75,7 +75,7 @@ func New(app App) *WsEmpty {
 }
 
 func (ws *WsEmpty) Name() string {
-	return "Workspace"
+	return icon.File + " Workspace"
 }
 
 func (ws *WsEmpty) Title() string {

diff --git a/src/app/ui/menu/menu.go b/src/app/ui/menu/menu.go
@@ -19,6 +19,7 @@ import (
 type app interface {
 	// File
 	DoNewWorkspace()
+	DoNewMap()
 	DoOpen()
 	DoLoadResource(path string)
 	DoClearRecentMaps()
@@ -39,7 +40,6 @@ type app interface {
 	DoDelete()
 	DoSearch()
 	DoDeselect()
-	DoCreateMap()
 
 	// View
 	DoAreaBorders()
@@ -113,6 +113,9 @@ func (m *Menu) Process() {
 			w.MenuItem("New Workspace", m.app.DoNewWorkspace).
 				Icon(icon.File).
 				Shortcut(platform.KeyModName(), "N"),
+			w.MenuItem("New Map", m.app.DoNewMap).
+				IconEmpty().
+				Enabled(m.app.HasLoadedEnvironment()),
 			w.Separator(),
 			w.MenuItem("Open...", m.app.DoOpen).
 				Icon(icon.FolderOpen).
@@ -190,10 +193,6 @@ func (m *Menu) Process() {
 				Icon(icon.Search).
 				Enabled(m.app.HasActiveMap()).
 				Shortcut(platform.KeyModName(), "F"),
-			w.Separator(),
-			w.MenuItem("Create Map", m.app.DoCreateMap).
-				IconEmpty().
-				Enabled(m.app.HasLoadedEnvironment()),
 		}),
 
 		w.Menu("View", w.Layout{