Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: klnusbaum/UDJ-Desktop-Client
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: UDJ/UDJ-Desktop-Client
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Feb 23, 2013

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    fb03661 View commit details
  2. Merge pull request #1 from murph/master

    Fix issue with spacebar in search box of library
    klnusbaum committed Feb 23, 2013
    Copy the full SHA
    63d8e63 View commit details
Showing with 13 additions and 0 deletions.
  1. +11 −0 src/LibraryWidget.cpp
  2. +2 −0 src/LibraryWidget.hpp
11 changes: 11 additions & 0 deletions src/LibraryWidget.cpp
Original file line number Diff line number Diff line change
@@ -22,15 +22,26 @@
#include <QGridLayout>
#include <QLineEdit>
#include <QLabel>
#include <QKeyEvent>

namespace UDJ{

bool LibraryWidget::eventFilter(QObject *obj, QEvent *event) {
if (obj->inherits("QLineEdit") && event->type() == QEvent::KeyRelease)
return true;
else
return false;
}

LibraryWidget::LibraryWidget(DataStore* dataStore, QWidget* parent):
QWidget(parent),
dataStore(dataStore)
{
libraryView = new LibraryView(dataStore, this);
searchEdit = new QLineEdit(this);

searchEdit->installEventFilter(this);

QLabel *searchLabel = new QLabel(tr("Search:"),this);

setFocusPolicy(Qt::TabFocus);
2 changes: 2 additions & 0 deletions src/LibraryWidget.hpp
Original file line number Diff line number Diff line change
@@ -74,6 +74,8 @@ Q_OBJECT

//@}

protected:
bool eventFilter(QObject *obj, QEvent *event);
};