Commit 20863fe8937c092e240201d3ff7a03cd6a0d6945

Aneesh Dogra
Sun Dec 09 03:13:04 EST 2012

Tree SHA1: 0042f6b
Parent SHA1: 3dafb55 (Some more fixes.)
raw diff | raw patch

More fixes.

Diff rendering mode:
inline
side by side


100	100	toolbar_box.show()
101	101
102	102	def __visibility_notify_event_cb(self, window, event):
103		self.is_visible = event.state != Gdk.VISIBILITY_FULLY_OBSCURED
	103	self.is_visible = event.state != Gdk.VisibilityState.FULLY_OBSCURED
104	104
105	105	#Configuracion por defecto
106	106


31	31	if e_data is None:
32	32	e_data = data(**kwargs)
33	33
34		#print 'Event:', e_name, e_data
	34	print 'Event:', e_name, e_data
35	35
36	36	failure = True
37	37	error = None


45	45	# FIXME: find a better way...
46	46	dummy = Gtk.Label()
47	47	dummy.set_style(None)
48
	48
49	49	def apply_style_fg(value):
50	50	dummy.modify_text(Gtk.StateType.NORMAL, Gdk.color.parse(value))
51	51
…	…
236	236
237	237	self.remove(self.label)
238	238	self.add(entry)
239		self.window.set_cursor(None)
	239	self.get_window().set_cursor(None)
240	240
241	241	entry.show()
242	242	entry.grab_focus()
…	…
245	245	self.remove(widget)
246	246	self.add(self.label)
247	247	self.win.input.grab_focus()
248		self.window.set_cursor(Gdk.Cursor(Gdk.XTERM))
	248	self.window.set_cursor(Gdk.Cursor(Gdk.CursorType.XTERM))
249	249
250	250	def __init__(self, window, core):
251	251	Gtk.EventBox.__init__(self)
…	…
262	262
263	263	self.connect(
264	264	"realize",
265		lambda *a: self.window.set_cursor(Gtk.gdk.Cursor(Gdk.XTERM))
	265	lambda *a: self.get_window().set_cursor(Gdk.Cursor(Gdk.CursorType.XTERM))
266	266	)
267	267
268	268	# The entry which you type in to send messages
…	…
304	304
305	305	def keypress(self, event):
306	306	keychar = (
307		(Gdk.EventMask.CONTROL_MASK, '^'),
308		(Gdk.EventMask.SHIFT_MASK, '+'),
309		(Gdk.EventMask.MOD1_MASK, '!')
	307	(Gdk.ModifierType.CONTROL_MASK, '^'),
	308	(Gdk.ModifierType.SHIFT_MASK, '+'),
	309	(Gdk.ModifierType.MOD1_MASK, '!')
310	310	)
311	311
312	312	key = ''
…	…
362	362
363	363	def get_iter_at_coords(view, x, y):
364	364	return view.get_iter_at_location(
365		*view.window_to_buffer_coords(Gtk.TEXT_WINDOW_TEXT, int(x), int(y))
	365	*view.window_to_buffer_coords(Gtk.TextWindowType.TEXT, int(x), int(y))
366	366	)
367	367
368	368	def get_event_at_iter(view, iter, core):
…	…
456	456
457	457	cc = buffer.get_char_count()
458	458
459		buffer.insert_with_tags_by_name(
460		buffer.get_end_iter(),
461		text + line_ending,
462		'indent'
463		)
	459	# buffer.insert_with_tags_by_name(
	460	# buffer.get_end_iter(),
	461	# text + line_ending,
	462	# 'indent'
	463	# )
464	464
465	465	for tag in tags:
466	466	tag_name = str(tag['data'])
…	…
474	474	buffer.get_iter_at_offset(tag['to'] + cc)
475	475	)
476	476
477		def popup(self, menu):
	477	def popup(self, menu):
478	478	hover_iter = get_iter_at_coords(self, *self.hover_coords)
479
	479
