Skip to content

Commit

Permalink
Fixed Mouse binding issue after external Editor by rivo/tview#545
Browse files Browse the repository at this point in the history
  • Loading branch information
ajaxray committed Jan 15, 2021
1 parent 1b6ae23 commit 0c09a29
Show file tree
Hide file tree
Showing 9 changed files with 154 additions and 44 deletions.
2 changes: 1 addition & 1 deletion app/cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"os"

"github.com/asdine/storm/v3"
"github.com/gdamore/tcell"
"github.com/gdamore/tcell/v2"
"github.com/rivo/tview"

"github.com/ajaxray/geek-life/model"
Expand Down
2 changes: 1 addition & 1 deletion app/project_detail.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package main

import (
"github.com/gdamore/tcell"
"github.com/gdamore/tcell/v2"
"github.com/rivo/tview"

"github.com/ajaxray/geek-life/model"
Expand Down
2 changes: 1 addition & 1 deletion app/projects.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"strings"

"github.com/gdamore/tcell"
"github.com/gdamore/tcell/v2"
"github.com/rivo/tview"

"github.com/ajaxray/geek-life/model"
Expand Down
6 changes: 3 additions & 3 deletions app/task_detail.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"os/exec"
"time"

"github.com/gdamore/tcell"
"github.com/gdamore/tcell/v2"
"github.com/pgavlin/femto"
"github.com/pgavlin/femto/runtime"
"github.com/rivo/tview"
Expand Down Expand Up @@ -239,14 +239,14 @@ func (td *TaskDetailPane) editInExternalEditor() {
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
if err := cmd.Run(); err != nil {
messageToShow = "[red::]Failed to save content. Try in-app editing by pressing i"
messageToShow = "[red::]Failed to save content. Try in-app editing by pressing e"
return
}

if content, readErr := ioutil.ReadFile(tmpFileName); readErr == nil {
updatedContent = string(content)
} else {
messageToShow = "[red::]Failed to load external editing. Try in-app editing by pressing i"
messageToShow = "[red::]Failed to load external editing. Try in-app editing by pressing e"
}
})

Expand Down
2 changes: 1 addition & 1 deletion app/task_title.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"fmt"

"github.com/gdamore/tcell"
"github.com/gdamore/tcell/v2"
"github.com/rivo/tview"

"github.com/ajaxray/geek-life/model"
Expand Down
2 changes: 1 addition & 1 deletion app/tasks.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"time"

"github.com/asdine/storm/v3"
"github.com/gdamore/tcell"
"github.com/gdamore/tcell/v2"
"github.com/rivo/tview"

"github.com/ajaxray/geek-life/model"
Expand Down
2 changes: 1 addition & 1 deletion app/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"reflect"
"time"

"github.com/gdamore/tcell"
"github.com/gdamore/tcell/v2"
"github.com/rivo/tview"

"github.com/ajaxray/geek-life/model"
Expand Down
27 changes: 20 additions & 7 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,25 @@ module github.com/ajaxray/geek-life
go 1.14

require (
github.com/asdine/storm/v3 v3.2.0
github.com/gdamore/tcell v1.3.0
github.com/golang/protobuf v1.3.3 // indirect
github.com/DataDog/zstd v1.4.5 // indirect
github.com/Sereal/Sereal v0.0.0-20200820125258-a016b7cda3f3 // indirect
github.com/asdine/storm/v3 v3.2.1
github.com/gdamore/tcell/v2 v2.1.0
github.com/golang/protobuf v1.4.3 // indirect
github.com/golang/snappy v0.0.2 // indirect
github.com/google/go-cmp v0.5.4 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/mitchellh/go-homedir v1.1.0
github.com/pgavlin/femto v0.0.0-20191028012355-31a9964a50b5
github.com/rivo/tview v0.0.0-20200507165325-823f280c5426
golang.org/x/sys v0.0.0-20200519105757-fe76b779f299 // indirect
gopkg.in/yaml.v2 v2.2.8 // indirect
github.com/pgavlin/femto v0.0.0-20201224065653-0c9d20f9cac4
github.com/rivo/tview v0.0.0-20210111184519-c818a0c789ee
github.com/stretchr/testify v1.7.0 // indirect
go.etcd.io/bbolt v1.3.5 // indirect
golang.org/x/net v0.0.0-20201224014010-6772e930b67b // indirect
golang.org/x/sys v0.0.0-20210113131315-ba0562f347e0 // indirect
golang.org/x/text v0.3.5 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.25.0 // indirect
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
)
153 changes: 125 additions & 28 deletions go.sum

Large diffs are not rendered by default.

0 comments on commit 0c09a29

Please sign in to comment.