svnno****@sourc*****
svnno****@sourc*****
2009年 8月 5日 (水) 21:51:45 JST
ForkRevision: 2518
http://sourceforge.jp/projects/kita/svn/view?view=rev&revision=2518
Author: nogu
Date: 2009-08-05 21:51:45 +0900 (Wed, 05 Aug 2009)
Log Message:
-----------
allocate new actions in a constructor
Modified Paths:
--------------
kita/branches/KITA-KDE4/kita/src/bbsview.cpp
kita/branches/KITA-KDE4/kita/src/bbsview.h
Modified: kita/branches/KITA-KDE4/kita/src/bbsview.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/bbsview.cpp 2009-08-05 12:36:38 UTC (rev 2517)
+++ kita/branches/KITA-KDE4/kita/src/bbsview.cpp 2009-08-05 12:51:45 UTC (rev 2518)
@@ -83,6 +83,12 @@
SLOT(refreshFavoriteBoards()));
connect(searchCombo, SIGNAL(textChanged(const QString&)),
SLOT(filter(const QString&)));
+
+ m_openWithBrowserAct = new KAction(i18n("Open with Web Browser"), this);
+ m_copyUrlAct = new KAction(i18n("Copy URL"), this);
+ m_copyTitleAndUrlAct = new KAction(i18n("Copy title and URL"), this);
+ m_removeFromFavoritesAct = new KAction(i18n("Remove from Favorites"), this);
+ m_addToFavoritesAct = new KAction(i18n("Add to Favorites"), this);
}
BBSView::~BBSView()
@@ -463,51 +469,33 @@
}
KMenu popup(0);
+ popup.addAction(m_openWithBrowserAct);
+ popup.addAction(m_copyUrlAct);
+ popup.addAction(m_copyTitleAndUrlAct);
+ item->parent() == m_favorites ? popup.addAction(m_removeFromFavoritesAct)
+ : popup.addAction(m_addToFavoritesAct);
- KAction* openWithBrowserAct
- = new KAction(i18n("Open with Web Browser"), this);
- popup.addAction(openWithBrowserAct);
-
- KAction* copyURLAct = new KAction(i18n("Copy URL"), this);
- popup.addAction(copyURLAct);
-
- KAction* copyTitleAndURLAct
- = new KAction(i18n("Copy title and URL"), this);
- popup.addAction(copyTitleAndURLAct);
-
- KAction* removeFromFavoritesAct = 0;
- KAction* addToFavoritesAct = 0;
- if (item->parent() == m_favorites) {
- removeFromFavoritesAct
- = new KAction(i18n("Remove from Favorites"), this);
- popup.addAction(removeFromFavoritesAct);
- } else {
- addToFavoritesAct = new KAction(i18n("Add to Favorites"), this);
- popup.addAction(addToFavoritesAct);
- }
-
QString boardName = item->text(0);
KUrl boardURL = item->text(1);
KUrl boardURL_upToDate = BoardManager::boardURL(boardURL);
QClipboard* clipboard = QApplication::clipboard();
QAction *action = popup.exec(point);
- if (!action) {
- return;
- }
- if (action == openWithBrowserAct) {
+ if (action == m_openWithBrowserAct) {
KRun::runUrl(boardURL, "text/html", this);
- } else if (action == copyURLAct) {
- clipboard->setText(boardURL_upToDate.prettyUrl(), QClipboard::Clipboard);
- clipboard->setText(boardURL_upToDate.prettyUrl(), QClipboard::Selection);
- } else if (action == copyTitleAndURLAct) {
+ } else if (action == m_copyUrlAct) {
+ clipboard->setText(boardURL_upToDate.prettyUrl(),
+ QClipboard::Clipboard);
+ clipboard->setText(boardURL_upToDate.prettyUrl(),
+ QClipboard::Selection);
+ } else if (action == m_copyTitleAndUrlAct) {
clipboard->setText(boardName + '\n' + boardURL_upToDate.prettyUrl(),
QClipboard::Clipboard);
clipboard->setText(boardName + '\n' + boardURL_upToDate.prettyUrl(),
QClipboard::Selection);
- } else if (action == addToFavoritesAct) {
+ } else if (action == m_addToFavoritesAct) {
FavoriteBoards::append(boardURL_upToDate);
- } else if (action == removeFromFavoritesAct) {
+ } else if (action == m_removeFromFavoritesAct) {
FavoriteBoards::remove(boardURL);
}
}
Modified: kita/branches/KITA-KDE4/kita/src/bbsview.h
===================================================================
--- kita/branches/KITA-KDE4/kita/src/bbsview.h 2009-08-05 12:36:38 UTC (rev 2517)
+++ kita/branches/KITA-KDE4/kita/src/bbsview.h 2009-08-05 12:51:45 UTC (rev 2518)
@@ -19,6 +19,7 @@
class QTreeWidgetItem;
class QVBoxLayout;
+class KAction;
class KComboBox;
class KUrl;
@@ -73,6 +74,12 @@
void mousePressEvent(QMouseEvent *e);
BBSView(const BBSView&);
BBSView& operator=(const BBSView&);
+
+ KAction* m_openWithBrowserAct;
+ KAction* m_copyUrlAct;
+ KAction* m_copyTitleAndUrlAct;
+ KAction* m_removeFromFavoritesAct;
+ KAction* m_addToFavoritesAct;
};
}