Merge pull request #35 from libyui/improve_cancel_message

Improve cancel message
libyui · Oct 10, 2016 · 84d6316 · 84d6316
2 parents 789441e + ba7835d
commit 84d6316
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/VERSION.cmake b/VERSION.cmake
@@ -1,6 +1,6 @@
 SET( VERSION_MAJOR "2" )
 SET( VERSION_MINOR "45" )
-SET( VERSION_PATCH "6" )
+SET( VERSION_PATCH "7" )
 SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" )
 
 ##### This is need for the libyui core, ONLY.

diff --git a/package/libyui-qt-pkg-doc.spec b/package/libyui-qt-pkg-doc.spec
@@ -20,7 +20,7 @@
 %define so_version 7
 
 Name:           %{parent}-doc
-Version:        2.45.6
+Version:        2.45.7
 Release:        0
 Source:         %{parent}-%{version}.tar.bz2
 

diff --git a/package/libyui-qt-pkg.changes b/package/libyui-qt-pkg.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Oct 10 14:04:41 UTC 2016 - jreidinger@suse.com
+
+- Improve message shown when user want to quit without saving
+  changes (bsc#849084)
+- 2.45.7
+
 -------------------------------------------------------------------
 Wed Nov 25 14:52:07 CET 2015 - gs@suse.de
 

diff --git a/package/libyui-qt-pkg.spec b/package/libyui-qt-pkg.spec
@@ -17,7 +17,7 @@
 
 
 Name:           libyui-qt-pkg
-Version:        2.45.6
+Version:        2.45.7
 Release:        0
 Source:         %{name}-%{version}.tar.bz2
 

diff --git a/src/YQPackageSelectorBase.cc b/src/YQPackageSelectorBase.cc
@@ -245,11 +245,11 @@ YQPackageSelectorBase::reject()
     {
 	int result =
 	    QMessageBox::warning( this, "",
-				  _( "Abandon all changes?" ),
-				  _( "&Abandon" ), _( "&Cancel" ), "",
+				  _( "Do you want to Abandon all changes and exit?" ),
+				  _( "&Yes" ), _( "&No" ), "",
 				  1, // defaultButtonNumber (from 0)
 				  1 ); // escapeButtonNumber
-	
+
 	confirm = ( result == 0 );
     }