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

Committer: Bazaar Package Importer
Author(s): Maia Kozheva
Date: 2009-11-04 12:45:38 UTC
mto: (1.1.10 upstream) (3.1.3 squeeze)
mto: This revision was merged to the branch mainline in revision 15.
Revision ID: james.westby@ubuntu.com-20091104124538-i5ntu42ni0e1njnv

Import upstream version 0.6.8

files added:
Watching_TV.txt

docs/hu

docs/hu/faq.html

docs/hu/gpl.html

docs/it

docs/it/faq.html

docs/it/gpl.html

setup/translations

setup/translations/basque.nsh

setup/translations/catalan.nsh

setup/translations/chinese-simp.nsh

setup/translations/chinese-trad.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/norwegian.nsh

setup/translations/polish.nsh

setup/translations/portuguese.nsh

setup/translations/russian.nsh

setup/translations/slovak.nsh

setup/translations/slovenian.nsh

setup/translations/spanish.nsh

src/favoriteeditor.cpp

src/favoriteeditor.h

src/favoriteeditor.ui

src/favorites.cpp

src/favorites.h

src/filters.cpp

src/filters.h

src/icons-png/download_subs.png

src/icons-png/favorite.png

src/icons-png/next_aspect.png

src/icons-png/open_radio.png

src/icons-png/open_tv.png

src/icons-png/screenshots.png

src/icons-png/tips.png

src/icons-png/type_tv.png

src/icons-png/video_preview.png

src/preftv.cpp

src/preftv.h

src/preftv.ui

src/translations/smplayer_et.ts

src/translations/smplayer_pt.ts

src/translations/smplayer_vi_VN.ts

src/tvlist.cpp

src/tvlist.h

src/tvsettings.cpp

src/tvsettings.h

files removed:
src/translations/smplayer_pt_PT.ts

files modified:
Changelog

Makefile

Release_notes.txt

create_deb.sh

debian-rvm/changelog-orig

debian-rvm/control

debian-rvm/docs

debian-rvm/rules

docs/ru/faq.html

man/smplayer.1

setup/Readme.txt

setup/install_smplayer.bat

setup/smplayer-installer.nsi

smplayer.desktop

smplayer.spec

smplayer_enqueue.desktop

src/about.cpp

src/actionseditor.cpp

src/basegui.cpp

src/basegui.h

src/baseguiplus.cpp

src/clhelp.cpp

src/config.h

src/core.cpp

src/core.h

src/extensions.cpp

src/findsubtitles/filedownloader/filedownloader.cpp

src/findsubtitles/findsubtitleswindow.cpp

src/findsubtitles/simplehttp.cpp

src/icons-png/qt.png

src/icons.qrc

src/infofile.cpp

src/inforeader.cpp

src/inputurl.cpp

src/languages.cpp

src/main.cpp

src/mediadata.cpp

src/mediadata.h

src/mediasettings.cpp

src/mediasettings.h

src/mplayerprocess.cpp

src/mplayerprocess.h

src/mplayerversion.cpp

src/mplayerversion.h

src/mplayerwindow.cpp

src/mplayerwindow.h

src/myclient.cpp

src/myclient.h

src/myserver.cpp

src/myserver.h

src/playlist.cpp

src/playlist.h

src/prefadvanced.cpp

src/prefadvanced.h

src/prefadvanced.ui

src/prefassociations.cpp

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

src/prefperformance.h

src/prefperformance.ui

src/screensaver.cpp

src/screensaver.h

src/shortcuts/default.keys

src/smplayer.cpp

src/smplayer.h

src/smplayer.ico

src/smplayer.pro

src/smplayer_associations.ico

src/toolbareditor.cpp

src/translations/smplayer_ar_SY.ts

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_gl.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_mk.ts

src/translations/smplayer_nl.ts

src/translations/smplayer_pl.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_tr.ts

src/translations/smplayer_uk_UA.ts

src/translations/smplayer_zh_CN.ts

src/translations/smplayer_zh_TW.ts

src/urlhistory.cpp

src/version.cpp

src/videopreview/videopreview.cpp

src/videopreview/videopreview.h

src/winfileassoc.cpp

Show diffs side-by-side

added added

removed removed

90

90

91

91

if (line2.isEmpty()) return;

92

92

93

line2 = "["+ QTime::currentTime().toString() +"] "+ line2;

93

line2 = "["+ QTime::currentTime().toString("hh:mm:ss:zzz") +"] "+ line2;

94

94

95

95

if (basegui_instance) {

96

96

if (!saved_lines.isEmpty()) {

Older »