From 5dc98c677ea6f0d1a8d691fcfde08d4f4ff240cf Mon Sep 17 00:00:00 2001
From: HamzaFarooqArif <hamza.farooq@techlogix.com>
Date: Sun, 23 Jul 2023 00:04:20 +0500
Subject: [PATCH 1/5] added a new option for timelines

---
 .../floating-column/settings/settings.component.html        | 5 +++++
 src/app/components/stream/stream.component.html             | 6 +++---
 src/app/states/settings.state.ts                            | 3 ++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/app/components/floating-column/settings/settings.component.html b/src/app/components/floating-column/settings/settings.component.html
index 16019697..45f8ecf7 100644
--- a/src/app/components/floating-column/settings/settings.component.html
+++ b/src/app/components/floating-column/settings/settings.component.html
@@ -136,6 +136,11 @@ <h4 class="panel__subtitle">Timelines</h4>
             <label class="noselect sub-section__label" for="timelineheader-5">Title</label>
             <br>
 
+            <input class="sub-section__checkbox" [checked]="timeLineHeader === 6" (change)="onTimeLineHeaderChange(6)"
+                type="radio" name="timelineheader-6" value="timelineheader-6" id="timelineheader-6">
+            <label class="noselect sub-section__label" for="timelineheader-6">Title - Account Icon - Username - Domain Name</label>
+            <br>
+
             <span class="sub-section__title">loading behavior:</span><br />
 
             <input class="sub-section__checkbox" [checked]="timeLineMode === 1" (change)="onTimeLineModeChange(1)"
diff --git a/src/app/components/stream/stream.component.html b/src/app/components/stream/stream.component.html
index a71ca301..f5b5ce87 100644
--- a/src/app/components/stream/stream.component.html
+++ b/src/app/components/stream/stream.component.html
@@ -7,11 +7,11 @@
         <!-- <div> -->
         <div class="stream-column__stream-header">
             <a class="stream-column__stream-selector" href title="return to top" (click)="goToTop()">
-                <img *ngIf="timelineHeader === 3 || timelineHeader === 4" class="stream-column__stream-selector--avatar" src="{{avatar}}" />
+                <img *ngIf="timelineHeader === 3 || timelineHeader === 4 || timelineHeader === 6" class="stream-column__stream-selector--avatar" src="{{avatar}}" />
                 <fa-icon class="stream-column__stream-selector--icon" [icon]="columnFaIcon"></fa-icon>
                 <span class="stream-column__stream-selector--text">
-                    <h1 class="stream-column__stream-selector--title" [class.stream-column__stream-selector--title--only]="timelineHeader === 4 || timelineHeader === 5">{{ streamElement.name.toUpperCase() }}</h1>
-                    <span class="stream-column__stream-selector--subtitle" *ngIf="streamElement.instance && timelineHeader !== 4 && timelineHeader !== 5"><span *ngIf="timelineHeader === 2">{{account.username}}@</span>{{ streamElement.instance.toLowerCase() }}</span>
+                    <h1 class="stream-column__stream-selector--title" [class.stream-column__stream-selector--title--only]="timelineHeader === 4 || timelineHeader === 5 || timelineHeader === 6">{{ streamElement.name.toUpperCase() }}</h1>
+                    <span class="stream-column__stream-selector--subtitle" *ngIf="streamElement.instance && timelineHeader !== 4 && timelineHeader !== 5"><span *ngIf="timelineHeader === 2 || timelineHeader === 6">{{account.username}}@</span>{{ streamElement.instance.toLowerCase() }}</span>
                 </span>
             </a>
             <a class="stream-column__open-menu" href title="edit column" (click)="openEditionMenu()">
