svnno****@sourc*****
svnno****@sourc*****
2009年 8月 6日 (木) 19:33:05 JST
Revision: 2524 http://sourceforge.jp/projects/kita/svn/view?view=rev&revision=2524 Author: nogu Date: 2009-08-06 19:33:04 +0900 (Thu, 06 Aug 2009) Log Message: ----------- - fix a regression in ThreadIndex - remove ThreadIndex::setUrl() - add pointers of KAction as member variables of BoardTabWidget - i18n - kita.html -> index.html (kita.desktop) - add a space to Comment[ja] (kita.desktop) Modified Paths: -------------- kita/branches/KITA-KDE4/kita/po/ja.po kita/branches/KITA-KDE4/kita/po/kita.pot kita/branches/KITA-KDE4/kita/src/boardtabwidget.cpp kita/branches/KITA-KDE4/kita/src/boardtabwidget.h kita/branches/KITA-KDE4/kita/src/kita.desktop kita/branches/KITA-KDE4/kita/src/libkita/datinfo.cpp kita/branches/KITA-KDE4/kita/src/libkita/threadindex.cpp kita/branches/KITA-KDE4/kita/src/libkita/threadindex.h kita/branches/KITA-KDE4/kita/src/threadtabwidget.cpp Modified: kita/branches/KITA-KDE4/kita/po/ja.po =================================================================== --- kita/branches/KITA-KDE4/kita/po/ja.po 2009-08-05 14:32:56 UTC (rev 2523) +++ kita/branches/KITA-KDE4/kita/po/ja.po 2009-08-06 10:33:04 UTC (rev 2524) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: ja\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-05 21:33+0900\n" +"POT-Creation-Date: 2009-08-06 19:29+0900\n" "PO-Revision-Date: 2009-07-27 06:35+0900\n" "Language-Team: 日本語 <kde-i****@kde*****>\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "X-Generator: Lokalize 0.3\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../src/bbsview.cpp:175 +#: ../src/bbsview.cpp:181 msgid "" "\n" "Please create the backup of those caches.\n" @@ -75,11 +75,11 @@ msgid "Abone Word List." msgstr "あぼーん単語一覧。" -#: ../src/kitaui/tabwidgetbase.cpp:145 +#: ../src/kitaui/tabwidgetbase.cpp:147 msgid "Activate Next Tab" msgstr "次のタブをアクティブにする" -#: ../src/kitaui/tabwidgetbase.cpp:150 +#: ../src/kitaui/tabwidgetbase.cpp:152 msgid "Activate Previous Tab" msgstr "前のタブをアクティブにする" @@ -88,7 +88,7 @@ msgid "Add '%1' to abone list" msgstr "'%1'をあぼーん一覧に追加" -#: ../src/bbsview.cpp:485 ../src/threadlistview.cpp:201 +#: ../src/bbsview.cpp:91 ../src/threadlistview.cpp:201 msgid "Add to Favorites" msgstr "お気に入りに追加" @@ -120,7 +120,7 @@ msgid "Auth code of be.2ch.net" msgstr "be.2ch.net の認証コード" -#: ../src/threadlistheaderview.cpp:72 +#: ../src/threadlistheaderview.cpp:60 msgid "Auto Resize" msgstr "自動サイズ変更" @@ -168,7 +168,7 @@ msgid "Be mail address" msgstr "&Be のメールアドレス" -#: ../src/threadlistheaderview.cpp:44 +#: ../src/threadlistheaderview.cpp:46 msgctxt "@title:column" msgid "Board" msgstr "板" @@ -177,7 +177,7 @@ #. i18n: ectx: Menu (board) #. i18n: file: ../src/kitaui.rc:8 #. i18n: ectx: Menu (board) -#: ../src/threadlistheaderview.cpp:44 rc.cpp:6 rc.cpp:12 +#: ../src/threadlistheaderview.cpp:46 rc.cpp:6 rc.cpp:12 msgid "Board" msgstr "板(&B)" @@ -221,23 +221,23 @@ msgid "Close" msgstr "閉じる" -#: ../src/kitaui/tabwidgetbase.cpp:173 +#: ../src/kitaui/tabwidgetbase.cpp:183 msgid "Close All Tabs" msgstr "すべてのタブを閉じる" -#: ../src/boardtabwidget.cpp:199 ../src/kitaui/tabwidgetbase.cpp:169 +#: ../src/boardtabwidget.cpp:174 ../src/kitaui/tabwidgetbase.cpp:177 msgid "Close Left Tabs" msgstr "左のタブすべてを閉じる" -#: ../src/boardtabwidget.cpp:193 ../src/kitaui/tabwidgetbase.cpp:160 +#: ../src/boardtabwidget.cpp:172 ../src/kitaui/tabwidgetbase.cpp:164 msgid "Close Other Tabs" msgstr "他のタブを閉じる" -#: ../src/boardtabwidget.cpp:196 ../src/kitaui/tabwidgetbase.cpp:165 +#: ../src/boardtabwidget.cpp:173 ../src/kitaui/tabwidgetbase.cpp:171 msgid "Close Right Tabs" msgstr "右のタブすべてを閉じる" -#: ../src/boardtabwidget.cpp:186 ../src/kitaui/tabwidgetbase.cpp:155 +#: ../src/boardtabwidget.cpp:171 ../src/kitaui/tabwidgetbase.cpp:157 msgid "Close This Tab" msgstr "このタブを閉じる(&C)" @@ -248,11 +248,11 @@ msgid "Close tab" msgstr "タブを閉じる" -#: ../src/kitaui/tabwidgetbase.cpp:139 +#: ../src/kitaui/tabwidgetbase.cpp:138 msgid "Configure Shortcuts..." msgstr "ショートカットを設定(&H)..." -#: ../src/htmlpart.cpp:763 ../src/bbsview.cpp:184 +#: ../src/htmlpart.cpp:763 ../src/bbsview.cpp:190 msgid "Copy" msgstr "コピー" @@ -260,20 +260,19 @@ msgid "Copy Link Location" msgstr "リンクの場所をコピー" -#: ../src/boardtabwidget.cpp:211 +#: ../src/boardtabwidget.cpp:177 msgid "Copy Title and URL" msgstr "タイトルと URL をコピー" -#: ../src/bbsview.cpp:471 ../src/threadlistview.cpp:72 +#: ../src/bbsview.cpp:88 ../src/threadlistview.cpp:72 msgid "Copy URL" msgstr "URL をコピー" -#: ../src/htmlpart.cpp:1093 ../src/bbsview.cpp:475 -#: ../src/threadlistview.cpp:73 +#: ../src/htmlpart.cpp:1093 ../src/bbsview.cpp:89 ../src/threadlistview.cpp:73 msgid "Copy title and URL" msgstr "タイトルと URL をコピー" -#: ../src/threadlistheaderview.cpp:46 +#: ../src/threadlistheaderview.cpp:48 msgctxt "@title:column" msgid "Dat URL" msgstr "DATファイルのURL" @@ -290,7 +289,7 @@ msgid "DatManager's information" msgstr "インデックスファイルの情報" -#: ../src/threadlistheaderview.cpp:46 +#: ../src/threadlistheaderview.cpp:48 msgid "DatURL" msgstr "DAT ファイルの URL" @@ -318,7 +317,7 @@ msgid "Default name." msgstr "標準の名前" -#: ../src/threadtabwidget.cpp:243 +#: ../src/threadtabwidget.cpp:247 msgid "Delete" msgstr "削除(&D)" @@ -344,7 +343,7 @@ msgid "Display all res" msgstr "すべてのレスを表示" -#: ../src/bbsview.cpp:183 +#: ../src/bbsview.cpp:189 msgid "Do you really want to update board list?" msgstr "本当に板一覧を更新しますか?" @@ -357,7 +356,7 @@ msgid "Do you want to clear the text?" msgstr "テキストをクリアしますか?" -#: ../src/threadview.cpp:556 ../src/boardview.cpp:315 +#: ../src/threadview.cpp:549 ../src/boardview.cpp:315 msgid "Do you want to delete Log?" msgstr "ログを削除しますか?" @@ -382,7 +381,7 @@ msgid "End" msgstr "最後(&E)" -#: ../src/threadtabwidget.cpp:225 +#: ../src/threadtabwidget.cpp:229 msgctxt "@action:intoolbar" msgid "End" msgstr "最後(&E)" @@ -392,11 +391,11 @@ msgstr "外観" #: ../src/boardtabwidget.cpp:38 -msgctxt "Favorite boards" +msgctxt "@title:tab Favorite boards" msgid "Favorite" -msgstr "お気に入り" +msgstr "お気に入り(&A)" -#: ../src/bbsview.cpp:401 +#: ../src/bbsview.cpp:407 msgid "Favorites" msgstr "お気に入り" @@ -437,7 +436,7 @@ msgid "Font" msgstr "フォント" -#: ../src/threadtabwidget.cpp:213 +#: ../src/threadtabwidget.cpp:217 msgid "Go Back Anchor" msgstr "アンカー元に戻る(&G)" @@ -451,7 +450,7 @@ msgid "Hideki Ikemoto" msgstr "Hideki Ikemoto" -#: ../src/threadlistheaderview.cpp:26 +#: ../src/threadlistheaderview.cpp:28 msgid "ID" msgstr "ID" @@ -462,16 +461,16 @@ msgid "ID" msgstr "&ID" -#: ../src/threadlistheaderview.cpp:50 +#: ../src/threadlistheaderview.cpp:52 msgctxt "@title:column" msgid "ID Order" msgstr "IDの順序" -#: ../src/threadlistheaderview.cpp:50 +#: ../src/threadlistheaderview.cpp:52 msgid "IDOrder" msgstr "ID の順序" -#: ../src/threadlistheaderview.cpp:28 +#: ../src/threadlistheaderview.cpp:30 msgid "Icon" msgstr "アイコン" @@ -509,7 +508,7 @@ msgid "Kita - 2ch client for KDE" msgstr "Kita - KDE 用の 2ch ブラウザ" -#: ../src/bbsview.cpp:312 +#: ../src/bbsview.cpp:318 msgid "Kita Board" msgstr "Kita 板" @@ -558,11 +557,11 @@ msgstr "be.2ch.net のメールアドレス" #: ../src/htmlpart.cpp:726 ../src/htmlpart.cpp:1064 -#: ../src/threadlistheaderview.cpp:24 +#: ../src/threadlistheaderview.cpp:26 msgid "Mark" msgstr "マーク" -#: ../src/threadlistheaderview.cpp:48 +#: ../src/threadlistheaderview.cpp:50 msgctxt "@title:column" msgid "Mark Order" msgstr "マークの順序" @@ -573,7 +572,7 @@ msgid "Mark new thread to made:" msgstr "次の時間以内に作成されたスレをマーク(&M):" -#: ../src/threadlistheaderview.cpp:48 +#: ../src/threadlistheaderview.cpp:50 msgid "MarkOrder" msgstr "マークの順序" @@ -610,7 +609,7 @@ msgid "Name Completion list." msgstr "名前補完一覧。" -#: ../src/bbsview.cpp:165 ../src/bbsview.cpp:188 ../src/bbsview.cpp:248 +#: ../src/bbsview.cpp:171 ../src/bbsview.cpp:194 ../src/bbsview.cpp:254 msgid "" "New boards:\n" "\n" @@ -618,7 +617,7 @@ "新規板:\n" "\n" -#: ../src/threadlistheaderview.cpp:26 +#: ../src/threadlistheaderview.cpp:28 msgctxt "@title:column" msgid "No." msgstr "No." @@ -633,7 +632,7 @@ msgid "None" msgstr "なし" -#: ../src/threadview.cpp:523 +#: ../src/threadview.cpp:516 msgid "Not Found" msgstr "見つかりません" @@ -650,7 +649,7 @@ msgstr "&OK" #: ../src/htmlpart.cpp:786 ../src/htmlpart.cpp:1072 ../src/htmlpart.cpp:1239 -#: ../src/bbsview.cpp:468 ../src/boardtabwidget.cpp:208 +#: ../src/bbsview.cpp:87 ../src/boardtabwidget.cpp:176 #: ../src/threadlistview.cpp:71 msgid "Open with Web Browser" msgstr "ウェブブラウザで開く" @@ -695,7 +694,7 @@ msgid "Property" msgstr "プロパティ" -#: ../src/threadlistheaderview.cpp:34 +#: ../src/threadlistheaderview.cpp:36 msgctxt "@title:column" msgid "ReadNum" msgstr "取得" @@ -706,11 +705,11 @@ #. i18n: ectx: property (text), widget (QLabel, idx_readNumLabel0) #. i18n: file: ../src/threadproperty.ui:337 #. i18n: ectx: property (text), widget (QLabel, cache_readNumLabel0) -#: ../src/threadlistheaderview.cpp:34 rc.cpp:207 rc.cpp:222 rc.cpp:234 +#: ../src/threadlistheaderview.cpp:36 rc.cpp:207 rc.cpp:222 rc.cpp:234 msgid "ReadNum" msgstr "取得" -#: ../src/threadtabwidget.cpp:231 +#: ../src/threadtabwidget.cpp:235 msgid "Reload" msgstr "再読み込み(&R)" @@ -737,11 +736,11 @@ msgid "Reload board" msgstr "板の再読み込み" -#: ../src/bbsview.cpp:482 ../src/threadlistview.cpp:201 +#: ../src/bbsview.cpp:90 ../src/threadlistview.cpp:201 msgid "Remove from Favorites" msgstr "お気に入りから削除" -#: ../src/threadlistheaderview.cpp:32 +#: ../src/threadlistheaderview.cpp:34 msgctxt "@title:column" msgid "ResNum" msgstr "レス数" @@ -752,11 +751,11 @@ #. i18n: ectx: property (text), widget (QLabel, idx_resNumLabel0) #. i18n: file: ../src/threadproperty.ui:317 #. i18n: ectx: property (text), widget (QLabel, cache_resNumLabel0) -#: ../src/threadlistheaderview.cpp:32 rc.cpp:204 rc.cpp:219 rc.cpp:231 +#: ../src/threadlistheaderview.cpp:34 rc.cpp:204 rc.cpp:219 rc.cpp:231 msgid "ResNum" msgstr "レス数" -#: ../src/boardtabwidget.cpp:133 ../src/boardtabwidget.cpp:205 +#: ../src/boardtabwidget.cpp:133 ../src/boardtabwidget.cpp:175 msgid "Show Old Logs" msgstr "古いログを表示(&S)" @@ -782,16 +781,16 @@ msgid "Show unread thread first" msgstr "未読のあるスレを先に表示" -#: ../src/threadlistheaderview.cpp:40 +#: ../src/threadlistheaderview.cpp:42 msgctxt "@title:column" msgid "Since" msgstr "スレ立て日時" -#: ../src/threadlistheaderview.cpp:40 +#: ../src/threadlistheaderview.cpp:42 msgid "Since" msgstr "スレ立て日時" -#: ../src/threadlistheaderview.cpp:43 +#: ../src/threadlistheaderview.cpp:45 msgid "Speed" msgstr "速度" @@ -800,15 +799,15 @@ msgid "Start" msgstr "最初(&S)" -#: ../src/threadtabwidget.cpp:219 +#: ../src/threadtabwidget.cpp:223 msgid "Start" msgstr "最初(&S)" -#: ../src/threadtabwidget.cpp:237 +#: ../src/threadtabwidget.cpp:241 msgid "Stop" msgstr "停止(&T)" -#: ../src/threadlistheaderview.cpp:30 +#: ../src/threadlistheaderview.cpp:32 msgid "Subject" msgstr "サブジェクト" @@ -832,7 +831,7 @@ msgid "Text Color" msgstr "文字色(&X)" -#: ../src/bbsview.cpp:174 ../src/bbsview.cpp:189 ../src/bbsview.cpp:249 +#: ../src/bbsview.cpp:180 ../src/bbsview.cpp:195 ../src/bbsview.cpp:255 msgid "" "These boards were moved:\n" "\n" @@ -840,10 +839,15 @@ "以下の板が移動しました:\n" "\n" -#: ../src/threadview.cpp:393 +#: ../src/threadview.cpp:386 msgid "This thread is broken." msgstr "このスレッドは壊れています。" +#: ../src/threadtabwidget.cpp:41 ../src/threadtabwidget.cpp:191 +msgctxt "@title:tab" +msgid "Thread" +msgstr "スレッド" + #. i18n: file: ../src/threadtabwidgetui.rc:4 #. i18n: ectx: Menu (thread) #. i18n: file: ../src/kitaui.rc:11 @@ -894,7 +898,7 @@ msgid "Thread foreground color." msgstr "スレッドの前景色。" -#: ../src/threadlistheaderview.cpp:42 +#: ../src/threadlistheaderview.cpp:44 msgctxt "@title:column" msgid "Thread's speed" msgstr "スレッドの速度" @@ -911,7 +915,7 @@ msgid "Time marked as newly arrived thread. (0 == after last access.)" msgstr "" -#: ../src/threadlistheaderview.cpp:30 +#: ../src/threadlistheaderview.cpp:32 msgctxt "@title:column" msgid "Title" msgstr "タイトル" @@ -926,12 +930,12 @@ msgid "URL of board list" msgstr "板一覧の URL" -#: ../src/threadlistheaderview.cpp:38 +#: ../src/threadlistheaderview.cpp:40 msgctxt "@title:column" msgid "Unread" msgstr "未読" -#: ../src/threadlistheaderview.cpp:38 +#: ../src/threadlistheaderview.cpp:40 msgid "Unread" msgstr "未読" @@ -969,7 +973,7 @@ msgid "User Interface" msgstr "ユーザインターフェース" -#: ../src/threadlistheaderview.cpp:36 +#: ../src/threadlistheaderview.cpp:38 msgctxt "@title:column" msgid "ViewPos" msgstr "ViewPos" @@ -978,7 +982,7 @@ #. i18n: ectx: property (text), widget (QLabel, viewPosLabel0) #. i18n: file: ../src/threadproperty.ui:277 #. i18n: ectx: property (text), widget (QLabel, idx_viewPosLabel0) -#: ../src/threadlistheaderview.cpp:36 rc.cpp:210 rc.cpp:225 +#: ../src/threadlistheaderview.cpp:38 rc.cpp:210 rc.cpp:225 msgid "ViewPos" msgstr "ViewPos" @@ -1140,7 +1144,7 @@ msgid "improvements" msgstr "さまざまな改良" -#: ../src/threadview.cpp:523 +#: ../src/threadview.cpp:516 msgid "kita" msgstr "kita" @@ -1173,7 +1177,7 @@ msgid "name" msgstr "名前" -#: ../src/bbsview.cpp:196 +#: ../src/bbsview.cpp:202 msgid "no new boards" msgstr "新しい板はありません" @@ -1229,10 +1233,6 @@ msgid "this option affects from the next thread." msgstr "このオプションは次のスレッドから有効になります。" -#: ../src/threadtabwidget.cpp:37 -msgid "thread" -msgstr "スレッド" - #. i18n: file: ../src/threadlistviewbase.ui:76 #. i18n: ectx: property (toolTip), widget (QLabel, kindLabel) #: rc.cpp:30 @@ -1510,6 +1510,9 @@ #~ msgid "template" #~ msgstr "置換" +#~ msgid "thread" +#~ msgstr "スレッド" + #~ msgid "to:" #~ msgstr "置換先:" Modified: kita/branches/KITA-KDE4/kita/po/kita.pot =================================================================== --- kita/branches/KITA-KDE4/kita/po/kita.pot 2009-08-05 14:32:56 UTC (rev 2523) +++ kita/branches/KITA-KDE4/kita/po/kita.pot 2009-08-06 10:33:04 UTC (rev 2524) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-05 21:33+0900\n" +"POT-Creation-Date: 2009-08-06 19:29+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL @ ADDRESS>\n" "Language-Team: LANGUAGE <LL****@li*****>\n" @@ -43,7 +43,7 @@ msgstr "" #: ../src/htmlpart.cpp:726 ../src/htmlpart.cpp:1064 -#: ../src/threadlistheaderview.cpp:24 +#: ../src/threadlistheaderview.cpp:26 msgid "Mark" msgstr "" @@ -62,7 +62,7 @@ msgid "End" msgstr "" -#: ../src/htmlpart.cpp:763 ../src/bbsview.cpp:184 +#: ../src/htmlpart.cpp:763 ../src/bbsview.cpp:190 msgid "Copy" msgstr "" @@ -72,7 +72,7 @@ msgstr "" #: ../src/htmlpart.cpp:786 ../src/htmlpart.cpp:1072 ../src/htmlpart.cpp:1239 -#: ../src/bbsview.cpp:468 ../src/boardtabwidget.cpp:208 +#: ../src/bbsview.cpp:87 ../src/boardtabwidget.cpp:176 #: ../src/threadlistview.cpp:71 msgid "Open with Web Browser" msgstr "" @@ -110,8 +110,7 @@ msgid "copy URL" msgstr "" -#: ../src/htmlpart.cpp:1093 ../src/bbsview.cpp:475 -#: ../src/threadlistview.cpp:73 +#: ../src/htmlpart.cpp:1093 ../src/bbsview.cpp:89 ../src/threadlistview.cpp:73 msgid "Copy title and URL" msgstr "" @@ -141,32 +140,33 @@ msgid "None" msgstr "" -#: ../src/threadtabwidget.cpp:37 -msgid "thread" +#: ../src/threadtabwidget.cpp:41 ../src/threadtabwidget.cpp:191 +msgctxt "@title:tab" +msgid "Thread" msgstr "" -#: ../src/threadtabwidget.cpp:213 +#: ../src/threadtabwidget.cpp:217 msgid "Go Back Anchor" msgstr "" -#: ../src/threadtabwidget.cpp:219 +#: ../src/threadtabwidget.cpp:223 msgid "Start" msgstr "" -#: ../src/threadtabwidget.cpp:225 +#: ../src/threadtabwidget.cpp:229 msgctxt "@action:intoolbar" msgid "End" msgstr "" -#: ../src/threadtabwidget.cpp:231 +#: ../src/threadtabwidget.cpp:235 msgid "Reload" msgstr "" -#: ../src/threadtabwidget.cpp:237 +#: ../src/threadtabwidget.cpp:241 msgid "Stop" msgstr "" -#: ../src/threadtabwidget.cpp:243 +#: ../src/threadtabwidget.cpp:247 msgid "Delete" msgstr "" @@ -190,54 +190,54 @@ msgid "board name" msgstr "" -#: ../src/bbsview.cpp:165 ../src/bbsview.cpp:188 ../src/bbsview.cpp:248 +#: ../src/bbsview.cpp:88 ../src/threadlistview.cpp:72 +msgid "Copy URL" +msgstr "" + +#: ../src/bbsview.cpp:90 ../src/threadlistview.cpp:201 +msgid "Remove from Favorites" +msgstr "" + +#: ../src/bbsview.cpp:91 ../src/threadlistview.cpp:201 +msgid "Add to Favorites" +msgstr "" + +#: ../src/bbsview.cpp:171 ../src/bbsview.cpp:194 ../src/bbsview.cpp:254 msgid "" "New boards:\n" "\n" msgstr "" -#: ../src/bbsview.cpp:174 ../src/bbsview.cpp:189 ../src/bbsview.cpp:249 +#: ../src/bbsview.cpp:180 ../src/bbsview.cpp:195 ../src/bbsview.cpp:255 msgid "" "These boards were moved:\n" "\n" msgstr "" -#: ../src/bbsview.cpp:175 +#: ../src/bbsview.cpp:181 msgid "" "\n" "Please create the backup of those caches.\n" msgstr "" -#: ../src/bbsview.cpp:183 +#: ../src/bbsview.cpp:189 msgid "Do you really want to update board list?" msgstr "" -#: ../src/bbsview.cpp:196 +#: ../src/bbsview.cpp:202 msgid "no new boards" msgstr "" -#: ../src/bbsview.cpp:312 +#: ../src/bbsview.cpp:318 msgid "Kita Board" msgstr "" -#: ../src/bbsview.cpp:401 +#: ../src/bbsview.cpp:407 msgid "Favorites" msgstr "" -#: ../src/bbsview.cpp:471 ../src/threadlistview.cpp:72 -msgid "Copy URL" -msgstr "" - -#: ../src/bbsview.cpp:482 ../src/threadlistview.cpp:201 -msgid "Remove from Favorites" -msgstr "" - -#: ../src/bbsview.cpp:485 ../src/threadlistview.cpp:201 -msgid "Add to Favorites" -msgstr "" - #: ../src/boardtabwidget.cpp:38 -msgctxt "Favorite boards" +msgctxt "@title:tab Favorite boards" msgid "Favorite" msgstr "" @@ -250,27 +250,27 @@ msgid "Reload" msgstr "" -#: ../src/boardtabwidget.cpp:133 ../src/boardtabwidget.cpp:205 +#: ../src/boardtabwidget.cpp:133 ../src/boardtabwidget.cpp:175 msgid "Show Old Logs" msgstr "" -#: ../src/boardtabwidget.cpp:186 ../src/kitaui/tabwidgetbase.cpp:155 +#: ../src/boardtabwidget.cpp:171 ../src/kitaui/tabwidgetbase.cpp:157 msgid "Close This Tab" msgstr "" -#: ../src/boardtabwidget.cpp:193 ../src/kitaui/tabwidgetbase.cpp:160 +#: ../src/boardtabwidget.cpp:172 ../src/kitaui/tabwidgetbase.cpp:164 msgid "Close Other Tabs" msgstr "" -#: ../src/boardtabwidget.cpp:196 ../src/kitaui/tabwidgetbase.cpp:165 +#: ../src/boardtabwidget.cpp:173 ../src/kitaui/tabwidgetbase.cpp:171 msgid "Close Right Tabs" msgstr "" -#: ../src/boardtabwidget.cpp:199 ../src/kitaui/tabwidgetbase.cpp:169 +#: ../src/boardtabwidget.cpp:174 ../src/kitaui/tabwidgetbase.cpp:177 msgid "Close Left Tabs" msgstr "" -#: ../src/boardtabwidget.cpp:211 +#: ../src/boardtabwidget.cpp:177 msgid "Copy Title and URL" msgstr "" @@ -321,61 +321,61 @@ msgid "Close tab" msgstr "" -#: ../src/threadview.cpp:393 +#: ../src/threadview.cpp:386 msgid "This thread is broken." msgstr "" -#: ../src/threadview.cpp:523 +#: ../src/threadview.cpp:516 msgid "Not Found" msgstr "" -#: ../src/threadview.cpp:523 +#: ../src/threadview.cpp:516 msgid "kita" msgstr "" -#: ../src/threadview.cpp:556 ../src/boardview.cpp:315 +#: ../src/threadview.cpp:549 ../src/boardview.cpp:315 msgid "Do you want to delete Log?" msgstr "" -#: ../src/kitaui/tabwidgetbase.cpp:139 +#: ../src/kitaui/tabwidgetbase.cpp:138 msgid "Configure Shortcuts..." msgstr "" -#: ../src/kitaui/tabwidgetbase.cpp:145 +#: ../src/kitaui/tabwidgetbase.cpp:147 msgid "Activate Next Tab" msgstr "" -#: ../src/kitaui/tabwidgetbase.cpp:150 +#: ../src/kitaui/tabwidgetbase.cpp:152 msgid "Activate Previous Tab" msgstr "" -#: ../src/kitaui/tabwidgetbase.cpp:173 +#: ../src/kitaui/tabwidgetbase.cpp:183 msgid "Close All Tabs" msgstr "" -#: ../src/threadlistheaderview.cpp:26 +#: ../src/threadlistheaderview.cpp:28 msgctxt "@title:column" msgid "No." msgstr "" -#: ../src/threadlistheaderview.cpp:26 +#: ../src/threadlistheaderview.cpp:28 msgid "ID" msgstr "" -#: ../src/threadlistheaderview.cpp:28 +#: ../src/threadlistheaderview.cpp:30 msgid "Icon" msgstr "" -#: ../src/threadlistheaderview.cpp:30 +#: ../src/threadlistheaderview.cpp:32 msgctxt "@title:column" msgid "Title" msgstr "" -#: ../src/threadlistheaderview.cpp:30 +#: ../src/threadlistheaderview.cpp:32 msgid "Subject" msgstr "" -#: ../src/threadlistheaderview.cpp:32 +#: ../src/threadlistheaderview.cpp:34 msgctxt "@title:column" msgid "ResNum" msgstr "" @@ -386,11 +386,11 @@ #. i18n: ectx: property (text), widget (QLabel, idx_resNumLabel0) #. i18n: file: ../src/threadproperty.ui:317 #. i18n: ectx: property (text), widget (QLabel, cache_resNumLabel0) -#: ../src/threadlistheaderview.cpp:32 rc.cpp:204 rc.cpp:219 rc.cpp:231 +#: ../src/threadlistheaderview.cpp:34 rc.cpp:204 rc.cpp:219 rc.cpp:231 msgid "ResNum" msgstr "" -#: ../src/threadlistheaderview.cpp:34 +#: ../src/threadlistheaderview.cpp:36 msgctxt "@title:column" msgid "ReadNum" msgstr "" @@ -401,11 +401,11 @@ #. i18n: ectx: property (text), widget (QLabel, idx_readNumLabel0) #. i18n: file: ../src/threadproperty.ui:337 #. i18n: ectx: property (text), widget (QLabel, cache_readNumLabel0) -#: ../src/threadlistheaderview.cpp:34 rc.cpp:207 rc.cpp:222 rc.cpp:234 +#: ../src/threadlistheaderview.cpp:36 rc.cpp:207 rc.cpp:222 rc.cpp:234 msgid "ReadNum" msgstr "" -#: ../src/threadlistheaderview.cpp:36 +#: ../src/threadlistheaderview.cpp:38 msgctxt "@title:column" msgid "ViewPos" msgstr "" @@ -414,38 +414,38 @@ #. i18n: ectx: property (text), widget (QLabel, viewPosLabel0) #. i18n: file: ../src/threadproperty.ui:277 #. i18n: ectx: property (text), widget (QLabel, idx_viewPosLabel0) -#: ../src/threadlistheaderview.cpp:36 rc.cpp:210 rc.cpp:225 +#: ../src/threadlistheaderview.cpp:38 rc.cpp:210 rc.cpp:225 msgid "ViewPos" msgstr "" -#: ../src/threadlistheaderview.cpp:38 +#: ../src/threadlistheaderview.cpp:40 msgctxt "@title:column" msgid "Unread" msgstr "" -#: ../src/threadlistheaderview.cpp:38 +#: ../src/threadlistheaderview.cpp:40 msgid "Unread" msgstr "" -#: ../src/threadlistheaderview.cpp:40 +#: ../src/threadlistheaderview.cpp:42 msgctxt "@title:column" msgid "Since" msgstr "" -#: ../src/threadlistheaderview.cpp:40 +#: ../src/threadlistheaderview.cpp:42 msgid "Since" msgstr "" -#: ../src/threadlistheaderview.cpp:42 +#: ../src/threadlistheaderview.cpp:44 msgctxt "@title:column" msgid "Thread's speed" msgstr "" -#: ../src/threadlistheaderview.cpp:43 +#: ../src/threadlistheaderview.cpp:45 msgid "Speed" msgstr "" -#: ../src/threadlistheaderview.cpp:44 +#: ../src/threadlistheaderview.cpp:46 msgctxt "@title:column" msgid "Board" msgstr "" @@ -454,38 +454,38 @@ #. i18n: ectx: Menu (board) #. i18n: file: ../src/kitaui.rc:8 #. i18n: ectx: Menu (board) -#: ../src/threadlistheaderview.cpp:44 rc.cpp:6 rc.cpp:12 +#: ../src/threadlistheaderview.cpp:46 rc.cpp:6 rc.cpp:12 msgid "Board" msgstr "" -#: ../src/threadlistheaderview.cpp:46 +#: ../src/threadlistheaderview.cpp:48 msgctxt "@title:column" msgid "Dat URL" msgstr "" -#: ../src/threadlistheaderview.cpp:46 +#: ../src/threadlistheaderview.cpp:48 msgid "DatURL" msgstr "" -#: ../src/threadlistheaderview.cpp:48 +#: ../src/threadlistheaderview.cpp:50 msgctxt "@title:column" msgid "Mark Order" msgstr "" -#: ../src/threadlistheaderview.cpp:48 +#: ../src/threadlistheaderview.cpp:50 msgid "MarkOrder" msgstr "" -#: ../src/threadlistheaderview.cpp:50 +#: ../src/threadlistheaderview.cpp:52 msgctxt "@title:column" msgid "ID Order" msgstr "" -#: ../src/threadlistheaderview.cpp:50 +#: ../src/threadlistheaderview.cpp:52 msgid "IDOrder" msgstr "" -#: ../src/threadlistheaderview.cpp:72 +#: ../src/threadlistheaderview.cpp:60 msgid "Auto Resize" msgstr "" Modified: kita/branches/KITA-KDE4/kita/src/boardtabwidget.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/boardtabwidget.cpp 2009-08-05 14:32:56 UTC (rev 2523) +++ kita/branches/KITA-KDE4/kita/src/boardtabwidget.cpp 2009-08-06 10:33:04 UTC (rev 2524) @@ -35,7 +35,7 @@ FavoriteListView* favoriteList = new FavoriteListView(this); favoriteList->setObjectName("favoriteTab"); ViewMediator::getInstance()->setFavoriteListView(favoriteList); - addTab(favoriteList, i18nc("Favorite boards", "Favorite")); + addTab(favoriteList, i18nc("@title:tab Favorite boards", "Favorite")); setupActions(); } @@ -168,6 +168,13 @@ { connect(this, SIGNAL(contextMenu(int, const QPoint&)), SLOT(showPopupMenu(int, const QPoint&))); + m_closeAct = new KAction(i18n("Close This Tab"), this); + m_closeOtherAct = new KAction(i18n("Close Other Tabs"), this); + m_closeRightAct = new KAction(i18n("Close Right Tabs"), this); + m_closeLeftAct = new KAction(i18n("Close Left Tabs"), this); + m_showOldLogsAct = new KAction(i18n("Show Old Logs"), this); + m_openBrowserAct = new KAction(i18n("Open with Web Browser"), this); + m_copyTitleAct = new KAction(i18n("Copy Title and URL"), this); } SubjectTabBar::~SubjectTabBar() @@ -180,60 +187,45 @@ BoardTabWidget* tabwidget = static_cast<BoardTabWidget*>(parentWidget()); KActionCollection * collection = tabwidget->actionCollection(); - if (QString::compare(tabwidget->widget(idx) ->objectName(), "favoriteTab") == 0) return ; + if (QString::compare(tabwidget->widget(idx)->objectName(), "favoriteTab") + == 0) + return; KMenu popup(this); - - KAction* closeAct = new KAction(i18n("Close This Tab"), this); - popup.addAction(closeAct); - + popup.addAction(m_closeAct); popup.addAction(collection->action("tab_prevtab")); popup.addAction(collection->action("tab_nexttab")); popup.addSeparator(); - KAction* closeOtherAct = new KAction(i18n("Close Other Tabs"), this); - popup.addAction(closeOtherAct); - - KAction* closeRightAct = new KAction(i18n("Close Right Tabs"), this); - popup.addAction(closeRightAct); - - KAction* closeLeftAct = new KAction(i18n("Close Left Tabs"), this); - popup.addAction(closeLeftAct); - + popup.addAction(m_closeOtherAct); + popup.addAction(m_closeRightAct); + popup.addAction(m_closeLeftAct); popup.addAction(collection->action("tab_closealltab")); popup.addSeparator(); - KAction* showOldLogsAct = new KAction(i18n("Show Old Logs"), this); - popup.addAction(showOldLogsAct); - - KAction* openBrowserAct = new KAction(i18n("Open with Web Browser"), this); - popup.addAction(openBrowserAct); - - KAction* copyTitleAct = new KAction(i18n("Copy Title and URL"), this); - popup.addAction(copyTitleAct); - + popup.addAction(m_showOldLogsAct); + popup.addAction(m_openBrowserAct); + popup.addAction(m_copyTitleAct); popup.addSeparator(); + popup.addAction(collection->action("tab_configkeys")); BoardView* subjectView = static_cast<BoardView *>(tabwidget->widget(idx)); QClipboard* clipboard = QApplication::clipboard(); QAction* action = popup.exec(global); - if (!action) { - return; - } - if (action == closeAct) { + if (action == m_closeAct) { tabwidget->slotCloseTab(idx); - } else if (action == closeOtherAct) { + } else if (action == m_closeOtherAct) { tabwidget->slotCloseOtherTab(idx); - } else if (action == closeRightAct) { + } else if (action == m_closeRightAct) { tabwidget->slotCloseRightTab(idx); - } else if (action == closeLeftAct) { + } else if (action == m_closeLeftAct) { tabwidget->slotCloseLeftTab(idx); - } else if (action == showOldLogsAct) { + } else if (action == m_showOldLogsAct) { tabwidget->slotShowOldLogs(idx); - } else if (action == openBrowserAct) { + } else if (action == m_openBrowserAct) { KRun::runUrl(subjectView->boardURL(), "text/html", this); - } else if (action == copyTitleAct) { + } else if (action == m_copyTitleAct) { QString cliptxt = BoardManager::boardName(subjectView->boardURL()) + '\n' + subjectView->boardURL().prettyUrl(); clipboard->setText(cliptxt , QClipboard::Clipboard); Modified: kita/branches/KITA-KDE4/kita/src/boardtabwidget.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/boardtabwidget.h 2009-08-05 14:32:56 UTC (rev 2523) +++ kita/branches/KITA-KDE4/kita/src/boardtabwidget.h 2009-08-06 10:33:04 UTC (rev 2524) @@ -13,6 +13,8 @@ #include "ktabbar.h" #include "kitaui/tabwidgetbase.h" +class KAction; + namespace Kita { class BoardView; @@ -24,32 +26,33 @@ { Q_OBJECT - public: - explicit BoardTabWidget(QWidget* parent = 0); - ~BoardTabWidget(); + public: + explicit BoardTabWidget(QWidget* parent = 0); + ~BoardTabWidget(); - void updateBoardView(const KUrl& datURL); - public slots: - void loadBoard(const KUrl&); + void updateBoardView(const KUrl& datURL); - private: - BoardView* createView(QString label); - BoardView* findView(const KUrl& boardURL); - BoardView* isSubjectView(QWidget* w); + public slots: + void loadBoard(const KUrl&); - protected: - virtual void deleteWidget(QWidget* w); + private: + BoardView* createView(QString label); + BoardView* findView(const KUrl& boardURL); + BoardView* isSubjectView(QWidget* w); + protected: + virtual void deleteWidget(QWidget* w); + /* tab actions */ - private: - void setupActions(); + private: + void setupActions(); - public slots: - void slotReloadButton(); - void slotFocusSearchCombo(); - void slotShowOldLogs(int idx = -1); + public slots: + void slotReloadButton(); + void slotFocusSearchCombo(); + void slotShowOldLogs(int idx = -1); }; /*--------------------------------------------------*/ @@ -58,13 +61,21 @@ { Q_OBJECT - public: - SubjectTabBar(QWidget* parent = 0); - ~SubjectTabBar(); + public: + explicit SubjectTabBar(QWidget* parent = 0); + ~SubjectTabBar(); - public slots: - virtual void showPopupMenu(int idx, const QPoint& global); + public slots: + virtual void showPopupMenu(int idx, const QPoint& global); + private: + KAction* m_closeAct; + KAction* m_closeOtherAct; + KAction* m_closeRightAct; + KAction* m_closeLeftAct; + KAction* m_showOldLogsAct; + KAction* m_openBrowserAct; + KAction* m_copyTitleAct; }; } Modified: kita/branches/KITA-KDE4/kita/src/kita.desktop =================================================================== --- kita/branches/KITA-KDE4/kita/src/kita.desktop 2009-08-05 14:32:56 UTC (rev 2523) +++ kita/branches/KITA-KDE4/kita/src/kita.desktop 2009-08-06 10:33:04 UTC (rev 2524) @@ -3,8 +3,8 @@ Exec=kita %i -caption "%c" Icon=kita Type=Application -X-DocPath=kita/kita.html +X-DocPath=kita/index.html Comment=Kita - 2ch client for KDE -Comment[ja]=Kita - KDE用2ちゃんねるブラウザ +Comment[ja]=Kita - KDE 用2ちゃんねるブラウザ Terminal=false Categories=Network;WebBrowser;KDE; Modified: kita/branches/KITA-KDE4/kita/src/libkita/datinfo.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/datinfo.cpp 2009-08-05 14:32:56 UTC (rev 2523) +++ kita/branches/KITA-KDE4/kita/src/libkita/datinfo.cpp 2009-08-06 10:33:04 UTC (rev 2524) @@ -39,7 +39,7 @@ { QString refstr; m_datURL = getDatURL(url, refstr); - m_threadIndex.setUrl(m_datURL); + m_threadIndex = ThreadIndex(m_datURL); /* get the pointer of Thread class */ m_thread = Thread::getByURLNew(m_datURL); if (m_thread == 0) { Modified: kita/branches/KITA-KDE4/kita/src/libkita/threadindex.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/threadindex.cpp 2009-08-05 14:32:56 UTC (rev 2523) +++ kita/branches/KITA-KDE4/kita/src/libkita/threadindex.cpp 2009-08-06 10:33:04 UTC (rev 2524) @@ -12,6 +12,7 @@ #include <QtCore/QFile> +#include <kconfig.h> #include <KConfigGroup> #include "cache.h" @@ -24,60 +25,62 @@ ThreadIndex::ThreadIndex(const KUrl& url) : m_url(url) { - setUrl(url); -} - -void ThreadIndex::setUrl(const KUrl& url) -{ - m_url = url; Cache cache(m_url); - QString indexPath = cache.getIndexPath(); - m_config.copyTo(indexPath, &m_config); + m_indexPath = cache.getIndexPath(); } QString ThreadIndex::getSubject() const { - return getSubjectPrivate(); + KConfig config(m_indexPath); + return getSubjectPrivate(config); } void ThreadIndex::setSubject(const QString& str) { - setSubjectPrivate(str); + KConfig config(m_indexPath); + setSubjectPrivate(config, str); } -int ThreadIndex::getResNum() +int ThreadIndex::getResNum() const { - return getResNumPrivate(); + KConfig config(m_indexPath); + return getResNumPrivate(config); } void ThreadIndex::setResNum(int resNum) { - setResNumPrivate(resNum); + KConfig config(m_indexPath); + setResNumPrivate(config, resNum); } -int ThreadIndex::getReadNum() +int ThreadIndex::getReadNum() const { - return getReadNumPrivate(true); + KConfig config(m_indexPath); + return getReadNumPrivate(config, true); } void ThreadIndex::setReadNum(int readNum) { - setReadNumPrivate(readNum); + KConfig config(m_indexPath); + setReadNumPrivate(config, readNum); } int ThreadIndex::getViewPos() const { - return getViewPosPrivate(); + KConfig config(m_indexPath); + return getViewPosPrivate(config); } void ThreadIndex::setViewPos(int viewPos) { - setViewPosPrivate(viewPos); + KConfig config(m_indexPath); + setViewPosPrivate(config, viewPos); } void ThreadIndex::setMarkList(const QList<int>& markList) { - setMarkListPrivate(markList); + KConfig config(m_indexPath); + setMarkListPrivate(config, markList); } @@ -85,33 +88,34 @@ /* load thread information */ /* public */ -void ThreadIndex::loadIndex(Thread* thread, bool checkCached) +void ThreadIndex::loadIndex(Thread* thread, bool checkCached) const { + KConfig config(m_indexPath); /* load read number */ - int readNum = getReadNumPrivate(checkCached); + int readNum = getReadNumPrivate(config, checkCached); if (readNum == 0) return ; /* cache does not exist. */ thread->setReadNum(readNum); /* load thread name */ - QString subject = getSubjectPrivate(); + QString subject = getSubjectPrivate(config); if (subject.isEmpty() && !thread->threadName().isEmpty()) { subject = thread->threadName(); - KConfigGroup group = m_config.group(""); + KConfigGroup group = config.group(""); group.writeEntry("Subject", subject); } if (subject.isEmpty()) thread->setThreadName("?"); else thread->setThreadName(subject); /* load res number */ - thread->setResNum(getResNumPrivate()); + thread->setResNum(getResNumPrivate(config)); /* load view pos */ - thread->setViewPos(getViewPosPrivate()); + thread->setViewPos(getViewPosPrivate(config)); if (thread->viewPos() > thread->readNum()) thread->setReadNum(thread->viewPos()); /* load mark */ - thread->setMarkList(getMarkListPrivate()); + thread->setMarkList(getMarkListPrivate(config)); } @@ -121,25 +125,24 @@ { /* If readNum == 0, delete idx file */ if (thread->readNum() == 0) { - Cache cache(m_url); - QString indexPath = cache.getIndexPath(); - QFile::remove(indexPath); + QFile::remove(m_indexPath); } + KConfig config(m_indexPath); /* save thread name */ - setSubjectPrivate(thread->threadName()); + setSubjectPrivate(config, thread->threadName()); /* save res number */ - setResNumPrivate(thread->resNum()); + setResNumPrivate(config, thread->resNum()); /* save read number */ - setReadNumPrivate(thread->readNum()); + setReadNumPrivate(config, thread->readNum()); /* save view pos */ - setViewPosPrivate(thread->viewPos()); + setViewPosPrivate(config, thread->viewPos()); /* save mark */ - setMarkListPrivate(thread->markList()); + setMarkListPrivate(config, thread->markList()); /* save "cache" */ KUrl datURL = getDatURL(m_url); @@ -151,45 +154,45 @@ /*------------------------------------------------------------------*/ /* private */ -QString ThreadIndex::getSubjectPrivate() const +QString ThreadIndex::getSubjectPrivate(const KConfig& config) const { - return m_config.group("").readEntry("Subject"); + return config.group("").readEntry("Subject"); } /* private */ -void ThreadIndex::setSubjectPrivate(const QString& str) +void ThreadIndex::setSubjectPrivate(KConfig& config, const QString& str) { - m_config.group("").writeEntry("Subject", str); + config.group("").writeEntry("Subject", str); } /*-------*/ /* private */ -int ThreadIndex::getResNumPrivate() +int ThreadIndex::getResNumPrivate(KConfig& config) const { - int resNum = m_config.group("").readEntry("ResNum", 0); + int resNum = config.group("").readEntry("ResNum", 0); /* use obsoleted "cache" file */ if (!resNum) { KUrl datURL = getDatURL(m_url); resNum = ThreadInfo::readNum(datURL.prettyUrl()); if (resNum) - m_config.group("").writeEntry("ResNum", resNum); + config.group("").writeEntry("ResNum", resNum); } return resNum; } /* private */ -void ThreadIndex::setResNumPrivate(int resNum) +void ThreadIndex::setResNumPrivate(KConfig& config, int resNum) { - m_config.group("").writeEntry("ResNum", resNum); + config.group("").writeEntry("ResNum", resNum); } /*-------*/ /* private */ -int ThreadIndex::getReadNumPrivate(bool checkCached) +int ThreadIndex::getReadNumPrivate(KConfig& config, bool checkCached) const { /* If cache does not exist, return 0 */ if (checkCached) { @@ -200,12 +203,12 @@ } } - int readNum = m_config.group("").readEntry("ReadNum", 0); + int readNum = config.group("").readEntry("ReadNum", 0); if (!readNum) { /* use ViewPos instead of ReadNum. */ - readNum = m_config.group("").readEntry("ViewPos", 0); + readNum = config.group("").readEntry("ViewPos", 0); /* use obsoleted "cache" file */ if (!readNum) { @@ -214,43 +217,44 @@ } if (readNum) - m_config.group("").writeEntry("ReadNum", readNum); + config.group("").writeEntry("ReadNum", readNum); } return readNum; } /* private */ -void ThreadIndex::setReadNumPrivate(int readNum) +void ThreadIndex::setReadNumPrivate(KConfig& config, int readNum) { - m_config.group("").writeEntry("ReadNum", readNum); + config.group("").writeEntry("ReadNum", readNum); } /*-------*/ /* private */ -int ThreadIndex::getViewPosPrivate() const +int ThreadIndex::getViewPosPrivate(const KConfig& config) const { - return m_config.group("").readEntry("ViewPos", 0); + return config.group("").readEntry("ViewPos", 0); } /* private */ -void ThreadIndex::setViewPosPrivate(int viewPos) +void ThreadIndex::setViewPosPrivate(KConfig& config, int viewPos) { - m_config.group("").writeEntry("ViewPos", viewPos); + config.group("").writeEntry("ViewPos", viewPos); } /*-------*/ /* private */ -QList<int> ThreadIndex::getMarkListPrivate() const +QList<int> ThreadIndex::getMarkListPrivate(const KConfig& config) const { QList<int> default_value; - return m_config.group("").readEntry("Mark", default_value); + return config.group("").readEntry("Mark", default_value); } /* private */ -void ThreadIndex::setMarkListPrivate(const QList<int>& markList) +void ThreadIndex::setMarkListPrivate(KConfig& config, + const QList<int>& markList) { - m_config.group("").writeEntry("Mark", markList); + config.group("").writeEntry("Mark", markList); } Modified: kita/branches/KITA-KDE4/kita/src/libkita/threadindex.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/threadindex.h 2009-08-05 14:32:56 UTC (rev 2523) +++ kita/branches/KITA-KDE4/kita/src/libkita/threadindex.h 2009-08-06 10:33:04 UTC (rev 2524) @@ -13,9 +13,10 @@ #include <QtCore/QList> #include <QtCore/QString> -#include <kconfig.h> #include <kurl.h> +class KConfig; + namespace Kita { class Thread; @@ -28,15 +29,13 @@ public: ThreadIndex(const KUrl& url); - void setUrl(const KUrl& url); - QString getSubject() const; void setSubject(const QString& str); - int getResNum(); + int getResNum() const; void setResNum(int resNum); - int getReadNum(); + int getReadNum() const; void setReadNum(int readNum); int getViewPos() const; @@ -46,28 +45,28 @@ /*---------------------------------*/ - void loadIndex(Thread* thread, bool checkCached = true); + void loadIndex(Thread* thread, bool checkCached = true) const; void saveIndex(const Thread* thread); private: - QString getSubjectPrivate() const; - void setSubjectPrivate(const QString& str); + QString getSubjectPrivate(const KConfig& config) const; + void setSubjectPrivate(KConfig& config, const QString& str); - int getResNumPrivate(); - void setResNumPrivate(int resNum); + int getResNumPrivate(KConfig& config) const; + void setResNumPrivate(KConfig& config, int resNum); - int getReadNumPrivate(bool checkCached); - void setReadNumPrivate(int readNum); + int getReadNumPrivate(KConfig& config, bool checkCached) const; + void setReadNumPrivate(KConfig& config, int readNum); - int getViewPosPrivate() const; - void setViewPosPrivate(int viewPos); + int getViewPosPrivate(const KConfig& config) const; + void setViewPosPrivate(KConfig& config, int viewPos); - QList<int> getMarkListPrivate() const; - void setMarkListPrivate(const QList<int>& markList); + QList<int> getMarkListPrivate(const KConfig& config) const; + void setMarkListPrivate(KConfig& config, const QList<int>& markList); KUrl m_url; - KConfig m_config; + QString m_indexPath; }; } Modified: kita/branches/KITA-KDE4/kita/src/threadtabwidget.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/threadtabwidget.cpp 2009-08-05 14:32:56 UTC (rev 2523) +++ kita/branches/KITA-KDE4/kita/src/threadtabwidget.cpp 2009-08-06 10:33:04 UTC (rev 2524) @@ -38,7 +38,7 @@ setupActions(); /* default view */ - createView(i18n("thread")); + createView(i18nc("@title:tab", "Thread")); } @@ -188,7 +188,7 @@ ViewMediator::getInstance()->setMainURLLine(KUrl()); /* default view */ - ThreadView * threadView = createView("thread"); + ThreadView * threadView = createView(i18nc("@title:tab", "Thread")); if (threadView) { setCurrentWidget(threadView);