diff --git a/DOCUMENTATION.md b/DOCUMENTATION.md index 3408334..d7b2ba7 100755 --- a/DOCUMENTATION.md +++ b/DOCUMENTATION.md @@ -67,7 +67,7 @@ This is a list of components that are included in this project, as well as their |Name |Description |Finished|Fork| |------------------|------------------------------------------------------------------------------------------------------------------|--------|----| -|Aero cursors |Cursor pack for KDE. Currently only has the small size (96 DPI). |N |[Moony](https://store.kde.org/p/999972/)| +|Aero cursors |Cursor pack for KDE. Currently supports resolutions 32 and 48. |N |[Souris-2d07](https://gitgud.io/souris)| |SevenBlack |Windows 7 theme for KDE Plasma. |N |[Mirko Gennari](https://kde-look.org/p/998614),
[DrGordBord](https://store.kde.org/p/1722560/),
[bionegative](https://www.pling.com/p/998823)| |Sound collection |Sounds taken from Windows 7 directly. |Y |Microsoft| |VistaVG Wine theme|Msstyle used for theming Wine applications. |Y |[Vishal Gupta](https://www.deviantart.com/vishal-gupta/art/VistaVG-Ultimate-57715902)| diff --git a/INSTALL.md b/INSTALL.md index 1dbf691..9d0677c 100755 --- a/INSTALL.md +++ b/INSTALL.md @@ -32,11 +32,6 @@ The following software is required for this project: - extra-cmake-modules - [Scale Minimize Animation](https://store.kde.org/p/1267839) (Can be installed through System Settings) -Optional programs: - -- KMix, for a volume menu that looks more like Windows 7. For Pipewire users it might be better to just use the default volume plasmoid KDE provides. -- Some program to change the GTK2 theme, like ```gtk-chtheme```, if applying the GTK2 theme. - On Debian and Debian-based distributions (Ubuntu, Mint, etc.), the following apt packages are required: ``` @@ -136,52 +131,29 @@ To apply it, go to ```System Settings -> Appearance -> Plasma Style``` to find i ### Icons and Cursors -The icon theme is ```windowsicon```, while ```aero-cursors``` is the cursor theme. Extract the tar archives and move the folders in the following directory: +The icon theme is ```windowsicon```, while ```aero-drop``` is the cursor theme. Extract the tar archives and move the icon theme into the following directory: ``` $ ~/.local/share/icons/ ``` -To apply them, go to ```System Settings -> Appearance -> Icons``` and ```System Settings -> Appearance -> Cursors``` respectively to select them. - +To apply the icon theme, go to ```System Settings -> Appearance -> Icons``` and select the theme. It is also strongly recommended to install the [Oxygen](https://invent.kde.org/frameworks/oxygen-icons5) icon theme if it's not already installed on your system, as this project's icon theme optionally depends on it. +As for installing the cursor theme, apply the theme in ```System Settings -> Appearance -> Cursors```, and then follow [this](https://www.youtube.com/watch?v=Dj7co2R7RKw) video tutorial to ensure the cursor theme is applied everywhere consistently. It's important to keep in mind the following: + +1. Make sure that the cursor theme is installed system-wide (it has to be in ```/usr/share/icons```), or else SDDM cannot apply the theme. +2. If SDDM fails to pick up on the cursor theme, go to ```System Settings -> Startup and Shutdown -> Login Screen (SDDM)``` and click on 'Apply Plasma Settings' to ensure SDDM is properly configured. + +Consult the [Arch Wiki](https://wiki.archlinux.org/title/Cursor_themes) for more information, as setting a cursor theme on Linux is not as trivial or elegant KDE's System Settings would suggest. + + ### Qt Visual Style Installing Kvantum requires installing the package ```kvantum``` which is available in the community repository for Arch, and is available on most other Linux distributions as well. -To install the GTK2 theme, locate and move the following directory: - -``` -$ ./Qt/Application_Theme/QGtkStyle/win27pixmap/ -``` - -to this directory (create it if it doesn't exist): - -``` -$ ~/.themes/ -``` - Installing the Kvantum theme is simply done through Kvantum's settings. Afterwards, Kvantum can be set as the visual style in ```System Settings -> Appearance -> Application Style```. -**Applying the GTK2 theme:** - -Through a utility program like ```gtk-chtheme```, set the GTK2 theme to Win2-7. When configuring GTK2, make sure to set the font to the same font as configured in the system settings (for this theme, the default is Segoe UI, size 9). - -In case the GTK2 theme isn't persistent throughout sessions, in order to keep it applied, add the following line: - -``` -GTK2_RC_FILES=/home/[username]/.themes/win27pixmap/gtk-2.0/gtkrc -``` - -in - -``` -# /etc/environment -``` - -Replace ```[username]``` with your own user name. Restart the Plasma session to see the effect. - **Installing the color scheme:** To install the color scheme, go to ```System Settings -> Appearance -> Colors``` and click "Install from file". Locate the following file and select it: diff --git a/Icons and cursors/aero-cursors.tar.gz b/Icons and cursors/aero-cursors.tar.gz deleted file mode 100755 index 19c1b1d..0000000 Binary files a/Icons and cursors/aero-cursors.tar.gz and /dev/null differ diff --git a/Icons and cursors/aero-drop.tar.gz b/Icons and cursors/aero-drop.tar.gz new file mode 100644 index 0000000..1b616a6 Binary files /dev/null and b/Icons and cursors/aero-drop.tar.gz differ diff --git a/Icons and cursors/index.theme b/Icons and cursors/index.theme new file mode 100644 index 0000000..6b5b184 --- /dev/null +++ b/Icons and cursors/index.theme @@ -0,0 +1,2 @@ +[icon theme] +Inherits=aero-drop diff --git a/README.md b/README.md index c77295e..51c5cd4 100755 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ It is still in heavy development and testing. This project has been tested on: - Intel integrated graphics, AMD dedicated graphics - 96 DPI scaling -Here's what's currently not supported but should be (see FAQ): +Here's what's currently not supported but is planned (see FAQ): - Multi-distro support (While this could work on other distros, and has been confirmed to run well on Arch and Ubuntu, I cannot provide help if something goes wrong) - HiDPI scaling @@ -50,7 +50,9 @@ The following will not be supported at all in the foreseeable future: - GTK3 - GTK4 - - Wayland + - Wayland* + + *Based on user feedback, it seems that only the KWin effects provided in AeroThemePlasma don't work with Wayland. I have issues when running Wayland so I'm unable to debug this, but I'd be happy to accept a merge request that fixes this issue.

DISCLAIMER:

@@ -131,6 +133,10 @@ Lastly, feel free to fork this project and/or contribute to it in any way. Any a +### Firefox + + + ## Installation *See [INSTALL.md](./INSTALL.md)* diff --git a/Screenshots/Firefox.png b/Screenshots/Firefox.png new file mode 100644 index 0000000..d975cd3 Binary files /dev/null and b/Screenshots/Firefox.png differ diff --git a/Screenshots/Icons.png b/Screenshots/Icons.png index 032a1bb..55a7d81 100755 Binary files a/Screenshots/Icons.png and b/Screenshots/Icons.png differ diff --git a/Screenshots/QGtkStyle/AeroColorMixer.png b/Screenshots/QGtkStyle/AeroColorMixer.png deleted file mode 100755 index bc98c34..0000000 Binary files a/Screenshots/QGtkStyle/AeroColorMixer.png and /dev/null differ diff --git a/Screenshots/QGtkStyle/Clementine.png b/Screenshots/QGtkStyle/Clementine.png deleted file mode 100755 index e830c6d..0000000 Binary files a/Screenshots/QGtkStyle/Clementine.png and /dev/null differ diff --git a/Screenshots/QGtkStyle/Context_Menu.png b/Screenshots/QGtkStyle/Context_Menu.png deleted file mode 100755 index 1711ace..0000000 Binary files a/Screenshots/QGtkStyle/Context_Menu.png and /dev/null differ diff --git a/Screenshots/QGtkStyle/Context_Menu_2.png b/Screenshots/QGtkStyle/Context_Menu_2.png deleted file mode 100755 index eddc751..0000000 Binary files a/Screenshots/QGtkStyle/Context_Menu_2.png and /dev/null differ diff --git a/Screenshots/QGtkStyle/Dolphin.png b/Screenshots/QGtkStyle/Dolphin.png deleted file mode 100755 index 198921c..0000000 Binary files a/Screenshots/QGtkStyle/Dolphin.png and /dev/null differ diff --git a/Screenshots/QGtkStyle/Dolphin_2.png b/Screenshots/QGtkStyle/Dolphin_2.png deleted file mode 100755 index 1914fd5..0000000 Binary files a/Screenshots/QGtkStyle/Dolphin_2.png and /dev/null differ diff --git a/Screenshots/QGtkStyle/KSysGuard.png b/Screenshots/QGtkStyle/KSysGuard.png deleted file mode 100755 index 73f6447..0000000 Binary files a/Screenshots/QGtkStyle/KSysGuard.png and /dev/null differ diff --git a/install.sh b/install.sh index a94689f..b61094e 100755 --- a/install.sh +++ b/install.sh @@ -23,6 +23,8 @@ USER_ICONS=${USER_LOCAL}icons/ KWIN_SWITCHER_DIR=${USER_LOCAL}kwin/tabbox/ EMERALD_PATH=~/.emerald/ KVANTUM_THEMES=${USER_CONFIG}Kvantum/ +CURSOR_USER=~/.icons/default/ +CURSOR_SYSTEM=/usr/share/icons/ # System directories KWIN_PLUGIN_DIR=/usr/lib/qt/plugins/org.kde.kdecoration2/ # Used for installing Smaragd @@ -85,7 +87,7 @@ KWIN_SWITCHER=thumbnail_seven # Icons and cursors ICONTHEME=windowsicon -CURSORTHEME=aero-cursors +CURSORTHEME=aero-drop function print_help { printf "WARNING: This script is early in development\n" @@ -178,7 +180,8 @@ function install { "$COLOR_SCHEMES" \ "$USER_ICONS" \ "$USER_LOOK_AND_FEEL" \ - "$KWIN_SWITCHER_DIR" + "$KWIN_SWITCHER_DIR" \ + "$CURSOR_USER" echo "Installing user plasmoids..." sudo mkdir -p "${PLASMOID_PLUGINS}" sudo cp "${INNER_PLASMA_WIDGETS}User/${SEVEN_TASKS_PLUGIN}" "${PLASMOID_PLUGINS}" @@ -194,7 +197,7 @@ function install { "${USER_PLASMOIDS}${DESKTOP_CONTAINMENT}" rm -rf \ - "${USER_ICONS}${ICONTHEME}" \ + "${CURSOR_USER}" \ "${USER_ICONS}${CURSORTHEME}" \ "${USER_LOOK_AND_FEEL}${SPLASH_SCREEN}" \ "${PLASMA_THEMES}${PLASMA_THEME}" \ @@ -212,7 +215,9 @@ function install { mv "${ICONTHEME}" "${USER_ICONS}" echo "Installing cursor theme..." tar -xf "${INNER_ICON_THEME}${CURSORTHEME}.tar.gz" - mv "${CURSORTHEME}" "${USER_ICONS}" + sudo mv "${CURSORTHEME}" "${CURSOR_SYSTEM}" + cp "${INNER_ICON_THEME}index.theme" "${CURSOR_USER}index.theme" + ln -s "${CURSOR_SYSTEM}${CURSORTHEME}/cursors" "${CURSOR_USER}cursors" echo "Installing Smaragd Seven..." sudo mkdir -p "${KWIN_PLUGIN_DIR}"