mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-11-21 04:46:29 +03:00
Remove the "Donate" and "Ask Question" links from the status bar (#6215)
They take up unnecessary space.
This commit is contained in:
7 files changed
+27
-38
No files matched your search
+7
-11
@@ -12,18 +12,14 @@ type Docs struct {
|
||||
}
|
||||
|
||||
var Links = struct {
|
||||
Docs Docs
|
||||
Issues string
|
||||
Donate string
|
||||
Discussions string
|
||||
RepoUrl string
|
||||
Releases string
|
||||
Docs Docs
|
||||
Issues string
|
||||
RepoUrl string
|
||||
Releases string
|
||||
}{
|
||||
RepoUrl: "https://github.com/jesseduffield/lazygit",
|
||||
Issues: "https://github.com/jesseduffield/lazygit/issues",
|
||||
Donate: "https://github.com/sponsors/jesseduffield",
|
||||
Discussions: "https://github.com/jesseduffield/lazygit/discussions",
|
||||
Releases: "https://github.com/jesseduffield/lazygit/releases",
|
||||
RepoUrl: "https://github.com/jesseduffield/lazygit",
|
||||
Issues: "https://github.com/jesseduffield/lazygit/issues",
|
||||
Releases: "https://github.com/jesseduffield/lazygit/releases",
|
||||
Docs: Docs{
|
||||
CustomDiffRenderers: "https://github.com/jesseduffield/lazygit/blob/master/docs/Custom_DiffRenderers.md",
|
||||
CustomKeybindings: "https://github.com/jesseduffield/lazygit/blob/master/docs/keybindings/Custom_Keybindings.md",
|
||||
|
||||
@@ -66,8 +66,8 @@ type WindowArrangementArgs struct {
|
||||
// The content shown on the bottom left of the screen when showing a loader
|
||||
// or toast e.g. 'Rebasing /'
|
||||
AppStatus string
|
||||
// The content shown on the bottom right of the screen (e.g. the 'donate',
|
||||
// 'ask question' links or a message about the current mode e.g. rebase mode)
|
||||
// The content shown on the bottom right of the screen (e.g. the version
|
||||
// number or a message about the current mode e.g. rebase mode)
|
||||
InformationStr string
|
||||
// Whether to show the extras window which contains the command log context
|
||||
ShowExtrasWindow bool
|
||||
|
||||
@@ -8,7 +8,6 @@ import (
|
||||
"github.com/jesseduffield/lazygit/pkg/constants"
|
||||
"github.com/jesseduffield/lazygit/pkg/gocui"
|
||||
"github.com/jesseduffield/lazygit/pkg/gui/presentation"
|
||||
"github.com/jesseduffield/lazygit/pkg/gui/style"
|
||||
"github.com/jesseduffield/lazygit/pkg/gui/types"
|
||||
"github.com/jesseduffield/lazygit/pkg/utils"
|
||||
)
|
||||
@@ -204,7 +203,6 @@ func (self *StatusController) showDashboard() {
|
||||
fmt.Sprintf("Tutorial: %s", constants.Links.Docs.Tutorial),
|
||||
fmt.Sprintf("Raise an Issue: %s", constants.Links.Issues),
|
||||
fmt.Sprintf("Release Notes: %s", constants.Links.Releases),
|
||||
style.FgMagenta.Sprintf("Become a sponsor: %s", constants.Links.Donate), // caffeine ain't free
|
||||
}, "\n\n") + "\n"
|
||||
|
||||
self.c.RenderToMainViews(types.RefreshMainOpts{
|
||||
|
||||
@@ -1,10 +1,6 @@
|
||||
package gui
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/jesseduffield/lazygit/pkg/constants"
|
||||
"github.com/jesseduffield/lazygit/pkg/gui/style"
|
||||
"github.com/jesseduffield/lazygit/pkg/utils"
|
||||
)
|
||||
|
||||
@@ -13,12 +9,6 @@ func (gui *Gui) informationStr() string {
|
||||
return activeMode.InfoLabel()
|
||||
}
|
||||
|
||||
if gui.g.Mouse {
|
||||
donate := style.FgMagenta.Sprint(style.PrintHyperlink(gui.c.Tr.Donate, constants.Links.Donate))
|
||||
askQuestion := style.FgYellow.Sprint(style.PrintHyperlink(gui.c.Tr.AskQuestion, constants.Links.Discussions))
|
||||
return fmt.Sprintf("%s %s %s", donate, askQuestion, gui.Config.GetVersion())
|
||||
}
|
||||
|
||||
return gui.Config.GetVersion()
|
||||
}
|
||||
|
||||
|
||||
+1
-9
@@ -434,8 +434,6 @@ type TranslationSet struct {
|
||||
SureCherryPick string
|
||||
CherryPick string
|
||||
CannotCherryPickNonCommit string
|
||||
Donate string
|
||||
AskQuestion string
|
||||
PrevHunk string
|
||||
NextHunk string
|
||||
PrevFileInDiff string
|
||||
@@ -1222,7 +1220,7 @@ type Actions struct {
|
||||
}
|
||||
|
||||
const englishIntroPopupMessage = `
|
||||
Thanks for using lazygit! Seriously you rock. Three things to share with you:
|
||||
Thanks for using lazygit! Seriously you rock. Two things to share with you:
|
||||
|
||||
1) If you want to learn about lazygit's features, watch this vid:
|
||||
https://youtu.be/CPLdltN7wgE
|
||||
@@ -1230,10 +1228,6 @@ Thanks for using lazygit! Seriously you rock. Three things to share with you:
|
||||
2) Be sure to read the latest release notes at:
|
||||
https://github.com/jesseduffield/lazygit/releases
|
||||
|
||||
3) If lazygit has made your life easier, you can say thanks by clicking the
|
||||
donate button at the bottom right. Donation does not grant priority support,
|
||||
but it is much appreciated.
|
||||
|
||||
Press {{confirmationKey}} to get started.
|
||||
`
|
||||
|
||||
@@ -1674,8 +1668,6 @@ func EnglishTranslationSet() *TranslationSet {
|
||||
SureCherryPick: "Are you sure you want to cherry-pick the {{.numCommits}} copied commit(s) onto this branch?",
|
||||
CherryPick: "Cherry-pick",
|
||||
CannotCherryPickNonCommit: "Cannot cherry-pick this kind of todo item",
|
||||
Donate: "Donate",
|
||||
AskQuestion: "Ask Question",
|
||||
PrevHunk: "Go to previous hunk",
|
||||
NextHunk: "Go to next hunk",
|
||||
PrevFileInDiff: "Go to previous file",
|
||||
|
||||
@@ -16,7 +16,7 @@ import (
|
||||
// │a35c687d CI commit-10 ▼┌─Command log────────────────────────────────────────────────────┐
|
||||
// └───────────────────────10 of 20─┘│Random tip: To filter commits by path, press '<ctrl+s>' │
|
||||
// ╶─Stash───────────────────0 of 0─╴└────────────────────────────────────────────────────────────────┘
|
||||
// <pgup>/<pgdown>: Scroll, <esc>: Cancel, q: Quit, ?: Keybindings, 1-Donate Ask Question unversioned
|
||||
// Squash: s | Fixup: f | Reword: r | Drop: d | Edit: e | Amend: A | Checkout: <space> | … unversioned
|
||||
|
||||
var Accordion = NewIntegrationTest(NewIntegrationTestArgs{
|
||||
Description: "Verify accordion mode kicks in when the screen height is too small",
|
||||
|
||||
@@ -12,13 +12,26 @@ var OpenLinkFailure = NewIntegrationTest(NewIntegrationTestArgs{
|
||||
SetupConfig: func(config *config.AppConfig) {
|
||||
config.GetUserConfig().OS.OpenLink = "exit 42"
|
||||
},
|
||||
SetupRepo: func(shell *Shell) {},
|
||||
SetupRepo: func(shell *Shell) {
|
||||
shell.EmptyCommit("https://example.com")
|
||||
},
|
||||
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
||||
t.Views().Information().Click(0, 0)
|
||||
t.Views().Commits().
|
||||
Focus()
|
||||
|
||||
t.Views().Main().
|
||||
TopLines(
|
||||
Contains("commit"),
|
||||
Contains("Author:"),
|
||||
Contains("Date:"),
|
||||
Equals(""),
|
||||
Equals(" https://example.com"),
|
||||
).
|
||||
Click(4, 4)
|
||||
|
||||
t.ExpectPopup().Confirmation().
|
||||
Title(Equals("Error")).
|
||||
Content(Equals("Failed to open URL https://github.com/sponsors/jesseduffield\n\nError: exit status 42")).
|
||||
Content(Equals("Failed to open URL https://example.com\n\nError: exit status 42")).
|
||||
Confirm()
|
||||
},
|
||||
})
|
||||
Reference in new issue
Block a user