[profitpy commit] r308 - in trunk/profit: lib/widgets workbench workbench/widgets

[codesite...@google.com]

Author: troy.melhase
Date: Thu Jul 24 17:42:58 2008
New Revision: 308

Added:
trunk/profit/lib/widgets/filterbar.py
- copied, changed from r307, /trunk/profit/lib/widgets/searchbar.py
trunk/profit/lib/widgets/ui_filterbar.ui
- copied, changed from r307, /trunk/profit/lib/widgets/ui_searchbar.ui
Removed:
trunk/profit/lib/widgets/searchbar.py
trunk/profit/lib/widgets/ui_searchbar.ui
Modified:
trunk/profit/workbench/executionsdisplay.py
trunk/profit/workbench/messagedisplay.py
trunk/profit/workbench/widgets/ui_executionsdisplay.ui
trunk/profit/workbench/widgets/ui_messagedisplay.ui
trunk/profit/workbench/widgets/ui_orderdisplay.ui
trunk/profit/workbench/widgets/ui_portfoliodisplay.ui
trunk/profit/workbench/widgets/ui_tickerdisplay.ui

Log:
Renamed searchbar to filterbar and updated references.

Copied: trunk/profit/lib/widgets/filterbar.py (from r307, /trunk/profit/lib/widgets/searchbar.py)
==============================================================================
--- /trunk/profit/lib/widgets/searchbar.py (original)
+++ trunk/profit/lib/widgets/filterbar.py Thu Jul 24 17:42:58 2008
@@ -8,11 +8,11 @@
from PyQt4.QtGui import QWidget

from profit.lib.core import Signals
-from profit.lib.widgets.ui_searchbar import Ui_SearchBar
+from profit.lib.widgets.ui_filterbar import Ui_FilterBar

-class SearchBar(QWidget, Ui_SearchBar):
- """ Widget with search line edit and clear button.
+class FilterBar(QWidget, Ui_FilterBar):
+ """ Widget with filter line edit and clear button.

"""
def __init__(self, parent=None):
@@ -29,10 +29,10 @@

@return None
"""
- self.searchEdit.clear()
- self.searchEdit.emit(Signals.editingFinished)
+ self.filterEdit.clear()
+ self.filterEdit.emit(Signals.editingFinished)

- def on_searchEdit_textChanged(self, text):
+ def on_filterEdit_textChanged(self, text):
""" signal handler called when line edit text changed

@param text current value of line edit as QString instance

Copied: trunk/profit/lib/widgets/ui_filterbar.ui (from r307, /trunk/profit/lib/widgets/ui_searchbar.ui)
==============================================================================
--- /trunk/profit/lib/widgets/ui_searchbar.ui (original)
+++ trunk/profit/lib/widgets/ui_filterbar.ui Thu Jul 24 17:42:58 2008
@@ -1,6 +1,6 @@
<ui version="4.0" >
- <class>SearchBar</class>
- <widget class="QWidget" name="SearchBar" >
+ <class>FilterBar</class>
+ <widget class="QWidget" name="FilterBar" >
<property name="geometry" >
<rect>
<x>0</x>
@@ -36,12 +36,12 @@
<item>
<widget class="QLabel" name="label" >
<property name="text" >
- <string>Search:</string>
+ <string>Filter:</string>
</property>
</widget>
</item>
<item>
- <widget class="QLineEdit" name="searchEdit" >
+ <widget class="QLineEdit" name="filterEdit" >
<property name="text" >
<string/>
</property>

Modified: trunk/profit/workbench/executionsdisplay.py
==============================================================================
--- trunk/profit/workbench/executionsdisplay.py (original)
+++ trunk/profit/workbench/executionsdisplay.py Thu Jul 24 17:42:58 2008
@@ -160,7 +160,7 @@

class ExecutionsDisplay(QFrame, Ui_ExecutionsDisplay, SessionHandler):
- """ Combines a search filter bar (not working) and an exec details table.
+ """ Combines a filter bar and an exec details table.

"""
def __init__(self, parent=None):

Modified: trunk/profit/workbench/messagedisplay.py
==============================================================================
--- trunk/profit/workbench/messagedisplay.py (original)
+++ trunk/profit/workbench/messagedisplay.py Thu Jul 24 17:42:58 2008
@@ -110,8 +110,8 @@
self.setupColors()
self.requestSession()

- def on_searchEdit_editingFinished(self):
- self.filterModel.setFilterWildcard(self.searchBar.searchEdit.text())
+ def on_filterEdit_editingFinished(self):
+ self.filterModel.setFilterWildcard(self.filterBar.filterEdit.text())

@pyqtSignature('int')

