mcvsoftware/twblue
1
0
Fork 0
mirror of https://github.com/MCV-Software/TWBlue.git synced 2024-11-26 20:53:13 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix a git conflict

Browse Source
This commit is contained in:
Manuel Cortez 2015-05-06 13:21:09 -05:00
commit 472099614a
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/wxUI/dialogs/configuration.py
View File

@ -123,10 +123,13 @@ class other_buffers(wx.Panel):
def move_up(self, *args, **kwargs): def move_up(self, *args, **kwargs):
current = self.buffers.get_selected() current = self.buffers.get_selected()
if self.buffers.get_text_column(current, 1) == 'hide': if current == -1:
output.speak("Select a buffer first.",True)
return False
if self.buffers.get_text_column(current, 1) == 'Hide':
output.speak("The buffer is hidden, show it first.",True) output.speak("The buffer is hidden, show it first.",True)
return False return False
if current == 0: if current <= 0:
output.speak("The buffer is already at the top of the list.",True) output.speak("The buffer is already at the top of the list.",True)
return false return false
current_text = self.buffers.get_text_column(self.buffers.get_selected(), 0) current_text = self.buffers.get_text_column(self.buffers.get_selected(), 0)
@ -140,10 +143,13 @@ class other_buffers(wx.Panel):
def move_down(self, *args, **kwargs): def move_down(self, *args, **kwargs):
current = self.buffers.get_selected() current = self.buffers.get_selected()
if self.buffers.get_text_column(current, 1) == 'hide': if current == -1:
output.speak("Select a buffer first.",True)
return False
if self.buffers.get_text_column(current, 1) == 'Hide':
output.speak("The buffer is hidden, show it first.",True) output.speak("The buffer is hidden, show it first.",True)
return False return False
if current == self.buffers.get_count(): if current >= self.buffers.get_count():
output.speak("The buffer is already at the bottom of the list.",True) output.speak("The buffer is already at the bottom of the list.",True)
return false return false
current_text = self.buffers.get_text_column(self.buffers.get_selected(), 0) current_text = self.buffers.get_text_column(self.buffers.get_selected(), 0)