Merge pull request #4 from imarkoff/3-compact-tweak

Close #3: panel tweaks & popup improvements
- Panel default size tweak.
- Remove background from panel button tweak.
- Custom panel text color tweak.
- Smaller popup menu paddings.

README.md

@@ -35,13 +35,13 @@ Icon theme: https://github.com/vinceliuice/Colloid-icon-theme
 ![Dash look](./readme-images/dash.png?raw=true "Dash look")
 
 ## Requirements
-- GNOME 43, 44. I do not guarantee correct functionality on other versions.
+- GNOME 43, 44. I don't guarantee correct functionality on other versions.
 - [User Themes](https://extensions.gnome.org/extension/19/user-themes/ "User Themes") extension.
 - [GNOME Tweaks](https://gitlab.gnome.org/GNOME/gnome-tweaks "GNOME Tweaks").
 - Python 3.2+.
 
 ## Installation
-1. Open terminal.
+1. Open the terminal.
 2. Clone git and change directory:
 ```shell
 git clone https://github.com/imarkoff/Marble-shell-theme.git && cd Marble-shell-theme
@@ -59,28 +59,37 @@ python install.py -h
 #### Install default color
 You can install several themes in one string: `python install.py --red --green --blue`
 
-| Option        | Theme mode (optional) | Description                                              |
+| Option    | Description                                            |
-|---------------|-----------------------|----------------------------------------------------------|
+|-----------|--------------------------------------------------------|
-| -A, --all     |                       |  Install all available accent colors. Light & dark mode. |
+| -A, --all | Install all available accent colors, light & dark mode |
-| --red         |                       | red theme only                                           |
+| --red     | red theme only                                         |
-| --pink        |                       | pink theme only                                          |
+| --pink    | pink theme only                                        |
-| --purple      |                       | purple theme only                                        |
+| --purple  | purple theme only                                      |
-| --blue        |                       | blue theme only                                          |
+| --blue    | blue theme only                                        |
-| --green       |                       | green theme only                                         |
+| --green   | green theme only                                       |
-| --yellow      |                       | yellow theme only                                        |
+| --yellow  | yellow theme only                                      |
-| --gray        |                       | gray theme only                                          |
+| --gray    | gray theme only                                        |
 
 #### Install custom color
-| Option | Hue degree | Secondary option (optional) | Description                              |
+| Option | Secondary option (optional) | Description                              |
-|--------|------------|-----------------------------|------------------------------------------|
+|--------|-----------------------------|------------------------------------------|
-| --hue  | (0 - 360)  |                             | Generate theme from Hue prompt [0 - 360] |
+| --hue  | (0 - 360)                   | Generate theme from Hue prompt [0 - 360] |
-|        |            | --name=NAME                 | Custom theme name                        |
+| --name | --name=NAME                 | Custom theme name                        |
 
 #### Optional theme tweaks
-| Option  | Secondary option | Description                                                |
+| Option | Secondary option | Description                                                |
-|---------|------------------|------------------------------------------------------------|
+|--------|------------------|------------------------------------------------------------|
-| --mode= | light / dark     | light / dark theme only                                    |
+| --mode | light / dark     | light / dark theme only                                    |
-| --sat=  | (0 - 250)%       | custom color saturation (<100% - reduce, >100% - increase) |
+| --sat  | (0 - 250)%       | custom color saturation (<100% - reduce, >100% - increase) |
+
+#### Panel tweaks
+![Panel default size](./readme-images/tweaks/panel-default-size.png "Panel default size")
+![Panel without buttons background](./readme-images/tweaks/panel-no-pill.png "Panel without buttons background")
+| Option                     | Secondary option | Description                    |
+|----------------------------|------------------|--------------------------------|
+| -Pds, --panel_default_size |                  | set default panel size         |
+| -Pnp, --panel_no_pill      |                  | remove panel button background |
+| -Ptc, --panel_text_color   | #abcdef          | custom panel HEX(A) text color |
 
 #### Examples
 | Command                                        | Description                                                          |

install.py

@@ -22,102 +22,23 @@ import argparse
 import textwrap
 
 
-def destination_return(path_name, theme_mode):
+def generate_file(folder, final_file):
     """
-    Copied/modified gnome-shell theme location
+    Combines all files in a folder into a single file
-    :param path_name: color name
+    :param folder: source folder
-    :param theme_mode: theme name (light or dark)
+    :param final_file: location where file will be created
-    :return: copied files' folder location
     """
 
-    return f"~/.themes/Marble-{path_name}-{theme_mode}/gnome-shell"
+    opened_file = open(final_file, "w")
+
+    for file in os.listdir(folder):
+        opened_file.write(open(folder + file).read() + '\n')
+
+    opened_file.close()
 
 
-def copy_files(source, destination):
+def concatenate_files(file, edit_file):
-    """
+    open(edit_file, 'a').write('\n' + open(file).read())
-    Copy files from the source to another directory
-    :param source: where files will be copied
-    :param destination: where files will be pasted
-    """
-
-    destinationDirs = destination.split("/")
-    loopCreateDirs = f"{destinationDirs[0]}/"
-
-    # create necessary folders
-    for i in range(1, len(destinationDirs)):
-        loopCreateDirs += f"{destinationDirs[i]}/"
-        os.system(f"mkdir -p {loopCreateDirs}")
-
-    os.system(f"cp -aT {source} {destination}")
-
-
-def apply_theme_to_file(hue, destination, theme_mode, apply_file, sat=None):
-    """
-    Install accent colors from colors.json to different file
-    :param hue
-    :param destination: file directory
-    :param theme_mode: theme name (light or dark)
-    :param apply_file: file name
-    :param sat: color saturation (optional)
-    """
-
-    with open(os.path.expanduser(f"{destination}/{apply_file}"), "r") as file:
-        edit_file = file.read()
-
-        # colorsys works in range(0, 1)
-        h = hue / 360
-        for element in colors["elements"]:
-            # convert to range(0, 1)
-            lightness = int(colors["elements"][element][theme_mode]["l"]) / 100
-            saturation = int(colors["elements"][element][theme_mode]["s"]) / 100 if sat is None else int(
-                colors["elements"][element][theme_mode]["s"]) * (sat / 100) / 100
-            alpha = colors["elements"][element][theme_mode]["a"]
-
-            # convert hsl to rgb and multiple every item
-            red, green, blue = [int(item * 256) for item in colorsys.hls_to_rgb(h, lightness, saturation)]
-
-            replace_keyword = colors["elements"][element]["replace"]
-
-            edit_file = edit_file.replace(replace_keyword, f"rgba({red}, {green}, {blue}, {alpha})")
-
-    with open(os.path.expanduser(f"{destination}/{apply_file}"), "w") as file:
-        file.write(edit_file)
-
-
-def apply_theme(hue, destination, theme_mode, sat=None):
-    """
-    Apply theme to all files listed in "apply-theme-files" (colors.json)
-    :param hue
-    :param destination: file directory
-    :param theme_mode: theme name (light or dark)
-    :param sat: color saturation (optional)
-    """
-
-    for apply_file in os.listdir("./gnome-shell/"):
-        apply_theme_to_file(hue, destination, theme_mode, apply_file, sat=sat)
-
-
-def install_color(hue, name, theme_mode, sat=None):
-    """
-    Copy files and generate theme with different accent color
-    :param hue
-    :param name: theme name
-    :param theme_mode: light or dark mode
-    :param sat: color saturation (optional)
-    """
-
-    print(f"Creating {name} {', '.join(theme_mode)} theme...", end=" ")
-
-    try:
-        for mode in theme_mode:
-            copy_files("./gnome-shell", destination_return(name, mode))
-            apply_theme(hue, destination_return(name, mode), mode, sat=sat)
-
-    except Exception as err:
-        print("\nError: " + str(err))
-
-    else:
-        print("Done.")
 
 
 def remove_files():
@@ -167,6 +88,126 @@ def remove_files():
                 print(f"The path {path} does not exist.")
 
 
+def destination_return(path_name, theme_mode):
+    """
+    Copied/modified gnome-shell theme location
+    :param path_name: color name
+    :param theme_mode: theme name (light or dark)
+    :return: copied files' folder location
+    """
+
+    return f"~/.themes/Marble-{path_name}-{theme_mode}/gnome-shell"
+
+
+def copy_files(source, destination):
+    """
+    Copy files from the source to another directory
+    :param source: where files will be copied
+    :param destination: where files will be pasted
+    """
+
+    destination_dirs = destination.split("/")
+    loop_create_dirs = f"{destination_dirs[0]}/"
+
+    # create necessary folders
+    for i in range(1, len(destination_dirs)):
+        loop_create_dirs += f"{destination_dirs[i]}/"
+        os.system(f"mkdir -p {loop_create_dirs}")
+
+    os.system(f"cp -aT {source} {destination}")
+
+
+def apply_colors(hue, destination, theme_mode, apply_file, sat=None):
+    """
+    Install accent colors from colors.json to different file
+    :param hue
+    :param destination: file directory
+    :param theme_mode: theme name (light or dark)
+    :param apply_file: file name
+    :param sat: color saturation (optional)
+    """
+
+    with open(os.path.expanduser(f"{destination}/{apply_file}"), "r") as file:
+        edit_file = file.read()
+
+        # colorsys works in range(0, 1)
+        h = hue / 360
+        for element in colors["elements"]:
+            # convert to range(0, 1)
+            lightness = int(colors["elements"][element][theme_mode]["l"]) / 100
+            saturation = int(colors["elements"][element][theme_mode]["s"]) / 100 if sat is None else int(
+                colors["elements"][element][theme_mode]["s"]) * (sat / 100) / 100
+            alpha = colors["elements"][element][theme_mode]["a"]
+
+            # convert hsl to rgb and multiple every item
+            red, green, blue = [int(item * 256) for item in colorsys.hls_to_rgb(h, lightness, saturation)]
+
+            replace_keyword = colors["elements"][element]["replace"]
+
+            edit_file = edit_file.replace(replace_keyword, f"rgba({red}, {green}, {blue}, {alpha})")
+
+    with open(os.path.expanduser(f"{destination}/{apply_file}"), "w") as file:
+        file.write(edit_file)
+
+
+def apply_theme(hue, destination, theme_mode, sat=None):
+    """
+    Apply theme to all files listed in "apply-theme-files" (colors.json)
+    :param hue
+    :param destination: file directory
+    :param theme_mode: theme name (light or dark)
+    :param sat: color saturation (optional)
+    """
+
+    for apply_file in os.listdir("./gnome-shell/"):
+        apply_colors(hue, destination, theme_mode, apply_file, sat=sat)
+
+
+def install_color(hue, name, theme_mode, sat=None):
+    """
+    Copy files and generate theme with different accent color
+    :param hue
+    :param name: theme name
+    :param theme_mode: light or dark mode
+    :param sat: color saturation (optional)
+    """
+
+    print(f"Creating {name} {', '.join(theme_mode)} theme...", end=" ")
+
+    try:
+        for mode in theme_mode:
+            copy_files("./gnome-shell", destination_return(name, mode))
+
+            apply_theme(hue, destination_return(name, mode), mode, sat=sat)
+
+    except Exception as err:
+        print("\nError: " + str(err))
+
+    else:
+        print("Done.")
+
+
+def hex_to_rgba(hex_color):
+    """
+    Convert hex(a) to rgba
+    :param hex_color: input value
+    """
+
+    try:
+        if len(hex_color) in range(6, 10):
+            hex_color = hex_color.lstrip('#') + "ff"
+            # is convertable
+            int(hex_color[:], 16)
+        else:
+            raise ValueError
+        
+    except ValueError:
+        raise ValueError(f'Error: Invalid HEX color code: {hex_color}')
+
+    else:
+        return int(hex_color[0:2], 16), int(hex_color[2:4], 16), int(hex_color[4:6], 16), int(hex_color[6:8], 16) / 255
+
+
 def main():
     parser = argparse.ArgumentParser(prog="python install.py",
                                      formatter_class=argparse.RawDescriptionHelpFormatter,
@@ -207,10 +248,32 @@ def main():
     color_tweaks.add_argument('--sat', type=int, choices=range(0, 251),
                               help='custom color saturation (<100%% - reduce, >100%% - increase)', metavar='(0 - 250)%')
 
+    # Add arguments for panel tweaks
+    panel_args = parser.add_argument_group('Panel tweaks')
+    panel_args.add_argument('-Pds', '--panel_default_size', action='store_true', help='set default panel size')
+    panel_args.add_argument('-Pnp', '--panel_no_pill', action='store_true', help='remove panel button background')
+    panel_args.add_argument('-Ptc', '--panel_text_color', type=str, nargs='?', help='custom panel HEX(A) text color')
+    
     args = parser.parse_args()
 
     mode = [args.mode] if args.mode else ['light', 'dark']
 
+    generate_file("./css/", gnome_shell_css)
+
+    if args.panel_default_size:
+        concatenate_files("./tweaks/panel/def-size.css", gnome_shell_css)
+
+    if args.panel_no_pill:
+        concatenate_files("./tweaks/panel/no-pill.css", gnome_shell_css)
+
+    if args.panel_text_color:
+        open('./gnome-shell/gnome-shell.css', 'a') \
+            .write(".panel-button,\
+                    .clock,\
+                    .clock-display StIcon {\
+                        color: rgba(" + ', '.join(map(str, hex_to_rgba(args.panel_text_color))) + ");\
+                    }")
+
     # Process the arguments and perform the installation accordingly
     if args.remove:
         remove_files()
@@ -242,6 +305,9 @@ def main():
 
 
 if __name__ == "__main__":
-    colors = json.load(open("colors.json"))  # used as database for replacing colors, files which must be generated
+    gnome_shell_css = "./gnome-shell/gnome-shell.css"
+    colors = json.load(open("colors.json"))  # used as database for replacing colors
 
     main()
+
+    os.remove("./gnome-shell/gnome-shell.css")

tweaks/panel/def-size.css

@@ -0,0 +1,11 @@
+/* default panel size */
+#panel{
+  height: 2.2em;
+  font-size: 15px;
+}
+.panel-button,
+.clock,
+.clock-display StIcon {
+  border-radius: 99px;
+  border: 3px solid transparent;
+}

tweaks/panel/no-pill.css

@@ -0,0 +1,14 @@
+.panel-button,
+.clock,
+.clock-display StIcon {
+	background-color: transparent;
+	box-shadow: none;
+}
+.panel-button:hover,
+.panel-button:hover .clock,
+.panel-button:active,
+.panel-button:overview, /* activites */
+.panel-button:active .clock {
+	background-color: ACCENT-DISABLED_HOVER;
+    box-shadow: inset 0 0 0 1px BORDER-SHADOW;
+}