[PC-BSD Commits] r19099 - pcbsd/current/src-qt4/pc-installgui

[svn at pcbsd.org]

Author: kris
Date: 2012-09-12 18:09:53 +0000 (Wed, 12 Sep 2012)
New Revision: 19099

Modified:
   pcbsd/current/src-qt4/pc-installgui/installer.cpp
Log:

Fix a bug when we customize TrueOS packages, and then click Customize again

While here, clarify the titles on the custom package screen, so you know
which is being run again. 

Reported By: Curt Dox


Modified: pcbsd/current/src-qt4/pc-installgui/installer.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-installgui/installer.cpp	2012-09-12 17:45:44 UTC (rev 19098)
+++ pcbsd/current/src-qt4/pc-installgui/installer.cpp	2012-09-12 18:09:53 UTC (rev 19099)
@@ -454,7 +454,7 @@
 void Installer::slotDesktopCustomizeClicked()
 {
   desks = new desktopSelection();
-  if ( wheelCurItem != wPCSERVER && wheelCurItem != 11 )
+  if ( wheelCurItem != wPCSERVER && wheelCurItem != 11 && wheelCurItem != 12)
      desks->programInit(listDeskPkgs,selectedPkgs);
   else
      desks->programInit(listServerPkgs,selectedPkgs);
@@ -467,11 +467,24 @@
 void Installer::slotSaveMetaChanges(QStringList sPkgs)
 {
   selectedPkgs = sPkgs;
-  groupDeskSummary->setTitle(tr("Custom Package Selection"));
-  textDeskSummary->setText(tr("The following meta-pkgs will be installed:") + "<br>" + selectedPkgs.join("<br>"));
+
   // Only add +10 if we are not already on the custom screen
   if ( wheelCurItem < 10 )
     wheelCurItem= wheelCurItem + 10;
+
+  switch (wheelCurItem) {
+    case 12:
+        groupDeskSummary->setTitle(tr("TrueOS Package Selection"));
+        break;
+    case 11:
+        groupDeskSummary->setTitle(tr("FreeBSD Package Selection"));
+        break;
+    default:
+        groupDeskSummary->setTitle(tr("PC-BSD Package Selection"));
+        break;
+  }
+
+  textDeskSummary->setText(tr("The following meta-pkgs will be installed:") + "<br>" + selectedPkgs.join("<br>"));
   graphicsViewOS->setScene(customScene);
 }