diff --git a/MANIFEST.in b/MANIFEST.in index b4b99cd..bff3adc 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -3,6 +3,7 @@ recursive-include qt_material *.ui recursive-include qt_material/themes *.xml recursive-include qt_material/fonts/roboto *.ttf recursive-include qt_material/resources/ * +recursive-include qt_material/resources/source * recursive-include * *.csv recursive-include * *.ttf recursive-exclude * __pycache__ diff --git a/examples/full_features/main_window.ui b/examples/full_features/main_window.ui index ba1c42b..91a1057 100644 --- a/examples/full_features/main_window.ui +++ b/examples/full_features/main_window.ui @@ -1764,9 +1764,6 @@ Unchecked - - ItemIsSelectable|ItemIsDragEnabled|ItemIsUserCheckable|ItemIsEnabled|ItemIsTristate - @@ -1775,9 +1772,6 @@ PartiallyChecked - - ItemIsSelectable|ItemIsDragEnabled|ItemIsUserCheckable|ItemIsEnabled|ItemIsTristate - @@ -1798,7 +1792,7 @@ Unchecked - ItemIsSelectable|ItemIsDragEnabled|ItemIsUserCheckable|ItemIsTristate + ItemIsSelectable|ItemIsDragEnabled|ItemIsUserCheckable @@ -1809,7 +1803,7 @@ PartiallyChecked - ItemIsSelectable|ItemIsDragEnabled|ItemIsUserCheckable|ItemIsTristate + ItemIsSelectable|ItemIsDragEnabled|ItemIsUserCheckable diff --git a/examples/full_features/my_theme.xml b/examples/full_features/my_theme.xml index ffc0650..5c2f63f 100644 --- a/examples/full_features/my_theme.xml +++ b/examples/full_features/my_theme.xml @@ -1,11 +1,11 @@ - #e2a963 - #ffcb74 - #f5f5f5 - #ffffff - #e6e6e6 - #3c3c3c - #555555 + #1de9b6 + #6effe8 + #232629 + #4f5b62 + #31363b + #000000 + #ffffff \ No newline at end of file diff --git a/qt_material/material.css.template b/qt_material/material.css.template index 850eff7..a37af55 100644 --- a/qt_material/material.css.template +++ b/qt_material/material.css.template @@ -79,7 +79,7 @@ QDateTimeEdit, QSpinBox, QDoubleSpinBox, QTextEdit, -QLineEdit, +.QLineEdit, QComboBox, QPushButton { color: {{primaryColor}}; @@ -96,7 +96,7 @@ QSpinBox, QDoubleSpinBox, QTreeView, QListView, -QLineEdit, +.QLineEdit, QComboBox { color: {{primaryColor}}; padding-left: 15px; @@ -119,7 +119,7 @@ QDateTimeEdit:disabled, QSpinBox:disabled, QDoubleSpinBox:disabled, QTextEdit:disabled, -QLineEdit:disabled, +.QLineEdit:disabled, QComboBox:disabled { color: {{primaryColor|opacity(0.2)}}; background-color: {{secondaryColor|opacity(0.75)}}; diff --git a/setup.py b/setup.py index 9b20f98..cb3b422 100644 --- a/setup.py +++ b/setup.py @@ -9,8 +9,9 @@ os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir))) setup( name='qt-material', - version='2.8', - packages=['qt_material', 'qt_material.resources'], + version='2.8.2', + packages=['qt_material', 'qt_material.resources', + 'qt_material.resources.source'], author='Yeison Cardona', author_email='yencardonaal@unal.edu.co',