X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fpopups%2Fdeviceoptions.cpp;h=bfb702cf064ce062462b67e5c7f0d0eba3f822d0;hp=353dfcfedfe941df0ded87663eae7bf28bc2913d;hb=f4ab4b5c657e5613caba82feaa81a8a400e4f331;hpb=d9aecf1fcd9af471db3b59de7efc65b9632a6d79

diff --git a/pv/popups/deviceoptions.cpp b/pv/popups/deviceoptions.cpp
index 353dfcf..bfb702c 100644
--- a/pv/popups/deviceoptions.cpp
+++ b/pv/popups/deviceoptions.cpp
@@ -14,37 +14,48 @@
  * 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 <http://www.gnu.org/licenses/>.
  */
 
-#include "deviceoptions.h"
+#include "deviceoptions.hpp"
 
 #include <QFormLayout>
 #include <QListWidget>
 
-#include <pv/prop/property.h>
+#include <pv/prop/property.hpp>
 
-using boost::shared_ptr;
+#include <libsigrokcxx/libsigrokcxx.hpp>
+
+using std::shared_ptr;
+
+using sigrok::Device;
 
 namespace pv {
 namespace popups {
 
-DeviceOptions::DeviceOptions(shared_ptr<device::DevInst> dev_inst,
-	QWidget *parent) :
+DeviceOptions::DeviceOptions(shared_ptr<Device> device, QWidget *parent) :
 	Popup(parent),
-	_dev_inst(dev_inst),
-	_layout(this),
-	_binding(dev_inst)
+	device_(device),
+	layout_(this),
+	binding_(device)
 {
-	setLayout(&_layout);
+	setLayout(&layout_);
+
+	layout_.addWidget(binding_.get_property_form(this, true));
+}
 
-	_layout.addWidget(_binding.get_property_form(this, true));
+pv::binding::Device& DeviceOptions::binding()
+{
+	return binding_;
 }
 
-pv::prop::binding::DeviceOptions& DeviceOptions::binding()
+void DeviceOptions::show()
 {
-	return _binding;
+	// Update device config widgets with the current values supplied by the
+	// driver before actually showing the popup dialog
+	binding_.update_property_widgets();
+
+	Popup::show();
 }
 
 } // namespace popups