Insert date and time function added, file save question in open file added.

Signed-off-by: Agustin Zubiaga <aguzubiaga97@gmail.com>

2 files changed, 17 insertions, 1 deletions

diff --git a/activity.py b/activity.py
index 8e8312f..8ec3c1c 100644
--- a/activity.py
+++ b/activity.py
@@ -133,6 +133,10 @@ class JAMEdit(activity.Activity):
                 separator.set_draw(False)
                 separator.set_expand(True)
                 edit_toolbar.insert(separator, -1)
+                
+                insert_datetime = gtk.ToolButton("insert-datetime")
+                insert_datetime.connect("clicked", self.editor._insert_date_time)
+                edit_toolbar.insert(insert_datetime, -1)
 
                 edit_toolbar.pep8_btn = ToolButton('pep8')
                 edit_toolbar.pep8_btn.connect("clicked", self.pep8_check)
@@ -251,6 +255,7 @@ class JAMEdit(activity.Activity):
                         activity.Activity.close(self)
 
         def open_file(self, widget):
+                self.save_file(None, type="exit")
                 file_path = file_choosers.open_file_dialog()
                 if file_path != None:
                         self.set_title(os.path.split(file_path)[-1])
diff --git a/editor.py b/editor.py
index 833d494..b4a5b94 100644
--- a/editor.py
+++ b/editor.py
@@ -22,6 +22,9 @@
 
 import os
 import sys
+import datetime
+import time
+import locale
 
 import gtk
 import gtksourceview2
@@ -182,9 +185,17 @@ class Editor(gtksourceview2.View):
         def _get_all_text(self):
                 start = self.buffer.get_start_iter()
                 end = self.buffer.get_end_iter()
-                text = self.buffer.get_text(start, end, False)
+                text = self.buffer.get_text(start, end, True)
                 return text
 
+        def _insert_date_time(self, widget):
+                today = datetime.date.today()
+                today = today.strftime("%d/%m/%y")
+                _time = time.strftime("%H:%M:%S")
+                zone = locale.getdefaultlocale()[0]         
+                date_time = str(today)+" "+_time+"-"+zone
+                self.buffer.insert_at_cursor(date_time)
+
         def _search_entry_activate_cb(self, entry):
                 self.set_search_text(entry.props.text)
                 self._update_search_buttons()