← Back to branch summary

~leighman/ubuntu/raring/workrave/fix-desktop-file-2

« back to all changes in this revision

Viewing changes to frontend/gtkmm/src/PreferencesDialog.cc

  • Committer: Package Import Robot
  • Author(s): Michael Terry
  • Date: 2013-01-24 11:04:41 UTC
  • mfrom: (1.2.10)
  • Revision ID: package-import@ubuntu.com-20130124110441-rbrq0e0y6p71asoc
Tags: 1.10-0ubuntu1
https://launchpad.net/bugs/796824
* New upstream release
* debian/control, debian/rules, debian/workrave.install:
  - Enable support for an indicator in Unity (LP: #796824)
* debian/patches/fix-format-security.patch:
  - Fix FTBFS due to -Werror=format-security

Show diffs side-by-side

added added

removed removed

Lines of Context:
frontend/gtkmm/src/PreferencesDialog.cc
1
1
// PreferencesDialog.cc --- Preferences dialog
2
2
//
3
 
// Copyright (C) 2002, 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Raymond Penners <raymond@dotsphinx.com>
 
3
// Copyright (C) 2002, 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Raymond Penners <raymond@dotsphinx.com>
4
4
// All rights reserved.
5
5
//
6
6
// This program is free software: you can redistribute it and/or modify
188
188
  // Options
189
189
  HigCategoryPanel *panel = Gtk::manage(new HigCategoryPanel(_("Options")));
190
190
 
191
 
  panel->add(_("Block mode:"), *block_button);
 
191
  panel->add_label(_("Block mode:"), *block_button);
192
192
 
193
193
#if defined(HAVE_LANGUAGE_SELECTION)
194
194
  string current_locale = GUIConfig::get_locale();
277
277
 
278
278
  languages_combo.set_active(selected);
279
279
 
280
 
  panel->add(_("Language:"), languages_combo);
 
280
  panel->add_label(_("Language:"), languages_combo);
281
281
#endif
282
282
 
283
283
#if defined(PLATFORM_OS_WIN32)
298
298
  trayicon_cb->add(*trayicon_lab);
299
299
  connector->connect(GUIConfig::CFG_KEY_TRAYICON_ENABLED, dc::wrap(trayicon_cb));
300
300
 
301
 
  panel->add(*trayicon_cb);
 
301
  panel->add_widget(*trayicon_cb);
302
302
  
303
303
  panel->set_border_width(12);
304
304
  return panel;
348
348
      sound_volume_scale->set_increments(1.0, 5.0);
349
349
      connector->connect(SoundPlayer::CFG_KEY_SOUND_VOLUME, dc::wrap(sound_volume_scale->get_adjustment()));
350
350
 
351
 
      hig->add(_("Volume:"), *sound_volume_scale, true, true);
 
351
      hig->add_label(_("Volume:"), *sound_volume_scale, true, true);
352
352
    }
353
353
 
354
 
  hig->add(_("Sound:"), *sound_button);
 
354
  hig->add_label(_("Sound:"), *sound_button);
355
355
 
356
356
  if (snd->capability(SOUND_CAP_MUTE))
357
357
    {
361
361
 
362
362
      connector->connect(SoundPlayer::CFG_KEY_SOUND_MUTE, dc::wrap(mute_cb));
363
363
 
364
 
      hig->add(*mute_cb, true, true);
 
364
      hig->add_widget(*mute_cb, true, true);
365
365
    }
366
366
 
367
367
  if (snd->capability(SOUND_CAP_EDIT))
375
375
      update_theme_selection();
376
376
 
377
377
      sound_theme_button->signal_changed().connect(sigc::mem_fun(*this, &PreferencesDialog::on_sound_theme_changed));
378
 
      hig->add(_("Sound Theme:"), *sound_theme_button);
 
378
      hig->add_label(_("Sound Theme:"), *sound_theme_button);
379
379
 
380
380
      sound_store = Gtk::ListStore::create(sound_model);
381
381
      sound_treeview.set_model(sound_store);
412
412
      sound_scroll->set_size_request(-1, 200);
413
413
      sound_treeview.set_size_request(-1, 200);
414
414
 
415
 
      hig->add(*sound_scroll, true, true);
 
415
      hig->add_widget(*sound_scroll, true, true);
416
416
 
417
417
      Gtk::HBox *hbox = Gtk::manage(new Gtk::HBox(false, 6));
418
418
 
443
443
      fsbutton->add_filter(*filefilter);
444
444
#endif
445
445
 
446
 
      hig->add(*hbox);
 
446
      hig->add_widget(*hbox);
447
447
 
448
448
      Gtk::HBox *selector_hbox = Gtk::manage(new Gtk::HBox(false, 0));
449
449
      Gtk::Button *selector_playbutton = Gtk::manage(new Gtk::Button(_("Play")));
511
511
  Gtk::Widget *monitoring_page = create_monitoring_page();
512
512
  
513
513
#ifdef HAVE_GTK3
514
 
  tnotebook->append_page(*monitoriing_page , *box);
 
514
  tnotebook->append_page(*monitoring_page , *box);
515
515
#else
516
516
  tnotebook->pages().push_back(Gtk::Notebook_Helpers::TabElem(*monitoring_page, *box));
517
517
#endif