← Back to branch summary

~walkerlee/totem/pre-interview

« back to all changes in this revision

Viewing changes to src/plugins/grilo/grilo.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
https://launchpad.net/bugs/1007438
https://launchpad.net/bugs/1039604
* 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:
src/plugins/grilo/grilo.ui
19
19
  </object>
20
20
  <object class="GtkTreeStore" id="gw_browse_store_results">
21
21
    <columns>
 
22
      <!-- column-name id -->
 
23
      <column type="gchararray"/>
 
24
      <!-- column-name uri -->
 
25
      <column type="gchararray"/>
 
26
      <!-- column-name primary_text -->
 
27
      <column type="gchararray"/>
 
28
      <!-- column-name secondary_text -->
 
29
      <column type="gchararray"/>
 
30
      <!-- column-name icon -->
 
31
      <column type="GdkPixbuf"/>
 
32
      <!-- column-name mtime -->
 
33
      <column type="gchararray"/>
 
34
      <!-- column-name selected -->
 
35
      <column type="gboolean"/>
 
36
 
22
37
      <!-- column-name source -->
23
38
      <column type="GObject"/>
24
39
      <!-- column-name content -->
25
40
      <column type="GObject"/>
26
 
      <!-- column-name thumbnail -->
27
 
      <column type="GdkPixbuf"/>
28
41
      <!-- column-name is_prethumbnail -->
29
42
      <column type="gboolean"/>
30
 
      <!-- column-name description -->
31
 
      <column type="gchararray"/>
32
 
      <!-- column-name duration -->
33
 
      <column type="gchararray"/>
34
43
      <!-- column-name page -->
35
44
      <column type="gint"/>
36
45
      <!-- column-name remaining -->
57
66
            <child>
58
67
              <object class="GtkCellRendererPixbuf" id="gw_browse_col_render_pix"/>
59
68
              <attributes>
60
 
                <attribute name="pixbuf">2</attribute>
 
69
                <attribute name="pixbuf">4</attribute>
61
70
              </attributes>
62
71
            </child>
63
72
            <child>
64
73
              <object class="GtkCellRendererText" id="gw_browse_col_render_desc"/>
65
74
              <attributes>
66
 
                <attribute name="markup">4</attribute>
 
75
                <attribute name="text">2</attribute>
67
76
              </attributes>
68
77
            </child>
69
78
            <child>
70
79
              <object class="GtkCellRendererText" id="gw_browse_col_render_dur"/>
71
80
              <attributes>
72
 
                <attribute name="text">5</attribute>
 
81
                <attribute name="text">3</attribute>
73
82
              </attributes>
74
83
            </child>
75
84
          </object>
100
109
          </packing>
101
110
        </child>
102
111
        <child>
103
 
          <object class="GtkComboBox" id="gw_search_select_source">
 
112
          <object class="TotemSearchEntry" id="gw_search_text">
104
113
            <property name="visible">True</property>
105
 
            <property name="can_focus">False</property>
106
 
            <property name="model">gw_search_store_sources</property>
107
 
            <child>
108
 
              <object class="GtkCellRendererText" id="gw_search_source_col_name"/>
109
 
              <attributes>
110
 
                <attribute name="text">1</attribute>
111
 
              </attributes>
112
 
            </child>
 
114
            <property name="can_focus">True</property>
113
115
          </object>
114
116
          <packing>
115
117
            <property name="expand">True</property>
125
127
      </packing>
126
128
    </child>
127
129
    <child>
128
 
      <object class="GtkEntry" id="gw_search_text">
129
 
        <property name="visible">True</property>
130
 
        <property name="can_focus">True</property>
131
 
        <property name="invisible_char">●</property>
132
 
        <property name="activates_default">True</property>
133
 
        <property name="shadow_type">etched-out</property>
134
 
        <property name="caps_lock_warning">False</property>
135
 
      </object>
136
 
      <packing>
137
 
        <property name="expand">False</property>
138
 
        <property name="fill">True</property>
139
 
        <property name="position">1</property>
140
 
      </packing>
141
 
    </child>
142
 
    <child>
143
130
      <object class="GtkScrolledWindow" id="gw_search_results_window">
144
131
        <property name="visible">True</property>
145
132
        <property name="can_focus">True</property>
146
133
        <property name="shadow_type">in</property>
147
134
        <child>
148
 
          <object class="GtkIconView" id="gw_search_results_view">
 
135
          <object class="GdMainIconView" id="gw_search_results_view">
149
136
            <property name="visible">True</property>
150
137
            <property name="can_focus">True</property>
151
138
            <property name="model">gw_search_store_results</property>
152
 
            <child>
153
 
              <object class="GtkCellRendererPixbuf" id="gw_search_result_thumbnail"/>
154
 
              <attributes>
155
 
                <attribute name="pixbuf">2</attribute>
156
 
              </attributes>
157
 
            </child>
158
 
            <child>
159
 
              <object class="GtkCellRendererText" id="gw_search_result_description">
160
 
                <property name="ellipsize">end</property>
161
 
                <property name="scale">0.75</property>
162
 
              </object>
163
 
              <attributes>
164
 
                <attribute name="markup">4</attribute>
165
 
              </attributes>
166
 
            </child>
 
139
            <style>
 
140
              <class name="content-view"/>
 
141
            </style>
167
142
          </object>
168
143
        </child>
169
144
      </object>
176
151
  </object>
177
152
  <object class="GtkListStore" id="gw_search_store_results">
178
153
    <columns>
 
154
      <!-- column-name id -->
 
155
      <column type="gchararray"/>
 
156
      <!-- column-name uri -->
 
157
      <column type="gchararray"/>
 
158
      <!-- column-name primary_text -->
 
159
      <column type="gchararray"/>
 
160
      <!-- column-name secondary_text -->
 
161
      <column type="gchararray"/>
 
162
      <!-- column-name icon -->
 
163
      <column type="GdkPixbuf"/>
 
164
      <!-- column-name mtime -->
 
165
      <column type="gchararray"/>
 
166
      <!-- column-name selected -->
 
167
      <column type="gboolean"/>
 
168
 
179
169
      <!-- column-name source -->
180
170
      <column type="GObject"/>
181
171
      <!-- column-name content -->
182
172
      <column type="GObject"/>
183
 
      <!-- column-name thumbnail -->
184
 
      <column type="GdkPixbuf"/>
185
173
      <!-- column-name is_prethumbnail -->
186
174
      <column type="gboolean"/>
187
 
      <!-- column-name description -->
188
 
      <column type="gchararray"/>
189
175
    </columns>
190
176
  </object>
191
177
  <object class="GtkListStore" id="gw_search_store_sources">