← Back to branch summary

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

« back to all changes in this revision

Viewing changes to gtk/rgrepositorywin.cc

  • 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/rgrepositorywin.cc
113
113
 
114
114
 
115
115
RGRepositoryEditor::RGRepositoryEditor(RGWindow *parent)
116
 
   : RGGladeWindow(parent, "repositories"), _dirty(false)
 
116
   : RGGtkBuilderWindow(parent, "repositories"), _dirty(false)
117
117
{
118
118
   //cout << "RGRepositoryEditor::RGRepositoryEditor(RGWindow *parent)"<<endl;
119
119
   assert(_win);
135
135
                                          G_TYPE_STRING,
136
136
                                          G_TYPE_POINTER, GDK_TYPE_COLOR);
137
137
 
138
 
   _sourcesListView = glade_xml_get_widget(_gladeXML, "treeview_repositories");
 
138
   _sourcesListView = GTK_WIDGET(gtk_builder_get_object(_builder, "treeview_repositories"));
139
139
   gtk_tree_view_set_model(GTK_TREE_VIEW(_sourcesListView),
140
140
                           GTK_TREE_MODEL(_sourcesListStore));
141
141
 
213
213
   g_signal_connect(G_OBJECT(select), "changed",
214
214
                    G_CALLBACK(SelectionChanged), this);
215
215
 
216
 
   //_cbEnabled = glade_xml_get_widget(_gladeXML, "checkbutton_enabled");
 
216
   //_cbEnabled = GTK_WIDGET(gtk_builder_get_object(_builder, "checkbutton_enabled"));
217
217
 
218
 
   _optType = glade_xml_get_widget(_gladeXML, "optionmenu_type");
 
218
   _optType = GTK_WIDGET(gtk_builder_get_object(_builder, "optionmenu_type"));
219
219
   _optTypeMenu = gtk_menu_new();
220
220
 
221
221
   GtkWidget *item;
262
262
#endif
263
263
   gtk_option_menu_set_menu(GTK_OPTION_MENU(_optType), _optTypeMenu);
264
264
 
265
 
   _optVendor = glade_xml_get_widget(_gladeXML, "optionmenu_vendor");
 
265
   _optVendor = GTK_WIDGET(gtk_builder_get_object(_builder,
 
266
                                                  "optionmenu_vendor"));
266
267
   _optVendorMenu = gtk_menu_new();
267
268
   item = gtk_menu_item_new_with_label(_("(no vendor)"));
268
269
   gtk_menu_append(GTK_MENU(_optVendorMenu), item);
273
274
#ifndef HAVE_RPM
274
275
   // debian can't use the vendors menu, so we hide it
275
276
   gtk_widget_hide(GTK_WIDGET(_optVendor));
276
 
   GtkWidget *vendors = glade_xml_get_widget(_gladeXML,"button_edit_vendors");
 
277
   GtkWidget *vendors = GTK_WIDGET(gtk_builder_get_object
 
278
                                   (_builder, "button_edit_vendors"));
277
279
   assert(vendors);
278
280
   gtk_widget_hide(GTK_WIDGET(vendors));
279
281
#endif
280
282
 
281
 
   _entryURI = glade_xml_get_widget(_gladeXML, "entry_uri");
 
283
   _entryURI = GTK_WIDGET(gtk_builder_get_object(_builder, "entry_uri"));
282
284
   assert(_entryURI);
283
 
   _entryDist = glade_xml_get_widget(_gladeXML, "entry_distribution");
 
285
   _entryDist = GTK_WIDGET(gtk_builder_get_object(_builder,
 
286
                                                  "entry_distribution"));
284
287
   assert(_entryDist);
285
 
   _entrySect = glade_xml_get_widget(_gladeXML, "entry_sections");
 
288
   _entrySect = GTK_WIDGET(gtk_builder_get_object(_builder, "entry_sections"));
286
289
   assert(_entrySect);
287
290
 
288
 
   glade_xml_signal_connect_data(_gladeXML,
289
 
                                 "on_button_ok_clicked",
290
 
                                 G_CALLBACK(DoOK), this);
291
 
 
292
 
   glade_xml_signal_connect_data(_gladeXML,
293
 
                                 "on_button_cancel_clicked",
294
 
                                 G_CALLBACK(DoCancel), this);
