--- a/javamanager/javainstaller/installerui/data/javaapplicationinstaller.css Fri Oct 15 12:29:39 2010 +0300
+++ b/javamanager/javainstaller/installerui/data/javaapplicationinstaller.css Fri Oct 29 11:49:32 2010 +0300
@@ -17,21 +17,41 @@
QScrollArea#dialogArea {
/* General size parameters for all installer dialogs */
-
/* this depends on display; NHD portrait width:360px and height:640px used */
/* Note that popup width and height is according to portrait dimensions, and is the same in portrait and landscape */
width: 346.6px; /*expr(var(hb-param-screen-short-edge)- 2*var(hb-param-margin-gene-screen)); /* 2un*/
/*height: /*the size of MessageBox with 3-5 rows of text? */
max-height: 626.6px; /*expr(var(hb-param-long-edge)-2*var(hb-param-margin-gene-screen));
/*position: vertically and horizontally centre of screen - is this needed?*/
+ border: 1px solid;
+ border-radius: 7px;
+}
+
+QScrollArea#headingArea {
+ /* Heading area style for installation dialogs. */
+ border: 1px solid;
+ border-top-left-radius: 7px;
+ border-top-right-radius: 7px;
+}
+
+QScrollArea#contentArea {
+ /* Content area style for installation dialogs. */
+ padding-top: 10px;
+ padding-bottom: 10px;
+}
+
+QScrollArea#commandButtonArea {
+ /* Command button area style for installation dialogs. */
+ border: 1px solid;
+ border-bottom-left-radius: 7px;
+ border-bottom-right-radius: 7px;
}
QScrollArea#appInfoArea {
- /* This is valid for all installation query application details,
+ /* This is valid for all installation dialog application details,
* and also for application details in short error message */
- /* (ViewBase) */
/* Note: this text area becomes scrollable if there are more text
- * that can be displayed at one time (this could be also QAbstractScrollArea?)*/
+ * that can be displayed at a time. */
margin-top: 13.4px; /*hb-param-margin-gene-popup; /*2un*/
margin-left: 13.4px; /*hb-param-margin-gene-popup; /*2un*/
margin-right: 13.4px; /*hb-param-margin-gene-popup; /*2un*/
@@ -39,22 +59,23 @@
}
QLabel#appInfoLabel {
- /* The font size of application details; each detail is its own label */
- font-size: 23.45px; /*hb-param-text-height-secondary; /*3.5un*/
+ font-size: 20px;
}
QLabel#heading {
- /* Any installation query heading text: its text size, and top/left margins */
- font-size: 26.8px; /*hb-param-text-height-primary;/*4un*/
+ /* Any installation dialog heading text. */
font-weight: bold;
max-height: 53.6px; /*expr(var(hb-param-text-height-primary)+2*var(hb-param-margin-gene-popup)) - same as hb-param-widget-popup-heading-height;*/
margin-top: 13.4px; /*hb-param-margin-gene-top; /*2un*/
margin-left: 13.4px; /*hb-param-margin-gene-left; /*2un*/
+ padding-bottom: 13.4px;
}
QLabel#contentIcon {
- /* This is valid for all icons displayed in the installation query content area */
- /* Application icon, question icon, error icon in installation error dialog etc */
+ /* This is valid for all icons displayed in the
+ * installation dialog content area;
+ * application icon, question icon, error icon in
+ * installation error dialog, etc. */
margin-left: 13.4px; /*hb-param-margin-gene-popup; /*2un*/
margin-top: 13.4px; /*hb-param-margin-gene-popup; /*2un*/
/* size of icon - fixed size */
@@ -65,66 +86,61 @@
}
QComboBox#driveSelector{
- /* Combo box in installationquery. Need to define the top margin at least (InstallConfirmationView). */
+ /* Combo box in installation dialog. */
margin-top: 5.025px; /*hb-param-margin-gene-middle-vertical; /*0.75un*/
}
QProgressBar#progressBar{
- /* Progress bar in installationquery. Need to define the top margin at least (ProgressView). */
+ /* Progress bar in installation dialog. */
margin-top: 5.025px; /*hb-param-margin-gene-middle-vertical; /*0.75un*/
}
QLabel#permissionDetails{
- /* String that requests access for protected functionality in permission query */
- /* (PermissionInfo) */
+ /* String that requests access for protected functionality
+ * in permission query. */
margin-left: 13.4px; /*hb-param-margin-gene-popup; /*2un*/
margin-top: 13.4px; /*hb-param-margin-gene-popup; /*2un*/
}
QLabel#errorLabel{
- /* short error message from USIF (note: this is not Java specific error message but
- * common to all installers), (ErrorView) */
- font-size: 23.45px; /*hb-param-text-height-secondary; /*3.5un*/
+ /* Short error message (note: this is not Java specific error message but
+ * common to all installers). */
margin-top: 5.025px; /*hb-param-margin-gene-middle-vertical; /*0.75un*/
}
QLabel#detailsWarningLabel{
- /* Application is certified / is not certified views and permission details
- * view texts (CertificateDetailsView, PermissionDetailsView) */
- font-size: 23.45px; /*hb-param-text-height-secondary; /*3.5un*/
+ /* Application is certified / is not certified views and
+ * permission details view texts. */
}
QLabel#urlLabel{
- /* Text in authentication dialog (UsernamePasswordView) */
- /* Note that this dialog is always in portrait */
- font-size: 23.45px; /*hb-param-text-height-secondary; /*3.5un*/
+ /* Text in authentication dialog. */
+ /* Note that this dialog is always in portrait. */
margin-top: 13.4px; /*hb-param-margin-gene-popup; /*2un*/
margin-left: 13.4px; /*hb-param-margin-gene-popup; /*2un*/
margin-right: 13.4px; /*hb-param-margin-gene-popup; /*2un*/
}
QLabel#authLabel{
- /* Text in authentication dialog (UsernamePasswordView) */
+ /* Text in authentication dialog. */
/* Note that this dialog is always in portrait */
- font-size: 23.45px; /*hb-param-text-height-secondary; /*3.5un*/
margin-top: 13.4px; /*hb-param-margin-gene-popup; /*2un*/
margin-left: 13.4px; /*hb-param-margin-gene-popup; /*2un*/
margin-right: 13.4px; /*hb-param-margin-gene-popup; /*2un*/
}
QLabel#usernamePasswordLabel{
- /* Label of username and password input fields in authentication dialog (UsernamePasswordView) */
+ /* Label of username and password input fields in
+ * authentication dialog. */
/* Note that this dialog is always in portrait */
- font-size: 23.45px; /*hb-param-text-height-secondary; /*3.5un*/
margin-top: 13.4px; /*hb-param-margin-gene-popup; /*2un*/
margin-left: 13.4px; /*hb-param-margin-gene-popup; /*2un*/
margin-right: 13.4px; /*hb-param-margin-gene-popup; /*2un*/
}
QLabel#usernamePasswordInputField{
- /* Input fields of username and password in authentication dialog (UsernamePasswordView) */
+ /* Input fields of username and password in authentication dialog. */
/* Note that this dialog is always in portrait */
- font-size: 23.45px; /*hb-param-text-height-secondary; /*3.5un*/
margin-top: 5.025px; /*hb-param-margin-gene-middle-vertical; /*0.75un*/
margin-left: 13.4px; /*hb-param-margin-gene-popup; /*2un*/
margin-right: 13.4px; /*hb-param-margin-gene-popup; /*2un*/
@@ -133,76 +149,59 @@
/* --- Buttons --- */
-QPushButton {
- font-size: 20.1px;/* hb-param-text-height-tiny; /*3un*/
-}
-
QPushButton#softKeyButton{
- /* Installation query OK button (ConfirmationViewBase) */
- margin-top: 13.4px; /*hb-param-margin-gene-popup; /*2un*/
- height: 50.25px; /*hb-param-widget-popup-softkey-height;/*7.5un*/
- /* this depends on display; NHD portrait width:360px and height:640px used */
- width: 173.3px; /*expr((var(hb-param-screen-short-edge)-2*var(hb-param-margin-gene-screen))/2); /* width of one button is half of popup width*/
+ /* Installation query OK button. */
+ height: 40px;
}
QPushButton#softKeyButtonWide{
- /* Ok button to go back from a details view (application is certified / not certified views
- * and permission details view) (CertificateDetailsView, PermissionDetailsView)*/
- /* this ok button has different top margin otherwise the same as OkCommand button with max-width */
- margin-top: 5.025px; /*hb-param-margin-gene-middle-vertical; /*0.75un*/
- height: 50.25px; /*hb-param-widget-popup-softkey-height;/*7.5un*/
+ /* Ok button to go back from a details view (application is
+ * certified / not certified views and permission details view)*/
+ height: 40px;
}
QPushButton#securityButton{
- /* Security lock icon button in installation query heading (ViewBase.createSecurityButton) */
+ /* Security lock icon button in installation dialog heading. */
margin-right: 13.4px; /*hb-param-margin-gene-popup; /*2un*/
/* size of icon */
min-width: 26.8px; /* hb-param-graphic-size-primary-small; /*4un*/
max-width: 26.8px; /* hb-param-graphic-size-primary-small; /*4un*/
min-height: 26.8px; /* hb-param-graphic-size-primary-small; /*4un*/
max-height: 26.8px; /* hb-param-graphic-size-primary-small; /*4un*/
-
}
QPushButton#detailsLink{
- /* Button in permission query to view details (PermissionConfirmationView) */
+ /* Button in permission query to view details. */
margin-right: 13.4px; /*hb-param-margin-gene-popup; /*2un*/
margin-left: 13.4px; /*hb-param-margin-gene-left; /*2un*/
margin-top: 13.4px; /*hb-param-margin-gene-popup; /*2un*/
+ font-size: 14px;
}
QPushButton#allowButton{
- /* Allow always function button in permission query */
- /* (PermissionConfirmationView) */
+ /* Allow always function button in permission query. */
margin-right: 13.4px; /*hb-param-margin-gene-popup; /*2un*/
margin-left: 13.4px; /*hb-param-margin-gene-popup; /*2un*/
margin-top: 13.4px; /*hb-param-margin-gene-popup; /*2un*/
-
}
QPushButton#denyButton{
- /* Ask me later function buttons in permission query */
- /* (PermissionConfirmationView) */
+ /* Ask me later function buttons in permission query. */
margin-right: 13.4px; /*hb-param-margin-gene-popup; /*2un*/
margin-left: 13.4px; /*hb-param-margin-gene-popup; /*2un*/
margin-top: 5.025px; /*hb-param-margin-gene-middle-vertical; /*0.75un*/
}
QPushButton#cancelButton{
- /* Cancel installing function button in permission query */
- /* (PermissionConfirmationView) */
+ /* Cancel installing function button in permission query. */
margin-right: 13.4px; /*hb-param-margin-gene-popup; /*2un*/
margin-left: 13.4px; /*hb-param-margin-gene-popup; /*2un*/
margin-top: 5.025px; /*hb-param-margin-gene-middle-vertical; /*0.75un*/
margin-bottom: 13.4px; /*hb-param-margin-gene-popup; /*2un*/
-
}
-QCheckBox#retainDataButton {
- /* Retain user data check box button in update query */
- /* Note that there is 2*hb-param-margin-gene-middle-vertical margin at the top as this check box is placed
- * after drive selector combo */
- /* (InstallConfirmationView) */
+QPushButton#retainDataButton {
+ /* Retain user data check box button in update query. */
margin-right: 13.4px; /*hb-param-margin-gene-popup; /*2un*/
margin-left: 13.4px; /*hb-param-margin-gene-popup; /*2un*/
margin-top: 10.05px; /*expr(2*var(hb-param-margin-gene-middle-vertical));