修正BUG，重构代码

Author: wangdaye078

QtResArscEditor.vcxproj

@@ -109,7 +109,9 @@
     <ClCompile Include="src\QResArscEditor.cpp" />
     <ClCompile Include="src\QResArscEditorUI.cpp" />
     <ClCompile Include="src\QResArscParser.cpp" />
+    <ClCompile Include="src\QUtf8.cpp" />
     <ClCompile Include="src\ResArscStruct.cpp" />
+    <ClCompile Include="src\StringPoolExtend.cpp" />
     <ClCompile Include="src\SimpleRichText.cpp" />
     <ClCompile Include="src\utf8.cpp" />
     <QtRcc Include="QResArscEditorUI.qrc" />
@@ -123,6 +125,8 @@
     <QtMoc Include="src\QAppendDialog.h" />
     <QtMoc Include="src\QPublicFinal.h" />
     <QtMoc Include="src\QAddLocaleDialog.h" />
+    <ClInclude Include="src\QUtf8.h" />
+    <ClInclude Include="src\StringPoolExtend.h" />
     <ClInclude Include="src\SimpleRichText.h" />
     <ClInclude Include="src\utf8.h" />
     <QtMoc Include="src\QResArscEditorUI.h" />

QtResArscEditor.vcxproj.filters

@@ -21,6 +21,9 @@
       <UniqueIdentifier>{639EADAA-A684-42e4-A9AD-28FC9BCB8F7C}</UniqueIdentifier>
       <Extensions>ts</Extensions>
     </Filter>
+    <Filter Include="utf8">
+      <UniqueIdentifier>{ae6f8a82-e3a0-43da-85b2-20bf4236eee2}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <QtRcc Include="QResArscEditorUI.qrc">
@@ -46,9 +49,6 @@
     <ClCompile Include="src\SimpleRichText.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\utf8.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\QEditDialog.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -61,6 +61,15 @@
     <ClCompile Include="src\QAddLocaleDialog.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\StringPoolExtend.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\QUtf8.cpp">
+      <Filter>utf8</Filter>
+    </ClCompile>
+    <ClCompile Include="src\utf8.cpp">
+      <Filter>utf8</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <QtMoc Include="src\QResArscParser.h">
@@ -95,9 +104,15 @@
     <ClInclude Include="src\SimpleRichText.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\utf8.h">
+    <ClInclude Include="src\StringPoolExtend.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\utf8.h">
+      <Filter>utf8</Filter>
+    </ClInclude>
+    <ClInclude Include="src\QUtf8.h">
+      <Filter>utf8</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="QtResArscEditor.rc">

src/QResArscEditor.cpp

@@ -32,9 +32,10 @@ void QResArscEditor::refreshArscTree()
 	m_TW_tree->clear();
 	const ResTable_package& t_tablePackage = m_Parser->tablePackage();
 	QTreeWidgetItem* t_packageItem = new QTreeWidgetItem(m_TW_tree);
-	t_packageItem->setText(0, WCHARToQString(t_tablePackage.name));
+	QString t_packageName = WCHARToQString(t_tablePackage.name);
+	t_packageItem->setText(0, t_packageName);
 	t_packageItem->setData(0, eTreeItemRole_type, eTreeItemType_package);
-
+	t_packageItem->setData(0, eTreeItemRole_package, t_packageName);
 	const TStringPool& t_typeString = m_Parser->typeString();
 	const QMap<uint, TTableTypeData>& t_typeDatas = m_Parser->tableTypeDatas();
 
@@ -46,13 +47,15 @@ void QResArscEditor::refreshArscTree()
 		QTreeWidgetItem* t_typeItem = new QTreeWidgetItem(t_packageItem);
 		t_typeItem->setText(0, t_typeString.strings[i.key() - 1]);
 		t_typeItem->setData(0, eTreeItemRole_type, eTreeItemType_type);
+		t_typeItem->setData(0, eTreeItemRole_package, t_packageName);
 		t_typeItem->setData(0, eTreeItemRole_typeid, i.key());
 		const QVector<TTableTypeEx>& t_tableType = t_typeDatas[i.key()].typeDatas;
 		for (int j = 0; j < t_tableType.size(); ++j)
 		{
 			QTreeWidgetItem* t_specItem = new QTreeWidgetItem(t_typeItem);
 			t_specItem->setText(0, tableConfig2String(t_typeString.strings[i.key() - 1], t_tableType[j].config));
 			t_specItem->setData(0, eTreeItemRole_type, eTreeItemType_spec);
+			t_specItem->setData(0, eTreeItemRole_package, t_packageName);
 			t_specItem->setData(0, eTreeItemRole_typeid, i.key());
 			t_specItem->setData(0, eTreeItemRole_specid, j);
 			t_specItem->setData(0, eTreeItemRole_tableConfig, QVariant::fromValue(t_tableType[j].config));
@@ -179,6 +182,8 @@ void QResArscEditor::onShowTreeContextMenu_slot(const QPoint& _pos)
 	if (m_TW_tree->currentItem() == NULL)
 		return;
 	QTreeWidgetItem* t_item = m_TW_tree->currentItem();
+	if (t_item->data(0, eTreeItemRole_type).toUInt() == eTreeItemType_package)
+		return;
 	QTreeWidgetItem* t_typeItem = t_item;
 	if (t_item->data(0, eTreeItemRole_type).toUInt() != eTreeItemType_type)
 		t_typeItem = t_item->parent();

src/QResArscEditor.h

@@ -18,6 +18,7 @@ enum ETreeItemType
 enum ETreeItemRole
 {
 	eTreeItemRole_type = Qt::UserRole,
+	eTreeItemRole_package,
 	eTreeItemRole_typeid,
 	eTreeItemRole_specid,
 	eTreeItemRole_tableConfig