diff --git a/src/app/states/settings.state.ts b/src/app/states/settings.state.ts
index 89f41a88..8fbb7afd 100644
--- a/src/app/states/settings.state.ts
+++ b/src/app/states/settings.state.ts
@@ -51,7 +51,8 @@ export enum TimeLineHeaderEnum {
     Title_Username_DomainName = 2,
     Title_AccountIcon_DomainName = 3,
     Title_AccountIcon = 4,
-    Title = 5
+    Title = 5,
+    Title_AccountIcon_Username_DomainName = 6
 }
 
 export class ContentWarningPolicy {

From a1a56e49f5d4e0ed8d6eadd4b53b14cf04428803 Mon Sep 17 00:00:00 2001
From: HamzaFarooqArif <hamza.farooq@techlogix.com>
Date: Mon, 31 Jul 2023 10:06:59 +0500
Subject: [PATCH 2/5] reverted code that breaks spacing

---
 src/app/components/stream/stream.component.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/app/components/stream/stream.component.html b/src/app/components/stream/stream.component.html
index f5b5ce87..23afb548 100644
--- a/src/app/components/stream/stream.component.html
+++ b/src/app/components/stream/stream.component.html
@@ -10,7 +10,8 @@
                 <img *ngIf="timelineHeader === 3 || timelineHeader === 4 || timelineHeader === 6" class="stream-column__stream-selector--avatar" src="{{avatar}}" />
                 <fa-icon class="stream-column__stream-selector--icon" [icon]="columnFaIcon"></fa-icon>
                 <span class="stream-column__stream-selector--text">
-                    <h1 class="stream-column__stream-selector--title" [class.stream-column__stream-selector--title--only]="timelineHeader === 4 || timelineHeader === 5 || timelineHeader === 6">{{ streamElement.name.toUpperCase() }}</h1>
+                    <h1 class="stream-column__stream-selector--title" [class.stream-column__stream-selector--title--only]="timelineHeader === 4 || timelineHeader === 5">{{ streamElement.name.toUpperCase() }}</h1>
+                    <span class="stream-column__stream-selector--subtitle" *ngIf="streamElement.instance && timelineHeader !== 4 && timelineHeader !== 5"><span *ngIf="timelineHeader === 2">{{account.username}}@</span>{{ streamElement.instance.toLowerCase() }}</span>
                     <span class="stream-column__stream-selector--subtitle" *ngIf="streamElement.instance && timelineHeader !== 4 && timelineHeader !== 5"><span *ngIf="timelineHeader === 2 || timelineHeader === 6">{{account.username}}@</span>{{ streamElement.instance.toLowerCase() }}</span>
                 </span>
             </a>

From f71e175375ecdc5e8455666636a9f92340aa461a Mon Sep 17 00:00:00 2001
From: Nicolas Constant <github@nicolas-constant.com>
Date: Wed, 2 Aug 2023 18:48:29 -0400
Subject: [PATCH 3/5] better wording

---
 .../manage-account/my-account/my-account.component.html         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/components/floating-column/manage-account/my-account/my-account.component.html b/src/app/components/floating-column/manage-account/my-account/my-account.component.html
index adcb39fc..e8607733 100644
--- a/src/app/components/floating-column/manage-account/my-account/my-account.component.html
+++ b/src/app/components/floating-column/manage-account/my-account/my-account.component.html
@@ -65,6 +65,6 @@ <h4 class="my-account__label my-account__margin-top">advanced settings:</h4>
 
     <h4 class="my-account__label my-account__margin-top">remove account from sengi:</h4>
     <a class="my-account__link my-account__red" href (click)="removeAccount()">
-        Delete
+        Remove
     </a>
 </div>
\ No newline at end of file

From 95c4d8b24922a6175c1345eece817077605232ac Mon Sep 17 00:00:00 2001
From: Nicolas Constant <github@nicolas-constant.com>
Date: Wed, 2 Aug 2023 18:57:43 -0400
Subject: [PATCH 4/5] small refactoring of the domain name display

---
 src/app/components/stream/stream.component.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app/components/stream/stream.component.html b/src/app/components/stream/stream.component.html
index 23afb548..ff4e7b1c 100644
--- a/src/app/components/stream/stream.component.html
+++ b/src/app/components/stream/stream.component.html
@@ -11,8 +11,9 @@
                 <fa-icon class="stream-column__stream-selector--icon" [icon]="columnFaIcon"></fa-icon>
                 <span class="stream-column__stream-selector--text">
                     <h1 class="stream-column__stream-selector--title" [class.stream-column__stream-selector--title--only]="timelineHeader === 4 || timelineHeader === 5">{{ streamElement.name.toUpperCase() }}</h1>
-                    <span class="stream-column__stream-selector--subtitle" *ngIf="streamElement.instance && timelineHeader !== 4 && timelineHeader !== 5"><span *ngIf="timelineHeader === 2">{{account.username}}@</span>{{ streamElement.instance.toLowerCase() }}</span>
-                    <span class="stream-column__stream-selector--subtitle" *ngIf="streamElement.instance && timelineHeader !== 4 && timelineHeader !== 5"><span *ngIf="timelineHeader === 2 || timelineHeader === 6">{{account.username}}@</span>{{ streamElement.instance.toLowerCase() }}</span>
+                    <span class="stream-column__stream-selector--subtitle" *ngIf="streamElement.instance && timelineHeader !== 4 && timelineHeader !== 5">
+                        <span *ngIf="timelineHeader === 2 || timelineHeader === 6">{{account.username}}@</span>{{ streamElement.instance.toLowerCase() }}
+                    </span>
                 </span>
             </a>
             <a class="stream-column__open-menu" href title="edit column" (click)="openEditionMenu()">

From a5f9feb10b18f9d2e00bb5e00f4e0974d5bde282 Mon Sep 17 00:00:00 2001
From: Nicolas Constant <github@nicolas-constant.com>
Date: Wed, 2 Aug 2023 18:58:09 -0400
Subject: [PATCH 5/5] road to 1.4.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 824fae64..054950cf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sengi",
-    "version": "1.3.0",
+    "version": "1.4.0",
     "license": "AGPL-3.0-or-later",
     "main": "main-electron.js",
     "description": "A multi-account desktop client for Mastodon and Pleroma",