~walkerlee/totem/pre-interview

« back to all changes in this revision

Viewing changes to src/plugins/opensubtitles/opensubtitles.ui

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-05-26 00:07:51 UTC
  • mfrom: (1.6.1) (24.1.4 experimental)
  • Revision ID: package-import@ubuntu.com-20130526000751-kv8ap3x1di4qq8j2
Tags: 3.8.2-0ubuntu1
* Sync with Debian. Remaining changes: 
* debian/control.in:
  - Drop build-depends on libepc-ui-dev and libgrilo-0.2-dev (in universe)
  - Drop libxtst-dev build-depends so that the (redundant) fake key presses
    for inhibiting the screensaver are disabled (LP: #1007438)
  - Build-depend on libzeitgeist-dev
  - Suggest rather than recommend gstreamer components in universe
  - Add totem-plugins-extra
  - Add XB-Npp-Description and XB-Npp-Filename header to the 
    totem-mozilla package to improve ubufox/ubuntu plugin db integration 
  - Refer to Firefox in totem-mozilla description instead of Iceweasel
  - Don't have totem-mozilla recommend any particular browser
  - Drop obsolete python library dependencies since iplayer is no longer
    included
* debian/totem-common.install, debian/source_totem.py:
  - Install Ubuntu apport debugging hook
* debian/totem-plugins-extra.install:
  - Universe plugins split out of totem-plugins (currently only gromit)
* debian/totem-plugins.install:    
  - Skip the plugins split to -extra and add the zeitgeist plugin
* debian/rules:
  - Build with --fail-missing, to ensure we install everything. 
    + Ignore libtotem.{,l}a since we delibrately don't install these.
  - Re-enable hardening, make sure both PIE and BINDNOW are used
    by setting hardening=+all. (LP: #1039604)
* debian/patches/91_quicklist_entries.patch:
  - Add static quicklist
* debian/patches/92_gst-plugins-good.patch:
  - Build without unnecessary gstreamer1.0-bad dependency
* debian/patches/93_grilo_optional.patch:
  - Allow building without grilo while grilo MIR is still pending
* debian/patches/correct_desktop_mimetypes.patch:
  - Don't list the mimetypes after the unity lists
* debian/patches/revert_shell_menu.patch: 
  - revert the use of a shell menu until indicator-appmenu can handle
    the mixed shell/traditional menus itself
* New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
<?xml version="1.0"?>
2
2
<interface>
3
 
  <requires lib="gtk+" version="2.14"/>
 
3
  <requires lib="gtk+" version="3.0"/>
4
4
  <!-- interface-naming-policy toplevel-contextual -->
5
5
  <object class="GtkListStore" id="subtitle_model">
6
6
    <columns>
30
30
    <property name="default_height">400</property>
31
31
    <property name="type_hint">dialog</property>
32
32
    <child>
33
 
      <object class="GtkVBox" id="vbox1">
 
33
      <object class="GtkBox" id="vbox1">
34
34
        <property name="orientation">vertical</property>
35
35
        <property name="spacing">6</property>
36
36
        <child>
37
 
          <object class="GtkHBox" id="hbox2">
 
37
          <object class="GtkBox" id="hbox2">
38
38
            <property name="spacing">6</property>
39
39
            <child>
40
40
              <object class="GtkLabel" id="label3">
45
45
              </object>
46
46
              <packing>
47
47
                <property name="expand">False</property>
 
48
                <property name="fill">True</property>
48
49
                <property name="position">0</property>
49
50
              </packing>
50
51
            </child>
54
55
              </object>
55
56
              <packing>
56
57
                <property name="position">1</property>
 
58
                <property name="expand">False</property>
 
59
                <property name="fill">True</property>
57
60
              </packing>
58
61
            </child>
59
62
            <child>
72
75
            </child>
73
76
          </object>
74
77
          <packing>
 
78
            <property name="fill">True</property>
75
79
            <property name="expand">False</property>
76
80
            <property name="position">0</property>
77
81
          </packing>
92
96
          </object>
93
97
          <packing>
94
98
            <property name="position">1</property>
 
99
            <property name="fill">True</property>
 
100
            <property name="expand">True</property>
95
101
          </packing>
96
102
        </child>
97
103
        <child>
108
114
          <object class="GtkAlignment" id="alignment2">
109
115
            <property name="top_padding">6</property>
110
116
            <child>
111
 
              <object class="GtkHButtonBox" id="hbbox1">
 
117
              <object class="GtkButtonBox" id="hbbox1">
112
118
                <property name="visible">True</property>
113
119
                <property name="spacing">6</property>
114
120
                <property name="layout_style">end</property>