diff options
author | Milan Crha <mcrha@redhat.com> | 2012-07-13 19:36:05 +0800 |
---|---|---|
committer | Milan Crha <mcrha@redhat.com> | 2012-07-13 19:36:05 +0800 |
commit | 3a3a788041a1d8aa5e961b77919ea88ed32e635e (patch) | |
tree | beca11ce68af8fa7f9a0b5d38fe69c160aa2384b /calendar | |
parent | 79f40c3cacc31d1975fff4c3143ce93dc0035179 (diff) | |
download | gsoc2013-evolution-3a3a788041a1d8aa5e961b77919ea88ed32e635e.tar gsoc2013-evolution-3a3a788041a1d8aa5e961b77919ea88ed32e635e.tar.gz gsoc2013-evolution-3a3a788041a1d8aa5e961b77919ea88ed32e635e.tar.bz2 gsoc2013-evolution-3a3a788041a1d8aa5e961b77919ea88ed32e635e.tar.lz gsoc2013-evolution-3a3a788041a1d8aa5e961b77919ea88ed32e635e.tar.xz gsoc2013-evolution-3a3a788041a1d8aa5e961b77919ea88ed32e635e.tar.zst gsoc2013-evolution-3a3a788041a1d8aa5e961b77919ea88ed32e635e.zip |
Bug #653529 - Alarm Notification window events list is too small
Diffstat (limited to 'calendar')
-rw-r--r-- | calendar/alarm-notify/alarm-notify.ui | 606 | ||||
-rw-r--r-- | calendar/alarm-notify/alarm-queue.c | 1 |
2 files changed, 319 insertions, 288 deletions
diff --git a/calendar/alarm-notify/alarm-notify.ui b/calendar/alarm-notify/alarm-notify.ui index acfdf5cd64..db83a54192 100644 --- a/calendar/alarm-notify/alarm-notify.ui +++ b/calendar/alarm-notify/alarm-notify.ui @@ -1,359 +1,391 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <interface> - <!-- interface-requires gtk+ 2.12 --> - <!-- interface-naming-policy toplevel-contextual --> - <object class="GtkAdjustment" id="adjustment1"> + <!-- interface-requires gtk+ 3.0 --> + <object class="GtkAdjustment" id="adjustment-days"> <property name="upper">65535</property> <property name="step_increment">1</property> <property name="page_increment">5</property> </object> - <object class="GtkAdjustment" id="adjustment2"> + <object class="GtkAdjustment" id="adjustment-hours"> <property name="upper">65535</property> <property name="step_increment">1</property> <property name="page_increment">5</property> </object> - <object class="GtkAdjustment" id="adjustment3"> + <object class="GtkAdjustment" id="adjustment-minutes"> <property name="upper">65535</property> <property name="value">5</property> <property name="step_increment">1</property> - <property name="page_increment">10</property> + <property name="page_increment">5</property> </object> - <object class="GtkDialog" id="alarm-notify"> + <object class="GtkImage" id="apply-icon"> <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-apply</property> + </object> + <object class="GtkDialog" id="alarm-notify"> + <property name="can_focus">False</property> <property name="border_width">5</property> <property name="title" translatable="yes">Appointments</property> - <property name="default_width">384</property> - <property name="default_height">200</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> - <object class="GtkVBox" id="content-area"> - <property name="visible">True</property> + <object class="GtkBox" id="dialog-vbox1"> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> <property name="orientation">vertical</property> + <property name="spacing">2</property> + <child internal-child="action_area"> + <object class="GtkButtonBox" id="dialog-action_area1"> + <property name="can_focus">False</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="dismiss-all-button"> + <property name="label" translatable="yes">Dismiss _All</property> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">True</property> + <property name="use_action_appearance">False</property> + <property name="image">close-icon</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> <child> - <object class="GtkHBox" id="main-columns"> + <object class="GtkGrid" id="main-grid"> <property name="visible">True</property> - <property name="border_width">5</property> - <property name="spacing">12</property> + <property name="can_focus">False</property> + <property name="margin_left">6</property> + <property name="margin_right">6</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="row_spacing">6</property> + <property name="column_spacing">6</property> <child> <object class="GtkImage" id="alarm-image"> <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="valign">start</property> <property name="yalign">0</property> <property name="stock">gtk-dialog-info</property> <property name="icon-size">6</property> </object> <packing> - <property name="expand">False</property> - <property name="position">0</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">3</property> </packing> </child> <child> - <object class="GtkTable" id="main-table"> + <object class="GtkScrolledWindow" id="appointments-scrolled-window"> + <property name="height_request">75</property> <property name="visible">True</property> - <property name="n_rows">3</property> - <property name="n_columns">2</property> - <property name="column_spacing">6</property> - <property name="row_spacing">12</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="shadow_type">in</property> <child> - <object class="GtkScrolledWindow" id="appointments-scrolled-window"> - <property name="width_request">375</property> + <object class="GtkTreeView" id="appointments-treeview"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkTreeView" id="appointments-treeview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="headers_visible">False</property> - </object> + <property name="headers_visible">False</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection2"/> </child> </object> - <packing> - <property name="right_attach">2</property> - </packing> </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + <property name="width">2</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="description"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTextView" id="description-label"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">False</property> + <property name="wrap_mode">word</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkVButtonBox" id="button-box"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="valign">start</property> + <property name="spacing">6</property> + <property name="layout_style">start</property> <child> - <object class="GtkScrolledWindow" id="description"> + <object class="GtkButton" id="snooze-button"> + <property name="label" translatable="yes">_Snooze</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkTextView" id="description-label"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">False</property> - <property name="wrap_mode">word</property> - </object> - </child> + <property name="can_default">True</property> + <property name="receives_default">True</property> + <property name="use_action_appearance">False</property> + <property name="image">refresh-icon</property> + <property name="use_underline">True</property> </object> <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkVButtonBox" id="button-box"> + <object class="GtkButton" id="edit-button"> + <property name="label">gtk-edit</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <property name="layout_style">start</property> - <child> - <object class="GtkButton" id="snooze-button"> - <property name="label" translatable="yes">_Snooze</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">True</property> - <property name="image">refresh-icon</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="edit-button"> - <property name="label">gtk-edit</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="print-button"> - <property name="label">gtk-print</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkButton" id="dismiss-button"> - <property name="label" translatable="yes">_Dismiss</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="image">apply-icon</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">3</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">True</property> + <property name="use_action_appearance">False</property> + <property name="use_stock">True</property> </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"></property> - <property name="y_options"></property> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkTable" id="detail-table"> + <object class="GtkButton" id="print-button"> + <property name="label">gtk-print</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> - <property name="n_rows">2</property> - <property name="n_columns">2</property> - <property name="column_spacing">6</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkLabel" id="snooze-label"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Snooze _time:</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkHBox" id="snooze-box"> - <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkSpinButton" id="snooze-time-days"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">●</property> - <property name="adjustment">adjustment1</property> - <property name="climb_rate">1</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="days-label"> - <property name="visible">True</property> - <property name="label" translatable="yes">days</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - - <child> - <object class="GtkSpinButton" id="snooze-time-hrs"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">●</property> - <property name="adjustment">adjustment2</property> - <property name="climb_rate">1</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="hrs-label"> - <property name="visible">True</property> - <property name="label" translatable="yes">hours</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">3</property> - </packing> - </child> - - - <child> - <object class="GtkSpinButton" id="snooze-time-min"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">●</property> - <property name="adjustment">adjustment3</property> - <property name="climb_rate">1</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">4</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="minutes-label"> - <property name="visible">True</property> - <property name="label" translatable="yes">minutes</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">5</property> - </packing> - </child> - </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="GtkLabel" id="location-label"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">location of appointment</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="location-labe"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Location:</property> - <property name="selectable">True</property> - </object> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">True</property> + <property name="use_action_appearance">False</property> + <property name="use_stock">True</property> </object> <packing> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="y_options"></property> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> </packing> </child> <child> - <placeholder/> + <object class="GtkButton" id="dismiss-button"> + <property name="label" translatable="yes">_Dismiss</property> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_action_appearance">False</property> + <property name="image">apply-icon</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">3</property> + </packing> </child> </object> <packing> - <property name="position">1</property> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - <child internal-child="action_area"> - <object class="GtkHButtonBox" id="action-area"> - <property name="visible">True</property> - <property name="layout_style">end</property> <child> - <object class="GtkButton" id="dismiss-all-button"> - <property name="label" translatable="yes">Dismiss _All</property> + <object class="GtkGrid" id="bottom-grid"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="image">close-icon</property> - <property name="use_underline">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <property name="column_spacing">6</property> + <child> + <object class="GtkLabel" id="location-labe"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Location:</property> + <property name="selectable">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="location-label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">location of appointment</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + <property name="width">6</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="snooze-label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Snooze _time:</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="snooze-time-days"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="halign">start</property> + <property name="invisible_char">●</property> + <property name="invisible_char_set">True</property> + <property name="adjustment">adjustment-days</property> + <property name="climb_rate">1</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="days-label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">days</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="snooze-time-hrs"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="halign">start</property> + <property name="invisible_char">●</property> + <property name="invisible_char_set">True</property> + <property name="adjustment">adjustment-hours</property> + <property name="climb_rate">1</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="hrs-label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">hours</property> + </object> + <packing> + <property name="left_attach">4</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="snooze-time-min"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="halign">start</property> + <property name="invisible_char">●</property> + <property name="invisible_char_set">True</property> + <property name="adjustment">adjustment-minutes</property> + <property name="climb_rate">1</property> + <property name="snap_to_ticks">True</property> + </object> + <packing> + <property name="left_attach">5</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="minutes-label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">minutes</property> + </object> + <packing> + <property name="left_attach">6</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + <property name="width">2</property> + <property name="height">1</property> </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="pack_type">end</property> - <property name="position">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> @@ -364,14 +396,12 @@ </object> <object class="GtkImage" id="close-icon"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="stock">gtk-close</property> </object> <object class="GtkImage" id="refresh-icon"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="stock">gtk-refresh</property> </object> - <object class="GtkImage" id="apply-icon"> - <property name="visible">True</property> - <property name="stock">gtk-apply</property> - </object> </interface> diff --git a/calendar/alarm-notify/alarm-queue.c b/calendar/alarm-notify/alarm-queue.c index 2ffd427f45..2f1ad05caf 100644 --- a/calendar/alarm-notify/alarm-queue.c +++ b/calendar/alarm-notify/alarm-queue.c @@ -1461,6 +1461,7 @@ open_alarm_dialog (TrayIconData *tray_data) gtk_tree_selection_select_iter ( selection, &tray_data->iter); + gtk_window_present (GTK_WINDOW (alarm_notifications_dialog->dialog)); } } else { |