rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00
Code Issues Releases Activity

Jose's fix for the config options page no longer hangs the options menu. Plugin now enabled in build.

Browse Source 
Small fix to the Notify options page, sound can be tested now, still issues with it.

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@811 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
dankers 2010-06-18 16:06:12 +00:00 committed by dankers
parent 3b3c582799
commit d884f46abe
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ground/src/plugins/config/configgadgetoptionspage.cpp
View File

@ -26,6 +26,8 @@
*/
#include "configgadgetoptionspage.h"
#include <QWidget>
ConfigGadgetOptionsPage::ConfigGadgetOptionsPage(ConfigGadgetConfiguration *config, QObject *parent)
{
//todo:implement
@ -34,7 +36,7 @@ ConfigGadgetOptionsPage::ConfigGadgetOptionsPage(ConfigGadgetConfiguration *conf
QWidget *ConfigGadgetOptionsPage::createPage(QWidget *parent)
{
//todo:implement
return parent;
return new QWidget;
}
void ConfigGadgetOptionsPage::apply()

4
ground/src/plugins/notify/notifypluginoptionspage.cpp
View File

@ -217,14 +217,14 @@ void NotifyPluginOptionsPage::on_UAVObject_indexChanged(QString val) {
// locate collection folder on disk
void NotifyPluginOptionsPage::on_buttonSoundFolder_clicked(const QString& path)
{
disconnect(options_page->SoundCollectionList, SIGNAL(currentIndexChanged (int)), this, SLOT(on_soundLanguage_indexChanged(int)));
//disconnect(options_page->SoundCollectionList, SIGNAL(currentIndexChanged (int)), this, SLOT(on_soundLanguage_indexChanged(int)));
QDir dirPath(path);
listDirCollections = dirPath.entryList(QDir::AllDirs | QDir::NoDotAndDotDot);
options_page->SoundCollectionList->clear();
options_page->SoundCollectionList->addItems(listDirCollections);
connect(options_page->SoundCollectionList, SIGNAL(currentIndexChanged (int)), this, SLOT(on_soundLanguage_indexChanged(int)));
//connect(options_page->SoundCollectionList, SIGNAL(currentIndexChanged (int)), this, SLOT(on_soundLanguage_indexChanged(int)));
}

10
ground/src/plugins/plugins.pro
View File

@ -103,12 +103,6 @@ plugin_notify.depends = plugin_coreplugin
plugin_notify.depends = plugin_uavobjects
SUBDIRS += plugin_notify
#Config Gadget
#plugin_config.subdir = config
#plugin_config.depends = plugin_coreplugin
#SUBDIRS += plugin_config
#HITL simulation Gadget
plugin_hitl.subdir = hitl
plugin_hitl.depends = plugin_coreplugin
@ -116,3 +110,7 @@ plugin_hitl.depends += plugin_uavobjects
plugin_hitl.depends += plugin_uavtalk
SUBDIRS += plugin_hitl
#Config Gadget
plugin_config.subdir = config
plugin_config.depends = plugin_coreplugin
SUBDIRS += plugin_config