diff --git a/docs/source/conf.py b/docs/source/conf.py index f85351e1a..8b4ba313a 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -15,56 +15,56 @@ # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the # documentation root, use os.path.abspath to make it absolute, like shown here. -#sys.path.insert(0, os.path.abspath('.')) +# sys.path.insert(0, os.path.abspath('.')) # -- General configuration ------------------------------------------------ # If your documentation needs a minimal Sphinx version, state it here. -#needs_sphinx = '1.0' +# needs_sphinx = '1.0' # Add any Sphinx extension module names here, as strings. They can be # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom # ones. extensions = [ - 'sphinx.ext.doctest', - 'reno.sphinxext', - 'sphinxcontrib.programoutput', + "sphinx.ext.doctest", + "reno.sphinxext", + "sphinxcontrib.programoutput", ] # Add any paths that contain templates here, relative to this directory. -templates_path = ['_templates'] +templates_path = ["_templates"] # The suffix of source filenames. -source_suffix = '.rst' +source_suffix = ".rst" # The encoding of source files. -#source_encoding = 'utf-8-sig' +# source_encoding = 'utf-8-sig' # The master toctree document. -master_doc = 'index' +master_doc = "index" # General information about the project. -project = u'Guake' -copyright = u'2018, Gaetan Semet' +project = "Guake" +copyright = "2018, Gaetan Semet" # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the # built documents. # # The short X.Y version. -version = '1.0' +version = "1.0" # The full version, including alpha/beta/rc tags. -release = '1.0' +release = "1.0" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. -#language = None +# language = None # There are two options for replacing |today|: either, you set today to some # non-false value, then it is used: -#today = '' +# today = '' # Else, today_fmt is used as the format for a strftime call. -#today_fmt = '%B %d, %Y' +# today_fmt = '%B %d, %Y' # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. @@ -72,27 +72,27 @@ # The reST default role (used for this markup: `text`) to use for all # documents. -#default_role = None +# default_role = None # If true, '()' will be appended to :func: etc. cross-reference text. -#add_function_parentheses = True +# add_function_parentheses = True # If true, the current module name will be prepended to all description # unit titles (such as .. function::). -#add_module_names = True +# add_module_names = True # If true, sectionauthor and moduleauthor directives will be shown in the # output. They are ignored by default. -#show_authors = False +# show_authors = False # The name of the Pygments (syntax highlighting) style to use. -pygments_style = 'sphinx' +pygments_style = "sphinx" # A list of ignored prefixes for module index sorting. -#modindex_common_prefix = [] +# modindex_common_prefix = [] # If true, keep warnings as "system message" paragraphs in the built documents. -#keep_warnings = False +# keep_warnings = False # -- Options for HTML output ---------------------------------------------- @@ -103,90 +103,88 @@ # Theme options are theme-specific and customize the look and feel of a theme # further. For a list of options available for each theme, see the # documentation. -#html_theme_options = {} +# html_theme_options = {} # Add any paths that contain custom themes here, relative to this directory. -#html_theme_path = [] +# html_theme_path = [] # The name for this set of Sphinx documents. If None, it defaults to # " v documentation". -#html_title = None +# html_title = None # A shorter title for the navigation bar. Default is the same as html_title. -#html_short_title = None +# html_short_title = None # The name of an image file (relative to this directory) to place at the top # of the sidebar. -#html_logo = None +# html_logo = None # The name of an image file (within the static path) to use as favicon of the # docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 # pixels large. -#html_favicon = None +# html_favicon = None # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ['_static'] +html_static_path = ["_static"] # Add any extra paths that contain custom files (such as robots.txt or # .htaccess) here, relative to this directory. These files are copied # directly to the root of the documentation. -#html_extra_path = [] +# html_extra_path = [] # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. -#html_last_updated_fmt = '%b %d, %Y' +# html_last_updated_fmt = '%b %d, %Y' # If true, SmartyPants will be used to convert quotes and dashes to # typographically correct entities. -#html_use_smartypants = True +# html_use_smartypants = True # Custom sidebar templates, maps document names to template names. -#html_sidebars = {} +# html_sidebars = {} # Additional templates that should be rendered to pages, maps page names to # template names. -#html_additional_pages = {} +# html_additional_pages = {} # If false, no module index is generated. -#html_domain_indices = True +# html_domain_indices = True # If false, no index is generated. -#html_use_index = True +# html_use_index = True # If true, the index is split into individual pages for each letter. -#html_split_index = False +# html_split_index = False # If true, links to the reST sources are added to the pages. -#html_show_sourcelink = True +# html_show_sourcelink = True # If true, "Created using Sphinx" is shown in the HTML footer. Default is True. -#html_show_sphinx = True +# html_show_sphinx = True # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True. -#html_show_copyright = True +# html_show_copyright = True # If true, an OpenSearch description file will be output, and all pages will # contain a tag referring to it. The value of this option must be the # base URL from which the finished HTML is served. -#html_use_opensearch = '' +# html_use_opensearch = '' # This is the file name suffix for HTML files (e.g. ".xhtml"). -#html_file_suffix = None +# html_file_suffix = None # Output file base name for HTML help builder. -htmlhelp_basename = 'PythonFixImportsdoc' +htmlhelp_basename = "PythonFixImportsdoc" # -- Options for LaTeX output --------------------------------------------- latex_elements = { # The paper size ('letterpaper' or 'a4paper'). # 'papersize': 'letterpaper', - # The font size ('10pt', '11pt' or '12pt'). # 'pointsize': '10pt', - # Additional stuff for the LaTeX preamble. # 'preamble': '', } @@ -195,42 +193,37 @@ # (source start file, target name, title, # author, documentclass [howto, manual, or own class]). latex_documents = [ - ( - 'index', 'PythonFixImports.tex', u'Python Fix Imports Documentation', u'Gaetan Semet', - 'manual' - ), + ("index", "PythonFixImports.tex", "Python Fix Imports Documentation", "Gaetan Semet", "manual"), ] # The name of an image file (relative to this directory) to place at the top of # the title page. -#latex_logo = None +# latex_logo = None # For "manual" documents, if this is true, then toplevel headings are parts, # not chapters. -#latex_use_parts = False +# latex_use_parts = False # If true, show page references after internal links. -#latex_show_pagerefs = False +# latex_show_pagerefs = False # If true, show URL addresses after external links. -#latex_show_urls = False +# latex_show_urls = False # Documents to append as an appendix to all manuals. -#latex_appendices = [] +# latex_appendices = [] # If false, no module index is generated. -#latex_domain_indices = True +# latex_domain_indices = True # -- Options for manual page output --------------------------------------- # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). -man_pages = [ - ('index', 'pythonfiximports', u'Python Fix Imports Documentation', [u'Gaetan Semet'], 1) -] +man_pages = [("index", "pythonfiximports", "Python Fix Imports Documentation", ["Gaetan Semet"], 1)] # If true, show URL addresses after external links. -#man_show_urls = False +# man_show_urls = False # -- Options for Texinfo output ------------------------------------------- @@ -239,19 +232,24 @@ # dir menu entry, description, category) texinfo_documents = [ ( - 'index', 'PythonFixImports', u'Python Fix Imports Documentation', u'Gaetan Semet', - 'PythonFixImports', 'One line description of project.', 'Miscellaneous' + "index", + "PythonFixImports", + "Python Fix Imports Documentation", + "Gaetan Semet", + "PythonFixImports", + "One line description of project.", + "Miscellaneous", ), ] # Documents to append as an appendix to all manuals. -#texinfo_appendices = [] +# texinfo_appendices = [] # If false, no module index is generated. -#texinfo_domain_indices = True +# texinfo_domain_indices = True # How to display URL addresses: 'footnote', 'no', or 'inline'. -#texinfo_show_urls = 'footnote' +# texinfo_show_urls = 'footnote' # If true, do not generate a @detailmenu in the "Top" node's menu. -#texinfo_no_detailmenu = False +# texinfo_no_detailmenu = False diff --git a/guake/callbacks.py b/guake/callbacks.py index 84fee7320..59b77905b 100644 --- a/guake/callbacks.py +++ b/guake/callbacks.py @@ -11,6 +11,14 @@ from guake.utils import get_server_time from urllib.parse import quote_plus +# the urls of the search engine options +ENGINES = { + 0: "google.com/search?safe=off&q=", + 1: "duckduckgo.com/", + 2: "bing.com/search?q=", + 3: "yandex.com/search?text=", +} + class TerminalContextMenuCallbacks: def __init__(self, terminal, window, settings, notebook): @@ -41,7 +49,7 @@ def on_reset_terminal(self, *args): self.terminal.reset(True, True) def on_find(self): - # this is not implemented jet + # this is not implemented yet pass def on_open_link(self, *args): @@ -53,8 +61,12 @@ def on_search_on_web(self, *args): clipboard = Gtk.Clipboard.get_default(self.window.get_display()) query = clipboard.wait_for_text() query = quote_plus(query) + if query: - search_url = f"https://www.google.com/search?q={query}&safe=off" + # put the query at the end of the url and https + search_url = ( + "https://www." + ENGINES[self.settings.general.get_int("search-engine")] + query + ) Gtk.show_uri(self.window.get_screen(), search_url, get_server_time(self.window)) def on_quick_open(self, *args): diff --git a/guake/data/org.guake.gschema.xml b/guake/data/org.guake.gschema.xml index 74f5a4b52..a55d8dc78 100644 --- a/guake/data/org.guake.gschema.xml +++ b/guake/data/org.guake.gschema.xml @@ -81,6 +81,12 @@ Prompt when closing tabs. 0: Never 1: If process is running 2: Always. Also prompts on quit. + + 0 + Search engine to use when using web search + Search engine to use + + true Stay on top. diff --git a/guake/data/prefs.glade b/guake/data/prefs.glade index 952725106..e688935df 100644 --- a/guake/data/prefs.glade +++ b/guake/data/prefs.glade @@ -1,5 +1,5 @@ - + @@ -224,7 +224,7 @@ False 12 - + True False @@ -299,6 +299,15 @@ + + + + + + + + + @@ -689,6 +698,49 @@ 2 + + + True + False + 4 + + + True + False + Search Engine: + + + False + True + 0 + + + + + True + False + 0 + + Google + DuckDuckGo + Bing + Yandex + + + + + False + True + 1 + + + + + False + True + 3 + + @@ -698,6 +750,9 @@ 0 + + + diff --git a/guake/prefs.py b/guake/prefs.py index c7515cbfd..8cc6ea3a9 100644 --- a/guake/prefs.py +++ b/guake/prefs.py @@ -296,6 +296,9 @@ def on_prompt_on_close_tab_changed(self, combo): """Set the `prompt_on_close_tab' property in dconf""" self.settings.general.set_int("prompt-on-close-tab", combo.get_active()) + def on_search_engine_changed(self, combo): + self.settings.general.set_int("search-engine", combo.get_active()) + def on_gtk_theme_name_changed(self, combo): """Set the `gtk_theme_name' property in dconf""" citer = combo.get_active_iter() @@ -1045,6 +1048,10 @@ def load_configs(self): self.get_widget("prompt_on_close_tab").set_active(value) self.get_widget("prompt_on_quit").set_sensitive(value != 2) + # search engine + value = self.settings.general.get_int("search-engine") + self.get_widget("search_engine_select").set_active(value) + # use system theme value = self.settings.general.get_boolean("gtk-use-system-default-theme") self.get_widget("gtk_use_system_default_theme").set_active(value) diff --git a/releasenotes/notes/search_engine_option-14970e6e9b338449.yaml b/releasenotes/notes/search_engine_option-14970e6e9b338449.yaml new file mode 100644 index 000000000..5b864d5a6 --- /dev/null +++ b/releasenotes/notes/search_engine_option-14970e6e9b338449.yaml @@ -0,0 +1,6 @@ +release_summary: > + Added drop down menu to select search engine in preferences + +features: + - | + - search engine can be set to preference #2125 diff --git a/scripts/all-sitedirs-in-prefix.py b/scripts/all-sitedirs-in-prefix.py index 4dedaf90b..0d73741cd 100644 --- a/scripts/all-sitedirs-in-prefix.py +++ b/scripts/all-sitedirs-in-prefix.py @@ -1,5 +1,6 @@ from __future__ import print_function import site, os -prefix=os.getenv("PREFIX") + +prefix = os.getenv("PREFIX") for d in site.getsitepackages(None if not prefix else [prefix]): print(d)