diff options
| -rw-r--r-- | calendar/gui/e-week-view.c | 3 | ||||
| -rw-r--r-- | calendar/gui/event-editor-dialog.glade | 477 | ||||
| -rw-r--r-- | calendar/gui/event-editor-dialog.glade.h | 8 |
3 files changed, 272 insertions, 216 deletions
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index 96eacac213..45f209885b 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -1873,9 +1873,6 @@ e_week_view_reshape_events (EWeekView *week_view) else max_rows = week_view->rows_per_compressed_cell; - g_print ("rows in the day:%i max rows:%i\n", - week_view->rows_per_day[day], max_rows); - /* Determine whether the jump button should be shown. */ if (week_view->rows_per_day[day] <= max_rows) { gnome_canvas_item_hide (week_view->jump_buttons[day]); diff --git a/calendar/gui/event-editor-dialog.glade b/calendar/gui/event-editor-dialog.glade index a86363759d..7573a94869 100644 --- a/calendar/gui/event-editor-dialog.glade +++ b/calendar/gui/event-editor-dialog.glade @@ -44,6 +44,7 @@ <class>GtkNotebook</class> <child_name>GnomeDock:contents</child_name> <name>dialog-contents</name> + <border_width>2</border_width> <can_focus>True</can_focus> <show_tabs>True</show_tabs> <show_border>True</show_border> @@ -56,14 +57,18 @@ <widget> <class>GtkVBox</class> <name>vbox2</name> + <border_width>4</border_width> <homogeneous>False</homogeneous> - <spacing>0</spacing> + <spacing>6</spacing> <widget> - <class>GtkHBox</class> - <name>hbox4</name> + <class>GtkTable</class> + <name>table5</name> + <rows>2</rows> + <columns>2</columns> <homogeneous>False</homogeneous> - <spacing>0</spacing> + <row_spacing>4</row_spacing> + <column_spacing>4</column_spacing> <child> <padding>0</padding> <expand>True</expand> @@ -71,80 +76,104 @@ </child> <widget> - <class>GtkLabel</class> - <name>label13</name> - <label>_Owner:</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>0.5</xalign> - <yalign>0.5</yalign> - <xpad>0</xpad> - <ypad>0</ypad> - <focus_target>general-owner</focus_target> + <class>GtkEntry</class> + <name>general-owner</name> + <can_focus>True</can_focus> + <editable>True</editable> + <text_visible>True</text_visible> + <text_max_length>0</text_max_length> + <text></text> <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> + <left_attach>1</left_attach> + <right_attach>2</right_attach> + <top_attach>0</top_attach> + <bottom_attach>1</bottom_attach> + <xpad>0</xpad> + <ypad>0</ypad> + <xexpand>True</xexpand> + <yexpand>False</yexpand> + <xshrink>False</xshrink> + <yshrink>False</yshrink> + <xfill>True</xfill> + <yfill>False</yfill> </child> </widget> <widget> <class>GtkEntry</class> - <name>general-owner</name> + <name>general-summary</name> <can_focus>True</can_focus> <editable>True</editable> <text_visible>True</text_visible> <text_max_length>0</text_max_length> <text></text> <child> - <padding>0</padding> - <expand>True</expand> - <fill>True</fill> + <left_attach>1</left_attach> + <right_attach>2</right_attach> + <top_attach>1</top_attach> + <bottom_attach>2</bottom_attach> + <xpad>0</xpad> + <ypad>0</ypad> + <xexpand>True</xexpand> + <yexpand>False</yexpand> + <xshrink>False</xshrink> + <yshrink>False</yshrink> + <xfill>True</xfill> + <yfill>False</yfill> </child> </widget> - </widget> - - <widget> - <class>GtkHBox</class> - <name>hbox5</name> - <homogeneous>False</homogeneous> - <spacing>0</spacing> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> <widget> <class>GtkLabel</class> - <name>label14</name> + <name>label41</name> <label>_Summary:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> - <xalign>0.5</xalign> + <xalign>7.45058e-09</xalign> <yalign>0.5</yalign> <xpad>0</xpad> <ypad>0</ypad> <focus_target>general-summary</focus_target> <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> + <left_attach>0</left_attach> + <right_attach>1</right_attach> + <top_attach>1</top_attach> + <bottom_attach>2</bottom_attach> + <xpad>0</xpad> + <ypad>0</ypad> + <xexpand>False</xexpand> + <yexpand>False</yexpand> + <xshrink>False</xshrink> + <yshrink>False</yshrink> + <xfill>False</xfill> + <yfill>False</yfill> </child> </widget> <widget> - <class>GtkEntry</class> - <name>general-summary</name> - <can_focus>True</can_focus> - <editable>True</editable> - <text_visible>True</text_visible> - <text_max_length>0</text_max_length> - <text></text> + <class>GtkLabel</class> + <name>label13</name> + <label>_Owner:</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>7.45058e-09</xalign> + <yalign>0.5</yalign> + <xpad>0</xpad> + <ypad>0</ypad> + <focus_target>general-owner</focus_target> <child> - <padding>0</padding> - <expand>True</expand> - <fill>True</fill> + <left_attach>0</left_attach> + <right_attach>1</right_attach> + <top_attach>0</top_attach> + <bottom_attach>1</bottom_attach> + <xpad>0</xpad> + <ypad>0</ypad> + <xexpand>False</xexpand> + <yexpand>False</yexpand> + <xshrink>False</xshrink> + <yshrink>False</yshrink> + <xfill>True</xfill> + <yfill>False</yfill> </child> </widget> </widget> @@ -164,6 +193,7 @@ <widget> <class>GtkTable</class> <name>table3</name> + <border_width>4</border_width> <rows>2</rows> <columns>3</columns> <homogeneous>False</homogeneous> @@ -310,6 +340,7 @@ <widget> <class>GtkTable</class> <name>table4</name> + <border_width>4</border_width> <rows>4</rows> <columns>5</columns> <homogeneous>False</homogeneous> @@ -696,10 +727,10 @@ Days <widget> <class>GtkLabel</class> <name>label18</name> - <label>Mail _to</label> + <label>Mail _to:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> - <xalign>0.5</xalign> + <xalign>7.45058e-09</xalign> <yalign>0.5</yalign> <xpad>0</xpad> <ypad>0</ypad> @@ -723,10 +754,10 @@ Days <widget> <class>GtkLabel</class> <name>label17</name> - <label>_Run program</label> + <label>_Run program:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> - <xalign>0.5</xalign> + <xalign>0</xalign> <yalign>0.5</yalign> <xpad>0</xpad> <ypad>0</ypad> @@ -764,6 +795,7 @@ Days <widget> <class>GtkHBox</class> <name>hbox6</name> + <border_width>4</border_width> <homogeneous>False</homogeneous> <spacing>4</spacing> @@ -831,9 +863,9 @@ Days <widget> <class>GtkVBox</class> <name>vbox3</name> - <border_width>4</border_width> + <border_width>6</border_width> <homogeneous>False</homogeneous> - <spacing>0</spacing> + <spacing>6</spacing> <widget> <class>GtkFrame</class> @@ -856,6 +888,7 @@ Days <widget> <class>GtkVBox</class> <name>vbox4</name> + <border_width>4</border_width> <homogeneous>False</homogeneous> <spacing>0</spacing> <child> @@ -954,7 +987,7 @@ Days <class>GtkNotebook</class> <name>recurrence-rule-notebook</name> <show_tabs>False</show_tabs> - <show_border>True</show_border> + <show_border>False</show_border> <tab_pos>GTK_POS_TOP</tab_pos> <scrollable>False</scrollable> <tab_hborder>2</tab_hborder> @@ -967,7 +1000,13 @@ Days </child> <widget> - <class>Placeholder</class> + <class>GtkTable</class> + <name>table6</name> + <rows>3</rows> + <columns>3</columns> + <homogeneous>False</homogeneous> + <row_spacing>0</row_spacing> + <column_spacing>0</column_spacing> </widget> <widget> @@ -994,6 +1033,7 @@ Days <widget> <class>GtkVBox</class> <name>vbox7</name> + <border_width>4</border_width> <homogeneous>False</homogeneous> <spacing>0</spacing> @@ -1084,8 +1124,9 @@ Days <widget> <class>GtkVBox</class> <name>vbox8</name> + <border_width>4</border_width> <homogeneous>False</homogeneous> - <spacing>0</spacing> + <spacing>2</spacing> <widget> <class>GtkHBox</class> @@ -1281,149 +1322,120 @@ Days </widget> <widget> - <class>GtkHBox</class> - <name>hbox16</name> + <class>GtkTable</class> + <name>table8</name> + <rows>2</rows> + <columns>4</columns> <homogeneous>False</homogeneous> - <spacing>0</spacing> + <row_spacing>2</row_spacing> + <column_spacing>2</column_spacing> <widget> - <class>GtkVBox</class> - <name>vbox9</name> - <homogeneous>False</homogeneous> - <spacing>0</spacing> + <class>GtkRadioButton</class> + <name>recurrence-rule-monthly-on-day</name> + <can_focus>True</can_focus> + <label>Recur on the</label> + <active>True</active> + <draw_indicator>True</draw_indicator> + <group>recurrence_rule_monthly_group</group> <child> - <padding>0</padding> - <expand>True</expand> - <fill>True</fill> + <left_attach>0</left_attach> + <right_attach>1</right_attach> + <top_attach>0</top_attach> + <bottom_attach>1</bottom_attach> + <xpad>0</xpad> + <ypad>0</ypad> + <xexpand>False</xexpand> + <yexpand>False</yexpand> + <xshrink>False</xshrink> + <yshrink>False</yshrink> + <xfill>False</xfill> + <yfill>False</yfill> </child> + </widget> - <widget> - <class>GtkVBox</class> - <name>vbox10</name> - <homogeneous>False</homogeneous> - <spacing>0</spacing> - <child> - <padding>0</padding> - <expand>True</expand> - <fill>True</fill> - </child> - - <widget> - <class>GtkHBox</class> - <name>hbox17</name> - <homogeneous>False</homogeneous> - <spacing>0</spacing> - <child> - <padding>0</padding> - <expand>True</expand> - <fill>True</fill> - </child> - - <widget> - <class>GtkRadioButton</class> - <name>recurrence-rule-monthly-on-day</name> - <can_focus>True</can_focus> - <label>Recur on the</label> - <active>True</active> - <draw_indicator>True</draw_indicator> - <group>recurrence_rule_monthly_group</group> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> - </widget> - - <widget> - <class>GtkSpinButton</class> - <name>recurrence-rule-monthly-day-nth</name> - <can_focus>True</can_focus> - <climb_rate>1</climb_rate> - <digits>0</digits> - <numeric>False</numeric> - <update_policy>GTK_UPDATE_ALWAYS</update_policy> - <snap>False</snap> - <wrap>False</wrap> - <value>1</value> - <lower>0</lower> - <upper>100</upper> - <step>1</step> - <page>10</page> - <page_size>10</page_size> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>True</fill> - </child> - </widget> - - <widget> - <class>GtkLabel</class> - <name>label35</name> - <label>th day of the month</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>0.5</xalign> - <yalign>0.5</yalign> - <xpad>0</xpad> - <ypad>0</ypad> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> - </widget> - </widget> + <widget> + <class>GtkRadioButton</class> + <name>recurrence-rule-monthly-weekday</name> + <can_focus>True</can_focus> + <label>Recur on the</label> + <active>False</active> + <draw_indicator>True</draw_indicator> + <group>recurrence_rule_monthly_group</group> + <child> + <left_attach>0</left_attach> + <right_attach>1</right_attach> + <top_attach>1</top_attach> + <bottom_attach>2</bottom_attach> + <xpad>0</xpad> + <ypad>0</ypad> + <xexpand>False</xexpand> + <yexpand>False</yexpand> + <xshrink>False</xshrink> + <yshrink>False</yshrink> + <xfill>False</xfill> + <yfill>False</yfill> + </child> + </widget> - <widget> - <class>GtkHBox</class> - <name>hbox18</name> - <homogeneous>False</homogeneous> - <spacing>0</spacing> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> + <widget> + <class>GtkLabel</class> + <name>label35</name> + <label>th day of the month</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>0.5</xalign> + <yalign>0.5</yalign> + <xpad>0</xpad> + <ypad>0</ypad> + <child> + <left_attach>2</left_attach> + <right_attach>3</right_attach> + <top_attach>0</top_attach> + <bottom_attach>1</bottom_attach> + <xpad>0</xpad> + <ypad>0</ypad> + <xexpand>False</xexpand> + <yexpand>False</yexpand> + <xshrink>False</xshrink> + <yshrink>False</yshrink> + <xfill>False</xfill> + <yfill>False</yfill> + </child> + </widget> - <widget> - <class>GtkRadioButton</class> - <name>recurrence-rule-monthly-weekday</name> - <can_focus>True</can_focus> - <label>Recur on the</label> - <active>False</active> - <draw_indicator>True</draw_indicator> - <group>recurrence_rule_monthly_group</group> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> - </widget> - - <widget> - <class>GtkOptionMenu</class> - <name>recurrence-rule-monthly-week</name> - <can_focus>True</can_focus> - <items>1st + <widget> + <class>GtkOptionMenu</class> + <name>recurrence-rule-monthly-week</name> + <can_focus>True</can_focus> + <items>1st 2nd 3rd 4th 5th </items> - <initial_choice>0</initial_choice> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> - </widget> - - <widget> - <class>GtkOptionMenu</class> - <name>recurrence-rule-monthly-weekpos</name> - <can_focus>True</can_focus> - <items>Monday + <initial_choice>0</initial_choice> + <child> + <left_attach>1</left_attach> + <right_attach>2</right_attach> + <top_attach>1</top_attach> + <bottom_attach>2</bottom_attach> + <xpad>0</xpad> + <ypad>0</ypad> + <xexpand>False</xexpand> + <yexpand>False</yexpand> + <xshrink>False</xshrink> + <yshrink>False</yshrink> + <xfill>False</xfill> + <yfill>False</yfill> + </child> + </widget> + + <widget> + <class>GtkOptionMenu</class> + <name>recurrence-rule-monthly-weekpos</name> + <can_focus>True</can_focus> + <items>Monday Tuesday Wednesday Thursday @@ -1431,30 +1443,42 @@ Friday Saturday Sunday </items> - <initial_choice>0</initial_choice> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> - </widget> - </widget> - </widget> - - <widget> - <class>Placeholder</class> - </widget> + <initial_choice>0</initial_choice> + <child> + <left_attach>2</left_attach> + <right_attach>3</right_attach> + <top_attach>1</top_attach> + <bottom_attach>2</bottom_attach> + <xpad>0</xpad> + <ypad>0</ypad> + <xexpand>False</xexpand> + <yexpand>False</yexpand> + <xshrink>False</xshrink> + <yshrink>False</yshrink> + <xfill>False</xfill> + <yfill>False</yfill> + </child> </widget> <widget> <class>GtkHBox</class> <name>hbox19</name> + <border_width>3</border_width> <homogeneous>False</homogeneous> - <spacing>0</spacing> + <spacing>3</spacing> <child> - <padding>0</padding> - <expand>False</expand> - <fill>True</fill> + <left_attach>3</left_attach> + <right_attach>4</right_attach> + <top_attach>0</top_attach> + <bottom_attach>2</bottom_attach> + <xpad>0</xpad> + <ypad>0</ypad> + <xexpand>True</xexpand> + <yexpand>False</yexpand> + <xshrink>False</xshrink> + <yshrink>False</yshrink> + <xfill>True</xfill> + <yfill>True</yfill> </child> <widget> @@ -1514,6 +1538,38 @@ Sunday </child> </widget> </widget> + + <widget> + <class>GtkSpinButton</class> + <name>recurrence-rule-monthly-day-nth</name> + <can_focus>True</can_focus> + <climb_rate>1</climb_rate> + <digits>0</digits> + <numeric>False</numeric> + <update_policy>GTK_UPDATE_ALWAYS</update_policy> + <snap>False</snap> + <wrap>False</wrap> + <value>1</value> + <lower>0</lower> + <upper>100</upper> + <step>1</step> + <page>10</page> + <page_size>10</page_size> + <child> + <left_attach>1</left_attach> + <right_attach>2</right_attach> + <top_attach>0</top_attach> + <bottom_attach>1</bottom_attach> + <xpad>0</xpad> + <ypad>0</ypad> + <xexpand>False</xexpand> + <yexpand>False</yexpand> + <xshrink>False</xshrink> + <yshrink>False</yshrink> + <xfill>True</xfill> + <yfill>False</yfill> + </child> + </widget> </widget> <widget> @@ -1532,6 +1588,7 @@ Sunday <widget> <class>GtkVBox</class> <name>vbox11</name> + <border_width>4</border_width> <homogeneous>False</homogeneous> <spacing>0</spacing> @@ -1625,7 +1682,7 @@ Sunday <class>GtkHBox</class> <name>hbox8</name> <homogeneous>False</homogeneous> - <spacing>0</spacing> + <spacing>4</spacing> <child> <padding>0</padding> <expand>False</expand> @@ -1647,8 +1704,9 @@ Sunday <widget> <class>GtkVBox</class> <name>vbox5</name> + <border_width>4</border_width> <homogeneous>True</homogeneous> - <spacing>0</spacing> + <spacing>2</spacing> <widget> <class>GtkRadioButton</class> @@ -1791,8 +1849,9 @@ Sunday <widget> <class>GtkVBox</class> <name>vbox12</name> + <border_width>4</border_width> <homogeneous>False</homogeneous> - <spacing>0</spacing> + <spacing>4</spacing> <widget> <class>Custom</class> @@ -1812,7 +1871,7 @@ Sunday <class>GtkHBox</class> <name>hbox21</name> <homogeneous>False</homogeneous> - <spacing>0</spacing> + <spacing>4</spacing> <child> <padding>0</padding> <expand>True</expand> @@ -1823,7 +1882,7 @@ Sunday <class>GtkVBox</class> <name>vbox13</name> <homogeneous>False</homogeneous> - <spacing>0</spacing> + <spacing>2</spacing> <child> <padding>0</padding> <expand>False</expand> diff --git a/calendar/gui/event-editor-dialog.glade.h b/calendar/gui/event-editor-dialog.glade.h index d4712e6de6..c789432d31 100644 --- a/calendar/gui/event-editor-dialog.glade.h +++ b/calendar/gui/event-editor-dialog.glade.h @@ -5,8 +5,8 @@ */ gchar *s = N_("event-editor-dialog"); -gchar *s = N_("_Owner:"); gchar *s = N_("_Summary:"); +gchar *s = N_("_Owner:"); gchar *s = N_("Time"); gchar *s = N_("Start time:"); gchar *s = N_("End time:"); @@ -32,8 +32,8 @@ gchar *s = N_("_Display"); gchar *s = N_("_Audio"); gchar *s = N_("_Program"); gchar *s = N_("_Mail"); -gchar *s = N_("Mail _to"); -gchar *s = N_("_Run program"); +gchar *s = N_("Mail _to:"); +gchar *s = N_("_Run program:"); gchar *s = N_("Classification"); gchar *s = N_("Pu_blic"); gchar *s = N_("Pri_vate"); @@ -60,8 +60,8 @@ gchar *s = N_("Sat"); gchar *s = N_("Sun"); gchar *s = N_("label25"); gchar *s = N_("Recur on the"); -gchar *s = N_("th day of the month"); gchar *s = N_("Recur on the"); +gchar *s = N_("th day of the month"); gchar *s = N_("1st\n" "2nd\n" "3rd\n" |