[PC-BSD Commits] r791 - pcbsd/trunk/kcmPBMsource

svn at pcbsd.org svn at pcbsd.org
Mon Oct 22 08:48:13 PDT 2007


Author: tim
Date: 2007-10-22 08:48:13 -0700 (Mon, 22 Oct 2007)
New Revision: 791

Modified:
   pcbsd/trunk/kcmPBMsource/pbm.ui.h
Log:
Removed some old code, and fixed a tiny error in the last commit

Modified: pcbsd/trunk/kcmPBMsource/pbm.ui.h
===================================================================
--- pcbsd/trunk/kcmPBMsource/pbm.ui.h	2007-10-22 15:44:50 UTC (rev 790)
+++ pcbsd/trunk/kcmPBMsource/pbm.ui.h	2007-10-22 15:48:13 UTC (rev 791)
@@ -178,43 +178,6 @@
     SoftwareListBox->insertItem(pbi);
     qDebug(pbi->text());
     SoftwareListBox->sort();
-    /**
-    while (! ProgName[i].isEmpty())
-    {
-        tmp = ProgName[i];
-        tmp.replace(" ", "");
-        ProgDirName = tmp;
-        tmp = ProgVer[i];
-        tmp.replace(" ", "");
-        ProgDirName = ProgDirName + tmp;
-
-	// Check if our directory exists or not
-	QDir d( "/Programs/" + ProgDirName );  
-   	 if ( !d.exists() ) {
-	 // If the directory doesn't exist, remove the entry
-	 CleanPackageList(i);
-	 PopulateList();
-	 return;
-	}
-
-	qDebug("Working out path for: " + ProgName[i]);
-	QString progPath = "/Programs/" + ProgName[i] + ProgVer[i];
-	progPath.remove(" ");
-	qDebug("Finding size of: " + progPath);
-	ProgSize[i] = getDirSize(progPath);
-        
-        QString iconPath = "";
-        if (ProgIcon[i].isEmpty()) iconPath = "/Programs/.config/application.png";
-        else iconPath = "/Programs/" + ProgDirName + "/" + ProgIcon[i];
-
-        QPixmap PixmapIcon;
-        PixmapIcon.convertFromImage(QImage(iconPath).smoothScale(40,40));
-        qDebug("Inserting " + ProgName[i] + " into ListBox");
-        SoftwareListBox->insertItem(PixmapIcon, ProgName[i] + " " + ProgVer[i] + " (" + bytesToHumanReadable(ProgSize[i]) + ")");
-        
-        i++;
-    }
-    **/
 }
 
 
@@ -349,7 +312,7 @@
    QString progDir = pbi->getName() + pbi->getVersion();
    
    // Check if a custom removal script exists, and run it
-   QFile CheckScript("/Programs/" + progDir + "/pbi->RemoveScript.sh");
+   QFile CheckScript("/Programs/" + progDir + "/PBI.RemoveScript.sh");
    if (CheckScript.exists())
    {
       // Write out the wrapper script
@@ -361,7 +324,7 @@
          stream << "PROGDIR=\"" + progDir + "\"; export PROGDIR\n";
          stream << "USERNAME=\"" + RealUserName + "\"; export USERNAME\n";
          stream << "INSTALLMODE=\"GUI\"; export INSTALLMODE\n";
-         stream << "sh /Programs/" + progDir + "/pbi->RemoveScript.sh ${PROGDIR}\nexit ${?}";
+         stream << "sh /Programs/" + progDir + "/PBI.RemoveScript.sh ${PROGDIR}\nexit ${?}";
          file.close();
       }
       



More information about the Commits mailing list