svnno****@sourc*****
svnno****@sourc*****
2009年 7月 24日 (金) 23:11:08 JST
ForkRevision: 2467
http://sourceforge.jp/projects/kita/svn/view?view=rev&revision=2467
Author: nogu
Date: 2009-07-24 23:11:08 +0900 (Fri, 24 Jul 2009)
Log Message:
-----------
implement LoginPrefPage
Modified Paths:
--------------
kita/branches/KITA-KDE4/kita/src/libkita/CMakeLists.txt
kita/branches/KITA-KDE4/kita/src/libkita/globalconfig.kcfg
kita/branches/KITA-KDE4/kita/src/mainwindow.cpp
kita/branches/KITA-KDE4/kita/src/prefs/loginprefpage.cpp
kita/branches/KITA-KDE4/kita/src/writeview.cpp
Added Paths:
-----------
kita/branches/KITA-KDE4/kita/src/libkita/accountconfig.kcfg
kita/branches/KITA-KDE4/kita/src/libkita/accountconfig.kcfgc
Modified: kita/branches/KITA-KDE4/kita/src/libkita/CMakeLists.txt
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/CMakeLists.txt 2009-07-24 13:29:53 UTC (rev 2466)
+++ kita/branches/KITA-KDE4/kita/src/libkita/CMakeLists.txt 2009-07-24 14:11:08 UTC (rev 2467)
@@ -27,6 +27,7 @@
kde4_add_kcfg_files(kita_LIB_SRCS
abone.kcfgc
+ accountconfig.kcfgc
asciiart.kcfgc
colorconfig.kcfgc
globalconfig.kcfgc
Added: kita/branches/KITA-KDE4/kita/src/libkita/accountconfig.kcfg
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/accountconfig.kcfg (rev 0)
+++ kita/branches/KITA-KDE4/kita/src/libkita/accountconfig.kcfg 2009-07-24 14:11:08 UTC (rev 2467)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
+ http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
+ <kcfgfile name="kitarc" />
+ <group name="Account">
+ <entry name="BeMailAddress" type="String">
+ <label>Mail address of be.2ch.net</label>
+ </entry>
+ <entry name="BeAuthCode" type="String">
+ <label>Auth code of be.2ch.net</label>
+ </entry>
+ <entry name="UserID" type="String">
+ <label>Maru user id</label>
+ </entry>
+ <entry name="AutoLogin" type="Bool">
+ <label>Whether login automatically or not.</label>
+ <default>false</default>
+ </entry>
+ <entry name="Password" type="Password">
+ <label>Maru password</label>
+ </entry>
+ </group>
+</kcfg>
Added: kita/branches/KITA-KDE4/kita/src/libkita/accountconfig.kcfgc
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/accountconfig.kcfgc (rev 0)
+++ kita/branches/KITA-KDE4/kita/src/libkita/accountconfig.kcfgc 2009-07-24 14:11:08 UTC (rev 2467)
@@ -0,0 +1,6 @@
+File=accountconfig.kcfg
+ClassName=AccountConfig
+NameSpace=Kita
+Singleton=true
+Mutators=true
+Visibility=KDE_EXPORT
Modified: kita/branches/KITA-KDE4/kita/src/libkita/globalconfig.kcfg
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/globalconfig.kcfg 2009-07-24 13:29:53 UTC (rev 2466)
+++ kita/branches/KITA-KDE4/kita/src/libkita/globalconfig.kcfg 2009-07-24 14:11:08 UTC (rev 2467)
@@ -73,24 +73,6 @@
<default>http://menu.2ch.net/bbsmenu.html</default>
</entry>
</group>
- <group name="Account">
- <entry name="BeMailAddress" type="String">
- <label>Mail address of be.2ch.net</label>
- </entry>
- <entry name="BeAuthCode" type="String">
- <label>Auth code of be.2ch.net</label>
- </entry>
- <entry name="UserID" type="String">
- <label>Maru user id</label>
- </entry>
- <entry name="AutoLogin" type="Bool">
- <label>Whether login automatically or not.</label>
- <default>false</default>
- </entry>
- <entry name="Password" type="Password">
- <label>Maru password</label>
- </entry>
- </group>
<group name="Completion">
<entry name="NameCompletionList" type="StringList">
<label>Name Completion list.</label>
Modified: kita/branches/KITA-KDE4/kita/src/mainwindow.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/mainwindow.cpp 2009-07-24 13:29:53 UTC (rev 2466)
+++ kita/branches/KITA-KDE4/kita/src/mainwindow.cpp 2009-07-24 14:11:08 UTC (rev 2467)
@@ -40,6 +40,7 @@
#include "writetabwidget.h"
#include "libkita/abone.h"
#include "libkita/account.h"
+#include "libkita/accountconfig.h"
#include "libkita/asciiart.h"
#include "libkita/datmanager.h"
#include "libkita/favoriteboards.h"
@@ -132,7 +133,7 @@
// update favorite list
ViewMediator::getInstance()->updateFavoriteListView();
- if (GlobalConfig::autoLogin()) {
+ if (AccountConfig::autoLogin()) {
login();
}
}
@@ -172,7 +173,7 @@
void MainWindow::login()
{
- if (Account::login(GlobalConfig::userID(), GlobalConfig::password())) {
+ if (Account::login(AccountConfig::userID(), AccountConfig::password())) {
setMainStatus(i18n("Login succeeded."));
} else {
setMainStatus(i18n("Login failed."));
Modified: kita/branches/KITA-KDE4/kita/src/prefs/loginprefpage.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/prefs/loginprefpage.cpp 2009-07-24 13:29:53 UTC (rev 2466)
+++ kita/branches/KITA-KDE4/kita/src/prefs/loginprefpage.cpp 2009-07-24 14:11:08 UTC (rev 2467)
@@ -10,6 +10,8 @@
#include "loginprefpage.h"
+#include "libkita/accountconfig.h"
+
using namespace Kita;
LoginPrefPage::LoginPrefPage(QWidget* parent) : AbstractPrefPage(parent)
@@ -20,12 +22,25 @@
void LoginPrefPage::apply()
{
+ AccountConfig::setBeMailAddress(kcfg_BeMailAddress->text());
+ AccountConfig::setBeAuthCode(kcfg_BeAuthCode->text());
+ AccountConfig::setUserID(kcfg_UserID->text());
+ AccountConfig::setAutoLogin(kcfg_AutoLogin->isChecked());
+ AccountConfig::setPassword(kcfg_Password->text());
}
void LoginPrefPage::load()
{
+ kcfg_BeMailAddress->setText(AccountConfig::beMailAddress());
+ kcfg_BeAuthCode->setText(AccountConfig::beAuthCode());
+ kcfg_UserID->setText(AccountConfig::userID());
+ kcfg_AutoLogin->setChecked(AccountConfig::autoLogin());
+ kcfg_Password->setText(AccountConfig::password());
}
void LoginPrefPage::reset()
{
+ AccountConfig::self()->useDefaults(true);
+ load();
+ AccountConfig::self()->useDefaults(false);
}
Modified: kita/branches/KITA-KDE4/kita/src/writeview.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/writeview.cpp 2009-07-24 13:29:53 UTC (rev 2466)
+++ kita/branches/KITA-KDE4/kita/src/writeview.cpp 2009-07-24 14:11:08 UTC (rev 2467)
@@ -20,6 +20,7 @@
#include "viewmediator.h"
#include "writetabwidget.h"
#include "libkita/account.h"
+#include "libkita/accountconfig.h"
#include "libkita/asciiart.h"
#include "libkita/boardmanager.h"
#include "libkita/datmanager.h"
@@ -96,8 +97,8 @@
// setup 'be' checkbox
QRegExp host_2ch(".+\\.2ch\\.net");
if (host_2ch.indexIn(m_bbscgi.host()) != -1
- && GlobalConfig::beMailAddress().length() > 0
- && GlobalConfig::beAuthCode().length() > 0) {
+ && AccountConfig::beMailAddress().length() > 0
+ && AccountConfig::beAuthCode().length() > 0) {
beBox->setChecked(true);
}
@@ -216,8 +217,8 @@
/* 2ch.net cookie modify */
if (m_bbstype == Board_2ch && beBox->isChecked()) {
QString cookie = "Cookie: ";
- QString BeMailAddress = GlobalConfig::beMailAddress();
- QString BeAuthCode = GlobalConfig::beAuthCode();
+ QString BeMailAddress = AccountConfig::beMailAddress();
+ QString BeAuthCode = AccountConfig::beAuthCode();
if (BeMailAddress.length() > 0 && BeAuthCode.length() > 0) {
cookie += "DMDM=" + BeMailAddress + "; ";
cookie += "MDMD=" + BeAuthCode + "; ";