Author: kmachalkova Date: Thu Dec 10 18:39:14 2009 New Revision: 60060 URL: http://svn.opensuse.org/viewcvs/yast?rev=60060&view=rev Log: Activate Ctrl-Q Modified: trunk/control-center/VERSION.cmake trunk/control-center/package/yast2-control-center.changes trunk/control-center/src/main_window.cpp 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=60060&r1=60059&r2=60060&view=diff ============================================================================== --- trunk/control-center/VERSION.cmake (original) +++ trunk/control-center/VERSION.cmake Thu Dec 10 18:39:14 2009 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") -SET(VERSION_MINOR "18") -SET(VERSION_PATCH "12") +SET(VERSION_MINOR "19") +SET(VERSION_PATCH "0") 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=60060&r1=60059&r2=60060&view=diff ============================================================================== --- trunk/control-center/package/yast2-control-center.changes (original) +++ trunk/control-center/package/yast2-control-center.changes Thu Dec 10 18:39:14 2009 @@ -1,10 +1,12 @@ ------------------------------------------------------------------- Thu Dec 10 13:03:24 CET 2009 - kmachalkova@suse.cz -- Show correctly GenericNames containing comma (convert QStringList +- Correctly show GenericNames containing comma (convert QStringList to QString) (bnc#550085) - Show Name from .desktop (instead of client name) in status line (bnc#544167) +- Enable closing the main window with Ctrl+Q (bnc#551737) +- 2.19.0 ------------------------------------------------------------------- Mon Nov 23 16:30:53 CET 2009 - kmachalkova@suse.cz Modified: trunk/control-center/src/main_window.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/main_window.cpp?rev=60060&r1=60059&r2=60060&view=diff ============================================================================== --- trunk/control-center/src/main_window.cpp (original) +++ trunk/control-center/src/main_window.cpp Thu Dec 10 18:39:14 2009 @@ -162,7 +162,8 @@ readSettings(); - //initActions(); + initActions(); + addAction( shutdown ); //d->modview->addAction( addToF ); //d->modview->setContextMenuPolicy( Qt::ActionsContextMenu ); @@ -181,6 +182,8 @@ connect( d->searchField, SIGNAL( textChanged( const QString &)), SLOT( slotFilterChanged() )); + connect( shutdown, SIGNAL( activated()), qApp, SLOT( quit())); + } void MainWindow::setFullScreen( bool fs ) @@ -195,7 +198,9 @@ void MainWindow::initActions() { - addToF = new QAction( "Add to Favourites", this ); + //addToF = new QAction( "Add to Favourites", this ); + shutdown = new QAction( this ); + shutdown->setShortcut( ("Ctrl+Q") ); } void MainWindow::slotGroupPressed( const QModelIndex &index ) Modified: trunk/control-center/src/main_window.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/main_window.h?rev=60060&r1=60059&r2=60060&view=diff ============================================================================== --- trunk/control-center/src/main_window.h (original) +++ trunk/control-center/src/main_window.h Thu Dec 10 18:39:14 2009 @@ -53,6 +53,7 @@ Private *const d; QAction *addToF; + QAction *shutdown; void writeSettings(); void readSettings(); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org