svnno****@sourc*****
svnno****@sourc*****
2009年 7月 19日 (日) 08:33:09 JST
ForkRevision: 2439
http://sourceforge.jp/projects/kita/svn/view?view=rev&revision=2439
Author: nogu
Date: 2009-07-19 08:33:09 +0900 (Sun, 19 Jul 2009)
Log Message:
-----------
- remove an unused parameter
- don't set colors
- fix the position of "Favorites"
Modified Paths:
--------------
kita/branches/KITA-KDE4/kita/src/bbsview.cpp
kita/branches/KITA-KDE4/kita/src/bbsview.h
kita/branches/KITA-KDE4/kita/src/kitaui/listviewitem.cpp
kita/branches/KITA-KDE4/kita/src/kitaui/listviewitem.h
Modified: kita/branches/KITA-KDE4/kita/src/bbsview.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/bbsview.cpp 2009-07-18 22:41:39 UTC (rev 2438)
+++ kita/branches/KITA-KDE4/kita/src/bbsview.cpp 2009-07-18 23:33:09 UTC (rev 2439)
@@ -52,7 +52,7 @@
/*--------------------------------------*/
-BBSView::BBSView(QWidget *, const char *name) : m_favorites(0)
+BBSView::BBSView(QWidget *parent) : QWidget(parent), m_favorites(0)
{
/* copied from Base class */
bbsViewBaseLayout = new QVBoxLayout(this);
@@ -76,12 +76,6 @@
m_boardList->setHeaderLabel(i18n("board name"));
m_boardList->header()->setClickable(false);
- /* default colors */
- QPalette palette = m_boardList->viewport() ->palette();
- m_textColor = palette.text();
- m_baseColor = palette.base();
- m_backColor = m_boardList->viewport()->palette().color(QPalette::Background);
-
connect(m_boardList, SIGNAL(itemActivated(QTreeWidgetItem*, int)),
SLOT(loadBoard(QTreeWidgetItem*)));
connect(FavoriteBoards::getInstance(), SIGNAL(changed()),
@@ -272,21 +266,6 @@
*/
void BBSView::showBoardList()
{
- /* color setting */
- /*
- m_textColor = QColor("white");
- m_baseColor = QColor("red");
- m_backColor = QColor("yellow");
- m_altColor = QColor("blue");
- */
- /*-------------------------------------------------*/
-
- /* set background color */
- QWidget *widget = m_boardList->viewport();
- QPalette palette;
- palette.setColor(widget->backgroundRole(), m_backColor);
- widget->setPalette(palette);
-
// clear list
m_boardList->clear();
m_favorites = 0;
@@ -303,7 +282,6 @@
KConfigGroup group = config.group(category);
ListViewItem* categoryItem = new ListViewItem(
m_boardList, previous, QStringList(category));
- categoryItem->setColor(m_textColor.color(), m_baseColor.color());
ListViewItem* previousBoard = 0;
for (int count = 0; ; count++) {
@@ -325,7 +303,6 @@
BoardManager::loadBBSHistory(boardURL);
previousBoard = new ListViewItem(categoryItem, previousBoard,
QStringList() << boardName << boardURL);
- previousBoard->setColor(m_textColor.color(), m_baseColor.color());
}
previous = categoryItem;
}
@@ -356,7 +333,6 @@
ListViewItem* categoryItem
= new ListViewItem(m_boardList, QStringList("extboard"));
- categoryItem->setColor(m_textColor.color(), m_baseColor.color());
while (!(str = stream.readLine()).isEmpty()) {
if (! str.isEmpty()) {
@@ -366,10 +342,8 @@
QString board_title = list[ 0 ];
QString board_url = list[ 1 ];
- ListViewItem* tmpitem = new ListViewItem(categoryItem,
+ new ListViewItem(categoryItem,
QStringList() << board_title << board_url);
- tmpitem->setColor(
- m_textColor.color(), m_baseColor.color());
QString oldURL;
int type = Board_Unknown;
if (list.size() == 3) type = list[ 2 ].toInt();
@@ -422,10 +396,9 @@
void BBSView::refreshFavoriteBoards()
{
if (!m_favorites) {
- m_favorites = new ListViewItem(m_boardList,
+ m_favorites = new ListViewItem(m_boardList, 0,
QStringList(i18n("Favorites")));
}
- m_favorites->setColor(m_textColor.color(), m_baseColor.color());
// remove all items.
do {
@@ -441,9 +414,7 @@
QString boardURL = (*it).prettyUrl();
QString boardName = BoardManager::boardName(boardURL);
- ListViewItem* item = new ListViewItem(m_favorites,
- QStringList() << boardName << boardURL);
- item->setColor(m_textColor.color(), m_baseColor.color());
+ new ListViewItem(m_favorites, QStringList() << boardName << boardURL);
}
}
Modified: kita/branches/KITA-KDE4/kita/src/bbsview.h
===================================================================
--- kita/branches/KITA-KDE4/kita/src/bbsview.h 2009-07-18 22:41:39 UTC (rev 2438)
+++ kita/branches/KITA-KDE4/kita/src/bbsview.h 2009-07-18 23:33:09 UTC (rev 2439)
@@ -37,11 +37,6 @@
Q_OBJECT
ListViewItem* m_favorites;
- /* list color */
- QBrush m_textColor;
- QBrush m_baseColor;
- QColor m_backColor;
-
QList<Category> getCategoryList(const QString& html) const;
void saveOpened();
@@ -61,7 +56,7 @@
void slotMenuOpenWithBrowser();
public:
- explicit BBSView(QWidget *parent, const char *name = 0);
+ explicit BBSView(QWidget *parent);
~BBSView();
void loadOpened();
Modified: kita/branches/KITA-KDE4/kita/src/kitaui/listviewitem.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/kitaui/listviewitem.cpp 2009-07-18 22:41:39 UTC (rev 2438)
+++ kita/branches/KITA-KDE4/kita/src/kitaui/listviewitem.cpp 2009-07-18 23:33:09 UTC (rev 2439)
@@ -37,12 +37,3 @@
: QTreeWidgetItem(parent, strings)
{
}
-
-/* public */
-void ListViewItem::setColor(const QColor& textColor, const QColor& baseColor)
-{
- for (int i = 0, j = columnCount(); i < j; i++) {
- setForeground(i, QBrush(textColor));
- setBackground(i, QBrush(baseColor));
- }
-}
Modified: kita/branches/KITA-KDE4/kita/src/kitaui/listviewitem.h
===================================================================
--- kita/branches/KITA-KDE4/kita/src/kitaui/listviewitem.h 2009-07-18 22:41:39 UTC (rev 2438)
+++ kita/branches/KITA-KDE4/kita/src/kitaui/listviewitem.h 2009-07-18 23:33:09 UTC (rev 2439)
@@ -30,11 +30,6 @@
const QStringList& strings);
ListViewItem(QTreeWidgetItem *parent, const QStringList& strings);
-
- void setColor(const QColor& textColor, const QColor& baseColor);
-
- private:
- void init();
};
}