From 93a174b0e50d87422af767e05ed474fd50026222 Mon Sep 17 00:00:00 2001 From: ikemo Date: Wed, 3 May 2006 06:17:29 +0000 Subject: [PATCH] remove LoginPrefPage git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/kita/kita/trunk@1822 56b19765-1e22-0410-a548-a0f45d66c51a --- kita/src/prefs/Makefile.am | 4 +- kita/src/prefs/loginprefbase.ui | 219 +++++++++++++++++++++------------------ kita/src/prefs/loginprefpage.cpp | 38 ------- kita/src/prefs/loginprefpage.h | 33 ------ kita/src/prefs/prefs.cpp | 6 +- kita/src/prefs/prefs.h | 4 +- 6 files changed, 122 insertions(+), 182 deletions(-) delete mode 100644 kita/src/prefs/loginprefpage.cpp delete mode 100644 kita/src/prefs/loginprefpage.h diff --git a/kita/src/prefs/Makefile.am b/kita/src/prefs/Makefile.am index 46ace77..a607afb 100644 --- a/kita/src/prefs/Makefile.am +++ b/kita/src/prefs/Makefile.am @@ -2,5 +2,5 @@ INCLUDES = $(all_includes) -I.. METASOURCES = AUTO lib_LTLIBRARIES = libkitapref.la libkitapref_la_LDFLAGS = $(all_libraries) -libkitapref_la_SOURCES = aboneprefbase.ui aboneprefpage.cpp asciiartprefbase.ui loginprefbase.ui loginprefpage.cpp uiprefbase.ui prefs.cpp faceprefbase.ui writeprefbase.ui -noinst_HEADERS = aboneprefpage.h loginprefpage.h prefs.h writeprefbase.ui.h +libkitapref_la_SOURCES = aboneprefbase.ui aboneprefpage.cpp asciiartprefbase.ui loginprefbase.ui uiprefbase.ui prefs.cpp faceprefbase.ui writeprefbase.ui +noinst_HEADERS = aboneprefpage.h prefs.h writeprefbase.ui.h diff --git a/kita/src/prefs/loginprefbase.ui b/kita/src/prefs/loginprefbase.ui index 48f7441..3cdcea2 100644 --- a/kita/src/prefs/loginprefbase.ui +++ b/kita/src/prefs/loginprefbase.ui @@ -1,4 +1,4 @@ - + Kita::LoginPrefBase @@ -15,148 +15,161 @@ Form1 - + unnamed - + - layout5 + layout6 - + unnamed - layout8 + layout6 - + unnamed - + - userIDLabel - - - User ID + layout5 + + + unnamed + + + + userIDLabel + + + User ID + + + + + kcfg_UserID + + + + + kcfg_Password + + + Password + + + + + passwordLabel + + + Password + + + - + - kcfg_UserID + spacer6 - - - - passwordLabel + + Horizontal - - Password + + Expanding - - - - passwordLine + + + 285 + 20 + - - + + - + - spacer6 + kcfg_AutoLogin - - Horizontal + + enables &auto login - - Expanding + + Alt+A - - - 40 - 20 - - - - - - - - kcfg_AutoLogin - - - enables &auto login - - - Alt+A - - - - - layout6 - - - - unnamed - + - layout9 + layout6 - + unnamed - + - BeMailAddressLabel - - - Be mail address + layout9 + + + unnamed + + + + BeMailAddressLabel + + + Be mail address + + + + + kcfg_BeMailAddress + + + + + BeAuthCodeLabel + + + Be auth code + + + + + kcfg_BeAuthCode + + + - + - kcfg_BeMailAddress + spacer7 - - - - BeAuthCodeLabel + + Horizontal - - Be auth code + + Expanding - - - - kcfg_BeAuthCode + + + 40 + 20 + - - + + - - - spacer7 - - - Horizontal - - - Expanding - - - - 40 - 20 - - - - + - + spacer5 @@ -169,16 +182,16 @@ 20 - 260 + 325 - + klineedit.h - kpassdlg.h + klineedit.h klineedit.h klineedit.h diff --git a/kita/src/prefs/loginprefpage.cpp b/kita/src/prefs/loginprefpage.cpp deleted file mode 100644 index a73710d..0000000 --- a/kita/src/prefs/loginprefpage.cpp +++ /dev/null @@ -1,38 +0,0 @@ -/*************************************************************************** -* Copyright (C) 2004 by Kita Developers * -* ikemo@users.sourceforge.jp * -* * -* This program is free software; you can redistribute it and/or modify * -* it under the terms of the GNU General Public License as published by * -* the Free Software Foundation; either version 2 of the License, or * -* (at your option) any later version. * -***************************************************************************/ -#include "loginprefpage.h" - -#include "libkita/kitaconfig.h" -#include "libkita/config_xt.h" - -#include - -#include -#include - -using namespace Kita; -LoginPrefPage::LoginPrefPage( QWidget *parent ) - : LoginPrefBase( parent ) -{ - passwordLine->insert( Kita::Config::password() ); - - connect( passwordLine, SIGNAL( textChanged( const QString& ) ), - SIGNAL( changed() ) ); -} - -LoginPrefPage::~LoginPrefPage() -{} - -void LoginPrefPage::apply() -{ - Kita::Config::setPassword( passwordLine->password() ); -} - -#include "loginprefpage.moc" diff --git a/kita/src/prefs/loginprefpage.h b/kita/src/prefs/loginprefpage.h deleted file mode 100644 index 8ba39d1..0000000 --- a/kita/src/prefs/loginprefpage.h +++ /dev/null @@ -1,33 +0,0 @@ -/*************************************************************************** -* Copyright (C) 2004 by Kita Developers * -* ikemo@users.sourceforge.jp * -* * -* This program is free software; you can redistribute it and/or modify * -* it under the terms of the GNU General Public License as published by * -* the Free Software Foundation; either version 2 of the License, or * -* (at your option) any later version. * -***************************************************************************/ -#ifndef KITALOGINPREFPAGE_H -#define KITALOGINPREFPAGE_H - -#include "loginprefbase.h" - -namespace Kita -{ - /** - @author Hideki Ikemoto - */ - class LoginPrefPage : public LoginPrefBase - { - Q_OBJECT - public slots: - void apply(); - public: - LoginPrefPage( QWidget *parent = 0 ); - ~LoginPrefPage(); - signals: - void changed(); - }; -} - -#endif diff --git a/kita/src/prefs/prefs.cpp b/kita/src/prefs/prefs.cpp index db73ad3..d51956c 100644 --- a/kita/src/prefs/prefs.cpp +++ b/kita/src/prefs/prefs.cpp @@ -36,7 +36,7 @@ #include "libkita/boardmanager.h" #include "libkita/config_xt.h" #include "aboneprefpage.h" -#include "loginprefpage.h" +#include "loginprefbase.h" #include "writeprefbase.h" using namespace Kita; @@ -65,7 +65,7 @@ KitaPreferences::KitaPreferences( QWidget* parent ) m_abonePage = new Kita::AbonePrefPage( 0 ); addPage( m_abonePage, i18n( "Abone" ), "kita" ); - m_loginPage = new Kita::LoginPrefPage( 0 ); + m_loginPage = new Kita::LoginPrefBase( 0 ); addPage( m_loginPage, i18n( "Login" ), "connect_established" ); m_writePage = new Kita::WritePrefBase( 0 ); @@ -104,7 +104,6 @@ void KitaPreferences::slotApply() break; case 4: // login - m_loginPage->apply(); break; case 5: // write @@ -155,7 +154,6 @@ void KitaPreferences::slotOk() m_asciiArtPage->apply(); m_uiPage->apply(); m_abonePage->apply(); - m_loginPage->apply(); KDialogBase::slotOk(); } diff --git a/kita/src/prefs/prefs.h b/kita/src/prefs/prefs.h index 548d4e7..e883ff0 100644 --- a/kita/src/prefs/prefs.h +++ b/kita/src/prefs/prefs.h @@ -29,7 +29,7 @@ namespace Kita class AsciiArtPrefPage; class UIPrefPage; class AbonePrefPage; - class LoginPrefPage; + class LoginPrefBase; class FacePrefPage; class WritePrefBase; } @@ -49,7 +49,7 @@ private: Kita::AsciiArtPrefPage* m_asciiArtPage; Kita::UIPrefPage* m_uiPage; Kita::AbonePrefPage* m_abonePage; - Kita::LoginPrefPage* m_loginPage; + Kita::LoginPrefBase* m_loginPage; Kita::WritePrefBase* m_writePage; private slots: -- 2.11.0