[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kcachegrind/frameworks] /: Merge branch 'master' into frameworks
From:       Josef Weidendorfer <Josef.Weidendorfer () gmx ! de>
Date:       2016-11-06 20:15:44
Message-ID: E1c3Tqy-0003ce-C4 () code ! kde ! org
[Download RAW message or body]

Git commit 699bf3671c01c1fd3b97de2eff449821b85fac31 by Josef Weidendorfer.
Committed on 06/11/2016 at 20:13.
Pushed by weidendo into branch 'frameworks'.

Merge branch 'master' into frameworks

M  +19   -12   libviews/functionselection.cpp
M  +1    -1    libviews/functionselection.h
M  +87   -45   qcachegrind/qcgtoplevel.cpp
M  +6    -0    qcachegrind/qcgtoplevel.h

http://commits.kde.org/kcachegrind/699bf3671c01c1fd3b97de2eff449821b85fac31

diff --cc qcachegrind/qcgtoplevel.cpp
index 886f38e,6c48b1f..25eeafd
--- a/qcachegrind/qcgtoplevel.cpp
+++ b/qcachegrind/qcgtoplevel.cpp
@@@ -353,9 -371,23 +371,23 @@@ void QCGTopLevel::createActions(
      _exitAction = new QAction(tr("E&xit"), this);
      _exitAction->setShortcut(tr("Ctrl+Q"));
      _exitAction->setStatusTip(tr("Exit the application"));
 -    connect(_exitAction, SIGNAL(triggered()), this, SLOT(close()));
 +    connect(_exitAction, &QAction::triggered, this, &QWidget::close);
  
      // view menu actions
+ 
+     _primaryMenuAction = new QAction(tr( "Primary Event Type" ), this );
+     _primaryMenuAction->setMenu(new QMenu(this));
+     connect(_primaryMenuAction->menu(), &QMenu::aboutToShow,
+ 	    this, &QCGTopLevel::primaryAboutToShow );
+     _secondaryMenuAction = new QAction(tr( "Secondary Event Type" ), this );
+     _secondaryMenuAction->setMenu(new QMenu(this));
+     connect(_secondaryMenuAction->menu(), &QMenu::aboutToShow,
+ 	    this, &QCGTopLevel::secondaryAboutToShow );
+     _groupingMenuAction = new QAction(tr( "Grouping" ), this );
+     _groupingMenuAction->setMenu(new QMenu(this));
+     connect(_groupingMenuAction->menu(), &QMenu::aboutToShow,
+ 	    this, &QCGTopLevel::groupingAboutToShow );
+ 
      icon = QApplication::style()->standardIcon(QStyle::SP_BrowserReload);
      _cyclesToggleAction = new QAction(icon, tr("Detect Cycles"), this);
      _cyclesToggleAction->setCheckable(true);
[prev in list] [next in list] [prev in thread] [next in thread]