12 files changed, 126 insertions, 47 deletions
diff --git a/README.md b/README.md
index c6b4ba13..4c67b72b 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-lumina
+Lumina
 ======
 
 This is the official source tree for the Lumina Desktop Environment.
@@ -15,7 +15,7 @@ Latest Stable Versions
 ----
 Qt4 - 0.7.2 (Beta): Use the qt4/0.7.2 branch of the source tree to fetch this version.
 
-Qt5 - 0.8.7 (Beta): Use the qt5/0.8.7 branch of the source tree to fetch this version.
+Qt5 - 0.8.8 (Beta): Use the qt5/0.8.8 branch of the source tree to fetch this version.
 
 The master branch is where all development is performed and tested before the next release version is branched off.
 
@@ -36,23 +36,28 @@ Bug Tracker: https://bugs.pcbsd.org/projects/pcbsd
 How to build from source
 ----
 1) Checkout the source repo to your local box (GitHub gives a few methods for this)
+* To update an exising checkout of the Lumina repo, run "git pull" while within the source directory. 
 
 2) In a terminal, change to the lumina repo directory (base dir, not one of the sub-projects)
 
 3) Run "qmake" on your local system to turn all the Qt project files (*.pro) into Makefiles
- - NOTE: If any of the Qt project files is modified (either by you or from updating the Lumina source tree), you will need to be sure to repeat this step to place those changes into your local Makefiles (otherwise you may experience strange build failures).
- - NOTE 2: The Qt5 version of qmake is located in /usr/local/lib/qt5/bin/qmake on FreeBSD, other OS's may have slightly different locations or names for qmake (such as qmake-qt5 for example)
- - NOTE 3: You can set a customized install PREFIX, LIBPREFIX, and QT5LIBDIR variables via the qmake command. PREFIX determines the base directory to install Lumina ("/usr/local" by default), LIBPREFIX determines the location to install/use libraries ("PREFIX/lib" by default), and QT5LIBDIR determines the location of the Qt5 libraries ("LIBPREFIX/qt5" by default). The syntax to set these custom values when running qmake is usually: "qmake PREFIX=/some/prefix LIBPREFIX=/some/lib/prefix QT5LIBDIR=/main/qt5/library/dir"
+ * NOTE 1: The Qt5 version of qmake is located in /usr/local/lib/qt5/bin/qmake on FreeBSD, other OS's may have slightly different locations or names for qmake (such as qmake-qt5 for example)
+ * NOTE 2: Check the terminal output of the qmake command to ensure that your OS build settings were loaded properly. Here is an example:
 
- - (Linux Note) If there is a customized OS template for your particular distro (not the general "Linux" template), you will need to change into the libLumina subdirectory and run the "make-linux-distro.sh" script to modify the project file for the Lumina library after running "qmake" in step 3. Be sure to change back to the base Lumina directory before moving on to step 4.
-Example usage: "cd libLumina && ./make-linux-distro.sh MYDISTRO && cd .." (where there is a LuminaOS-MYDISTRO.cpp template available).
+> Project MESSAGE: Build OS Info: FreeBSD, amd64, FreeBSD 10.2-RELEASE-p11 #0: Thu Jan 14 15:48:17 UTC 2016 root@amd64-builder.pcbsd.org:/usr/obj/usr/src/sys/GENERIC
+
+> Project MESSAGE: Build Settings Loaded: FreeBSD
+
+ * Build Note: Compile-time options may be set at this time using qmake. The syntax for this is typically: `qmake CONFIG+="PREFIX=/some/prefix LIBPREFIX=/some/lib/prefix DESTDIR=/some/temporary/packaging/dir"`. This is typically not needed unless you are setting up Lumina for automated build/packaging. If the automatically-detected build settings for your particular OS are invalid or need adjustment, please update the "OS-detect.pri" file as needed and send in your changes.
+  * PREFIX: Determines the base directory used to install/run Lumina ("/usr/local" by default)
+  * LIBPREFIX: Determines the location to install the Lumina library ("PREFIX/lib" by default)
+  * DESTDIR: An optional directory where the compiled files will be placed temporary (such as for packaging/distributing via some other system).
+  * NO_I18N: (Recommended) Do not generate/install the translation files. If you wish to install translation files, please use the pcbsd/lumina-i18n repo for the full set (this repo only contains partial translations/templates).
 
