From 088f5859e9f1222f99dbd5e93834bf7c6a607173 Mon Sep 17 00:00:00 2001 From: LazoCoder Date: Sun, 18 Jun 2017 00:31:05 -0400 Subject: [PATCH] Formatted help menu + added search system info --- README.md | 7 ++++++- Scripts/background.scpt | 2 +- main.py | 11 ++++++++--- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index fff2efe..619770d 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ Other Parameters: pokemon random-kanto - Change the terminal background to a random Pokemon from the specified region. pokemon slideshow [time] - Iterate through each Pokemon. Optional time (in seconds) between Pokemon. pokemon slideshow-kanto [time] - Iterate through each Pokemon in the specified region. Optional time (in seconds) between Pokemon. - pokemon clear - Clear the Pokemon in the terminal. + pokemon clear | disable | off - Clear the Pokemon in the terminal. pokemon help - Display this menu. Wallpaper Parameters: @@ -89,6 +89,11 @@ Wallpaper Parameters: pokemon _random - Change the wallpaper to a random Pokemon. pokemon _random-kanto - Change the wallpaper to a random Pokemon from the specified region. +Search System Information: + Any input containing 3 or more characters triggers the internal search system. Examples: + "pokemon pika" changes the terminal background to Pikachu. + "pokemon dos" changes the terminal background to Gyarados. + ``` Example: diff --git a/Scripts/background.scpt b/Scripts/background.scpt index 183a1b6..eed0f6e 100644 --- a/Scripts/background.scpt +++ b/Scripts/background.scpt @@ -1,5 +1,5 @@ tell application "iTerm" tell current session of current window - set background image to "/Users/Laki/Documents/GitHub/Pokemon-Terminal/./Images/Generation IV - Sinnoh/493.png" + set background image to "" end tell end tell \ No newline at end of file diff --git a/main.py b/main.py index 03a422d..b007772 100755 --- a/main.py +++ b/main.py @@ -78,13 +78,18 @@ Other Parameters: pokemon random-kanto - Change the terminal background to a random Pokemon from the specified region. pokemon slideshow [time] - Iterate through each Pokemon. Optional time (in seconds) between Pokemon. pokemon slideshow-kanto [time] - Iterate through each Pokemon in the specified region. Optional time (in seconds) between Pokemon. - pokemon clear - Clear the Pokemon in the terminal. + pokemon clear | disable | off - Clear the Pokemon in the terminal. pokemon help - Display this menu. Wallpaper Parameters: pokemon _pikachu - Change the wallpaper to the specified Pokemon. pokemon _random - Change the wallpaper to a random Pokemon. pokemon _random-kanto - Change the wallpaper to a random Pokemon from the specified region. + +Search System Information: + Any input containing 3 or more characters triggers the internal search system. Examples: + "pokemon pika" changes the terminal background to Pikachu. + "pokemon dos" changes the terminal background to Gyarados. ''') @@ -185,7 +190,7 @@ def single_argument_handler(arg): print_extra(db) elif arg == "regions": print_list(db.get_regions()) - elif arg == "help": + elif arg == "help" or arg.startswith("-h"): print_usage() elif arg == "kanto": print_columns(db.get_kanto()) @@ -197,7 +202,7 @@ def single_argument_handler(arg): print_columns(db.get_sinnoh()) elif arg == "all": print_columns(db.get_all()) - elif arg == "clear": + elif arg == "clear" or arg == "disable" or arg == "off": scripter.clear_terminal() elif arg == "random" and escape_code: change_wallpaper(db, db.get_random().get_name())