Correctly select first remote upon loading configuration

3 files changed, 6 insertions, 2 deletions

diff --git a/noncore/tools/remote/topgroup.cpp b/noncore/tools/remote/topgroup.cpp
index 427cb8f..7f2366b 100644
--- a/noncore/tools/remote/topgroup.cpp
+++ b/noncore/tools/remote/topgroup.cpp
@@ -19,36 +19,40 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 TopGroup::TopGroup(QWidget *parent, const char *name):QWidget(parent,name)
 {
 	QHBoxLayout *layout = new QHBoxLayout(this, 0, -1, 0);
 
 	QPushButton *power = new QPushButton("Power",this,"power");
 	layout->addWidget(power);
 	connect(power, SIGNAL(pressed()), this->parentWidget(), SLOT(sendIR()) );
 //	power->setGeometry(5, 5,40, 20);
 
 	layout->addSpacing(5);
 
 	QPushButton *source = new QPushButton("Source",this,"source");
 	layout->addWidget(source);
 	connect(source, SIGNAL(pressed()), this->parentWidget(), SLOT(sendIR()) );
 	//	source->setGeometry(50,5,40,20);
 
 	remotes = new QComboBox(false, this, "remotes");
 	connect(remotes, SIGNAL(activated(const QString&)), this->parentWidget(), SLOT(remoteSelected(const QString&)) );
 	remotes->insertItem("Select Remote");
 //	remotes->setGeometry(135,5,95,20);
 
 	QLabel *remoteLabel = new QLabel(remotes, "Remote: ",this,"remoteLabel");
 //	remoteLabel->setGeometry(90,5,40,20);
 	remoteLabel->setAlignment(AlignRight | AlignVCenter);
 
 	layout->addWidget(remoteLabel);
 	layout->addWidget(remotes);
 }
 
 void TopGroup::updateRemotes(Config *cfg)
 {
 	remotes->clear();
-	remotes->insertItem(QString("SelectRemote"));
 	cfg->setGroup("Remotes");
 	remotes->insertStringList(cfg->readListEntry("remoteList", ',') );
 }
+
+QString TopGroup::getRemotesText()
+{
+	return remotes->currentText();
+}
diff --git a/noncore/tools/remote/topgroup.h b/noncore/tools/remote/topgroup.h
index 215292d..091ac14 100644
--- a/noncore/tools/remote/topgroup.h
+++ b/noncore/tools/remote/topgroup.h
@@ -1,31 +1,32 @@
 /*
 Opie-Remote.  emulates remote controlls on an iPaq (and maybe a Zaurus) in Opie.
 Copyright (C)
 
 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public
 License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later
 version.
 
 This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
 implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
 #include <qpe/config.h>
 #include <qwidget.h>
 #include <qpushbutton.h>
 #include <qcombobox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 
 class TopGroup : public QWidget
 {
 public:
 	TopGroup(QWidget *parent=0, const char *name=0);
 	void updateRemotes(Config *cfg);
+	QString getRemotesText();
 private:
 	QComboBox *remotes;
 };
diff --git a/noncore/tools/remote/topgroupconf.cpp b/noncore/tools/remote/topgroupconf.cpp
index 0419a65..7df4d18 100644
--- a/noncore/tools/remote/topgroupconf.cpp
+++ b/noncore/tools/remote/topgroupconf.cpp
@@ -4,65 +4,64 @@ Copyright (C) 2002 Thomas Stephens
 
 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public
 License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later
 version.
 
 This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
 implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
 #include "topgroupconf.h"
 
 TopGroupConf::TopGroupConf(QWidget *parent, const char *name):QWidget(parent,name)
 {
 	QHBoxLayout *layout = new QHBoxLayout(this);
 
 	QPushButton *power = new QPushButton("Power",this,"power");
 	layout->addWidget(power);
 	connect(power, SIGNAL(pressed()), this->parentWidget(), SLOT(buttonPressed()) );
 //	power->setGeometry(5, 5,40, 20);
 
 	layout->addSpacing(5);
 
 	QPushButton *source = new QPushButton("Source",this,"source");
 	layout->addWidget(source);
 	connect(source, SIGNAL(pressed()), this->parentWidget(), SLOT(buttonPressed()) );
 	//	source->setGeometry(50,5,40,20);
 
 	remotes = new QComboBox(true, this, "remotes");
-	remotes->insertItem(QString("Remotes"));
 	layout->addWidget(remotes);
 	layout->setStretchFactor(remotes, 1);
 	connect(remotes, SIGNAL(activated(const QString&)), this->parentWidget(), SLOT(remoteSelected(const QString&)) );
 
 
 	QPushButton *newrem = new QPushButton("New", this, "new");
 	layout->addWidget(newrem);
 	connect(newrem, SIGNAL(pressed()), this->parentWidget(), SLOT(newPressed()) );
 
 
 /*	remotes = new QComboBox(false, this, "remotes");
 	connect(remotes, SIGNAL(activated(const QString&)), this->parentWidget(), SLOT(remoteSelected(const QString&)) );
 	remotes->insertItem("Select Remote");
 //	remotes->setGeometry(135,5,95,20);
 
 	QLabel *remoteLabel = new QLabel(remotes, "Remote: ",this,"remoteLabel");
 //	remoteLabel->setGeometry(90,5,40,20);
 	remoteLabel->setAlignment(AlignRight | AlignVCenter);
 
 	layout->addWidget(remoteLabel);
 	layout->addWidget(remotes);
 */
 }
 
 void TopGroupConf::updateRemotes(QStringList list)
 {
 	remotes->insertStringList(list);
 }
 
 QString TopGroupConf::getRemotesText()
 {
 	return remotes->currentText();