Commit dae64141 authored by mathieui's avatar mathieui
Browse files

Fix a circular import introduced in 409b1513

It breaks python 3.4 which is touchy about them, https://bugs.python.org/issue17636
parent 3dcb0499
...@@ -20,12 +20,12 @@ class SizeManager(object): ...@@ -20,12 +20,12 @@ class SizeManager(object):
@property @property
def tab_degrade_x(self): def tab_degrade_x(self):
_, x = windows.TAB_WIN.getmaxyx() _, x = windows.base_wins.TAB_WIN.getmaxyx()
return x < THRESHOLD_WIDTH_DEGRADE return x < THRESHOLD_WIDTH_DEGRADE
@property @property
def tab_degrade_y(self): def tab_degrade_y(self):
y, x = windows.TAB_WIN.getmaxyx() y, x = windows.base_wins.TAB_WIN.getmaxyx()
return y < THRESHOLD_HEIGHT_DEGRADE return y < THRESHOLD_HEIGHT_DEGRADE
@property @property
......
...@@ -164,7 +164,7 @@ class Tab(object): ...@@ -164,7 +164,7 @@ class Tab(object):
@staticmethod @staticmethod
def resize(scr): def resize(scr):
Tab.height, Tab.width = scr.getmaxyx() Tab.height, Tab.width = scr.getmaxyx()
windows.TAB_WIN = scr windows.base_wins.TAB_WIN = scr
def missing_command_callback(self, command_name): def missing_command_callback(self, command_name):
""" """
......
...@@ -3,8 +3,6 @@ Module exporting all the Windows, which are wrappers around curses wins ...@@ -3,8 +3,6 @@ Module exporting all the Windows, which are wrappers around curses wins
used to display information on the screen used to display information on the screen
""" """
TAB_WIN = None
from poezio.windows.base_wins import Win from poezio.windows.base_wins import Win
from poezio.windows.data_forms import FormWin from poezio.windows.data_forms import FormWin
from poezio.windows.bookmark_forms import BookmarksWin from poezio.windows.bookmark_forms import BookmarksWin
......
...@@ -7,13 +7,14 @@ the text window, the roster window, etc. ...@@ -7,13 +7,14 @@ the text window, the roster window, etc.
A Tab (see the poezio.tabs module) is composed of multiple Windows A Tab (see the poezio.tabs module) is composed of multiple Windows
""" """
TAB_WIN = None
import logging import logging
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
import curses import curses
import string import string
from poezio import windows
from poezio.theming import to_curses_attr, read_tuple from poezio.theming import to_curses_attr, read_tuple
FORMAT_CHAR = '\x19' FORMAT_CHAR = '\x19'
...@@ -43,7 +44,7 @@ class Win(object): ...@@ -43,7 +44,7 @@ class Win(object):
return return
self.height, self.width, self.x, self.y = height, width, x, y self.height, self.width, self.x, self.y = height, width, x, y
try: try:
self._win = windows.TAB_WIN.derwin(height, width, y, x) self._win = TAB_WIN.derwin(height, width, y, x)
except: except:
log.debug('DEBUG: mvwin returned ERR. Please investigate') log.debug('DEBUG: mvwin returned ERR. Please investigate')
if self._win is None: if self._win is None:
......
...@@ -3,8 +3,7 @@ Windows used inthe bookmarkstab ...@@ -3,8 +3,7 @@ Windows used inthe bookmarkstab
""" """
import curses import curses
from poezio import windows from poezio.windows.base_wins import Win, TAB_WIN
from poezio.windows.base_wins import Win
from poezio.windows.inputs import Input from poezio.windows.inputs import Input
from poezio.windows.data_forms import FieldInput from poezio.windows.data_forms import FieldInput
from poezio.theming import to_curses_attr, get_theme from poezio.theming import to_curses_attr, get_theme
...@@ -131,7 +130,7 @@ class BookmarkAutojoinWin(FieldInput, Win): ...@@ -131,7 +130,7 @@ class BookmarkAutojoinWin(FieldInput, Win):
class BookmarksWin(Win): class BookmarksWin(Win):
def __init__(self, bookmarks, height, width, y, x): def __init__(self, bookmarks, height, width, y, x):
self._win = windows.TAB_WIN.derwin(height, width, y, x) self._win = TAB_WIN.derwin(height, width, y, x)
self.scroll_pos = 0 self.scroll_pos = 0
self._current_input = 0 self._current_input = 0
self.current_horizontal_input = 0 self.current_horizontal_input = 0
...@@ -182,7 +181,7 @@ class BookmarksWin(Win): ...@@ -182,7 +181,7 @@ class BookmarksWin(Win):
def resize(self, height, width, y, x): def resize(self, height, width, y, x):
self.height = height self.height = height
self.width = width self.width = width
self._win = windows.TAB_WIN.derwin(height, width, y, x) self._win = TAB_WIN.derwin(height, width, y, x)
# Adjust the scroll position, if resizing made the window too small # Adjust the scroll position, if resizing made the window too small
# for the cursor to be visible # for the cursor to be visible
while self.current_input - self.scroll_pos > self.height-1: while self.current_input - self.scroll_pos > self.height-1:
......
...@@ -6,8 +6,7 @@ does not inherit from the Win base class), as it will create the ...@@ -6,8 +6,7 @@ does not inherit from the Win base class), as it will create the
others when needed. others when needed.
""" """
from poezio import windows from poezio.windows.base_wins import Win, TAB_WIN
from poezio.windows.base_wins import Win
from poezio.windows.inputs import Input from poezio.windows.inputs import Input
from poezio.theming import to_curses_attr, get_theme from poezio.theming import to_curses_attr, get_theme
...@@ -342,7 +341,7 @@ class FormWin(object): ...@@ -342,7 +341,7 @@ class FormWin(object):
} }
def __init__(self, form, height, width, y, x): def __init__(self, form, height, width, y, x):
self._form = form self._form = form
self._win = windows.TAB_WIN.derwin(height, width, y, x) self._win = TAB_WIN.derwin(height, width, y, x)
self.scroll_pos = 0 self.scroll_pos = 0
self.current_input = 0 self.current_input = 0
self.inputs = [] # dict list self.inputs = [] # dict list
...@@ -365,7 +364,7 @@ class FormWin(object): ...@@ -365,7 +364,7 @@ class FormWin(object):
def resize(self, height, width, y, x): def resize(self, height, width, y, x):
self.height = height self.height = height
self.width = width self.width = width
self._win = windows.TAB_WIN.derwin(height, width, y, x) self._win = TAB_WIN.derwin(height, width, y, x)
# Adjust the scroll position, if resizing made the window too small # Adjust the scroll position, if resizing made the window too small
# for the cursor to be visible # for the cursor to be visible
while self.current_input - self.scroll_pos > self.height-1: while self.current_input - self.scroll_pos > self.height-1:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment