~ubuntu-branches/ubuntu/maverick/smplayer/maverick

Viewing changes to src/prefsubtitles.cpp

Committer: Bazaar Package Importer
Author(s): Maia Kozheva
Date: 2009-03-31 23:05:43 UTC
mfrom: (1.1.9 upstream) (3.1.2 squeeze)
Revision ID: james.westby@ubuntu.com-20090331230543-1ned1omblgt4qiak

Tags: 0.6.7-1

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:
debian/README.source

debian/patches

debian/patches/01_gl_translation.patch

dvdmenus.txt

setup/smplayer-installer.nsi

src/discname.cpp

src/discname.h

src/findsubtitles/findsubtitlesconfigdialog.cpp

src/findsubtitles/findsubtitlesconfigdialog.h

src/findsubtitles/findsubtitlesconfigdialog.ui

files removed:
svn_revision

files modified:
Changelog

Install.txt

Makefile

Release_notes.txt

create_deb.sh

debian-rvm/changelog-orig

debian-rvm/control

debian-rvm/rules

debian/changelog

debian/control

debian/copyright

debian/rules

docs/cs/faq.html

docs/en/faq.html

docs/ja/faq.html

get_svn_revision.sh

setup/smplayer.iss

smplayer.desktop

smplayer.spec

smplayer_enqueue.desktop

src/about.cpp

src/about.h

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

src/eqslider.h

src/errordialog.cpp

src/errordialog.h

src/extensions.cpp

src/extensions.h

src/filechooser.cpp

src/filechooser.h

src/filedialog.cpp

src/filedialog.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/findsubtitles/filedownloader/filedownloader.cpp

src/findsubtitles/filedownloader/filedownloader.h

src/findsubtitles/findsubtitles.pro

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

src/findsubtitles/simplehttp.h

src/findsubtitles/subchooserdialog.cpp

src/findsubtitles/subchooserdialog.h

src/floatingwidget.cpp

src/floatingwidget.h

src/global.cpp

src/global.h

src/guiconfig.h

src/helper.cpp

src/helper.h

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

src/inputmplayerversion.h

src/inputmplayerversion.ui

src/inputurl.cpp

src/inputurl.h

src/languages.cpp

src/languages.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/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/myaction.cpp

src/myaction.h

src/myactiongroup.cpp

src/myactiongroup.h

src/myclient.cpp

src/myclient.h

src/mycombobox.cpp

src/mycombobox.h

src/myprocess.cpp

src/myprocess.h

src/myserver.cpp

src/myserver.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/playlistpreferences.cpp

src/playlistpreferences.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/prefinput.cpp

src/prefinput.h

src/prefinterface.cpp

src/prefinterface.h

src/prefperformance.cpp

src/prefperformance.h

src/prefplaylist.cpp

src/prefplaylist.h

src/prefsubtitles.cpp

src/prefsubtitles.h

src/prefsubtitles.ui

src/prefwidget.cpp

src/prefwidget.h

src/recents.cpp

src/recents.h

src/screensaver.cpp

src/screensaver.h

src/seekwidget.cpp

src/seekwidget.h

src/selectcolorbutton.cpp

src/selectcolorbutton.h

src/shortcutgetter.cpp

src/shortcutgetter.h

src/smplayer.cpp

src/smplayer.h

src/smplayer.pro

src/subtracks.cpp

src/subtracks.h

src/timedialog.cpp

src/timedialog.h

src/timedialog.ui

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/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_pt_PT.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/translator.cpp

src/translator.h

src/tristatecombo.cpp

src/tristatecombo.h

src/urlhistory.cpp

src/urlhistory.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/videopreviewconfigdialog.cpp

src/videopreview/videopreviewconfigdialog.h

src/videopreview/videopreviewconfigdialog.ui

src/widgetactions.cpp

src/widgetactions.h

src/winfileassoc.cpp

src/winfileassoc.h

Show diffs side-by-side

added added

removed removed

src/prefsubtitles.cpp

