move preview text method for profiles into xorg superclass, override when needed (#1918)

Co-authored-by: Anton Hvornum <anton@hvornum.se>
This commit is contained in:
Himadri Bhattacharjee 2023-07-31 07:40:45 +00:00 committed by GitHub
parent d878496a2f
commit f8d2690920
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 6 additions and 62 deletions

View File

@ -1,4 +1,4 @@
from typing import List, Optional, Any, TYPE_CHECKING
from typing import List, Any, TYPE_CHECKING
from archinstall.default_profiles.profile import ProfileType
from archinstall.default_profiles.xorg import XorgProfile
@ -28,10 +28,6 @@ class AwesomeProfile(XorgProfile):
'xsel',
]
def preview_text(self) -> Optional[str]:
text = str(_('Environment type: {}')).format(self.profile_type.value)
return text + '\n' + self.packages_text()
def install(self, install_session: 'Installer'):
super().install(install_session)

View File

@ -24,7 +24,3 @@ class BudgieProfile(XorgProfile):
@property
def default_greeter_type(self) -> Optional[GreeterType]:
return GreeterType.Lightdm
def preview_text(self) -> Optional[str]:
text = str(_('Environment type: {}')).format(self.profile_type.value)
return text + '\n' + self.packages_text()

View File

@ -25,7 +25,3 @@ class CinnamonProfile(XorgProfile):
@property
def default_greeter_type(self) -> Optional[GreeterType]:
return GreeterType.Lightdm
def preview_text(self) -> Optional[str]:
text = str(_('Environment type: {}')).format(self.profile_type.value)
return text + '\n' + self.packages_text()

View File

@ -23,9 +23,5 @@ class CutefishProfile(XorgProfile):
def default_greeter_type(self) -> Optional[GreeterType]:
return GreeterType.Sddm
def preview_text(self) -> Optional[str]:
text = str(_('Environment type: {}')).format(self.profile_type.value)
return text + '\n' + self.packages_text()
def install(self, install_session: 'Installer'):
super().install(install_session)

View File

@ -22,7 +22,3 @@ class DeepinProfile(XorgProfile):
@property
def default_greeter_type(self) -> Optional[GreeterType]:
return GreeterType.Lightdm
def preview_text(self) -> Optional[str]:
text = str(_('Environment type: {}')).format(self.profile_type.value)
return text + '\n' + self.packages_text()

View File

@ -21,7 +21,3 @@ class EnlighenmentProfile(XorgProfile):
@property
def default_greeter_type(self) -> Optional[GreeterType]:
return GreeterType.Lightdm
def preview_text(self) -> Optional[str]:
text = str(_('Environment type: {}')).format(self.profile_type.value)
return text + '\n' + self.packages_text()

View File

@ -21,7 +21,3 @@ class GnomeProfile(XorgProfile):
@property
def default_greeter_type(self) -> Optional[GreeterType]:
return GreeterType.Gdm
def preview_text(self) -> Optional[str]:
text = str(_('Environment type: {}')).format(self.profile_type.value)
return text + '\n' + self.packages_text()

View File

@ -25,7 +25,3 @@ class HyperlandProfile(XorgProfile):
@property
def default_greeter_type(self) -> Optional[GreeterType]:
return GreeterType.Sddm
def preview_text(self) -> Optional[str]:
text = str(_('Environment type: {}')).format(self.profile_type.value)
return text + '\n' + self.packages_text()

View File

@ -27,7 +27,3 @@ class I3wmProfile(XorgProfile):
@property
def default_greeter_type(self) -> Optional[GreeterType]:
return GreeterType.Lightdm
def preview_text(self) -> Optional[str]:
text = str(_('Environment type: {}')).format(self.profile_type.value)
return text + '\n' + self.packages_text()

View File

@ -26,7 +26,3 @@ class KdeProfile(XorgProfile):
@property
def default_greeter_type(self) -> Optional[GreeterType]:
return GreeterType.Sddm
def preview_text(self) -> Optional[str]:
text = str(_('Environment type: {}')).format(self.profile_type.value)
return text + '\n' + self.packages_text()

View File

@ -29,7 +29,3 @@ class LxqtProfile(XorgProfile):
@property
def default_greeter_type(self) -> Optional[GreeterType]:
return GreeterType.Sddm
def preview_text(self) -> Optional[str]:
text = str(_('Environment type: {}')).format(self.profile_type.value)
return text + '\n' + self.packages_text()

View File

@ -21,7 +21,3 @@ class MateProfile(XorgProfile):
@property
def default_greeter_type(self) -> Optional[GreeterType]:
return GreeterType.Lightdm
def preview_text(self) -> Optional[str]:
text = str(_('Environment type: {}')).format(self.profile_type.value)
return text + '\n' + self.packages_text()

View File

@ -21,7 +21,3 @@ class QtileProfile(XorgProfile):
@property
def default_greeter_type(self) -> Optional[GreeterType]:
return GreeterType.Lightdm
def preview_text(self) -> Optional[str]:
text = str(_('Environment type: {}')).format(self.profile_type.value)
return text + '\n' + self.packages_text()

View File

@ -73,9 +73,5 @@ class SwayProfile(XorgProfile):
def do_on_select(self):
self._ask_seat_access()
def preview_text(self) -> Optional[str]:
text = str(_('Environment type: {}')).format(self.profile_type.value)
return text + '\n' + self.packages_text()
def install(self, install_session: 'Installer'):
super().install(install_session)

View File

@ -24,7 +24,3 @@ class Xfce4Profile(XorgProfile):
@property
def default_greeter_type(self) -> Optional[GreeterType]:
return GreeterType.Lightdm
def preview_text(self) -> Optional[str]:
text = str(_('Environment type: {}')).format(self.profile_type.value)
return text + '\n' + self.packages_text()

View File

@ -1,4 +1,4 @@
from typing import Any, TYPE_CHECKING, List
from typing import Any, Optional, TYPE_CHECKING, List
from archinstall.default_profiles.profile import Profile, ProfileType
@ -20,6 +20,10 @@ class XorgProfile(Profile):
support_gfx_driver=True
)
def preview_text(self) -> Optional[str]:
text = str(_('Environment type: {}')).format(self.profile_type.value)
return text + '\n' + self.packages_text()
@property
def packages(self) -> List[str]:
return [