Skip to content

Commit

Permalink
adopted keepassxc theme
Browse files Browse the repository at this point in the history
- removed phantomstyle submodule
- added REVISION.txt for tracking specific commits
- removed roboto font
- removed most old stylesheet files
- removed most icons
- redesigned the about dialog
- tweaked main menu measurements
- rewrote code for painting diary pixels and diary stats
- fixed buttons being added in wrong order for messageboxes
- incremented minor version
  • Loading branch information
someretical committed Jan 15, 2022
1 parent 6279423 commit 526817d
Show file tree
Hide file tree
Showing 310 changed files with 8,058 additions and 35,585 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ jobs:
- name: qmake and nmake
run: |
echo $(git rev-parse --short "$GITHUB_SHA") > text\\REVISION.txt
type text\\REVISION.txt
qmake theoreticaldiary.pro CONFIG+=release
set CL=/MP
nmake qmake_all
Expand Down Expand Up @@ -85,6 +87,8 @@ jobs:
- name: qmake and make
run: |
echo $(git rev-parse --short "$GITHUB_SHA") > text/REVISION.txt
cat text/REVISION.txt
sudo xcode-select -s /Applications/Xcode_12.1.1.app/Contents/Developer
qmake QMAKE_CC="/usr/local/opt/llvm/bin/clang" QMAKE_CXX="/usr/local/opt/llvm/bin/clang++" CONFIG+=release QMAKE_LIBS+="-L/usr/local/opt/llvm/lib -L/usr/local/lib" INCLUDEPATH+="-I/usr/local/opt/llvm/include"
make -j$(sysctl -n hw.logicalcpu)
Expand Down Expand Up @@ -129,6 +133,8 @@ jobs:
- name: qmake and make
run: |
echo $(git rev-parse --short "$GITHUB_SHA") > text/REVISION.txt
cat text/REVISION.txt
qmake CONFIG+=release
make -j$(nproc)
make install INSTALL_ROOT=TheoreticalDiary.AppDir
Expand Down
5 changes: 1 addition & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,4 @@
url = https://github.com/someretical/o2.git
[submodule "external-libs/asyncfuture"]
path = external-libs/asyncfuture
url = https://github.com/benlau/asyncfuture.git
[submodule "external-libs/phantomstyle"]
path = external-libs/phantomstyle
url = https://github.com/randrew/phantomstyle.git
url = https://github.com/benlau/asyncfuture.git
1 change: 0 additions & 1 deletion external-libs/phantomstyle
Submodule phantomstyle deleted from 309c97
Binary file removed fonts/Roboto/Roboto-Black.ttf
Binary file not shown.
Binary file removed fonts/Roboto/Roboto-BlackItalic.ttf
Binary file not shown.
Binary file removed fonts/Roboto/Roboto-Bold.ttf
Binary file not shown.
Binary file removed fonts/Roboto/Roboto-BoldItalic.ttf
Binary file not shown.
Binary file removed fonts/Roboto/Roboto-Italic.ttf
Binary file not shown.
Binary file removed fonts/Roboto/Roboto-Light.ttf
Binary file not shown.
Binary file removed fonts/Roboto/Roboto-LightItalic.ttf
Binary file not shown.
Binary file removed fonts/Roboto/Roboto-Medium.ttf
Binary file not shown.
Binary file removed fonts/Roboto/Roboto-MediumItalic.ttf
Binary file not shown.
Binary file removed fonts/Roboto/Roboto-Regular.ttf
Binary file not shown.
Binary file removed fonts/Roboto/Roboto-Thin.ttf
Binary file not shown.
Binary file removed fonts/Roboto/Roboto-ThinItalic.ttf
Binary file not shown.
Binary file removed fonts/Roboto/RobotoCondensed-Bold.ttf
Binary file not shown.
Binary file removed fonts/Roboto/RobotoCondensed-BoldItalic.ttf
Binary file not shown.
Binary file removed fonts/Roboto/RobotoCondensed-Italic.ttf
Binary file not shown.
Binary file removed fonts/Roboto/RobotoCondensed-Light.ttf
Binary file not shown.
Binary file removed fonts/Roboto/RobotoCondensed-LightItalic.ttf
Binary file not shown.
Binary file removed fonts/Roboto/RobotoCondensed-Regular.ttf
Binary file not shown.
Binary file removed fonts/RobotoMono/RobotoMono-Bold.ttf
Binary file not shown.
Binary file removed fonts/RobotoMono/RobotoMono-BoldItalic.ttf
Binary file not shown.
Binary file removed fonts/RobotoMono/RobotoMono-ExtraLight.ttf
Binary file not shown.
Binary file removed fonts/RobotoMono/RobotoMono-ExtraLightItalic.ttf
Binary file not shown.
Binary file removed fonts/RobotoMono/RobotoMono-Italic.ttf
Binary file not shown.
Binary file removed fonts/RobotoMono/RobotoMono-Light.ttf
Binary file not shown.
Binary file removed fonts/RobotoMono/RobotoMono-LightItalic.ttf
Binary file not shown.
Binary file removed fonts/RobotoMono/RobotoMono-Medium.ttf
Binary file not shown.
Binary file removed fonts/RobotoMono/RobotoMono-MediumItalic.ttf
Binary file not shown.
Binary file removed fonts/RobotoMono/RobotoMono-Regular.ttf
Binary file not shown.
Binary file removed fonts/RobotoMono/RobotoMono-SemiBold.ttf
Binary file not shown.
Binary file removed fonts/RobotoMono/RobotoMono-SemiBoldItalic.ttf
Binary file not shown.
Binary file removed fonts/RobotoMono/RobotoMono-Thin.ttf
Binary file not shown.
Binary file removed fonts/RobotoMono/RobotoMono-ThinItalic.ttf
Binary file not shown.
36 changes: 0 additions & 36 deletions fonts/fonts.qrc

