[hamster-applet] removed toolbars under tabs
- From: Toms Baugis <tbaugis src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [hamster-applet] removed toolbars under tabs
- Date: Sat, 19 Dec 2009 01:32:41 +0000 (UTC)
commit 68f6d6b8fb017227e51f4894cf68a341a508a773
Author: Toms Bauģis <toms baugis gmail com>
Date: Sat Dec 19 01:32:30 2009 +0000
removed toolbars under tabs
data/stats.ui | 70 ++++++++++++++-
data/stats_overview.ui | 76 ++--------------
data/stats_reports.ui | 229 ++++++++++++++++++++--------------------------
hamster/stats.py | 4 +-
hamster/stats_reports.py | 2 -
5 files changed, 178 insertions(+), 203 deletions(-)
---
diff --git a/data/stats.ui b/data/stats.ui
index 2c2d3ef..10168b8 100644
--- a/data/stats.ui
+++ b/data/stats.ui
@@ -150,6 +150,75 @@
</packing>
</child>
<child>
+ <object class="GtkSeparatorToolItem" id="toolbutton1">
+ <property name="visible">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="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="label" translatable="yes">Add</property>
+ <property name="stock_id">gtk-add</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="remove">
+ <property name="visible">True</property>
+ <property name="sensitive">False</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">Remove</property>
+ <property name="stock_id">gtk-remove</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="edit">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="label" translatable="yes">Edit</property>
+ <property name="stock_id">gtk-edit</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSeparatorToolItem" id="toolbutton2">
+ <property name="visible">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="report_button">
+ <property name="visible">True</property>
+ <property name="is_important">True</property>
+ <property name="label" translatable="yes">Save Report</property>
+ <property name="use_underline">True</property>
+ <property name="stock_id">gtk-save</property>
+ <signal name="clicked" handler="on_report_button_clicked"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkToolItem" id="toolbutton6">
<property name="visible">True</property>
<child>
@@ -175,7 +244,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
- <property name="width_chars">30</property>
<property name="secondary_icon_stock">gtk-find</property>
<property name="primary_icon_sensitive">True</property>
<property name="secondary_icon_sensitive">True</property>
diff --git a/data/stats_overview.ui b/data/stats_overview.ui
index f99ac92..c26838c 100644
--- a/data/stats_overview.ui
+++ b/data/stats_overview.ui
@@ -4,80 +4,20 @@
<!-- interface-naming-policy project-wide -->
<object class="GtkWindow" id="overview_window">
<child>
- <object class="GtkVBox" id="overview_box">
+ <object class="GtkAlignment" id="overview_box">
<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="border_width">10</property>
<child>
- <object class="GtkToolbar" id="toolbar3">
+ <object class="GtkScrolledWindow" id="overview_facts_box">
<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="can_focus">True</property>
+ <property name="hscrollbar_policy">never</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
- <object class="GtkToolButton" id="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="label" translatable="yes">Add</property>
- <property name="stock_id">gtk-add</property>
- <signal name="clicked" handler="on_add_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="remove">
- <property name="visible">True</property>
- <property name="sensitive">False</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">Remove</property>
- <property name="stock_id">gtk-remove</property>
- <signal name="clicked" handler="on_remove_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="edit">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="label" translatable="yes">Edit</property>
- <property name="stock_id">gtk-edit</property>
- <signal name="clicked" handler="on_edit_clicked"/>
- </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>
- <object class="GtkAlignment" id="alignment1">
- <property name="visible">True</property>
- <property name="border_width">10</property>
- <child>
- <object class="GtkScrolledWindow" id="overview_facts_box">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">never</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">in</property>
- <child>
- <placeholder/>
- </child>
- </object>
+ <placeholder/>
</child>
</object>
- <packing>
- <property name="position">1</property>
- </packing>
</child>
</object>
</child>
diff --git a/data/stats_reports.ui b/data/stats_reports.ui
index 440a567..5268c4c 100644
--- a/data/stats_reports.ui
+++ b/data/stats_reports.ui
@@ -6,25 +6,17 @@
<child>
<object class="GtkVBox" id="reports_box">
<property name="visible">True</property>
+ <property name="border_width">12</property>
<property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkToolbar" id="toolbar1">
+ <object class="GtkLabel" id="overview_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>
- <child>
- <object class="GtkToolButton" id="report_button">
- <property name="visible">True</property>
- <property name="is_important">True</property>
- <property name="label" translatable="yes">Save Report</property>
- <property name="use_underline">True</property>
- <property name="stock_id">gtk-save</property>
- <signal name="clicked" handler="on_report_button_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes"><b>Overview</b></property>
+ <property name="use_markup">True</property>
+ <property name="single_line_mode">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -32,146 +24,93 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="vbox6">
+ <object class="GtkHPaned" id="hpaned1">
<property name="visible">True</property>
- <property name="border_width">12</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</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="position">400</property>
+ <property name="position_set">True</property>
<child>
- <object class="GtkLabel" id="overview_label">
+ <object class="GtkScrolledWindow" id="totals_tree_box">
<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"><b>Overview</b></property>
- <property name="use_markup">True</property>
- <property name="single_line_mode">True</property>
+ <property name="hscrollbar_policy">never</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="position">0</property>
+ <property name="resize">False</property>
+ <property name="shrink">True</property>
</packing>
</child>
<child>
- <object class="GtkHPaned" id="hpaned1">
+ <object class="GtkFrame" id="frame1">
<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="position">400</property>
- <property name="position_set">True</property>
- <child>
- <object class="GtkScrolledWindow" id="totals_tree_box">
- <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">never</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">in</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="resize">False</property>
- <property name="shrink">True</property>
- </packing>
- </child>
+ <property name="label_xalign">0</property>
<child>
- <object class="GtkFrame" id="frame1">
+ <object class="GtkEventBox" id="graph_frame">
<property name="visible">True</property>
- <property name="label_xalign">0</property>
+ <signal name="size_allocate" handler="on_graph_frame_size_allocate"/>
<child>
- <object class="GtkEventBox" id="graph_frame">
+ <object class="GtkVBox" id="vbox4">
<property name="visible">True</property>
- <signal name="size_allocate" handler="on_graph_frame_size_allocate"/>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkVBox" id="vbox4">
+ <object class="GtkVBox" id="graphs">
+ <property name="width_request">390</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>
+ <property name="border_width">4</property>
<property name="orientation">vertical</property>
+ <property name="spacing">24</property>
+ <property name="homogeneous">True</property>
<child>
- <object class="GtkVBox" id="graphs">
- <property name="width_request">390</property>
+ <object class="GtkFrame" id="fram1">
<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="border_width">4</property>
- <property name="orientation">vertical</property>
- <property name="spacing">24</property>
- <property name="homogeneous">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
<child>
- <object class="GtkFrame" id="fram1">
+ <object class="GtkHBox" id="week_box">
<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">none</property>
+ <property name="border_width">9</property>
+ <property name="spacing">36</property>
<child>
- <object class="GtkHBox" id="week_box">
+ <object class="GtkEventBox" id="totals_by_category">
<property name="visible">True</property>
- <property name="border_width">9</property>
- <property name="spacing">36</property>
- <child>
- <object class="GtkEventBox" id="totals_by_category">
- <property name="visible">True</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
<child>
- <object class="GtkEventBox" id="totals_by_day">
- <property name="visible">True</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
+ <placeholder/>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
- <child type="label">
- <object class="GtkLabel" id="dayview_caption">
- <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" translatable="yes">Week</property>
- <property name="use_markup">True</property>
- </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">none</property>
<child>
- <object class="GtkEventBox" id="totals_by_activity">
+ <object class="GtkEventBox" id="totals_by_day">
<property name="visible">True</property>
- <property name="border_width">12</property>
<child>
<placeholder/>
</child>
</object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label5">
- <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" translatable="yes">Activity</property>
- <property name="use_markup">True</property>
- </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
- <packing>
- <property name="position">1</property>
- </packing>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="dayview_caption">
+ <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" translatable="yes">Week</property>
+ <property name="use_markup">True</property>
+ </object>
</child>
</object>
<packing>
@@ -179,35 +118,63 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="no_data_label">
- <property name="no_show_all">True</property>
- <property name="label" translatable="yes">No data for this interval</property>
+ <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">none</property>
+ <child>
+ <object class="GtkEventBox" id="totals_by_activity">
+ <property name="visible">True</property>
+ <property name="border_width">12</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label5">
+ <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" translatable="yes">Activity</property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="no_data_label">
+ <property name="no_show_all">True</property>
+ <property name="label" translatable="yes">No data for this interval</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
</child>
- <child type="label_item">
- <placeholder/>
- </child>
</object>
- <packing>
- <property name="resize">True</property>
- <property name="shrink">True</property>
- </packing>
+ </child>
+ <child type="label_item">
+ <placeholder/>
</child>
</object>
<packing>
- <property name="position">300</property>
+ <property name="resize">True</property>
+ <property name="shrink">True</property>
</packing>
</child>
</object>
<packing>
- <property name="position">1</property>
+ <property name="position">400</property>
</packing>
</child>
</object>
diff --git a/hamster/stats.py b/hamster/stats.py
index 9922814..703dc33 100644
--- a/hamster/stats.py
+++ b/hamster/stats.py
@@ -128,12 +128,14 @@ class StatsViewer(object):
self.end_date_input.set_date(self.end_date)
facts = runtime.storage.get_facts(self.start_date, self.end_date)
+ self.get_widget("report_button").set_sensitive(len(facts) > 0)
self.overview.search(self.start_date, self.end_date, facts)
self.reports.search(self.start_date, self.end_date, facts)
-
+ def on_report_button_clicked(self, widget):
+ self.reports.on_report_button_clicked(widget) #forward for now
def on_range_combo_changed(self, combo):
diff --git a/hamster/stats_reports.py b/hamster/stats_reports.py
index a2285f2..d4fb7c8 100644
--- a/hamster/stats_reports.py
+++ b/hamster/stats_reports.py
@@ -267,8 +267,6 @@ class ReportsBox(gtk.VBox):
def do_graph(self, facts = None):
facts = facts or runtime.storage.get_facts(self.start_date, self.end_date)
- self.get_widget("report_button").set_sensitive(len(facts) > 0)
-
self.fill_totals_tree(facts)
if not facts:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
