← Back to branch summary

~ubuntu-branches/ubuntu/wily/smplayer/wily

~ubuntu-branches/ubuntu/wily/smplayer/wily

« back to all changes in this revision

Viewing changes to src/actionseditor.cpp

Committer: Bazaar Package Importer
Author(s): Maia Kozheva
Date: 2009-03-31 23:05:43 UTC
mfrom: (1.2.2 upstream)
mto: This revision was merged to the branch mainline in revision 14.
Revision ID: james.westby@ubuntu.com-20090331230543-0h2hfwpwlu9opbv2

http://bugs.debian.org/523791

http://bugs.debian.org/503295

http://bugs.debian.org/486314

http://bugs.debian.org/489375

* New upstream release. (Closes: #523791)
  - Reworked subtitle font preferences. (Closes: #503295)
  - No longer installs qt_fr.qm. (Closes: #486314)
* debian/control:
  - Bumped Standards-Version to 3.8.1.
  - Changed maintainer name (still the same person and GPG key).
  - Changed section to video.
  - Build-depend on zlib1g-dev for findsubtitles.
  - Require Qt >= 4.3 per readme.
  - Added ${misc:Depends}.
  - Make smplayer-translations depend on smplayer and smplayer recommend
    smplayer-translations, not the other way round. (Closes: #489375)
* debian/copyright:
  - Significantly expanded per-file with new upstream authors.
* debian/rules:
  - Make make use correct uic in install.
  - Clean svn_revision.
  - Removed get-orig-source - not needed with uscan --repack.
* debian/patches/01_gl_translation.patch:
  - Added patch to fix lrelease error on smplayer_gl.ts.
* Added debian/README.source for simple-patchsys.

files added:
Audio_equalizer.txt

Configuring_the_toolbars.txt

Finding_subtitles.txt

Portable_Edition.txt

compile_windows_portable.bat

debian/README.source

debian/patches

debian/patches/01_gl_translation.patch

docs/cs

docs/cs/faq.html

docs/cs/gpl.html

docs/nl

docs/nl/gpl.html

dvdmenus.txt

dxlist

dxlist/README.txt

dxlist/directx

dxlist/directx/README.txt

dxlist/dxlist.pro

dxlist/main.cpp

setup/smplayer-installer.nsi

setup/smplayer_orig.ini

src/assstyles.cpp

src/assstyles.h

src/audioequalizer.cpp

src/audioequalizer.h

src/audioequalizerlist.h

src/colorutils.cpp

src/colorutils.h

src/config.h

src/constants.h

src/core.cpp

src/core.h

src/desktopinfo.cpp

src/desktopinfo.h

src/deviceinfo.cpp

src/deviceinfo.h

src/discname.cpp

src/discname.h

src/filesettings.cpp

src/filesettings.h

src/filesettingsbase.cpp

src/filesettingsbase.h

src/filesettingshash.cpp

src/filesettingshash.h

src/findsubtitles

src/findsubtitles/filedownloader

src/findsubtitles/filedownloader/filedownloader.cpp

src/findsubtitles/filedownloader/filedownloader.h

src/findsubtitles/filedownloader/filedownloader.pro

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/findsubtitleswindow.ui

src/findsubtitles/main.cpp

src/findsubtitles/osparser.cpp

src/findsubtitles/osparser.h

src/findsubtitles/quazip

src/findsubtitles/quazip/COPYING

src/findsubtitles/quazip/COPYING.LGPL

src/findsubtitles/quazip/COPYING.readme

src/findsubtitles/quazip/README

src/findsubtitles/quazip/crypt.h

src/findsubtitles/quazip/ioapi.c

src/findsubtitles/quazip/ioapi.h

src/findsubtitles/quazip/quazip.cpp

src/findsubtitles/quazip/quazip.h

src/findsubtitles/quazip/quazip.pro

src/findsubtitles/quazip/quazipfile.cpp

src/findsubtitles/quazip/quazipfile.h

src/findsubtitles/quazip/quazipfileinfo.h

src/findsubtitles/quazip/quazipnewinfo.cpp

src/findsubtitles/quazip/quazipnewinfo.h

src/findsubtitles/quazip/unzip.c

src/findsubtitles/quazip/unzip.h

src/findsubtitles/quazip/zip.c

src/findsubtitles/quazip/zip.h

src/findsubtitles/simplehttp.cpp

src/findsubtitles/simplehttp.h

src/findsubtitles/subchooserdialog.cpp

src/findsubtitles/subchooserdialog.h

src/findsubtitles/subchooserdialog.ui

src/global.cpp

src/global.h

src/helper.cpp

src/helper.h

src/icons-png/audio_equalizer.png

src/icons-png/flip.png

src/icons-png/mirror.png

src/icons-png/play_pause.png

src/infoprovider.cpp

src/infoprovider.h

src/languages

src/languages.cpp

src/languages.h

src/languages/list.txt

src/languages/main.cpp

src/languages/process_list.pro

src/mediadata.cpp

src/mediadata.h

src/mediasettings.cpp

src/mediasettings.h

src/mpcgui

src/mpcgui/mpc_mono.png

src/mpcgui/mpc_stereo.png

src/mpcgui/mpc_toolbar.png

src/mpcgui/mpcgui.cpp

src/mpcgui/mpcgui.h

src/mpcgui/mpcstyles.cpp

src/mpcgui/mpcstyles.h

src/mplayerprocess.cpp

src/mplayerprocess.h

src/mplayerversion.cpp

src/mplayerversion.h

src/mplayerwindow.cpp

src/mplayerwindow.h

src/myprocess.cpp

src/myprocess.h

src/paths.cpp

src/paths.h

src/preferences.cpp

src/preferences.h

src/prefplaylist.cpp

src/prefplaylist.h

src/prefplaylist.ui

src/screensaver.cpp

src/screensaver.h

src/selectcolorbutton.cpp

src/selectcolorbutton.h

src/shortcuts/sda.keys

src/subtracks.cpp

src/subtracks.h

src/titletracks.cpp

src/titletracks.h

src/toolbareditor.cpp

src/toolbareditor.h

src/tracks.cpp

src/tracks.h

src/translations/smplayer_ar_SY.ts

src/translations/smplayer_gl.ts

src/translations/smplayer_ku.ts

src/translations/smplayer_sl_SI.ts

src/urlhistory.cpp

src/urlhistory.h

src/videopreview

src/videopreview/async.diff

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

files removed:
debian-rvm/cron.d.ex

debian-rvm/emacsen-install.ex

debian-rvm/emacsen-remove.ex

debian-rvm/emacsen-startup.ex

debian-rvm/init.d.ex

debian-rvm/manpage.1.ex

debian-rvm/manpage.sgml.ex

debian-rvm/manpage.xml.ex

debian-rvm/postinst.ex

debian-rvm/postrm.ex

debian-rvm/preinst.ex

debian-rvm/prerm.ex

debian-rvm/smplayer-default.ex

debian-rvm/smplayer.doc-base.EX

debian-rvm/watch.ex

setup/smplayer_lite.iss

src/corelib/config.h

src/corelib/constants.h

src/corelib/core.cpp

src/corelib/core.h

src/corelib/desktopinfo.cpp

src/corelib/desktopinfo.h

src/corelib/global.cpp

src/corelib/global.h

src/corelib/helper.cpp

src/corelib/helper.h

src/corelib/infoprovider.cpp

src/corelib/infoprovider.h

src/corelib/mediadata.cpp

src/corelib/mediadata.h

src/corelib/mediasettings.cpp

src/corelib/mediasettings.h

src/corelib/mplayerprocess.cpp

src/corelib/mplayerprocess.h

src/corelib/mplayerversion.cpp

src/corelib/mplayerversion.h

src/corelib/mplayerwindow.cpp

src/corelib/mplayerwindow.h

src/corelib/myprocess.cpp

src/corelib/myprocess.h

src/corelib/preferences.cpp

src/corelib/preferences.h

src/corelib/screensaver.cpp

src/corelib/screensaver.h

src/corelib/subtracks.cpp

src/corelib/subtracks.h

src/corelib/trackdata.cpp

src/corelib/trackdata.h

src/corelib/tracks.cpp

src/corelib/tracks.h

src/encodings.cpp

src/encodings.h

src/old-code

src/old-code/aboutdialog.cpp

src/old-code/aboutdialog.h

src/old-code/floatingcontrol.cpp

src/old-code/floatingcontrol.h

src/old-code/main.cpp

src/translations/qt_fr.qm

src/translations/qt_fr.ts

files modified:
Changelog

Install.txt

Makefile

Readme.txt

Release_notes.txt

clean_windows.bat

compile_windows_with_qxt.bat

create_deb.sh

create_rpm.sh

debian-rvm/changelog-orig

debian-rvm/control

debian-rvm/docs

debian-rvm/rules

debian/changelog

debian/control

debian/copyright

debian/rules

docs/en/faq.html

docs/ja/faq.html

get_svn_revision.sh

getrev/getrev.pro

man/smplayer.1

setup/install_smplayer.bat

setup/smplayer.iss

smplayer.desktop

smplayer.spec

smplayer_enqueue.desktop

src/about.cpp

src/about.h

src/about.ui

src/actionseditor.cpp

src/actionseditor.h

src/basegui.cpp

src/basegui.h

src/baseguiplus.cpp

src/baseguiplus.h

src/clhelp.cpp

src/clhelp.h

src/corelib/smplayercore.pro

src/defaultgui.cpp

src/defaultgui.h

src/eqslider.cpp

src/eqslider.h

src/eqslider.ui

src/errordialog.cpp

src/errordialog.h

src/errordialog.ui

src/extensions.cpp

src/extensions.h

src/filechooser.cpp

src/filechooser.h

src/filechooser.ui

src/filedialog.cpp

src/filedialog.h

src/filepropertiesdialog.cpp

src/filepropertiesdialog.h

src/filepropertiesdialog.ui

src/floatingwidget.cpp

src/floatingwidget.h

src/guiconfig.h

src/icons.qrc

src/images.cpp

src/images.h

src/infofile.cpp

src/infofile.h

src/inforeader.cpp

src/inforeader.h

src/input.conf

src/inputdvddirectory.cpp

src/inputdvddirectory.h

src/inputdvddirectory.ui

src/inputmplayerversion.cpp

src/inputmplayerversion.h

src/inputmplayerversion.ui

src/inputurl.cpp

src/inputurl.h

src/inputurl.ui

src/logwindow.cpp

src/logwindow.h

src/logwindowbase.ui

src/main.cpp

src/minigui.cpp

src/minigui.h

src/myaction.cpp

src/myaction.h

src/myactiongroup.cpp

src/myactiongroup.h

src/myclient.cpp

src/myclient.h

src/mycombobox.cpp

src/mycombobox.h

src/myserver.cpp

src/myserver.h

src/myslider.cpp

src/myslider.h

src/mytablewidget.cpp

src/mytablewidget.h

src/playlist.cpp

src/playlist.h

src/playlistdock.cpp

src/playlistdock.h

src/playlistpreferences.cpp

src/playlistpreferences.h

src/playlistpreferences.ui

src/prefadvanced.cpp

src/prefadvanced.h

src/prefadvanced.ui

src/prefassociations.cpp

src/prefassociations.h

src/prefassociations.ui

src/prefdrives.cpp

src/prefdrives.h

src/prefdrives.ui

src/preferencesdialog.cpp

src/preferencesdialog.h

src/preferencesdialog.ui

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/prefsubtitles.cpp

src/prefsubtitles.h

src/prefsubtitles.ui

src/prefwidget.cpp

src/prefwidget.h

src/recents.cpp

src/recents.h

src/seekwidget.cpp

src/seekwidget.h

src/seekwidget.ui

src/shortcutgetter.cpp

src/shortcutgetter.h

src/shortcuts/default.keys

src/smplayer.cpp

src/smplayer.h

src/smplayer.pro

src/timedialog.cpp

src/timedialog.h

src/timedialog.ui

src/timeslider.cpp

src/timeslider.h

src/translations/smplayer_bg.ts

src/translations/smplayer_ca.ts

src/translations/smplayer_cs.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_eu.ts

src/translations/smplayer_fi.ts

src/translations/smplayer_fr.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_mk.ts

src/translations/smplayer_nl.ts

src/translations/smplayer_pl.ts

src/translations/smplayer_pt_BR.ts

src/translations/smplayer_pt_PT.ts

src/translations/smplayer_ro_RO.ts

src/translations/smplayer_ru_RU.ts

src/translations/smplayer_sk.ts

src/translations/smplayer_sr.ts

src/translations/smplayer_sv.ts

src/translations/smplayer_tr.ts

src/translations/smplayer_uk_UA.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/version.cpp

src/version.h

src/videoequalizer.cpp

src/videoequalizer.h

src/widgetactions.cpp

src/widgetactions.h

src/winfileassoc.cpp

src/winfileassoc.h

Show diffs side-by-side

added added

removed removed

src/actionseditor.cpp

1

1

/* smplayer, GUI front-end for mplayer.

2

Copyright (C) 2006-2008 Ricardo Villalba <rvm@escomposlinux.org>

2

Copyright (C) 2006-2009 Ricardo Villalba <rvm@escomposlinux.org>

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

39

39

40

40

#include "images.h"

41

41

#include "filedialog.h"

42

#include "helper.h"

42

#include "paths.h"

43

43

44

44

#include "shortcutgetter.h"

45

45

112

112

113

113

for (int n=0; n < l.count(); n++) {

114

114

//qDebug("%s", l[n].toUtf8().data());

115

#if QT_VERSION >= 0x040300

116

// Qt 4.3 and 4.4 (at least on linux) seems to have a problem when using Traditional Chinese

117

// QKeysequence deletes the arrow key names from the shortcut

118

// so this is a work-around.

119

QString s = l[n].simplified();

120

#else

115

121

QString s = QKeySequence( l[n].simplified() );

122

#endif

116

123

117

124

//Work-around for Simplified-Chinese

118

125

s.replace( QString::fromUtf8("左"), "Left");

137

144

ActionsEditor::ActionsEditor(QWidget * parent, Qt::WindowFlags f)

138

145

: QWidget(parent, f)

139

146

{

140

latest_dir = Helper::shortcutsPath();

147

latest_dir = Paths::shortcutsPath();

141

148

142

149

actionsTable = new QTableWidget(0, COL_NAME +1, this);

143

150

actionsTable->setSelectionMode( QAbstractItemView::SingleSelection );

226

233

QList<QAction *> actions = widget->findChildren<QAction *>();

227

234

for (int n=0; n < actions.count(); n++) {

228

235

action = static_cast<QAction*> (actions[n]);

229

if (!action->objectName().isEmpty())

236

if (!action->objectName().isEmpty() && !action->inherits("QWidgetAction"))

230

237

actionsList.append(action);

231

238

}

232

239

350

357

void ActionsEditor::editShortcut() {

351

358

QTableWidgetItem * i = actionsTable->item( actionsTable->currentRow(), COL_SHORTCUT );

352

359

if (i) {

353

ShortcutGetter d;

360

ShortcutGetter d(this);

354

361

QString result = d.exec( i->text() );

355

362

356

363

if (!result.isNull()) {

536

543

QList<QAction *> actions = o->findChildren<QAction *>();

537

544

for (int n=0; n < actions.count(); n++) {

538

545

action = static_cast<QAction*> (actions[n]);

539

if (!action->objectName().isEmpty()) {

546

if (!action->objectName().isEmpty() && !action->inherits("QWidgetAction")) {

540

547

#if USE_MULTIPLE_SHORTCUTS

541

548

QString accelText = shortcutsToString(action->shortcuts());

542

549

#else

561

568

QList<QAction *> actions = o->findChildren<QAction *>();

562

569

for (int n=0; n < actions.count(); n++) {

563

570

action = static_cast<QAction*> (actions[n]);

564

if (!action->objectName().isEmpty()) {

571

if (!action->objectName().isEmpty() && !action->inherits("QWidgetAction")) {

565

572

#if USE_MULTIPLE_SHORTCUTS

566

573

QString current = shortcutsToString(action->shortcuts());

567

574

accelText = set->value(action->objectName(), current).toString();

Older »