chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 10:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix translation loader on mac, updated Dutch translations

Browse Source
This commit is contained in:
Mark Watkins 2014-04-05 19:00:06 +10:00
parent 7c8eb35afd
commit b303d5816c
10 changed files with 4406 additions and 11182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1757
Translations/Bulgarian.bg.ts
View File

File diff suppressed because it is too large Load Diff

1757
Translations/Deutsch.de_DE.ts
View File

File diff suppressed because it is too large Load Diff

1757
Translations/Espaniol.es.ts
View File

File diff suppressed because it is too large Load Diff

1757
Translations/Francais.fr.ts
View File

File diff suppressed because it is too large Load Diff

6779
Translations/Nederlands.nl_NL.ts
View File

File diff suppressed because it is too large Load Diff

1757
Translations/Svenska.se.ts
View File

File diff suppressed because it is too large Load Diff

7
sleepyhead/Graphs/gGraphView.cpp
View File

@ -3570,9 +3570,8 @@ void gGraphView::mouseMoveEvent(QMouseEvent * event)
for (int i=m_graph_index-1;i>=0;i--) { for (int i=m_graph_index-1;i>=0;i--) {
if (m_graphs[i]->isPinned()!=m_graphs[m_graph_index]->isPinned()) { if (m_graphs[i]->isPinned()!=m_graphs[m_graph_index]->isPinned()) {
m_graph_dragging=false;
// fix cursor // fix cursor
break; continue;
} }
empty=m_graphs[i]->isEmpty() || (!m_graphs[i]->visible()); empty=m_graphs[i]->isEmpty() || (!m_graphs[i]->visible());
// swapping upwards. // swapping upwards.
@ -3597,9 +3596,9 @@ void gGraphView::mouseMoveEvent(QMouseEvent * event)
//qDebug() << "Graph Reorder" << m_graph_index; //qDebug() << "Graph Reorder" << m_graph_index;
for (int i=m_graph_index+1;i<m_graphs.size();i++) { for (int i=m_graph_index+1;i<m_graphs.size();i++) {
if (m_graphs[i]->isPinned()!=m_graphs[m_graph_index]->isPinned()) { if (m_graphs[i]->isPinned()!=m_graphs[m_graph_index]->isPinned()) {
m_graph_dragging=false; //m_graph_dragging=false;
// fix cursor // fix cursor
break; continue;
} }
empty=m_graphs[i]->isEmpty() || (!m_graphs[i]->visible()); empty=m_graphs[i]->isEmpty() || (!m_graphs[i]->visible());
p=m_graphs[m_graph_index]; p=m_graphs[m_graph_index];

9
sleepyhead/main.cpp
View File

@ -186,8 +186,9 @@ int main(int argc, char *argv[])
lang_layout.addWidget(&lang_combo,1); lang_layout.addWidget(&lang_combo,1);
lang_layout.addWidget(&lang_okbtn); lang_layout.addWidget(&lang_okbtn);
#ifdef Q_WS_MAC #ifdef Q_OS_MAC
QString transdir=QDir::cleanPath(QCoreApplication::applicationDirPath()+"/../Resources/Translations/"); QString transdir=QDir::cleanPath(QCoreApplication::applicationDirPath()+"/../Resources/Translations/");
#else #else
const QString transdir=QCoreApplication::applicationDirPath()+"/Translations/"; const QString transdir=QCoreApplication::applicationDirPath()+"/Translations/";
#endif #endif
@ -236,7 +237,11 @@ int main(int argc, char *argv[])
qDebug() << "Loading " << langname << " Translation" << langfile << "from" << transdir; qDebug() << "Loading " << langname << " Translation" << langfile << "from" << transdir;
QTranslator translator; QTranslator translator;
translator.load(langfile,transdir); if (!translator.load(langfile,transdir)) {
qDebug() << "Could not load translation" << langfile << "reverting to english :(";
}
a.installTranslator(&translator); a.installTranslator(&translator);
initializeStrings(); // Important, call this AFTER translator is installed. initializeStrings(); // Important, call this AFTER translator is installed.

4
sleepyhead/overview.cpp
View File

@ -96,6 +96,7 @@ Overview::Overview(QWidget *parent,gGraphView * shared) :
else else
AHI=createGraph(STR_TR_AHI,tr("Apnea\nHypopnea\nIndex")); AHI=createGraph(STR_TR_AHI,tr("Apnea\nHypopnea\nIndex"));
UC=createGraph(tr("Usage"),tr("Usage\n(hours)")); UC=createGraph(tr("Usage"),tr("Usage\n(hours)"));
FL=createGraph(STR_TR_FlowLimit,STR_TR_FlowLimit); FL=createGraph(STR_TR_FlowLimit,STR_TR_FlowLimit);
@ -276,6 +277,9 @@ Overview::Overview(QWidget *parent,gGraphView * shared) :
SET->setRecMinY(0); SET->setRecMinY(0);
//SET->setRecMaxY(5); //SET->setRecMaxY(5);
AHI->setPinned(true);
} }
Overview::~Overview() Overview::~Overview()
{ {

4
sleepyhead/sleepyhead.pro
View File

@ -219,8 +219,8 @@ win32 {
} }
mac { mac {
TransFiles.files = $$files(../Translations/*.qm) TransFiles.files = $$files($$PWD/../Translations/*.qm)
TransFiles.path = Contents/Resources/Translations TransFiles.path = ./Contents/Resources/Translations
QMAKE_BUNDLE_DATA += TransFiles QMAKE_BUNDLE_DATA += TransFiles
} }