ComputerSurge/lazygit
3
0
Fork 0
Code Pull Requests 1 Activity

Merge branch 'feature/anonymous-reporting'

Browse Source
This commit is contained in:
Jesse Duffield
2018-08-27 20:35:55 +10:00
parent 1901901d24 a1c6adab59
commit 23a9f41d9d
20 changed files with 1236 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/gui/gui.go
View File

@@ -58,7 +58,7 @@ type Teml i18n.Teml
// Gui wraps the gocui Gui object which handles rendering and events
type Gui struct {
g *gocui.Gui
Log *logrus.Logger
Log *logrus.Entry
GitCommand *commands.GitCommand
OSCommand *commands.OSCommand
SubProcess *exec.Cmd
@@ -86,7 +86,8 @@ type guiState struct {
}
// NewGui builds a new gui handler
func NewGui(log *logrus.Logger, gitCommand *commands.GitCommand, oSCommand *commands.OSCommand, tr *i18n.Localizer, config config.AppConfigurer, updater *updates.Updater) (*Gui, error) {
func NewGui(log *logrus.Entry, gitCommand *commands.GitCommand, oSCommand *commands.OSCommand, tr *i18n.Localizer, config config.AppConfigurer, updater *updates.Updater) (*Gui, error) {
initialState := guiState{
Files: make([]commands.File, 0),
PreviousView: "files",
@@ -298,6 +299,12 @@ func (gui *Gui) layout(g *gocui.Gui) error {
if err := gui.switchFocus(g, nil, filesView); err != nil {
return err
}
if gui.Config.GetUserConfig().GetString("reporting") == "undetermined" {
if err := gui.promptAnonymousReporting(); err != nil {
return err
}
}
}
gui.resizePopupPanels(g)
@@ -305,6 +312,14 @@ func (gui *Gui) layout(g *gocui.Gui) error {
return nil
}
func (gui *Gui) promptAnonymousReporting() error {
return gui.createConfirmationPanel(gui.g, nil, gui.Tr.SLocalize("AnonymousReportingTitle"), gui.Tr.SLocalize("AnonymousReportingPrompt"), func(g *gocui.Gui, v *gocui.View) error {
return gui.Config.InsertToUserConfig("reporting", "on")
}, func(g *gocui.Gui, v *gocui.View) error {
return gui.Config.InsertToUserConfig("reporting", "off")
})
}
func (gui *Gui) fetch(g *gocui.Gui) error {
gui.GitCommand.Fetch()
gui.refreshStatus(g)