nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Undo in message composer. Closes #4656

Browse source
This commit is contained in:
Eric Gregory 2012-01-30 14:27:06 -08:00
parent 5b81c32208
commit a5b8aa47c2
4 changed files with 24 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/client/ui/composer-window.vala
View file

@ -12,7 +12,7 @@ public class ComposerWindow : Gtk.Window {
private Gtk.Entry cc_entry;
private Gtk.Entry bcc_entry;
private Gtk.Entry subject_entry;
private Gtk.TextView message_text;
private Gtk.SourceView message_text = new Gtk.SourceView();
private Gtk.Button send_button;
public string from { get; set; }
@ -60,7 +60,9 @@ public class ComposerWindow : Gtk.Window {
cc_entry = builder.get_object("cc") as Gtk.Entry;
bcc_entry = builder.get_object("bcc") as Gtk.Entry;
subject_entry = builder.get_object("subject") as Gtk.Entry;
message_text = builder.get_object("message") as Gtk.TextView;
Gtk.ScrolledWindow scroll = builder.get_object("scrolledwindow") as Gtk.ScrolledWindow;
scroll.add(message_text);
((Gtk.SourceBuffer) message_text.buffer).highlight_matching_brackets = false;
title = DEFAULT_TITLE;
subject_entry.changed.connect(on_subject_changed);

4
src/client/wscript_build
View file

@ -30,9 +30,9 @@ gsettings_schemas = [
'org.yorba.geary.gschema.xml'
]
client_uselib = 'GLIB GEE GTK GNOME-KEYRING WEBKITGTK JAVASCRIPTCOREGTK'
client_uselib = 'GLIB GEE GTK GNOME-KEYRING WEBKITGTK JAVASCRIPTCOREGTK GTKSOURCEVIEW'
client_packages = [ 'gtk+-3.0', 'glib-2.0', 'gee-1.0', 'gnome-keyring-1', 'webkitgtk-3.0',
'javascriptcoregtk-3.0' ]
'javascriptcoregtk-3.0', 'gtksourceview-3.0' ]
app = bld.program(
target = 'geary',

20
ui/composer.glade
View file

@ -175,6 +175,15 @@
<property name="height">1</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
@ -183,21 +192,14 @@
</packing>
</child>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow1">
<object class="GtkScrolledWindow" id="scrolledwindow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="margin_top">6</property>
<property name="hscrollbar_policy">never</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTextView" id="message">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="vscroll_policy">natural</property>
<property name="wrap_mode">word</property>
</object>
<placeholder/>
</child>
</object>
<packing>

7
wscript
View file

@ -94,6 +94,13 @@ def configure(conf):
atleast_version='1.4.3',
mandatory=1,
args='--cflags --libs')
conf.check_cfg(
package='gtksourceview-3.0',
uselib_store='GTKSOURCEVIEW',
atleast_version='3.2',
mandatory=1,
args='--cflags --libs')
def build(bld):
bld.add_post_fun(post_build)