Author: tgoettlicher Date: Fri Aug 19 12:01:58 2011 New Revision: 65374 URL: http://svn.opensuse.org/viewcvs/yast?rev=65374&view=rev Log: - Fixed bnc#549863: useless context menu in category-dock-widget (2.21.5) -This line, and those below, will be ignored-- M control-center/VERSION.cmake M control-center/src/main_window.h M control-center/package/yast2-control-center.changes Modified: trunk/control-center/VERSION.cmake trunk/control-center/package/yast2-control-center.changes trunk/control-center/src/main_window.h Modified: trunk/control-center/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/VERSION.cmake?rev=65374&r1=65373&r2=65374&view=diff ============================================================================== --- trunk/control-center/VERSION.cmake (original) +++ trunk/control-center/VERSION.cmake Fri Aug 19 12:01:58 2011 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "4") +SET(VERSION_PATCH "5") Modified: trunk/control-center/package/yast2-control-center.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/package/yast2-control-center.changes?rev=65374&r1=65373&r2=65374&view=diff ============================================================================== --- trunk/control-center/package/yast2-control-center.changes (original) +++ trunk/control-center/package/yast2-control-center.changes Fri Aug 19 12:01:58 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Aug 19 12:01:25 CEST 2011 - tgoettlicher@suse.de + +- Fixed bnc#549863: useless context menu in category-dock-widget +- Version: 2.21.5 + +------------------------------------------------------------------- Fri Aug 5 14:48:57 CEST 2011 - tgoettlicher@suse.de - Added application icon (bnc #621010) Modified: trunk/control-center/src/main_window.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/main_window.h?rev=65374&r1=65373&r2=65374&view=diff ============================================================================== --- trunk/control-center/src/main_window.h (original) +++ trunk/control-center/src/main_window.h Fri Aug 19 12:01:58 2011 @@ -19,6 +19,7 @@ #include <QMainWindow> +#include <QMenu> #include <QAction> #include <QCloseEvent> @@ -37,6 +38,7 @@ void setFullScreen( bool fs); void setNoBorder( bool nb ); + QMenu* createPopupMenu () { return NULL; }; protected slots: void slotGroupPressed( const QModelIndex &index ); @@ -64,6 +66,7 @@ void setWinTitle(); QSize readGroupViewSize(); + QDockWidget *groupdock; }; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org