-- (Another Linux note) On Fedora (and related Red Hat and CentOS distributions) the
-system libraries are stored in a different directory than most other distributions use. For this reason, the "qmake" command must include the LIBPREFIX flag. On a 64-bit machine, the "qmake" command that should be used is "qmake LIBPREFIX=/lib64". The QTLIBDIR may need to be set too if lrelease is not in your usual path.
 
 4) Run "make" to compile all the Lumina projects (can be done as user)
 
 5) Run "make install" to install the Lumina desktop on your local system (requires admin/root privileges usually)
 
-6-optional) Run "make clean" to clean up all the temporary build files in the Lumina source tree.
+6-optional) Run "make distclean" to clean up all the build files in the Lumina source tree. (go back to step 3 later)
 
diff --git a/icon-theme/README.md b/icon-theme/README.md
index 62e6e2e6..b9ff09cf 100644
--- a/icon-theme/README.md
+++ b/icon-theme/README.md
@@ -1,23 +1,41 @@
 
-Lumina Desktop default icon theme
+# Lumina Desktop Environment Icon Theme #
 
-Requirements
-1) White foreground (primarily), with black shadow/outline. 
+## Requirements ##
+
+1. White foreground (primarily), with black shadow/outline. 
 	The shadow/outline ensures that the icon will still be completely visible on a pure white background (allowing it to be used on any background color/type).
-2) Colors may be used (and are recommended) for additional icon overlays/additions as needed.
+2. Color may be used (and is recommended) to distinguish between similar-looking icons.
 	Example: the "folder.svg" icon is plain white/black, while the "folder-video.svg" icon will use the same base folder image, but might overlay a small colorized emblem somewhere on it.
-3) All icons need be to be svg formatted, with a base/default size of 128x128 and usable by the stock/generic SVG library .
+3. All icons need be to be svg formatted, with a base/default size of 128x128 and usable by the stock/generic SVG library .
 	Note: Adobe applications tend to use a customized version of the svg library, so make sure to verify the icon with some other SVG application such as inkscape.
-4) All icons will be licensed under the Creative Commons Attribution 4.0 International Public License.
+4. All icons will be licensed under the Creative Commons Attribution 4.0 International Public License.
 	https://creativecommons.org/licenses/by/4.0/legalcode
 	Basically, the icons can be used any anyone, anywhere, in anything, as long as the original author still gets attributed for his work. This license is comparable to the BSD license for source code.
 
+## Examples ##
+
+Sample icons to give the general idea (to be updated later as the first icons are submitted):
+
+* (shadowing) http://findicons.com/icon/80883/white18?id=81865
+* (General icon style) http://www.gentleface.com/free_icon_set.html
+
+This theme is intended to be high-contrast and function on high-resolution systems (4K+) with a more professional/streamlined appearance. The white foreground with black outline/shadowing will also permit the visibility of these icons on any background the user may utilize.
+
+## Contributing ##
+
+1. Icons which are still needed are listed in the TODO.txt files within each directory.
+2. Submit the icon file via git pull request
+3. Add an entry for your icon/submission to the AUTHORS file (to ensure each contributor gets proper credit for their work)
+4. Remove the icon from the appropriate TODO.txt file/list
+
+## Totals ##
 
