hamster-applet r886 - trunk/data
- From: tbaugis svn gnome org
- To: svn-commits-list gnome org
- Subject: hamster-applet r886 - trunk/data
- Date: Tue, 7 Apr 2009 20:23:28 +0000 (UTC)
Author: tbaugis
Date: Tue Apr 7 20:23:28 2009
New Revision: 886
URL: http://svn.gnome.org/viewvc/hamster-applet?rev=886&view=rev
Log:
moving from libglade to gtkbuilder.
this time for real. i think
Modified:
trunk/data/applet.ui
trunk/data/edit_activity.ui
trunk/data/preferences.ui
trunk/data/stats.ui
Modified: trunk/data/applet.ui
==============================================================================
--- trunk/data/applet.ui (original)
+++ trunk/data/applet.ui Tue Apr 7 20:23:28 2009
@@ -1,19 +1,20 @@
<?xml version="1.0"?>
-<!--Generated with glade3 3.4.5 on Wed Feb 4 22:28:05 2009 -->
<interface>
+ <requires lib="gtk+" version="2.16"/>
+ <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkWindow" id="hamster-window">
<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 comments="This title appears only when debugging from console. Leave it as is." name="title" translatable="yes">Hamster</property>
+ <property name="title" translatable="yes" comments="This title appears only when debugging from console. Leave it as is.">Hamster</property>
<property name="resizable">False</property>
- <property name="window_position">GTK_WIN_POS_MOUSE</property>
+ <property name="window_position">mouse</property>
<property name="destroy_with_parent">True</property>
<property name="icon_name">hamster-applet</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU</property>
+ <property name="type_hint">dropdown-menu</property>
<property name="skip_taskbar_hint">True</property>
<property name="skip_pager_hint">True</property>
<property name="decorated">False</property>
- <signal handler="on_windows_keys" name="key_press_event"/>
+ <signal name="key_press_event" handler="on_windows_keys"/>
<child>
<object class="GtkEventBox" id="hamster-box">
<property name="visible">True</property>
@@ -23,7 +24,7 @@
<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="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_OUT</property>
+ <property name="shadow_type">out</property>
<child>
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
@@ -45,6 +46,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -56,16 +58,7 @@
<property name="width_request">250</property>
<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>
- <signal handler="on_activity_switched" name="changed"/>
- <child internal-child="entry">
- <object class="GtkEntry" id="current_activity">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <signal handler="on_activity_entered" name="activate"/>
- </object>
- </child>
+ <signal name="changed" handler="on_activity_switched"/>
</object>
</child>
</object>
@@ -75,13 +68,13 @@
</child>
<child>
<object class="GtkButton" id="stop_tracking">
+ <property name="label" translatable="yes">_Stop Tracking</property>
<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="label" translatable="yes">_Stop Tracking</property>
<property name="use_underline">True</property>
- <signal handler="on_stop_tracking" name="clicked"/>
+ <signal name="clicked" handler="on_stop_tracking"/>
</object>
<packing>
<property name="expand">False</property>
@@ -91,6 +84,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -109,9 +103,9 @@
<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">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_NEVER</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">never</property>
+ <property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="today">
<property name="visible">True</property>
@@ -120,12 +114,15 @@
<property name="headers_visible">False</property>
<property name="rules_hint">True</property>
<property name="enable_search">False</property>
- <signal handler="on_todays_keys" name="key_press_event"/>
- <signal handler="on_today_row_activated" name="row_activated"/>
- <signal handler="on_today_release_event" name="button_release_event"/>
+ <signal name="key_press_event" handler="on_todays_keys"/>
+ <signal name="row_activated" handler="on_today_row_activated"/>
+ <signal name="button_release_event" handler="on_today_release_event"/>
</object>
</child>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkLabel" id="fact_totals">
@@ -169,24 +166,27 @@
<property name="spacing">6</property>
<child>
<object class="GtkButton" id="button2">
+ <property name="label" translatable="yes">Ad_d Earlier Activity</property>
<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="label" translatable="yes">Ad_d Earlier Activity</property>
<property name="use_underline">True</property>
- <signal handler="on_custom_fact" name="clicked"/>
+ <signal name="clicked" handler="on_custom_fact"/>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkButton" id="button1">
+ <property name="label" translatable="yes">Show _Overview</property>
<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="label" translatable="yes">Show _Overview</property>
<property name="use_underline">True</property>
- <signal handler="on_overview" name="clicked"/>
+ <signal name="clicked" handler="on_overview"/>
</object>
<packing>
<property name="position">1</property>
@@ -202,7 +202,7 @@
</child>
</object>
</child>
- <child type="label">
+ <child type="label_item">
<placeholder/>
</child>
</object>
Modified: trunk/data/edit_activity.ui
==============================================================================
--- trunk/data/edit_activity.ui (original)
+++ trunk/data/edit_activity.ui Tue Apr 7 20:23:28 2009
@@ -1,15 +1,16 @@
<?xml version="1.0"?>
-<!--Generated with glade3 3.4.5 on Sat Feb 28 22:37:09 2009 -->
<interface>
+ <requires lib="gtk+" version="2.16"/>
+ <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkWindow" id="custom_fact_window">
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="border_width">12</property>
<property name="title" translatable="yes">Add Earlier Activity</property>
<property name="resizable">False</property>
- <property name="window_position">GTK_WIN_POS_CENTER</property>
+ <property name="window_position">center</property>
<property name="icon_name">hamster-applet</property>
- <signal handler="on_window_key_pressed" name="key_press_event"/>
- <signal handler="on_close" name="delete_event"/>
+ <signal name="key_press_event" handler="on_window_key_pressed"/>
+ <signal name="delete_event" handler="on_close"/>
<child>
<object class="GtkVBox" id="vbox2">
<property name="visible">True</property>
@@ -61,13 +62,7 @@
<child>
<object class="GtkComboBoxEntry" id="activity_combo">
<property name="visible">True</property>
- <signal handler="on_activity_combo_changed" name="changed"/>
- <child internal-child="entry">
- <object class="GtkEntry" id="activity_text">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- </object>
- </child>
+ <signal name="changed" handler="on_activity_combo_changed"/>
</object>
</child>
</object>
@@ -90,11 +85,14 @@
<property name="can_focus">True</property>
<property name="width_chars">12</property>
<property name="text" translatable="yes">20/01/09</property>
- <signal handler="on_date_button_press_event" name="button_press_event"/>
- <signal handler="on_date_focus_out_event" name="focus_out_event"/>
- <signal handler="on_date_focus_in_event" name="focus_in_event"/>
- <signal handler="on_date_key_press_event" name="key_press_event"/>
+ <signal name="button_press_event" handler="on_date_button_press_event"/>
+ <signal name="key_press_event" handler="on_date_key_press_event"/>
+ <signal name="focus_out_event" handler="on_date_focus_out_event"/>
+ <signal name="focus_in_event" handler="on_date_focus_in_event"/>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkEntry" id="start_time">
@@ -102,16 +100,19 @@
<property name="can_focus">True</property>
<property name="width_chars">7</property>
<property name="text" translatable="yes">3:30pm</property>
- <signal handler="on_time_button_press_event" name="button_press_event"/>
- <signal handler="on_start_time_focus_out_event" name="focus_out_event"/>
- <signal handler="on_start_time_focus_in_event" name="focus_in_event"/>
- <signal handler="on_time_key_press_event" name="key_press_event"/>
+ <signal name="button_press_event" handler="on_time_button_press_event"/>
+ <signal name="key_press_event" handler="on_time_key_press_event"/>
+ <signal name="focus_out_event" handler="on_start_time_focus_out_event"/>
+ <signal name="focus_in_event" handler="on_start_time_focus_in_event"/>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkLabel" id="label3">
@@ -133,11 +134,14 @@
<property name="can_focus">True</property>
<property name="width_chars">7</property>
<property name="text" translatable="yes">3:30pm</property>
- <signal handler="on_time_button_press_event" name="button_press_event"/>
- <signal handler="on_end_time_focus_out_event" name="focus_out_event"/>
- <signal handler="on_end_time_focus_in_event" name="focus_in_event"/>
- <signal handler="on_time_key_press_event" name="key_press_event"/>
+ <signal name="button_press_event" handler="on_time_button_press_event"/>
+ <signal name="key_press_event" handler="on_time_key_press_event"/>
+ <signal name="focus_out_event" handler="on_end_time_focus_out_event"/>
+ <signal name="focus_in_event" handler="on_end_time_focus_in_event"/>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkEntry" id="end_date">
@@ -145,10 +149,10 @@
<property name="can_focus">True</property>
<property name="width_chars">12</property>
<property name="text" translatable="yes">20/01/08</property>
- <signal handler="on_date_button_press_event" name="button_press_event"/>
- <signal handler="on_date_focus_out_event" name="focus_out_event"/>
- <signal handler="on_date_focus_in_event" name="focus_in_event"/>
- <signal handler="on_date_key_press_event" name="key_press_event"/>
+ <signal name="button_press_event" handler="on_date_button_press_event"/>
+ <signal name="key_press_event" handler="on_date_key_press_event"/>
+ <signal name="focus_out_event" handler="on_date_focus_out_event"/>
+ <signal name="focus_in_event" handler="on_date_focus_in_event"/>
</object>
<packing>
<property name="position">1</property>
@@ -161,11 +165,12 @@
</child>
<child>
<object class="GtkCheckButton" id="in_progress">
+ <property name="label" translatable="yes">in progress</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">in progress</property>
+ <property name="receives_default">False</property>
<property name="draw_indicator">True</property>
- <signal handler="on_in_progress_toggled" name="toggled"/>
+ <signal name="toggled" handler="on_in_progress_toggled"/>
</object>
<packing>
<property name="position">3</property>
@@ -233,15 +238,15 @@
<object class="GtkScrolledWindow" id="scrolledwindow2">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="hscrollbar_policy">never</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
<object class="GtkTextView" id="description">
<property name="height_request">50</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="wrap_mode">GTK_WRAP_WORD_CHAR</property>
+ <property name="wrap_mode">word-char</property>
</object>
</child>
</object>
@@ -255,6 +260,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -269,22 +275,25 @@
<property name="spacing">8</property>
<child>
<object class="GtkButton" id="cancel_button">
+ <property name="label" translatable="yes">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="label" translatable="yes">gtk-cancel</property>
<property name="use_stock">True</property>
- <signal handler="on_cancel_clicked" name="clicked"/>
+ <signal name="clicked" handler="on_cancel_clicked"/>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkButton" id="save_button">
+ <property name="label" translatable="yes">gtk-save</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="label" translatable="yes">gtk-save</property>
<property name="use_stock">True</property>
- <signal handler="on_save_button_clicked" name="clicked"/>
+ <signal name="clicked" handler="on_save_button_clicked"/>
</object>
<packing>
<property name="position">1</property>
@@ -302,9 +311,9 @@
</child>
</object>
<object class="GtkWindow" id="calendar_window">
- <property name="type">GTK_WINDOW_POPUP</property>
+ <property name="type">popup</property>
<property name="resizable">False</property>
- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+ <property name="window_position">center-on-parent</property>
<child>
<object class="GtkAlignment" id="calendar_box">
<property name="visible">True</property>
@@ -315,13 +324,13 @@
</child>
</object>
<object class="GtkWindow" id="time_window">
- <property name="type">GTK_WINDOW_POPUP</property>
+ <property name="type">popup</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="hscrollbar_policy">never</property>
+ <property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="time_tree">
<property name="visible">True</property>
@@ -330,7 +339,7 @@
<property name="enable_search">False</property>
<property name="hover_selection">True</property>
<property name="show_expanders">False</property>
- <signal handler="on_time_tree_button_press_event" name="button_press_event"/>
+ <signal name="button_press_event" handler="on_time_tree_button_press_event"/>
</object>
</child>
</object>
Modified: trunk/data/preferences.ui
==============================================================================
--- trunk/data/preferences.ui (original)
+++ trunk/data/preferences.ui Tue Apr 7 20:23:28 2009
@@ -1,26 +1,25 @@
<?xml version="1.0"?>
-<!--Generated with glade3 3.4.5 on Thu Feb 26 09:08:35 2009 -->
<interface>
+ <requires lib="gtk+" version="2.16"/>
+ <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkAdjustment" id="adjustment1">
- <property name="upper">121</property>
+ <property name="value">5</property>
<property name="lower">5</property>
- <property name="page_increment">0</property>
+ <property name="upper">121</property>
<property name="step_increment">1</property>
- <property name="page_size">0</property>
- <property name="value">5</property>
</object>
<object class="GtkWindow" id="preferences_window">
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="border_width">12</property>
<property name="title" translatable="yes">Time Tracker Preferences</property>
- <property name="window_position">GTK_WIN_POS_CENTER</property>
+ <property name="window_position">center</property>
<property name="default_width">600</property>
<property name="default_height">500</property>
<property name="destroy_with_parent">True</property>
<property name="icon_name">hamster-applet</property>
- <signal handler="on_preferences_window_key_press" name="key_press_event"/>
- <signal handler="on_preferences_window_destroy" name="destroy"/>
- <signal handler="on_close" name="delete_event"/>
+ <signal name="destroy" handler="on_preferences_window_destroy"/>
+ <signal name="key_press_event" handler="on_preferences_window_key_press"/>
+ <signal name="delete_event" handler="on_close"/>
<child>
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
@@ -33,7 +32,7 @@
<property name="height_request">250</property>
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
@@ -62,6 +61,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -69,9 +69,9 @@
<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">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="category_list">
<property name="visible">True</property>
@@ -79,10 +79,10 @@
<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>
- <signal handler="on_category_list_button_pressed" name="button_press_event"/>
- <signal handler="on_category_list_drag_motion" name="drag_motion"/>
- <signal handler="on_category_list_key_pressed" name="key_press_event"/>
- <signal handler="on_category_list_button_released" name="button_release_event"/>
+ <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>
@@ -92,7 +92,7 @@
</child>
</object>
<packing>
- <property name="x_options"/>
+ <property name="x_options"></property>
</packing>
</child>
<child>
@@ -110,6 +110,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -125,9 +126,9 @@
<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">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</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>
@@ -137,14 +138,17 @@
<property name="rules_hint">True</property>
<property name="enable_search">False</property>
<property name="enable_tree_lines">True</property>
- <signal handler="on_activity_list_button_pressed" name="button_press_event"/>
- <signal handler="on_activity_list_drag_motion" name="drag_motion"/>
- <signal handler="on_activity_list_key_pressed" name="key_press_event"/>
- <signal handler="on_activity_list_button_released" name="button_release_event"/>
- <signal handler="row_selected_cb" name="cursor_changed"/>
+ <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="cursor_changed" handler="row_selected_cb"/>
+ <signal name="button_release_event" handler="on_activity_list_button_released"/>
</object>
</child>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkAlignment" id="alignment9">
@@ -162,7 +166,7 @@
<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>
- <signal handler="on_add_activity_clicked" name="clicked"/>
+ <signal name="clicked" handler="on_add_activity_clicked"/>
<child>
<object class="GtkLabel" id="add_activity_label">
<property name="visible">True</property>
@@ -173,6 +177,9 @@
</object>
</child>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkButton" id="promote_activity">
@@ -180,7 +187,7 @@
<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>
- <signal handler="on_promote_activity_clicked" name="clicked"/>
+ <signal name="clicked" handler="on_promote_activity_clicked"/>
<child>
<object class="GtkHBox" id="hbox3">
<property name="visible">True</property>
@@ -194,6 +201,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -220,7 +228,7 @@
<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>
- <signal handler="on_demote_activity_clicked" name="clicked"/>
+ <signal name="clicked" handler="on_demote_activity_clicked"/>
<child>
<object class="GtkHBox" id="hbox5">
<property name="visible">True</property>
@@ -234,6 +242,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -286,7 +295,7 @@
<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>
- <signal handler="on_add_category_clicked" name="clicked"/>
+ <signal name="clicked" handler="on_add_category_clicked"/>
<child>
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
@@ -304,7 +313,7 @@
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -334,12 +343,15 @@
</object>
</child>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkFrame" id="frame3">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
@@ -350,23 +362,26 @@
<property name="visible">True</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="label" translatable="yes">Stop tracking on shutdown</property>
+ <property name="receives_default">False</property>
<property name="draw_indicator">True</property>
- <signal handler="on_shutdown_track_toggled" name="toggled"/>
+ <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="label" translatable="yes">Stop tracking when computer becomes idle</property>
+ <property name="receives_default">False</property>
<property name="draw_indicator">True</property>
- <signal handler="on_idle_track_toggled" name="toggled"/>
+ <signal name="toggled" handler="on_idle_track_toggled"/>
</object>
<packing>
<property name="position">1</property>
@@ -377,7 +392,7 @@
<property name="visible">True</property>
<property name="no_show_all">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
@@ -390,9 +405,9 @@
<property name="show_fill_level">True</property>
<property name="restrict_to_fill_level">False</property>
<property name="digits">0</property>
- <property name="value_pos">GTK_POS_BOTTOM</property>
- <signal handler="on_notify_interval_value_changed" name="value_changed"/>
- <signal handler="on_notify_interval_format_value" name="format_value"/>
+ <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>
</child>
</object>
@@ -431,7 +446,7 @@
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment6">
<property name="visible">True</property>
@@ -443,7 +458,7 @@
<object class="GtkEntry" id="keybinding">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <signal handler="on_keybinding_changed" name="changed"/>
+ <signal name="changed" handler="on_keybinding_changed"/>
</object>
</child>
</object>
@@ -462,6 +477,9 @@
</packing>
</child>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkAlignment" id="alignment2">
@@ -471,12 +489,12 @@
<property name="top_padding">12</property>
<child>
<object class="GtkButton" id="close_button">
+ <property name="label">gtk-close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="label">gtk-close</property>
<property name="use_stock">True</property>
- <signal handler="on_close_button_clicked" name="clicked"/>
+ <signal name="clicked" handler="on_close_button_clicked"/>
</object>
</child>
</object>
Modified: trunk/data/stats.ui
==============================================================================
--- trunk/data/stats.ui (original)
+++ trunk/data/stats.ui Tue Apr 7 20:23:28 2009
@@ -1,17 +1,19 @@
<?xml version="1.0"?>
-<!--Generated with glade3 3.4.5 on Mon Feb 16 11:04:36 2009 -->
<interface>
+ <requires lib="gtk+" version="2.16"/>
+ <!-- interface-naming-policy toplevel-contextual -->
+ <!-- interface-local-resource-path /home/toms/cvs/hamster/data/art -->
<object class="GtkWindow" id="stats_window">
<property name="width_request">600</property>
<property name="height_request">400</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="title" translatable="yes">Overview - Hamster</property>
- <property name="window_position">GTK_WIN_POS_CENTER</property>
+ <property name="window_position">center</property>
<property name="default_width">800</property>
<property name="default_height">600</property>
<property name="icon_name">hamster-applet</property>
- <signal handler="on_window_key_pressed" name="key_press_event"/>
- <signal handler="on_close" name="delete_event"/>
+ <signal name="key_press_event" handler="on_window_key_pressed"/>
+ <signal name="delete_event" handler="on_close"/>
<child>
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
@@ -20,16 +22,17 @@
<object class="GtkToolbar" id="toolbar3">
<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="toolbar_style">GTK_TOOLBAR_BOTH_HORIZ</property>
+ <property name="toolbar_style">both-horiz</property>
<child>
<object class="GtkToolButton" id="prev">
<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="tooltip_text">Earlier activities</property>
<property name="stock_id">gtk-go-back</property>
- <signal handler="on_prev_clicked" name="clicked"/>
+ <signal name="clicked" handler="on_prev_clicked"/>
</object>
<packing>
+ <property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
@@ -41,9 +44,10 @@
<property name="label">Today</property>
<property name="use_underline">True</property>
<property name="stock_id">gtk-home</property>
- <signal handler="on_home_clicked" name="clicked"/>
+ <signal name="clicked" handler="on_home_clicked"/>
</object>
<packing>
+ <property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
@@ -53,9 +57,10 @@
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="tooltip_text" translatable="yes">Newer activities</property>
<property name="stock_id">gtk-go-forward</property>
- <signal handler="on_next_clicked" name="clicked"/>
+ <signal name="clicked" handler="on_next_clicked"/>
</object>
<packing>
+ <property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
@@ -64,6 +69,9 @@
<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>
</object>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
</child>
<child>
<object class="GtkToolButton" id="remove">
@@ -72,9 +80,10 @@
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="tooltip_text" translatable="yes">Delete activity</property>
<property name="stock_id">gtk-remove</property>
- <signal handler="on_remove_clicked" name="clicked"/>
+ <signal name="clicked" handler="on_remove_clicked"/>
</object>
<packing>
+ <property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
@@ -84,9 +93,10 @@
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="tooltip_text" translatable="yes">Add activity</property>
<property name="stock_id">gtk-add</property>
- <signal handler="on_add_clicked" name="clicked"/>
+ <signal name="clicked" handler="on_add_clicked"/>
</object>
<packing>
+ <property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
@@ -96,9 +106,10 @@
<property name="sensitive">False</property>
<property name="tooltip_text" translatable="yes">Edit activity</property>
<property name="stock_id">gtk-edit</property>
- <signal handler="on_edit_clicked" name="clicked"/>
+ <signal name="clicked" handler="on_edit_clicked"/>
</object>
<packing>
+ <property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
@@ -107,6 +118,9 @@
<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>
</object>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
</child>
<child>
<object class="GtkRadioToolButton" id="week">
@@ -116,11 +130,12 @@
<property name="is_important">True</property>
<property name="label" translatable="yes"> _Week</property>
<property name="use_underline">True</property>
- <property name="icon">art/stock_calendar-view-week.png</property>
+ <property name="icon_widget">week_icon</property>
<property name="active">True</property>
- <signal handler="on_week_toggled" name="toggled"/>
+ <signal name="toggled" handler="on_week_toggled"/>
</object>
<packing>
+ <property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
@@ -132,16 +147,18 @@
<property name="is_important">True</property>
<property name="label" translatable="yes"> _Month</property>
<property name="use_underline">True</property>
- <property name="icon">art/stock_calendar-view-month.png</property>
- <signal handler="on_month_toggled" name="toggled"/>
+ <property name="icon_widget">month_icon</property>
+ <signal name="toggled" handler="on_month_toggled"/>
</object>
<packing>
+ <property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -182,20 +199,23 @@
<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">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="facts">
<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="enable_search">False</property>
- <signal handler="on_key_pressed" name="key_press_event"/>
- <signal handler="on_facts_row_activated" name="row_activated"/>
+ <signal name="key_press_event" handler="on_key_pressed"/>
+ <signal name="row_activated" handler="on_facts_row_activated"/>
</object>
</child>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkAlignment" id="alignment2">
@@ -205,11 +225,11 @@
<property name="top_padding">6</property>
<child>
<object class="GtkButton" id="report_button">
+ <property name="label" translatable="yes">Generate Report</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="label" translatable="yes">Generate Report</property>
- <signal handler="on_report_button_clicked" name="clicked"/>
+ <signal name="clicked" handler="on_report_button_clicked"/>
</object>
</child>
</object>
@@ -231,9 +251,9 @@
<object class="GtkScrolledWindow" id="scrolledwindow2">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
<object class="GtkEventBox" id="graph_frame">
<property name="visible">True</property>
@@ -253,7 +273,7 @@
<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="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
@@ -269,6 +289,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -293,13 +314,16 @@
</object>
</child>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkFrame" id="frame39">
<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="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkEventBox" id="totals_by_activity">
<property name="visible">True</property>
@@ -323,6 +347,9 @@
</packing>
</child>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkLabel" id="no_data_label">
@@ -337,6 +364,9 @@
</object>
</child>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkAlignment" id="alignment3">
@@ -370,4 +400,12 @@
</object>
</child>
</object>
+ <object class="GtkImage" id="week_icon">
+ <property name="visible">True</property>
+ <property name="pixbuf">stock_calendar-view-week.png</property>
+ </object>
+ <object class="GtkImage" id="month_icon">
+ <property name="visible">True</property>
+ <property name="pixbuf">stock_calendar-view-month.png</property>
+ </object>
</interface>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
