[PC-BSD Commits] r2877 - in pcbsd: branches/7.0/PCInstall branches/7.0/installcd-overlay/usr/local/pcbsd/scripts trunk/PCInstall trunk/installcd-overlay/usr/local/pcbsd/scripts

[svn at pcbsd.org]

Author: kris
Date: 2008-10-09 08:38:17 -0700 (Thu, 09 Oct 2008)
New Revision: 2877

Removed:
   pcbsd/branches/7.0/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.InstallLangCD.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.InstallLangCD.sh
Modified:
   pcbsd/branches/7.0/PCInstall/pcinstall.cpp
   pcbsd/branches/7.0/PCInstall/pcinstall.h
   pcbsd/trunk/PCInstall/pcinstall.cpp
   pcbsd/trunk/PCInstall/pcinstall.h
Log:


Removed the PCBSD.InstallLangCD.sh script, and associated code from the system installer. With the introduction of KDE 4.1.2, the KDE packages are almost 1/6th the size of them previously, and we will use some of the extra space to have the l10n packages installed by default, allowing the user to "on-the-fly" switch between languages and locales as they see fit. 



Modified: pcbsd/branches/7.0/PCInstall/pcinstall.cpp
===================================================================
--- pcbsd/branches/7.0/PCInstall/pcinstall.cpp	2008-10-09 15:25:07 UTC (rev 2876)
+++ pcbsd/branches/7.0/PCInstall/pcinstall.cpp	2008-10-09 15:38:17 UTC (rev 2877)
@@ -2965,33 +2965,6 @@
 }
 
 
