[hamster-applet] removed keybinding pref as we are using global keybindings now. also removed redundant headings.
- From: Toms Baugis <tbaugis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [hamster-applet] removed keybinding pref as we are using global keybindings now. also removed redundant headings.
- Date: Wed, 26 May 2010 09:56:39 +0000 (UTC)
commit c9abfb39701c15af55b59e58b5518d1c844e6dff
Author: Toms Bauģis <toms baugis gmail com>
Date: Wed May 26 10:56:31 2010 +0100
removed keybinding pref as we are using global keybindings now.
also removed redundant headings.
data/preferences.ui | 851 +++++++++++++++++++-----------------------
src/hamster/configuration.py | 1 -
src/hamster/preferences.py | 4 -
3 files changed, 388 insertions(+), 468 deletions(-)
---
diff --git a/data/preferences.ui b/data/preferences.ui
index 58ce9a8..fbe1a1c 100644
--- a/data/preferences.ui
+++ b/data/preferences.ui
@@ -23,6 +23,7 @@
<child>
<object class="GtkVBox" id="big_box">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">8</property>
<child>
<object class="GtkNotebook" id="notebook1">
@@ -38,164 +39,152 @@
<child>
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">20</property>
<child>
- <object class="GtkFrame" id="frame3">
+ <object class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="top_padding">4</property>
+ <property name="left_padding">4</property>
+ <property name="right_padding">4</property>
<child>
- <object class="GtkAlignment" id="alignment4">
+ <object class="GtkVBox" id="vbox7">
<property name="visible">True</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">4</property>
<child>
- <object class="GtkVBox" id="vbox7">
+ <object class="GtkCheckButton" id="shutdown_track">
+ <property name="label" translatable="yes">Stop tracking on shutdown</property>
<property name="visible">True</property>
- <property name="spacing">8</property>
- <child>
- <object class="GtkCheckButton" id="shutdown_track">
- <property name="label" translatable="yes">Stop tracking on shutdown</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_shutdown_track_toggled"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="idle_track">
- <property name="label" translatable="yes">Stop tracking when computer becomes idle</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_idle_track_toggled"/>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_shutdown_track_toggled"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="idle_track">
+ <property name="label" translatable="yes">Stop tracking when computer becomes idle</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_idle_track_toggled"/>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="notification_preference_frame">
+ <property name="visible">True</property>
+ <property name="no_show_all">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
<child>
- <object class="GtkFrame" id="notification_preference_frame">
+ <object class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
- <property name="no_show_all">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="left_padding">12</property>
<child>
- <object class="GtkAlignment" id="alignment3">
+ <object class="GtkVBox" id="vbox3">
<property name="visible">True</property>
- <property name="left_padding">12</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkVBox" id="vbox3">
+ <object class="GtkHScale" id="notify_interval">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">adjustment1</property>
+ <property name="show_fill_level">True</property>
+ <property name="restrict_to_fill_level">False</property>
+ <property name="digits">0</property>
+ <property name="value_pos">bottom</property>
+ <signal name="value_changed" handler="on_notify_interval_value_changed"/>
+ <signal name="format_value" handler="on_notify_interval_format_value"/>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="top_padding">8</property>
+ <property name="left_padding">4</property>
<child>
- <object class="GtkHScale" id="notify_interval">
+ <object class="GtkCheckButton" id="notify_on_idle">
+ <property name="label" translatable="yes">Also remind when no activity is set</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">adjustment1</property>
- <property name="show_fill_level">True</property>
- <property name="restrict_to_fill_level">False</property>
- <property name="digits">0</property>
- <property name="value_pos">bottom</property>
- <signal name="value_changed" handler="on_notify_interval_value_changed"/>
- <signal name="format_value" handler="on_notify_interval_format_value"/>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment1">
- <property name="visible">True</property>
- <property name="top_padding">8</property>
- <property name="left_padding">4</property>
- <child>
- <object class="GtkCheckButton" id="notify_on_idle">
- <property name="label" translatable="yes">Also remind when no activity is set</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_notify_on_idle_toggled"/>
- </object>
- </child>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_notify_on_idle_toggled"/>
</object>
- <packing>
- <property name="position">1</property>
- </packing>
</child>
</object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
</child>
- <child type="label">
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Remind of current activity every:</property>
- <property name="use_underline">True</property>
- </object>
- </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Remind of current activity every:</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="padding">8</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox1">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">New day starts at</property>
</object>
<packing>
- <property name="padding">8</property>
- <property name="position">2</property>
+ <property name="expand">False</property>
+ <property name="padding">4</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox1">
+ <object class="GtkAlignment" id="day_start_placeholder">
<property name="visible">True</property>
<child>
- <object class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="label" translatable="yes">New day starts at</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="padding">4</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="day_start_placeholder">
- <property name="visible">True</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
<placeholder/>
</child>
</object>
<packing>
- <property name="position">3</property>
+ <property name="expand">False</property>
+ <property name="position">1</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
</object>
+ <packing>
+ <property name="position">3</property>
+ </packing>
</child>
</object>
</child>
- <child type="label">
- <object class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Tracking</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
</object>
<packing>
<property name="expand">False</property>
@@ -211,14 +200,15 @@
<object class="GtkAlignment" id="alignment11">
<property name="visible">True</property>
<property name="top_padding">8</property>
- <property name="left_padding">12</property>
+ <property name="left_padding">16</property>
+ <property name="right_padding">4</property>
<child>
<object class="GtkHBox" id="hbox4">
<property name="visible">True</property>
<child>
<object class="GtkLabel" id="label12">
<property name="visible">True</property>
- <property name="label" translatable="yes">Use following todo list:</property>
+ <property name="label" translatable="yes">Use following todo list if available:</property>
</object>
<packing>
<property name="expand">False</property>
@@ -244,6 +234,7 @@
<child type="label">
<object class="GtkLabel" id="label11">
<property name="visible">True</property>
+ <property name="xpad">4</property>
<property name="label" translatable="yes">Integration</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -256,43 +247,6 @@
<property name="position">1</property>
</packing>
</child>
- <child>
- <object class="GtkFrame" id="frame1">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment" id="alignment6">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xscale">0.10000000149011612</property>
- <property name="top_padding">8</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkEntry" id="keybinding">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- <signal name="changed" handler="on_keybinding_changed"/>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label7">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Global Hotkey</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
</object>
</child>
</object>
@@ -300,7 +254,7 @@
<child type="tab">
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
- <property name="label" translatable="yes">General</property>
+ <property name="label" translatable="yes">Tracking</property>
</object>
<packing>
<property name="tab_fill">False</property>
@@ -316,36 +270,89 @@
<child>
<object class="GtkVBox" id="vbox2">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">15</property>
<child>
- <object class="GtkFrame" id="frame2">
- <property name="height_request">200</property>
+ <object class="GtkAlignment" id="alignment7">
<property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="top_padding">6</property>
<child>
- <object class="GtkAlignment" id="alignment7">
+ <object class="GtkHPaned" id="hpaned1">
<property name="visible">True</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="can_focus">True</property>
<child>
- <object class="GtkHPaned" id="hpaned1">
+ <object class="GtkVBox" id="vbox4">
+ <property name="width_request">150</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">4</property>
<child>
- <object class="GtkVBox" id="vbox4">
- <property name="width_request">150</property>
+ <object class="GtkLabel" id="categories_label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="spacing">4</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Categories</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">category_list</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
- <object class="GtkLabel" id="categories_label">
+ <object class="GtkTreeView" id="category_list">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Categories</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">category_list</property>
+ <property name="headers_visible">False</property>
+ <property name="enable_search">False</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="category_list-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Category list</property>
+ </object>
+ </child>
+ <signal name="button_press_event" handler="on_category_list_button_pressed"/>
+ <signal name="drag_motion" handler="on_category_list_drag_motion"/>
+ <signal name="key_press_event" handler="on_category_list_key_pressed"/>
+ <signal name="button_release_event" handler="on_category_list_button_released"/>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox3">
+ <property name="visible">True</property>
+ <property name="spacing">4</property>
+ <child>
+ <object class="GtkButton" id="category_add">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="category_add-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Add category</property>
+ </object>
+ </child>
+ <signal name="clicked" handler="on_category_add_clicked"/>
+ <child>
+ <object class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="icon_name">list-add</property>
+ </object>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -353,137 +360,145 @@
</packing>
</child>
<child>
- <object class="GtkScrolledWindow" id="scrolledwindow2">
+ <object class="GtkButton" id="category_remove">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">in</property>
+ <property name="receives_default">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="category_remove-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Remove category</property>
+ </object>
+ </child>
+ <signal name="clicked" handler="on_category_remove_clicked"/>
<child>
- <object class="GtkTreeView" id="category_list">
+ <object class="GtkImage" id="image2">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="headers_visible">False</property>
- <property name="enable_search">False</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="category_list-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Category list</property>
- </object>
- </child>
- <signal name="button_press_event" handler="on_category_list_button_pressed"/>
- <signal name="drag_motion" handler="on_category_list_drag_motion"/>
- <signal name="key_press_event" handler="on_category_list_key_pressed"/>
- <signal name="button_release_event" handler="on_category_list_button_released"/>
+ <property name="icon_name">list-remove</property>
</object>
</child>
</object>
<packing>
+ <property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox3">
+ <object class="GtkButton" id="category_edit">
<property name="visible">True</property>
- <property name="spacing">4</property>
- <child>
- <object class="GtkButton" id="category_add">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="category_add-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Add category</property>
- </object>
- </child>
- <signal name="clicked" handler="on_category_add_clicked"/>
- <child>
- <object class="GtkImage" id="image1">
- <property name="visible">True</property>
- <property name="icon_name">list-add</property>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="category_edit-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Edit category</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
</child>
+ <signal name="clicked" handler="on_category_edit_clicked"/>
<child>
- <object class="GtkButton" id="category_remove">
+ <object class="GtkImage" id="image3">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="category_remove-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Remove category</property>
- </object>
- </child>
- <signal name="clicked" handler="on_category_remove_clicked"/>
- <child>
- <object class="GtkImage" id="image2">
- <property name="visible">True</property>
- <property name="icon_name">list-remove</property>
- </object>
- </child>
+ <property name="icon_name">gtk-edit</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="resize">False</property>
+ <property name="shrink">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox5">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">4</property>
+ <child>
+ <object class="GtkLabel" id="activities_label">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Activities</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">activity_list</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment8">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
- <object class="GtkButton" id="category_edit">
+ <object class="GtkTreeView" id="activity_list">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="headers_visible">False</property>
+ <property name="rules_hint">True</property>
+ <property name="enable_search">False</property>
+ <property name="enable_tree_lines">True</property>
<child internal-child="accessible">
- <object class="AtkObject" id="category_edit-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Edit category</property>
- </object>
- </child>
- <signal name="clicked" handler="on_category_edit_clicked"/>
- <child>
- <object class="GtkImage" id="image3">
- <property name="visible">True</property>
- <property name="icon_name">gtk-edit</property>
+ <object class="AtkObject" id="activity_list-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Activity list</property>
</object>
</child>
+ <signal name="button_press_event" handler="on_activity_list_button_pressed"/>
+ <signal name="drag_motion" handler="on_activity_list_drag_motion"/>
+ <signal name="key_press_event" handler="on_activity_list_key_pressed"/>
+ <signal name="button_release_event" handler="on_activity_list_button_released"/>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <placeholder/>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
</child>
</object>
<packing>
- <property name="resize">False</property>
- <property name="shrink">True</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkVBox" id="vbox5">
+ <object class="GtkHBox" id="hbox2">
<property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">4</property>
<child>
- <object class="GtkLabel" id="activities_label">
+ <object class="GtkButton" id="activity_add">
<property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Activities</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">activity_list</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="activity_add-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Add activity</property>
+ </object>
+ </child>
+ <signal name="clicked" handler="on_activity_add_clicked"/>
+ <child>
+ <object class="GtkImage" id="image4">
+ <property name="visible">True</property>
+ <property name="icon_name">list-add</property>
+ </object>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -491,190 +506,114 @@
</packing>
</child>
<child>
- <object class="GtkAlignment" id="alignment8">
+ <object class="GtkButton" id="activity_remove">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="activity_remove-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Remove activity</property>
+ </object>
+ </child>
+ <signal name="clicked" handler="on_activity_remove_clicked"/>
<child>
- <object class="GtkScrolledWindow" id="scrolledwindow1">
+ <object class="GtkImage" id="image5">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkTreeView" id="activity_list">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="headers_visible">False</property>
- <property name="rules_hint">True</property>
- <property name="enable_search">False</property>
- <property name="enable_tree_lines">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="activity_list-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Activity list</property>
- </object>
- </child>
- <signal name="button_press_event" handler="on_activity_list_button_pressed"/>
- <signal name="drag_motion" handler="on_activity_list_drag_motion"/>
- <signal name="key_press_event" handler="on_activity_list_key_pressed"/>
- <signal name="button_release_event" handler="on_activity_list_button_released"/>
- </object>
- </child>
+ <property name="icon_name">list-remove</property>
</object>
</child>
</object>
<packing>
+ <property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox2">
+ <object class="GtkButton" id="activity_edit">
<property name="visible">True</property>
- <property name="spacing">4</property>
- <child>
- <object class="GtkButton" id="activity_add">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="activity_add-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Add activity</property>
- </object>
- </child>
- <signal name="clicked" handler="on_activity_add_clicked"/>
- <child>
- <object class="GtkImage" id="image4">
- <property name="visible">True</property>
- <property name="icon_name">list-add</property>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="activity_edit-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Edit activity</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
</child>
+ <signal name="clicked" handler="on_activity_edit_clicked"/>
<child>
- <object class="GtkButton" id="activity_remove">
+ <object class="GtkImage" id="image6">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="activity_remove-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Remove activity</property>
- </object>
- </child>
- <signal name="clicked" handler="on_activity_remove_clicked"/>
- <child>
- <object class="GtkImage" id="image5">
- <property name="visible">True</property>
- <property name="icon_name">list-remove</property>
- </object>
- </child>
+ <property name="icon_name">gtk-edit</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
</child>
- <child>
- <object class="GtkButton" id="activity_edit">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="activity_edit-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Edit activity</property>
- </object>
- </child>
- <signal name="clicked" handler="on_activity_edit_clicked"/>
- <child>
- <object class="GtkImage" id="image6">
- <property name="visible">True</property>
- <property name="icon_name">gtk-edit</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="activity_up">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="activity_up-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Move activity up</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
</child>
+ <signal name="clicked" handler="on_activity_up_clicked"/>
<child>
- <object class="GtkButton" id="activity_up">
+ <object class="GtkImage" id="image7">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="activity_up-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Move activity up</property>
- </object>
- </child>
- <signal name="clicked" handler="on_activity_up_clicked"/>
- <child>
- <object class="GtkImage" id="image7">
- <property name="visible">True</property>
- <property name="icon_name">up</property>
- </object>
- </child>
+ <property name="icon_name">up</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="position">3</property>
- </packing>
</child>
- <child>
- <object class="GtkButton" id="activity_down">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="activity_down-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Move activity down</property>
- </object>
- </child>
- <signal name="clicked" handler="on_activity_down_clicked"/>
- <child>
- <object class="GtkImage" id="image8">
- <property name="visible">True</property>
- <property name="icon_name">down</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="activity_down">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="activity_down-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Move activity down</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="position">4</property>
- </packing>
</child>
+ <signal name="clicked" handler="on_activity_down_clicked"/>
<child>
- <placeholder/>
+ <object class="GtkImage" id="image8">
+ <property name="visible">True</property>
+ <property name="icon_name">down</property>
+ </object>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="position">2</property>
+ <property name="position">4</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
- <property name="resize">True</property>
- <property name="shrink">True</property>
+ <property name="expand">False</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
+ <packing>
+ <property name="resize">True</property>
+ <property name="shrink">True</property>
+ </packing>
</child>
</object>
</child>
- <child type="label">
- <object class="GtkLabel" id="label6">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Activities</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
</object>
<packing>
<property name="position">0</property>
@@ -702,6 +641,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="wrap_mode">word-char</property>
+ <property name="left_margin">4</property>
+ <property name="right_margin">4</property>
<property name="buffer">autocomplete_tags</property>
<property name="accepts_tab">False</property>
<signal name="focus_out_event" handler="on_autocomplete_tags_view_focus_out_event"/>
@@ -754,24 +695,37 @@
<child>
<object class="GtkVBox" id="vbox8">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkFrame" id="workspace_frame">
+ <object class="GtkAlignment" id="alignment10">
<property name="visible">True</property>
- <property name="no_show_all">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="top_padding">6</property>
<child>
- <object class="GtkAlignment" id="alignment10">
+ <object class="GtkVBox" id="vbox6">
<property name="visible">True</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">8</property>
<child>
- <object class="GtkVBox" id="vbox6">
+ <object class="GtkCheckButton" id="workspace_tracking_memory">
+ <property name="label" translatable="yes">Resume the last activity when returning to a workspace</property>
<property name="visible">True</property>
- <property name="spacing">8</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_workspace_tracking_toggled"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox9">
+ <property name="visible">True</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkCheckButton" id="workspace_tracking_memory">
- <property name="label" translatable="yes">Resume the last activity when returning to a workspace</property>
+ <object class="GtkCheckButton" id="workspace_tracking_name">
+ <property name="label" translatable="yes">Start new activity when switching workspaces:</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -784,46 +738,24 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="vbox9">
+ <object class="GtkAlignment" id="alignment12">
<property name="visible">True</property>
+ <property name="top_padding">5</property>
+ <property name="left_padding">24</property>
<child>
- <object class="GtkCheckButton" id="workspace_tracking_name">
- <property name="label" translatable="yes">Start new activity when switching workspaces:</property>
+ <object class="GtkScrolledWindow" id="scrolledwindow5">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_workspace_tracking_toggled"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment12">
- <property name="visible">True</property>
- <property name="top_padding">5</property>
- <property name="left_padding">24</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
- <object class="GtkScrolledWindow" id="scrolledwindow5">
+ <object class="GtkTreeView" id="workspace_list">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkTreeView" id="workspace_list">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- </object>
- </child>
</object>
</child>
</object>
- <packing>
- <property name="position">1</property>
- </packing>
</child>
</object>
<packing>
@@ -831,19 +763,12 @@
</packing>
</child>
</object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
</child>
- <child type="label">
- <object class="GtkLabel" id="label9">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Workspaces</property>
- <property name="use_markup">True</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
</object>
<packing>
<property name="position">0</property>
diff --git a/src/hamster/configuration.py b/src/hamster/configuration.py
index c30daa3..7d85da9 100644
--- a/src/hamster/configuration.py
+++ b/src/hamster/configuration.py
@@ -170,7 +170,6 @@ class GConfStore(gobject.GObject, Singleton):
'notify_on_idle' : False, # Remind also if no activity is set
'notify_interval' : 27, # Remind of current activity every X minutes
'day_start_minutes' : 5 * 60 + 30, # At what time does the day start (5:30AM)
- 'keybinding' : "<Super>H", # Key binding to summon hamster
'overview_window_box' : [], # X, Y, W, H
'overview_window_maximized' : False, # Is overview window maximized
'workspace_tracking' : [], # Should hamster switch activities on workspace change 0,1,2
diff --git a/src/hamster/preferences.py b/src/hamster/preferences.py
index 561e522..37cf547 100755
--- a/src/hamster/preferences.py
+++ b/src/hamster/preferences.py
@@ -281,7 +281,6 @@ class PreferencesEditor:
self.get_widget("shutdown_track").set_active(conf.get("stop_on_shutdown"))
self.get_widget("idle_track").set_active(conf.get("enable_timeout"))
self.get_widget("notify_interval").set_value(conf.get("notify_interval"))
- self.get_widget("keybinding").set_text(conf.get("keybinding"))
self.get_widget("notify_on_idle").set_active(conf.get("notify_on_idle"))
self.get_widget("notify_on_idle").set_sensitive(conf.get("notify_interval") <=120)
@@ -788,9 +787,6 @@ class PreferencesEditor:
conf.set("notify_interval", value)
self.get_widget("notify_on_idle").set_sensitive(value <= 120)
- def on_keybinding_changed(self, textbox):
- conf.set("keybinding", textbox.get_text().decode('utf8', 'replace'))
-
def on_day_start_changed(self, widget):
day_start = self.day_start.get_time()
if day_start is None:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
