Update how the PC-BSD overlay files for Lumina are installed. Now there is a special "PCBSD" qmake argument to tell Lumina to install the PC-BSD specific config/wallpaper files instead of the generic files.

14 files changed, 75 insertions, 30 deletions

diff --git a/lumina-desktop/defaults/desktop-background.jpg b/lumina-desktop/defaults/desktop-background.jpg
index 456de652..a092f636 100644
--- a/lumina-desktop/defaults/desktop-background.jpg
+++ b/lumina-desktop/defaults/desktop-background.jpg
diff --git a/lumina-desktop/defaults/desktop-background.pcbsd.jpg b/lumina-desktop/defaults/desktop-background.pcbsd.jpg
new file mode 100644
index 00000000..f7fbe029
--- /dev/null
+++ b/lumina-desktop/defaults/desktop-background.pcbsd.jpg
diff --git a/lumina-desktop/defaults/luminaDesktop.pcbsd.conf b/lumina-desktop/defaults/luminaDesktop.pcbsd.conf
new file mode 100644
index 00000000..3dd95444
--- /dev/null
+++ b/lumina-desktop/defaults/luminaDesktop.pcbsd.conf
@@ -0,0 +1,47 @@
+#PC-BSD configuration file for the Lumina Desktop Environment (0.8.7+)
+
+# See the /usr/local/share/LuminaDE/luminaDesktop.conf file for all the possible values/details
+
+#GENERAL SESSION SETTINGS 
+session_enablenumlock=false #[true/false] Enable numlock on login using "numlockx"
+session_playloginaudio=true #[true/false] Play the audio chimes on log in
+session_playlogoutaudio=true #[true/false] Play the audio chimes on log out
+
+#Note: the last "ifexists" entry has the highest priority for the next few options
+session_default_terminal=/usr/local/share/applications/xterm.desktop
+session_default_filemanager=/usr/local/share/applications/lumina-fm.desktop
+session_default_webbrowser_ifexists=/usr/local/share/applications/chromium-browser.desktop
+session_default_webbrowser_ifexists=/usr/local/share/applications/firefox.desktop
+session_default_email_ifexists=/usr/local/share/applications/thunderbird.desktop
+
+#FAVORITES (Not shown on the desktop by default, but in the menu)
+favorites_add_ifexists=/usr/local/share/applications/firefox.desktop
+favorites_add_ifexists=/usr/local/share/applications/chromium-browser.desktop
+favorites_add_ifexists=/usr/local/share/applications/thunderbird.desktop
+favorites_add_ifexists=/usr/local/share/applications/smplayer.desktop
+favorites_add_ifexists=/usr/local/share/applications/vlc.desktop
+favorites_add_ifexists=/usr/local/share/applications/lumina-fm.desktop
+
+#THEME SETTINGS
+#theme.themefile=<file path> #Absolute path to the theme template file to use (disable for Lumina-Default)
+theme_colorfile=/usr/local/share/Lumina-DE/colors/PCBSD10-Default.qss.colors #Absolute path to the color spec file to use for theming
+theme_iconset=oxygen #Name of the icon theme to use
+theme_font=Noto Sans #Name of the font family to use
+theme_fontsize=11pt #Default size of the fonts to use on the desktop
+
+#DESKTOP SETTINGS (used for the left-most screen in multi-screen setups)
+desktop_visiblepanels=1 #The number of panels visible by default
+#desktop_backgroundfiles=/usr/local/share/wallpapers/pcbsd-default.jpg #list of absolute file paths for image files (disable for Lumina default)
+desktop_backgroundrotateminutes=5 #[positive integer] number of minutes between background rotations (if multiple files)
+desktop_generate_icons=true #[true/false] Auto-generate launchers for ~/Desktop items
+
+#PANEL SETTINGS (preface with panel1.<setting> or panel2.<setting>, depending on the number of panels you have visible by default)
+panel1_location=bottom #[top/bottom/left/right] Screen edge the panel should be on
+panel1_pixelsize=4%H #number of pixels wide/high the panel should be (or <number>%[W/H] for a percentage of the screen width/height)
+panel1_autohide=false #[true/false] Have the panel become visible on mouse-over
+panel1_plugins=systemstart, taskmanager-nogroups, spacer, systemtray, clock #list of plugins for the panel
+panel1_pinlocation=center #[left/center/right] Note:[left/right] corresponds to [top/bottom] for vertical panels
+panel1_edgepercent=100 #[1->100] percentage of the screen edge to use
+
+#MENU SETTINGS (right-click menu)
+menu_plugins=terminal, filemanager, applications, line, settings #list of menu plugins to show
diff --git a/lumina-desktop/lumina-desktop.pro b/lumina-desktop/lumina-desktop.pro
index b917462a..9f791fbc 100644
--- a/lumina-desktop/lumina-desktop.pro
+++ b/lumina-desktop/lumina-desktop.pro
@@ -82,25 +82,32 @@ icons.files = Lumina-DE.png \
 
 icons.path = $$PREFIX/share/pixmaps
 
