Don't allow creating remote layouts with a blank name; remove old commented out code

1 files changed, 4 insertions, 13 deletions

diff --git a/noncore/tools/remote/configtab.cpp b/noncore/tools/remote/configtab.cpp
index ebfba2e..af2b5ff 100644
--- a/noncore/tools/remote/configtab.cpp
+++ b/noncore/tools/remote/configtab.cpp
@@ -41,146 +41,137 @@ ConfigTab::ConfigTab(QWidget *parent, const char *name):QWidget(parent,name)
 
 void ConfigTab::setConfig(Config *newCfg)
 {
 	cfg = newCfg;
 	cfg->setGroup("Remotes");
 	topGroupConf->updateRemotes(cfg->readListEntry("remoteList", ',') );
 	cfg->setGroup("Default");
 	const QObject *obj;
 
 	const QObjectList *objList = topGroupConf->children();
 	for(obj = ((QObjectList *)objList)->first(); obj != 0; obj=((QObjectList *)objList)->next())
 	{
 		if(obj->inherits("QPushButton"))
 		{
 			if(!cfg->hasKey((QString)obj->name()+"Label"))
 			{
 				cfg->writeEntry((QString)obj->name()+"Label", ((QPushButton *)obj)->text());
 			}
 		}
 	}
 
 	objList = dvdGroupConf->children();
 	for(obj = ((QObjectList *)objList)->first(); obj != 0; obj=((QObjectList *)objList)->next())
 	{
 		if(obj->inherits("QPushButton"))
 		{
 			if(!cfg->hasKey((QString)obj->name()+"Label"))
 			{
 				cfg->writeEntry((QString)obj->name()+"Label", ((QPushButton *)obj)->text());
 			}
 		}
 	}
 
 	objList = vcrGroupConf->children();
 	for(obj = ((QObjectList *)objList)->first(); obj != 0; obj=((QObjectList *)objList)->next())
 	{
 		if(obj->inherits("QPushButton"))
 		{
 			if(!cfg->hasKey((QString)obj->name()+"Label"))
 			{
 				cfg->writeEntry((QString)obj->name()+"Label", ((QPushButton *)obj)->text());
 			}
 		}
 	}
 
 	objList = channelGroupConf->children();
 	for(obj = ((QObjectList *)objList)->first(); obj != 0; obj=((QObjectList *)objList)->next())
 	{
 		if(obj->inherits("QPushButton"))
 		{
 			if(!cfg->hasKey((QString)obj->name()+"Label"))
 			{
 				cfg->writeEntry((QString)obj->name()+"Label", ((QPushButton *)obj)->text());
 			}
 		}
 	}
 	cfg->write();
 
 	cfg->setGroup("Remotes");
 
 	QString curr_remote = topGroupConf->getRemotesText();
 	if(curr_remote != "")
 		remoteSelected(curr_remote);
 }
-/*
-void ConfigTab::savePressed()
-{
-	cfg->setGroup(remotes->currentText());
-	ButtonDialog *bd = new ButtonDialog(this, "BD", true, 0);
-	if( bd->exec() == 1)
-	{
-		printf("%s\n", bd->getList().join(" ").latin1());
-	}
-}
-*/
 
 void ConfigTab::newPressed()
 {
 	QStringList list;
 	QString newname = topGroupConf->getRemotesText();
-	if(newname=="Remotes")
-		QMessageBox::warning(this, tr("Error"), tr("The name 'Remotes' is not allowed"), QMessageBox::Ok, QMessageBox::NoButton);
+	if(newname.stripWhiteSpace()=="")
+		QMessageBox::warning(this, tr("Error"), tr("Please enter a name\nfirst"), QMessageBox::Ok, QMessageBox::NoButton);
+	else if(newname=="Remotes")
+		QMessageBox::warning(this, tr("Error"), tr("The name 'Remotes' is\nnot allowed"), QMessageBox::Ok, QMessageBox::NoButton);
 	else {
 		cfg->setGroup("Remotes");
 		list=cfg->readListEntry("remoteList", ',');
 		if(list.findIndex(newname) == -1) {
 			list+=newname;
 			cfg->writeEntry("remoteList", list, ',');
 			cfg->setGroup(newname);
 			topGroupConf->updateRemotes(QStringList(newname) );
 			cfg->write();
 			emit remotesChanged();
 			remoteSelected(newname);
 		}
 		else {
 			QMessageBox::warning(this, tr("Already exists"), tr("A layout named %1\nalready exists").arg(newname), QMessageBox::Ok, QMessageBox::NoButton);
 			// Re-select existing layout
 			remoteSelected(newname);
 		}
 	}
 }
 
 void ConfigTab::remoteSelected(const QString &string)
 {
 	cfg->setGroup(string);
 	const QObject *obj;
 
 	const QObjectList *objList = topGroupConf->children();
 	for(obj = ((QObjectList *)objList)->first(); obj != 0; obj=((QObjectList *)objList)->next())
 	{
 		if(obj->inherits("QPushButton"))
 		{
 			if(cfg->hasKey((QString)obj->name()+"Label"))
 			{
 				((QPushButton *)obj)->setText(cfg->readEntry((QString)obj->name()+"Label") );
 			}
 			else
 			{
 				cfg->setGroup("Default");
 				((QPushButton *)obj)->setText(cfg->readEntry((QString)obj->name()+"Label") );
 				cfg->setGroup(string);
 			}
 		}
 	}
 
 	objList = dvdGroupConf->children();
 	for(obj = ((QObjectList *)objList)->first(); obj != 0; obj=((QObjectList *)objList)->next())
 	{
 		if(obj->inherits("QPushButton"))
 		{
 			if(cfg->hasKey((QString)obj->name()+"Label"))
 			{
 				((QPushButton *)obj)->setText(cfg->readEntry((QString)obj->name()+"Label") );
 			}
 			else
 			{
 				cfg->setGroup("Default");
 				((QPushButton *)obj)->setText(cfg->readEntry((QString)obj->name()+"Label") );
 				cfg->setGroup(string);
 			}
 		}
 	}
 
 	objList = vcrGroupConf->children();
 	for(obj = ((QObjectList *)objList)->first(); obj != 0; obj=((QObjectList *)objList)->next())
 	{