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

Committer: Package Import Robot
Author(s): Mateusz Łukasik, Mateusz Łukasik, Alessio Treglia
Date: 2014-09-10 13:50:48 UTC
mfrom: (1.3.3)
mto: This revision was merged to the branch mainline in revision 27.
Revision ID: package-import@ubuntu.com-20140910135048-t043hd88bhpfvfow

[ Mateusz Łukasik ]
* New upstream release.

[ Alessio Treglia ]
* Repackaging upstream sources to get rid of
zlib/contrib/dotzlib/DotZLib.chm.
* Enable parallel builds.

files added:
debian/repack.local

debian/repack.sh

debian/repack.stub

setup/translations/po_files/ukrainian.po

setup/translations/ukrainian.nsh

src/icons-png/shutdown.png

src/old/images.cpp

src/old/images.h

src/shutdown.cpp

src/shutdown.h

src/shutdowndialog.cpp

src/shutdowndialog.h

src/shutdowndialog.ui

files removed:
zlib/contrib/dotzlib/DotZLib.chm

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

Changelog

Release_notes.txt

compile_windows.cmd

create_deb.sh

debian-rvm/changelog-orig

debian/changelog

debian/rules

debian/watch

setup/scripts/install_smplayer.cmd

setup/scripts/make_pkgs.cmd

setup/smplayer.nsi

setup/translations/dutch.nsh

setup/translations/hebrew.nsh

setup/translations/po_files/dutch.po

setup/translations/po_files/hebrew.po

setup/translations/po_files/polish.po

setup/translations/po_files/russian.po

setup/translations/polish.nsh

setup/translations/russian.nsh

smplayer.desktop

smplayer.spec

smplayer_enqueue.desktop

src/about.cpp

src/basegui.cpp

src/basegui.h

src/baseguiplus.cpp

src/core.cpp

src/extensions.cpp

src/favorites.cpp

src/findsubtitles/findsubtitleswindow.cpp

src/findsubtitles/osclient.cpp

src/findsubtitles/osclient.h

src/icons.qrc

src/images.cpp

src/images.h

src/infofile.cpp

src/mpcgui/mpcgui.cpp

src/mpcgui/mpcgui.h

src/playlist.cpp

src/preferences.cpp

src/preferences.h

src/prefgeneral.cpp

src/prefgeneral.ui

src/prefinterface.cpp

src/prefinterface.ui

src/prefsubtitles.cpp

src/prefupdates.cpp

src/prefupdates.ui

src/recents.cpp

src/recents.h

src/screensaver.h

src/sharedialog.cpp

src/sharedialog.h

src/skingui/mediabarpanel.cpp

src/skingui/mediapanel.cpp

src/skingui/mediapanel.h

src/skingui/panelseeker.cpp

src/skingui/panelseeker.h

src/skingui/skingui.cpp

src/smplayer.cpp

src/smplayer.pro

src/smplayer.rc

src/timeslider.cpp

src/timeslider.h

src/translations/smplayer_ar.ts

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_GB.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_id.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_nn_NO.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_uz.ts

src/translations/smplayer_vi_VN.ts

src/translations/smplayer_zh_CN.ts

src/translations/smplayer_zh_TW.ts

src/version.cpp

src/videopreview/videopreview.cpp

src/widgetactions.cpp

src/widgetactions.h

src/youtube/retrieveyoutubeurl.cpp

src/youtube/retrieveyoutubeurl.h

src/youtube/ytsig.cpp

Show diffs side-by-side

added added

removed removed

src/prefsubtitles.cpp

424

424

#ifdef Q_OS_WIN

425

425

if (b) {

426

426

style_font_combo->setFontsFromDir(QString::null);

427

fontCombo->setFontsFromDir(QString::null);

427

428

} else {

428

429

QString fontdir = Paths::fontPath();

429

430

//QString fontdir = "/tmp/fonts/";

430

431

style_font_combo->setFontsFromDir(fontdir);

432

433

// Calling setFontsFromDir resets the fonts in other comboboxes!

434

// So the font list is copied from the previous combobox

435

QString current_text = fontCombo->currentText();

436

fontCombo->clear();

437

for (int n=0; n < style_font_combo->count(); n++) {

438

fontCombo->addItem( style_font_combo->itemText(n) );

439

}

440

fontCombo->setCurrentText(current_text);

431

441

}

432

442

#endif

433

443

}

Older »