len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-09 13:15:18 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rework configuration dialog for TTS / Encoder values.

Browse source 
The generated dialogs for encoder and TTS configuration didn't scale well and were missing icons. Use a grid layout so buttons are aligned properly now, remove the fixed width for buttongs (which breaks immediately if a label text is getting too long, especially when using a translation).

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23075 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Riebeling 2009-10-10 16:52:36 +00:00
parent 6be1d8b8a8
commit ef9dfb89b8
2 changed files with 25 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

43
rbutil/rbutilqt/encttscfggui.cpp
View file

@ -46,18 +46,32 @@ void EncTtsCfgGui::setUpWindow()
{ {
m_settingsList = m_settingInterface->getSettings(); m_settingsList = m_settingInterface->getSettings();
//layout // layout
QVBoxLayout *mainLayout = new QVBoxLayout; QVBoxLayout *mainLayout = new QVBoxLayout;
// groupbox // groupbox
QGroupBox *groupBox = new QGroupBox(this); QGroupBox *groupBox = new QGroupBox(this);
QFormLayout *formlayout = new QFormLayout; QGridLayout *gridLayout = new QGridLayout(groupBox);
// setting widgets // setting widgets
for(int i = 0; i < m_settingsList.size(); i++) for(int i = 0; i < m_settingsList.size(); i++)
{ {
formlayout->addRow(m_settingsList.at(i)->name(),createWidgets(m_settingsList.at(i))); QLabel *label = new QLabel(m_settingsList.at(i)->name());
gridLayout->addWidget(label, i, 0);
QWidget *widget = createWidgets(m_settingsList.at(i));
gridLayout->addWidget(widget, i, 1);
QWidget *btn = createButton(m_settingsList.at(i));
if(btn != NULL)
{
gridLayout->addWidget(btn, i, 2);
}
} }
groupBox->setLayout(formlayout); // add hidden spacers to make the dialog scale properly
QSpacerItem* spacer = new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
gridLayout->addItem(spacer, m_settingsList.size(), 0);
spacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
gridLayout->addItem(spacer, m_settingsList.size(), 1);
groupBox->setLayout(gridLayout);
mainLayout->addWidget(groupBox); mainLayout->addWidget(groupBox);
// connect browse btn // connect browse btn
@ -82,7 +96,7 @@ void EncTtsCfgGui::setUpWindow()
this->setLayout(mainLayout); this->setLayout(mainLayout);
} }
QLayout* EncTtsCfgGui::createWidgets(EncTtsSetting* setting) QWidget* EncTtsCfgGui::createWidgets(EncTtsSetting* setting)
{ {
// value display // value display
QWidget* value = NULL; QWidget* value = NULL;
@ -152,23 +166,14 @@ QLayout* EncTtsCfgGui::createWidgets(EncTtsSetting* setting)
} }
} }
// remeber widget // remember widget
if(value != NULL) if(value != NULL)
{ {
m_settingsWidgetsMap.insert(setting,value); m_settingsWidgetsMap.insert(setting,value);
connect(setting,SIGNAL(updateGui()),this,SLOT(updateWidget())); connect(setting,SIGNAL(updateGui()),this,SLOT(updateWidget()));
} }
// buttons ? return value;
QWidget* btn = createButton(setting);
// add to layout
QHBoxLayout *hbox = new QHBoxLayout;
if(value != NULL)hbox->addWidget(value);
if(btn != NULL) hbox->addWidget(btn);
return hbox;
} }
QWidget* EncTtsCfgGui::createButton(EncTtsSetting* setting) QWidget* EncTtsCfgGui::createButton(EncTtsSetting* setting)
@ -176,7 +181,7 @@ QWidget* EncTtsCfgGui::createButton(EncTtsSetting* setting)
if(setting->button() == EncTtsSetting::eBROWSEBTN) if(setting->button() == EncTtsSetting::eBROWSEBTN)
{ {
QPushButton* browsebtn = new QPushButton(tr("Browse"),this); QPushButton* browsebtn = new QPushButton(tr("Browse"),this);
browsebtn->setFixedWidth(50); //all buttons the same size, or it looks ugly browsebtn->setIcon(QIcon(":/icons/system-search.png"));
m_browseBtnMap.setMapping(browsebtn,setting); m_browseBtnMap.setMapping(browsebtn,setting);
connect(browsebtn,SIGNAL(clicked()),&m_browseBtnMap,SLOT(map())); connect(browsebtn,SIGNAL(clicked()),&m_browseBtnMap,SLOT(map()));
return browsebtn; return browsebtn;
@ -184,7 +189,7 @@ QWidget* EncTtsCfgGui::createButton(EncTtsSetting* setting)
else if(setting->button() == EncTtsSetting::eREFRESHBTN) else if(setting->button() == EncTtsSetting::eREFRESHBTN)
{ {
QPushButton* refreshbtn = new QPushButton(tr("Refresh"),this); QPushButton* refreshbtn = new QPushButton(tr("Refresh"),this);
refreshbtn->setFixedWidth(50); //all buttons the same size, or it looks ugly refreshbtn->setIcon(QIcon(":/icons/view-refresh.png"));
connect(refreshbtn,SIGNAL(clicked()),setting,SIGNAL(refresh())); connect(refreshbtn,SIGNAL(clicked()),setting,SIGNAL(refresh()));
return refreshbtn; return refreshbtn;
} }

2
rbutil/rbutilqt/encttscfggui.h
View file

@ -54,7 +54,7 @@ private:
//! creates all dynamic window content //! creates all dynamic window content
void setUpWindow(); void setUpWindow();
//! creates the Widgets needed for one setting. returns a Layout with the widgets //! creates the Widgets needed for one setting. returns a Layout with the widgets
QLayout* createWidgets(EncTtsSetting* setting); QWidget* createWidgets(EncTtsSetting* setting);
//! creates a button when needed by the setting. //! creates a button when needed by the setting.
QWidget* createButton(EncTtsSetting* setting); QWidget* createButton(EncTtsSetting* setting);
//! name of the Encoder or TTS for which this UI is //! name of the Encoder or TTS for which this UI is