maryjane
/
gpodder
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

preferences: Allow a narrower Video page 

* Replace Grid with FlowBox in Video page
 * Don't set hexpand on ComboBoxes
 * preferences.py: Ellipsize video format selector combobox strings
This commit is contained in:
Teemu Ikonen 2022-04-12 10:33:32 +03:00
parent b1ef6e0859
commit 3d85283bac
2 changed files with 58 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
share/gpodder/ui/gtk/gpodderpreferences.ui
View File

@ -1015,82 +1015,92 @@
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<!-- n-columns=2 n-rows=3 -->
<object class="GtkGrid" id="table_video">
<object class="GtkFlowBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="row-spacing">6</property>
<property name="column-spacing">12</property>
<property name="min-children-per-line">1</property>
<property name="max-children-per-line">2</property>
<property name="selection-mode">none</property>
<child>
<object class="GtkLabel" id="label_preferred_youtube_format">
<object class="GtkFlowBoxChild">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Preferred YouTube format:</property>
<property name="xalign">0</property>
<child>
<object class="GtkLabel" id="label_preferred_youtube_format">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Preferred YouTube format:</property>
<property name="xalign">0</property>
</object>
</child>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="combobox_preferred_youtube_format">
<object class="GtkFlowBoxChild">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<signal name="changed" handler="on_combobox_preferred_youtube_format_changed" swapped="no"/>
<child>
<object class="GtkComboBox" id="combobox_preferred_youtube_format">
<property name="visible">True</property>
<property name="can-focus">False</property>
<signal name="changed" handler="on_combobox_preferred_youtube_format_changed" swapped="no"/>
</object>
</child>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label_preferred_youtube_hls_format">
<object class="GtkFlowBoxChild">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Preferred YouTube HLS format:</property>
<property name="xalign">0</property>
<child>
<object class="GtkLabel" id="label_preferred_youtube_hls_format">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Preferred YouTube HLS format:</property>
<property name="xalign">0</property>
</object>
</child>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="combobox_preferred_youtube_hls_format">
<object class="GtkFlowBoxChild">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<signal name="changed" handler="on_combobox_preferred_youtube_hls_format_changed" swapped="no"/>
<child>
<object class="GtkComboBox" id="combobox_preferred_youtube_hls_format">
<property name="visible">True</property>
<property name="can-focus">False</property>
<signal name="changed" handler="on_combobox_preferred_youtube_hls_format_changed" swapped="no"/>
</object>
</child>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label_preferred_vimeo_format">
<object class="GtkFlowBoxChild">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Preferred Vimeo format:</property>
<property name="xalign">0</property>
<child>
<object class="GtkLabel" id="label_preferred_vimeo_format">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Preferred Vimeo format:</property>
<property name="xalign">0</property>
</object>
</child>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">2</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="combobox_preferred_vimeo_format">
<object class="GtkFlowBoxChild">
<property name="visible">True</property>
<property name="can-focus">False</property>
<signal name="changed" handler="on_combobox_preferred_vimeo_format_changed" swapped="no"/>
<child>
<object class="GtkComboBox" id="combobox_preferred_vimeo_format">
<property name="visible">True</property>
<property name="can-focus">False</property>
<signal name="changed" handler="on_combobox_preferred_vimeo_format_changed" swapped="no"/>
</object>
</child>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">2</property>
</packing>
</child>
</object>
<packing>

3
src/gpodder/gtkui/desktop/preferences.py
View File

@ -209,6 +209,7 @@ class gPodderPreferences(BuilderWidget):
self.preferred_youtube_format_model = YouTubeVideoFormatListModel(self._config)
self.combobox_preferred_youtube_format.set_model(self.preferred_youtube_format_model)
cellrenderer = Gtk.CellRendererText()
cellrenderer.set_property('ellipsize', Pango.EllipsizeMode.END)
self.combobox_preferred_youtube_format.pack_start(cellrenderer, True)
self.combobox_preferred_youtube_format.add_attribute(cellrenderer, 'text', self.preferred_youtube_format_model.C_CAPTION)
self.combobox_preferred_youtube_format.set_active(self.preferred_youtube_format_model.get_index())
@ -216,6 +217,7 @@ class gPodderPreferences(BuilderWidget):
self.preferred_youtube_hls_format_model = YouTubeVideoHLSFormatListModel(self._config)
self.combobox_preferred_youtube_hls_format.set_model(self.preferred_youtube_hls_format_model)
cellrenderer = Gtk.CellRendererText()
cellrenderer.set_property('ellipsize', Pango.EllipsizeMode.END)
self.combobox_preferred_youtube_hls_format.pack_start(cellrenderer, True)
self.combobox_preferred_youtube_hls_format.add_attribute(cellrenderer, 'text', self.preferred_youtube_hls_format_model.C_CAPTION)
self.combobox_preferred_youtube_hls_format.set_active(self.preferred_youtube_hls_format_model.get_index())
@ -223,6 +225,7 @@ class gPodderPreferences(BuilderWidget):
self.preferred_vimeo_format_model = VimeoVideoFormatListModel(self._config)
self.combobox_preferred_vimeo_format.set_model(self.preferred_vimeo_format_model)
cellrenderer = Gtk.CellRendererText()
cellrenderer.set_property('ellipsize', Pango.EllipsizeMode.END)
self.combobox_preferred_vimeo_format.pack_start(cellrenderer, True)
self.combobox_preferred_vimeo_format.add_attribute(cellrenderer, 'text', self.preferred_vimeo_format_model.C_CAPTION)
self.combobox_preferred_vimeo_format.set_active(self.preferred_vimeo_format_model.get_index())