内部的な変更

diff --git a/usr/share/serene-setup-wizard/src/Interfaces.py b/usr/share/serene-setup-wizard/src/Interfaces.py
index 8f8bcc1..e49a2b2 100755 (executable)
--- a/usr/share/serene-setup-wizard/src/Interfaces.py
+++ b/usr/share/serene-setup-wizard/src/Interfaces.py
@@ -52,7 +52,7 @@ class CUI(Interface) :
 
     def show(self, _str) :
 
-        print(_str)
+        print("{}: {}".format(_str[0].ljust(25), _str[1]))
 
     def choose(self, _num_of_choices) :
        

diff --git a/usr/share/serene-setup-wizard/src/Items.py b/usr/share/serene-setup-wizard/src/Items.py
index 7d6848f..8fae678 100755 (executable)
--- a/usr/share/serene-setup-wizard/src/Items.py
+++ b/usr/share/serene-setup-wizard/src/Items.py
@@ -121,9 +121,9 @@ class Chrome(Item) :
     def show(self) :
 
         if self.isdefault() :
-            self.interface.show("Google Chrome           : not installed ")
+            self.interface.show([self.name, "not installed"])
         else :
-            self.interface.show("Google Chrome           : installed")
+            self.interface.show([self.name, "installed"])
 
 
     def change(self) :
@@ -201,10 +201,9 @@ class Firefox(Item) :
     def show(self) :
 
         if self.isdefault() :
-            self.interface.show("Firefox                 : not installed ")
+            self.interface.show([self.name, "not installed"])
         else :
-            self.interface.show("Firefox                 : installed")
-
+            self.interface.show([self.name, "installed"])
 
     def change(self) :
 
@@ -268,10 +267,9 @@ class Chromium(Item) :
     def show(self) :
        
         if self.isdefault() :
-            self.interface.show("Chromium                : installed") 
+            self.interface.show([self.name, "installed"])
         else :
-            self.interface.show("Chromium                : not installed")
-
+            self.interface.show([self.name, "not installed"])
     
     def change(self) :
 
@@ -333,9 +331,9 @@ class FFmpeg(Item) :
     def show(self) :
        
         if self.isdefault() :
-            self.interface.show("FFmpeg                  : not installed") 
+            self.interface.show([self.name, "not installed"])
         else :
-            self.interface.show("FFmpeg                  : installed")
+            self.interface.show([self.name, "installed"])
 
     
     def change(self) :
@@ -397,9 +395,9 @@ class Blueman(Item) :
     def show(self) :
        
         if self.isdefault() :
-            self.interface.show("Blueman                 : not installed") 
+            self.interface.show([self.name, "not installed"])
         else :
-            self.interface.show("Blueman                 : installed")
+            self.interface.show([self.name, "installed"])
 
     
     def change(self) :
@@ -461,9 +459,9 @@ class Kdeconnect(Item) :
     def show(self) :
        
         if self.isdefault() :
-            self.interface.show("KDE Connect             : not installed") 
+            self.interface.show([self.name, "not installed"])
         else :
-            self.interface.show("KDE Connect             : installed")
+            self.interface.show([self.name, "installed"])
 
     
     def change(self) :
@@ -560,9 +558,9 @@ class Wine(Item) :
     def show(self) :
 
         if self.isdefault() :
-            self.interface.show("Wine 4.0                : not installed ")
+            self.interface.show([self.name, "not installed"])
         else :
-            self.interface.show("Wine 4.0                : installed")
+            self.interface.show([self.name, "installed"])
 
 
     def change(self) :
@@ -623,9 +621,9 @@ class Playonlinux(Item) :
     def show(self) :
        
         if self.isdefault() :
-            self.interface.show("PlayOnLinux             : not installed") 
+            self.interface.show([self.name, "not installed"])
         else :
-            self.interface.show("PlayOnLinux             : installed")
+            self.interface.show([self.name, "installed"])
 
     
     def change(self) :
@@ -696,9 +694,9 @@ class Winetricks(Item) :
     def show(self) :
        
         if self.isdefault() :
-            self.interface.show("Winetricks              : not installed") 
+            self.interface.show([self.name, "not installed"])
         else :
-            self.interface.show("Winetricks              : installed")
+            self.interface.show([self.name, "installed"])
 
     
     def change(self) :
@@ -759,9 +757,9 @@ class Steam(Item) :
     def show(self) :
        
         if self.isdefault() :
-            self.interface.show("Steam                   : not installed") 
+            self.interface.show([self.name, "not installed"])
         else :
-            self.interface.show("Steam                   : installed")
+            self.interface.show([self.name, "installed"])
 
     
     def change(self) :
@@ -822,9 +820,9 @@ class VSCode(Item) :
     def show(self) :
        
         if self.isdefault() :
-            self.interface.show("Visual Studio Code      : not installed") 
+            self.interface.show([self.name, "not installed"])
         else :
-            self.interface.show("Visual Studio Code      : installed")
+            self.interface.show([self.name, "installed"])
 
     
     def change(self) :