Prelim: CMake build for Luna (blue)

themes/luna/blue/CMakeLists.txt

@@ -0,0 +1,66 @@
+cmake_minimum_required(VERSION 3.0)
+
+project(
+    wintc-theme-native
+    VERSION 1.0
+    DESCRIPTION "Windows Total Conversion Windows XP style (Blue) theme."
+)
+
+set(PROJECT_ROOT ${CMAKE_CURRENT_LIST_DIR})
+
+include(../../../packaging/cmake-inc/common/CMakeLists.txt)
+include(../../../packaging/cmake-inc/themes/CMakeLists.txt)
+
+# Import colour scheme and theme metadata
+#
+wintc_source_vars(scheme)
+wintc_source_vars(theme)
+
+# Import dir constants
+#
+wintc_define_theme_dirs()
+
+# GTK2 Theme Generation
+#
+configure_file(${THEMES_BUILD_COMMON_GTK2_DIR}/scheme.rc.in scheme.rc @ONLY)
+
+install(FILES ${THEMES_BUILD_GTK2_FILES}    DESTINATION ${THEME_PROJECT_INSTALL_PATH}/gtk-2.0)
+install(FILES ${CMAKE_BINARY_DIR}/scheme.rc DESTINATION ${THEME_PROJECT_INSTALL_PATH}/gtk-2.0)
+
+# GTK3 Theme Generation
+#
+find_program(SASS scss)
+
+configure_file(${THEMES_BUILD_COMMON_GTK3_DIR}/scheme.scss.in scheme.scss @ONLY)
+configure_file(gtk-3.0/main.scss.in                           main.scss   @ONLY)
+
+add_custom_command(
+    OUTPUT ${CMAKE_BINARY_DIR}/gtk.css
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+    COMMAND ${SASS}
+    ARGS
+        ${CMAKE_BINARY_DIR}/main.scss
+        ${CMAKE_BINARY_DIR}/gtk.css
+        --sourcemap=none
+    VERBATIM
+    MAIN_DEPENDENCY ${CMAKE_BINARY_DIR}/main.scss
+    DEPENDS
+        ${CMAKE_BINARY_DIR}/scheme.scss
+)
+
+add_custom_target(
+    theme-gtk3 ALL
+    DEPENDS
+        ${CMAKE_BINARY_DIR}/gtk.css
+)
+
+install(FILES ${CMAKE_BINARY_DIR}/gtk.css DESTINATION ${THEME_PROJECT_INSTALL_PATH}/gtk-3.0)
+
+# XFWM4 Theme Generation
+#
+install(DIRECTORY xfwm4 DESTINATION ${THEME_PROJECT_INSTALL_PATH})
+
+# Resources Generation
+#
+install(DIRECTORY Resources                    DESTINATION ${THEME_PROJECT_INSTALL_PATH})
+install(DIRECTORY ${CMAKE_BINARY_DIR}/composed DESTINATION ${THEME_PROJECT_INSTALL_PATH}/Resources)

themes/luna/blue/gtk-2.0/apps.rc

@@ -1,99 +0,0 @@
-# vim:set ft=gtkrc ts=2 sw=2 sts=2 ai et:
-#
-# This file, unlike hacks.rc, contains legitimate cases we need to handle, e.g.
-# custom widgets, programs giving us a chance to alter their UI to fit more with
-# the theme or stuff that is supposed to look different, like panels.
-
-# TODO: This could really look nicer
-style "gimp_spin_scale" {
-
-  # Spin background
-  bg[NORMAL] = @base_color
-
-  engine "pixmap" {
-
-    image {
-      function        = BOX
-      state           = NORMAL
-      detail          = "spinbutton_up"
-      overlay_file    = "assets/spin-up.png"
-      overlay_stretch = FALSE
-    }
-
-    image {
-      function        = BOX
-      state           = PRELIGHT
-      detail          = "spinbutton_up"
-      overlay_file    = "assets/spin-up.png"
-      overlay_stretch = FALSE
-    }
-
-    image {
-      function        = BOX
-      state           = ACTIVE
-      detail          = "spinbutton_up"
-      overlay_file    = "assets/spin-up.png"
-      overlay_stretch = FALSE
-    }
-
-    image {
-      function        = BOX
-      state           = INSENSITIVE
-      detail          = "spinbutton_up"
-      overlay_file    = "assets/spin-up-insensitive.png"
-      overlay_stretch = FALSE
-    }
-
-    image {
-      function        = BOX
-      state           = NORMAL
-      detail          = "spinbutton_down"
-      overlay_file    = "assets/spin-down.png"
-      overlay_stretch = FALSE
-    }
-
-    image {
-      function        = BOX
-      state           = PRELIGHT
-      detail          = "spinbutton_down"
-      overlay_file    = "assets/spin-down.png"
-      overlay_stretch = FALSE
-    }
-
-    image {
-      function        = BOX
-      state           = ACTIVE
-      detail          = "spinbutton_down"
-      overlay_file    = "assets/spin-down.png"
-      overlay_stretch = FALSE
-    }
-
-    image {
-      function        = BOX
-      state           = INSENSITIVE
-      detail          = "spinbutton_down"
-      overlay_file    = "assets/spin-down-insensitive.png"
-      overlay_stretch = FALSE
-    }
-
- }
-
-}
-
-style "chrome_gtk_frame" {
-
-  ChromeGtkFrame::frame-color          = @window_color
-  ChromeGtkFrame::frame-gradient-color = @window_color
-  ChromeGtkFrame::inactive-frame-color = @bg_color
-
-  ChromeGtkFrame::incognito-frame-color          = "#cbd2d9"
-  ChromeGtkFrame::incognito-frame-gradient-color = "#cbd2d9"
-  ChromeGtkFrame::incognito-inactive-frame-color = mix (0.5, @bg_color, "#cbd2d9")
-
-}
-
-# Disable spin button assets for GimpSpinScale
-class "GimpSpinScale" style "gimp_spin_scale"
-
-# Chromium lets us define some colours and settings for better integration
-class "ChromeGtkFrame" style "chrome_gtk_frame"

