Add thread window.

[fukui-no-namari/fukui-no-namari.git] / src / Hage1 / board_window.py

diff --git a/src/Hage1/board_window.py b/src/Hage1/board_window.py
index 0837a8d..dcd4136 100644 (file)
--- a/src/Hage1/board_window.py
+++ b/src/Hage1/board_window.py
@@ -23,6 +23,7 @@ import os
 import time
 
 import board_data
+import thread_window
 
 GLADE_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)),
                          "..", "data")
@@ -148,11 +149,11 @@ class WinWrap:
                   "on_quit_activate": self.on_quit_activate,
                   "on_load_local_activate": self.on_load_local_activate,
                   "on_get_remote_activate": self.on_get_remote_activate,
-                  "on_treeview_row_activated": self.on_treeview_row_activated,
+                  "on_treeview_row_activated":
+                  lambda w,p,v: self.on_open_thread(w),
                   "on_treeview_button_press_event":
                   self.on_treeview_button_press_event,
-                  "on_popup_menu_open_activate":
-                  self.on_popup_menu_open_activate}
+                  "on_popup_menu_open_activate": self.on_open_thread}
         self.mainwin.signal_autoconnect(sigdic)
 
     def on_board_window_destroy(self, widget):
@@ -169,8 +170,8 @@ class WinWrap:
         t = board_data.GetRemote(self.bbs, self.board, self.update_datastore)
         t.start()
 
-    def on_treeview_row_activated(self, widget, row, column):
-        treeselection = widget.get_selection()
+    def on_open_thread(self, widget):
+        treeselection = self.treeview.get_selection()
         model, iter = treeselection.get_selected()
         if not iter:
             return
@@ -179,6 +180,8 @@ class WinWrap:
         title = model.get_value(iter, 1)["title"]
         print thread + ':"' + title + '"', "activated"
 
+        thread_window.WinWrap(self.bbs, self.board, thread)
+
     def on_treeview_button_press_event(self, widget, event):
         if event.button == 3:
             x = int(event.x)
@@ -192,16 +195,6 @@ class WinWrap:
                 self.popupmenu.popup(None, None, None, event.button, time)
             return 1
 
-    def on_popup_menu_open_activate(self, widget):
-        treeselection = self.treeview.get_selection()
-        model, iter = treeselection.get_selected()
-        if not iter:
-            return
-
-        thread = model.get_value(iter, 0)
-        title = model.get_value(iter, 1)["title"]
-        print thread + ':"' + title + '"', "activated 2"
-
     def update_datastore(self, datalist):
         print "clear datastore"
         self.datastore.clear()