merge stash and status

3 files changed, 21 insertions, 18 deletions

diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go
index 0f3f7b8..0cfd113 100644
--- a/pkg/gui/keybindings.go
+++ b/pkg/gui/keybindings.go
@@ -167,14 +167,6 @@ func (gui *Gui) generateKeybindings() error {
 			Description: "Sort repositories by Modification date",
 			Vital:       false,
 		}, {
-			View:        mainViewFeature.Name,
-			Key:         's',
-			Modifier:    gocui.ModNone,
-			Handler:     gui.showStashView,
-			Display:     "s",
-			Description: "show stash",
-			Vital:       true,
-		}, {
 			View:        "",
 			Key:         gocui.KeyCtrlC,
 			Modifier:    gocui.ModNone,
@@ -420,17 +412,23 @@ func (gui *Gui) generateKeybindings() error {
 			Display:     "c",
 			Description: "close/cancel",
 			Vital:       true,
-		}, 
-	// Stash View
-		{
-			View:        "stash",
+		}, {
+			View:        statusHeaderViewFeature.Name,
 			Key:         'c',
 			Modifier:    gocui.ModNone,
-			Handler:     gui.closeStashView,
+			Handler:     gui.closeStatusView,
 			Display:     "c",
 			Description: "close/cancel",
 			Vital:       true,
-		}, 		
+		}, {
+			View:        mainViewFeature.Name,
+			Key:         's',
+			Modifier:    gocui.ModNone,
+			Handler:     gui.openStatusView,
+			Display:     "s",
+			Description: "Open Status",
+			Vital:       true,
+		},	
 	}
 	for _, binding := range individualKeybindings {
 		gui.KeyBindings = append(gui.KeyBindings, binding)
diff --git a/pkg/gui/stashview.go b/pkg/gui/stashview.go
index 09ec8ac..8deb6d0 100644
--- a/pkg/gui/stashview.go
+++ b/pkg/gui/stashview.go
@@ -8,7 +8,7 @@ import (
 
 var stashReturnView string
 
-func (gui *Gui) openStashView(g *gocui.Gui, returnViewName string) error {
+func (gui *Gui) openStashesView(g *gocui.Gui, returnViewName string) error {
 	maxX, maxY := g.Size()
 	stashReturnView = returnViewName
 	v, err := g.SetView("stash", maxX/2-30, maxY/2-3, maxX/2+30, maxY/2+3)
@@ -32,7 +32,7 @@ func (gui *Gui) openStashView(g *gocui.Gui, returnViewName string) error {
 	return nil
 }
 
-func (gui *Gui) closeStashView(g *gocui.Gui, v *gocui.View) error {
+func (gui *Gui) closeStashesView(g *gocui.Gui, v *gocui.View) error {
 
 	if err := g.DeleteView(v.Name()); err != nil {
 		return nil
@@ -44,7 +44,7 @@ func (gui *Gui) closeStashView(g *gocui.Gui, v *gocui.View) error {
 	return nil
 }
 
-func (gui *Gui) showStashView(g *gocui.Gui, v *gocui.View) (err error) {
-	gui.openStashView(g, mainViewFeature.Name)
+func (gui *Gui) showStashesView(g *gocui.Gui, v *gocui.View) (err error) {
+	// gui.openStashView(g, mainViewFeature.Name)
 	return nil
 }
diff --git a/pkg/gui/statusview.go b/pkg/gui/statusview.go
index e33e4c5..8ea6327 100644
--- a/pkg/gui/statusview.go
+++ b/pkg/gui/statusview.go
@@ -91,6 +91,11 @@ func (gui *Gui) openStashView(g *gocui.Gui) error {
 		}
 		v.Title = stashViewFeature.Title
 		v.Wrap = true
+		entity := gui.getSelectedRepository()
+		stashedItems := entity.Stasheds
+		for _, stashedItem := range stashedItems {
+			fmt.Fprintln(v, stashedItem)
+		}
 	}
 	return nil
 }