diff --git a/docs/images/DFontComboBox.png b/docs/images/DFontComboBox.png new file mode 100644 index 000000000..1543ab90e Binary files /dev/null and b/docs/images/DFontComboBox.png differ diff --git a/docs/widgets/dfontcombobox.zh_CN.dox b/docs/widgets/dfontcombobox.zh_CN.dox index dc1bd2c7a..8b3037f8e 100644 --- a/docs/widgets/dfontcombobox.zh_CN.dox +++ b/docs/widgets/dfontcombobox.zh_CN.dox @@ -2,11 +2,42 @@ @~chinese @file dfontcombobox.h @ingroup button -@class -@brief -@details +@class Dtk::Widget::DFontComboBox +@brief 继承自 DComboBox类 字体选择下拉列表 +@details DFontComboBox类 继承自 DComboBox类 提供了进行系统字体选择的下拉列表 +@code +#代码示例 +DFontComboBox *fontComboBox = new DFontComboBox(); +@endcode +@image html DFontComboBox.png -TODO: 添加类简介、示例代码、示例截图和函数使用说明等 +@fn DFontComboBox::DFontComboBox(QWidget *parent) +@brief DFontComboBox 构造函数 +@param[in] parent 父构件对象 +@fn void DFontComboBox::setWritingSystem(QFontDatabase::WritingSystem script) +@brief 与 QFontComboBox::setWritingSystem 相同 + +@fn QFontDatabase::WritingSystem DFontComboBox::writingSystem() const +@brief 与 QFontComboBox::writingSystem 相同 + +@fn void DFontComboBox::setFontFilters(QFontComboBox::FontFilters filters) +@brief 与 QFontComboBox::setFontFilters 相同 + +@fn QFontComboBox::FontFilters DFontComboBox::fontFilters() const +@brief 与 QFontComboBox::fontFilters 相同 + +@fn QFont DFontComboBox::currentFont() const +@brief 与 QFontComboBox::currentFont 相同 + +@fn QSize DFontComboBox::sizeHint() const +@brief 与 QFontComboBox::sizeHint 相同 + +@fn void DFontComboBox::setCurrentFont(const QFont &f) +@brief 与 QFontComboBox::setCurrentFont 相同 + +@fn bool DFontComboBox::event(QEvent *e) +@brief 与 QFontComboBox::event 相同 */ + diff --git a/src/widgets/dfontcombobox.cpp b/src/widgets/dfontcombobox.cpp index 132fc03a0..012e674c7 100644 --- a/src/widgets/dfontcombobox.cpp +++ b/src/widgets/dfontcombobox.cpp @@ -30,7 +30,7 @@ class DFontComboBoxPrivate : public DComboBoxPrivate virtual ~DFontComboBoxPrivate() override; - // DFontComboBox的具体实现采用QFontComboBox的实现 + // The specific implementation of DFontComboBox adopts the implementation of QFontComboBox QFontComboBox* impl; }; @@ -40,17 +40,22 @@ DFontComboBoxPrivate::~DFontComboBoxPrivate() } /*! - * \~chinese \class DFontComboBox - * \~chinese \brief DFontComboBox 字体选择下拉列表 - * \~chinese \li DFontComboBox 提供了系统字体选择功能 - * - * \~chinese \note\row 代码示例 - * \~chinese \note\row DFontComboBox *fontComboBox = new DFontComboBox(); - */ - +@~english + @class DFontComboBox + @brief The DFontComboBox class provides combobox for selecting font + + The DFontComboBox class provides functions to select system font + + @code + #code example + DFontComboBox *fontComboBox = new DFontComboBox(); + @endcode + + @image html DFontComboBox.png /*! - * \chinese \brief DFontComboBox 构造函数 - * \chinese \param parent参数被发送到 DComboBox 构造函数 +@~english + @brief DFontComboBox constructor. + @param[in] parent is passed to DComboBox constructor */ DFontComboBox::DFontComboBox(QWidget *parent) : DComboBox(*new DFontComboBoxPrivate(this), parent) @@ -69,7 +74,8 @@ DFontComboBox::~DFontComboBox() } /*! - * \~chinese \brief 与QFontComboBox::setWritingSystem相同 +@~english + @brief same as QFontComboBox::setWritingSystem */ void DFontComboBox::setWritingSystem(QFontDatabase::WritingSystem script) { @@ -78,7 +84,8 @@ void DFontComboBox::setWritingSystem(QFontDatabase::WritingSystem script) } /*! - * \~chinese \brief 与QFontComboBox::writingSystem相同 +@~english + @brief same as QFontComboBox::writingSystem */ QFontDatabase::WritingSystem DFontComboBox::writingSystem() const { @@ -87,7 +94,8 @@ QFontDatabase::WritingSystem DFontComboBox::writingSystem() const } /*! - * \~chinese \brief 与QFontComboBox::setFontFilters相同 +@~english + @brief same as QFontComboBox::setFontFilters */ void DFontComboBox::setFontFilters(QFontComboBox::FontFilters filters) { @@ -96,7 +104,8 @@ void DFontComboBox::setFontFilters(QFontComboBox::FontFilters filters) } /*! - * \~chinese \brief 与QFontComboBox::fontFilters相同 +@~english + @brief same as QFontComboBox::fontFilters */ QFontComboBox::FontFilters DFontComboBox::fontFilters() const { @@ -105,7 +114,8 @@ QFontComboBox::FontFilters DFontComboBox::fontFilters() const } /*! - * \~chinese \brief 与QFontComboBox::currentFont相同 +@~english + @brief same as QFontComboBox::currentFont */ QFont DFontComboBox::currentFont() const { @@ -114,7 +124,8 @@ QFont DFontComboBox::currentFont() const } /*! - * \~chinese \brief 与QFontComboBox::sizeHint相同 +@~english + @brief same as QFontComboBox::sizeHint */ QSize DFontComboBox::sizeHint() const { @@ -123,7 +134,8 @@ QSize DFontComboBox::sizeHint() const } /*! - * \~chinese \brief 与QFontComboBox::setCurrentFont相同 +@~english + @brief same as QFontComboBox::setCurrentFont */ void DFontComboBox::setCurrentFont(const QFont &f) { @@ -132,7 +144,8 @@ void DFontComboBox::setCurrentFont(const QFont &f) } /*! - * \~chinese \brief 与QFontComboBox::event相同 +@~english + @brief same as QFontComboBox::event */ bool DFontComboBox::event(QEvent *e) {