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

Merge remote-tracking branch 'origin/next' into PipXtreme

Browse Source
This commit is contained in:
Brian Webb 2012-03-02 18:13:38 -07:00
commit a902cfa4d5
5 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ground/openpilotgcs/src/app/main.cpp
View File

@ -239,6 +239,8 @@ int main(int argc, char **argv)
setrlimit(RLIMIT_NOFILE, &rl); setrlimit(RLIMIT_NOFILE, &rl);
#endif #endif
QApplication::setGraphicsSystem("raster");
SharedTools::QtSingleApplication app((QLatin1String(appNameC)), argc, argv); SharedTools::QtSingleApplication app((QLatin1String(appNameC)), argc, argv);
QString locale = QLocale::system().name(); QString locale = QLocale::system().name();

20
ground/openpilotgcs/src/plugins/config/stabilization.ui
View File

@ -496,8 +496,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>648</width> <width>626</width>
<height>802</height> <height>834</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="gridLayout_23"> <layout class="QGridLayout" name="gridLayout_23">
@ -11753,9 +11753,9 @@ border-radius: 4;
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>-402</y>
<width>401</width> <width>626</width>
<height>990</height> <height>1026</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="gridLayout_15"> <layout class="QGridLayout" name="gridLayout_15">
@ -24709,7 +24709,7 @@ border-radius: 5;</string>
<string notr="true"/> <string notr="true"/>
</property> </property>
<property name="decimals"> <property name="decimals">
<number>0</number> <number>3</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<double>1000000.000000000000000</double> <double>1000000.000000000000000</double>
@ -24755,7 +24755,7 @@ border-radius: 5;</string>
<string notr="true"/> <string notr="true"/>
</property> </property>
<property name="decimals"> <property name="decimals">
<number>0</number> <number>3</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<double>1000000.000000000000000</double> <double>1000000.000000000000000</double>
@ -24801,7 +24801,7 @@ border-radius: 5;</string>
<string notr="true"/> <string notr="true"/>
</property> </property>
<property name="decimals"> <property name="decimals">
<number>0</number> <number>5</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<double>1000000.000000000000000</double> <double>1000000.000000000000000</double>
@ -25598,8 +25598,6 @@ border-radius: 4;
</layout> </layout>
</widget> </widget>
<layoutdefault spacing="6" margin="11"/> <layoutdefault spacing="6" margin="11"/>
<resources> <resources/>
<include location="../../coreplugin/core.qrc"/>
</resources>
<connections/> <connections/>
</ui> </ui>

1
ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
View File

@ -412,6 +412,7 @@ void ConfigTaskWidget::widgetsContentsChanged()
} }
} }
} }
smartsave->resetIcons();
setDirty(true); setDirty(true);
} }
/** /**

6
ground/openpilotgcs/src/plugins/uavobjectwidgetutils/smartsavebutton.cpp
View File

@ -192,6 +192,12 @@ void smartSaveButton::enableControls(bool value)
button->setEnabled(value); button->setEnabled(value);
} }
void smartSaveButton::resetIcons()
{
foreach(QPushButton * button,buttonList.keys())
button->setIcon(QIcon());
}
void smartSaveButton::apply() void smartSaveButton::apply()
{ {
processOperation(NULL,false); processOperation(NULL,false);

1
ground/openpilotgcs/src/plugins/uavobjectwidgetutils/smartsavebutton.h
View File

@ -52,6 +52,7 @@ public:
void removeAllObjects(); void removeAllObjects();
void addApplyButton(QPushButton *apply); void addApplyButton(QPushButton *apply);
void addSaveButton(QPushButton *save); void addSaveButton(QPushButton *save);
void resetIcons();
signals: signals:
void preProcessOperations(); void preProcessOperations();
void saveSuccessfull(); void saveSuccessfull();