对代码结构做一些修改

Author: wangdaye078

QtResArscEditor.vcxproj

@@ -113,6 +113,7 @@
     <ClCompile Include="src\ResArscStruct.cpp" />
     <ClCompile Include="src\StringPoolExtend.cpp" />
     <ClCompile Include="src\SimpleRichText.cpp" />
+    <ClCompile Include="src\TablePackageExtend.cpp" />
     <ClCompile Include="src\utf8.cpp" />
     <QtRcc Include="QResArscEditorUI.qrc" />
     <ClCompile Include="main.cpp" />
@@ -128,6 +129,7 @@
     <ClInclude Include="src\QUtf8.h" />
     <ClInclude Include="src\StringPoolExtend.h" />
     <ClInclude Include="src\SimpleRichText.h" />
+    <ClInclude Include="src\TablePackageExtend.h" />
     <ClInclude Include="src\utf8.h" />
     <QtMoc Include="src\QResArscEditorUI.h" />
     <QtMoc Include="src\QResArscEditor.h" />

QtResArscEditor.vcxproj.filters

@@ -70,6 +70,9 @@
     <ClCompile Include="src\utf8.cpp">
       <Filter>utf8</Filter>
     </ClCompile>
+    <ClCompile Include="src\TablePackageExtend.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <QtMoc Include="src\QResArscParser.h">
@@ -113,6 +116,9 @@
     <ClInclude Include="src\QUtf8.h">
       <Filter>utf8</Filter>
     </ClInclude>
+    <ClInclude Include="src\TablePackageExtend.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="QtResArscEditor.rc">

src/QEditDialog.cpp

@@ -256,9 +256,9 @@ void QEditDialog::CreateControl(void)
 	m_Type2Page.insert((uint32_t)Res_value::_DataType::TYPE_INT_COLOR_ARGB4, 1);
 	m_Type2Page.insert((uint32_t)Res_value::_DataType::TYPE_INT_COLOR_RGB4, 1);
 }
-void QEditDialog::setResArscParser(QResArscParser* _p)
+void QEditDialog::setTablePackage(TTablePackage* _package)
 {
-	m_ResArscParser = _p;
+	m_tablePackage = _package;
 }
 void QEditDialog::setData(const ResTable_config& _config, uint32_t _type, uint32_t _data)
 {
@@ -290,22 +290,23 @@ void QEditDialog::onStackedCurrentChanged_slot(int _index)
 	switch (_index)
 	{
 	case 0:
-		m_TE_String->setPlainText(m_ResArscParser->resValue2String(t_value));
+		m_TE_String->setPlainText(m_tablePackage->resValue2String(t_value));
+		m_CB_ShowRichText->setChecked(false);
 		break;
 	case 1:
-		m_LE_Color->setText(m_ResArscParser->resValue2String(t_value));
+		m_LE_Color->setText(m_tablePackage->resValue2String(t_value));
 		break;
 	case 2:
-		m_LE_Digital->setText(m_ResArscParser->resValue2String(t_value));
+		m_LE_Digital->setText(m_tablePackage->resValue2String(t_value));
 		break;
 	case 3:
-		m_LE_Hex->setText(m_ResArscParser->resValue2String(t_value));
+		m_LE_Hex->setText(m_tablePackage->resValue2String(t_value));
 		break;
 	case 4:
 		m_CB_Boolen->setCurrentIndex(m_data == 0 ? 0 : 1);
 		break;
 	case 5:
-		m_LE_Reference->setText(m_ResArscParser->resValue2String(t_value));
+		m_LE_Reference->setText(m_tablePackage->resValue2String(t_value));
 		break;
 	}
 }
@@ -341,7 +342,7 @@ void QEditDialog::onReferenceTextChanged_slot(const QString& _text)
 	if (!t_ok)
 		return;
 
-	m_TE_Reference->setText(m_ResArscParser->getReferenceDestination(m_config, t_data));
+	m_TE_Reference->setText(m_tablePackage->getReferenceDestination(m_config, t_data));
 }
 void QEditDialog::onShowRichTextStateChanged_slot(int)
 {

src/QEditDialog.h

@@ -20,7 +20,7 @@ class QPlainTextEdit;
 class QTextBrowser;
 class QCheckBox;
 class QResArscParser;
-
+class TTablePackage;
 
 class QEditDialog : public QDialog
 {
@@ -30,7 +30,7 @@ class QEditDialog : public QDialog
 	QEditDialog(QWidget* _parent = nullptr);
 	~QEditDialog();
 	void RetranslateUi(void);
-	void setResArscParser(QResArscParser* _p);
+	void setTablePackage(TTablePackage* _package);
 	void setData(const ResTable_config& _config, uint32_t _type, uint32_t _data);
 	uint32_t getType(void) const;
 	uint32_t getData(void) const;
@@ -68,7 +68,7 @@ private slots:
 	QTextEdit* m_TE_Reference;
 	//----------------------
 	QMap<uint32_t, int> m_Type2Page;
-	QResArscParser* m_ResArscParser;
+	TTablePackage* m_tablePackage;
 	ResTable_config m_config;
 	uint32_t m_type;
 	uint32_t m_data;

src/QResArscEditor.cpp

@@ -6,22 +6,16 @@
 //********************************************************************
 #ifndef QResArscEditor_h__
 #define QResArscEditor_h__
-
 #include "QResArscEditorUI.h"
+#include "TablePackageExtend.h"
+
 class QResArscParser;
-enum ETreeItemType
-{
-	eTreeItemType_package,
-	eTreeItemType_type,
-	eTreeItemType_spec
-};
 enum ETreeItemRole
 {
 	eTreeItemRole_type = Qt::UserRole,
 	eTreeItemRole_package,
 	eTreeItemRole_typeid,
 	eTreeItemRole_specid,
-	eTreeItemRole_tableConfig
 };
 enum EValueItemType
 {
@@ -48,7 +42,9 @@ class QResArscEditor : public QResArscEditorUI
 	~QResArscEditor();
 private:
 	void refreshArscTree();
-	void refreshResTableType(quint32 _typeid, quint32 _specid);
+	void onRefreshTablePackage(const QString& _name, const TTablePackage& _package);
+	void onRefreshTablePackageData(const QString& _packageName, ETreeItemType _type, uint32_t _id1, uint32_t _id2, const QString& _name);
+	void refreshResTableType(const TTablePackage& _tablePackage, quint32 _typeid, quint32 _specid);
 
 	void onOpenReleased_Slot(void);
 	void onSaveReleased_Slot(void);