Permalink
Browse files

Merge branch 'master' into paradox2

Conflicts:
	.gitignore
	README.rst
	docs/conf.py
	docs/index.rst
	libqtile/command.py
	libqtile/confreader.py
	libqtile/layout/__init__.py
	libqtile/layout/floating.py
	libqtile/layout/max.py
	libqtile/layout/tree.py
	libqtile/resources/default_config.py
	libqtile/sh.py
	libqtile/widget/battery.py
	libqtile/window.py
	test/test_bar.py
  • Loading branch information...
2 parents aebce9d + 346489e commit 34be6d421e63c367809b4d73ed64b01915e96e6d @cjbarnes18 cjbarnes18 committed Jun 30, 2012
Showing with 2,762 additions and 197 deletions.
  1. +3 −0 .gitignore
  2. +24 −2 README.rst
  3. BIN docs/_static/favicon.png
  4. BIN docs/_static/github-ribbon.png
  5. BIN docs/_static/objgraph.png
  6. BIN docs/_static/widgets/clock.png
  7. BIN docs/_static/widgets/graph.png
  8. BIN docs/_static/widgets/groupbox.png
  9. BIN docs/_static/widgets/systray.png
  10. +10 −0 docs/_themes/qtile/layout.html
  11. +4 −0 docs/_themes/qtile/localtoc.html
  12. +11 −0 docs/_themes/qtile/sidebar_intro.html
  13. +8 −0 docs/_themes/qtile/sidebar_links.html
  14. +164 −0 docs/_themes/qtile/static/qtile.css_t
  15. +6 −0 docs/_themes/qtile/theme.conf
  16. +8 −0 docs/build.sh
  17. +18 −19 docs/conf.py
  18. +55 −100 docs/index.rst
  19. +130 −0 docs/manual/commands/index.rst
  20. +76 −0 docs/manual/commands/qsh.rst
  21. +29 −0 docs/manual/commands/scripting.rst
  22. +20 −0 docs/manual/config/groups.rst
  23. +25 −0 docs/manual/config/hooks.rst
  24. +59 −0 docs/manual/config/index.rst
  25. +40 −0 docs/manual/config/keys.rst
  26. +27 −0 docs/manual/config/layouts.rst
  27. +24 −0 docs/manual/config/mouse.rst
  28. +36 −0 docs/manual/config/screens.rst
  29. +36 −0 docs/manual/faq.rst
  30. +44 −0 docs/manual/hacking.rst
  31. +63 −0 docs/manual/install/arch.rst
  32. +141 −0 docs/manual/install/gentoo.rst
  33. +24 −0 docs/manual/install/index.rst
  34. +77 −0 docs/manual/install/source.rst
  35. +20 −0 docs/manual/install/ubuntu.rst
  36. +24 −0 docs/manual/license.rst
  37. +121 −0 docs/manual/ref/hooks.rst
  38. +8 −0 docs/manual/ref/index.rst
  39. +400 −0 docs/manual/ref/layouts.rst
  40. +897 −0 docs/manual/ref/widgets.rst
  41. +3 −0 libqtile/bar.py
  42. +2 −0 libqtile/command.py
  43. +34 −48 libqtile/confreader.py
  44. +13 −5 libqtile/ipc.py
  45. +1 −1 libqtile/layout/tree.py
  46. +2 −1 libqtile/layout/xmonad.py
  47. +16 −2 libqtile/manager.py
  48. 0 libqtile/resources/__init__.py
  49. +17 −8 libqtile/resources/{default-config.py → default_config.py}
  50. +12 −4 libqtile/sh.py
  51. +1 −1 libqtile/widget/prompt.py
  52. +14 −2 libqtile/window.py
  53. +8 −1 test/test_bar.py
  54. +4 −2 test/test_command.py
  55. +1 −0 test/test_layout.py
  56. +2 −1 test/test_sh.py
