Skip to content

Commit 6a1797c

Browse files
committed
Renamed "gallery" to "style"
1 parent 89bb602 commit 6a1797c

28 files changed

+102
-102
lines changed

lib/CMakeLists.txt

+22-22
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ set(ELEMENTS_SOURCES
3434
src/element/element.cpp
3535
src/element/floating.cpp
3636
src/element/flow.cpp
37-
src/element/gallery/button.cpp
38-
src/element/gallery/check_box.cpp
39-
src/element/gallery/icon_button.cpp
40-
src/element/gallery/menu.cpp
41-
src/element/gallery/radio_button.cpp
42-
src/element/gallery/slide_switch.cpp
43-
src/element/gallery/thumbwheel.cpp
37+
src/element/style/button.cpp
38+
src/element/style/check_box.cpp
39+
src/element/style/icon_button.cpp
40+
src/element/style/menu.cpp
41+
src/element/style/radio_button.cpp
42+
src/element/style/slide_switch.cpp
43+
src/element/style/thumbwheel.cpp
4444
src/element/grid.cpp
4545
src/element/image.cpp
4646
src/element/label.cpp
@@ -80,21 +80,21 @@ set(ELEMENTS_HEADERS
8080
include/elements/element/element.hpp
8181
include/elements/element/floating.hpp
8282
include/elements/element/flow.hpp
83-
include/elements/element/gallery.hpp
84-
include/elements/element/gallery/button.hpp
85-
include/elements/element/gallery/caption.hpp
86-
include/elements/element/gallery/check_box.hpp
87-
include/elements/element/gallery/thumbwheel.hpp
88-
include/elements/element/gallery/dialog.hpp
89-
include/elements/element/gallery/group.hpp
90-
include/elements/element/gallery/icon_button.hpp
91-
include/elements/element/gallery/menu.hpp
92-
include/elements/element/gallery/message_box.hpp
93-
include/elements/element/gallery/notebook.hpp
94-
include/elements/element/gallery/pane.hpp
95-
include/elements/element/gallery/radio_button.hpp
96-
include/elements/element/gallery/tab.hpp
97-
include/elements/element/gallery/text_entry.hpp
83+
include/elements/element/style.hpp
84+
include/elements/element/style/button.hpp
85+
include/elements/element/style/caption.hpp
86+
include/elements/element/style/check_box.hpp
87+
include/elements/element/style/thumbwheel.hpp
88+
include/elements/element/style/dialog.hpp
89+
include/elements/element/style/group.hpp
90+
include/elements/element/style/icon_button.hpp
91+
include/elements/element/style/menu.hpp
92+
include/elements/element/style/message_box.hpp
93+
include/elements/element/style/notebook.hpp
94+
include/elements/element/style/pane.hpp
95+
include/elements/element/style/radio_button.hpp
96+
include/elements/element/style/tab.hpp
97+
include/elements/element/style/text_entry.hpp
9898
include/elements/element/grid.hpp
9999
include/elements/element/image.hpp
100100
include/elements/element/indirect.hpp

lib/include/elements/element.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@
3636
#include <elements/element/tooltip.hpp>
3737

3838
// Include this last
39-
#include <elements/element/gallery.hpp>
39+
#include <elements/element/style.hpp>
4040

4141
#endif

lib/include/elements/element/gallery.hpp

-25
This file was deleted.
+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
/*=============================================================================
2+
Copyright (c) 2016-2023 Joel de Guzman
3+
4+
Distributed under the MIT License [ https://opensource.org/licenses/MIT ]
5+
=============================================================================*/
6+
#if !defined(ELEMENTS_STYLE_JUNE_5_2016)
7+
#define ELEMENTS_STYLE_JUNE_5_2016
8+
9+
#include <elements/element/style/button.hpp>
10+
#include <elements/element/style/caption.hpp>
11+
#include <elements/element/style/check_box.hpp>
12+
#include <elements/element/style/thumbwheel.hpp>
13+
#include <elements/element/style/group.hpp>
14+
#include <elements/element/style/icon_button.hpp>
15+
#include <elements/element/style/menu.hpp>
16+
#include <elements/element/style/message_box.hpp>
17+
#include <elements/element/style/notebook.hpp>
18+
#include <elements/element/style/pane.hpp>
19+
#include <elements/element/style/radio_button.hpp>
20+
#include <elements/element/style/tab.hpp>
21+
#include <elements/element/style/text_entry.hpp>
22+
#include <elements/element/style/child_window.hpp>
23+
#include <elements/element/style/slide_switch.hpp>
24+
25+
#endif

lib/include/elements/element/gallery/button.hpp lib/include/elements/element/style/button.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
44
Distributed under the MIT License [ https://opensource.org/licenses/MIT ]
55
=============================================================================*/
6-
#if !defined(ELEMENTS_GALLERY_BUTTON_JUNE_5_2016)
7-
#define ELEMENTS_GALLERY_BUTTON_JUNE_5_2016
6+
#if !defined(ELEMENTS_STYLE_BUTTON_JUNE_5_2016)
7+
#define ELEMENTS_STYLE_BUTTON_JUNE_5_2016
88

99
#include <elements/element/button.hpp>
1010
#include <elements/element/misc.hpp>

lib/include/elements/element/gallery/caption.hpp lib/include/elements/element/style/caption.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
44
Distributed under the MIT License [ https://opensource.org/licenses/MIT ]
55
=============================================================================*/
6-
#if !defined(ELEMENTS_GALLERY_CAPION_JUNE_5_2016)
7-
#define ELEMENTS_GALLERY_CAPION_JUNE_5_2016
6+
#if !defined(ELEMENTS_STYLE_CAPION_JUNE_5_2016)
7+
#define ELEMENTS_STYLE_CAPION_JUNE_5_2016
88

99
#include <elements/element/tile.hpp>
1010
#include <elements/element/align.hpp>

lib/include/elements/element/gallery/check_box.hpp lib/include/elements/element/style/check_box.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
44
Distributed under the MIT License [ https://opensource.org/licenses/MIT ]
55
=============================================================================*/
6-
#if !defined(ELEMENTS_GALLERY_CHECK_BOX_JUNE_5_2016)
7-
#define ELEMENTS_GALLERY_CHECK_BOX_JUNE_5_2016
6+
#if !defined(ELEMENTS_STYLE_CHECK_BOX_JUNE_5_2016)
7+
#define ELEMENTS_STYLE_CHECK_BOX_JUNE_5_2016
88

9-
#include <elements/element/gallery/button.hpp>
10-
#include <elements/element/gallery/toggle_selector.hpp>
9+
#include <elements/element/style/button.hpp>
10+
#include <elements/element/style/toggle_selector.hpp>
1111

1212
namespace cycfi::elements
1313
{

lib/include/elements/element/gallery/child_window.hpp lib/include/elements/element/style/child_window.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
44
Distributed under the MIT License [ https://opensource.org/licenses/MIT ]
55
=============================================================================*/
6-
#if !defined(ELEMENTS_GALLERY_CHILD_WINDOW_JANUARY_19_2021)
7-
#define ELEMENTS_GALLERY_CHILD_WINDOW_JANUARY_19_2021
6+
#if !defined(ELEMENTS_STYLE_CHILD_WINDOW_JANUARY_19_2021)
7+
#define ELEMENTS_STYLE_CHILD_WINDOW_JANUARY_19_2021
88

99
#include <elements/element/child_window.hpp>
10-
#include <elements/element/gallery/pane.hpp>
10+
#include <elements/element/style/pane.hpp>
1111

1212
namespace cycfi::elements
1313
{

lib/include/elements/element/gallery/dialog.hpp lib/include/elements/element/style/dialog.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
44
Distributed under the MIT License [ https://opensource.org/licenses/MIT ]
55
=============================================================================*/
6-
#if !defined(ELEMENTS_GALLERY_DIALOG_OCTOBER_14_2019)
7-
#define ELEMENTS_GALLERY_DIALOG_OCTOBER_14_2019
6+
#if !defined(ELEMENTS_STYLE_DIALOG_OCTOBER_14_2019)
7+
#define ELEMENTS_STYLE_DIALOG_OCTOBER_14_2019
88

99
#include <elements/element/align.hpp>
1010
#include <elements/element/margin.hpp>
@@ -13,7 +13,7 @@
1313
#include <elements/element/size.hpp>
1414
#include <elements/element/layer.hpp>
1515
#include <elements/element/indirect.hpp>
16-
#include <elements/element/gallery/button.hpp>
16+
#include <elements/element/style/button.hpp>
1717
#include <elements/support/theme.hpp>
1818

1919
namespace cycfi::elements

lib/include/elements/element/gallery/group.hpp lib/include/elements/element/style/group.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
44
Distributed under the MIT License [ https://opensource.org/licenses/MIT ]
55
=============================================================================*/
6-
#if !defined(ELEMENTS_GALLERY_GROUP_JUNE_5_2016)
7-
#define ELEMENTS_GALLERY_GROUP_JUNE_5_2016
6+
#if !defined(ELEMENTS_STYLE_GROUP_JUNE_5_2016)
7+
#define ELEMENTS_STYLE_GROUP_JUNE_5_2016
88

99
#include <elements/element/align.hpp>
1010
#include <elements/element/margin.hpp>

lib/include/elements/element/gallery/icon_button.hpp lib/include/elements/element/style/icon_button.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
44
Distributed under the MIT License [ https://opensource.org/licenses/MIT ]
55
=============================================================================*/
6-
#if !defined(ELEMENTS_GALLERY_ICON_BUTTON_JUNE_5_2016)
7-
#define ELEMENTS_GALLERY_ICON_BUTTON_JUNE_5_2016
6+
#if !defined(ELEMENTS_STYLE_ICON_BUTTON_JUNE_5_2016)
7+
#define ELEMENTS_STYLE_ICON_BUTTON_JUNE_5_2016
88

99
#include <elements/element/element.hpp>
10-
#include <elements/element/gallery/button.hpp>
10+
#include <elements/element/style/button.hpp>
1111
#include <elements/support/theme.hpp>
1212

1313
namespace cycfi::elements

lib/include/elements/element/gallery/menu.hpp lib/include/elements/element/style/menu.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
44
Distributed under the MIT License [ https://opensource.org/licenses/MIT ]
55
=============================================================================*/
6-
#if !defined(ELEMENTS_GALLERY_MENU_JUNE_5_2016)
7-
#define ELEMENTS_GALLERY_MENU_JUNE_5_2016
6+
#if !defined(ELEMENTS_STYLE_MENU_JUNE_5_2016)
7+
#define ELEMENTS_STYLE_MENU_JUNE_5_2016
88

99
#include <elements/element/indirect.hpp>
1010
#include <elements/element/menu.hpp>
@@ -14,7 +14,7 @@
1414
#include <elements/element/margin.hpp>
1515
#include <elements/element/tile.hpp>
1616
#include <elements/support/theme.hpp>
17-
#include <elements/element/gallery/button.hpp>
17+
#include <elements/element/style/button.hpp>
1818
#include <infra/string_view.hpp>
1919
#include <string>
2020
#include <vector>

lib/include/elements/element/gallery/message_box.hpp lib/include/elements/element/style/message_box.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
44
Distributed under the MIT License [ https://opensource.org/licenses/MIT ]
55
=============================================================================*/
6-
#if !defined(ELEMENTS_GALLERY_MESSAGE_BOX_JUNE_5_2016)
7-
#define ELEMENTS_GALLERY_MESSAGE_BOX_JUNE_5_2016
6+
#if !defined(ELEMENTS_STYLE_MESSAGE_BOX_JUNE_5_2016)
7+
#define ELEMENTS_STYLE_MESSAGE_BOX_JUNE_5_2016
88

99
#include <elements/element/text.hpp>
10-
#include <elements/element/gallery/button.hpp>
11-
#include <elements/element/gallery/dialog.hpp>
10+
#include <elements/element/style/button.hpp>
11+
#include <elements/element/style/dialog.hpp>
1212
#include <infra/string_view.hpp>
1313

1414
namespace cycfi::elements

lib/include/elements/element/gallery/notebook.hpp lib/include/elements/element/style/notebook.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
44
Distributed under the MIT License [ https://opensource.org/licenses/MIT ]
55
=============================================================================*/
6-
#if !defined(ELEMENTS_GALLERY_NOTEBOOK_MAY_23_2020)
7-
#define ELEMENTS_GALLERY_NOTEBOOK_MAY_23_2020
6+
#if !defined(ELEMENTS_STYLE_NOTEBOOK_MAY_23_2020)
7+
#define ELEMENTS_STYLE_NOTEBOOK_MAY_23_2020
88

9-
#include <elements/element/gallery/tab.hpp>
9+
#include <elements/element/style/tab.hpp>
1010
#include <elements/element/tile.hpp>
1111
#include <elements/element/align.hpp>
1212
#include <elements/element/margin.hpp>

lib/include/elements/element/gallery/pane.hpp lib/include/elements/element/style/pane.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
44
Distributed under the MIT License [ https://opensource.org/licenses/MIT ]
55
=============================================================================*/
6-
#if !defined(ELEMENTS_GALLERY_PANE_JUNE_5_2016)
7-
#define ELEMENTS_GALLERY_PANE_JUNE_5_2016
6+
#if !defined(ELEMENTS_STYLE_PANE_JUNE_5_2016)
7+
#define ELEMENTS_STYLE_PANE_JUNE_5_2016
88

99
#include <elements/element/tile.hpp>
1010
#include <elements/element/layer.hpp>

lib/include/elements/element/gallery/radio_button.hpp lib/include/elements/element/style/radio_button.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
44
Distributed under the MIT License [ https://opensource.org/licenses/MIT ]
55
=============================================================================*/
6-
#if !defined(ELEMENTS_GALLERY_RADIO_BUTTON_FEBRUARY_29_2020)
7-
#define ELEMENTS_GALLERY_RADIO_BUTTON_FEBRUARY_29_2020
6+
#if !defined(ELEMENTS_STYLE_RADIO_BUTTON_FEBRUARY_29_2020)
7+
#define ELEMENTS_STYLE_RADIO_BUTTON_FEBRUARY_29_2020
88

9-
#include <elements/element/gallery/button.hpp>
10-
#include <elements/element/gallery/toggle_selector.hpp>
9+
#include <elements/element/style/button.hpp>
10+
#include <elements/element/style/toggle_selector.hpp>
1111

1212
namespace cycfi::elements
1313
{

lib/include/elements/element/gallery/slide_switch.hpp lib/include/elements/element/style/slide_switch.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
44
Distributed under the MIT License [ https://opensource.org/licenses/MIT ]
55
=============================================================================*/
6-
#if !defined(ELEMENTS_GALLERY_SLIDE_SWITCH_NOVEMBER_10_2023)
7-
#define ELEMENTS_GALLERY_SLIDE_SWITCH_NOVEMBER_10_2023
6+
#if !defined(ELEMENTS_STYLE_SLIDE_SWITCH_NOVEMBER_10_2023)
7+
#define ELEMENTS_STYLE_SLIDE_SWITCH_NOVEMBER_10_2023
88

9-
#include <elements/element/gallery/button.hpp>
9+
#include <elements/element/style/button.hpp>
1010

1111
namespace cycfi::elements
1212
{

lib/include/elements/element/gallery/tab.hpp lib/include/elements/element/style/tab.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
44
Distributed under the MIT License [ https://opensource.org/licenses/MIT ]
55
=============================================================================*/
6-
#if !defined(ELEMENTS_GALLERY_TAB_MAY_02_2020)
7-
#define ELEMENTS_GALLERY_TAB_MAY_02_2020
6+
#if !defined(ELEMENTS_STYLE_TAB_MAY_02_2020)
7+
#define ELEMENTS_STYLE_TAB_MAY_02_2020
88

9-
#include <elements/element/gallery/button.hpp>
9+
#include <elements/element/style/button.hpp>
1010
#include <elements/element/size.hpp>
1111

1212
namespace cycfi::elements

lib/include/elements/element/gallery/text_entry.hpp lib/include/elements/element/style/text_entry.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
44
Distributed under the MIT License [ https://opensource.org/licenses/MIT ]
55
=============================================================================*/
6-
#if !defined(ELEMENTS_GALLERY_TEXT_ENTRY_JUNE_5_2016)
7-
#define ELEMENTS_GALLERY_TEXT_ENTRY_JUNE_5_2016
6+
#if !defined(ELEMENTS_STYLE_TEXT_ENTRY_JUNE_5_2016)
7+
#define ELEMENTS_STYLE_TEXT_ENTRY_JUNE_5_2016
88

99
#include <elements/element/layer.hpp>
1010
#include <elements/element/port.hpp>

lib/include/elements/element/gallery/thumbwheel.hpp lib/include/elements/element/style/thumbwheel.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
44
Distributed under the MIT License [ https://opensource.org/licenses/MIT ]
55
=============================================================================*/
6-
#if !defined(ELEMENTS_GALLERY_THUMBWHEEL_SEPTEMBER_23_2020)
7-
#define ELEMENTS_GALLERY_THUMBWHEEL_SEPTEMBER_23_2020
6+
#if !defined(ELEMENTS_STYLE_THUMBWHEEL_SEPTEMBER_23_2020)
7+
#define ELEMENTS_STYLE_THUMBWHEEL_SEPTEMBER_23_2020
88

99
#include <elements/element/thumbwheel.hpp>
1010
#include <elements/element/list.hpp>

lib/include/elements/element/gallery/toggle_selector.hpp lib/include/elements/element/style/toggle_selector.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
44
Distributed under the MIT License [ https://opensource.org/licenses/MIT ]
55
=============================================================================*/
6-
#if !defined(ELEMENTS_GALLERY_TOGGLE_SELECTOR_JUNE_5_2016)
7-
#define ELEMENTS_GALLERY_TOGGLE_SELECTOR_JUNE_5_2016
6+
#if !defined(ELEMENTS_STYLE_TOGGLE_SELECTOR_JUNE_5_2016)
7+
#define ELEMENTS_STYLE_TOGGLE_SELECTOR_JUNE_5_2016
88

99
#include <elements/support/theme.hpp>
1010
#include <elements/element/element.hpp>

lib/src/element/gallery/button.cpp lib/src/element/style/button.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
Distributed under the MIT License [ https://opensource.org/licenses/MIT ]
55
=============================================================================*/
6-
#include <elements/element/gallery/button.hpp>
6+
#include <elements/element/style/button.hpp>
77

88
namespace cycfi::elements
99
{

lib/src/element/gallery/check_box.cpp lib/src/element/style/check_box.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
Distributed under the MIT License [ https://opensource.org/licenses/MIT ]
55
=============================================================================*/
6-
#include <elements/element/gallery/check_box.hpp>
6+
#include <elements/element/style/check_box.hpp>
77

88
namespace cycfi::elements
99
{

lib/src/element/gallery/icon_button.cpp lib/src/element/style/icon_button.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
Distributed under the MIT License [ https://opensource.org/licenses/MIT ]
55
=============================================================================*/
6-
#include <elements/element/gallery/icon_button.hpp>
6+
#include <elements/element/style/icon_button.hpp>
77
#include <elements/support/text_utils.hpp>
88

99
namespace cycfi::elements

lib/src/element/gallery/menu.cpp lib/src/element/style/menu.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
Distributed under the MIT License [ https://opensource.org/licenses/MIT ]
55
=============================================================================*/
6-
#include <elements/element/gallery/menu.hpp>
6+
#include <elements/element/style/menu.hpp>
77
#include <elements/support/text_utils.hpp>
88

99
namespace cycfi::elements

0 commit comments

Comments
 (0)