diff options
Diffstat (limited to 'src/modules/setup')
| -rw-r--r-- | src/modules/setup/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/modules/setup/SetupWizard.cpp (renamed from src/modules/setup/setupwizard.cpp) | 56 | ||||
| -rw-r--r-- | src/modules/setup/SetupWizard.h (renamed from src/modules/setup/setupwizard.h) | 30 | ||||
| -rw-r--r-- | src/modules/setup/libkvisetup.cpp | 4 |
4 files changed, 47 insertions, 47 deletions
diff --git a/src/modules/setup/CMakeLists.txt b/src/modules/setup/CMakeLists.txt index ed4d0c978..ba0ff1003 100644 --- a/src/modules/setup/CMakeLists.txt +++ b/src/modules/setup/CMakeLists.txt @@ -5,12 +5,12 @@ IF(WIN32) ENDIF() SET(kvisetup_MOC_HDRS - setupwizard.h + SetupWizard.h ) SET(kvisetup_SRCS libkvisetup.cpp - setupwizard.cpp + SetupWizard.cpp ) # After this call, files will be moc'ed to moc_kvi_*.cpp diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/SetupWizard.cpp index 32bec3ceb..9d2aeede4 100644 --- a/src/modules/setup/setupwizard.cpp +++ b/src/modules/setup/SetupWizard.cpp @@ -1,6 +1,6 @@ //=============================================================================== // -// File : setupwizard.cpp +// File : SetupWizard.cpp // Creation date : Sat Oct 6 02:06:53 2001 GMT by Szymon Stefanek // // This file is part of the KVIrc irc client distribution @@ -24,7 +24,7 @@ bool g_bFoundMirc; -#include "setupwizard.h" +#include "SetupWizard.h" #include "KviApplication.h" #include "KviLocale.h" @@ -73,7 +73,7 @@ extern QString szMircIni; #define KVI_LOCAL_KVIRC_SUBDIRECTORY_NAME ".config/KVIrc" #endif -KviSetupPage::KviSetupPage(KviSetupWizard * w) +SetupPage::SetupPage(SetupWizard * w) : QWidget(w) { QGridLayout * g = new QGridLayout(this); @@ -127,12 +127,12 @@ KviSetupPage::KviSetupPage(KviSetupWizard * w) m_pVBox->setStretchFactor(m_pTextLabel,1); } -KviSetupPage::~KviSetupPage() +SetupPage::~SetupPage() { } -KviSetupWizard::KviSetupWizard() +SetupWizard::SetupWizard() : KviTalWizard(0) { setModal(true); @@ -154,7 +154,7 @@ KviSetupWizard::KviSetupWizard() ///////////////////////////////////////////////////////////////////////////////////////////////////////////// // Welcome - m_pWelcome = new KviSetupPage(this); + m_pWelcome = new SetupPage(this); // here we go... QString szText = __tr2qs("<p>" \ @@ -178,7 +178,7 @@ KviSetupWizard::KviSetupWizard() ///////////////////////////////////////////////////////////////////////////////////////////////////////////// // License #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) //it have been already shown by installer - KviSetupPage * m_pLicense = new KviSetupPage(this); + SetupPage * m_pLicense = new SetupPage(this); m_pLicense->m_pTextLabel->setText(__tr2qs( \ "<p>All of the files in this distribution are covered by the GPL. " \ "In human terms this can be read as follows:<br>" \ @@ -213,7 +213,7 @@ KviSetupWizard::KviSetupWizard() ///////////////////////////////////////////////////////////////////////////////////////////////////////////// // Directories - m_pDirectory = new KviSetupPage(this); + m_pDirectory = new SetupPage(this); m_pDirectory->m_pTextLabel->setText(__tr2qs("<p>Please choose a folder for " \ "KVIrc to store its settings and other data, and another for downloaded files. " \ @@ -314,7 +314,7 @@ KviSetupWizard::KviSetupWizard() ///////////////////////////////////////////////////////////////////////////////////////////////////////////// // Identity - m_pIdentity = new KviSetupPage(this); + m_pIdentity = new SetupPage(this); m_pIdentity->m_pTextLabel->setText(__tr2qs("Please choose a Nickname.<br><br>" \ "Your nickname is the name that other IRC users will know you by. " \ @@ -420,7 +420,7 @@ KviSetupWizard::KviSetupWizard() ///////////////////////////////////////////////////////////////////////////////////////////////////////////// // Default theme - m_pTheme = new KviSetupPage(this); + m_pTheme = new SetupPage(this); m_pTheme->m_pTextLabel->setText(__tr2qs( \ "<p>Here you can choose the default appearance of KVIrc.<br><br>" \ "The Fancy Theme uses icons, a transparent background and a lot of colors. " \ @@ -486,7 +486,7 @@ KviSetupWizard::KviSetupWizard() ///////////////////////////////////////////////////////////////////////////////////////////////////////////// // Desktop integration - m_pDesktopIntegration = new KviSetupPage(this); + m_pDesktopIntegration = new SetupPage(this); szText = __tr2qs( \ "<p>" \ @@ -520,7 +520,7 @@ KviSetupWizard::KviSetupWizard() /* ///////////////////////////////////////////////////////////////////////////////////////////////////////////// // Server config - m_pServers = new KviSetupPage(this); + m_pServers = new SetupPage(this); m_pServers->m_pTextLabel->setText(__tr2qs( \ "Now you should specify an IRC server, to be connected to it")); @@ -655,12 +655,12 @@ KviSetupWizard::KviSetupWizard() } -KviSetupWizard::~KviSetupWizard() +SetupWizard::~SetupWizard() { delete m_pLabelPixmap; } -void KviSetupWizard::showEvent(QShowEvent *e) +void SetupWizard::showEvent(QShowEvent *e) { int primary_screen = g_pApp->desktop()->primaryScreen(); QRect r = g_pApp->desktop()->screenGeometry(primary_screen); @@ -684,7 +684,7 @@ void KviSetupWizard::showEvent(QShowEvent *e) KviTalWizard::showEvent(e); } -void KviSetupWizard::oldDirClicked() +void SetupWizard::oldDirClicked() { m_pOldPathBox->setEnabled(true); m_pNewPathBox->setEnabled(false); @@ -698,22 +698,22 @@ void KviSetupWizard::oldDirClicked() else setNextEnabled(m_pDirectory,true); } -void KviSetupWizard::oldDataTextChanged ( const QString & str) +void SetupWizard::oldDataTextChanged ( const QString & str) { setNextEnabled(m_pDirectory,!str.isEmpty()); } -void KviSetupWizard::newDataTextChanged ( const QString & str) +void SetupWizard::newDataTextChanged ( const QString & str) { setNextEnabled(m_pDirectory,!str.isEmpty() && !m_pIncomingPathEdit->text().isEmpty()); } -void KviSetupWizard::newIncomingTextChanged ( const QString & str) +void SetupWizard::newIncomingTextChanged ( const QString & str) { setNextEnabled(m_pDirectory,!str.isEmpty() && !m_pDataPathEdit->text().isEmpty()); } -void KviSetupWizard::newDirClicked() +void SetupWizard::newDirClicked() { m_pOldPathBox->setEnabled(false); m_pNewPathBox->setEnabled(true); @@ -727,7 +727,7 @@ void KviSetupWizard::newDirClicked() else setNextEnabled(m_pDirectory,true); } -void KviSetupWizard::portableClicked() +void SetupWizard::portableClicked() { m_pOldPathBox->setEnabled(false); m_pNewPathBox->setEnabled(false); @@ -740,7 +740,7 @@ void KviSetupWizard::portableClicked() setNextEnabled(m_pDirectory,true); } -void KviSetupWizard::chooseOldDataPath() +void SetupWizard::chooseOldDataPath() { // FIXME: We'd like to show hidden directories here ($HOME/.kvirc is hidden)... QString szBuffer = KviTalFileDialog::getExistingDirectoryPath(m_pDataPathEdit->text(),__tr2qs("Choose an Old Configuration Folder - KVIrc Setup"),0); @@ -768,7 +768,7 @@ void KviSetupWizard::chooseOldDataPath() } } -void KviSetupWizard::chooseDataPath() +void SetupWizard::chooseDataPath() { QString szBuffer = KviTalFileDialog::getExistingDirectoryPath(m_pDataPathEdit->text(),__tr2qs("Choose a Configuration Folder - KVIrc Setup"),0); KviFileUtils::adjustFilePath(szBuffer); @@ -779,7 +779,7 @@ void KviSetupWizard::chooseDataPath() } } -void KviSetupWizard::chooseIncomingPath() +void SetupWizard::chooseIncomingPath() { QString szBuffer = KviTalFileDialog::getExistingDirectoryPath(m_pIncomingPathEdit->text(),__tr2qs("Choose a Download Folder - KVIrc Setup"),0); KviFileUtils::adjustFilePath(szBuffer); @@ -789,7 +789,7 @@ void KviSetupWizard::chooseIncomingPath() } } -void KviSetupWizard::makeLink() +void SetupWizard::makeLink() { #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) // Let's make a link on the desktop :) @@ -888,7 +888,7 @@ void KviSetupWizard::makeLink() } -void KviSetupWizard::setUrlHandlers() +void SetupWizard::setUrlHandlers() { #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) QString szReg = "REGEDIT4\r\n" \ @@ -948,7 +948,7 @@ void KviSetupWizard::setUrlHandlers() #endif } -void KviSetupWizard::reject() +void SetupWizard::reject() { if(QMessageBox::warning(this,__tr2qs("Abort Setup - KVIrc Setup"), __tr2qs("You have chosen to abort the setup.<br>KVIrc cannot run until you complete this procedure.<br><br>Do you really wish to abort?"), @@ -957,7 +957,7 @@ void KviSetupWizard::reject() KviTalWizard::reject(); } -void KviSetupWizard::accept() +void SetupWizard::accept() { QString szDir; @@ -1142,5 +1142,5 @@ void KviSetupWizard::accept() } #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "setupwizard.moc" +#include "SetupWizard.moc" #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/setup/setupwizard.h b/src/modules/setup/SetupWizard.h index 9a6efbf88..88df3a4a5 100644 --- a/src/modules/setup/setupwizard.h +++ b/src/modules/setup/SetupWizard.h @@ -2,7 +2,7 @@ #define _SETUPWIZARD_H_ //============================================================================= // -// File : setupwizard.h +// File : SetupWizard.h // Creation date : Sat Oct 6 02:06:51 2001 GMT by Szymon Stefanek // // This file is part of the KVIrc irc client distribution @@ -40,15 +40,15 @@ #include <QCheckBox> #include <QGridLayout> -class KviSetupWizard; +class SetupWizard; -class KviSetupPage : public QWidget +class SetupPage : public QWidget { Q_OBJECT public: - KviSetupPage(KviSetupWizard * w); - ~KviSetupPage(); + SetupPage(SetupWizard * w); + ~SetupPage(); public: KviTalVBox * m_pVBox; QLabel * m_pPixmapLabel; @@ -60,22 +60,22 @@ public: #define THEME_APPLY_HIRES 1 #define THEME_APPLY_LORES 2 -class KviSetupWizard : public KviTalWizard +class SetupWizard : public KviTalWizard { Q_OBJECT public: - KviSetupWizard(); - ~KviSetupWizard(); + SetupWizard(); + ~SetupWizard(); public: QPixmap * m_pLabelPixmap; - KviSetupPage * m_pWelcome; - KviSetupPage * m_pLicense; - KviSetupPage * m_pDirectory; - KviSetupPage * m_pIdentity; - KviSetupPage * m_pTheme; - KviSetupPage * m_pDesktopIntegration; - KviSetupPage * m_pServers; + SetupPage * m_pWelcome; + SetupPage * m_pLicense; + SetupPage * m_pDirectory; + SetupPage * m_pIdentity; + SetupPage * m_pTheme; + SetupPage * m_pDesktopIntegration; + SetupPage * m_pServers; // Theme QGroupBox * m_pThemeButtonGroup; diff --git a/src/modules/setup/libkvisetup.cpp b/src/modules/setup/libkvisetup.cpp index 4a13e85cc..b176f0b83 100644 --- a/src/modules/setup/libkvisetup.cpp +++ b/src/modules/setup/libkvisetup.cpp @@ -22,7 +22,7 @@ // //============================================================================= -#include "setupwizard.h" +#include "SetupWizard.h" #include "KviModule.h" #include "KviOptions.h" @@ -58,7 +58,7 @@ KVIMODULEEXPORTFUNC bool setup_begin() // FIXME: try to guess the user's .kvirc directory // and the preferred nickname from a previous installation - KviSetupWizard * w = new KviSetupWizard(); + SetupWizard * w = new SetupWizard(); int retcode = w->exec(); delete w; return (retcode == QDialog::Accepted); |