themes/luna/blue/gtk-2.0/gtkrc

@@ -1,40 +0,0 @@
-# Based on Bridge by ScionicSpectre
-# vim:set ts=2 sw=2 sts=2 ai et:
-#
-# This is the GTK+ 2 version of Adwaita. It's whole purpose is to look as the
-# GTK+ 3 version as much as possible until GTK+ 2 dies completely.
-#
-# Note: comments for explaining styles are on the bottom of each file beside the
-# widget matches.
-
-# Declare the colours used throughout the theme.
-# There shouldn't be any fiddling with them in the theme files themselves in
-# order to not mess up the dark theme.
-
-# Text/base
-gtk-color-scheme = "text_color:#000000\nbase_color:#FFFFFF"
-# Foreground/background
-gtk-color-scheme = "fg_color:#000000\nbg_color:#ECE9D8"
-# Selected foreground/background
-gtk-color-scheme = "selected_fg_color:#ffffff\nselected_bg_color:#316AC5"
-# Insensitive foreground/background
-gtk-color-scheme = "insensitive_fg_color:#ACA899\ninsensitive_bg_color:#ECE9D8"
-# Menus
-gtk-color-scheme = "menu_color:#FFFFFF"
-# Links
-gtk-color-scheme = "link_color:#0000ee\nvisited_link_color:#551a8b"
-# Treeview headers
-gtk-color-scheme = "column_header_color:#EBEADB\nhover_column_header_color:#FFFFFF"
-# Window decoration
-gtk-color-scheme = "window_color:#ECE9D8"
-# Tooltips
-gtk-color-scheme = "tooltip_fg_color:#000000\ntooltip_bg_color:#FFFFE1"
-
-# Set GTK settings
-gtk-auto-mnemonics              = 1
-gtk-primary-button-warps-slider = 1
-
-# And hand over the control to the theme files
-include "main.rc"
-include "apps.rc"
-include "hacks.rc"

themes/luna/blue/gtk-2.0/hacks.rc

@@ -1,36 +0,0 @@
-# vim:set ft=gtkrc ts=2 sw=2 sts=2 ai et:
-#
-# This file contains horrible hacks to make this theme work with some programs
-# This is mostly due to the limitations of gtk2 but sometimes its the fault of
-# the programs themselves. Not going to point fingers.
-#
-# Either way, it's a WONTFIX for both, hence this horrible file.
-
-style "toplevel_hack" {
-  engine "adwaita" {}
-}
-
-style "chrome_entry" {
-  base[NORMAL]      = @base_color
-  base[INSENSITIVE] = @base_color
-}
-
-style "vim_notebook" {
-  bg[NORMAL] = @base_color
-  bg[ACTIVE] = @insensitive_bg_color
-}
-
-# Vim puts an eventbox between the tab and the label and colours it,
-# we need to handle that
-widget "vim-main-window*GtkNotebook.GtkEventBox" style "vim_notebook"
-
-# (he)xchat input box
-class "SexySpellEntry" style:highest "normal_entry"
-
-# Chromium uses base as the fill colour of its own entries
-# This would be fine but Gtk+ uses it to fill the surrounding space, so its set to bg
-# That results in Chromium using it for the fill, so we need to handle that
-widget_class "*Chrom*<GtkEntry>" style "chrome_entry"
-
-# Hack to be able to match widgets in LibreOffice
-class "GtkWindow" style "toplevel_hack"

themes/luna/blue/gtk-3.0/main.scss