-wallpapers.files = wallpapers/Lumina_Wispy_gold_1920x1080.jpg \
-			wallpapers/Lumina_Wispy_green_1920x1080.jpg \
-			wallpapers/Lumina_Wispy_purple_1920x1080.jpg \
-			wallpapers/Lumina_Wispy_red_1920x1080.jpg
-wallpapers.path = $$PREFIX/share/wallpapers/Lumina-DE
-
 fluxconf.files = fluxboxconf/fluxbox-init-rc \
 			fluxboxconf/fluxbox-keys
 fluxconf.path = $$PREFIX/share/Lumina-DE/
 
-defaults.files = defaults/desktop-background.jpg \
-		defaults/defaultapps.conf \
-		defaults/luminaDesktop.conf \
+wallpapers.files = wallpapers/Lumina_Wispy_gold.jpg \
+			wallpapers/Lumina_Wispy_green.jpg \
+			wallpapers/Lumina_Wispy_purple.jpg \
+			wallpapers/Lumina_Wispy_red.jpg
+wallpapers.path = $$PREFIX/share/wallpapers/Lumina-DE
+
+
+defaults.files = defaults/luminaDesktop.conf \
 		audiofiles/Logout.ogg \
 		audiofiles/Login.ogg
 defaults.path = $$PREFIX/share/Lumina-DE/
 
 conf.path = $$PREFIX/etc
-conf.extra = cp defaults/luminaDesktop.conf $(INSTALL_ROOT)$$PREFIX/etc/luminaDesktop.conf.dist
+
+#Now do any PC-BSD defaults (if set)
+PCBSD{
+  conf.extra = cp defaults/luminaDesktop.pcbsd.conf $(INSTALL_ROOT)$$PREFIX/etc/luminaDesktop.conf.dist
+  defaults.extra = cp defaults/desktop-background.pcbsd.jpg $(INSTALL_ROOT)$$PREFIX/share/Lumina-DE/desktop-background.jpg
+}else{
+  conf.extra = cp defaults/luminaDesktop.conf $(INSTALL_ROOT)$$PREFIX/etc/luminaDesktop.conf.dist
+  defaults.extra = cp defaults/desktop-background.jpg $(INSTALL_ROOT)$$PREFIX/share/Lumina-DE/desktop-background.jpg
+}
 
 TRANSLATIONS =  i18n/lumina-desktop_af.ts \
                 i18n/lumina-desktop_ar.ts \
diff --git a/lumina-desktop/panel-plugins/clock/LClock.cpp b/lumina-desktop/panel-plugins/clock/LClock.cpp
index 7af36e5a..4035cd13 100644
--- a/lumina-desktop/panel-plugins/clock/LClock.cpp
+++ b/lumina-desktop/panel-plugins/clock/LClock.cpp
@@ -1,6 +1,6 @@
 //===========================================
 //  Lumina-DE source code
-//  Copyright (c) 2012, Ken Moore
+//  Copyright (c) 2012-2015, Ken Moore
 //  Available under the 3-clause BSD license
 //  See the LICENSE file for full details
 //===========================================