This file was deleted.

159 changes: 7 additions & 152 deletions images/images.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,158 +2,13 @@
<qresource prefix="/">
<file>linux_icons/256x256/theoreticaldiary.png</file>
<file>linux_icons/scalable/theoreticaldiary.svg</file>
<file>themes/dark/disabled/base.svg</file>
<file>themes/dark/disabled/branch-closed.svg</file>
<file>themes/dark/disabled/branch-end.svg</file>
<file>themes/dark/disabled/branch-more.svg</file>
<file>themes/dark/disabled/branch-open.svg</file>
<file>themes/dark/disabled/checkbox_checked.svg</file>
<file>themes/dark/disabled/checkbox_checked_invert.svg</file>
<file>themes/dark/disabled/checkbox_indeterminate.svg</file>
<file>themes/dark/disabled/checkbox_indeterminate_invert.svg</file>
<file>themes/dark/disabled/checkbox_unchecked.svg</file>
<file>themes/dark/disabled/checkbox_unchecked_invert.svg</file>
<file>themes/dark/disabled/checklist.svg</file>
<file>themes/dark/disabled/checklist_indeterminate.svg</file>
<file>themes/dark/disabled/checklist_indeterminate_invert.svg</file>
<file>themes/dark/disabled/checklist_invert.svg</file>
<file>themes/dark/disabled/close.svg</file>
<file>themes/dark/disabled/downarrow.svg</file>
<file>themes/dark/disabled/downarrow2.svg</file>
<file>themes/dark/disabled/float.svg</file>
<file>themes/dark/disabled/leftarrow.svg</file>
<file>themes/dark/disabled/leftarrow2.svg</file>
<file>themes/dark/disabled/radiobutton_checked.svg</file>
<file>themes/dark/disabled/radiobutton_unchecked.svg</file>
<file>themes/dark/disabled/rightarrow.svg</file>
<file>themes/dark/disabled/rightarrow2.svg</file>
<file>themes/dark/disabled/sizegrip.svg</file>
<file>themes/dark/disabled/slider.svg</file>
<file>themes/dark/disabled/splitter-horizontal.svg</file>
<file>themes/dark/disabled/splitter-vertical.svg</file>
<file>themes/dark/disabled/tab_close.svg</file>
<file>themes/dark/disabled/toolbar-handle-horizontal.svg</file>
<file>themes/dark/disabled/toolbar-handle-vertical.svg</file>
<file>themes/dark/disabled/uparrow.svg</file>
<file>themes/dark/disabled/uparrow2.svg</file>
<file>themes/dark/disabled/vline.svg</file>
<file>themes/dark/primary/base.svg</file>
<file>themes/dark/primary/branch-closed.svg</file>
<file>themes/dark/primary/branch-end.svg</file>
<file>themes/dark/primary/branch-more.svg</file>
<file>themes/dark/primary/branch-open.svg</file>
<file>themes/dark/primary/checkbox_checked.svg</file>
<file>themes/dark/primary/checkbox_checked_invert.svg</file>
<file>themes/dark/primary/checkbox_indeterminate.svg</file>
<file>themes/dark/primary/checkbox_indeterminate_invert.svg</file>
<file>themes/dark/primary/checkbox_unchecked.svg</file>
<file>themes/dark/primary/checkbox_unchecked_invert.svg</file>
<file>themes/dark/primary/checklist.svg</file>
<file>themes/dark/primary/checklist_indeterminate.svg</file>
<file>themes/dark/primary/checklist_indeterminate_invert.svg</file>
<file>themes/dark/primary/checklist_invert.svg</file>
<file>themes/dark/primary/close.svg</file>
<file>themes/dark/primary/downarrow.svg</file>
<file>themes/dark/primary/downarrow2.svg</file>
<file>themes/dark/primary/float.svg</file>
<file>themes/dark/primary/leftarrow.svg</file>
<file>themes/dark/primary/leftarrow2.svg</file>
<file>themes/dark/primary/radiobutton_checked.svg</file>
<file>themes/dark/primary/radiobutton_unchecked.svg</file>
<file>themes/dark/primary/rightarrow.svg</file>
<file>themes/dark/primary/rightarrow2.svg</file>
<file>themes/dark/primary/sizegrip.svg</file>
<file>themes/dark/primary/slider.svg</file>
<file>themes/dark/primary/splitter-horizontal.svg</file>
<file>themes/dark/primary/splitter-vertical.svg</file>
<file>themes/dark/primary/tab_close.svg</file>
<file>themes/dark/primary/toolbar-handle-horizontal.svg</file>
<file>themes/dark/primary/toolbar-handle-vertical.svg</file>
<file>themes/dark/primary/uparrow.svg</file>
<file>themes/dark/primary/uparrow2.svg</file>
<file>themes/dark/primary/vline.svg</file>
<file>themes/global/star_black.svg</file>
<file>themes/global/star_white.svg</file>
<file>windows_icons/icon.ico</file>
<file>themes/global/small_star_white.svg</file>
<file>themes/global/small_star_black.svg</file>
<file>themes/light/passwordlineedit/eye_on.svg</file>
<file>themes/light/passwordlineedit/eye_off.svg</file>
<file>themes/dark/passwordlineedit/eye_on.svg</file>
<file>themes/dark/passwordlineedit/eye_off.svg</file>
<file>themes/light/disabled/base.svg</file>
<file>themes/light/disabled/branch-closed.svg</file>
<file>themes/light/disabled/branch-end.svg</file>
<file>themes/light/disabled/branch-more.svg</file>
<file>themes/light/disabled/branch-open.svg</file>
<file>themes/light/disabled/checkbox_checked.svg</file>
<file>themes/light/disabled/checkbox_checked_invert.svg</file>
<file>themes/light/disabled/checkbox_indeterminate.svg</file>
<file>themes/light/disabled/checkbox_indeterminate_invert.svg</file>
<file>themes/light/disabled/checkbox_unchecked.svg</file>
<file>themes/light/disabled/checkbox_unchecked_invert.svg</file>
<file>themes/light/disabled/checklist.svg</file>
<file>themes/light/disabled/checklist_indeterminate.svg</file>
<file>themes/light/disabled/checklist_indeterminate_invert.svg</file>
<file>themes/light/disabled/checklist_invert.svg</file>
<file>themes/light/disabled/close.svg</file>
<file>themes/light/disabled/downarrow.svg</file>
<file>themes/light/disabled/downarrow2.svg</file>
<file>themes/light/disabled/float.svg</file>
<file>themes/light/disabled/leftarrow.svg</file>
<file>themes/light/disabled/leftarrow2.svg</file>
<file>themes/light/disabled/radiobutton_checked.svg</file>
<file>themes/light/disabled/radiobutton_checked_invert.svg</file>
<file>themes/light/disabled/radiobutton_unchecked.svg</file>
<file>themes/light/disabled/radiobutton_unchecked_invert.svg</file>
<file>themes/light/disabled/rightarrow.svg</file>
<file>themes/light/disabled/rightarrow2.svg</file>
<file>themes/light/disabled/sizegrip.svg</file>
<file>themes/light/disabled/slider.svg</file>
<file>themes/light/disabled/splitter-horizontal.svg</file>
<file>themes/light/disabled/splitter-vertical.svg</file>
<file>themes/light/disabled/tab_close.svg</file>
<file>themes/light/disabled/toolbar-handle-horizontal.svg</file>
<file>themes/light/disabled/toolbar-handle-vertical.svg</file>
<file>themes/light/disabled/uparrow.svg</file>
<file>themes/light/disabled/uparrow2.svg</file>
<file>themes/light/disabled/vline.svg</file>
<file>themes/light/primary/base.svg</file>
<file>themes/light/primary/branch-closed.svg</file>
<file>themes/light/primary/branch-end.svg</file>
<file>themes/light/primary/branch-more.svg</file>
<file>themes/light/primary/branch-open.svg</file>
<file>themes/light/primary/checkbox_checked.svg</file>
<file>themes/light/primary/checkbox_checked_invert.svg</file>
<file>themes/light/primary/checkbox_indeterminate.svg</file>
<file>themes/light/primary/checkbox_indeterminate_invert.svg</file>
<file>themes/light/primary/checkbox_unchecked.svg</file>
<file>themes/light/primary/checkbox_unchecked_invert.svg</file>
<file>themes/light/primary/checklist.svg</file>
<file>themes/light/primary/checklist_indeterminate.svg</file>
<file>themes/light/primary/checklist_indeterminate_invert.svg</file>
<file>themes/light/primary/checklist_invert.svg</file>
<file>themes/light/primary/close.svg</file>
<file>themes/light/primary/downarrow.svg</file>
<file>themes/light/primary/downarrow2.svg</file>
<file>themes/light/primary/float.svg</file>
<file>themes/light/primary/leftarrow.svg</file>
<file>themes/light/primary/leftarrow2.svg</file>
<file>themes/light/primary/radiobutton_checked.svg</file>
<file>themes/light/primary/radiobutton_checked_invert.svg</file>
<file>themes/light/primary/radiobutton_unchecked.svg</file>
<file>themes/light/primary/radiobutton_unchecked_invert.svg</file>
<file>themes/light/primary/rightarrow.svg</file>
<file>themes/light/primary/rightarrow2.svg</file>
<file>themes/light/primary/sizegrip.svg</file>
<file>themes/light/primary/slider.svg</file>
<file>themes/light/primary/splitter-horizontal.svg</file>
<file>themes/light/primary/splitter-vertical.svg</file>
<file>themes/light/primary/tab_close.svg</file>
<file>themes/light/primary/toolbar-handle-horizontal.svg</file>
<file>themes/light/primary/toolbar-handle-vertical.svg</file>
<file>themes/light/primary/uparrow.svg</file>
<file>themes/light/primary/uparrow2.svg</file>
<file>themes/light/primary/vline.svg</file>
<file>osx_icons/icons.icns</file>
<file>themes/dark/eye_off.svg</file>
<file>themes/dark/eye_on.svg</file>
<file>themes/dark/star.svg</file>
<file>themes/light/eye_off.svg</file>
<file>themes/light/eye_on.svg</file>
<file>themes/light/star.svg</file>
</qresource>
</RCC>
Loading

0 comments on commit 526817d

Please sign in to comment.