Merge branch 'devel' into features_recentfilelist

Conflicts:
	source/app/SubWindowHandle.h
	source/app/plaYUVerApp.h
This commit is contained in:
jfmcarreira committed 2014-10-03 01:44:38 +01:00
commit e9b5630ca3
38 files changed
+1392 -426

No files matched your search

+6 -5
View File
@@ -73,6 +73,9 @@ private:
QString m_cWindowName;
QString m_cWindowShortName;
QString m_cCurrFileName;
Bool m_bIsPlaying;
Bool m_bIsModule;
@@ -202,13 +205,11 @@ public:
{
return m_cWindowName;
}
QString userFriendlyCurrentFile()
QString getWindowShortName()
{
return m_cWindowName;
return m_cWindowShortName;
}
QString currentFile()
QString getCurrentFileName()
{
return m_sStreamInfo.m_cFilename;
}