copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Revert r10064 and to it the right way™.

Browse source
This commit is contained in:
js 2008-07-29 19:42:31 +00:00
parent 981dca2b6b
commit 993d0d8609
3 changed files with 76 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
data/glade/change_activity_dialog.glade
View file

@ -63,7 +63,6 @@
<child> <child>
<widget class="GtkImage" id="working_image"> <widget class="GtkImage" id="working_image">
<property name="visible">True</property> <property name="visible">True</property>
<property name="tooltip" translatable="yes">Working</property>
<property name="stock">gtk-missing-image</property> <property name="stock">gtk-missing-image</property>
<property name="icon_size">1</property> <property name="icon_size">1</property>
</widget> </widget>
@ -106,7 +105,6 @@
<child> <child>
<widget class="GtkImage" id="eating_image"> <widget class="GtkImage" id="eating_image">
<property name="visible">True</property> <property name="visible">True</property>
<property name="tooltip" translatable="yes">Eating</property>
<property name="stock">gtk-missing-image</property> <property name="stock">gtk-missing-image</property>
<property name="icon_size">1</property> <property name="icon_size">1</property>
</widget> </widget>
@ -150,7 +148,6 @@
<child> <child>
<widget class="GtkImage" id="exercising_image"> <widget class="GtkImage" id="exercising_image">
<property name="visible">True</property> <property name="visible">True</property>
<property name="tooltip" translatable="yes">Exercising</property>
<property name="stock">gtk-missing-image</property> <property name="stock">gtk-missing-image</property>
<property name="icon_size">1</property> <property name="icon_size">1</property>
</widget> </widget>
@ -194,7 +191,6 @@
<child> <child>
<widget class="GtkImage" id="relaxing_image"> <widget class="GtkImage" id="relaxing_image">
<property name="visible">True</property> <property name="visible">True</property>
<property name="tooltip" translatable="yes">Relaxing</property>
<property name="stock">gtk-missing-image</property> <property name="stock">gtk-missing-image</property>
<property name="icon_size">1</property> <property name="icon_size">1</property>
</widget> </widget>
@ -238,7 +234,6 @@
<child> <child>
<widget class="GtkImage" id="talking_image"> <widget class="GtkImage" id="talking_image">
<property name="visible">True</property> <property name="visible">True</property>
<property name="tooltip" translatable="yes">Talking</property>
<property name="stock">gtk-missing-image</property> <property name="stock">gtk-missing-image</property>
<property name="icon_size">1</property> <property name="icon_size">1</property>
</widget> </widget>
@ -282,7 +277,6 @@
<child> <child>
<widget class="GtkImage" id="doing_chores_image"> <widget class="GtkImage" id="doing_chores_image">
<property name="visible">True</property> <property name="visible">True</property>
<property name="tooltip" translatable="yes">Doing Chores</property>
<property name="stock">gtk-missing-image</property> <property name="stock">gtk-missing-image</property>
<property name="icon_size">1</property> <property name="icon_size">1</property>
</widget> </widget>
@ -326,7 +320,6 @@
<child> <child>
<widget class="GtkImage" id="inactive_image"> <widget class="GtkImage" id="inactive_image">
<property name="visible">True</property> <property name="visible">True</property>
<property name="tooltip" translatable="yes">Inactive</property>
<property name="stock">gtk-missing-image</property> <property name="stock">gtk-missing-image</property>
<property name="icon_size">1</property> <property name="icon_size">1</property>
</widget> </widget>
@ -370,7 +363,6 @@
<child> <child>
<widget class="GtkImage" id="traveling_image"> <widget class="GtkImage" id="traveling_image">
<property name="visible">True</property> <property name="visible">True</property>
<property name="tooltip" translatable="yes">Traveling</property>
<property name="stock">gtk-missing-image</property> <property name="stock">gtk-missing-image</property>
<property name="icon_size">1</property> <property name="icon_size">1</property>
</widget> </widget>
@ -414,7 +406,6 @@
<child> <child>
<widget class="GtkImage" id="having_appointment_image"> <widget class="GtkImage" id="having_appointment_image">
<property name="visible">True</property> <property name="visible">True</property>
<property name="tooltip" translatable="yes">Having an Appointment</property>
<property name="stock">gtk-missing-image</property> <property name="stock">gtk-missing-image</property>
<property name="icon_size">1</property> <property name="icon_size">1</property>
</widget> </widget>
@ -458,7 +449,6 @@
<child> <child>
<widget class="GtkImage" id="drinking_image"> <widget class="GtkImage" id="drinking_image">
<property name="visible">True</property> <property name="visible">True</property>
<property name="tooltip" translatable="yes">Drinking</property>
<property name="stock">gtk-missing-image</property> <property name="stock">gtk-missing-image</property>
<property name="icon_size">1</property> <property name="icon_size">1</property>
</widget> </widget>
@ -502,7 +492,6 @@
<child> <child>
<widget class="GtkImage" id="grooming_image"> <widget class="GtkImage" id="grooming_image">
<property name="visible">True</property> <property name="visible">True</property>
<property name="tooltip" translatable="yes">Grooming</property>
<property name="stock">gtk-missing-image</property> <property name="stock">gtk-missing-image</property>
<property name="icon_size">1</property> <property name="icon_size">1</property>
</widget> </widget>

