X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fwidgets%2Fdevicetoolbutton.cpp;h=6a12aa25c446904651b60bfe6de58e13d27eaa12;hb=323715c41a09a1aba08f4b716e9d93da58f0f3a8;hp=ffa1cc6546561f74ceebba4b198e5a85d702cd71;hpb=1982c6500d69f2ee005b35460944e6c2d323b465;p=pulseview.git
diff --git a/pv/widgets/devicetoolbutton.cpp b/pv/widgets/devicetoolbutton.cpp
index ffa1cc6..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
@@ -23,9 +22,10 @@
#include
#include
-#include
+#include
#include
+#include
#include "devicetoolbutton.hpp"
@@ -35,7 +35,7 @@ using std::string;
using std::weak_ptr;
using std::vector;
-using sigrok::Device;
+using pv::devices::Device;
namespace pv {
namespace widgets {
@@ -71,12 +71,19 @@ void DeviceToolButton::set_device_list(
const list< shared_ptr > &devices, shared_ptr selected)
{
selected_device_ = selected;
- setText(QString::fromStdString(
- device_manager_.get_display_name(selected)));
+ 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();
@@ -84,17 +91,17 @@ 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;
QAction *const a = new QAction(QString::fromStdString(
- device_manager_.get_display_name(dev)), this);
+ dev->display_name(device_manager_)), this);
a->setCheckable(true);
a->setChecked(selected_device_ == dev);
a->setData(qVariantFromValue((void*)dev.get()));
- a->setToolTip(QString::fromStdString(device_manager_.get_full_name(dev)));
+ a->setToolTip(QString::fromStdString(dev->full_name()));
mapper_.setMapping(a, a);
connect(a, SIGNAL(triggered()), &mapper_, SLOT(map()));
@@ -107,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);
@@ -118,7 +127,7 @@ void DeviceToolButton::on_action(QObject *action)
update_device_list();
setText(QString::fromStdString(
- device_manager_.get_display_name(selected_device_)));
+ selected_device_->display_name(device_manager_)));
device_selected();
}
@@ -148,5 +157,5 @@ void DeviceToolButton::on_menu_hover_timeout()
QToolTip::showText(QCursor::pos(), device_tooltip_);
}
-} // widgets
-} // pv
+} // namespace widgets
+} // namespace pv