Modified: trunk/profit/workbench/widgets/ui_executionsdisplay.ui
==============================================================================
--- trunk/profit/workbench/widgets/ui_executionsdisplay.ui (original)
+++ trunk/profit/workbench/widgets/ui_executionsdisplay.ui Thu Jul 24
17:42:58 2008
@@ -20,7 +20,7 @@
<number>9</number>
</property>
<item>
- <widget class="SearchBar" native="1" name="searchBar" />
+ <widget class="FilterBar" native="1" name="filterBar" />
</item>
<item>
<widget class="QTableView" name="executionsTable" >
@@ -48,9 +48,9 @@
</widget>
<customwidgets>
<customwidget>
- <class>SearchBar</class>
+ <class>FilterBar</class>
<extends>QWidget</extends>
- <header location="global" >profit.lib.widgets.searchbar.h</header>
+ <header location="global" >profit.lib.widgets.filterbar.h</header>
</customwidget>
</customwidgets>
<resources/>

Modified: trunk/profit/workbench/widgets/ui_messagedisplay.ui
==============================================================================
--- trunk/profit/workbench/widgets/ui_messagedisplay.ui (original)
+++ trunk/profit/workbench/widgets/ui_messagedisplay.ui Thu Jul 24
17:42:58 2008
@@ -133,7 +133,7 @@
</widget>
</item>
<item>
- <widget class="SearchBar" native="1" name="searchBar" >
+ <widget class="FilterBar" native="1" name="filterBar" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
<horstretch>1</horstretch>
@@ -183,9 +183,9 @@
</widget>
<customwidgets>
<customwidget>
- <class>SearchBar</class>
+ <class>FilterBar</class>
<extends>QWidget</extends>
- <header location="global" >profit.lib.widgets.searchbar.h</header>
+ <header location="global" >profit.lib.widgets.filterbar.h</header>
</customwidget>
<customwidget>
<class>MessageTypeSelect</class>

Modified: trunk/profit/workbench/widgets/ui_orderdisplay.ui
==============================================================================
--- trunk/profit/workbench/widgets/ui_orderdisplay.ui (original)
+++ trunk/profit/workbench/widgets/ui_orderdisplay.ui Thu Jul 24
17:42:58 2008
@@ -20,7 +20,7 @@
<number>9</number>
</property>
<item>
- <widget class="SearchBar" native="1" name="widget" />
+ <widget class="FilterBar" native="1" name="widget" />
</item>
<item>
<widget class="LocalTable" name="orderTable" >
@@ -125,9 +125,9 @@
</widget>
<customwidgets>
<customwidget>
- <class>SearchBar</class>
+ <class>FilterBar</class>
<extends>QWidget</extends>
- <header location="global" >profit.lib.widgets.searchbar.h</header>
+ <header location="global" >profit.lib.widgets.filterbar.h</header>
</customwidget>
<customwidget>
<class>LocalTable</class>

Modified: trunk/profit/workbench/widgets/ui_portfoliodisplay.ui
==============================================================================
--- trunk/profit/workbench/widgets/ui_portfoliodisplay.ui (original)
+++ trunk/profit/workbench/widgets/ui_portfoliodisplay.ui Thu Jul 24
17:42:58 2008
@@ -20,7 +20,7 @@
<number>9</number>
</property>
<item>
- <widget class="SearchBar" native="1" name="searchBar" />
+ <widget class="FilterBar" native="1" name="filterBar" />
</item>
<item>
<widget class="LocalTable" name="portfolioTable" >
@@ -85,9 +85,9 @@
</widget>
<customwidgets>
<customwidget>
- <class>SearchBar</class>
+ <class>FilterBar</class>
<extends>QWidget</extends>
- <header location="global" >profit.lib.widgets.searchbar.h</header>
+ <header location="global" >profit.lib.widgets.filterbar.h</header>
</customwidget>
<customwidget>
<class>LocalTable</class>

Modified: trunk/profit/workbench/widgets/ui_tickerdisplay.ui
==============================================================================
--- trunk/profit/workbench/widgets/ui_tickerdisplay.ui (original)
+++ trunk/profit/workbench/widgets/ui_tickerdisplay.ui Thu Jul 24
17:42:58 2008
@@ -20,7 +20,7 @@
<number>9</number>
</property>
<item>
- <widget class="SearchBar" native="1" name="widget" />
+ <widget class="FilterBar" native="1" name="widget" />
</item>
<item>
<widget class="LocalTable" name="tickerTable" >
@@ -114,9 +114,9 @@
</widget>
<customwidgets>
<customwidget>
- <class>SearchBar</class>
+ <class>FilterBar</class>
<extends>QWidget</extends>
- <header location="global" >profit.lib.widgets.searchbar.h</header>
+ <header location="global" >profit.lib.widgets.filterbar.h</header>
</customwidget>
<customwidget>
<class>LocalTable</class>