#143 ドライブ情報が正しく表示されるようになった

actlaboratory · Jul 10, 2020 · cf752cd · cf752cd
1 parent 498196b
commit cf752cd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/tabs/NetworkResourceList.py b/tabs/NetworkResourceList.py
@@ -85,5 +85,6 @@ def GetTabName(self):
 
 	def GetRootObject(self):
 		"""ドライブ詳細情報表示で用いる"""
-		#TODO:IPアドレス入れる
-		return browsableObjects.NetworkResource(self.listObject.rootDirectory[2:],self.listObject.rootDirectory,None)
+		obj=browsableObjects.NetworkResource()
+		obj.Initialize(self.listObject.rootDirectory[2:],self.listObject.rootDirectory,"")
+		return obj
diff --git a/views/main.py b/views/main.py
@@ -856,7 +856,7 @@ def ShowDetail(self,elem):
 			if elem.free>=0:
 				dic[_("総容量")]=misc.ConvertBytesTo(elem.total, misc.UNIT_AUTO, True)
 			dic[_("種類")]=elem.typeString
-		if type(elem)==browsableObjects.NetworkResource:
+		if type(elem)==browsableObjects.NetworkResource and elem.address!="":
 			dic[_("IPアドレス")]=elem.address
 		d=views.objectDetail.Dialog()
 		d.Initialize(dic)