hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'stable-1.2'

Browse Source 
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	src/core/Track.cpp
This commit is contained in:
Hyunjin Song
2020-07-05 11:27:33 +09:00
parent 84998a26fd 94363be152
commit c83c9bf54f
7 changed files with 61 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/Track.cpp
View File

@@ -774,12 +774,12 @@ void TrackContentObjectView::mousePressEvent( QMouseEvent * me )
m_action = ResizeLeft;
setCursor( Qt::SizeHorCursor );
}
else if( me->x() < width() - RESIZE_GRIP_WIDTH )
else if( m_tco->getAutoResize() || me->x() < width() - RESIZE_GRIP_WIDTH )
{
m_action = Move;
setCursor( Qt::SizeAllCursor );
}
else if( !m_tco->getAutoResize() )
else
{
m_action = Resize;
setCursor( Qt::SizeHorCursor );

25
src/core/main.cpp
View File

@@ -129,9 +129,10 @@ inline void loadTranslation( const QString & tname,
QTranslator * t = new QTranslator( QCoreApplication::instance() );
QString name = tname + ".qm";
t->load( name, dir );
QCoreApplication::instance()->installTranslator( t );
if (t->load(name, dir))
{
QCoreApplication::instance()->installTranslator(t);
}
}
@@ -723,19 +724,17 @@ int main( int argc, char * * argv )
pos = QLocale::system().name().left( 2 );
}
#ifdef LMMS_BUILD_WIN32
#undef QT_TRANSLATIONS_DIR
#define QT_TRANSLATIONS_DIR ConfigManager::inst()->localeDir()
#endif
#ifdef QT_TRANSLATIONS_DIR
// load translation for Qt-widgets/-dialogs
loadTranslation( QString( "qt_" ) + pos,
QString( QT_TRANSLATIONS_DIR ) );
#endif
// load actual translation for LMMS
loadTranslation( pos );
// load translation for Qt-widgets/-dialogs
#ifdef QT_TRANSLATIONS_DIR
// load from the original path first
loadTranslation(QString("qt_") + pos, QT_TRANSLATIONS_DIR);
#endif
// override it with bundled/custom one, if exists
loadTranslation(QString("qt_") + pos, ConfigManager::inst()->localeDir());
// try to set realtime priority
#if defined(LMMS_BUILD_LINUX) || defined(LMMS_BUILD_FREEBSD)