diff --git a/data/activities/default/doing_chores/buying_groceries.png b/data/activities/default/doing_chores/buying_groceries.png
new file mode 100644
index 0000000000000000000000000000000000000000..027079d1640223b6c3957ccc8d28d350ec3f738c
Binary files /dev/null and b/data/activities/default/doing_chores/buying_groceries.png differ
diff --git a/data/activities/default/doing_chores/cleaning.png b/data/activities/default/doing_chores/cleaning.png
new file mode 100644
index 0000000000000000000000000000000000000000..18549f38a1f13a18424e88dc0d8cb92ad28536e3
Binary files /dev/null and b/data/activities/default/doing_chores/cleaning.png differ
diff --git a/data/activities/default/doing_chores/cooking.png b/data/activities/default/doing_chores/cooking.png
new file mode 100644
index 0000000000000000000000000000000000000000..bcd238539cebdba5867ac869d40614dfb9829e58
Binary files /dev/null and b/data/activities/default/doing_chores/cooking.png differ
diff --git a/data/activities/default/doing_chores/doing_maintenance.png b/data/activities/default/doing_chores/doing_maintenance.png
new file mode 100644
index 0000000000000000000000000000000000000000..51410347460a89d689ec7addba2964151666dc02
Binary files /dev/null and b/data/activities/default/doing_chores/doing_maintenance.png differ
diff --git a/data/activities/default/doing_chores/doing_the_dishes.png b/data/activities/default/doing_chores/doing_the_dishes.png
new file mode 100644
index 0000000000000000000000000000000000000000..77b6d87c81267f4749227d3e0c28606b0f6e3d0f
Binary files /dev/null and b/data/activities/default/doing_chores/doing_the_dishes.png differ
diff --git a/data/activities/default/doing_chores/doing_the_laundry.png b/data/activities/default/doing_chores/doing_the_laundry.png
new file mode 100644
index 0000000000000000000000000000000000000000..e11c86ceee180bd6f87ae875ca5742493aa7f319
Binary files /dev/null and b/data/activities/default/doing_chores/doing_the_laundry.png differ
diff --git a/data/activities/default/doing_chores/gardening.png b/data/activities/default/doing_chores/gardening.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e0415b55b92ff279d85cb05bc06d4f30e114e1b
Binary files /dev/null and b/data/activities/default/doing_chores/gardening.png differ
diff --git a/data/activities/default/doing_chores/running_an_errand.png b/data/activities/default/doing_chores/running_an_errand.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e74ba6d52ec1b5dea2134b6a6a3f2539486b74e
Binary files /dev/null and b/data/activities/default/doing_chores/running_an_errand.png differ
diff --git a/data/activities/default/doing_chores/walking_the_dog.png b/data/activities/default/doing_chores/walking_the_dog.png
new file mode 100644
index 0000000000000000000000000000000000000000..de96a9e2095e1bad0813bf14dcd853bbcc333347
Binary files /dev/null and b/data/activities/default/doing_chores/walking_the_dog.png differ
diff --git a/data/activities/default/drinking/having_a_beer.png b/data/activities/default/drinking/having_a_beer.png
new file mode 100644
index 0000000000000000000000000000000000000000..43336893088f1e71df72ef6164c4f81d5b7c346a
Binary files /dev/null and b/data/activities/default/drinking/having_a_beer.png differ
diff --git a/data/activities/default/drinking/having_coffee.png b/data/activities/default/drinking/having_coffee.png
new file mode 100644
index 0000000000000000000000000000000000000000..c27608b53dad80ea8f74826c11bc966d03b3a531
Binary files /dev/null and b/data/activities/default/drinking/having_coffee.png differ
diff --git a/data/activities/default/drinking/having_tea.png b/data/activities/default/drinking/having_tea.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ca49704890923661c53d2924b3c2392ebc12dea
Binary files /dev/null and b/data/activities/default/drinking/having_tea.png differ
diff --git a/data/activities/default/eating/having_a_snack.png b/data/activities/default/eating/having_a_snack.png
new file mode 100644
index 0000000000000000000000000000000000000000..f6d699c84f69d530cde604c55c0d4f426b06a918
Binary files /dev/null and b/data/activities/default/eating/having_a_snack.png differ
diff --git a/data/activities/default/eating/having_breakfast.png b/data/activities/default/eating/having_breakfast.png
new file mode 100644
index 0000000000000000000000000000000000000000..eced76e94ef1b44943ec2ed97885c414475214ac
Binary files /dev/null and b/data/activities/default/eating/having_breakfast.png differ
diff --git a/data/activities/default/eating/having_dinner.png b/data/activities/default/eating/having_dinner.png
new file mode 100644
index 0000000000000000000000000000000000000000..b40a1fdb947c365f935e5c557a88b67cf7440558
Binary files /dev/null and b/data/activities/default/eating/having_dinner.png differ
diff --git a/data/activities/default/eating/having_lunch.png b/data/activities/default/eating/having_lunch.png
new file mode 100644
index 0000000000000000000000000000000000000000..a25a5c6a8746ffbc14cfaf17a0b4de83aaa4e0b2
Binary files /dev/null and b/data/activities/default/eating/having_lunch.png differ
diff --git a/data/activities/default/exercising/cycling.png b/data/activities/default/exercising/cycling.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d97f656b4629b70f4ce287979ea3bc3d615750c
Binary files /dev/null and b/data/activities/default/exercising/cycling.png differ
diff --git a/data/activities/default/exercising/hiking.png b/data/activities/default/exercising/hiking.png
new file mode 100644
index 0000000000000000000000000000000000000000..541d308aa738446065b704c874664022a0a63744
Binary files /dev/null and b/data/activities/default/exercising/hiking.png differ
diff --git a/data/activities/default/exercising/jogging.png b/data/activities/default/exercising/jogging.png
new file mode 100644
index 0000000000000000000000000000000000000000..d7c98bbeeb7835735468f648393b596c89fb4b5e
Binary files /dev/null and b/data/activities/default/exercising/jogging.png differ
diff --git a/data/activities/default/exercising/playing_sports.png b/data/activities/default/exercising/playing_sports.png
new file mode 100644
index 0000000000000000000000000000000000000000..33e32e6a6076b662a5c23dff1cb0329910bfb7e2
Binary files /dev/null and b/data/activities/default/exercising/playing_sports.png differ
diff --git a/data/activities/default/exercising/running.png b/data/activities/default/exercising/running.png
new file mode 100644
index 0000000000000000000000000000000000000000..85237cfd3b1cc3b47629ecb79d95d67a1d8a000c
Binary files /dev/null and b/data/activities/default/exercising/running.png differ
diff --git a/data/activities/default/exercising/skiing.png b/data/activities/default/exercising/skiing.png
new file mode 100644
index 0000000000000000000000000000000000000000..b33bb97bba0b39cd294335ca81a3515326a9d4e7
Binary files /dev/null and b/data/activities/default/exercising/skiing.png differ
diff --git a/data/activities/default/exercising/swimming.png b/data/activities/default/exercising/swimming.png
new file mode 100644
index 0000000000000000000000000000000000000000..fad7c6ced12cbf8886b6f6e9219ee0b6fd7d4845
Binary files /dev/null and b/data/activities/default/exercising/swimming.png differ
diff --git a/data/activities/default/exercising/working_out.png b/data/activities/default/exercising/working_out.png
new file mode 100644
index 0000000000000000000000000000000000000000..9df00db59a6a31f3a9de67dc81f07122fcea50bb
Binary files /dev/null and b/data/activities/default/exercising/working_out.png differ
diff --git a/data/activities/default/grooming/at_the_spa.png b/data/activities/default/grooming/at_the_spa.png
new file mode 100644
index 0000000000000000000000000000000000000000..26d4440228d05f81ad32dff811d224b50a7993ca
Binary files /dev/null and b/data/activities/default/grooming/at_the_spa.png differ
diff --git a/data/activities/default/grooming/brushing_teeth.png b/data/activities/default/grooming/brushing_teeth.png
new file mode 100644
index 0000000000000000000000000000000000000000..f24d0773dda4931fa4ab29b736638f383844ec9a
Binary files /dev/null and b/data/activities/default/grooming/brushing_teeth.png differ
diff --git a/data/activities/default/grooming/getting_a_haircut.png b/data/activities/default/grooming/getting_a_haircut.png
new file mode 100644
index 0000000000000000000000000000000000000000..13396d71e2507b0f940b73b08e8c3e0167977fe0
Binary files /dev/null and b/data/activities/default/grooming/getting_a_haircut.png differ
diff --git a/data/activities/default/grooming/shaving.png b/data/activities/default/grooming/shaving.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1da19f227add242937a64b8f328583bc4726658
Binary files /dev/null and b/data/activities/default/grooming/shaving.png differ
diff --git a/data/activities/default/grooming/taking_a_bath.png b/data/activities/default/grooming/taking_a_bath.png
new file mode 100644
index 0000000000000000000000000000000000000000..f487cc25dde263e33019529df1fe8dd478ccc65b
Binary files /dev/null and b/data/activities/default/grooming/taking_a_bath.png differ
diff --git a/data/activities/default/grooming/taking_a_shower.png b/data/activities/default/grooming/taking_a_shower.png
new file mode 100644
index 0000000000000000000000000000000000000000..1113215081943462d7bbac1824768eff5f115174
Binary files /dev/null and b/data/activities/default/grooming/taking_a_shower.png differ
diff --git a/data/activities/default/inactive/day_off.png b/data/activities/default/inactive/day_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..f79791473fc978a8a10720dc656a531f7620a319
Binary files /dev/null and b/data/activities/default/inactive/day_off.png differ
diff --git a/data/activities/default/inactive/hanging_out.png b/data/activities/default/inactive/hanging_out.png
new file mode 100644
index 0000000000000000000000000000000000000000..c06931f443041b6459543b6d10fcf900514d4862
Binary files /dev/null and b/data/activities/default/inactive/hanging_out.png differ
diff --git a/data/activities/default/inactive/on_vacation.png b/data/activities/default/inactive/on_vacation.png
new file mode 100644
index 0000000000000000000000000000000000000000..36c10ed386bba575966d4b8c4e670cb255bfdbf7
Binary files /dev/null and b/data/activities/default/inactive/on_vacation.png differ
diff --git a/data/activities/default/inactive/scheduled_holiday.png b/data/activities/default/inactive/scheduled_holiday.png
new file mode 100644
index 0000000000000000000000000000000000000000..6fbeb2a886a4baa1ab7755f67a8b46ab2402f113
Binary files /dev/null and b/data/activities/default/inactive/scheduled_holiday.png differ
diff --git a/data/activities/default/inactive/sleeping.png b/data/activities/default/inactive/sleeping.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b80b50f6b9f02d8e2dcdba117c4950951058a03
Binary files /dev/null and b/data/activities/default/inactive/sleeping.png differ
diff --git a/data/activities/default/relaxing/gaming.png b/data/activities/default/relaxing/gaming.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a817fbc32d7347a8164d7f8f315be92851f61a8
Binary files /dev/null and b/data/activities/default/relaxing/gaming.png differ
diff --git a/data/activities/default/relaxing/going_out.png b/data/activities/default/relaxing/going_out.png
new file mode 100644
index 0000000000000000000000000000000000000000..05bf1c1f82d00d57d37ed0b2498f3d2affc22f07
Binary files /dev/null and b/data/activities/default/relaxing/going_out.png differ
diff --git a/data/activities/default/relaxing/partying.png b/data/activities/default/relaxing/partying.png
new file mode 100644
index 0000000000000000000000000000000000000000..31835b5edc2e637081d15dd313948ca6f8ddd38c
Binary files /dev/null and b/data/activities/default/relaxing/partying.png differ
diff --git a/data/activities/default/relaxing/reading.png b/data/activities/default/relaxing/reading.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e7eb8c544515e102eb9da5b50d9064c23495fde
Binary files /dev/null and b/data/activities/default/relaxing/reading.png differ
diff --git a/data/activities/default/relaxing/rehearsing.png b/data/activities/default/relaxing/rehearsing.png
new file mode 100644
index 0000000000000000000000000000000000000000..5be9a8b2d3ea7824737925cc9db037efcc323856
Binary files /dev/null and b/data/activities/default/relaxing/rehearsing.png differ
diff --git a/data/activities/default/relaxing/shopping.png b/data/activities/default/relaxing/shopping.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f969fb7b566ed9692e59117b84211340bbf317c
Binary files /dev/null and b/data/activities/default/relaxing/shopping.png differ
diff --git a/data/activities/default/relaxing/socializing.png b/data/activities/default/relaxing/socializing.png
new file mode 100644
index 0000000000000000000000000000000000000000..45fe7fc5b39086d5de4d69cfe26d0a4a55542f2b
Binary files /dev/null and b/data/activities/default/relaxing/socializing.png differ
diff --git a/data/activities/default/relaxing/sunbathing.png b/data/activities/default/relaxing/sunbathing.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d6e2c94e85c3b3be9edca3fb36ecada30ecd90c
Binary files /dev/null and b/data/activities/default/relaxing/sunbathing.png differ
diff --git a/data/activities/default/relaxing/watching_a_movie.png b/data/activities/default/relaxing/watching_a_movie.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd66835d721eaffa0597ed1b3a90768c3e7b9a3d
Binary files /dev/null and b/data/activities/default/relaxing/watching_a_movie.png differ
diff --git a/data/activities/default/relaxing/watching_tv.png b/data/activities/default/relaxing/watching_tv.png
new file mode 100644
index 0000000000000000000000000000000000000000..82255b80ccbfb1333e9d35b3ed8fbe453cf1ffda
Binary files /dev/null and b/data/activities/default/relaxing/watching_tv.png differ
diff --git a/data/activities/default/talking/in_real_life.png b/data/activities/default/talking/in_real_life.png
new file mode 100644
index 0000000000000000000000000000000000000000..76c96eaaa75d7d717278f5861412ad9c0d261a31
Binary files /dev/null and b/data/activities/default/talking/in_real_life.png differ
diff --git a/data/activities/default/talking/on_the_phone.png b/data/activities/default/talking/on_the_phone.png
new file mode 100644
index 0000000000000000000000000000000000000000..bdfb88001f6ee138acac5da2e5e79b0893db3205
Binary files /dev/null and b/data/activities/default/talking/on_the_phone.png differ
diff --git a/data/activities/default/talking/on_the_video_phone.png b/data/activities/default/talking/on_the_video_phone.png
new file mode 100644
index 0000000000000000000000000000000000000000..672c43805411364cb9d9143214317af07950dc83
Binary files /dev/null and b/data/activities/default/talking/on_the_video_phone.png differ
diff --git a/data/activities/default/traveling/commuting.png b/data/activities/default/traveling/commuting.png
new file mode 100644
index 0000000000000000000000000000000000000000..525edb6fc7096e1ab71d07dd8869fdf1940d9486
Binary files /dev/null and b/data/activities/default/traveling/commuting.png differ
diff --git a/data/activities/default/traveling/cycling.png b/data/activities/default/traveling/cycling.png
new file mode 100644
index 0000000000000000000000000000000000000000..60f2bd57d9b4cf189d026fbe96a68804374b4673
Binary files /dev/null and b/data/activities/default/traveling/cycling.png differ
diff --git a/data/activities/default/traveling/driving.png b/data/activities/default/traveling/driving.png
new file mode 100644
index 0000000000000000000000000000000000000000..1dcb517fa02a46345350c25c78c6b11a0789c0b4
Binary files /dev/null and b/data/activities/default/traveling/driving.png differ
diff --git a/data/activities/default/traveling/in_a_car.png b/data/activities/default/traveling/in_a_car.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a4d18d051db1746d27f07f872af57d86de7aadd
Binary files /dev/null and b/data/activities/default/traveling/in_a_car.png differ
diff --git a/data/activities/default/traveling/on_a_bus.png b/data/activities/default/traveling/on_a_bus.png
new file mode 100644
index 0000000000000000000000000000000000000000..7bacc1e672ca8c7d44d60508a408bba176071171
Binary files /dev/null and b/data/activities/default/traveling/on_a_bus.png differ
diff --git a/data/activities/default/traveling/on_a_plane.png b/data/activities/default/traveling/on_a_plane.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c38c58d068c1eaf276c36daf42343087f59f6e4
Binary files /dev/null and b/data/activities/default/traveling/on_a_plane.png differ
diff --git a/data/activities/default/traveling/on_a_train.png b/data/activities/default/traveling/on_a_train.png
new file mode 100644
index 0000000000000000000000000000000000000000..b17ce472fc6963231bded1512ac826af30ece295
Binary files /dev/null and b/data/activities/default/traveling/on_a_train.png differ
diff --git a/data/activities/default/traveling/on_a_trip.png b/data/activities/default/traveling/on_a_trip.png
new file mode 100644
index 0000000000000000000000000000000000000000..fbcc243eeb9a127e657c82992630054336d34e4c
Binary files /dev/null and b/data/activities/default/traveling/on_a_trip.png differ
diff --git a/data/activities/default/traveling/walking.png b/data/activities/default/traveling/walking.png
new file mode 100644
index 0000000000000000000000000000000000000000..3066c76ddbe332cafaf7eff7b8558e8d90686ff3
Binary files /dev/null and b/data/activities/default/traveling/walking.png differ
diff --git a/data/activities/default/working/coding.png b/data/activities/default/working/coding.png
new file mode 100644
index 0000000000000000000000000000000000000000..0105225fe11aaa4c3256a7df3650b2a445f5c8c8
Binary files /dev/null and b/data/activities/default/working/coding.png differ
diff --git a/data/activities/default/working/in_a_meeting.png b/data/activities/default/working/in_a_meeting.png
new file mode 100644
index 0000000000000000000000000000000000000000..4870e68435f7e7e5e8f29cc74d7c5226b6fc014a
Binary files /dev/null and b/data/activities/default/working/in_a_meeting.png differ
diff --git a/data/activities/default/working/studying.png b/data/activities/default/working/studying.png
new file mode 100644
index 0000000000000000000000000000000000000000..b05fa8477c9fcdf7ee5fbad136ae4771f64ed4b9
Binary files /dev/null and b/data/activities/default/working/studying.png differ
diff --git a/data/activities/default/working/writing.png b/data/activities/default/working/writing.png
new file mode 100644
index 0000000000000000000000000000000000000000..c63554e396320da266e51b768bb3cd033d7270f0
Binary files /dev/null and b/data/activities/default/working/writing.png differ
diff --git a/src/dialogs.py b/src/dialogs.py
index b792759481b9816dc9a6c52b2e105409cc8921e6..a50983b6bd677d828b5c8a6ea934449e6eb71ad9 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 6900a856a826f8587adfa7da1c321ccb05e81bf5..98f0511b3e647cfaa7d07f1fee27eb0e792c34d7 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