svnno****@sourc*****
svnno****@sourc*****
2009年 7月 19日 (日) 00:09:16 JST
Revision: 2431 http://sourceforge.jp/projects/kita/svn/view?view=rev&revision=2431 Author: nogu Date: 2009-07-19 00:09:16 +0900 (Sun, 19 Jul 2009) Log Message: ----------- - farewell to Qt3Support - re-add rc files Modified Paths: -------------- kita/branches/KITA-KDE4/kita/src/prefs/CMakeLists.txt kita/branches/KITA-KDE4/kita/src/prefs/aboneprefbase.ui kita/branches/KITA-KDE4/kita/src/prefs/asciiartprefbase.ui kita/branches/KITA-KDE4/kita/src/prefs/faceprefbase.ui kita/branches/KITA-KDE4/kita/src/prefs/login_page.ui kita/branches/KITA-KDE4/kita/src/prefs/prefs.cpp kita/branches/KITA-KDE4/kita/src/prefs/uiprefbase.ui kita/branches/KITA-KDE4/kita/src/prefs/write_page.ui Added Paths: ----------- kita/branches/KITA-KDE4/kita/src/boardtabwidgetui.rc kita/branches/KITA-KDE4/kita/src/kitaui.rc kita/branches/KITA-KDE4/kita/src/threadtabwidgetui.rc kita/branches/KITA-KDE4/kita/src/writetabwidgetui.rc Added: kita/branches/KITA-KDE4/kita/src/boardtabwidgetui.rc =================================================================== --- kita/branches/KITA-KDE4/kita/src/boardtabwidgetui.rc (rev 0) +++ kita/branches/KITA-KDE4/kita/src/boardtabwidgetui.rc 2009-07-18 15:09:16 UTC (rev 2431) @@ -0,0 +1,15 @@ +<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> +<kpartgui name="kitaSubjectTabWidget" version="1"> +<MenuBar> + <Menu name="board"><text>&Board</text> + <Action name="tab_closetab" /> + <Separator/> + <Action name="subjectview_reload" /> + <Action name="subjectview_showoldlogs" /> + <Action name="subjectview_showtitleimg" /> + <Action name="subjectview_newthread" /> + <Separator/> + <Action name="tab_configkeys" /> + </Menu> +</MenuBar> +</kpartgui> Added: kita/branches/KITA-KDE4/kita/src/kitaui.rc =================================================================== --- kita/branches/KITA-KDE4/kita/src/kitaui.rc (rev 0) +++ kita/branches/KITA-KDE4/kita/src/kitaui.rc 2009-07-18 15:09:16 UTC (rev 2431) @@ -0,0 +1,18 @@ +<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> +<kpartgui name="kita" version="3"> +<MenuBar> + <Menu name="file"><text>&File</text> + <Action name="load_board_list" /> + <Action name="login" /> + </Menu> + <Menu name="board"><text>&Board</text> + <Action name="dummy" /> + </Menu> + <Menu name="thread"><text>&Thread</text> + <Action name="dummy" /> + </Menu> +</MenuBar> +<ToolBar name="mainToolBar"> + <Action name="url_line_action" /> +</ToolBar> +</kpartgui> Modified: kita/branches/KITA-KDE4/kita/src/prefs/CMakeLists.txt =================================================================== --- kita/branches/KITA-KDE4/kita/src/prefs/CMakeLists.txt 2009-07-18 11:02:05 UTC (rev 2430) +++ kita/branches/KITA-KDE4/kita/src/prefs/CMakeLists.txt 2009-07-18 15:09:16 UTC (rev 2431) @@ -16,7 +16,7 @@ kde4_add_library(kitapref SHARED ${kitapref_LIB_SRCS}) -target_link_libraries(kitapref ${KDE4_KDECORE_LIBS} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} kitautil) +target_link_libraries(kitapref ${KDE4_KDECORE_LIBS} kitautil ${KDE4_KDEUI_LIBS}) set_target_properties(kitapref PROPERTIES VERSION 1.0.0 SOVERSION 1) install(TARGETS kitapref ${INSTALL_TARGETS_DEFAULT_ARGS}) Modified: kita/branches/KITA-KDE4/kita/src/prefs/aboneprefbase.ui =================================================================== --- kita/branches/KITA-KDE4/kita/src/prefs/aboneprefbase.ui 2009-07-18 11:02:05 UTC (rev 2430) +++ kita/branches/KITA-KDE4/kita/src/prefs/aboneprefbase.ui 2009-07-18 15:09:16 UTC (rev 2431) @@ -70,5 +70,4 @@ </layout> </widget> <layoutdefault spacing="6" margin="11" /> - <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> </ui> Modified: kita/branches/KITA-KDE4/kita/src/prefs/asciiartprefbase.ui =================================================================== --- kita/branches/KITA-KDE4/kita/src/prefs/asciiartprefbase.ui 2009-07-18 11:02:05 UTC (rev 2430) +++ kita/branches/KITA-KDE4/kita/src/prefs/asciiartprefbase.ui 2009-07-18 15:09:16 UTC (rev 2431) @@ -19,7 +19,6 @@ </layout> </widget> <layoutdefault spacing="6" margin="11" /> - <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> <customwidgets> <customwidget> <class>KTextEdit</class> Modified: kita/branches/KITA-KDE4/kita/src/prefs/faceprefbase.ui =================================================================== --- kita/branches/KITA-KDE4/kita/src/prefs/faceprefbase.ui 2009-07-18 11:02:05 UTC (rev 2430) +++ kita/branches/KITA-KDE4/kita/src/prefs/faceprefbase.ui 2009-07-18 15:09:16 UTC (rev 2431) @@ -1,299 +1,322 @@ -<ui version="4.0" stdsetdef="1" > - <author></author> - <comment></comment> - <exportmacro></exportmacro> - <class>Kita::FacePrefBase</class> - <widget class="QWidget" name="Kita::FacePrefBase" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>600</width> - <height>508</height> - </rect> - </property> - <property name="windowTitle" > - <string>Form1</string> - </property> - <layout class="QGridLayout" > - <item row="0" column="0" > - <widget class="QTabWidget" name="tabWidget2" > - <widget class="QWidget" name="tab" > - <attribute name="title" > - <string>Basic</string> - </attribute> - <layout class="QGridLayout" > - <item row="0" column="1" > - <spacer name="spacer1" > - <property name="sizeHint" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> - <property name="sizeType" > - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - </spacer> - </item> - <item row="3" column="0" > - <spacer name="spacer2" > - <property name="sizeHint" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> - <property name="sizeType" > - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - </spacer> - </item> - <item row="0" column="0" > - <widget class="Q3GroupBox" name="listGroupBox" > - <property name="title" > - <string>Board/Subject List</string> - </property> - <layout class="QGridLayout" > - <item row="0" column="1" > - <widget class="QPushButton" name="listFontButton" > - <property name="text" > - <string>set font</string> - </property> - </widget> - </item> - <item row="2" column="1" > - <widget class="KColorButton" name="listBackgroundColorButton" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="text" > - <string/> - </property> - </widget> - </item> - <item row="1" column="0" > - <widget class="QLabel" name="listColorLabel" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="text" > - <string>text color</string> - </property> - <property name="wordWrap" > - <bool>false</bool> - </property> - </widget> - </item> - <item row="2" column="0" > - <widget class="QLabel" name="listBackgroundColorLabel" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="text" > - <string>background color</string> - </property> - <property name="wordWrap" > - <bool>false</bool> - </property> - </widget> - </item> - <item row="1" column="1" > - <widget class="KColorButton" name="listColorButton" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="text" > - <string/> - </property> - </widget> - </item> - <item row="0" column="0" > - <widget class="QLabel" name="listFontLabel" > - <property name="text" > - <string>font</string> - </property> - <property name="wordWrap" > - <bool>false</bool> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item row="1" column="0" > - <widget class="Q3GroupBox" name="threadGroupBox" > - <property name="title" > - <string>Thread</string> - </property> - <layout class="QGridLayout" > - <item row="1" column="1" > - <widget class="KColorButton" name="threadColorButton" > - <property name="text" > - <string/> - </property> - </widget> - </item> - <item row="1" column="0" > - <widget class="QLabel" name="threadColorLabel" > - <property name="text" > - <string>text color</string> - </property> - <property name="wordWrap" > - <bool>false</bool> - </property> - </widget> - </item> - <item row="2" column="1" > - <widget class="KColorButton" name="threadBackgroundColorButton" > - <property name="text" > - <string/> - </property> - </widget> - </item> - <item row="2" column="0" > - <widget class="QLabel" name="threadBackgroundColorLabel" > - <property name="text" > - <string>background color</string> - </property> - <property name="wordWrap" > - <bool>false</bool> - </property> - </widget> - </item> - <item row="0" column="1" > - <widget class="QPushButton" name="threadFontButton" > - <property name="text" > - <string>set font</string> - </property> - </widget> - </item> - <item row="0" column="0" > - <widget class="QLabel" name="threadFontLabel" > - <property name="text" > - <string>font</string> - </property> - <property name="wordWrap" > - <bool>false</bool> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item row="2" column="0" > - <widget class="Q3GroupBox" name="popupGroupBox" > - <property name="title" > - <string>Popup</string> - </property> - <layout class="QGridLayout" > - <item row="0" column="1" > - <widget class="QPushButton" name="popupFontButton" > - <property name="text" > - <string>set font</string> - </property> - </widget> - </item> - <item row="1" column="0" > - <widget class="QLabel" name="popupColorLabel" > - <property name="text" > - <string>text color</string> - </property> - <property name="wordWrap" > - <bool>false</bool> - </property> - </widget> - </item> - <item row="2" column="0" > - <widget class="QLabel" name="popupBackgroundColorLabel" > - <property name="text" > - <string>background color</string> - </property> - <property name="wordWrap" > - <bool>false</bool> - </property> - </widget> - </item> - <item row="0" column="0" > - <widget class="QLabel" name="popupFontLabel" > - <property name="text" > - <string>font</string> - </property> - <property name="wordWrap" > - <bool>false</bool> - </property> - </widget> - </item> - <item row="1" column="1" > - <widget class="KColorButton" name="popupColorButton" > - <property name="text" > - <string/> - </property> - </widget> - </item> - <item row="2" column="1" > - <widget class="KColorButton" name="popupBackgroundColorButton" > - <property name="text" > - <string/> - </property> - </widget> - </item> - </layout> - </widget> - </item> - </layout> - </widget> - <widget class="QWidget" name="tab" > - <attribute name="title" > - <string>Advanced</string> - </attribute> - <layout class="QVBoxLayout" > - <item> - <widget class="QCheckBox" name="useStyleSheetCheckBox" > - <property name="text" > - <string>use stylesheet ( the setup of color/font is overwritten ).</string> - </property> - </widget> - </item> - <item> - <widget class="KTextEdit" name="styleSheetText" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="text" > - <string/> - </property> - </widget> - </item> - </layout> - </widget> +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>Kita::FacePrefBase</class> + <widget class="QWidget" name="Kita::FacePrefBase"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>600</width> + <height>508</height> + </rect> + </property> + <property name="windowTitle"> + <string>Form1</string> + </property> + <layout class="QGridLayout"> + <item row="0" column="0"> + <widget class="QTabWidget" name="tabWidget2"> + <property name="currentIndex"> + <number>0</number> + </property> + <widget class="QWidget" name="tab"> + <attribute name="title"> + <string>Basic</string> + </attribute> + <layout class="QGridLayout" name="gridLayout_4"> + <item row="0" column="0"> + <widget class="QGroupBox" name="listGroupBox"> + <property name="title"> + <string>Board/Subject List</string> + </property> + <layout class="QGridLayout" name="gridLayout_2"> + <item row="0" column="0"> + <widget class="QLabel" name="listFontLabel"> + <property name="text"> + <string>font</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QPushButton" name="listFontButton"> + <property name="text"> + <string>set font</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="listColorLabel"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text"> + <string>text color</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="KColorButton" name="listColorButton"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="listBackgroundColorLabel"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text"> + <string>background color</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="KColorButton" name="listBackgroundColorButton"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> + </layout> </widget> - </item> - </layout> - </widget> - <layoutdefault spacing="6" margin="11" /> - <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> - <includes> - <include location="local" >kcolorbutton.h</include> - <include location="local" >kcolorbutton.h</include> - <include location="local" >kcolorbutton.h</include> - <include location="local" >kcolorbutton.h</include> - <include location="local" >kcolorbutton.h</include> - <include location="local" >kcolorbutton.h</include> - <include location="local" >ktextedit.h</include> - </includes> - <connections> - <connection> - <sender>useStyleSheetCheckBox</sender> - <signal>toggled(bool)</signal> - <receiver>styleSheetText</receiver> - <slot>setEnabled(bool)</slot> - </connection> - </connections> + </item> + <item row="0" column="1"> + <spacer name="spacer1"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="0"> + <widget class="QGroupBox" name="threadGroupBox"> + <property name="title"> + <string>Thread</string> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="threadFontLabel"> + <property name="text"> + <string>font</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QPushButton" name="threadFontButton"> + <property name="text"> + <string>set font</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="threadColorLabel"> + <property name="text"> + <string>text color</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="KColorButton" name="threadColorButton"> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="threadBackgroundColorLabel"> + <property name="text"> + <string>background color</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="KColorButton" name="threadBackgroundColorButton"> + <property name="text"> + <string/> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item row="2" column="0"> + <widget class="QGroupBox" name="popupGroupBox"> + <property name="title"> + <string>Popup</string> + </property> + <layout class="QGridLayout" name="gridLayout_3"> + <item row="0" column="0"> + <widget class="QLabel" name="popupFontLabel"> + <property name="text"> + <string>font</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QPushButton" name="popupFontButton"> + <property name="text"> + <string>set font</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="popupColorLabel"> + <property name="text"> + <string>text color</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="KColorButton" name="popupColorButton"> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="popupBackgroundColorLabel"> + <property name="text"> + <string>background color</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="KColorButton" name="popupBackgroundColorButton"> + <property name="text"> + <string/> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item row="3" column="0"> + <spacer name="spacer2"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + <widget class="QWidget" name="tab"> + <attribute name="title"> + <string>Advanced</string> + </attribute> + <layout class="QVBoxLayout"> + <item> + <widget class="QCheckBox" name="useStyleSheetCheckBox"> + <property name="text"> + <string>use stylesheet ( the setup of color/font is overwritten ).</string> + </property> + </widget> + </item> + <item> + <widget class="KTextEdit" name="styleSheetText"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text" stdset="0"> + <string/> + </property> + </widget> + </item> + </layout> + </widget> + </widget> + </item> + </layout> + </widget> + <layoutdefault spacing="6" margin="11"/> + <customwidgets> + <customwidget> + <class>KColorButton</class> + <extends>QPushButton</extends> + <header>kcolorbutton.h</header> + </customwidget> + <customwidget> + <class>KTextEdit</class> + <extends>QTextEdit</extends> + <header>ktextedit.h</header> + </customwidget> + </customwidgets> + <includes> + <include location="local">kcolorbutton.h</include> + <include location="local">kcolorbutton.h</include> + <include location="local">kcolorbutton.h</include> + <include location="local">kcolorbutton.h</include> + <include location="local">kcolorbutton.h</include> + <include location="local">kcolorbutton.h</include> + <include location="local">ktextedit.h</include> + </includes> + <resources/> + <connections> + <connection> + <sender>useStyleSheetCheckBox</sender> + <signal>toggled(bool)</signal> + <receiver>styleSheetText</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>20</x> + <y>20</y> + </hint> + <hint type="destinationlabel"> + <x>20</x> + <y>20</y> + </hint> + </hints> + </connection> + </connections> </ui> Modified: kita/branches/KITA-KDE4/kita/src/prefs/login_page.ui =================================================================== --- kita/branches/KITA-KDE4/kita/src/prefs/login_page.ui 2009-07-18 11:02:05 UTC (rev 2430) +++ kita/branches/KITA-KDE4/kita/src/prefs/login_page.ui 2009-07-18 15:09:16 UTC (rev 2431) @@ -153,7 +153,6 @@ </layout> </widget> <layoutdefault spacing="6" margin="11" /> - <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> <includes> <include location="local" >klineedit.h</include> <include location="local" >klineedit.h</include> Modified: kita/branches/KITA-KDE4/kita/src/prefs/prefs.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/prefs/prefs.cpp 2009-07-18 11:02:05 UTC (rev 2430) +++ kita/branches/KITA-KDE4/kita/src/prefs/prefs.cpp 2009-07-18 15:09:16 UTC (rev 2431) @@ -174,7 +174,7 @@ kcfg_MarkTime->setValue(24); kcfg_ShowMailAddress->setChecked(false); kcfg_ShowNum->setValue(100); - kcfg_ListSortOrder->setButton(Config::EnumListSortOrder::Mark); + //kcfg_ListSortOrder->setButton(Config::EnumListSortOrder::Mark);TODO kcfg_PartMimeList->setText("image/gif,image/jpeg,image/png,image/x-bmp"); kcfg_UsePart->setChecked(true); } Modified: kita/branches/KITA-KDE4/kita/src/prefs/uiprefbase.ui =================================================================== --- kita/branches/KITA-KDE4/kita/src/prefs/uiprefbase.ui 2009-07-18 11:02:05 UTC (rev 2430) +++ kita/branches/KITA-KDE4/kita/src/prefs/uiprefbase.ui 2009-07-18 15:09:16 UTC (rev 2431) @@ -1,276 +1,268 @@ -<ui version="4.0" stdsetdef="1" > - <author></author> - <comment></comment> - <exportmacro></exportmacro> - <class>Kita::UIPrefBase</class> - <widget class="QWidget" name="Kita::UIPrefBase" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>646</width> - <height>534</height> - </rect> - </property> - <property name="windowTitle" > - <string>Form1</string> - </property> - <layout class="QVBoxLayout" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>Kita::UIPrefBase</class> + <widget class="QWidget" name="Kita::UIPrefBase"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>646</width> + <height>534</height> + </rect> + </property> + <property name="windowTitle"> + <string>Form1</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout_4"> + <item> + <widget class="QCheckBox" name="kcfg_AlwaysUseTab"> + <property name="text"> + <string>Use new tab when opening the thread(board).</string> + </property> + </widget> + </item> + <item> + <layout class="QHBoxLayout"> + <item> + <widget class="QLabel" name="MarkLabel"> + <property name="text"> + <string>Mark new thread to made:</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + <item> + <spacer name="spacer6"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QSpinBox" name="kcfg_MarkTime"> + <property name="toolTip"> + <string/> + </property> + <property name="specialValueText"> + <string>after last access</string> + </property> + <property name="suffix"> + <string> hour</string> + </property> + <property name="prefix"> + <string>within </string> + </property> + <property name="minimum"> + <number>0</number> + </property> + <property name="maximum"> + <number>24</number> + </property> + <property name="value"> + <number>24</number> + </property> + </widget> + </item> + </layout> + </item> + <item> + <widget class="QGroupBox" name="threadGroupBox"> + <property name="title"> + <string>Thread</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> <item> - <widget class="QCheckBox" name="kcfg_AlwaysUseTab" > - <property name="text" > - <string>Use new tab when opening the thread(board).</string> + <layout class="QHBoxLayout" name="_2"> + <item> + <widget class="QSpinBox" name="kcfg_ShowNum"> + <property name="wrapping"> + <bool>true</bool> </property> - </widget> + <property name="specialValueText"> + <string>Display all res</string> + </property> + <property name="suffix"> + <string> res</string> + </property> + <property name="prefix"> + <string>Display </string> + </property> + <property name="maximum"> + <number>1000</number> + </property> + <property name="singleStep"> + <number>50</number> + </property> + <property name="value"> + <number>100</number> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="textLabel3_2"> + <property name="text"> + <string>around the last read response.</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + <item> + <spacer name="spacer11_2_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> </item> <item> - <layout class="QHBoxLayout" > - <item> - <widget class="QLabel" name="MarkLabel" > - <property name="text" > - <string>Mark new thread to made:</string> - </property> - <property name="wordWrap" > - <bool>false</bool> - </property> - </widget> - </item> - <item> - <spacer name="spacer6" > - <property name="sizeHint" > - <size> - <width>20</width> - <height>20</height> - </size> - </property> - <property name="sizeType" > - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - </spacer> - </item> - <item> - <widget class="QSpinBox" name="kcfg_MarkTime" > - <property name="prefix" > - <string>within </string> - </property> - <property name="suffix" > - <string> hour</string> - </property> - <property name="specialValueText" > - <string>after last access</string> - </property> - <property name="maximum" > - <number>24</number> - </property> - <property name="minimum" > - <number>0</number> - </property> - <property name="value" > - <number>24</number> - </property> - <property name="toolTip" stdset="0" > - <string/> - </property> - </widget> - </item> - </layout> + <widget class="QLabel" name="textLabel1"> + <property name="text"> + <string>this option affects from the next thread.</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> </item> <item> - <widget class="Q3ButtonGroup" name="buttonGroup3" > - <property name="title" > - <string>Thread</string> - </property> - <layout class="QVBoxLayout" > - <item> - <widget class="QLabel" name="textLabel1" > - <property name="text" > - <string>this option affects from the next thread.</string> - </property> - <property name="wordWrap" > - <bool>false</bool> - </property> - </widget> - </item> - <item> - <widget class="QCheckBox" name="kcfg_ShowMailAddress" > - <property name="text" > - <string>Show mail address in the thread.</string> - </property> - </widget> - </item> - <item> - <layout class="QHBoxLayout" > - <item> - <widget class="QSpinBox" name="kcfg_ShowNum" > - <property name="prefix" > - <string>Display </string> - </property> - <property name="suffix" > - <string> res</string> - </property> - <property name="specialValueText" > - <string>Display all res</string> - </property> - <property name="wrapping" > - <bool>true</bool> - </property> - <property name="maximum" > - <number>1000</number> - </property> - <property name="singleStep" > - <number>50</number> - </property> - <property name="value" > - <number>100</number> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="textLabel3_2" > - <property name="text" > - <string>around the last read response.</string> - </property> - <property name="wordWrap" > - <bool>false</bool> - </property> - </widget> - </item> - <item> - <spacer name="spacer11_2_2" > - <property name="sizeHint" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> - <property name="sizeType" > - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - </spacer> - </item> - </layout> - </item> - </layout> - </widget> + <widget class="QCheckBox" name="kcfg_ShowMailAddress"> + <property name="text"> + <string>Show mail address in the thread.</string> + </property> + </widget> </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="kcfg_ListSortOrder"> + <property name="title"> + <string>When open the board</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout_2"> <item> - <widget class="Q3ButtonGroup" name="kcfg_ListSortOrder" > - <property name="title" > - <string>When open the board</string> - </property> - <layout class="QVBoxLayout" > - <item> - <widget class="QRadioButton" name="unreadFirstRadio" > - <property name="text" > - <string>Show unread thread first</string> - </property> - <property name="checked" > - <bool>true</bool> - </property> - <property name="buttonGroupId" > - <number>0</number> - </property> - </widget> - </item> - <item> - <widget class="QRadioButton" name="numOrderRadio" > - <property name="text" > - <string>Show thread in numerical order</string> - </property> - <property name="buttonGroupId" > - <number>1</number> - </property> - </widget> - </item> - </layout> - </widget> + <widget class="QRadioButton" name="unreadFirstRadio"> + <property name="text"> + <string>Show unread thread first</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + <property name="buttonGroupId" stdset="0"> + <number>0</number> + </property> + </widget> </item> <item> - <widget class="Q3GroupBox" name="extPartGroup" > - <property name="title" > - <string>Parts</string> - </property> - <layout class="QGridLayout" > - <item row="2" column="0" > - <widget class="QLineEdit" name="kcfg_PartMimeList" /> - </item> - <item row="0" column="0" > - <widget class="QCheckBox" name="kcfg_UsePart" > - <property name="text" > - <string>Use other Part to open external link</string> - </property> - <property name="checked" > - <bool>true</bool> - </property> - </widget> - </item> - <item row="1" column="0" > - <widget class="QLabel" name="mimeListLabel" > - <property name="text" > - <string>If mime type include this list ( comma separated list )</string> - </property> - <property name="buddy" stdset="0" > - <cstring>PartMimeList</cstring> - </property> - <property name="toolTip" stdset="0" > - <string/> - </property> - <property name="wordWrap" > - <bool>false</bool> - </property> - </widget> - </item> - </layout> - </widget> + <widget class="QRadioButton" name="numOrderRadio"> + <property name="text"> + <string>Show thread in numerical order</string> + </property> + <property name="buttonGroupId" stdset="0"> + <number>1</number> + </property> + </widget> </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="partsGroupBox"> + <property name="title"> + <string>Parts</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout_3"> <item> - <widget class="KUrlLabel" name="editFileAssociation" > - <property name="text" > - <string>Edit file association...</string> - </property> - </widget> + <widget class="QCheckBox" name="kcfg_UsePart"> + <property name="text"> + <string>Use other Part to open external link</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> </item> <item> - <spacer name="spacer2" > - <property name="sizeHint" > - <size> - <width>30</width> - <height>70</height> - </size> - </property> - <property name="sizeType" > - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - </spacer> + <widget class="QLabel" name="mimeListLabel"> + <property name="toolTip"> + <string/> + </property> + <property name="text"> + <string>If mime type include this list ( comma separated list )</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + <property name="buddy"> + <cstring>PartMimeList</cstring> + </property> + </widget> </item> - </layout> - </widget> - <layoutdefault spacing="6" margin="11" /> - <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> - <includes> - <include location="local" >kurllabel.h</include> - </includes> - <connections> - <connection> - <sender>kcfg_UsePart</sender> - <signal>toggled(bool)</signal> - <receiver>kcfg_PartMimeList</receiver> - <slot>setEnabled(bool)</slot> - </connection> - <connection> - <sender>kcfg_UsePart</sender> - <signal>toggled(bool)</signal> - <receiver>mimeListLabel</receiver> - <slot>setEnabled(bool)</slot> - </connection> - </connections> + <item> + <widget class="QLineEdit" name="kcfg_PartMimeList"/> + </item> + </layout> + </widget> + </item> + <item> + <widget class="KUrlLabel" name="editFileAssociation"> + <property name="text"> + <string>Edit file association...</string> + </property> + </widget> + </item> + <item> + <spacer name="spacer2"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>30</width> + <height>70</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + <layoutdefault spacing="6" margin="11"/> + <customwidgets> + <customwidget> + <class>KUrlLabel</class> + <extends>QLabel</extends> + <header>kurllabel.h</header> + </customwidget> + </customwidgets> + <includes> + <include location="local">kurllabel.h</include> + </includes> + <resources/> + <connections/> </ui> Modified: kita/branches/KITA-KDE4/kita/src/prefs/write_page.ui =================================================================== --- kita/branches/KITA-KDE4/kita/src/prefs/write_page.ui 2009-07-18 11:02:05 UTC (rev 2430) +++ kita/branches/KITA-KDE4/kita/src/prefs/write_page.ui 2009-07-18 15:09:16 UTC (rev 2431) @@ -115,7 +115,6 @@ </layout> </widget> <layoutdefault spacing="6" margin="11" /> - <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> <includes> <include location="local" >klineedit.h</include> <include location="local" >klineedit.h</include> Added: kita/branches/KITA-KDE4/kita/src/threadtabwidgetui.rc =================================================================== --- kita/branches/KITA-KDE4/kita/src/threadtabwidgetui.rc (rev 0) +++ kita/branches/KITA-KDE4/kita/src/threadtabwidgetui.rc 2009-07-18 15:09:16 UTC (rev 2431) @@ -0,0 +1,22 @@ +<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> +<kpartgui name="kitaThreadTabWidget" version="1"> +<MenuBar> + <Menu name="thread"><text>&Thread</text> + <Action name="tab_closetab" /> + <Separator/> + <Action name="threadview_goback" /> + <Action name="threadview_gotoheader" /> + <Action name="threadview_gotofooter" /> + <Separator/> + <Action name="threadview_reload" /> + <Action name="threadview_stop" /> + <Action name="threadview_delete" /> + <Separator/> + <Action name="threadview_find" /> + <Action name="threadview_findnext" /> + <Action name="threadview_findprev" /> + <Separator/> + <Action name="tab_configkeys" /> + </Menu> +</MenuBar> +</kpartgui> Added: kita/branches/KITA-KDE4/kita/src/writetabwidgetui.rc =================================================================== --- kita/branches/KITA-KDE4/kita/src/writetabwidgetui.rc (rev 0) +++ kita/branches/KITA-KDE4/kita/src/writetabwidgetui.rc 2009-07-18 15:09:16 UTC (rev 2431) @@ -0,0 +1,3 @@ +<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> +<kpartgui name="kitaWriteTabWidget" version="1"> +</kpartgui>