[almanah] Fix the UI to follow the GNOME HIG
- From: Philip Withnall <pwithnall src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [almanah] Fix the UI to follow the GNOME HIG
- Date: Thu, 24 Sep 2009 17:01:12 +0000 (UTC)
commit b4b5ac5793725492444d9bd850e869396132ac26
Author: Philip Withnall <philip tecnocode co uk>
Date: Thu Sep 24 18:00:45 2009 +0100
Fix the UI to follow the GNOME HIG
data/almanah.ui | 663 ++++++++++++++++++++++++----------------------
src/definitions/uri.c | 4 +-
src/interface.c | 10 -
src/interface.h | 1 -
src/main-window.c | 1 -
src/preferences-dialog.c | 3 +-
src/printing.c | 21 +-
7 files changed, 363 insertions(+), 340 deletions(-)
---
diff --git a/data/almanah.ui b/data/almanah.ui
index 6dcba63..98585c3 100644
--- a/data/almanah.ui
+++ b/data/almanah.ui
@@ -117,6 +117,7 @@
<object class="GtkToggleAction" id="almanah_ui_bold">
<property name="stock-id">gtk-bold</property>
<property name="name">format-bold</property>
+ <property name="tooltip" translatable="yes">Toggle whether the currently selected text is bold.</property>
</object>
<accelerator key="B" modifiers="GDK_CONTROL_MASK"/>
</child>
@@ -124,6 +125,7 @@
<object class="GtkToggleAction" id="almanah_ui_italic">
<property name="stock-id">gtk-italic</property>
<property name="name">format-italic</property>
+ <property name="tooltip" translatable="yes">Toggle whether the currently selected text is italic.</property>
</object>
<accelerator key="I" modifiers="GDK_CONTROL_MASK"/>
</child>
@@ -131,6 +133,7 @@
<object class="GtkToggleAction" id="almanah_ui_underline">
<property name="stock-id">gtk-underline</property>
<property name="name">format-underline</property>
+ <property name="tooltip" translatable="yes">Toggle whether the currently selected text is underlined.</property>
</object>
<accelerator key="U" modifiers="GDK_CONTROL_MASK"/>
</child>
@@ -146,7 +149,9 @@
<object class="GtkToggleAction" id="almanah_ui_important">
<property name="name">format-important</property>
<property name="label" translatable="yes">I_mportant</property>
+ <property name="tooltip" translatable="yes">Toggle whether the current entry is marked as important.</property>
<property name="icon-name">gtk-info</property>
+ <property name="is-important">True</property>
<signal name="activate" handler="mw_important_activate_cb"/>
</object>
<accelerator key="M" modifiers="GDK_CONTROL_MASK"/>
@@ -169,6 +174,8 @@
<property name="stock-id">gtk-jump-to</property>
<property name="name">jump-to-today</property>
<property name="label" translatable="yes">Go to _Today</property>
+ <property name="tooltip" translatable="yes">Jump to the current date in the diary.</property>
+ <property name="is-important">True</property>
<signal name="activate" handler="mw_jump_to_today_activate_cb"/>
</object>
</child>
@@ -183,6 +190,8 @@
<property name="stock-id">gtk-add</property>
<property name="name">add-definition</property>
<property name="label" translatable="yes">_Add Definition</property>
+ <property name="tooltip" translatable="yes">Add a definition for the currently selected text.</property>
+ <property name="is-important">True</property>
<property name="sensitive">False</property><!-- Disabled until a selection range is made -->
<signal name="activate" handler="mw_add_definition_activate_cb"/>
</object>
@@ -192,6 +201,7 @@
<property name="stock-id">gtk-remove</property>
<property name="name">remove-definition</property>
<property name="label" translatable="yes">_Remove Definition</property>
+ <property name="tooltip" translatable="yes">Remove the definition from the currently selected text.</property>
<property name="sensitive">False</property><!-- Disabled until a selection range is made -->
<signal name="activate" handler="mw_remove_definition_activate_cb"/>
</object>
@@ -289,161 +299,171 @@
</packing>
</child>
<child>
- <object class="GtkHPaned" id="hpaned1">
- <property name="can-focus">True</property>
+ <object class="GtkAlignment" id="mw_alignment">
+ <property name="top-padding">6</property>
<child>
- <object class="GtkVBox" id="vbox3">
+ <object class="GtkHPaned" id="hpaned1">
+ <property name="can-focus">True</property>
<child>
- <object class="GtkLabel" id="almanah_mw_date_label">
- <property name="use-markup">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow" id="scrolledwindow1">
- <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>
+ <object class="GtkVBox" id="vbox3">
+ <property name="spacing">6</property>
<child>
- <object class="GtkTextView" id="almanah_mw_entry_view">
- <property name="width-request">300</property>
- <property name="height-request">300</property>
+ <object class="GtkLabel" id="almanah_mw_date_label">
+ <property name="use-markup">True</property>
+ <attributes>
+ <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="can-focus">True</property>
- <property name="has-focus">True</property>
- <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-almanah_mw_entry_view">
- <property name="AtkObject::accessible-name" translatable="yes">Entry editing area</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>
+ <child>
+ <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>
+ <property name="has-focus">True</property>
+ <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-almanah_mw_entry_view">
+ <property name="AtkObject::accessible-name" translatable="yes">Entry editing area</property>
+ </object>
+ </child>
</object>
</child>
</object>
</child>
</object>
- </child>
- </object>
- <packing>
- <property name="resize">True</property>
- <property name="shrink">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="vbox2">
- <child>
- <object class="GtkLabel" id="almanah_mw_calendar_label">
- <property name="label" translatable="yes">Calendar</property>
- <accessibility>
- <relation target="almanah_mw_calendar" type="label-for"/>
- </accessibility>
- <attributes>
- <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
- </attributes>
- </object>
<packing>
- <property name="expand">False</property>
+ <property name="resize">True</property>
+ <property name="shrink">False</property>
</packing>
</child>
<child>
- <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="almanah_mw_calendar_label" type="labelled-by"/>
- </accessibility>
- <child internal-child="accessible">
- <object class="AtkObject" id="a11y-almanah_mw_calendar">
- <property name="AtkObject::accessible-name" translatable="yes">Calendar</property>
+ <object class="GtkVBox" id="vbox2">
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="almanah_mw_calendar_label">
+ <property name="label" translatable="yes">Calendar</property>
+ <accessibility>
+ <relation target="almanah_mw_calendar" type="label-for"/>
+ </accessibility>
+ <attributes>
+ <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+ </attributes>
</object>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="almanah_mw_events_label">
- <property name="label" translatable="yes">Past Events</property>
- <accessibility>
- <relation target="almanah_mw_events_tree_view" type="label-for"/>
- </accessibility>
- <attributes>
- <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow" id="scrolledwindow2">
- <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>
<child>
- <object class="GtkTreeView" id="almanah_mw_events_tree_view">
- <property name="model">almanah_mw_event_store</property>
+ <object class="GtkCalendar" id="almanah_mw_calendar">
+ <property name="width-request">200</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"/>
+ <signal name="day-selected" handler="mw_calendar_day_selected_cb"/>
+ <signal name="month-changed" handler="almanah_calendar_month_changed_cb"/>
<accessibility>
- <relation target="almanah_mw_events_label" type="labelled-by"/>
+ <relation target="almanah_mw_calendar_label" type="labelled-by"/>
</accessibility>
<child internal-child="accessible">
- <object class="AtkObject" id="a11y-almanah_mw_events_tree_view">
- <property name="AtkObject::accessible-name" translatable="yes">Past Event List</property>
+ <object class="AtkObject" id="a11y-almanah_mw_calendar">
+ <property name="AtkObject::accessible-name" translatable="yes">Calendar</property>
</object>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="almanah_mw_events_label">
+ <property name="label" translatable="yes">Past Events</property>
+ <accessibility>
+ <relation target="almanah_mw_events_tree_view" type="label-for"/>
+ </accessibility>
+ <attributes>
+ <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow2">
+ <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>
<child>
- <object class="GtkTreeViewColumn" id="column3">
+ <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="almanah_mw_events_label" type="labelled-by"/>
+ </accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="a11y-almanah_mw_events_tree_view">
+ <property name="AtkObject::accessible-name" translatable="yes">Past Event List</property>
+ </object>
+ </child>
<child>
- <object class="GtkCellRendererPixbuf" id="renderer3"/>
- <attributes>
- <attribute name="icon-name">1</attribute>
- </attributes>
+ <object class="GtkTreeViewColumn" id="column3">
+ <child>
+ <object class="GtkCellRendererPixbuf" id="renderer3"/>
+ <attributes>
+ <attribute name="icon-name">1</attribute>
+ </attributes>
+ </child>
+ </object>
</child>
- </object>
- </child>
- <child>
- <object class="GtkTreeViewColumn" id="almanah_mw_event_value_column">
<child>
- <object class="GtkCellRendererText" id="almanah_mw_event_value_renderer"/>
+ <object class="GtkTreeViewColumn" id="almanah_mw_event_value_column">
+ <child>
+ <object class="GtkCellRendererText" id="almanah_mw_event_value_renderer"/>
+ </child>
+ </object>
</child>
</object>
</child>
</object>
</child>
- </object>
- </child>
- <child>
- <object class="GtkHButtonBox" id="buttonbox1">
<child>
- <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-almanah_mw_view_button">
- <property name="AtkObject::accessible-name" translatable="yes">View Event</property>
+ <object class="GtkHButtonBox" id="buttonbox1">
+ <child>
+ <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-almanah_mw_view_button">
+ <property name="AtkObject::accessible-name" translatable="yes">View Event</property>
+ </object>
+ </child>
</object>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="resize">False</property>
+ <property name="shrink">False</property>
</packing>
</child>
</object>
- <packing>
- <property name="resize">False</property>
- <property name="shrink">False</property>
- </packing>
</child>
</object>
</child>
@@ -461,67 +481,57 @@
<!-- TODO: Use the description of definition types somewhere -->
<object class="AlmanahAddDefinitionDialog" id="almanah_add_definition_dialog">
+ <property name="border-width">5</property>
<child internal-child="vbox">
<object class="GtkVBox" id="vbox1">
+ <property name="spacing">6</property>
<child>
- <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>
+ <object class="GtkVBox" id="almanah_add_main_vbox">
+ <property name="spacing">18</property>
<property name="border-width">5</property>
<child>
- <object class="GtkLabel" id="almanah_add_type_label">
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Definition Type</property>
- <accessibility>
- <relation target="almanah_add_type_combo_box" type="label-for"/>
- </accessibility>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="right-attach">2</property>
- <property name="top-attach">1</property>
- <property name="bottom-attach">2</property>
- <property name="y-options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <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="almanah_add_type_label" type="labelled-by"/>
- </accessibility>
+ <object class="GtkHBox" id="almanah_add_hbox">
+ <property name="spacing">6</property>
<child>
- <object class="GtkCellRendererPixbuf" id="renderer5"/>
- <attributes>
- <attribute name="icon-name">2</attribute>
- </attributes>
+ <object class="GtkLabel" id="almanah_add_type_label">
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Definition type:</property>
+ <accessibility>
+ <relation target="almanah_add_type_combo_box" type="label-for"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
</child>
<child>
- <object class="GtkCellRendererText" id="renderer4"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
+ <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="almanah_add_type_label" type="labelled-by"/>
+ </accessibility>
+ <child>
+ <object class="GtkCellRendererPixbuf" id="renderer5"/>
+ <attributes>
+ <attribute name="icon-name">2</attribute>
+ </attributes>
+ </child>
+ <child>
+ <object class="GtkCellRendererText" id="renderer4"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
</child>
</object>
<packing>
- <property name="left-attach">2</property>
- <property name="right-attach">3</property>
- <property name="top-attach">1</property>
- <property name="bottom-attach">2</property>
- <property name="y-options">GTK_FILL</property>
+ <property name="expand">False</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="almanah_add_vbox"/>
- <packing>
- <property name="left-attach">1</property>
- <property name="right-attach">3</property>
- <property name="top-attach">2</property>
- <property name="bottom-attach">3</property>
- </packing>
</child>
</object>
</child>
@@ -565,82 +575,94 @@
</object>
<object class="AlmanahSearchDialog" id="almanah_search_dialog">
+ <property name="border-width">5</property>
<child internal-child="vbox">
<object class="GtkVBox" id="vbox2">
+ <property name="spacing">6</property>
<child>
- <object class="GtkHBox" id="hbox0">
+ <object class="GtkVBox" id="almanah_search_dialog_vbox">
+ <property name="spacing">6</property>
+ <property name="border-width">5</property>
<child>
- <object class="GtkEntry" id="almanah_sd_search_entry">
- <property name="activates-default">True</property>
- <accessibility>
- <relation target="almanah_sd_search_button" type="labelled-by"/>
- </accessibility>
- <child internal-child="accessible">
- <object class="AtkObject" id="a11y-almanah_sd_search_entry">
- <property name="AtkObject::accessible-name" translatable="yes">Search entry</property>
+ <object class="GtkAlignment" id="alignment0">
+ <property name="bottom-padding">12</property>
+ <child>
+ <object class="GtkHBox" id="hbox0">
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkEntry" id="almanah_sd_search_entry">
+ <property name="activates-default">True</property>
+ <accessibility>
+ <relation target="almanah_sd_search_button" type="labelled-by"/>
+ </accessibility>
+ <child internal-child="accessible">
+ <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="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="almanah_sd_search_entry" type="label-for"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
+ </child>
</object>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
</child>
<child>
- <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"/>
+ <object class="GtkLabel" id="almanah_sd_results_label">
+ <property name="label" translatable="yes">Results:</property>
+ <property name="xalign">0</property>
<accessibility>
- <relation target="almanah_sd_search_entry" type="label-for"/>
+ <relation target="almanah_sd_results_tree_view" type="label-for"/>
</accessibility>
</object>
<packing>
<property name="expand">False</property>
</packing>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="almanah_sd_results_label">
- <property name="label" translatable="yes">Results</property>
- <accessibility>
- <relation target="almanah_sd_results_tree_view" type="label-for"/>
- </accessibility>
- <attributes>
- <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow" id="scrolledwindow2">
- <property name="hscrollbar-policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar-policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow-type">GTK_SHADOW_IN</property>
<child>
- <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="almanah_sd_results_label" type="labelled-by"/>
- </accessibility>
- <child internal-child="accessible">
- <object class="AtkObject" id="a11y-almanah_sd_results_tree_view">
- <property name="AtkObject::accessible-name" translatable="yes">Result List</property>
- </object>
- </child>
+ <object class="GtkScrolledWindow" id="scrolledwindow2">
+ <property name="hscrollbar-policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar-policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow-type">GTK_SHADOW_IN</property>
<child>
- <object class="GtkTreeViewColumn" id="column0">
+ <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="almanah_sd_results_label" type="labelled-by"/>
+ </accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="a11y-almanah_sd_results_tree_view">
+ <property name="AtkObject::accessible-name" translatable="yes">Result List</property>
+ </object>
+ </child>
<child>
- <object class="GtkCellRendererText" id="renderer0"/>
- <attributes>
- <attribute name="text">3</attribute>
- </attributes>
+ <object class="GtkTreeViewColumn" id="column0">
+ <child>
+ <object class="GtkCellRendererText" id="renderer0"/>
+ <attributes>
+ <attribute name="text">3</attribute>
+ </attributes>
+ </child>
+ </object>
</child>
</object>
</child>
@@ -673,14 +695,16 @@
</object>
<object class="AlmanahPreferencesDialog" id="almanah_preferences_dialog">
+ <property name="border-width">5</property>
<child internal-child="vbox">
<object class="GtkVBox" id="vbox4">
+ <property name="spacing">6</property>
<child>
<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>
- <property name="row-spacing">5</property>
+ <property name="column-spacing">6</property>
+ <property name="row-spacing">6</property>
<property name="border-width">5</property>
<!-- Encryption key chooser and label go here, programmatically -->
</object>
@@ -712,8 +736,10 @@
</object>
<object class="AlmanahDefinitionManagerWindow" id="almanah_definition_manager_window">
+ <property name="border-width">12</property>
<child>
<object class="GtkHBox" id="hbox1">
+ <property name="spacing">6</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow3">
<property name="hscrollbar-policy">GTK_POLICY_AUTOMATIC</property>
@@ -748,84 +774,87 @@
</packing>
</child>
<child>
- <object class="GtkTable" id="almanah_dmw_table">
- <property name="n-rows">3</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="almanah_dmw_name_label_label">
- <property name="label" translatable="yes">Type</property>
- <property name="xalign">1</property>
- <accessibility>
- <relation target="almanah_dmw_name_label" type="label-for"/>
- </accessibility>
- <attributes>
- <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
- </attributes>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="right-attach">2</property>
- <property name="top-attach">1</property>
- <property name="bottom-attach">2</property>
- <property name="x-options">GTK_FILL</property>
- <property name="y-options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="almanah_dmw_name_label">
- <property name="label" translatable="yes">Nothing selected</property>
- <property name="xalign">0</property>
- <accessibility>
- <relation target="almanah_dmw_name_label_label" type="labelled-by"/>
- </accessibility>
- </object>
- <packing>
- <property name="left-attach">2</property>
- <property name="right-attach">3</property>
- <property name="top-attach">1</property>
- <property name="bottom-attach">2</property>
- <property name="y-options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="almanah_dmw_description_label_label">
- <property name="label" translatable="yes">Description</property>
- <property name="xalign">1</property>
- <property name="yalign">0</property>
- <accessibility>
- <relation target="almanah_dmw_description_label" type="label-for"/>
- </accessibility>
- <attributes>
- <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
- </attributes>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="right-attach">2</property>
- <property name="top-attach">2</property>
- <property name="bottom-attach">3</property>
- <property name="x-options">GTK_FILL</property>
- <property name="y-options">GTK_FILL</property>
- </packing>
- </child>
+ <object class="GtkVBox" id="almanah_dmw_vbox">
<child>
- <object class="GtkLabel" id="almanah_dmw_description_label">
- <property name="wrap">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <accessibility>
- <relation target="almanah_dmw_description_label_label" type="labelled-by"/>
- </accessibility>
+ <object class="GtkTable" id="almanah_dmw_table">
+ <property name="n-rows">3</property>
+ <property name="n-columns">2</property>
+ <property name="column-spacing">6</property>
+ <property name="row-spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="almanah_dmw_name_label_label">
+ <property name="label" translatable="yes">Type: </property>
+ <property name="xalign">1</property>
+ <accessibility>
+ <relation target="almanah_dmw_name_label" type="label-for"/>
+ </accessibility>
+ <!--<attributes>
+ <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+ </attributes>-->
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="right-attach">2</property>
+ <property name="top-attach">1</property>
+ <property name="bottom-attach">2</property>
+ <property name="x-options">GTK_FILL</property>
+ <property name="y-options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="almanah_dmw_name_label">
+ <property name="label" translatable="yes">Nothing selected</property>
+ <property name="xalign">0</property>
+ <accessibility>
+ <relation target="almanah_dmw_name_label_label" type="labelled-by"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="left-attach">2</property>
+ <property name="right-attach">3</property>
+ <property name="top-attach">1</property>
+ <property name="bottom-attach">2</property>
+ <property name="y-options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="almanah_dmw_description_label_label">
+ <property name="label" translatable="yes">Description: </property>
+ <property name="xalign">1</property>
+ <property name="yalign">0</property>
+ <accessibility>
+ <relation target="almanah_dmw_description_label" type="label-for"/>
+ </accessibility>
+ <!--<attributes>
+ <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+ </attributes>-->
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="right-attach">2</property>
+ <property name="top-attach">2</property>
+ <property name="bottom-attach">3</property>
+ <property name="x-options">GTK_FILL</property>
+ <property name="y-options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="almanah_dmw_description_label">
+ <property name="wrap">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <accessibility>
+ <relation target="almanah_dmw_description_label_label" type="labelled-by"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="left-attach">2</property>
+ <property name="right-attach">3</property>
+ <property name="top-attach">2</property>
+ <property name="bottom-attach">3</property>
+ </packing>
+ </child>
</object>
- <packing>
- <property name="left-attach">2</property>
- <property name="right-attach">3</property>
- <property name="top-attach">2</property>
- <property name="bottom-attach">3</property>
- </packing>
</child>
<child>
<object class="GtkHButtonBox" id="almanah_dmw_button_box">
@@ -852,11 +881,7 @@
</child>
</object>
<packing>
- <property name="left-attach">1</property>
- <property name="right-attach">3</property>
- <property name="top-attach">3</property>
- <property name="bottom-attach">4</property>
- <property name="y-options">GTK_FILL</property>
+ <property name="expand">False</property>
</packing>
</child>
</object>
@@ -866,11 +891,14 @@
</object>
<object class="AlmanahDateEntryDialog" id="almanah_date_entry_dialog">
+ <property name="border-width">5</property>
<child internal-child="vbox">
<object class="GtkVBox" id="vbox1">
+ <property name="spacing">6</property>
<child>
<object class="GtkVBox" id="almanah_ded_vbox">
- <property name="spacing">5</property>
+ <property name="spacing">6</property>
+ <property name="border-width">5</property>
<child>
<object class="GtkEntry" id="almanah_ded_date_entry">
<property name="activates-default">True</property>
@@ -936,26 +964,27 @@
</object>
<object class="AlmanahImportDialog" id="almanah_import_dialog">
+ <property name="border-width">5</property>
<child internal-child="vbox">
<object class="GtkVBox" id="almanah_id_internal_vbox">
- <property name="spacing">5</property>
+ <property name="spacing">6</property>
<child>
<object class="GtkVBox" id="almanah_id_vbox">
<property name="border-width">5</property>
- <property name="spacing">5</property>
+ <property name="spacing">6</property>
<child>
<object class="GtkHBox" id="almanah_id_hbox">
- <property name="spacing">5</property>
+ <property name="spacing">6</property>
<child>
<object class="GtkLabel" id="almanah_id_mode_label">
<property name="xalign">0</property>
- <property name="label" translatable="yes">Import Mode</property>
+ <property name="label" translatable="yes">Import mode: </property>
<accessibility>
<relation target="almanah_id_mode_combo_box" type="label-for"/>
</accessibility>
- <attributes>
+ <!--<attributes>
<attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
- </attributes>
+ </attributes>-->
</object>
<packing>
<property name="expand">False</property>
@@ -993,11 +1022,16 @@
</packing>
</child>
<child>
- <object class="GtkFileChooserWidget" id="almanah_id_file_chooser">
- <signal name="selection-changed" handler="id_file_chooser_selection_changed_cb"/>
- <signal name="file-activated" handler="id_file_chooser_file_activated_cb"/>
- <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
- <property name="select-multiple">False</property>
+ <object class="GtkAlignment" id="almanah_id_alignment">
+ <property name="top-padding">12</property>
+ <child>
+ <object class="GtkFileChooserWidget" id="almanah_id_file_chooser">
+ <signal name="selection-changed" handler="id_file_chooser_selection_changed_cb"/>
+ <signal name="file-activated" handler="id_file_chooser_file_activated_cb"/>
+ <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
+ <property name="select-multiple">False</property>
+ </object>
+ </child>
</object>
</child>
</object>
@@ -1061,13 +1095,14 @@
</object>
<object class="AlmanahImportResultsDialog" id="almanah_import_results_dialog">
+ <property name="border-width">5</property>
<child internal-child="vbox">
<object class="GtkVBox" id="almanah_ird_internal_vbox">
- <property name="spacing">5</property>
+ <property name="spacing">6</property>
<child>
<object class="GtkVBox" id="almanah_id_vbox">
<property name="border-width">5</property>
- <property name="spacing">5</property>
+ <property name="spacing">6</property>
<child>
<object class="GtkComboBox" id="almanah_ird_view_combo_box">
<signal name="changed" handler="ird_view_combo_box_changed_cb"/>
diff --git a/src/definitions/uri.c b/src/definitions/uri.c
index c99166b..2e8c4d1 100644
--- a/src/definitions/uri.c
+++ b/src/definitions/uri.c
@@ -94,9 +94,9 @@ uri_build_dialog (AlmanahDefinition *definition, GtkVBox *parent_vbox)
AlmanahURIDefinitionPrivate *priv = ALMANAH_URI_DEFINITION (definition)->priv;
const gchar *value = almanah_definition_get_value (definition);
- hbox = gtk_hbox_new (FALSE, 5);
+ hbox = gtk_hbox_new (FALSE, 6);
- label = gtk_label_new (_("URI"));
+ label = gtk_label_new (_("URI: "));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
diff --git a/src/interface.c b/src/interface.c
index 32e74f0..fcb3079 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -39,16 +39,6 @@ almanah_get_interface_filename (void)
return PACKAGE_DATA_DIR"/almanah/almanah.ui";
}
-void
-almanah_interface_embolden_label (GtkLabel *label)
-{
- gchar *markup;
-
- markup = g_strdup_printf ("<b>%s</b>", gtk_label_get_label (label));
- gtk_label_set_markup_with_mnemonic (label, markup);
- g_free (markup);
-}
-
static gboolean
definition_tag_event_cb (GtkTextTag *tag, GObject *object, GdkEvent *event, GtkTextIter *iter, gpointer user_data)
{
diff --git a/src/interface.h b/src/interface.h
index e4899fd..f08cadd 100644
--- a/src/interface.h
+++ b/src/interface.h
@@ -25,7 +25,6 @@
G_BEGIN_DECLS
const gchar *almanah_get_interface_filename (void);
-void almanah_interface_embolden_label (GtkLabel *label);
void almanah_interface_create_text_tags (GtkTextBuffer *text_buffer, gboolean connect_events);
void almanah_calendar_month_changed_cb (GtkCalendar *calendar, gpointer user_data);
diff --git a/src/main-window.c b/src/main-window.c
index eaa88af..43dbdf3 100644
--- a/src/main-window.c
+++ b/src/main-window.c
@@ -1028,7 +1028,6 @@ mw_calendar_day_selected_cb (GtkCalendar *calendar, AlmanahMainWindow *main_wind
/* Translators: This is a strftime()-format string for the date displayed at the top of the main window. */
g_date_strftime (calendar_string, sizeof (calendar_string), _("%A, %e %B %Y"), &calendar_date);
gtk_label_set_markup (priv->date_label, calendar_string);
- almanah_interface_embolden_label (priv->date_label);
/* Update the entry */
if (priv->current_entry != NULL)
diff --git a/src/preferences-dialog.c b/src/preferences-dialog.c
index 0017e20..c495941 100644
--- a/src/preferences-dialog.c
+++ b/src/preferences-dialog.c
@@ -157,8 +157,7 @@ almanah_preferences_dialog_new (void)
#ifdef ENABLE_ENCRYPTION
/* Grab our child widgets */
- label = gtk_label_new (_("Encryption Key"));
- almanah_interface_embolden_label (GTK_LABEL (label));
+ label = gtk_label_new (_("Encryption key: "));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_table_attach (table, label, 1, 2, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
diff --git a/src/printing.c b/src/printing.c
index 0442598..cea6f74 100644
--- a/src/printing.c
+++ b/src/printing.c
@@ -410,18 +410,19 @@ create_custom_widget_cb (GtkPrintOperation *operation, AlmanahPrintOperation *al
end_calendar = gtk_calendar_new ();
g_signal_connect (end_calendar, "month-changed", G_CALLBACK (almanah_calendar_month_changed_cb), NULL);
- start_label = GTK_LABEL (gtk_label_new (NULL));
- gtk_label_set_markup (start_label, _("Start Date"));
- almanah_interface_embolden_label (start_label);
- end_label = GTK_LABEL (gtk_label_new (NULL));
- gtk_label_set_markup (end_label, _("End Date"));
- almanah_interface_embolden_label (end_label);
+ start_label = GTK_LABEL (gtk_label_new (_("Start date:")));
+ gtk_misc_set_alignment (GTK_MISC (start_label), 0.0, 0.5);
+ end_label = GTK_LABEL (gtk_label_new (_("End date:")));
+ gtk_misc_set_alignment (GTK_MISC (end_label), 0.0, 0.5);
table = GTK_TABLE (gtk_table_new (2, 2, FALSE));
- gtk_table_attach (table, start_calendar, 0, 1, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 5, 5);
- gtk_table_attach (table, end_calendar, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 5, 5);
- gtk_table_attach (table, GTK_WIDGET (start_label), 0, 1, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 5, 5);
- gtk_table_attach (table, GTK_WIDGET (end_label), 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 5, 5);
+ gtk_table_set_row_spacings (table, 6);
+ gtk_table_set_col_spacings (table, 6);
+ gtk_container_set_border_width (GTK_CONTAINER (table), 6);
+ gtk_table_attach (table, start_calendar, 0, 1, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+ gtk_table_attach (table, end_calendar, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+ gtk_table_attach (table, GTK_WIDGET (start_label), 0, 1, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+ gtk_table_attach (table, GTK_WIDGET (end_label), 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
almanah_operation->start_calendar = GTK_CALENDAR (start_calendar);
almanah_operation->end_calendar = GTK_CALENDAR (end_calendar);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
