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

svn at pcbsd.org svn at pcbsd.org
Wed Mar 20 00:16:51 PDT 2013


Author: kris
Date: 2013-03-20 07:16:51 +0000 (Wed, 20 Mar 2013)
New Revision: 21908

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

Remove broken slider bar, just use small text widget to explain to users
that they can click left and right arrow on install screen



Modified: pcbsd/current/src-qt4/pc-installgui/installer.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-installgui/installer.cpp	2013-03-19 19:16:13 UTC (rev 21907)
+++ pcbsd/current/src-qt4/pc-installgui/installer.cpp	2013-03-20 07:16:51 UTC (rev 21908)
@@ -561,12 +561,14 @@
 
 void Installer::moveDesktopWheel(bool direction)
 {
+  qDebug() << wheelCurItem << direction;
   // Make sure we aren't scrolling too far
   if ( direction && wheelCurItem >= wheelIcons.size() )
     return;
   if ( ! direction && wheelCurItem <= 1 )
     return;
 
+
   int tItem, tPixel, cPixel;
   cPixel=96 + ((wheelCurItem-1) * 64) + (wheelCurItem * 32);
 
@@ -598,7 +600,7 @@
   }
   
   wheelCurItem=tItem;
-  deskSlider->setValue(wheelCurItem);
+
   groupDeskSummary->setTitle(wheelName.at(tItem-1));
   textDeskSummary->setText(wheelDesc.at(tItem-1));
 
@@ -681,18 +683,12 @@
     }
     graphicsViewOS->setScene(defaultScene);
 
-    // desk slider
-    deskSlider->setMinimum(1);
-    deskSlider->setMaximum(6);
-    deskSlider->setTickInterval(1);
-
     // If less than 2GB memory, default to LXDE, otherwise KDE
     if ( systemMemory > 2048 )  {
       wheelCurItem=2;
     } else {
       wheelCurItem=3;
     }
-    deskSlider->setValue(wheelCurItem);
     graphicsViewOS->centerOn(191,0);
     graphicsViewOS->show();
     moveDesktopWheel(true);
@@ -704,34 +700,8 @@
     connect(pushDeskRight,SIGNAL(clicked()), this, SLOT(slotDesktopRightClicked()));
     connect(pushDeskLeft,SIGNAL(clicked()), this, SLOT(slotDesktopLeftClicked()));
     connect(pushDeskCustomize,SIGNAL(clicked()), this, SLOT(slotDesktopCustomizeClicked()));
-    connect(deskSlider,SIGNAL(valueChanged(int)), this, SLOT(slotDeskSliderChanged(int)));
 }
 
-void Installer::slotDeskSliderChanged(int val)
-{
-    if ( wheelCurItem >= 10 ) {
-    int ret = QMessageBox::question(this, tr("PC-BSD Installer"), tr("You currently have a custom package set configured. Continue changing to a default set?"),
-                              QMessageBox::No | QMessageBox::Yes,
-                              QMessageBox::No);
-      switch (ret) {
-      case QMessageBox::Yes:
-        break;
-      case QMessageBox::No: // :)
-        deskSlider->setValue(wheelCurItem);
-        return;
-        break;
-      } 
-      wheelCurItem = wheelCurItem - 10;
-      graphicsViewOS->setScene(defaultScene);
-    }
-
-    if ( val > wheelCurItem)
-      moveDesktopWheel(true);
-    else
-      moveDesktopWheel(false);
-      
-}
-
 void Installer::proceed(bool forward)
 {
     int count = installStackWidget->count() - 1;

Modified: pcbsd/current/src-qt4/pc-installgui/installer.h
===================================================================
--- pcbsd/current/src-qt4/pc-installgui/installer.h	2013-03-19 19:16:13 UTC (rev 21907)
+++ pcbsd/current/src-qt4/pc-installgui/installer.h	2013-03-20 07:16:51 UTC (rev 21908)
@@ -65,7 +65,6 @@
     void slotDesktopCustomizeClicked();
     void slotSaveMetaChanges(QStringList);
     void slotSaveFBSDSettings(QString, QString, QString, QString, QString, QString, bool, bool, bool, QStringList);
-    void slotDeskSliderChanged(int val);
 
 
 private:

Modified: pcbsd/current/src-qt4/pc-installgui/installer.ui
===================================================================
(Binary files differ)



More information about the Commits mailing list