@@ -1,14 +0,0 @@
-/**
- * main.scss - Luna (Blue) Style GTK 3 Theme Root Document
- *
- * This source-code is part of the Windows XP stuff for XFCE:
- * <<https://www.oddmatics.uk>>
- *
- * Author(s): Rory Fewell <roryf@oddmatics.uk>
- */
-
-@import "scheme";
-@import "../../../gtk-3.0-base/required";
-@import "colors/all";
-@import "styling/all";
-@import "../../../gtk-3.0-base/main";

themes/luna/blue/gtk-3.0/main.scss.in

@@ -0,0 +1,14 @@
+/**
+ * main.scss.in - Luna (Blue) Style GTK 3 Theme Root Document
+ *
+ * This source-code is part of the Windows XP stuff for XFCE:
+ * <<https://www.oddmatics.uk>>
+ *
+ * Author(s): Rory Fewell <roryf@oddmatics.uk>
+ */
+
+@import "scheme";
+@import "@THEMES_BUILD_COMMON_GTK3_DIR@/required";
+@import "@PROJECT_ROOT@/gtk-3.0/colors/all";
+@import "@PROJECT_ROOT@/gtk-3.0/styling/all";
+@import "@THEMES_BUILD_COMMON_GTK3_DIR@/main";

themes/luna/blue/gtk-3.0/scheme.scss

@@ -1,90 +0,0 @@
-/**
- * scheme.scss - Luna (Blue) Style Appearance Scheme Constants
- *
- * This source-code is part of Windows XP stuff for XFCE:
- * <<https://www.oddmatics.uk>>
- *
- * Author(s): Rory Fewell <roryf@oddmatics.uk>
- */
-
-$threed_objects_bg: #ECE9D8;
-$threed_objects_fg: #000000;
-
-$active_title_bar_bg1: #0053E3;
-$active_title_bar_bg2: #3D94FF;
-$active_title_bar_fg: #FFFFFF;
-$active_title_bar_font_family: "Trebuchet MS";
-$active_title_bar_font_size: 10pt;
-$active_title_bar_font_style: normal;
-$active_title_bar_font_weight: bold;
-$active_title_bar_size: 25;
-
-$active_window_border_bg: #D4D0C8;
-$active_window_border_size: 1;
-
-$application_background_bg: #808080;
-
-$caption_buttons_size: 25;
-
-$desktop_bg: #004F98;
-
-$icon_font_family: "Tahoma";
-$icon_font_size: 8pt;
-$icon_font_style: normal;
-$icon_font_weight: normal;
-$icon_size: 32;
-
-$icon_spacing_horz: 43;
-$icon_spacing_vert: 43;
-
-$inactive_title_bar_bg1: #7A97DF;
-$inactive_title_bar_bg2: #9DBAEB;
-$inactive_title_bar_fg: #D8E4F8;
-$inactive_title_bar_font_family: "Trebuchet MS";
-$inactive_title_bar_font_size: 10pt;
-$inactive_title_bar_font_style: normal;
-$inactive_title_bar_font_weight: bold;
-$inactive_title_bar_size: 25;
-
-$inactive_window_border_bg: #D4D0C8;
-$inactive_window_border_size: 1;
-
-$menu_bg: #FFFFFF;
-$menu_fg: #000000;
-$menu_font_family: "Tahoma";
-$menu_font_size: 8pt;
-$menu_font_style: normal;
-$menu_font_weight: normal;
-$menu_size: 19;
-
-$message_box_fg: #000000;
-$message_box_font_family: "Tahoma";
-$message_box_font_size: 8pt;
-$message_box_font_style: normal;
-$message_box_font_weight: normal;
-
-$palette_title_font_family: "Tahoma";
-$palette_title_font_size: 8pt;
-$palette_title_font_style: normal;
-$palette_title_font_weight: bold;
-$palette_title_size: 15;
-
-$scrollbar_size: 17;
-
-$selected_items_bg: #316AC5;
-$selected_items_fg: #FFFFFF;
-$selected_items_font_family: "Tahoma";
-$selected_items_font_size: 8pt;
-$selected_items_font_style: normal;
-$selected_items_font_weight: normal;
-$selected_items_size: 19;
-
-$tooltip_bg: #FFFFE1;
-$tooltip_fg: #000000;
-$tooltip_font_family: "Tahoma";
-$tooltip_font_size: 8pt;
-$tooltip_font_style: normal;
-$tooltip_font_weight: normal;
-
-$window_bg: #FFFFFF;
-$window_fg: #000000;

themes/luna/blue/scheme

