mirror
/
tut
mirror of https://github.com/RasmusLindroth/tut.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch 'short' into seventeen

pull/48/head
Rasmus Lindroth 5 years ago
parent
a3ee9b6c97 51ab51cf8c
commit
a1ccbbbac1
7 changed files with 53 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      config.go
  2. 48
      feed.go
  3. 6
      linkoverlay.go
  4. 8
      media.go
  5. 14
      messagebox.go
  6. 10
      util.go
  7. 2
      visibilityoverlay.go

7
config.go
Unescape View File

@ -30,6 +30,7 @@ type GeneralConfig struct {
NotificationFeed bool
QuoteReply bool
CharLimit int
ShortHints bool
}
type StyleConfig struct {
@ -239,6 +240,7 @@ func parseGeneral(cfg *ini.File) GeneralConfig {
general.NotificationFeed = cfg.Section("general").Key("notification-feed").MustBool(true)
general.QuoteReply = cfg.Section("general").Key("quote-reply").MustBool(false)
general.CharLimit = cfg.Section("general").Key("char-limit").MustInt(500)
general.ShortHints = cfg.Section("general").Key("short-hints").MustBool(false)
return general
}
@ -467,6 +469,11 @@ quote-reply=false
# default=500
char-limit=500
# If you've learnt all the shortcut keys you can remove the help text and
# only show the key in tui. So it gets less cluttered.
# default=false
short-hints=false
[media]
# Your image viewer
# default=xdg-open

48
feed.go
Unescape View File

@ -176,34 +176,34 @@ func showTootOptions(app *App, status *mastodon.Status, showSensitive bool) (str
app.UI.StatusView.ScrollToBeginning()
var info []string
if status.Favourited == true {
info = append(info, ColorKey(app.Config.Style, "Un", "F", "avorite"))
info = append(info, ColorKey(app.Config, "Un", "F", "avorite"))
} else {
info = append(info, ColorKey(app.Config.Style, "", "F", "avorite"))
info = append(info, ColorKey(app.Config, "", "F", "avorite"))
}
if status.Reblogged == true {
info = append(info, ColorKey(app.Config.Style, "Un", "B", "oost"))
info = append(info, ColorKey(app.Config, "Un", "B", "oost"))
} else {
info = append(info, ColorKey(app.Config.Style, "", "B", "oost"))
info = append(info, ColorKey(app.Config, "", "B", "oost"))
}
info = append(info, ColorKey(app.Config.Style, "", "T", "hread"))
info = append(info, ColorKey(app.Config.Style, "", "R", "eply"))
info = append(info, ColorKey(app.Config.Style, "", "V", "iew"))
info = append(info, ColorKey(app.Config.Style, "", "U", "ser"))
info = append(info, ColorKey(app.Config, "", "T", "hread"))
info = append(info, ColorKey(app.Config, "", "R", "eply"))
info = append(info, ColorKey(app.Config, "", "V", "iew"))
info = append(info, ColorKey(app.Config, "", "U", "ser"))
if len(status.MediaAttachments) > 0 {
info = append(info, ColorKey(app.Config.Style, "", "M", "edia"))
info = append(info, ColorKey(app.Config, "", "M", "edia"))
}
if len(urls)+len(status.Mentions)+len(status.Tags) > 0 {
info = append(info, ColorKey(app.Config.Style, "", "O", "pen"))
info = append(info, ColorKey(app.Config, "", "O", "pen"))
}
info = append(info, ColorKey(app.Config.Style, "", "A", "vatar"))
info = append(info, ColorKey(app.Config, "", "A", "vatar"))
if status.Account.ID == app.Me.ID {
info = append(info, ColorKey(app.Config.Style, "", "D", "elete"))
info = append(info, ColorKey(app.Config, "", "D", "elete"))
}
if status.Bookmarked == false {
info = append(info, ColorKey(app.Config.Style, "", "S", "ave"))
info = append(info, ColorKey(app.Config, "", "S", "ave"))
} else {
info = append(info, ColorKey(app.Config.Style, "Un", "S", "ave"))
info = append(info, ColorKey(app.Config, "Un", "S", "ave"))
}
controls := strings.Join(info, " ")
@ -240,28 +240,28 @@ func showUser(app *App, user *mastodon.Account, relation *mastodon.Relationship,
var controlItems []string
if app.Me.ID != user.ID {
if relation.Following {
controlItems = append(controlItems, ColorKey(app.Config.Style, "Un", "F", "ollow"))
controlItems = append(controlItems, ColorKey(app.Config, "Un", "F", "ollow"))
} else {
controlItems = append(controlItems, ColorKey(app.Config.Style, "", "F", "ollow"))
controlItems = append(controlItems, ColorKey(app.Config, "", "F", "ollow"))
}
if relation.Blocking {
controlItems = append(controlItems, ColorKey(app.Config.Style, "Un", "B", "lock"))
controlItems = append(controlItems, ColorKey(app.Config, "Un", "B", "lock"))
} else {
controlItems = append(controlItems, ColorKey(app.Config.Style, "", "B", "lock"))
controlItems = append(controlItems, ColorKey(app.Config, "", "B", "lock"))
}
if relation.Muting {
controlItems = append(controlItems, ColorKey(app.Config.Style, "Un", "M", "ute"))
controlItems = append(controlItems, ColorKey(app.Config, "Un", "M", "ute"))
} else {
controlItems = append(controlItems, ColorKey(app.Config.Style, "", "M", "ute"))
controlItems = append(controlItems, ColorKey(app.Config, "", "M", "ute"))
}
if len(urls) > 0 {
controlItems = append(controlItems, ColorKey(app.Config.Style, "", "O", "pen"))
controlItems = append(controlItems, ColorKey(app.Config, "", "O", "pen"))
}
}
if showUserControl {
controlItems = append(controlItems, ColorKey(app.Config.Style, "", "U", "ser"))
controlItems = append(controlItems, ColorKey(app.Config, "", "U", "ser"))
}
controlItems = append(controlItems, ColorKey(app.Config.Style, "", "A", "vatar"))
controlItems = append(controlItems, ColorKey(app.Config, "", "A", "vatar"))
controls = strings.Join(controlItems, " ")
return text, controls
@ -1120,7 +1120,7 @@ func (n *NotificationsFeed) DrawToot() {
switch notification.Type {
case "follow":
text = SublteText(n.app.Config.Style, FormatUsername(notification.Account)+" started following you\n\n")
controls = ColorKey(n.app.Config.Style, "", "U", "ser")
controls = ColorKey(n.app.Config, "", "U", "ser")
case "favourite":
pre := SublteText(n.app.Config.Style, FormatUsername(notification.Account)+" favorited your toot") + "\n\n"
text, controls = showTootOptions(n.app, notification.Status, n.showSpoiler)

6
linkoverlay.go
Unescape View File

@ -28,10 +28,10 @@ func NewLinkOverlay(app *App) *LinkOverlay {
l.List.SetHighlightFullLine(true)
l.Flex.SetDrawFunc(app.Config.ClearContent)
var items []string
items = append(items, ColorKey(app.Config.Style, "", "O", "pen"))
items = append(items, ColorKey(app.Config.Style, "", "Y", "ank"))
items = append(items, ColorKey(app.Config, "", "O", "pen"))
items = append(items, ColorKey(app.Config, "", "Y", "ank"))
for _, cust := range app.Config.OpenCustom.OpenCustoms {
items = append(items, ColorKey(app.Config.Style, "", fmt.Sprintf("%d", cust.Index), cust.Name))
items = append(items, ColorKey(app.Config, "", fmt.Sprintf("%d", cust.Index), cust.Name))
}
l.TextBottom.SetText(strings.Join(items, " "))
return l

8
media.go
Unescape View File

@ -93,10 +93,10 @@ func (m *MediaView) Draw() {
m.TextTop.SetText(topText)
var items []string
items = append(items, ColorKey(m.app.Config.Style, "", "A", "dd file"))
items = append(items, ColorKey(m.app.Config.Style, "", "D", "elete file"))
items = append(items, ColorKey(m.app.Config.Style, "", "E", "dit desc"))
items = append(items, ColorKey(m.app.Config.Style, "", "Esc", " Done"))
items = append(items, ColorKey(m.app.Config, "", "A", "dd file"))
items = append(items, ColorKey(m.app.Config, "", "D", "elete file"))
items = append(items, ColorKey(m.app.Config, "", "E", "dit desc"))
items = append(items, ColorKey(m.app.Config, "", "Esc", " Done"))
m.TextBottom.SetText(strings.Join(items, " "))
}

14
messagebox.go
Unescape View File

@ -171,13 +171,13 @@ func (m *MessageBox) TootLength() int {
func (m *MessageBox) Draw() {
var items []string
items = append(items, ColorKey(m.app.Config.Style, "", "P", "ost"))
items = append(items, ColorKey(m.app.Config.Style, "", "E", "dit"))
items = append(items, ColorKey(m.app.Config.Style, "", "V", "isibility"))
items = append(items, ColorKey(m.app.Config.Style, "", "T", "oggle CW"))
items = append(items, ColorKey(m.app.Config.Style, "", "C", "ontent warning text"))
items = append(items, ColorKey(m.app.Config.Style, "", "M", "edia attachment"))
items = append(items, ColorKey(m.app.Config.Style, "", "I", "nclude quote"))
items = append(items, ColorKey(m.app.Config, "", "P", "ost"))
items = append(items, ColorKey(m.app.Config, "", "E", "dit"))
items = append(items, ColorKey(m.app.Config, "", "V", "isibility"))
items = append(items, ColorKey(m.app.Config, "", "T", "oggle CW"))
items = append(items, ColorKey(m.app.Config, "", "C", "ontent warning text"))
items = append(items, ColorKey(m.app.Config, "", "M", "edia attachment"))
items = append(items, ColorKey(m.app.Config, "", "I", "nclude quote"))
status := strings.Join(items, " ")
m.Controls.SetText(status)

10
util.go
Unescape View File

@ -270,10 +270,14 @@ func FindFiles(s string) []string {
return files
}
func ColorKey(style StyleConfig, pre, key, end string) string {
color := ColorMark(style.TextSpecial2)
normal := ColorMark(style.Text)
func ColorKey(c *Config, pre, key, end string) string {
color := ColorMark(c.Style.TextSpecial2)
normal := ColorMark(c.Style.Text)
key = tview.Escape("[" + key + "]")
if c.General.ShortHints {
pre = ""
end = ""
}
text := fmt.Sprintf("%s%s%s%s%s%s", normal, pre, color, key, normal, end)
return text
}

2
visibilityoverlay.go
Unescape View File

@ -23,7 +23,7 @@ func NewVisibilityOverlay(app *App) *VisibilityOverlay {
v.List.ShowSecondaryText(false)
v.List.SetHighlightFullLine(true)
v.Flex.SetDrawFunc(app.Config.ClearContent)
v.TextBottom.SetText(ColorKey(app.Config.Style, "", "Enter", ""))
v.TextBottom.SetText(ColorKey(app.Config, "", "Enter", ""))
return v
}

Write Preview
Loading…
Cancel
Save