Mailinglist Archive: yast-commit (595 mails)

< Previous Next >
[yast-commit] r53955 - in /trunk/qt-pkg: VERSION.cmake package/yast2-qt-pkg.changes src/YQPkgObjList.cc src/YQPkgObjList.h
  • From: dmacvicar@xxxxxxxxxxxxxxxx
  • Date: Fri, 05 Dec 2008 16:50:28 -0000
  • Message-id: <20081205165028.C6AB9B1B8A@xxxxxxxxxxxxxxxx>
Author: dmacvicar
Date: Fri Dec 5 17:50:28 2008
New Revision: 53955

URL: http://svn.opensuse.org/viewcvs/yast?rev=53955&view=rev
Log:
hide the solver information feature if the package is not
present on the installation media (the popup has no sense there)
(bnc #450065)


Modified:
trunk/qt-pkg/VERSION.cmake
trunk/qt-pkg/package/yast2-qt-pkg.changes
trunk/qt-pkg/src/YQPkgObjList.cc
trunk/qt-pkg/src/YQPkgObjList.h

Modified: trunk/qt-pkg/VERSION.cmake
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/VERSION.cmake?rev=53955&r1=53954&r2=53955&view=diff
==============================================================================
--- trunk/qt-pkg/VERSION.cmake (original)
+++ trunk/qt-pkg/VERSION.cmake Fri Dec 5 17:50:28 2008
@@ -1,3 +1,3 @@
SET(VERSION_MAJOR "2")
SET(VERSION_MINOR "17")
-SET(VERSION_PATCH "22")
+SET(VERSION_PATCH "23")

Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/package/yast2-qt-pkg.changes?rev=53955&r1=53954&r2=53955&view=diff
==============================================================================
--- trunk/qt-pkg/package/yast2-qt-pkg.changes (original)
+++ trunk/qt-pkg/package/yast2-qt-pkg.changes Fri Dec 5 17:50:28 2008
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Fri Dec 5 17:46:08 CET 2008 - dmacvicar@xxxxxxx
+
+- hide the solver information feature if the package is not
+ present on the installation media (the popup has no sense there)
+ (bnc #450065)
+- V 2.17.23
+
+-------------------------------------------------------------------
Tue Dec 2 14:06:07 CET 2008 - sh@xxxxxxx

- Fixed bnc #450280: Text cut off in repository list

Modified: trunk/qt-pkg/src/YQPkgObjList.cc
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgObjList.cc?rev=53955&r1=53954&r2=53955&view=diff
==============================================================================
--- trunk/qt-pkg/src/YQPkgObjList.cc (original)
+++ trunk/qt-pkg/src/YQPkgObjList.cc Fri Dec 5 17:50:28 2008
@@ -35,7 +35,8 @@
#include "YQi18n.h"
#include "YQIconPool.h"
#include "YQUI.h"
-#include "YQZyppSolverDialogPluginStub.h"
+
+#include "zypp/ZYppFactory.h"

using std::list;
using std::string;
@@ -318,8 +319,7 @@

if ( item )
{
- YQZyppSolverDialogPluginStub plugin;
- plugin.createZyppSolverDialog(item->zyppObj()->poolItem());
+ _plugin.createZyppSolverDialog(item->zyppObj()->poolItem());
}
}

@@ -429,6 +429,32 @@
connect( actionSetListUpdateForce, SIGNAL( activated() ), this, SLOT(
setListUpdateForce() ) );
connect( actionSetListTaboo, SIGNAL( activated() ), this, SLOT(
setListTaboo() ) );
connect( actionSetListProtected, SIGNAL( activated() ), this, SLOT(
setListProtected() ) );
+
+ // if the solver info plugin did not success to load (which is, the package
+ // of the plugin is not installed or was not included in the media
+ //
+ // it will show up a popup when called, however, if we are in installation
+ // (that is, target is not / or there is no target at all,
+ // the user will have no chance of installing
+ // the plugin package, therefore we disable the action.
+ //
+ zypp::Target_Ptr target = zypp::getZYpp()->getTarget();
+ if ( ! target || ( target->root() != "/" ) )
+ {
+ // there is no target or the target is mounted out of root
+ // which means install or update
+ // if the plugin did not load
+ if ( ! _plugin.success() )
+ {
+ // grey out the option
+ yuiMilestone() << "Disabling solver info plugin: not available and
no target or target is not /" << endl;
+ actionShowCurrentSolverInfo->setVisible(false);
+ }
+ else
+ {
+ yuiMilestone() << "target not available or target or target is not
/. Solver info plugin available anyway." << endl;
+ }
+ }
}



Modified: trunk/qt-pkg/src/YQPkgObjList.h
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgObjList.h?rev=53955&r1=53954&r2=53955&view=diff
==============================================================================
--- trunk/qt-pkg/src/YQPkgObjList.h (original)
+++ trunk/qt-pkg/src/YQPkgObjList.h Fri Dec 5 17:50:28 2008
@@ -31,6 +31,8 @@
#include <zypp/Edition.h>
#include <FSize.h>

+#include "YQZyppSolverDialogPluginStub.h"
+
class YQPkgObjListItem;
class QAction;
class QMenu;
@@ -385,9 +387,7 @@
QAction * actionSetListTaboo;
QAction * actionSetListProtected;

-
-public:
-
+ YQZyppSolverDialogPluginStub _plugin;
};



--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages