Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Touch control for pushbuttons #76

Merged
merged 25 commits into from
Feb 22, 2014
Merged

Touch control for pushbuttons #76

merged 25 commits into from
Feb 22, 2014

Commits on Oct 3, 2013

  1. catch touch events

    @daschuer
    daschuer committed Oct 3, 2013
    Configuration menu
    Copy the full SHA
    9d029e5 View commit details
    Browse the repository at this point in the history

  2. allow to control more than one button on a multi touch device

    @daschuer
    daschuer committed Oct 3, 2013
    Configuration menu
    Copy the full SHA
    cea8ab7 View commit details
    Browse the repository at this point in the history

  3. cherry pick m_bRightClickForcePush removal from cdj branch and set m_… 

    …rightPressed
    @daschuer
    daschuer committed Oct 3, 2013
    Configuration menu
    Copy the full SHA
    318ed32 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2013

  1. fix focusOutEvent for multitouch

    @daschuer
    daschuer committed Oct 4, 2013
    Configuration menu
    Copy the full SHA
    8dd9d69 View commit details
    Browse the repository at this point in the history

  2. introduced [Controls] touch_shift; if != 0.0, touch events are rated as 

    right clicks
    @daschuer
    daschuer committed Oct 4, 2013
    Configuration menu
    Copy the full SHA
    9612deb View commit details
    Browse the repository at this point in the history

  3. moved m_pTouchShift to WWidget

    @daschuer
    daschuer committed Oct 4, 2013
    Configuration menu
    Copy the full SHA
    ff560a3 View commit details
    Browse the repository at this point in the history

  4. move entire touch event handling to WWidget

    @daschuer
    daschuer committed Oct 4, 2013
    Configuration menu
    Copy the full SHA
    0e9d074 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2013

  1. changed touch_shift to ControlPushButton for skin usage

    @daschuer
    daschuer committed Oct 6, 2013
    Configuration menu
    Copy the full SHA
    cbcff76 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2013

  1. Merge branch 'master' into singletouch 

    Conflicts:
	src/mixxx.cpp
	src/mixxx.h
    @daschuer
    daschuer committed Oct 17, 2013
    Configuration menu
    Copy the full SHA
    e598229 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2013

  1. Some minor changes

    @daschuer
    daschuer committed Oct 22, 2013
    Configuration menu
    Copy the full SHA
    4dffc67 View commit details
    Browse the repository at this point in the history

  2. moved constructor and destructor of MixxxApp to the top of the file

    @daschuer
    daschuer committed Oct 22, 2013
    Configuration menu
    Copy the full SHA
    8a82ba0 View commit details
    Browse the repository at this point in the history

  3. removed unused function crashDlg()

    @daschuer
    daschuer committed Oct 22, 2013
    Configuration menu
    Copy the full SHA
    14ed5ab View commit details
    Browse the repository at this point in the history

  4. renamed MixxxApp to MixxxMainWindow, because it is derived from QMain… 

    …Window and not from QApplication
    @daschuer
    daschuer committed Oct 22, 2013
    Configuration menu
    Copy the full SHA
    f71e96f View commit details
    Browse the repository at this point in the history

  5. Introduced a MixxxApplication class derived from QApplication

    @daschuer
    daschuer committed Oct 22, 2013
    Configuration menu
    Copy the full SHA
    ffc76ce View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2013

  1. Almost working version of global mouse point emulation

    @daschuer
    daschuer committed Oct 28, 2013
    Configuration menu
    Copy the full SHA
    db9244e View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2013

  1. mouse click fake works but issues with drag and drop

    @daschuer
    daschuer committed Oct 29, 2013
    Configuration menu
    Copy the full SHA
    61348ae View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2013

  1. fixed drag and drop issues by faking a touch release

    @daschuer
    daschuer committed Nov 2, 2013
    Configuration menu
    Copy the full SHA
    c2762e5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into singletouch 

    Conflicts:
	src/mixxx.cpp
	src/widget/wwidget.cpp
    @daschuer
    daschuer committed Nov 2, 2013
    Configuration menu
    Copy the full SHA
    bfe5286 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2014

  1. Merge branch 'master' into singletouch 

    Conflicts:
	src/dlgladspa.h
	src/dlgprefcontrols.h
	src/encoder/encoderffmpegvorbis.cpp
	src/main.cpp
	src/mixxx.cpp
	src/mixxx.h
	src/widget/wpushbutton.cpp
	src/widget/wpushbutton.h
	src/widget/wslidercomposed.h
	src/widget/wwidget.cpp
	src/widget/wwidget.h
    @daschuer
    daschuer committed Jan 23, 2014
    Configuration menu
    Copy the full SHA
    1d2f266 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into singletouch 

    Conflicts:
	src/widget/wpushbutton.cpp
    @daschuer
    daschuer committed Jan 23, 2014
    Configuration menu
    Copy the full SHA
    b446883 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2014

  1. Added conditional timing test based on RJ's patch, Thank you.

    @daschuer
    daschuer committed Feb 20, 2014
    Configuration menu
    Copy the full SHA
    08b00bd View commit details
    Browse the repository at this point in the history

  2. Added SuspendableTimer to exclude portions from measurement.

    @daschuer
    daschuer committed Feb 20, 2014
    Configuration menu
    Copy the full SHA
    1f31abe View commit details
    Browse the repository at this point in the history

  3. Made timing test symetric and add a reference time

    @daschuer
    daschuer committed Feb 20, 2014
    Configuration menu
    Copy the full SHA
    c32d9fc View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/master' into singletouch 

    Conflicts:
	res/developer_skins
    @daschuer
    daschuer committed Feb 20, 2014
    Configuration menu
    Copy the full SHA
    90933ac View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2014

  1. Removed timing test

    @daschuer
    daschuer committed Feb 22, 2014
    Configuration menu
    Copy the full SHA
    967c5e7 View commit details
    Browse the repository at this point in the history