Navigation

← Previous Changeset
Next Changeset →

Changeset 9590

Timestamp:

05/07/08 17:34:00 (2 months ago)

Author:

Message:

* Converted GC to new GUI as well.
* Moved some code so we can get rid of a few ifs.

What still needs to be done for the GUI redesign to be complete:
Don't show entries in the actions menu that have buttons.

Files:

trunk/data/glade/message_window.glade (modified) (8 diffs)
trunk/src/chat_control.py (modified) (2 diffs)
trunk/src/groupchat_control.py (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/data/glade/message_window.glade

r9573	r9590
71	71	<widget class="GtkImage" id="avatar_image">
72	72	<property name="visible">True</property>
73		<property name="stock">~~Non~~e</property>
	73	<property name="stock">gtk-missing-image</property>
74	74	</widget>
75	75	</child>
…	…
157	157	<property name="visible">True</property>
158	158	<property name="events">GDK_POINTER_MOTION_MASK \| GDK_POINTER_MOTION_HINT_MASK \| GDK_BUTTON_PRESS_MASK \| GDK_BUTTON_RELEASE_MASK</property>
159		<property name="tooltip" translatable="yes">Show a list of emoticons</property>
	159	<property name="tooltip" translatable="yes">Show a list of emoticons (Alt-M)</property>
160	160	<property name="relief">GTK_RELIEF_NONE</property>
161	161	<property name="focus_on_click">False</property>
…	…
210	210	<property name="visible">True</property>
211	211	<property name="events">GDK_POINTER_MOTION_MASK \| GDK_POINTER_MOTION_HINT_MASK \| GDK_BUTTON_PRESS_MASK \| GDK_BUTTON_RELEASE_MASK</property>
212		<property name="tooltip" translatable="yes">Invite contacts to conversation</property>
	212	<property name="tooltip" translatable="yes">Invite contacts to the conversation</property>
213	213	<property name="relief">GTK_RELIEF_NONE</property>
214	214	<property name="focus_on_click">False</property>
…	…
232	232	<property name="visible">True</property>
233	233	<property name="events">GDK_POINTER_MOTION_MASK \| GDK_POINTER_MOTION_HINT_MASK \| GDK_BUTTON_PRESS_MASK \| GDK_BUTTON_RELEASE_MASK</property>
234		<property name="tooltip" translatable="yes">Show contact ~~information~~</property>
	234	<property name="tooltip" translatable="yes">Show contact's profile (Ctrl-I)</property>
235	235	<property name="relief">GTK_RELIEF_NONE</property>
236	236	<property name="focus_on_click">False</property>
…	…
254	254	<property name="visible">True</property>
255	255	<property name="events">GDK_POINTER_MOTION_MASK \| GDK_POINTER_MOTION_HINT_MASK \| GDK_BUTTON_PRESS_MASK \| GDK_BUTTON_RELEASE_MASK</property>
256		<property name="tooltip" translatable="yes">Browse ~~history~~</property>
	256	<property name="tooltip" translatable="yes">Browse the chat history (Ctrl-H)</property>
257	257	<property name="relief">GTK_RELIEF_NONE</property>
258	258	<property name="focus_on_click">False</property>
…	…
333	333	<property name="visible">True</property>
334	334	<property name="stock">gtk-jump-to</property>
335		~~<property name="icon_size">4</property>~~
336	335	</widget>
337	336	<packing>
…	…
571	570	<widget class="GtkHBox" id="actions_hbox">
572	571	<property name="visible">True</property>
573		~~<property name="border_width">3</property>~~
574	572	<child>
575	573	<widget class="GtkHBox" id="hbox3023">
576	574	<property name="visible">True</property>
577	575	<child>
578		~~<placeholder/>~~
579		~~</child>~~
580		~~</widget>~~
581		~~</child>~~
582		~~<child>~~
583		~~<widget class="GtkHBox" id="hbox3013">~~
584		~~<property name="visible">True</property>~~
585		~~<property name="spacing">6</property>~~
586		~~<child>~~
587	576	<widget class="GtkButton" id="emoticons_button">
588	577	<property name="visible">True</property>
589		<property name="can_focus">True</property>
590		<property name="tooltip" translatable="yes">Click to insert an emoticon (Alt+M)</property>
	578	<property name="events">GDK_POINTER_MOTION_MASK \| GDK_POINTER_MOTION_HINT_MASK \| GDK_BUTTON_PRESS_MASK \| GDK_BUTTON_RELEASE_MASK</property>
	579	<property name="tooltip" translatable="yes">Show a list of emoticons (Alt-M)</property>
	580	<property name="relief">GTK_RELIEF_NONE</property>
591	581	<property name="response_id">0</property>
592	582	<child>
593		<widget class="GtkHBox" id="hbox3014">
594		<property name="visible">True</property>
595		<child>
596		<widget class="GtkImage" id="emoticons_button_image">
597		<property name="visible">True</property>
598		<property name="xpad">2</property>
599		<property name="stock">gtk-missing-image</property>
600		</widget>
601		</child>
602		<child>
603		<widget class="GtkArrow" id="arrow5">
604		<property name="visible">True</property>
605		<property name="arrow_type">GTK_ARROW_DOWN</property>
606		</widget>
607		<packing>
608		<property name="position">1</property>
609		</packing>
610		</child>
	583	<widget class="GtkImage" id="emoticons_button_image">
	584	<property name="visible">True</property>
	585	<property name="stock">gtk-missing-image</property>
	586	<property name="icon_size">1</property>
611	587	</widget>
612	588	</child>
…	…
617	593	</packing>
618	594	</child>
619		<child>
620		<widget class="GtkButton" id="muc_window_actions_button">
621		<property name="visible">True</property>
622		<property name="can_focus">True</property>
623		<property name="response_id">0</property>
624		<child>
625		<widget class="GtkAlignment" id="alignment104">
626		<property name="visible">True</property>
627		<property name="xscale">0</property>
628		<property name="yscale">0</property>
629		<child>
630		<widget class="GtkHBox" id="gc_actions_hbox">
	595	</widget>
	596	<packing>
	597	<property name="expand">False</property>
	598	</packing>
	599	</child>
	600	<child>
	601	<widget class="GtkVSeparator" id="vseparator2">
	602	<property name="visible">True</property>
	603	<property name="events">GDK_POINTER_MOTION_MASK \| GDK_POINTER_MOTION_HINT_MASK \| GDK_BUTTON_PRESS_MASK \| GDK_BUTTON_RELEASE_MASK</property>
	604	</widget>
	605	<packing>
	606	<property name="expand">False</property>
	607	<property name="position">1</property>
	608	</packing>
	609	</child>
	610	<child>
	611	<widget class="GtkButton" id="change_nick_button">
	612	<property name="visible">True</property>
	613	<property name="events">GDK_POINTER_MOTION_MASK \| GDK_POINTER_MOTION_HINT_MASK \| GDK_BUTTON_PRESS_MASK \| GDK_BUTTON_RELEASE_MASK</property>
	614	<property name="tooltip" translatable="yes">Change your nickname</property>
	615	<property name="relief">GTK_RELIEF_NONE</property>
	616	<property name="response_id">0</property>
	617	<child>
	618	<widget class="GtkImage" id="image4">
	619	<property name="visible">True</property>
	620	<property name="events">GDK_POINTER_MOTION_MASK \| GDK_POINTER_MOTION_HINT_MASK \| GDK_BUTTON_PRESS_MASK \| GDK_BUTTON_RELEASE_MASK</property>
	621	<property name="stock">gtk-edit</property>
	622	<property name="icon_size">1</property>
	623	</widget>
	624	</child>
	625	</widget>
	626	<packing>
	627	<property name="expand">False</property>
	628	<property name="fill">False</property>
	629	<property name="position">2</property>
	630	</packing>
	631	</child>
	632	<child>
	633	<widget class="GtkButton" id="change_subject_button">
	634	<property name="visible">True</property>
	635	<property name="events">GDK_POINTER_MOTION_MASK \| GDK_POINTER_MOTION_HINT_MASK \| GDK_BUTTON_PRESS_MASK \| GDK_BUTTON_RELEASE_MASK</property>
	636	<property name="tooltip" translatable="yes">Change the room's subject</property>
	637	<property name="relief">GTK_RELIEF_NONE</property>
	638	<property name="response_id">0</property>
	639	<child>
	640	<widget class="GtkImage" id="image6">
	641	<property name="visible">True</property>
	642	<property name="events">GDK_POINTER_MOTION_MASK \| GDK_POINTER_MOTION_HINT_MASK \| GDK_BUTTON_PRESS_MASK \| GDK_BUTTON_RELEASE_MASK</property>
	643	<property name="stock">gtk-properties</property>
	644	<property name="icon_size">1</property>
	645	</widget>
	646	</child>
	647	</widget>
	648	<packing>
	649	<property name="expand">False</property>
	650	<property name="fill">False</property>
	651	<property name="position">3</property>
	652	</packing>
	653	</child>
	654	<child>
	655	<widget class="GtkButton" id="bookmark_button">
	656	<property name="visible">True</property>
	657	<property name="events">GDK_POINTER_MOTION_MASK \| GDK_POINTER_MOTION_HINT_MASK \| GDK_BUTTON_PRESS_MASK \| GDK_BUTTON_RELEASE_MASK</property>
	658	<property name="tooltip" translatable="yes">Bookmark this room</property>
	659	<property name="relief">GTK_RELIEF_NONE</property>
	660	<property name="response_id">0</property>
	661	<child>
	662	<widget class="GtkImage" id="image7">
	663	<property name="visible">True</property>
	664	<property name="events">GDK_POINTER_MOTION_MASK \| GDK_POINTER_MOTION_HINT_MASK \| GDK_BUTTON_PRESS_MASK \| GDK_BUTTON_RELEASE_MASK</property>
	665	<property name="stock">gtk-add</property>
	666	<property name="icon_size">1</property>
	667	</widget>
	668	</child>
	669	</widget>
	670	<packing>
	671	<property name="expand">False</property>
	672	<property name="fill">False</property>
	673	<property name="position">4</property>
	674	</packing>
	675	</child>
	676	<child>
	677	<widget class="GtkButton" id="history_button">
	678	<property name="visible">True</property>
	679	<property name="events">GDK_POINTER_MOTION_MASK \| GDK_POINTER_MOTION_HINT_MASK \| GDK_BUTTON_PRESS_MASK \| GDK_BUTTON_RELEASE_MASK</property>
	680	<property name="tooltip" translatable="yes">Browse the chat history (Ctrl-H)</property>
	681	<property name="relief">GTK_RELIEF_NONE</property>
	682	<property name="response_id">0</property>
	683	<child>
	684	<widget class="GtkImage" id="image8">
	685	<property name="visible">True</property>
	686	<property name="events">GDK_POINTER_MOTION_MASK \| GDK_POINTER_MOTION_HINT_MASK \| GDK_BUTTON_PRESS_MASK \| GDK_BUTTON_RELEASE_MASK</property>
	687	<property name="stock">gtk-justify-fill</property>
	688	<property name="icon_size">1</property>
	689	</widget>
	690	</child>
	691	</widget>
	692	<packing>
	693	<property name="expand">False</property>
	694	<property name="fill">False</property>
	695	<property name="position">5</property>
	696	</packing>
	697	</child>
	698	<child>
	699	<widget class="GtkVSeparator" id="vseparator4">
	700	<property name="visible">True</property>
	701	<property name="events">GDK_POINTER_MOTION_MASK \| GDK_POINTER_MOTION_HINT_MASK \| GDK_BUTTON_PRESS_MASK \| GDK_BUTTON_RELEASE_MASK</property>
	702	</widget>
	703	<packing>
	704	<property name="expand">False</property>
	705	<property name="position">6</property>
	706	</packing>
	707	</child>
	708	<child>
	709	<widget class="GtkButton" id="muc_window_actions_button">
	710	<property name="visible">True</property>
	711	<property name="events">GDK_POINTER_MOTION_MASK \| GDK_POINTER_MOTION_HINT_MASK \| GDK_BUTTON_PRESS_MASK \| GDK_BUTTON_RELEASE_MASK</property>
	712	<property name="tooltip" translatable="yes">Show a menu of advanced functions</property>
	713	<property name="relief">GTK_RELIEF_NONE</property>
	714	<property name="response_id">0</property>
	715	<child>
	716	<widget class="GtkAlignment" id="alignment104">
	717	<property name="visible">True</property>
	718	<property name="xscale">0</property>
	719	<property name="yscale">0</property>
	720	<child>
	721	<widget class="GtkImage" id="image1344">
	722	<property name="visible">True</property>
	723	<property name="stock">gtk-execute</property>
	724	<property name="icon_size">1</property>
	725	</widget>
	726	</child>
	727	</widget>
	728	</child>
	729	</widget>
	730	<packing>
	731	<property name="expand">False</property>
	732	<property name="fill">False</property>
	733	<property name="position">7</property>
	734	</packing>
	735	</child>
	736	<child>
	737	<widget class="GtkAlignment" id="alignment2">
	738	<property name="visible">True</property>
	739	<property name="events">GDK_POINTER_MOTION_MASK \| GDK_POINTER_MOTION_HINT_MASK \| GDK_BUTTON_PRESS_MASK \| GDK_BUTTON_RELEASE_MASK</property>
	740	<child>
	741	<placeholder/>
	742	</child>
	743	</widget>
	744	<packing>
	745	<property name="position">8</property>
	746	</packing>
	747	</child>
	748	<child>
	749	<widget class="GtkButton" id="send_button">
	750	<property name="visible">True</property>
	751	<property name="can_focus">True</property>
	752	<property name="response_id">0</property>
	753	<child>
	754	<widget class="GtkAlignment" id="alignment105">
	755	<property name="visible">True</property>
	756	<property name="xscale">0</property>
	757	<property name="yscale">0</property>
	758	<child>
	759	<widget class="GtkHBox" id="hbox3016">
	760	<property name="visible">True</property>
	761	<property name="spacing">2</property>
	762	<child>
	763	<widget class="GtkImage" id="image1345">
631	764	<property name="visible">True</property>
632		<property name="spacing">2</property>
633		<child>
634		<widget class="GtkImage" id="image1344">
635		<property name="visible">True</property>
636		<property name="stock">gtk-execute</property>
637		</widget>
638		<packing>
639		<property name="expand">False</property>
640		<property name="fill">False</property>
641		</packing>
642		</child>
643		<child>
644		<widget class="GtkLabel" id="label376">
645		<property name="visible">True</property>
646		<property name="label" translatable="yes" comments="Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)">_Actions</property>
647		<property name="use_underline">True</property>
648		</widget>
649		<packing>
650		<property name="expand">False</property>
651		<property name="fill">False</property>
652		<property name="position">1</property>
653		</packing>
654		</child>
655		<child>
656		<widget class="GtkArrow" id="arrow6">
657		<property name="visible">True</property>
658		<property name="arrow_type">GTK_ARROW_DOWN</property>
659		</widget>
660		<packing>
661		<property name="expand">False</property>
662		<property name="fill">False</property>
663		<property name="position">2</property>
664		</packing>
665		</child>
	765	<property name="stock">gtk-jump-to</property>
	766	<property name="icon_size">2</property>
666	767	</widget>
667		</child>
668		</widget>
669		</child>
670		</widget>
671		<packing>
672		<property name="expand">False</property>
673		<property name="fill">False</property>
674		<property name="position">1</property>
675		</packing>
676		</child>
677		<child>
678		<widget class="GtkVSeparator" id="vseparator6">
679		<property name="visible">True</property>
680		</widget>
681		<packing>
682		<property name="expand">False</property>
683		<property name="padding">2</property>
684		<property name="position">2</property>
685		</packing>
686		</child>
687		<child>
688		<widget class="GtkButton" id="send_button">
689		<property name="visible">True</property>
690		<property name="can_focus">True</property>
691		<property name="response_id">0</property>
692		<child>
693		<widget class="GtkAlignment" id="alignment105">
694		<property name="visible">True</property>
695		<property name="xscale">0</property>
696		<property name="yscale">0</property>
697		<child>
698		<widget class="GtkHBox" id="hbox3016">
	768	<packing>
	769	<property name="expand">False</property>
	770	<property name="fill">False</property>
	771	</packing>
	772	</child>
	773	<child>
	774	<widget class="GtkLabel" id="label377">
699	775	<property name="visible">True</property>
700		<property name="spacing">2</property>
701		<child>
702		<widget class="GtkImage" id="image1345">
703		<property name="visible">True</property>
704		<property name="stock">gtk-jump-to</property>
705		</widget>
706		<packing>
707		<property name="expand">False</property>
708		<property name="fill">False</property>
709		</packing>
710		</child>
711		<child>
712		<widget class="GtkLabel" id="label377">
713		<property name="visible">True</property>
714		<property name="label" translatable="yes" comments="Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)">_Send</property>
715		<property name="use_underline">True</property>
716		</widget>
717		<packing>
718		<property name="expand">False</property>
719		<property name="fill">False</property>
720		<property name="position">1</property>
721		</packing>
722		</child>
	776	<property name="label" translatable="yes" comments="Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)">_Send</property>
	777	<property name="use_underline">True</property>
723	778	</widget>
724		</child>
725		</widget>
726		</child>
727		</widget>
728		<packing>
729		<property name="expand">False</property>
730		<property name="fill">False</property>
731		<property name="position">3</property>
732		</packing>
733		</child>
734		</widget>
735		<packing>
736		<property name="expand">False</property>
737		<property name="position">1</property>
	779	<packing>
	780	<property name="expand">False</property>
	781	<property name="fill">False</property>
	782	<property name="position">1</property>
	783	</packing>
	784	</child>
	785	</widget>
	786	</child>
	787	</widget>
	788	</child>
	789	</widget>
	790	<packing>
	791	<property name="expand">False</property>
	792	<property name="fill">False</property>
	793	<property name="position">9</property>
738	794	</packing>
739	795	</child>

trunk/src/chat_control.py

r9583	r9590
139	139	contact, acct, resource = resource);
140	140
141		~~widget = self.xml.get_widget('contact_information_button')~~
142		~~# FIXME: Required as it's not in GC yet~~
143		~~if widget != None:~~
144		~~id = widget.connect('clicked', self._on_contact_information_menuitem_activate)~~
145		~~self.handlers[id] = widget~~
146
147	141	widget = self.xml.get_widget('history_button')
148		# FIXME: Required as it's not in GC yet
149		if widget != None:
150		id = widget.connect('clicked', self._on_history_menuitem_activate)
151		self.handlers[id] = widget
152
153		widget = self.xml.get_widget('send_file_button')
154		# FIXME: Required as it's not in GC yet
155		if widget != None:
156		id = widget.connect('clicked', self._on_send_file_menuitem_activate)
157		self.handlers[id] = widget
158
159		widget = self.xml.get_widget('convert_to_gc_button')
160		# FIXME: Required as it's not in GC yet
161		if widget != None:
162		id = widget.connect('clicked', self._on_convert_to_gc_menuitem_activate)
163		self.handlers[id] = widget
	142	id = widget.connect('clicked', self._on_history_menuitem_activate)
	143	self.handlers[id] = widget
