Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-26 09:45:21 +03:00
Code Issues Wiki Activity

Merge branch 'origin/next'

Browse source 
Conflicts:
	companion/src/CMakeLists.txt
	companion/src/apppreferencesdialog.ui
	companion/src/companion.qrc
	companion/src/mdichild.cpp
This commit is contained in:
Kjell Kernen 2014-03-31 10:22:23 +02:00
commit 8059daccaf
236 changed files with 25514 additions and 16461 deletions
Download patch file Download diff file Expand all files Collapse all files

5
companion/src/modelslist.cpp
View file

@ -277,10 +277,7 @@ void ModelsListWidget::refreshList()
clear();
int msize;
div_t divresult;
QString name = radioData->generalSettings.ownerName;
if(!name.isEmpty())
name.prepend(" - ");
addItem(tr("General Settings") + name);
addItem(tr("General Settings"));
EEPROMInterface *eepromInterface = GetEepromInterface();
int availableEEpromSize = eepromInterface->getEEpromSize()-64; //let's consider fat