Skip to content

small changes #49

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

Open
wants to merge 46 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
a025d5d
Start using cmake instead of qmake.
ashraf-kx Feb 17, 2022
c667bc2
removing *.qrc files.
ashraf-kx Feb 17, 2022
b752e8a
Deleting *.pro files.
ashraf-kx Feb 17, 2022
31a4a59
AppBar -> md namespace.
ashraf-kx Feb 17, 2022
14f4403
move "AutoComplete" classes into "md" namespace.
ashraf-kx Feb 17, 2022
cce6e6f
Move Avatar => md namespace.
ashraf-kx Feb 17, 2022
410bb72
Move CirclarProgress => md namespace.
ashraf-kx Feb 17, 2022
8a55c8f
Move "FlatButton" to "md" namespace.
ashraf-kx Feb 17, 2022
792f3cf
IconButton => md
ashraf-kx Feb 17, 2022
d11d642
Menu => md namespace.
ashraf-kx Feb 17, 2022
9dff79d
Empty classes [not implemented yet].
ashraf-kx Feb 17, 2022
c71884d
Empty class.
ashraf-kx Feb 17, 2022
49778eb
The base classes moved to md namespace.
ashraf-kx Feb 17, 2022
168ac02
Badge moved to md.
ashraf-kx Feb 17, 2022
336b50e
CkechBox moved.
ashraf-kx Feb 17, 2022
597ad49
Dialog moved
ashraf-kx Feb 17, 2022
0e907a7
Drawer moved.
ashraf-kx Feb 17, 2022
1788acd
Fab moved..
ashraf-kx Feb 17, 2022
ff93c8e
ProgressBar moved.
ashraf-kx Feb 17, 2022
1c07c06
ProgressBar moved - 2
ashraf-kx Feb 17, 2022
5651ee3
RadioButton moved to md.
ashraf-kx Feb 17, 2022
b8cb380
RaisedButton moved to md namespace.
ashraf-kx Feb 17, 2022
ef1427c
ScrollBar moved
ashraf-kx Feb 17, 2022
098267a
Slider moved
ashraf-kx Feb 17, 2022
80f7bbd
Snackbar moved to md.
ashraf-kx Feb 17, 2022
0fee3cf
Tabs
ashraf-kx Feb 17, 2022
a910b39
TextField moved to md
ashraf-kx Feb 17, 2022
803bce5
Toggle
ashraf-kx Feb 17, 2022
0c7dc75
"QtMaterialStyle" renamed to "Style" and moved to "md" namespace.
ashraf-kx Feb 17, 2022
a9281b2
Importing StateMachine Module.
ashraf-kx Feb 17, 2022
0a6c337
Fixing structure of the project
ashraf-kx Feb 17, 2022
b209855
Remove the support of qmake
ashraf-kx Feb 17, 2022
08e0703
Customizing a test example.
ashraf-kx Feb 17, 2022
5a044e1
Testing one component at a time.
ashraf-kx Feb 17, 2022
4215a79
Reorganizing and fix the headers/include.
ashraf-kx Feb 17, 2022
0edcedc
Testing more widgets ..
ashraf-kx Feb 17, 2022
09cc27e
Fix the component "RadioButton" issue.
ashraf-kx Feb 17, 2022
0db2da8
all available Material widgets examples WORKS OKAY.
ashraf-kx Feb 17, 2022
f1f696c
Class name matches the file name.
ashraf-kx Feb 17, 2022
5b1269d
Copying Fonts/Assets/Icons folders to build dir.
ashraf-kx Feb 17, 2022
e04298e
Locate resources at runtime using QDir::currentpath
ashraf-kx Feb 17, 2022
f345d3a
Delete .qmake.conf
ashraf-kx Feb 17, 2022
3608731
Update README.md
ashraf-kx Feb 19, 2022
872b74e
Update README.md
ashraf-kx Feb 19, 2022
4b233f2
move fonts folder inside the components directory.
ashraf-kx Feb 21, 2022
851d3fb
Qt Resource System for shipping resource files.
ashraf-kx Feb 21, 2022
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
*.pro.user
CMakeLists.txt.user
2 changes: 0 additions & 2 deletions .qmake.conf

This file was deleted.

53 changes: 53 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
cmake_minimum_required(VERSION 3.5)

project(QtMaterialWidgets VERSION 0.1 LANGUAGES CXX)

set(CMAKE_INCLUDE_CURRENT_DIR ON)

set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)

set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

find_package(QT NAMES Qt6 Qt5 COMPONENTS Widgets REQUIRED)

add_subdirectory(components)
add_subdirectory(examples)

if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
# qt_add_executable(QtMaterialWidgets
# MANUAL_FINALIZATION
# ${PROJECT_SOURCES}
# )
# Define target properties for Android with Qt 6 as:
# set_property(TARGET QtMaterialWidgets APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR
# ${CMAKE_CURRENT_SOURCE_DIR}/android)
# For more information, see https://doc.qt.io/qt-6/qt-add-executable.html#target-creation
else()
if(ANDROID)
add_library(QtMaterialWidgets SHARED ${PROJECT_SOURCES})
# Define properties for Android with Qt 5 after find_package() calls as:
# set(ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/android")
else()
add_executable(QtMaterialWidgets
${PROJECT_SOURCES}
)
endif()
endif()


#set_target_properties(QtMaterialWidgets PROPERTIES
# MACOSX_BUNDLE_GUI_IDENTIFIER my.example.com
# MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
# MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
# MACOSX_BUNDLE TRUE
# WIN32_EXECUTABLE TRUE
#)

#file(COPY fonts DESTINATION ${CMAKE_BINARY_DIR})