164	144
165	145	# when/if we do XHTML we will put formatting buttons back
…	…
1050	1030	self.handlers[id] = widget
1051	1031
	1032	widget = self.xml.get_widget('send_file_button')
	1033	id = widget.connect('clicked', self._on_send_file_menuitem_activate)
	1034	self.handlers[id] = widget
	1035
	1036	widget = self.xml.get_widget('convert_to_gc_button')
	1037	id = widget.connect('clicked', self._on_convert_to_gc_menuitem_activate)
	1038	self.handlers[id] = widget
	1039
	1040	widget = self.xml.get_widget('contact_information_button')
	1041	id = widget.connect('clicked', self._on_contact_information_menuitem_activate)
	1042	self.handlers[id] = widget
	1043
1052	1044	compact_view = gajim.config.get('compact_view')
1053	1045	self.chat_buttons_set_visible(compact_view)

trunk/src/groupchat_control.py

r9584	r9590
176	176	widget = self.xml.get_widget('muc_window_actions_button')
177	177	id = widget.connect('clicked', self.on_actions_button_clicked)
	178	self.handlers[id] = widget
	179
	180	widget = self.xml.get_widget('change_nick_button')
	181	id = widget.connect('clicked', self._on_change_nick_menuitem_activate)
	182	self.handlers[id] = widget
	183
	184	widget = self.xml.get_widget('change_subject_button')
	185	id = widget.connect('clicked', self._on_change_subject_menuitem_activate)
	186	self.handlers[id] = widget
	187
	188	widget = self.xml.get_widget('bookmark_button')
	189	id = widget.connect('clicked', self._on_bookmark_room_menuitem_activate)
178	190	self.handlers[id] = widget
179	191