diff options
author | Barry Warsaw <barry@python.org> | 2011-09-21 14:46:19 -0400 |
---|---|---|
committer | Barry Warsaw <barry@python.org> | 2011-09-21 14:46:19 -0400 |
commit | f23cd817b48596ea2e2f011c4535e7fe91443a9c (patch) | |
tree | ee461097aebb384795296cddb2635235d8dd390e | |
parent | 4b26858ddc51a59c860ad052a619cb7de5d8b1d7 (diff) |
Update NEWS and HACKING files, and fix a typo.0.7.0
-rw-r--r-- | HACKING.txt | 42 | ||||
-rw-r--r-- | NEWS.txt | 114 | ||||
-rwxr-xr-x | src/gtimelog/main.py | 2 |
3 files changed, 79 insertions, 79 deletions
diff --git a/HACKING.txt b/HACKING.txt index 482f72a..125d30d 100644 --- a/HACKING.txt +++ b/HACKING.txt @@ -19,41 +19,55 @@ report bugs or feature requests. If you don't want to create a Launchpad account for some reason, feel free to send me an email at <marius@gedmin.as>. +Update 2011-09-21: Marius has handed over project management to Barry Warsaw, +so you can contact me directly if you want: <barry@python.org>. + Creating a patch ---------------- -Here's how you can create and send me a a patch. You'll need the `Bazaar -<http://bazaar.canonical.com/en/>`_ version control system installed on your -computer, as well as the usual stuff needed to run GTimeLog (`Python -<http://python.org/>`_, and `PyGtk <http://pygtk.org/>`_ or the GTK and Pango -gobject-introspection typelibs). +`Merge proposals <https://help.launchpad.net/Code/BugAndBlueprintLinks>`_ are +the preferred way to submit patches. It's best if you submit a bug report, +branch lp:gtimelog, push your personal branch, link it to the bug report, and +submit a merge proposal. The Launchpad help page above, and examples below, +can provide information on how to do that - it's not nearly as daunting as it +sounds. :) + +You'll need the `Bazaar <http://bazaar.canonical.com/en/>`_ version control +system installed on your computer, as well as the usual stuff needed to run +GTimeLog (`Python <http://python.org/>`_, and `PyGtk <http://pygtk.org/>`_ or +the GTK and Pango gobject-introspection typelibs). First, get a copy of the source code:: - bzr branch lp:gtimelog + $ bzr branch lp:gtimelog You can run it without installing:: - cd gtimelog - ./gtimelog + $ cd gtimelog + $ ./gtimelog Change the code in ``src/gtimelog/*.py``, play around, run the test suite :: - ./runtests + $ python setup.py test When you're happy with the results, describe your change in ``NEWS.txt`` and commit :: - bzr commit + $ bzr commit + +`Publish your branch <https://help.launchpad.net/Code/UploadingABranch>`_ on +Launchpad with :: -`Publish your branch <https://help.launchpad.net/Code/UploadingABranch>`_ on Launchpad with :: + $ bzr push lp:~you/gtimelog/branch-name - bzr push lp:~userid/gtimelog/branch-name +where `you` is your Launchpad user id, and `branch-name` can be anything you +want. -and create a merge request through the Launchpad web interface +Create a merge proposal through the Launchpad web interface (``https://code.launchpad.net/~userid/gtimelog/branch-name/+register-merge``), or with :: - bzr lp-submit + $ bzr lp-submit +I'll see your merge proposal and will act on it as soon as possible. @@ -1,34 +1,42 @@ -Changes in version 0.6.1 (released 2011-09-20) -============================================== - +0.7.0 (2011-09-21) +================== +* Use gobject-introspection by default, using pygtk only as a fallback. This + will require a newer gir1.2-pango-1.0 than what's in Ubuntu Oneiric + (LP: #855076) and still suffers from key presses being ignored + (LP: #849732). Unset the environment variable UBUNTU_MENUPROXY to work + around the latter bug. +* Rework the gi/pygtk imports so that only the minimum is wrapped in a + try-except. +* Use /usr/bin/env python in #! line, though this should be hard-coded to the + installed version of Python in the Debian package. +* Other code cleanup (e.g. use new-style classes via __metaclass__, remove + ancient workaround for missing `set` built-in). + + +0.6.1 (2011-09-20) +================== * Fix two crashes when using GI. Given by Martin Pitt. -Changes in version 0.6.0 (released 2011-08-23) -============================================== - +0.6.0 (2011-08-23) +================== * Ctrl-Q now quits. (LP: #750092) - * Fixed UnboundLocalError. (LP: #778285) Given by Jeroen Langeveld. - * Ported from PyGTK to GI. This supports GTK 2 and GTK 3 with GI now, but still works with PyGTK. + Contributed by Martin Pitt <martin.pitt@ubuntu.com>. Packager's note: If you want to use GI, you need to change the package's dependencies from pygtk to the package that provides the GTK and Pango typelibs (e. g. gir1.2-gtk-2.0 and gir1.2-pango-1.0 on Debian/Ubuntu). It also requires pygobject >= 2.27.1. - Contributed by Martin Pitt <martin.pitt@ubuntu.com>. - * Hide the main window on Esc. Fixes LP: #716257. - Contributed by Vladislav Naumov (https://launchpad.net/~vnaum). -Changes in version 0.5.0 (released 2011-01-28) -============================================== - +0.5.0 (2011-01-28) +================== * Switched from Glade to GtkBuilder. This fixes those strange theme problems GTimeLog had with Ubuntu's Radiance and especially Ambiance. (LP: #644393) @@ -39,7 +47,6 @@ Changes in version 0.5.0 (released 2011-01-28) * GTimeLog now supports Ubuntu's application indicators. There's a new configuration option, ``prefer_app_indicator``, defaulting to true. Fixes LP: #523461. - * GTimeLog tries to detect your theme color and make the tray icon dark or bright, for good contrast. This is a hack that doesn't work reliably, but is better than nothing. Fixes LP: #700428. @@ -52,15 +59,16 @@ Changes in version 0.5.0 (released 2011-01-28) The following command line options are supported:: gtimelog --ignore-dbus - always launch a new application instance, do not start the DBus service + Always launch a new application instance, do not start the DBus + service. gtimelog --toggle - if GtimeLog already running, show or hide the GTimeLog window, - otherwise launch a new application instance + If GtimeLog already running, show or hide the GTimeLog window, + otherwise launch a new application instance. gtimelog - if GtimeLog already running, bring the GTimeLog window to the front, - otherwise launch a new application instance + If GtimeLog already running, bring the GTimeLog window to the front, + otherwise launch a new application instance. Contributed by Bruce van der Kooij (https://launchpad.net/~brucevdk), Fixes LP: #356495. @@ -68,46 +76,35 @@ Changes in version 0.5.0 (released 2011-01-28) * New option: start_in_tray. Defaults to false. Contributed by Bruce van der Kooij (https://launchpad.net/~brucevdk), as part of his patch for LP: #356495. - * New command-line option: --tray. Makes GTimeLog start minimized, or exit without doing anything if it's already running. - * Added some documentation for contributors: HACKING.txt. - * Daily reports include totals by category. Contributed by Laurynas Speičys <laurynas@pov.lt>. - * The tasks pane can be toggled by pressing F9 and has a close button. - * Alternative weekly and monthly report style, can be chosen by adding ``report_style = categorized`` to ~/.gtimelog/gtimelogrc. Contributed by Laurynas Speičys <laurynas@pov.lt>. - * Bugfix: always preserve the order of entries, even when they have the same timestamp (LP: #708825). -Changes in version 0.4.0 (released 2010-09-03) -============================================== - +0.4.0 (2010-09-03) +================== * Added configuration variable 'chronological' to control initial view of either Chronological (True) or Grouped (False). Contributed by Barry Warsaw <barry@python.org> (LP: #628876) - * Recognize $GTIMELOG_HOME environment variable to use something other than ~/.gtimelog as the configuration directory. Contributed by Barry Warsaw <barry@python.org> (LP: #628873) - * Changed application name to 'GTimeLog Time Tracker' in the desktop file (Debian #595280) -Changes in version 0.3.2 (released 2010-07-22) -============================================== - +0.3.2 (2010-07-22) +================== * Double-clicking a category in task list tries hard to focus the input box (fixes: https://bugs.launchpad.net/gtimelog/+bug/608734). - * Change default mailer to quote the command passed to x-terminal-emulator -e; this makes it work with Terminator (also tested with xterm and gnome-terminal). Fixes https://bugs.launchpad.net/gtimelog/+bug/592552. @@ -136,17 +133,15 @@ Changes in version 0.3.2 (released 2010-07-22) spreadsheet = xdg-open %s -Changes in version 0.3.1 (released 2009-12-18) -============================================== - +0.3.1 (2009-12-18) +================== * Fixed broken sdist (by adding MANIFEST.in, since setuptools doesn't understand bzr by default). * Added Makefile for convenience (make distcheck, make release). -Changes in version 0.3 (released 2009-12-17) -============================================ - +0.3 (2009-12-17) +================ * Fix DeprecationWarning: the sets module is deprecated. * Use gtk.StatusIcon if egg.trayicon is not available (https://bugs.launchpad.net/gtimelog/+bug/209798). @@ -164,17 +159,14 @@ gtimelog.main. If you have wrapper scripts that used to import 'main' from gtimelog.gtimelog, you'll have to change them. -Changes in version 0.2.5 -======================== - +0.2.5 +===== * Don't open a console window on Windows. - * Moved the primary GTimeLog source repository to Bazaar hosted on Launchpad. -Changes in version 0.2.4 -======================== - +0.2.4 +===== * Show time spent at the office (https://bugs.launchpad.net/gtimelog/+bug/238515). * Closing the main window minimizes GTimeLog to the system tray @@ -183,39 +175,34 @@ Changes in version 0.2.4 (https://bugs.launchpad.net/bugs/291356) -Changes in version 0.2.3 -======================== - +0.2.3 +===== * Fix duplicates in the completion popup after you reload the log file (https://bugs.launchpad.net/gtimelog/+bug/238505). * Change status to Beta in setup.py -- while I still consider it to be less polished than it should, there are people who find it useful already. -Changes in version 0.2.2 -======================== - +0.2.2 +===== * Tweak setup.py to get a sane page at http://pypi.python.org/pypi/gtimelog/ -Changes in version 0.2.1 -======================== - +0.2.1 +===== * Entries with `***` are skipped from reports (bug 209750) * Help -> Online Documentation opens a browser with some help (bug 209754) * View -> Tasks allows you to hide the Tasks pane (bug 220773) -Changes in version 0.2.0 -======================== - +0.2.0 +===== * Reorganize the source tree properly. * Bump intermediate revision number to celebrate. -Changes in version 0.0.85 -========================= - +0.0.85 +====== * First setuptools-based release (`easy_install gtimelog` now works). @@ -224,4 +211,3 @@ Changes in older versions You'll have to dig through Subversion logs to discover those, if you're really that interested: http://mg.pov.lt/gtimelog/trac/log - diff --git a/src/gtimelog/main.py b/src/gtimelog/main.py index 7a41899..5a780b5 100755 --- a/src/gtimelog/main.py +++ b/src/gtimelog/main.py @@ -2,7 +2,7 @@ """An application for keeping track of your time.""" # Default to new-style classes. -__metadata__ = type +__metaclass__ = type import os import re |