X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fpopups%2Fdeviceoptions.cpp;h=bfb702cf064ce062462b67e5c7f0d0eba3f822d0;hb=b4bc9b55381ff22196785291d3862c8c8c131885;hp=3d069f799e1f40f9a6066148804c9e73f687109c;hpb=e8d009288de28cb194bc7964f96677c2baf900c9;p=pulseview.git
diff --git a/pv/popups/deviceoptions.cpp b/pv/popups/deviceoptions.cpp
index 3d069f7..bfb702c 100644
--- a/pv/popups/deviceoptions.cpp
+++ b/pv/popups/deviceoptions.cpp
@@ -14,18 +14,17 @@
* 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 "deviceoptions.h"
+#include "deviceoptions.hpp"
#include
#include
-#include
+#include
-#include
+#include
using std::shared_ptr;
@@ -36,18 +35,27 @@ namespace popups {
DeviceOptions::DeviceOptions(shared_ptr device, QWidget *parent) :
Popup(parent),
- _device(device),
- _layout(this),
- _binding(device)
+ 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::prop::binding::DeviceOptions& DeviceOptions::binding()
+pv::binding::Device& DeviceOptions::binding()
{
- return _binding;
+ return binding_;
+}
+
+void DeviceOptions::show()
+{
+ // 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