@@ -51,7 +51,7 @@ def __init__(self):
5151
5252 self .app_url = 'https://devdocs.io'
5353 self .args = parser .parse_args ()
54- self .search = self . args . s . strip ()
54+ self .search = None
5555 self .open_link = False
5656 self .hit_link = None
5757 self .options = self .read_settings_json ('cookies' )
@@ -72,7 +72,6 @@ def __init__(self):
7272 self .manager = WebKit2 .UserContentManager ()
7373 self .webview = WebKit2 .WebView .new_with_user_content_manager (self .manager )
7474 self .webview .set_settings (self .settings )
75- self .webview .load_uri (self .url_with_search ())
7675
7776 self .history = self .webview .get_back_forward_list ()
7877 self .history .connect ('changed' , self .on_history_changed )
@@ -84,6 +83,7 @@ def __init__(self):
8483 self .webview .connect ('mouse-target-changed' , self .on_mouse_target_changed )
8584 self .webview .connect ('button-release-event' , self .on_button_release )
8685
86+ self .window = self .main .get_object ('window_main' )
8787 self .scrolled = self .main .get_object ('scrolled_main' )
8888 self .scrolled .add (self .webview )
8989
@@ -110,9 +110,6 @@ def __init__(self):
110110 self .finder .connect ('found-text' , self .on_finder_found_text )
111111 self .finder .connect ('failed-to-find-text' , self .on_finder_failed_to_find_text )
112112
113- self .window = self .main .get_object ('window_main' )
114- self .window .show_all ()
115-
116113 self .create_settings_path ()
117114 self .inject_custom_styles ()
118115 self .inject_custom_scripts ()
@@ -122,19 +119,16 @@ def __init__(self):
122119 self .set_zoom_level ()
123120
124121 def run (self ):
122+ self .load_uri (self .args .s .strip ())
123+ self .window .show_all ()
124+
125125 Gtk .main ()
126126
127127 def quit (self ):
128128 Gtk .main_quit ()
129129
130- def search_term (self , term ):
131- self .search = term
132- self .header_search .set_text (self .search )
133- self .webview .load_uri (self .url_with_search ())
134-
135- def url_with_search (self ):
136- url = "%s#q=%s" % (self .app_url , self .search )
137- return url
130+ def load_uri (self , term ):
131+ self .webview .load_uri ("%s#q=%s" % (self .app_url , term ))
138132
139133 def settings_path (self , filepath = '' ):
140134 root = "%s/devdocs-desktop" % os .path .expanduser ('~/.config' )
@@ -469,7 +463,7 @@ def __init__(self, app):
469463
470464 def search (self , argv ):
471465 term = str (argv [- 1 ])
472- self .app .search_term (term )
466+ self .app .load_uri (term )
473467 self .app .window .present_with_time (Gdk .CURRENT_TIME )
474468
475469
0 commit comments