View
@@ -8,5 +8,8 @@ MANIFEST
/dist
# Vim swap files
*.swp
+*.swo
/doc
+/docs/_build
+# some people hack on macs? :-)
.DS_Store
View
@@ -1,8 +1,14 @@
=====
Qtile
=====
-A full-featured, pure-Python tiling window manager.
----------------------------------------------------
+
+A full-featured, pure-Python tiling window manager
+==================================================
+
+:Website: http://www.qtile.org
+:Source: https://github.com/qtile/qtile
+:Documentation: http://qtile.readthedocs.org/en/latest/manual/index.html
+:License: MIT License
Features
========
@@ -17,4 +23,20 @@ Features
* Qtile's remote scriptability makes it one of the most thoroughly
unit-tested window mangers around.
+Community
+=========
+
+Qtile is supported by a small (and growing!) but dedicated group of users. If
+you need any help, please don't hesitate to fire off an email to our mailing
+list or join us on IRC.
+
+:Mailing List: http://groups.google.com/group/qtile-dev
+:IRC: irc://irc.oftc.net:6667/qtile
+
+Bug Tracker
+===========
+
+Please report any suggestions, feature requests, bug reports, or annoyances to
+the Github `issue tracker`_.
+.. _`issue tracker`: https://github.com/qtile/qtile/issues
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -0,0 +1,10 @@
+{% extends "basic/layout.html" %}
+{% block relbar2 %}{% endblock %}
+{% block footer %}
+<!-- <div class="footer">
+ Copyright &copy; <a href="http://corte.si/">Aldo Cortesi</a> and <a href="https://github.com/qtile/qtile/contributors">contributers</a>.
+ </div>
+ <a href="https://github.com/qtile/qtile" class="github">
+ <img style="position: absolute; top: 0; right: 0; border: 0;" src="{{ pathto('_static/github-ribbon.png', 1) }}" alt="Fork me on GitHub" class="github"/>
+ </a>-->
+{% endblock %}
@@ -0,0 +1,4 @@
+{% if display_toc %}
+ <h3>{{ _('Contents') }}</h3>
+ {{ toc }}
+{% endif %}
@@ -0,0 +1,11 @@
+<h1 class="logo">
+ <a href="{{ pathto(master_doc) }}">
+ <b>Qtile</b><small>:docs</small>
+ </a>
+</h1>
+
+<!--<iframe src="http://markdotto.github.com/github-buttons/github-btn.html?user=qtile&repo=qtile&type=watch&count=true&size=large"
+ allowtransparency="true" frameborder="0" scrolling="0" width="170px" height="30px"></iframe>
+
+<p><b>Qtile</b> is a full-featured, hackable tiling window manager written in Python.</p>
+-->
@@ -0,0 +1,8 @@
+<h3>Useful Links</h3>
+<ul>
+ <li><a href="{{ pathto("manual/index") }}">Documentation</a></li>
+ <li><a href="http://github.com/qtile/qtile">Fork on Github</a></li>
+ <li><a href="http://github.com/qtile/qtile/issues">Issue Tracker</a></li>
+ <li><a href="http://groups.google.com/group/qtile-dev">Mailing List</a></li>
+ <li><a href="irc://irc.oftc.net:6667/qtile">IRC</a></li>
+</ul>
@@ -0,0 +1,164 @@
+
+{% set page_width = '960px' %}
+{% set sidebar_width = '220px' %}
+
+@import url("http://fonts.googleapis.com/css?family=Inconsolata|Open+Sans:400italic,600italic,700italic,400,600,700");
+@import url("basic.css");
+
+/* Layout */
+
+html {
+ font: 62.5% 'Open Sans', sans-serif;
+}
+
+body {
+ background: -webkit-gradient(linear, 50% 0%, 50% 175, color-stop(0%, #ccc), color-stop(100%, #f6f6f6));
+ background: -webkit-linear-gradient(top, #ccc 0%, #f6f6f6 175px);
+ background: -moz-linear-gradient(top, #ccc 0%, #f6f6f6 175px);
+ background: -o-linear-gradient(top, #ccc 0%, #f6f6f6 175px);
+ background: linear-gradient(top, #ccc 0%, #f6f6f6 175px);
+ background-color: #f6f6f6;
+ background-repeat: no-repeat;
+ font-size: 1.5em;
+ margin: 0;
+ padding: 0;
+ text-shadow: 1px 1px rgba(0, 0, 0, 0.1);
+}
+
+div.document {
+ margin: 0px auto;
+ width: {{ page_width }};
+}
+
+div.documentwrapper {
+ float: left;
+ width: 100%;
+}
+
+div.bodywrapper {
+ margin: 0 0 0 {{ sidebar_width }};
+}
+
+div.sphinxsidebarwrapper {
+ padding: 20px 5px 0px 10px;
+}
+
+div.sphinxsidebar {
+ width: {{ sidebar_width }};
+}
+
+div.related {
+ display: none;
+}
+
+/* Style */
+
+a {
+ color: #369;
+ text-decoration: underline;
+}
+
+a:hover, a:focus, a:active {
+ color: #c63;
+}
+
+div.sphinxsidebar .logo {
+ margin-top: 0px;
+}
+
+div.sphinxsidebar .logo a {
+ color: #000;
+ font-weight: normal;
+ text-decoration: none;
+}
+
+div.sphinxsidebar .logo a:hover,
+div.sphinxsidebar .logo a:focus,
+div.sphinxsidebar .logo a:active {
+ color: #036;
+}
+
+div.sphinxsidebar input[type="submit"] {
+ padding: 2px 5px;
+}
+
+div.sphinxsidebar ul {
+ padding: 0;
+}
+
+div.sphinxsidebar ul ul {
+ padding: 0 0 0 10px;
+}
+
+div.body {
+ /*-webkit-border-top-left-radius: 5px;
+ -webkit-border-top-right-radius: 5px;
+ -moz-border-radius-topleft: 5px;
+ -moz-border-radius-topright: 5px;
+ border-top-left-radius: 5px;
+ border-top-right-radius: 5px;
+ background: #fff;*/
+ line-height: 1.4;
+ padding: 20px;
+}
+
+div.body > :first-child,
+div.body > .section > :first-child {
+ margin-top: 0px;
+}
+
+div.body > :last-child {
+ margin-top: 0px;
+}
+
+div.footer {
+ background: #15181a;
+ color: #fff;
+ font-size: .8em;
+ text-align: center;
+ padding: 10px 0px;
+}
+
+div.footer a {
+ color: #eee;
+}
+
+
+/* Code highlighting */
+
+tt {
+ font-size: 1.1em;
+}
+
+div.highlight {
+ background: #fff;
+ border: #ccc 1px solid;
+ border-left-width: 3px;
+ font-size: 1.1em;
+ padding: 10px;
+}
+
+div.highlight pre {
+ margin: 0px;
+}
+
+
+/* Homepage */
+
+ul.screenshots {
+ list-style-type: none;
+ margin-left: 30px;
+ padding: 0px;
+}
+
+ul.screenshots li {
+ display: inline;
+}
+
+ul.screenshots li a {
+ text-decoration: none;
+}
+
+p.biglink:first-child {
+ margin-top: 0px;
+}
@@ -0,0 +1,6 @@
+[theme]
+inherit = basic
+stylesheet = qtile.css
+
+[options]
+touch_icon =
View
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+rm -rf _build/*
+
+while [ true ]; do
+ make html
+ sleep 5
+done
View
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
#
# Qtile documentation build configuration file, created by
-# sphinx-quickstart on Sat Dec 3 13:11:54 2011.
+# sphinx-quickstart on Sat Feb 11 15:20:21 2012.
#
# This file is execfile()d with the current directory set to its containing dir.
#
@@ -16,7 +16,7 @@
# 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('_themes'))
# -- General configuration -----------------------------------------------------
@@ -25,7 +25,7 @@
# 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.autodoc', 'sphinx.ext.intersphinx']
+extensions = []
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
@@ -41,16 +41,16 @@
# General information about the project.
project = u'Qtile'
-copyright = u'2011, Aldo Cortesi'
+copyright = u'2012, Aldo Cortesi and contributers'
# 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 = '0.1'
+version = '0.4'
# The full version, including alpha/beta/rc tags.
-release = '0.1.1'
+release = '0.4'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
@@ -81,7 +81,7 @@
#show_authors = False
# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'friendly'
# A list of ignored prefixes for module index sorting.
#modindex_common_prefix = []
@@ -91,15 +91,15 @@
# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
-html_theme = 'default'
+html_theme = 'qtile'
# 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 = {}
# Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
+html_theme_path = ['_themes']
# The name for this set of Sphinx documents. If None, it defaults to
# "<project> v<release> documentation".
@@ -115,7 +115,7 @@
# 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 = 'favicon.png'
# 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,
@@ -131,17 +131,20 @@
#html_use_smartypants = True
# Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
+html_sidebars = {
+ #'index': ['sidebar_intro.html', 'searchbox.html'],
+ '**': ['sidebar_intro.html', 'localtoc.html', 'relations.html', 'sourcelink.html', 'searchbox.html']
+}
# Additional templates that should be rendered to pages, maps page names to
# template names.
-#html_additional_pages = {}
+#html_additional_pages = {'index': 'index.html'}
# 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
@@ -228,7 +231,7 @@
# dir menu entry, description, category)
texinfo_documents = [
('index', 'Qtile', u'Qtile Documentation',
- u'Aldo Cortesi', 'Qtile', 'One line description of project.',
+ u'Aldo Cortesi', 'Qtile', 'A hackable tiling window manager.',
'Miscellaneous'),
]
@@ -240,7 +243,3 @@
# How to display URL addresses: 'footnote', 'no', or 'inline'.
#texinfo_show_urls = 'footnote'
-
-
-# Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'http://docs.python.org/': None}
Oops, something went wrong.

0 comments on commit 34be6d4

Please sign in to comment.