almanah r121 - in trunk: . data src
- From: pwithnall svn gnome org
- To: svn-commits-list gnome org
- Subject: almanah r121 - in trunk: . data src
- Date: Sat, 13 Dec 2008 15:17:51 +0000 (UTC)
Author: pwithnall
Date: Sat Dec 13 15:17:51 2008
New Revision: 121
URL: http://svn.gnome.org/viewvc/almanah?rev=121&view=rev
Log:
2008-12-13 Philip Withnall <philip tecnocode co uk>
* data/almanah.ui:
* src/add-definition-dialog.c
(almanah_add_definition_dialog_new):
* src/main-window.c (almanah_main_window_new):
* src/preferences-dialog.c (almanah_preferences_dialog_new):
* src/search-dialog.c (almanah_search_dialog_new):
* src/storage-manager.c (almanah_storage_manager_class_init),
(almanah_storage_manager_add_definition),
(almanah_storage_manager_remove_definition): Replace the "dry_"
UI
prefix with "almanah_" for consistency.
Modified:
trunk/ChangeLog
trunk/data/almanah.ui
trunk/src/add-definition-dialog.c
trunk/src/main-window.c
trunk/src/preferences-dialog.c
trunk/src/search-dialog.c
trunk/src/storage-manager.c
Modified: trunk/data/almanah.ui
==============================================================================
--- trunk/data/almanah.ui (original)
+++ trunk/data/almanah.ui Sat Dec 13 15:17:51 2008
@@ -1,36 +1,36 @@
<?xml version="1.0"?>
<interface>
- <object class="GtkUIManager" id="dry_ui_manager">
+ <object class="GtkUIManager" id="almanah_ui_manager">
<child>
<object class="GtkActionGroup" id="actiongroup1">
<child>
- <object class="GtkAction" id="dry_ui_file">
+ <object class="GtkAction" id="almanah_ui_file">
<property name="name">file</property>
<property name="label" translatable="yes">_File</property>
</object>
</child>
<child>
- <object class="GtkAction" id="dry_ui_print">
+ <object class="GtkAction" id="almanah_ui_print">
<property name="stock-id">gtk-print</property>
<property name="name">file-print</property>
<signal name="activate" handler="mw_print_activate_cb"/>
</object>
</child>
<child>
- <object class="GtkAction" id="dry_ui_quit">
+ <object class="GtkAction" id="almanah_ui_quit">
<property name="stock-id">gtk-quit</property>
<property name="name">file-quit</property>
<signal name="activate" handler="mw_quit_activate_cb"/>
</object>
</child>
<child>
- <object class="GtkAction" id="dry_ui_edit">
+ <object class="GtkAction" id="almanah_ui_edit">
<property name="name">edit</property>
<property name="label" translatable="yes">_Edit</property>
</object>
</child>
<child>
- <object class="GtkAction" id="dry_ui_cut">
+ <object class="GtkAction" id="almanah_ui_cut">
<property name="stock-id">gtk-cut</property>
<property name="name">edit-cut</property>
<property name="sensitive">False</property><!-- Disabled until a selection range is made -->
@@ -38,7 +38,7 @@
</object>
</child>
<child>
- <object class="GtkAction" id="dry_ui_copy">
+ <object class="GtkAction" id="almanah_ui_copy">
<property name="stock-id">gtk-copy</property>
<property name="name">edit-copy</property>
<property name="sensitive">False</property><!-- Disabled until a selection range is made -->
@@ -46,14 +46,14 @@
</object>
</child>
<child>
- <object class="GtkAction" id="dry_ui_paste">
+ <object class="GtkAction" id="almanah_ui_paste">
<property name="stock-id">gtk-paste</property>
<property name="name">edit-paste</property>
<signal name="activate" handler="mw_paste_activate_cb"/>
</object>
</child>
<child>
- <object class="GtkAction" id="dry_ui_delete">
+ <object class="GtkAction" id="almanah_ui_delete">
<property name="stock-id">gtk-delete</property>
<property name="name">edit-delete</property>
<property name="sensitive">False</property><!-- Disabled until a selection range is made -->
@@ -61,7 +61,7 @@
</object>
</child>
<child>
- <object class="GtkAction" id="dry_ui_search">
+ <object class="GtkAction" id="almanah_ui_search">
<property name="stock-id">gtk-find</property>
<property name="label" translatable="yes">_Search</property>
<property name="name">edit-search</property>
@@ -69,54 +69,54 @@
</object>
</child>
<child>
- <object class="GtkAction" id="dry_ui_preferences">
+ <object class="GtkAction" id="almanah_ui_preferences">
<property name="stock-id">gtk-preferences</property>
<property name="name">edit-preferences</property>
<signal name="activate" handler="mw_preferences_activate_cb"/>
</object>
</child>
<child>
- <object class="GtkAction" id="dry_ui_format">
+ <object class="GtkAction" id="almanah_ui_format">
<property name="name">format</property>
<property name="label" translatable="yes">F_ormat</property>
</object>
</child>
<child>
- <object class="GtkToggleAction" id="dry_ui_bold">
+ <object class="GtkToggleAction" id="almanah_ui_bold">
<property name="stock-id">gtk-bold</property>
<property name="name">format-bold</property>
</object>
<accelerator key="B" modifiers="GDK_CONTROL_MASK"/>
</child>
<child>
- <object class="GtkToggleAction" id="dry_ui_italic">
+ <object class="GtkToggleAction" id="almanah_ui_italic">
<property name="stock-id">gtk-italic</property>
<property name="name">format-italic</property>
</object>
<accelerator key="I" modifiers="GDK_CONTROL_MASK"/>
</child>
<child>
- <object class="GtkToggleAction" id="dry_ui_underline">
+ <object class="GtkToggleAction" id="almanah_ui_underline">
<property name="stock-id">gtk-underline</property>
<property name="name">format-underline</property>
</object>
<accelerator key="U" modifiers="GDK_CONTROL_MASK"/>
</child>
<child>
- <object class="GtkAction" id="dry_ui_help">
+ <object class="GtkAction" id="almanah_ui_help">
<property name="name">help</property>
<property name="label" translatable="yes">_Help</property>
</object>
</child>
<child>
- <object class="GtkAction" id="dry_ui_about">
+ <object class="GtkAction" id="almanah_ui_about">
<property name="stock-id">gtk-about</property>
<property name="name">help-about</property>
<signal name="activate" handler="mw_about_activate_cb"/>
</object>
</child>
<child>
- <object class="GtkAction" id="dry_ui_jump_to_today">
+ <object class="GtkAction" id="almanah_ui_jump_to_today">
<property name="stock-id">gtk-jump-to</property>
<property name="name">jump-to-today</property>
<property name="label" translatable="yes">Go to _Today</property>
@@ -124,13 +124,13 @@
</object>
</child>
<child>
- <object class="GtkAction" id="dry_ui_definitions">
+ <object class="GtkAction" id="almanah_ui_definitions">
<property name="name">definitions</property>
<property name="label" translatable="yes">_Definitions</property>
</object>
</child>
<child>
- <object class="GtkAction" id="dry_ui_add_definition">
+ <object class="GtkAction" id="almanah_ui_add_definition">
<property name="stock-id">gtk-add</property>
<property name="name">add-definition</property>
<property name="label" translatable="yes">_Add Definition</property>
@@ -139,7 +139,7 @@
</object>
</child>
<child>
- <object class="GtkAction" id="dry_ui_remove_definition">
+ <object class="GtkAction" id="almanah_ui_remove_definition">
<property name="stock-id">gtk-remove</property>
<property name="name">remove-definition</property>
<property name="label" translatable="yes">_Remove Definition</property>
@@ -148,7 +148,7 @@
</object>
</child>
<child>
- <object class="GtkAction" id="dry_ui_view_definitions">
+ <object class="GtkAction" id="almanah_ui_view_definitions">
<property name="name">view-definitions</property>
<property name="label" translatable="yes">_View Definitions</property>
<signal name="activate" handler="mw_remove_definition_activate_cb"/>
@@ -157,50 +157,50 @@
</object>
</child>
<ui>
- <menubar name="dry_mw_menu_bar">
- <menu action="dry_ui_file">
- <menuitem action="dry_ui_print"/>
- <menuitem action="dry_ui_quit"/>
+ <menubar name="almanah_mw_menu_bar">
+ <menu action="almanah_ui_file">
+ <menuitem action="almanah_ui_print"/>
+ <menuitem action="almanah_ui_quit"/>
</menu>
- <menu action="dry_ui_edit">
- <menuitem action="dry_ui_cut"/>
- <menuitem action="dry_ui_copy"/>
- <menuitem action="dry_ui_paste"/>
- <menuitem action="dry_ui_delete"/>
+ <menu action="almanah_ui_edit">
+ <menuitem action="almanah_ui_cut"/>
+ <menuitem action="almanah_ui_copy"/>
+ <menuitem action="almanah_ui_paste"/>
+ <menuitem action="almanah_ui_delete"/>
<separator/>
- <menuitem action="dry_ui_search"/>
+ <menuitem action="almanah_ui_search"/>
<separator/>
- <menuitem action="dry_ui_preferences"/>
+ <menuitem action="almanah_ui_preferences"/>
</menu>
- <menu action="dry_ui_format">
- <menuitem action="dry_ui_bold"/>
- <menuitem action="dry_ui_italic"/>
- <menuitem action="dry_ui_underline"/>
+ <menu action="almanah_ui_format">
+ <menuitem action="almanah_ui_bold"/>
+ <menuitem action="almanah_ui_italic"/>
+ <menuitem action="almanah_ui_underline"/>
</menu>
- <menu action="dry_ui_definitions">
- <menuitem action="dry_ui_add_definition"/>
- <menuitem action="dry_ui_remove_definition"/>
+ <menu action="almanah_ui_definitions">
+ <menuitem action="almanah_ui_add_definition"/>
+ <menuitem action="almanah_ui_remove_definition"/>
<separator/>
- <menuitem action="dry_ui_view_definitions"/>
+ <menuitem action="almanah_ui_view_definitions"/>
</menu>
- <menu action="dry_ui_help">
- <menuitem action="dry_ui_about"/>
+ <menu action="almanah_ui_help">
+ <menuitem action="almanah_ui_about"/>
</menu>
</menubar>
- <toolbar name="dry_mw_toolbar">
- <toolitem action="dry_ui_jump_to_today"/>
+ <toolbar name="almanah_mw_toolbar">
+ <toolitem action="almanah_ui_jump_to_today"/>
<separator/>
- <toolitem action="dry_ui_bold"/>
- <toolitem action="dry_ui_italic"/>
- <toolitem action="dry_ui_underline"/>
+ <toolitem action="almanah_ui_bold"/>
+ <toolitem action="almanah_ui_italic"/>
+ <toolitem action="almanah_ui_underline"/>
<separator/>
- <toolitem action="dry_ui_add_definition"/>
- <toolitem action="dry_ui_remove_definition"/>
+ <toolitem action="almanah_ui_add_definition"/>
+ <toolitem action="almanah_ui_remove_definition"/>
</toolbar>
</ui>
</object>
- <object class="GtkListStore" id="dry_mw_event_store">
+ <object class="GtkListStore" id="almanah_mw_event_store">
<columns>
<column type="AlmanahEvent"/><!-- Event object -->
<column type="gchararray"/><!-- Icon name -->
@@ -208,21 +208,21 @@
</columns>
</object>
- <object class="GtkImage" id="dry_mw_view_button_image">
+ <object class="GtkImage" id="almanah_mw_view_button_image">
<property name="stock">gtk-open</property>
</object>
- <object class="AlmanahMainWindow" id="dry_main_window">
+ <object class="AlmanahMainWindow" id="almanah_main_window">
<child>
<object class="GtkVBox" id="vbox1">
<child>
- <object class="GtkMenuBar" constructor="dry_ui_manager" id="dry_mw_menu_bar"/>
+ <object class="GtkMenuBar" constructor="almanah_ui_manager" id="almanah_mw_menu_bar"/>
<packing>
<property name="expand">False</property>
</packing>
</child>
<child>
- <object class="GtkToolbar" constructor="dry_ui_manager" id="dry_mw_toolbar"/>
+ <object class="GtkToolbar" constructor="almanah_ui_manager" id="almanah_mw_toolbar"/>
<packing>
<property name="expand">False</property>
</packing>
@@ -233,7 +233,7 @@
<child>
<object class="GtkVBox" id="vbox3">
<child>
- <object class="GtkLabel" id="dry_mw_date_label">
+ <object class="GtkLabel" id="almanah_mw_date_label">
<property name="use-markup">True</property>
</object>
<packing>
@@ -247,7 +247,7 @@
<property name="vscrollbar-policy">GTK_POLICY_AUTOMATIC</property>
<property name="shadow-type">GTK_SHADOW_IN</property>
<child>
- <object class="GtkTextView" id="dry_mw_entry_view">
+ <object class="GtkTextView" id="almanah_mw_entry_view">
<property name="width-request">300</property>
<property name="height-request">300</property>
<property name="can-focus">True</property>
@@ -255,7 +255,7 @@
<property name="wrap-mode">GTK_WRAP_WORD</property>
<signal name="focus-out-event" handler="mw_entry_view_focus_out_event_cb"/>
<child internal-child="accessible">
- <object class="AtkObject" id="a11y-dry_mw_entry_view">
+ <object class="AtkObject" id="a11y-almanah_mw_entry_view">
<property name="AtkObject::accessible-name" translatable="yes">Entry editing area</property>
</object>
</child>
@@ -272,10 +272,10 @@
<child>
<object class="GtkVBox" id="vbox2">
<child>
- <object class="GtkLabel" id="dry_mw_calendar_label">
+ <object class="GtkLabel" id="almanah_mw_calendar_label">
<property name="label" translatable="yes">Calendar</property>
<accessibility>
- <relation target="dry_mw_calendar" type="label-for"/>
+ <relation target="almanah_mw_calendar" type="label-for"/>
</accessibility>
</object>
<packing>
@@ -283,16 +283,16 @@
</packing>
</child>
<child>
- <object class="GtkCalendar" id="dry_mw_calendar">
+ <object class="GtkCalendar" id="almanah_mw_calendar">
<property name="width-request">200</property>
<property name="can-focus">True</property>
<signal name="day-selected" handler="mw_calendar_day_selected_cb"/>
<signal name="month-changed" handler="almanah_calendar_month_changed_cb"/>
<accessibility>
- <relation target="dry_mw_calendar_label" type="labelled-by"/>
+ <relation target="almanah_mw_calendar_label" type="labelled-by"/>
</accessibility>
<child internal-child="accessible">
- <object class="AtkObject" id="a11y-dry_mw_calendar">
+ <object class="AtkObject" id="a11y-almanah_mw_calendar">
<property name="AtkObject::accessible-name" translatable="yes">Calendar</property>
</object>
</child>
@@ -302,10 +302,10 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="dry_mw_events_label">
+ <object class="GtkLabel" id="almanah_mw_events_label">
<property name="label" translatable="yes">Past Events</property>
<accessibility>
- <relation target="dry_mw_events_tree_view" type="label-for"/>
+ <relation target="almanah_mw_events_tree_view" type="label-for"/>
</accessibility>
</object>
<packing>
@@ -319,16 +319,16 @@
<property name="vscrollbar-policy">GTK_POLICY_AUTOMATIC</property>
<property name="shadow-type">GTK_SHADOW_IN</property>
<child>
- <object class="GtkTreeView" id="dry_mw_events_tree_view">
- <property name="model">dry_mw_event_store</property>
+ <object class="GtkTreeView" id="almanah_mw_events_tree_view">
+ <property name="model">almanah_mw_event_store</property>
<property name="can-focus">True</property>
<property name="headers-visible">False</property>
<signal name="row-activated" handler="mw_events_tree_view_row_activated_cb"/>
<accessibility>
- <relation target="dry_mw_events_label" type="labelled-by"/>
+ <relation target="almanah_mw_events_label" type="labelled-by"/>
</accessibility>
<child internal-child="accessible">
- <object class="AtkObject" id="a11y-dry_mw_events_tree_view">
+ <object class="AtkObject" id="a11y-almanah_mw_events_tree_view">
<property name="AtkObject::accessible-name" translatable="yes">Past Event List</property>
</object>
</child>
@@ -343,9 +343,9 @@
</object>
</child>
<child>
- <object class="GtkTreeViewColumn" id="dry_mw_event_value_column">
+ <object class="GtkTreeViewColumn" id="almanah_mw_event_value_column">
<child>
- <object class="GtkCellRendererText" id="dry_mw_event_value_renderer"/>
+ <object class="GtkCellRendererText" id="almanah_mw_event_value_renderer"/>
</child>
</object>
</child>
@@ -356,12 +356,12 @@
<child>
<object class="GtkHButtonBox" id="buttonbox1">
<child>
- <object class="GtkButton" id="dry_mw_view_button">
- <property name="image">dry_mw_view_button_image</property>
+ <object class="GtkButton" id="almanah_mw_view_button">
+ <property name="image">almanah_mw_view_button_image</property>
<property name="label" translatable="yes">View</property>
<signal name="clicked" handler="mw_view_button_clicked_cb"/>
<child internal-child="accessible">
- <object class="AtkObject" id="a11y-dry_mw_view_button">
+ <object class="AtkObject" id="a11y-almanah_mw_view_button">
<property name="AtkObject::accessible-name" translatable="yes">View Event</property>
</object>
</child>
@@ -384,7 +384,7 @@
</child>
</object>
- <object class="GtkListStore" id="dry_add_type_store">
+ <object class="GtkListStore" id="almanah_add_type_store">
<columns>
<column type="gchararray"/><!-- Name -->
<column type="guint"/><!-- Type -->
@@ -393,22 +393,22 @@
</object>
<!-- TODO: Use the description of definition types somewhere -->
- <object class="AlmanahAddDefinitionDialog" id="dry_add_definition_dialog">
+ <object class="AlmanahAddDefinitionDialog" id="almanah_add_definition_dialog">
<child internal-child="vbox">
<object class="GtkVBox" id="vbox1">
<child>
- <object class="GtkTable" id="dry_add_table">
+ <object class="GtkTable" id="almanah_add_table">
<property name="n-rows">2</property>
<property name="n-columns">2</property>
<property name="column-spacing">5</property>
<property name="row-spacing">5</property>
<property name="border-width">5</property>
<child>
- <object class="GtkLabel" id="dry_add_type_label">
+ <object class="GtkLabel" id="almanah_add_type_label">
<property name="xalign">0</property>
<property name="label" translatable="yes">Definition Type</property>
<accessibility>
- <relation target="dry_add_type_combo_box" type="label-for"/>
+ <relation target="almanah_add_type_combo_box" type="label-for"/>
</accessibility>
</object>
<packing>
@@ -420,11 +420,11 @@
</packing>
</child>
<child>
- <object class="GtkComboBox" id="dry_add_type_combo_box">
- <property name="model">dry_add_type_store</property>
+ <object class="GtkComboBox" id="almanah_add_type_combo_box">
+ <property name="model">almanah_add_type_store</property>
<signal name="changed" handler="add_type_combo_box_changed_cb"/>
<accessibility>
- <relation target="dry_add_type_label" type="labelled-by"/>
+ <relation target="almanah_add_type_label" type="labelled-by"/>
</accessibility>
<child>
<object class="GtkCellRendererPixbuf" id="renderer5"/>
@@ -448,7 +448,7 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="dry_add_vbox"/>
+ <object class="GtkVBox" id="almanah_add_vbox"/>
<packing>
<property name="left-attach">1</property>
<property name="right-attach">3</property>
@@ -461,13 +461,13 @@
<child internal-child="action_area">
<object class="GtkHButtonBox" id="hbuttonbox1">
<child>
- <object class="GtkButton" id="dry_add_cancel_button">
+ <object class="GtkButton" id="almanah_add_cancel_button">
<property name="use-stock">True</property>
<property name="label">gtk-cancel</property>
</object>
</child>
<child>
- <object class="GtkButton" id="dry_add_add_button">
+ <object class="GtkButton" id="almanah_add_add_button">
<property name="use-stock">True</property>
<property name="label">gtk-add</property>
<property name="can-default">True</property>
@@ -479,16 +479,16 @@
</object>
</child>
<action-widgets>
- <action-widget response="-6">dry_add_cancel_button</action-widget><!-- GTK_RESPONSE_CANCEL -->
- <action-widget response="-5">dry_add_add_button</action-widget><!-- GTK_RESPONSE_OK -->
+ <action-widget response="-6">almanah_add_cancel_button</action-widget><!-- GTK_RESPONSE_CANCEL -->
+ <action-widget response="-5">almanah_add_add_button</action-widget><!-- GTK_RESPONSE_OK -->
</action-widgets>
</object>
- <object class="GtkImage" id="dry_sd_search_button_image">
+ <object class="GtkImage" id="almanah_sd_search_button_image">
<property name="stock">gtk-find</property>
</object>
- <object class="GtkListStore" id="dry_sd_results_store">
+ <object class="GtkListStore" id="almanah_sd_results_store">
<columns>
<column type="guint"/><!-- Day -->
<column type="guint"/><!-- Month -->
@@ -497,33 +497,33 @@
</columns>
</object>
- <object class="AlmanahSearchDialog" id="dry_search_dialog">
+ <object class="AlmanahSearchDialog" id="almanah_search_dialog">
<child internal-child="vbox">
<object class="GtkVBox" id="vbox2">
<child>
<object class="GtkHBox" id="hbox2">
<child>
- <object class="GtkEntry" id="dry_sd_search_entry">
+ <object class="GtkEntry" id="almanah_sd_search_entry">
<property name="activates-default">True</property>
<accessibility>
- <relation target="dry_sd_search_button" type="labelled-by"/>
+ <relation target="almanah_sd_search_button" type="labelled-by"/>
</accessibility>
<child internal-child="accessible">
- <object class="AtkObject" id="a11y-dry_sd_search_entry">
+ <object class="AtkObject" id="a11y-almanah_sd_search_entry">
<property name="AtkObject::accessible-name" translatable="yes">Search entry</property>
</object>
</child>
</object>
</child>
<child>
- <object class="GtkButton" id="dry_sd_search_button">
- <property name="image">dry_sd_search_button_image</property>
+ <object class="GtkButton" id="almanah_sd_search_button">
+ <property name="image">almanah_sd_search_button_image</property>
<property name="label" translatable="yes">Search</property>
<property name="can-default">True</property>
<property name="has-default">True</property>
<signal name="clicked" handler="sd_search_button_clicked_cb"/>
<accessibility>
- <relation target="dry_sd_search_entry" type="label-for"/>
+ <relation target="almanah_sd_search_entry" type="label-for"/>
</accessibility>
</object>
<packing>
@@ -536,10 +536,10 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="dry_sd_results_label">
+ <object class="GtkLabel" id="almanah_sd_results_label">
<property name="label" translatable="yes">Results</property>
<accessibility>
- <relation target="dry_sd_results_tree_view" type="label-for"/>
+ <relation target="almanah_sd_results_tree_view" type="label-for"/>
</accessibility>
</object>
<packing>
@@ -552,15 +552,15 @@
<property name="vscrollbar-policy">GTK_POLICY_AUTOMATIC</property>
<property name="shadow-type">GTK_SHADOW_IN</property>
<child>
- <object class="GtkTreeView" id="dry_sd_results_tree_view">
- <property name="model">dry_sd_results_store</property>
+ <object class="GtkTreeView" id="almanah_sd_results_tree_view">
+ <property name="model">almanah_sd_results_store</property>
<property name="headers-visible">False</property>
<signal name="row-activated" handler="sd_results_tree_view_row_activated_cb"/>
<accessibility>
- <relation target="dry_sd_results_label" type="labelled-by"/>
+ <relation target="almanah_sd_results_label" type="labelled-by"/>
</accessibility>
<child internal-child="accessible">
- <object class="AtkObject" id="a11y-dry_sd_results_tree_view">
+ <object class="AtkObject" id="a11y-almanah_sd_results_tree_view">
<property name="AtkObject::accessible-name" translatable="yes">Result List</property>
</object>
</child>
@@ -581,14 +581,14 @@
<child internal-child="action_area">
<object class="GtkHButtonBox" id="hbuttonbox2">
<child>
- <object class="GtkButton" id="dry_sd_view_button">
+ <object class="GtkButton" id="almanah_sd_view_button">
<property name="label" translatable="yes">View Entry</property>
<property name="sensitive">False</property>
<signal name="clicked" handler="sd_view_button_clicked_cb"/>
</object>
</child>
<child>
- <object class="GtkButton" id="dry_sd_close_button">
+ <object class="GtkButton" id="almanah_sd_close_button">
<property name="use-stock">True</property>
<property name="label">gtk-close</property>
</object>
@@ -598,15 +598,15 @@
</object>
</child>
<action-widgets>
- <action-widget response="-7">dry_sd_close_button</action-widget><!-- GTK_RESPONSE_CLOSE -->
+ <action-widget response="-7">almanah_sd_close_button</action-widget><!-- GTK_RESPONSE_CLOSE -->
</action-widgets>
</object>
- <object class="AlmanahPreferencesDialog" id="dry_preferences_dialog">
+ <object class="AlmanahPreferencesDialog" id="almanah_preferences_dialog">
<child internal-child="vbox">
<object class="GtkVBox" id="vbox4">
<child>
- <object class="GtkTable" id="dry_pd_table">
+ <object class="GtkTable" id="almanah_pd_table">
<property name="n-rows">1</property>
<property name="n-columns">3</property>
<property name="column-spacing">5</property>
@@ -618,7 +618,7 @@
<child internal-child="action_area">
<object class="GtkHButtonBox" id="hbuttonbox2">
<child>
- <object class="GtkButton" id="dry_pd_close_button">
+ <object class="GtkButton" id="almanah_pd_close_button">
<property name="use-stock">True</property>
<property name="label">gtk-close</property>
<property name="can-default">True</property>
@@ -630,7 +630,7 @@
</object>
</child>
<action-widgets>
- <action-widget response="-7">dry_pd_close_button</action-widget><!-- GTK_RESPONSE_CLOSE -->
+ <action-widget response="-7">almanah_pd_close_button</action-widget><!-- GTK_RESPONSE_CLOSE -->
</action-widgets>
</object>
</interface>
Modified: trunk/src/add-definition-dialog.c
==============================================================================
--- trunk/src/add-definition-dialog.c (original)
+++ trunk/src/add-definition-dialog.c Sat Dec 13 15:17:51 2008
@@ -146,8 +146,8 @@
GError *error = NULL;
const gchar *interface_filename = almanah_get_interface_filename ();
const gchar *object_names[] = {
- "dry_add_definition_dialog",
- "dry_add_type_store",
+ "almanah_add_definition_dialog",
+ "almanah_add_type_store",
NULL
};
@@ -171,7 +171,7 @@
}
gtk_builder_set_translation_domain (builder, GETTEXT_PACKAGE);
- add_definition_dialog = ALMANAH_ADD_DEFINITION_DIALOG (gtk_builder_get_object (builder, "dry_add_definition_dialog"));
+ add_definition_dialog = ALMANAH_ADD_DEFINITION_DIALOG (gtk_builder_get_object (builder, "almanah_add_definition_dialog"));
gtk_builder_connect_signals (builder, add_definition_dialog);
if (add_definition_dialog == NULL) {
@@ -182,9 +182,9 @@
priv = add_definition_dialog->priv;
/* Grab our child widgets */
- priv->type_combo_box = GTK_COMBO_BOX (gtk_builder_get_object (builder, "dry_add_type_combo_box"));
- priv->vbox = GTK_VBOX (gtk_builder_get_object (builder, "dry_add_vbox"));
- priv->type_store = GTK_LIST_STORE (gtk_builder_get_object (builder, "dry_add_type_store"));
+ priv->type_combo_box = GTK_COMBO_BOX (gtk_builder_get_object (builder, "almanah_add_type_combo_box"));
+ priv->vbox = GTK_VBOX (gtk_builder_get_object (builder, "almanah_add_vbox"));
+ priv->type_store = GTK_LIST_STORE (gtk_builder_get_object (builder, "almanah_add_type_store"));
almanah_definition_populate_model (priv->type_store, 1, 0, 2);
gtk_combo_box_set_active (priv->type_combo_box, 0);
Modified: trunk/src/main-window.c
==============================================================================
--- trunk/src/main-window.c (original)
+++ trunk/src/main-window.c Sat Dec 13 15:17:51 2008
@@ -127,10 +127,10 @@
#endif /* ENABLE_SPELL_CHECKING */
const gchar *interface_filename = almanah_get_interface_filename ();
const gchar *object_names[] = {
- "dry_main_window",
- "dry_mw_event_store",
- "dry_mw_view_button_image",
- "dry_ui_manager",
+ "almanah_main_window",
+ "almanah_mw_event_store",
+ "almanah_mw_view_button_image",
+ "almanah_ui_manager",
NULL
};
@@ -154,7 +154,7 @@
}
gtk_builder_set_translation_domain (builder, GETTEXT_PACKAGE);
- main_window = ALMANAH_MAIN_WINDOW (gtk_builder_get_object (builder, "dry_main_window"));
+ main_window = ALMANAH_MAIN_WINDOW (gtk_builder_get_object (builder, "almanah_main_window"));
gtk_builder_connect_signals (builder, main_window);
if (main_window == NULL) {
@@ -165,23 +165,23 @@
priv = ALMANAH_MAIN_WINDOW (main_window)->priv;
/* Grab our child widgets */
- priv->entry_view = GTK_TEXT_VIEW (gtk_builder_get_object (builder, "dry_mw_entry_view"));
+ priv->entry_view = GTK_TEXT_VIEW (gtk_builder_get_object (builder, "almanah_mw_entry_view"));
priv->entry_buffer = gtk_text_view_get_buffer (priv->entry_view);
- priv->calendar = GTK_CALENDAR (gtk_builder_get_object (builder, "dry_mw_calendar"));
- priv->date_label = GTK_LABEL (gtk_builder_get_object (builder, "dry_mw_date_label"));
- priv->view_button = GTK_BUTTON (gtk_builder_get_object (builder, "dry_mw_view_button"));
- priv->add_action = GTK_ACTION (gtk_builder_get_object (builder, "dry_ui_add_definition"));
- priv->remove_action = GTK_ACTION (gtk_builder_get_object (builder, "dry_ui_remove_definition"));
- priv->event_store = GTK_LIST_STORE (gtk_builder_get_object (builder, "dry_mw_event_store"));
- priv->events_selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (gtk_builder_get_object (builder, "dry_mw_events_tree_view")));
- priv->event_value_column = GTK_TREE_VIEW_COLUMN (gtk_builder_get_object (builder, "dry_mw_event_value_column"));
- priv->event_value_renderer = GTK_CELL_RENDERER_TEXT (gtk_builder_get_object (builder, "dry_mw_event_value_renderer"));
- priv->bold_action = GTK_TOGGLE_ACTION (gtk_builder_get_object (builder, "dry_ui_bold"));;
- priv->italic_action = GTK_TOGGLE_ACTION (gtk_builder_get_object (builder, "dry_ui_italic"));
- priv->underline_action = GTK_TOGGLE_ACTION (gtk_builder_get_object (builder, "dry_ui_underline"));
- priv->cut_action = GTK_ACTION (gtk_builder_get_object (builder, "dry_ui_cut"));
- priv->copy_action = GTK_ACTION (gtk_builder_get_object (builder, "dry_ui_copy"));
- priv->delete_action = GTK_ACTION (gtk_builder_get_object (builder, "dry_ui_delete"));
+ priv->calendar = GTK_CALENDAR (gtk_builder_get_object (builder, "almanah_mw_calendar"));
+ priv->date_label = GTK_LABEL (gtk_builder_get_object (builder, "almanah_mw_date_label"));
+ priv->view_button = GTK_BUTTON (gtk_builder_get_object (builder, "almanah_mw_view_button"));
+ priv->add_action = GTK_ACTION (gtk_builder_get_object (builder, "almanah_ui_add_definition"));
+ priv->remove_action = GTK_ACTION (gtk_builder_get_object (builder, "almanah_ui_remove_definition"));
+ priv->event_store = GTK_LIST_STORE (gtk_builder_get_object (builder, "almanah_mw_event_store"));
+ priv->events_selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (gtk_builder_get_object (builder, "almanah_mw_events_tree_view")));
+ priv->event_value_column = GTK_TREE_VIEW_COLUMN (gtk_builder_get_object (builder, "almanah_mw_event_value_column"));
+ priv->event_value_renderer = GTK_CELL_RENDERER_TEXT (gtk_builder_get_object (builder, "almanah_mw_event_value_renderer"));
+ priv->bold_action = GTK_TOGGLE_ACTION (gtk_builder_get_object (builder, "almanah_ui_bold"));;
+ priv->italic_action = GTK_TOGGLE_ACTION (gtk_builder_get_object (builder, "almanah_ui_italic"));
+ priv->underline_action = GTK_TOGGLE_ACTION (gtk_builder_get_object (builder, "almanah_ui_underline"));
+ priv->cut_action = GTK_ACTION (gtk_builder_get_object (builder, "almanah_ui_cut"));
+ priv->copy_action = GTK_ACTION (gtk_builder_get_object (builder, "almanah_ui_copy"));
+ priv->delete_action = GTK_ACTION (gtk_builder_get_object (builder, "almanah_ui_delete"));
/* Set up text formatting */
almanah_interface_create_text_tags (priv->entry_buffer, TRUE);
@@ -239,12 +239,12 @@
gtk_tree_view_column_set_cell_data_func (priv->event_value_column, GTK_CELL_RENDERER (priv->event_value_renderer), mw_events_value_data_cb, NULL, NULL);
/* Prettify the UI */
- almanah_interface_embolden_label (GTK_LABEL (gtk_builder_get_object (builder, "dry_mw_calendar_label")));
- almanah_interface_embolden_label (GTK_LABEL (gtk_builder_get_object (builder, "dry_mw_events_label")));
+ almanah_interface_embolden_label (GTK_LABEL (gtk_builder_get_object (builder, "almanah_mw_calendar_label")));
+ almanah_interface_embolden_label (GTK_LABEL (gtk_builder_get_object (builder, "almanah_mw_events_label")));
#ifndef ENABLE_ENCRYPTION
/* Remove the "Preferences" entry from the menu */
- gtk_action_set_visible (GTK_ACTION (gtk_builder_get_object (builder, "dry_ui_preferences")), FALSE);
+ gtk_action_set_visible (GTK_ACTION (gtk_builder_get_object (builder, "almanah_ui_preferences")), FALSE);
#endif /* !ENABLE_ENCRYPTION */
g_object_unref (builder);
Modified: trunk/src/preferences-dialog.c
==============================================================================
--- trunk/src/preferences-dialog.c (original)
+++ trunk/src/preferences-dialog.c Sat Dec 13 15:17:51 2008
@@ -109,7 +109,7 @@
GError *error = NULL;
const gchar *interface_filename = almanah_get_interface_filename ();
const gchar *object_names[] = {
- "dry_preferences_dialog",
+ "almanah_preferences_dialog",
NULL
};
@@ -133,7 +133,7 @@
}
gtk_builder_set_translation_domain (builder, GETTEXT_PACKAGE);
- preferences_dialog = ALMANAH_PREFERENCES_DIALOG (gtk_builder_get_object (builder, "dry_preferences_dialog"));
+ preferences_dialog = ALMANAH_PREFERENCES_DIALOG (gtk_builder_get_object (builder, "almanah_preferences_dialog"));
gtk_builder_connect_signals (builder, preferences_dialog);
if (preferences_dialog == NULL) {
@@ -145,7 +145,7 @@
#ifdef ENABLE_ENCRYPTION
/* Grab our child widgets */
- table = GTK_TABLE (gtk_builder_get_object (builder, "dry_pd_table"));
+ table = GTK_TABLE (gtk_builder_get_object (builder, "almanah_pd_table"));
label = gtk_label_new (_("Encryption Key"));
almanah_interface_embolden_label (GTK_LABEL (label));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
Modified: trunk/src/search-dialog.c
==============================================================================
--- trunk/src/search-dialog.c (original)
+++ trunk/src/search-dialog.c Sat Dec 13 15:17:51 2008
@@ -66,9 +66,9 @@
GError *error = NULL;
const gchar *interface_filename = almanah_get_interface_filename ();
const gchar *object_names[] = {
- "dry_search_dialog",
- "dry_sd_search_button_image",
- "dry_sd_results_store",
+ "almanah_search_dialog",
+ "almanah_sd_search_button_image",
+ "almanah_sd_results_store",
NULL
};
@@ -92,7 +92,7 @@
}
gtk_builder_set_translation_domain (builder, GETTEXT_PACKAGE);
- search_dialog = ALMANAH_SEARCH_DIALOG (gtk_builder_get_object (builder, "dry_search_dialog"));
+ search_dialog = ALMANAH_SEARCH_DIALOG (gtk_builder_get_object (builder, "almanah_search_dialog"));
gtk_builder_connect_signals (builder, search_dialog);
if (search_dialog == NULL) {
@@ -103,17 +103,17 @@
priv = ALMANAH_SEARCH_DIALOG (search_dialog)->priv;
/* Grab our child widgets */
- priv->sd_search_entry = GTK_ENTRY (gtk_builder_get_object (builder, "dry_sd_search_entry"));
- priv->sd_results_store = GTK_LIST_STORE (gtk_builder_get_object (builder, "dry_sd_results_store"));
- priv->sd_results_selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (gtk_builder_get_object (builder, "dry_sd_results_tree_view")));
+ priv->sd_search_entry = GTK_ENTRY (gtk_builder_get_object (builder, "almanah_sd_search_entry"));
+ priv->sd_results_store = GTK_LIST_STORE (gtk_builder_get_object (builder, "almanah_sd_results_store"));
+ priv->sd_results_selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (gtk_builder_get_object (builder, "almanah_sd_results_tree_view")));
g_signal_connect (priv->sd_results_selection, "changed", G_CALLBACK (sd_results_selection_changed_cb),
- gtk_builder_get_object (builder, "dry_sd_view_button"));
+ gtk_builder_get_object (builder, "almanah_sd_view_button"));
- gtk_widget_grab_default (GTK_WIDGET (gtk_builder_get_object (builder, "dry_sd_search_button")));
+ gtk_widget_grab_default (GTK_WIDGET (gtk_builder_get_object (builder, "almanah_sd_search_button")));
/* Prettify the UI */
- almanah_interface_embolden_label (GTK_LABEL (gtk_builder_get_object (builder, "dry_sd_results_label")));
+ almanah_interface_embolden_label (GTK_LABEL (gtk_builder_get_object (builder, "almanah_sd_results_label")));
g_object_unref (builder);
Modified: trunk/src/storage-manager.c
==============================================================================
--- trunk/src/storage-manager.c (original)
+++ trunk/src/storage-manager.c Sat Dec 13 15:17:51 2008
@@ -51,6 +51,8 @@
enum {
SIGNAL_DISCONNECTED,
+ SIGNAL_DEFINITION_ADDED,
+ SIGNAL_DEFINITION_REMOVED,
LAST_SIGNAL
};
@@ -88,6 +90,18 @@
0, NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE, 1, ALMANAH_TYPE_STORAGE_MANAGER);
+ storage_manager_signals[SIGNAL_DEFINITION_ADDED] = g_signal_new ("definition-added",
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST,
+ 0, NULL, NULL,
+ g_cclosure_marshal_VOID__OBJECT,
+ G_TYPE_NONE, 1, ALMANAH_TYPE_DEFINITION);
+ storage_manager_signals[SIGNAL_DEFINITION_REMOVED] = g_signal_new ("definition-removed",
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST,
+ 0, NULL, NULL,
+ g_cclosure_marshal_VOID__STRING,
+ G_TYPE_NONE, 1, G_TYPE_STRING);
}
static void
@@ -951,12 +965,19 @@
text);
}
+ if (return_value == TRUE)
+ g_signal_emit (self, storage_manager_signals[SIGNAL_DEFINITION_ADDED], 0, definition);
+
return return_value;
}
gboolean
almanah_storage_manager_remove_definition (AlmanahStorageManager *self, const gchar *definition_text)
{
- return almanah_storage_manager_query_async (self, "DELETE FROM definitions WHERE definition_text = '%q'", NULL, NULL, NULL,
- definition_text);
+ if (almanah_storage_manager_query_async (self, "DELETE FROM definitions WHERE definition_text = '%q'", NULL, NULL, NULL, definition_text) == TRUE) {
+ g_signal_emit (self, storage_manager_signals[SIGNAL_DEFINITION_REMOVED], 0, definition_text);
+ return TRUE;
+ }
+
+ return FALSE;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