-Sample icons to show kind of what I was thinking of:
-(shadowing) http://findicons.com/icon/80883/white18?id=81865
-(General icon style) http://www.gentleface.com/free_icon_set.html
+* ~1249 icons total
+* ~300 are mimetype icons (low priority initially)
+* Many icons are slight variations of each other (arrows pointing different directions, alternate colors/emblems, etc..), so should be quite simple to submit icons in small groups (all single arrows, all double arrows, etc..)
+ 
 
-Total count:
-~1249 icons total
-~300 are mimetype icons (extremely low priority)
-Many icons are slight variations of each other (arrows pointing different directions, alternate colors/emblems, etc..)
-\ No newline at end of file
+### Relevant Links to the FreeDesktop Specifications ###
+* Icon Theme Specification: https://specifications.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html
+* Icon Naming Specification: https://specifications.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html
diff --git a/icon-theme/index.theme b/icon-theme/index.theme
index 70a53f95..e96fed2d 100644
--- a/icon-theme/index.theme
+++ b/icon-theme/index.theme
@@ -1,31 +1,72 @@
 [Icon Theme]
 Name=Lumina
+Comment=Lumina Desktop Icon Theme: CC-BY 4.0 International Public License
+Inherits=hicolor
 
-Comment=Creative Commons Attribution 4.0 International Public License
+Example=folder
 
-DisplayDepth=32
+Directories=scalable/actions, scalable/apps, scalable/categories, scalable/devices, scalable/emblems, scalable/mimetypes, scalable/places, scalable/special, scalable/status
 
-Inherits=hicolor
 
-Example=folder
+[scalable/actions]
+Size=128
+Type=Scalable
+MinSize=1
+MaxSize=256
+Context=Actions
 
-LinkOverlay=link
-LockOverlay=lockoverlay
-ShareOverlay=share
-ZipOverlay=zip
-
-DesktopDefault=scalable
-DesktopSizes=scalable
-ToolbarDefault=scalable
-ToolbarSizes=scalable
-MainToolbarDefault=scalable
-MainToolbarSizes=scalable
-SmallDefault=scalable
-SmallSizes=scalable
-PanelDefault=scalable
-PanelSizes=scalable
-DialogDefault=scalable
-DialogSizes=scalable
+[scalable/apps]
+Size=128
+Type=Scalable
+MinSize=1
+MaxSize=256
+Context=Applications
 
-Directories=scalable/actions, scalable/apps, scalable/categories, scalable/devices, scalable/emblems, scalable/mimetypes, scalable/places, scalable/special, scalable/status
+[scalable/categories]
+Size=128
+Type=Scalable
+MinSize=1
+MaxSize=256
+Context=Categories
+
+[scalable/devices]
+Size=128
+Type=Scalable
+MinSize=1
+MaxSize=256
+Context=Devices
+
+[scalable/emblems]
+Size=128
+Type=Scalable
+MinSize=1
+MaxSize=256
+Context=Emblems
+
+[scalable/mimetypes]
+Size=128
+Type=Scalable
+MinSize=1
+MaxSize=256
+Context=MimeTypes
+
+[scalable/places]
+Size=128
+Type=Scalable
+MinSize=1
+MaxSize=256
+Context=Places
+
+[scalable/special]
+Size=128
+Type=Scalable
+MinSize=1
+MaxSize=256
+Context=Actions
 
+[scalable/status]
+Size=128
+Type=Scalable
+MinSize=1
+MaxSize=256
+Context=Status
+\ No newline at end of file
diff --git a/libLumina/LuminaOS-Debian.cpp b/libLumina/LuminaOS-Debian.cpp
index 76b6822e..1f84d44b 100644
--- a/libLumina/LuminaOS-Debian.cpp
+++ b/libLumina/LuminaOS-Debian.cpp
@@ -16,6 +16,8 @@ static int screenbrightness = -1;
 QString LOS::OSName(){ return "Debian GNU/Linux"; }
 
 //OS-specific prefix(s)