/* smplayer, GUI front-end for mplayer.

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

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

#include "filedialog.h"

#include "languages.h"

#include <QColorDialog>

#include <QInputDialog>

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

: PrefWidget(parent, f )

140

style_font_combo->setCurrentText(pref->ass_styles.fontname);

141

style_size_spin->setValue(pref->ass_styles.fontsize);

142

style_text_color_button->setColor(pref->ass_styles.primarycolor);

143

style_border_color_button->setColor(pref->ass_styles.backcolor);

143

style_border_color_button->setColor(pref->ass_styles.outlinecolor);

144

style_shadow_color_button->setColor(pref->ass_styles.backcolor);

144

145

style_bold_check->setChecked(pref->ass_styles.bold);

145

146

style_italic_check->setChecked(pref->ass_styles.italic);

146

147

style_alignment_combo->setCurrentIndex(style_alignment_combo->findData(pref->ass_styles.halignment));

151

152

style_marginl_spin->setValue(pref->ass_styles.marginl);

152

153

style_marginr_spin->setValue(pref->ass_styles.marginr);

153

154

style_marginv_spin->setValue(pref->ass_styles.marginv);

155

156

setForceAssStyles(pref->force_ass_styles);

157

setCustomizedAssStyle(pref->user_forced_ass_style);

154

158

}

155

159

156

160

void PrefSubtitles::getData(Preferences * pref) {

177

181

TEST_AND_SET(pref->ass_styles.fontname, style_font_combo->currentText());

178

182

TEST_AND_SET(pref->ass_styles.fontsize, style_size_spin->value());

179

183

TEST_AND_SET(pref->ass_styles.primarycolor, style_text_color_button->color().rgb());

180

TEST_AND_SET(pref->ass_styles.backcolor, style_border_color_button->color().rgb());

184

TEST_AND_SET(pref->ass_styles.outlinecolor, style_border_color_button->color().rgb());

185

TEST_AND_SET(pref->ass_styles.backcolor, style_shadow_color_button->color().rgb());

181

186

TEST_AND_SET(pref->ass_styles.bold, style_bold_check->isChecked());

182

187

TEST_AND_SET(pref->ass_styles.italic, style_italic_check->isChecked());

183

188

TEST_AND_SET(pref->ass_styles.halignment, style_alignment_combo->itemData(style_alignment_combo->currentIndex()).toInt());

190

195

TEST_AND_SET(pref->ass_styles.marginv, style_marginv_spin->value());

191

196

192

197

pref->ass_styles.exportStyles( Paths::subtitleStyleFile() );

198

199

TEST_AND_SET(pref->force_ass_styles, forceAssStyles());

200

TEST_AND_SET(pref->user_forced_ass_style, customizedAssStyle());

193

201

}

194

202

195

203

void PrefSubtitles::checkBorderStyleCombo( int index ) {

328

336

return ass_line_spacing_spin->value();

329

337

}

330

338

339

void PrefSubtitles::setForceAssStyles(bool b) {

340

force_ass_styles->setChecked(b);

341

}

342

343

bool PrefSubtitles::forceAssStyles() {

344

return force_ass_styles->isChecked();

345

}

346

331

347

void PrefSubtitles::on_ass_subs_button_toggled(bool b) {

332

348

if (b)

333

349

stackedWidget->setCurrentIndex(1);

335

351

stackedWidget->setCurrentIndex(0);

336

352

}

337

353

354

void PrefSubtitles::on_ass_customize_button_clicked() {

355

bool ok;

356

357

QString edit = forced_ass_style;

358

359

// A copy with the current values in the dialog

360

AssStyles ass_styles;

361

ass_styles.fontname = style_font_combo->currentText();

362

ass_styles.fontsize = style_size_spin->value();

363

ass_styles.primarycolor = style_text_color_button->color().rgb();

364

ass_styles.outlinecolor = style_border_color_button->color().rgb();

365

ass_styles.backcolor = style_shadow_color_button->color().rgb();

366

ass_styles.bold = style_bold_check->isChecked();

367

ass_styles.italic = style_italic_check->isChecked();

368

ass_styles.halignment = style_alignment_combo->itemData(style_alignment_combo->currentIndex()).toInt();

369

ass_styles.valignment = style_valignment_combo->currentIndex();

370

ass_styles.borderstyle = style_border_style_combo->itemData(style_border_style_combo->currentIndex()).toInt();

371

ass_styles.outline = style_outline_spin->value();

372

ass_styles.shadow = style_shadow_spin->value();

373

ass_styles.marginl = style_marginl_spin->value();

374

ass_styles.marginr = style_marginr_spin->value();

375

ass_styles.marginv = style_marginv_spin->value();

376

377

if (edit.isEmpty()) {

378

edit = ass_styles.toString();

379

}

380

381

QString s = QInputDialog::getText(this, tr("Customize SSA/ASS style"),

382

tr("Here you can enter your customized SSA/ASS style.") +"<br>"+

383

tr("Clear the edit line to disable the customized style."),

384

QLineEdit::Normal,

385

edit, &ok );

386

if (ok) {

387

if (s == ass_styles.toString()) s.clear(); // Clear string if it wasn't changed by the user

388

setCustomizedAssStyle(s);

389

}

390

}

391

338

392

void PrefSubtitles::setFreetypeSupport(bool b) {

339

393

freetype_check->setChecked(b);

340

394

}

445

499

tr("This specifies the spacing that will be used to separate "

446

500

"multiple lines. It can have negative values.") );

447

501

502

setWhatsThis(styles_container, tr("SSA/ASS style"),

503

tr("The following options allows you to define the style to "

504

"be used for non-styled subtitles (srt, sub...).") );

505

448

506

setWhatsThis(style_font_combo, tr("Font"),

449

507

tr("Select the font for the subtitles.") );

450

508

463

521

setWhatsThis(style_border_color_button, tr("Border color"),

464

522

tr("Select the color for the border of the subtitles.") );

465

523

524

setWhatsThis(style_shadow_color_button, tr("Shadow color"),

525

tr("This color will be used for the shadow of the subtitles.") );

526

466

527

setWhatsThis(style_marginl_spin, tr("Left margin"),

467

528

tr("Specifies the left margin in pixels.") );

468

529

491

552

setWhatsThis(style_shadow_spin, tr("Shadow"),

492

553

tr("If border style is set to <i>outline</i>, this option specifies "

493

554

"the depth of the drop shadow behind the text in pixels.") );

555

556

setWhatsThis(force_ass_styles, tr("Apply style to ass files too"),

557

tr("If this option is checked, the style defined above will be "

558

"applied to ass subtitles too.") );

494

559

}

495

560

496

561

#include "moc_prefsubtitles.cpp"

Older »