295
 
 
296
 
   glade_xml_signal_connect_data(_gladeXML,
297
 
                                 "on_button_edit_vendors_clicked",
298
 
                                 G_CALLBACK(VendorsWindow), this);
 
291
   g_signal_connect(GTK_WIDGET(gtk_builder_get_object(_builder, "button_ok")),
 
292
                    "clicked",
 
293
                    G_CALLBACK(DoOK), this);
 
294
 
 
295
   g_signal_connect(GTK_WIDGET(gtk_builder_get_object
 
296
                               (_builder, "button_remove")),
 
297
                    "clicked",
 
298
                    G_CALLBACK(DoCancel), this);
 
299
 
 
300
   g_signal_connect(GTK_WIDGET(gtk_builder_get_object
 
301
                               (_builder, "button_edit_vendors")),
 
302
                    "clicked",
 
303
                    G_CALLBACK(VendorsWindow), this);
299
304
 
300
305
   /*
301
 
      glade_xml_signal_connect_data(_gladeXML,
302
 
      "on_button_clear_clicked",
 
306
      g_signal_connect(GTK_WIDGET(gtk_builder_get_object
 
307
      (_builder, "button_clear")),
 
308
      "clicked",
303
309
      G_CALLBACK(DoClear),
304
310
      this);
305
311
    */
306
312
 
307
 
   glade_xml_signal_connect_data(_gladeXML,
308
 
                                 "on_button_add_clicked",
 
313
   g_signal_connect(GTK_WIDGET(gtk_builder_get_object
 
314
                               (_builder, "button_add")),
 
315
                                 "clicked",
309
316
                                 G_CALLBACK(DoAdd), this);
310
317
 
311
 
   glade_xml_signal_connect_data(_gladeXML,
312
 
                                 "on_button_remove_clicked",
313
 
                                 G_CALLBACK(DoRemove), this);
314
 
 
315
 
   glade_xml_signal_connect_data(_gladeXML,
316
 
                                 "on_button_updown_clicked",
317
 
                                 G_CALLBACK(DoUpDown), this);
318
 
   
319
 
   GtkWidget *button = glade_xml_get_widget(_gladeXML, "button_up");
320
 
   g_object_set_data(G_OBJECT(button), "up", GINT_TO_POINTER(1));
321
 
   g_object_set_data(G_OBJECT(button), "down", GINT_TO_POINTER(0));
322
 
 
323
 
   _upBut = glade_xml_get_widget(_gladeXML, "button_up");
 
318
   _upBut = GTK_WIDGET(gtk_builder_get_object(_builder, "button_up"));
324
319
   assert(_upBut);
 
320
   g_object_set_data(G_OBJECT(_upBut), "up", GINT_TO_POINTER(1));
 
321
   g_signal_connect(_upBut,
 
322
                    "clicked",
 
323
                    G_CALLBACK(DoUpDown), this);
325
324
   gtk_widget_set_sensitive(_upBut, FALSE);
326
325
 
327
 
   _downBut = glade_xml_get_widget(_gladeXML, "button_down");
 
326
   _downBut = GTK_WIDGET(gtk_builder_get_object(_builder, "button_down"));
328
327
   assert(_downBut);
 
328
   g_object_set_data(G_OBJECT(_downBut), "down", GINT_TO_POINTER(0));
 
329
   g_signal_connect(_downBut,
 
330
                    "clicked",
 
331
                    G_CALLBACK(DoUpDown), this);
329
332
   gtk_widget_set_sensitive(_downBut, FALSE);
330
333
   
331
 
   _deleteBut = glade_xml_get_widget(_gladeXML, "button_add");
 
334
   _deleteBut = GTK_WIDGET(gtk_builder_get_object(_builder, "button_remove"));
332
335
   assert(_deleteBut);
 
336
   g_signal_connect(_deleteBut,
 
337
                    "clicked",
 
338
                    G_CALLBACK(DoRemove), this);
333
339
   gtk_widget_set_sensitive(_deleteBut, FALSE);
334
340
 
335
 
   _editTable = glade_xml_get_widget(_gladeXML, "table_edit");
 
341
   _editTable = GTK_WIDGET(gtk_builder_get_object(_builder, "table_edit"));
336
342
   assert(_editTable);
337
343
   gtk_widget_set_sensitive(_editTable, FALSE);
338
344