← Back to branch summary

~ubuntu-branches/debian/stretch/smplayer/stretch

~ubuntu-branches/debian/stretch/smplayer/stretch

« back to all changes in this revision

Viewing changes to src/prefinput.cpp

Committer: Package Import Robot
Author(s): Mateusz Łukasik
Date: 2014-04-21 11:53:59 UTC
mfrom: (1.3.2)
Revision ID: package-import@ubuntu.com-20140421115359-oz572avkq20ieqaf

Tags: 14.3.0-1

http://bugs.debian.org/740769

http://bugs.debian.org/742685

http://bugs.debian.org/698365

* Add myself to uploaders.
* New upstream release. (Closes: #740769, #742685)
* debian/control:
- bump standards version to 3.9.5. (no changes needed)
- rename smplayer-translations to smplayer-l10n. (Closes: #698365)

files added:
debian/smplayer-l10n.install

qt-translations/qt_ja.qm

qt-translations/qt_ja.ts

setup/translations/albanian.nsh

setup/translations/arabic.nsh

setup/translations/bulgarian.nsh

setup/translations/malay.nsh

setup/translations/po_files

setup/translations/po_files/.tx

setup/translations/po_files/.tx/config

setup/translations/po_files/albanian.po

setup/translations/po_files/arabic.po

setup/translations/po_files/basque.po

setup/translations/po_files/bulgarian.po

setup/translations/po_files/catalan.po

setup/translations/po_files/croatian.po

setup/translations/po_files/czech.po

setup/translations/po_files/danish.po

setup/translations/po_files/dutch.po

setup/translations/po_files/english.pot

setup/translations/po_files/finnish.po

setup/translations/po_files/french.po

setup/translations/po_files/german.po

setup/translations/po_files/hebrew.po

setup/translations/po_files/hungarian.po

setup/translations/po_files/italian.po

setup/translations/po_files/japanese.po

setup/translations/po_files/korean.po

setup/translations/po_files/malay.po

setup/translations/po_files/norwegian.po

setup/translations/po_files/polish.po

setup/translations/po_files/portuguese.po

setup/translations/po_files/portuguesebrazil.po

setup/translations/po_files/russian.po

setup/translations/po_files/serbian.po

setup/translations/po_files/simpchinese.po

setup/translations/po_files/slovak.po

setup/translations/po_files/slovenian.po

setup/translations/po_files/spanish.po

setup/translations/po_files/thai.po

setup/translations/po_files/tradchinese.po

setup/translations/portuguesebrazil.nsh

setup/translations/serbian.nsh

src/autohidewidget.cpp

src/autohidewidget.h

src/icons-png/bluray.png

src/icons-png/bluray_drive.png

src/icons-png/paypal.png

src/icons-png/social_facebook.png

src/icons-png/social_twitter.png

src/icons-png/type_bluray.png

src/old

src/old/floatingwidget.cpp

src/old/floatingwidget.h

src/old/videoequalizer.cpp

src/old/videoequalizer.h

src/reminderdialog.cpp

src/reminderdialog.h

src/reminderdialog.ui

src/sharedialog.cpp

src/sharedialog.h

src/sharedialog.ui

src/shortcuts/euskara.keys

src/translations/smplayer_ar.ts

src/translations/smplayer_en_GB.ts

src/translations/smplayer_id.ts

src/translations/smplayer_nn_NO.ts

src/translations/smplayer_uz.ts

src/videoequalizer.ui

files removed:
debian/smplayer-translations.install

setup/scripts/make_pkgs64.cmd

src/floatingwidget.cpp

src/floatingwidget.h

src/simplehttp.cpp

src/simplehttp.h

src/videoequalizer2.cpp

src/videoequalizer2.h

src/videoequalizer2.ui

files modified:
.pc/01-add-mplayer2-detection.patch/src/core.cpp

.pc/02-disable_updates.patch/src/updatechecker.cpp

Changelog

Readme.txt

Release_notes.txt

create_deb.sh

debian-rvm/changelog-orig

debian/changelog

debian/control

qt-translations/qt_eu.qm

qt-translations/qt_eu.ts

setup/scripts/make_pkgs.cmd

setup/smplayer.nsi

setup/translations/basque.nsh

setup/translations/catalan.nsh

setup/translations/croatian.nsh

setup/translations/czech.nsh

setup/translations/danish.nsh

setup/translations/dutch.nsh

setup/translations/english.nsh

setup/translations/finnish.nsh

setup/translations/french.nsh

setup/translations/german.nsh

setup/translations/hebrew.nsh

setup/translations/hungarian.nsh

setup/translations/italian.nsh

setup/translations/japanese.nsh

setup/translations/korean.nsh

setup/translations/norwegian.nsh

setup/translations/polish.nsh

setup/translations/portuguese.nsh

setup/translations/russian.nsh

setup/translations/simpchinese.nsh

setup/translations/slovak.nsh

setup/translations/slovenian.nsh

setup/translations/spanish.nsh

setup/translations/thai.nsh

setup/translations/tradchinese.nsh

smplayer.desktop

smplayer.spec

smplayer_enqueue.desktop

src/about.cpp

src/about.h

src/about.ui

src/actionseditor.cpp

src/actionseditor.h

src/assstyles.cpp

src/assstyles.h

src/audioequalizer.cpp

src/audioequalizer.h

src/audioequalizerlist.h

src/basegui.cpp

src/basegui.h

src/baseguiplus.cpp

src/baseguiplus.h

src/chapters.cpp

src/chapters.h

src/cleanconfig.cpp

src/clhelp.cpp

src/clhelp.h

src/colorutils.cpp

src/colorutils.h

src/config.h

src/constants.h

src/core.cpp

src/core.h

src/defaultgui.cpp

src/defaultgui.h

src/desktopinfo.cpp

src/desktopinfo.h

src/deviceinfo.cpp

src/deviceinfo.h

src/discname.cpp

src/discname.h

src/editabletoolbar.cpp

src/editabletoolbar.h

src/eqslider.cpp

src/eqslider.h

src/errordialog.cpp

src/errordialog.h

src/extensions.cpp

src/extensions.h

src/favoriteeditor.cpp

src/favoriteeditor.h

src/favorites.cpp

src/favorites.h

src/filechooser.cpp

src/filechooser.h

src/filedialog.cpp

src/filedialog.h

src/filehash.cpp

src/filehash.h

src/filepropertiesdialog.cpp

src/filepropertiesdialog.h

src/filesettings.cpp

src/filesettings.h

src/filesettingsbase.cpp

src/filesettingsbase.h

src/filesettingshash.cpp

src/filesettingshash.h

src/filters.cpp

src/filters.h

src/findsubtitles/filedownloader/filedownloader.cpp

src/findsubtitles/filedownloader/filedownloader.h

src/findsubtitles/filedownloader/main.cpp

src/findsubtitles/findsubtitles.pro

src/findsubtitles/findsubtitlesconfigdialog.cpp

src/findsubtitles/findsubtitlesconfigdialog.h

src/findsubtitles/findsubtitlesconfigdialog.ui

src/findsubtitles/findsubtitleswindow.cpp

src/findsubtitles/findsubtitleswindow.h

src/findsubtitles/fixsubs.cpp

src/findsubtitles/fixsubs.h

src/findsubtitles/main.cpp

src/findsubtitles/osclient.cpp

src/findsubtitles/osclient.h

src/findsubtitles/osparser.cpp

src/findsubtitles/osparser.h

src/findsubtitles/subchooserdialog.cpp

src/findsubtitles/subchooserdialog.h

src/fontcache.cpp

src/fontcache.h

src/global.cpp

src/global.h

src/guiconfig.h

src/helper.cpp

src/helper.h

src/icons-png/cdrom_drive.png

src/icons-png/dvd_drive.png

src/icons.qrc

src/images.cpp

src/images.h

src/infofile.cpp

src/infofile.h

src/infoprovider.cpp

src/infoprovider.h

src/inforeader.cpp

src/inforeader.h

src/inputdvddirectory.cpp

src/inputdvddirectory.h

src/inputdvddirectory.ui

src/inputmplayerversion.cpp

src/inputmplayerversion.h

src/inputurl.cpp

src/inputurl.h

src/languages.cpp

src/languages.h

src/lineedit_with_icon.cpp

src/lineedit_with_icon.h

src/logwindow.cpp

src/logwindow.h

src/main.cpp

src/mediadata.cpp

src/mediadata.h

src/mediasettings.cpp

src/mediasettings.h

src/minigui.cpp

src/minigui.h

src/mpcgui/mpcgui.cpp

src/mpcgui/mpcgui.h

src/mplayerprocess.cpp

src/mplayerprocess.h

src/mplayerversion.cpp

src/mplayerversion.h

src/mplayerwindow.cpp

src/mplayerwindow.h

src/multilineinputdialog.cpp

src/multilineinputdialog.h

src/myaction.cpp

src/myaction.h

src/myactiongroup.cpp

src/myactiongroup.h

src/myapplication.cpp

src/myapplication.h

src/mycombobox.cpp

src/mycombobox.h

src/mylineedit.cpp

src/mylineedit.h

src/myprocess.cpp

src/myprocess.h

src/myslider.cpp

src/myslider.h

src/mytablewidget.cpp

src/mytablewidget.h

src/paths.cpp

src/paths.h

src/playlist.cpp

src/playlist.h

src/playlistdock.cpp

src/playlistdock.h

src/prefadvanced.cpp

src/prefadvanced.h

src/prefadvanced.ui

src/prefassociations.cpp

src/prefassociations.h

src/prefdrives.cpp

src/prefdrives.h

src/prefdrives.ui

src/preferences.cpp

src/preferences.h

src/preferencesdialog.cpp

src/preferencesdialog.h

src/prefgeneral.cpp

src/prefgeneral.h

src/prefgeneral.ui

src/prefinput.cpp

src/prefinput.h

src/prefinput.ui

src/prefinterface.cpp

src/prefinterface.h

src/prefinterface.ui

src/prefperformance.cpp

src/prefperformance.h

src/prefperformance.ui

src/prefplaylist.cpp

src/prefplaylist.h

src/prefplaylist.ui

src/prefsubtitles.cpp

src/prefsubtitles.h

src/prefsubtitles.ui

src/preftv.cpp

src/preftv.h

src/prefupdates.cpp

src/prefupdates.h

src/prefupdates.ui

src/prefwidget.cpp

src/prefwidget.h

src/qtsingleapplication/qtlocalpeer.cpp

src/qtsingleapplication/qtlocalpeer.h

src/qtsingleapplication/qtlockedfile.cpp

src/qtsingleapplication/qtlockedfile.h

src/qtsingleapplication/qtlockedfile_unix.cpp

src/qtsingleapplication/qtlockedfile_win.cpp

src/qtsingleapplication/qtsingleapplication.cpp

src/qtsingleapplication/qtsingleapplication.h

src/qtsingleapplication/qtsingleapplication.pri

src/qtsingleapplication/qtsinglecoreapplication.cpp

src/qtsingleapplication/qtsinglecoreapplication.h

src/recents.cpp

src/recents.h

src/screensaver.cpp

src/screensaver.h

src/seekwidget.cpp

src/seekwidget.h

src/seekwidget.ui

src/selectcolorbutton.cpp

src/selectcolorbutton.h

src/shortcutgetter.cpp

src/shortcutgetter.h

src/shortcuts/default.keys

src/skingui/actiontools.cpp

src/skingui/actiontools.h

src/skingui/mediabarpanel.cpp

src/skingui/mediabarpanel.h

src/skingui/mediapanel.cpp

src/skingui/mediapanel.h

src/skingui/mybutton.cpp

src/skingui/mybutton.h

src/skingui/myicon.cpp

src/skingui/myicon.h

src/skingui/panelseeker.cpp

src/skingui/panelseeker.h

src/skingui/playcontrol.cpp

src/skingui/playcontrol.h

src/skingui/qpropertysetter.cpp

src/skingui/qpropertysetter.h

src/skingui/skingui.cpp

src/skingui/skingui.h

src/skingui/volumecontrolpanel.cpp

src/smplayer.cpp

src/smplayer.h

src/smplayer.pro

src/smplayer.rc

src/subtracks.cpp

src/subtracks.h

src/timedialog.cpp

src/timedialog.h

src/timeslider.cpp

src/timeslider.h

src/titletracks.cpp

src/titletracks.h

src/toolbareditor.cpp

src/toolbareditor.h

src/tracks.cpp

src/tracks.h

src/translations/.tx/config

src/translations/smplayer_ar_SY.ts

src/translations/smplayer_bg.ts

src/translations/smplayer_ca.ts

src/translations/smplayer_cs.ts

src/translations/smplayer_da.ts

src/translations/smplayer_de.ts

src/translations/smplayer_el_GR.ts

src/translations/smplayer_en_US.ts

src/translations/smplayer_es.ts

src/translations/smplayer_et.ts

src/translations/smplayer_eu.ts

src/translations/smplayer_fi.ts

src/translations/smplayer_fr.ts

src/translations/smplayer_gl.ts

src/translations/smplayer_he_IL.ts

src/translations/smplayer_hr.ts

src/translations/smplayer_hu.ts

src/translations/smplayer_it.ts

src/translations/smplayer_ja.ts

src/translations/smplayer_ka.ts

src/translations/smplayer_ko.ts

src/translations/smplayer_ku.ts

src/translations/smplayer_lt.ts

src/translations/smplayer_mk.ts

src/translations/smplayer_ms_MY.ts

src/translations/smplayer_nl.ts

src/translations/smplayer_pl.ts

src/translations/smplayer_pt.ts

src/translations/smplayer_pt_BR.ts

src/translations/smplayer_ro_RO.ts

src/translations/smplayer_ru_RU.ts

src/translations/smplayer_sk.ts

src/translations/smplayer_sl_SI.ts

src/translations/smplayer_sr.ts

src/translations/smplayer_sv.ts

src/translations/smplayer_th.ts

src/translations/smplayer_tr.ts

src/translations/smplayer_uk_UA.ts

src/translations/smplayer_vi_VN.ts

src/translations/smplayer_zh_CN.ts

src/translations/smplayer_zh_TW.ts

src/translator.cpp

src/translator.h

src/tristatecombo.cpp

src/tristatecombo.h

src/tvlist.cpp

src/tvlist.h

src/tvsettings.cpp

src/tvsettings.h

src/updatechecker.cpp

src/updatechecker.h

src/urlhistory.cpp

src/urlhistory.h

src/vdpauproperties.cpp

src/vdpauproperties.h

src/version.cpp

src/version.h

src/videoequalizer.cpp

src/videoequalizer.h

src/videopreview/main.cpp

src/videopreview/videopreview.cpp

src/videopreview/videopreview.h

src/videopreview/videopreview.pro

src/videopreview/videopreviewconfigdialog.cpp

src/videopreview/videopreviewconfigdialog.h

src/videopreview/videopreviewconfigdialog.ui

src/widgetactions.cpp

src/widgetactions.h

src/winfileassoc.cpp

src/winfileassoc.h

src/youtube/codedownloader.cpp

src/youtube/codedownloader.h

src/youtube/retrieveyoutubeurl.cpp

src/youtube/retrieveyoutubeurl.h

src/youtube/ytsig.cpp

src/youtube/ytsig.h

Show diffs side-by-side

added added

removed removed

src/prefinput.cpp

1

1

/* smplayer, GUI front-end for mplayer.

2

Copyright (C) 2006-2013 Ricardo Villalba <rvm@users.sourceforge.net>

2

Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>

3

3

4

4

This program is free software; you can redistribute it and/or modify

5

5

it under the terms of the GNU General Public License as published by

172

172

setWheelFunction( pref->wheel_function );

173

173

setWheelFunctionCycle(pref->wheel_function_cycle);

174

174

setWheelFunctionSeekingReverse(pref->wheel_function_seeking_reverse);

175

delay_left_check->setChecked(pref->delay_left_click);

175

176

}

176

177

177

178

void PrefInput::getData(Preferences * pref) {

186

187

pref->wheel_function = wheelFunction();

187

188

pref->wheel_function_cycle = wheelFunctionCycle();

188

189

pref->wheel_function_seeking_reverse = wheelFunctionSeekingReverse();

190

pref->delay_left_click = delay_left_check->isChecked();

189

191

}

190

192

191

193

/*

265

267

return wheel_function_combo->itemData(wheel_function_combo->currentIndex()).toInt();

266

268

}

267

269

268

void PrefInput::setWheelFunctionCycle(QFlags<Preferences::WheelFunctions> flags){

270

void PrefInput::setWheelFunctionCycle(Preferences::WheelFunctions flags){

269

271

wheel_function_seek->setChecked(flags.testFlag(Preferences::Seeking));

270

272

wheel_function_volume->setChecked(flags.testFlag(Preferences::Volume));

271

273

wheel_function_zoom->setChecked(flags.testFlag(Preferences::Zoom));

272

274

wheel_function_speed->setChecked(flags.testFlag(Preferences::ChangeSpeed));

273

275

}

274

276

275

QFlags<Preferences::WheelFunctions> PrefInput::wheelFunctionCycle(){

276

QFlags<Preferences::WheelFunctions> seekflags (QFlag ((int) Preferences::Seeking)) ;

277

QFlags<Preferences::WheelFunctions> volumeflags (QFlag ((int) Preferences::Volume)) ;

278

QFlags<Preferences::WheelFunctions> zoomflags (QFlag ((int) Preferences::Zoom)) ;

279

QFlags<Preferences::WheelFunctions> speedflags (QFlag ((int) Preferences::ChangeSpeed)) ;

280

QFlags<Preferences::WheelFunctions> out (QFlag (0));

277

Preferences::WheelFunctions PrefInput::wheelFunctionCycle(){

278

Preferences::WheelFunctions seekflags (QFlag ((int) Preferences::Seeking)) ;

279

Preferences::WheelFunctions volumeflags (QFlag ((int) Preferences::Volume)) ;

280

Preferences::WheelFunctions zoomflags (QFlag ((int) Preferences::Zoom)) ;

281

Preferences::WheelFunctions speedflags (QFlag ((int) Preferences::ChangeSpeed)) ;

282

Preferences::WheelFunctions out (QFlag (0));

281

283

if(wheel_function_seek->isChecked()){

282

284

out = out | seekflags;

283

285

}

337

339

setWhatsThis(wheel_function_combo, tr("Wheel function"),

338

340

tr("Select the action for the mouse wheel.") );

339

341

342

setWhatsThis(delay_left_check, tr("Don't trigger the left click function with a double click"),

343

tr("If this option is enabled when you double click on the "

344

"video area only the double click function will be triggered. "

345

"The left click action won't be activated.") + " "+

346

tr("By enabling this option the left click is delayed %1 milliseconds "

347

"because it's necessary to wait that time to know if there's a double click or not.").arg(qApp->doubleClickInterval()+10) );

348

349

setWhatsThis(wheel_function_seeking_reverse_check, tr("Reverse mouse wheel seeking"),

350

tr("Check it to seek in the opposite direction.") );

351

340

352

addSectionTitle(tr("Mouse wheel functions"));

341

353

342

354

setWhatsThis(wheel_function_seek, tr("Media seeking"),

350

362

351

363

setWhatsThis(wheel_function_speed, tr("Change speed"),

352

364

tr("Check it to enable changing speed as one function.") );

353

354

setWhatsThis(wheel_function_seeking_reverse_check, tr("Reverse mouse wheel seeking"),

355

tr("Check it to seek in the opposite direction.") );

356

357

365

}

358

366

359

367

#include "moc_prefinput.cpp"

Older »