Channels popup: Use a more compact one-line button row.

diff --git a/pv/popups/channels.cpp b/pv/popups/channels.cpp
index cbe9a2a2eb4fd7bd6b0ddb828739381261c5b597..ce023a8ffdd622d908731cd41c724d4ac3634d91 100644 (file)
--- a/pv/popups/channels.cpp
+++ b/pv/popups/channels.cpp
@@ -24,6 +24,7 @@
 #include <QFontMetrics>
 #include <QFormLayout>
 #include <QGridLayout>
 #include <QFontMetrics>
 #include <QFormLayout>
 #include <QGridLayout>

+#include <QHBoxLayout>

 #include <QLabel>
 
 #include "channels.hpp"
 #include <QLabel>
 
 #include "channels.hpp"


@@ -57,12 +58,12 @@ Channels::Channels(Session &session, QWidget *parent) :
        Popup(parent),
        session_(session),
        updating_channels_(false),
        Popup(parent),
        session_(session),
        updating_channels_(false),

-       enable_all_channels_(tr("Enable All"), this),
-       disable_all_channels_(tr("Disable All"), this),
-       enable_all_logic_channels_(tr("Enable only logic"), this),
-       enable_all_analog_channels_(tr("Enable only analog"), this),
-       enable_all_named_channels_(tr("Enable only named"), this),
-       enable_all_changing_channels_(tr("Enable only changing"), this),
+       enable_all_channels_(tr("All"), this),
+       disable_all_channels_(tr("All"), this),
+       enable_all_logic_channels_(tr("Logic"), this),
+       enable_all_analog_channels_(tr("Analog"), this),
+       enable_all_named_channels_(tr("Named"), this),
+       enable_all_changing_channels_(tr("Changing"), this),

        check_box_mapper_(this)
 {
        // Create the layout
        check_box_mapper_(this)
 {
        // Create the layout


@@ -127,13 +128,17 @@ Channels::Channels(Session &session, QWidget *parent) :
        connect(&enable_all_changing_channels_, SIGNAL(clicked()),
                this, SLOT(enable_all_changing_channels()));
 
        connect(&enable_all_changing_channels_, SIGNAL(clicked()),
                this, SLOT(enable_all_changing_channels()));
 

-       buttons_bar_.setRowMinimumHeight(0, 2 * QFontMetrics(QApplication::font()).height());
-       buttons_bar_.addWidget(&enable_all_channels_, 1, 0);
-       buttons_bar_.addWidget(&disable_all_channels_, 1, 1);
-       buttons_bar_.addWidget(&enable_all_logic_channels_, 2, 0);
-       buttons_bar_.addWidget(&enable_all_analog_channels_, 2, 1);
-       buttons_bar_.addWidget(&enable_all_named_channels_, 2, 2);
-       buttons_bar_.addWidget(&enable_all_changing_channels_, 2, 3);
+       QLabel *label1 = new QLabel(tr("Disable: "));
+       buttons_bar_.addWidget(label1);
+       buttons_bar_.addWidget(&disable_all_channels_);
+       QLabel *label2 = new QLabel(tr("Enable: "));
+       buttons_bar_.addWidget(label2);
+       buttons_bar_.addWidget(&enable_all_channels_);
+       buttons_bar_.addWidget(&enable_all_logic_channels_);
+       buttons_bar_.addWidget(&enable_all_analog_channels_);
+       buttons_bar_.addWidget(&enable_all_named_channels_);
+       buttons_bar_.addWidget(&enable_all_changing_channels_);
+       buttons_bar_.addStretch();

 
        layout_.addRow(&buttons_bar_);
 
 
        layout_.addRow(&buttons_bar_);
 

diff --git a/pv/popups/channels.hpp b/pv/popups/channels.hpp
index eb1e029773f1d9204c7845270e0605033b0932a2..e486768f001e4ad76edef29eb1549d39cde8c79b 100644 (file)
--- a/pv/popups/channels.hpp
+++ b/pv/popups/channels.hpp
@@ -28,6 +28,7 @@
 #include <QCheckBox>
 #include <QFormLayout>
 #include <QGridLayout>
 #include <QCheckBox>
 #include <QFormLayout>
 #include <QGridLayout>

+#include <QHBoxLayout>

 #include <QLabel>
 #include <QPushButton>
 #include <QSignalMapper>
 #include <QLabel>
 #include <QPushButton>
 #include <QSignalMapper>


@@ -104,7 +105,7 @@ private:
                check_box_signal_map_;
        map< shared_ptr<sigrok::ChannelGroup>, QLabel*> group_label_map_;
 
                check_box_signal_map_;
        map< shared_ptr<sigrok::ChannelGroup>, QLabel*> group_label_map_;
 

-       QGridLayout buttons_bar_;
+       QHBoxLayout buttons_bar_;

        QPushButton enable_all_channels_, disable_all_channels_;
        QPushButton enable_all_logic_channels_, enable_all_analog_channels_;
        QPushButton enable_all_named_channels_, enable_all_changing_channels_;
        QPushButton enable_all_channels_, disable_all_channels_;
        QPushButton enable_all_logic_channels_, enable_all_analog_channels_;
        QPushButton enable_all_named_channels_, enable_all_changing_channels_;