Index: st2.py ================================================================== --- st2.py +++ st2.py @@ -182,18 +182,19 @@ "menu_toolbar_style_icons": lambda w: (self.toolbar.set_style(gtk.TOOLBAR_ICONS)), "menu_toolbar_style_both": lambda w: (self.toolbar.set_style(gtk.TOOLBAR_BOTH)), "menu_toolbar_size_small": lambda w: (self.toolbar.set_icon_size(gtk.ICON_SIZE_SMALL_TOOLBAR)), "menu_toolbar_size_medium": lambda w: (self.toolbar.set_icon_size(gtk.ICON_SIZE_DND)), "menu_toolbar_size_large": lambda w: (self.toolbar.set_icon_size(gtk.ICON_SIZE_DIALOG)), - # else + # win_config "menu_properties": config_dialog.open, "config_cancel": config_dialog.hide, "config_save": config_dialog.save, "config_play_list_edit_col0": lambda w,path,txt: (config_dialog.list_edit(self.config_play, path, 0, txt)), "config_play_list_edit_col1": lambda w,path,txt: (config_dialog.list_edit(self.config_play, path, 1, txt)), "config_record_list_edit_col0": lambda w,path,txt: (config_dialog.list_edit(self.config_record, path, 0, txt)), "config_record_list_edit_col1": lambda w,path,txt: (config_dialog.list_edit(self.config_record, path, 1, txt)), + # else "update_categories": self.update_categories, "update_favicons": self.update_favicons, "app_state": self.app_state, "bookmark": self.bookmark, "save_as": self.save_as, @@ -203,17 +204,19 @@ "menu_fossilwiki": lambda w: action.browser("http://fossil.include-once.org/streamtuner2/"), "menu_projhomepage": lambda w: action.browser("http://milki.include-once.org/streamtuner2/"), # "menu_bugreport": lambda w: BugReport(), "menu_copy": self.menu_copy, "delete_entry": self.delete_entry, + # search dialog "quicksearch_set": search.quicksearch_set, "search_open": search.menu_search, "search_go": search.start, "search_srv": search.start, "search_google": search.google, "search_cancel": search.cancel, "true": lambda w,*args: True, + # win_streamedit "streamedit_open": streamedit.open, "streamedit_save": streamedit.save, "streamedit_new": streamedit.new, "streamedit_cancel": streamedit.cancel, }.items() ) + list( self.add_signals.items() ) )) @@ -474,11 +477,10 @@ import traceback traceback.print_exc() # default plugins conf.add_plugin_defaults(self.channels["bookmarks"].config, "bookmarks") - #conf.add_plugin_defaults(self.channels["shoutcast"].config, "shoutcast") # store window/widget states (sizes, selections, etc.) def app_state(self, widget): # gtk widget states @@ -583,11 +585,10 @@ # hide dialog box again def cancel(self, *args): self.search_dialog.hide() return True # stop any other gtk handlers - #self.search_dialog.hide() #if conf.hide_searchdialog # perform search def start(self, *w): self.cancel() @@ -740,10 +741,11 @@ def open(self, widget): if self.first_open: self.add_plugins() self.combobox_theme() self.first_open = 0 + self.win_config.resize(565, 625) self.load_config(conf.__dict__, "config_") self.load_config(conf.plugins, "config_plugins_") self.win_config.show() first_open = 1 @@ -1142,12 +1144,10 @@ #-- run main --------------------------------------------- if __name__ == "__main__": - #-- global configuration settings - "conf = Config()" # already happened with "from config import conf" # graphical if len(sys.argv) < 2 or "--gtk3" in sys.argv: