← Back to branch summary

~ubuntu-branches/debian/jessie/subdownloader/jessie

« back to all changes in this revision

Viewing changes to gui/preferences_ui.py

  • Committer: Package Import Robot
  • Author(s): Emilien Klein, Jakub Wilk, Emilien Klein
  • Date: 2014-10-22 00:09:01 UTC
  • mfrom: (1.2.2)
  • Revision ID: package-import@ubuntu.com-20141022000901-968rxi9a15icm032
Tags: 2.0.18-1
http://bugs.debian.org/687126
http://bugs.debian.org/751920
* New upstream release (Closes: #687126, #751920).

[ Jakub Wilk ]
* Use canonical URIs for Vcs-* fields.
* Fix watch file.

[ Emilien Klein ]
* Transition from python_support to dh_python2. Affects files:
  - d/control
  - d/rules
  - d/subdownloader.install
  - d/subdownloader.links
* d/control:
  - Bump Standards-Version from 3.9.1 to 3.9.6 (one change performed to
    d/rules recommended target)
  - Replace Marco Rodrigues by myself in Uploaders
* d/rules: Fix debian-rules-missing-recommended-target Lintian warning
* d/patches/fix-non-ascii-download-path.patch: deleted as applied upstream
* d/patches/desktop-file-remove-path.patch: make the desktop file usable
* d/patches/no-mime-type-in-desktop-file.patch: Mime Type is unused, as
    the .desktop file doesn't provide an Exec code.
* d/patches/resize-icon.patch: Resize icon from 64x64 to 32x32

Show diffs side-by-side

added added

removed removed

Lines of Context:
gui/preferences_ui.py
122
122
        self.optionDownloadSameFilenamePlusLang.setChecked(False)
123
123
        self.optionDownloadSameFilenamePlusLang.setObjectName("optionDownloadSameFilenamePlusLang")
124
124
        self.verticalLayout_2.addWidget(self.optionDownloadSameFilenamePlusLang)
 
125
        self.optionDownloadSameFilenamePlusLangAndUploader = QtGui.QRadioButton(self.groupBox_2)
 
126
        self.optionDownloadSameFilenamePlusLangAndUploader.setChecked(False)
 
127
        self.optionDownloadSameFilenamePlusLangAndUploader.setObjectName("optionDownloadSameFilenamePlusLangAndUploader")
 
128
        self.verticalLayout_2.addWidget(self.optionDownloadSameFilenamePlusLangAndUploader)
125
129
        self.optionDownloadOnlineSubName = QtGui.QRadioButton(self.groupBox_2)
126
130
        self.optionDownloadOnlineSubName.setObjectName("optionDownloadOnlineSubName")
127
131
        self.verticalLayout_2.addWidget(self.optionDownloadOnlineSubName)
276
280
        self.groupBox_2.setTitle(_("Filename of the Subtitle:"))
277
281
        self.optionDownloadSameFilename.setText(_("Same name as video file"))
278
282
        self.optionDownloadSameFilenamePlusLang.setText(_("Same name as video file + language code (ex: StarWarsCD1.eng.srt)"))
 
283
        self.optionDownloadSameFilenamePlusLangAndUploader.setText(_("Same name as video file + language code + Uploader (ex: StarWarsCD1.eng.JohnDoe.srt)"))
279
284
        self.optionDownloadOnlineSubName.setText(_("Same name as the online subtitle"))
280
285
        self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_6), _("Download"))
281
286
        self.label_55.setText(_("Default language of uploaded subtitles"))