summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmaury Pouly <amaury.pouly@gmail.com>2014-09-27 21:24:18 +0200
committerAmaury Pouly <amaury.pouly@gmail.com>2014-12-15 22:53:03 +0100
commit4a711fee423b00698313ac9c9a8df4f25696f8dd (patch)
tree3547d000faabd96d4c319ebabde5dc9f8a0941e3
parent99ed6d2bea6b8bc76b9775aea4735b68c19f175f (diff)
downloadrockbox-4a711fee423b00698313ac9c9a8df4f25696f8dd.tar.gz
rockbox-4a711fee423b00698313ac9c9a8df4f25696f8dd.zip
qeditor: display message on "Nothing" backend selection
Change-Id: I071c79500f55afe0b6342cbb5a26a9fddba35d94 Reviewed-on: http://gerrit.rockbox.org/996 Reviewed-by: Amaury Pouly <amaury.pouly@gmail.com>
-rw-r--r--utils/regtools/qeditor/regtab.cpp1
-rw-r--r--utils/regtools/qeditor/utils.cpp17
-rw-r--r--utils/regtools/qeditor/utils.h5
3 files changed, 19 insertions, 4 deletions
diff --git a/utils/regtools/qeditor/regtab.cpp b/utils/regtools/qeditor/regtab.cpp
index 32d08a73d3..3a1c702dc7 100644
--- a/utils/regtools/qeditor/regtab.cpp
+++ b/utils/regtools/qeditor/regtab.cpp
@@ -134,6 +134,7 @@ RegTab::RegTab(Backend *backend, QWidget *parent)
134 QGroupBox *data_sel_group = new QGroupBox("Data selection"); 134 QGroupBox *data_sel_group = new QGroupBox("Data selection");
135 QHBoxLayout *data_sel_layout = new QHBoxLayout; 135 QHBoxLayout *data_sel_layout = new QHBoxLayout;
136 m_backend_selector = new BackendSelector(m_backend, this); 136 m_backend_selector = new BackendSelector(m_backend, this);
137 m_backend_selector->SetNothingMessage("<i>Select a data source to analyse its content.</i>");
137 m_readonly_check = new QCheckBox("Read-only"); 138 m_readonly_check = new QCheckBox("Read-only");
138 m_readonly_check->setCheckState(Qt::Checked); 139 m_readonly_check->setCheckState(Qt::Checked);
139 m_data_soc_label = new QLabel; 140 m_data_soc_label = new QLabel;
diff --git a/utils/regtools/qeditor/utils.cpp b/utils/regtools/qeditor/utils.cpp
index 677d24dd7f..da5e44ab71 100644
--- a/utils/regtools/qeditor/utils.cpp
+++ b/utils/regtools/qeditor/utils.cpp
@@ -825,17 +825,20 @@ bool MySwitchableTextEditor::IsModified()
825BackendSelector::BackendSelector(Backend *backend, QWidget *parent) 825BackendSelector::BackendSelector(Backend *backend, QWidget *parent)
826 :QWidget(parent), m_backend(backend) 826 :QWidget(parent), m_backend(backend)
827{ 827{
828 m_data_selector = new QComboBox; 828 m_data_selector = new QComboBox(this);
829 m_data_selector->addItem(QIcon::fromTheme("text-x-generic"), "Nothing...", QVariant(DataSelNothing)); 829 m_data_selector->addItem(QIcon::fromTheme("text-x-generic"), "Nothing...", QVariant(DataSelNothing));
830 m_data_selector->addItem(QIcon::fromTheme("document-open"), "File...", QVariant(DataSelFile)); 830 m_data_selector->addItem(QIcon::fromTheme("document-open"), "File...", QVariant(DataSelFile));
831#ifdef HAVE_HWSTUB 831#ifdef HAVE_HWSTUB
832 m_data_selector->addItem(QIcon::fromTheme("multimedia-player"), "Device...", QVariant(DataSelDevice)); 832 m_data_selector->addItem(QIcon::fromTheme("multimedia-player"), "Device...", QVariant(DataSelDevice));
833#endif 833#endif
834 m_data_sel_edit = new QLineEdit; 834 m_data_sel_edit = new QLineEdit(this);
835 m_data_sel_edit->setReadOnly(true); 835 m_data_sel_edit->setReadOnly(true);
836 m_nothing_text = new QLabel(this);
837 m_nothing_text->setTextFormat(Qt::RichText);
836 QHBoxLayout *data_sel_layout = new QHBoxLayout(this); 838 QHBoxLayout *data_sel_layout = new QHBoxLayout(this);
837 data_sel_layout->addWidget(m_data_selector); 839 data_sel_layout->addWidget(m_data_selector);
838 data_sel_layout->addWidget(m_data_sel_edit, 1); 840 data_sel_layout->addWidget(m_data_sel_edit, 1);
841 data_sel_layout->addWidget(m_nothing_text, 1);
839 data_sel_layout->addStretch(0); 842 data_sel_layout->addStretch(0);
840#ifdef HAVE_HWSTUB 843#ifdef HAVE_HWSTUB
841 m_dev_selector = new QComboBox; 844 m_dev_selector = new QComboBox;
@@ -863,6 +866,11 @@ BackendSelector::~BackendSelector()
863 delete m_io_backend; 866 delete m_io_backend;
864} 867}
865 868
869void BackendSelector::SetNothingMessage(const QString& msg)
870{
871 m_nothing_text->setText(msg);
872}
873
866void BackendSelector::OnDataSelChanged(int index) 874void BackendSelector::OnDataSelChanged(int index)
867{ 875{
868 if(index == -1) 876 if(index == -1)
@@ -870,6 +878,7 @@ void BackendSelector::OnDataSelChanged(int index)
870 QVariant var = m_data_selector->itemData(index); 878 QVariant var = m_data_selector->itemData(index);
871 if(var == DataSelFile) 879 if(var == DataSelFile)
872 { 880 {
881 m_nothing_text->hide();
873 m_data_sel_edit->show(); 882 m_data_sel_edit->show();
874#ifdef HAVE_HWSTUB 883#ifdef HAVE_HWSTUB
875 m_dev_selector->hide(); 884 m_dev_selector->hide();
@@ -888,7 +897,8 @@ void BackendSelector::OnDataSelChanged(int index)
888#ifdef HAVE_HWSTUB 897#ifdef HAVE_HWSTUB
889 else if(var == DataSelDevice) 898 else if(var == DataSelDevice)
890 { 899 {
891 m_data_sel_edit->hide();; 900 m_nothing_text->hide();
901 m_data_sel_edit->hide();
892 m_dev_selector->show(); 902 m_dev_selector->show();
893 OnDevListChanged(); 903 OnDevListChanged();
894 } 904 }
@@ -896,6 +906,7 @@ void BackendSelector::OnDataSelChanged(int index)
896 else 906 else
897 { 907 {
898 m_data_sel_edit->hide(); 908 m_data_sel_edit->hide();
909 m_nothing_text->show();
899#ifdef HAVE_HWSTUB 910#ifdef HAVE_HWSTUB
900 m_dev_selector->hide(); 911 m_dev_selector->hide();
901#endif 912#endif
diff --git a/utils/regtools/qeditor/utils.h b/utils/regtools/qeditor/utils.h
index ec3175b5da..a2a95f1cac 100644
--- a/utils/regtools/qeditor/utils.h
+++ b/utils/regtools/qeditor/utils.h
@@ -304,11 +304,14 @@ public:
304 BackendSelector(Backend *backend, QWidget *parent = 0); 304 BackendSelector(Backend *backend, QWidget *parent = 0);
305 virtual ~BackendSelector(); 305 virtual ~BackendSelector();
306 IoBackend *GetBackend(); 306 IoBackend *GetBackend();
307 void SetNothingMessage(const QString& msg);
307 308
308signals: 309signals:
309 void OnSelect(IoBackend *backend); 310 void OnSelect(IoBackend *backend);
310 311
311protected: 312protected:
313 void ChangeBackend(IoBackend *new_backend);
314
312 enum 315 enum
313 { 316 {
314 DataSelNothing, 317 DataSelNothing,
@@ -326,7 +329,7 @@ protected:
326 QComboBox *m_dev_selector; 329 QComboBox *m_dev_selector;
327 HWStubBackendHelper m_hwstub_helper; 330 HWStubBackendHelper m_hwstub_helper;
328#endif 331#endif
329 void ChangeBackend(IoBackend *new_backend); 332 QLabel *m_nothing_text;
330 333
331private slots: 334private slots:
332#ifdef HAVE_HWSTUB 335#ifdef HAVE_HWSTUB