@@ -62,19 +62,15 @@ void LClock::updateTime(bool adjustformat){
   else{ datelabel = CT.toString(datefmt); }
   if(datetimeorder == "dateonly"){
 	  label = datelabel;
-	  //labelWidget->setToolTip(timelabel);
 	  button->setToolTip(timelabel);
   }else if(datetimeorder == "timedate"){
 	  label = timelabel + "\n" + datelabel;
-	  //labelWidget->setToolTip("");
 	  button->setToolTip("");
   }else if(datetimeorder == "datetime"){
 	  label = datelabel + "\n" + timelabel;
-	  //labelWidget->setToolTip("");
 	  button->setToolTip("");
   }else{ 
 	 label = timelabel;
-         //labelWidget->setToolTip(datelabel);
 	button->setToolTip(datelabel);
   }
   if( this->layout()->direction() == QBoxLayout::TopToBottom ){
@@ -82,22 +78,15 @@ void LClock::updateTime(bool adjustformat){
     label.replace(" ","\n");
   }
   if(adjustformat){
-   /* //Check the font/spacing for the display and adjust as necessary
-    int wid = button->width(); //since text always is painted horizontal - no matter the widget orientation
-    //get the number of effective lines (with word wrap)
-    int lines = label.count("\n")+1;
-    int efflines = lines; //effective lines (with wordwrap)
-    for(int i=0; i<lines; i++){
-      if(button->fontMetrics().width(label.section("\n",i,i)) > wid){ efflines++; } //this line will wrap around
-    }
+   //Check the font/spacing for the display and adjust as necessary
+    /*double efflines = label.count("\n")+1; //effective lines (with wordwrap)
     if( (button->fontMetrics().height()*efflines) > button->height() ){
       //Force a pixel metric font size to fit everything
-      int szH = (button->height() - button->fontMetrics().lineSpacing() )/efflines;
+      int szH = qRound( (button->height() - button->fontMetrics().lineSpacing() )/efflines );
       //Need to supply a *width* pixel, not a height metric
-      int szW = (szH*button->fontMetrics().maxWidth())/button->fontMetrics().height();
-      qDebug() << "Change Clock font:" << button->height() << szH << szW << efflines << lines << button->fontMetrics().height() << button->fontMetrics().lineSpacing();
+      int szW = qRound( (szH*button->fontMetrics().maxWidth())/( (double) button->fontMetrics().height()) );
+      qDebug() << "Change Clock font:" << button->height() << szH << szW << efflines << button->fontMetrics().height() << button->fontMetrics().lineSpacing();
       button->setStyleSheet("font-weight: bold; font-size: "+QString::number(szW)+"px;");
-      
     }else{
       button->setStyleSheet("font-weight: bold;");
     }*/
@@ -251,9 +240,11 @@ void LClock::ThemeChange(){
 
 void LClock::OrientationChange(){
   if(this->layout()->direction()==QBoxLayout::LeftToRight){
-    this->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding);
+    this->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
+    button->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
   }else{
-    this->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
+    this->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+    button->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
   }
   updateTime(true); //re-adjust the font/spacings
   this->layout()->update();
diff --git a/lumina-desktop/panel-plugins/clock/LClock.h b/lumina-desktop/panel-plugins/clock/LClock.h
index f6d19d3e..8131375d 100644
--- a/lumina-desktop/panel-plugins/clock/LClock.h
+++ b/lumina-desktop/panel-plugins/clock/LClock.h
@@ -1,6 +1,6 @@
 //===========================================
 //  Lumina-DE source code
-//  Copyright (c) 2012, Ken Moore
+//  Copyright (c) 2012-2015, Ken Moore
 //  Available under the 3-clause BSD license
 //  See the LICENSE file for full details
 //===========================================
diff --git a/lumina-desktop/wallpapers/Lumina_Wispy_gold.jpg b/lumina-desktop/wallpapers/Lumina_Wispy_gold.jpg
new file mode 100644
index 00000000..cba03cee
--- /dev/null
+++ b/lumina-desktop/wallpapers/Lumina_Wispy_gold.jpg
diff --git a/lumina-desktop/wallpapers/Lumina_Wispy_gold_1920x1080.jpg b/lumina-desktop/wallpapers/Lumina_Wispy_gold_1920x1080.jpg
deleted file mode 100644
index e7b01b93..00000000
--- a/lumina-desktop/wallpapers/Lumina_Wispy_gold_1920x1080.jpg
+++ /dev/null
diff --git a/lumina-desktop/wallpapers/Lumina_Wispy_green.jpg b/lumina-desktop/wallpapers/Lumina_Wispy_green.jpg
new file mode 100644
index 00000000..80b0d3e3
--- /dev/null
+++ b/lumina-desktop/wallpapers/Lumina_Wispy_green.jpg
diff --git a/lumina-desktop/wallpapers/Lumina_Wispy_green_1920x1080.jpg b/lumina-desktop/wallpapers/Lumina_Wispy_green_1920x1080.jpg
deleted file mode 100644
index 56bdd128..00000000
--- a/lumina-desktop/wallpapers/Lumina_Wispy_green_1920x1080.jpg
+++ /dev/null
diff --git a/lumina-desktop/wallpapers/Lumina_Wispy_purple.jpg b/lumina-desktop/wallpapers/Lumina_Wispy_purple.jpg
new file mode 100644
index 00000000..e4c3d7a8
--- /dev/null
+++ b/lumina-desktop/wallpapers/Lumina_Wispy_purple.jpg
diff --git a/lumina-desktop/wallpapers/Lumina_Wispy_purple_1920x1080.jpg b/lumina-desktop/wallpapers/Lumina_Wispy_purple_1920x1080.jpg
deleted file mode 100644
index b62946b7..00000000
--- a/lumina-desktop/wallpapers/Lumina_Wispy_purple_1920x1080.jpg
+++ /dev/null
diff --git a/lumina-desktop/wallpapers/Lumina_Wispy_red.jpg b/lumina-desktop/wallpapers/Lumina_Wispy_red.jpg
new file mode 100644
index 00000000..a092f636
--- /dev/null
+++ b/lumina-desktop/wallpapers/Lumina_Wispy_red.jpg
diff --git a/lumina-desktop/wallpapers/Lumina_Wispy_red_1920x1080.jpg b/lumina-desktop/wallpapers/Lumina_Wispy_red_1920x1080.jpg
deleted file mode 100644
index 456de652..00000000
--- a/lumina-desktop/wallpapers/Lumina_Wispy_red_1920x1080.jpg
+++ /dev/null