From 902ac250b07345395dacd9c8daa254f6e031b6ba Mon Sep 17 00:00:00 2001 From: miruka Date: Wed, 17 Jul 2019 13:40:28 -0400 Subject: [PATCH] Fix file names to respect conventions Important markdown/text files: UPPERCASE.ext QML module dirs, qml files: PascalCase Python module dirs, py files, js files: snake_case Everything else (including icons): hyphen-case --- gui-tests.md => TESTS.md | 0 live_reload.sh => live-reload.sh | 0 src/icons/{forget_room.svg => forget-room.svg} | 0 src/icons/{invite_accept.svg => invite-accept.svg} | 0 .../{invite_decline.svg => invite-decline.svg} | 0 src/icons/{reduced_menu.svg => reduced-menu.svg} | 0 ...ed_room_buttons.svg => reduced-room-buttons.svg} | 0 .../{room_view_files.svg => room-view-files.svg} | 0 ...{room_view_history.svg => room-view-history.svg} | 0 ...{room_view_members.svg => room-view-members.svg} | 0 ...otifications.svg => room-view-notifications.svg} | 0 ...oom_view_settings.svg => room-view-settings.svg} | 0 src/icons/{set_status.svg => set-status.svg} | 0 ...ices_inspect.svg => unknown-devices-inspect.svg} | 0 ...ices_warning.svg => unknown-devices-warning.svg} | 0 src/icons/{upload_avatar.svg => upload-avatar.svg} | 0 src/images/{login_background.jpg => background.jpg} | Bin src/qml/Chat/Banners/UnknownDevicesBanner.qml | 4 ++-- src/qml/Pages/EditAccount/Profile.qml | 2 +- src/qml/UI.qml | 2 +- 20 files changed, 4 insertions(+), 4 deletions(-) rename gui-tests.md => TESTS.md (100%) rename live_reload.sh => live-reload.sh (100%) rename src/icons/{forget_room.svg => forget-room.svg} (100%) rename src/icons/{invite_accept.svg => invite-accept.svg} (100%) rename src/icons/{invite_decline.svg => invite-decline.svg} (100%) rename src/icons/{reduced_menu.svg => reduced-menu.svg} (100%) rename src/icons/{reduced_room_buttons.svg => reduced-room-buttons.svg} (100%) rename src/icons/{room_view_files.svg => room-view-files.svg} (100%) rename src/icons/{room_view_history.svg => room-view-history.svg} (100%) rename src/icons/{room_view_members.svg => room-view-members.svg} (100%) rename src/icons/{room_view_notifications.svg => room-view-notifications.svg} (100%) rename src/icons/{room_view_settings.svg => room-view-settings.svg} (100%) rename src/icons/{set_status.svg => set-status.svg} (100%) rename src/icons/{unknown_devices_inspect.svg => unknown-devices-inspect.svg} (100%) rename src/icons/{unknown_devices_warning.svg => unknown-devices-warning.svg} (100%) rename src/icons/{upload_avatar.svg => upload-avatar.svg} (100%) rename src/images/{login_background.jpg => background.jpg} (100%) diff --git a/gui-tests.md b/TESTS.md similarity index 100% rename from gui-tests.md rename to TESTS.md diff --git a/live_reload.sh b/live-reload.sh similarity index 100% rename from live_reload.sh rename to live-reload.sh diff --git a/src/icons/forget_room.svg b/src/icons/forget-room.svg similarity index 100% rename from src/icons/forget_room.svg rename to src/icons/forget-room.svg diff --git a/src/icons/invite_accept.svg b/src/icons/invite-accept.svg similarity index 100% rename from src/icons/invite_accept.svg rename to src/icons/invite-accept.svg diff --git a/src/icons/invite_decline.svg b/src/icons/invite-decline.svg similarity index 100% rename from src/icons/invite_decline.svg rename to src/icons/invite-decline.svg diff --git a/src/icons/reduced_menu.svg b/src/icons/reduced-menu.svg similarity index 100% rename from src/icons/reduced_menu.svg rename to src/icons/reduced-menu.svg diff --git a/src/icons/reduced_room_buttons.svg b/src/icons/reduced-room-buttons.svg similarity index 100% rename from src/icons/reduced_room_buttons.svg rename to src/icons/reduced-room-buttons.svg diff --git a/src/icons/room_view_files.svg b/src/icons/room-view-files.svg similarity index 100% rename from src/icons/room_view_files.svg rename to src/icons/room-view-files.svg diff --git a/src/icons/room_view_history.svg b/src/icons/room-view-history.svg similarity index 100% rename from src/icons/room_view_history.svg rename to src/icons/room-view-history.svg diff --git a/src/icons/room_view_members.svg b/src/icons/room-view-members.svg similarity index 100% rename from src/icons/room_view_members.svg rename to src/icons/room-view-members.svg diff --git a/src/icons/room_view_notifications.svg b/src/icons/room-view-notifications.svg similarity index 100% rename from src/icons/room_view_notifications.svg rename to src/icons/room-view-notifications.svg diff --git a/src/icons/room_view_settings.svg b/src/icons/room-view-settings.svg similarity index 100% rename from src/icons/room_view_settings.svg rename to src/icons/room-view-settings.svg diff --git a/src/icons/set_status.svg b/src/icons/set-status.svg similarity index 100% rename from src/icons/set_status.svg rename to src/icons/set-status.svg diff --git a/src/icons/unknown_devices_inspect.svg b/src/icons/unknown-devices-inspect.svg similarity index 100% rename from src/icons/unknown_devices_inspect.svg rename to src/icons/unknown-devices-inspect.svg diff --git a/src/icons/unknown_devices_warning.svg b/src/icons/unknown-devices-warning.svg similarity index 100% rename from src/icons/unknown_devices_warning.svg rename to src/icons/unknown-devices-warning.svg diff --git a/src/icons/upload_avatar.svg b/src/icons/upload-avatar.svg similarity index 100% rename from src/icons/upload_avatar.svg rename to src/icons/upload-avatar.svg diff --git a/src/images/login_background.jpg b/src/images/background.jpg similarity index 100% rename from src/images/login_background.jpg rename to src/images/background.jpg diff --git a/src/qml/Chat/Banners/UnknownDevicesBanner.qml b/src/qml/Chat/Banners/UnknownDevicesBanner.qml index dc14c3ba..de49c254 100644 --- a/src/qml/Chat/Banners/UnknownDevicesBanner.qml +++ b/src/qml/Chat/Banners/UnknownDevicesBanner.qml @@ -9,14 +9,14 @@ Banner { color: theme.chat.unknownDevices.background avatar.visible: false - icon.svgName: "unknown_devices_warning" + icon.svgName: "unknown-devices-warning" labelText: "Unknown devices are present in this encrypted room." buttonModel: [ { name: "inspect", text: qsTr("Inspect"), - iconName: "unknown_devices_inspect", + iconName: "unknown-devices-inspect", } ] diff --git a/src/qml/Pages/EditAccount/Profile.qml b/src/qml/Pages/EditAccount/Profile.qml index 9ee0e2de..af0da1fb 100644 --- a/src/qml/Pages/EditAccount/Profile.qml +++ b/src/qml/Pages/EditAccount/Profile.qml @@ -67,7 +67,7 @@ HGridLayout { width: parent.width HIcon { - svgName: "upload_avatar" + svgName: "upload-avatar" dimension: 64 Layout.alignment: Qt.AlignCenter } diff --git a/src/qml/UI.qml b/src/qml/UI.qml index 65659d6b..f5f5bad1 100644 --- a/src/qml/UI.qml +++ b/src/qml/UI.qml @@ -25,7 +25,7 @@ Item { HImage { id: mainUIBackground fillMode: Image.PreserveAspectCrop - source: "../images/login_background.jpg" + source: "../images/background.jpg" sourceSize.width: Screen.width sourceSize.height: Screen.height anchors.fill: parent