From 5996f70bb1feddb298b09574d2519cc026f025ac Mon Sep 17 00:00:00 2001 From: Alexander Bus Date: Tue, 15 May 2018 22:27:06 +0700 Subject: [PATCH] Fix #5 namespace multiselection --- cutelog/logger_tab.py | 4 ++++ setup.py | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cutelog/logger_tab.py b/cutelog/logger_tab.py index 5d6f5b2..0e2016e 100644 --- a/cutelog/logger_tab.py +++ b/cutelog/logger_tab.py @@ -305,6 +305,7 @@ def filterAcceptsRow(self, sourceRow, sourceParent): path = tindex.internalPointer().path if path == '': result = True + break if path: name = record.name # name is None for record added by method add_conn_closed_record(). @@ -312,10 +313,13 @@ def filterAcceptsRow(self, sourceRow, sourceParent): result = False elif name == path: result = True + break elif not self.selection_includes_children and name == path: result = True + break elif self.selection_includes_children and name.startswith(path + '.'): result = True + break else: result = False if result and self.search_filter: diff --git a/setup.py b/setup.py index 11ab6e4..20f1e56 100644 --- a/setup.py +++ b/setup.py @@ -5,14 +5,14 @@ from setuptools.command.install import install -VERSION = '1.1.7' +VERSION = '1.1.8' def build_qt_resources(): print('Compiling resources...') from PyQt5 import pyrcc_main pyrcc_main.processResourceFile(['cutelog/resources/resources.qrc'], - 'cutelog/resources.py', False) + 'cutelog/resources.py', False) print('Resources compiled successfully')