@@ -100,10 +100,7 @@ def loadini(struct, configfile):
100100'curtsies' : {
101101'list_above' :False ,
102102'fill_terminal' :False ,
103- },
104- 'gtk' : {
105- 'font' :'monospace 10' ,
106- 'color_scheme' :'default' }})
103+ }})
107104if not config .read (config_path ):
108105# No config file. If the user has it in the old place then complain
109106if os .path .isfile (os .path .expanduser ('~/.bpython.ini' )):
@@ -163,13 +160,10 @@ def loadini(struct, configfile):
163160struct .autocomplete_mode = config .get ('general' ,'autocomplete_mode' )
164161struct .save_append_py = config .getboolean ('general' ,'save_append_py' )
165162
166- struct .gtk_font = config .get ('gtk' ,'font' )
167-
168163struct .curtsies_list_above = config .getboolean ('curtsies' ,'list_above' )
169164struct .curtsies_fill_terminal = config .getboolean ('curtsies' ,'fill_terminal' )
170165
171166color_scheme_name = config .get ('general' ,'color_scheme' )
172- color_gtk_scheme_name = config .get ('gtk' ,'color_scheme' )
173167
174168default_colors = {
175169'keyword' :'y' ,
@@ -189,24 +183,6 @@ def loadini(struct, configfile):
189183'prompt_more' :'g' ,
190184 }
191185
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-
210186if color_scheme_name == 'default' :
211187struct .color_scheme = default_colors
212188else :
@@ -230,22 +206,6 @@ def loadini(struct, configfile):
230206 (color_scheme_name , ))
231207sys .exit (1 )
232208
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-
249209# checks for valid key configuration this part still sucks
250210for key in (struct .pastebin_key ,struct .save_key ):
251211key_dispatch [key ]