diff options
author | js <js-gajim@webkeks.org> | 2008-10-22 18:21:57 +0400 |
---|---|---|
committer | js <js-gajim@webkeks.org> | 2008-10-22 18:21:57 +0400 |
commit | 72f30bd80b5115ea7360cab8374b4f10652b8732 (patch) | |
tree | e7168085b1551cf5ad275150b35d0d6ed9dfcf3f | |
parent | 6fc5ffe2769eea8aa2b4dd7cdc1e754bb5d96998 (diff) |
Complete activity icon set.
Special thanks to Rederick Asher!
Fixes #4140.
63 files changed, 19 insertions, 6 deletions
diff --git a/data/activities/default/doing_chores/buying_groceries.png b/data/activities/default/doing_chores/buying_groceries.png Binary files differnew file mode 100644 index 000000000..027079d16 --- /dev/null +++ b/data/activities/default/doing_chores/buying_groceries.png diff --git a/data/activities/default/doing_chores/cleaning.png b/data/activities/default/doing_chores/cleaning.png Binary files differnew file mode 100644 index 000000000..18549f38a --- /dev/null +++ b/data/activities/default/doing_chores/cleaning.png diff --git a/data/activities/default/doing_chores/cooking.png b/data/activities/default/doing_chores/cooking.png Binary files differnew file mode 100644 index 000000000..bcd238539 --- /dev/null +++ b/data/activities/default/doing_chores/cooking.png diff --git a/data/activities/default/doing_chores/doing_maintenance.png b/data/activities/default/doing_chores/doing_maintenance.png Binary files differnew file mode 100644 index 000000000..514103474 --- /dev/null +++ b/data/activities/default/doing_chores/doing_maintenance.png diff --git a/data/activities/default/doing_chores/doing_the_dishes.png b/data/activities/default/doing_chores/doing_the_dishes.png Binary files differnew file mode 100644 index 000000000..77b6d87c8 --- /dev/null +++ b/data/activities/default/doing_chores/doing_the_dishes.png diff --git a/data/activities/default/doing_chores/doing_the_laundry.png b/data/activities/default/doing_chores/doing_the_laundry.png Binary files differnew file mode 100644 index 000000000..e11c86cee --- /dev/null +++ b/data/activities/default/doing_chores/doing_the_laundry.png diff --git a/data/activities/default/doing_chores/gardening.png b/data/activities/default/doing_chores/gardening.png Binary files differnew file mode 100644 index 000000000..3e0415b55 --- /dev/null +++ b/data/activities/default/doing_chores/gardening.png diff --git a/data/activities/default/doing_chores/running_an_errand.png b/data/activities/default/doing_chores/running_an_errand.png Binary files differnew file mode 100644 index 000000000..6e74ba6d5 --- /dev/null +++ b/data/activities/default/doing_chores/running_an_errand.png diff --git a/data/activities/default/doing_chores/walking_the_dog.png b/data/activities/default/doing_chores/walking_the_dog.png Binary files differnew file mode 100644 index 000000000..de96a9e20 --- /dev/null +++ b/data/activities/default/doing_chores/walking_the_dog.png diff --git a/data/activities/default/drinking/having_a_beer.png b/data/activities/default/drinking/having_a_beer.png Binary files differnew file mode 100644 index 000000000..433368930 --- /dev/null +++ b/data/activities/default/drinking/having_a_beer.png diff --git a/data/activities/default/drinking/having_coffee.png b/data/activities/default/drinking/having_coffee.png Binary files differnew file mode 100644 index 000000000..c27608b53 --- /dev/null +++ b/data/activities/default/drinking/having_coffee.png diff --git a/data/activities/default/drinking/having_tea.png b/data/activities/default/drinking/having_tea.png Binary files differnew file mode 100644 index 000000000..8ca497048 --- /dev/null +++ b/data/activities/default/drinking/having_tea.png diff --git a/data/activities/default/eating/having_a_snack.png b/data/activities/default/eating/having_a_snack.png Binary files differnew file mode 100644 index 000000000..f6d699c84 --- /dev/null +++ b/data/activities/default/eating/having_a_snack.png diff --git a/data/activities/default/eating/having_breakfast.png b/data/activities/default/eating/having_breakfast.png Binary files differnew file mode 100644 index 000000000..eced76e94 --- /dev/null +++ b/data/activities/default/eating/having_breakfast.png diff --git a/data/activities/default/eating/having_dinner.png b/data/activities/default/eating/having_dinner.png Binary files differnew file mode 100644 index 000000000..b40a1fdb9 --- /dev/null +++ b/data/activities/default/eating/having_dinner.png diff --git a/data/activities/default/eating/having_lunch.png b/data/activities/default/eating/having_lunch.png Binary files differnew file mode 100644 index 000000000..a25a5c6a8 --- /dev/null +++ b/data/activities/default/eating/having_lunch.png diff --git a/data/activities/default/exercising/cycling.png b/data/activities/default/exercising/cycling.png Binary files differnew file mode 100644 index 000000000..9d97f656b --- /dev/null +++ b/data/activities/default/exercising/cycling.png diff --git a/data/activities/default/exercising/hiking.png b/data/activities/default/exercising/hiking.png Binary files differnew file mode 100644 index 000000000..541d308aa --- /dev/null +++ b/data/activities/default/exercising/hiking.png diff --git a/data/activities/default/exercising/jogging.png b/data/activities/default/exercising/jogging.png Binary files differnew file mode 100644 index 000000000..d7c98bbee --- /dev/null +++ b/data/activities/default/exercising/jogging.png diff --git a/data/activities/default/exercising/playing_sports.png b/data/activities/default/exercising/playing_sports.png Binary files differnew file mode 100644 index 000000000..33e32e6a6 --- /dev/null +++ b/data/activities/default/exercising/playing_sports.png diff --git a/data/activities/default/exercising/running.png b/data/activities/default/exercising/running.png Binary files differnew file mode 100644 index 000000000..85237cfd3 --- /dev/null +++ b/data/activities/default/exercising/running.png diff --git a/data/activities/default/exercising/skiing.png b/data/activities/default/exercising/skiing.png Binary files differnew file mode 100644 index 000000000..b33bb97bb --- /dev/null +++ b/data/activities/default/exercising/skiing.png diff --git a/data/activities/default/exercising/swimming.png b/data/activities/default/exercising/swimming.png Binary files differnew file mode 100644 index 000000000..fad7c6ced --- /dev/null +++ b/data/activities/default/exercising/swimming.png diff --git a/data/activities/default/exercising/working_out.png b/data/activities/default/exercising/working_out.png Binary files differnew file mode 100644 index 000000000..9df00db59 --- /dev/null +++ b/data/activities/default/exercising/working_out.png diff --git a/data/activities/default/grooming/at_the_spa.png b/data/activities/default/grooming/at_the_spa.png Binary files differnew file mode 100644 index 000000000..26d444022 --- /dev/null +++ b/data/activities/default/grooming/at_the_spa.png diff --git a/data/activities/default/grooming/brushing_teeth.png b/data/activities/default/grooming/brushing_teeth.png Binary files differnew file mode 100644 index 000000000..f24d0773d --- /dev/null +++ b/data/activities/default/grooming/brushing_teeth.png diff --git a/data/activities/default/grooming/getting_a_haircut.png b/data/activities/default/grooming/getting_a_haircut.png Binary files differnew file mode 100644 index 000000000..13396d71e --- /dev/null +++ b/data/activities/default/grooming/getting_a_haircut.png diff --git a/data/activities/default/grooming/shaving.png b/data/activities/default/grooming/shaving.png Binary files differnew file mode 100644 index 000000000..d1da19f22 --- /dev/null +++ b/data/activities/default/grooming/shaving.png diff --git a/data/activities/default/grooming/taking_a_bath.png b/data/activities/default/grooming/taking_a_bath.png Binary files differnew file mode 100644 index 000000000..f487cc25d --- /dev/null +++ b/data/activities/default/grooming/taking_a_bath.png diff --git a/data/activities/default/grooming/taking_a_shower.png b/data/activities/default/grooming/taking_a_shower.png Binary files differnew file mode 100644 index 000000000..111321508 --- /dev/null +++ b/data/activities/default/grooming/taking_a_shower.png diff --git a/data/activities/default/inactive/day_off.png b/data/activities/default/inactive/day_off.png Binary files differnew file mode 100644 index 000000000..f79791473 --- /dev/null +++ b/data/activities/default/inactive/day_off.png diff --git a/data/activities/default/inactive/hanging_out.png b/data/activities/default/inactive/hanging_out.png Binary files differnew file mode 100644 index 000000000..c06931f44 --- /dev/null +++ b/data/activities/default/inactive/hanging_out.png diff --git a/data/activities/default/inactive/on_vacation.png b/data/activities/default/inactive/on_vacation.png Binary files differnew file mode 100644 index 000000000..36c10ed38 --- /dev/null +++ b/data/activities/default/inactive/on_vacation.png diff --git a/data/activities/default/inactive/scheduled_holiday.png b/data/activities/default/inactive/scheduled_holiday.png Binary files differnew file mode 100644 index 000000000..6fbeb2a88 --- /dev/null +++ b/data/activities/default/inactive/scheduled_holiday.png diff --git a/data/activities/default/inactive/sleeping.png b/data/activities/default/inactive/sleeping.png Binary files differnew file mode 100644 index 000000000..8b80b50f6 --- /dev/null +++ b/data/activities/default/inactive/sleeping.png diff --git a/data/activities/default/relaxing/gaming.png b/data/activities/default/relaxing/gaming.png Binary files differnew file mode 100644 index 000000000..1a817fbc3 --- /dev/null +++ b/data/activities/default/relaxing/gaming.png diff --git a/data/activities/default/relaxing/going_out.png b/data/activities/default/relaxing/going_out.png Binary files differnew file mode 100644 index 000000000..05bf1c1f8 --- /dev/null +++ b/data/activities/default/relaxing/going_out.png diff --git a/data/activities/default/relaxing/partying.png b/data/activities/default/relaxing/partying.png Binary files differnew file mode 100644 index 000000000..31835b5ed --- /dev/null +++ b/data/activities/default/relaxing/partying.png diff --git a/data/activities/default/relaxing/reading.png b/data/activities/default/relaxing/reading.png Binary files differnew file mode 100644 index 000000000..4e7eb8c54 --- /dev/null +++ b/data/activities/default/relaxing/reading.png diff --git a/data/activities/default/relaxing/rehearsing.png b/data/activities/default/relaxing/rehearsing.png Binary files differnew file mode 100644 index 000000000..5be9a8b2d --- /dev/null +++ b/data/activities/default/relaxing/rehearsing.png diff --git a/data/activities/default/relaxing/shopping.png b/data/activities/default/relaxing/shopping.png Binary files differnew file mode 100644 index 000000000..8f969fb7b --- /dev/null +++ b/data/activities/default/relaxing/shopping.png diff --git a/data/activities/default/relaxing/socializing.png b/data/activities/default/relaxing/socializing.png Binary files differnew file mode 100644 index 000000000..45fe7fc5b --- /dev/null +++ b/data/activities/default/relaxing/socializing.png diff --git a/data/activities/default/relaxing/sunbathing.png b/data/activities/default/relaxing/sunbathing.png Binary files differnew file mode 100644 index 000000000..8d6e2c94e --- /dev/null +++ b/data/activities/default/relaxing/sunbathing.png diff --git a/data/activities/default/relaxing/watching_a_movie.png b/data/activities/default/relaxing/watching_a_movie.png Binary files differnew file mode 100644 index 000000000..bd66835d7 --- /dev/null +++ b/data/activities/default/relaxing/watching_a_movie.png diff --git a/data/activities/default/relaxing/watching_tv.png b/data/activities/default/relaxing/watching_tv.png Binary files differnew file mode 100644 index 000000000..82255b80c --- /dev/null +++ b/data/activities/default/relaxing/watching_tv.png diff --git a/data/activities/default/talking/in_real_life.png b/data/activities/default/talking/in_real_life.png Binary files differnew file mode 100644 index 000000000..76c96eaaa --- /dev/null +++ b/data/activities/default/talking/in_real_life.png diff --git a/data/activities/default/talking/on_the_phone.png b/data/activities/default/talking/on_the_phone.png Binary files differnew file mode 100644 index 000000000..bdfb88001 --- /dev/null +++ b/data/activities/default/talking/on_the_phone.png diff --git a/data/activities/default/talking/on_the_video_phone.png b/data/activities/default/talking/on_the_video_phone.png Binary files differnew file mode 100644 index 000000000..672c43805 --- /dev/null +++ b/data/activities/default/talking/on_the_video_phone.png diff --git a/data/activities/default/traveling/commuting.png b/data/activities/default/traveling/commuting.png Binary files differnew file mode 100644 index 000000000..525edb6fc --- /dev/null +++ b/data/activities/default/traveling/commuting.png diff --git a/data/activities/default/traveling/cycling.png b/data/activities/default/traveling/cycling.png Binary files differnew file mode 100644 index 000000000..60f2bd57d --- /dev/null +++ b/data/activities/default/traveling/cycling.png diff --git a/data/activities/default/traveling/driving.png b/data/activities/default/traveling/driving.png Binary files differnew file mode 100644 index 000000000..1dcb517fa --- /dev/null +++ b/data/activities/default/traveling/driving.png diff --git a/data/activities/default/traveling/in_a_car.png b/data/activities/default/traveling/in_a_car.png Binary files differnew file mode 100644 index 000000000..8a4d18d05 --- /dev/null +++ b/data/activities/default/traveling/in_a_car.png diff --git a/data/activities/default/traveling/on_a_bus.png b/data/activities/default/traveling/on_a_bus.png Binary files differnew file mode 100644 index 000000000..7bacc1e67 --- /dev/null +++ b/data/activities/default/traveling/on_a_bus.png diff --git a/data/activities/default/traveling/on_a_plane.png b/data/activities/default/traveling/on_a_plane.png Binary files differnew file mode 100644 index 000000000..7c38c58d0 --- /dev/null +++ b/data/activities/default/traveling/on_a_plane.png diff --git a/data/activities/default/traveling/on_a_train.png b/data/activities/default/traveling/on_a_train.png Binary files differnew file mode 100644 index 000000000..b17ce472f --- /dev/null +++ b/data/activities/default/traveling/on_a_train.png diff --git a/data/activities/default/traveling/on_a_trip.png b/data/activities/default/traveling/on_a_trip.png Binary files differnew file mode 100644 index 000000000..fbcc243ee --- /dev/null +++ b/data/activities/default/traveling/on_a_trip.png diff --git a/data/activities/default/traveling/walking.png b/data/activities/default/traveling/walking.png Binary files differnew file mode 100644 index 000000000..3066c76dd --- /dev/null +++ b/data/activities/default/traveling/walking.png diff --git a/data/activities/default/working/coding.png b/data/activities/default/working/coding.png Binary files differnew file mode 100644 index 000000000..0105225fe --- /dev/null +++ b/data/activities/default/working/coding.png diff --git a/data/activities/default/working/in_a_meeting.png b/data/activities/default/working/in_a_meeting.png Binary files differnew file mode 100644 index 000000000..4870e6843 --- /dev/null +++ b/data/activities/default/working/in_a_meeting.png diff --git a/data/activities/default/working/studying.png b/data/activities/default/working/studying.png Binary files differnew file mode 100644 index 000000000..b05fa8477 --- /dev/null +++ b/data/activities/default/working/studying.png diff --git a/data/activities/default/working/writing.png b/data/activities/default/working/writing.png Binary files differnew file mode 100644 index 000000000..c63554e39 --- /dev/null +++ b/data/activities/default/working/writing.png diff --git a/src/dialogs.py b/src/dialogs.py index b79275948..a50983b6b 100644 --- a/src/dialogs.py +++ b/src/dialogs.py @@ -358,9 +358,13 @@ class ChangeActivityDialog: else: rbtns[act] = group = gtk.RadioButton() + hbox = gtk.HBox(False, 5) + hbox.pack_start(gtkgui_helpers.load_activity_icon(category), + False, False, 0) lbl = gtk.Label('<b>' + pep.ACTIVITIES[category]['category'] + '</b>') lbl.set_use_markup(True) - rbtns[act].add(lbl) + hbox.pack_start(lbl, False, False, 0) + rbtns[act].add(hbox) rbtns[act].connect('toggled', self.on_rbtn_toggled, [category, 'other']) vbox.pack_start(rbtns[act], False, False, 0) @@ -381,9 +385,14 @@ class ChangeActivityDialog: else: rbtns[act] = group = gtk.RadioButton() - rbtns[act].set_label(pep.ACTIVITIES[category][activity]) + hbox = gtk.HBox(False, 5) + hbox.pack_start(gtkgui_helpers.load_activity_icon(category, + activity), False, False, 0) + hbox.pack_start(gtk.Label(pep.ACTIVITIES[category][activity]), + False, False, 0) rbtns[act].connect('toggled', self.on_rbtn_toggled, [category, activity]) + rbtns[act].add(hbox) vbox.pack_start(rbtns[act], False, False, 0) rbtns['working_other'].set_active(True) diff --git a/src/gtkgui_helpers.py b/src/gtkgui_helpers.py index 6900a856a..98f0511b3 100644 --- a/src/gtkgui_helpers.py +++ b/src/gtkgui_helpers.py @@ -902,13 +902,17 @@ def load_mood_icon(icon_name): icon_list = _load_icon_list([icon_name], path) return icon_list[icon_name] -def load_activity_icon(activity, sub_activity = None): +def load_activity_icon(category, activity = None): '''load an icon from the activity iconset in 16x16''' + print category + print activity iconset = gajim.config.get('activity_iconset') path = os.path.join(helpers.get_activity_iconset_path(iconset), - activity, '') - icon_list = _load_icon_list(['category'], path) - return icon_list['category'] + category, '') + if activity is None: + activity = 'category' + icon_list = _load_icon_list([activity], path) + return icon_list[activity] def load_icons_meta(): '''load and return - AND + small icons to put on top left of an icon |