Merge pull request #599 from NicolasConstant/develop

1.4.0 PR

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",

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>

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)"

src/app/components/stream/stream.component.html

@@ -7,11 +7,13 @@
         <!-- <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>
+                    <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()">

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 {