← Back to branch summary

~ubuntu-branches/ubuntu/raring/synaptic/raring-proposed

« back to all changes in this revision

Viewing changes to gtk/glade/dialog_conffile.glade

  • Committer: Bazaar Package Importer
  • Author(s): Michael Vogt, Michael Vogt, Chris McGinlay, Luca Falavigna
  • Date: 2011-02-10 09:56:20 UTC
  • mfrom: (3.1.101 natty)
  • Revision ID: james.westby@ubuntu.com-20110210095620-ffqbw32poq9deuss
Tags: 0.75
https://launchpad.net/bugs/637157
https://launchpad.net/bugs/628818
https://launchpad.net/bugs/706271
https://launchpad.net/bugs/702181
https://launchpad.net/bugs/688897
https://launchpad.net/bugs/706271
[ Michael Vogt ]
* merged lp:~mathieu-tl/synaptic/gtk3 this brings gtkbuilder
  (instead of glade) and the preparation for updating for gtk3
  Many thanks to Mathieu Trudel-Lapierre
* show changelog button alongside the screenshot button
* make sure /etc/apt/apt.conf.d/99synaptic is mode 644
  (LP: #637157)
* common/rpackagecache.cc:
  - read pindir as well as the pinfile (LP: #628818)
* when reading markings, ensure the views are refreshed
  so that broken dependencies are displayed
* show /ask about the pkg state changes when reading selections
  from a file, simpify askStateChanges code
* merged
  lp:~chris-ascentsoftware/ubuntu/natty/synaptic/synaptic-fix-706271
  many thanks! (LP: #706271)
* merged lp:~kelemeng/synaptic/bug702181, many thanks! 
  (LP: #702181)
* merged lp:~kelemeng/synaptic/bug688897, many thanks! 
  (LP: #688897)

[ Chris McGinlay ]
* gtk/gtkbuilder/window_preferences.ui, po/*
 - Change capitalisation of internet to Internet (LP: #706271)

[ Luca Falavigna ]
* common/rpackageview.cc:
  - Do not display base packages in manual view.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gtk/glade/dialog_conffile.glade
1
 
<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
2
 
<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
3
 
 
4
 
<glade-interface>
5
 
 
6
 
<widget class="GtkDialog" id="dialog_conffile">
7
 
  <property name="border_width">5</property>
8
 
  <property name="visible">True</property>
9
 
  <property name="title" translatable="yes"></property>
10
 
  <property name="type">GTK_WINDOW_TOPLEVEL</property>
11
 
  <property name="window_position">GTK_WIN_POS_NONE</property>
12
 
  <property name="modal">True</property>
13
 
  <property name="resizable">True</property>
14
 
  <property name="destroy_with_parent">False</property>
15
 
  <property name="icon">synaptic_mini.xpm</property>
16
 
  <property name="decorated">True</property>
17
 
  <property name="skip_taskbar_hint">False</property>
18
 
  <property name="skip_pager_hint">False</property>
19
 
  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
20
 
  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
21
 
  <property name="focus_on_map">True</property>
22
 
  <property name="urgency_hint">True</property>
23
 
  <property name="has_separator">False</property>
24
 
 
25
 
  <child internal-child="vbox">
26
 
    <widget class="GtkVBox" id="dialog-vbox1">
27
 
      <property name="visible">True</property>
28
 
      <property name="homogeneous">False</property>
29
 
      <property name="spacing">12</property>
30
 
 
31
 
      <child internal-child="action_area">
32
 
        <widget class="GtkHButtonBox" id="dialog-action_area1">
33
 
          <property name="visible">True</property>
34
 
          <property name="layout_style">GTK_BUTTONBOX_END</property>
35
 
 
36
 
          <child>
37
 
            <widget class="GtkButton" id="button2">
38
 
              <property name="visible">True</property>
39
 
              <property name="can_default">True</property>
40
 
              <property name="has_default">True</property>
41
 
              <property name="can_focus">True</property>
42
 
              <property name="has_focus">True</property>
43
 
              <property name="relief">GTK_RELIEF_NORMAL</property>
44
 
              <property name="focus_on_click">True</property>
45
 
              <property name="response_id">-9</property>
46
 
 
47
 
              <child>
48
 
                <widget class="GtkAlignment" id="alignment3">
49
 
                  <property name="visible">True</property>
50
 
                  <property name="xalign">0.5</property>
51
 
                  <property name="yalign">0.5</property>
52
 
                  <property name="xscale">0</property>
53
 
                  <property name="yscale">0</property>
54
 
                  <property name="top_padding">0</property>
55
 
                  <property name="bottom_padding">0</property>
56
 
                  <property name="left_padding">0</property>
57
 
                  <property name="right_padding">0</property>
58
 
 
59
 
                  <child>
60
 
                    <widget class="GtkHBox" id="hbox4">
61
 
                      <property name="visible">True</property>
62
 
                      <property name="homogeneous">False</property>
63
 
                      <property name="spacing">2</property>
64
 
 
65
 
                      <child>
66
 
                        <widget class="GtkImage" id="image3">
67
 
                          <property name="visible">True</property>
68
 
                          <property name="stock">gtk-cancel</property>
69
 
                          <property name="icon_size">4</property>
70
 
                          <property name="xalign">0.5</property>
71
 
                          <property name="yalign">0.5</property>
72
 
                          <property name="xpad">0</property>
73
 
                          <property name="ypad">0</property>
74
 
                        </widget>
75
 
                        <packing>
76
 
                          <property name="padding">0</property>
77
 
                          <property name="expand">False</property>
78
 
                          <property name="fill">False</property>
79
 
                        </packing>
80
 
                      </child>
81
 
 
82
 
                      <child>
83
 
                        <widget class="GtkLabel" id="label4">
84
 
                          <property name="visible">True</property>
85
 
                          <property name="label" translatable="yes">_Keep</property>
86
 
                          <property name="use_underline">True</property>
87
 
                          <property name="use_markup">False</property>
88
 
                          <property name="justify">GTK_JUSTIFY_LEFT</property>
89
 
                          <property name="wrap">False</property>
90
 
                          <property name="selectable">False</property>
91
 
                          <property name="xalign">0.5</property>
92
 
                          <property name="yalign">0.5</property>
93
 
                          <property name="xpad">0</property>
94
 
                          <property name="ypad">0</property>
95
 
                          <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
96
 
                          <property name="width_chars">-1</property>
97
 
                          <property name="single_line_mode">False</property>
98
 
                          <property name="angle">0</property>
99
 
                        </widget>
100
 
                        <packing>
101
 
                          <property name="padding">0</property>
102
 
                          <property name="expand">False</property>
103
 
                          <property name="fill">False</property>
104
 
                        </packing>
105
 
                      </child>
106
 
                    </widget>
107
 
                  </child>
108
 
                </widget>
109
 
              </child>
110
 
            </widget>
111
 
          </child>
112
 
 
113
 
          <child>
114
 
            <widget class="GtkButton" id="button3">
115
 
              <property name="visible">True</property>
116
 
              <property name="can_default">True</property>
117
 
              <property name="can_focus">True</property>
118
 
              <property name="relief">GTK_RELIEF_NORMAL</property>
119
 
              <property name="focus_on_click">True</property>
120
 
              <property name="response_id">-8</property>
121
 
 
122
 
              <child>
123
 
                <widget class="GtkAlignment" id="alignment2">
124
 
                  <property name="visible">True</property>
125
 
                  <property name="xalign">0.5</property>
126
 
                  <property name="yalign">0.5</property>
127
 
                  <property name="xscale">0</property>
128
 
                  <property name="yscale">0</property>
129
 
                  <property name="top_padding">0</property>
130
 
                  <property name="bottom_padding">0</property>
131
 
                  <property name="left_padding">0</property>
132
 
                  <property name="right_padding">0</property>
133
 
 
134
 
                  <child>
135
 
                    <widget class="GtkHBox" id="hbox3">
136
 
                      <property name="visible">True</property>
137
 
                      <property name="homogeneous">False</property>
138
 
                      <property name="spacing">2</property>
139
 
 
140
 
                      <child>
141
 
                        <widget class="GtkImage" id="image2">
142
 
                          <property name="visible">True</property>
143
 
                          <property name="stock">gtk-ok</property>
144
 
                          <property name="icon_size">4</property>
145
 
                          <property name="xalign">0.5</property>
146
 
                          <property name="yalign">0.5</property>
147
 
                          <property name="xpad">0</property>
148
 
                          <property name="ypad">0</property>
149
 
                        </widget>
150
 
                        <packing>
151
 
                          <property name="padding">0</property>
152
 
                          <property name="expand">False</property>
153
 
                          <property name="fill">False</property>
154
 
                        </packing>
155
 
                      </child>
156
 
 
157
 
                      <child>
158
 
                        <widget class="GtkLabel" id="label3">
159
 
                          <property name="visible">True</property>
160
 
                          <property name="label" translatable="yes">_Replace</property>
161
 
                          <property name="use_underline">True</property>
162
 
                          <property name="use_markup">False</property>
163
 
                          <property name="justify">GTK_JUSTIFY_LEFT</property>
164
 
                          <property name="wrap">False</property>
165
 
                          <property name="selectable">False</property>
166
 
                          <property name="xalign">0.5</property>
167
 
                          <property name="yalign">0.5</property>
168
 
                          <property name="xpad">0</property>
169
 
                          <property name="ypad">0</property>
170
 
                          <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
171
 
                          <property name="width_chars">-1</property>
172
 
                          <property name="single_line_mode">False</property>
173
 
                          <property name="angle">0</property>
174
 
                        </widget>
175
 
                        <packing>
176
 
                          <property name="padding">0</property>
177
 
                          <property name="expand">False</property>
178
 
                          <property name="fill">False</property>
179
 
                        </packing>
180
 
                      </child>
181
 
                    </widget>
182
 
                  </child>
183
 
                </widget>
184
 
              </child>
185
 
            </widget>
186
 
          </child>
187
 
        </widget>
188
 
        <packing>
189
 
          <property name="padding">0</property>
190
 
          <property name="expand">False</property>
191
 
          <property name="fill">True</property>
192
 
          <property name="pack_type">GTK_PACK_END</property>
193
 
        </packing>
194
 
      </child>
195
 
 
196
 
      <child>
197
 
        <widget class="GtkHBox" id="hbox1">
198
 
          <property name="border_width">6</property>
199
 
          <property name="visible">True</property>
200
 
          <property name="homogeneous">False</property>
201
 
          <property name="spacing">12</property>
202
 
 
203
 
          <child>
204
 
            <widget class="GtkImage" id="image">
205
 
              <property name="visible">True</property>
206
 
              <property name="stock">gtk-dialog-question</property>
207
 
              <property name="icon_size">6</property>
208
 
              <property name="xalign">0</property>
209
 
              <property name="yalign">0</property>
210
 
              <property name="xpad">0</property>
211
 
              <property name="ypad">0</property>
212
 
            </widget>
213
 
            <packing>
214
 
              <property name="padding">0</property>
215
 
              <property name="expand">False</property>
216
 
              <property name="fill">False</property>
217
 
            </packing>
218
 
          </child>
219
 
 
220
 
          <child>
221
 
            <widget class="GtkVBox" id="vbox_messages">
222
 
              <property name="visible">True</property>
223
 
              <property name="homogeneous">False</property>
224
 
              <property name="spacing">12</property>
225
 
 
226
 
              <child>
227
 
                <widget class="GtkLabel" id="label_message">
228
 
                  <property name="visible">True</property>
229
 
                  <property name="label" translatable="yes"></property>
230
 
                  <property name="use_underline">False</property>
231
 
                  <property name="use_markup">True</property>
232
 
                  <property name="justify">GTK_JUSTIFY_LEFT</property>
233
 
                  <property name="wrap">True</property>
234
 
                  <property name="selectable">False</property>
235
 
                  <property name="xalign">0</property>
236
 
                  <property name="yalign">0.5</property>
237
 
                  <property name="xpad">0</property>
238
 
                  <property name="ypad">0</property>
239
 
                  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
240
 
                  <property name="width_chars">-1</property>
241
 
                  <property name="single_line_mode">False</property>
242
 
                  <property name="angle">0</property>
243
 
                </widget>
244
 
                <packing>
245
 
                  <property name="padding">0</property>
246
 
                  <property name="expand">False</property>
247
 
                  <property name="fill">False</property>
248
 
                </packing>
249
 
              </child>
250
 
            </widget>
251
 
            <packing>
252
 
              <property name="padding">0</property>
253
 
              <property name="expand">True</property>
254
 
              <property name="fill">True</property>
255
 
            </packing>
256
 
          </child>
257
 
        </widget>
258
 
        <packing>
259
 
          <property name="padding">0</property>
260
 
          <property name="expand">False</property>
261
 
          <property name="fill">True</property>
262
 
        </packing>
263
 
      </child>
264
 
 
265
 
      <child>
266
 
        <widget class="GtkExpander" id="expander1">
267
 
          <property name="visible">True</property>
268
 
          <property name="can_focus">True</property>
269
 
          <property name="expanded">False</property>
270
 
          <property name="spacing">0</property>
271
 
 
272
 
          <child>
273
 
            <widget class="GtkVBox" id="vbox_diff">
274
 
              <property name="visible">True</property>
275
 
              <property name="homogeneous">False</property>
276
 
              <property name="spacing">0</property>
277
 
 
278
 
              <child>
279
 
                <widget class="GtkScrolledWindow" id="scrolledwindow1">
280
 
                  <property name="visible">True</property>
281
 
                  <property name="can_focus">True</property>
282
 
                  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
283
 
                  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
284
 
                  <property name="shadow_type">GTK_SHADOW_IN</property>
285
 
                  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
286
 
 
287
 
                  <child>
288
 
                    <widget class="GtkTextView" id="textview_diff">
289
 
                      <property name="width_request">600</property>
290
 
                      <property name="height_request">400</property>
291
 
                      <property name="visible">True</property>
292
 
                      <property name="can_focus">True</property>
293
 
                      <property name="editable">False</property>
294
 
                      <property name="overwrite">False</property>
295
 
                      <property name="accepts_tab">True</property>
296
 
                      <property name="justification">GTK_JUSTIFY_LEFT</property>
297
 
                      <property name="wrap_mode">GTK_WRAP_NONE</property>
298
 
                      <property name="cursor_visible">False</property>
299
 
                      <property name="pixels_above_lines">0</property>
300
 
                      <property name="pixels_below_lines">0</property>
301
 
                      <property name="pixels_inside_wrap">0</property>
302
 
                      <property name="left_margin">0</property>
303
 
                      <property name="right_margin">0</property>
304
 
                      <property name="indent">0</property>
305
 
                      <property name="text" translatable="yes"></property>
306
 
                    </widget>
307
 
                  </child>
308
 
                </widget>
309
 
                <packing>
310
 
                  <property name="padding">0</property>
311
 
                  <property name="expand">True</property>
312
 
                  <property name="fill">True</property>
313
 
                </packing>
314
 
              </child>
315
 
            </widget>
316
 
          </child>
317
 
 
318
 
          <child>
319
 
            <widget class="GtkLabel" id="label1">
320
 
              <property name="visible">True</property>
321
 
              <property name="label" translatable="yes">Difference between the files</property>
322
 
              <property name="use_underline">False</property>
323
 
              <property name="use_markup">False</property>
324
 
              <property name="justify">GTK_JUSTIFY_LEFT</property>
325
 
              <property name="wrap">False</property>
326
 
              <property name="selectable">False</property>
327
 
              <property name="xalign">0.5</property>
328
 
              <property name="yalign">0.5</property>
329
 
              <property name="xpad">0</property>
330
 
              <property name="ypad">0</property>
331
 
              <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
332
 
              <property name="width_chars">-1</property>
333
 
              <property name="single_line_mode">False</property>
334
 
              <property name="angle">0</property>
335
 
            </widget>
336
 
            <packing>
337
 
              <property name="type">label_item</property>
338
 
            </packing>
339
 
          </child>
340
 
        </widget>
341
 
        <packing>
342
 
          <property name="padding">0</property>
343
 
          <property name="expand">True</property>
344
 
          <property name="fill">True</property>
345
 
        </packing>
346
 
      </child>
347
 
    </widget>
348
 
  </child>
349
 
</widget>
350
 
 
351
 
</glade-interface>