[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdesupport/kdewin-installer/gui
From:       Ralf Habacker <Ralf.Habacker () freenet ! de>
Date:       2008-03-29 0:11:45
Message-ID: 1206749505.952251.17085.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 791319 by habacker:

- compile fix

 M  +3 -3      CMakeLists.txt  
 M  +5 -26     installwizard.cpp  
 M  +0 -1      installwizard.h  


--- trunk/kdesupport/kdewin-installer/gui/CMakeLists.txt #791318:791319
@@ -48,7 +48,7 @@
    ${CMAKE_CURRENT_SOURCE_DIR}/installerenginegui.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/installpage.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/usercompilermodepage.cpp
-   ${CMAKE_CURRENT_SOURCE_DIR}/enduserinstallmodepage.cpp
+#   ${CMAKE_CURRENT_SOURCE_DIR}/enduserinstallmodepage.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/enduserpackageselectorpage.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/installwizard.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/internetsettingspage.cpp
@@ -71,7 +71,7 @@
    ${CMAKE_CURRENT_SOURCE_DIR}/installerenginegui.h
    ${CMAKE_CURRENT_SOURCE_DIR}/installpage.h
    ${CMAKE_CURRENT_SOURCE_DIR}/usercompilermodepage.h
-   ${CMAKE_CURRENT_SOURCE_DIR}/enduserinstallmodepage.h
+#   ${CMAKE_CURRENT_SOURCE_DIR}/enduserinstallmodepage.h
    ${CMAKE_CURRENT_SOURCE_DIR}/enduserpackageselectorpage.h
    ${CMAKE_CURRENT_SOURCE_DIR}/installwizard.h
    ${CMAKE_CURRENT_SOURCE_DIR}/internetsettingspage.h
@@ -89,7 +89,7 @@
    ${CMAKE_CURRENT_SOURCE_DIR}/finishpage.ui
    ${CMAKE_CURRENT_SOURCE_DIR}/installdirectorypage.ui
    ${CMAKE_CURRENT_SOURCE_DIR}/usercompilermodepage.ui
-   ${CMAKE_CURRENT_SOURCE_DIR}/enduserinstallmodepage.ui
+#   ${CMAKE_CURRENT_SOURCE_DIR}/enduserinstallmodepage.ui
    ${CMAKE_CURRENT_SOURCE_DIR}/enduserpackageselectorpage.ui
    ${CMAKE_CURRENT_SOURCE_DIR}/internetsettingspage.ui
    ${CMAKE_CURRENT_SOURCE_DIR}/mirrorsettingspage.ui
--- trunk/kdesupport/kdewin-installer/gui/installwizard.cpp #791318:791319
@@ -41,7 +41,7 @@
 #include "installdirectorypage.h"
 #include "internetsettingspage.h"
 #include "downloadsettingspage.h"
-#include "enduserinstallmodepage.h"
+//#include "enduserinstallmodepage.h"
 #include "enduserpackageselectorpage.h"
 //#include "enduserupdatepage.h"
 //#include "enduserrepairpage.h"
@@ -81,16 +81,7 @@
     // must be first
     setWizardStyle(QWizard::ModernStyle);
     setPixmap(QWizard::LogoPixmap,QPixmap(":/logo.png"));
-    // setting a banner limit the installer width 
-    // setPixmap(QWizard::BannerPixmap, QPixmap(":/images/banner.png"));
-/*
-    _settingsPage = new SettingsPage(this);
-    QPushButton *settingsButton = new QPushButton(tr("Settings"));
-    setButton(QWizard::CustomButton2, settingsButton);
-    setOption(QWizard::HaveCustomButton2, true);
-    connect(settingsButton, SIGNAL(clicked()), this, SLOT(settingsButtonClicked()) \
                );
-    settingsButton->hide();
-*/
+
     setOption(QWizard::NoBackButtonOnStartPage,true);
 
 #ifdef HAVE_RETRY_BUTTON
@@ -100,14 +91,6 @@
     retryButton->hide();
     connect(retryButton, SIGNAL(clicked()), this, SLOT(restart()) );
 #endif
-/*
-    QList<QWizard::WizardButton> layout;
-    layout << QWizard::CustomButton1 << QWizard::Stretch << QWizard::CustomButton2 \
                << QWizard::Stretch 
-            << QWizard::CancelButton << QWizard::BackButton 
-//            << QWizard::CustomButton3 
-            << QWizard::NextButton << QWizard::FinishButton;
-    setButtonLayout(layout);
-*/
     TitlePage *titlePageP = new TitlePage();
     
     QString windowTitle = titlePageP->windowTitle() + QLatin1String(" - Version " \
VERSION); @@ -118,7 +101,7 @@
     setPage(userCompilerModePage, new UserCompilerModePage); 
     setPage(downloadSettingsPage, new DownloadSettingsPage); 
     setPage(internetSettingsPage, new InternetSettingsPage); 
-    setPage(endUserInstallModePage,new EndUserInstallModePage);
+//    setPage(endUserInstallModePage,new EndUserInstallModePage);
     setPage(endUserPackageSelectorPage, new EndUserPackageSelectorPage); 
 //    setPage(endUserUpdatePage,     new EndUserUpdatePage);     
 //    setPage(endUserRepairPage,     new EndUserRepairPage);    
@@ -147,12 +130,6 @@
 {
 }
 
-void InstallWizard::settingsButtonClicked()
-{
-    _settingsPage->init();
-    _settingsPage->exec();
-}
-
 void InstallWizard::reject()
 {
     //there is no page set for this signal 
@@ -271,11 +248,13 @@
         else
             return mirrorSettingsPage;
         
+#if 0
     case endUserInstallModePage:
     { 
         EndUserInstallModePage *_page = \
static_cast<EndUserInstallModePage*>(page(endUserInstallModePage));  return \
_page->nextId();  }
+#endif
     case mirrorSettingsPage: return endUserPackageSelectorPage;
 //    case endUserUpdatePage:        return dependenciesPage;
 //    case endUserRepairPage:        return uninstallPage;
--- trunk/kdesupport/kdewin-installer/gui/installwizard.h #791318:791319
@@ -64,7 +64,6 @@
     virtual int nextId() const;
 
 private slots:
-    void settingsButtonClicked();
     virtual void reject();
     void slotCurrentIdChanged(int id);
     void slotEngineError(const QString &);


[prev in list] [next in list] [prev in thread] [next in thread]