+// NOTE: PREFIX, L_ETCDIR, L_SHAREDIR are defined in the OS-detect.pri project file and passed in
+QString LOS::LuminaShare(){ return (L_SHAREDIR+"/Lumina-DE/"); } //Install dir for Lumina share files
 QString LOS::AppPrefix(){ return "/usr/"; } //Prefix for applications
 QString LOS::SysPrefix(){ return "/"; } //Prefix for system
 
diff --git a/libLumina/LuminaOS-DragonFly.cpp b/libLumina/LuminaOS-DragonFly.cpp
index fb2c2241..b98a36ee 100644
--- a/libLumina/LuminaOS-DragonFly.cpp
+++ b/libLumina/LuminaOS-DragonFly.cpp
@@ -66,6 +66,8 @@ static bool get_sysctlbyname_uint(const char *name, unsigned int *res) {
 QString LOS::OSName(){ return "DragonFly BSD"; }
 
 //OS-specific prefix(s)
+// NOTE: PREFIX, L_ETCDIR, L_SHAREDIR are defined in the OS-detect.pri project file and passed in
+QString LOS::LuminaShare(){ return (L_SHAREDIR+"/Lumina-DE/"); } //Install dir for Lumina share files
 QString LOS::AppPrefix(){ return "/usr/local/"; } //Prefix for applications
 QString LOS::SysPrefix(){ return "/usr/"; } //Prefix for system
 
diff --git a/libLumina/LuminaOS-FreeBSD.cpp b/libLumina/LuminaOS-FreeBSD.cpp
index 530ee5f0..72abf0eb 100644
--- a/libLumina/LuminaOS-FreeBSD.cpp
+++ b/libLumina/LuminaOS-FreeBSD.cpp
@@ -18,6 +18,8 @@ static int audiovolume = -1;
 QString LOS::OSName(){ return "FreeBSD"; }
 
 //OS-specific prefix(s)
+// NOTE: PREFIX, L_ETCDIR, L_SHAREDIR are defined in the OS-detect.pri project file and passed in
+QString LOS::LuminaShare(){ return (L_SHAREDIR+"/Lumina-DE/"); } //Install dir for Lumina share files
 QString LOS::AppPrefix(){ return "/usr/local/"; } //Prefix for applications
 QString LOS::SysPrefix(){ return "/usr/"; } //Prefix for system
 
diff --git a/libLumina/LuminaOS-Linux.cpp b/libLumina/LuminaOS-Linux.cpp
index 43bcb242..eb9ed48f 100644
--- a/libLumina/LuminaOS-Linux.cpp
+++ b/libLumina/LuminaOS-Linux.cpp
@@ -16,6 +16,8 @@ static int screenbrightness = -1;
 QString LOS::OSName(){ return "Linux"; }
 
 //OS-specific prefix(s)
+// NOTE: PREFIX, L_ETCDIR, L_SHAREDIR are defined in the OS-detect.pri project file and passed in
+QString LOS::LuminaShare(){ return (L_SHAREDIR+"/Lumina-DE/"); } //Install dir for Lumina share files
 QString LOS::AppPrefix(){ return "/usr/"; } //Prefix for applications
 QString LOS::SysPrefix(){ return "/usr/"; } //Prefix for system
 
diff --git a/libLumina/LuminaOS-NetBSD.cpp b/libLumina/LuminaOS-NetBSD.cpp
index c3b4b3a2..866ccc5c 100644
--- a/libLumina/LuminaOS-NetBSD.cpp
+++ b/libLumina/LuminaOS-NetBSD.cpp
@@ -12,6 +12,8 @@
 QString LOS::OSName(){ return "NetBSD"; }
 
 //OS-specific prefix(s)
+// NOTE: PREFIX, L_ETCDIR, L_SHAREDIR are defined in the OS-detect.pri project file and passed in
+QString LOS::LuminaShare(){ return (L_SHAREDIR+"/Lumina-DE/"); } //Install dir for Lumina share files
 QString LOS::AppPrefix(){ return "/usr/local/"; } //Prefix for applications
 QString LOS::SysPrefix(){ return "/usr/"; } //Prefix for system
 
diff --git a/libLumina/LuminaOS-OpenBSD.cpp b/libLumina/LuminaOS-OpenBSD.cpp
index fa715480..c0fdafd4 100644
--- a/libLumina/LuminaOS-OpenBSD.cpp
+++ b/libLumina/LuminaOS-OpenBSD.cpp
@@ -15,6 +15,8 @@ static int screenbrightness = -1;
 QString LOS::OSName(){ return "OpenBSD"; }
 
 //OS-specific prefix(s)
+// NOTE: PREFIX, L_ETCDIR, L_SHAREDIR are defined in the OS-detect.pri project file and passed in
+QString LOS::LuminaShare(){ return (L_SHAREDIR+"/Lumina-DE/"); } //Install dir for Lumina share files
 QString LOS::AppPrefix(){ return "/usr/local/"; } //Prefix for applications
 QString LOS::SysPrefix(){ return "/usr/"; } //Prefix for system
 
diff --git a/libLumina/LuminaOS-kFreeBSD.cpp b/libLumina/LuminaOS-kFreeBSD.cpp
index da0d6fe7..4fe62686 100644
--- a/libLumina/LuminaOS-kFreeBSD.cpp
+++ b/libLumina/LuminaOS-kFreeBSD.cpp
@@ -20,6 +20,8 @@ static int screenbrightness = -1;
 QString LOS::OSName(){ return "Debian GNU/kFreeBSD"; }
 
 //OS-specific prefix(s)
+// NOTE: PREFIX, L_ETCDIR, L_SHAREDIR are defined in the OS-detect.pri project file and passed in
+QString LOS::LuminaShare(){ return (L_SHAREDIR+"/Lumina-DE/"); } //Install dir for Lumina share files
 QString LOS::AppPrefix(){ return "/usr/"; } //Prefix for applications
 QString LOS::SysPrefix(){ return "/usr/"; } //Prefix for system
 
diff --git a/libLumina/LuminaOS-template.cpp b/libLumina/LuminaOS-template.cpp
index 073b9092..5969bf3a 100644
--- a/libLumina/LuminaOS-template.cpp
+++ b/libLumina/LuminaOS-template.cpp
@@ -12,6 +12,8 @@
 QString LOS::OSName(){ return "Sample"; }
 
 //OS-specific prefix(s)
+// NOTE: PREFIX, L_ETCDIR, L_SHAREDIR are defined in the OS-detect.pri project file and passed in
+QString LOS::LuminaShare(){ return (L_SHAREDIR+"/Lumina-DE/"); } //Install dir for Lumina share files
 QString LOS::AppPrefix(){ return "/usr/local/"; } //Prefix for applications
 QString LOS::SysPrefix(){ return "/usr/"; } //Prefix for system
 
diff --git a/libLumina/LuminaOS.h b/libLumina/LuminaOS.h
index b211d04a..c305277a 100644
--- a/libLumina/LuminaOS.h
+++ b/libLumina/LuminaOS.h
@@ -20,14 +20,13 @@
 
 #include "LuminaUtils.h"
 
-// NOTE: PREFIX, L_ETCDIR, L_SHAREDIR are defined in the OS-detect.pri project file and passed in
 class LOS{
 public:
 	//Return the name of the OS being used
 	static QString OSName(); 
 
 	//OS-specific prefix(s)
-	static QString LuminaShare(){ return (L_SHAREDIR+"/Lumina-DE/"); } //Install dir for Lumina share files
+	static QString LuminaShare(); //Install dir for Lumina share files
 	static QString AppPrefix(); //Prefix for applications (/usr/local/ on FreeBSD)
 	static QString SysPrefix(); //Prefix for system (/usr/ on FreeBSD)