Changeset 2877

Timestamp:

10/09/08 08:38:17 (17 months ago)

Author:

kris

Message:

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.

Location:

pcbsd

Files:

• branches/7.0/PCInstall/pcinstall.cpp (modified) (2 diffs)
• branches/7.0/PCInstall/pcinstall.h (modified) (1 diff)
• branches/7.0/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.InstallLangCD.sh (deleted)
• trunk/PCInstall/pcinstall.cpp (modified) (2 diffs)
• trunk/PCInstall/pcinstall.h (modified) (1 diff)
• trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.InstallLangCD.sh (deleted)

pcbsd/branches/7.0/PCInstall/pcinstall.cpp

@@ -2966 +2966 @@
 
 
-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()
 {
@@ -3035 +3008 @@
       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() ) );
 

pcbsd/branches/7.0/PCInstall/pcinstall.h

@@ -91 +91 @@
     void selectComponentSlot();
     void removeComponentSlot();
-    void slotRunInstallLangCD();
     void slotRunInstallComponents();
     void readInstallComponentSlot();

pcbsd/trunk/PCInstall/pcinstall.cpp

@@ -2966 +2966 @@
 
 
-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()
 {
@@ -3035 +3008 @@
       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() ) );
 

pcbsd/trunk/PCInstall/pcinstall.h

@@ -91 +91 @@
     void selectComponentSlot();
     void removeComponentSlot();
-    void slotRunInstallLangCD();
     void slotRunInstallComponents();
     void readInstallComponentSlot();