if(QT_VERSION_MAJOR EQUAL 6)
# qt_finalize_executable(QtMaterialWidgets)
endif()
38 changes: 19 additions & 19 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ YouTube video preview [available here](http://www.youtube.com/watch?v=21UMeNVBPU
App Bar
</td>
<td>
<code>QtMaterialAppBar</code>
<code>md::AppBar</code>
</td>
</tr>
<tr>
Expand All @@ -25,7 +25,7 @@ YouTube video preview [available here](http://www.youtube.com/watch?v=21UMeNVBPU
Auto Complete
</td>
<td>
<code>QtMaterialAutoComplete</code>
<code>md::AutoComplete</code>
</td>
</tr>
<tr>
Expand All @@ -38,7 +38,7 @@ YouTube video preview [available here](http://www.youtube.com/watch?v=21UMeNVBPU
Avatar
</td>
<td>
<code>QtMaterialAvatar</code>
<code>md::Avatar</code>
</td>
</tr>
<tr>
Expand All @@ -51,7 +51,7 @@ YouTube video preview [available here](http://www.youtube.com/watch?v=21UMeNVBPU
Badge
</td>
<td>
<code>QtMaterialBadge</code>
<code>md::Badge</code>
</td>
</tr>
<tr>
Expand All @@ -64,7 +64,7 @@ YouTube video preview [available here](http://www.youtube.com/watch?v=21UMeNVBPU
Check Box
</td>
<td>
<code>QtMaterialCheckBox</code>
<code>md::CheckBox</code>
</td>
</tr>
<tr>
Expand All @@ -77,7 +77,7 @@ YouTube video preview [available here](http://www.youtube.com/watch?v=21UMeNVBPU
Circular Progress
</td>
<td>
<code>QtMaterialCircularProgress</code>
<code>md::CircularProgress</code>
</td>
</tr>
<tr>
Expand All @@ -90,7 +90,7 @@ YouTube video preview [available here](http://www.youtube.com/watch?v=21UMeNVBPU
Dialog
</td>
<td>
<code>QtMaterialDialog</code>
<code>md::Dialog</code>
</td>
</tr>
<tr>
Expand All @@ -103,7 +103,7 @@ YouTube video preview [available here](http://www.youtube.com/watch?v=21UMeNVBPU
Drawer
</td>
<td>
<code>QtMaterialDrawer</code>
<code>md::Drawer</code>
</td>
</tr>
<tr>
Expand All @@ -116,7 +116,7 @@ YouTube video preview [available here](http://www.youtube.com/watch?v=21UMeNVBPU
FAB
</td>
<td>
<code>QtMaterialFloatingActionButton</code>
<code>md::FloatingActionButton</code>
</td>
</tr>
<tr>
Expand All @@ -129,7 +129,7 @@ YouTube video preview [available here](http://www.youtube.com/watch?v=21UMeNVBPU
Flat Button
</td>
<td>
<code>QtMaterialFlatButton</code>
<code>md::FlatButton</code>
</td>
</tr>
<tr>
Expand All @@ -155,7 +155,7 @@ YouTube video preview [available here](http://www.youtube.com/watch?v=21UMeNVBPU
Progress
</td>
<td>
<code>QtMaterialProgress</code>
<code>md::Progress</code>
</td>
</tr>
<tr>
Expand All @@ -168,7 +168,7 @@ YouTube video preview [available here](http://www.youtube.com/watch?v=21UMeNVBPU
Radio Button
</td>
<td>
<code>QtMaterialRadioButton</code>
<code>md::RadioButton</code>
</td>
</tr>
<tr>
Expand All @@ -181,7 +181,7 @@ YouTube video preview [available here](http://www.youtube.com/watch?v=21UMeNVBPU
Raised Button
</td>
<td>
<code>QtMaterialRaisedButton</code>
<code>md::RaisedButton</code>
</td>
</tr>
<tr>
Expand All @@ -194,7 +194,7 @@ YouTube video preview [available here](http://www.youtube.com/watch?v=21UMeNVBPU
Scroll Bar
</td>
<td>
<code>QtMaterialScrollBar</code>
<code>md::ScrollBar</code>
</td>
</tr>
<tr>
Expand All @@ -207,7 +207,7 @@ YouTube video preview [available here](http://www.youtube.com/watch?v=21UMeNVBPU
Slider
</td>
<td>
<code>QtMaterialSlider</code>
<code>md::Slider</code>
</td>
</tr>
<tr>
Expand All @@ -220,7 +220,7 @@ YouTube video preview [available here](http://www.youtube.com/watch?v=21UMeNVBPU
Snackbar
</td>
<td>
<code>QtMaterialSnackBar</code>
<code>md::SnackBar</code>
</td>
</tr>
<tr>
Expand All @@ -233,7 +233,7 @@ YouTube video preview [available here](http://www.youtube.com/watch?v=21UMeNVBPU
Tabs
</td>
<td>
<code>QtMaterialTabs</code>
<code>md::Tabs</code>
</td>
</tr>
<tr>
Expand All @@ -246,7 +246,7 @@ YouTube video preview [available here](http://www.youtube.com/watch?v=21UMeNVBPU
Text Field
</td>
<td>
<code>QtMaterialTextField</code>
<code>md::TextField</code>
</td>
</tr>
<tr>
Expand All @@ -259,7 +259,7 @@ YouTube video preview [available here](http://www.youtube.com/watch?v=21UMeNVBPU
Toggle
</td>
<td>
<code>QtMaterialToggle</code>
<code>md::Toggle</code>
</td>
</tr>
<tr>
Expand Down
Loading