From 71df66748854651aff14970a29fe239f55361e75 Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Thu, 16 Apr 1998 05:18:12 +0000 Subject: XPM files for events with alarm and recurrence, respectively. 1998-04-16 Federico Mena Quintero * bell.xpm recur.xpm: XPM files for events with alarm and recurrence, respectively. 1998-04-15 Federico Mena Quintero * gncal-full-day.c (button_1): Preserve the up/down cursor while dragging. svn path=/trunk/; revision=143 --- calendar/ChangeLog | 7 ++++ calendar/TODO | 2 -- calendar/bell.xpm | 83 +++++++++++++++++++++++++++++++++++++++++++ calendar/gncal-day-view.h | 1 - calendar/gncal-full-day.c | 6 ++-- calendar/gui/bell.xpm | 83 +++++++++++++++++++++++++++++++++++++++++++ calendar/gui/gncal-day-view.h | 1 - calendar/gui/gncal-full-day.c | 6 ++-- calendar/gui/recur.xpm | 83 +++++++++++++++++++++++++++++++++++++++++++ calendar/gui/year-view.h | 1 - calendar/recur.xpm | 83 +++++++++++++++++++++++++++++++++++++++++++ calendar/year-view.h | 1 - 12 files changed, 345 insertions(+), 12 deletions(-) create mode 100644 calendar/bell.xpm create mode 100644 calendar/gui/bell.xpm create mode 100644 calendar/gui/recur.xpm create mode 100644 calendar/recur.xpm (limited to 'calendar') diff --git a/calendar/ChangeLog b/calendar/ChangeLog index d0273a59eb..ae78b7afd9 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,5 +1,12 @@ +1998-04-16 Federico Mena Quintero + + * bell.xpm recur.xpm: XPM files for events with alarm and + recurrence, respectively. + 1998-04-15 Federico Mena Quintero + * gncal-full-day.c (button_1): Preserve the up/down cursor while dragging. + * gncal-full-day.c (child_draw): Now children have a vertical handle as well. This can be used to move the child anytime, not only when it is focused. diff --git a/calendar/TODO b/calendar/TODO index 389ffc0cce..7fffd51365 100644 --- a/calendar/TODO +++ b/calendar/TODO @@ -14,8 +14,6 @@ Event editor dialog: Full day view widget: -- Display vertical handle bar at the left of a child to move it. - - Display alarm/whatever flags somewhere. - Layout the children nicely like M$ Schedule or Netscape Calendar do diff --git a/calendar/bell.xpm b/calendar/bell.xpm new file mode 100644 index 0000000000..b1ab537a17 --- /dev/null +++ b/calendar/bell.xpm @@ -0,0 +1,83 @@ +/* XPM */ +static char * bell_xpm[] = { +"16 16 64 1", +" c None", +". c #000000", +"+ c #E3BB43", +"@ c #E6C049", +"# c #EED275", +"$ c #F4E193", +"% c #F4DF8C", +"& c #EAC95C", +"* c #EFD57A", +"= c #FAEFBB", +"- c #FDF6D3", +"; c #FDF5C6", +"> c #F4E18F", +", c #E4BD43", +"' c #F6E295", +") c #FEF9D8", +"! c #FFFFFF", +"~ c #FFFADA", +"{ c #FCEEAA", +"] c #EBCA5A", +"^ c #E9C550", +"/ c #FAEA9C", +"( c #FEF7CB", +"_ c #FFF8CC", +": c #FDF1A8", +"< c #EED060", +"[ c #D39D12", +"} c #F2D55D", +"| c #FCEC91", +"1 c #FFF4AE", +"2 c #FFF5B6", +"3 c #FEEF97", +"4 c #F3D65E", +"5 c #D5A216", +"6 c #FAE05C", +"7 c #FFED7C", +"8 c #FFEF8C", +"9 c #FFF092", +"0 c #FDEB7A", +"a c #F4D750", +"b c #D8A717", +"c c #EAC01D", +"d c #F6D83E", +"e c #FAE255", +"f c #FAE362", +"g c #F9E161", +"h c #F6DE5B", +"i c #F1D145", +"j c #E6BE28", +"k c #D09B09", +"l c #B67E00", +"m c #CE9100", +"n c #D69F04", +"o c #E0B011", +"p c #E6BA1D", +"q c #E3B721", +"r c #E0B21E", +"s c #DCAB16", +"t c #D7A20D", +"u c #CC9303", +"v c #BE8400", +"w c #AC7500", +"x c #A06B00", +"y c #FFDD00", +" ", +" .. ", +" .+@. ", +" .#$%&. ", +" .*=-;>,. ", +" .')!~{]. ", +" .^/(~_:<[. ", +" .}|121345. ", +" .678980ab. ", +" .cdefghijkl. ", +" .mnopqrstuvwx. ", +" .............. ", +" .8y. ", +" .. ", +" ", +" "}; diff --git a/calendar/gncal-day-view.h b/calendar/gncal-day-view.h index f2a4ae6e93..564788fc81 100644 --- a/calendar/gncal-day-view.h +++ b/calendar/gncal-day-view.h @@ -11,7 +11,6 @@ #include #include -#include "calendar.h" #include "gnome-cal.h" BEGIN_GNOME_DECLS diff --git a/calendar/gncal-full-day.c b/calendar/gncal-full-day.c index 6d95a79d41..67756d0482 100644 --- a/calendar/gncal-full-day.c +++ b/calendar/gncal-full-day.c @@ -16,7 +16,7 @@ #define TEXT_BORDER 2 #define HANDLE_SIZE 8 -#define MIN_WIDTH 200 +#define MIN_WIDTH 300 #define XOR_RECT_WIDTH 2 #define UNSELECT_TIMEOUT 150 /* ms */ @@ -1413,7 +1413,7 @@ button_1 (GncalFullDay *fullday, GdkEventButton *event) | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_RELEASE_MASK), NULL, - NULL, + fullday->up_down_cursor, event->time); if (old_rows_used == 0) { @@ -1460,7 +1460,7 @@ button_1 (GncalFullDay *fullday, GdkEventButton *event) | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_RELEASE_MASK), NULL, - NULL, + fullday->up_down_cursor, event->time); draw_xor_rect (fullday); diff --git a/calendar/gui/bell.xpm b/calendar/gui/bell.xpm new file mode 100644 index 0000000000..b1ab537a17 --- /dev/null +++ b/calendar/gui/bell.xpm @@ -0,0 +1,83 @@ +/* XPM */ +static char * bell_xpm[] = { +"16 16 64 1", +" c None", +". c #000000", +"+ c #E3BB43", +"@ c #E6C049", +"# c #EED275", +"$ c #F4E193", +"% c #F4DF8C", +"& c #EAC95C", +"* c #EFD57A", +"= c #FAEFBB", +"- c #FDF6D3", +"; c #FDF5C6", +"> c #F4E18F", +", c #E4BD43", +"' c #F6E295", +") c #FEF9D8", +"! c #FFFFFF", +"~ c #FFFADA", +"{ c #FCEEAA", +"] c #EBCA5A", +"^ c #E9C550", +"/ c #FAEA9C", +"( c #FEF7CB", +"_ c #FFF8CC", +": c #FDF1A8", +"< c #EED060", +"[ c #D39D12", +"} c #F2D55D", +"| c #FCEC91", +"1 c #FFF4AE", +"2 c #FFF5B6", +"3 c #FEEF97", +"4 c #F3D65E", +"5 c #D5A216", +"6 c #FAE05C", +"7 c #FFED7C", +"8 c #FFEF8C", +"9 c #FFF092", +"0 c #FDEB7A", +"a c #F4D750", +"b c #D8A717", +"c c #EAC01D", +"d c #F6D83E", +"e c #FAE255", +"f c #FAE362", +"g c #F9E161", +"h c #F6DE5B", +"i c #F1D145", +"j c #E6BE28", +"k c #D09B09", +"l c #B67E00", +"m c #CE9100", +"n c #D69F04", +"o c #E0B011", +"p c #E6BA1D", +"q c #E3B721", +"r c #E0B21E", +"s c #DCAB16", +"t c #D7A20D", +"u c #CC9303", +"v c #BE8400", +"w c #AC7500", +"x c #A06B00", +"y c #FFDD00", +" ", +" .. ", +" .+@. ", +" .#$%&. ", +" .*=-;>,. ", +" .')!~{]. ", +" .^/(~_:<[. ", +" .}|121345. ", +" .678980ab. ", +" .cdefghijkl. ", +" .mnopqrstuvwx. ", +" .............. ", +" .8y. ", +" .. ", +" ", +" "}; diff --git a/calendar/gui/gncal-day-view.h b/calendar/gui/gncal-day-view.h index f2a4ae6e93..564788fc81 100644 --- a/calendar/gui/gncal-day-view.h +++ b/calendar/gui/gncal-day-view.h @@ -11,7 +11,6 @@ #include #include -#include "calendar.h" #include "gnome-cal.h" BEGIN_GNOME_DECLS diff --git a/calendar/gui/gncal-full-day.c b/calendar/gui/gncal-full-day.c index 6d95a79d41..67756d0482 100644 --- a/calendar/gui/gncal-full-day.c +++ b/calendar/gui/gncal-full-day.c @@ -16,7 +16,7 @@ #define TEXT_BORDER 2 #define HANDLE_SIZE 8 -#define MIN_WIDTH 200 +#define MIN_WIDTH 300 #define XOR_RECT_WIDTH 2 #define UNSELECT_TIMEOUT 150 /* ms */ @@ -1413,7 +1413,7 @@ button_1 (GncalFullDay *fullday, GdkEventButton *event) | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_RELEASE_MASK), NULL, - NULL, + fullday->up_down_cursor, event->time); if (old_rows_used == 0) { @@ -1460,7 +1460,7 @@ button_1 (GncalFullDay *fullday, GdkEventButton *event) | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_RELEASE_MASK), NULL, - NULL, + fullday->up_down_cursor, event->time); draw_xor_rect (fullday); diff --git a/calendar/gui/recur.xpm b/calendar/gui/recur.xpm new file mode 100644 index 0000000000..49836b62e7 --- /dev/null +++ b/calendar/gui/recur.xpm @@ -0,0 +1,83 @@ +/* XPM */ +static char * recur_xpm[] = { +"16 16 64 1", +" c None", +". c #350000", +"+ c #2A0000", +"@ c #1B0000", +"# c #280000", +"$ c #430000", +"% c #090000", +"& c #160000", +"* c #250000", +"= c #460000", +"- c #550000", +"; c #610000", +"> c #0D0000", +", c #1F0000", +"' c #4B0000", +") c #5E0000", +"! c #6B0000", +"~ c #750000", +"{ c #790000", +"] c #810000", +"^ c #FFFF83", +"/ c #FFFF89", +"( c #FFFF93", +"_ c #8B0000", +": c #900000", +"< c #930000", +"[ c #FFFF62", +"} c #A10000", +"| c #FFFF41", +"1 c #FFFF3B", +"2 c #FFFF31", +"3 c #B70000", +"4 c #B20000", +"5 c #AE0000", +"6 c #FFFF22", +"7 c #FFFF16", +"8 c #FFFF06", +"9 c #C90000", +"0 c #C10000", +"a c #BB0000", +"b c #FFF600", +"c c #FFE100", +"d c #FFC500", +"e c #E40000", +"f c #D70000", +"g c #CD0000", +"h c #FFDB00", +"i c #FFA900", +"j c #FF8500", +"k c #FF5900", +"l c #FF2800", +"m c #FC0000", +"n c #ED0000", +"o c #E10000", +"p c #FFAF00", +"q c #FF9400", +"r c #FF7400", +"s c #FF5000", +"t c #FF0100", +"u c #F30000", +"v c #E80000", +"w c #FF6900", +"x c #FF4900", +"y c #FF0800", +" ", +" . ", +" +. ", +" @#.$ ", +" %&*.=-; ", +" >,.')!~ ", +" &. !{] ", +" ^/( . _:< ", +" [[[ }}} ", +" |12 345 ", +" 678 90a ", +" bcd efg ", +" hdijklmnof ", +" pqrsltuv ", +" wxly ", +" "}; diff --git a/calendar/gui/year-view.h b/calendar/gui/year-view.h index 8cc4e8a403..f31d5ae4a3 100644 --- a/calendar/gui/year-view.h +++ b/calendar/gui/year-view.h @@ -16,7 +16,6 @@ #include #include -#include "calendar.h" #include "gnome-cal.h" BEGIN_GNOME_DECLS diff --git a/calendar/recur.xpm b/calendar/recur.xpm new file mode 100644 index 0000000000..49836b62e7 --- /dev/null +++ b/calendar/recur.xpm @@ -0,0 +1,83 @@ +/* XPM */ +static char * recur_xpm[] = { +"16 16 64 1", +" c None", +". c #350000", +"+ c #2A0000", +"@ c #1B0000", +"# c #280000", +"$ c #430000", +"% c #090000", +"& c #160000", +"* c #250000", +"= c #460000", +"- c #550000", +"; c #610000", +"> c #0D0000", +", c #1F0000", +"' c #4B0000", +") c #5E0000", +"! c #6B0000", +"~ c #750000", +"{ c #790000", +"] c #810000", +"^ c #FFFF83", +"/ c #FFFF89", +"( c #FFFF93", +"_ c #8B0000", +": c #900000", +"< c #930000", +"[ c #FFFF62", +"} c #A10000", +"| c #FFFF41", +"1 c #FFFF3B", +"2 c #FFFF31", +"3 c #B70000", +"4 c #B20000", +"5 c #AE0000", +"6 c #FFFF22", +"7 c #FFFF16", +"8 c #FFFF06", +"9 c #C90000", +"0 c #C10000", +"a c #BB0000", +"b c #FFF600", +"c c #FFE100", +"d c #FFC500", +"e c #E40000", +"f c #D70000", +"g c #CD0000", +"h c #FFDB00", +"i c #FFA900", +"j c #FF8500", +"k c #FF5900", +"l c #FF2800", +"m c #FC0000", +"n c #ED0000", +"o c #E10000", +"p c #FFAF00", +"q c #FF9400", +"r c #FF7400", +"s c #FF5000", +"t c #FF0100", +"u c #F30000", +"v c #E80000", +"w c #FF6900", +"x c #FF4900", +"y c #FF0800", +" ", +" . ", +" +. ", +" @#.$ ", +" %&*.=-; ", +" >,.')!~ ", +" &. !{] ", +" ^/( . _:< ", +" [[[ }}} ", +" |12 345 ", +" 678 90a ", +" bcd efg ", +" hdijklmnof ", +" pqrsltuv ", +" wxly ", +" "}; diff --git a/calendar/year-view.h b/calendar/year-view.h index 8cc4e8a403..f31d5ae4a3 100644 --- a/calendar/year-view.h +++ b/calendar/year-view.h @@ -16,7 +16,6 @@ #include #include -#include "calendar.h" #include "gnome-cal.h" BEGIN_GNOME_DECLS -- cgit v1.2.3