Hello community,
here is the log from the commit of package yast2-qt-pkg for openSUSE:Factory
checked in at Thu Oct 6 17:25:27 CEST 2011.
--------
--- openSUSE:Factory/yast2-qt-pkg/yast2-qt-pkg.changes 2011-10-05
17:48:53.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-qt-pkg/yast2-qt-pkg.changes
2011-10-06 13:41:18.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Oct 6 13:39:33 CEST 2011 - tgoettlic...@suse.de
+
+- Made settings persistant (fate #307220 )
+- 2.21.9
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-qt-pkg-2.21.8.tar.bz2
New:
----
yast2-qt-pkg-2.21.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-qt-pkg.spec ++++++
--- /var/tmp/diff_new_pack.1rwxWR/_old 2011-10-06 17:25:24.000000000 +0200
+++ /var/tmp/diff_new_pack.1rwxWR/_new 2011-10-06 17:25:24.000000000 +0200
@@ -18,13 +18,13 @@
Name: yast2-qt-pkg
-Version: 2.21.8
+Version: 2.21.9
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-qt-pkg-2.21.8.tar.bz2
+Source0: yast2-qt-pkg-2.21.9.tar.bz2
Group: System/YaST
-License: GPL v2 or later
+License: GPL-2.0 or later
BuildRequires: docbook-xsl-stylesheets doxygen libdrm-devel libjpeg-devel
libxcrypt-devel
BuildRequires: libqt4-devel libxslt perl-XML-Writer sgml-skel
update-desktop-files
++++++ yast2-qt-pkg-2.21.8.tar.bz2 -> yast2-qt-pkg-2.21.9.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-qt-pkg-2.21.8/VERSION.cmake
new/yast2-qt-pkg-2.21.9/VERSION.cmake
--- old/yast2-qt-pkg-2.21.8/VERSION.cmake 2011-10-05 10:29:44.000000000
+0200
+++ new/yast2-qt-pkg-2.21.9/VERSION.cmake 2011-10-06 15:06:48.000000000
+0200
@@ -1,3 +1,3 @@
SET(VERSION_MAJOR "2")
SET(VERSION_MINOR "21")
-SET(VERSION_PATCH "8")
+SET(VERSION_PATCH "9")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-qt-pkg-2.21.8/package/yast2-qt-pkg.changes
new/yast2-qt-pkg-2.21.9/package/yast2-qt-pkg.changes
--- old/yast2-qt-pkg-2.21.8/package/yast2-qt-pkg.changes 2011-10-05
10:29:44.000000000 +0200
+++ new/yast2-qt-pkg-2.21.9/package/yast2-qt-pkg.changes 2011-10-06
15:06:48.000000000 +0200
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Thu Oct 6 13:39:33 CEST 2011 - tgoettlic...@suse.de
+
+- Made settings persistant (fate #307220 )
+- 2.21.9
+
+-------------------------------------------------------------------
Wed Oct 5 08:34:23 CEST 2011 - tgoettlic...@suse.de
- Applied Stano's patch to make installation history accessible
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-qt-pkg-2.21.8/src/YQPackageSelector.cc
new/yast2-qt-pkg-2.21.9/src/YQPackageSelector.cc
--- old/yast2-qt-pkg-2.21.8/src/YQPackageSelector.cc 2011-10-05
10:29:44.000000000 +0200
+++ new/yast2-qt-pkg-2.21.9/src/YQPackageSelector.cc 2011-10-06
15:06:48.000000000 +0200
@@ -72,6 +72,7 @@
#include <QTabWidget>
#include <QTimer>
#include <QMenu>
+#include <QSettings>
#define YUILogComponent "qt-pkg"
#include "YUILog.h"
@@ -129,6 +130,9 @@
#define DEFAULT_EXPORT_FILE_NAME "user-packages.xml"
#define FAST_SOLVER 1
+#define SETTINGS_DIR "YaST2"
+
+
YQPackageSelector::YQPackageSelector( YWidget * parent,
@@ -164,6 +168,7 @@
basicLayout();
addMenus(); // Only after all widgets are created!
+ loadSettings(); // Only after menus are created!
makeConnections();
emit loadData();
@@ -426,6 +431,11 @@
}
+YQPackageSelector::~YQPackageSelector()
+{
+ saveSettings();
+}
+
QWidget *
YQPackageSelector::layoutRightPane( QWidget *parent )
{
@@ -650,6 +660,8 @@
void
YQPackageSelector::addMenus()
{
+
+
//
// File menu
//
@@ -779,7 +791,6 @@
_dependencyMenu->addAction( _( "&Check Now" ), this, SLOT(
manualResolvePackageDependencies() ) );
_autoDependenciesAction = new QAction( _( "&Autocheck" ), this );
_autoDependenciesAction->setCheckable( true );
- _autoDependenciesAction->setChecked( AUTO_CHECK_DEPENDENCIES_DEFAULT );
_dependencyMenu->addAction( _autoDependenciesAction );
@@ -797,7 +808,6 @@
_showDevelAction = _optionsMenu->addAction( _( "Show -de&vel Packages" ),
this, SLOT(
pkgExcludeDevelChanged( bool ) ), Qt::Key_F7 );
_showDevelAction->setCheckable(true);
- _showDevelAction->setChecked(true);
_excludeDevelPkgs = new YQPkgObjList::ExcludeRule( _pkgList, QRegExp(
".*-devel(-\\d+bit)?$" ), _pkgList->nameCol() );
YUI_CHECK_NEW( _excludeDevelPkgs );
@@ -807,7 +817,6 @@
_showDebugAction = _optionsMenu->addAction( _( "Show
-&debuginfo/-debugsource Packages" ),
this, SLOT(
pkgExcludeDebugChanged( bool ) ), Qt::Key_F8 );
_showDebugAction->setCheckable(true);
- _showDebugAction->setChecked(true);
_excludeDebugInfoPkgs = new YQPkgObjList::ExcludeRule( _pkgList, QRegExp(
".*-(debuginfo|debugsource)(-32bit)?$" ), _pkgList->nameCol() );
YUI_CHECK_NEW( _excludeDebugInfoPkgs );
_excludeDebugInfoPkgs->enable( false );
@@ -816,27 +825,21 @@
_verifySystemModeAction = _optionsMenu->addAction( _( "&System
Verification Mode" ),
this, SLOT(
pkgVerifySytemModeChanged( bool ) ) );
_verifySystemModeAction->setCheckable(true);
- _verifySystemModeAction->setChecked(
zypp::getZYpp()->resolver()->systemVerification() );
_ignoreAlreadyRecommendAction = _optionsMenu->addAction( _( "&Ignore
Recommended Packages for Already Installed Packages" ),
this, SLOT(
pkgIgnoreAlreadyRecommendedChanged( bool ) ) );
_ignoreAlreadyRecommendAction->setCheckable(true);
- _ignoreAlreadyRecommendAction->setChecked(
zypp::getZYpp()->resolver()->ignoreAlreadyRecommended() );
+
_cleanDepsOnRemoveAction = _optionsMenu->addAction( _( "&Cleanup when
deleting packages" ),
this, SLOT(
pkgCleanDepsOnRemoveChanged( bool ) ) );
_cleanDepsOnRemoveAction->setCheckable(true);
- _cleanDepsOnRemoveAction->setChecked(
zypp::getZYpp()->resolver()->cleandepsOnRemove() );
-
-
_allowVendorChangeAction = _optionsMenu->addAction( _( "&Allow vendor
change" ),
this, SLOT(
pkgAllowVendorChangeChanged( bool ) ) );
_allowVendorChangeAction->setCheckable(true);
- _allowVendorChangeAction->setChecked(
zypp::getZYpp()->resolver()->allowVendorChange() );
-
@@ -1693,5 +1696,45 @@
YQPkgChangesDialog::OptionNone );
// showIfEmpty
}
+void
+YQPackageSelector::loadSettings()
+{
+ QSettings settings( QSettings::UserScope, SETTINGS_DIR,
"YQPackageSelector" );
+
+ _autoDependenciesAction->setChecked(
settings.value("Options/AutocheckDependencies",
+ AUTO_CHECK_DEPENDENCIES_DEFAULT
).toBool() ) ;
+
+ _showDevelAction->setChecked(settings.value("Options/showDevelPackages",
true).toBool());
+
+ _showDebugAction->setChecked(settings.value("Options/showDebugPackages",
true).toBool());
+
+ _verifySystemModeAction->setChecked(
settings.value("Options/systemVerificationMode",
+
zypp::getZYpp()->resolver()->systemVerification() ).toBool() );
+
+ _ignoreAlreadyRecommendAction->setChecked(
settings.value("Options/IgnoreRecommendedPackagesForAlreadyInstalledPackages",
+
zypp::getZYpp()->resolver()->ignoreAlreadyRecommended() ).toBool() );
+
+ _cleanDepsOnRemoveAction->setChecked(
settings.value("Options/CleanupWhenDeletingPackages",
+
zypp::getZYpp()->resolver()->cleandepsOnRemove()).toBool() );
+
+ _allowVendorChangeAction->setChecked(
settings.value("Options/AllowVendorChange",
+
zypp::getZYpp()->resolver()->allowVendorChange() ).toBool() );
+
+}
+
+void
+YQPackageSelector::saveSettings()
+{
+ QSettings settings( QSettings::UserScope, SETTINGS_DIR,
"YQPackageSelector" );
+
+ settings.setValue("Options/AutocheckDependencies",
_autoDependenciesAction->isChecked() );
+ settings.setValue("Options/showDevelPackages",
_showDevelAction->isChecked() );
+ settings.setValue("Options/showDebugPackages",
_showDebugAction->isChecked() );
+ settings.setValue("Options/systemVerificationMode",
_verifySystemModeAction->isChecked() );
+
settings.setValue("Options/IgnoreRecommendedPackagesForAlreadyInstalledPackages",
_ignoreAlreadyRecommendAction->isChecked() );
+ settings.setValue("Options/CleanupWhenDeletingPackages",
_cleanDepsOnRemoveAction->isChecked() );
+ settings.setValue("Options/AllowVendorChange",
_allowVendorChangeAction->isChecked() );
+
+}
#include "YQPackageSelector.moc"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-qt-pkg-2.21.8/src/YQPackageSelector.h
new/yast2-qt-pkg-2.21.9/src/YQPackageSelector.h
--- old/yast2-qt-pkg-2.21.8/src/YQPackageSelector.h 2011-10-05
10:29:44.000000000 +0200
+++ new/yast2-qt-pkg-2.21.9/src/YQPackageSelector.h 2011-10-06
15:06:48.000000000 +0200
@@ -89,6 +89,7 @@
public:
YQPackageSelector( YWidget * parent, long modeFlags = 0 );
+ ~YQPackageSelector();
public slots:
@@ -191,6 +192,16 @@
*/
void updateRepositoryUpgradeLabel();
+ /**
+ * loads settings for the checkboxes in the option menu
+ */
+ void loadSettings();
+
+ /**
+ * saves settings of the checkboxes in the option menu
+ */
+ void saveSettings();
+
signals:
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-qt-pkg-2.21.8/yast2-qt-pkg.spec.in
new/yast2-qt-pkg-2.21.9/yast2-qt-pkg.spec.in
--- old/yast2-qt-pkg-2.21.8/yast2-qt-pkg.spec.in 2011-10-05
10:29:44.000000000 +0200
+++ new/yast2-qt-pkg-2.21.9/yast2-qt-pkg.spec.in 2011-10-06
15:06:48.000000000 +0200
@@ -3,7 +3,7 @@
@HEADER@
Group: System/YaST
-License: GPL v2 or later
+License: GPL-2.0 or later
BuildRequires: docbook-xsl-stylesheets doxygen libdrm-devel libjpeg-devel
libxcrypt-devel
BuildRequires: libxslt perl-XML-Writer libqt4-devel sgml-skel
update-desktop-files
continue with "q"...
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
