From 8181f776093bde3d078709e4b5d50cba50cad92c Mon Sep 17 00:00:00 2001 From: jp9000 Date: Mon, 25 Feb 2019 12:16:07 -0800 Subject: [PATCH] UI: Rename a bunch of bad file names --- .../Acri/{cogwheel@2x.png => cogwheel_2x.png} | Bin .../Dark/{cogwheel@2x.png => cogwheel_2x.png} | Bin ...21_16@2x.png => configuration21_16_2x.png} | Bin ...ible_mask@2x.png => invisible_mask_2x.png} | Bin ...{locked_mask@2x.png => locked_mask_2x.png} | Bin .../{properties@2x.png => properties_2x.png} | Bin .../{advanced@2x.png => advanced_2x.png} | Bin ...-2@2x.png => applications-system-2_2x.png} | Bin ...yer@2x.png => decibel_audio_player_2x.png} | Bin ...etooth@2x.png => network-bluetooth_2x.png} | Bin .../{network@2x.png => network_2x.png} | Bin ...erences-desktop-keyboard-shortcuts_2x.png} | Bin ...ng => preferences-system-network-3_2x.png} | Bin ...ings-3@2x.png => system-settings-3_2x.png} | Bin ...isplay-3@2x.png => video-display-3_2x.png} | Bin ...ocked_mask@2x.png => unlocked_mask_2x.png} | Bin ...isible_mask@2x.png => visible_mask_2x.png} | Bin UI/forms/obs.qrc | 28 +++++++++--------- UI/locked-checkbox.cpp | 4 +-- UI/visibility-checkbox.cpp | 4 +-- 20 files changed, 18 insertions(+), 18 deletions(-) rename UI/data/themes/Acri/{cogwheel@2x.png => cogwheel_2x.png} (100%) rename UI/data/themes/Dark/{cogwheel@2x.png => cogwheel_2x.png} (100%) rename UI/forms/images/{configuration21_16@2x.png => configuration21_16_2x.png} (100%) rename UI/forms/images/{invisible_mask@2x.png => invisible_mask_2x.png} (100%) rename UI/forms/images/{locked_mask@2x.png => locked_mask_2x.png} (100%) rename UI/forms/images/{properties@2x.png => properties_2x.png} (100%) rename UI/forms/images/settings/{advanced@2x.png => advanced_2x.png} (100%) rename UI/forms/images/settings/{applications-system-2@2x.png => applications-system-2_2x.png} (100%) rename UI/forms/images/settings/{decibel_audio_player@2x.png => decibel_audio_player_2x.png} (100%) rename UI/forms/images/settings/{network-bluetooth@2x.png => network-bluetooth_2x.png} (100%) rename UI/forms/images/settings/{network@2x.png => network_2x.png} (100%) rename UI/forms/images/settings/{preferences-desktop-keyboard-shortcuts@2x.png => preferences-desktop-keyboard-shortcuts_2x.png} (100%) rename UI/forms/images/settings/{preferences-system-network-3@2x.png => preferences-system-network-3_2x.png} (100%) rename UI/forms/images/settings/{system-settings-3@2x.png => system-settings-3_2x.png} (100%) rename UI/forms/images/settings/{video-display-3@2x.png => video-display-3_2x.png} (100%) rename UI/forms/images/{unlocked_mask@2x.png => unlocked_mask_2x.png} (100%) rename UI/forms/images/{visible_mask@2x.png => visible_mask_2x.png} (100%) diff --git a/UI/data/themes/Acri/cogwheel@2x.png b/UI/data/themes/Acri/cogwheel_2x.png similarity index 100% rename from UI/data/themes/Acri/cogwheel@2x.png rename to UI/data/themes/Acri/cogwheel_2x.png diff --git a/UI/data/themes/Dark/cogwheel@2x.png b/UI/data/themes/Dark/cogwheel_2x.png similarity index 100% rename from UI/data/themes/Dark/cogwheel@2x.png rename to UI/data/themes/Dark/cogwheel_2x.png diff --git a/UI/forms/images/configuration21_16@2x.png b/UI/forms/images/configuration21_16_2x.png similarity index 100% rename from UI/forms/images/configuration21_16@2x.png rename to UI/forms/images/configuration21_16_2x.png diff --git a/UI/forms/images/invisible_mask@2x.png b/UI/forms/images/invisible_mask_2x.png similarity index 100% rename from UI/forms/images/invisible_mask@2x.png rename to UI/forms/images/invisible_mask_2x.png diff --git a/UI/forms/images/locked_mask@2x.png b/UI/forms/images/locked_mask_2x.png similarity index 100% rename from UI/forms/images/locked_mask@2x.png rename to UI/forms/images/locked_mask_2x.png diff --git a/UI/forms/images/properties@2x.png b/UI/forms/images/properties_2x.png similarity index 100% rename from UI/forms/images/properties@2x.png rename to UI/forms/images/properties_2x.png diff --git a/UI/forms/images/settings/advanced@2x.png b/UI/forms/images/settings/advanced_2x.png similarity index 100% rename from UI/forms/images/settings/advanced@2x.png rename to UI/forms/images/settings/advanced_2x.png diff --git a/UI/forms/images/settings/applications-system-2@2x.png b/UI/forms/images/settings/applications-system-2_2x.png similarity index 100% rename from UI/forms/images/settings/applications-system-2@2x.png rename to UI/forms/images/settings/applications-system-2_2x.png diff --git a/UI/forms/images/settings/decibel_audio_player@2x.png b/UI/forms/images/settings/decibel_audio_player_2x.png similarity index 100% rename from UI/forms/images/settings/decibel_audio_player@2x.png rename to UI/forms/images/settings/decibel_audio_player_2x.png diff --git a/UI/forms/images/settings/network-bluetooth@2x.png b/UI/forms/images/settings/network-bluetooth_2x.png similarity index 100% rename from UI/forms/images/settings/network-bluetooth@2x.png rename to UI/forms/images/settings/network-bluetooth_2x.png diff --git a/UI/forms/images/settings/network@2x.png b/UI/forms/images/settings/network_2x.png similarity index 100% rename from UI/forms/images/settings/network@2x.png rename to UI/forms/images/settings/network_2x.png diff --git a/UI/forms/images/settings/preferences-desktop-keyboard-shortcuts@2x.png b/UI/forms/images/settings/preferences-desktop-keyboard-shortcuts_2x.png similarity index 100% rename from UI/forms/images/settings/preferences-desktop-keyboard-shortcuts@2x.png rename to UI/forms/images/settings/preferences-desktop-keyboard-shortcuts_2x.png diff --git a/UI/forms/images/settings/preferences-system-network-3@2x.png b/UI/forms/images/settings/preferences-system-network-3_2x.png similarity index 100% rename from UI/forms/images/settings/preferences-system-network-3@2x.png rename to UI/forms/images/settings/preferences-system-network-3_2x.png diff --git a/UI/forms/images/settings/system-settings-3@2x.png b/UI/forms/images/settings/system-settings-3_2x.png similarity index 100% rename from UI/forms/images/settings/system-settings-3@2x.png rename to UI/forms/images/settings/system-settings-3_2x.png diff --git a/UI/forms/images/settings/video-display-3@2x.png b/UI/forms/images/settings/video-display-3_2x.png similarity index 100% rename from UI/forms/images/settings/video-display-3@2x.png rename to UI/forms/images/settings/video-display-3_2x.png diff --git a/UI/forms/images/unlocked_mask@2x.png b/UI/forms/images/unlocked_mask_2x.png similarity index 100% rename from UI/forms/images/unlocked_mask@2x.png rename to UI/forms/images/unlocked_mask_2x.png diff --git a/UI/forms/images/visible_mask@2x.png b/UI/forms/images/visible_mask_2x.png similarity index 100% rename from UI/forms/images/visible_mask@2x.png rename to UI/forms/images/visible_mask_2x.png diff --git a/UI/forms/obs.qrc b/UI/forms/obs.qrc index 7ea29c256..8e05612ce 100644 --- a/UI/forms/obs.qrc +++ b/UI/forms/obs.qrc @@ -4,44 +4,44 @@ images/unmute.png images/refresh.png images/configuration21_16.png - images/configuration21_16@2x.png + images/configuration21_16_2x.png images/invisible_mask.png - images/invisible_mask@2x.png + images/invisible_mask_2x.png images/visible_mask.png - images/visible_mask@2x.png + images/visible_mask_2x.png images/list_remove.png images/add.png images/down.png images/editscene.png images/live.png images/properties.png - images/properties@2x.png + images/properties_2x.png images/up.png images/obs.png images/tray_active.png images/locked_mask.png - images/locked_mask@2x.png + images/locked_mask_2x.png images/unlocked_mask.png - images/unlocked_mask@2x.png + images/unlocked_mask_2x.png images/collapse.png images/expand.png images/settings/advanced.png - images/settings/advanced@2x.png + images/settings/advanced_2x.png images/settings/network.png - images/settings/network@2x.png + images/settings/network_2x.png images/settings/video-display-3.png - images/settings/video-display-3@2x.png + images/settings/video-display-3_2x.png images/settings/decibel_audio_player.png - images/settings/decibel_audio_player@2x.png + images/settings/decibel_audio_player_2x.png images/settings/applications-system-2.png - images/settings/applications-system-2@2x.png + images/settings/applications-system-2_2x.png images/settings/system-settings-3.png - images/settings/system-settings-3@2x.png + images/settings/system-settings-3_2x.png images/settings/network-bluetooth.png - images/settings/network-bluetooth@2x.png + images/settings/network-bluetooth_2x.png images/settings/preferences-desktop-keyboard-shortcuts.png - images/settings/preferences-desktop-keyboard-shortcuts@2x.png + images/settings/preferences-desktop-keyboard-shortcuts_2x.png diff --git a/UI/locked-checkbox.cpp b/UI/locked-checkbox.cpp index a5f6b5649..2d0d688ed 100644 --- a/UI/locked-checkbox.cpp +++ b/UI/locked-checkbox.cpp @@ -10,8 +10,8 @@ LockedCheckBox::LockedCheckBox() : QCheckBox() QString lockedFile; QString unlockedFile; if (devicePixelRatio() >= 2) { - lockedFile = ":/res/images/locked_mask@2x.png"; - unlockedFile = ":/res/images/unlocked_mask@2x.png"; + lockedFile = ":/res/images/locked_mask_2x.png"; + unlockedFile = ":/res/images/unlocked_mask_2x.png"; } else { lockedFile = ":/res/images/locked_mask.png"; unlockedFile = ":/res/images/unlocked_mask.png"; diff --git a/UI/visibility-checkbox.cpp b/UI/visibility-checkbox.cpp index 004a65c4d..d80cab2d4 100644 --- a/UI/visibility-checkbox.cpp +++ b/UI/visibility-checkbox.cpp @@ -10,8 +10,8 @@ VisibilityCheckBox::VisibilityCheckBox() : QCheckBox() QString checkedFile; QString uncheckedFile; if (devicePixelRatio() >= 2) { - checkedFile = ":/res/images/visible_mask@2x.png"; - uncheckedFile = ":/res/images/invisible_mask@2x.png"; + checkedFile = ":/res/images/visible_mask_2x.png"; + uncheckedFile = ":/res/images/invisible_mask_2x.png"; } else { checkedFile = ":/res/images/visible_mask.png"; uncheckedFile = ":/res/images/invisible_mask.png";