X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Ftoolbars%2Fmainbar.cpp;h=05952e0f94d87c897dd461b2e034dc62b8bbda12;hp=e77f18bb4e7ec861f32c55ccc38377080d9e5724;hb=efdec55aec1a137460fa362a381ed1904182bfed;hpb=e0ba4f6fb263b4cc1dae96df2a0ff1e1ef8984ce diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp index e77f18b..05952e0 100644 --- a/pv/toolbars/mainbar.cpp +++ b/pv/toolbars/mainbar.cpp @@ -14,8 +14,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * along with this program; if not, see . */ #include @@ -214,9 +213,11 @@ MainBar::MainBar(Session &session, QWidget *parent, set_capture_state(pv::Session::Stopped); + configure_button_.setToolTip(tr("Configure Device")); configure_button_.setIcon(QIcon::fromTheme("configure", QIcon(":/icons/configure.png"))); + channels_button_.setToolTip(tr("Configure Channels")); channels_button_.setIcon(QIcon::fromTheme("channels", QIcon(":/icons/channels.svg"))); @@ -227,7 +228,7 @@ MainBar::MainBar(Session &session, QWidget *parent, // Setup session_ events connect(&session_, SIGNAL(capture_state_changed(int)), - this, SLOT(capture_state_changed(int))); + this, SLOT(on_capture_state_changed(int))); connect(&session, SIGNAL(device_changed()), this, SLOT(on_device_changed())); @@ -561,11 +562,6 @@ void MainBar::show_session_error(const QString text, const QString info_text) msg.exec(); } -void MainBar::capture_state_changed(int state) -{ - set_capture_state((pv::Session::capture_state)state); -} - void MainBar::add_decoder(srd_decoder *decoder) { #ifdef ENABLE_DECODE @@ -715,6 +711,11 @@ void MainBar::on_device_changed() update_device_config_widgets(); } +void MainBar::on_capture_state_changed(int state) +{ + set_capture_state((pv::Session::capture_state)state); +} + void MainBar::on_sample_count_changed() { if (!updating_sample_count_)