Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge SystemDropDownMailBoxUserView & SystemDropDownSettingsUserView into SystemDropDownUserView

Browse source
This commit is contained in:
djmaze 2021-09-23 10:40:10 +02:00
parent 1c23ccd327
commit 8010229d6b
5 changed files with 5 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dev/Screen/User/MailBox.js
View file

@ -10,7 +10,7 @@ import { FolderUserStore } from 'Stores/User/Folder';
import { MessageUserStore } from 'Stores/User/Message'; import { MessageUserStore } from 'Stores/User/Message';
import { ThemeStore } from 'Stores/Theme'; import { ThemeStore } from 'Stores/Theme';
import { SystemDropDownMailBoxUserView } from 'View/User/MailBox/SystemDropDown'; import { SystemDropDownUserView } from 'View/User/SystemDropDown';
import { MailFolderList } from 'View/User/MailBox/FolderList'; import { MailFolderList } from 'View/User/MailBox/FolderList';
import { MailMessageList } from 'View/User/MailBox/MessageList'; import { MailMessageList } from 'View/User/MailBox/MessageList';
import { MailMessageView } from 'View/User/MailBox/MessageView'; import { MailMessageView } from 'View/User/MailBox/MessageView';
@ -20,7 +20,7 @@ import { AbstractScreen } from 'Knoin/AbstractScreen';
export class MailBoxUserScreen extends AbstractScreen { export class MailBoxUserScreen extends AbstractScreen {
constructor() { constructor() {
super('mailbox', [ super('mailbox', [
SystemDropDownMailBoxUserView, SystemDropDownUserView,
MailFolderList, MailFolderList,
MailMessageList, MailMessageList,
MailMessageView MailMessageView

4
dev/Screen/User/Settings.js
View file

@ -18,13 +18,13 @@ import { FoldersUserSettings } from 'Settings/User/Folders';
import { ThemesUserSettings } from 'Settings/User/Themes'; import { ThemesUserSettings } from 'Settings/User/Themes';
import { OpenPgpUserSettings } from 'Settings/User/OpenPgp'; import { OpenPgpUserSettings } from 'Settings/User/OpenPgp';
import { SystemDropDownSettingsUserView } from 'View/User/Settings/SystemDropDown'; import { SystemDropDownUserView } from 'View/User/SystemDropDown';
import { MenuSettingsUserView } from 'View/User/Settings/Menu'; import { MenuSettingsUserView } from 'View/User/Settings/Menu';
import { PaneSettingsUserView } from 'View/User/Settings/Pane'; import { PaneSettingsUserView } from 'View/User/Settings/Pane';
export class SettingsUserScreen extends AbstractSettingsScreen { export class SettingsUserScreen extends AbstractSettingsScreen {
constructor() { constructor() {
super([SystemDropDownSettingsUserView, MenuSettingsUserView, PaneSettingsUserView]); super([SystemDropDownUserView, MenuSettingsUserView, PaneSettingsUserView]);
settingsAddViewModel(GeneralUserSettings, 'SettingsGeneral', 'SETTINGS_LABELS/LABEL_GENERAL_NAME', 'general', true); settingsAddViewModel(GeneralUserSettings, 'SettingsGeneral', 'SETTINGS_LABELS/LABEL_GENERAL_NAME', 'general', true);

7
dev/View/User/MailBox/SystemDropDown.js
View file

@ -1,7 +0,0 @@
import { AbstractSystemDropDownUserView } from 'View/User/AbstractSystemDropDown';
class SystemDropDownMailBoxUserView extends AbstractSystemDropDownUserView
{
}
export { SystemDropDownMailBoxUserView };

7
dev/View/User/Settings/SystemDropDown.js
View file

@ -1,7 +0,0 @@
import { AbstractSystemDropDownUserView } from 'View/User/AbstractSystemDropDown';
class SystemDropDownSettingsUserView extends AbstractSystemDropDownUserView
{
}
export { SystemDropDownSettingsUserView };

2
dev/View/User/AbstractSystemDropDown.js → dev/View/User/SystemDropDown.js
View file

@ -16,7 +16,7 @@ import { doc, Settings, leftPanelDisabled } from 'Common/Globals';
import { ThemeStore } from 'Stores/Theme'; import { ThemeStore } from 'Stores/Theme';
export class AbstractSystemDropDownUserView extends AbstractViewRight { export class SystemDropDownUserView extends AbstractViewRight {
constructor() { constructor() {
super('SystemDropDown'); super('SystemDropDown');