Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add default button icon for stop after current #757

Merged
merged 1 commit into from
Jul 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@
[[#735](https://github.com/reupen/columns_ui/pull/735),
[#740](https://github.com/reupen/columns_ui/pull/740)]

- A built-in icon for the stop after current command was added to the Buttons
toolbar. [[#757](https://github.com/reupen/columns_ui/pull/757)]

- When title formatting is used in the playlist switcher panel, typing in the
panel now always searches by the actual playlist name and not the displayed
title. [[#738](https://github.com/reupen/columns_ui/pull/738)]
Expand Down
86 changes: 86 additions & 0 deletions foo_ui_columns/assets/vectors/dark-stop-after-current.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
86 changes: 86 additions & 0 deletions foo_ui_columns/assets/vectors/light-stop-after-current.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified foo_ui_columns/assets/vectors/rendered/dark-next.ico
Binary file not shown.
Binary file modified foo_ui_columns/assets/vectors/rendered/dark-open.ico
Binary file not shown.
Binary file modified foo_ui_columns/assets/vectors/rendered/dark-pause.ico
Binary file not shown.
Binary file modified foo_ui_columns/assets/vectors/rendered/dark-play-random.ico
Binary file not shown.
Binary file modified foo_ui_columns/assets/vectors/rendered/dark-play.ico
Binary file not shown.
Binary file modified foo_ui_columns/assets/vectors/rendered/dark-previous.ico
Binary file not shown.
Binary file not shown.
Binary file modified foo_ui_columns/assets/vectors/rendered/dark-stop.ico
Binary file not shown.
Binary file modified foo_ui_columns/assets/vectors/rendered/light-next.ico
Binary file not shown.
Binary file modified foo_ui_columns/assets/vectors/rendered/light-open.ico
Binary file not shown.
Binary file modified foo_ui_columns/assets/vectors/rendered/light-pause.ico
Binary file not shown.
Binary file modified foo_ui_columns/assets/vectors/rendered/light-play-random.ico
Binary file not shown.
Binary file modified foo_ui_columns/assets/vectors/rendered/light-play.ico
Binary file not shown.
Binary file modified foo_ui_columns/assets/vectors/rendered/light-previous.ico
Binary file not shown.
Binary file not shown.
Binary file modified foo_ui_columns/assets/vectors/rendered/light-stop.ico
Binary file not shown.
18 changes: 10 additions & 8 deletions foo_ui_columns/buttons_stock.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -116,16 +116,18 @@ class ButtonMenuItemWithBitmap : public uie::button_v2 {
}
};

uie::button_factory<ButtonMenuItemWithBitmap<standard_commands::guid_main_stop, icons::built_in::stop>> g_button_stop;
uie::button_factory<ButtonMenuItemWithBitmap<standard_commands::guid_main_open, icons::built_in::open>> g_button_open;
uie::button_factory<ButtonMenuItemWithBitmap<standard_commands::guid_main_play, icons::built_in::play>> g_button_play;
uie::button_factory<ButtonMenuItemWithBitmap<standard_commands::guid_main_pause, icons::built_in::pause>>
g_button_pause;
uie::button_factory<ButtonMenuItemWithBitmap<standard_commands::guid_main_next, icons::built_in::next>> g_button_next;
uie::button_factory<ButtonMenuItemWithBitmap<standard_commands::guid_main_open, icons::built_in::open>> _button_open;
uie::button_factory<ButtonMenuItemWithBitmap<standard_commands::guid_main_play, icons::built_in::play>> _button_play;
uie::button_factory<ButtonMenuItemWithBitmap<standard_commands::guid_main_pause, icons::built_in::pause>> _button_pause;
uie::button_factory<ButtonMenuItemWithBitmap<standard_commands::guid_main_next, icons::built_in::next>> _button_next;
uie::button_factory<ButtonMenuItemWithBitmap<standard_commands::guid_main_previous, icons::built_in::previous>>
g_button_previous;
_button_previous;
uie::button_factory<ButtonMenuItemWithBitmap<standard_commands::guid_main_random, icons::built_in::random>>
g_button_random;
_button_random;
uie::button_factory<ButtonMenuItemWithBitmap<standard_commands::guid_main_stop, icons::built_in::stop>> _button_stop;
uie::button_factory<
ButtonMenuItemWithBitmap<standard_commands::guid_main_stop_after_current, icons::built_in::stop_after_current>>
_button_stop_after_current;

class ButtonBlank : public ui_extension::custom_button {
const GUID& get_item_guid() const override
Expand Down
8 changes: 8 additions & 0 deletions foo_ui_columns/foo_ui_columns.rc
Original file line number Diff line number Diff line change
Expand Up @@ -1066,6 +1066,10 @@ IDI_DARK_PADLOCK ICON "assets\\vectors\\rendered\\dark

IDI_LIGHT_PADLOCK ICON "assets\\vectors\\rendered\\light-padlock.ico"

IDI_DARK_STOP_AFTER_CURRENT ICON "assets\\vectors\\rendered\\dark-stop-after-current.ico"

IDI_LIGHT_STOP_AFTER_CURRENT ICON "assets\\vectors\\rendered\\light-stop-after-current.ico"


/////////////////////////////////////////////////////////////////////////////
//
Expand Down Expand Up @@ -1126,6 +1130,10 @@ IDV_DARK_PADLOCK SVG "assets\\vectors\\minified\\dark

IDV_LIGHT_PADLOCK SVG "assets\\vectors\\minified\\light-padlock.svg"

IDV_DARK_STOP_AFTER_CURRENT SVG "assets\\vectors\\minified\\dark-stop-after-current.svg"

IDV_LIGHT_STOP_AFTER_CURRENT SVG "assets\\vectors\\minified\\light-stop-after-current.svg"

#endif // English (United Kingdom) resources
/////////////////////////////////////////////////////////////////////////////

Expand Down
4 changes: 4 additions & 0 deletions foo_ui_columns/foo_ui_columns.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -528,6 +528,7 @@
<None Include="assets\vectors\minified\dark-reset.svg" />
<None Include="assets\vectors\minified\dark-star-gold.svg" />
<None Include="assets\vectors\minified\dark-star-grey.svg" />
<None Include="assets\vectors\minified\dark-stop-after-current.svg" />
<None Include="assets\vectors\minified\dark-stop.svg" />
<None Include="assets\vectors\minified\light-next.svg" />
<None Include="assets\vectors\minified\light-open.svg" />
Expand All @@ -539,6 +540,7 @@
<None Include="assets\vectors\minified\light-reset.svg" />
<None Include="assets\vectors\minified\light-star-gold.svg" />
<None Include="assets\vectors\minified\light-star-grey.svg" />
<None Include="assets\vectors\minified\light-stop-after-current.svg" />
<None Include="assets\vectors\minified\light-stop.svg" />
<None Include="version.h.template" />
</ItemGroup>
Expand Down Expand Up @@ -581,6 +583,7 @@
<Image Include="assets\vectors\rendered\dark-reset.ico" />
<Image Include="assets\vectors\rendered\dark-star-gold.ico" />
<Image Include="assets\vectors\rendered\dark-star-grey.ico" />
<Image Include="assets\vectors\rendered\dark-stop-after-current.ico" />
<Image Include="assets\vectors\rendered\dark-stop.ico" />
<Image Include="assets\vectors\rendered\light-next.ico" />
<Image Include="assets\vectors\rendered\light-open.ico" />
Expand All @@ -593,6 +596,7 @@
<Image Include="assets\vectors\rendered\light-reset.ico" />
<Image Include="assets\vectors\rendered\light-star-gold.ico" />
<Image Include="assets\vectors\rendered\light-star-grey.ico" />
<Image Include="assets\vectors\rendered\light-stop-after-current.ico" />
<Image Include="assets\vectors\rendered\light-stop.ico" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Expand Down
12 changes: 12 additions & 0 deletions foo_ui_columns/foo_ui_columns.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -960,6 +960,12 @@
<None Include="assets\vectors\minified\light-stop.svg">
<Filter>Resources\svg</Filter>
</None>
<None Include="assets\vectors\minified\dark-stop-after-current.svg">
<Filter>Resources\svg</Filter>
</None>
<None Include="assets\vectors\minified\light-stop-after-current.svg">
<Filter>Resources\svg</Filter>
</None>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="foo_ui_columns.rc">
Expand Down Expand Up @@ -1042,5 +1048,11 @@
<Image Include="assets\vectors\rendered\light-stop.ico">
<Filter>Resources\ico</Filter>
</Image>
<Image Include="assets\vectors\rendered\dark-stop-after-current.ico">
<Filter>Resources\ico</Filter>
</Image>
<Image Include="assets\vectors\rendered\light-stop-after-current.ico">
<Filter>Resources\ico</Filter>
</Image>
</ItemGroup>
</Project>
1 change: 1 addition & 0 deletions foo_ui_columns/icons.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ constexpr IconConfig previous(MAKE_ICON_CONFIG_CTOR_ARGS(PREV));
constexpr IconConfig random(MAKE_ICON_CONFIG_CTOR_ARGS(RAND));
constexpr IconConfig reset(MAKE_ICON_CONFIG_CTOR_ARGS(RESET));
constexpr IconConfig stop(MAKE_ICON_CONFIG_CTOR_ARGS(STOP));
constexpr IconConfig stop_after_current(MAKE_ICON_CONFIG_CTOR_ARGS(STOP_AFTER_CURRENT));

} // namespace built_in

Expand Down
6 changes: 5 additions & 1 deletion foo_ui_columns/resource.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,12 @@
#define IDV_DARK_RESET 191
#define IDV_DARK_PADLOCK 192
#define IDV_LIGHT_PADLOCK 193
#define IDV_DARK_STOP_AFTER_CURRENT 194
#define IDV_LIGHT_STOP_AFTER_CURRENT 195
#define IDD_PREFS_PVIEW_GENERAL 196
#define IDI_DARK_STOP_AFTER_CURRENT 196
#define IDD_PREFS_PLAYLISTS_DRAGDROP 197
#define IDI_LIGHT_STOP_AFTER_CURRENT 197
#define IDD_PREFS_LAYOUT_PRESETS 198
#define IDD_RENAME_PLAYLIST 200
#define IDD_PREFS_TAB_HOST 201
Expand Down Expand Up @@ -287,7 +291,7 @@
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NO_MFC 1
#define _APS_NEXT_RESOURCE_VALUE 194
#define _APS_NEXT_RESOURCE_VALUE 198
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1191
#define _APS_NEXT_SYMED_VALUE 101
Expand Down