-void PCInstall::slotRunInstallLangCD()
-{
-    QString tmp;
-    
-    	// Get the language selected
-      tmp = listBoxLang->currentText();
-      tmp.remove(0, tmp.find("(") + 1 );
-      tmp.truncate(tmp.find(")") );
-    
-       textFileProgress->setText(tr("Installing Language Packages..."));
-       textFileProgressUpgrade->setText(tr("Installing Language Packages..."));
-	
-       //Setup Process to mount the root partition
-      AddLangFiles = new Q3Process( this );
-      AddLangFiles->addArgument( "/usr/local/pcbsd/scripts/PCBSD.InstallLangCD.sh" );
-      AddLangFiles->addArgument( tmp );
-      
-      connect( AddLangFiles, SIGNAL(processExited()), this, SLOT(slotFinishedInstallCD3()) );
-      connect( AddLangFiles, SIGNAL(readyReadStdout()), this, SLOT(readLangInstallSlot() ) );
-
-         if ( !AddLangFiles->start() ) {
-	  QMessageBox::warning( this, "PCBSD Installer", "Failed Starting InstallLangCD", "Retry", "Quit", 0, 0, 1 );
-        }
-
-}
-
-
 void PCInstall::slotRunInstallComponents()
 {
        textFileProgress->setText(tr("Installing additional components..."));
@@ -3034,14 +3007,8 @@
       InstallComponentsProc = new Q3Process( this );
       InstallComponentsProc->addArgument( "/usr/local/pcbsd/scripts/PCBSD.InstallCD3.sh" );
       
-      // connect our slots
-     if ( listBoxLang->currentItem() != 0 )
-     {
-        connect( InstallComponentsProc, SIGNAL(processExited()), this, SLOT(slotRunInstallLangCD() ) );
-      } else {
-        connect( InstallComponentsProc, SIGNAL(processExited()), this, SLOT(slotFinishedInstallCD3() ) );
-      }
-
+       // connect our slots
+      connect( InstallComponentsProc, SIGNAL(processExited()), this, SLOT(slotFinishedInstallCD3() ) );
       connect( InstallComponentsProc, SIGNAL(readyReadStdout()), this, SLOT(readInstallComponentSlot() ) );
 
          if ( !InstallComponentsProc->start() ) {

Modified: pcbsd/branches/7.0/PCInstall/pcinstall.h
===================================================================
--- pcbsd/branches/7.0/PCInstall/pcinstall.h	2008-10-09 15:25:07 UTC (rev 2876)
+++ pcbsd/branches/7.0/PCInstall/pcinstall.h	2008-10-09 15:38:17 UTC (rev 2877)
@@ -90,7 +90,6 @@
     void listBoxLayoutChanged();
     void selectComponentSlot();
     void removeComponentSlot();
-    void slotRunInstallLangCD();
     void slotRunInstallComponents();
     void readInstallComponentSlot();
     void userPasswordLineEditLostFocus();

Modified: pcbsd/trunk/PCInstall/pcinstall.cpp
===================================================================
--- pcbsd/trunk/PCInstall/pcinstall.cpp	2008-10-09 15:25:07 UTC (rev 2876)
+++ pcbsd/trunk/PCInstall/pcinstall.cpp	2008-10-09 15:38:17 UTC (rev 2877)
@@ -2965,33 +2965,6 @@
 }
 
 
-void PCInstall::slotRunInstallLangCD()
-{
-    QString tmp;
-    
-    	// Get the language selected
-      tmp = listBoxLang->currentText();
-      tmp.remove(0, tmp.find("(") + 1 );
-      tmp.truncate(tmp.find(")") );
-    
-       textFileProgress->setText(tr("Installing Language Packages..."));
-       textFileProgressUpgrade->setText(tr("Installing Language Packages..."));
-	
-       //Setup Process to mount the root partition
-      AddLangFiles = new Q3Process( this );
-      AddLangFiles->addArgument( "/usr/local/pcbsd/scripts/PCBSD.InstallLangCD.sh" );
-      AddLangFiles->addArgument( tmp );
-      
-      connect( AddLangFiles, SIGNAL(processExited()), this, SLOT(slotFinishedInstallCD3()) );
-      connect( AddLangFiles, SIGNAL(readyReadStdout()), this, SLOT(readLangInstallSlot() ) );
-
-         if ( !AddLangFiles->start() ) {
-	  QMessageBox::warning( this, "PCBSD Installer", "Failed Starting InstallLangCD", "Retry", "Quit", 0, 0, 1 );
-        }
-
-}
-
-
 void PCInstall::slotRunInstallComponents()
 {
        textFileProgress->setText(tr("Installing additional components..."));
@@ -3034,14 +3007,8 @@
       InstallComponentsProc = new Q3Process( this );
       InstallComponentsProc->addArgument( "/usr/local/pcbsd/scripts/PCBSD.InstallCD3.sh" );
       
-      // connect our slots
-     if ( listBoxLang->currentItem() != 0 )
-     {
-        connect( InstallComponentsProc, SIGNAL(processExited()), this, SLOT(slotRunInstallLangCD() ) );
-      } else {
-        connect( InstallComponentsProc, SIGNAL(processExited()), this, SLOT(slotFinishedInstallCD3() ) );
-      }
-
+       // connect our slots
+      connect( InstallComponentsProc, SIGNAL(processExited()), this, SLOT(slotFinishedInstallCD3() ) );
       connect( InstallComponentsProc, SIGNAL(readyReadStdout()), this, SLOT(readInstallComponentSlot() ) );
 
          if ( !InstallComponentsProc->start() ) {

Modified: pcbsd/trunk/PCInstall/pcinstall.h
===================================================================
--- pcbsd/trunk/PCInstall/pcinstall.h	2008-10-09 15:25:07 UTC (rev 2876)
+++ pcbsd/trunk/PCInstall/pcinstall.h	2008-10-09 15:38:17 UTC (rev 2877)
@@ -90,7 +90,6 @@
     void listBoxLayoutChanged();
     void selectComponentSlot();
     void removeComponentSlot();
-    void slotRunInstallLangCD();
     void slotRunInstallComponents();
     void readInstallComponentSlot();
     void userPasswordLineEditLostFocus();