| FazBrowse GitHub Viewer | Trending | | Home |
| Tools: [Download Repo ZIP] [Original HTTPS Page] |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -3,7 +3,6 @@ include AUTHORS | |||
| 3 | 3 | include CHANGELOG | |
| 4 | 4 | include LICENSE | |
| 5 | 5 | include data/bpython | |
| 6 | - include data/bpython-gtk | ||
| 7 | 6 | include data/bpython.desktop | |
| 8 | 7 | include doc/sphinx/source/conf.py | |
| 9 | 8 | include doc/sphinx/source/*.rst | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -100,10 +100,7 @@ def loadini(struct, configfile): | |||
| 100 | 100 | 'curtsies': { | |
| 101 | 101 | 'list_above' : False, | |
| 102 | 102 | 'fill_terminal' : False, | |
| 103 | - }, | ||
| 104 | - 'gtk': { | ||
| 105 | - 'font': 'monospace 10', | ||
| 106 | - 'color_scheme': 'default'}}) | ||
| 103 | + }}) | ||
| 107 | 104 | if not config.read(config_path): | |
| 108 | 105 | # No config file. If the user has it in the old place then complain | |
| 109 | 106 | if os.path.isfile(os.path.expanduser('~/.bpython.ini')): | |
@@ -163,13 +160,10 @@ def loadini(struct, configfile): | |||
| 163 | 160 | struct.autocomplete_mode = config.get('general', 'autocomplete_mode') | |
| 164 | 161 | struct.save_append_py = config.getboolean('general', 'save_append_py') | |
| 165 | 162 | ||
| 166 | - struct.gtk_font = config.get('gtk', 'font') | ||
| 167 | - | ||
| 168 | 163 | struct.curtsies_list_above = config.getboolean('curtsies', 'list_above') | |
| 169 | 164 | struct.curtsies_fill_terminal = config.getboolean('curtsies', 'fill_terminal') | |
| 170 | 165 | ||
| 171 | 166 | color_scheme_name = config.get('general', 'color_scheme') | |
| 172 | - color_gtk_scheme_name = config.get('gtk', 'color_scheme') | ||
| 173 | 167 | ||
| 174 | 168 | default_colors = { | |
| 175 | 169 | 'keyword': 'y', | |
@@ -189,24 +183,6 @@ def loadini(struct, configfile): | |||
| 189 | 183 | 'prompt_more': 'g', | |
| 190 | 184 | } | |
| 191 | 185 | ||
| 192 | - default_gtk_colors = { | ||
| 193 | - 'keyword': 'b', | ||
| 194 | - 'name': 'k', | ||
| 195 | - 'comment': 'b', | ||
| 196 | - 'string': 'm', | ||
| 197 | - 'error': 'r', | ||
| 198 | - 'number': 'G', | ||
| 199 | - 'operator': 'B', | ||
| 200 | - 'punctuation': 'g', | ||
| 201 | - 'token': 'C', | ||
| 202 | - 'background': 'w', | ||
| 203 | - 'output': 'k', | ||
| 204 | - 'main': 'c', | ||
| 205 | - 'paren': 'R', | ||
| 206 | - 'prompt': 'b', | ||
| 207 | - 'prompt_more': 'g', | ||
| 208 | - } | ||
| 209 | - | ||
| 210 | 186 | if color_scheme_name == 'default': | |
| 211 | 187 | struct.color_scheme = default_colors | |
| 212 | 188 | else: | |
@@ -230,22 +206,6 @@ def loadini(struct, configfile): | |||
| 230 | 206 | (color_scheme_name, )) | |
| 231 | 207 | sys.exit(1) | |
| 232 | 208 | ||
| 233 | - if color_gtk_scheme_name == 'default': | ||
| 234 | - struct.color_gtk_scheme = default_gtk_colors | ||
| 235 | - else: | ||
| 236 | - struct.color_gtk_scheme = dict() | ||
| 237 | - # Note: This is a new config option, hence we don't have a | ||
| 238 | - # fallback directory. | ||
| 239 | - path = os.path.expanduser(os.path.join(get_config_home(), | ||
| 240 | - color_gtk_scheme_name + '.theme')) | ||
| 241 | - | ||
| 242 | - try: | ||
| 243 | - load_theme(struct, path, struct.color_gtk_scheme, default_colors) | ||
| 244 | - except EnvironmentError: | ||
| 245 | - sys.stderr.write("Could not load gtk theme '%s'.\n" % | ||
| 246 | - (color_gtk_scheme_name, )) | ||
| 247 | - sys.exit(1) | ||
| 248 | - | ||
| 249 | 209 | # checks for valid key configuration this part still sucks | |
| 250 | 210 | for key in (struct.pastebin_key, struct.save_key): | |
| 251 | 211 | key_dispatch[key] | |
| Back | FazBrowse Home | New Git URL |
0 commit comments