svnno****@sourc*****
svnno****@sourc*****
2009年 7月 27日 (月) 21:57:12 JST
ForkRevision: 2483
http://sourceforge.jp/projects/kita/svn/view?view=rev&revision=2483
Author: nogu
Date: 2009-07-27 21:57:12 +0900 (Mon, 27 Jul 2009)
Log Message:
-----------
- updateListViewItem() -> updateRow()
- ThreadListView::s_colAttr[] -> ThreadListHeaderView::attribute[]
- i18n
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/boardtabwidgetui.rc
kita/branches/KITA-KDE4/kita/src/boardview.cpp
kita/branches/KITA-KDE4/kita/src/boardview.h
kita/branches/KITA-KDE4/kita/src/kitaui/tabwidgetbase.cpp
kita/branches/KITA-KDE4/kita/src/kitaui.rc
kita/branches/KITA-KDE4/kita/src/mainwindow.cpp
kita/branches/KITA-KDE4/kita/src/prefs/faceprefbase.ui
kita/branches/KITA-KDE4/kita/src/prefs/uiprefbase.ui
kita/branches/KITA-KDE4/kita/src/threadlistheaderview.cpp
kita/branches/KITA-KDE4/kita/src/threadlistheaderview.h
kita/branches/KITA-KDE4/kita/src/threadlistview.cpp
kita/branches/KITA-KDE4/kita/src/threadlistview.h
kita/branches/KITA-KDE4/kita/src/threadproperty.ui
kita/branches/KITA-KDE4/kita/src/threadtabwidget.cpp
kita/branches/KITA-KDE4/kita/src/threadtabwidgetui.rc
kita/branches/KITA-KDE4/kita/src/writedialogbase.ui
Modified: kita/branches/KITA-KDE4/kita/po/ja.po
===================================================================
--- kita/branches/KITA-KDE4/kita/po/ja.po 2009-07-26 21:37:13 UTC (rev 2482)
+++ kita/branches/KITA-KDE4/kita/po/ja.po 2009-07-27 12:57:12 UTC (rev 2483)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: ja\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-27 06:34+0900\n"
+"POT-Creation-Date: 2009-07-27 20:35+0900\n"
"PO-Revision-Date: 2009-07-27 06:35+0900\n"
"Language-Team: 日本語 <kde-i****@kde*****>\n"
"MIME-Version: 1.0\n"
@@ -40,44 +40,6 @@
msgid "\"cache\" file's info (obsolete)"
msgstr "（古い）\"cache\"ファイルの情報"
-#. i18n: file: ../src/boardtabwidgetui.rc:4
-#. i18n: ectx: Menu (board)
-#. i18n: file: ../src/kitaui.rc:8
-#. i18n: ectx: Menu (board)
-#: rc.cpp:6 rc.cpp:12
-msgid "&Board"
-msgstr "板(&B)"
-
-#. i18n: file: ../src/writedialogbase.ui:181
-#. i18n: ectx: property (text), widget (QPushButton, buttonCancel)
-#: rc.cpp:270
-msgid "&Cancel"
-msgstr "キャンセル(&C)"
-
-#. i18n: file: ../src/kitaui.rc:4
-#. i18n: ectx: Menu (file)
-#: rc.cpp:9
-msgid "&File"
-msgstr "ファイル(&F)"
-
-#. i18n: file: ../src/writedialogbase.ui:165
-#. i18n: ectx: property (text), widget (QPushButton, buttonOk)
-#: rc.cpp:267
-msgid "&OK"
-msgstr "&OK"
-
-#: ../src/mainwindow.cpp:299
-msgid "&Show Toolbar"
-msgstr "ツールバーを表示(&S)"
-
-#. i18n: file: ../src/threadtabwidgetui.rc:4
-#. i18n: ectx: Menu (thread)
-#. i18n: file: ../src/kitaui.rc:11
-#. i18n: ectx: Menu (thread)
-#: rc.cpp:3 rc.cpp:15
-msgid "&Thread"
-msgstr "スレッド(&T)"
-
#. i18n: file: ../src/writedialogbase.ui:116
#. i18n: ectx: property (text), widget (QCheckBox, beBox)
#: rc.cpp:258
@@ -138,7 +100,7 @@
msgid "Add '%1' to abone list"
msgstr "'%1'をあぼーん一覧に追加"
-#: ../src/bbsview.cpp:485 ../src/threadlistview.cpp:220
+#: ../src/bbsview.cpp:485 ../src/threadlistview.cpp:199
msgid "Add to Favorites"
msgstr "お気に入りに追加"
@@ -165,7 +127,7 @@
msgid "Auth code of be.2ch.net"
msgstr "be.2ch.net の認証コード"
-#: ../src/threadlistheaderview.cpp:39
+#: ../src/threadlistheaderview.cpp:59
msgid "Auto Resize"
msgstr "自動サイズ変更"
@@ -193,9 +155,13 @@
msgid "Be mail address"
msgstr "Be のメールアドレス"
-#: ../src/threadlistview.cpp:48
+#. i18n: file: ../src/boardtabwidgetui.rc:4
+#. i18n: ectx: Menu (board)
+#. i18n: file: ../src/kitaui.rc:8
+#. i18n: ectx: Menu (board)
+#: ../src/threadlistheaderview.cpp:34 rc.cpp:6 rc.cpp:12
msgid "Board"
-msgstr "板"
+msgstr "板(&B)"
#. i18n: file: ../src/prefs/faceprefbase.ui:27
#. i18n: ectx: property (title), widget (QGroupBox, listGroupBox)
@@ -219,6 +185,12 @@
msgid "Cache Path"
msgstr "キャッシュのパス"
+#. i18n: file: ../src/writedialogbase.ui:181
+#. i18n: ectx: property (text), widget (QPushButton, buttonCancel)
+#: rc.cpp:270
+msgid "Cancel"
+msgstr "キャンセル(&C)"
+
#. i18n: file: ../src/libkita/globalconfig.kcfg:60
#. i18n: ectx: label, entry (ListSortOrder), group (Global)
#: rc.cpp:333
@@ -231,25 +203,25 @@
msgid "Close"
msgstr "閉じる"
-#: ../src/boardtabwidget.cpp:193 ../src/kitaui/tabwidgetbase.cpp:160
-msgid "Close Other Tabs"
-msgstr "他のタブを閉じる"
-
#: ../src/kitaui/tabwidgetbase.cpp:173
-msgid "Close all tabs"
+msgid "Close All Tabs"
msgstr "すべてのタブを閉じる"
#: ../src/boardtabwidget.cpp:199 ../src/kitaui/tabwidgetbase.cpp:169
-msgid "Close left tabs"
+msgid "Close Left Tabs"
msgstr "左のタブすべてを閉じる"
+#: ../src/boardtabwidget.cpp:193 ../src/kitaui/tabwidgetbase.cpp:160
+msgid "Close Other Tabs"
+msgstr "他のタブを閉じる"
+
#: ../src/boardtabwidget.cpp:196 ../src/kitaui/tabwidgetbase.cpp:165
-msgid "Close right tabs"
+msgid "Close Right Tabs"
msgstr "右のタブすべてを閉じる"
#: ../src/boardtabwidget.cpp:186 ../src/kitaui/tabwidgetbase.cpp:155
-msgid "Close this tab"
-msgstr "このタブを閉じる"
+msgid "Close This Tab"
+msgstr "このタブを閉じる(&C)"
#: ../src/kitaui/tabwidgetbase.cpp:139
msgid "Configure S&hortcuts..."
@@ -263,18 +235,22 @@
msgid "Copy Link Location"
msgstr "リンクの場所をコピー"
-#: ../src/bbsview.cpp:471 ../src/threadlistview.cpp:91
+#: ../src/boardtabwidget.cpp:211
+msgid "Copy Title and URL"
+msgstr "タイトルと URL をコピー"
+
+#: ../src/bbsview.cpp:471 ../src/threadlistview.cpp:70
msgid "Copy URL"
msgstr "URL をコピー"
#: ../src/htmlpart.cpp:1090 ../src/bbsview.cpp:475
-#: ../src/boardtabwidget.cpp:211 ../src/threadlistview.cpp:92
+#: ../src/threadlistview.cpp:71
msgid "Copy title and URL"
msgstr "タイトルと URL をコピー"
#. i18n: file: ../src/threadproperty.ui:37
#. i18n: ectx: property (text), widget (QLabel, datURLLabel0)
-#: ../src/threadlistview.cpp:49 rc.cpp:189
+#: ../src/threadlistheaderview.cpp:35 rc.cpp:189
msgid "Dat URL"
msgstr "DATファイルのURL"
@@ -284,7 +260,7 @@
msgid "DatManager's information"
msgstr "インデックスファイルの情報"
-#: ../src/threadlistview.cpp:49
+#: ../src/threadlistheaderview.cpp:35
msgid "DatURL"
msgstr "DAT ファイルの URL"
@@ -314,9 +290,9 @@
#: ../src/threadtabwidget.cpp:243
msgid "Delete"
-msgstr "削除"
+msgstr "削除(&D)"
-#: ../src/threadlistview.cpp:94
+#: ../src/threadlistview.cpp:73
msgid "Delete Log"
msgstr "ログを削除"
@@ -346,7 +322,7 @@
msgid "Do you want to clear the text?"
msgstr "テキストをクリアしますか？"
-#: ../src/threadview.cpp:552 ../src/boardview.cpp:314
+#: ../src/threadview.cpp:552 ../src/boardview.cpp:315
msgid "Do you want to delete Log ?"
msgstr "ログを削除しますか？"
@@ -362,7 +338,7 @@
#: ../src/htmlpart.cpp:750 ../src/threadtabwidget.cpp:225
msgid "End"
-msgstr "最後"
+msgstr "最後(&E)"
#: ../src/prefs/preferences.cpp:36
msgid "Face"
@@ -377,10 +353,20 @@
msgid "Favorites"
msgstr "お気に入り"
+#. i18n: file: ../src/kitaui.rc:4
+#. i18n: ectx: Menu (file)
+#: rc.cpp:9
+msgid "File"
+msgstr "ファイル(&F)"
+
#: ../src/boardtabwidget.cpp:122
msgid "Find"
msgstr "検索"
+#: ../src/threadtabwidget.cpp:213
+msgid "Go Back Anchor"
+msgstr "アンカー元に戻る(&G)"
+
#. i18n: file: ../src/threadlistviewbase.ui:47
#. i18n: ectx: property (text), widget (QToolButton, hideButton)
#: rc.cpp:21
@@ -391,7 +377,7 @@
msgid "Hideki Ikemoto"
msgstr "Hideki Ikemoto"
-#: ../src/threadlistview.cpp:38
+#: ../src/threadlistheaderview.cpp:24
msgid "ID"
msgstr "ID"
@@ -402,15 +388,15 @@
msgid "ID"
msgstr "ID"
-#: ../src/threadlistview.cpp:52
+#: ../src/threadlistheaderview.cpp:38
msgid "ID Order"
msgstr "IDの順序"
-#: ../src/threadlistview.cpp:52
+#: ../src/threadlistheaderview.cpp:38
msgid "IDOrder"
msgstr "ID の順序"
-#: ../src/threadlistview.cpp:39
+#: ../src/threadlistheaderview.cpp:25
msgid "Icon"
msgstr "アイコン"
@@ -465,11 +451,16 @@
msgstr "フォントの設定"
#: ../src/mainwindow.cpp:322
-msgid "Load board list"
-msgstr "板一覧の読み込み"
+msgid "Load Board List"
+msgstr "板一覧の読み込み(&L)"
-#: ../src/mainwindow.cpp:326 ../src/prefs/preferences.cpp:65
+#: ../src/mainwindow.cpp:326
+msgctxt "@action:inmenu Login menu"
msgid "Login"
+msgstr "ログイン(&O)"
+
+#: ../src/prefs/preferences.cpp:65
+msgid "Login"
msgstr "ログイン"
#: ../src/mainwindow.cpp:187
@@ -493,11 +484,11 @@
msgstr "be.2ch.net のメールアドレス"
#: ../src/htmlpart.cpp:725 ../src/htmlpart.cpp:1061
-#: ../src/threadlistview.cpp:37
+#: ../src/threadlistheaderview.cpp:23
msgid "Mark"
msgstr "マーク"
-#: ../src/threadlistview.cpp:50
+#: ../src/threadlistheaderview.cpp:36
msgid "Mark Order"
msgstr "マークの順序"
@@ -507,7 +498,7 @@
msgid "Mark new thread to made:"
msgstr "次の時間以内に作成されたスレをマーク:"
-#: ../src/threadlistview.cpp:50
+#: ../src/threadlistheaderview.cpp:37
msgid "MarkOrder"
msgstr "マークの順序"
@@ -552,7 +543,7 @@
"新規板:\n"
"\n"
-#: ../src/threadlistview.cpp:38
+#: ../src/threadlistheaderview.cpp:24
msgid "No."
msgstr "No."
@@ -576,9 +567,15 @@
msgid "Number of responses displayed once."
msgstr "一度に表示するレスの数。"
+#. i18n: file: ../src/writedialogbase.ui:165
+#. i18n: ectx: property (text), widget (QPushButton, buttonOk)
+#: rc.cpp:267
+msgid "OK"
+msgstr "&OK"
+
#: ../src/htmlpart.cpp:784 ../src/htmlpart.cpp:1069 ../src/htmlpart.cpp:1235
#: ../src/bbsview.cpp:468 ../src/boardtabwidget.cpp:208
-#: ../src/threadlistview.cpp:90
+#: ../src/threadlistview.cpp:69
msgid "Open with Web Browser"
msgstr "ウェブブラウザで開く"
@@ -618,7 +615,7 @@
msgid "Popup foreground color."
msgstr "ポップアップの前景色。"
-#: ../src/threadlistview.cpp:96
+#: ../src/threadlistview.cpp:75
msgid "Property"
msgstr "プロパティ"
@@ -628,18 +625,18 @@
#. i18n: ectx: property (text), widget (QLabel, idx_readNumLabel0)
#. i18n: file: ../src/threadproperty.ui:337
#. i18n: ectx: property (text), widget (QLabel, cache_readNumLabel0)
-#: ../src/threadlistview.cpp:42 rc.cpp:207 rc.cpp:222 rc.cpp:234
+#: ../src/threadlistheaderview.cpp:28 rc.cpp:207 rc.cpp:222 rc.cpp:234
msgid "ReadNum"
msgstr "取得"
#: ../src/threadtabwidget.cpp:231
msgid "Reload"
-msgstr "再読み込み"
+msgstr "再読み込み(&R)"
#: ../src/boardtabwidget.cpp:128
msgctxt "@action:button Reload the subject view"
msgid "Reload"
-msgstr "再読み込み"
+msgstr "再読み込み(&R)"
#. i18n: file: ../src/threadlistviewbase.ui:60
#. i18n: ectx: property (text), widget (QToolButton, reloadButton)
@@ -648,7 +645,7 @@
msgid "Reload"
msgstr "再読み込み"
-#: ../src/bbsview.cpp:482 ../src/threadlistview.cpp:220
+#: ../src/bbsview.cpp:482 ../src/threadlistview.cpp:199
msgid "Remove from Favorites"
msgstr "お気に入りから削除"
@@ -658,14 +655,18 @@
#. i18n: ectx: property (text), widget (QLabel, idx_resNumLabel0)
#. i18n: file: ../src/threadproperty.ui:317
#. i18n: ectx: property (text), widget (QLabel, cache_resNumLabel0)
-#: ../src/threadlistview.cpp:41 rc.cpp:204 rc.cpp:219 rc.cpp:231
+#: ../src/threadlistheaderview.cpp:27 rc.cpp:204 rc.cpp:219 rc.cpp:231
msgid "ResNum"
msgstr "レス数"
#: ../src/boardtabwidget.cpp:133 ../src/boardtabwidget.cpp:205
msgid "Show Old Logs"
-msgstr "古いログを表示"
+msgstr "古いログを表示(&S)"
+#: ../src/mainwindow.cpp:299
+msgid "Show Toolbar"
+msgstr "ツールバーを表示(&S)"
+
#. i18n: file: ../src/prefs/uiprefbase.ui:150
#. i18n: ectx: property (text), widget (QCheckBox, kcfg_ShowMailAddress)
#: rc.cpp:135
@@ -684,28 +685,28 @@
msgid "Show unread thread first"
msgstr "未読のあるスレを先に表示"
-#: ../src/threadlistview.cpp:45
+#: ../src/threadlistheaderview.cpp:31
msgid "Since"
msgstr "スレ立て日時"
-#: ../src/threadlistview.cpp:46
+#: ../src/threadlistheaderview.cpp:33
msgid "Speed"
msgstr "速度"
#: ../src/htmlpart.cpp:737
msgctxt "@action:inmenu Go to the original post"
msgid "Start"
-msgstr "最初"
+msgstr "最初(&S)"
#: ../src/threadtabwidget.cpp:219
msgid "Start"
-msgstr "最初"
+msgstr "最初(&S)"
#: ../src/threadtabwidget.cpp:237
msgid "Stop"
-msgstr "停止"
+msgstr "停止(&T)"
-#: ../src/threadlistview.cpp:40
+#: ../src/threadlistheaderview.cpp:26
msgid "Subject"
msgstr "サブジェクト"
@@ -721,11 +722,20 @@
msgid "This thread is broken."
msgstr "このスレッドは壊れています。"
+#. i18n: file: ../src/threadtabwidgetui.rc:4
+#. i18n: ectx: Menu (thread)
+#. i18n: file: ../src/kitaui.rc:11
+#. i18n: ectx: Menu (thread)
+#: rc.cpp:3 rc.cpp:15
+msgid "Thread"
+msgstr "スレッド(&T)"
+
#. i18n: file: ../src/prefs/faceprefbase.ui:115
#. i18n: ectx: property (title), widget (QGroupBox, threadGroupBox)
#. i18n: file: ../src/prefs/uiprefbase.ui:79
#. i18n: ectx: property (title), widget (QGroupBox, threadGroupBox)
#: rc.cpp:66 rc.cpp:117
+msgctxt "@label:textbox"
msgid "Thread"
msgstr "スレッド"
@@ -734,6 +744,8 @@
#. i18n: file: ../src/threadproperty.ui:217
#. i18n: ectx: property (text), widget (QLabel, idx_threadNameWithIndexLabel0)
#: rc.cpp:195 rc.cpp:216
+#, fuzzy
+msgctxt "@label:textbox"
msgid "Thread Name"
msgstr "スレッド名"
@@ -761,7 +773,7 @@
msgid "Thread foreground color."
msgstr "スレッドの前景色。"
-#: ../src/threadlistview.cpp:46
+#: ../src/threadlistheaderview.cpp:32
msgid "Thread's speed"
msgstr "スレッドの速度"
@@ -777,7 +789,7 @@
msgid "Time marked as newly arrived thread. (0 == after last access.)"
msgstr ""
-#: ../src/threadlistview.cpp:40
+#: ../src/threadlistheaderview.cpp:26
msgid "Title"
msgstr "タイトル"
@@ -791,7 +803,7 @@
msgid "URL of board list"
msgstr "板一覧の URL"
-#: ../src/threadlistview.cpp:44
+#: ../src/threadlistheaderview.cpp:30
msgid "Unread"
msgstr "未読"
@@ -821,7 +833,7 @@
#. i18n: ectx: property (text), widget (QLabel, viewPosLabel0)
#. i18n: file: ../src/threadproperty.ui:277
#. i18n: ectx: property (text), widget (QLabel, idx_viewPosLabel0)
-#: ../src/threadlistview.cpp:43 rc.cpp:210 rc.cpp:225
+#: ../src/threadlistheaderview.cpp:29 rc.cpp:210 rc.cpp:225
msgid "ViewPos"
msgstr "ViewPos"
@@ -834,14 +846,12 @@
#. i18n: file: ../src/libkita/globalconfig.kcfg:49
#. i18n: ectx: label, entry (AboneChain), group (Global)
#: rc.cpp:324
-#, fuzzy
msgid "Whether abone responses recursively (secret config)."
msgstr ""
#. i18n: file: ../src/libkita/globalconfig.kcfg:53
#. i18n: ectx: label, entry (CheckResponsed), group (Global)
#: rc.cpp:327
-#, fuzzy
msgid "Whether check responsed responses or not (secret config)."
msgstr ""
@@ -1013,10 +1023,6 @@
msgid "font"
msgstr "フォント"
-#: ../src/threadtabwidget.cpp:213
-msgid "go back anchor"
-msgstr "戻る"
-
#: ../src/main.cpp:40
msgid "improvements"
msgstr "さまざまな改良"
@@ -1248,12 +1254,18 @@
#~ msgid "KitaWriteView"
#~ msgstr "Kita画像ビューア"
+#~ msgid "L&ogin"
+#~ msgstr "ログイン(&O)"
+
#~ msgid "New Thread"
#~ msgstr "新規スレッド"
#~ msgid "Open Thread"
#~ msgstr "スレッドを開く"
+#~ msgid "Open With Web Browser"
+#~ msgstr "ウェブブラウザで開く"
+
#~ msgid "Open by background"
#~ msgstr "バックグラウンドで開く"
Modified: kita/branches/KITA-KDE4/kita/po/kita.pot
===================================================================
--- kita/branches/KITA-KDE4/kita/po/kita.pot 2009-07-26 21:37:13 UTC (rev 2482)
+++ kita/branches/KITA-KDE4/kita/po/kita.pot 2009-07-27 12:57:12 UTC (rev 2483)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-27 06:34+0900\n"
+"POT-Creation-Date: 2009-07-27 20:35+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"
@@ -25,14 +25,15 @@
msgstr ""
#: ../src/mainwindow.cpp:299
-msgid "&Show Toolbar"
+msgid "Show Toolbar"
msgstr ""
#: ../src/mainwindow.cpp:322
-msgid "Load board list"
+msgid "Load Board List"
msgstr ""
-#: ../src/mainwindow.cpp:326 ../src/prefs/preferences.cpp:65
+#: ../src/mainwindow.cpp:326
+msgctxt "@action:inmenu Login menu"
msgid "Login"
msgstr ""
@@ -42,7 +43,7 @@
msgstr ""
#: ../src/htmlpart.cpp:725 ../src/htmlpart.cpp:1061
-#: ../src/threadlistview.cpp:37
+#: ../src/threadlistheaderview.cpp:23
msgid "Mark"
msgstr ""
@@ -71,7 +72,7 @@
#: ../src/htmlpart.cpp:784 ../src/htmlpart.cpp:1069 ../src/htmlpart.cpp:1235
#: ../src/bbsview.cpp:468 ../src/boardtabwidget.cpp:208
-#: ../src/threadlistview.cpp:90
+#: ../src/threadlistview.cpp:69
msgid "Open with Web Browser"
msgstr ""
@@ -109,7 +110,7 @@
msgstr ""
#: ../src/htmlpart.cpp:1090 ../src/bbsview.cpp:475
-#: ../src/boardtabwidget.cpp:211 ../src/threadlistview.cpp:92
+#: ../src/threadlistview.cpp:71
msgid "Copy title and URL"
msgstr ""
@@ -144,7 +145,7 @@
msgstr ""
#: ../src/threadtabwidget.cpp:213
-msgid "go back anchor"
+msgid "Go Back Anchor"
msgstr ""
#: ../src/threadtabwidget.cpp:219
@@ -217,15 +218,15 @@
msgid "Favorites"
msgstr ""
-#: ../src/bbsview.cpp:471 ../src/threadlistview.cpp:91
+#: ../src/bbsview.cpp:471 ../src/threadlistview.cpp:70
msgid "Copy URL"
msgstr ""
-#: ../src/bbsview.cpp:482 ../src/threadlistview.cpp:220
+#: ../src/bbsview.cpp:482 ../src/threadlistview.cpp:199
msgid "Remove from Favorites"
msgstr ""
-#: ../src/bbsview.cpp:485 ../src/threadlistview.cpp:220
+#: ../src/bbsview.cpp:485 ../src/threadlistview.cpp:199
msgid "Add to Favorites"
msgstr ""
@@ -248,7 +249,7 @@
msgstr ""
#: ../src/boardtabwidget.cpp:186 ../src/kitaui/tabwidgetbase.cpp:155
-msgid "Close this tab"
+msgid "Close This Tab"
msgstr ""
#: ../src/boardtabwidget.cpp:193 ../src/kitaui/tabwidgetbase.cpp:160
@@ -256,13 +257,17 @@
msgstr ""
#: ../src/boardtabwidget.cpp:196 ../src/kitaui/tabwidgetbase.cpp:165
-msgid "Close right tabs"
+msgid "Close Right Tabs"
msgstr ""
#: ../src/boardtabwidget.cpp:199 ../src/kitaui/tabwidgetbase.cpp:169
-msgid "Close left tabs"
+msgid "Close Left Tabs"
msgstr ""
+#: ../src/boardtabwidget.cpp:211
+msgid "Copy Title and URL"
+msgstr ""
+
#: ../src/prefs/preferences.cpp:36
msgid "Face"
msgstr ""
@@ -280,6 +285,10 @@
msgid "Abone"
msgstr ""
+#: ../src/prefs/preferences.cpp:65
+msgid "Login"
+msgstr ""
+
#: ../src/prefs/preferences.cpp:72
msgid "Write"
msgstr ""
@@ -296,7 +305,7 @@
msgid "kita"
msgstr ""
-#: ../src/threadview.cpp:552 ../src/boardview.cpp:314
+#: ../src/threadview.cpp:552 ../src/boardview.cpp:315
msgid "Do you want to delete Log ?"
msgstr ""
@@ -313,94 +322,26 @@
msgstr ""
#: ../src/kitaui/tabwidgetbase.cpp:173
-msgid "Close all tabs"
+msgid "Close All Tabs"
msgstr ""
-#: ../src/threadlistheaderview.cpp:39
-msgid "Auto Resize"
-msgstr ""
-
-#: ../src/main.cpp:22
-msgid "Kita - 2ch client for KDE"
-msgstr ""
-
-#: ../src/main.cpp:32
-msgid "Kita"
-msgstr ""
-
-#: ../src/main.cpp:33
-msgid "(C) 2003-2009 Kita Developers"
-msgstr ""
-
-#: ../src/main.cpp:35
-msgid "Hideki Ikemoto"
-msgstr ""
-
-#: ../src/main.cpp:35
-msgid "maintainer, initial code"
-msgstr ""
-
-#: ../src/main.cpp:37
-msgid "konqueror plugin no hito"
-msgstr ""
-
-#: ../src/main.cpp:38
-msgid "konqueror plugin, KDE part"
-msgstr ""
-
-#: ../src/main.cpp:39
-msgid "421"
-msgstr ""
-
-#: ../src/main.cpp:39
-msgid "kitanavi, threadview's improvement"
-msgstr ""
-
-#: ../src/main.cpp:40
-msgid "Toshihiko Okada"
-msgstr ""
-
-#: ../src/main.cpp:40
-msgid "improvements"
-msgstr ""
-
-#: ../src/main.cpp:42
-msgid "75"
-msgstr ""
-
-#: ../src/main.cpp:42
-msgid "stylesheet support"
-msgstr ""
-
-#: ../src/main.cpp:45
-msgid "Document to open."
-msgstr ""
-
-#: ../src/main.cpp:46
-msgid "board list's URL."
-msgstr ""
-
-#: ../src/libkita/datinfo.cpp:446 ../src/libkita/datinfo.cpp:447
-msgid "Broken"
-msgstr ""
-
-#: ../src/threadlistview.cpp:38
+#: ../src/threadlistheaderview.cpp:24
msgid "No."
msgstr ""
-#: ../src/threadlistview.cpp:38
+#: ../src/threadlistheaderview.cpp:24
msgid "ID"
msgstr ""
-#: ../src/threadlistview.cpp:39
+#: ../src/threadlistheaderview.cpp:25
msgid "Icon"
msgstr ""
-#: ../src/threadlistview.cpp:40
+#: ../src/threadlistheaderview.cpp:26
msgid "Title"
msgstr ""
-#: ../src/threadlistview.cpp:40
+#: ../src/threadlistheaderview.cpp:26
msgid "Subject"
msgstr ""
@@ -410,7 +351,7 @@
#. i18n: ectx: property (text), widget (QLabel, idx_resNumLabel0)
#. i18n: file: ../src/threadproperty.ui:317
#. i18n: ectx: property (text), widget (QLabel, cache_resNumLabel0)
-#: ../src/threadlistview.cpp:41 rc.cpp:204 rc.cpp:219 rc.cpp:231
+#: ../src/threadlistheaderview.cpp:27 rc.cpp:204 rc.cpp:219 rc.cpp:231
msgid "ResNum"
msgstr ""
@@ -420,7 +361,7 @@
#. i18n: ectx: property (text), widget (QLabel, idx_readNumLabel0)
#. i18n: file: ../src/threadproperty.ui:337
#. i18n: ectx: property (text), widget (QLabel, cache_readNumLabel0)
-#: ../src/threadlistview.cpp:42 rc.cpp:207 rc.cpp:222 rc.cpp:234
+#: ../src/threadlistheaderview.cpp:28 rc.cpp:207 rc.cpp:222 rc.cpp:234
msgid "ReadNum"
msgstr ""
@@ -428,61 +369,133 @@
#. i18n: ectx: property (text), widget (QLabel, viewPosLabel0)
#. i18n: file: ../src/threadproperty.ui:277
#. i18n: ectx: property (text), widget (QLabel, idx_viewPosLabel0)
-#: ../src/threadlistview.cpp:43 rc.cpp:210 rc.cpp:225
+#: ../src/threadlistheaderview.cpp:29 rc.cpp:210 rc.cpp:225
msgid "ViewPos"
msgstr ""
-#: ../src/threadlistview.cpp:44
+#: ../src/threadlistheaderview.cpp:30
msgid "Unread"
msgstr ""
-#: ../src/threadlistview.cpp:45
+#: ../src/threadlistheaderview.cpp:31
msgid "Since"
msgstr ""
-#: ../src/threadlistview.cpp:46
+#: ../src/threadlistheaderview.cpp:32
msgid "Thread's speed"
msgstr ""
-#: ../src/threadlistview.cpp:46
+#: ../src/threadlistheaderview.cpp:33
msgid "Speed"
msgstr ""
-#: ../src/threadlistview.cpp:48
+#. i18n: file: ../src/boardtabwidgetui.rc:4
+#. i18n: ectx: Menu (board)
+#. i18n: file: ../src/kitaui.rc:8
+#. i18n: ectx: Menu (board)
+#: ../src/threadlistheaderview.cpp:34 rc.cpp:6 rc.cpp:12
msgid "Board"
msgstr ""
#. i18n: file: ../src/threadproperty.ui:37
#. i18n: ectx: property (text), widget (QLabel, datURLLabel0)
-#: ../src/threadlistview.cpp:49 rc.cpp:189
+#: ../src/threadlistheaderview.cpp:35 rc.cpp:189
msgid "Dat URL"
msgstr ""
-#: ../src/threadlistview.cpp:49
+#: ../src/threadlistheaderview.cpp:35
msgid "DatURL"
msgstr ""
-#: ../src/threadlistview.cpp:50
+#: ../src/threadlistheaderview.cpp:36
msgid "Mark Order"
msgstr ""
-#: ../src/threadlistview.cpp:50
+#: ../src/threadlistheaderview.cpp:37
msgid "MarkOrder"
msgstr ""
-#: ../src/threadlistview.cpp:52
+#: ../src/threadlistheaderview.cpp:38
msgid "ID Order"
msgstr ""
-#: ../src/threadlistview.cpp:52
+#: ../src/threadlistheaderview.cpp:38
msgid "IDOrder"
msgstr ""
-#: ../src/threadlistview.cpp:94
+#: ../src/threadlistheaderview.cpp:59
+msgid "Auto Resize"
+msgstr ""
+
+#: ../src/main.cpp:22
+msgid "Kita - 2ch client for KDE"
+msgstr ""
+
+#: ../src/main.cpp:32
+msgid "Kita"
+msgstr ""
+
+#: ../src/main.cpp:33
+msgid "(C) 2003-2009 Kita Developers"
+msgstr ""
+
+#: ../src/main.cpp:35
+msgid "Hideki Ikemoto"
+msgstr ""
+
+#: ../src/main.cpp:35
+msgid "maintainer, initial code"
+msgstr ""
+
+#: ../src/main.cpp:37
+msgid "konqueror plugin no hito"
+msgstr ""
+
+#: ../src/main.cpp:38
+msgid "konqueror plugin, KDE part"
+msgstr ""
+
+#: ../src/main.cpp:39
+msgid "421"
+msgstr ""
+
+#: ../src/main.cpp:39
+msgid "kitanavi, threadview's improvement"
+msgstr ""
+
+#: ../src/main.cpp:40
+msgid "Toshihiko Okada"
+msgstr ""
+
+#: ../src/main.cpp:40
+msgid "improvements"
+msgstr ""
+
+#: ../src/main.cpp:42
+msgid "75"
+msgstr ""
+
+#: ../src/main.cpp:42
+msgid "stylesheet support"
+msgstr ""
+
+#: ../src/main.cpp:45
+msgid "Document to open."
+msgstr ""
+
+#: ../src/main.cpp:46
+msgid "board list's URL."
+msgstr ""
+
+#: ../src/libkita/datinfo.cpp:446 ../src/libkita/datinfo.cpp:447
+msgid "Broken"
+msgstr ""
+
+#: ../src/threadlistview.cpp:73
msgid "Delete Log"
msgstr ""
-#: ../src/threadlistview.cpp:96
+#: ../src/threadlistview.cpp:75
msgid "Property"
msgstr ""
@@ -491,21 +504,13 @@
#. i18n: file: ../src/kitaui.rc:11
#. i18n: ectx: Menu (thread)
#: rc.cpp:3 rc.cpp:15
-msgid "&Thread"
+msgid "Thread"
msgstr ""
-#. i18n: file: ../src/boardtabwidgetui.rc:4
-#. i18n: ectx: Menu (board)
-#. i18n: file: ../src/kitaui.rc:8
-#. i18n: ectx: Menu (board)
-#: rc.cpp:6 rc.cpp:12
-msgid "&Board"
-msgstr ""
-
#. i18n: file: ../src/kitaui.rc:4
#. i18n: ectx: Menu (file)
#: rc.cpp:9
-msgid "&File"
+msgid "File"
msgstr ""
#. i18n: file: ../src/threadlistviewbase.ui:44
@@ -630,6 +635,7 @@
#. i18n: file: ../src/prefs/uiprefbase.ui:79
#. i18n: ectx: property (title), widget (QGroupBox, threadGroupBox)
#: rc.cpp:66 rc.cpp:117
+msgctxt "@label:textbox"
msgid "Thread"
msgstr ""
@@ -832,6 +838,7 @@
#. i18n: file: ../src/threadproperty.ui:217
#. i18n: ectx: property (text), widget (QLabel, idx_threadNameWithIndexLabel0)
#: rc.cpp:195 rc.cpp:216
+msgctxt "@label:textbox"
msgid "Thread Name"
msgstr ""
@@ -917,13 +924,13 @@
#. i18n: file: ../src/writedialogbase.ui:165
#. i18n: ectx: property (text), widget (QPushButton, buttonOk)
#: rc.cpp:267
-msgid "&OK"
+msgid "OK"
msgstr ""
#. i18n: file: ../src/writedialogbase.ui:181
#. i18n: ectx: property (text), widget (QPushButton, buttonCancel)
#: rc.cpp:270
-msgid "&Cancel"
+msgid "Cancel"
msgstr ""
#. i18n: file: ../src/libkita/accountconfig.kcfg:9
Modified: kita/branches/KITA-KDE4/kita/src/boardtabwidget.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/boardtabwidget.cpp 2009-07-26 21:37:13 UTC (rev 2482)
+++ kita/branches/KITA-KDE4/kita/src/boardtabwidget.cpp 2009-07-27 12:57:12 UTC (rev 2483)
@@ -183,7 +183,7 @@
if (QString::compare(tabwidget->widget(idx) ->objectName(), "favoriteTab") == 0) return ;
KMenu popup(this);
- KAction* closeAct = new KAction(i18n("Close this tab"), this);
+ KAction* closeAct = new KAction(i18n("Close This Tab"), this);
popup.addAction(closeAct);
popup.addAction(collection->action("tab_prevtab"));
@@ -193,10 +193,10 @@
KAction* closeOtherAct = new KAction(i18n("Close Other Tabs"), this);
popup.addAction(closeOtherAct);
- KAction* closeRightAct = new KAction(i18n("Close right tabs"), this);
+ KAction* closeRightAct = new KAction(i18n("Close Right Tabs"), this);
popup.addAction(closeRightAct);
- KAction* closeLeftAct = new KAction(i18n("Close left tabs"), this);
+ KAction* closeLeftAct = new KAction(i18n("Close Left Tabs"), this);
popup.addAction(closeLeftAct);
popup.addAction(collection->action("tab_closealltab"));
@@ -208,7 +208,7 @@
KAction* openBrowserAct = new KAction(i18n("Open with Web Browser"), this);
popup.addAction(openBrowserAct);
- KAction* copyTitleAct = new KAction(i18n("Copy title and URL"), this);
+ KAction* copyTitleAct = new KAction(i18n("Copy Title and URL"), this);
popup.addAction(copyTitleAct);
popup.addSeparator();
Modified: kita/branches/KITA-KDE4/kita/src/boardtabwidgetui.rc
===================================================================
--- kita/branches/KITA-KDE4/kita/src/boardtabwidgetui.rc 2009-07-26 21:37:13 UTC (rev 2482)
+++ kita/branches/KITA-KDE4/kita/src/boardtabwidgetui.rc 2009-07-27 12:57:12 UTC (rev 2483)
@@ -1,7 +1,7 @@
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
<kpartgui name="kitaSubjectTabWidget" version="1">
<MenuBar>
- <Menu name="board"><text>&Board</text>
+ <Menu name="board"><text>Board</text>
<Action name="tab_closetab" />
<Separator/>
<Action name="subjectview_reload" />
Modified: kita/branches/KITA-KDE4/kita/src/boardview.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/boardview.cpp 2009-07-26 21:37:13 UTC (rev 2482)
+++ kita/branches/KITA-KDE4/kita/src/boardview.cpp 2009-07-27 12:57:12 UTC (rev 2483)
@@ -21,6 +21,7 @@
#include <kstandarddirs.h>
#include "boardtabwidget.h"
+#include "threadlistheaderview.h"
#include "threadlistviewitem.h"
#include "viewmediator.h"
#include "libkita/boardmanager.h"
@@ -142,7 +143,7 @@
}
int id = (i < countNew ? i + 1 : 0);
int order = i + 1;
- updateListViewItem(i, datURL, current, id, order);
+ updateRow(i, datURL, current, id, order);
}
subjectList->setSortingEnabled(true);
@@ -234,7 +235,7 @@
return;
int id = subjectList->item(i, ColumnId)->text().toInt();
int order = subjectList->item(i, ColumnIdOrder)->text().toInt();
- updateListViewItem(i, datURL, current, id, order);
+ updateRow(i, datURL, current, id, order);
updateKindLabel();
@@ -245,7 +246,7 @@
/* if id == 0, this thread is old thread. */
/* private */
-void BoardView::updateListViewItem(int row, const KUrl& datURL,
+void BoardView::updateRow(int row, const KUrl& datURL,
const QDateTime& current, int id, int order)
{
QDateTime since;
@@ -348,7 +349,7 @@
KConfigGroup group = config.group("Column");
for (int i = ColumnBegin; i <= ColumnEnd; i++) {
- group.writeEntry(s_colAttr[i].keyName,
+ group.writeEntry(ThreadListHeaderView::attribute[i].keyName,
subjectList->columnWidth(i) != 0);
}
}
@@ -362,7 +363,8 @@
KConfigGroup group = config.group("Column");
for (int i = ColumnBegin; i <= ColumnEnd; i++) {
bool isShown = group.readEntry(
- s_colAttr[i].keyName, s_colAttr[i].showDefault);
+ ThreadListHeaderView::attribute[i].keyName,
+ ThreadListHeaderView::attribute[i].showDefault);
isShown ? showColumn(i) : hideColumn(i);
}
}
Modified: kita/branches/KITA-KDE4/kita/src/boardview.h
===================================================================
--- kita/branches/KITA-KDE4/kita/src/boardview.h 2009-07-26 21:37:13 UTC (rev 2482)
+++ kita/branches/KITA-KDE4/kita/src/boardview.h 2009-07-27 12:57:12 UTC (rev 2483)
@@ -55,7 +55,7 @@
void updateKindLabel();
void deleteLog(const KUrl& url);
void loadLayout();
- void updateListViewItem(int row, const KUrl& datURL,
+ void updateRow(int row, const KUrl& datURL,
const QDateTime& current, int id, int order);
void saveHeaderOnOff();
void loadHeaderOnOff();
Modified: kita/branches/KITA-KDE4/kita/src/kitaui/tabwidgetbase.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/kitaui/tabwidgetbase.cpp 2009-07-26 21:37:13 UTC (rev 2482)
+++ kita/branches/KITA-KDE4/kita/src/kitaui/tabwidgetbase.cpp 2009-07-27 12:57:12 UTC (rev 2483)
@@ -152,7 +152,7 @@
connect(tab_prevtab_action, SIGNAL(triggered()), this, SLOT(slotPrevTab()));
KAction* tab_closetab_action = actionCollection()->addAction("tab_closetab");
- tab_closetab_action->setText(i18n("Close this tab"));
+ tab_closetab_action->setText(i18n("Close This Tab"));
tab_closetab_action->setShortcut(KStandardShortcut::close());
connect(tab_closetab_action, SIGNAL(triggered()), this, SLOT(slotCloseCurrentTab()));
@@ -162,15 +162,15 @@
connect(tab_closeothertab_action, SIGNAL(triggered()), this, SLOT(slotCloseOtherTab()));
KAction* tab_closerighttab_action = actionCollection()->addAction("tab_closetrightab");
- tab_closerighttab_action->setText(i18n("Close right tabs"));
+ tab_closerighttab_action->setText(i18n("Close Right Tabs"));
connect(tab_closerighttab_action, SIGNAL(triggered()), this, SLOT(slotCloseRightTab()));
KAction* tab_closelefttab_action = actionCollection()->addAction("tab_closetleftab");
- tab_closelefttab_action->setText(i18n("Close left tabs"));
+ tab_closelefttab_action->setText(i18n("Close Left Tabs"));
connect(tab_closelefttab_action, SIGNAL(triggered()), this, SLOT(slotCloseLeftTab()));
KAction* tab_closealltab_action = actionCollection()->addAction("tab_closealltab");
- tab_closealltab_action->setText(i18n("Close all tabs"));
+ tab_closealltab_action->setText(i18n("Close All Tabs"));
connect(tab_closealltab_action, SIGNAL(triggered()), this, SLOT(slotCloseAllTab()));
}
Modified: kita/branches/KITA-KDE4/kita/src/kitaui.rc
===================================================================
--- kita/branches/KITA-KDE4/kita/src/kitaui.rc 2009-07-26 21:37:13 UTC (rev 2482)
+++ kita/branches/KITA-KDE4/kita/src/kitaui.rc 2009-07-27 12:57:12 UTC (rev 2483)
@@ -1,14 +1,14 @@
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
<kpartgui name="kita" version="3">
<MenuBar>
- <Menu name="file"><text>&File</text>
+ <Menu name="file"><text>File</text>
<Action name="load_board_list" />
<Action name="login" />
</Menu>
- <Menu name="board"><text>&Board</text>
+ <Menu name="board"><text>Board</text>
<Action name="dummy" />
</Menu>
- <Menu name="thread"><text>&Thread</text>
+ <Menu name="thread"><text>Thread</text>
<Action name="dummy" />
</Menu>
</MenuBar>
Modified: kita/branches/KITA-KDE4/kita/src/mainwindow.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/mainwindow.cpp 2009-07-26 21:37:13 UTC (rev 2482)
+++ kita/branches/KITA-KDE4/kita/src/mainwindow.cpp 2009-07-27 12:57:12 UTC (rev 2483)
@@ -296,7 +296,7 @@
setStandardToolBarMenuEnabled(true);
- m_toolbarAction = new KToggleAction(i18n("&Show Toolbar"), this);
+ m_toolbarAction = new KToggleAction(i18n("Show Toolbar"), this);
actionCollection()->addAction("toolBar", m_toolbarAction);
connect(m_toolbarAction, SIGNAL(toggled(bool)),
SLOT(optionsShowToolbar()));
@@ -319,11 +319,11 @@
KStandardAction::preferences(this, SLOT(optionsPreferences()), actionCollection());
KAction* load_board_action = actionCollection()->addAction("load_board_list");
- load_board_action->setText(i18n("Load board list"));
+ load_board_action->setText(i18n("Load Board List"));
connect(load_board_action, SIGNAL(triggered()), m_bbsTab, SLOT(updateBoardList()));
KAction* login_action = actionCollection()->addAction("login");
- login_action->setText(i18n("Login"));
+ login_action->setText(i18nc("@action:inmenu Login menu", "Login"));
connect(login_action, SIGNAL(triggered()), m_bbsTab, SLOT(login()));
setXMLFile("kitaui.rc");
Modified: kita/branches/KITA-KDE4/kita/src/prefs/faceprefbase.ui
===================================================================
--- kita/branches/KITA-KDE4/kita/src/prefs/faceprefbase.ui 2009-07-26 21:37:13 UTC (rev 2482)
+++ kita/branches/KITA-KDE4/kita/src/prefs/faceprefbase.ui 2009-07-27 12:57:12 UTC (rev 2483)
@@ -112,7 +112,7 @@
<item row="1" column="0">
<widget class="QGroupBox" name="threadGroupBox">
<property name="title">
- <string>Thread</string>
+ <string comment="@label:textbox">Thread</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
Modified: kita/branches/KITA-KDE4/kita/src/prefs/uiprefbase.ui
===================================================================
--- kita/branches/KITA-KDE4/kita/src/prefs/uiprefbase.ui 2009-07-26 21:37:13 UTC (rev 2482)
+++ kita/branches/KITA-KDE4/kita/src/prefs/uiprefbase.ui 2009-07-27 12:57:12 UTC (rev 2483)
@@ -76,7 +76,7 @@
<item>
<widget class="QGroupBox" name="threadGroupBox">
<property name="title">
- <string>Thread</string>
+ <string comment="@label:textbox">Thread</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
Modified: kita/branches/KITA-KDE4/kita/src/threadlistheaderview.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/threadlistheaderview.cpp 2009-07-26 21:37:13 UTC (rev 2482)
+++ kita/branches/KITA-KDE4/kita/src/threadlistheaderview.cpp 2009-07-27 12:57:12 UTC (rev 2483)
@@ -18,6 +18,26 @@
using namespace Kita;
+const struct ColumnAttribute ThreadListHeaderView::attribute[] = {
+ // labelName, itemName, keyName, showDefault
+ { " ", I18N_NOOP("Mark"), "ColumnMark", true },
+ { I18N_NOOP("No."), I18N_NOOP("ID"), "ColumnId", true },
+ { " ", I18N_NOOP("Icon"), "ColumnIcon", true },
+ { I18N_NOOP("Title"), I18N_NOOP("Subject"), "ColumnSubject", true },
+ { I18N_NOOP("ResNum"), I18N_NOOP("ResNum"), "ColumnResNum", true },
+ { I18N_NOOP("ReadNum"), I18N_NOOP("ReadNum"), "ColumnReadNum", true },
+ { I18N_NOOP("ViewPos"), I18N_NOOP("ViewPos"), "ColumnViewPos", false },
+ { I18N_NOOP("Unread"), I18N_NOOP("Unread"), "ColumnUnread", true },
+ { I18N_NOOP("Since"), I18N_NOOP("Since"), "ColumnSince", true },
+ { I18N_NOOP("Thread's speed"),
+ I18N_NOOP("Speed"), "ColumnSpeed", true },
+ { I18N_NOOP("Board"), I18N_NOOP("Board"), "ColumnBoard", false },
+ { I18N_NOOP("Dat URL"), I18N_NOOP("DatURL"), "ColumnDatUrl", false },
+ { I18N_NOOP("Mark Order"),
+ I18N_NOOP("MarkOrder"), "ColumnMarkOrder", false },
+ { I18N_NOOP("ID Order"), I18N_NOOP("IDOrder"), "ColumnIdOrder", false }
+};
+
ThreadListHeaderView::ThreadListHeaderView(QWidget* parent)
: QHeaderView(Qt::Horizontal, parent)
{
@@ -29,7 +49,7 @@
KMenu popup;
for (int i = ColumnBegin; i <= ColumnEnd; i++) {
if (i != ColumnSubject && i != ColumnMarkOrder && i != ColumnIdOrder) {
- KAction* action = new KAction(""/*s_colAttr[i].itemName*/, this);
+ KAction* action = new KAction(i18n(attribute[i].itemName), this);
action->setCheckable(true);
action->setChecked(!isSectionHidden(i));
action->setData(QVariant(i));
@@ -48,9 +68,9 @@
if (action == autoResizeAct) {
//setAutoResize(!action->isChecked());TODO
} else if (action->isChecked()) {
+ showSection(action->data().toInt());
+ } else {
hideSection(action->data().toInt());
- } else {
- showSection(action->data().toInt());
}
//saveHeaderOnOff(); TODO
}
Modified: kita/branches/KITA-KDE4/kita/src/threadlistheaderview.h
===================================================================
--- kita/branches/KITA-KDE4/kita/src/threadlistheaderview.h 2009-07-26 21:37:13 UTC (rev 2482)
+++ kita/branches/KITA-KDE4/kita/src/threadlistheaderview.h 2009-07-27 12:57:12 UTC (rev 2483)
@@ -12,6 +12,14 @@
#include <QtGui/QHeaderView>
+struct ColumnAttribute
+{
+ const char* const labelName; /// for header's label
+ const char* const itemName; /// for header's popupItem
+ QString keyName; /// for KConfig's key
+ bool showDefault; /// default setting.
+};
+
namespace Kita
{
class ThreadListHeaderView : public QHeaderView
@@ -20,6 +28,7 @@
public:
explicit ThreadListHeaderView(QWidget* parent = 0);
+ static const ColumnAttribute attribute[];
private:
void contextMenuEvent(QContextMenuEvent *event);
Modified: kita/branches/KITA-KDE4/kita/src/threadlistview.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/threadlistview.cpp 2009-07-26 21:37:13 UTC (rev 2482)
+++ kita/branches/KITA-KDE4/kita/src/threadlistview.cpp 2009-07-27 12:57:12 UTC (rev 2483)
@@ -31,27 +31,6 @@
using namespace Kita;
-struct ColumnAttribute ThreadListView::s_colAttr[] =
- {
- // labelName, itemName, keyName, showDefault
- { " ", I18N_NOOP("Mark"), "ColumnMark", true },
- { I18N_NOOP("No."), I18N_NOOP("ID"), "ColumnId", true },
- { " ", I18N_NOOP("Icon"), "ColumnIcon", true },
- { I18N_NOOP("Title"), I18N_NOOP("Subject"), "ColumnSubject", true },
- { I18N_NOOP("ResNum"), I18N_NOOP("ResNum"), "ColumnResNum", true },
- { I18N_NOOP("ReadNum"), I18N_NOOP("ReadNum"), "ColumnReadNum", true },
- { I18N_NOOP("ViewPos"), I18N_NOOP("ViewPos"), "ColumnViewPos", false },
- { I18N_NOOP("Unread"), I18N_NOOP("Unread"), "ColumnUnread", true },
- { I18N_NOOP("Since"), I18N_NOOP("Since"), "ColumnSince", true },
- { I18N_NOOP("Thread's speed"), I18N_NOOP("Speed"),
- "ColumnSpeed", true },
- { I18N_NOOP("Board"), I18N_NOOP("Board"), "ColumnBoard", false },
- { I18N_NOOP("Dat URL"), I18N_NOOP("DatURL"), "ColumnDatUrl", false },
- { I18N_NOOP("Mark Order"), I18N_NOOP("MarkOrder"),
- "ColumnMarkOrder", false },
- { I18N_NOOP("ID Order"), I18N_NOOP("IDOrder"), "ColumnIdOrder", false }
- };
-
ThreadListView::ThreadListView(QWidget* parent)
: QWidget(parent)
{
@@ -70,8 +49,8 @@
subjectList->verticalHeader()->setVisible(false);
QStringList labels;
for (int i = ColumnBegin; i <= ColumnEnd; i++) {
- labels << i18n(s_colAttr[i].labelName);
- if (!s_colAttr[i].showDefault) {
+ labels << i18n(ThreadListHeaderView::attribute[i].labelName);
+ if (!ThreadListHeaderView::attribute[i].showDefault) {
hideColumn(i);
}
}
Modified: kita/branches/KITA-KDE4/kita/src/threadlistview.h
===================================================================
--- kita/branches/KITA-KDE4/kita/src/threadlistview.h 2009-07-26 21:37:13 UTC (rev 2482)
+++ kita/branches/KITA-KDE4/kita/src/threadlistview.h 2009-07-27 12:57:12 UTC (rev 2483)
@@ -16,15 +16,6 @@
class KAction;
-struct ColumnAttribute
-{
- const char* labelName; /// for header's label
- QString itemName; /// for header's popupItem
- QString keyName; /// for KConfig's key
- bool showDefault; /// default setting.
-};
-
-
namespace Kita
{
class Thread;
@@ -40,7 +31,6 @@
virtual ~ThreadListView();
protected:
- static struct ColumnAttribute s_colAttr[];
QStringList m_prevquery;
unsigned m_nextHitIndex;
QList<QTableWidgetItem *> m_hitList;
Modified: kita/branches/KITA-KDE4/kita/src/threadproperty.ui
===================================================================
--- kita/branches/KITA-KDE4/kita/src/threadproperty.ui 2009-07-26 21:37:13 UTC (rev 2482)
+++ kita/branches/KITA-KDE4/kita/src/threadproperty.ui 2009-07-27 12:57:12 UTC (rev 2483)
@@ -74,7 +74,7 @@
<item row="4" column="0">
<widget class="QLabel" name="threadNameLabel0">
<property name="text">
- <string>Thread Name</string>
+ <string comment="@label:textbox">Thread Name</string>
</property>
<property name="wordWrap">
<bool>false</bool>
@@ -214,7 +214,7 @@
<item row="12" column="0">
<widget class="QLabel" name="idx_threadNameWithIndexLabel0">
<property name="text">
- <string>Thread Name</string>
+ <string comment="@label:textbox">Thread Name</string>
</property>
<property name="wordWrap">
<bool>false</bool>
Modified: kita/branches/KITA-KDE4/kita/src/threadtabwidget.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/threadtabwidget.cpp 2009-07-26 21:37:13 UTC (rev 2482)
+++ kita/branches/KITA-KDE4/kita/src/threadtabwidget.cpp 2009-07-27 12:57:12 UTC (rev 2483)
@@ -210,7 +210,7 @@
KStandardAction::findPrev(this, SLOT(slotSearchPrev()), actionCollection());
KAction* goback_action = actionCollection()->addAction("threadview_goback");
- goback_action->setText(i18n("go back anchor"));
+ goback_action->setText(i18n("Go Back Anchor"));
goback_action->setShortcut(Qt::Key_Backspace);
goback_action->setIcon(SmallIcon("arrow-left-double"));
connect(goback_action, SIGNAL(triggered()), this, SLOT(slotGobackAnchor()));
Modified: kita/branches/KITA-KDE4/kita/src/threadtabwidgetui.rc
===================================================================
--- kita/branches/KITA-KDE4/kita/src/threadtabwidgetui.rc 2009-07-26 21:37:13 UTC (rev 2482)
+++ kita/branches/KITA-KDE4/kita/src/threadtabwidgetui.rc 2009-07-27 12:57:12 UTC (rev 2483)
@@ -1,7 +1,7 @@
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
<kpartgui name="kitaThreadTabWidget" version="1">
<MenuBar>
- <Menu name="thread"><text>&Thread</text>
+ <Menu name="thread"><text>Thread</text>
<Action name="tab_closetab" />
<Separator/>
<Action name="threadview_goback" />
Modified: kita/branches/KITA-KDE4/kita/src/writedialogbase.ui
===================================================================
--- kita/branches/KITA-KDE4/kita/src/writedialogbase.ui 2009-07-26 21:37:13 UTC (rev 2482)
+++ kita/branches/KITA-KDE4/kita/src/writedialogbase.ui 2009-07-27 12:57:12 UTC (rev 2483)
@@ -162,7 +162,7 @@
<item>
<widget class="QPushButton" name="buttonOk" >
<property name="text" >
- <string>&OK</string>
+ <string>OK</string>
</property>
<property name="shortcut" >
<string/>
@@ -178,7 +178,7 @@
<item>
<widget class="QPushButton" name="buttonCancel" >
<property name="text" >
- <string>&Cancel</string>
+ <string>Cancel</string>
</property>
<property name="shortcut" >
<string/>