X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fwidgets%2Fdevicetoolbutton.cpp;h=6a12aa25c446904651b60bfe6de58e13d27eaa12;hb=970fca0d353f5c6d05c763bf7bdd12aac6f5ea0b;hp=723542b9fd9d3c6f874e4494004ee1b64eb383f1;hpb=3084ed4b15663dd717ff656745db305f377ab215;p=pulseview.git
diff --git a/pv/widgets/devicetoolbutton.cpp b/pv/widgets/devicetoolbutton.cpp
index 723542b..6a12aa2 100644
--- a/pv/widgets/devicetoolbutton.cpp
+++ b/pv/widgets/devicetoolbutton.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
@@ -72,12 +71,19 @@ void DeviceToolButton::set_device_list(
const list< shared_ptr > &devices, shared_ptr selected)
{
selected_device_ = selected;
- setText(QString::fromStdString(
- selected->display_name(device_manager_)));
+ setText(selected ? QString::fromStdString(
+ selected->display_name(device_manager_)) : tr(""));
devices_ = vector< weak_ptr >(devices.begin(), devices.end());
update_device_list();
}
+void DeviceToolButton::reset()
+{
+ setText(tr(""));
+ selected_device_.reset();
+ update_device_list();
+}
+
void DeviceToolButton::update_device_list()
{
menu_.clear();
@@ -85,8 +91,8 @@ void DeviceToolButton::update_device_list()
menu_.setDefaultAction(connect_action_);
menu_.addSeparator();
- for (weak_ptr dev_weak_ptr : devices_) {
- shared_ptr dev(dev_weak_ptr);
+ for (weak_ptr& dev_weak_ptr : devices_) {
+ shared_ptr dev(dev_weak_ptr.lock());
if (!dev)
continue;
@@ -108,8 +114,10 @@ void DeviceToolButton::on_action(QObject *action)
{
assert(action);
+ selected_device_.reset();
+
Device *const dev = (Device*)((QAction*)action)->data().value();
- for (weak_ptr dev_weak_ptr : devices_) {
+ for (weak_ptr& dev_weak_ptr : devices_) {
shared_ptr dev_ptr(dev_weak_ptr);
if (dev_ptr.get() == dev) {
selected_device_ = shared_ptr(dev_ptr);
@@ -149,5 +157,5 @@ void DeviceToolButton::on_menu_hover_timeout()
QToolTip::showText(QCursor::pos(), device_tooltip_);
}
-} // widgets
-} // pv
+} // namespace widgets
+} // namespace pv