480	480	menuitems = []
481	481	if not hover_iter.ends_line():
482	482	c_data = get_event_at_iter(self, hover_iter)
…	…
500	500
501	501	menu.show_all()
502	502
503		def mousedown(self, event):
	503	def mousedown(self, widget, event):
504	504	if event.button == 3:
505		self.hover_coords = event.get_coords()
	505	self.hover_coords = widget.get_coords()
506	506
507		def mouseup(self, event):
	507	def mouseup(self, widget, event):
	508	print widget, event
508	509	if not self.get_buffer().get_selection_bounds():
509		if event.button == 1:
510		hover_iter = get_iter_at_coords(self, event.x, event.y)
	510	if widget.button == 1:
	511	hover_iter = get_iter_at_coords(self, *self.hover_coords)
511	512
512	513	if not hover_iter.ends_line():
513	514	c_data = get_event_at_iter(self, hover_iter, self.core)
…	…
518	518	if self.is_focus():
519	519	self.win.focus()
520	520
521		def clear_hover(self, _event=None):
	521	def clear_hover(self, _widget=None, event=None):
522	522	buffer = self.get_buffer()
523	523
524	524	for fr, to in self.linking:
…	…
529	529	)
530	530
531	531	self.linking = set()
532		self.get_window(Gtk.TEXT_WINDOW_TEXT).set_cursor(None)
	532	self.get_window(Gtk.TextWindowType.TEXT).set_cursor(None)
533	533
534		def hover(self, event):
	534	def hover(self, widget, event):
535	535	if self.linking:
536	536	self.clear_hover()
537	537
538		hover_iter = get_iter_at_coords(self, event.x, event.y)
	538	hover_iter = get_iter_at_coords(self, *self.hover_coords)
539	539
540	540	if not hover_iter.ends_line():
541	541	h_data = get_event_at_iter(self, hover_iter, self.core)
…	…
562	562	)
563	563
564	564	self.get_window(
565		Gtk.TEXT_WINDOW_TEXT
	565	Gtk.TextWindowType.TEXT
566	566	).set_cursor(Gdk.Cursor(Gdk.HAND2))
567	567
568	568	self.get_pointer()
569	569
570		def scroll(self, _allocation=None):
	570	def scroll(self, widget, cairo_rect, _allocation=None):
571	571	if self.autoscroll:
572	572	def do_scroll():
573		self.scroller.value = self.scroller.upper - self.scroller.page_size
	573	self.scroller.set_value(self.scroller.get_upper() - \
	574	self.scroller.get_page_size())
574	575	self._scrolling = False
575
	576
576	577	if not self._scrolling:
577	578	self._scrolling = GObject.idle_add(do_scroll)
578	579
579	580	def check_autoscroll(self, *args):
580	581	def set_to_scroll():
581		self.autoscroll = self.scroller.value + self.scroller.page_size >= self.scroller.upper
	582	self.autoscroll = self.scroller.get_value() + \
	583	self.scroller.get_page_size() >= \
	584	self.scroller.get_upper()
582	585
583	586	GObject.idle_add(set_to_scroll)
584	587
…	…
637	637	self.connect("size-allocate", self.scroll)
638	638
639	639	def set_cursor(widget):
640		self.get_window(Gtk.TEXT_WINDOW_TEXT).set_cursor(None)
	640	self.get_window(Gtk.TextWindowType.TEXT).set_cursor(None)
641	641
642	642	self.connect("realize", set_cursor)
643	643
…	…
671	671	for item in menu_from_list(c_data.menu):
672	672	menu.append(item)
673	673	menu.show_all()
674		menu.popup(None, None, None, event.button, event.time)
	674	menu.popup(None, None, None, event.button, event.time, None)
675	675
676	676	def __init__(self, window, core):
677	677	Gtk.EventBox.__init__(self)

Commit 20863fe8937c092e240201d3ff7a03cd6a0d6945

Gitorious