@@ -0,0 +1,81 @@
+THREED_OBJECTS_BG=#ECE9D8
+THREED_OBJECTS_FG=#000000
+
+ACTIVE_TITLE_BAR_BG1=#0053E3
+ACTIVE_TITLE_BAR_BG2=#3D94FF
+ACTIVE_TITLE_BAR_FG=#FFFFFF
+ACTIVE_TITLE_BAR_FONT_FAMILY=Trebuchet MS
+ACTIVE_TITLE_BAR_FONT_SIZE=10pt
+ACTIVE_TITLE_BAR_FONT_STYLE=normal
+ACTIVE_TITLE_BAR_FONT_WEIGHT=bold
+ACTIVE_TITLE_BAR_SIZE=25
+
+ACTIVE_WINDOW_BORDER_BG=#D4D0C8
+ACTIVE_WINDOW_BORDER_SIZE=1
+
+APPLICATION_BACKGROUND_BG=#808080
+
+CAPTION_BUTTONS_SIZE=25
+
+DESKTOP_BG=#004F98
+
+ICON_FONT_FAMILY=Tahoma
+ICON_FONT_SIZE=8pt
+ICON_FONT_STYLE=normal
+ICON_FONT_WEIGHT=normal
+ICON_SIZE=32
+
+ICON_SPACING_HORZ=43
+ICON_SPACING_VERT=43
+
+INACTIVE_TITLE_BAR_BG1=#7A97DF
+INACTIVE_TITLE_BAR_BG2=#9DBAEB
+INACTIVE_TITLE_BAR_FG=#D8E4F8
+INACTIVE_TITLE_BAR_FONT_FAMILY=Trebuchet MS
+INACTIVE_TITLE_BAR_FONT_SIZE=10pt
+INACTIVE_TITLE_BAR_FONT_STYLE=normal
+INACTIVE_TITLE_BAR_FONT_WEIGHT=bold
+INACTIVE_TITLE_BAR_SIZE=25
+
+INACTIVE_WINDOW_BORDER_BG=#D4D0C8
+INACTIVE_WINDOW_BORDER_SIZE=1
+
+MENU_BG=#FFFFFF
+MENU_FG=#000000
+MENU_FONT_FAMILY=Tahoma
+MENU_FONT_SIZE=8pt
+MENU_FONT_STYLE=normal
+MENU_FONT_WEIGHT=normal
+MENU_SIZE=19
+
+MESSAGE_BOX_FG=#000000
+MESSAGE_BOX_FONT_FAMILY=Tahoma
+MESSAGE_BOX_FONT_SIZE=8pt
+MESSAGE_BOX_FONT_STYLE=normal
+MESSAGE_BOX_FONT_WEIGHT=normal
+
+PALETTE_TITLE_FONT_FAMILY=Tahoma
+PALETTE_TITLE_FONT_SIZE=8pt
+PALETTE_TITLE_FONT_STYLE=normal
+PALETTE_TITLE_FONT_WEIGHT=bold
+PALETTE_TITLE_SIZE=15
+
+SCROLLBAR_SIZE=17
+
+SELECTED_ITEMS_BG=#316AC5
+SELECTED_ITEMS_FG=#FFFFFF
+SELECTED_ITEMS_FONT_FAMILY=Tahoma
+SELECTED_ITEMS_FONT_SIZE=8pt
+SELECTED_ITEMS_FONT_STYLE=normal
+SELECTED_ITEMS_FONT_WEIGHT=normal
+SELECTED_ITEMS_SIZE=19
+
+TOOLTIP_BG=#FFFFE1
+TOOLTIP_FG=#000000
+TOOLTIP_FONT_FAMILY=Tahoma
+TOOLTIP_FONT_SIZE=8pt
+TOOLTIP_FONT_STYLE=normal
+TOOLTIP_FONT_WEIGHT=normal
+
+WINDOW_BG=#FFFFFF
+WINDOW_FG=#000000

themes/luna/blue/theme

@@ -0,0 +1,6 @@
+THEME_BASENAME=Windows XP style
+THEME_DESCRIPTION=Windows XP (Blue) visual style for XFCE.
+THEME_DISPLAYNAME=Windows XP style (Blue)
+THEME_MAINTAINER=Rory Fewell <roryf@oddmatics.uk>
+THEME_RAWNAME=luna-blue
+THEME_VARIANT=Blue

themes/luna/blue/themevars.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-SCRIPTDIR=`dirname ${BASH_SOURCE[0]}`
-
-. "${SCRIPTDIR}/../theme.sh"
-
-export THEME_DESCRIPTION="Windows XP (Blue) visual style for XFCE."
-export THEME_MAINTAINER="Rory Fewell <roryf@oddmatics.uk>"
-export THEME_RAWNAME="luna-blue"
-export THEME_VARIANT="Blue"
-
-export THEME_DISPLAYNAME="${THEME_BASENAME} (${THEME_VARIANT})"

themes/luna/theme.sh

@@ -1,2 +0,0 @@
-#!/bin/bash
-export THEME_BASENAME="Windows XP style"