Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGonzalo Odiard <godiard@gmail.com>2014-02-12 19:13:45 (GMT)
committer Gonzalo Odiard <godiard@gmail.com>2014-02-12 19:13:45 (GMT)
commite42cda312998dfa908a6f97db0dfcf96f70fb36b (patch)
tree4b7100563cd5f62a21f112ca50708c58e180bb77
parent9558b525b7f366c10ef2e1dab49354699cd89b29 (diff)
reMove code to open a log file to sourceview_editor
-rw-r--r--develop-activity/develop_app.py18
-rw-r--r--develop-activity/sourceview_editor.py17
2 files changed, 19 insertions, 16 deletions
diff --git a/develop-activity/develop_app.py b/develop-activity/develop_app.py
index a9a877d..c09e0e5 100644
--- a/develop-activity/develop_app.py
+++ b/develop-activity/develop_app.py
@@ -46,7 +46,6 @@ import logviewer
import sourceview_editor
S_WHERE = sourceview_editor.S_WHERE
import new_activity
-from widgets import TabLabel
from symbols_tree import SymbolsTree
DEBUG_FILTER_LEVEL = 1
@@ -467,7 +466,7 @@ class DevelopActivity(activity.Activity):
self.load_file(path)
self.numb = False
- def __log_file_selected_cb(self, log_file_viewer, path):
+ def __log_file_selected_cb(self, log_files_viewer, path):
if not path:
return
@@ -478,19 +477,8 @@ class DevelopActivity(activity.Activity):
# Set buffer and scroll down
if self.editor.set_to_page_like(path):
return
- newlogview = logviewer.LogView(path, log_file_viewer)
- scrollwnd = Gtk.ScrolledWindow()
- scrollwnd.set_policy(Gtk.PolicyType.AUTOMATIC,
- Gtk.PolicyType.AUTOMATIC)
- scrollwnd.add(newlogview)
- scrollwnd.page = newlogview
- tablabel = TabLabel(newlogview, os.path.basename(path))
- tablabel.connect(
- 'tab-close', lambda widget, child:
- self.editor.remove_page(self.editor.page_num(child)))
- self.editor.append_page(scrollwnd, tablabel)
- self.editor.show_all()
- self.editor.set_current_page(-1)
+
+ self.editor.load_log_file(path, log_files_viewer)
def save_bundle(self, btn):
#create bundle
diff --git a/develop-activity/sourceview_editor.py b/develop-activity/sourceview_editor.py
index f0263d7..dbb3dc6 100644
--- a/develop-activity/sourceview_editor.py
+++ b/develop-activity/sourceview_editor.py
@@ -26,6 +26,7 @@ import mimetypes
from exceptions import ValueError, TypeError, IOError, OSError
from widgets import TabLabel
+import logviewer
class S_WHERE:
@@ -88,6 +89,21 @@ class GtkSourceview2Editor(Gtk.Notebook):
self.show_all()
self.set_current_page(-1)
+ def load_log_file(self, full_path, log_files_viewer):
+ logview = logviewer.LogView(full_path, log_files_viewer)
+ scrollwnd = Gtk.ScrolledWindow()
+ scrollwnd.set_policy(Gtk.PolicyType.AUTOMATIC,
+ Gtk.PolicyType.AUTOMATIC)
+ scrollwnd.add(logview)
+ scrollwnd.page = logview
+ tablabel = TabLabel(logview, os.path.basename(full_path))
+ tablabel.connect(
+ 'tab-close', lambda widget, child:
+ self.remove_page(self.page_num(child)))
+ self.append_page(scrollwnd, tablabel)
+ self.show_all()
+ self.set_current_page(-1)
+
def _changed_cb(self, buffer):
if not buffer.can_undo():
buffer.set_modified(False)
@@ -408,7 +424,6 @@ class GtkSourceview2Page(GtkSource.View):
def get_next_result(self, direction):
_buffer = self.get_buffer()
- end_text_iter = _buffer.get_end_iter()
if direction == 'forward':
text_iter = _buffer.get_iter_at_mark(_buffer.get_insert())