[PC-BSD Commits] r21544 - pcbsd-projects/PCDM

[svn at pcbsd.org]

Author: kenmoore
Date: 2013-02-15 18:53:21 +0000 (Fri, 15 Feb 2013)
New Revision: 21544

Modified:
   pcbsd-projects/PCDM/loginWidget.cpp
   pcbsd-projects/PCDM/pcdm-gui.cpp
   pcbsd-projects/PCDM/pcdm-gui.h
   pcbsd-projects/PCDM/pcdm.theme
Log:
Add a number of display improvements to the default theme, as well as fix a couple minor bugs in the login widget and main GUI



Modified: pcbsd-projects/PCDM/loginWidget.cpp
===================================================================
--- pcbsd-projects/PCDM/loginWidget.cpp	2013-02-15 18:29:11 UTC (rev 21543)
+++ pcbsd-projects/PCDM/loginWidget.cpp	2013-02-15 18:53:21 UTC (rev 21544)
@@ -170,7 +170,6 @@
 
 void LoginWidget::displayHostName(QString name){
   hostName = name;
-  retranslateUi();
 }
 
 void LoginWidget::changeButtonIcon(QString button, QString iconFile, QSize iconSize){

Modified: pcbsd-projects/PCDM/pcdm-gui.cpp
===================================================================
--- pcbsd-projects/PCDM/pcdm-gui.cpp	2013-02-15 18:29:11 UTC (rev 21543)
+++ pcbsd-projects/PCDM/pcdm-gui.cpp	2013-02-15 18:53:21 UTC (rev 21544)
@@ -160,6 +160,9 @@
     tmpIcon = currentTheme->itemIcon("password");
     if(!QFile::exists(tmpIcon) || tmpIcon.isEmpty() ){ tmpIcon=":/images/password.png"; }
     loginW->changeButtonIcon("pwview",tmpIcon, currentTheme->itemIconSize("password"));
+    //Display the Hostname
+    QString hostname = QProcessEnvironment::systemEnvironment().value("HOSTNAME");
+    loginW->displayHostName(hostname);
     //Add item to the grid
     grid->addWidget( loginW, currentTheme->itemLocation("login","row"), \
                       currentTheme->itemLocation("login","col"), \
@@ -217,6 +220,8 @@
     
   //Now translate the UI and set all the text
   retranslateUi();
+  //Now make sure that the login widget has focus
+  loginW->setFocus();  
 
 }
 

Modified: pcbsd-projects/PCDM/pcdm-gui.h
===================================================================
--- pcbsd-projects/PCDM/pcdm-gui.h	2013-02-15 18:29:11 UTC (rev 21543)
+++ pcbsd-projects/PCDM/pcdm-gui.h	2013-02-15 18:53:21 UTC (rev 21544)
@@ -16,6 +16,7 @@
 #include <QGridLayout>
 #include <QX11EmbedContainer>
 #include <QSpacerItem>
+#include <QProcessEnvironment>
 
 #include "pcdm-backend.h"
 #include "themeStruct.h"

Modified: pcbsd-projects/PCDM/pcdm.theme
===================================================================
--- pcbsd-projects/PCDM/pcdm.theme	2013-02-15 18:29:11 UTC (rev 21543)
+++ pcbsd-projects/PCDM/pcdm.theme	2013-02-15 18:53:21 UTC (rev 21544)
@@ -16,20 +16,20 @@
   BACKGROUND_DISABLE=FALSE		# Flag to disable using a background image
 
 HEADER_IMAGE=default-header.jpg 	# Image to be displayed as a window header
-  HEADER_IMAGE_SIZE=800x200		# Size for the image (in pixels)
+  HEADER_IMAGE_SIZE=600x200		# Size for the image (in pixels)
   HEADER_DISABLE=FALSE			# Flag to remove the header image entirely
   
 USER_IMAGE=default-user.png  		# Image for the user selection widget
-  USER_IMAGE_SIZE=64x64  		  # Size for the image (in pixels)
+  USER_IMAGE_SIZE=48x48  		  # Size for the image (in pixels)
   
 PASSWORD_IMAGE=default-password.png  	# Default image for the password entry box
-  PASSWORD_IMAGE_SIZE=64x64		  # Size for the image (in pixels)
+  PASSWORD_IMAGE_SIZE=32x32		  # Size for the image (in pixels)
   
 LOGIN_IMAGE=default-login.png  		# Image contained in the login button
   LOGIN_IMAGE_SIZE=64x64		  # Size for the image (in pixels)
 
 DESKTOP_IMAGE=default-de-select.png	# Default Image for the DE selection if none found
-  DESKTOP_IMAGE_SIZE=64x64		  	# Size for the image (in pixels)
+  DESKTOP_IMAGE_SIZE=32x32		  	# Size for the image (in pixels)
   DESKTOP_ORIENTATION=horizontal		# [horizontal | vertical]
 
 # --Images that will scale according to the toolbar size--
@@ -71,9 +71,15 @@
 # Desktop Environment Selector Buttons: QPushButton
 # ----------
 APP_STYLESHEET_START
-QComboBox{ font-size: 32px; }
-QGroupBox{ background-color: qlineargradient(x1: 0, x2: 0, y1: 0.8, y2: 0.8, stop: 0 blue, stop: 1 transparent); }
-QToolBar{ background: qlineargradient(x1: 0, x2: 0, y1: 0.6, y2: 0.6, stop: 0 blue, stop: 1 transparent); }
-QGraphicsView{ background: white; color: black; }
+QToolBar{ background-color: transparent; }
 QWindow{ background-color: white; color: black; }
+LoginWidget{
+ QComboBox{font-size: 28px;}
+ QGroupBox{ background-color: qlineargradient(x1: 0, x2: 0, y1: 0, y2: 1, stop: 0 blue, stop: 1 transparent);
+	border: 1px grey }
+}
+FancyWidget{
+ QGraphicsView{ background: white; color: black; }
+ QPushButton{ background-color: transparent; }
+}
 APP_STYLESHEET_STOP