144
src/common/pep.py
View file

@ -37,78 +37,78 @@ MOODS = {
GAJIM_MOODS = ['thoughtful'] GAJIM_MOODS = ['thoughtful']
ACTIVITIES = { ACTIVITIES = {
'doing_chores': {'category': _('Doing Chores'), 'doing_chores': {'category': _('Doing Chores'),
'buying_groceries': _('Buying Groceries'), 'buying_groceries': _('Buying Groceries'),
'cleaning': _('Cleaning'), 'cleaning': _('Cleaning'),
'cooking': _('Cooking'), 'cooking': _('Cooking'),
'doing_maintenance': _('Doing Maintenance'), 'doing_maintenance': _('Doing Maintenance'),
'doing_the_dishes': _('Doing the Dishes'), 'doing_the_dishes': _('Doing the Dishes'),
'doing_the_laundry': _('Doing the Laundry'), 'doing_the_laundry': _('Doing the Laundry'),
'gardening': _('Gardening'), 'gardening': _('Gardening'),
'running_an_errand': _('Running an Errand'), 'running_an_errand': _('Running an Errand'),
'walking_the_dog': _('Walking the Dog')}, 'walking_the_dog': _('Walking the Dog')},
'drinking': {'category': _('Drinking'), 'drinking': {'category': _('Drinking'),
'having_a_beer': _('Having a Beer'), 'having_a_beer': _('Having a Beer'),
'having_coffee': _('Having Coffee'), 'having_coffee': _('Having Coffee'),
'having_tea': _('Having Tea')}, 'having_tea': _('Having Tea')},
'eating': {'category': _('Eating'), 'eating': {'category': _('Eating'),
'having_a_snack': _('Having a Snack'), 'having_a_snack': _('Having a Snack'),
'having_breakfast': _('Having Breakfast'), 'having_breakfast': _('Having Breakfast'),
'having_dinner': _('Having Dinner'), 'having_dinner': _('Having Dinner'),
'having_lunch': _('Having Lunch')}, 'having_lunch': _('Having Lunch')},
'exercising': {'category': _('Exercising'), 'exercising': {'category': _('Exercising'),
'cycling': _('Cycling'), 'cycling': _('Cycling'),
'hiking': _('Hiking'), 'hiking': _('Hiking'),
'jogging': _('Jogging'), 'jogging': _('Jogging'),
'playing_sports': _('Playing Sports'), 'playing_sports': _('Playing Sports'),
'running': _('Running'), 'running': _('Running'),
'skiing': _('Skiing'), 'skiing': _('Skiing'),
'swimming': _('Swimming'), 'swimming': _('Swimming'),
'working_out': _('Working out')}, 'working_out': _('Working out')},
'grooming': {'category': _('Grooming'), 'grooming': {'category': _('Grooming'),
'at_the_spa': _('At the Spa'), 'at_the_spa': _('At the Spa'),
'brushing_teeth': _('Brushing Teeth'), 'brushing_teeth': _('Brushing Teeth'),
'getting_a_haircut': _('Getting a Haircut'), 'getting_a_haircut': _('Getting a Haircut'),
'shaving': _('Shaving'), 'shaving': _('Shaving'),
'taking_a_bath': _('Taking a Bath'), 'taking_a_bath': _('Taking a Bath'),
'taking_a_shower': _('Taking a Shower')}, 'taking_a_shower': _('Taking a Shower')},
'having_appointment': {'category:': _('Having an Appointment')}, 'having_appointment': {'category': _('Having an Appointment')},
'inactive': {'category': _('Inactive'), 'inactive': {'category': _('Inactive'),
'day_off': _('Day Off'), 'day_off': _('Day Off'),
'hanging_out': _('Haning out'), 'hanging_out': _('Haning out'),
'on_vacation': _('On Vacation'), 'on_vacation': _('On Vacation'),
'scheduled_holiday': _('Scheduled Holiday'), 'scheduled_holiday': _('Scheduled Holiday'),
'sleeping': _('Sleeping')}, 'sleeping': _('Sleeping')},
'relaxing': {'category': _('Relaxing'), 'relaxing': {'category': _('Relaxing'),
'gaming': _('Gaming'), 'gaming': _('Gaming'),
'going_out': _('Going out'), 'going_out': _('Going out'),
'partying': _('Partying'), 'partying': _('Partying'),
'reading': _('Reading'), 'reading': _('Reading'),
'rehearsing': _('Rehearsing'), 'rehearsing': _('Rehearsing'),
'shopping': _('Shopping'), 'shopping': _('Shopping'),
'socializing': _('Socializing'), 'socializing': _('Socializing'),
'sunbathing': _('Sunbathing'), 'sunbathing': _('Sunbathing'),
'watching_tv': _('Watching TV'), 'watching_tv': _('Watching TV'),
'watching_a_movie': _('Watching a Movie')}, 'watching_a_movie': _('Watching a Movie')},
'talking': {'category': _('Talking'), 'talking': {'category': _('Talking'),
'in_real_life': _('In Real Life'), 'in_real_life': _('In Real Life'),
'on_the_phone': _('On the Phone'), 'on_the_phone': _('On the Phone'),
'on_video_phone': _('On Video Phone')}, 'on_video_phone': _('On Video Phone')},
'traveling': {'category': _('Traveling'), 'traveling': {'category': _('Traveling'),
'commuting': _('Commuting'), 'commuting': _('Commuting'),
'cycling': _('Cycling'), 'cycling': _('Cycling'),
'driving': _('Driving'), 'driving': _('Driving'),
'in_a_car': _('In a Car'), 'in_a_car': _('In a Car'),
'on_a_bus': _('On a Bus'), 'on_a_bus': _('On a Bus'),
'on_a_plane': _('On a Plane'), 'on_a_plane': _('On a Plane'),
'on_a_train': _('On a Train'), 'on_a_train': _('On a Train'),
'on_a_trip': _('On a Trip'), 'on_a_trip': _('On a Trip'),
'walking': _('Walking')}, 'walking': _('Walking')},
'working': {'category': _('Working'), 'working': {'category': _('Working'),
'coding': _('Coding'), 'coding': _('Coding'),
'in_a_meeting': _('In a Meeting'), 'in_a_meeting': _('In a Meeting'),
'studying': _('Studying'), 'studying': _('Studying'),
'writing': _('Writing')}} 'writing': _('Writing')}}
def user_mood(items, name, jid): def user_mood(items, name, jid):
has_child = False has_child = False

10
src/dialogs.py
View file

@ -355,8 +355,8 @@ class ChangeActivityDialog:
for category in pep.ACTIVITIES: for category in pep.ACTIVITIES:
item = self.xml.get_widget(category + '_image') item = self.xml.get_widget(category + '_image')
item.set_from_pixbuf( item.set_from_pixbuf(
gtkgui_helpers.load_activity_icon( gtkgui_helpers.load_activity_icon(category).get_pixbuf())
category).get_pixbuf()) gtk.Tooltips().set_tip(item, pep.ACTIVITIES[category]['category'])
vbox = self.xml.get_widget(category + '_vbox') vbox = self.xml.get_widget(category + '_vbox')
for activity in pep.ACTIVITIES[category]: for activity in pep.ACTIVITIES[category]:
@ -370,10 +370,8 @@ class ChangeActivityDialog:
else: else:
rbtns[act] = group = gtk.RadioButton() rbtns[act] = group = gtk.RadioButton()
rbtns[act].set_label( rbtns[act].set_label(pep.ACTIVITIES[category][activity])
pep.ACTIVITIES[category][activity]) rbtns[act].connect('toggled', self.on_rbtn_toggled,
rbtns[act].connect('toggled',
self.on_rbtn_toggled,
[category, activity]) [category, activity])
vbox.pack_start(rbtns[act], False, False, 0) vbox.pack_start(rbtns[act], False, False, 0)