Skip to content

Commit

Permalink
Add showTrackerList option (#1203)
Browse files Browse the repository at this point in the history
  • Loading branch information
6c65726f79 committed Feb 17, 2023
1 parent ebc77a4 commit b06cb20
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 5 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ The file can contain the following key/value pairs:
| openMagnetLinks | `boolean` | Open magnet links with Transmissionic | `false` |
| rememberSelectedPreset | `boolean` | Remember selected preset when adding torrents | `false` |
| compactMode | `boolean` | Compact torrent list | `false` |
| showTrackerList | `boolean` | Always show the list of trackers in the side menu | `false` |
| refreshInterval | `number` | Refresh interval in seconds | `5` |
| timeout | `number` | Connection timeout in seconds | `10` |
| servers | `array` | Default servers | `[]` |
Expand Down
3 changes: 2 additions & 1 deletion src/services/UserSettings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ const defaultSettings: Record<string,any> = {
searchByDirectory:true,
selectedPreset:"",
rememberSelectedPreset:false,
compactMode: false
compactMode: false,
showTrackerList: false
}

const defaultServer: Record<string, any> = {
Expand Down
16 changes: 12 additions & 4 deletions src/views/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<ion-menu contentId="main-content" type="overlay" menu-id="left" :swipeGesture="privateState.swipeEnabled" v-on:ionDidClose="closeTrackerList()" v-on:ionDidOpen="Utils.pushState()">

<!-- Main menu -->
<ion-content v-show="!privateState.trackerListOpened" id="navigation" ref="navigation" scrollbar>
<ion-content v-show="!privateState.trackerListOpened || sharedState.showTrackerList" id="navigation" ref="navigation" scrollbar :class="{separator: sharedState.showTrackerList}">
<ion-list id="servers-list">
<ion-list-header>{{ Locale.servers }}</ion-list-header>

Expand All @@ -24,7 +24,7 @@
</ion-menu-toggle>
</ion-list>

<ion-list id="trackers-list">
<ion-list id="trackers-list" v-show="!sharedState.showTrackerList">
<ion-list-header>{{ LocaleController.getForm("tracker","other") }}</ion-list-header>

<ion-menu-toggle auto-hide="false">
Expand Down Expand Up @@ -53,15 +53,15 @@
</ion-content>

<!-- Tracker list -->
<ion-content v-show="privateState.trackerListOpened" id="trackers" ref="trackers">
<ion-content v-show="privateState.trackerListOpened || sharedState.showTrackerList" id="trackers" ref="trackers">
<ion-list>
<ion-list-header>{{ LocaleController.getForm("tracker","other") }}</ion-list-header>
<ion-menu-toggle auto-hide="false">
<ion-item @click="selectTracker()" lines="none" :class="{selected:privateState.selectedTracker==''}" button>
<ion-label>{{ Locale.filters.all }}</ion-label>
</ion-item>
</ion-menu-toggle>
<ion-menu-toggle auto-hide="false" v-for="tracker in privateState.trackerList" :key="tracker.id">
<ion-menu-toggle auto-hide="false" v-for="tracker in tkList" :key="tracker.id">
<ion-item @click="selectTracker(tracker)" lines="none" :class="{selected:privateState.selectedTracker==tracker.announce}" button>
<ion-label :title="tracker.announce">{{tracker.announce}}</ion-label>
<div slot="end">
Expand All @@ -72,6 +72,7 @@
<ion-infinite-scroll
@ionInfinite="displayTrackers($event)"
threshold="100px"
v-if="!sharedState.showTrackerList"
>
<ion-infinite-scroll-content
loading-spinner="circular">
Expand Down Expand Up @@ -385,6 +386,9 @@ export default defineComponent({
language: function(): string {
return this.sharedState.language
},
tkList: function(): Array<Record<string,any>> {
return this.sharedState.showTrackerList ? TransmissionRPC.persistentData.trackers : this.privateState.trackerList
}
},
methods: {
Expand Down Expand Up @@ -587,6 +591,10 @@ export default defineComponent({
color:var(--ion-color-primary);
}
.separator {
border-bottom: 1px solid var(--ion-color-step-150, #d7d8da);
}
ion-menu.menu-pane-visible {
max-width: 304px;
}
Expand Down
5 changes: 5 additions & 0 deletions src/views/Settings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,11 @@
<ion-label>{{ Locale.expandSideMenu }}</ion-label>
<ion-toggle v-model="sharedState.expandMenu"></ion-toggle>
</ion-item>

<ion-item>
<ion-label>{{ Locale.showTrackerList }}</ion-label>
<ion-toggle v-model="sharedState.showTrackerList"></ion-toggle>
</ion-item>

<ion-item>
<ion-label>{{ Locale.displayFlag }}*</ion-label>
Expand Down

0 comments on commit b06cb20

Please sign in to comment.