← Back to branch summary

~ubuntu-branches/ubuntu/wily/me-tv/wily

« back to all changes in this revision

Viewing changes to src/scan_dialog.h

  • Committer: Bazaar Package Importer
  • Author(s): Michael Lamothe
  • Date: 2010-06-20 21:51:41 UTC
  • mfrom: (1.1.13 upstream) (3.1.12 sid)
  • Revision ID: james.westby@ubuntu.com-20100620215141-jfzya7s0a5g8xxl4
Tags: 1.2.6-1
http://bugs.debian.org/575122
http://bugs.debian.org/582613
* New upstream release
* Fix "needs to depend on libxine1-x" updated control file to
  depend on ${xine-x:Depends} (Closes: #575122)
* Fix "EPG texts with ampersands not shown" encoded XML strings
  in GTK controls that use markup (Closes: #582613)
* Updated the description of the application to remove reference
  to MythTV

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/scan_dialog.h
71
71
                        add(column_name);
72
72
                        add(column_frontend_parameters);
73
73
                        add(column_polarisation); // for DVB-S only
 
74
                        add(column_signal_strength); // for DVB-S only
74
75
                }
75
76
 
76
77
                Gtk::TreeModelColumn<guint>                                                             column_id;
77
78
                Gtk::TreeModelColumn<Glib::ustring>                                             column_name;
78
79
                Gtk::TreeModelColumn<struct dvb_frontend_parameters>    column_frontend_parameters;
79
80
                Gtk::TreeModelColumn<guint>                                                             column_polarisation;
 
81
                Gtk::TreeModelColumn<Glib::ustring>                                                     column_signal_strength;
80
82
        };
81
83
 
82
84
        ModelColumns columns;
90
92
        void on_button_scan_wizard_cancel_clicked();
91
93
        void on_button_scan_wizard_add_clicked();
92
94
        void on_button_scan_stop_clicked();
93
 
        void on_signal_service(const struct dvb_frontend_parameters& frontend_parameters, guint id, const Glib::ustring& name, const guint polarisation);
 
95
        void on_signal_service(const struct dvb_frontend_parameters& frontend_parameters,
 
96
                guint id, const Glib::ustring& name, const guint polarisation, guint signal_strength);
94
97
        void on_signal_progress(guint step, gsize total);
95
98
        void on_signal_complete();
96
99
        void on_file_chooser_button_scan_file_set();
99
102
        void on_hide(); 
100
103
        void stop_scan();
101
104
        void update_channel_count();
102
 
        void add_channel_row(const Channel& channel);
 
105
        void add_channel_row(const Channel& channel, guint signal_strength);
103
106
        guint convert_string_to_value(const StringTable* table, const gchar* text);
104
107
 
105
108
        void process_terrestrial_line(const Glib::ustring& line);