[PC-BSD Commits] r1391 - in pbibuild/pbi-source: PBIsource PBItext

[svn at pcbsd.org]

Author: kris
Date: 2008-02-14 18:19:35 -0800 (Thu, 14 Feb 2008)
New Revision: 1391

Modified:
   pbibuild/pbi-source/PBIsource/pbi.ui.h
   pbibuild/pbi-source/PBItext/main.cpp
Log:

Fixed a few bugs relating to the Edu fixes for the kmenu



Modified: pbibuild/pbi-source/PBIsource/pbi.ui.h
===================================================================
--- pbibuild/pbi-source/PBIsource/pbi.ui.h	2008-02-15 01:29:02 UTC (rev 1390)
+++ pbibuild/pbi-source/PBIsource/pbi.ui.h	2008-02-15 02:19:35 UTC (rev 1391)
@@ -697,14 +697,18 @@
 	{
 	    SubDir = "";  
 	} else if (ExeOwndir[exenum] == 1) {
-	    SubDir =  "/"  + ExeKdeCat[exenum] + "/";
+            if ( ExeKdeCat[exenum].find("Edutainment") != -1 ) {
+	      SubDir = "/Edutainment/";
+            } else {
+	      SubDir =  "/"  + ExeKdeCat[exenum] + "/";
+            }
 	} else {
 	    SubDir="";
 	}
 	
 	
-	QDir LaunchDir;
-	LaunchDir.mkdir("/usr/local/share/applnk/" +SubDir + ProgramName);
+        QDir LaunchDir;
+        LaunchDir.mkdir("/usr/local/share/applnk/" +SubDir + ProgramName);
 	
 	QFile diricon("/usr/local/share/applnk/" + SubDir + ProgramName + "/.directory");
                if ( diricon.open( IO_WriteOnly) ) {
@@ -864,10 +868,30 @@
 		 {
 		       stream << "Categories=Qt;KDE;Editors;\n";
 		 }
-		 if ( ExeKdeCat[exenum] == "Edutainment")
-		 {
-		       stream << "Categories=Qt;KDE;Edutainment;\n";
-		 }
+                 if ( ExeKdeCat[exenum] == "Edutainment")
+                 {
+                       stream << "Categories=Qt;KDE;Education;\n";
+                 }
+                 if ( ExeKdeCat[exenum] == "Edutainment/Languages")
+                 {
+                       stream << "Categories=Qt;KDE;Education;Languages;\n";
+                 }
+                 if ( ExeKdeCat[exenum] == "Edutainment/Math")
+                 {
+                       stream << "Categories=Qt;KDE;Education;Math;\n";
+                 }
+                 if ( ExeKdeCat[exenum] == "Edutainment/Misc")
+                 {
+                       stream << "Categories=Qt;KDE;Education;\n";
+                 }
+                 if ( ExeKdeCat[exenum] == "Edutainment/Science")
+                 {
+                       stream << "Categories=Qt;KDE;Education;Science;\n";
+                 }
+                 if ( ExeKdeCat[exenum] == "Edutainment/Teaching")
+                 {
+                       stream << "Categories=Qt;KDE;Education;Teaching;\n";
+                 }
 		 if ( ExeKdeCat[exenum] == "Games/Arcade")
 		 {
 		       stream << "Categories=Qt;KDE;Game;ArcadeGame;\n";

Modified: pbibuild/pbi-source/PBItext/main.cpp
===================================================================
--- pbibuild/pbi-source/PBItext/main.cpp	2008-02-15 01:29:02 UTC (rev 1390)
+++ pbibuild/pbi-source/PBItext/main.cpp	2008-02-15 02:19:35 UTC (rev 1391)
@@ -638,7 +638,11 @@
 	{
 	    SubDir = "";  
 	} else if (ExeOwndir[exenum] == 1) {
-	    SubDir =  "/"  + ExeKdeCat[exenum] + "/";
+            if ( ExeKdeCat[exenum].find("Edutainment") != -1 ) {
+              SubDir = "/Edutainment/";
+            } else {
+              SubDir =  "/"  + ExeKdeCat[exenum] + "/";
+            }
 	} else {
 	    SubDir="";
 	}
@@ -804,10 +808,30 @@
 		 {
 		       stream << "Categories=Qt;KDE;Editors;\n";
 		 }
-		 if ( ExeKdeCat[exenum] == "Edutainment")
-		 {
-		       stream << "Categories=Qt;KDE;Edutainment;\n";
-		 }
+                 if ( ExeKdeCat[exenum] == "Edutainment")
+                 {
+                       stream << "Categories=Qt;KDE;Education;\n";
+                 }
+                 if ( ExeKdeCat[exenum] == "Edutainment/Languages")
+                 {
+                       stream << "Categories=Qt;KDE;Education;Languages;\n";
+                 }
+                 if ( ExeKdeCat[exenum] == "Edutainment/Math")
+                 {
+                       stream << "Categories=Qt;KDE;Education;Math;\n";
+                 }
+                 if ( ExeKdeCat[exenum] == "Edutainment/Misc")
+                 {
+                       stream << "Categories=Qt;KDE;Education;\n";
+                 }
+                 if ( ExeKdeCat[exenum] == "Edutainment/Science")
+                 {
+                       stream << "Categories=Qt;KDE;Education;Science;\n";
+                 }
+                 if ( ExeKdeCat[exenum] == "Edutainment/Teaching")
+                 {
+                       stream << "Categories=Qt;KDE;Education;Teaching;\n";
+                 }
 		 if ( ExeKdeCat[exenum] == "Games/Arcade")
 		 {
 		       stream << "Categories=Qt;KDE;Game;ArcadeGame;\n";