Recover from UI changes

This commit is contained in:
Charles Haley 2010-07-10 14:07:00 +01:00
parent 4782888466
commit 336294fe35

View File

@ -12,6 +12,7 @@ from PyQt4.Qt import QIcon, Qt, QWidget, QAction, QToolBar, QSize, QVariant, \
from calibre.constants import __appname__, filesystem_encoding from calibre.constants import __appname__, filesystem_encoding
from calibre.gui2.search_box import SearchBox2, SavedSearchBox from calibre.gui2.search_box import SearchBox2, SavedSearchBox
from calibre.gui2.widgets import ComboBoxWithHelp
from calibre.gui2.throbber import ThrobbingButton from calibre.gui2.throbber import ThrobbingButton
from calibre.gui2 import NONE from calibre.gui2 import NONE
from calibre import human_readable from calibre import human_readable
@ -280,12 +281,7 @@ class SearchBar(QWidget): # {{{
self._layout = l = QHBoxLayout() self._layout = l = QHBoxLayout()
self.setLayout(self._layout) self.setLayout(self._layout)
self.restriction_label = QLabel(_("&Restrict to:")) x = ComboBoxWithHelp(self)
l.addWidget(self.restriction_label)
self.restriction_label.setSizePolicy(QSizePolicy.Minimum,
QSizePolicy.Minimum)
x = QComboBox(self)
x.setMaximumSize(QSize(150, 16777215)) x.setMaximumSize(QSize(150, 16777215))
x.setObjectName("search_restriction") x.setObjectName("search_restriction")
x.setToolTip(_("Books display will be restricted to those matching the selected saved search")) x.setToolTip(_("Books display will be restricted to those matching the selected saved search"))
@ -344,7 +340,6 @@ class SearchBar(QWidget): # {{{
x.setToolTip(_("Delete current saved search")) x.setToolTip(_("Delete current saved search"))
self.label.setBuddy(parent.search) self.label.setBuddy(parent.search)
self.restriction_label.setBuddy(parent.search_restriction)
# }}} # }}}