jfmcarreira/calyp
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'devel' into features_recentfilelist

Browse Source
This commit is contained in:
jfmcarreira committed 2014-10-04 12:47:55 +01:00
2 parents b9b2df9b7e ba2b3bfca5
commit fdc4d8b923
4 files changed
+40 -23
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

source/app/plaYUVerApp.cpp
+2 -2
View File
@@ -886,7 +886,7 @@ Void plaYUVerApp::updatePixelValueStatusBar( const QPoint & pos, PlaYUVerFrame*
Void plaYUVerApp::dragEnterEvent( QDragEnterEvent *event )
{
//setText(tr("<drop content>"));
setBackgroundRole( QPalette::Highlight );
mdiArea->setBackgroundRole( QPalette::Highlight );
event->acceptProposedAction();
}
@@ -1277,7 +1277,7 @@ Void plaYUVerApp::createMenus()
m_arrayMenu[DOCK_VIEW_MENU] = createPopupMenu();
if( m_arrayMenu[DOCK_VIEW_MENU] )
{
actionPopupMenu = m_arrayMenu[VIEW_MENU]->addMenu( m_arrayMenu[DOCK_VIEW_MENU] );
QAction *actionPopupMenu = m_arrayMenu[VIEW_MENU]->addMenu( m_arrayMenu[DOCK_VIEW_MENU] );
actionPopupMenu->setText( tr( "&Toolbars/Docks" ) );
}