[PC-BSD Commits] r13675 - pcbsd/current/src-qt4/pc-softwaremanager

svn at pcbsd.org svn at pcbsd.org
Wed Nov 2 08:32:56 PDT 2011


Author: kris
Date: 2011-11-02 08:32:56 -0700 (Wed, 02 Nov 2011)
New Revision: 13675

Modified:
   pcbsd/current/src-qt4/pc-softwaremanager/softmanager-main.cpp
   pcbsd/current/src-qt4/pc-softwaremanager/softmanager-pbiupdate.cpp
Log:

Fix AppCafe to show PBIs that are manually created / installed and not assocated with any particular repo. 




Modified: pcbsd/current/src-qt4/pc-softwaremanager/softmanager-main.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-softwaremanager/softmanager-main.cpp	2011-11-02 15:07:33 UTC (rev 13674)
+++ pcbsd/current/src-qt4/pc-softwaremanager/softmanager-main.cpp	2011-11-02 15:32:56 UTC (rev 13675)
@@ -439,6 +439,7 @@
     loadPBIs->setProcessChannelMode(QProcess::MergedChannels);
     loadPBIs->start(QString("pbi_info"), QStringList() << "-v");
     loadPBIs->waitForFinished(-1);
+    repoID="-1";
 
     qDebug("Reading PBI List");
     while ( loadPBIs->canReadLine() ) {
@@ -532,7 +533,7 @@
 	   author="";
 	   website="";
 	   arch="";
-	   repoID="";
+    	   repoID="-1";
 	   autoUpdate="";
 	   installBy="";
     	}

Modified: pcbsd/current/src-qt4/pc-softwaremanager/softmanager-pbiupdate.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-softwaremanager/softmanager-pbiupdate.cpp	2011-11-02 15:07:33 UTC (rev 13674)
+++ pcbsd/current/src-qt4/pc-softwaremanager/softmanager-pbiupdate.cpp	2011-11-02 15:32:56 UTC (rev 13675)
@@ -376,8 +376,11 @@
       {
          popup = new QMenu();
 	 popup->setTitle(item->getName());
-         popup->addAction( tr("View details"), this, SLOT(slotViewPBIClicked()));
 
+	 // If this is in an associated repo show the view details option
+ 	 if ( item->getRepoID() != "-1" )
+           popup->addAction( tr("View details"), this, SLOT(slotViewPBIClicked()));
+
          if ( ! item->isNewDownload() ) {
            popup->addSeparator();
            popup->addAction( tr("Install Desktop Icons"), this, SLOT(slotAddDesktopIcons()));



More information about the Commits mailing list